From 269cda7ac933e5418313a0c2b4c8b149d7f816ee Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Tue, 20 Oct 2015 23:52:50 -0700 Subject: [PATCH] remove "+1" from function pointer labels --- asm/emerald.s | 9380 +++++++++++++------------- asm/libagbbackup.s | 26 +- asm/libmks4agb.s | 32 +- asm/librfu.s | 68 +- asm/main.s | 6 +- asm/task.s | 2 +- asm/window.s | 12 +- data/contest_effect_function_table.s | 96 +- 8 files changed, 4811 insertions(+), 4811 deletions(-) diff --git a/asm/emerald.s b/asm/emerald.s index 4226e059e..d4bc8ddad 100644 --- a/asm/emerald.s +++ b/asm/emerald.s @@ -1572,7 +1572,7 @@ sub_8009570: ; 8009570 bl reset_all_obj_data bl gpu_pal_allocator_reset bl clear_tasks - ldr r0, =sub_80096BC + 1 + ldr r0, =sub_80096BC bl SetVBlankCallback bl sub_800A2E0 ldr r1, =0x020229c6 @@ -1605,7 +1605,7 @@ sub_8009570: ; 8009570 lsls r1, 5 movs r0, 0 bl lcd_io_set - ldr r0, =sub_8009404 + 1 + ldr r0, =sub_8009404 movs r1, 0 bl AddTask bl run_active_tasks @@ -1615,10 +1615,10 @@ sub_8009570: ; 8009570 ldr r0, =0x03000d60 str r4, [r0] bl sub_8009638 - ldr r0, =task00_link_test + 1 + ldr r0, =task00_link_test movs r1, 0 bl AddTask - ldr r0, =c2_08009A8C + 1 + ldr r0, =c2_08009A8C bl set_callback2 add sp, 0x4 pop {r4} @@ -1768,7 +1768,7 @@ sub_8009734: ; 8009734 bl sub_800B628 bl sub_80096D0 ldr r1, =0x03003140 - ldr r0, =sub_800A824 + 1 + ldr r0, =sub_800A824 str r0, [r1] ldr r0, =0x03002748 strb r4, [r0] @@ -1786,7 +1786,7 @@ sub_8009734: ; 8009734 strb r4, [r0] ldr r0, =0x030030f4 strh r4, [r0] - ldr r0, =task02_080097CC + 1 + ldr r0, =task02_080097CC movs r1, 0x2 bl AddTask b @080097AC @@ -2429,7 +2429,7 @@ sub_8009AA0: ; 8009AA0 cmp r0, 0 beq @08009D0C @08009CEC: - ldr r0, =c2_800ACD4 + 1 + ldr r0, =c2_800ACD4 bl set_callback2 b @08009D6E .align 2, 0 @@ -2697,7 +2697,7 @@ sub_8009F18: ; 8009F18 bl sub_800F804 @08009F26: ldr r1, =0x03003140 - ldr r0, =sub_8009F70 + 1 + ldr r0, =sub_8009F70 str r0, [r1] pop {r0} bx r0 @@ -2719,7 +2719,7 @@ sub_8009F3C: ; 8009F3C @08009F50: ldr r0, =0x03003140 ldr r1, [r0] - ldr r0, =sub_8009F70 + 1 + ldr r0, =sub_8009F70 cmp r1, r0 beq @08009F68 movs r0, 0 @@ -3267,7 +3267,7 @@ sub_800A2F4: ; 800A2F4 ldr r0, =0x0000bbbb bl sub_8009D90 ldr r1, =0x03003140 - ldr r0, =sub_800A364 + 1 + ldr r0, =sub_800A364 str r0, [r1] ldr r1, =0x03000d50 movs r0, 0 @@ -3291,7 +3291,7 @@ sub_800A364: ; 800A364 cmp r0, 0x2 bls @0800A378 ldr r1, =0x03003140 - ldr r0, =sub_800A388 + 1 + ldr r0, =sub_800A388 str r0, [r1] @0800A378: pop {r0} @@ -3337,7 +3337,7 @@ sub_800A388: ; 800A388 movs r0, 0 strb r0, [r4, 0x8] ldr r1, =0x03003140 - ldr r0, =sub_800A3EC + 1 + ldr r0, =sub_800A3EC str r0, [r1] @0800A3D0: pop {r4-r6} @@ -3389,7 +3389,7 @@ sub_800A418: ; 800A418 .pool @0800A438: ldr r1, =0x03003140 - ldr r0, =sub_800A3F8 + 1 + ldr r0, =sub_800A3F8 str r0, [r1] @0800A43E: pop {r0} @@ -4363,7 +4363,7 @@ sub_800AB18: ; 800AB18 movs r0, 0x1 strb r0, [r1] bl sub_80097E8 - ldr r0, =c2_800ACD4 + 1 + ldr r0, =c2_800ACD4 bl set_callback2 @0800AB6A: adds r0, r4, 0x1 @@ -4458,7 +4458,7 @@ sub_800ABF4: ; 800ABF4 ldr r1, [r2] cmp r1, 0 bne @0800AC20 - ldr r0, =sub_800AC80 + 1 + ldr r0, =sub_800AC80 str r0, [r2] ldr r0, =0x030030e4 strb r1, [r0] @@ -4495,7 +4495,7 @@ sub_800AC34: ; 800AC34 .align 2, 0 .pool @0800AC64: - ldr r0, =sub_800AC80 + 1 + ldr r0, =sub_800AC80 str r0, [r2] ldr r0, =0x030030e4 strb r1, [r0] @@ -4518,7 +4518,7 @@ sub_800AC80: ; 800AC80 ldr r0, =0x00005fff bl sub_8009D90 ldr r1, =0x03003140 - ldr r0, =sub_800ACAC + 1 + ldr r0, =sub_800ACAC str r0, [r1] @0800AC96: pop {r0} @@ -4598,7 +4598,7 @@ sub_800AD10: ; 800AD10 .align 2, 0 .pool @0800AD40: - ldr r0, =sub_800AD5C + 1 + ldr r0, =sub_800AD5C str r0, [r2] ldr r0, =0x030030e4 strb r1, [r0] @@ -4621,7 +4621,7 @@ sub_800AD5C: ; 800AD5C ldr r0, =0x00005fff bl sub_8009D90 ldr r1, =0x03003140 - ldr r0, =sub_800AD88 + 1 + ldr r0, =sub_800AD88 str r0, [r1] @0800AD72: pop {r0} @@ -4699,7 +4699,7 @@ sub_800ADF8: ; 800ADF8 ldr r0, [r1] cmp r0, 0 bne @0800AE18 - ldr r0, =sub_800AE30 + 1 + ldr r0, =sub_800AE30 str r0, [r1] @0800AE18: ldr r1, =0x030030e4 @@ -4722,7 +4722,7 @@ sub_800AE30: ; 800AE30 ldr r0, =0x00002ffe bl sub_8009D90 ldr r1, =0x03003140 - ldr r0, =sub_800AE5C + 1 + ldr r0, =sub_800AE5C str r0, [r1] @0800AE46: pop {r0} @@ -4805,7 +4805,7 @@ sub_800AEB4: ; 800AEB4 ldr r0, =0x03003160 ldrb r0, [r0] strb r0, [r1, 0x5] - ldr r0, =c2_800ACD4 + 1 + ldr r0, =c2_800ACD4 bl set_callback2 @0800AEEA: ldr r1, =0x0300306c @@ -4872,7 +4872,7 @@ c2_800ACD4: ; 800AF30 @0800AF88: bl sub_800E604 @0800AF8C: - ldr r0, =sub_80096BC + 1 + ldr r0, =sub_80096BC bl SetVBlankCallback movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags @@ -4924,7 +4924,7 @@ c2_800ACD4: ; 800AF30 ldr r1, =0x03002700 movs r0, 0 strb r0, [r1] - ldr r0, =sub_8009404 + 1 + ldr r0, =sub_8009404 movs r1, 0 bl AddTask bl sub_80A2F30 @@ -4935,7 +4935,7 @@ c2_800ACD4: ; 800AF30 bl call_obj_callbacks bl obj_sync_something bl fade_and_return_progress_probably - ldr r0, =sub_800B1A0 + 1 + ldr r0, =sub_800B1A0 bl set_callback2 @0800B03C: pop {r4} @@ -5357,7 +5357,7 @@ sub_800B3A4: ; 800B3A4 cmp r0, 0 beq @0800B3F4 @0800B3EE: - ldr r0, =c2_800ACD4 + 1 + ldr r0, =c2_800ACD4 bl set_callback2 @0800B3F4: pop {r4-r6} @@ -6813,9 +6813,9 @@ sub_800BF4C: ; 800BF4C strb r0, [r4, 0x6] str r5, [r4, 0x40] str r6, [r4, 0x44] - ldr r0, =sub_800CEB0 + 1 + ldr r0, =sub_800CEB0 bl rfu_setMSCCallback - ldr r0, =sub_800C7B4 + 1 + ldr r0, =sub_800C7B4 bl rfu_setREQCallback movs r0, 0 b @0800BF96 @@ -9619,7 +9619,7 @@ sub_800D52C: ; 800D52C push {lr} ldr r1, =0x03004140 str r0, [r1, 0x44] - ldr r0, =sub_800CEB0 + 1 + ldr r0, =sub_800CEB0 bl rfu_setMSCCallback pop {r0} bx r0 @@ -12083,7 +12083,7 @@ sub_800E748: ; 800E748 ldrb r0, [r1] movs r0, 0 strb r0, [r1] - ldr r0, =sub_800EDBC + 1 + ldr r0, =sub_800EDBC bl sub_800D52C bl sub_800EAB4 bl sub_800EAFC @@ -12096,7 +12096,7 @@ sub_800E748: ; 800E748 adds r0, r1 movs r1, 0x8 strh r1, [r0, 0xA] - ldr r0, =sub_801084C + 1 + ldr r0, =sub_801084C movs r1, 0x5 bl AddTask adds r0, r5, 0 @@ -12376,7 +12376,7 @@ sub_800E94C: ; 800E94C adds r0, 0x1 strb r0, [r4, 0xF] @0800EA92: - ldr r0, =sub_801084C + 1 + ldr r0, =sub_801084C movs r1, 0x5 bl AddTask @0800EA9A: @@ -12536,7 +12536,7 @@ sub_800EB44: ; 800EB44 movs r1, 0 movs r2, 0xF0 bl sub_800C054 - ldr r0, =sub_800ED34 + 1 + ldr r0, =sub_800ED34 bl sub_800D52C ldr r1, =0x03005000 movs r0, 0x12 @@ -12572,14 +12572,14 @@ sub_800EB44: ; 800EB44 ldrsh r0, [r1, r2] cmp r0, 0 beq @0800EC88 - ldr r0, =sub_8010D0C + 1 + ldr r0, =sub_8010D0C movs r1, 0x1 bl AddTask b @0800ECF4 .align 2, 0 .pool @0800EC88: - ldr r0, =sub_801084C + 1 + ldr r0, =sub_801084C movs r1, 0x5 bl AddTask b @0800ECF4 @@ -12600,7 +12600,7 @@ sub_800EB44: ; 800EB44 ldrb r0, [r1] movs r0, 0 strb r0, [r1] - ldr r0, =sub_800EDBC + 1 + ldr r0, =sub_800EDBC bl sub_800D52C movs r0, 0x1 bl sub_8011068 @@ -12617,7 +12617,7 @@ sub_800EB44: ; 800EB44 strh r1, [r0, 0xA] movs r4, 0x1 strb r4, [r6, 0xC] - ldr r0, =sub_801084C + 1 + ldr r0, =sub_801084C movs r1, 0x5 bl AddTask ldr r1, =0x00000ce8 @@ -12735,14 +12735,14 @@ sub_800EDD4: ; 800EDD4 ldrb r0, [r4, 0xC] cmp r0, 0x1 bne @0800EDF0 - ldr r0, =sub_800E748 + 1 + ldr r0, =sub_800E748 b @0800EDF6 .align 2, 0 .pool @0800EDF0: cmp r0, 0 bne @0800EE18 - ldr r0, =sub_800E94C + 1 + ldr r0, =sub_800E94C @0800EDF6: bl is_function_an_active_task lsls r0, 24 @@ -12760,7 +12760,7 @@ sub_800EDD4: ; 800EDD4 @0800EE18: cmp r0, 0x2 bne @0800EE38 - ldr r0, =sub_800EB44 + 1 + ldr r0, =sub_800EB44 bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 @@ -12805,7 +12805,7 @@ sub_800EDD4: ; 800EDD4 thumb_func_start sub_800EE78 sub_800EE78: ; 800EE78 push {lr} - ldr r0, =sub_800E748 + 1 + ldr r0, =sub_800E748 movs r1, 0x1 bl AddTask ldr r1, =0x03005000 @@ -12877,7 +12877,7 @@ sub_800EEBC: ; 800EEBC thumb_func_start sub_800EF00 sub_800EF00: ; 800EF00 push {lr} - ldr r0, =sub_800E94C + 1 + ldr r0, =sub_800E94C movs r1, 0x1 bl AddTask ldr r1, =0x03005000 @@ -13520,7 +13520,7 @@ sub_800F1E0: ; 800F1E0 adds r1, r6, 0 subs r1, 0xB strb r0, [r1] - ldr r0, =sub_8010AAC + 1 + ldr r0, =sub_8010AAC movs r1, 0 bl AddTask b @0800F452 @@ -13997,7 +13997,7 @@ sub_800F7E4: ; 800F7E4 movs r2, 0 ldr r0, =0x03005000 ldr r1, [r0] - ldr r0, =rfu_func_080F97B8 + 1 + ldr r0, =rfu_func_080F97B8 cmp r1, r0 bne @0800F7F4 movs r2, 0x1 @@ -14012,7 +14012,7 @@ sub_800F7E4: ; 800F7E4 thumb_func_start sub_800F804 sub_800F804: ; 800F804 ldr r1, =0x03005000 - ldr r0, =rfu_func_080F97B8 + 1 + ldr r0, =rfu_func_080F97B8 str r0, [r1] bx lr .align 2, 0 @@ -14060,7 +14060,7 @@ sub_800F850: ; 800F850 ldr r0, [r1] cmp r0, 0 bne @0800F85E - ldr r0, =sub_800F820 + 1 + ldr r0, =sub_800F820 str r0, [r1] @0800F85E: pop {r0} @@ -14922,7 +14922,7 @@ sub_800FE84: ; 800FE84 lsls r0, 8 bl sub_800FD14 ldr r0, =0x03005000 - ldr r1, =rfufunc_80F9F44 + 1 + ldr r1, =rfufunc_80F9F44 str r1, [r0] adds r0, 0x5B movs r1, 0 @@ -14979,7 +14979,7 @@ rfufunc_80F9F44: ; 800FF4C cmp r0, r5 bne @0800FFA0 @0800FF9C: - ldr r0, =sub_800FFB0 + 1 + ldr r0, =sub_800FFB0 str r0, [r4] @0800FFA0: pop {r4,r5} @@ -15039,7 +15039,7 @@ sub_800FFB0: ; 800FFB0 adds r0, 0x7C movs r1, 0 strb r1, [r0] - ldr r0, =rfufunc_80FA020 + 1 + ldr r0, =rfufunc_80FA020 mov r1, r12 str r0, [r1] @08010014: @@ -15224,7 +15224,7 @@ sub_8010168: ; 8010168 .align 2, 0 .pool @08010188: - ldr r0, =sub_8010148 + 1 + ldr r0, =sub_8010148 str r0, [r4] @0801018C: pop {r4} @@ -15298,7 +15298,7 @@ sub_80101CC: ; 80101CC .align 2, 0 .pool @0801021C: - ldr r0, =sub_8010168 + 1 + ldr r0, =sub_8010168 str r0, [r3] @08010220: pop {r4,r5} @@ -15324,7 +15324,7 @@ sub_801022C: ; 801022C movs r0, 0xBE lsls r0, 7 bl sub_800FD14 - ldr r0, =sub_80101CC + 1 + ldr r0, =sub_80101CC str r0, [r4] @0801024E: pop {r4} @@ -15347,7 +15347,7 @@ sub_8010264: ; 8010264 adds r0, r2, r1 movs r1, 0x1 strb r1, [r0] - ldr r0, =sub_801022C + 1 + ldr r0, =sub_801022C str r0, [r2] adds r0, r3, 0 bl remove_task @@ -15361,7 +15361,7 @@ sub_8010264: ; 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, =sub_8010264 + 1 + ldr r4, =sub_8010264 adds r0, r4, 0 bl is_function_an_active_task lsls r0, 24 @@ -15477,7 +15477,7 @@ sub_8010358: ; 8010358 movs r0, 0xCC lsls r0, 7 bl sub_800FD14 - ldr r0, =sub_80102B8 + 1 + ldr r0, =sub_80102B8 str r0, [r4] @0801037A: pop {r4} @@ -15507,7 +15507,7 @@ sub_8010390: ; 8010390 movs r0, 0xCC lsls r0, 7 bl sub_800FD14 - ldr r0, =sub_80102B8 + 1 + ldr r0, =sub_80102B8 b @0801041C .align 2, 0 .pool @@ -15551,7 +15551,7 @@ sub_8010390: ; 8010390 movs r0, 0xCC lsls r0, 7 bl sub_800FD14 - ldr r0, =sub_8010358 + 1 + ldr r0, =sub_8010358 @0801041C: str r0, [r4] @0801041E: @@ -15569,7 +15569,7 @@ sub_8010434: ; 8010434 ldr r2, [r1] cmp r2, 0 bne @08010448 - ldr r0, =sub_8010390 + 1 + ldr r0, =sub_8010390 str r0, [r1] adds r0, r1, 0 adds r0, 0xFE @@ -16788,7 +16788,7 @@ sub_8010DB4: ; 8010DB4 bne @08010E5C ldr r0, =0x030022c0 ldr r1, [r0, 0x4] - ldr r0, =sub_8018438 + 1 + ldr r0, =sub_8018438 cmp r1, r0 beq @08010DDE ldr r0, [r2, 0x3C] @@ -16800,7 +16800,7 @@ sub_8010DB4: ; 8010DB4 movs r0, 0x2 strb r0, [r1] @08010DE4: - ldr r4, =c2_800ACD4 + 1 + ldr r4, =c2_800ACD4 adds r0, r4, 0 bl set_callback2 ldr r0, =0x030022c0 @@ -17339,7 +17339,7 @@ sub_80111DC: ; 80111DC thumb_func_start sub_80111FC sub_80111FC: ; 80111FC ldr r1, =0x03005000 - ldr r0, =sub_80111DC + 1 + ldr r0, =sub_80111DC str r0, [r1] bx lr .align 2, 0 @@ -18173,7 +18173,7 @@ sub_8011674: ; 8011674 bhi @080118B0 adds r0, 0x1 strb r0, [r1] - ldr r0, =sub_801209C + 1 + ldr r0, =sub_801209C movs r1, 0x2 bl AddTask b @08011A42 @@ -18306,7 +18306,7 @@ sub_8011674: ; 8011674 ldrb r0, [r0, 0x7] cmp r0, 0 bne @080119DA - ldr r0, =sub_800EB44 + 1 + ldr r0, =sub_800EB44 bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 @@ -18477,7 +18477,7 @@ sub_8011AFC: ; 8011AFC bl gpu_pal_allocator_reset bl clear_tasks bl sub_80A1A74 - ldr r0, =sub_8011AE8 + 1 + ldr r0, =sub_8011AE8 bl SetVBlankCallback bl sub_80093CC lsls r0, 24 @@ -18512,7 +18512,7 @@ sub_8011AFC: ; 8011AFC bl obj_sync_something bl fade_and_return_progress_probably bl sub_8011BA4 - ldr r0, =sub_8011BF8 + 1 + ldr r0, =sub_8011BF8 bl set_callback2 @08011B70: pop {r4} @@ -18525,7 +18525,7 @@ sub_8011AFC: ; 8011AFC thumb_func_start sub_8011B90 sub_8011B90: ; 8011B90 push {lr} - ldr r0, =sub_800EB44 + 1 + ldr r0, =sub_800EB44 bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 @@ -18538,7 +18538,7 @@ sub_8011B90: ; 8011B90 thumb_func_start sub_8011BA4 sub_8011BA4: ; 8011BA4 push {r4,lr} - ldr r4, =nullsub_89 + 1 + ldr r4, =nullsub_89 adds r0, r4, 0 bl is_function_an_active_task lsls r0, 24 @@ -18561,7 +18561,7 @@ sub_8011BA4: ; 8011BA4 thumb_func_start sub_8011BD0 sub_8011BD0: ; 8011BD0 push {lr} - ldr r0, =nullsub_89 + 1 + ldr r0, =nullsub_89 bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 @@ -18597,7 +18597,7 @@ sub_8011C10: ; 8011C10 movs r0, 0x1 strb r0, [r1, 0xC] bl sub_8010F48 - ldr r0, =sub_801120C + 1 + ldr r0, =sub_801120C movs r1, 0 bl sub_800BF4C ldr r2, =0x02022b2c @@ -18627,8 +18627,8 @@ sub_8011C5C: ; 8011C5C movs r0, 0 strb r0, [r1, 0xC] bl sub_8010F48 - ldr r0, =sub_8011404 + 1 - ldr r1, =sub_800ED34 + 1 + ldr r0, =sub_8011404 + ldr r1, =sub_800ED34 bl sub_800BF4C bl sub_800EF00 pop {r0} @@ -18645,7 +18645,7 @@ sub_8011C84: ; 8011C84 movs r0, 0x2 strb r0, [r4, 0xC] bl sub_8010F48 - ldr r0, =sub_8011674 + 1 + ldr r0, =sub_8011674 movs r1, 0 bl sub_800BF4C ldr r2, =0x02022b2c @@ -18659,7 +18659,7 @@ sub_8011C84: ; 8011C84 movs r0, 0x96 lsls r0, 2 strh r0, [r2, 0x12] - ldr r0, =sub_800EB44 + 1 + ldr r0, =sub_800EB44 movs r1, 0x1 bl AddTask adds r4, 0x67 @@ -18900,7 +18900,7 @@ sub_8011E94: ; 8011E94 push {r4-r6,lr} adds r4, r0, 0 adds r6, r1, 0 - ldr r5, =sub_8011E2C + 1 + ldr r5, =sub_8011E2C adds r0, r5, 0 bl get_task_id_by_function lsls r0, 24 @@ -19051,7 +19051,7 @@ sub_8011FC8: ; 8011FC8 adds r0, 0xF1 movs r1, 0 strb r1, [r0] - ldr r0, =sub_8011EF4 + 1 + ldr r0, =sub_8011EF4 movs r1, 0x3 bl AddTask lsls r0, 24 @@ -19279,7 +19279,7 @@ sub_8012188: ; 8012188 movs r2, 0xD bl memcpy bl sub_800D658 - ldr r0, =sub_801209C + 1 + ldr r0, =sub_801209C movs r1, 0x2 bl AddTask lsls r0, 24 @@ -19290,7 +19290,7 @@ sub_8012188: ; 8012188 lsls r1, 3 adds r1, r5 strh r4, [r1, 0xA] - ldr r0, =sub_800EB44 + 1 + ldr r0, =sub_800EB44 bl get_task_id_by_function lsls r0, 24 lsrs r1, r0, 24 @@ -19938,7 +19938,7 @@ sub_80126CC: ; 80126CC thumb_func_start sub_801273C sub_801273C: ; 801273C push {lr} - ldr r0, =sub_8012780 + 1 + ldr r0, =sub_8012780 movs r1, 0 bl AddTask lsls r0, 24 @@ -21506,7 +21506,7 @@ sub_8013398: ; 8013398 thumb_func_start sub_80134A4 sub_80134A4: ; 80134A4 push {lr} - ldr r0, =sub_80134E8 + 1 + ldr r0, =sub_80134E8 movs r1, 0 bl AddTask lsls r0, 24 @@ -22317,7 +22317,7 @@ sub_8013BD8: ; 8013BD8 thumb_func_start sub_8013C40 sub_8013C40: ; 8013C40 push {lr} - ldr r0, =sub_8013C7C + 1 + ldr r0, =sub_8013C7C movs r1, 0 bl AddTask lsls r0, 24 @@ -22732,7 +22732,7 @@ sub_8013F60: ; 8013F60 thumb_func_start sub_8013F78 sub_8013F78: ; 8013F78 push {lr} - ldr r0, =sub_8013F60 + 1 + ldr r0, =sub_8013F60 movs r1, 0 bl AddTask lsls r0, 24 @@ -22866,9 +22866,9 @@ sub_8013F90: ; 8013F90 movs r0, 0x6 strb r0, [r1, 0x1] ldr r1, =0x030022c0 - ldr r0, =c2_exit_to_overworld_2_switch + 1 + ldr r0, =c2_exit_to_overworld_2_switch str r0, [r1, 0x8] - ldr r0, =sub_807AE50 + 1 + ldr r0, =sub_807AE50 bl set_callback2 mov r0, r8 bl sub_801807C @@ -22994,7 +22994,7 @@ sub_80141A4: ; 80141A4 .align 2, 0 .pool @080141C0: - ldr r0, =sub_80140E0 + 1 + ldr r0, =sub_80140E0 movs r1, 0x5 bl AddTask ldrb r0, [r4] @@ -23004,7 +23004,7 @@ sub_80141A4: ; 80141A4 .align 2, 0 .pool @080141D4: - ldr r0, =sub_80140E0 + 1 + ldr r0, =sub_80140E0 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 @@ -23014,7 +23014,7 @@ sub_80141A4: ; 80141A4 eors r0, r1 lsls r0, 24 lsrs r0, 24 - ldr r1, =c2_exit_to_overworld_2_switch + 1 + ldr r1, =c2_exit_to_overworld_2_switch bl sub_80C4E74 @080141F2: bl run_active_tasks @@ -23068,7 +23068,7 @@ sub_8014210: ; 8014210 lsrs r0, 24 strh r0, [r1, 0x18] ldr r1, =0x030022c0 - ldr r0, =sub_80B360C + 1 + ldr r0, =sub_80B360C str r0, [r1, 0x8] ldr r0, =0x02022fec str r6, [r0] @@ -23208,7 +23208,7 @@ sub_8014384: ; 8014384 .align 2, 0 .pool @080143A0: - ldr r0, =sub_80140E0 + 1 + ldr r0, =sub_80140E0 movs r1, 0x5 bl AddTask ldrb r0, [r4] @@ -23218,12 +23218,12 @@ sub_8014384: ; 8014384 .align 2, 0 .pool @080143B4: - ldr r0, =sub_80140E0 + 1 + ldr r0, =sub_80140E0 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 bne @080143C6 - ldr r0, =sub_8086074 + 1 + ldr r0, =sub_8086074 bl set_callback2 @080143C6: bl run_active_tasks @@ -23399,7 +23399,7 @@ sub_801440C: ; 801440C @080145D8: bl overworld_free_bg_tilemaps ldr r1, =0x030022c0 - ldr r0, =sub_801AC54 + 1 + ldr r0, =sub_801AC54 str r0, [r1, 0x8] movs r0, 0x3 bl sub_81B8518 @@ -23484,14 +23484,14 @@ sub_801440C: ; 801440C movs r3, 0x9 @080146B0: bl sub_8014304 - ldr r0, =sub_8014384 + 1 + ldr r0, =sub_8014384 bl set_callback2 b @08014764 .align 2, 0 .pool @080146C4: bl overworld_free_bg_tilemaps - ldr r0, =sub_8013F90 + 1 + ldr r0, =sub_8013F90 movs r1, 0 bl AddTask b @08014764 @@ -23517,7 +23517,7 @@ sub_801440C: ; 801440C ldr r0, =0x020228c4 movs r1, 0 bl sub_80143E4 - ldr r0, =sub_80141A4 + 1 + ldr r0, =sub_80141A4 bl set_callback2 b @08014764 .align 2, 0 @@ -23530,7 +23530,7 @@ sub_801440C: ; 801440C bl brm_get_pokemon_selection lsls r0, 24 lsrs r0, 24 - ldr r1, =c2_load_new_map + 1 + ldr r1, =c2_load_new_map bl sub_802A9A8 b @08014764 .align 2, 0 @@ -23540,7 +23540,7 @@ sub_801440C: ; 801440C movs r1, 0x9 movs r2, 0x1 bl sub_8014290 - ldr r0, =c2_load_new_map + 1 + ldr r0, =c2_load_new_map bl sub_8020C70 b @08014764 .align 2, 0 @@ -23553,7 +23553,7 @@ sub_801440C: ; 801440C bl brm_get_pokemon_selection lsls r0, 24 lsrs r0, 24 - ldr r1, =c2_load_new_map + 1 + ldr r1, =c2_load_new_map bl sub_802493C @08014764: adds r0, r4, 0 @@ -23719,7 +23719,7 @@ sub_8014790: ; 8014790 bne @08014914 adds r0, r4, 0 bl remove_task - ldr r0, =sub_80773AC + 1 + ldr r0, =sub_80773AC bl set_callback2 b @080149B2 .align 2, 0 @@ -23808,7 +23808,7 @@ sub_8014790: ; 8014790 thumb_func_start sub_80149C4 sub_80149C4: ; 80149C4 push {lr} - ldr r0, =sub_8014790 + 1 + ldr r0, =sub_8014790 movs r1, 0 bl AddTask pop {r0} @@ -23820,7 +23820,7 @@ sub_80149C4: ; 80149C4 thumb_func_start sub_80149D8 sub_80149D8: ; 80149D8 push {lr} - ldr r0, =sub_801440C + 1 + ldr r0, =sub_801440C movs r1, 0 bl AddTask lsls r0, 24 @@ -23842,7 +23842,7 @@ sub_80149D8: ; 80149D8 sub_8014A00: ; 8014A00 push {r4,lr} adds r4, r0, 0 - ldr r0, =sub_8014A40 + 1 + ldr r0, =sub_8014A40 movs r1, 0 bl AddTask lsls r0, 24 @@ -24401,7 +24401,7 @@ sub_8014A40: ; 8014A40 sub_8014EFC: ; 8014EFC push {r4,lr} adds r4, r0, 0 - ldr r0, =sub_8014F48 + 1 + ldr r0, =sub_8014F48 movs r1, 0 bl AddTask lsls r0, 24 @@ -24801,7 +24801,7 @@ sub_8014F48: ; 8014F48 sub_80152A8: ; 80152A8 push {r4,lr} adds r4, r0, 0 - ldr r0, =task00_081182DC + 1 + ldr r0, =task00_081182DC movs r1, 0 bl AddTask lsls r0, 24 @@ -25184,7 +25184,7 @@ task00_081182DC: ; 80152F4 sub_801560C: ; 801560C push {r4,lr} bl sub_8010F60 - ldr r0, =sub_80156E0 + 1 + ldr r0, =sub_80156E0 movs r1, 0xA bl AddTask ldr r4, =0x02022c30 @@ -25691,7 +25691,7 @@ sub_80156E0: ; 80156E0 bl sub_801A284 bl @08016878 @08015ADA: - ldr r0, =sub_809FA34 + 1 + ldr r0, =sub_809FA34 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 @@ -25801,7 +25801,7 @@ sub_80156E0: ; 80156E0 ldr r0, =0x020228c4 movs r1, 0x1 bl sub_80143E4 - ldr r0, =sub_80140E0 + 1 + ldr r0, =sub_80140E0 movs r1, 0x5 bl AddTask movs r0, 0x26 @@ -25809,7 +25809,7 @@ sub_80156E0: ; 80156E0 .align 2, 0 .pool @08015BF4: - ldr r0, =sub_80140E0 + 1 + ldr r0, =sub_80140E0 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 @@ -26350,7 +26350,7 @@ sub_80156E0: ; 80156E0 ldr r0, =0x020228c4 movs r1, 0x1 bl sub_80143E4 - ldr r0, =sub_80140E0 + 1 + ldr r0, =sub_80140E0 movs r1, 0x5 bl AddTask movs r0, 0x27 @@ -26360,7 +26360,7 @@ sub_80156E0: ; 80156E0 @08016104: adds r0, r6, 0 bl sub_801689C - ldr r0, =sub_80140E0 + 1 + ldr r0, =sub_80140E0 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 @@ -26809,9 +26809,9 @@ sub_80156E0: ; 80156E0 movs r0, 0x1 strh r0, [r1] ldr r1, =0x03005dac - ldr r0, =sub_80AF128 + 1 + ldr r0, =sub_80AF128 str r0, [r1] - ldr r1, =c2_exit_to_overworld_2_switch + 1 + ldr r1, =c2_exit_to_overworld_2_switch movs r0, 0x8 bl sub_81B8904 b @08016878 @@ -27117,9 +27117,9 @@ sub_80156E0: ; 80156E0 lsrs r0, 22 strh r0, [r2] ldr r1, =0x03005dac - ldr r0, =sub_80AF128 + 1 + ldr r0, =sub_80AF128 str r0, [r1] - ldr r1, =c2_exit_to_overworld_2_switch + 1 + ldr r1, =c2_exit_to_overworld_2_switch movs r0, 0x9 bl sub_81B8904 adds r0, r6, 0 @@ -27299,7 +27299,7 @@ sub_8016934: ; 8016934 ldr r5, =0x02022c20 movs r0, 0xFF strb r0, [r5] - ldr r0, =task00_081199FC + 1 + ldr r0, =task00_081199FC movs r1, 0 bl AddTask ldr r4, =0x02022c30 @@ -27896,7 +27896,7 @@ sub_8016DF0: ; 8016DF0 adds r4, r0, 0 adds r5, r1, 0 adds r6, r2, 0 - ldr r0, =sub_8016CA0 + 1 + ldr r0, =sub_8016CA0 movs r1, 0 bl AddTask lsls r0, 24 @@ -28137,7 +28137,7 @@ sub_8016FC0: ; 8016FC0 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 - ldr r0, =sub_8016E24 + 1 + ldr r0, =sub_8016E24 movs r1, 0 bl AddTask lsls r0, 24 @@ -28162,7 +28162,7 @@ sub_8016FF0: ; 8016FF0 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 - ldr r0, =sub_8016F44 + 1 + ldr r0, =sub_8016F44 movs r1, 0 bl AddTask lsls r0, 24 @@ -31004,7 +31004,7 @@ sub_8018450: ; 8018450 bl gpu_sync_bg_show ldr r0, =0x0000021d bl song_play_for_text - ldr r0, =sub_8018424 + 1 + ldr r0, =sub_8018424 bl SetVBlankCallback movs r0, 0xC5 bl enable_irqs @@ -31028,7 +31028,7 @@ c2_mystery_gift: ; 8018650 bl sub_8018450 cmp r0, 0 beq @0801866C - ldr r0, =sub_8018438 + 1 + ldr r0, =sub_8018438 bl set_callback2 ldr r1, =0x02022c60 movs r0, 0 @@ -31049,7 +31049,7 @@ sub_801867C: ; 801867C bl sub_8018450 cmp r0, 0 beq @08018698 - ldr r0, =sub_8018438 + 1 + ldr r0, =sub_8018438 bl set_callback2 ldr r1, =0x02022c60 movs r0, 0x1 @@ -31081,7 +31081,7 @@ sub_80186A4: ; 80186A4 movs r0, 0x3 bl bg_get_tilemap bl free - ldr r0, =c2_title_screen_1 + 1 + ldr r0, =c2_title_screen_1 bl set_callback2 pop {r0} bx r0 @@ -32488,7 +32488,7 @@ sub_8019174: ; 8019174 thumb_func_start task_add_00_mystery_gift task_add_00_mystery_gift: ; 80191AC push {r4,lr} - ldr r0, =task00_mystery_gift + 1 + ldr r0, =task00_mystery_gift movs r1, 0 bl AddTask lsls r0, 24 @@ -33401,7 +33401,7 @@ task00_mystery_gift: ; 80191F4 bl free adds r0, r4, 0 bl remove_task - ldr r0, =sub_80186A4 + 1 + ldr r0, =sub_80186A4 bl set_callback2 @08019922: add sp, 0x4 @@ -34075,7 +34075,7 @@ sub_8019DD0: ; 8019DD0 thumb_func_start sub_8019DF4 sub_8019DF4: ; 8019DF4 push {r4,lr} - ldr r4, =sub_8019DD0 + 1 + ldr r4, =sub_8019DD0 adds r0, r4, 0 bl is_function_an_active_task lsls r0, 24 @@ -34101,7 +34101,7 @@ sub_8019DF4: ; 8019DF4 thumb_func_start sub_8019E20 sub_8019E20: ; 8019E20 push {lr} - ldr r0, =sub_8019DD0 + 1 + ldr r0, =sub_8019DD0 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -34895,7 +34895,7 @@ sub_801A418: ; 801A418 thumb_func_start sub_801A42C sub_801A42C: ; 801A42C push {lr} - ldr r0, =sub_801A43C + 1 + ldr r0, =sub_801A43C bl set_callback2 pop {r0} bx r0 @@ -34954,9 +34954,9 @@ sub_801A43C: ; 801A43C bl clear_tasks bl remove_some_task bl SoundVSyncOn_rev01 - ldr r0, =sub_801A418 + 1 + ldr r0, =sub_801A418 bl SetVBlankCallback - ldr r0, =sub_801A6C0 + 1 + ldr r0, =sub_801A6C0 movs r1, 0 bl AddTask ldr r1, [r5] @@ -35004,7 +35004,7 @@ sub_801A43C: ; 801A43C bl Bg_FillWramTileMapRectWithTileAndPalette movs r0, 0x1 bl gpu_copy_wram_bg_tilemap_to_vram - ldr r0, =sub_801A3F4 + 1 + ldr r0, =sub_801A3F4 bl set_callback2 bl run_active_tasks bl run_remoboxes @@ -35035,7 +35035,7 @@ sub_801A584: ; 801A584 ldr r0, =0x03000dac ldr r0, [r0] bl free - ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 + ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music bl set_callback2 pop {r4} pop {r0} @@ -35391,7 +35391,7 @@ sub_801A6C0: ; 801A6C0 ands r0, r1 cmp r0, 0 bne @0801A89C - ldr r0, =sub_801A584 + 1 + ldr r0, =sub_801A584 bl set_callback2 adds r0, r5, 0 bl remove_task @@ -35763,7 +35763,7 @@ sub_801AAD4: ; 801AAD4 lsls r2, 4 adds r1, r2, 0 strh r1, [r0] - ldr r0, =sub_8036760 + 1 + ldr r0, =sub_8036760 bl set_callback2 pop {r4-r7} pop {r0} @@ -36023,7 +36023,7 @@ sub_801AC54: ; 801AC54 movs r2, 0xD0 bl box_border_load_tiles_and_pal bl sub_819789C - ldr r0, =sub_801AC40 + 1 + ldr r0, =sub_801AC40 bl SetVBlankCallback ldr r1, =0x030022c0 movs r0, 0x87 @@ -36183,7 +36183,7 @@ sub_801AC54: ; 801AC54 lsls r0, 24 cmp r0, 0 beq @0801AFAE - ldr r0, =sub_801AAD4 + 1 + ldr r0, =sub_801AAD4 bl set_callback2 b @0801AFAE .align 2, 0 @@ -36196,7 +36196,7 @@ sub_801AC54: ; 801AC54 bl sub_801ABDC cmp r0, 0 beq @0801AFAE - ldr r0, =c2_exit_to_overworld_2_switch + 1 + ldr r0, =c2_exit_to_overworld_2_switch bl set_callback2 b @0801AFAE .align 2, 0 @@ -36224,7 +36224,7 @@ sub_801AC54: ; 801AC54 bl sub_801ABDC cmp r0, 0 beq @0801AFAE - ldr r0, =c2_exit_to_overworld_2_switch + 1 + ldr r0, =c2_exit_to_overworld_2_switch bl set_callback2 @0801AFAE: bl run_active_tasks @@ -38961,7 +38961,7 @@ sub_801C4C0: ; 801C4C0 bl sub_80D2E84 lsls r0, 16 lsrs r0, 16 - ldr r1, =nullsub_12 + 1 + ldr r1, =nullsub_12 str r7, [sp] str r7, [sp, 0x4] movs r2, 0xDC @@ -39066,7 +39066,7 @@ sub_801C4C0: ; 801C4C0 mov r2, r9 str r2, [sp] str r2, [sp, 0x4] - ldr r1, =nullsub_12 + 1 + ldr r1, =nullsub_12 adds r2, r5, 0 movs r3, 0x88 bl sub_80D2D78 @@ -41497,9 +41497,9 @@ sub_801D8D8: ; 801D8D8 strh r3, [r0, 0x8] str r3, [r0, 0x1C] str r3, [r0, 0x18] - ldr r1, =sub_801DA5C + 1 + ldr r1, =sub_801DA5C str r1, [r0, 0x24] - ldr r1, =sub_801D988 + 1 + ldr r1, =sub_801D988 str r1, [r0, 0x20] bx lr .align 2, 0 @@ -42155,7 +42155,7 @@ sub_801DD98: ; 801DD98 strh r0, [r1] movs r0, 0 bl SetVBlankCallback - ldr r0, =c2_081284E0 + 1 + ldr r0, =c2_081284E0 bl set_callback2 pop {r4} pop {r0} @@ -42276,7 +42276,7 @@ c2_081284E0: ; 801DE54 movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - ldr r0, =sub_801DF20 + 1 + ldr r0, =sub_801DF20 bl SetVBlankCallback @0801DEBC: ldrb r0, [r6] @@ -42293,15 +42293,15 @@ c2_081284E0: ; 801DE54 ands r0, r1 cmp r0, 0 bne @0801DF04 - ldr r0, =sub_801DF38 + 1 + ldr r0, =sub_801DF38 bl set_callback2 - ldr r0, =sub_801DF54 + 1 + ldr r0, =sub_801DF54 movs r1, 0x8 bl AddTask ldr r4, =0x02022c84 ldr r1, [r4] strb r0, [r1, 0xE] - ldr r0, =sub_801F2B4 + 1 + ldr r0, =sub_801F2B4 movs r1, 0x7 bl AddTask ldr r1, [r4] @@ -43010,7 +43010,7 @@ sub_801E460: ; 801E460 .4byte @0801E584 .4byte @0801E5A8 @0801E4A4: - ldr r0, =sub_801F2B4 + 1 + ldr r0, =sub_801F2B4 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 @@ -43167,7 +43167,7 @@ sub_801E5C4: ; 801E5C4 beq @0801E650 b @0801E662 @0801E5EA: - ldr r0, =sub_801F2B4 + 1 + ldr r0, =sub_801F2B4 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 @@ -43256,7 +43256,7 @@ sub_801E668: ; 801E668 .4byte @0801E724 .4byte @0801E748 @0801E69C: - ldr r0, =sub_801F2B4 + 1 + ldr r0, =sub_801F2B4 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 @@ -43880,7 +43880,7 @@ sub_801E978: ; 801E978 bne @0801EBC2 bl sub_801F544 bl sub_801DE30 - ldr r0, =c2_exit_to_overworld_2_switch + 1 + ldr r0, =c2_exit_to_overworld_2_switch bl set_callback2 @0801EBC2: add sp, 0x4 @@ -45194,7 +45194,7 @@ sub_801F580: ; 801F580 beq @0801F5A8 movs r2, 0 adds r4, r1, 0 - ldr r5, =sub_801FDD8 + 1 + ldr r5, =sub_801FDD8 movs r3, 0 @0801F592: ldr r0, [r4] @@ -45256,7 +45256,7 @@ sub_801F5EC: ; 801F5EC ldr r0, [r3] lsrs r1, 21 adds r0, r1 - ldr r2, =sub_801FDD8 + 1 + ldr r2, =sub_801FDD8 str r2, [r0] movs r4, 0 adds r5, r3, 0 @@ -48114,7 +48114,7 @@ sub_8020C0C: ; 8020C0C str r0, [r5] adds r0, r4, 0 bl set_callback2 - ldr r0, =c2_exit_to_overworld_2_switch + 1 + ldr r0, =c2_exit_to_overworld_2_switch cmp r4, r0 bne @08020C5A ldr r2, =0x03003014 @@ -48125,7 +48125,7 @@ sub_8020C0C: ; 8020C0C movs r0, 0xC8 lsls r0, 1 bl current_map_music_set - ldr r0, =c1_overworld + 1 + ldr r0, =c1_overworld bl set_callback1 @08020C5A: movs r0, 0 @@ -48241,9 +48241,9 @@ sub_8020C70: ; 8020C70 movs r0, 0x4 movs r1, 0x1 bl sub_8022BEC - ldr r0, =sub_8020F88 + 1 + ldr r0, =sub_8020F88 bl set_callback2 - ldr r0, =sub_8020FA0 + 1 + ldr r0, =sub_8020FA0 movs r1, 0x8 bl AddTask ldr r1, [r6] @@ -48317,12 +48317,12 @@ sub_8020D8C: ; 8020D8C movs r0, 0x4 movs r1, 0x1 bl sub_8022BEC - ldr r0, =sub_8020FA0 + 1 + ldr r0, =sub_8020FA0 movs r1, 0x8 bl AddTask ldr r1, [r4] strb r0, [r1, 0xA] - ldr r0, =sub_8020F88 + 1 + ldr r0, =sub_8020F88 bl set_callback2 add sp, 0xC pop {r4} @@ -48339,7 +48339,7 @@ sub_8020E1C: ; 8020E1C ldr r0, [r0] ldrb r0, [r0, 0xA] bl remove_task - ldr r0, =sub_8020D8C + 1 + ldr r0, =sub_8020D8C bl sub_81AABF0 pop {r0} bx r0 @@ -48350,7 +48350,7 @@ sub_8020E1C: ; 8020E1C thumb_func_start sub_8020E3C sub_8020E3C: ; 8020E3C push {lr} - ldr r0, =sub_8020F74 + 1 + ldr r0, =sub_8020F74 bl SetVBlankCallback pop {r0} bx r0 @@ -49352,7 +49352,7 @@ sub_8021608: ; 8021608 ands r0, r2 cmp r1, r0 blt @0802169A - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r5, 0x1C] adds r0, r5, 0 bl obj_free_rotscale_entry @@ -49548,7 +49548,7 @@ sub_80216E0: ; 80216E0 ands r0, r1 cmp r0, 0 beq @0802187E - ldr r0, =sub_8022B28 + 1 + ldr r0, =sub_8022B28 str r0, [r2, 0x1C] lsls r1, r4, 1 ldr r3, =gUnknown_082F41D2 @@ -51074,7 +51074,7 @@ sub_8022250: ; 8022250 sub_80224D0: ; 80224D0 push {lr} bl script_env_2_enable - ldr r0, =sub_8022250 + 1 + ldr r0, =sub_8022250 movs r1, 0 bl AddTask lsls r0, 24 @@ -51742,7 +51742,7 @@ sub_8022A4C: ; 8022A4C push {r4,r5,lr} adds r3, r0, 0 movs r1, 0 - ldr r5, =nullsub_12 + 1 + ldr r5, =nullsub_12 adds r2, r3, 0 adds r2, 0x2E movs r4, 0 @@ -51844,7 +51844,7 @@ sub_8022A94: ; 8022A94 ands r0, r2 cmp r1, r0 ble @08022B1A - ldr r0, =sub_8022A4C + 1 + ldr r0, =sub_8022A4C str r0, [r5, 0x1C] @08022B1A: pop {r4-r6} @@ -51926,7 +51926,7 @@ sub_8022B28: ; 8022B28 mov r0, r8 strh r0, [r6, 0x26] strh r0, [r6, 0x24] - ldr r0, =sub_8022A94 + 1 + ldr r0, =sub_8022A94 str r0, [r6, 0x1C] adds r2, r6, 0 adds r2, 0x2C @@ -52387,7 +52387,7 @@ sub_8022F04: ; 8022F04 push {lr} movs r1, 0 str r1, [r0, 0x4] - ldr r0, =sub_8020E1C + 1 + ldr r0, =sub_8020E1C bl set_callback2 movs r0, 0 pop {r1} @@ -52627,7 +52627,7 @@ sub_8023070: ; 8023070 adds r1, r4, r2 adds r0, r1, r0 ldr r2, [r0] - ldr r0, =sub_8021608 + 1 + ldr r0, =sub_8021608 str r0, [r2, 0x1C] ldrb r0, [r3] lsls r0, 2 @@ -52654,7 +52654,7 @@ sub_8023070: ; 8023070 adds r3, r1, r0 ldr r0, [r3] ldr r1, [r0, 0x1C] - ldr r0, =sub_8021608 + 1 + ldr r0, =sub_8021608 cmp r1, r0 beq @080231AE movs r0, 0 @@ -54800,14 +54800,14 @@ sub_8024134: ; 8024134 movs r0, 0 movs r1, 0x3 bl Window_CopyToVram - ldr r0, =sub_8153688 + 1 + ldr r0, =sub_8153688 movs r1, 0 bl AddTask b @08024218 .align 2, 0 .pool @080241F0: - ldr r0, =sub_8153688 + 1 + ldr r0, =sub_8153688 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 @@ -55852,10 +55852,10 @@ sub_802493C: ; 802493C ldr r2, =0x020244ec adds r1, r2 bl sub_80261F8 - ldr r0, =sub_8024BC8 + 1 + ldr r0, =sub_8024BC8 movs r1, 0x1 bl AddTask - ldr r0, =sub_80261CC + 1 + ldr r0, =sub_80261CC bl set_callback2 bl sub_80273F0 ldr r2, [r4] @@ -56134,14 +56134,14 @@ sub_8024BC8: ; 8024BC8 @08024C10: movs r0, 0 bl SetVBlankCallback - ldr r0, =sub_8025910 + 1 + ldr r0, =sub_8025910 movs r1, 0x4 bl sub_802620C b @08024D20 .align 2, 0 .pool @08024C24: - ldr r0, =sub_8025910 + 1 + ldr r0, =sub_8025910 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 @@ -56240,7 +56240,7 @@ sub_8024BC8: ; 8024BC8 movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - ldr r0, =sub_80261E4 + 1 + ldr r0, =sub_80261E4 bl SetVBlankCallback b @08024D20 .align 2, 0 @@ -56266,7 +56266,7 @@ sub_8024BC8: ; 8024BC8 @08024D34: adds r0, r1, 0 bl remove_task - ldr r0, =sub_802589C + 1 + ldr r0, =sub_802589C bl sub_802621C @08024D40: add sp, 0x4 @@ -57664,7 +57664,7 @@ sub_8025758: ; 8025758 @0802585C: ldrb r0, [r1, 0x4] bl remove_task - ldr r0, =sub_802589C + 1 + ldr r0, =sub_802589C bl sub_802621C bl sub_802903C ldr r0, [r4] @@ -57735,13 +57735,13 @@ sub_802589C: ; 802589C ldrb r0, [r0] cmp r0, 0 beq @080258F8 - ldr r0, =sub_8024D4C + 1 + ldr r0, =sub_8024D4C bl sub_802621C b @080258FE .align 2, 0 .pool @080258F8: - ldr r0, =sub_8024D84 + 1 + ldr r0, =sub_8024D84 bl sub_802621C @080258FE: adds r0, r5, 0 @@ -62184,7 +62184,7 @@ sub_8027A5C: ; 8027A5C thumb_func_start sub_8027AAC sub_8027AAC: ; 8027AAC push {r4,lr} - ldr r4, =sub_8027ACC + 1 + ldr r4, =sub_8027ACC adds r0, r4, 0 movs r1, 0 bl AddTask @@ -63417,7 +63417,7 @@ sub_8028408: ; 8028408 str r3, [sp, 0x24] ldr r0, =gUnknown_082EC6A8 str r0, [sp, 0x28] - ldr r0, =sub_80284A8 + 1 + ldr r0, =sub_80284A8 str r0, [sp, 0x2C] mov r0, sp movs r2, 0x18 @@ -65282,14 +65282,14 @@ sub_8029274: ; 8029274 adds r1, 0xC adds r0, r1 strb r2, [r0] - ldr r0, =sub_8029314 + 1 + ldr r0, =sub_8029314 movs r1, 0x3 bl AddTask ldr r1, [r4] ldr r2, =0x00003004 adds r1, r2 strb r0, [r1] - ldr r0, =sub_8029338 + 1 + ldr r0, =sub_8029338 bl sub_802A72C pop {r4} pop {r0} @@ -67185,14 +67185,14 @@ sub_802A380: ; 802A380 lsls r0, 24 cmp r0, 0 bne @0802A448 - ldr r0, =sub_8153688 + 1 + ldr r0, =sub_8153688 movs r1, 0 bl AddTask b @0802A410 .align 2, 0 .pool @0802A404: - ldr r0, =sub_8153688 + 1 + ldr r0, =sub_8153688 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 @@ -67899,7 +67899,7 @@ sub_802A9A8: ; 802A9A8 cmp r0, 0 beq @0802AA3C bl clear_tasks - ldr r0, =sub_802ACA0 + 1 + ldr r0, =sub_802ACA0 movs r1, 0x1 bl AddTask adds r4, r0, 0 @@ -67932,7 +67932,7 @@ sub_802A9A8: ; 802A9A8 adds r0, r4, 0 movs r1, 0x2 bl set_word_task_arg - ldr r0, =sub_802AC6C + 1 + ldr r0, =sub_802AC6C bl set_callback2 b @0802AA42 .align 2, 0 @@ -68281,7 +68281,7 @@ sub_802ACA0: ; 802ACA0 bl SetVBlankCallback bl reset_all_obj_data bl gpu_pal_allocator_reset - ldr r0, =sub_802BD84 + 1 + ldr r0, =sub_802BD84 movs r1, 0x5 bl sub_802BE60 movs r0, 0x4 @@ -68292,7 +68292,7 @@ sub_802ACA0: ; 802ACA0 .align 2, 0 .pool @0802AD0C: - ldr r0, =sub_802BD84 + 1 + ldr r0, =sub_802BD84 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 @@ -68344,7 +68344,7 @@ sub_802ACA0: ; 802ACA0 movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - ldr r0, =sub_802AC58 + 1 + ldr r0, =sub_802AC58 bl SetVBlankCallback ldr r0, =0x02022cfc ldr r1, [r0] @@ -68386,13 +68386,13 @@ sub_802ACA0: ; 802ACA0 ldrb r0, [r0] cmp r0, 0 beq @0802ADF8 - ldr r0, =sub_802AF80 + 1 + ldr r0, =sub_802AF80 bl sub_802AC84 b @0802ADFE .align 2, 0 .pool @0802ADF8: - ldr r0, =sub_802B194 + 1 + ldr r0, =sub_802B194 bl sub_802AC84 @0802ADFE: bl sub_802BE80 @@ -69671,14 +69671,14 @@ sub_802B720: ; 802B720 bl sub_802C70C cmp r0, 0 beq @0802B7D8 - ldr r0, =sub_8153688 + 1 + ldr r0, =sub_8153688 movs r1, 0x6 bl AddTask b @0802B7A8 .align 2, 0 .pool @0802B798: - ldr r0, =sub_8153688 + 1 + ldr r0, =sub_8153688 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 @@ -72311,7 +72311,7 @@ sub_802CB14: ; 802CB14 movs r0, 0x60 strh r0, [r1, 0x22] ldr r0, [r5] - ldr r1, =sub_802CB7C + 1 + ldr r1, =sub_802CB7C str r1, [r0, 0x1C] movs r1, 0x1 bl obj_anim_image_start @@ -72380,7 +72380,7 @@ sub_802CB7C: ; 802CB7C movs r1, 0x4 orrs r0, r1 strb r0, [r3] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r2, 0x1C] @0802CBE6: pop {r0} @@ -72397,7 +72397,7 @@ sub_802CBF0: ; 802CBF0 adds r0, r2 adds r0, r1 ldr r2, [r0] - ldr r1, =sub_802CC40 + 1 + ldr r1, =sub_802CC40 str r1, [r2, 0x1C] movs r1, 0 strh r1, [r2, 0x26] @@ -72419,7 +72419,7 @@ sub_802CC18: ; 802CC18 adds r0, r1 ldr r0, [r0] ldr r1, [r0, 0x1C] - ldr r0, =sub_802CC40 + 1 + ldr r0, =sub_802CC40 cmp r1, r0 bne @0802CC30 movs r2, 0x1 @@ -72464,7 +72464,7 @@ sub_802CC40: ; 802CC40 ble @0802CC7C movs r0, 0 strh r0, [r2, 0x26] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r2, 0x1C] @0802CC7C: pop {r0} @@ -72484,7 +72484,7 @@ sub_802CC88: ; 802CC88 ldr r0, [r4] bl sub_802C9BC ldr r1, [r4] - ldr r0, =sub_802CD08 + 1 + ldr r0, =sub_802CD08 str r0, [r1, 0x1C] pop {r4} pop {r0} @@ -72507,8 +72507,8 @@ sub_802CCB0: ; 802CCB0 mov r12, r1 ldr r1, =0x000081a8 adds r3, r4, r1 - ldr r7, =sub_802CD08 + 1 - ldr r6, =nullsub_12 + 1 + ldr r7, =sub_802CD08 + ldr r6, =nullsub_12 movs r5, 0xA adds r4, r0, 0 @0802CCD2: @@ -72610,7 +72610,7 @@ sub_802CD70: ; 802CD70 ldr r0, [r4] bl sub_802C9BC ldr r1, [r4] - ldr r0, =sub_802CDD4 + 1 + ldr r0, =sub_802CDD4 str r0, [r1, 0x1C] pop {r4} pop {r0} @@ -72629,7 +72629,7 @@ sub_802CD98: ; 802CD98 movs r2, 0 cmp r2, r3 bge @0802CDCC - ldr r5, =sub_802CDD4 + 1 + ldr r5, =sub_802CDD4 ldr r0, =0x000081a8 adds r1, r4, r0 @0802CDB0: @@ -72709,7 +72709,7 @@ sub_802CDD4: ; 802CDD4 .align 2, 0 .pool @0802CE38: - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r5, 0x1C] @0802CE3C: pop {r4,r5} @@ -73005,7 +73005,7 @@ sub_802D074: ; 802D074 ldr r4, =0x02022d00 str r0, [r4] bl sub_802D0BC - ldr r0, =sub_802D12C + 1 + ldr r0, =sub_802D12C movs r1, 0x3 bl AddTask ldr r1, [r4] @@ -73014,7 +73014,7 @@ sub_802D074: ; 802D074 ldrb r0, [r2, 0x6] movs r1, 0x2 bl set_word_task_arg - ldr r0, =sub_802D150 + 1 + ldr r0, =sub_802D150 bl sub_802D108 pop {r4} pop {r0} @@ -75000,7 +75000,7 @@ sub_802E00C: ; 802E00C bl bg_change_y_offset movs r0, 0x1 bl gpu_sync_bg_show - ldr r0, =sub_802E090 + 1 + ldr r0, =sub_802E090 movs r1, 0x4 bl AddTask pop {r4} @@ -75499,7 +75499,7 @@ sub_802E3A8: ; 802E3A8 thumb_func_start sub_802E3C4 sub_802E3C4: ; 802E3C4 push {r4,lr} - ldr r4, =sub_802E3E4 + 1 + ldr r4, =sub_802E3E4 adds r0, r4, 0 movs r1, 0 bl AddTask @@ -75808,7 +75808,7 @@ sub_802E63C: ; 802E63C lsrs r5, 24 lsls r1, 24 lsrs r1, 24 - ldr r0, =sub_802E6D0 + 1 + ldr r0, =sub_802E6D0 bl AddTask adds r4, r0, 0 lsls r4, 24 @@ -75838,7 +75838,7 @@ sub_802E63C: ; 802E63C thumb_func_start sub_802E688 sub_802E688: ; 802E688 push {lr} - ldr r0, =sub_802E6D0 + 1 + ldr r0, =sub_802E6D0 bl get_task_id_by_function lsls r0, 24 lsrs r2, r0, 24 @@ -75865,7 +75865,7 @@ sub_802E688: ; 802E688 thumb_func_start sub_802E6BC sub_802E6BC: ; 802E6BC push {lr} - ldr r0, =sub_802E6D0 + 1 + ldr r0, =sub_802E6D0 bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 @@ -76338,7 +76338,7 @@ sub_802EA50: ; 802EA50 adds r1, r2, 0 adds r1, 0x1C adds r0, r1 - ldr r1, =sub_802E938 + 1 + ldr r1, =sub_802E938 str r1, [r0] movs r0, 0x1A ldrsh r1, [r6, r0] @@ -76439,7 +76439,7 @@ sub_802EB24: ; 802EB24 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r0, =sub_802EB98 + 1 + ldr r0, =sub_802EB98 movs r1, 0x50 str r3, [sp] bl AddTask @@ -76470,7 +76470,7 @@ sub_802EB24: ; 802EB24 thumb_func_start sub_802EB84 sub_802EB84: ; 802EB84 push {lr} - ldr r0, =sub_802EB98 + 1 + ldr r0, =sub_802EB98 bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 @@ -76801,7 +76801,7 @@ sub_802EDCC: ; 802EDCC movs r0, 0x1C add r8, r0 add r4, r8 - ldr r0, =sub_802EE5C + 1 + ldr r0, =sub_802EE5C str r0, [r4] add r3, r8 str r0, [r3] @@ -76827,7 +76827,7 @@ sub_802EE30: ; 802EE30 adds r2, 0x1C adds r1, r2 ldr r1, [r1] - ldr r0, =sub_802EE5C + 1 + ldr r0, =sub_802EE5C cmp r1, r0 bne @0802EE4E movs r3, 0x1 @@ -76957,7 +76957,7 @@ sub_802EE5C: ; 802EE5C asrs r0, 16 cmp r0, 0x28 ble @0802EF46 - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r5, 0x1C] @0802EF46: pop {r4,r5} @@ -78149,9 +78149,9 @@ init_title_menu: ; 802F6F4 bl lcd_io_set movs r0, 0x1 bl enable_irqs - ldr r0, =sub_802F6C8 + 1 + ldr r0, =sub_802F6C8 bl SetVBlankCallback - ldr r0, =c2_title_menu_3 + 1 + ldr r0, =c2_title_menu_3 bl set_callback2 movs r1, 0xC1 lsls r1, 6 @@ -78161,7 +78161,7 @@ init_title_menu: ; 802F6F4 bl gpu_sync_bg_show movs r0, 0x1 bl gpu_sync_bg_hide - ldr r0, =task_init_title_menu_graphics + 1 + ldr r0, =task_init_title_menu_graphics movs r1, 0 bl AddTask movs r0, 0 @@ -78256,7 +78256,7 @@ task_init_title_menu_graphics: ; 802F8D8 mov r0, r8 subs r0, 0x8 adds r0, r7, r0 - ldr r1, =task_init_title_menu_graphics_2 + 1 + ldr r1, =task_init_title_menu_graphics_2 b @0802F9FC .align 2, 0 .pool @@ -78276,7 +78276,7 @@ task_init_title_menu_graphics: ; 802F8D8 mov r0, r8 subs r0, 0x8 adds r0, r7, r0 - ldr r1, =task_init_title_menu_save_file_corrupt + 1 + ldr r1, =task_init_title_menu_save_file_corrupt str r1, [r0] movs r0, 0x1 strh r0, [r4] @@ -78297,7 +78297,7 @@ task_init_title_menu_graphics: ; 802F8D8 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, =task_init_title_menu_graphics_2 + 1 + ldr r1, =task_init_title_menu_graphics_2 b @0802F9FC .align 2, 0 .pool @@ -78309,7 +78309,7 @@ task_init_title_menu_graphics: ; 802F8D8 adds r0, r7, r0 strh r5, [r0, 0x8] @0802F9FA: - ldr r1, =task_init_title_menu_save_file_corrupt + 1 + ldr r1, =task_init_title_menu_save_file_corrupt @0802F9FC: str r1, [r0] @0802F9FE: @@ -78389,7 +78389,7 @@ task_init_title_menu_save_file_corrupt: ; 802FA5C adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =task_init_title_menu_graphics_2 + 1 + ldr r1, =task_init_title_menu_graphics_2 str r1, [r0] @0802FA98: pop {r4} @@ -78443,7 +78443,7 @@ task_init_title_menu_graphics_2: ; 802FAB0 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =task_init_title_menu_graphics_3 + 1 + ldr r0, =task_init_title_menu_graphics_3 str r0, [r1] b @0802FB3C .align 2, 0 @@ -78456,7 +78456,7 @@ task_init_title_menu_graphics_2: ; 802FAB0 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, =task_init_title_menu_battery_dry + 1 + ldr r1, =task_init_title_menu_battery_dry str r1, [r0] @0802FB3C: pop {r4,r5} @@ -78492,7 +78492,7 @@ task_init_title_menu_battery_dry: ; 802FB50 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =task_init_title_menu_graphics_3 + 1 + ldr r1, =task_init_title_menu_graphics_3 str r1, [r0] @0802FB8C: pop {r4} @@ -78957,7 +78957,7 @@ task_init_title_menu_graphics_3: ; 802FBA4 adds r0, r1 lsls r0, 3 add r0, r8 - ldr r1, =sub_81AF59C + 1 + ldr r1, =sub_81AF59C str r1, [r0] ldrh r0, [r4] cmp r0, 0x4 @@ -78988,7 +78988,7 @@ task_init_title_menu_graphics_3: ; 802FBA4 adds r1, r2, r7 lsls r1, 3 adds r1, r0 - ldr r0, =task_title_menu_highlight_selected_menu_items + 1 + ldr r0, =task_title_menu_highlight_selected_menu_items str r0, [r1] @0803006C: add sp, 0x10 @@ -79018,7 +79018,7 @@ task_title_menu_highlight_selected_menu_items: ; 80300B0 movs r3, 0x24 ldrsh r2, [r4, r3] bl title_menu_highlight_selected_menu_items - ldr r0, =task_title_menu_handle_input + 1 + ldr r0, =task_title_menu_handle_input str r0, [r4] pop {r4} pop {r0} @@ -79057,7 +79057,7 @@ title_menu_handle_input: ; 80300E0 adds r0, r7, 0 subs r0, 0x8 adds r0, r4, r0 - ldr r1, =title_menu_handle_keypad_a_pressed + 1 + ldr r1, =title_menu_handle_keypad_a_pressed str r1, [r0] b @08030240 .align 2, 0 @@ -79088,7 +79088,7 @@ title_menu_handle_input: ; 80300E0 adds r0, r7, 0 subs r0, 0x8 adds r0, r4, r0 - ldr r1, =sub_8030544 + 1 + ldr r1, =sub_8030544 str r1, [r0] b @08030240 .align 2, 0 @@ -79215,7 +79215,7 @@ task_title_menu_handle_input: ; 803024C adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =task_title_menu_highlight_selected_menu_items + 1 + ldr r0, =task_title_menu_highlight_selected_menu_items str r0, [r1] @0803026C: pop {r4} @@ -79438,7 +79438,7 @@ title_menu_handle_keypad_a_pressed: ; 803027C adds r0, r7, r6 lsls r0, 3 adds r0, r1 - ldr r1, =task_new_game_prof_birch_speech_1 + 1 + ldr r1, =task_new_game_prof_birch_speech_1 str r1, [r0] b @08030514 .align 2, 0 @@ -79449,30 +79449,30 @@ title_menu_handle_keypad_a_pressed: ; 803027C strh r1, [r0] ldr r0, =0x02037b14 strh r1, [r0] - ldr r0, =sub_8086230 + 1 + ldr r0, =sub_8086230 b @0803048A .align 2, 0 .pool @08030460: ldr r0, =0x030022c0 - ldr r1, =c2_title_menu_2_dupe + 1 + ldr r1, =c2_title_menu_2_dupe str r1, [r0, 0x8] - ldr r0, =c2_options_menu + 1 + ldr r0, =c2_options_menu b @0803048A .align 2, 0 .pool @08030478: - ldr r0, =c2_mystery_gift + 1 + ldr r0, =c2_mystery_gift b @0803048A .align 2, 0 .pool @08030480: - ldr r0, =sub_8178974 + 1 + ldr r0, =sub_8178974 b @0803048A .align 2, 0 .pool @08030488: - ldr r0, =sub_801867C + 1 + ldr r0, =sub_801867C @0803048A: bl set_callback2 adds r0, r6, 0 @@ -79487,7 +79487,7 @@ title_menu_handle_keypad_a_pressed: ; 803027C adds r0, r1 movs r4, 0 strh r4, [r0, 0xA] - ldr r1, =sub_80305A4 + 1 + ldr r1, =sub_80305A4 str r1, [r0] ldr r0, =0x02037714 movs r2, 0xF1 @@ -79584,7 +79584,7 @@ sub_8030544: ; 8030544 ldr r0, =0x02022d06 strh r4, [r0] bl Window_FreeMemory - ldr r0, =c2_title_screen_1 + 1 + ldr r0, =c2_title_screen_1 bl set_callback2 adds r0, r5, 0 bl remove_task @@ -79709,7 +79709,7 @@ sub_80305A4: ; 80305A4 movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, =sub_8030544 + 1 + ldr r0, =sub_8030544 str r0, [r4] @08030688: add sp, 0x8 @@ -79948,7 +79948,7 @@ task_new_game_prof_birch_speech_1: ; 80307B0 lsls r0, 3 adds r0, r1 strh r5, [r0, 0x10] - ldr r1, =task_new_game_prof_birch_speech_2 + 1 + ldr r1, =task_new_game_prof_birch_speech_2 str r1, [r0] movs r1, 0xFF strh r1, [r0, 0xC] @@ -80022,7 +80022,7 @@ task_new_game_prof_birch_speech_2: ; 80308B0 bl sub_8031D34 movs r0, 0x50 strh r0, [r4, 0x16] - ldr r0, =task_new_game_prof_birch_speech_3 + 1 + ldr r0, =task_new_game_prof_birch_speech_3 str r0, [r4] @0803091A: pop {r4,r5} @@ -80094,7 +80094,7 @@ task_new_game_prof_birch_speech_3: ; 8030928 bl ExpandTextCodes movs r0, 0x1 bl get_map_name - ldr r0, =task_new_game_prof_birch_speech_4 + 1 + ldr r0, =task_new_game_prof_birch_speech_4 str r0, [r4] @080309B6: pop {r4} @@ -80124,12 +80124,12 @@ task_new_game_prof_birch_speech_4: ; 80309CC adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =task_new_game_prof_birch_speech_5 + 1 + ldr r1, =task_new_game_prof_birch_speech_5 str r1, [r0] ldr r0, =0x02021fc4 ldr r1, =gUnknown_085E8692 bl ExpandTextCodes - ldr r1, =sub_80323A0 + 1 + ldr r1, =sub_80323A0 movs r0, 0x1 bl sub_8197A9C ldr r0, =0x03000dd0 @@ -80161,7 +80161,7 @@ task_new_game_prof_birch_speech_5: ; 8030A2C adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =task_new_game_prof_birch_speech_6 + 1 + ldr r1, =task_new_game_prof_birch_speech_6 str r1, [r0] @08030A58: pop {r4} @@ -80226,7 +80226,7 @@ sub_8030A70: ; 8030A70 adds r0, r4 lsls r0, 3 adds r0, r6 - ldr r1, =sub_8030B14 + 1 + ldr r1, =sub_8030B14 str r1, [r0] mov r0, r8 ldrb r1, [r0] @@ -80285,7 +80285,7 @@ sub_8030B14: ; 8030B14 .pool @08030B64: ldr r1, [r3, 0x1C] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 bne @08030BBA ldrb r1, [r3, 0x1] @@ -80361,7 +80361,7 @@ task_new_game_prof_birch_speech_6: ; 8030BCC adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =task_new_game_prof_birch_speech_7 + 1 + ldr r1, =task_new_game_prof_birch_speech_7 str r1, [r0] @08030BFE: pop {r4} @@ -80418,7 +80418,7 @@ task_new_game_prof_birch_speech_7: ; 8030C18 bl sub_8031C88 movs r0, 0x40 strh r0, [r4, 0x16] - ldr r0, =task_new_game_prof_birch_speech_8 + 1 + ldr r0, =task_new_game_prof_birch_speech_8 str r0, [r4] @08030C7C: pop {r4-r6} @@ -80456,7 +80456,7 @@ task_new_game_prof_birch_speech_8: ; 8030C90 @08030CC0: ldr r0, =0x0000ffc4 strh r0, [r2, 0x10] - ldr r0, =task_new_game_prof_birch_speech_9 + 1 + ldr r0, =task_new_game_prof_birch_speech_9 str r0, [r2] @08030CC8: pop {r0} @@ -80544,7 +80544,7 @@ task_new_game_prof_birch_speech_9: ; 8030CD4 adds r0, r5, 0 movs r1, 0x1 bl sub_8031D34 - ldr r0, =task_new_game_prof_birch_speech_10 + 1 + ldr r0, =task_new_game_prof_birch_speech_10 str r0, [r4] @08030D7A: pop {r4-r7} @@ -80580,7 +80580,7 @@ task_new_game_prof_birch_speech_10: ; 8030D84 negs r0, r0 ands r0, r2 strb r0, [r1, 0x1] - ldr r0, =task_new_game_prof_birch_speech_11 + 1 + ldr r0, =task_new_game_prof_birch_speech_11 str r0, [r3] @08030DB8: pop {r0} @@ -80607,7 +80607,7 @@ task_new_game_prof_birch_speech_11: ; 8030DC8 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =task_new_game_prof_birch_speech_12 + 1 + ldr r1, =task_new_game_prof_birch_speech_12 str r1, [r0] pop {r4} pop {r0} @@ -80631,7 +80631,7 @@ task_new_game_prof_birch_speech_12: ; 8030E08 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =task_new_game_prof_birch_speech_13 + 1 + ldr r0, =task_new_game_prof_birch_speech_13 str r0, [r1] @08030E2A: pop {r4} @@ -80669,7 +80669,7 @@ task_new_game_prof_birch_speech_13: ; 8030E38 adds r0, r2, r5 lsls r0, 3 adds r0, r1 - ldr r1, =task_new_game_prof_birch_speech_14 + 1 + ldr r1, =task_new_game_prof_birch_speech_14 str r1, [r0] adds r4, r2, 0 @08030E76: @@ -80702,7 +80702,7 @@ task_new_game_prof_birch_speech_13: ; 8030E38 adds r0, r5, 0 movs r1, 0 bl sub_8031ACC - ldr r0, =sub_8030ED4 + 1 + ldr r0, =sub_8030ED4 str r0, [r4] @08030EB8: pop {r4,r5} @@ -80790,7 +80790,7 @@ sub_8030ED4: ; 8030ED4 adds r0, r6, 0 movs r1, 0 bl sub_8031BAC - ldr r0, =sub_8030F7C + 1 + ldr r0, =sub_8030F7C str r0, [r4] @08030F72: pop {r4-r7} @@ -80838,7 +80838,7 @@ sub_8030F7C: ; 8030F7C negs r1, r1 ands r1, r0 strb r1, [r2, 0x1] - ldr r0, =task_new_game_prof_birch_speech_13 + 1 + ldr r0, =task_new_game_prof_birch_speech_13 str r0, [r3] @08030FCA: pop {r4} @@ -80866,7 +80866,7 @@ task_new_game_prof_birch_speech_14: ; 8030FD4 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =task_new_game_prof_birch_speech_15 + 1 + ldr r1, =task_new_game_prof_birch_speech_15 str r1, [r0] pop {r4} pop {r0} @@ -80889,7 +80889,7 @@ task_new_game_prof_birch_speech_15: ; 8031014 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =task_new_game_prof_birch_speech_16 + 1 + ldr r0, =task_new_game_prof_birch_speech_16 str r0, [r1] @08031032: pop {r4} @@ -80928,7 +80928,7 @@ task_new_game_prof_birch_speech_16: ; 8031040 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =task_new_game_prof_birch_speech_17 + 1 + ldr r1, =task_new_game_prof_birch_speech_17 str r1, [r0] @0803107A: add sp, 0x4 @@ -80975,7 +80975,7 @@ task_new_game_prof_birch_speech_17: ; 8031090 ldr r1, [r0] ldrb r2, [r1, 0x8] str r5, [sp] - ldr r0, =new_game_prof_birch_speech_part2_start + 1 + ldr r0, =new_game_prof_birch_speech_part2_start str r0, [sp, 0x4] movs r0, 0 movs r3, 0 @@ -81007,7 +81007,7 @@ task_new_game_prof_birch_speech_part2_2: ; 8031104 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =task_new_game_prof_birch_speech_part2_3 + 1 + ldr r1, =task_new_game_prof_birch_speech_part2_3 str r1, [r0] pop {r4} pop {r0} @@ -81040,7 +81040,7 @@ task_new_game_prof_birch_speech_part2_3: ; 8031144 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =task_new_game_prof_birch_speech_part2_4 + 1 + ldr r1, =task_new_game_prof_birch_speech_part2_4 str r1, [r0] @08031178: add sp, 0x8 @@ -81100,7 +81100,7 @@ task_new_game_prof_birch_speech_part2_4: ; 8031188 adds r0, r5, 0 movs r1, 0x1 bl sub_8031C88 - ldr r0, =task_new_game_prof_birch_speech_part2_5 + 1 + ldr r0, =task_new_game_prof_birch_speech_part2_5 str r0, [r4] b @08031210 .align 2, 0 @@ -81113,7 +81113,7 @@ task_new_game_prof_birch_speech_part2_4: ; 8031188 adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, =task_new_game_prof_birch_speech_11 + 1 + ldr r0, =task_new_game_prof_birch_speech_11 str r0, [r1] @08031210: pop {r4,r5} @@ -81147,7 +81147,7 @@ task_new_game_prof_birch_speech_part2_5: ; 8031220 .align 2, 0 .pool @0803124C: - ldr r0, =task_new_game_prof_birch_speech_part2_6 + 1 + ldr r0, =task_new_game_prof_birch_speech_part2_6 str r0, [r1] @08031250: pop {r0} @@ -81251,7 +81251,7 @@ task_new_game_prof_birch_speech_part2_6: ; 8031258 bl ExpandTextCodes movs r0, 0x1 bl get_map_name - ldr r0, =task_new_game_prof_birch_speech_part2_7 + 1 + ldr r0, =task_new_game_prof_birch_speech_part2_7 str r0, [r7] @08031320: pop {r4-r7} @@ -81333,7 +81333,7 @@ task_new_game_prof_birch_speech_part2_7: ; 803133C bl sub_8031C88 movs r0, 0x40 strh r0, [r4, 0x16] - ldr r0, =task_new_game_prof_birch_speech_part2_8 + 1 + ldr r0, =task_new_game_prof_birch_speech_part2_8 str r0, [r4] @080313D2: pop {r4-r7} @@ -81440,7 +81440,7 @@ task_new_game_prof_birch_speech_part2_8: ; 80313E4 bl ExpandTextCodes movs r0, 0x1 bl get_map_name - ldr r0, =task_new_game_prof_birch_speech_part2_9 + 1 + ldr r0, =task_new_game_prof_birch_speech_part2_9 str r0, [r4] @080314B0: pop {r4-r7} @@ -81510,7 +81510,7 @@ task_new_game_prof_birch_speech_part2_9: ; 80314C4 adds r0, r7, 0 adds r0, 0x1C adds r4, r0 - ldr r0, =sub_80318D8 + 1 + ldr r0, =sub_80318D8 str r0, [r4] ldr r0, =0x0000ffff mov r1, r8 @@ -81521,7 +81521,7 @@ task_new_game_prof_birch_speech_part2_9: ; 80314C4 bl sub_80A1AD4 movs r0, 0x4 bl play_sound_effect - ldr r0, =task_new_game_prof_birch_speech_part2_10 + 1 + ldr r0, =task_new_game_prof_birch_speech_part2_10 str r0, [r6] @0803155C: add sp, 0x4 @@ -81555,7 +81555,7 @@ task_new_game_prof_birch_speech_part2_10: ; 8031580 lsls r0, 26 cmp r0, 0 bge @080315AA - ldr r0, =task_new_game_prof_birch_speech_part2_11 + 1 + ldr r0, =task_new_game_prof_birch_speech_part2_11 str r0, [r3] @080315AA: pop {r0} @@ -81588,7 +81588,7 @@ task_new_game_prof_birch_speech_part2_11: ; 80315BC lsls r0, 2 adds r1, 0x1C adds r0, r1 - ldr r1, =nullsub_11 + 1 + ldr r1, =nullsub_11 str r1, [r0] movs r1, 0x82 lsls r1, 5 @@ -81601,7 +81601,7 @@ task_new_game_prof_birch_speech_part2_11: ; 80315BC movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, =task_new_game_prof_birch_speech_part2_12 + 1 + ldr r0, =task_new_game_prof_birch_speech_part2_12 str r0, [r4] @0803160A: add sp, 0x4 @@ -81632,7 +81632,7 @@ task_new_game_prof_birch_speech_part2_12: ; 8031630 ldrh r0, [r0, 0x1A] bl sub_818D820 bl dp13_810BB8C - ldr r0, =c2_new_game + 1 + ldr r0, =c2_new_game bl set_callback2 adds r0, r4, 0 bl remove_task @@ -81738,7 +81738,7 @@ new_game_prof_birch_speech_part2_start: ; 8031678 movs r2, 0x10 bl gpu_pal_apply bl clear_tasks - ldr r0, =task_new_game_prof_birch_speech_part2_1 + 1 + ldr r0, =task_new_game_prof_birch_speech_part2_1 movs r1, 0 bl AddTask lsls r0, 24 @@ -81838,9 +81838,9 @@ new_game_prof_birch_speech_part2_start: ; 8031678 orrs r0, r1 strh r0, [r4] strh r2, [r3] - ldr r0, =sub_802F6C8 + 1 + ldr r0, =sub_802F6C8 bl SetVBlankCallback - ldr r0, =c2_title_menu_3 + 1 + ldr r0, =c2_title_menu_3 bl set_callback2 ldr r0, =gUnknown_082FF080 bl Window_InitFromTemplates @@ -81941,7 +81941,7 @@ sub_803192C: ; 803192C add r3, r9 mov r8, r3 adds r1, r2, r3 - ldr r7, =nullsub_11 + 1 + ldr r7, =nullsub_11 str r7, [r1] add r2, r9 ldrb r3, [r2, 0x5] @@ -82147,7 +82147,7 @@ sub_8031ACC: ; 8031ACC add r0, r8 movs r6, 0 strh r6, [r0, 0x12] - ldr r0, =waterfall_4_check_if_can_continue + 1 + ldr r0, =waterfall_4_check_if_can_continue movs r1, 0 bl AddTask lsls r0, 24 @@ -82260,7 +82260,7 @@ sub_8031BAC: ; 8031BAC add r0, r8 movs r6, 0 strh r6, [r0, 0x12] - ldr r0, =sub_8031B3C + 1 + ldr r0, =sub_8031B3C movs r1, 0 bl AddTask lsls r0, 24 @@ -82352,7 +82352,7 @@ sub_8031C88: ; 8031C88 lsrs r4, 24 lsls r5, 24 lsrs r5, 24 - ldr r0, =sub_8031C1C + 1 + ldr r0, =sub_8031C1C movs r1, 0 bl AddTask lsls r0, 24 @@ -82444,7 +82444,7 @@ sub_8031D34: ; 8031D34 lsrs r4, 24 lsls r5, 24 lsrs r5, 24 - ldr r0, =sub_8031CC8 + 1 + ldr r0, =sub_8031CC8 movs r1, 0 bl AddTask lsls r0, 24 @@ -83129,7 +83129,7 @@ sub_80322E0: ; 80322E0 lsrs r5, r0, 24 lsls r4, 24 lsrs r4, 24 - ldr r1, =sub_8032298 + 1 + ldr r1, =sub_8032298 adds r0, r5, 0 bl CallWindowFunction adds r0, r5, 0 @@ -83229,7 +83229,7 @@ sub_80323A0: ; 80323A0 bne @080323C0 movs r0, 0x1 strb r0, [r1] - ldr r0, =sub_8030A70 + 1 + ldr r0, =sub_8030A70 movs r1, 0 bl AddTask @080323C0: @@ -83304,7 +83304,7 @@ unknown_rbox_to_vram: ; 803243C lsrs r5, r0, 24 lsls r4, 24 lsrs r4, 24 - ldr r1, =sub_8032474 + 1 + ldr r1, =sub_8032474 adds r0, r5, 0 bl CallWindowFunction adds r0, r5, 0 @@ -83535,7 +83535,7 @@ task_new_game_prof_birch_speech_part2_1: ; 803261C movs r0, 0 movs r1, 0x1 bl unknown_rbox_to_vram - ldr r0, =task_new_game_prof_birch_speech_part2_2 + 1 + ldr r0, =task_new_game_prof_birch_speech_part2_2 str r0, [r4] @08032644: pop {r4} @@ -83566,7 +83566,7 @@ battle_wireless_setup_if_required_maybe: ; 8032654 bne @0803267A bl sub_8009734 @0803267A: - ldr r0, =task00_08081A90 + 1 + ldr r0, =task00_08081A90 movs r1, 0 bl AddTask bl sub_8033244 @@ -83582,7 +83582,7 @@ sub_803269C: ; 803269C push {r4-r7,lr} sub sp, 0x14 ldr r0, =0x03005d04 - ldr r1, =nullsub_20 + 1 + ldr r1, =nullsub_20 str r1, [r0] movs r0, 0 str r0, [sp, 0x10] @@ -83591,7 +83591,7 @@ sub_803269C: ; 803269C ldr r6, =0x020244ac movs r2, 0 ldr r5, =0x020244b0 - ldr r4, =nullsub_21 + 1 + ldr r4, =nullsub_21 ldr r3, =0x02024076 @080326B8: lsls r0, r1, 2 @@ -83767,7 +83767,7 @@ b_setup_bx: ; 8032824 cmp r5, 0 beq @080328E4 ldr r1, =0x03005d04 - ldr r0, =sub_8039ECC + 1 + ldr r0, =sub_8039ECC str r0, [r1] movs r4, 0x80 lsls r4, 17 @@ -83775,7 +83775,7 @@ b_setup_bx: ; 8032824 cmp r4, 0 beq @08032874 ldr r2, =0x03005d60 - ldr r0, =sub_818994C + 1 + ldr r0, =sub_818994C str r0, [r2] ldr r1, =0x02024076 movs r0, 0 @@ -83785,16 +83785,16 @@ b_setup_bx: ; 8032824 .pool @08032874: ldr r2, =0x03005d60 - ldr r0, =sub_805745C + 1 + ldr r0, =sub_805745C str r0, [r2] ldr r1, =0x02024076 strb r4, [r1] @0803287E: - ldr r3, =sub_805F164 + 1 + ldr r3, =sub_805F164 str r3, [r2, 0x4] movs r0, 0x1 strb r0, [r1, 0x1] - ldr r0, =sub_81BADF4 + 1 + ldr r0, =sub_81BADF4 str r0, [r2, 0x8] movs r0, 0x2 strb r0, [r1, 0x2] @@ -83833,7 +83833,7 @@ b_setup_bx: ; 8032824 b @080329E0 @080328F0: ldr r0, =0x03005d04 - ldr r2, =sub_8039ECC + 1 + ldr r2, =sub_8039ECC str r2, [r0] movs r1, 0x80 ands r1, r3 @@ -83841,7 +83841,7 @@ b_setup_bx: ; 8032824 cmp r1, 0 beq @08032918 ldr r1, =0x03005d60 - ldr r0, =sub_815936C + 1 + ldr r0, =sub_815936C b @08032934 .align 2, 0 .pool @@ -83852,13 +83852,13 @@ b_setup_bx: ; 8032824 cmp r3, 0 beq @08032930 ldr r1, =0x03005d60 - ldr r0, =bx_goto_buffer_A_ch0_tbl3 + 1 + ldr r0, =bx_goto_buffer_A_ch0_tbl3 b @08032934 .align 2, 0 .pool @08032930: ldr r1, =0x03005d60 - ldr r0, =sub_805745C + 1 + ldr r0, =sub_805745C @08032934: str r0, [r1] mov r10, r1 @@ -83868,7 +83868,7 @@ b_setup_bx: ; 8032824 mov r1, r9 strb r1, [r4] mov r5, r10 - ldr r2, =sub_805F164 + 1 + ldr r2, =sub_805F164 mov r8, r2 str r2, [r5, 0x4] movs r6, 0x1 @@ -83898,11 +83898,11 @@ b_setup_bx: ; 8032824 mov r1, r12 ldr r0, =0x03005d04 str r1, [r0] - ldr r0, =sub_818994C + 1 + ldr r0, =sub_818994C str r0, [r5] mov r1, r9 strb r1, [r4] - ldr r0, =sub_81864EC + 1 + ldr r0, =sub_81864EC str r0, [r5, 0x4] strb r6, [r4, 0x1] strb r7, [r2] @@ -83910,10 +83910,10 @@ b_setup_bx: ; 8032824 .align 2, 0 .pool @080329B4: - ldr r0, =sub_818994C + 1 + ldr r0, =sub_818994C str r0, [r5, 0x4] strb r1, [r4, 0x1] - ldr r0, =sub_81864EC + 1 + ldr r0, =sub_81864EC str r0, [r5] strb r6, [r4] strb r7, [r2] @@ -83921,7 +83921,7 @@ b_setup_bx: ; 8032824 .align 2, 0 .pool @080329CC: - ldr r0, =sub_818994C + 1 + ldr r0, =sub_818994C mov r2, r10 str r0, [r2] strb r1, [r4] @@ -83932,15 +83932,15 @@ b_setup_bx: ; 8032824 .align 2, 0 .pool @080329E0: - ldr r1, =sub_8039ECC + 1 + ldr r1, =sub_8039ECC ldr r2, =0x03005d04 str r1, [r2] ldr r2, =0x03005d60 - ldr r0, =sub_805745C + 1 + ldr r0, =sub_805745C str r0, [r2] ldr r4, =0x02024076 strb r5, [r4] - ldr r6, =sub_805F164 + 1 + ldr r6, =sub_805F164 str r6, [r2, 0x4] strb r7, [r4, 0x1] str r0, [r2, 0x8] @@ -83971,10 +83971,10 @@ b_setup_bx: ; 8032824 ands r0, r1 cmp r0, r1 bne @08032AA0 - ldr r0, =sub_8039ECC + 1 + ldr r0, =sub_8039ECC ldr r1, =0x03005d04 str r0, [r1] - ldr r0, =sub_818994C + 1 + ldr r0, =sub_818994C str r0, [r2] strb r5, [r4] str r6, [r2, 0x4] @@ -84068,7 +84068,7 @@ b_setup_bx: ; 8032824 lsls r1, 2 ldr r2, =0x03005d60 adds r1, r2 - ldr r2, =sub_818994C + 1 + ldr r2, =sub_818994C str r2, [r1] ldrh r1, [r3, 0x18] mov r12, r0 @@ -84138,7 +84138,7 @@ b_setup_bx: ; 8032824 lsls r0, 2 ldr r1, =0x03005d60 adds r0, r1 - ldr r1, =sub_818994C + 1 + ldr r1, =sub_818994C str r1, [r0] ldrh r1, [r2, 0x18] cmp r1, 0x2 @@ -84174,7 +84174,7 @@ b_setup_bx: ; 8032824 lsls r0, 2 ldr r1, =0x03005d60 adds r0, r1 - ldr r1, =sub_81864EC + 1 + ldr r1, =sub_81864EC str r1, [r0] ldrh r0, [r2, 0x18] cmp r0, 0x2 @@ -84229,7 +84229,7 @@ b_setup_bx: ; 8032824 ands r1, r3 cmp r1, 0 beq @08032C7C - ldr r0, =sub_818994C + 1 + ldr r0, =sub_818994C str r0, [r2] strb r5, [r4] str r0, [r2, 0x8] @@ -84240,7 +84240,7 @@ b_setup_bx: ; 8032824 ands r3, r0 cmp r3, 0 beq @08032C70 - ldr r0, =sub_81864EC + 1 + ldr r0, =sub_81864EC str r0, [r2, 0x4] strb r7, [r4, 0x1] str r0, [r2, 0xC] @@ -84257,7 +84257,7 @@ b_setup_bx: ; 8032824 strb r2, [r4, 0x3] b @08032CB2 @08032C7C: - ldr r0, =sub_818994C + 1 + ldr r0, =sub_818994C str r0, [r2, 0x4] strb r1, [r4, 0x1] str r0, [r2, 0xC] @@ -84268,7 +84268,7 @@ b_setup_bx: ; 8032824 ands r3, r0 cmp r3, 0 beq @08032CA8 - ldr r0, =sub_81864EC + 1 + ldr r0, =sub_81864EC str r0, [r2] strb r7, [r4] str r0, [r2, 0x8] @@ -84312,14 +84312,14 @@ b_setup_bx_link: ; 8032CC0 cmp r4, 0 beq @08032D1C ldr r1, =0x03005d04 - ldr r0, =sub_8039ECC + 1 + ldr r0, =sub_8039ECC str r0, [r1] ldr r2, =0x03005d60 - ldr r0, =sub_805745C + 1 + ldr r0, =sub_805745C str r0, [r2] ldr r1, =0x02024076 strb r3, [r1] - ldr r0, =sub_8064394 + 1 + ldr r0, =sub_8064394 str r0, [r2, 0x4] strb r5, [r1, 0x1] ldr r1, =0x0202406c @@ -84329,11 +84329,11 @@ b_setup_bx_link: ; 8032CC0 .pool @08032D1C: ldr r2, =0x03005d60 - ldr r0, =sub_805745C + 1 + ldr r0, =sub_805745C str r0, [r2, 0x4] ldr r1, =0x02024076 strb r4, [r1, 0x1] - ldr r0, =sub_8064394 + 1 + ldr r0, =sub_8064394 str r0, [r2] strb r5, [r1] ldr r1, =0x0202406c @@ -84352,15 +84352,15 @@ b_setup_bx_link: ; 8032CC0 cmp r3, 0 beq @08032D98 ldr r1, =0x03005d04 - ldr r0, =sub_8039ECC + 1 + ldr r0, =sub_8039ECC str r0, [r1] ldr r2, =0x03005d60 - ldr r4, =sub_805745C + 1 + ldr r4, =sub_805745C str r4, [r2] ldr r1, =0x02024076 movs r0, 0 strb r0, [r1] - ldr r3, =sub_8064394 + 1 + ldr r3, =sub_8064394 str r3, [r2, 0x4] strb r5, [r1, 0x1] str r4, [r2, 0x8] @@ -84374,11 +84374,11 @@ b_setup_bx_link: ; 8032CC0 .pool @08032D98: ldr r2, =0x03005d60 - ldr r0, =sub_805745C + 1 + ldr r0, =sub_805745C str r0, [r2, 0x4] ldr r1, =0x02024076 strb r3, [r1, 0x1] - ldr r3, =sub_8064394 + 1 + ldr r3, =sub_8064394 str r3, [r2] strb r5, [r1] str r0, [r2, 0xC] @@ -84405,31 +84405,31 @@ b_setup_bx_link: ; 8032CC0 cmp r3, 0 beq @08032E1C ldr r1, =0x03005d04 - ldr r0, =sub_8039ECC + 1 + ldr r0, =sub_8039ECC str r0, [r1] ldr r2, =0x03005d60 - ldr r0, =sub_805745C + 1 + ldr r0, =sub_805745C str r0, [r2] ldr r1, =0x02024076 movs r0, 0 strb r0, [r1] - ldr r3, =sub_805F164 + 1 + ldr r3, =sub_805F164 str r3, [r2, 0x4] strb r5, [r1, 0x1] - ldr r0, =sub_814AEB0 + 1 + ldr r0, =sub_814AEB0 b @08032E2E .align 2, 0 .pool @08032E1C: ldr r2, =0x03005d60 - ldr r0, =sub_814AEB0 + 1 + ldr r0, =sub_814AEB0 str r0, [r2] ldr r1, =0x02024076 strb r3, [r1] - ldr r3, =sub_8064394 + 1 + ldr r3, =sub_8064394 str r3, [r2, 0x4] strb r5, [r1, 0x1] - ldr r0, =sub_805745C + 1 + ldr r0, =sub_805745C @08032E2E: str r0, [r2, 0x8] movs r0, 0x2 @@ -84471,7 +84471,7 @@ b_setup_bx_link: ; 8032CC0 cmp r0, 0 beq @08032EA4 ldr r1, =0x03005d04 - ldr r0, =sub_8039ECC + 1 + ldr r0, =sub_8039ECC str r0, [r1] @08032EA4: movs r0, 0 @@ -84523,7 +84523,7 @@ b_setup_bx_link: ; 8032CC0 lsls r1, 2 ldr r2, =0x03005d60 adds r1, r2 - ldr r2, =sub_805745C + 1 + ldr r2, =sub_805745C str r2, [r1] ldrh r1, [r3, 0x18] mov r12, r0 @@ -84593,7 +84593,7 @@ b_setup_bx_link: ; 8032CC0 lsls r0, 2 ldr r1, =0x03005d60 adds r0, r1 - ldr r1, =sub_814AEB0 + 1 + ldr r1, =sub_814AEB0 str r1, [r0] ldrh r1, [r2, 0x18] cmp r1, 0x2 @@ -84629,7 +84629,7 @@ b_setup_bx_link: ; 8032CC0 lsls r0, 2 ldr r1, =0x03005d60 adds r0, r1 - ldr r1, =sub_8064394 + 1 + ldr r1, =sub_8064394 str r1, [r0] ldrh r0, [r2, 0x18] cmp r0, 0x2 @@ -84943,7 +84943,7 @@ dp01_prepare_buffer: ; 80331B8 thumb_func_start sub_8033244 sub_8033244: ; 8033244 push {r4-r6,lr} - ldr r0, =task00_wireless_something + 1 + ldr r0, =task00_wireless_something movs r1, 0 bl AddTask ldr r2, =0x02022d08 @@ -84981,7 +84981,7 @@ sub_8033244: ; 8033244 lsls r0, 3 adds r0, r5 strh r4, [r0, 0x26] - ldr r0, =sub_803375C + 1 + ldr r0, =sub_803375C movs r1, 0 bl AddTask ldr r2, =0x02022d09 @@ -89767,7 +89767,7 @@ sub_8035608: ; 8035608 movs r2, 0x4 orrs r0, r2 strb r0, [r1] - ldr r0, =sub_8035648 + 1 + ldr r0, =sub_8035648 bl set_callback2 pop {r0} bx r0 @@ -91656,13 +91656,13 @@ sub_8036760: ; 8036760 cmp r1, 0 bne @080367B4 bl battle_wireless_setup_if_required_maybe - ldr r0, =sub_8037ADC + 1 + ldr r0, =sub_8037ADC bl set_callback2 b @080367BA .align 2, 0 .pool @080367B4: - ldr r0, =intro_end + 1 + ldr r0, =intro_end bl set_callback2 @080367BA: ldr r1, =0x02024332 @@ -91815,7 +91815,7 @@ sub_80367D4: ; 80367D4 ldr r1, =0x0300301c movs r0, 0x4 strb r0, [r1] - ldr r0, =vblank_cb_08078BB4 + 1 + ldr r0, =vblank_cb_08078BB4 bl SetVBlankCallback bl sub_803269C ldr r2, [r4] @@ -91831,7 +91831,7 @@ sub_80367D4: ; 80367D4 cmp r0, r1 bne @08036994 @0803693E: - ldr r0, =sub_8037458 + 1 + ldr r0, =sub_8037458 bl set_callback2 b @080369AE .align 2, 0 @@ -91841,13 +91841,13 @@ sub_80367D4: ; 80367D4 ands r2, r0 cmp r2, 0 beq @080369A8 - ldr r0, =sub_8037DF4 + 1 + ldr r0, =sub_8037DF4 bl set_callback2 b @080369AE .align 2, 0 .pool @080369A8: - ldr r0, =sub_8036FAC + 1 + ldr r0, =sub_8036FAC bl set_callback2 @080369AE: ldr r5, =0x02022fec @@ -92778,7 +92778,7 @@ sub_8036FAC: ; 8036FAC adds r1, r6, 0 bl sub_8036EB8 bl berry_801017C - ldr r0, =task00_0800F6FC + 1 + ldr r0, =task00_0800F6FC movs r1, 0 bl AddTask lsls r0, 24 @@ -93047,9 +93047,9 @@ sub_8036FAC: ; 8036FAC ldr r1, =0x030022c0 ldr r0, [r1] str r0, [r2] - ldr r0, =sub_8039EF0 + 1 + ldr r0, =sub_8039EF0 str r0, [r1] - ldr r0, =sub_8038420 + 1 + ldr r0, =sub_8038420 bl set_callback2 ldr r2, =0x02022fec ldr r1, [r2] @@ -93283,7 +93283,7 @@ sub_8037458: ; 8037458 adds r1, r6, 0 bl sub_8036EB8 bl berry_801017C - ldr r0, =task00_0800F6FC + 1 + ldr r0, =task00_0800F6FC movs r1, 0 bl AddTask lsls r0, 24 @@ -93668,9 +93668,9 @@ sub_8037458: ; 8037458 ldr r1, =0x030022c0 ldr r0, [r1] str r0, [r2] - ldr r0, =sub_8039EF0 + 1 + ldr r0, =sub_8039EF0 str r0, [r1] - ldr r0, =sub_8038420 + 1 + ldr r0, =sub_8038420 bl set_callback2 ldr r2, =0x02022fec ldr r1, [r2] @@ -93967,7 +93967,7 @@ sub_8037ADC: ; 8037ADC ldr r0, [r0] mov r2, r10 str r0, [r2] - ldr r0, =sub_8037ADC + 1 + ldr r0, =sub_8037ADC str r0, [r1, 0x8] bl sub_81B9150 b @08037D0A @@ -94014,7 +94014,7 @@ sub_8037ADC: ; 8037ADC ldr r2, [sp] ldr r0, [r2] str r0, [r1, 0x8] - ldr r0, =sub_80367D4 + 1 + ldr r0, =sub_80367D4 bl set_callback2 ldr r4, =0x02023058 ldr r0, [r4] @@ -94036,7 +94036,7 @@ sub_8037ADC: ; 8037ADC ldr r2, [sp] ldr r0, [r2] str r0, [r1, 0x8] - ldr r0, =sub_80367D4 + 1 + ldr r0, =sub_80367D4 bl set_callback2 ldr r4, =0x02023058 ldr r0, [r4] @@ -94096,7 +94096,7 @@ intro_end: ; 8037D2C ldr r0, =0x02022fec ldr r0, [r0] str r0, [r7] - ldr r0, =intro_end + 1 + ldr r0, =intro_end str r0, [r1, 0x8] bl sub_81B9150 b @08037DD6 @@ -94120,7 +94120,7 @@ intro_end: ; 8037D2C mov r2, r8 ldr r0, [r2] str r0, [r1, 0x8] - ldr r0, =sub_80367D4 + 1 + ldr r0, =sub_80367D4 bl set_callback2 ldr r4, =0x02023058 ldr r0, [r4] @@ -94291,7 +94291,7 @@ sub_8037DF4: ; 8037DF4 bl sub_8036EB8 bl berry_801017C bl sub_8068AA4 - ldr r0, =task00_0800F6FC + 1 + ldr r0, =task00_0800F6FC movs r1, 0 bl AddTask lsls r0, 24 @@ -94838,9 +94838,9 @@ sub_8037DF4: ; 8037DF4 ldr r1, =0x030022c0 ldr r0, [r1] str r0, [r2] - ldr r0, =sub_8039EF0 + 1 + ldr r0, =sub_8039EF0 str r0, [r1] - ldr r0, =sub_8038420 + 1 + ldr r0, =sub_8038420 bl set_callback2 ldr r3, =0x02022fec ldr r2, [r3] @@ -94907,7 +94907,7 @@ sub_8038420: ; 8038420 movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, =sub_80384E4 + 1 + ldr r0, =sub_80384E4 bl set_callback2 @08038482: add sp, 0x4 @@ -94976,7 +94976,7 @@ sub_80384E4: ; 80384E4 sub_8038528: ; 8038528 movs r1, 0 strh r1, [r0, 0x2E] - ldr r1, =sub_8038538 + 1 + ldr r1, =sub_8038538 str r1, [r0, 0x1C] bx lr .align 2, 0 @@ -95068,7 +95068,7 @@ sub_8038538: ; 8038538 asrs r0, 16 cmp r0, 0x14 bne @080385DC - ldr r0, =sub_8036760 + 1 + ldr r0, =sub_8036760 bl set_callback2 @080385DC: pop {r4,r5} @@ -95770,7 +95770,7 @@ sub_8038B74: ; 8038B74 adds r4, r0, 0 movs r1, 0x1 bl sub_8008258 - ldr r0, =sub_8038B04 + 1 + ldr r0, =sub_8038B04 str r0, [r4, 0x1C] movs r0, 0x68 bl audio_play @@ -96131,9 +96131,9 @@ sub_8038D64: ; 8038D64 ldr r1, =0x0300301c movs r0, 0x4 strb r0, [r1] - ldr r0, =vblank_cb_08078BB4 + 1 + ldr r0, =vblank_cb_08078BB4 bl SetVBlankCallback - ldr r0, =task00_0800F6FC + 1 + ldr r0, =task00_0800F6FC movs r1, 0 bl AddTask lsls r0, 24 @@ -96151,7 +96151,7 @@ sub_8038D64: ; 8038D64 movs r2, 0x1 strh r2, [r1, 0x12] bl sub_8038B94 - ldr r0, =sub_8038F14 + 1 + ldr r0, =sub_8038F14 bl set_callback2 ldr r0, =0x02024332 strb r4, [r0] @@ -96306,7 +96306,7 @@ sub_8038F34: ; 8038F34 cmp r0, 0 beq @08039074 bl Window_FreeMemory - ldr r0, =sub_80392A8 + 1 + ldr r0, =sub_80392A8 bl set_callback2 b @080391C6 .align 2, 0 @@ -96329,7 +96329,7 @@ sub_8038F34: ; 8038F34 ldrb r0, [r0] cmp r0, 0 bne @08039172 - ldr r0, =sub_80B3AF8 + 1 + ldr r0, =sub_80B3AF8 movs r1, 0x5 bl AddTask b @08039172 @@ -96387,7 +96387,7 @@ sub_8038F34: ; 8038F34 .align 2, 0 .pool @08039118: - ldr r0, =sub_80B3AF8 + 1 + ldr r0, =sub_80B3AF8 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 @@ -96626,9 +96626,9 @@ sub_80392A8: ; 80392A8 ldr r1, =0x0300301c movs r0, 0x4 strb r0, [r1] - ldr r0, =vblank_cb_08078BB4 + 1 + ldr r0, =vblank_cb_08078BB4 bl SetVBlankCallback - ldr r0, =sub_803937C + 1 + ldr r0, =sub_803937C bl set_callback2 movs r0, 0x1 negs r0, r0 @@ -96720,7 +96720,7 @@ sub_803939C: ; 803939C ldrb r0, [r0] cmp r0, 0 bne @08039434 - ldr r0, =sub_80B3AF8 + 1 + ldr r0, =sub_80B3AF8 movs r1, 0x5 bl AddTask @08039434: @@ -96731,7 +96731,7 @@ sub_803939C: ; 803939C .align 2, 0 .pool @08039450: - ldr r0, =sub_80B3AF8 + 1 + ldr r0, =sub_80B3AF8 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 @@ -97145,7 +97145,7 @@ sub_80397C4: ; 80397C4 oac_poke_opponent: ; 80397DC push {lr} sub sp, 0x4 - ldr r1, =sub_803980C + 1 + ldr r1, =sub_803980C str r1, [r0, 0x1C] movs r1, 0 bl obj_anim_image_start_if_different @@ -97180,7 +97180,7 @@ sub_803980C: ; 803980C lsls r0, 16 cmp r0, 0 bne @0803982C - ldr r0, =sub_8039838 + 1 + ldr r0, =sub_8039838 str r0, [r2, 0x1C] @0803982C: pop {r0} @@ -97210,7 +97210,7 @@ sub_8039838: ; 8039838 adds r0, r1 ldrb r0, [r0] bl sub_80729D0 - ldr r0, =sub_8039894 + 1 + ldr r0, =sub_8039894 str r0, [r4, 0x1C] adds r0, r4, 0 movs r1, 0 @@ -97265,7 +97265,7 @@ sub_80398BC: ; 80398BC strh r1, [r0, 0x34] movs r1, 0x1 strh r1, [r0, 0x36] - ldr r1, =sub_80398D0 + 1 + ldr r1, =sub_80398D0 str r1, [r0, 0x1C] bx lr .align 2, 0 @@ -97312,7 +97312,7 @@ sub_80398D0: ; 80398D0 ands r0, r1 mov r1, r12 strb r0, [r1] - ldr r0, =nullsub_18 + 1 + ldr r0, =nullsub_18 str r0, [r3, 0x1C] ldr r0, =0x02022f88 str r2, [r0] @@ -97450,7 +97450,7 @@ sub_8039934: ; 8039934 strh r0, [r1, 0x34] movs r0, 0x1 strh r0, [r1, 0x36] - ldr r0, =sub_8039A48 + 1 + ldr r0, =sub_8039A48 str r0, [r1, 0x1C] pop {r3,r4} mov r8, r3 @@ -97544,7 +97544,7 @@ sub_8039AD8: ; 8039AD8 lsls r1, 29 lsrs r1, 31 strh r1, [r0, 0x36] - ldr r1, =sub_8039AF4 + 1 + ldr r1, =sub_8039AF4 str r1, [r0, 0x1C] bx lr .align 2, 0 @@ -97602,7 +97602,7 @@ sub_8039B2C: ; 8039B2C strb r1, [r2] movs r1, 0 strh r1, [r0, 0x36] - ldr r1, =nullsub_18 + 1 + ldr r1, =nullsub_18 str r1, [r0, 0x1C] bx lr .align 2, 0 @@ -97656,7 +97656,7 @@ sub_8039B58: ; 8039B58 thumb_func_start sub_8039BB4 sub_8039BB4: ; 8039BB4 - ldr r1, =oac_poke_ally_ + 1 + ldr r1, =oac_poke_ally_ str r1, [r0, 0x1C] bx lr .align 2, 0 @@ -97680,7 +97680,7 @@ oac_poke_ally_: ; 8039BC0 asrs r1, r0, 16 cmp r1, 0 bne @08039BE4 - ldr r0, =nullsub_19 + 1 + ldr r0, =nullsub_19 str r0, [r2, 0x1C] strh r1, [r2, 0x30] @08039BE4: @@ -97692,7 +97692,7 @@ oac_poke_ally_: ; 8039BC0 thumb_func_start sub_8039BF0 sub_8039BF0: ; 8039BF0 - ldr r1, =nullsub_19 + 1 + ldr r1, =nullsub_19 str r1, [r0, 0x1C] bx lr .align 2, 0 @@ -97776,7 +97776,7 @@ dp11b_obj_instanciate: ; 8039C28 adds r6, r2, 0 cmp r0, 0 bne @08039D2C - ldr r0, =objc_dp11b_pingpong + 1 + ldr r0, =objc_dp11b_pingpong bl object_new_hidden_with_callback lsls r0, 24 lsrs r5, r0, 24 @@ -98029,7 +98029,7 @@ sub_8039E60: ; 8039E60 ands r0, r1 cmp r0, 0 beq @08039E7A - ldr r0, =nullsub_19 + 1 + ldr r0, =nullsub_19 str r0, [r4, 0x1C] @08039E7A: pop {r4} @@ -98045,7 +98045,7 @@ sub_8039E84: ; 8039E84 adds r4, r0, 0 movs r1, 0x1 bl obj_anim_image_start - ldr r0, =sub_8039E60 + 1 + ldr r0, =sub_8039E60 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -98093,7 +98093,7 @@ sub_8039ECC: ; 8039ECC movs r0, 0 strb r0, [r1, 0x1] ldr r1, =0x03005d04 - ldr r0, =bc_8012FAC + 1 + ldr r0, =bc_8012FAC str r0, [r1] pop {r0} bx r0 @@ -99641,7 +99641,7 @@ bc_8012FAC: ; 803ABC0 cmp r0, r1 bne @0803AC2C ldr r1, =0x03005d04 - ldr r0, =bc_load_battlefield + 1 + ldr r0, =bc_load_battlefield str r0, [r1] b @0803AC2E .align 2, 0 @@ -99672,7 +99672,7 @@ bc_load_battlefield: ; 803AC34 ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution ldr r1, =0x03005d04 - ldr r0, =sub_803AC84 + 1 + ldr r0, =sub_803AC84 str r0, [r1] ldr r0, =0x02024332 strb r5, [r0] @@ -100012,7 +100012,7 @@ sub_803AC84: ; 803AC84 b @0803ACB4 @0803AF48: ldr r1, =0x03005d04 - ldr r0, =bc_801333C + 1 + ldr r0, =bc_801333C str r0, [r1] @0803AF4E: pop {r3-r5} @@ -100155,7 +100155,7 @@ bc_801333C: ; 803AF80 ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution ldr r1, =0x03005d04 - ldr r0, =bc_battle_begin_message + 1 + ldr r0, =bc_battle_begin_message b @0803B10A .align 2, 0 .pool @@ -100204,7 +100204,7 @@ bc_801333C: ; 803AF80 cmp r7, 0x5 ble @0803B0B2 ldr r1, =0x03005d04 - ldr r0, =bc_8013568 + 1 + ldr r0, =bc_8013568 @0803B10A: str r0, [r1] @0803B10C: @@ -100233,7 +100233,7 @@ bc_battle_begin_message: ; 803B120 movs r0, 0 bl b_std_message ldr r1, =0x03005d04 - ldr r0, =sub_803B180 + 1 + ldr r0, =sub_803B180 str r0, [r1] @0803B142: pop {r0} @@ -100250,7 +100250,7 @@ bc_8013568: ; 803B158 cmp r0, 0 bne @0803B170 ldr r1, =0x03005d04 - ldr r0, =sub_803B3CC + 1 + ldr r0, =sub_803B3CC str r0, [r1] movs r0, 0 movs r1, 0 @@ -100300,7 +100300,7 @@ sub_803B180: ; 803B180 movs r0, 0x1 bl b_std_message ldr r1, =0x03005d04 - ldr r0, =sub_803B25C + 1 + ldr r0, =sub_803B25C str r0, [r1] @0803B1D0: pop {r0} @@ -100361,7 +100361,7 @@ sub_803B1DC: ; 803B1DC bcc @0803B20E @0803B23A: ldr r1, =0x03005d04 - ldr r0, =bc_801362C + 1 + ldr r0, =bc_801362C str r0, [r1] pop {r4,r5} pop {r0} @@ -100396,7 +100396,7 @@ sub_803B25C: ; 803B25C .pool @0803B288: ldr r1, =0x03005d04 - ldr r0, =sub_803B1DC + 1 + ldr r0, =sub_803B1DC b @0803B2F0 .align 2, 0 .pool @@ -100445,7 +100445,7 @@ sub_803B25C: ; 803B25C bcc @0803B2B2 @0803B2EC: ldr r1, =0x03005d04 - ldr r0, =bc_801362C + 1 + ldr r0, =bc_801362C @0803B2F0: str r0, [r1] @0803B2F2: @@ -100512,7 +100512,7 @@ bc_801362C: ; 803B314 bcc @0803B334 @0803B37E: ldr r1, =0x03005d04 - ldr r0, =sub_803B3CC + 1 + ldr r0, =sub_803B3CC str r0, [r1] @0803B384: pop {r4-r7} @@ -100530,7 +100530,7 @@ sub_803B3AC: ; 803B3AC cmp r0, 0 bne @0803B3BC ldr r1, =0x03005d04 - ldr r0, =sub_803B3CC + 1 + ldr r0, =sub_803B3CC str r0, [r1] @0803B3BC: pop {r0} @@ -100578,7 +100578,7 @@ sub_803B3CC: ; 803B3CC bl b_std_message @0803B412: ldr r1, =0x03005d04 - ldr r0, =sub_803B4C8 + 1 + ldr r0, =sub_803B4C8 str r0, [r1] @0803B418: pop {r0} @@ -100652,7 +100652,7 @@ sub_803B42C: ; 803B42C adds r0, r2 strb r1, [r0] ldr r1, =0x03005d04 - ldr r0, =sub_803B628 + 1 + ldr r0, =sub_803B628 str r0, [r1] pop {r4,r5} pop {r0} @@ -100684,7 +100684,7 @@ sub_803B4C8: ; 803B4C8 .pool @0803B4F0: ldr r1, =0x03005d04 - ldr r0, =sub_803B42C + 1 + ldr r0, =sub_803B42C b @0803B572 .align 2, 0 .pool @@ -100746,7 +100746,7 @@ sub_803B4C8: ; 803B4C8 adds r0, r2 strb r1, [r0] ldr r1, =0x03005d04 - ldr r0, =sub_803B628 + 1 + ldr r0, =sub_803B628 @0803B572: str r0, [r1] @0803B574: @@ -100812,7 +100812,7 @@ sub_803B598: ; 803B598 adds r0, r2 strb r1, [r0] ldr r1, =0x03005d04 - ldr r0, =sub_803B628 + 1 + ldr r0, =sub_803B628 str r0, [r1] @0803B606: pop {r4,r5} @@ -101079,7 +101079,7 @@ sub_803B628: ; 803B628 movs r1, 0 bl battle_show_message_maybe ldr r1, =0x03005d04 - ldr r0, =sub_803BE74 + 1 + ldr r0, =sub_803BE74 str r0, [r1] bl sub_803F988 ldr r1, =0x02024332 @@ -101169,7 +101169,7 @@ bc_8013B1C: ; 803B904 cmp r0, 0 bne @0803B994 ldr r1, =0x03005d04 - ldr r0, =sub_803B9BC + 1 + ldr r0, =sub_803B9BC str r0, [r1] ldr r3, =0x0202406c ldr r1, =0x02024332 @@ -101325,7 +101325,7 @@ sub_803B9BC: ; 803B9BC movs r0, 0xC strb r0, [r1] ldr r1, =0x03005d04 - ldr r0, =bc_bs_exec + 1 + ldr r0, =bc_bs_exec str r0, [r1] b @0803BB78 .align 2, 0 @@ -101391,7 +101391,7 @@ sub_803B9BC: ; 803B9BC movs r1, 0 bl battle_show_message_maybe ldr r1, =0x03005d04 - ldr r0, =sub_803BE74 + 1 + ldr r0, =sub_803BE74 str r0, [r1] bl GenerateRandomNumber ldr r1, =0x02024330 @@ -103404,7 +103404,7 @@ sub_803BE74: ; 803BE74 movs r0, 0x1 bl sub_818603C ldr r1, =0x03005d04 - ldr r0, =sub_803D2E8 + 1 + ldr r0, =sub_803D2E8 str r0, [r1] ldr r0, =0x02022fec ldr r0, [r0] @@ -104223,7 +104223,7 @@ sub_803D2E8: ; 803D2E8 adds r4, r1, 0 ldr r7, =0x03005d04 mov r10, r7 - ldr r0, =bc_80154A0 + 1 + ldr r0, =bc_80154A0 mov r12, r0 ldr r1, =0x0202449c mov r9, r1 @@ -104395,7 +104395,7 @@ sub_803D2E8: ; 803D2E8 blt @0803D4E8 @0803D54A: ldr r1, =0x03005d04 - ldr r0, =bc_80154A0 + 1 + ldr r0, =bc_80154A0 str r0, [r1] ldr r0, =0x0202449c ldr r0, [r0] @@ -104693,7 +104693,7 @@ bc_80154A0: ; 803D6F0 ldr r0, [r0] strb r2, [r0, 0x13] ldr r1, =0x03005d04 - ldr r0, =bc_bs_exec + 1 + ldr r0, =bc_bs_exec str r0, [r1] ldr r0, =0x02024332 strb r2, [r0, 0x3] @@ -104947,7 +104947,7 @@ sub_803D8C0: ; 803D8C0 str r0, [r1] @0803DAA4: ldr r1, =0x03005d04 - ldr r0, =sub_803DCD8 + 1 + ldr r0, =sub_803DCD8 str r0, [r1] pop {r4} pop {r0} @@ -105030,7 +105030,7 @@ sub_803DAC0: ; 803DAC0 str r0, [r1] @0803DB82: ldr r1, =0x03005d04 - ldr r0, =sub_803DCD8 + 1 + ldr r0, =sub_803DCD8 str r0, [r1] pop {r4} pop {r0} @@ -105119,7 +105119,7 @@ sub_803DBA0: ; 803DBA0 str r0, [r1] @0803DC6A: ldr r1, =0x03005d04 - ldr r0, =sub_803DCD8 + 1 + ldr r0, =sub_803DCD8 str r0, [r1] pop {r0} bx r0 @@ -105152,7 +105152,7 @@ bc_80158BC: ; 803DC84 ldr r0, =gUnknown_082DAAF7 str r0, [r1] ldr r1, =0x03005d04 - ldr r0, =sub_803DCD8 + 1 + ldr r0, =sub_803DCD8 str r0, [r1] bx lr .align 2, 0 @@ -105277,10 +105277,10 @@ sub_803DCD8: ; 803DCD8 movs r0, 0x5 bl sub_80A2F50 ldr r1, =0x03005d04 - ldr r0, =sub_803DE40 + 1 + ldr r0, =sub_803DE40 str r0, [r1] ldr r1, =0x030061e8 - ldr r0, =sub_8038420 + 1 + ldr r0, =sub_8038420 str r0, [r1] b @0803DE2A .align 2, 0 @@ -105328,14 +105328,14 @@ sub_803DE40: ; 803DE40 beq @0803DE80 @0803DE62: ldr r1, =0x03005d04 - ldr r0, =c4_overworld + 1 + ldr r0, =c4_overworld str r0, [r1] b @0803DEA2 .align 2, 0 .pool @0803DE80: ldr r1, =0x03005d04 - ldr r0, =bc_evolution_cutscene + 1 + ldr r0, =bc_evolution_cutscene str r0, [r1] @0803DE86: bl Window_FreeMemory @@ -105391,7 +105391,7 @@ bc_evolution_cutscene: ; 803DEB4 beq @0803DF20 bl Window_FreeMemory ldr r0, =0x03005d04 - ldr r1, =sub_803DF48 + 1 + ldr r1, =sub_803DF48 str r1, [r0] lsls r3, r6, 24 lsrs r3, 24 @@ -105412,7 +105412,7 @@ bc_evolution_cutscene: ; 803DEB4 bne @0803DEC0 @0803DF2E: ldr r1, =0x03005d04 - ldr r0, =c4_overworld + 1 + ldr r0, =c4_overworld str r0, [r1] @0803DF34: pop {r4-r6} @@ -105427,11 +105427,11 @@ sub_803DF48: ; 803DF48 push {lr} ldr r0, =0x030022c0 ldr r1, [r0, 0x4] - ldr r0, =sub_8038420 + 1 + ldr r0, =sub_8038420 cmp r1, r0 bne @0803DF5A ldr r1, =0x03005d04 - ldr r0, =bc_evolution_cutscene + 1 + ldr r0, =bc_evolution_cutscene str r0, [r1] @0803DF5A: pop {r0} @@ -110144,7 +110144,7 @@ sub_80401D0: ; 80401D0 @080408FE: ldr r0, =0x03005d04 ldr r1, [r0] - ldr r0, =sub_803B9BC + 1 + ldr r0, =sub_803B9BC eors r1, r0 negs r0, r1 orrs r0, r1 @@ -116843,7 +116843,7 @@ b_call_bc_move_exec: ; 8044458 ldr r1, =0x03005d04 ldr r0, [r1] str r0, [r2] - ldr r0, =bc_move_exec_returning + 1 + ldr r0, =bc_move_exec_returning str r0, [r1] ldr r1, =0x02024083 movs r0, 0 @@ -116874,7 +116874,7 @@ b_push_move_exec: ; 8044498 ldr r1, =0x03005d04 ldr r0, [r1] str r0, [r2] - ldr r0, =sub_803E08C + 1 + ldr r0, =sub_803E08C str r0, [r1] pop {r4} pop {r0} @@ -135170,7 +135170,7 @@ sub_804E038: ; 804E038 subs r2, 0x1 lsls r2, 24 lsrs r2, 24 - ldr r3, =sub_80A92F8 + 1 + ldr r3, =sub_80A92F8 ldr r4, =0x020244e2 ldrh r4, [r4] str r4, [sp] @@ -135194,7 +135194,7 @@ sub_804E038: ; 804E038 @0804E1C6: ldr r0, =0x030022c0 ldr r1, [r0, 0x4] - ldr r0, =sub_8038420 + 1 + ldr r0, =sub_8038420 cmp r1, r0 beq @0804E1D2 b @0804E3B8 @@ -135215,7 +135215,7 @@ sub_804E038: ; 804E038 @0804E1F2: ldr r0, =0x030022c0 ldr r1, [r0, 0x4] - ldr r0, =sub_8038420 + 1 + ldr r0, =sub_8038420 cmp r1, r0 beq @0804E1FE b @0804E3B8 @@ -151205,7 +151205,7 @@ sub_80568CC: ; 80568CC bne @08056A2C ldr r0, =0x030022c0 ldr r1, [r0, 0x4] - ldr r0, =sub_8038420 + 1 + ldr r0, =sub_8038420 cmp r1, r0 bne @08056A2C ldr r2, =0x03005e00 @@ -151218,7 +151218,7 @@ sub_80568CC: ; 80568CC ldrb r0, [r0, 0x4] cmp r0, 0 bne @08056A2C - ldr r0, =vblank_cb_08078BB4 + 1 + ldr r0, =vblank_cb_08078BB4 bl SetVBlankCallback ldrb r0, [r4] adds r0, 0x1 @@ -151712,7 +151712,7 @@ atkF3_receive_new_pokemon_maybe: ; 8056BEC ldr r1, [r2] adds r1, 0x6D str r0, [sp] - ldr r0, =sub_8038420 + 1 + ldr r0, =sub_8038420 str r0, [sp, 0x4] movs r0, 0x2 adds r2, r6, 0 @@ -151728,7 +151728,7 @@ atkF3_receive_new_pokemon_maybe: ; 8056BEC @08056DD4: ldr r0, =0x030022c0 ldr r1, [r0, 0x4] - ldr r0, =sub_8038420 + 1 + ldr r0, =sub_8038420 cmp r1, r0 bne @08056E62 ldr r0, =0x02037fd4 @@ -152483,7 +152483,7 @@ sub_805745C: ; 805745C ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, =bx_exec_buffer_A_ch0_tbl1 + 1 + ldr r1, =bx_exec_buffer_A_ch0_tbl1 str r1, [r0] ldr r0, =0x020244b9 movs r1, 0 @@ -152504,7 +152504,7 @@ dp01_tbl1_exec_completed: ; 805748C ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =bx_exec_buffer_A_ch0_tbl1 + 1 + ldr r1, =bx_exec_buffer_A_ch0_tbl1 str r1, [r0] ldr r0, =0x02022fec ldr r0, [r0] @@ -152902,7 +152902,7 @@ sub_80577F0: ; 80577F0 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8057824 + 1 + ldr r1, =sub_8057824 str r1, [r0] pop {r4} pop {r0} @@ -152986,7 +152986,7 @@ sub_8057824: ; 8057824 lsls r0, 2 adds r2, 0x1C adds r0, r2 - ldr r1, =sub_8039B2C + 1 + ldr r1, =sub_8039B2C str r1, [r0] ldr r1, =0x020244b0 ldr r0, =0x02024064 @@ -153028,14 +153028,14 @@ sub_8057824: ; 8057824 lsls r0, 2 adds r2, 0x1C adds r0, r2 - ldr r1, =sub_8039B2C + 1 + ldr r1, =sub_8039B2C str r1, [r0] ldr r1, =0x03005d60 ldr r4, =0x02024064 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8057BFC + 1 + ldr r1, =sub_8057BFC str r1, [r0] ldrb r0, [r4] movs r1, 0x1 @@ -153073,7 +153073,7 @@ sub_8057824: ; 8057824 lsls r0, 2 adds r2, 0x1C adds r0, r2 - ldr r1, =sub_8039B2C + 1 + ldr r1, =sub_8039B2C str r1, [r0] adds r5, r3, 0 @080579B8: @@ -153204,7 +153204,7 @@ sub_8057824: ; 8057824 lsls r0, 2 adds r2, 0x1C adds r0, r2 - ldr r1, =sub_8039B2C + 1 + ldr r1, =sub_8039B2C str r1, [r0] adds r5, r3, 0 @08057ADC: @@ -153323,7 +153323,7 @@ sub_8057824: ; 8057824 lsls r0, 2 adds r2, 0x1C adds r0, r2 - ldr r1, =sub_8039AD8 + 1 + ldr r1, =sub_8039AD8 str r1, [r0] @08057BC8: add sp, 0x4 @@ -153516,7 +153516,7 @@ sub_8057BFC: ; 8057BFC ldrb r0, [r7] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8057824 + 1 + ldr r1, =sub_8057824 str r1, [r0] movs r0, 0x12 ands r4, r0 @@ -153562,7 +153562,7 @@ sub_8057BFC: ; 8057BFC lsls r0, 2 adds r2, 0x1C adds r0, r2 - ldr r1, =sub_8039AD8 + 1 + ldr r1, =sub_8039AD8 b @08057F9C .align 2, 0 .pool @@ -153755,7 +153755,7 @@ sub_8057BFC: ; 8057BFC ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8058138 + 1 + ldr r1, =sub_8058138 @08057F9C: str r1, [r0] @08057F9E: @@ -154394,7 +154394,7 @@ sub_8058138: ; 8058138 ldrb r0, [r2] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8057BFC + 1 + ldr r1, =sub_8057BFC str r1, [r0] ldr r3, =0x020244b0 ldrb r0, [r2] @@ -154431,7 +154431,7 @@ sub_8058138: ; 8058138 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8057BFC + 1 + ldr r1, =sub_8057BFC str r1, [r0] @08058532: bl sub_8059B18 @@ -154653,7 +154653,7 @@ sub_80586F8: ; 80586F8 ldr r0, =0x03005d00 ldr r0, [r0] str r0, [r3] - ldr r0, =sub_8038D64 + 1 + ldr r0, =sub_8038D64 bl set_callback2 ldr r0, =0x0202433a ldrb r0, [r0] @@ -154683,7 +154683,7 @@ sub_80586F8: ; 80586F8 ldr r0, =0x03005d00 ldr r0, [r0] str r0, [r3] - ldr r0, =sub_8038D64 + 1 + ldr r0, =sub_8038D64 bl set_callback2 ldr r0, =0x0202433a ldrb r0, [r0] @@ -154734,7 +154734,7 @@ sub_80587B0: ; 80587B0 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, =sub_80586F8 + 1 + ldr r1, =sub_80586F8 str r1, [r0] b @08058832 .align 2, 0 @@ -154777,7 +154777,7 @@ sub_8058844: ; 8058844 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 bne @08058868 bl dp01_tbl1_exec_completed @@ -154803,7 +154803,7 @@ sub_805887C: ; 805887C adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 bne @080588A0 bl dp01_tbl1_exec_completed @@ -154830,7 +154830,7 @@ bx_802F7A0: ; 80588B4 adds r1, 0x1C adds r0, r1 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 bne @08058908 ldr r0, =0x03005d90 @@ -154934,7 +154934,7 @@ sub_805896C: ; 805896C adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 mov r10, r3 cmp r1, r0 bne @08058A0A @@ -154955,7 +154955,7 @@ sub_805896C: ; 805896C adds r5, 0x1C adds r0, r5 ldr r3, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 mov r10, r2 cmp r3, r0 bne @08058A0A @@ -155094,7 +155094,7 @@ sub_805896C: ; 805896C ldrb r0, [r2] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8058924 + 1 + ldr r1, =sub_8058924 str r1, [r0] @08058B08: pop {r3-r5} @@ -155369,7 +155369,7 @@ sub_8058B40: ; 8058B40 adds r2, 0x1C adds r0, r2 ldr r3, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r3, r0 bne @08058E0A ldr r0, =0x020241e4 @@ -155398,7 +155398,7 @@ sub_8058B40: ; 8058B40 adds r2, 0x1C adds r0, r2 ldr r4, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r4, r0 bne @08058E0A ldr r6, =0x020241e4 @@ -155511,7 +155511,7 @@ sub_8058B40: ; 8058B40 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =sub_805896C + 1 + ldr r1, =sub_805896C str r1, [r0] @08058EAA: pop {r3,r4} @@ -155539,7 +155539,7 @@ sub_8058EDC: ; 8058EDC adds r2, 0x1C adds r0, r2 ldr r4, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r4, r0 bne @08058F94 ldr r5, =0x020244d0 @@ -155613,7 +155613,7 @@ sub_8058EDC: ; 8058EDC ldrb r1, [r6] lsls r1, 2 adds r1, r0 - ldr r0, =sub_8058FC0 + 1 + ldr r0, =sub_8058FC0 str r0, [r1] @08058F94: pop {r4-r6} @@ -155707,7 +155707,7 @@ sub_805902C: ; 805902C adds r0, 0x1C adds r0, r3, r0 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 bne @080590D2 ldr r0, [r6] @@ -155747,7 +155747,7 @@ sub_805902C: ; 805902C ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8058EDC + 1 + ldr r1, =sub_8058EDC str r1, [r0] @080590D2: pop {r4-r6} @@ -155968,7 +155968,7 @@ sub_80591B8: ; 80591B8 cmp r1, r0 bne @080592D4 @080592B2: - ldr r0, =sub_8059544 + 1 + ldr r0, =sub_8059544 b @08059316 .align 2, 0 .pool @@ -155979,7 +155979,7 @@ sub_80591B8: ; 80591B8 add r1, r9 lsls r1, 3 adds r1, r0 - ldr r0, =sub_805965C + 1 + ldr r0, =sub_805965C b @08059318 .align 2, 0 .pool @@ -155993,7 +155993,7 @@ sub_80591B8: ; 80591B8 ldr r3, [sp, 0x8] lsls r0, r3, 2 adds r0, r1 - ldr r1, =sub_80591A0 + 1 + ldr r1, =sub_80591A0 str r1, [r0] mov r0, r9 bl remove_task @@ -156001,7 +156001,7 @@ sub_80591B8: ; 80591B8 .align 2, 0 .pool @08059314: - ldr r0, =sub_8059330 + 1 + ldr r0, =sub_8059330 @08059316: mov r1, r8 @08059318: @@ -156097,7 +156097,7 @@ sub_8059330: ; 8059330 bl sub_807294C movs r0, 0x21 bl audio_play - ldr r0, =sub_8059400 + 1 + ldr r0, =sub_8059400 mov r1, r8 str r0, [r1] add sp, 0x4 @@ -156227,7 +156227,7 @@ sub_8059400: ; 8059400 movs r1, 0xB bl dp01_build_cmdbuf_x21_a_bb strb r5, [r4] - ldr r0, =sub_8059544 + 1 + ldr r0, =sub_8059544 str r0, [r6] b @0805952C .align 2, 0 @@ -156241,7 +156241,7 @@ sub_8059400: ; 8059400 ldr r1, =0x03005d60 lsls r0, r7, 2 adds r0, r1 - ldr r1, =sub_80591A0 + 1 + ldr r1, =sub_80591A0 str r1, [r0] mov r0, r8 bl remove_task @@ -156296,7 +156296,7 @@ sub_8059544: ; 8059544 adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, =sub_80595A4 + 1 + ldr r0, =sub_80595A4 str r0, [r1] pop {r4-r6} pop {r0} @@ -156376,7 +156376,7 @@ sub_80595A4: ; 80595A4 adds r1, r6 lsls r1, 3 adds r1, r0 - ldr r0, =sub_805965C + 1 + ldr r0, =sub_805965C str r0, [r1] @08059646: pop {r4-r7} @@ -156408,7 +156408,7 @@ sub_805965C: ; 805965C ldr r1, =0x03005d60 lsls r0, 2 adds r0, r1 - ldr r1, =sub_80591A0 + 1 + ldr r1, =sub_80591A0 str r1, [r0] adds r0, r5, 0 bl remove_task @@ -156561,7 +156561,7 @@ sub_80597CC: ; 80597CC ldrb r0, [r2] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8059828 + 1 + ldr r1, =sub_8059828 str r1, [r0] ldr r3, =0x03005e00 ldr r1, =0x03005d7c @@ -156590,7 +156590,7 @@ sub_8059828: ; 8059828 push {lr} ldr r0, =0x030022c0 ldr r1, [r0, 0x4] - ldr r0, =sub_8038420 + 1 + ldr r0, =sub_8038420 cmp r1, r0 bne @08059898 ldr r0, =0x02037fd4 @@ -156652,7 +156652,7 @@ sub_80598A4: ; 80598A4 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, =sub_80598E0 + 1 + ldr r1, =sub_80598E0 str r1, [r0] bl nullsub_35 bl Window_FreeMemory @@ -156669,7 +156669,7 @@ sub_80598E0: ; 80598E0 push {lr} ldr r0, =0x030022c0 ldr r1, [r0, 0x4] - ldr r0, =sub_8038420 + 1 + ldr r0, =sub_8038420 cmp r1, r0 bne @08059906 ldr r0, =0x02037fd4 @@ -157199,7 +157199,7 @@ sub_8059CF8: ; 8059CF8 thumb_func_start sub_8059D40 sub_8059D40: ; 8059D40 push {lr} - ldr r0, =sub_80A92F8 + 1 + ldr r0, =sub_80A92F8 bl set_callback2 pop {r0} bx r0 @@ -157210,7 +157210,7 @@ sub_8059D40: ; 8059D40 thumb_func_start sub_8059D50 sub_8059D50: ; 8059D50 push {lr} - ldr r0, =sub_80A92F8 + 1 + ldr r0, =sub_80A92F8 bl set_callback2 pop {r0} bx r0 @@ -159559,7 +159559,7 @@ sub_805B164: ; 805B164 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =bx_0802E404 + 1 + ldr r1, =bx_0802E404 str r1, [r0] pop {r4} pop {r0} @@ -159615,7 +159615,7 @@ sub_805B1CC: ; 805B1CC ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, =sub_805902C + 1 + ldr r1, =sub_805902C str r1, [r0] pop {r4-r6} pop {r0} @@ -159658,7 +159658,7 @@ sub_805B258: ; 805B258 lsls r0, 16 lsrs r0, 16 mov r8, r0 - ldr r0, =sub_805D714 + 1 + ldr r0, =sub_805D714 bl object_new_hidden_with_callback ldr r1, =0x03005d7c mov r9, r1 @@ -159763,7 +159763,7 @@ sub_805B258: ; 805B258 adds r1, r5, 0 adds r1, 0x1C adds r0, r1 - ldr r1, =nullsub_12 + 1 + ldr r1, =nullsub_12 str r1, [r0] movs r0, 0 movs r1, 0xFF @@ -159812,7 +159812,7 @@ sub_805B3D4: ; 805B3D4 ldrb r0, [r6] lsls r0, 2 adds r0, r1 - ldr r1, =sub_805B464 + 1 + ldr r1, =sub_805B464 str r1, [r0] b @0805B452 .align 2, 0 @@ -159911,7 +159911,7 @@ sub_805B464: ; 805B464 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8059744 + 1 + ldr r1, =sub_8059744 str r1, [r0] @0805B4E2: pop {r4-r6} @@ -160193,7 +160193,7 @@ sub_805B4F0: ; 805B4F0 adds r1, r5, 0 adds r1, 0x1C adds r0, r1 - ldr r1, =sub_805D7AC + 1 + ldr r1, =sub_805D7AC str r1, [r0] ldrb r0, [r6] adds r0, r4 @@ -160291,7 +160291,7 @@ sub_805B4F0: ; 805B4F0 lsls r0, 2 adds r4, 0x1C adds r0, r4 - ldr r1, =sub_805D7AC + 1 + ldr r1, =sub_805D7AC str r1, [r0] @0805B82A: ldr r1, =0x03005d60 @@ -160299,7 +160299,7 @@ sub_805B4F0: ; 805B4F0 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8058844 + 1 + ldr r1, =sub_8058844 str r1, [r0] pop {r3,r4} mov r8, r3 @@ -160477,13 +160477,13 @@ dp01t_08_1_8032428: ; 805B864 lsls r0, 2 adds r4, 0x1C adds r0, r4 - ldr r1, =sub_805D7AC + 1 + ldr r1, =sub_805D7AC str r1, [r0] ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, =sub_805887C + 1 + ldr r1, =sub_805887C str r1, [r0] pop {r4-r6} pop {r0} @@ -160542,7 +160542,7 @@ sub_805B9F8: ; 805B9F8 adds r1, r4, 0 adds r1, 0x1C adds r0, r1 - ldr r1, =sub_80A6EEC + 1 + ldr r1, =sub_80A6EEC str r1, [r0] ldrb r0, [r6] adds r0, r5 @@ -160551,7 +160551,7 @@ sub_805B9F8: ; 805B9F8 adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, =nullsub_12 + 1 + ldr r1, =nullsub_12 bl oamt_set_x3A_32 ldrb r0, [r6] adds r0, r5 @@ -160566,7 +160566,7 @@ sub_805B9F8: ; 805B9F8 ldrb r0, [r6] lsls r0, 2 adds r0, r1 - ldr r1, =bx_802F7A0 + 1 + ldr r1, =bx_802F7A0 str r1, [r0] pop {r4-r6} pop {r0} @@ -160666,13 +160666,13 @@ sub_805BAB8: ; 805BAB8 lsls r0, 2 adds r2, 0x1C adds r0, r2 - ldr r1, =sub_8039C00 + 1 + ldr r1, =sub_8039C00 str r1, [r0] ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, =sub_80596A8 + 1 + ldr r1, =sub_80596A8 str r1, [r0] @0805BB82: pop {r4-r6} @@ -160726,7 +160726,7 @@ sub_805BBC4: ; 805BBC4 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, =bx_wait_t1 + 1 + ldr r1, =bx_wait_t1 str r1, [r0] pop {r4,r5} pop {r0} @@ -160766,7 +160766,7 @@ sub_805BC18: ; 805BC18 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, =bx_wait_t1 + 1 + ldr r1, =bx_wait_t1 str r1, [r0] pop {r4,r5} pop {r0} @@ -160936,7 +160936,7 @@ dp01t_0F_1_move_anim: ; 805BCA8 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, =bx_move_anim_1 + 1 + ldr r1, =bx_move_anim_1 str r1, [r0] ldrh r1, [r4] ldr r2, [r7] @@ -161160,7 +161160,7 @@ sub_805BF80: ; 805BF80 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, =sub_80597B4 + 1 + ldr r1, =sub_80597B4 str r1, [r0] ldrh r0, [r4] bl sub_817C95C @@ -161212,7 +161212,7 @@ sub_805C004: ; 805C004 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8057588 + 1 + ldr r1, =sub_8057588 str r1, [r0] @0805C02A: pop {r0} @@ -161229,7 +161229,7 @@ dp01t_12_6_battle_menu: ; 805C044 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, =sub_805C004 + 1 + ldr r1, =sub_805C004 str r1, [r0] bl sub_817F2A8 ldr r0, =gUnknown_085CCA3A @@ -161291,7 +161291,7 @@ sub_805C0B0: ; 805C0B0 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =sub_80599D4 + 1 + ldr r1, =sub_80599D4 str r1, [r0] b @0805C10C .align 2, 0 @@ -161325,7 +161325,7 @@ sub_805C114: ; 805C114 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8057BFC + 1 + ldr r1, =sub_8057BFC str r1, [r0] @0805C13E: pop {r0} @@ -161394,7 +161394,7 @@ dp01t_14_5_move_menu_pokedude: ; 805C1A8 ldrb r0, [r2] lsls r0, 2 adds r0, r1 - ldr r1, =sub_805C158 + 1 + ldr r1, =sub_805C158 b @0805C1FC .align 2, 0 .pool @@ -161405,7 +161405,7 @@ dp01t_14_5_move_menu_pokedude: ; 805C1A8 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, =sub_805C114 + 1 + ldr r1, =sub_805C114 @0805C1FC: str r1, [r0] pop {r0} @@ -161453,7 +161453,7 @@ sub_805C248: ; 805C248 ldrb r0, [r2] lsls r0, 2 adds r0, r1 - ldr r1, =sub_80598A4 + 1 + ldr r1, =sub_80598A4 str r1, [r0] ldr r1, =0x020244b8 ldrb r0, [r2] @@ -161540,7 +161540,7 @@ sub_805C2AC: ; 805C2AC .align 2, 0 .pool @0805C330: - ldr r0, =nullsub_4 + 1 + ldr r0, =nullsub_4 movs r1, 0xFF bl AddTask ldr r3, =0x03005d7c @@ -161603,7 +161603,7 @@ sub_805C2AC: ; 805C2AC ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =sub_80597CC + 1 + ldr r1, =sub_80597CC str r1, [r0] ldr r1, =0x020244b8 ldrb r0, [r4] @@ -161741,7 +161741,7 @@ sub_805C410: ; 805C410 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, =bx_t1_healthbar_update + 1 + ldr r1, =bx_t1_healthbar_update str r1, [r0] add sp, 0x4 pop {r3,r4} @@ -161794,7 +161794,7 @@ sub_805C528: ; 805C528 ldrb r0, [r1] lsls r0, 8 orrs r4, r0 - ldr r0, =sub_80591B8 + 1 + ldr r0, =sub_80591B8 movs r1, 0xA bl AddTask lsls r0, 24 @@ -161812,7 +161812,7 @@ sub_805C528: ; 805C528 ldrb r0, [r6] lsls r0, 2 adds r0, r1 - ldr r1, =nullsub_21 + 1 + ldr r1, =nullsub_21 str r1, [r0] @0805C5AC: pop {r4-r7} @@ -161862,7 +161862,7 @@ sub_805C5C4: ; 805C5C4 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8059D60 + 1 + ldr r1, =sub_8059D60 str r1, [r0] @0805C618: pop {r4} @@ -161910,7 +161910,7 @@ sub_805C63C: ; 805C63C ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8059D60 + 1 + ldr r1, =sub_8059D60 str r1, [r0] @0805C68C: pop {r4,r5} @@ -162258,7 +162258,7 @@ dp01t_29_1_blink: ; 805C8F0 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =bx_blink_t1 + 1 + ldr r1, =bx_blink_t1 str r1, [r0] @0805C94E: pop {r4} @@ -162455,7 +162455,7 @@ dp01t_2F_1_pokemon_enter: ; 805CA80 adds r1, r5, 0 adds r1, 0x1C adds r0, r1 - ldr r1, =sub_80A6EEC + 1 + ldr r1, =sub_80A6EEC str r1, [r0] ldrb r2, [r7] adds r0, r2, r6 @@ -162472,7 +162472,7 @@ dp01t_2F_1_pokemon_enter: ; 805CA80 adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, =sub_805CC00 + 1 + ldr r1, =sub_805CC00 bl oamt_set_x3A_32 ldrb r0, [r7] adds r0, r6 @@ -162512,7 +162512,7 @@ dp01t_2F_1_pokemon_enter: ; 805CA80 ands r0, r2 orrs r0, r4 strb r0, [r1, 0x5] - ldr r0, =task05_08033660 + 1 + ldr r0, =task05_08033660 movs r1, 0x5 bl AddTask lsls r0, 24 @@ -162544,7 +162544,7 @@ dp01t_2F_1_pokemon_enter: ; 805CA80 adds r0, r1 lsls r0, 3 adds r0, r4 - ldr r1, =sub_8073C30 + 1 + ldr r1, =sub_8073C30 str r1, [r0] @0805CBA2: ldr r0, [r3] @@ -162557,7 +162557,7 @@ dp01t_2F_1_pokemon_enter: ; 805CA80 ldrb r0, [r7] lsls r0, 2 adds r0, r1 - ldr r1, =nullsub_21 + 1 + ldr r1, =nullsub_21 str r1, [r0] pop {r4-r7} pop {r0} @@ -162712,7 +162712,7 @@ task05_08033660: ; 805CC68 ldrb r0, [r2] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8058B40 + 1 + ldr r1, =sub_8058B40 str r1, [r0] mov r3, r9 strb r3, [r2] @@ -162807,7 +162807,7 @@ sub_805CD74: ; 805CD74 ldrb r1, [r5] lsls r1, 2 adds r1, r0 - ldr r0, =sub_805CE38 + 1 + ldr r0, =sub_805CE38 str r0, [r1] @0805CE18: pop {r4-r6} @@ -162879,7 +162879,7 @@ sub_805CE80: ; 805CE80 adds r0, r1 lsls r0, 3 adds r0, r2 - ldr r1, =sub_8073C30 + 1 + ldr r1, =sub_8073C30 str r1, [r0] @0805CEB2: bl dp01_tbl1_exec_completed @@ -162992,7 +162992,7 @@ sub_805CF54: ; 805CF54 ldrb r1, [r5] lsls r1, 2 adds r1, r0 - ldr r0, =bx_8030B2C + 1 + ldr r0, =bx_8030B2C str r0, [r1] @0805CFB0: adds r0, r6, 0 @@ -163152,7 +163152,7 @@ sub_805D094: ; 805D094 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, =sub_80587B0 + 1 + ldr r1, =sub_80587B0 str r1, [r0] pop {r4,r5} pop {r0} @@ -163915,7 +163915,7 @@ sub_805D714: ; 805D714 lsls r0, r3, 27 cmp r0, 0 bge @0805D766 - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r4, 0x1C] @0805D766: pop {r4} @@ -163936,7 +163936,7 @@ sub_805D770: ; 805D770 movs r2, 0x40 orrs r0, r2 strb r0, [r3] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r4, 0x1C] cmp r1, 0 bne @0805D798 @@ -163979,12 +163979,12 @@ sub_805D7AC: ; 805D7AC ldrsh r0, [r2, r1] cmp r0, 0 beq @0805D7E0 - ldr r0, =sub_805D7EC + 1 + ldr r0, =sub_805D7EC b @0805D7E2 .align 2, 0 .pool @0805D7E0: - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 @0805D7E2: str r0, [r2, 0x1C] @0805D7E4: @@ -164004,7 +164004,7 @@ sub_805D7EC: ; 805D7EC lsls r0, 16 cmp r0, 0 bne @0805D800 - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r1, 0x1C] @0805D800: pop {r0} @@ -164254,7 +164254,7 @@ move_anim_start_t3: ; 805D908 adds r1, r5, 0 movs r2, 0 bl move_something - ldr r0, =task0A_0803415C + 1 + ldr r0, =task0A_0803415C movs r1, 0xA bl AddTask lsls r0, 24 @@ -164373,7 +164373,7 @@ move_anim_start_t4: ; 805DAC4 adds r1, r3, 0 movs r2, 0 bl move_something - ldr r0, =task0A_08034248 + 1 + ldr r0, =task0A_08034248 movs r1, 0xA bl AddTask lsls r0, 24 @@ -166581,7 +166581,7 @@ sub_805ED70: ; 805ED70 cmp r0, 0 bne @0805EDC0 @0805EDAC: - ldr r0, =sub_805EE48 + 1 + ldr r0, =sub_805EE48 str r0, [r5, 0x1C] b @0805EE36 .align 2, 0 @@ -166708,7 +166708,7 @@ sub_805EE54: ; 805EE54 lsls r0, 2 adds r2, 0x1C adds r0, r2 - ldr r1, =sub_805ED70 + 1 + ldr r1, =sub_805ED70 b @0805EECE .align 2, 0 .pool @@ -166725,7 +166725,7 @@ sub_805EE54: ; 805EE54 lsls r0, 2 adds r2, 0x1C adds r0, r2 - ldr r1, =sub_805EE48 + 1 + ldr r1, =sub_805EE48 @0805EECE: str r1, [r0] @0805EED0: @@ -166754,7 +166754,7 @@ sub_805EEE0: ; 805EEE0 lsls r0, 2 adds r2, 0x1C adds r0, r2 - ldr r1, =sub_805EE48 + 1 + ldr r1, =sub_805EE48 str r1, [r0] bx lr .align 2, 0 @@ -167082,7 +167082,7 @@ sub_805F164: ; 805F164 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, =bx_exec_buffer_A_ch0_tbl7 + 1 + ldr r1, =bx_exec_buffer_A_ch0_tbl7 str r1, [r0] bx lr .align 2, 0 @@ -167140,7 +167140,7 @@ sub_805F1D0: ; 805F1D0 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 bne @0805F1F4 bl dp01_tbl7_exec_completed @@ -167166,7 +167166,7 @@ sub_805F208: ; 805F208 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 bne @0805F22C bl dp01_tbl7_exec_completed @@ -167193,7 +167193,7 @@ sub_805F240: ; 805F240 adds r0, 0x1C adds r0, r2, r0 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 bne @0805F292 adds r0, r2, r5 @@ -167305,7 +167305,7 @@ sub_805F2F0: ; 805F2F0 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 bne @0805F34E movs r1, 0x1 @@ -167328,7 +167328,7 @@ sub_805F2F0: ; 805F2F0 adds r3, 0x1C adds r0, r3 ldr r5, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r5, r0 bne @0805F3A0 movs r0, 0x2 @@ -167536,7 +167536,7 @@ sub_805F2F0: ; 805F2F0 ldrb r0, [r3] lsls r0, 2 adds r0, r1 - ldr r1, =sub_805F2A8 + 1 + ldr r1, =sub_805F2A8 str r1, [r0] @0805F53C: pop {r3-r5} @@ -167840,7 +167840,7 @@ sub_805F560: ; 805F560 adds r2, 0x1C adds r0, r2 ldr r3, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r3, r0 bne @0805F86E ldr r0, =0x020241e4 @@ -167871,7 +167871,7 @@ sub_805F560: ; 805F560 adds r2, 0x1C adds r0, r2 ldr r4, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r4, r0 bne @0805F86E ldr r6, =0x020241e4 @@ -168016,7 +168016,7 @@ sub_805F560: ; 805F560 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =sub_805F2F0 + 1 + ldr r1, =sub_805F2F0 str r1, [r0] @0805F958: add sp, 0x4 @@ -168083,7 +168083,7 @@ sub_805F994: ; 805F994 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 bne @0805FA48 ldr r4, =0x020244d0 @@ -168338,7 +168338,7 @@ sub_805FC10: ; 805FC10 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 bne @0805FC5C ldr r0, =0x020244d0 @@ -168361,7 +168361,7 @@ sub_805FC10: ; 805FC10 ldrb r1, [r4] lsls r1, 2 adds r1, r0 - ldr r0, =bx_803AEDC + 1 + ldr r0, =bx_803AEDC str r0, [r1] @0805FC5C: pop {r4} @@ -168403,10 +168403,10 @@ bx_803AEDC: ; 805FC80 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 beq @0805FCCA - ldr r0, =nullsub_18 + 1 + ldr r0, =nullsub_18 cmp r1, r0 bne @0805FCDA @0805FCCA: @@ -168452,7 +168452,7 @@ sub_805FD00: ; 805FD00 adds r1, 0x1C adds r0, r1 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 bne @0805FDBC ldrb r1, [r3] @@ -168511,7 +168511,7 @@ sub_805FD00: ; 805FD00 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, =sub_805FC10 + 1 + ldr r1, =sub_805FC10 str r1, [r0] @0805FDBC: pop {r4-r7} @@ -168560,7 +168560,7 @@ sub_805FDF0: ; 805FDF0 adds r0, 0x1C adds r0, r3, r0 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 bne @0805FE8C ldr r0, [r6] @@ -168596,7 +168596,7 @@ sub_805FDF0: ; 805FDF0 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, =sub_805FD00 + 1 + ldr r1, =sub_805FD00 str r1, [r0] @0805FE8C: pop {r4-r6} @@ -168665,7 +168665,7 @@ dp01_tbl7_exec_completed: ; 805FF18 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =bx_exec_buffer_A_ch0_tbl7 + 1 + ldr r1, =bx_exec_buffer_A_ch0_tbl7 str r1, [r0] ldr r0, =0x02022fec ldr r0, [r0] @@ -171028,7 +171028,7 @@ sub_8061224: ; 8061224 ldrb r0, [r6] lsls r0, 2 adds r0, r1 - ldr r1, =sub_805F994 + 1 + ldr r1, =sub_805F994 str r1, [r0] pop {r3-r5} mov r8, r3 @@ -171072,7 +171072,7 @@ sub_806137C: ; 806137C ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =sub_805FDF0 + 1 + ldr r1, =sub_805FDF0 str r1, [r0] pop {r4} pop {r0} @@ -171118,7 +171118,7 @@ sub_80613DC: ; 80613DC lsls r0, 16 lsrs r0, 16 mov r8, r0 - ldr r0, =sub_805D714 + 1 + ldr r0, =sub_805D714 bl object_new_hidden_with_callback ldr r1, =0x03005d7c mov r10, r1 @@ -171230,7 +171230,7 @@ sub_80613DC: ; 80613DC adds r1, r5, 0 adds r1, 0x1C adds r0, r1 - ldr r1, =nullsub_12 + 1 + ldr r1, =nullsub_12 str r1, [r0] movs r0, 0 movs r1, 0xFE @@ -171279,7 +171279,7 @@ sub_806156C: ; 806156C ldrb r0, [r6] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8061604 + 1 + ldr r1, =sub_8061604 str r1, [r0] b @080615F0 .align 2, 0 @@ -171380,7 +171380,7 @@ sub_8061604: ; 8061604 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, =sub_805FB08 + 1 + ldr r1, =sub_805FB08 str r1, [r0] @08061682: pop {r4-r6} @@ -171629,13 +171629,13 @@ sub_8061690: ; 8061690 lsls r0, 2 adds r4, 0x1C adds r0, r4 - ldr r1, =sub_805D7AC + 1 + ldr r1, =sub_805D7AC str r1, [r0] ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, =sub_805F1D0 + 1 + ldr r1, =sub_805F1D0 str r1, [r0] pop {r3,r4} mov r8, r3 @@ -171866,13 +171866,13 @@ sub_80618D8: ; 80618D8 lsls r0, 2 adds r4, 0x1C adds r0, r4 - ldr r1, =sub_805D7AC + 1 + ldr r1, =sub_805D7AC str r1, [r0] ldr r1, =0x03005d60 ldrb r0, [r6] lsls r0, 2 adds r0, r1 - ldr r1, =sub_805F208 + 1 + ldr r1, =sub_805F208 str r1, [r0] pop {r3} mov r8, r3 @@ -171934,7 +171934,7 @@ sub_8061AF0: ; 8061AF0 adds r1, r5, 0 adds r1, 0x1C adds r0, r1 - ldr r1, =sub_80A6EEC + 1 + ldr r1, =sub_80A6EEC str r1, [r0] ldrb r0, [r4] adds r0, r6 @@ -171943,13 +171943,13 @@ sub_8061AF0: ; 8061AF0 adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, =nullsub_12 + 1 + ldr r1, =nullsub_12 bl oamt_set_x3A_32 ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =sub_805F240 + 1 + ldr r1, =sub_805F240 str r1, [r0] pop {r4-r6} pop {r0} @@ -172021,13 +172021,13 @@ sub_8061B9C: ; 8061B9C lsls r0, 2 adds r2, 0x1C adds r0, r2 - ldr r1, =sub_8039934 + 1 + ldr r1, =sub_8039934 str r1, [r0] ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, =sub_805FAC4 + 1 + ldr r1, =sub_805FAC4 str r1, [r0] @08061C2C: pop {r4-r6} @@ -172198,7 +172198,7 @@ sub_8061C78: ; 8061C78 ldrb r0, [r6] lsls r0, 2 adds r0, r1 - ldr r1, =bx_move_anim_7 + 1 + ldr r1, =bx_move_anim_7 str r1, [r0] @08061D9E: pop {r4-r6} @@ -172416,7 +172416,7 @@ sub_8061F34: ; 8061F34 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, =bx_t7_button_a + 1 + ldr r1, =bx_t7_button_a str r1, [r0] ldrb r0, [r5] ldrh r1, [r4] @@ -172889,7 +172889,7 @@ sub_8062294: ; 8062294 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, =sub_805FA70 + 1 + ldr r1, =sub_805FA70 str r1, [r0] add sp, 0x4 pop {r3,r4} @@ -172950,7 +172950,7 @@ sub_8062390: ; 8062390 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =sub_805FEB8 + 1 + ldr r1, =sub_805FEB8 str r1, [r0] @080623E4: pop {r4} @@ -172998,7 +172998,7 @@ sub_8062408: ; 8062408 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, =sub_805FEB8 + 1 + ldr r1, =sub_805FEB8 str r1, [r0] @08062458: pop {r4,r5} @@ -173200,7 +173200,7 @@ dp01t_29_7_blink: ; 8062570 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =bx_blink_t7 + 1 + ldr r1, =bx_blink_t7 str r1, [r0] @080625CE: pop {r4} @@ -173397,7 +173397,7 @@ sub_80626FC: ; 80626FC adds r1, r4, 0 adds r1, 0x1C adds r0, r1 - ldr r1, =sub_80A6EEC + 1 + ldr r1, =sub_80A6EEC str r1, [r0] ldrb r0, [r6] adds r0, r5 @@ -173406,9 +173406,9 @@ sub_80626FC: ; 80626FC adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, =sub_806280C + 1 + ldr r1, =sub_806280C bl oamt_set_x3A_32 - ldr r0, =sub_8062828 + 1 + ldr r0, =sub_8062828 movs r1, 0x5 bl AddTask lsls r0, 24 @@ -173440,7 +173440,7 @@ sub_80626FC: ; 80626FC adds r0, r1 lsls r0, 3 adds r0, r4 - ldr r1, =sub_8073C30 + 1 + ldr r1, =sub_8073C30 str r1, [r0] @080627BE: ldr r0, [r3] @@ -173453,7 +173453,7 @@ sub_80626FC: ; 80626FC ldrb r0, [r6] lsls r0, 2 adds r0, r1 - ldr r1, =nullsub_26 + 1 + ldr r1, =nullsub_26 str r1, [r0] pop {r4-r6} pop {r0} @@ -173566,7 +173566,7 @@ sub_8062828: ; 8062828 ldrb r0, [r2] lsls r0, 2 adds r0, r1 - ldr r1, =sub_805F560 + 1 + ldr r1, =sub_805F560 str r1, [r0] mov r0, r9 strb r0, [r2] @@ -173700,7 +173700,7 @@ dp01t_30_7_0803D67C: ; 8062918 ldrb r1, [r7] lsls r1, 2 adds r1, r0 - ldr r0, =bx_0803D790_t7 + 1 + ldr r0, =bx_0803D790_t7 str r0, [r1] @08062A12: pop {r4-r7} @@ -173772,7 +173772,7 @@ sub_8062A74: ; 8062A74 adds r0, r1 lsls r0, 3 adds r0, r2 - ldr r1, =sub_8073C30 + 1 + ldr r1, =sub_8073C30 str r1, [r0] @08062AA6: bl dp01_tbl7_exec_completed @@ -173874,7 +173874,7 @@ dp01t_34_7_move_anim_start_t3: ; 8062B30 ldrb r1, [r6] lsls r1, 2 adds r1, r0 - ldr r0, =bx_803B0F4 + 1 + ldr r0, =bx_803B0F4 str r0, [r1] @08062B88: add sp, 0x4 @@ -176830,7 +176830,7 @@ sub_8064394: ; 8064394 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, =sub_80643B0 + 1 + ldr r1, =sub_80643B0 str r1, [r0] bx lr .align 2, 0 @@ -176888,7 +176888,7 @@ sub_8064400: ; 8064400 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 bne @08064424 bl sub_8065068 @@ -176914,7 +176914,7 @@ sub_8064438: ; 8064438 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 bne @0806445C bl sub_8065068 @@ -176941,7 +176941,7 @@ sub_8064470: ; 8064470 adds r0, 0x1C adds r0, r2, r0 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 bne @080644C2 adds r0, r2, r5 @@ -177044,7 +177044,7 @@ sub_8064520: ; 8064520 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 adds r7, r3, 0 cmp r1, r0 bne @080645C2 @@ -177065,7 +177065,7 @@ sub_8064520: ; 8064520 adds r5, 0x1C adds r0, r5 ldr r3, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 adds r7, r2, 0 cmp r3, r0 bne @080645C0 @@ -177240,7 +177240,7 @@ sub_8064520: ; 8064520 ldrb r0, [r3] lsls r0, 2 adds r0, r1 - ldr r1, =sub_80644D8 + 1 + ldr r1, =sub_80644D8 str r1, [r0] @08064714: pop {r3} @@ -177528,7 +177528,7 @@ sub_8064734: ; 8064734 adds r2, 0x1C adds r0, r2 ldr r4, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r4, r0 beq @08064982 b @08064AC0 @@ -177685,7 +177685,7 @@ sub_8064734: ; 8064734 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8064520 + 1 + ldr r1, =sub_8064520 str r1, [r0] @08064AC0: pop {r3-r5} @@ -177715,7 +177715,7 @@ sub_8064B04: ; 8064B04 adds r0, 0x1C adds r0, r2, r0 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 bne @08064BB6 adds r0, r2, r4 @@ -177992,7 +177992,7 @@ sub_8064D60: ; 8064D60 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 bne @08064DAC ldr r0, =0x020244d0 @@ -178015,7 +178015,7 @@ sub_8064D60: ; 8064D60 ldrb r1, [r4] lsls r1, 2 adds r1, r0 - ldr r0, =sub_8064DD0 + 1 + ldr r0, =sub_8064DD0 str r0, [r1] @08064DAC: pop {r4} @@ -178057,10 +178057,10 @@ sub_8064DD0: ; 8064DD0 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 beq @08064E1A - ldr r0, =nullsub_18 + 1 + ldr r0, =nullsub_18 cmp r1, r0 bne @08064E2A @08064E1A: @@ -178106,7 +178106,7 @@ sub_8064E50: ; 8064E50 adds r1, 0x1C adds r0, r1 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 bne @08064F0C ldrb r1, [r3] @@ -178165,7 +178165,7 @@ sub_8064E50: ; 8064E50 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8064D60 + 1 + ldr r1, =sub_8064D60 str r1, [r0] @08064F0C: pop {r4-r7} @@ -178214,7 +178214,7 @@ sub_8064F40: ; 8064F40 adds r0, 0x1C adds r0, r3, r0 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 bne @08064FDC ldr r0, [r6] @@ -178250,7 +178250,7 @@ sub_8064F40: ; 8064F40 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8064E50 + 1 + ldr r1, =sub_8064E50 str r1, [r0] @08064FDC: pop {r4-r6} @@ -178319,7 +178319,7 @@ sub_8065068: ; 8065068 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =sub_80643B0 + 1 + ldr r1, =sub_80643B0 str r1, [r0] ldr r0, =0x02022fec ldr r0, [r0] @@ -180620,7 +180620,7 @@ sub_80662F8: ; 80662F8 ldrb r0, [r6] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8064B04 + 1 + ldr r1, =sub_8064B04 str r1, [r0] pop {r3-r5} mov r8, r3 @@ -180657,7 +180657,7 @@ sub_8066448: ; 8066448 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8064F40 + 1 + ldr r1, =sub_8064F40 str r1, [r0] pop {r4} pop {r0} @@ -180703,7 +180703,7 @@ sub_8066494: ; 8066494 lsls r0, 16 lsrs r0, 16 mov r8, r0 - ldr r0, =sub_805D714 + 1 + ldr r0, =sub_805D714 bl object_new_hidden_with_callback ldr r1, =0x03005d7c mov r10, r1 @@ -180815,7 +180815,7 @@ sub_8066494: ; 8066494 adds r1, r5, 0 adds r1, 0x1C adds r0, r1 - ldr r1, =nullsub_12 + 1 + ldr r1, =nullsub_12 str r1, [r0] movs r0, 0 movs r1, 0xFE @@ -180864,7 +180864,7 @@ sub_8066624: ; 8066624 ldrb r0, [r6] lsls r0, 2 adds r0, r1 - ldr r1, =sub_80666BC + 1 + ldr r1, =sub_80666BC str r1, [r0] b @080666A8 .align 2, 0 @@ -180965,7 +180965,7 @@ sub_80666BC: ; 80666BC ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8064C58 + 1 + ldr r1, =sub_8064C58 str r1, [r0] @0806673A: pop {r4-r6} @@ -181320,13 +181320,13 @@ sub_8066748: ; 8066748 lsls r0, 2 adds r4, 0x1C adds r0, r4 - ldr r1, =sub_805D7AC + 1 + ldr r1, =sub_805D7AC str r1, [r0] ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8064400 + 1 + ldr r1, =sub_8064400 str r1, [r0] pop {r3,r4} mov r8, r3 @@ -181454,13 +181454,13 @@ sub_8066A58: ; 8066A58 lsls r0, 2 adds r4, 0x1C adds r0, r4 - ldr r1, =sub_805D7AC + 1 + ldr r1, =sub_805D7AC str r1, [r0] ldr r1, =0x03005d60 ldrb r0, [r6] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8064438 + 1 + ldr r1, =sub_8064438 str r1, [r0] bl sub_8065068 pop {r3} @@ -181523,7 +181523,7 @@ sub_8066B94: ; 8066B94 adds r1, r5, 0 adds r1, 0x1C adds r0, r1 - ldr r1, =sub_80A6EEC + 1 + ldr r1, =sub_80A6EEC str r1, [r0] ldrb r0, [r4] adds r0, r6 @@ -181532,13 +181532,13 @@ sub_8066B94: ; 8066B94 adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, =nullsub_12 + 1 + ldr r1, =nullsub_12 bl oamt_set_x3A_32 ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8064470 + 1 + ldr r1, =sub_8064470 str r1, [r0] pop {r4-r6} pop {r0} @@ -181610,13 +181610,13 @@ sub_8066C40: ; 8066C40 lsls r0, 2 adds r2, 0x1C adds r0, r2 - ldr r1, =sub_8039934 + 1 + ldr r1, =sub_8039934 str r1, [r0] ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8064C14 + 1 + ldr r1, =sub_8064C14 str r1, [r0] @08066CD0: pop {r4-r6} @@ -181793,7 +181793,7 @@ sub_8066D1C: ; 8066D1C ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8066E70 + 1 + ldr r1, =sub_8066E70 str r1, [r0] ldrh r1, [r4] ldr r2, [r7] @@ -182017,7 +182017,7 @@ sub_8066FF4: ; 8066FF4 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8064CCC + 1 + ldr r1, =sub_8064CCC str r1, [r0] ldrh r0, [r4] bl sub_817C95C @@ -182169,7 +182169,7 @@ sub_80670A0: ; 80670A0 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8064BC0 + 1 + ldr r1, =sub_8064BC0 str r1, [r0] add sp, 0x4 pop {r3,r4} @@ -182230,7 +182230,7 @@ sub_806719C: ; 806719C ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8065008 + 1 + ldr r1, =sub_8065008 str r1, [r0] @080671F0: pop {r4} @@ -182278,7 +182278,7 @@ sub_8067214: ; 8067214 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8065008 + 1 + ldr r1, =sub_8065008 str r1, [r0] @08067264: pop {r4,r5} @@ -182480,7 +182480,7 @@ sub_806737C: ; 806737C ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8064CE4 + 1 + ldr r1, =sub_8064CE4 str r1, [r0] @080673DA: pop {r4} @@ -182677,7 +182677,7 @@ sub_8067508: ; 8067508 adds r1, r4, 0 adds r1, 0x1C adds r0, r1 - ldr r1, =sub_80A6EEC + 1 + ldr r1, =sub_80A6EEC str r1, [r0] ldrb r0, [r6] adds r0, r5 @@ -182686,9 +182686,9 @@ sub_8067508: ; 8067508 adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, =sub_80676FC + 1 + ldr r1, =sub_80676FC bl oamt_set_x3A_32 - ldr r0, =c3_08038DC4 + 1 + ldr r0, =c3_08038DC4 movs r1, 0x5 bl AddTask lsls r0, 24 @@ -182720,7 +182720,7 @@ sub_8067508: ; 8067508 adds r0, r1 lsls r0, 3 adds r0, r4 - ldr r1, =sub_8073C30 + 1 + ldr r1, =sub_8073C30 str r1, [r0] @080675CA: ldr r0, [r3] @@ -182733,7 +182733,7 @@ sub_8067508: ; 8067508 ldrb r0, [r6] lsls r0, 2 adds r0, r1 - ldr r1, =nullsub_28 + 1 + ldr r1, =nullsub_28 str r1, [r0] pop {r4-r6} pop {r0} @@ -182826,7 +182826,7 @@ c3_08038DC4: ; 8067618 ldrb r0, [r2] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8064734 + 1 + ldr r1, =sub_8064734 str r1, [r0] mov r0, r9 strb r0, [r2] @@ -182975,7 +182975,7 @@ sub_8067718: ; 8067718 ldrb r1, [r7] lsls r1, 2 adds r1, r0 - ldr r0, =sub_806782C + 1 + ldr r0, =sub_806782C str r0, [r1] @08067812: pop {r4-r7} @@ -183047,7 +183047,7 @@ sub_8067874: ; 8067874 adds r0, r1 lsls r0, 3 adds r0, r2 - ldr r1, =sub_8073C30 + 1 + ldr r1, =sub_8073C30 str r1, [r0] @080678A6: bl sub_8065068 @@ -183150,7 +183150,7 @@ sub_8067930: ; 8067930 ldrb r1, [r5] lsls r1, 2 adds r1, r0 - ldr r0, =sub_8065038 + 1 + ldr r0, =sub_8065038 str r0, [r1] @0806798C: adds r0, r6, 0 @@ -183244,7 +183244,7 @@ sub_80679D0: ; 80679D0 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =sub_80587B0 + 1 + ldr r1, =sub_80587B0 str r1, [r0] pop {r4,r5} pop {r0} @@ -196957,7 +196957,7 @@ sub_806E694: ; 806E694 lsrs r4, 16 bl map_music_set_to_zero bl m4aMPlayAllStop - ldr r0, =sub_806E6CC + 1 + ldr r0, =sub_806E6CC movs r1, 0 bl AddTask lsls r0, 24 @@ -197845,7 +197845,7 @@ sub_806ED40: ; 806ED40 adds r0, r4, 0 bl cry_related @0806ED7C: - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 b @0806EDFA .align 2, 0 .pool @@ -197871,7 +197871,7 @@ sub_806ED40: ; 806ED40 ldrb r0, [r6] cmp r0, 0 beq @0806EDEC - ldr r0, =sub_806EC70 + 1 + ldr r0, =sub_806EC70 movs r1, 0 bl AddTask lsls r0, 24 @@ -197900,7 +197900,7 @@ sub_806ED40: ; 806ED40 adds r0, r5, 0 bl sub_817F544 @0806EDF8: - ldr r0, =nullsub_18 + 1 + ldr r0, =nullsub_18 @0806EDFA: str r0, [r5, 0x1C] pop {r4-r6} @@ -197934,7 +197934,7 @@ sub_806EE0C: ; 806EE0C ldrb r0, [r6] cmp r0, 0 beq @0806EE80 - ldr r0, =sub_806ECAC + 1 + ldr r0, =sub_806ECAC movs r1, 0 bl AddTask lsls r0, 24 @@ -197976,7 +197976,7 @@ sub_806EE0C: ; 806EE0C thumb_func_start sub_806EE98 sub_806EE98: ; 806EE98 push {lr} - ldr r0, =sub_806ECAC + 1 + ldr r0, =sub_806ECAC bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -198008,7 +198008,7 @@ sub_806EEB4: ; 806EEB4 ands r0, r1 cmp r0, 0 bne @0806EEE8 - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 b @0806EEFC .align 2, 0 .pool @@ -198020,7 +198020,7 @@ sub_806EEB4: ; 806EEB4 lsrs r1, 24 adds r0, r4, 0 bl sub_817F594 - ldr r0, =nullsub_18 + 1 + ldr r0, =nullsub_18 @0806EEFC: str r0, [r4, 0x1C] pop {r4} @@ -202796,7 +202796,7 @@ sub_80712C0: ; 80712C0 adds r0, r4, 0 movs r1, 0x3 bl Window_CopyToVram - ldr r0, =c3_080469FC + 1 + ldr r0, =c3_080469FC movs r1, 0x3 bl AddTask lsls r0, 24 @@ -202821,7 +202821,7 @@ sub_8071330: ; 8071330 push {lr} bl sub_81B9328 ldr r1, =0x030022c0 - ldr r0, =c2_exit_to_overworld_2_switch + 1 + ldr r0, =c2_exit_to_overworld_2_switch str r0, [r1, 0x8] pop {r0} bx r0 @@ -203272,7 +203272,7 @@ sub_807163C: ; 807163C strb r0, [r2] adds r4, 0x1C adds r1, r4 - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r1] @08071712: adds r0, r7, 0 @@ -203300,7 +203300,7 @@ sub_807172C: ; 807172C sub_8071740: ; 8071740 push {lr} bl script_env_2_enable - ldr r0, =sub_8071760 + 1 + ldr r0, =sub_8071760 movs r1, 0xA bl AddTask movs r0, 0x1 @@ -203324,10 +203324,10 @@ sub_8071760: ; 8071760 cmp r0, 0 bne @08071788 bl overworld_free_bg_tilemaps - ldr r0, =c1_hatching_egg + 1 + ldr r0, =c1_hatching_egg bl set_callback2 ldr r1, =0x03005dac - ldr r0, =sub_80AF168 + 1 + ldr r0, =sub_80AF168 str r0, [r1] adds r0, r4, 0 bl remove_task @@ -203386,7 +203386,7 @@ c1_hatching_egg: ; 80717A0 strb r0, [r2, 0x4] ldr r0, [r4] strb r1, [r0, 0x7] - ldr r0, =sub_807172C + 1 + ldr r0, =sub_807172C bl SetVBlankCallback bl current_map_music_get ldr r1, =0x020375e2 @@ -203548,7 +203548,7 @@ c1_hatching_egg: ; 80717A0 .align 2, 0 .pool @080719C8: - ldr r0, =sub_8071A94 + 1 + ldr r0, =sub_8071A94 bl set_callback2 ldr r0, =0x03000de0 ldr r1, [r0] @@ -203584,7 +203584,7 @@ sub_80719FC: ; 80719FC ldr r0, =0x03000de0 ldr r0, [r0] bl free - ldr r0, =c2_exit_to_overworld_2_switch + 1 + ldr r0, =c2_exit_to_overworld_2_switch bl set_callback2 pop {r0} bx r0 @@ -203697,7 +203697,7 @@ sub_8071A94: ; 8071A94 ldrb r0, [r1, 0x2] adds r0, 0x1 strb r0, [r1, 0x2] - ldr r0, =c3_080472E4 + 1 + ldr r0, =c3_080472E4 movs r1, 0x5 bl AddTask b @08071E06 @@ -203747,7 +203747,7 @@ sub_8071A94: ; 8071A94 lsls r0, 2 adds r2, 0x1C adds r0, r2 - ldr r1, =sub_8071E34 + 1 + ldr r1, =sub_8071E34 str r1, [r0] b @08071E06 .align 2, 0 @@ -203763,7 +203763,7 @@ sub_8071A94: ; 8071A94 adds r1, 0x1C adds r0, r1 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 beq @08071BBC b @08071E06 @@ -203801,7 +203801,7 @@ sub_8071A94: ; 8071A94 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 beq @08071C12 b @08071E06 @@ -203971,7 +203971,7 @@ sub_8071A94: ; 8071A94 movs r2, 0 bl pokemon_getattr str r0, [sp] - ldr r0, =sub_80719FC + 1 + ldr r0, =sub_80719FC str r0, [sp, 0x4] movs r0, 0x3 mov r1, r9 @@ -204017,7 +204017,7 @@ sub_8071A94: ; 8071A94 bl bg_unset_tilemap ldr r0, [r4] bl free - ldr r0, =c2_exit_to_overworld_2_switch + 1 + ldr r0, =c2_exit_to_overworld_2_switch bl set_callback2 @08071E06: bl run_active_tasks @@ -204047,7 +204047,7 @@ sub_8071E34: ; 8071E34 asrs r0, 16 cmp r0, 0x14 ble @08071E54 - ldr r0, =sub_8071E8C + 1 + ldr r0, =sub_8071E8C str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x2E] @@ -204100,7 +204100,7 @@ sub_8071E8C: ; 8071E8C asrs r0, 16 cmp r0, 0x14 ble @08071EBC - ldr r0, =sub_8071EF0 + 1 + ldr r0, =sub_8071EF0 str r0, [r4, 0x1C] strh r1, [r4, 0x2E] strh r1, [r4, 0x32] @@ -204152,7 +204152,7 @@ sub_8071EF0: ; 8071EF0 asrs r0, 16 cmp r0, 0x26 ble @08071F5C - ldr r0, =sub_8071FA4 + 1 + ldr r0, =sub_8071FA4 str r0, [r4, 0x1C] strh r5, [r4, 0x2E] ldr r4, =0x03000de0 @@ -204227,7 +204227,7 @@ sub_8071FA4: ; 8071FA4 asrs r0, 16 cmp r0, 0x32 ble @08071FBE - ldr r0, =sub_8071FC8 + 1 + ldr r0, =sub_8071FC8 str r0, [r1, 0x1C] movs r0, 0 strh r0, [r1, 0x2E] @@ -204290,7 +204290,7 @@ sub_8071FC8: ; 8071FC8 movs r1, 0x4 orrs r0, r1 strb r0, [r2] - ldr r0, =sub_8072048 + 1 + ldr r0, =sub_8072048 str r0, [r5, 0x1C] strh r4, [r5, 0x2E] @08072032: @@ -204368,7 +204368,7 @@ sub_8072048: ; 8072048 ldrsh r0, [r5, r2] cmp r0, 0x28 ble @080720CA - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r5, 0x1C] @080720CA: adds r0, r1, 0x1 @@ -205037,7 +205037,7 @@ battle_make_oam_normal_battle: ; 80724DC strh r6, [r1, 0x38] adds r2, 0x1C adds r0, r2 - ldr r1, =sub_8072924 + 1 + ldr r1, =sub_8072924 str r1, [r0] b @08072718 .align 2, 0 @@ -205106,7 +205106,7 @@ battle_make_oam_normal_battle: ; 80724DC strh r0, [r3, 0x4] adds r4, 0x1C adds r2, r4 - ldr r0, =sub_8072924 + 1 + ldr r0, =sub_8072924 str r0, [r2] movs r0, 0x1 b @08072716 @@ -205171,7 +205171,7 @@ battle_make_oam_normal_battle: ; 80724DC strh r0, [r3, 0x4] adds r4, 0x1C adds r2, r4 - ldr r0, =sub_8072924 + 1 + ldr r0, =sub_8072924 str r0, [r2] movs r0, 0x2 @08072716: @@ -205334,7 +205334,7 @@ battle_make_oam_safari_battle: ; 8072804 movs r0, 0x1C add r9, r0 add r3, r9 - ldr r0, =sub_8072924 + 1 + ldr r0, =sub_8072924 str r0, [r3] adds r0, r6, 0 pop {r3,r4} @@ -206668,7 +206668,7 @@ sub_8073314: ; 8073314 adds r1, 0x1C adds r0, r1 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 beq @08073354 b @080735A8 @@ -207121,7 +207121,7 @@ sub_80735DC: ; 80735DC lsls r1, 2 ldr r2, =0x0202064c adds r1, r2 - ldr r0, =sub_80741C8 + 1 + ldr r0, =sub_80741C8 str r0, [r1] @0807374C: ldr r4, =0x02020630 @@ -207653,7 +207653,7 @@ sub_80735DC: ; 80735DC cmp r7, 0x5 ble @08073ABC @08073B9A: - ldr r0, =nullsub_4 + 1 + ldr r0, =nullsub_4 movs r1, 0x5 bl AddTask lsls r0, 24 @@ -207859,7 +207859,7 @@ sub_8073C30: ; 8073C30 adds r0, r1 lsls r0, 2 adds r0, r3 - ldr r1, =sub_8074158 + 1 + ldr r1, =sub_8074158 str r1, [r0] ldr r2, =0x02020630 mov r12, r2 @@ -207890,7 +207890,7 @@ sub_8073C30: ; 8073C30 adds r0, r1 lsls r0, 2 adds r0, r3 - ldr r1, =sub_8074158 + 1 + ldr r1, =sub_8074158 str r1, [r0] ldr r0, =0x02020630 mov r12, r0 @@ -207916,7 +207916,7 @@ sub_8073C30: ; 8073C30 mov r1, r12 adds r1, 0x1C adds r3, r1 - ldr r1, =sub_8074090 + 1 + ldr r1, =sub_8074090 str r1, [r3] ldr r1, =gUnknown_0832C2CC bl obj_set_f18_to_r0_f42_to_40 @@ -207925,7 +207925,7 @@ sub_8073C30: ; 8073C30 add r0, r8 lsls r0, 3 adds r0, r1 - ldr r1, =task_battle_throw_own_ball + 1 + ldr r1, =task_battle_throw_own_ball str r1, [r0] b @08073DEE .align 2, 0 @@ -207936,7 +207936,7 @@ sub_8073C30: ; 8073C30 add r1, r8 lsls r1, 3 adds r1, r0 - ldr r0, =sub_8073F98 + 1 + ldr r0, =sub_8073F98 str r0, [r1] @08073DEE: add sp, 0x18 @@ -207989,7 +207989,7 @@ task_battle_throw_own_ball: ; 8073E08 ldrsh r0, [r4, r1] cmp r0, 0 bne @08073E54 - ldr r0, =sub_8073E64 + 1 + ldr r0, =sub_8073E64 str r0, [r4] @08073E54: pop {r4} @@ -208382,7 +208382,7 @@ sub_80740C4: ; 80740C4 movs r0, 0x73 bl sub_80A3808 @0807414A: - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r4, 0x1C] @0807414E: pop {r4} @@ -208445,7 +208445,7 @@ sub_8074158: ; 8074158 movs r1, 0x4 orrs r0, r1 strb r0, [r2] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r3, 0x1C] @080741BC: pop {r4} @@ -210504,7 +210504,7 @@ sub_807521C: ; 807521C ldr r0, =gUnknown_0831C628 bl gpu_pal_obj_decompress_and_apply3 @0807524E: - ldr r0, =sub_8075370 + 1 + ldr r0, =sub_8075370 bl object_new_hidden_with_callback mov r8, r0 mov r0, r8 @@ -210650,7 +210650,7 @@ sub_8075370: ; 8075370 .align 2, 0 .pool @080753A4: - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r4, 0x1C] @080753A8: pop {r4} @@ -210714,7 +210714,7 @@ sub_80753E8: ; 80753E8 movs r2, 0x8 orrs r1, r2 strb r1, [r0] - ldr r0, =sub_8075450 + 1 + ldr r0, =sub_8075450 movs r1, 0x5 bl AddTask lsls r0, 24 @@ -210841,7 +210841,7 @@ sub_8075450: ; 8075450 mov r0, r9 adds r0, 0x1C adds r0, r6, r0 - ldr r1, =sub_80761B4 + 1 + ldr r1, =sub_80761B4 str r1, [r0] b @08075592 .align 2, 0 @@ -210867,7 +210867,7 @@ sub_8075450: ; 8075450 mov r0, r9 adds r0, 0x1C adds r0, r6, r0 - ldr r1, =sub_8076398 + 1 + ldr r1, =sub_8076398 str r1, [r0] b @08075592 .align 2, 0 @@ -210926,7 +210926,7 @@ sub_8075450: ; 8075450 adds r0, r1 ldrb r1, [r5] strh r1, [r0, 0x10] - ldr r1, =nullsub_4 + 1 + ldr r1, =nullsub_4 str r1, [r0] movs r0, 0x3D bl audio_play @@ -211016,7 +211016,7 @@ objc_0804ABD4: ; 8075620 strh r0, [r7, 0x3C] adds r0, r6, 0 bl remove_task - ldr r0, =sub_80756D4 + 1 + ldr r0, =sub_80756D4 str r0, [r7, 0x1C] @080756C0: add sp, 0x4 @@ -211031,7 +211031,7 @@ objc_0804ABD4: ; 8075620 thumb_func_start sub_80756D4 sub_80756D4: ; 80756D4 - ldr r1, =sub_80756E0 + 1 + ldr r1, =sub_80756E0 str r1, [r0, 0x1C] bx lr .align 2, 0 @@ -211051,7 +211051,7 @@ sub_80756E0: ; 80756E0 cmp r0, 0xA bne @0807573A strh r7, [r6, 0x38] - ldr r0, =sub_807574C + 1 + ldr r0, =sub_807574C str r0, [r6, 0x1C] ldr r5, =0x020241e4 movs r1, 0x3A @@ -211139,7 +211139,7 @@ sub_807574C: ; 807574C strb r1, [r0] movs r0, 0 strh r0, [r4, 0x38] - ldr r0, =sub_80757E4 + 1 + ldr r0, =sub_80757E4 str r0, [r4, 0x1C] b @080757DC .align 2, 0 @@ -211201,7 +211201,7 @@ sub_80757E4: ; 80757E4 bl cosine negs r0, r0 strh r0, [r4, 0x26] - ldr r0, =sub_8075838 + 1 + ldr r0, =sub_8075838 str r0, [r4, 0x1C] @0807582C: pop {r4} @@ -211322,13 +211322,13 @@ sub_8075838: ; 8075838 ldrsh r0, [r4, r2] cmp r0, 0 bne @0807591C - ldr r0, =sub_8075D14 + 1 + ldr r0, =sub_8075D14 str r0, [r4, 0x1C] b @08075926 .align 2, 0 .pool @0807591C: - ldr r0, =sub_8075930 + 1 + ldr r0, =sub_8075930 str r0, [r4, 0x1C] movs r0, 0x1 strh r0, [r4, 0x36] @@ -211363,7 +211363,7 @@ sub_8075930: ; 8075930 adds r0, r4, 0 movs r1, 0x1 bl sub_8008258 - ldr r0, =sub_8075970 + 1 + ldr r0, =sub_8075970 str r0, [r4, 0x1C] movs r0, 0x17 bl audio_play @@ -211480,7 +211480,7 @@ sub_8075970: ; 8075970 ldrsh r1, [r4, r2] cmp r0, r1 bne @08075A48 - ldr r0, =sub_8075D14 + 1 + ldr r0, =sub_8075D14 str r0, [r4, 0x1C] b @08075AB6 .align 2, 0 @@ -211490,7 +211490,7 @@ sub_8075970: ; 8075970 bne @08075A5C cmp r0, 0x3 bne @08075A5C - ldr r0, =sub_8075FB4 + 1 + ldr r0, =sub_8075FB4 str r0, [r4, 0x1C] b @08075A62 .align 2, 0 @@ -211860,7 +211860,7 @@ sub_8075D14: ; 8075D14 lsls r0, 24 lsrs r0, 24 strh r0, [r6, 0x2E] - ldr r0, =sub_8075FD4 + 1 + ldr r0, =sub_8075FD4 str r0, [r6, 0x1C] ldr r0, =0x030022c0 ldr r1, =0x00000439 @@ -212002,7 +212002,7 @@ sub_8075D14: ; 8075D14 movs r2, 0x40 orrs r0, r2 strb r0, [r1, 0x1] - ldr r0, =c3_0804B070 + 1 + ldr r0, =c3_0804B070 movs r1, 0x3 bl AddTask lsls r0, 24 @@ -212062,7 +212062,7 @@ sub_8075D14: ; 8075D14 adds r1, r5, 0 adds r1, 0x1C adds r0, r1 - ldr r1, =sub_8039B58 + 1 + ldr r1, =sub_8039B58 b @08075F66 .align 2, 0 .pool @@ -212077,7 +212077,7 @@ sub_8075D14: ; 8075D14 adds r1, r5, 0 adds r1, 0x1C adds r0, r1 - ldr r1, =sub_8039E44 + 1 + ldr r1, =sub_8039E44 @08075F66: str r1, [r0] ldr r5, =0x020241e4 @@ -212122,7 +212122,7 @@ sub_8075FB4: ; 8075FB4 movs r2, 0x40 orrs r1, r2 strb r1, [r3] - ldr r1, =sub_80760F8 + 1 + ldr r1, =sub_80760F8 str r1, [r0, 0x1C] movs r1, 0 strh r1, [r0, 0x34] @@ -212387,7 +212387,7 @@ sub_80761B4: ; 80761B4 strh r0, [r4, 0x6] adds r0, r4, 0 bl sub_80A68D4 - ldr r0, =sub_8076204 + 1 + ldr r0, =sub_8076204 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -212556,12 +212556,12 @@ sub_8076204: ; 8076204 lsrs r0, 24 cmp r4, r0 bne @08076358 - ldr r0, =sub_8076374 + 1 + ldr r0, =sub_8076374 b @0807635A .align 2, 0 .pool @08076358: - ldr r0, =sub_8075D14 + 1 + ldr r0, =sub_8075D14 @0807635A: str r0, [r5, 0x1C] adds r0, r5, 0 @@ -212590,7 +212590,7 @@ sub_8076374: ; 8076374 ble @0807638E movs r0, 0 strh r0, [r2, 0x2E] - ldr r0, =sub_8075D14 + 1 + ldr r0, =sub_8075D14 str r0, [r2, 0x1C] @0807638E: pop {r0} @@ -212632,12 +212632,12 @@ sub_8076398: ; 8076398 lsrs r0, 24 cmp r4, r0 bne @080763E8 - ldr r0, =sub_8076374 + 1 + ldr r0, =sub_8076374 b @080763EA .align 2, 0 .pool @080763E8: - ldr r0, =sub_8075D14 + 1 + ldr r0, =sub_8075D14 @080763EA: str r0, [r5, 0x1C] @080763EC: @@ -212777,7 +212777,7 @@ sub_8076438: ; 8076438 movs r0, 0x1C add r8, r0 add r4, r8 - ldr r0, =sub_8076524 + 1 + ldr r0, =sub_8076524 str r0, [r4] adds r1, 0x3E ldrb r0, [r1] @@ -212853,7 +212853,7 @@ sub_8076524: ; 8076524 lsrs r0, 24 movs r5, 0 strh r0, [r6, 0x30] - ldr r0, =sub_80765E0 + 1 + ldr r0, =sub_80765E0 str r0, [r6, 0x1C] ldr r0, =0x02020630 lsls r4, r7, 4 @@ -213125,7 +213125,7 @@ sub_807671C: ; 807671C strb r1, [r2, 0x5] adds r6, 0x1C adds r3, r6 - ldr r1, =sub_80767D4 + 1 + ldr r1, =sub_80767D4 str r1, [r3] pop {r3-r5} mov r8, r3 @@ -213195,7 +213195,7 @@ sub_80767D4: ; 80767D4 lsrs r0, 24 movs r5, 0 strh r0, [r4, 0x30] - ldr r0, =sub_807687C + 1 + ldr r0, =sub_807687C str r0, [r4, 0x1C] lsls r4, r7, 4 adds r4, r7 @@ -213261,7 +213261,7 @@ sub_807687C: ; 807687C strb r0, [r2] movs r0, 0 strh r0, [r5, 0x38] - ldr r0, =sub_80768F0 + 1 + ldr r0, =sub_80768F0 str r0, [r5, 0x1C] b @080768E8 .align 2, 0 @@ -213291,7 +213291,7 @@ sub_80768F0: ; 80768F0 ands r0, r1 cmp r0, 0 beq @08076904 - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r2, 0x1C] @08076904: pop {r0} @@ -213329,7 +213329,7 @@ sub_8076918: ; 8076918 movs r0, 0x73 strh r0, [r4, 0x24] strh r1, [r4, 0x26] - ldr r0, =sub_80769CC + 1 + ldr r0, =sub_80769CC str r0, [r4, 0x1C] adds r0, r5, 0 bl battle_side_get_owner @@ -213366,7 +213366,7 @@ sub_8076918: ; 8076918 lsrs r0, 24 cmp r0, 0x2 bne @08076990 - ldr r0, =sub_80769A8 + 1 + ldr r0, =sub_80769A8 str r0, [r4, 0x1C] @08076990: pop {r4-r6} @@ -213389,7 +213389,7 @@ sub_80769A8: ; 80769A8 bne @080769C2 movs r0, 0 strh r0, [r1, 0x30] - ldr r0, =sub_80769CC + 1 + ldr r0, =sub_80769CC str r0, [r1, 0x1C] @080769C2: pop {r0} @@ -213413,7 +213413,7 @@ sub_80769CC: ; 80769CC ldr r0, [r2, 0x24] cmp r0, 0 bne @080769EA - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r2, 0x1C] @080769EA: pop {r0} @@ -213428,7 +213428,7 @@ sub_80769F4: ; 80769F4 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r5, =oamc_804BEB4 + 1 + ldr r5, =oamc_804BEB4 adds r0, r5, 0 bl object_new_hidden_with_callback lsls r0, 24 @@ -214554,7 +214554,7 @@ sub_80772A4: ; 80772A4 movs r1, 0x80 orrs r0, r1 strb r0, [r2, 0x8] - ldr r0, =sub_807811C + 1 + ldr r0, =sub_807811C bl SetVBlankCallback ldr r4, =gUnknown_0860F074 adds r0, r4, 0 @@ -214654,7 +214654,7 @@ sub_80772A4: ; 80772A4 thumb_func_start sub_80773AC sub_80773AC: ; 80773AC push {lr} - ldr r0, =sub_80773D0 + 1 + ldr r0, =sub_80773D0 bl set_callback2 ldr r0, =0x030022c0 movs r1, 0 @@ -214802,7 +214802,7 @@ sub_80773D0: ; 80773D0 ldrb r1, [r0] adds r1, 0x1 strb r1, [r0] - ldr r0, =task00_08081A90 + 1 + ldr r0, =task00_08081A90 movs r1, 0x1 bl AddTask b @08077B46 @@ -215026,7 +215026,7 @@ sub_80773D0: ; 80773D0 str r0, [sp, 0x4] str r1, [sp, 0x8] adds r0, r5, 0 - ldr r1, =sub_80D3014 + 1 + ldr r1, =sub_80D3014 bl sub_80D2CC4 mov r2, r8 ldr r1, [r2] @@ -215085,7 +215085,7 @@ sub_80773D0: ; 80773D0 movs r0, 0 str r0, [sp, 0x8] adds r0, r5, 0 - ldr r1, =sub_80D3014 + 1 + ldr r1, =sub_80D3014 bl sub_80D2CC4 mov r2, r8 ldr r1, [r2] @@ -215480,9 +215480,9 @@ sub_80773D0: ; 80773D0 ands r0, r1 cmp r0, 0 bne @08077B46 - ldr r0, =sub_8078C34 + 1 + ldr r0, =sub_8078C34 str r0, [r3] - ldr r0, =sub_807825C + 1 + ldr r0, =sub_807825C bl set_callback2 @08077B46: bl run_remoboxes @@ -215662,7 +215662,7 @@ sub_8077B74: ; 8077B74 str r0, [sp, 0x4] str r1, [sp, 0x8] adds r0, r5, 0 - ldr r1, =sub_80D3014 + 1 + ldr r1, =sub_80D3014 bl sub_80D2CC4 mov r2, r8 ldr r1, [r2] @@ -215721,7 +215721,7 @@ sub_8077B74: ; 8077B74 movs r0, 0 str r0, [sp, 0x8] adds r0, r5, 0 - ldr r1, =sub_80D3014 + 1 + ldr r1, =sub_80D3014 bl sub_80D2CC4 mov r2, r8 ldr r1, [r2] @@ -216114,7 +216114,7 @@ sub_8077B74: ; 8077B74 ands r0, r1 cmp r0, 0 bne @080780F6 - ldr r0, =sub_807825C + 1 + ldr r0, =sub_807825C bl set_callback2 @080780F6: bl run_active_tasks @@ -216223,7 +216223,7 @@ sub_807816C: ; 807816C sub_80781C8: ; 80781C8 push {r4,r5,lr} ldr r5, =0x030022c0 - ldr r0, =sub_80773AC + 1 + ldr r0, =sub_80773AC str r0, [r5, 0x8] ldr r0, =0x030030fc ldrb r0, [r0] @@ -216243,7 +216243,7 @@ sub_80781C8: ; 80781C8 movs r0, 0 str r0, [r5] bl sub_800E084 - ldr r0, =sub_807AE50 + 1 + ldr r0, =sub_807AE50 bl set_callback2 b @08078244 .align 2, 0 @@ -216261,7 +216261,7 @@ sub_80781C8: ; 80781C8 ldr r0, [r0] bl free str r4, [r5] - ldr r0, =sub_807AE50 + 1 + ldr r0, =sub_807AE50 bl set_callback2 @08078244: pop {r4,r5} @@ -217973,7 +217973,7 @@ sub_807905C: ; 807905C subs r3, 0x1 lsls r3, 24 lsrs r3, 24 - ldr r0, =sub_8077B74 + 1 + ldr r0, =sub_8077B74 str r0, [sp] movs r0, 0x1 bl sub_81BF8EC @@ -217990,7 +217990,7 @@ sub_807905C: ; 807905C subs r3, 0x1 lsls r3, 24 lsrs r3, 24 - ldr r0, =sub_8077B74 + 1 + ldr r0, =sub_8077B74 str r0, [sp] movs r0, 0x1 bl sub_81BF8EC @@ -218542,7 +218542,7 @@ sub_80794CC: ; 80794CC bl free bl Window_FreeMemory bl sub_800E084 - ldr r0, =c2_8056854 + 1 + ldr r0, =c2_8056854 bl set_callback2 b @0807953A .align 2, 0 @@ -218559,7 +218559,7 @@ sub_80794CC: ; 80794CC ldr r0, [r0] bl free bl Window_FreeMemory - ldr r0, =c2_8056854 + 1 + ldr r0, =c2_8056854 bl set_callback2 @0807953A: pop {r0} @@ -218920,7 +218920,7 @@ sub_80796B4: ; 80796B4 adds r0, r1 lsls r0, 2 add r0, r8 - ldr r1, =sub_80D3014 + 1 + ldr r1, =sub_80D3014 bl oamt_set_x3A_32 ldr r2, =0x0203229c ldr r1, [r2] @@ -218982,7 +218982,7 @@ sub_80796B4: ; 80796B4 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, =sub_80D3014 + 1 + ldr r0, =sub_80D3014 cmp r1, r0 beq @080798AC b @08079A24 @@ -221578,7 +221578,7 @@ sub_807AC64: ; 807AC64 cmp r1, r0 bls @0807ACC4 bl sub_80097E8 - ldr r0, =c2_800ACD4 + 1 + ldr r0, =c2_800ACD4 bl set_callback2 ldr r1, [r4] adds r3, r1, 0 @@ -221765,7 +221765,7 @@ sub_807ACFC: ; 807ACFC lsls r0, 2 adds r3, 0x1C adds r0, r3 - ldr r1, =nullsub_12 + 1 + ldr r1, =nullsub_12 str r1, [r0] @0807AE36: pop {r3} @@ -221834,7 +221834,7 @@ sub_807AE50: ; 807AE50 bl clear_tasks bl reset_all_obj_data bl gpu_pal_allocator_reset - ldr r0, =sub_807AC24 + 1 + ldr r0, =sub_807AC24 bl SetVBlankCallback bl sub_807B170 bl sub_807AC3C @@ -222087,7 +222087,7 @@ sub_807AE50: ; 807AE50 movs r1, 0 bl sub_800DFB4 @0807B110: - ldr r0, =sub_807EA2C + 1 + ldr r0, =sub_807EA2C bl set_callback2 @0807B116: bl run_active_tasks @@ -222307,7 +222307,7 @@ sub_807B270: ; 807B270 bl clear_tasks bl reset_all_obj_data bl gpu_pal_allocator_reset - ldr r0, =sub_807AC24 + 1 + ldr r0, =sub_807AC24 bl SetVBlankCallback bl sub_807B170 ldr r0, [r4] @@ -222412,7 +222412,7 @@ sub_807B270: ; 807B270 .align 2, 0 .pool @0807B438: - ldr r0, =sub_807B60C + 1 + ldr r0, =sub_807B60C bl set_callback2 @0807B43E: bl run_active_tasks @@ -223696,7 +223696,7 @@ sub_807BBEC: ; 807BBEC adds r4, 0x1C adds r0, r4 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 beq @0807C1FC bl @0807CFB4 @@ -223717,7 +223717,7 @@ sub_807BBEC: ; 807BBEC adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, =sub_807E5D8 + 1 + ldr r1, =sub_807E5D8 str r1, [r0] adds r2, 0xD2 ldrb r1, [r2] @@ -224739,7 +224739,7 @@ sub_807BBEC: ; 807BBEC lsls r0, 2 adds r2, 0x1C adds r0, r2 - ldr r1, =sub_807AAE0 + 1 + ldr r1, =sub_807AAE0 str r1, [r0] b @0807CFB4 .align 2, 0 @@ -224922,7 +224922,7 @@ sub_807BBEC: ; 807BBEC adds r1, r4, 0 adds r1, 0x1C adds r0, r1 - ldr r1, =sub_807E6AC + 1 + ldr r1, =sub_807E6AC str r1, [r0] ldrb r1, [r2] lsls r0, r1, 4 @@ -225001,7 +225001,7 @@ sub_807BBEC: ; 807BBEC adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 beq @0807CCEE b @0807CFB4 @@ -225241,7 +225241,7 @@ sub_807BBEC: ; 807BBEC movs r1, 0 bl sub_807B4D0 ldr r1, =0x030061e8 - ldr r0, =sub_807B60C + 1 + ldr r0, =sub_807B60C str r0, [r1] ldr r7, =0x02032298 ldrb r0, [r7] @@ -225320,7 +225320,7 @@ sub_807BBEC: ; 807BBEC bl free str r4, [r7] @0807CFAA: - ldr r0, =c2_exit_to_overworld_2_switch + 1 + ldr r0, =c2_exit_to_overworld_2_switch bl set_callback2 bl sub_807E784 @0807CFB4: @@ -225812,7 +225812,7 @@ sub_807CFC8: ; 807CFC8 adds r4, 0x1C adds r0, r4 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 beq @0807D5D8 bl @0807E400 @@ -225833,7 +225833,7 @@ sub_807CFC8: ; 807CFC8 adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, =sub_807E5D8 + 1 + ldr r1, =sub_807E5D8 str r1, [r0] adds r2, 0xD2 ldrb r1, [r2] @@ -225991,7 +225991,7 @@ sub_807CFC8: ; 807CFC8 lsls r1, 3 movs r0, 0x52 bl lcd_io_set - ldr r0, =c3_08054588 + 1 + ldr r0, =c3_08054588 movs r1, 0x5 bl AddTask ldr r1, [r7] @@ -225999,7 +225999,7 @@ sub_807CFC8: ; 807CFC8 .align 2, 0 .pool @0807D77C: - ldr r0, =c3_08054588 + 1 + ldr r0, =c3_08054588 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 @@ -226050,7 +226050,7 @@ sub_807CFC8: ; 807CFC8 adds r1, r5, 0 adds r1, 0x1C adds r0, r1 - ldr r1, =sub_807AA4C + 1 + ldr r1, =sub_807AA4C str r1, [r0] ldr r0, =gUnknown_08338DC8 movs r1, 0x78 @@ -226308,7 +226308,7 @@ sub_807CFC8: ; 807CFC8 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - ldr r0, =c3_0805465C + 1 + ldr r0, =c3_0805465C b @0807DC5A .align 2, 0 .pool @@ -226566,7 +226566,7 @@ sub_807CFC8: ; 807CFC8 ldrb r1, [r0] orrs r1, r2 strb r1, [r0] - ldr r0, =sub_807F39C + 1 + ldr r0, =sub_807F39C @0807DC5A: movs r1, 0x5 bl AddTask @@ -226687,7 +226687,7 @@ sub_807CFC8: ; 807CFC8 adds r1, r5, 0 adds r1, 0x1C adds r0, r1 - ldr r1, =sub_807AA4C + 1 + ldr r1, =sub_807AA4C str r1, [r0] ldr r0, =gUnknown_08338DC8 movs r1, 0x78 @@ -226801,7 +226801,7 @@ sub_807CFC8: ; 807CFC8 str r0, [r2, 0x64] cmp r0, 0xA bne @0807DE60 - ldr r0, =c3_08054588 + 1 + ldr r0, =c3_08054588 movs r1, 0x5 bl AddTask lsls r0, 24 @@ -226859,7 +226859,7 @@ sub_807CFC8: ; 807CFC8 .align 2, 0 .pool @0807DEC0: - ldr r0, =c3_08054588 + 1 + ldr r0, =c3_08054588 bl is_function_an_active_task lsls r0, 24 lsrs r3, r0, 24 @@ -227082,7 +227082,7 @@ sub_807CFC8: ; 807CFC8 adds r1, r4, 0 adds r1, 0x1C adds r0, r1 - ldr r1, =sub_807E6AC + 1 + ldr r1, =sub_807E6AC str r1, [r0] ldrb r1, [r2] lsls r0, r1, 4 @@ -227161,7 +227161,7 @@ sub_807CFC8: ; 807CFC8 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 beq @0807E13A b @0807E400 @@ -227401,7 +227401,7 @@ sub_807CFC8: ; 807CFC8 movs r1, 0 bl sub_807B4D0 ldr r1, =0x030061e8 - ldr r0, =sub_807B60C + 1 + ldr r0, =sub_807B60C str r0, [r1] ldr r7, =0x02032298 ldrb r0, [r7] @@ -227480,7 +227480,7 @@ sub_807CFC8: ; 807CFC8 bl free str r4, [r7] @0807E3F6: - ldr r0, =c2_exit_to_overworld_2_switch + 1 + ldr r0, =c2_exit_to_overworld_2_switch bl set_callback2 bl sub_807E784 @0807E400: @@ -227521,7 +227521,7 @@ c2_08053788: ; 807E414 .pool @0807E444: ldr r0, =0x030061e8 - ldr r1, =sub_807EB50 + 1 + ldr r1, =sub_807EB50 mov r8, r1 str r1, [r0] ldr r7, =0x02032298 @@ -227554,7 +227554,7 @@ c2_08053788: ; 807E414 bl sub_8077260 cmp r0, 0 beq @0807E4A8 - ldr r0, =sub_807F464 + 1 + ldr r0, =sub_807F464 bl set_callback2 b @0807E4AE .align 2, 0 @@ -227603,7 +227603,7 @@ sub_807E4DC: ; 807E4DC ldr r0, =0x0000dcba cmp r1, r0 bne @0807E504 - ldr r0, =c2_08053788 + 1 + ldr r0, =c2_08053788 bl set_callback2 @0807E504: ldrh r1, [r4] @@ -227702,7 +227702,7 @@ sub_807E55C: ; 807E55C bne @0807E5CE movs r0, 0x1 strh r0, [r5, 0x3C] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r5, 0x1C] @0807E5CE: pop {r4,r5} @@ -227743,7 +227743,7 @@ sub_807E5D8: ; 807E5D8 bne @0807E636 movs r0, 0x8C bl audio_play - ldr r0, =sub_807E64C + 1 + ldr r0, =sub_807E64C str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x2E] @@ -227882,7 +227882,7 @@ sub_807E6AC: ; 807E6AC asrs r0, 16 cmp r0, 0x6C bne @0807E72C - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r4, 0x1C] @0807E72C: pop {r4} @@ -228274,7 +228274,7 @@ sub_807EA2C: ; 807EA2C adds r0, 0x93 strb r6, [r0] @0807EA90: - ldr r0, =sub_807EACC + 1 + ldr r0, =sub_807EACC bl set_callback2 @0807EA96: bl sub_807B5B8 @@ -228300,7 +228300,7 @@ sub_807EACC: ; 807EACC bl sub_8077260 cmp r0, 0 beq @0807EAEC - ldr r0, =c2_08053788 + 1 + ldr r0, =c2_08053788 bl set_callback2 b @0807EB2C .align 2, 0 @@ -228795,7 +228795,7 @@ sub_807EB50: ; 807EB50 beq @0807EFD8 ldr r0, =0x030022c0 ldr r1, [r0, 0x8] - ldr r0, =sub_80773AC + 1 + ldr r0, =sub_80773AC cmp r1, r0 bne @0807EFD8 movs r0, 0x3 @@ -228823,7 +228823,7 @@ sub_807EB50: ; 807EB50 cmp r0, 0 beq @0807F028 ldr r1, [r2, 0x8] - ldr r0, =sub_80773AC + 1 + ldr r0, =sub_80773AC cmp r1, r0 bne @0807F028 bl sub_8077294 @@ -228832,7 +228832,7 @@ sub_807EB50: ; 807EB50 ldr r0, =0x03002700 movs r1, 0 strb r1, [r0] - ldr r0, =c2_080543C4 + 1 + ldr r0, =c2_080543C4 bl set_callback2 b @0807F03A .align 2, 0 @@ -228844,7 +228844,7 @@ sub_807EB50: ; 807EB50 bne @0807F03A ldr r0, =0x03002700 strb r1, [r0] - ldr r0, =c2_080543C4 + 1 + ldr r0, =c2_080543C4 bl set_callback2 @0807F03A: bl sub_800B33C @@ -228916,7 +228916,7 @@ sub_807F0E4: ; 807F0E4 push {lr} sub sp, 0x4 bl script_env_2_enable - ldr r0, =sub_807F110 + 1 + ldr r0, =sub_807F110 movs r1, 0xA bl AddTask movs r0, 0x1 @@ -228944,10 +228944,10 @@ sub_807F110: ; 807F110 ands r0, r1 cmp r0, 0 bne @0807F134 - ldr r0, =sub_807B270 + 1 + ldr r0, =sub_807B270 bl set_callback2 ldr r1, =0x03005dac - ldr r0, =sub_80AF168 + 1 + ldr r0, =sub_80AF168 str r0, [r1] adds r0, r4, 0 bl remove_task @@ -229654,7 +229654,7 @@ sub_807F464: ; 807F464 ldr r0, =0x03002700 movs r1, 0 strb r1, [r0] - ldr r0, =c2_080543C4 + 1 + ldr r0, =c2_080543C4 bl set_callback2 @0807F70C: bl sub_800B33C @@ -230056,7 +230056,7 @@ sub_807FA80: ; 807FA80 ldr r0, =0x020375e0 ldrb r0, [r0] bl sub_807FE54 - ldr r0, =sub_807FAC8 + 1 + ldr r0, =sub_807FAC8 bl set_callback2 pop {r4} pop {r0} @@ -230211,7 +230211,7 @@ sub_807FAC8: ; 807FAC8 movs r1, 0 bl sub_800DFB4 @0807FC14: - ldr r0, =sub_807F764 + 1 + ldr r0, =sub_807F764 bl SetVBlankCallback b @0807FCA0 .align 2, 0 @@ -230289,7 +230289,7 @@ sub_807FAC8: ; 807FAC8 bl bg_unset_tilemap movs r0, 0 bl SetVBlankCallback - ldr r0, =sub_807FFA4 + 1 + ldr r0, =sub_807FFA4 bl sub_81AABF0 ldr r0, =0x020322a4 ldr r0, [r0] @@ -230374,7 +230374,7 @@ sub_807FD64: ; 807FD64 strh r4, [r0, 0x38] strh r5, [r0, 0x3A] strh r6, [r0, 0x3C] - ldr r1, =sub_807FD08 + 1 + ldr r1, =sub_807FD08 str r1, [r0, 0x1C] pop {r4-r6} pop {r0} @@ -230661,13 +230661,13 @@ sub_807FFA4: ; 807FFA4 ldrh r0, [r5] cmp r0, 0 bne @08080008 - ldr r0, =sub_8080018 + 1 + ldr r0, =sub_8080018 bl set_callback2 b @0808000E .align 2, 0 .pool @08080008: - ldr r0, =sub_80808D4 + 1 + ldr r0, =sub_80808D4 bl set_callback2 @0808000E: pop {r4,r5} @@ -231265,7 +231265,7 @@ sub_8080018: ; 8080018 lsls r1, 1 adds r0, r3, r1 str r2, [r0] - ldr r0, =sub_8081898 + 1 + ldr r0, =sub_8081898 bl set_callback2 bl current_map_music_get lsls r0, 16 @@ -231317,7 +231317,7 @@ sub_8080588: ; 8080588 bl reset_all_obj_data bl gpu_pal_allocator_reset bl clear_tasks - ldr r0, =sub_807F764 + 1 + ldr r0, =sub_807F764 bl SetVBlankCallback movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags @@ -232196,7 +232196,7 @@ sub_80808D4: ; 80808D4 ldr r0, [r5] adds r0, 0x72 strb r3, [r0] - ldr r0, =sub_8081898 + 1 + ldr r0, =sub_8081898 bl set_callback2 ldr r0, =0x020375e0 ldrh r0, [r0] @@ -232208,7 +232208,7 @@ sub_80808D4: ; 80808D4 lsls r0, 24 cmp r0, 0 bne @08080D30 - ldr r0, =sub_8081224 + 1 + ldr r0, =sub_8081224 movs r1, 0xA bl AddTask ldr r1, [r5] @@ -232375,7 +232375,7 @@ sub_8080E6C: ; 8080E6C lsrs r5, 24 lsls r4, 24 lsrs r4, 24 - ldr r0, =sub_8080E20 + 1 + ldr r0, =sub_8080E20 movs r1, 0x50 bl AddTask lsls r0, 24 @@ -232897,7 +232897,7 @@ sub_8081288: ; 8081288 bl obj_anim_image_start adds r5, 0x1C adds r4, r5 - ldr r0, =sub_8082F9C + 1 + ldr r0, =sub_8082F9C str r0, [r4] movs r0, 0x28 bl audio_play @@ -233614,7 +233614,7 @@ sub_8081898: ; 8081898 strh r6, [r0] movs r0, 0x1 strb r0, [r3] - ldr r0, =sub_8081FC8 + 1 + ldr r0, =sub_8081FC8 bl set_callback2 @0808191A: ldr r0, =0x020322a4 @@ -235059,7 +235059,7 @@ sub_8081FC8: ; 8081FC8 ldrb r0, [r0] cmp r0, 0 beq @08082458 - ldr r0, =sub_8082924 + 1 + ldr r0, =sub_8082924 bl set_callback2 ldr r2, =0x020322a4 ldr r0, [r2] @@ -235097,7 +235097,7 @@ sub_8081FC8: ; 8081FC8 bl sub_808417C cmp r0, 0 beq @0808249E - ldr r0, =sub_8082644 + 1 + ldr r0, =sub_8082644 bl set_callback2 ldr r0, [r6] adds r0, 0x63 @@ -235559,7 +235559,7 @@ sub_8082644: ; 8082644 ldr r0, [r6] bl free str r4, [r6] - ldr r0, =sub_807FA80 + 1 + ldr r0, =sub_807FA80 bl set_callback2 b @080828DC .align 2, 0 @@ -235598,7 +235598,7 @@ sub_8082644: ; 8082644 ldr r0, [r6] bl free str r4, [r6] - ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 + ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music bl set_callback2 @080828DC: bl sub_8082AD4 @@ -235768,13 +235768,13 @@ sub_8082924: ; 8082924 ldrh r0, [r0] cmp r0, 0 bne @08082A70 - ldr r0, =sub_807FA80 + 1 + ldr r0, =sub_807FA80 bl set_callback2 b @08082A76 .align 2, 0 .pool @08082A70: - ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 + ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music bl set_callback2 @08082A76: bl Window_FreeMemory @@ -236362,7 +236362,7 @@ sub_8082E84: ; 8082E84 strh r0, [r4, 0x30] ldr r3, =0x0202064c adds r5, r3 - ldr r0, =sub_8082E3C + 1 + ldr r0, =sub_8082E3C str r0, [r5] subs r6, 0x1 cmp r6, 0 @@ -237498,7 +237498,7 @@ sub_8083450: ; 8083450 adds r1, r2 adds r0, r7, 0 bl sub_8083F94 - ldr r0, =sub_8083F3C + 1 + ldr r0, =sub_8083F3C movs r1, 0x6 bl AddTask bl sub_80EECEC @@ -237977,7 +237977,7 @@ sub_8083B08: ; 8083B08 adds r5, r6, 0 adds r5, 0x1C adds r0, r5 - ldr r4, =nullsub_12 + 1 + ldr r4, =nullsub_12 str r4, [r0] mov r0, r8 movs r1, 0xA0 @@ -242253,7 +242253,7 @@ is_c1_link_related_active: ; 8085D8C push {lr} ldr r0, =0x030022c0 ldr r1, [r0] - ldr r0, =c1_link_related + 1 + ldr r0, =c1_link_related cmp r1, r0 beq @08085DA4 movs r0, 0 @@ -242314,7 +242314,7 @@ c1_overworld: ; 8085E04 push {lr} ldr r2, =0x030022c0 ldr r1, [r2, 0x4] - ldr r0, =c2_overworld + 1 + ldr r0, =c2_overworld cmp r1, r0 bne @08085E18 ldrh r0, [r2, 0x2E] @@ -242453,7 +242453,7 @@ c2_new_game: ; 8085EF8 bl script_env_1_init bl script_env_2_disable ldr r1, =0x03005dac - ldr r0, =sub_80FB4E0 + 1 + ldr r0, =sub_80FB4E0 str r0, [r1] ldr r1, =0x03005db0 movs r0, 0 @@ -242461,9 +242461,9 @@ c2_new_game: ; 8085EF8 ldr r0, =0x030026f8 bl do_load_map_stuff_loop bl set_vblank_callback_8086390 - ldr r0, =c1_overworld + 1 + ldr r0, =c1_overworld bl set_callback1 - ldr r0, =c2_overworld + 1 + ldr r0, =c2_overworld bl set_callback2 pop {r0} bx r0 @@ -242494,7 +242494,7 @@ c2_whiteout: ; 8085F58 bl script_env_1_init bl script_env_2_disable ldr r1, =0x03005dac - ldr r0, =sub_80AF3C8 + 1 + ldr r0, =sub_80AF3C8 str r0, [r1] mov r1, sp movs r0, 0 @@ -242502,9 +242502,9 @@ c2_whiteout: ; 8085F58 mov r0, sp bl do_load_map_stuff_loop bl set_vblank_callback_8086390 - ldr r0, =c1_overworld + 1 + ldr r0, =c1_overworld bl set_callback1 - ldr r0, =c2_overworld + 1 + ldr r0, =c2_overworld bl set_callback2 @08085FB0: add sp, 0x4 @@ -242522,10 +242522,10 @@ c2_load_new_map: ; 8085FCC bl script_env_2_disable movs r0, 0 bl set_callback1 - ldr r0, =c2_change_map + 1 + ldr r0, =c2_change_map bl set_callback2 ldr r1, =0x030022c0 - ldr r0, =c2_load_new_map_2 + 1 + ldr r0, =c2_load_new_map_2 str r0, [r1, 0x8] pop {r0} bx r0 @@ -242539,9 +242539,9 @@ c2_load_new_map_2: ; 8085FFC ldr r0, =0x030026f8 bl do_load_map_stuff_loop bl set_vblank_callback_8086390 - ldr r0, =c1_overworld + 1 + ldr r0, =c1_overworld bl set_callback1 - ldr r0, =c2_overworld + 1 + ldr r0, =c2_overworld bl set_callback2 pop {r0} bx r0 @@ -242571,9 +242571,9 @@ sub_8086024: ; 8086024 cmp r0, 0 beq @08086062 bl set_vblank_callback_8086390 - ldr r0, =c1_overworld + 1 + ldr r0, =c1_overworld bl set_callback1 - ldr r0, =c2_overworld + 1 + ldr r0, =c2_overworld bl set_callback2 @08086062: pop {r4} @@ -242588,9 +242588,9 @@ sub_8086074: ; 8086074 push {lr} bl sub_808631C ldr r0, =0x03005dac - ldr r1, =sub_80AF314 + 1 + ldr r1, =sub_80AF314 str r1, [r0] - ldr r0, =c2_80567AC + 1 + ldr r0, =c2_80567AC bl set_callback2 pop {r0} bx r0 @@ -242606,10 +242606,10 @@ c2_80567AC: ; 8086098 cmp r0, 0 beq @080860B8 bl set_vblank_callback_8086390 - ldr r0, =c1_link_related + 1 + ldr r0, =c1_link_related bl set_callback1 bl sub_8086C2C - ldr r0, =c2_overworld + 1 + ldr r0, =c2_overworld bl set_callback2 @080860B8: pop {r0} @@ -242624,14 +242624,14 @@ c2_exit_to_overworld_2_switch: ; 80860C8 bl is_c1_link_related_active cmp r0, 0x1 bne @080860E0 - ldr r0, =c2_exit_to_overworld_2_link + 1 + ldr r0, =c2_exit_to_overworld_2_link bl set_callback2 b @080860EA .align 2, 0 .pool @080860E0: bl sub_808631C - ldr r0, =c2_exit_to_overworld_2_local + 1 + ldr r0, =c2_exit_to_overworld_2_local bl set_callback2 @080860EA: pop {r0} @@ -242648,7 +242648,7 @@ c2_exit_to_overworld_2_local: ; 80860F4 cmp r0, 0 beq @0808610A bl set_vblank_callback_8086390 - ldr r0, =c2_overworld + 1 + ldr r0, =c2_overworld bl set_callback2 @0808610A: pop {r0} @@ -242667,7 +242667,7 @@ c2_exit_to_overworld_2_link: ; 8086118 bl map_loading_iteration_2_link cmp r0, 0 beq @08086132 - ldr r0, =c2_overworld + 1 + ldr r0, =c2_overworld bl set_callback2 @08086132: pop {r0} @@ -242681,7 +242681,7 @@ c2_8056854: ; 8086140 push {lr} bl sub_808631C bl sub_80A2F30 - ldr r0, =c1_link_related + 1 + ldr r0, =c1_link_related bl set_callback1 bl sub_8086C2C ldr r0, =0x030030fc @@ -242689,13 +242689,13 @@ c2_8056854: ; 8086140 cmp r0, 0 beq @08086174 ldr r1, =0x03005dac - ldr r0, =sub_80AF314 + 1 + ldr r0, =sub_80AF314 b @08086178 .align 2, 0 .pool @08086174: ldr r1, =0x03005dac - ldr r0, =sub_80AF214 + 1 + ldr r0, =sub_80AF214 @08086178: str r0, [r1] bl script_env_1_init @@ -242712,7 +242712,7 @@ sub_8086194: ; 8086194 push {lr} bl sub_808631C ldr r1, =0x03005db0 - ldr r0, =sub_80AF6A4 + 1 + ldr r0, =sub_80AF6A4 str r0, [r1] bl c2_exit_to_overworld_2_switch pop {r0} @@ -242726,7 +242726,7 @@ sub_80861B0: ; 80861B0 push {lr} bl sub_808631C ldr r1, =0x03005dac - ldr r0, =sub_80AF188 + 1 + ldr r0, =sub_80AF188 str r0, [r1] bl c2_exit_to_overworld_2_switch pop {r0} @@ -242740,7 +242740,7 @@ c2_exit_to_overworld_1_continue_scripts_restart_music: ; 80861CC push {lr} bl sub_808631C ldr r1, =0x03005dac - ldr r0, =sub_80AF168 + 1 + ldr r0, =sub_80AF168 str r0, [r1] bl c2_exit_to_overworld_2_switch pop {r0} @@ -242754,7 +242754,7 @@ sub_80861E8: ; 80861E8 push {lr} bl sub_808631C ldr r1, =0x03005dac - ldr r0, =sub_80AF3C8 + 1 + ldr r0, =sub_80AF3C8 str r0, [r1] bl c2_exit_to_overworld_2_switch pop {r0} @@ -242854,7 +242854,7 @@ sub_8086230: ; 8086230 bl warp1_set_to_sav1w bl warp_in bl sub_80EDB44 - ldr r0, =c2_load_new_map + 1 + ldr r0, =c2_load_new_map bl set_callback2 b @08086308 .align 2, 0 @@ -242862,9 +242862,9 @@ sub_8086230: ; 8086230 @080862F4: bl sub_80EDB44 ldr r0, =0x03005dac - ldr r1, =sub_8086204 + 1 + ldr r1, =sub_8086204 str r1, [r0] - ldr r0, =c1_overworld + 1 + ldr r0, =c1_overworld bl set_callback1 bl c2_exit_to_overworld_2_switch @08086308: @@ -242926,7 +242926,7 @@ sub_808631C: ; 808631C thumb_func_start set_vblank_callback_8086390 set_vblank_callback_8086390: ; 8086380 push {lr} - ldr r0, =vblank_cb_8086390 + 1 + ldr r0, =vblank_cb_8086390 bl SetVBlankCallback pop {r0} bx r0 @@ -243930,7 +243930,7 @@ c1_link_related: ; 8086BD8 sub_8086C2C: ; 8086C2C push {lr} bl sub_8086C90 - ldr r0, =sub_80870B0 + 1 + ldr r0, =sub_80870B0 bl c1_link_related_func_set pop {r0} bx r0 @@ -244099,7 +244099,7 @@ sub_8086D18: ; 8086D18 bne @08086D58 b @08086F26 @08086D58: - ldr r0, =sub_80870F8 + 1 + ldr r0, =sub_80870F8 bl c1_link_related_func_set adds r0, r4, 0 bl sub_8087530 @@ -244118,7 +244118,7 @@ sub_8086D18: ; 8086D18 bne @08086D86 b @08086F26 @08086D86: - ldr r0, =sub_80870F8 + 1 + ldr r0, =sub_80870F8 bl c1_link_related_func_set bl sub_8087584 b @08086F26 @@ -244163,7 +244163,7 @@ sub_8086D18: ; 8086D18 ldrb r0, [r6, 0x1] cmp r0, 0 beq @08086EB2 - ldr r0, =sub_80870F8 + 1 + ldr r0, =sub_80870F8 bl c1_link_related_func_set bl sub_808751C b @08086EB2 @@ -244181,7 +244181,7 @@ sub_8086D18: ; 8086D18 ldrb r0, [r6, 0x1] cmp r0, 0 beq @08086EB2 - ldr r0, =sub_80870F8 + 1 + ldr r0, =sub_80870F8 bl c1_link_related_func_set bl sub_808754C b @08086EB2 @@ -244200,7 +244200,7 @@ sub_8086D18: ; 8086D18 ldrb r0, [r6, 0x1] cmp r0, 0 beq @08086EB2 - ldr r0, =sub_80870F8 + 1 + ldr r0, =sub_80870F8 bl c1_link_related_func_set adds r0, r4, 0 bl sub_8087568 @@ -244219,7 +244219,7 @@ sub_8086D18: ; 8086D18 ldrb r0, [r6, 0x1] cmp r0, 0 beq @08086EB2 - ldr r0, =sub_808711C + 1 + ldr r0, =sub_808711C bl c1_link_related_func_set bl sub_8087510 b @08086EB2 @@ -244237,7 +244237,7 @@ sub_8086D18: ; 8086D18 ldrb r0, [r6, 0x1] cmp r0, 0 beq @08086EB2 - ldr r0, =sub_8087140 + 1 + ldr r0, =sub_8087140 bl c1_link_related_func_set bl sub_8087510 @08086EB2: @@ -244282,7 +244282,7 @@ sub_8086D18: ; 8086D18 ldrb r0, [r6, 0x1] cmp r0, 0 beq @08086F26 - ldr r0, =sub_80870B0 + 1 + ldr r0, =sub_80870B0 bl c1_link_related_func_set b @08086F26 .align 2, 0 @@ -244572,7 +244572,7 @@ sub_80870F8: ; 80870F8 cmp r0, 0x1 beq @08087110 movs r4, 0x1A - ldr r0, =sub_80870EC + 1 + ldr r0, =sub_80870EC bl c1_link_related_func_set @08087110: adds r0, r4, 0 @@ -244592,7 +244592,7 @@ sub_808711C: ; 808711C bhi @08087134 movs r4, 0x1A bl script_env_2_disable - ldr r0, =sub_80870EC + 1 + ldr r0, =sub_80870EC bl c1_link_related_func_set @08087134: adds r0, r4, 0 @@ -244612,7 +244612,7 @@ sub_8087140: ; 8087140 bhi @08087158 movs r4, 0x1A bl script_env_2_disable - ldr r0, =sub_80870EC + 1 + ldr r0, =sub_80870EC bl c1_link_related_func_set @08087158: adds r0, r4, 0 @@ -244646,7 +244646,7 @@ sub_8087170: ; 8087170 ands r0, r1 cmp r0, 0 beq @080871A4 - ldr r0, =sub_8087164 + 1 + ldr r0, =sub_8087164 bl c1_link_related_func_set movs r0, 0x1D b @080871A6 @@ -244664,7 +244664,7 @@ sub_8087170: ; 8087170 thumb_func_start sub_80871AC sub_80871AC: ; 80871AC push {lr} - ldr r0, =sub_8087170 + 1 + ldr r0, =sub_8087170 bl c1_link_related_func_set movs r0, 0x16 pop {r1} @@ -244695,7 +244695,7 @@ sub_80871C4: ; 80871C4 bne @080871EA ldr r0, =gUnknown_08277513 bl script_env_1_execute_new_script - ldr r0, =sub_80871C0 + 1 + ldr r0, =sub_80871C0 bl c1_link_related_func_set @080871EA: movs r0, 0x11 @@ -244708,7 +244708,7 @@ sub_80871C4: ; 80871C4 thumb_func_start sub_80871FC sub_80871FC: ; 80871FC push {lr} - ldr r0, =sub_80871C4 + 1 + ldr r0, =sub_80871C4 bl c1_link_related_func_set movs r0, 0x17 pop {r1} @@ -244732,7 +244732,7 @@ sub_8087214: ; 8087214 beq @08087250 ldr r0, =0x03000e14 ldr r2, [r0] - ldr r1, =sub_8087170 + 1 + ldr r1, =sub_8087170 adds r3, r0, 0 cmp r2, r1 bne @0808723A @@ -244745,7 +244745,7 @@ sub_8087214: ; 8087214 bne @08087272 @0808723A: ldr r1, [r3] - ldr r0, =sub_8087164 + 1 + ldr r0, =sub_8087164 cmp r1, r0 bne @08087268 ldr r1, =0x03000e10 @@ -244787,7 +244787,7 @@ sub_808727C: ; 808727C thumb_func_start sub_8087288 sub_8087288: ; 8087288 push {lr} - ldr r0, =sub_80871AC + 1 + ldr r0, =sub_80871AC bl c1_link_related_func_set movs r0, 0 pop {r1} @@ -244799,7 +244799,7 @@ sub_8087288: ; 8087288 thumb_func_start sub_808729C sub_808729C: ; 808729C push {lr} - ldr r0, =sub_80870F8 + 1 + ldr r0, =sub_80870F8 bl c1_link_related_func_set movs r0, 0 pop {r1} @@ -244811,7 +244811,7 @@ sub_808729C: ; 808729C thumb_func_start sub_80872B0 sub_80872B0: ; 80872B0 push {lr} - ldr r0, =sub_80871FC + 1 + ldr r0, =sub_80871FC bl c1_link_related_func_set movs r0, 0 pop {r1} @@ -244823,7 +244823,7 @@ sub_80872B0: ; 80872B0 thumb_func_start sub_80872C4 sub_80872C4: ; 80872C4 push {lr} - ldr r0, =sub_8087210 + 1 + ldr r0, =sub_8087210 bl c1_link_related_func_set movs r0, 0 pop {r1} @@ -245236,10 +245236,10 @@ sub_80875C8: ; 80875C8 bne @0808762C ldr r0, =0x03000e14 ldr r1, [r0] - ldr r0, =sub_808711C + 1 + ldr r0, =sub_808711C cmp r1, r0 beq @08087614 - ldr r0, =sub_80870F8 + 1 + ldr r0, =sub_80870F8 cmp r1, r0 bne @0808762C ldr r0, =0x03000e18 @@ -245285,7 +245285,7 @@ sub_8087634: ; 8087634 bne @08087658 ldr r0, =0x03000e14 ldr r1, [r0] - ldr r0, =sub_8087140 + 1 + ldr r0, =sub_8087140 cmp r1, r0 beq @08087664 @08087658: @@ -246099,7 +246099,7 @@ sub_8087BCC: ; 8087BCC @08087C44: lsls r0, 24 lsrs r0, 24 - ldr r1, =sub_8087C8C + 1 + ldr r1, =sub_8087C8C movs r2, 0 str r2, [sp] movs r3, 0 @@ -251957,7 +251957,7 @@ sub_808A134: ; 808A134 lsls r0, 24 lsrs r0, 24 str r0, [r4, 0x4] - ldr r0, =sub_808A0F4 + 1 + ldr r0, =sub_808A0F4 str r0, [r4] movs r0, 0 pop {r4,r5} @@ -252157,7 +252157,7 @@ sub_808A2CC: ; 808A2CC thumb_func_start sub_808A2E4 sub_808A2E4: ; 808A2E4 ldr r1, =0x03000e30 - ldr r0, =nu_805AE74 + 1 + ldr r0, =nu_805AE74 str r0, [r1] ldr r1, =0x03000e2c movs r0, 0 @@ -252668,7 +252668,7 @@ task_overworld_door_add_if_inactive: ; 808A6C4 adds r5, r1, 0 adds r7, r2, 0 mov r8, r3 - ldr r4, =task50_overworld_door + 1 + ldr r4, =task50_overworld_door adds r0, r4, 0 bl is_function_an_active_task lsls r0, 24 @@ -252984,7 +252984,7 @@ task_overworld_door_add_if_role_69_for_opening_door_at: ; 808A8E4 thumb_func_start sub_808A91C sub_808A91C: ; 808A91C push {lr} - ldr r0, =task50_overworld_door + 1 + ldr r0, =task50_overworld_door bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 @@ -253061,7 +253061,7 @@ sub_808A998: ; 808A998 lsls r0, 2 ldr r2, =0x02037350 adds r0, r2 - ldr r2, =sub_808A9BC + 1 + ldr r2, =sub_808A9BC bl meta_step pop {r0} bx r0 @@ -253455,7 +253455,7 @@ sub_808AC58: ; 808AC58 thumb_func_start sub_808AC8C sub_808AC8C: ; 808AC8C push {lr} - ldr r0, =sub_808B738 + 1 + ldr r0, =sub_808B738 bl sub_808AC58 lsls r0, 24 lsrs r0, 24 @@ -253468,7 +253468,7 @@ sub_808AC8C: ; 808AC8C thumb_func_start sub_808ACA0 sub_808ACA0: ; 808ACA0 push {lr} - ldr r1, =sub_808B720 + 1 + ldr r1, =sub_808B720 movs r0, 0x1 bl sub_808ABE0 lsls r0, 24 @@ -253482,7 +253482,7 @@ sub_808ACA0: ; 808ACA0 thumb_func_start sub_808ACB8 sub_808ACB8: ; 808ACB8 push {lr} - ldr r1, =sub_808B720 + 1 + ldr r1, =sub_808B720 movs r0, 0x2 bl sub_808ABE0 lsls r0, 24 @@ -253496,7 +253496,7 @@ sub_808ACB8: ; 808ACB8 thumb_func_start sub_808ACD0 sub_808ACD0: ; 808ACD0 push {lr} - ldr r1, =sub_808B720 + 1 + ldr r1, =sub_808B720 movs r0, 0x3 bl sub_808ABE0 lsls r0, 24 @@ -253510,7 +253510,7 @@ sub_808ACD0: ; 808ACD0 thumb_func_start sub_808ACE8 sub_808ACE8: ; 808ACE8 push {lr} - ldr r1, =sub_808B720 + 1 + ldr r1, =sub_808B720 movs r0, 0x4 bl sub_808ABE0 lsls r0, 24 @@ -253524,7 +253524,7 @@ sub_808ACE8: ; 808ACE8 thumb_func_start sub_808AD00 sub_808AD00: ; 808AD00 push {lr} - ldr r1, =sub_808B750 + 1 + ldr r1, =sub_808B750 movs r0, 0x1 bl sub_808ABE0 lsls r0, 24 @@ -253538,7 +253538,7 @@ sub_808AD00: ; 808AD00 thumb_func_start sub_808AD18 sub_808AD18: ; 808AD18 push {lr} - ldr r1, =sub_808B750 + 1 + ldr r1, =sub_808B750 movs r0, 0x2 bl sub_808ABE0 lsls r0, 24 @@ -253552,7 +253552,7 @@ sub_808AD18: ; 808AD18 thumb_func_start sub_808AD30 sub_808AD30: ; 808AD30 push {lr} - ldr r1, =sub_808B750 + 1 + ldr r1, =sub_808B750 movs r0, 0x3 bl sub_808ABE0 lsls r0, 24 @@ -253566,7 +253566,7 @@ sub_808AD30: ; 808AD30 thumb_func_start sub_808AD48 sub_808AD48: ; 808AD48 push {lr} - ldr r1, =sub_808B750 + 1 + ldr r1, =sub_808B750 movs r0, 0x4 bl sub_808ABE0 lsls r0, 24 @@ -253608,7 +253608,7 @@ sub_808AD60: ; 808AD60 thumb_func_start sub_808AD98 sub_808AD98: ; 808AD98 push {lr} - ldr r1, =sub_808B738 + 1 + ldr r1, =sub_808B738 movs r0, 0x1 bl sub_808AD60 lsls r0, 24 @@ -253622,7 +253622,7 @@ sub_808AD98: ; 808AD98 thumb_func_start sub_808ADB0 sub_808ADB0: ; 808ADB0 push {lr} - ldr r1, =sub_808B738 + 1 + ldr r1, =sub_808B738 movs r0, 0x2 bl sub_808AD60 lsls r0, 24 @@ -253636,7 +253636,7 @@ sub_808ADB0: ; 808ADB0 thumb_func_start sub_808ADC8 sub_808ADC8: ; 808ADC8 push {lr} - ldr r1, =sub_808B738 + 1 + ldr r1, =sub_808B738 movs r0, 0x3 bl sub_808AD60 lsls r0, 24 @@ -253650,7 +253650,7 @@ sub_808ADC8: ; 808ADC8 thumb_func_start sub_808ADE0 sub_808ADE0: ; 808ADE0 push {lr} - ldr r1, =sub_808B738 + 1 + ldr r1, =sub_808B738 movs r0, 0x4 bl sub_808AD60 lsls r0, 24 @@ -253706,7 +253706,7 @@ sub_808AE10: ; 808AE10 movs r1, 0x2 orrs r0, r1 strb r0, [r4, 0x1] - ldr r1, =sub_808B738 + 1 + ldr r1, =sub_808B738 movs r0, 0x1 bl sub_808ABE0 lsls r0, 24 @@ -256458,7 +256458,7 @@ task_add_bump_boulder: ; 808C310 lsrs r4, 24 lsls r5, 24 lsrs r5, 24 - ldr r6, =taskFF_bump_boulder + 1 + ldr r6, =taskFF_bump_boulder adds r0, r6, 0 movs r1, 0xFF bl AddTask @@ -256649,7 +256649,7 @@ sub_808C484: ; 808C484 movs r0, 0 strb r0, [r1, 0x6] bl script_env_2_disable - ldr r0, =taskFF_bump_boulder + 1 + ldr r0, =taskFF_bump_boulder bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -256666,7 +256666,7 @@ sub_808C484: ; 808C484 thumb_func_start sub_808C4D8 sub_808C4D8: ; 808C4D8 push {r4,lr} - ldr r4, =sub_808C4F8 + 1 + ldr r4, =sub_808C4F8 adds r0, r4, 0 movs r1, 0xFF bl AddTask @@ -256753,7 +256753,7 @@ sub_808C544: ; 808C544 movs r1, 0x20 orrs r0, r1 strb r0, [r5, 0x1] - ldr r0, =sub_808C4F8 + 1 + ldr r0, =sub_808C4F8 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -256770,7 +256770,7 @@ sub_808C544: ; 808C544 thumb_func_start sub_808C5B0 sub_808C5B0: ; 808C5B0 push {r4,lr} - ldr r4, =sub_808C5D0 + 1 + ldr r4, =sub_808C5D0 adds r0, r4, 0 movs r1, 0xFF bl AddTask @@ -256959,7 +256959,7 @@ sub_808C6FC: ; 808C6FC ldr r1, =0x02037590 movs r0, 0 strb r0, [r1, 0x6] - ldr r0, =sub_808C5D0 + 1 + ldr r0, =sub_808C5D0 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -256991,7 +256991,7 @@ sub_808C750: ; 808C750 strb r0, [r2] movs r0, 0x1 strb r0, [r2, 0x6] - ldr r5, =taskFF_0805D1D4 + 1 + ldr r5, =taskFF_0805D1D4 adds r0, r5, 0 movs r1, 0xFF bl AddTask @@ -257049,7 +257049,7 @@ taskFF_0805D1D4: ; 808C7A8 lsrs r1, 24 adds r0, r5, 0 bl npc_set_state_2 - ldr r0, =sub_808C814 + 1 + ldr r0, =sub_808C814 str r0, [r4] @0808C7FC: pop {r4-r6} @@ -257118,7 +257118,7 @@ fishing_start: ; 808C88C adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r5, =sub_808C8C0 + 1 + ldr r5, =sub_808C8C0 adds r0, r5, 0 movs r1, 0xFF bl AddTask @@ -257743,7 +257743,7 @@ fishA_wait_for_a_pressed: ; 808CCA8 bl sub_80B5734 movs r0, 0x1 bl sub_80ED950 - ldr r0, =sub_808C8C0 + 1 + ldr r0, =sub_808C8C0 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -257968,7 +257968,7 @@ fishF: ; 808CF2C bl sub_8197434 movs r0, 0 bl sub_80ED950 - ldr r0, =sub_808C8C0 + 1 + ldr r0, =sub_808C8C0 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -258260,7 +258260,7 @@ sub_808D094: ; 808D094 thumb_func_start sub_808D194 sub_808D194: ; 808D194 push {r4,lr} - ldr r4, =sub_808D1FC + 1 + ldr r4, =sub_808D1FC adds r0, r4, 0 movs r1, 0 bl AddTask @@ -258277,7 +258277,7 @@ sub_808D194: ; 808D194 thumb_func_start sub_808D1B4 sub_808D1B4: ; 808D1B4 push {lr} - ldr r0, =sub_808D1FC + 1 + ldr r0, =sub_808D1FC bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 @@ -258290,7 +258290,7 @@ sub_808D1B4: ; 808D1B4 thumb_func_start sub_808D1C8 sub_808D1C8: ; 808D1C8 push {r4,lr} - ldr r4, =sub_808D094 + 1 + ldr r4, =sub_808D094 adds r0, r4, 0 movs r1, 0 bl AddTask @@ -258307,7 +258307,7 @@ sub_808D1C8: ; 808D1C8 thumb_func_start sub_808D1E8 sub_808D1E8: ; 808D1E8 push {lr} - ldr r0, =sub_808D094 + 1 + ldr r0, =sub_808D094 bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 @@ -259956,7 +259956,7 @@ sprite_new: ; 808DE0C adds r0, r5, 0 bl npc_get_type adds r4, r0, 0 - ldr r1, =sub_8097AC8 + 1 + ldr r1, =sub_8097AC8 add r3, sp, 0x1C adds r0, r5, 0 mov r2, sp @@ -262111,7 +262111,7 @@ find_obj_using_oac_0805F994: ; 808EE44 beq @0808EE78 adds r0, r1, r5 ldr r1, [r0] - ldr r0, =oac_0805F994 + 1 + ldr r0, =oac_0805F994 cmp r1, r0 bne @0808EE78 adds r0, r2, 0 @@ -262898,7 +262898,7 @@ sub_808F3E0: ; 808F3E0 lsls r0, 2 ldr r2, =0x02037350 adds r0, r2 - ldr r2, =sub_808F404 + 1 + ldr r2, =sub_808F404 bl meta_step pop {r0} bx r0 @@ -262923,7 +262923,7 @@ sub_808F408: ; 808F408 lsls r0, 2 ldr r2, =0x02037350 adds r0, r2 - ldr r2, =sub_808F42C + 1 + ldr r2, =sub_808F42C bl meta_step pop {r0} bx r0 @@ -263666,7 +263666,7 @@ sub_808F944: ; 808F944 lsls r0, 2 ldr r2, =0x02037350 adds r0, r2 - ldr r2, =sub_808F968 + 1 + ldr r2, =sub_808F968 bl meta_step pop {r0} bx r0 @@ -263838,7 +263838,7 @@ sub_808FA84: ; 808FA84 lsls r0, 2 ldr r2, =0x02037350 adds r0, r2 - ldr r2, =sub_808FAA8 + 1 + ldr r2, =sub_808FAA8 bl meta_step pop {r0} bx r0 @@ -264052,7 +264052,7 @@ sub_808FC08: ; 808FC08 lsls r0, 2 ldr r2, =0x02037350 adds r0, r2 - ldr r2, =sub_808FC2C + 1 + ldr r2, =sub_808FC2C bl meta_step pop {r0} bx r0 @@ -264266,7 +264266,7 @@ sub_808FD8C: ; 808FD8C lsls r0, 2 ldr r2, =0x02037350 adds r0, r2 - ldr r2, =sub_808FDB0 + 1 + ldr r2, =sub_808FDB0 bl meta_step pop {r0} bx r0 @@ -264371,7 +264371,7 @@ sub_808FE2C: ; 808FE2C orrs r0, r1 strh r0, [r4, 0x3C] @0808FE58: - ldr r2, =sub_808FE70 + 1 + ldr r2, =sub_808FE70 adds r0, r5, 0 adds r1, r4, 0 bl meta_step @@ -264655,7 +264655,7 @@ sub_8090050: ; 8090050 lsls r0, 2 ldr r2, =0x02037350 adds r0, r2 - ldr r2, =sub_8090074 + 1 + ldr r2, =sub_8090074 bl meta_step pop {r0} bx r0 @@ -264827,7 +264827,7 @@ sub_8090190: ; 8090190 lsls r0, 2 ldr r2, =0x02037350 adds r0, r2 - ldr r2, =sub_80901B4 + 1 + ldr r2, =sub_80901B4 bl meta_step pop {r0} bx r0 @@ -264999,7 +264999,7 @@ sub_80902D0: ; 80902D0 lsls r0, 2 ldr r2, =0x02037350 adds r0, r2 - ldr r2, =sub_80902F4 + 1 + ldr r2, =sub_80902F4 bl meta_step pop {r0} bx r0 @@ -265171,7 +265171,7 @@ sub_8090410: ; 8090410 lsls r0, 2 ldr r2, =0x02037350 adds r0, r2 - ldr r2, =sub_8090434 + 1 + ldr r2, =sub_8090434 bl meta_step pop {r0} bx r0 @@ -265343,7 +265343,7 @@ sub_8090550: ; 8090550 lsls r0, 2 ldr r2, =0x02037350 adds r0, r2 - ldr r2, =sub_8090574 + 1 + ldr r2, =sub_8090574 bl meta_step pop {r0} bx r0 @@ -265515,7 +265515,7 @@ sub_8090690: ; 8090690 lsls r0, 2 ldr r2, =0x02037350 adds r0, r2 - ldr r2, =sub_80906B4 + 1 + ldr r2, =sub_80906B4 bl meta_step pop {r0} bx r0 @@ -265687,7 +265687,7 @@ sub_80907D0: ; 80907D0 lsls r0, 2 ldr r2, =0x02037350 adds r0, r2 - ldr r2, =sub_80907F4 + 1 + ldr r2, =sub_80907F4 bl meta_step pop {r0} bx r0 @@ -265859,7 +265859,7 @@ sub_8090910: ; 8090910 lsls r0, 2 ldr r2, =0x02037350 adds r0, r2 - ldr r2, =sub_8090934 + 1 + ldr r2, =sub_8090934 bl meta_step pop {r0} bx r0 @@ -266031,7 +266031,7 @@ sub_8090A50: ; 8090A50 lsls r0, 2 ldr r2, =0x02037350 adds r0, r2 - ldr r2, =sub_8090A74 + 1 + ldr r2, =sub_8090A74 bl meta_step pop {r0} bx r0 @@ -266203,7 +266203,7 @@ sub_8090B90: ; 8090B90 lsls r0, 2 ldr r2, =0x02037350 adds r0, r2 - ldr r2, =sub_8090BB4 + 1 + ldr r2, =sub_8090BB4 bl meta_step pop {r0} bx r0 @@ -266375,7 +266375,7 @@ sub_8090CD0: ; 8090CD0 lsls r0, 2 ldr r2, =0x02037350 adds r0, r2 - ldr r2, =sub_8090CF4 + 1 + ldr r2, =sub_8090CF4 bl meta_step pop {r0} bx r0 @@ -266517,7 +266517,7 @@ sub_8090DD4: ; 8090DD4 lsls r0, 2 ldr r2, =0x02037350 adds r0, r2 - ldr r2, =sub_8090DF8 + 1 + ldr r2, =sub_8090DF8 bl meta_step pop {r0} bx r0 @@ -266659,7 +266659,7 @@ sub_8090ED8: ; 8090ED8 lsls r0, 2 ldr r2, =0x02037350 adds r0, r2 - ldr r2, =sub_8090EFC + 1 + ldr r2, =sub_8090EFC bl meta_step pop {r0} bx r0 @@ -266974,7 +266974,7 @@ sub_8091138: ; 8091138 lsls r0, 2 ldr r2, =0x02037350 adds r0, r2 - ldr r2, =sub_809115C + 1 + ldr r2, =sub_809115C bl meta_step pop {r0} bx r0 @@ -267050,7 +267050,7 @@ sub_80911C4: ; 80911C4 lsls r0, 2 ldr r2, =0x02037350 adds r0, r2 - ldr r2, =sub_80911E8 + 1 + ldr r2, =sub_80911E8 bl meta_step pop {r0} bx r0 @@ -267126,7 +267126,7 @@ sub_8091250: ; 8091250 lsls r0, 2 ldr r2, =0x02037350 adds r0, r2 - ldr r2, =sub_8091274 + 1 + ldr r2, =sub_8091274 bl meta_step pop {r0} bx r0 @@ -267202,7 +267202,7 @@ sub_80912DC: ; 80912DC lsls r0, 2 ldr r2, =0x02037350 adds r0, r2 - ldr r2, =sub_8091300 + 1 + ldr r2, =sub_8091300 bl meta_step pop {r0} bx r0 @@ -267278,7 +267278,7 @@ sub_8091368: ; 8091368 lsls r0, 2 ldr r2, =0x02037350 adds r0, r2 - ldr r2, =sub_809138C + 1 + ldr r2, =sub_809138C bl meta_step pop {r0} bx r0 @@ -267354,7 +267354,7 @@ sub_80913F4: ; 80913F4 lsls r0, 2 ldr r2, =0x02037350 adds r0, r2 - ldr r2, =sub_8091418 + 1 + ldr r2, =sub_8091418 bl meta_step pop {r0} bx r0 @@ -267430,7 +267430,7 @@ sub_8091480: ; 8091480 lsls r0, 2 ldr r2, =0x02037350 adds r0, r2 - ldr r2, =sub_80914A4 + 1 + ldr r2, =sub_80914A4 bl meta_step pop {r0} bx r0 @@ -267506,7 +267506,7 @@ sub_809150C: ; 809150C lsls r0, 2 ldr r2, =0x02037350 adds r0, r2 - ldr r2, =sub_8091530 + 1 + ldr r2, =sub_8091530 bl meta_step pop {r0} bx r0 @@ -267582,7 +267582,7 @@ sub_8091598: ; 8091598 lsls r0, 2 ldr r2, =0x02037350 adds r0, r2 - ldr r2, =sub_80915BC + 1 + ldr r2, =sub_80915BC bl meta_step pop {r0} bx r0 @@ -267658,7 +267658,7 @@ sub_8091624: ; 8091624 lsls r0, 2 ldr r2, =0x02037350 adds r0, r2 - ldr r2, =sub_8091648 + 1 + ldr r2, =sub_8091648 bl meta_step pop {r0} bx r0 @@ -267734,7 +267734,7 @@ sub_80916B0: ; 80916B0 lsls r0, 2 ldr r2, =0x02037350 adds r0, r2 - ldr r2, =sub_80916D4 + 1 + ldr r2, =sub_80916D4 bl meta_step pop {r0} bx r0 @@ -267810,7 +267810,7 @@ sub_809173C: ; 809173C lsls r0, 2 ldr r2, =0x02037350 adds r0, r2 - ldr r2, =sub_8091760 + 1 + ldr r2, =sub_8091760 bl meta_step pop {r0} bx r0 @@ -267886,7 +267886,7 @@ sub_80917C8: ; 80917C8 lsls r0, 2 ldr r2, =0x02037350 adds r0, r2 - ldr r2, =sub_80917EC + 1 + ldr r2, =sub_80917EC bl meta_step pop {r0} bx r0 @@ -267962,7 +267962,7 @@ sub_8091854: ; 8091854 lsls r0, 2 ldr r2, =0x02037350 adds r0, r2 - ldr r2, =sub_8091878 + 1 + ldr r2, =sub_8091878 bl meta_step pop {r0} bx r0 @@ -268038,7 +268038,7 @@ sub_80918E0: ; 80918E0 lsls r0, 2 ldr r2, =0x02037350 adds r0, r2 - ldr r2, =sub_8091904 + 1 + ldr r2, =sub_8091904 bl meta_step pop {r0} bx r0 @@ -268114,7 +268114,7 @@ sub_809196C: ; 809196C lsls r0, 2 ldr r2, =0x02037350 adds r0, r2 - ldr r2, =sub_8091990 + 1 + ldr r2, =sub_8091990 bl meta_step pop {r0} bx r0 @@ -268190,7 +268190,7 @@ sub_80919F8: ; 80919F8 lsls r0, 2 ldr r2, =0x02037350 adds r0, r2 - ldr r2, =sub_8091A1C + 1 + ldr r2, =sub_8091A1C bl meta_step pop {r0} bx r0 @@ -268266,7 +268266,7 @@ sub_8091A84: ; 8091A84 lsls r0, 2 ldr r2, =0x02037350 adds r0, r2 - ldr r2, =sub_8091AA8 + 1 + ldr r2, =sub_8091AA8 bl meta_step pop {r0} bx r0 @@ -268342,7 +268342,7 @@ sub_8091B10: ; 8091B10 lsls r0, 2 ldr r2, =0x02037350 adds r0, r2 - ldr r2, =sub_8091B34 + 1 + ldr r2, =sub_8091B34 bl meta_step pop {r0} bx r0 @@ -268418,7 +268418,7 @@ sub_8091B9C: ; 8091B9C lsls r0, 2 ldr r2, =0x02037350 adds r0, r2 - ldr r2, =sub_8091BC0 + 1 + ldr r2, =sub_8091BC0 bl meta_step pop {r0} bx r0 @@ -268494,7 +268494,7 @@ sub_8091C28: ; 8091C28 lsls r0, 2 ldr r2, =0x02037350 adds r0, r2 - ldr r2, =sub_8091C4C + 1 + ldr r2, =sub_8091C4C bl meta_step pop {r0} bx r0 @@ -268570,7 +268570,7 @@ sub_8091CB4: ; 8091CB4 lsls r0, 2 ldr r2, =0x02037350 adds r0, r2 - ldr r2, =sub_8091CD8 + 1 + ldr r2, =sub_8091CD8 bl meta_step pop {r0} bx r0 @@ -268646,7 +268646,7 @@ sub_8091D40: ; 8091D40 lsls r0, 2 ldr r2, =0x02037350 adds r0, r2 - ldr r2, =sub_8091D64 + 1 + ldr r2, =sub_8091D64 bl meta_step pop {r0} bx r0 @@ -268722,7 +268722,7 @@ sub_8091DCC: ; 8091DCC lsls r0, 2 ldr r2, =0x02037350 adds r0, r2 - ldr r2, =sub_8091DF0 + 1 + ldr r2, =sub_8091DF0 bl meta_step pop {r0} bx r0 @@ -268798,7 +268798,7 @@ sub_8091E58: ; 8091E58 lsls r0, 2 ldr r2, =0x02037350 adds r0, r2 - ldr r2, =sub_8091E7C + 1 + ldr r2, =sub_8091E7C bl meta_step pop {r0} bx r0 @@ -269586,7 +269586,7 @@ sub_8092494: ; 8092494 lsls r0, 2 ldr r2, =0x02037350 adds r0, r2 - ldr r2, =sub_80924B8 + 1 + ldr r2, =sub_80924B8 bl meta_step pop {r0} bx r0 @@ -269647,7 +269647,7 @@ mss_08062EA4: ; 80924D8 adds r2, r0, 0 lsls r2, 24 lsrs r2, 24 - ldr r3, =sub_8088E64 + 1 + ldr r3, =sub_8088E64 ldr r4, [r4] adds r0, r6, 0 adds r1, r7, 0 @@ -269707,7 +269707,7 @@ sub_809253C: ; 809253C lsls r0, 2 ldr r1, =0x02037350 adds r0, r1 - ldr r2, =sub_80925AC + 1 + ldr r2, =sub_80925AC adds r1, r5, 0 bl meta_step pop {r4-r6} @@ -269771,7 +269771,7 @@ sub_80925B8: ; 80925B8 lsls r0, 2 ldr r1, =0x02037350 adds r0, r1 - ldr r2, =sub_80925AC + 1 + ldr r2, =sub_80925AC adds r1, r5, 0 bl meta_step pop {r4-r6} @@ -269822,7 +269822,7 @@ sub_8092628: ; 8092628 adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r2, =sub_809268C + 1 + ldr r2, =sub_809268C adds r1, r3, 0 bl meta_step pop {r4} @@ -269888,7 +269888,7 @@ sub_80926D4: ; 80926D4 lsls r0, 2 ldr r2, =0x02037350 adds r0, r2 - ldr r2, =sub_80926F8 + 1 + ldr r2, =sub_80926F8 bl meta_step pop {r0} bx r0 @@ -269949,7 +269949,7 @@ sub_8092744: ; 8092744 lsls r0, 2 ldr r2, =0x02037350 adds r0, r2 - ldr r2, =sub_8092768 + 1 + ldr r2, =sub_8092768 bl meta_step pop {r0} bx r0 @@ -270010,7 +270010,7 @@ sub_80927B4: ; 80927B4 lsls r0, 2 ldr r2, =0x02037350 adds r0, r2 - ldr r2, =sub_80927D8 + 1 + ldr r2, =sub_80927D8 bl meta_step pop {r0} bx r0 @@ -270071,7 +270071,7 @@ sub_8092824: ; 8092824 lsls r0, 2 ldr r2, =0x02037350 adds r0, r2 - ldr r2, =sub_8092848 + 1 + ldr r2, =sub_8092848 bl meta_step pop {r0} bx r0 @@ -270132,7 +270132,7 @@ sub_8092894: ; 8092894 lsls r0, 2 ldr r2, =0x02037350 adds r0, r2 - ldr r2, =sub_80928B8 + 1 + ldr r2, =sub_80928B8 bl meta_step pop {r0} bx r0 @@ -273716,7 +273716,7 @@ sub_80940C4: ; 80940C4 thumb_func_start sub_8094188 sub_8094188: ; 8094188 push {lr} - ldr r2, =sub_809785C + 1 + ldr r2, =sub_809785C bl sub_80940C4 lsls r0, 24 lsrs r0, 24 @@ -273729,7 +273729,7 @@ sub_8094188: ; 8094188 thumb_func_start sub_809419C sub_809419C: ; 809419C push {lr} - ldr r2, =sub_80978E4 + 1 + ldr r2, =sub_80978E4 bl sub_80940C4 lsls r0, 24 lsrs r0, 24 @@ -281885,7 +281885,7 @@ sub_8097AF0: ; 8097AF0 cmp r0, 0 beq @08097B16 ldr r1, [r2, 0x1C] - ldr r0, =sub_8097AC8 + 1 + ldr r0, =sub_8097AC8 cmp r1, r0 bne @08097B16 adds r0, r2, 0 @@ -281920,7 +281920,7 @@ sub_8097B2C: ; 8097B2C cmp r0, 0 beq @08097B68 ldr r1, [r2, 0x1C] - ldr r0, =sub_8097AC8 + 1 + ldr r0, =sub_8097AC8 cmp r1, r0 bne @08097B68 ldrh r0, [r2, 0x2E] @@ -282548,7 +282548,7 @@ sub_8097F78: ; 8097F78 sub_8097FA4: ; 8097FA4 push {r4-r6,lr} adds r6, r0, 0 - ldr r0, =sub_8097FE4 + 1 + ldr r0, =sub_8097FE4 movs r1, 0xFF bl AddTask adds r5, r0, 0 @@ -282842,7 +282842,7 @@ sub_8098154: ; 8098154 thumb_func_start task_add_textbox task_add_textbox: ; 80981BC push {lr} - ldr r0, =sub_8098154 + 1 + ldr r0, =sub_8098154 movs r1, 0x50 bl AddTask pop {r0} @@ -282854,7 +282854,7 @@ task_add_textbox: ; 80981BC thumb_func_start task_del_textbox task_del_textbox: ; 80981D0 push {lr} - ldr r0, =sub_8098154 + 1 + ldr r0, =sub_8098154 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -282925,7 +282925,7 @@ sub_8098238: ; 8098238 ldr r0, =0x02021fc4 adds r1, r4, 0 bl ExpandTextCodes - ldr r0, =sub_8098214 + 1 + ldr r0, =sub_8098214 movs r1, 0 bl AddTask adds r0, r4, 0 @@ -283145,7 +283145,7 @@ sub_80983A4: ; 80983A4 thumb_func_start sub_80983C4 sub_80983C4: ; 80983C4 push {lr} - ldr r0, =sub_80983A4 + 1 + ldr r0, =sub_80983A4 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 @@ -283166,7 +283166,7 @@ sub_80983C4: ; 80983C4 sub_80983E8: ; 80983E8 push {lr} bl player_bitmagic - ldr r0, =sub_80983A4 + 1 + ldr r0, =sub_80983A4 movs r1, 0x50 bl AddTask pop {r0} @@ -283238,7 +283238,7 @@ sub_8098400: ; 8098400 thumb_func_start sub_809847C sub_809847C: ; 809847C push {lr} - ldr r0, =sub_8098400 + 1 + ldr r0, =sub_8098400 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 @@ -283261,7 +283261,7 @@ sub_80984A0: ; 80984A0 ldr r4, =0x03005df0 ldrb r0, [r4] bl sub_80974D0 - ldr r0, =sub_8098400 + 1 + ldr r0, =sub_8098400 movs r1, 0x50 bl AddTask lsls r0, 24 @@ -283472,7 +283472,7 @@ sub_8098630: ; 8098630 adds r0, r4, 0 adds r1, r5, 0 bl sub_8098074 - ldr r7, =sub_80985BC + 1 + ldr r7, =sub_80985BC adds r0, r7, 0 movs r1, 0x50 bl AddTask @@ -283531,7 +283531,7 @@ sub_8098630: ; 8098630 @080986E0: adds r0, r4, 0 bl sub_80974D0 - ldr r0, =sub_80985BC + 1 + ldr r0, =sub_80985BC movs r1, 0x50 bl AddTask lsls r0, 24 @@ -283569,7 +283569,7 @@ sub_8098630: ; 8098630 thumb_func_start sub_8098734 sub_8098734: ; 8098734 push {lr} - ldr r0, =sub_80985BC + 1 + ldr r0, =sub_80985BC bl is_function_an_active_task lsls r0, 24 cmp r0, 0 @@ -286548,7 +286548,7 @@ s97_screen_special_effect: ; 8099CC8 str r1, [r4, 0x8] movs r1, 0 bl fade_screen - ldr r1, =sub_8099CA8 + 1 + ldr r1, =sub_8099CA8 adds r0, r4, 0 bl script_setup_asm_script movs r0, 0x1 @@ -286574,7 +286574,7 @@ s98_refade_with_timer: ; 8099CF0 lsls r1, 24 asrs r1, 24 bl fade_screen - ldr r1, =sub_8099CA8 + 1 + ldr r1, =sub_8099CA8 adds r0, r4, 0 bl script_setup_asm_script movs r0, 0x1 @@ -286624,7 +286624,7 @@ sub_8099D20: ; 8099D20 movs r1, 0 bl fade_screen @08099D72: - ldr r1, =sub_8099CA8 + 1 + ldr r1, =sub_8099CA8 adds r0, r5, 0 bl script_setup_asm_script movs r0, 0x1 @@ -286664,7 +286664,7 @@ s28_pause: ; 8099DB4 bl script_read_halfword ldr r1, =0x020375c8 strh r0, [r1] - ldr r1, =s28_pause_asm + 1 + ldr r1, =s28_pause_asm adds r0, r4, 0 bl script_setup_asm_script movs r0, 0x1 @@ -287576,7 +287576,7 @@ s30_music_check_asm: ; 809A4C8 thumb_func_start s30_music_check s30_music_check: ; 809A4E0 push {lr} - ldr r1, =s30_music_check_asm + 1 + ldr r1, =s30_music_check_asm bl script_setup_asm_script movs r0, 0x1 pop {r1} @@ -287610,7 +287610,7 @@ s32_fanfare_wait_asm: ; 809A508 thumb_func_start s32_fanfare_wait s32_fanfare_wait: ; 809A518 push {lr} - ldr r1, =s32_fanfare_wait_asm + 1 + ldr r1, =s32_fanfare_wait_asm bl script_setup_asm_script movs r0, 0x1 pop {r1} @@ -287696,7 +287696,7 @@ s37_fadeout: ; 809A590 movs r0, 0x4 bl sub_80A31E8 @0809A5B0: - ldr r1, =sub_80A3200 + 1 + ldr r1, =sub_80A3200 adds r0, r4, 0 bl script_setup_asm_script movs r0, 0x1 @@ -287837,7 +287837,7 @@ s51_waitmove: ; 809A698 movs r0, 0x5 ldrsb r0, [r2, r0] strh r0, [r1] - ldr r1, =s51a_0806B288 + 1 + ldr r1, =s51a_0806B288 adds r0, r4, 0 bl script_setup_asm_script movs r0, 0x1 @@ -287874,7 +287874,7 @@ s52_waitmove_remote: ; 809A6EC strh r2, [r0] ldr r0, =0x020375ce strh r1, [r0] - ldr r1, =s51a_0806B288 + 1 + ldr r1, =s51a_0806B288 adds r0, r4, 0 bl script_setup_asm_script movs r0, 0x1 @@ -288345,7 +288345,7 @@ sub_809AAC4: ; 809AAC4 cmp r0, 0 bne @0809AAE4 bl sub_80983E8 - ldr r1, =sub_80983C4 + 1 + ldr r1, =sub_80983C4 adds r0, r4, 0 bl script_setup_asm_script movs r0, 0x1 @@ -288382,7 +288382,7 @@ sub_809AAEC: ; 809AAEC cmp r0, 0 beq @0809AB2C bl sub_80984A0 - ldr r1, =sub_809847C + 1 + ldr r1, =sub_809847C adds r0, r4, 0 bl script_setup_asm_script b @0809AB38 @@ -288390,7 +288390,7 @@ sub_809AAEC: ; 809AAEC .pool @0809AB2C: bl sub_80983E8 - ldr r1, =sub_80983C4 + 1 + ldr r1, =sub_80983C4 adds r0, r4, 0 bl script_setup_asm_script @0809AB38: @@ -288562,7 +288562,7 @@ s78_braille_msgbox: ; 809AC3C thumb_func_start sub_809AC78 sub_809AC78: ; 809AC78 push {lr} - ldr r1, =sub_809833C + 1 + ldr r1, =sub_809833C bl script_setup_asm_script movs r0, 0x1 pop {r1} @@ -288607,7 +288607,7 @@ sub_809AC98: ; 809AC98 thumb_func_start sub_809ACC0 sub_809ACC0: ; 809ACC0 push {lr} - ldr r1, =sub_809AC98 + 1 + ldr r1, =sub_809AC98 bl script_setup_asm_script movs r0, 0x1 pop {r1} @@ -289975,7 +289975,7 @@ s89_open_casino_game1: ; 809B6F4 bl var_get lsls r0, 24 lsrs r0, 24 - ldr r1, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 + ldr r1, =c2_exit_to_overworld_1_continue_scripts_restart_music bl sub_812A540 bl script_env_2_set_ctx_paused movs r0, 0x1 @@ -290161,7 +290161,7 @@ s9E_checkarray_HM_animation: ; 809B844 bl var_get ldr r1, =0x020375d0 strh r0, [r1] - ldr r1, =sub_809B824 + 1 + ldr r1, =sub_809B824 adds r0, r4, 0 bl script_setup_asm_script movs r0, 0x1 @@ -290230,7 +290230,7 @@ sA1_play_cry: ; 809B8A4 thumb_func_start sub_809B8DC sub_809B8DC: ; 809B8DC push {lr} - ldr r1, =sub_80A3678 + 1 + ldr r1, =sub_80A3678 bl script_setup_asm_script movs r0, 0x1 pop {r1} @@ -290390,7 +290390,7 @@ sub_809BA0C: ; 809BA0C thumb_func_start sub_809BA24 sub_809BA24: ; 809BA24 push {lr} - ldr r1, =sub_809BA0C + 1 + ldr r1, =sub_809BA0C bl script_setup_asm_script movs r0, 0x1 pop {r1} @@ -290664,7 +290664,7 @@ sub_809BBFC: ; 809BBFC cmp r0, 0 beq @0809BC2E bl sub_8098630 - ldr r1, =sub_8098734 + 1 + ldr r1, =sub_8098734 adds r0, r4, 0 bl script_setup_asm_script @0809BC2E: @@ -294404,7 +294404,7 @@ sub_809D908: ; 809D908 thumb_func_start overworld_ensure_per_step_coros_running overworld_ensure_per_step_coros_running: ; 809D93C push {r4,r5,lr} - ldr r5, =task_per_step_callback_manager + 1 + ldr r5, =task_per_step_callback_manager adds r0, r5, 0 bl is_function_an_active_task lsls r0, 24 @@ -294423,7 +294423,7 @@ overworld_ensure_per_step_coros_running: ; 809D93C adds r1, r2 strh r4, [r1, 0x8] @0809D966: - ldr r4, =sub_809E638 + 1 + ldr r4, =sub_809E638 adds r0, r4, 0 bl is_function_an_active_task lsls r0, 24 @@ -294433,7 +294433,7 @@ overworld_ensure_per_step_coros_running: ; 809D93C movs r1, 0x50 bl AddTask @0809D97C: - ldr r4, =sub_809D908 + 1 + ldr r4, =sub_809D908 adds r0, r4, 0 bl is_function_an_active_task lsls r0, 24 @@ -294455,7 +294455,7 @@ activate_per_step_callback: ; 809D9A8 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, =task_per_step_callback_manager + 1 + ldr r0, =task_per_step_callback_manager bl get_task_id_by_function lsls r0, 24 lsrs r1, r0, 24 @@ -294492,11 +294492,11 @@ activate_per_step_callback: ; 809D9A8 thumb_func_start wild_encounter_reset_coro_args wild_encounter_reset_coro_args: ; 809D9F0 push {lr} - ldr r0, =task_per_step_callback_manager + 1 + ldr r0, =task_per_step_callback_manager bl get_task_id_by_function lsls r0, 24 lsrs r1, r0, 24 - ldr r0, =sub_809D908 + 1 + ldr r0, =sub_809D908 bl get_task_id_by_function lsls r0, 24 lsrs r1, r0, 24 @@ -296404,7 +296404,7 @@ sub_809E858: ; 809E858 sub_809E8B4: ; 809E8B4 push {lr} bl sub_809E778 - ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 + ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music bl set_callback2 pop {r0} bx r0 @@ -296415,10 +296415,10 @@ sub_809E8B4: ; 809E8B4 thumb_func_start sub_809E8C8 sub_809E8C8: ; 809E8C8 push {lr} - ldr r0, =sub_81349F4 + 1 + ldr r0, =sub_81349F4 bl set_callback2 ldr r1, =0x030022c0 - ldr r0, =sub_809E8B4 + 1 + ldr r0, =sub_809E8B4 str r0, [r1, 0x8] pop {r0} bx r0 @@ -296729,7 +296729,7 @@ sub_809EB04: ; 809EB04 adds r4, r6, 0 adds r4, 0x1C adds r2, r0, r4 - ldr r1, =sub_809E8E8 + 1 + ldr r1, =sub_809E8E8 str r1, [r2] adds r0, r6 strh r5, [r0, 0x2E] @@ -296746,7 +296746,7 @@ sub_809EB04: ; 809EB04 adds r0, r1 lsls r0, 2 adds r4, r0, r4 - ldr r1, =sub_809EA04 + 1 + ldr r1, =sub_809EA04 str r1, [r4] adds r0, r6 strh r5, [r0, 0x2E] @@ -297057,7 +297057,7 @@ sub_809EDB8: ; 809EDB8 bl sub_809EB8C subs r5, 0x8 adds r4, r5 - ldr r0, =sub_809EDA0 + 1 + ldr r0, =sub_809EDA0 str r0, [r4] pop {r4,r5} pop {r0} @@ -297096,7 +297096,7 @@ sub_809EDE8: ; 809EDE8 mov r0, r8 subs r0, 0x8 adds r0, r7, r0 - ldr r1, =sub_809EDB8 + 1 + ldr r1, =sub_809EDB8 str r1, [r0] movs r0, 0 strh r0, [r5, 0x2] @@ -297153,7 +297153,7 @@ sub_809EDE8: ; 809EDE8 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, =sub_809EDB8 + 1 + ldr r1, =sub_809EDB8 str r1, [r0] strh r4, [r5, 0x2] movs r0, 0x6 @@ -297249,7 +297249,7 @@ sub_809EF00: ; 809EF00 negs r0, r0 add r9, r0 add r6, r9 - ldr r0, =sub_809EDE8 + 1 + ldr r0, =sub_809EDE8 str r0, [r6] add sp, 0x4 pop {r3,r4} @@ -297325,11 +297325,11 @@ sub_809EF88: ; 809EF88 bl clear_tasks bl sub_80A1A74 bl sub_809F048 - ldr r0, =sub_809F0AC + 1 + ldr r0, =sub_809F0AC bl SetVBlankCallback - ldr r0, =sub_809F090 + 1 + ldr r0, =sub_809F090 bl set_callback2 - ldr r0, =sub_809F200 + 1 + ldr r0, =sub_809F200 movs r1, 0x50 bl AddTask add sp, 0x4 @@ -297608,7 +297608,7 @@ sub_809F200: ; 809F200 .pool @0809F29C: bl sub_802F588 - ldr r0, =sub_809F0F8 + 1 + ldr r0, =sub_809F0F8 movs r1, 0x50 bl AddTask lsls r0, 24 @@ -297643,7 +297643,7 @@ sub_809F200: ; 809F200 ldr r0, [r0] str r0, [r2] str r1, [r2, 0x4] - ldr r0, =sub_809EF00 + 1 + ldr r0, =sub_809EF00 movs r1, 0x50 bl AddTask lsls r0, 24 @@ -298200,7 +298200,7 @@ sub_809F7C0: ; 809F7C0 adds r0, 0x4 adds r0, r3, r0 ldr r1, [r0] - ldr r0, =sub_809FC8C + 1 + ldr r0, =sub_809FC8C adds r7, r2, 0 cmp r1, r0 bne @0809F828 @@ -298434,7 +298434,7 @@ sub_809F9D0: ; 809F9D0 movs r0, 0 strb r0, [r1] strb r0, [r1, 0x1] - ldr r4, =task50_startmenu + 1 + ldr r4, =task50_startmenu adds r0, r4, 0 movs r1, 0x50 bl AddTask @@ -298473,7 +298473,7 @@ sub_809FA18: ; 809FA18 strb r0, [r1] strb r0, [r1, 0x1] ldr r1, =0x03005db0 - ldr r0, =sub_809FA00 + 1 + ldr r0, =sub_809FA00 str r0, [r1] bx lr .align 2, 0 @@ -298506,7 +298506,7 @@ sub_809FA34: ; 809FA34 bl var_800D_set_xB @0809FA64: ldr r1, =0x03005df4 - ldr r0, =sub_809FAC4 + 1 + ldr r0, =sub_809FAC4 str r0, [r1] ldrh r0, [r4, 0x8] adds r0, 0x1 @@ -298542,7 +298542,7 @@ sub_809FA9C: ; 809FA9C bl sub_808B864 bl sub_808BCF4 @0809FAB2: - ldr r0, =sub_809FA34 + 1 + ldr r0, =sub_809FA34 bl sub_809F9D0 bl script_env_2_enable pop {r0} @@ -298597,7 +298597,7 @@ sub_809FAC4: ; 809FAC4 adds r1, 0x4 adds r0, r1 ldr r1, [r0] - ldr r0, =sm_pokedex + 1 + ldr r0, =sm_pokedex cmp r1, r0 bne @0809FB34 movs r0, 0 @@ -298618,16 +298618,16 @@ sub_809FAC4: ; 809FAC4 adds r0, r1 ldr r1, [r0] str r1, [r3] - ldr r0, =sub_809FCFC + 1 + ldr r0, =sub_809FCFC cmp r1, r0 beq @0809FBA0 - ldr r0, =sub_809FD64 + 1 + ldr r0, =sub_809FD64 cmp r1, r0 beq @0809FBA0 - ldr r0, =sub_809FD74 + 1 + ldr r0, =sub_809FD74 cmp r1, r0 beq @0809FBA0 - ldr r0, =sub_809FDC0 + 1 + ldr r0, =sub_809FDC0 cmp r1, r0 beq @0809FBA0 movs r0, 0x1 @@ -298673,7 +298673,7 @@ sm_pokedex: ; 809FBB4 bl play_some_sound bl sub_809F774 bl overworld_free_bg_tilemaps - ldr r0, =sub_80BB534 + 1 + ldr r0, =sub_80BB534 bl set_callback2 movs r0, 0x1 @0809FBE6: @@ -298700,7 +298700,7 @@ sub_809FBF0: ; 809FBF0 bl play_some_sound bl sub_809F774 bl overworld_free_bg_tilemaps - ldr r0, =sub_81B7F34 + 1 + ldr r0, =sub_81B7F34 bl set_callback2 movs r0, 0x1 @0809FC1C: @@ -298727,7 +298727,7 @@ sub_809FC24: ; 809FC24 bl play_some_sound bl sub_809F774 bl overworld_free_bg_tilemaps - ldr r0, =c2_bag + 1 + ldr r0, =c2_bag bl set_callback2 movs r0, 0x1 @0809FC50: @@ -298754,7 +298754,7 @@ sub_809FC58: ; 809FC58 bl play_some_sound bl sub_809F774 bl overworld_free_bg_tilemaps - ldr r0, =sub_81C7250 + 1 + ldr r0, =sub_81C7250 bl set_callback2 movs r0, 0x1 @0809FC84: @@ -298783,7 +298783,7 @@ sub_809FC8C: ; 809FC8C cmp r0, 0 beq @0809FCC8 @0809FCB6: - ldr r0, =sub_8086194 + 1 + ldr r0, =sub_8086194 bl sub_80C4DDC b @0809FCEA .align 2, 0 @@ -298794,13 +298794,13 @@ sub_809FC8C: ; 809FC8C lsls r0, 24 cmp r0, 0 beq @0809FCE4 - ldr r0, =sub_8086194 + 1 + ldr r0, =sub_8086194 bl sub_80C51C4 b @0809FCEA .align 2, 0 .pool @0809FCE4: - ldr r0, =sub_8086194 + 1 + ldr r0, =sub_8086194 bl sub_80C4DDC @0809FCEA: movs r0, 0x1 @@ -298824,7 +298824,7 @@ sub_809FCFC: ; 809FCFC bl sub_809F774 @0809FD0C: ldr r1, =0x03005df4 - ldr r0, =sub_809FE28 + 1 + ldr r0, =sub_809FE28 str r0, [r1] movs r0, 0 pop {r1} @@ -298850,10 +298850,10 @@ sub_809FD20: ; 809FD20 bl play_some_sound bl sub_809F774 bl overworld_free_bg_tilemaps - ldr r0, =c2_options_menu + 1 + ldr r0, =c2_options_menu bl set_callback2 ldr r1, =0x030022c0 - ldr r0, =sub_8086194 + 1 + ldr r0, =sub_8086194 str r0, [r1, 0x8] movs r0, 0x1 @0809FD52: @@ -298902,7 +298902,7 @@ sub_809FD88: ; 809FD88 bl overworld_free_bg_tilemaps ldr r0, =0x03005db4 ldrb r0, [r0] - ldr r1, =sub_8086194 + 1 + ldr r1, =sub_8086194 bl sub_80C4E74 movs r0, 0x1 @0809FDB4: @@ -298915,7 +298915,7 @@ sub_809FD88: ; 809FD88 thumb_func_start sub_809FDC0 sub_809FDC0: ; 809FDC0 ldr r1, =0x03005df4 - ldr r0, =sub_809FE9C + 1 + ldr r0, =sub_809FE9C str r0, [r1] movs r0, 0 bx lr @@ -298930,7 +298930,7 @@ atk17_seteffectuser: ; 809FDD4 movs r1, 0 bl sub_8197DF8 bl sub_80984F4 - ldr r0, =sub_809FA34 + 1 + ldr r0, =sub_809FA34 bl sub_809F9D0 bl script_env_2_enable pop {r0} @@ -298956,7 +298956,7 @@ sub_809FDF4: ; 809FDF4 bl play_some_sound bl sub_809F774 bl overworld_free_bg_tilemaps - ldr r0, =sub_81C4EFC + 1 + ldr r0, =sub_81C4EFC bl set_callback2 movs r0, 0x1 @0809FE20: @@ -298971,7 +298971,7 @@ sub_809FE28: ; 809FE28 push {lr} bl sub_809FF28 ldr r1, =0x03005df4 - ldr r0, =sub_809FE44 + 1 + ldr r0, =sub_809FE44 str r0, [r1] movs r0, 0 pop {r1} @@ -299001,7 +299001,7 @@ sub_809FE44: ; 809FE44 bl sub_8197DF8 bl sub_809F998 ldr r1, =0x03005df4 - ldr r0, =sub_809FAC4 + 1 + ldr r0, =sub_809FAC4 str r0, [r1] b @0809FE94 .align 2, 0 @@ -299027,7 +299027,7 @@ sub_809FE9C: ; 809FE9C push {lr} bl sub_80A0340 ldr r1, =0x03005df4 - ldr r0, =sub_809FED4 + 1 + ldr r0, =sub_809FED4 str r0, [r1] movs r0, 0 pop {r1} @@ -299041,7 +299041,7 @@ sub_809FEB8: ; 809FEB8 push {lr} bl sub_809F998 ldr r1, =0x03005df4 - ldr r0, =sub_809FAC4 + 1 + ldr r0, =sub_809FAC4 str r0, [r1] movs r0, 0 pop {r1} @@ -299066,7 +299066,7 @@ sub_809FED4: ; 809FED4 @0809FEEC: bl sub_809F774 ldr r1, =0x03005df4 - ldr r0, =sub_809FEB8 + 1 + ldr r0, =sub_809FEB8 str r0, [r1] b @0809FF20 .align 2, 0 @@ -299095,7 +299095,7 @@ sub_809FF28: ; 809FF28 push {lr} bl save_serialize_map ldr r1, =0x0203761c - ldr r0, =sub_80A00A0 + 1 + ldr r0, =sub_80A00A0 str r0, [r1] ldr r1, =0x02037621 movs r0, 0 @@ -299136,7 +299136,7 @@ sub_809FF4C: ; 809FF4C sub_809FF80: ; 809FF80 push {lr} bl sub_809FF28 - ldr r0, =task50_save_game + 1 + ldr r0, =task50_save_game movs r1, 0x50 bl AddTask pop {r0} @@ -299309,14 +299309,14 @@ sub_80A00A0: ; 80A00A0 cmp r0, 0 beq @080A00D4 ldr r0, =gUnknown_08252CA7 - ldr r1, =sub_80A00EC + 1 + ldr r1, =sub_80A00EC bl sub_809FF98 b @080A00DC .align 2, 0 .pool @080A00D4: ldr r0, =gUnknown_082C87B4 - ldr r1, =sub_80A00EC + 1 + ldr r1, =sub_80A00EC bl sub_809FF98 @080A00DC: movs r0, 0 @@ -299331,7 +299331,7 @@ sub_80A00EC: ; 80A00EC push {lr} bl sub_8197930 ldr r1, =0x0203761c - ldr r0, =sub_80A0108 + 1 + ldr r0, =sub_80A0108 str r0, [r1] movs r0, 0 pop {r1} @@ -299373,14 +299373,14 @@ sub_80A0108: ; 80A0108 bne @080A0158 @080A013E: ldr r1, =0x0203761c - ldr r0, =sub_80A017C + 1 + ldr r0, =sub_80A017C str r0, [r1] b @080A0174 .align 2, 0 .pool @080A0158: ldr r1, =0x0203761c - ldr r0, =sub_80A0234 + 1 + ldr r0, =sub_80A0234 str r0, [r1] b @080A0174 .align 2, 0 @@ -299405,14 +299405,14 @@ sub_80A017C: ; 80A017C cmp r0, 0x1 bne @080A019C ldr r0, =gUnknown_082C8845 - ldr r1, =sub_80A01B4 + 1 + ldr r1, =sub_80A01B4 bl sub_809FF98 b @080A01A4 .align 2, 0 .pool @080A019C: ldr r0, =gUnknown_082C87D5 - ldr r1, =sub_80A01D0 + 1 + ldr r1, =sub_80A01D0 bl sub_809FF98 @080A01A4: movs r0, 0 @@ -299428,7 +299428,7 @@ sub_80A01B4: ; 80A01B4 movs r0, 0x1 bl sub_8197948 ldr r1, =0x0203761c - ldr r0, =sub_80A01EC + 1 + ldr r0, =sub_80A01EC str r0, [r1] movs r0, 0 pop {r1} @@ -299442,7 +299442,7 @@ sub_80A01D0: ; 80A01D0 push {lr} bl sub_8197930 ldr r1, =0x0203761c - ldr r0, =sub_80A01EC + 1 + ldr r0, =sub_80A01EC str r0, [r1] movs r0, 0 pop {r1} @@ -299472,7 +299472,7 @@ sub_80A01EC: ; 80A01EC b @080A022C @080A020E: ldr r1, =0x0203761c - ldr r0, =sub_80A0234 + 1 + ldr r0, =sub_80A0234 str r0, [r1] b @080A022C .align 2, 0 @@ -299493,7 +299493,7 @@ sub_80A01EC: ; 80A01EC sub_80A0234: ; 80A0234 push {lr} ldr r0, =gUnknown_082C8810 - ldr r1, =sub_80A024C + 1 + ldr r1, =sub_80A024C bl sub_809FF98 movs r0, 0 pop {r1} @@ -299530,14 +299530,14 @@ sub_80A024C: ; 80A024C cmp r1, 0x1 bne @080A0294 ldr r0, =gUnknown_082C8832 - ldr r1, =sub_80A02B0 + 1 + ldr r1, =sub_80A02B0 bl sub_809FF98 b @080A029C .align 2, 0 .pool @080A0294: ldr r0, =gUnknown_082C892A - ldr r1, =sub_80A02FC + 1 + ldr r1, =sub_80A02FC bl sub_809FF98 @080A029C: bl sub_80A0030 @@ -299560,7 +299560,7 @@ sub_80A02B0: ; 80A02B0 movs r0, 0x37 bl audio_play ldr r1, =0x0203761c - ldr r0, =sub_80A02D8 + 1 + ldr r0, =sub_80A02D8 str r0, [r1] @080A02CA: movs r0, 0 @@ -299602,7 +299602,7 @@ sub_80A02FC: ; 80A02FC movs r0, 0x16 bl audio_play ldr r1, =0x0203761c - ldr r0, =sub_80A0324 + 1 + ldr r0, =sub_80A0324 str r0, [r1] @080A0316: movs r0, 0 @@ -299632,7 +299632,7 @@ sub_80A0324: ; 80A0324 thumb_func_start sub_80A0340 sub_80A0340: ; 80A0340 ldr r1, =0x0203761c - ldr r0, =sub_80A035C + 1 + ldr r0, =sub_80A035C str r0, [r1] ldr r1, =0x02037621 movs r0, 0 @@ -299652,7 +299652,7 @@ sub_80A035C: ; 80A035C bl sub_819746C bl sub_8197A14 ldr r0, =gUnknown_08252CFB - ldr r1, =sub_80A0388 + 1 + ldr r1, =sub_80A0388 bl sub_809FF98 movs r0, 0 pop {r1} @@ -299667,7 +299667,7 @@ sub_80A0388: ; 80A0388 movs r0, 0x1 bl sub_8197948 ldr r1, =0x0203761c - ldr r0, =sub_80A03A4 + 1 + ldr r0, =sub_80A03A4 str r0, [r1] movs r0, 0 pop {r1} @@ -299829,7 +299829,7 @@ sub_80A03E4: ; 80A03E4 movs r1, 0x10 movs r2, 0 bl sub_80A2A20 - ldr r0, =sub_80A03D8 + 1 + ldr r0, =sub_80A03D8 bl SetVBlankCallback movs r0, 0x1 bl enable_irqs @@ -299861,10 +299861,10 @@ sub_80A0514: ; 80A0514 bl sub_80A03E4 cmp r0, 0 beq @080A052E - ldr r0, =sub_80A0550 + 1 + ldr r0, =sub_80A0550 movs r1, 0x50 bl AddTask - ldr r0, =sub_80A0540 + 1 + ldr r0, =sub_80A0540 bl set_callback2 @080A052E: pop {r0} @@ -300021,7 +300021,7 @@ sub_80A0550: ; 80A0550 .align 2, 0 .pool @080A0688: - ldr r0, =sub_8153688 + 1 + ldr r0, =sub_8153688 movs r1, 0x5 bl AddTask movs r0, 0x6 @@ -300029,7 +300029,7 @@ sub_80A0550: ; 80A0550 .align 2, 0 .pool @080A0698: - ldr r0, =sub_8153688 + 1 + ldr r0, =sub_8153688 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 @@ -300267,7 +300267,7 @@ sub_80A08A4: ; 80A08A4 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, =sub_8153688 + 1 + ldr r0, =sub_8153688 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 @@ -300286,7 +300286,7 @@ sub_80A08A4: ; 80A08A4 thumb_func_start sub_80A08CC sub_80A08CC: ; 80A08CC push {r4,r5,lr} - ldr r0, =sub_8153688 + 1 + ldr r0, =sub_8153688 movs r1, 0x5 bl AddTask adds r4, r0, 0 @@ -300299,7 +300299,7 @@ sub_80A08CC: ; 80A08CC adds r0, r5 movs r1, 0x1 strh r1, [r0, 0xC] - ldr r0, =sub_80A08A4 + 1 + ldr r0, =sub_80A08A4 movs r1, 0x6 bl AddTask lsls r0, 24 @@ -300587,7 +300587,7 @@ sub_80A0B20: ; 80A0B20 adds r0, r2, 0 strh r0, [r1] ldr r1, =0x03000f40 - ldr r0, =sub_80A0B70 + 1 + ldr r0, =sub_80A0B70 str r0, [r1] bx lr .align 2, 0 @@ -300605,7 +300605,7 @@ sub_80A0B48: ; 80A0B48 adds r0, r2, 0 strh r0, [r1] ldr r1, =0x03000f40 - ldr r0, =sub_80A0BB4 + 1 + ldr r0, =sub_80A0BB4 str r0, [r1] bx lr .align 2, 0 @@ -300775,7 +300775,7 @@ sub_80A0C94: ; 80A0C94 ldrh r0, [r0] strh r0, [r1] ldr r1, =0x03000f44 - ldr r0, =sub_80A103C + 1 + ldr r0, =sub_80A103C str r0, [r1] bx lr .align 2, 0 @@ -300792,7 +300792,7 @@ sub_80A0CC0: ; 80A0CC0 ldrh r0, [r0] strh r0, [r1] ldr r1, =0x03000f44 - ldr r0, =sub_80A10B8 + 1 + ldr r0, =sub_80A10B8 str r0, [r1] bx lr .align 2, 0 @@ -300809,7 +300809,7 @@ sub_80A0CEC: ; 80A0CEC ldrh r0, [r0] strh r0, [r1] ldr r1, =0x03000f44 - ldr r0, =sub_80A10D0 + 1 + ldr r0, =sub_80A10D0 str r0, [r1] bx lr .align 2, 0 @@ -300827,7 +300827,7 @@ sub_80A0D18: ; 80A0D18 ldrh r0, [r0] strh r0, [r1] ldr r1, =0x03000f44 - ldr r0, =sub_80A10E8 + 1 + ldr r0, =sub_80A10E8 str r0, [r1] bx lr .align 2, 0 @@ -300844,7 +300844,7 @@ sub_80A0D48: ; 80A0D48 ldrh r0, [r0] strh r0, [r1] ldr r1, =0x03000f44 - ldr r0, =sub_80A115C + 1 + ldr r0, =sub_80A115C str r0, [r1] bx lr .align 2, 0 @@ -300929,7 +300929,7 @@ sub_80A0E14: ; 80A0E14 ldrh r0, [r0] strh r0, [r1] ldr r1, =0x03000f44 - ldr r0, =sub_80A1188 + 1 + ldr r0, =sub_80A1188 str r0, [r1] bx lr .align 2, 0 @@ -300947,7 +300947,7 @@ sub_80A0E40: ; 80A0E40 ldrh r0, [r0] strh r0, [r1] ldr r1, =0x03000f44 - ldr r0, =sub_80A11FC + 1 + ldr r0, =sub_80A11FC str r0, [r1] bx lr .align 2, 0 @@ -300964,7 +300964,7 @@ sub_80A0E70: ; 80A0E70 ldrh r0, [r0] strh r0, [r1] ldr r1, =0x03000f44 - ldr r0, =sub_80A122C + 1 + ldr r0, =sub_80A122C str r0, [r1] bx lr .align 2, 0 @@ -300981,7 +300981,7 @@ sub_80A0E9C: ; 80A0E9C ldrh r0, [r0] strh r0, [r1] ldr r1, =0x03000f44 - ldr r0, =sub_80A127C + 1 + ldr r0, =sub_80A127C str r0, [r1] bx lr .align 2, 0 @@ -300998,7 +300998,7 @@ sub_80A0EC8: ; 80A0EC8 ldrh r0, [r0] strh r0, [r1] ldr r1, =0x03000f44 - ldr r0, =sub_80A1294 + 1 + ldr r0, =sub_80A1294 str r0, [r1] bx lr .align 2, 0 @@ -301014,7 +301014,7 @@ sub_80A0EF4: ; 80A0EF4 movs r0, 0x80 strh r0, [r1] ldr r1, =0x03000f44 - ldr r0, =sub_80A1244 + 1 + ldr r0, =sub_80A1244 str r0, [r1] bx lr .align 2, 0 @@ -301030,7 +301030,7 @@ Tileset28AnimationHeader: ; 80A0F18 movs r0, 0xF0 strh r0, [r1] ldr r1, =0x03000f44 - ldr r0, =sub_80A15D8 + 1 + ldr r0, =sub_80A15D8 str r0, [r1] bx lr .align 2, 0 @@ -301047,7 +301047,7 @@ sub_80A0F3C: ; 80A0F3C ldrh r0, [r0] strh r0, [r1] ldr r1, =0x03000f44 - ldr r0, =sub_80A1260 + 1 + ldr r0, =sub_80A1260 str r0, [r1] bx lr .align 2, 0 @@ -301063,7 +301063,7 @@ sub_80A0F68: ; 80A0F68 movs r0, 0x80 strh r0, [r1] ldr r1, =0x03000f44 - ldr r0, =sub_80A15F0 + 1 + ldr r0, =sub_80A15F0 str r0, [r1] bx lr .align 2, 0 @@ -301080,7 +301080,7 @@ sub_80A0F8C: ; 80A0F8C ldrh r0, [r0] strh r0, [r1] ldr r1, =0x03000f44 - ldr r0, =sub_80A15C0 + 1 + ldr r0, =sub_80A15C0 str r0, [r1] bx lr .align 2, 0 @@ -301097,7 +301097,7 @@ sub_80A0FB8: ; 80A0FB8 ldrh r0, [r0] strh r0, [r1] ldr r1, =0x03000f44 - ldr r0, =sub_80A161C + 1 + ldr r0, =sub_80A161C str r0, [r1] bx lr .align 2, 0 @@ -301114,7 +301114,7 @@ sub_80A0FE4: ; 80A0FE4 ldrh r0, [r0] strh r0, [r1] ldr r1, =0x03000f44 - ldr r0, =sub_80A1634 + 1 + ldr r0, =sub_80A1634 str r0, [r1] bx lr .align 2, 0 @@ -301131,7 +301131,7 @@ sub_80A1010: ; 80A1010 ldrh r0, [r0] strh r0, [r1] ldr r1, =0x03000f44 - ldr r0, =sub_80A1658 + 1 + ldr r0, =sub_80A1658 str r0, [r1] bx lr .align 2, 0 @@ -302221,14 +302221,14 @@ sub_80A1818: ; 80A1818 movs r0, 0x80 movs r1, 0x10 bl pal_fade_1 - ldr r0, =sub_8149DFC + 1 + ldr r0, =sub_8149DFC bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF beq @080A1862 ldr r1, =0x03000f44 - ldr r0, =sub_80A1670 + 1 + ldr r0, =sub_80A1670 str r0, [r1] ldr r1, =0x03000f3c movs r0, 0x20 @@ -302254,7 +302254,7 @@ sub_80A1884: ; 80A1884 ldr r1, =0x02037814 movs r2, 0x10 bl CpuSet - ldr r0, =sub_8149DFC + 1 + ldr r0, =sub_8149DFC bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -304893,7 +304893,7 @@ sub_80A2C44: ; 80A2C44 lsls r5, 24 lsrs r5, 24 mov r8, r5 - ldr r0, =sub_80A2D54 + 1 + ldr r0, =sub_80A2D54 bl AddTask lsls r0, 24 lsrs r5, r0, 24 @@ -304964,7 +304964,7 @@ sub_80A2CF8: ; 80A2CF8 lsls r0, 24 lsrs r3, r0, 24 movs r2, 0 - ldr r4, =sub_80A2D54 + 1 + ldr r4, =sub_80A2D54 ldr r1, =0x03005e00 @080A2D04: ldrb r0, [r1, 0x4] @@ -305000,7 +305000,7 @@ sub_80A2D34: ; 80A2D34 @080A2D38: bl remove_task @080A2D3C: - ldr r0, =sub_80A2D54 + 1 + ldr r0, =sub_80A2D54 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -305484,7 +305484,7 @@ fanfare_play: ; 80A30E4 thumb_func_start task_is_not_running_overworld_fanfare task_is_not_running_overworld_fanfare: ; 80A3120 push {lr} - ldr r0, =task50_overworld_fanfare + 1 + ldr r0, =task50_overworld_fanfare bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 @@ -305531,7 +305531,7 @@ task50_overworld_fanfare: ; 80A3140 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, =task50_overworld_fanfare + 1 + ldr r4, =task50_overworld_fanfare adds r0, r4, 0 bl is_function_an_active_task lsls r0, 24 @@ -306173,7 +306173,7 @@ sub_80A344C: ; 80A344C thumb_func_start sub_80A3678 sub_80A3678: ; 80A3678 push {lr} - ldr r0, =sub_80A370C + 1 + ldr r0, =sub_80A370C bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 @@ -306293,7 +306293,7 @@ sub_80A370C: ; 80A370C thumb_func_start sub_80A3754 sub_80A3754: ; 80A3754 push {r4,lr} - ldr r4, =sub_80A370C + 1 + ldr r4, =sub_80A370C adds r0, r4, 0 bl is_function_an_active_task lsls r0, 24 @@ -306701,7 +306701,7 @@ move_something: ; 80A3A48 ldr r1, =0x020383fd mov r12, r1 ldr r7, =0x020383f8 - ldr r6, =move_anim_execute + 1 + ldr r6, =move_anim_execute b @080A3B10 .align 2, 0 .pool @@ -306714,7 +306714,7 @@ move_something: ; 80A3A48 ldr r1, =0x020383fd mov r12, r1 ldr r7, =0x020383f8 - ldr r6, =move_anim_execute + 1 + ldr r6, =move_anim_execute ldr r2, =0x02039f34 ldr r1, =0x02038438 movs r4, 0x3 @@ -306937,7 +306937,7 @@ move_anim_waiter: ; 80A3CB8 cmp r0, 0 bgt @080A3CDC ldr r0, =0x020383f8 - ldr r1, =move_anim_execute + 1 + ldr r1, =move_anim_execute str r1, [r0] movs r0, 0 b @080A3CDE @@ -307013,7 +307013,7 @@ ma00_load_graphics: ; 80A3D24 movs r0, 0x1 strb r0, [r1] ldr r1, =0x020383f8 - ldr r0, =move_anim_waiter + 1 + ldr r0, =move_anim_waiter str r0, [r1] pop {r4-r6} pop {r0} @@ -307263,7 +307263,7 @@ ma04_wait_countdown: ; 80A3F48 adds r0, r2, 0x1 str r0, [r1] ldr r1, =0x020383f8 - ldr r0, =move_anim_waiter + 1 + ldr r0, =move_anim_waiter str r0, [r1] pop {r4} pop {r0} @@ -307483,7 +307483,7 @@ sub_80A40F4: ; 80A40F4 .align 2, 0 .pool @080A4148: - ldr r0, =task_pA_ma0A_obj_to_bg_pal + 1 + ldr r0, =task_pA_ma0A_obj_to_bg_pal movs r1, 0xA bl AddTask lsls r0, 24 @@ -307598,7 +307598,7 @@ sub_80A41D8: ; 80A41D8 adds r1, r5, 0 movs r2, 0 bl sub_80A438C - ldr r0, =sub_80A40F4 + 1 + ldr r0, =sub_80A40F4 movs r1, 0xA bl AddTask lsls r0, 24 @@ -307651,7 +307651,7 @@ sub_80A41D8: ; 80A41D8 adds r1, r5, 0 movs r2, 0 bl sub_80A438C - ldr r0, =sub_80A40F4 + 1 + ldr r0, =sub_80A40F4 movs r1, 0xA bl AddTask lsls r0, 24 @@ -307679,7 +307679,7 @@ sub_80A41D8: ; 80A41D8 movs r0, 0x1 strb r0, [r1] ldr r1, =0x020383f8 - ldr r0, =move_anim_waiter + 1 + ldr r0, =move_anim_waiter str r0, [r1] pop {r4,r5} pop {r0} @@ -308421,7 +308421,7 @@ ma0B_0807324C: ; 80A48B0 @080A4948: movs r4, 0 @080A494A: - ldr r0, =sub_80A4980 + 1 + ldr r0, =sub_80A4980 movs r1, 0x5 bl AddTask lsls r0, 24 @@ -308710,7 +308710,7 @@ ma23_8073484: ; 80A4ADC @080A4B78: movs r5, 0 @080A4B7A: - ldr r0, =sub_80A4BB0 + 1 + ldr r0, =sub_80A4BB0 movs r1, 0x5 bl AddTask lsls r0, 24 @@ -309073,7 +309073,7 @@ ma14_load_background: ; 80A4E18 ldrb r4, [r2, 0x1] adds r0, 0x1 str r0, [r1] - ldr r0, =task_p5_load_battle_screen_elements + 1 + ldr r0, =task_p5_load_battle_screen_elements movs r1, 0x5 bl AddTask lsls r0, 24 @@ -309109,7 +309109,7 @@ sub_80A4E5C: ; 80A4E5C ldrb r6, [r0, 0x2] adds r1, 0x4 str r1, [r2] - ldr r0, =task_p5_load_battle_screen_elements + 1 + ldr r0, =task_p5_load_battle_screen_elements movs r1, 0x5 bl AddTask lsls r0, 24 @@ -309378,7 +309378,7 @@ ma15_load_battle_screen_elements: ; 80A50AC ldr r0, [r1] adds r0, 0x1 str r0, [r1] - ldr r0, =task_p5_load_battle_screen_elements + 1 + ldr r0, =task_p5_load_battle_screen_elements movs r1, 0x5 bl AddTask lsls r0, 24 @@ -309822,7 +309822,7 @@ ma1B_8073C2C: ; 80A53B8 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, =c3_08073CEC + 1 + ldr r0, =c3_08073CEC movs r1, 0x1 bl AddTask lsls r0, 24 @@ -309965,7 +309965,7 @@ sub_80A5508: ; 80A5508 ldrb r6, [r1, 0x4] ldrb r1, [r1, 0x5] mov r10, r1 - ldr r0, =c3_08073CEC + 1 + ldr r0, =c3_08073CEC movs r1, 0x1 bl AddTask lsls r0, 24 @@ -310055,7 +310055,7 @@ sub_80A559C: ; 80A559C adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, =c3_08073CEC + 1 + ldr r0, =c3_08073CEC movs r1, 0x1 bl AddTask lsls r0, 24 @@ -310122,7 +310122,7 @@ ma1C_8073ED0: ; 80A565C adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, =sub_80A56E4 + 1 + ldr r0, =sub_80A56E4 movs r1, 0x1 bl AddTask lsls r0, 24 @@ -310229,7 +310229,7 @@ ma1D_08073FB4: ; 80A5740 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, =sub_80A57B4 + 1 + ldr r0, =sub_80A57B4 movs r1, 0x1 bl AddTask lsls r0, 24 @@ -311964,7 +311964,7 @@ sub_80A64D0: ; 80A64D0 push {r4,lr} adds r4, r0, 0 bl sub_80A64EC - ldr r1, =sub_80A653C + 1 + ldr r1, =sub_80A653C str r1, [r4, 0x1C] adds r0, r4, 0 bl _call_via_r1 @@ -312142,7 +312142,7 @@ sub_80A65EC: ; 80A65EC lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x36] - ldr r0, =sub_80A64D0 + 1 + ldr r0, =sub_80A64D0 str r0, [r4, 0x1C] pop {r4,r5} pop {r0} @@ -312342,7 +312342,7 @@ sub_80A6760: ; 80A6760 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x36] - ldr r0, =sub_80A64D0 + 1 + ldr r0, =sub_80A64D0 str r0, [r4, 0x1C] pop {r4,r5} pop {r0} @@ -313212,7 +313212,7 @@ sub_80A6DEC: ; 80A6DEC strh r0, [r4, 0x34] adds r0, r4, 0 bl sub_80A6E14 - ldr r1, =sub_80A65A8 + 1 + ldr r1, =sub_80A65A8 str r1, [r4, 0x1C] adds r0, r4, 0 bl _call_via_r1 @@ -313349,7 +313349,7 @@ sub_80A6EEC: ; 80A6EEC strh r0, [r4, 0x34] adds r0, r4, 0 bl obj_translate_based_on_private_1_2_3_4 - ldr r1, =sub_80A6F98 + 1 + ldr r1, =sub_80A6F98 str r1, [r4, 0x1C] adds r0, r4, 0 bl _call_via_r1 @@ -313370,7 +313370,7 @@ sub_80A6F14: ; 80A6F14 strh r0, [r4, 0x34] adds r0, r4, 0 bl obj_translate_based_on_private_1_2_3_4 - ldr r1, =sub_80A6FB4 + 1 + ldr r1, =sub_80A6FB4 str r1, [r4, 0x1C] adds r0, r4, 0 bl _call_via_r1 @@ -313505,7 +313505,7 @@ sub_80A7000: ; 80A7000 strh r0, [r4, 0x34] adds r0, r4, 0 bl sub_80A6FD4 - ldr r1, =sub_80A6F98 + 1 + ldr r1, =sub_80A6F98 str r1, [r4, 0x1C] adds r0, r4, 0 bl _call_via_r1 @@ -313609,7 +313609,7 @@ sub_80A70C0: ; 80A70C0 strh r0, [r4, 0x34] adds r0, r4, 0 bl sub_80A7028 - ldr r1, =sub_80A7144 + 1 + ldr r1, =sub_80A7144 str r1, [r4, 0x1C] adds r0, r4, 0 bl _call_via_r1 @@ -313726,7 +313726,7 @@ sub_80A718C: ; 80A718C strh r0, [r4, 0x34] adds r0, r4, 0 bl sub_80A7160 - ldr r1, =sub_80A7144 + 1 + ldr r1, =sub_80A7144 str r1, [r4, 0x1C] adds r0, r4, 0 bl _call_via_r1 @@ -314630,9 +314630,9 @@ sub_80A7820: ; 80A7820 ldrh r6, [r6, 0x6] adds r0, r6 strh r0, [r5, 0x36] - ldr r0, =sub_80A6EEC + 1 + ldr r0, =sub_80A6EEC str r0, [r5, 0x1C] - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 adds r0, r5, 0 bl oamt_set_x3A_32 pop {r4-r7} @@ -314683,7 +314683,7 @@ sub_80A78AC: ; 80A78AC strh r0, [r6, 0x38] adds r0, r6, 0 bl sub_80A68D4 - ldr r0, =sub_80A791C + 1 + ldr r0, =sub_80A791C str r0, [r6, 0x1C] pop {r4-r6} pop {r0} @@ -314777,9 +314777,9 @@ sub_80A7938: ; 80A7938 ldrh r4, [r4, 0x6] adds r0, r4 strh r0, [r5, 0x36] - ldr r0, =sub_80A6EEC + 1 + ldr r0, =sub_80A6EEC str r0, [r5, 0x1C] - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 adds r0, r5, 0 bl oamt_set_x3A_32 pop {r4-r7} @@ -314926,7 +314926,7 @@ sub_80A7A74: ; 80A7A74 lsrs r1, 16 movs r0, 0x52 bl lcd_io_set - ldr r0, =sub_80A7AFC + 1 + ldr r0, =sub_80A7AFC str r0, [r4] pop {r4-r6} pop {r0} @@ -315075,7 +315075,7 @@ sub_80A7BF4: ; 80A7BF4 strh r2, [r0, 0x14] ldrh r1, [r3, 0x8] strh r1, [r0, 0x16] - ldr r1, =sub_80A7C1C + 1 + ldr r1, =sub_80A7C1C str r1, [r0] bx lr .align 2, 0 @@ -316847,7 +316847,7 @@ sub_80A89C8: ; 80A89C8 sub sp, 0x4 lsls r6, r1, 24 lsrs r6, 24 - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 mov r10, r0 bl object_new_hidden_with_callback mov r8, r0 @@ -316964,10 +316964,10 @@ sub_80A8A6C: ; 80A8A6C strh r0, [r4, 0x34] ldrh r0, [r1, 0xA] strh r0, [r4, 0x38] - ldr r1, =move_anim_8074EE0 + 1 + ldr r1, =move_anim_8074EE0 adds r0, r4, 0 bl oamt_set_x3A_32 - ldr r0, =sub_80A66DC + 1 + ldr r0, =sub_80A66DC str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -317021,10 +317021,10 @@ sub_80A8AEC: ; 80A8AEC ldrb r1, [r1, 0xC] adds r0, r4, 0 bl obj_anim_image_start - ldr r1, =move_anim_8074EE0 + 1 + ldr r1, =move_anim_8074EE0 adds r0, r4, 0 bl oamt_set_x3A_32 - ldr r0, =sub_80A66DC + 1 + ldr r0, =sub_80A66DC str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -317064,9 +317064,9 @@ sub_80A8B64: ; 80A8B64 ldrh r1, [r4, 0x22] adds r0, r1 strh r0, [r4, 0x22] - ldr r0, =sub_80A67D8 + 1 + ldr r0, =sub_80A67D8 str r0, [r4, 0x1C] - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 adds r0, r4, 0 bl oamt_set_x3A_32 pop {r4} @@ -317170,7 +317170,7 @@ sub_80A8BC4: ; 80A8BC4 adds r0, r6, 0 movs r1, 0x10 bl pal_fade_1 - ldr r0, =sub_80A8CAC + 1 + ldr r0, =sub_80A8CAC str r0, [r5] pop {r4-r7} pop {r0} @@ -317335,7 +317335,7 @@ sub_80A8D78: ; 80A8D78 strh r0, [r3, 0x24] adds r5, 0x1C adds r4, r5 - ldr r0, =sub_80A8DFC + 1 + ldr r0, =sub_80A8DFC str r0, [r4] ldrh r0, [r6, 0x12] adds r0, 0x1 @@ -317411,7 +317411,7 @@ sub_80A8E30: ; 80A8E30 strh r0, [r5, 0x2E] ldr r0, =0x0000ffd8 strh r0, [r5, 0x30] - ldr r0, =sub_80A8E88 + 1 + ldr r0, =sub_80A8E88 str r0, [r5, 0x1C] pop {r4,r5} pop {r0} @@ -317509,9 +317509,9 @@ sub_80A8EE4: ; 80A8EE4 subs r0, 0x50 @080A8F32: strh r0, [r4, 0x22] - ldr r0, =sub_80A6EEC + 1 + ldr r0, =sub_80A6EEC str r0, [r4, 0x1C] - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 adds r0, r4, 0 bl oamt_set_x3A_32 pop {r4,r5} @@ -317550,7 +317550,7 @@ sub_80A92F8: ; 80A92F8 strb r1, [r2] adds r0, 0x22 strb r1, [r0] - ldr r0, =c2_80777E8 + 1 + ldr r0, =c2_80777E8 bl set_callback2 pop {r0} bx r0 @@ -317812,7 +317812,7 @@ c2_80777E8: ; 80A933C .align 2, 0 .pool @080A95A4: - ldr r0, =vblank_cb_08078BB4 + 1 + ldr r0, =vblank_cb_08078BB4 bl SetVBlankCallback bl sub_80A95F4 movs r0, 0x1 @@ -317827,7 +317827,7 @@ c2_80777E8: ; 80A933C movs r0, 0x7F ands r0, r1 strb r0, [r2, 0x8] - ldr r0, =sub_8038420 + 1 + ldr r0, =sub_8038420 bl set_callback2 bl sub_805EF14 @080A95D2: @@ -318094,7 +318094,7 @@ sub_80A9708: ; 80A9708 adds r1, r5, 0 adds r1, 0x1C adds r0, r1 - ldr r1, =nullsub_12 + 1 + ldr r1, =nullsub_12 str r1, [r0] ldrb r1, [r4] lsls r0, r1, 4 @@ -318229,7 +318229,7 @@ sub_80A9708: ; 80A9708 adds r1, r4, 0 adds r1, 0x1C adds r0, r1 - ldr r1, =nullsub_12 + 1 + ldr r1, =nullsub_12 str r1, [r0] ldrb r1, [r3] lsls r0, r1, 4 @@ -318314,7 +318314,7 @@ sub_80A9708: ; 80A9708 adds r1, r5, 0 adds r1, 0x1C adds r0, r1 - ldr r1, =nullsub_12 + 1 + ldr r1, =nullsub_12 str r1, [r0] ldrb r1, [r4] lsls r0, r1, 4 @@ -318594,7 +318594,7 @@ sub_80A9C70: ; 80A9C70 ldr r0, =0x020241e4 adds r0, r4, r0 ldrb r6, [r0] - ldr r0, =sub_80A9DB4 + 1 + ldr r0, =sub_80A9DB4 movs r1, 0xA bl AddTask lsls r0, 24 @@ -318824,7 +318824,7 @@ sub_80A9E44: ; 80A9E44 negs r1, r1 ands r1, r0 strb r1, [r3] - ldr r1, =sub_80A9E78 + 1 + ldr r1, =sub_80A9E78 str r1, [r2, 0x1C] adds r0, r2, 0 bl _call_via_r1 @@ -318982,7 +318982,7 @@ sub_80A9EF4: ; 80A9EF4 lsls r0, 3 adds r0, r1 strh r4, [r0, 0x26] - ldr r1, =sub_80A9FD0 + 1 + ldr r1, =sub_80A9FD0 str r1, [r0] pop {r4-r6} pop {r0} @@ -319009,7 +319009,7 @@ sub_80A9FD0: ; 80A9FD0 asrs r0, 16 cmp r0, 0xA bne @080AA004 - ldr r0, =sub_80AA020 + 1 + ldr r0, =sub_80AA020 str r0, [r1] movs r0, 0 strh r0, [r1, 0xA] @@ -319103,7 +319103,7 @@ sub_80AA020: ; 80AA020 bne @080AA0B0 movs r0, 0x9 strh r0, [r5, 0xA] - ldr r0, =sub_80AA0D0 + 1 + ldr r0, =sub_80AA0D0 str r0, [r5] @080AA0B0: pop {r4-r6} @@ -319133,7 +319133,7 @@ sub_80AA0D0: ; 80AA0D0 negs r1, r1 cmp r0, r1 bne @080AA108 - ldr r0, =sub_80AA124 + 1 + ldr r0, =sub_80AA124 str r0, [r2] movs r0, 0 strh r0, [r2, 0xA] @@ -319428,7 +319428,7 @@ sub_80AA18C: ; 80AA18C adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_8116EB4 + 1 + ldr r1, =sub_8116EB4 str r1, [r0] adds r0, r4, 0 bl _call_via_r1 @@ -319455,7 +319455,7 @@ move_anim_start_t2: ; 80AA364 ldr r0, =gUnknown_082C92FC movs r2, 0 bl move_something - ldr r0, =task0A_80788BC + 1 + ldr r0, =task0A_80788BC movs r1, 0xA bl AddTask lsls r0, 24 @@ -319939,7 +319939,7 @@ title_screen_add_logo_shine_obj: ; 80AA67C adds r5, r6, 0 adds r5, 0x1C adds r0, r1, r5 - ldr r2, =title_screen_logo_shine_obj_callback_type2 + 1 + ldr r2, =title_screen_logo_shine_obj_callback_type2 mov r10, r2 str r2, [r0] adds r1, r6 @@ -320168,7 +320168,7 @@ c2_title_screen_1: ; 80AA7A4 .align 2, 0 .pool @080AA998: - ldr r0, =task_title_screen_1 + 1 + ldr r0, =task_title_screen_1 movs r1, 0 bl AddTask lsls r0, 24 @@ -320205,7 +320205,7 @@ c2_title_screen_1: ; 80AA7A4 movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - ldr r0, =title_screen_vblank_callback + 1 + ldr r0, =title_screen_vblank_callback bl SetVBlankCallback ldr r0, =0x030022c0 movs r2, 0x87 @@ -320308,7 +320308,7 @@ c2_title_screen_1: ; 80AA7A4 movs r2, 0x4 movs r3, 0x4 bl sub_80BA384 - ldr r0, =c2_title_screen_2 + 1 + ldr r0, =c2_title_screen_2 bl set_callback2 @080AAB1E: add sp, 0x14 @@ -320443,7 +320443,7 @@ task_title_screen_1: ; 80AAB44 strh r5, [r1, 0x30] movs r0, 0x90 strh r0, [r6, 0x8] - ldr r0, =task_title_screen_2 + 1 + ldr r0, =task_title_screen_2 str r0, [r6] @080AAC32: pop {r4-r6} @@ -320522,7 +320522,7 @@ task_title_screen_2: ; 80AAC50 movs r1, 0x94 bl sub_80AA548 strh r7, [r5, 0x10] - ldr r0, =task_title_screen_3 + 1 + ldr r0, =task_title_screen_3 str r0, [r5] @080AACE2: ldr r2, =0x03005e00 @@ -320613,7 +320613,7 @@ task_title_screen_3: ; 80AAD64 movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, =c2_title_menu_1 + 1 + ldr r0, =c2_title_menu_1 bl set_callback2 b @080AAE98 .align 2, 0 @@ -320624,7 +320624,7 @@ task_title_screen_3: ; 80AAD64 ands r0, r1 cmp r0, 0x46 bne @080AADC8 - ldr r0, =c2_clear_save_data_screen_1 + 1 + ldr r0, =c2_clear_save_data_screen_1 bl set_callback2 b @080AAE98 .align 2, 0 @@ -320646,7 +320646,7 @@ task_title_screen_3: ; 80AAD64 movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, =c2_reset_rtc_screen_1 + 1 + ldr r0, =c2_reset_rtc_screen_1 bl set_callback2 b @080AAE98 .align 2, 0 @@ -320667,7 +320667,7 @@ task_title_screen_3: ; 80AAD64 movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, =c2_berry_program_update_screen_1 + 1 + ldr r0, =c2_berry_program_update_screen_1 bl set_callback2 b @080AAE98 .align 2, 0 @@ -320719,7 +320719,7 @@ task_title_screen_3: ; 80AAD64 movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, =c2_show_copyright_and_intro_again_1 + 1 + ldr r0, =c2_show_copyright_and_intro_again_1 bl set_callback2 @080AAE98: add sp, 0x4 @@ -320737,7 +320737,7 @@ c2_title_menu_1: ; 80AAEB8 lsls r0, 24 cmp r0, 0 bne @080AAECA - ldr r0, =c2_title_menu_2 + 1 + ldr r0, =c2_title_menu_2 bl set_callback2 @080AAECA: pop {r0} @@ -320753,7 +320753,7 @@ c2_show_copyright_and_intro_again_1: ; 80AAED4 lsls r0, 24 cmp r0, 0 bne @080AAEE6 - ldr r0, =c2_show_copyright_and_intro_again_2 + 1 + ldr r0, =c2_show_copyright_and_intro_again_2 bl set_callback2 @080AAEE6: pop {r0} @@ -320769,7 +320769,7 @@ c2_clear_save_data_screen_1: ; 80AAEF0 lsls r0, 24 cmp r0, 0 bne @080AAF02 - ldr r0, =c2_clear_save_data_screen_2 + 1 + ldr r0, =c2_clear_save_data_screen_2 bl set_callback2 @080AAF02: pop {r0} @@ -320785,7 +320785,7 @@ c2_reset_rtc_screen_1: ; 80AAF0C lsls r0, 24 cmp r0, 0 bne @080AAF1E - ldr r0, =sub_809EF88 + 1 + ldr r0, =sub_809EF88 bl set_callback2 @080AAF1E: pop {r0} @@ -320802,7 +320802,7 @@ c2_berry_program_update_screen_1: ; 80AAF28 cmp r0, 0 bne @080AAF3E bl m4aMPlayAllStop - ldr r0, =sub_81BF384 + 1 + ldr r0, =sub_81BF384 bl set_callback2 @080AAF3E: pop {r0} @@ -320866,7 +320866,7 @@ title_screen_update_rayquaza_ring_palette: ; 80AAF48 ; void sub_80AAFA4() sub_80AAFA4: ; 80AAFA4 push {r4-r6,lr} - ldr r0, =sub_80AB1B0 + 1 + ldr r0, =sub_80AB1B0 bl is_function_an_active_task lsls r0, 24 lsrs r6, r0, 24 @@ -320946,7 +320946,7 @@ sub_80AAFA4: ; 80AAFA4 adds r1, r4, r2 movs r0, 0x1 strb r0, [r1] - ldr r0, =sub_80AB160 + 1 + ldr r0, =sub_80AB160 movs r1, 0x50 bl AddTask ldr r1, =0x000006c9 @@ -321085,7 +321085,7 @@ sub_80AB160: ; 80AB160 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_80AB1B0 + 1 + ldr r1, =sub_80AB1B0 str r1, [r0] @080AB198: pop {r4} @@ -323958,7 +323958,7 @@ sub_80AC818: ; 80AC818 thumb_func_start sub_80AC81C sub_80AC81C: ; 80AC81C push {lr} - ldr r0, =task50_0807B6D4 + 1 + ldr r0, =task50_0807B6D4 movs r1, 0x50 bl AddTask pop {r0} @@ -324506,7 +324506,7 @@ sub_80ACC88: ; 80ACC88 bne @080ACCA8 adds r0, r4, 0 bl sub_80ACAB0 - ldr r0, =sub_80ACB84 + 1 + ldr r0, =sub_80ACB84 str r0, [r4, 0x1C] b @080ACCAC .align 2, 0 @@ -324729,8 +324729,8 @@ sub_80ACD78: ; 80ACD78 bne @080ACE9C movs r3, 0 adds r1, r2, 0 - ldr r5, =sub_80ACB84 + 1 - ldr r4, =sub_80ACC88 + 1 + ldr r5, =sub_80ACB84 + ldr r4, =sub_80ACC88 @080ACE64: lsls r0, r3, 2 adds r0, r1, r0 @@ -325295,7 +325295,7 @@ sub_80AD2B0: ; 80AD2B0 negs r0, r0 ands r0, r1 strb r0, [r2] - ldr r0, =sub_80AD30C + 1 + ldr r0, =sub_80AD30C str r0, [r3, 0x1C] ldr r1, =0x02021bbe adds r0, r3, 0 @@ -325449,7 +325449,7 @@ sub_80AD30C: ; 80AD30C movs r1, 0x4 orrs r0, r1 strb r0, [r2] - ldr r0, =sub_80AD2B0 + 1 + ldr r0, =sub_80AD2B0 str r0, [r4, 0x1C] @080AD40C: ldrh r0, [r4, 0x38] @@ -325471,7 +325471,7 @@ sub_80AD30C: ; 80AD30C movs r1, 0x4 orrs r0, r1 strb r0, [r2] - ldr r0, =sub_80AD2B0 + 1 + ldr r0, =sub_80AD2B0 str r0, [r4, 0x1C] @080AD438: pop {r4,r5} @@ -327940,7 +327940,7 @@ sub_80AE7F8: ; 80AE7F8 movs r3, 0 bl oam_center ldr r1, [r4] - ldr r0, =sub_80AE958 + 1 + ldr r0, =sub_80AE958 str r0, [r1, 0x1C] b @080AE8CE .align 2, 0 @@ -328038,7 +328038,7 @@ sub_80AE958: ; 80AE958 negs r1, r1 cmp r0, r1 bne @080AE972 - ldr r0, =sub_80AE97C + 1 + ldr r0, =sub_80AE97C str r0, [r2, 0x1C] @080AE972: pop {r0} @@ -328524,7 +328524,7 @@ sub_80AECA8: ; 80AECA8 thumb_func_start bag_add_task0_by_acit bag_add_task0_by_acit: ; 80AED28 push {lr} - ldr r0, =sub_80AECA8 + 1 + ldr r0, =sub_80AECA8 movs r1, 0 bl AddTask lsls r0, 24 @@ -328659,7 +328659,7 @@ sub_80AEE20: ; 80AEE20 lsrs r4, r0, 24 cmp r4, 0xF bne @080AEE4C - ldr r0, =sub_80AECA8 + 1 + ldr r0, =sub_80AECA8 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 @@ -328672,7 +328672,7 @@ sub_80AEE20: ; 80AEE20 .align 2, 0 .pool @080AEE4C: - ldr r5, =sub_80AECA8 + 1 + ldr r5, =sub_80AECA8 adds r0, r5, 0 bl is_function_an_active_task lsls r0, 24 @@ -328705,7 +328705,7 @@ sub_80AEE84: ; 80AEE84 lsrs r4, r0, 24 cmp r4, 0xF bne @080AEEB0 - ldr r0, =sub_80AECA8 + 1 + ldr r0, =sub_80AECA8 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 @@ -328718,7 +328718,7 @@ sub_80AEE84: ; 80AEE84 .align 2, 0 .pool @080AEEB0: - ldr r5, =sub_80AECA8 + 1 + ldr r5, =sub_80AECA8 adds r0, r5, 0 bl is_function_an_active_task lsls r0, 24 @@ -329053,7 +329053,7 @@ sub_80AF128: ; 80AF128 bl script_env_2_enable bl sub_8085784 bl pal_fill_black - ldr r0, =task0A_nop_for_a_while + 1 + ldr r0, =task0A_nop_for_a_while movs r1, 0xA bl AddTask pop {r0} @@ -329085,7 +329085,7 @@ sub_80AF168: ; 80AF168 bl script_env_2_enable bl sub_8085784 bl pal_fill_black - ldr r0, =task0A_asap_script_env_2_enable_and_set_ctx_running + 1 + ldr r0, =task0A_asap_script_env_2_enable_and_set_ctx_running movs r1, 0xA bl AddTask pop {r0} @@ -329099,7 +329099,7 @@ sub_80AF188: ; 80AF188 push {lr} bl script_env_2_enable bl pal_fill_black - ldr r0, =task0A_asap_script_env_2_enable_and_set_ctx_running + 1 + ldr r0, =task0A_asap_script_env_2_enable_and_set_ctx_running movs r1, 0xA bl AddTask pop {r0} @@ -329174,7 +329174,7 @@ sub_80AF214: ; 80AF214 bl script_env_2_enable bl sub_8085784 bl palette_bg_faded_fill_black - ldr r0, =task_mpl_807DD60 + 1 + ldr r0, =task_mpl_807DD60 movs r1, 0xA bl AddTask pop {r0} @@ -329305,7 +329305,7 @@ sub_80AF314: ; 80AF314 bl script_env_2_enable bl sub_8085784 bl palette_bg_faded_fill_black - ldr r0, =sub_80AF234 + 1 + ldr r0, =sub_80AF234 movs r1, 0xA bl AddTask pop {r0} @@ -329337,7 +329337,7 @@ sub_80AF334: ; 80AF334 lsrs r0, 24 cmp r0, 0x1 bne @080AF36C - ldr r1, =sub_80AF438 + 1 + ldr r1, =sub_80AF438 b @080AF37E .align 2, 0 .pool @@ -329346,10 +329346,10 @@ sub_80AF334: ; 80AF334 bl sub_8088F58 lsls r0, 24 lsrs r0, 24 - ldr r1, =task_map_chg_seq_0807E2CC + 1 + ldr r1, =task_map_chg_seq_0807E2CC cmp r0, 0x1 bne @080AF37E - ldr r1, =task_map_chg_seq_0807E20C + 1 + ldr r1, =task_map_chg_seq_0807E20C @080AF37E: adds r0, r1, 0 movs r1, 0xA @@ -329406,7 +329406,7 @@ sub_80AF3E8: ; 80AF3E8 bl pal_fill_for_maplights movs r0, 0x2E bl audio_play - ldr r0, =task0A_mpl_807E31C + 1 + ldr r0, =task0A_mpl_807E31C movs r1, 0xA bl AddTask bl script_env_2_enable @@ -329423,7 +329423,7 @@ sub_80AF40C: ; 80AF40C bl pal_fill_for_maplights movs r0, 0x2E bl audio_play - ldr r0, =task_map_chg_seq_0807E2CC + 1 + ldr r0, =task_map_chg_seq_0807E2CC movs r1, 0xA bl AddTask bl script_env_2_enable @@ -329707,7 +329707,7 @@ sub_80AF660: ; 80AF660 bne @080AF67C adds r0, r4, 0 bl remove_task - ldr r0, =sub_809FA34 + 1 + ldr r0, =sub_809FA34 movs r1, 0x50 bl AddTask @080AF67C: @@ -329722,7 +329722,7 @@ sub_80AF660: ; 80AF660 sub_80AF688: ; 80AF688 push {lr} bl pal_fill_black - ldr r0, =sub_80AF660 + 1 + ldr r0, =sub_80AF660 movs r1, 0x50 bl AddTask bl script_env_2_enable @@ -329764,7 +329764,7 @@ sub_80AF6D4: ; 80AF6D4 push {lr} bl script_env_2_enable bl pal_fill_black - ldr r0, =task_mpl_807E3C8 + 1 + ldr r0, =task_mpl_807E3C8 movs r1, 0xA bl AddTask pop {r0} @@ -329779,7 +329779,7 @@ sub_80AF6F0: ; 80AF6F0 bl script_env_2_enable bl sub_8085784 bl pal_fill_black - ldr r0, =task_mpl_807E3C8 + 1 + ldr r0, =task_mpl_807E3C8 movs r1, 0xA bl AddTask pop {r0} @@ -329825,9 +329825,9 @@ sub_80AF734: ; 80AF734 movs r0, 0x9 bl audio_play ldr r0, =0x03005dac - ldr r1, =mapldr_default + 1 + ldr r1, =mapldr_default str r1, [r0] - ldr r0, =sub_80AFA0C + 1 + ldr r0, =sub_80AFA0C movs r1, 0xA bl AddTask pop {r0} @@ -329844,9 +329844,9 @@ sp13E_warp_to_last_warp: ; 80AF76C bl sub_80AF0B4 bl play_some_sound ldr r0, =0x03005dac - ldr r1, =mapldr_default + 1 + ldr r1, =mapldr_default str r1, [r0] - ldr r0, =sub_80AFA0C + 1 + ldr r0, =sub_80AFA0C movs r1, 0xA bl AddTask pop {r0} @@ -329865,9 +329865,9 @@ sub_80AF79C: ; 80AF79C bl fade_screen bl play_some_sound ldr r0, =0x03005dac - ldr r1, =sub_80AF3B0 + 1 + ldr r1, =sub_80AF3B0 str r1, [r0] - ldr r0, =sub_80AFA0C + 1 + ldr r0, =sub_80AFA0C movs r1, 0xA bl AddTask pop {r0} @@ -329881,9 +329881,9 @@ sub_80AF7D0: ; 80AF7D0 push {lr} bl script_env_2_enable ldr r0, =0x03005dac - ldr r1, =mapldr_default + 1 + ldr r1, =mapldr_default str r1, [r0] - ldr r0, =sub_80AFA88 + 1 + ldr r0, =sub_80AFA88 movs r1, 0xA bl AddTask pop {r0} @@ -329897,7 +329897,7 @@ sp13F_fall_to_last_warp: ; 80AF7F4 push {lr} bl sp13E_warp_to_last_warp ldr r1, =0x03005dac - ldr r0, =sub_80B6B68 + 1 + ldr r0, =sub_80B6B68 str r0, [r1] pop {r0} bx r0 @@ -329948,11 +329948,11 @@ sub_80AF848: ; 80AF848 bl sub_80AF0B4 movs r0, 0x2D bl audio_play - ldr r0, =sub_80AFA0C + 1 + ldr r0, =sub_80AFA0C movs r1, 0xA bl AddTask ldr r1, =0x03005dac - ldr r0, =sub_80AF3E8 + 1 + ldr r0, =sub_80AF3E8 str r0, [r1] pop {r0} bx r0 @@ -329971,11 +329971,11 @@ sub_80AF87C: ; 80AF87C bl sub_80AF0B4 movs r0, 0x2D bl audio_play - ldr r0, =sub_80AFA0C + 1 + ldr r0, =sub_80AFA0C movs r1, 0xA bl AddTask ldr r1, =0x03005dac - ldr r0, =sub_80AF40C + 1 + ldr r0, =sub_80AF40C str r0, [r1] pop {r0} bx r0 @@ -329988,11 +329988,11 @@ sub_80AF8B8: ; 80AF8B8 push {lr} bl script_env_2_enable bl sub_80AF0B4 - ldr r0, =sub_80AFA0C + 1 + ldr r0, =sub_80AFA0C movs r1, 0xA bl AddTask ldr r1, =0x03005dac - ldr r0, =sub_80FB768 + 1 + ldr r0, =sub_80FB768 str r0, [r1] pop {r0} bx r0 @@ -330043,7 +330043,7 @@ sub_80AF8E0: ; 80AF8E0 b @080AF93E @080AF92E: bl warp_in - ldr r0, =sub_8086074 + 1 + ldr r0, =sub_8086074 bl set_callback2 adds r0, r5, 0 bl remove_task @@ -330063,7 +330063,7 @@ sub_80AF948: ; 80AF948 bl sub_80AF0B4 movs r0, 0x9 bl audio_play - ldr r0, =sub_80AF8E0 + 1 + ldr r0, =sub_80AF8E0 movs r1, 0xA bl AddTask pop {r0} @@ -330126,7 +330126,7 @@ sub_80AF96C: ; 80AF96C cmp r0, 0 bne @080AF9E8 bl warp_in - ldr r0, =c2_load_new_map + 1 + ldr r0, =c2_load_new_map bl set_callback2 adds r0, r5, 0 bl remove_task @@ -330141,7 +330141,7 @@ sub_80AF96C: ; 80AF96C thumb_func_start sub_80AF9F8 sub_80AF9F8: ; 80AF9F8 push {lr} - ldr r0, =sub_80AF96C + 1 + ldr r0, =sub_80AF96C movs r1, 0xA bl AddTask pop {r0} @@ -330201,7 +330201,7 @@ sub_80AFA0C: ; 80AFA0C b @080AFA7C @080AFA6C: bl warp_in - ldr r0, =c2_load_new_map + 1 + ldr r0, =c2_load_new_map bl set_callback2 adds r0, r6, 0 bl remove_task @@ -330374,7 +330374,7 @@ sub_80AFA88: ; 80AFA88 bl play_some_sound movs r0, 0 strh r0, [r5, 0x8] - ldr r0, =sub_80AFA0C + 1 + ldr r0, =sub_80AFA0C str r0, [r5] @080AFBE8: pop {r4-r6} @@ -330428,7 +330428,7 @@ task0A_fade_n_map_maybe: ; 80AFBF4 b @080AFC56 @080AFC46: bl warp_in - ldr r0, =sub_8086024 + 1 + ldr r0, =sub_8086024 bl set_callback2 adds r0, r5, 0 bl remove_task @@ -330450,9 +330450,9 @@ sub_80AFC60: ; 80AFC60 movs r0, 0x9 bl audio_play ldr r0, =0x03005dac - ldr r1, =sub_80AF3C8 + 1 + ldr r1, =sub_80AF3C8 str r1, [r0] - ldr r0, =task0A_fade_n_map_maybe + 1 + ldr r0, =task0A_fade_n_map_maybe movs r1, 0xA bl AddTask pop {r0} @@ -330866,7 +330866,7 @@ sub_80AFF90: ; 80AFF90 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, =sub_80AFE08 + 1 + ldr r0, =sub_80AFE08 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 @@ -330885,7 +330885,7 @@ sub_80AFF90: ; 80AFF90 thumb_func_start sub_80AFFB8 sub_80AFFB8: ; 80AFFB8 push {r4,lr} - ldr r4, =sub_80AFF90 + 1 + ldr r4, =sub_80AFF90 adds r0, r4, 0 bl is_function_an_active_task lsls r0, 24 @@ -330916,7 +330916,7 @@ sub_80AFFDC: ; 80AFFDC ldr r0, [sp, 0x20] lsls r0, 24 lsrs r7, r0, 24 - ldr r0, =sub_80AFE08 + 1 + ldr r0, =sub_80AFE08 movs r1, 0x50 bl AddTask lsls r0, 24 @@ -330966,7 +330966,7 @@ sub_80B003C: ; 80B003C ldr r0, [sp, 0x20] lsls r0, 24 lsrs r7, r0, 24 - ldr r0, =sub_80AFECC + 1 + ldr r0, =sub_80AFECC movs r1, 0x50 bl AddTask lsls r0, 24 @@ -331197,7 +331197,7 @@ sub_80B01BC: ; 80B01BC b @080B023A @080B022A: bl warp_in - ldr r0, =c2_load_new_map + 1 + ldr r0, =c2_load_new_map bl set_callback2 adds r0, r5, 0 bl remove_task @@ -331213,11 +331213,11 @@ sub_80B01BC: ; 80B01BC sub_80B0244: ; 80B0244 push {lr} bl script_env_2_enable - ldr r0, =sub_80AFA0C + 1 + ldr r0, =sub_80AFA0C movs r1, 0xA bl AddTask ldr r1, =0x03005dac - ldr r0, =sub_80AF3E8 + 1 + ldr r0, =sub_80AF3E8 str r0, [r1] pop {r0} bx r0 @@ -331230,9 +331230,9 @@ sub_80B0268: ; 80B0268 push {lr} bl script_env_2_enable ldr r0, =0x03005dac - ldr r1, =mapldr_default + 1 + ldr r1, =mapldr_default str r1, [r0] - ldr r0, =sub_80B01BC + 1 + ldr r0, =sub_80B01BC movs r1, 0xA bl AddTask pop {r0} @@ -331449,7 +331449,7 @@ sub_80B0318: ; 80B0318 strh r4, [r5] b @080B052C @080B0450: - ldr r0, =sub_80AFECC + 1 + ldr r0, =sub_80AFECC bl is_function_an_active_task lsls r0, 24 cmp r0, 0 @@ -331558,7 +331558,7 @@ sub_80B0318: ; 80B0318 thumb_func_start sub_80B0534 sub_80B0534: ; 80B0534 push {lr} - ldr r0, =sub_80B0318 + 1 + ldr r0, =sub_80B0318 movs r1, 0x50 bl AddTask lsls r0, 24 @@ -331604,7 +331604,7 @@ sub_80B0534: ; 80B0534 thumb_func_start sub_80B058C sub_80B058C: ; 80B058C push {lr} - ldr r0, =sub_80B0318 + 1 + ldr r0, =sub_80B0318 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -331625,7 +331625,7 @@ sub_80B058C: ; 80B058C sub_80B05B4: ; 80B05B4 push {lr} bl sub_80859B0 - ldr r0, =task50_0807F0C8 + 1 + ldr r0, =task50_0807F0C8 movs r1, 0x50 bl AddTask pop {r0} @@ -331690,7 +331690,7 @@ task01_battle_start: ; 80B05F0 cmp r0, 0x1 bne @080B0652 bl overworld_free_bg_tilemaps - ldr r0, =sub_8036760 + 1 + ldr r0, =sub_8036760 bl set_callback2 bl prev_quest_postbuffer_cursor_backup_reset bl overworld_poison_timer_set @@ -331713,7 +331713,7 @@ task_add_01_battle_start: ; 80B065C lsrs r4, 24 lsls r5, 16 lsrs r5, 16 - ldr r0, =task01_battle_start + 1 + ldr r0, =task01_battle_start movs r1, 0x1 bl AddTask lsls r0, 24 @@ -331763,7 +331763,7 @@ sub_80B06BC: ; 80B06BC bl player_bitmagic bl sub_808BCF4 ldr r1, =0x030022c0 - ldr r0, =sub_80B0AF8 + 1 + ldr r0, =sub_80B0AF8 str r0, [r1, 0x8] ldr r4, =0x02022fec movs r0, 0 @@ -331806,7 +331806,7 @@ sub_80B072C: ; 80B072C bl player_bitmagic bl sub_808BCF4 ldr r1, =0x030022c0 - ldr r0, =sub_80B0AF8 + 1 + ldr r0, =sub_80B0AF8 str r0, [r1, 0x8] ldr r1, =0x02022fec movs r0, 0x80 @@ -331836,7 +331836,7 @@ sub_80B077C: ; 80B077C bl player_bitmagic bl sub_808BCF4 ldr r1, =0x030022c0 - ldr r0, =sub_80FC190 + 1 + ldr r0, =sub_80FC190 str r0, [r1, 0x8] ldr r1, =0x02022fec movs r0, 0x80 @@ -331859,7 +331859,7 @@ sub_80B07B4: ; 80B07B4 bl player_bitmagic bl sub_808BCF4 ldr r1, =0x030022c0 - ldr r0, =sub_80B0AF8 + 1 + ldr r0, =sub_80B0AF8 str r0, [r1, 0x8] ldr r1, =0x02022fec movs r0, 0x80 @@ -331940,7 +331940,7 @@ sub_80B086C: ; 80B086C bl sub_8067FF8 bl script_env_2_enable ldr r1, =0x030022c0 - ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 + ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music str r0, [r1, 0x8] ldr r1, =0x02022fec movs r0, 0x80 @@ -331960,7 +331960,7 @@ sub_80B08A8: ; 80B08A8 push {lr} bl script_env_2_enable ldr r1, =0x030022c0 - ldr r0, =sub_80B0B6C + 1 + ldr r0, =sub_80B0B6C str r0, [r1, 0x8] ldr r1, =0x02022fec movs r0, 0 @@ -331987,7 +331987,7 @@ sub_80B08EC: ; 80B08EC push {lr} bl script_env_2_enable ldr r1, =0x030022c0 - ldr r0, =sub_80B0B6C + 1 + ldr r0, =sub_80B0B6C str r0, [r1, 0x8] ldr r1, =0x02022fec movs r0, 0x80 @@ -332015,7 +332015,7 @@ sub_80B0934: ; 80B0934 push {r4,lr} bl script_env_2_enable ldr r1, =0x030022c0 - ldr r0, =sub_80B0B6C + 1 + ldr r0, =sub_80B0B6C str r0, [r1, 0x8] ldr r4, =0x02022fec movs r0, 0x80 @@ -332120,7 +332120,7 @@ sub_80B0A18: ; 80B0A18 push {lr} bl script_env_2_enable ldr r1, =0x030022c0 - ldr r0, =sub_80B0B6C + 1 + ldr r0, =sub_80B0B6C str r0, [r1, 0x8] ldr r1, =0x02022fec movs r0, 0xC0 @@ -332158,7 +332158,7 @@ sub_80B0A74: ; 80B0A74 push {lr} bl script_env_2_enable ldr r1, =0x030022c0 - ldr r0, =sub_80B0B6C + 1 + ldr r0, =sub_80B0B6C str r0, [r1, 0x8] ldr r1, =0x02022fec movs r0, 0xC0 @@ -332243,16 +332243,16 @@ sub_80B0AF8: ; 80B0AF8 lsls r0, 24 cmp r0, 0 bne @080B0B4C - ldr r0, =c2_whiteout + 1 + ldr r0, =c2_whiteout bl set_callback2 b @080B0B58 .align 2, 0 .pool @080B0B4C: - ldr r0, =c2_exit_to_overworld_2_switch + 1 + ldr r0, =c2_exit_to_overworld_2_switch bl set_callback2 ldr r1, =0x03005dac - ldr r0, =sub_80AF6F0 + 1 + ldr r0, =sub_80AF6F0 str r0, [r1] @080B0B58: add sp, 0x4 @@ -332286,19 +332286,19 @@ sub_80B0B6C: ; 80B0B6C lsls r0, 24 cmp r0, 0 beq @080B0BB4 - ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 + ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music bl set_callback2 b @080B0BC6 .align 2, 0 .pool @080B0BB4: - ldr r0, =c2_whiteout + 1 + ldr r0, =c2_whiteout bl set_callback2 b @080B0BC6 .align 2, 0 .pool @080B0BC0: - ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 + ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music bl set_callback2 @080B0BC6: add sp, 0x4 @@ -333018,10 +333018,10 @@ sub_80B100C: ; 80B100C thumb_func_start sub_80B1138 sub_80B1138: ; 80B1138 push {lr} - ldr r0, =set_256color_bg_bg0 + 1 + ldr r0, =set_256color_bg_bg0 bl set_callback2 ldr r1, =0x030022c0 - ldr r0, =sub_80B1158 + 1 + ldr r0, =sub_80B1158 str r0, [r1, 0x8] pop {r0} bx r0 @@ -333051,7 +333051,7 @@ sub_80B1158: ; 80B1158 bl sub_80F9244 bl clear_tasks bl sub_806E64C - ldr r0, =sub_80B11A8 + 1 + ldr r0, =sub_80B11A8 bl set_callback2 movs r0, 0 bl sub_8145F10 @@ -333076,10 +333076,10 @@ sub_80B11A8: ; 80B11A8 movs r0, 0x10 str r0, [r1] ldr r1, =0x030022c0 - ldr r0, =sub_80B1204 + 1 + ldr r0, =sub_80B1204 str r0, [r1, 0x8] bl Window_FreeMemory - ldr r0, =sub_8036760 + 1 + ldr r0, =sub_8036760 bl set_callback2 bl prev_quest_postbuffer_cursor_backup_reset bl overworld_poison_timer_set @@ -333100,7 +333100,7 @@ sub_80B11A8: ; 80B11A8 sub_80B1204: ; 80B1204 push {lr} bl sav1_reset_x2C - ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 + ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music bl set_callback2 pop {r0} bx r0 @@ -333916,7 +333916,7 @@ sub_80B17E0: ; 80B17E0 movs r0, 0 strh r0, [r1] ldr r1, =0x030022c0 - ldr r0, =sub_80B1918 + 1 + ldr r0, =sub_80B1918 str r0, [r1, 0x8] bl sub_81A9E40 lsls r0, 24 @@ -333963,19 +333963,19 @@ sub_80B1918: ; 80B1918 cmp r0, 0 beq @080B195C @080B1946: - ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 + ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music bl set_callback2 b @080B198A .align 2, 0 .pool @080B195C: - ldr r0, =c2_whiteout + 1 + ldr r0, =c2_whiteout bl set_callback2 b @080B198A .align 2, 0 .pool @080B1968: - ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 + ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music bl set_callback2 bl sub_81A9E40 lsls r0, 24 @@ -334003,7 +334003,7 @@ sub_80B1994: ; 80B1994 lsls r0, 3 cmp r1, r0 bne @080B19B4 - ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 + ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music bl set_callback2 b @080B19E2 .align 2, 0 @@ -334014,13 +334014,13 @@ sub_80B1994: ; 80B1994 bl battle_exit_is_player_defeat cmp r0, 0x1 bne @080B19D0 - ldr r0, =c2_whiteout + 1 + ldr r0, =c2_whiteout bl set_callback2 b @080B19E2 .align 2, 0 .pool @080B19D0: - ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 + ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music bl set_callback2 bl sub_80B20BC bl rom_npc_set_flag_for_script_id @@ -334039,7 +334039,7 @@ sub_80B19EC: ; 80B19EC movs r0, 0x8 str r0, [r1] ldr r1, =0x030022c0 - ldr r0, =sub_80B1994 + 1 + ldr r0, =sub_80B1994 str r0, [r1, 0x8] bl task_add_01_battle_start_with_music_and_stats bl script_env_2_set_ctx_paused @@ -335333,7 +335333,7 @@ sub_80B236C: ; 80B236C lsrs r6, r0, 24 lsls r1, 24 lsrs r5, r1, 24 - ldr r4, =sub_80B2634 + 1 + ldr r4, =sub_80B2634 adds r0, r4, 0 bl get_task_id_by_function lsls r0, 24 @@ -335544,7 +335544,7 @@ sub_80B24F8: ; 80B24F8 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =sub_80B2D2C + 1 + ldr r0, =sub_80B2D2C str r0, [r1] movs r0, 0x1 @080B251E: @@ -335578,7 +335578,7 @@ sub_80B252C: ; 80B252C adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_80B2CEC + 1 + ldr r1, =sub_80B2CEC str r1, [r0] movs r0, 0x1 b @080B2572 @@ -335623,7 +335623,7 @@ sub_80B2578: ; 80B2578 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_80B2CEC + 1 + ldr r1, =sub_80B2CEC str r1, [r0] movs r0, 0x1 @080B25BA: @@ -335652,7 +335652,7 @@ sub_80B25CC: ; 80B25CC adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =sub_80B2D2C + 1 + ldr r0, =sub_80B2D2C str r0, [r1] movs r0, 0x1 @080B25F2: @@ -335720,7 +335720,7 @@ sub_80B2634: ; 80B2634 ble @080B2678 subs r0, 0x8 adds r0, r1, r0 - ldr r1, =sub_80B2688 + 1 + ldr r1, =sub_80B2688 str r1, [r0] @080B2678: ldrh r0, [r4] @@ -335769,7 +335769,7 @@ sub_80B2688: ; 80B2688 bl audio_play ldr r0, =gUnknown_082780B3 bl box_related_two__3 - ldr r0, =sub_80B270C + 1 + ldr r0, =sub_80B270C b @080B26FA .align 2, 0 .pool @@ -335778,7 +335778,7 @@ sub_80B2688: ; 80B2688 bl audio_play ldr r0, =gUnknown_08278131 bl box_related_two__3 - ldr r0, =sub_80B2918 + 1 + ldr r0, =sub_80B2918 @080B26FA: str r0, [r4] @080B26FC: @@ -335817,7 +335817,7 @@ sub_80B270C: ; 80B270C lsls r1, 3 adds r1, r0 strh r2, [r1, 0xE] - ldr r0, =sub_80B275C + 1 + ldr r0, =sub_80B275C str r0, [r1] @080B274C: pop {r4} @@ -335886,7 +335886,7 @@ sub_80B275C: ; 80B275C mov r0, r9 subs r0, 0x8 add r0, r8 - ldr r1, =sub_80B2804 + 1 + ldr r1, =sub_80B2804 str r1, [r0] @080B27E4: pop {r3,r4} @@ -335942,7 +335942,7 @@ sub_80B2804: ; 80B2804 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, =sub_80B270C + 1 + ldr r1, =sub_80B270C str r1, [r0] b @080B2898 .align 2, 0 @@ -335960,7 +335960,7 @@ sub_80B2804: ; 80B2804 adds r1, r6 lsls r1, 3 adds r1, r0 - ldr r0, =sub_80B28A8 + 1 + ldr r0, =sub_80B28A8 str r0, [r1] @080B2898: pop {r4-r6} @@ -335999,7 +335999,7 @@ sub_80B28A8: ; 80B28A8 lsls r0, 24 cmp r4, r0 beq @080B28F4 - ldr r0, =sub_80B2D2C + 1 + ldr r0, =sub_80B2D2C b @080B2908 .align 2, 0 .pool @@ -336012,7 +336012,7 @@ sub_80B28A8: ; 80B28A8 lsls r0, 16 cmp r0, 0 beq @080B290A - ldr r0, =sub_80B2A08 + 1 + ldr r0, =sub_80B2A08 @080B2908: str r0, [r5] @080B290A: @@ -336062,7 +336062,7 @@ sub_80B2918: ; 80B2918 bhi @080B297C bl sub_800AC34 bl textbox_close - ldr r0, =sub_80B2CB0 + 1 + ldr r0, =sub_80B2CB0 b @080B29E4 .align 2, 0 .pool @@ -336074,7 +336074,7 @@ sub_80B2918: ; 80B2918 @080B2984: bl sub_80097E8 bl textbox_close - ldr r0, =sub_80B2CB0 + 1 + ldr r0, =sub_80B2CB0 b @080B29E4 .align 2, 0 .pool @@ -336112,7 +336112,7 @@ sub_80B2918: ; 80B2918 bl pokemon_getattr adds r4, 0x56 strh r0, [r4] - ldr r0, =sub_80B2C30 + 1 + ldr r0, =sub_80B2C30 @080B29E4: str r0, [r7] @080B29E6: @@ -336166,7 +336166,7 @@ sub_80B2A08: ; 80B2A08 adds r1, r7 lsls r1, 3 adds r1, r0 - ldr r0, =sub_80B2CB0 + 1 + ldr r0, =sub_80B2CB0 str r0, [r1] b @080B2ACE .align 2, 0 @@ -336210,7 +336210,7 @@ sub_80B2A08: ; 80B2A08 adds r0, r7 lsls r0, 3 adds r0, r1 - ldr r1, =sub_80B2C30 + 1 + ldr r1, =sub_80B2C30 str r1, [r0] movs r0, 0x2 bl sub_800A4D8 @@ -336336,7 +336336,7 @@ task_map_chg_seq_0807EC34: ; 80B2B94 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_80B2CB0 + 1 + ldr r1, =sub_80B2CB0 str r1, [r0] b @080B2C22 .align 2, 0 @@ -336363,7 +336363,7 @@ task_map_chg_seq_0807EC34: ; 80B2B94 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =sub_80B2CB0 + 1 + ldr r0, =sub_80B2CB0 str r0, [r1] @080B2C22: pop {r4,r5} @@ -336541,7 +336541,7 @@ sub_80B2D6C: ; 80B2D6C .align 2, 0 .pool @080B2D94: - ldr r0, =sub_80B2D2C + 1 + ldr r0, =sub_80B2D2C str r0, [r2] movs r0, 0x1 @080B2D9A: @@ -336672,7 +336672,7 @@ sub_80B2E74: ; 80B2E74 thumb_func_start sub_80B2EA8 sub_80B2EA8: ; 80B2EA8 push {r4,lr} - ldr r4, =sub_80B2EE4 + 1 + ldr r4, =sub_80B2EE4 adds r0, r4, 0 bl get_task_id_by_function lsls r0, 24 @@ -336883,7 +336883,7 @@ sub_80B3028: ; 80B3028 thumb_func_start sub_80B3050 sub_80B3050: ; 80B3050 push {lr} - ldr r0, =sub_80B3144 + 1 + ldr r0, =sub_80B3144 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 @@ -336968,7 +336968,7 @@ sub_80B3050: ; 80B3050 adds r0, r2, 0 strh r0, [r1] @080B3128: - ldr r0, =sub_80B3144 + 1 + ldr r0, =sub_80B3144 movs r1, 0x50 bl AddTask lsls r0, 24 @@ -336996,7 +336996,7 @@ sub_80B3144: ; 80B3144 bne @080B3178 bl sub_8009734 bl sub_800A2BC - ldr r0, =task00_08081A90 + 1 + ldr r0, =task00_08081A90 movs r1, 0x50 bl AddTask b @080B3184 @@ -337007,7 +337007,7 @@ sub_80B3144: ; 80B3144 ble @080B3184 subs r0, 0x8 adds r0, r1, r0 - ldr r1, =sub_80B3194 + 1 + ldr r1, =sub_80B3194 str r1, [r0] @080B3184: ldrh r0, [r4] @@ -337041,7 +337041,7 @@ sub_80B3194: ; 80B3194 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =sub_80B31E8 + 1 + ldr r0, =sub_80B31E8 b @080B31D8 .align 2, 0 .pool @@ -337051,7 +337051,7 @@ sub_80B3194: ; 80B3194 adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, =sub_80B3220 + 1 + ldr r0, =sub_80B3220 @080B31D8: str r0, [r1] @080B31DA: @@ -337080,7 +337080,7 @@ sub_80B31E8: ; 80B31E8 adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, =sub_80B3220 + 1 + ldr r0, =sub_80B3220 str r0, [r1] @080B3212: pop {r4,r5} @@ -337271,10 +337271,10 @@ sub_80B32B4: ; 80B32B4 lsls r2, 4 adds r0, r2, 0 strh r0, [r1] - ldr r0, =sub_8036760 + 1 + ldr r0, =sub_8036760 bl set_callback2 ldr r1, =0x030022c0 - ldr r0, =sub_80B360C + 1 + ldr r0, =sub_80B360C str r0, [r1, 0x8] adds r0, r5, 0 bl remove_task @@ -337452,10 +337452,10 @@ sub_80B33BC: ; 80B33BC lsls r3, 4 adds r0, r3, 0 strh r0, [r1] - ldr r0, =sub_8036760 + 1 + ldr r0, =sub_8036760 bl set_callback2 ldr r1, =0x030022c0 - ldr r0, =sub_80B360C + 1 + ldr r0, =sub_80B360C str r0, [r1, 0x8] adds r0, r4, 0 bl remove_task @@ -337543,13 +337543,13 @@ sub_80B3554: ; 80B3554 ldrb r0, [r0] cmp r0, 0 bne @080B35FE - ldr r0, =c2_exit_to_overworld_2_switch + 1 + ldr r0, =c2_exit_to_overworld_2_switch bl set_callback2 b @080B35FE .align 2, 0 .pool @080B35F8: - ldr r0, =c2_exit_to_overworld_2_switch + 1 + ldr r0, =c2_exit_to_overworld_2_switch bl set_callback2 @080B35FE: bl run_active_tasks @@ -337634,16 +337634,16 @@ sub_80B360C: ; 80B360C cmp r0, 0x1 bne @080B36CC ldr r1, =0x030022c0 - ldr r0, =sub_80B3554 + 1 + ldr r0, =sub_80B3554 b @080B36D0 .align 2, 0 .pool @080B36CC: ldr r1, =0x030022c0 - ldr r0, =c2_8056854 + 1 + ldr r0, =c2_8056854 @080B36D0: str r0, [r1, 0x8] - ldr r0, =sub_80A0514 + 1 + ldr r0, =sub_80A0514 bl set_callback2 pop {r4,r5} pop {r0} @@ -337774,7 +337774,7 @@ sub_80B3728: ; 80B3728 sub_80B37D4: ; 80B37D4 push {r4,r5,lr} adds r5, r0, 0 - ldr r4, =sub_80B3728 + 1 + ldr r4, =sub_80B3728 adds r0, r4, 0 movs r1, 0x50 bl AddTask @@ -337854,7 +337854,7 @@ sub_80B37FC: ; 80B37FC ldrb r0, [r0] cmp r0, 0 bne @080B3884 - ldr r0, =sub_80773AC + 1 + ldr r0, =sub_80773AC bl set_callback2 adds r0, r5, 0 bl remove_task @@ -337945,13 +337945,13 @@ sub_80B3924: ; 80B3924 ldrb r0, [r0] cmp r0, 0 beq @080B3940 - ldr r0, =sub_80B3894 + 1 + ldr r0, =sub_80B3894 bl sub_80B37D4 b @080B3946 .align 2, 0 .pool @080B3940: - ldr r0, =sub_80B37FC + 1 + ldr r0, =sub_80B37FC bl sub_80B37D4 @080B3946: pop {r0} @@ -337963,7 +337963,7 @@ sub_80B3924: ; 80B3924 thumb_func_start sub_80B3950 sub_80B3950: ; 80B3950 push {lr} - ldr r0, =sub_80B37FC + 1 + ldr r0, =sub_80B37FC movs r1, 0x50 bl AddTask pop {r0} @@ -337988,13 +337988,13 @@ sub_80B3968: ; 80B3968 ldrb r0, [r0] cmp r0, 0 beq @080B3994 - ldr r0, =sub_80B33BC + 1 + ldr r0, =sub_80B33BC bl sub_80B37D4 b @080B399A .align 2, 0 .pool @080B3994: - ldr r0, =sub_80B32B4 + 1 + ldr r0, =sub_80B32B4 bl sub_80B37D4 @080B399A: pop {r0} @@ -338006,7 +338006,7 @@ sub_80B3968: ; 80B3968 thumb_func_start sub_80B39A4 sub_80B39A4: ; 80B39A4 push {lr} - ldr r0, =sub_80B3728 + 1 + ldr r0, =sub_80B3728 movs r1, 0x50 bl AddTask bl script_env_2_set_ctx_paused @@ -338021,7 +338021,7 @@ sp02A_crash_sound: ; 80B39BC push {lr} ldr r0, =0x020375e4 ldrb r0, [r0] - ldr r1, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 + ldr r1, =c2_exit_to_overworld_1_continue_scripts_restart_music bl sub_80C4E74 pop {r0} bx r0 @@ -338089,7 +338089,7 @@ task00_08081A90: ; 80B3A30 cmp r1, r0 ble @080B3A62 bl sub_80097E8 - ldr r0, =c2_800ACD4 + 1 + ldr r0, =c2_800ACD4 bl set_callback2 adds r0, r4, 0 bl remove_task @@ -338107,7 +338107,7 @@ task00_08081A90: ; 80B3A30 cmp r0, 0 bne @080B3A86 bl sub_80097E8 - ldr r0, =c2_800ACD4 + 1 + ldr r0, =c2_800ACD4 bl set_callback2 @080B3A86: adds r0, r4, 0 @@ -338156,7 +338156,7 @@ sub_80B3AD0: ; 80B3AD0 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_80B3AAC + 1 + ldr r1, =sub_80B3AAC str r1, [r0] pop {r4} pop {r0} @@ -338204,7 +338204,7 @@ sub_80B3AF8: ; 80B3AF8 .pool @080B3B40: bl sub_8009734 - ldr r0, =task00_08081A90 + 1 + ldr r0, =task00_08081A90 movs r1, 0x1 bl AddTask b @080B3B96 @@ -338881,7 +338881,7 @@ sub_80B406C: ; 80B406C push {r4,r5,lr} lsls r5, r1, 24 lsrs r5, 24 - ldr r0, =c3_8081EDC + 1 + ldr r0, =c3_8081EDC movs r1, 0x50 bl AddTask ldr r4, =0x03006090 @@ -338935,7 +338935,7 @@ sub_80B40C8: ; 80B40C8 ldr r0, =0x03006090 ldrb r5, [r0, 0x14] @080B40E8: - ldr r4, =c3_8081EDC + 1 + ldr r4, =c3_8081EDC adds r0, r5, 0 adds r1, r4, 0 bl set_task_function_and_args_14_15 @@ -339533,7 +339533,7 @@ sub_80B44C8: ; 80B44C8 sub_80B4578: ; 80B4578 push {r4,lr} adds r4, r0, 0 - ldr r0, =sub_80B44C8 + 1 + ldr r0, =sub_80B44C8 movs r1, 0 bl AddTask adds r1, r0, 0 @@ -339557,7 +339557,7 @@ sub_80B4578: ; 80B4578 thumb_func_start sub_80B45AC sub_80B45AC: ; 80B45AC push {lr} - ldr r0, =sub_80B45BC + 1 + ldr r0, =sub_80B45BC bl sub_80B40C8 pop {r0} bx r0 @@ -342853,7 +342853,7 @@ sub_80B5E6C: ; 80B5E6C str r2, [sp, 0xC] ldr r0, =gUnknown_082EC6A8 str r0, [sp, 0x10] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [sp, 0x14] lsls r5, 16 asrs r5, 16 @@ -343216,7 +343216,7 @@ sub_80B61A0: ; 80B61A0 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, =sub_80B61E4 + 1 + ldr r0, =sub_80B61E4 movs r1, 0xFF bl AddTask lsls r0, 24 @@ -343376,7 +343376,7 @@ sub_80B62B4: ; 80B62B4 bl obj_delete_and_free_tiles movs r0, 0x19 bl oe_active_list_remove - ldr r0, =sub_80B61E4 + 1 + ldr r0, =sub_80B61E4 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -343395,7 +343395,7 @@ sub_80B62F4: ; 80B62F4 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, =sub_80B6330 + 1 + ldr r0, =sub_80B6330 movs r1, 0xFF bl AddTask lsls r0, 24 @@ -343460,7 +343460,7 @@ sub_80B6360: ; 80B6360 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x14] - ldr r0, =sub_80B6330 + 1 + ldr r0, =sub_80B6330 bl get_task_id_by_function adds r4, r0, 0 lsls r4, 24 @@ -343568,7 +343568,7 @@ sub_80B642C: ; 80B642C bl obj_delete_and_free_tiles movs r0, 0x3E bl oe_active_list_remove - ldr r0, =sub_80B6330 + 1 + ldr r0, =sub_80B6330 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -343598,7 +343598,7 @@ sub_80B646C: ; 80B646C lsrs r5, 16 lsls r6, 16 lsrs r6, 16 - ldr r0, =sub_80B64C0 + 1 + ldr r0, =sub_80B64C0 bl obj_add_empty_with_callback lsls r0, 24 lsrs r0, 24 @@ -344279,10 +344279,10 @@ sub_80B6970: ; 80B6970 thumb_func_start sub_80B69DC sub_80B69DC: ; 80B69DC push {lr} - ldr r0, =c2_exit_to_overworld_2_switch + 1 + ldr r0, =c2_exit_to_overworld_2_switch bl set_callback2 ldr r1, =0x03005dac - ldr r0, =mapldr_080842E8 + 1 + ldr r0, =mapldr_080842E8 str r0, [r1] pop {r0} bx r0 @@ -344294,7 +344294,7 @@ sub_80B69DC: ; 80B69DC mapldr_080842E8: ; 80B69FC push {lr} bl pal_fill_black - ldr r0, =task00_8084310 + 1 + ldr r0, =task00_8084310 movs r1, 0 bl AddTask bl script_env_2_enable @@ -344348,10 +344348,10 @@ task00_8084310: ; 80B6A24 bne @080B6A8A bl flag_var_implications_of_teleport_ bl warp_in - ldr r0, =c2_load_new_map + 1 + ldr r0, =c2_load_new_map bl set_callback2 ldr r1, =0x03005dac - ldr r0, =mapldr_08084390 + 1 + ldr r0, =mapldr_08084390 str r0, [r1] adds r0, r5, 0 bl remove_task @@ -344368,7 +344368,7 @@ mapldr_08084390: ; 80B6AA4 push {r4,lr} bl sub_8085784 bl pal_fill_black - ldr r0, =c3_080843F8 + 1 + ldr r0, =c3_080843F8 movs r1, 0 bl AddTask ldr r4, =0x02037350 @@ -344458,7 +344458,7 @@ sub_80B6B68: ; 80B6B68 bl pal_fill_for_maplights bl script_env_2_enable bl player_bitmagic - ldr r0, =sub_80B6B94 + 1 + ldr r0, =sub_80B6B94 movs r1, 0 bl AddTask ldr r1, =0x03005dac @@ -344807,7 +344807,7 @@ sub_80B6E18: ; 80B6E18 bl sub_808EE8C bl sub_809757C bl sub_808A2E4 - ldr r0, =sub_80B6B94 + 1 + ldr r0, =sub_80B6B94 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -344827,7 +344827,7 @@ sub_80B6E4C: ; 80B6E4C lsrs r4, 24 lsls r1, 24 lsrs r1, 24 - ldr r0, =sub_80B6E88 + 1 + ldr r0, =sub_80B6E88 bl AddTask lsls r0, 24 lsrs r0, 24 @@ -345114,11 +345114,11 @@ sub_80B7060: ; 80B7060 bl sub_80E1570 bl warp_in ldr r1, =0x03005dac - ldr r0, =sub_80B70B4 + 1 + ldr r0, =sub_80B70B4 str r0, [r1] - ldr r0, =c2_load_new_map + 1 + ldr r0, =c2_load_new_map bl set_callback2 - ldr r0, =sub_80B6E88 + 1 + ldr r0, =sub_80B6E88 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -345136,7 +345136,7 @@ sub_80B70B4: ; 80B70B4 bl sub_8085784 bl pal_fill_for_maplights bl script_env_2_enable - ldr r0, =sub_80B70DC + 1 + ldr r0, =sub_80B70DC movs r1, 0 bl AddTask ldr r1, =0x03005dac @@ -345444,7 +345444,7 @@ sub_80B72F4: ; 80B72F4 lsrs r1, 24 adds r0, r4, 0 bl npc_set_state_2 - ldr r0, =sub_80B70DC + 1 + ldr r0, =sub_80B70DC bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -345461,7 +345461,7 @@ sub_80B72F4: ; 80B72F4 thumb_func_start oei_waterfall oei_waterfall: ; 80B734C push {r4,lr} - ldr r4, =sub_80B7384 + 1 + ldr r4, =sub_80B7384 adds r0, r4, 0 movs r1, 0xFF bl AddTask @@ -345635,7 +345635,7 @@ sub_80B7478: ; 80B7478 bl script_env_2_disable ldr r0, =0x02037590 strb r4, [r0, 0x6] - ldr r0, =sub_80B7384 + 1 + ldr r0, =sub_80B7384 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -345659,7 +345659,7 @@ sub_80B7478: ; 80B7478 thumb_func_start sub_80B74D0 sub_80B74D0: ; 80B74D0 push {r4,lr} - ldr r4, =sub_80B750C + 1 + ldr r4, =sub_80B750C adds r0, r4, 0 movs r1, 0xFF bl AddTask @@ -345772,7 +345772,7 @@ dive_3_unknown: ; 80B7580 ldrb r1, [r0, 0x1E] mov r0, sp bl dive_warp - ldr r0, =sub_80B750C + 1 + ldr r0, =sub_80B750C bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -345794,7 +345794,7 @@ sub_80B75D8: ; 80B75D8 adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 - ldr r0, =sub_80B75F0 + 1 + ldr r0, =sub_80B75F0 bl AddTask pop {r0} bx r0 @@ -346104,11 +346104,11 @@ sub_80B7814: ; 80B7814 bne @080B784C bl warp_in ldr r1, =0x03005dac - ldr r0, =mapldr_080851BC + 1 + ldr r0, =mapldr_080851BC str r0, [r1] - ldr r0, =c2_load_new_map + 1 + ldr r0, =c2_load_new_map bl set_callback2 - ldr r0, =sub_80B75F0 + 1 + ldr r0, =sub_80B75F0 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -346130,7 +346130,7 @@ mapldr_080851BC: ; 80B7868 ldr r0, =0x03005dac movs r1, 0 str r1, [r0] - ldr r0, =sub_80B7890 + 1 + ldr r0, =sub_80B7890 bl AddTask pop {r0} bx r0 @@ -346302,7 +346302,7 @@ sub_80B79BC: ; 80B79BC strb r0, [r1, 0x6] bl script_env_2_disable bl sub_809757C - ldr r0, =sub_80B7890 + 1 + ldr r0, =sub_80B7890 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -346386,7 +346386,7 @@ sub_80B7A74: ; 80B7A74 adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 - ldr r0, =sub_80B7A8C + 1 + ldr r0, =sub_80B7A8C bl AddTask pop {r0} bx r0 @@ -346592,11 +346592,11 @@ sub_80B7BF4: ; 80B7BF4 bne @080B7C2C bl warp_in ldr r1, =0x03005dac - ldr r0, =sub_80B6B68 + 1 + ldr r0, =sub_80B6B68 str r0, [r1] - ldr r0, =c2_load_new_map + 1 + ldr r0, =c2_load_new_map bl set_callback2 - ldr r0, =sub_80B7A8C + 1 + ldr r0, =sub_80B7A8C bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -346679,7 +346679,7 @@ sub_80B7CC8: ; 80B7CC8 push {lr} bl script_env_2_enable bl player_bitmagic - ldr r0, =sub_80B7CE4 + 1 + ldr r0, =sub_80B7CE4 movs r1, 0x50 bl AddTask pop {r0} @@ -346793,11 +346793,11 @@ sub_80B7D34: ; 80B7D34 bl sub_8084E14 bl warp_in ldr r1, =0x03005dac - ldr r0, =mapldr_080859D4 + 1 + ldr r0, =mapldr_080859D4 str r0, [r1] - ldr r0, =c2_load_new_map + 1 + ldr r0, =c2_load_new_map bl set_callback2 - ldr r0, =sub_80B7CE4 + 1 + ldr r0, =sub_80B7CE4 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -346870,7 +346870,7 @@ mapldr_080859D4: ; 80B7E48 movs r2, 0x20 orrs r1, r2 strb r1, [r0, 0x1] - ldr r0, =sub_80B7E94 + 1 + ldr r0, =sub_80B7E94 movs r1, 0 bl AddTask pop {r0} @@ -346980,7 +346980,7 @@ sub_80B7EE8: ; 80B7EE8 strb r0, [r6, 0x1] bl script_env_2_disable bl sub_809757C - ldr r0, =sub_80B7E94 + 1 + ldr r0, =sub_80B7E94 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -347033,7 +347033,7 @@ sub_80B7EE8: ; 80B7EE8 thumb_func_start sub_80B7FC8 sub_80B7FC8: ; 80B7FC8 push {lr} - ldr r0, =sub_80B7FDC + 1 + ldr r0, =sub_80B7FDC movs r1, 0 bl AddTask pop {r0} @@ -347284,12 +347284,12 @@ sub_80B8198: ; 80B8198 bne @080B81E6 bl copy_saved_warp3_bank_and_enter_x_to_warp1 bl warp_in - ldr r0, =c2_load_new_map + 1 + ldr r0, =c2_load_new_map bl set_callback2 ldr r1, =0x03005dac - ldr r0, =mapldr_08085D88 + 1 + ldr r0, =mapldr_08085D88 str r0, [r1] - ldr r0, =sub_80B7FDC + 1 + ldr r0, =sub_80B7FDC bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -347324,7 +347324,7 @@ mapldr_08085D88: ; 80B8200 orrs r1, r2 strb r1, [r0, 0x1] bl sub_808EEDC - ldr r0, =sub_80B8250 + 1 + ldr r0, =sub_80B8250 movs r1, 0 bl AddTask pop {r0} @@ -347601,7 +347601,7 @@ sub_80B8410: ; 80B8410 bl script_env_2_disable bl sub_808EE8C bl sub_809757C - ldr r0, =sub_80B8250 + 1 + ldr r0, =sub_80B8250 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -347626,12 +347626,12 @@ sub_80B849C: ; 80B849C lsrs r0, 24 cmp r0, 0x1 bne @080B84BC - ldr r0, =sub_80B8554 + 1 + ldr r0, =sub_80B8554 b @080B84BE .align 2, 0 .pool @080B84BC: - ldr r0, =sub_80B88B4 + 1 + ldr r0, =sub_80B88B4 @080B84BE: movs r1, 0xFF bl AddTask @@ -347758,7 +347758,7 @@ sub_80B8584: ; 80B8584 ldrh r1, [r4, 0x10] movs r0, 0x4A bl lcd_io_set - ldr r0, =sub_80B880C + 1 + ldr r0, =sub_80B880C bl SetVBlankCallback ldrh r0, [r4, 0x8] adds r0, 0x1 @@ -347877,7 +347877,7 @@ sub_80B8660: ; 80B8660 lsls r0, 2 adds r2, 0x1C adds r0, r2 - ldr r1, =sub_80B8CC0 + 1 + ldr r1, =sub_80B8CC0 str r1, [r0] ldrh r0, [r3, 0x8] adds r0, 0x1 @@ -348028,7 +348028,7 @@ overworld_bg_setup_2: ; 80B87B8 bl sub_80B6070 movs r0, 0x6 bl oe_active_list_remove - ldr r0, =sub_80B8554 + 1 + ldr r0, =sub_80B8554 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -348045,7 +348045,7 @@ overworld_bg_setup_2: ; 80B87B8 sub_80B880C: ; 80B880C push {r4,lr} sub sp, 0x4 - ldr r0, =sub_80B8554 + 1 + ldr r0, =sub_80B8554 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -348157,7 +348157,7 @@ sub_80B88E4: ; 80B88E4 ldr r1, =0x030022c0 ldr r1, [r1, 0xC] bl sub_806F67C - ldr r0, =sub_80B8AE0 + 1 + ldr r0, =sub_80B8AE0 bl SetVBlankCallback ldrh r0, [r4, 0x8] adds r0, 0x1 @@ -348240,7 +348240,7 @@ sub_80B898C: ; 80B898C lsls r0, 2 adds r2, 0x1C adds r0, r2 - ldr r1, =sub_80B8CC0 + 1 + ldr r1, =sub_80B8CC0 str r1, [r0] ldrh r0, [r4, 0x8] adds r0, 0x1 @@ -348367,7 +348367,7 @@ sub_80B8A64: ; 80B8A64 bl sub_80B6070 movs r0, 0x6 bl oe_active_list_remove - ldr r0, =sub_80B88B4 + 1 + ldr r0, =sub_80B88B4 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -348384,7 +348384,7 @@ sub_80B8A64: ; 80B8A64 sub_80B8AE0: ; 80B8AE0 push {r4,lr} sub sp, 0x4 - ldr r0, =sub_80B88B4 + 1 + ldr r0, =sub_80B88B4 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -348614,7 +348614,7 @@ sub_80B8C60: ; 80B8C60 lsls r2, 2 ldr r1, =0x02020630 adds r2, r1 - ldr r1, =nullsub_12 + 1 + ldr r1, =nullsub_12 str r1, [r2, 0x1C] ldrb r3, [r2, 0x5] movs r1, 0xD @@ -348646,7 +348646,7 @@ sub_80B8CC0: ; 80B8CC0 strh r0, [r1, 0x20] movs r0, 0x1E strh r0, [r1, 0x30] - ldr r0, =sub_80B8D04 + 1 + ldr r0, =sub_80B8D04 str r0, [r1, 0x1C] movs r2, 0x3A ldrsh r0, [r1, r2] @@ -348679,7 +348679,7 @@ sub_80B8D04: ; 80B8D04 lsls r0, 16 cmp r0, 0 bne @080B8D18 - ldr r0, =sub_80B8D20 + 1 + ldr r0, =sub_80B8D20 str r0, [r1, 0x1C] @080B8D18: pop {r0} @@ -348714,7 +348714,7 @@ sub_80B8D20: ; 80B8D20 thumb_func_start sub_80B8D44 sub_80B8D44: ; 80B8D44 push {lr} - ldr r0, =sub_80B8D84 + 1 + ldr r0, =sub_80B8D84 movs r1, 0xFF bl AddTask lsls r0, 24 @@ -348969,7 +348969,7 @@ sub_80B8F24: ; 80B8F24 bl script_env_2_disable movs r0, 0x9 bl oe_active_list_remove - ldr r0, =sub_80B8D84 + 1 + ldr r0, =sub_80B8D84 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -349142,7 +349142,7 @@ sub_80B90CC: ; 80B90CC movs r1, 0x4 orrs r0, r1 strb r0, [r2, 0x5] - ldr r0, =sub_80B9128 + 1 + ldr r0, =sub_80B9128 str r0, [r2, 0x1C] ldr r0, =0x02038c08 ldr r0, [r0] @@ -349225,7 +349225,7 @@ sub_80B9128: ; 80B9128 thumb_func_start sub_80B91A4 sub_80B91A4: ; 80B91A4 push {lr} - ldr r0, =sub_80B91D4 + 1 + ldr r0, =sub_80B91D4 movs r1, 0xFE bl AddTask lsls r0, 24 @@ -349601,7 +349601,7 @@ sub_80B9494: ; 80B9494 bne @080B94B6 movs r0, 0x1F bl oe_active_list_remove - ldr r0, =sub_80B91D4 + 1 + ldr r0, =sub_80B91D4 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -349638,7 +349638,7 @@ sub_80B94C4: ; 80B94C4 movs r3, 0x4 orrs r1, r3 strb r1, [r2, 0x5] - ldr r1, =sub_80B957C + 1 + ldr r1, =sub_80B957C str r1, [r2, 0x1C] pop {r1} bx r1 @@ -349673,7 +349673,7 @@ sub_80B9524: ; 80B9524 lsls r4, 2 ldr r0, =0x02020630 adds r4, r0 - ldr r0, =sub_80B963C + 1 + ldr r0, =sub_80B963C str r0, [r4, 0x1C] movs r1, 0 movs r0, 0x78 @@ -349994,7 +349994,7 @@ sub_80B9794: ; 80B9794 lsls r0, 2 adds r1, 0x1C adds r0, r1 - ldr r1, =sub_80B96B0 + 1 + ldr r1, =sub_80B96B0 str r1, [r0] pop {r4} pop {r0} @@ -350006,7 +350006,7 @@ sub_80B9794: ; 80B9794 thumb_func_start sub_80B97C0 sub_80B97C0: ; 80B97C0 push {lr} - ldr r0, =sub_80B97D4 + 1 + ldr r0, =sub_80B97D4 movs r1, 0xFE bl AddTask movs r0, 0 @@ -350374,7 +350374,7 @@ fishE: ; 80B9A60 strb r0, [r6, 0x6] movs r0, 0x20 bl oe_active_list_remove - ldr r0, =sub_80B97D4 + 1 + ldr r0, =sub_80B97D4 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -350400,7 +350400,7 @@ sub_80B9ADC: ; 80B9ADC lsls r0, 24 cmp r0, 0 bne @080B9B2C - ldr r0, =sub_80B9BE8 + 1 + ldr r0, =sub_80B9BE8 movs r1, 0x50 bl AddTask lsls r0, 24 @@ -350562,7 +350562,7 @@ sub_80B9BE8: ; 80B9BE8 sub_80B9C28: ; 80B9C28 push {r4,r5,lr} adds r5, r0, 0 - ldr r0, =sub_80B9B3C + 1 + ldr r0, =sub_80B9B3C movs r1, 0x5A bl AddTask adds r4, r0, 0 @@ -350654,7 +350654,7 @@ sub_80B9CDC: ; 80B9CDC ands r0, r1 cmp r0, 0 bne @080B9D16 - ldr r0, =sub_80B9B3C + 1 + ldr r0, =sub_80B9B3C bl is_function_an_active_task lsls r0, 24 cmp r0, 0 @@ -350856,7 +350856,7 @@ sub_80B9E28: ; 80B9E28 asrs r2, 16 adds r0, r4, 0 bl npc_coords_shift - ldr r0, =sub_80B9EDC + 1 + ldr r0, =sub_80B9EDC movs r1, 0x50 bl AddTask lsls r0, 24 @@ -351087,7 +351087,7 @@ sub_80BA038: ; 80BA038 lsls r2, 3 adds r1, r2 str r1, [r0, 0x4] - ldr r1, =sub_80BA134 + 1 + ldr r1, =sub_80BA134 b @080BA07C .align 2, 0 .pool @@ -351099,7 +351099,7 @@ sub_80BA038: ; 80BA038 lsls r2, 3 adds r1, r2 str r1, [r0, 0x4] - ldr r1, =sub_80BA154 + 1 + ldr r1, =sub_80BA154 @080BA07C: str r1, [r0, 0x10] adds r1, r0, 0 @@ -351536,7 +351536,7 @@ sub_80BA384: ; 80BA384 ldr r1, [sp, 0x4] ldr r2, [sp, 0x8] bl sub_80BA038 - ldr r0, =task00_for_dp12 + 1 + ldr r0, =task00_for_dp12 movs r1, 0 bl AddTask lsls r0, 24 @@ -351916,7 +351916,7 @@ c2_options_menu: ; 80BA4DC .align 2, 0 .pool @080BA774: - ldr r0, =sub_80BA83C + 1 + ldr r0, =sub_80BA83C movs r1, 0 bl AddTask lsls r0, 24 @@ -351987,9 +351987,9 @@ c2_options_menu: ; 80BA4DC movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - ldr r0, =sub_80BA4C8 + 1 + ldr r0, =sub_80BA4C8 bl SetVBlankCallback - ldr r0, =sub_80BA4B0 + 1 + ldr r0, =sub_80BA4B0 bl set_callback2 @080BA828: add sp, 0xC @@ -352018,7 +352018,7 @@ sub_80BA83C: ; 80BA83C adds r1, r2 lsls r1, 3 adds r1, r0 - ldr r0, =sub_80BA86C + 1 + ldr r0, =sub_80BA86C str r0, [r1] @080BA85C: pop {r0} @@ -352063,7 +352063,7 @@ sub_80BA86C: ; 80BA86C lsls r1, 3 adds r1, r0 @080BA8AE: - ldr r0, =sub_80BAA64 + 1 + ldr r0, =sub_80BAA64 str r0, [r1] b @080BAA5A .align 2, 0 @@ -352348,7 +352348,7 @@ sub_80BAA64: ; 80BAA64 movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, =sub_80BAB08 + 1 + ldr r0, =sub_80BAB08 str r0, [r4] add sp, 0x4 pop {r4-r6} @@ -353742,7 +353742,7 @@ sub_80BB534: ; 80BB534 bl malloc_and_clear str r0, [r4] bl sub_80BB384 - ldr r0, =sub_80BB78C + 1 + ldr r0, =sub_80BB78C movs r1, 0 bl AddTask ldr r1, [r4] @@ -353829,9 +353829,9 @@ sub_80BB534: ; 80BB534 @080BB71C: movs r0, 0x1 bl enable_irqs - ldr r0, =sub_80BB370 + 1 + ldr r0, =sub_80BB370 bl SetVBlankCallback - ldr r0, =sub_80BB774 + 1 + ldr r0, =sub_80BB774 bl set_callback2 ldr r0, =0x02039b4c ldr r1, [r0] @@ -353892,7 +353892,7 @@ sub_80BB78C: ; 80BB78C adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =sub_80BB7D4 + 1 + ldr r0, =sub_80BB7D4 str r0, [r1] @080BB7BE: pop {r4} @@ -353978,14 +353978,14 @@ sub_80BB7D4: ; 80BB7D4 lsls r0, 2 adds r4, 0x1C adds r0, r4 - ldr r1, =sub_80BE470 + 1 + ldr r1, =sub_80BE470 str r1, [r0] ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, =sub_80BBBF4 + 1 + ldr r1, =sub_80BBBF4 str r1, [r0] movs r0, 0x15 b @080BB976 @@ -354019,7 +354019,7 @@ sub_80BB7D4: ; 80BB7D4 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, =sub_80BBA78 + 1 + ldr r1, =sub_80BBA78 str r1, [r0] movs r0, 0x5 bl audio_play @@ -354082,7 +354082,7 @@ sub_80BB7D4: ; 80BB7D4 adds r4, 0x4 adds r0, r4 strh r1, [r0] - ldr r0, =sub_80BBD1C + 1 + ldr r0, =sub_80BBD1C str r0, [r3] movs r0, 0x2 @080BB976: @@ -354108,7 +354108,7 @@ sub_80BB7D4: ; 80BB7D4 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, =sub_80BBDE8 + 1 + ldr r1, =sub_80BBDE8 str r1, [r0] movs r0, 0x3 bl audio_play @@ -354136,7 +354136,7 @@ sub_80BB7D4: ; 80BB7D4 adds r1, r6 lsls r1, 3 adds r1, r0 - ldr r0, =sub_80BBA28 + 1 + ldr r0, =sub_80BBA28 str r0, [r1] @080BBA06: add sp, 0x4 @@ -354175,7 +354175,7 @@ sub_80BBA28: ; 80BBA28 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =sub_80BB7D4 + 1 + ldr r0, =sub_80BB7D4 str r0, [r1] @080BBA5C: pop {r4} @@ -354286,7 +354286,7 @@ sub_80BBA78: ; 80BBA78 adds r0, r7 lsls r0, 3 adds r0, r1 - ldr r1, =sub_80BBDE8 + 1 + ldr r1, =sub_80BBDE8 str r1, [r0] movs r0, 0x3 bl audio_play @@ -354308,7 +354308,7 @@ sub_80BBA78: ; 80BBA78 adds r0, r7 lsls r0, 3 adds r0, r1 - ldr r1, =sub_80BB7D4 + 1 + ldr r1, =sub_80BB7D4 str r1, [r0] b @080BBBB6 .align 2, 0 @@ -354408,7 +354408,7 @@ sub_80BBBF4: ; 80BBBF4 lsls r0, 24 lsrs r0, 24 strh r0, [r1, 0x8] - ldr r0, =sub_80BBC74 + 1 + ldr r0, =sub_80BBC74 str r0, [r1] @080BBC52: pop {r4-r6} @@ -354477,7 +354477,7 @@ sub_80BBC74: ; 80BBC74 adds r1, r0 ldrb r0, [r1] strb r0, [r2] - ldr r0, =sub_80BB78C + 1 + ldr r0, =sub_80BB78C str r0, [r4] @080BBCFC: pop {r4,r5} @@ -354521,7 +354521,7 @@ sub_80BBD1C: ; 80BBD1C adds r1, r2, r0 movs r0, 0x40 strb r0, [r1] - ldr r0, =sub_80BBE70 + 1 + ldr r0, =sub_80BBE70 b @080BBDC8 .align 2, 0 .pool @@ -354563,7 +354563,7 @@ sub_80BBD1C: ; 80BBD1C ldr r2, =0x00000616 adds r0, r2 strh r1, [r0] - ldr r0, =sub_80BB78C + 1 + ldr r0, =sub_80BB78C @080BBDC8: str r0, [r6] @080BBDCA: @@ -354610,7 +354610,7 @@ sub_80BBDE8: ; 80BBDE8 bl sub_80BC890 adds r0, r6, 0 bl remove_task - ldr r0, =sub_8086194 + 1 + ldr r0, =sub_8086194 bl set_callback2 ldr r0, =0x03007420 ldr r1, =0x0000ffff @@ -354650,7 +354650,7 @@ sub_80BBE70: ; 80BBE70 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =sub_80BBEB8 + 1 + ldr r0, =sub_80BBEB8 str r0, [r1] @080BBEA0: pop {r4} @@ -354719,7 +354719,7 @@ sub_80BBEB8: ; 80BBEB8 lsls r0, r1 adds r3, 0x1C adds r2, r3 - ldr r1, =sub_80BE470 + 1 + ldr r1, =sub_80BE470 str r1, [r2] mvns r0, r0 str r4, [sp] @@ -354732,7 +354732,7 @@ sub_80BBEB8: ; 80BBEB8 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, =sub_80BC2D4 + 1 + ldr r1, =sub_80BC2D4 str r1, [r0] movs r0, 0x15 b @080BC00A @@ -354766,7 +354766,7 @@ sub_80BBEB8: ; 80BBEB8 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, =sub_80BC0F8 + 1 + ldr r1, =sub_80BC0F8 str r1, [r0] movs r0, 0x5 bl audio_play @@ -354802,7 +354802,7 @@ sub_80BBEB8: ; 80BBEB8 ldr r3, =0x0000064e adds r0, r3 strb r2, [r0] - ldr r0, =sub_80BBD1C + 1 + ldr r0, =sub_80BBD1C str r0, [r1] movs r0, 0x2 @080BC00A: @@ -354828,7 +354828,7 @@ sub_80BBEB8: ; 80BBEB8 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, =sub_80BC3DC + 1 + ldr r1, =sub_80BC3DC str r1, [r0] movs r0, 0x3 bl audio_play @@ -354856,7 +354856,7 @@ sub_80BBEB8: ; 80BBEB8 adds r1, r6 lsls r1, 3 adds r1, r0 - ldr r0, =sub_80BC0A8 + 1 + ldr r0, =sub_80BC0A8 str r0, [r1] @080BC08A: add sp, 0x4 @@ -354892,7 +354892,7 @@ sub_80BC0A8: ; 80BC0A8 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =sub_80BBEB8 + 1 + ldr r0, =sub_80BBEB8 str r0, [r1] @080BC0DC: pop {r4} @@ -355016,7 +355016,7 @@ sub_80BC0F8: ; 80BC0F8 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, =sub_80BC3DC + 1 + ldr r1, =sub_80BC3DC str r1, [r0] movs r0, 0x34 bl audio_play @@ -355036,7 +355036,7 @@ sub_80BC0F8: ; 80BC0F8 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, =sub_80BC47C + 1 + ldr r1, =sub_80BC47C str r1, [r0] movs r0, 0x3 bl audio_play @@ -355058,7 +355058,7 @@ sub_80BC0F8: ; 80BC0F8 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, =sub_80BBEB8 + 1 + ldr r1, =sub_80BBEB8 str r1, [r0] b @080BC296 .align 2, 0 @@ -355162,7 +355162,7 @@ sub_80BC2D4: ; 80BC2D4 adds r0, r4 ldr r2, =0x0000ffff strh r2, [r0] - ldr r0, =sub_80BC360 + 1 + ldr r0, =sub_80BC360 str r0, [r1] @080BC33A: pop {r4-r6} @@ -355219,7 +355219,7 @@ sub_80BC360: ; 80BC360 .align 2, 0 .pool @080BC3CC: - ldr r0, =sub_80BBE70 + 1 + ldr r0, =sub_80BBE70 str r0, [r4] @080BC3D0: pop {r4,r5} @@ -355283,7 +355283,7 @@ sub_80BC3DC: ; 80BC3DC adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, =sub_80BB78C + 1 + ldr r1, =sub_80BB78C str r1, [r0] bl sub_80BDA40 bl sub_80BC890 @@ -355349,7 +355349,7 @@ sub_80BC47C: ; 80BC47C adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, =sub_80BBDE8 + 1 + ldr r1, =sub_80BBDE8 str r1, [r0] @080BC4E8: pop {r4,r5} @@ -355595,7 +355595,7 @@ sub_80BC514: ; 80BC514 movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - ldr r0, =sub_80BB370 + 1 + ldr r0, =sub_80BB370 bl SetVBlankCallback ldr r1, =0x030022c0 movs r2, 0x87 @@ -357034,7 +357034,7 @@ sub_80BD2B4: ; 80BD2B4 adds r1, r3, 0 adds r1, 0x1C adds r1, r0, r1 - ldr r2, =sub_80BE4E0 + 1 + ldr r2, =sub_80BE4E0 str r2, [r1] adds r0, r3 ldr r1, =0x0000ffe0 @@ -357058,7 +357058,7 @@ sub_80BD2B4: ; 80BD2B4 adds r1, r3, 0 adds r1, 0x1C adds r1, r0, r1 - ldr r2, =sub_80BE4E0 + 1 + ldr r2, =sub_80BE4E0 str r2, [r1] adds r0, r3 movs r1, 0 @@ -357084,7 +357084,7 @@ sub_80BD2B4: ; 80BD2B4 adds r1, r3, 0 adds r1, 0x1C adds r1, r0, r1 - ldr r2, =sub_80BE4E0 + 1 + ldr r2, =sub_80BE4E0 str r2, [r1] adds r0, r3 movs r1, 0x20 @@ -357359,7 +357359,7 @@ sub_80BD5A8: ; 80BD5A8 adds r1, r3, 0 adds r1, 0x1C adds r1, r0, r1 - ldr r2, =sub_80BE4E0 + 1 + ldr r2, =sub_80BE4E0 str r2, [r1] adds r0, r3 ldr r1, =0x0000ffc0 @@ -357402,7 +357402,7 @@ sub_80BD5A8: ; 80BD5A8 adds r1, r3, 0 adds r1, 0x1C adds r1, r0, r1 - ldr r2, =sub_80BE4E0 + 1 + ldr r2, =sub_80BE4E0 str r2, [r1] adds r0, r3 movs r1, 0x40 @@ -359081,7 +359081,7 @@ sub_80BE470: ; 80BE470 .align 2, 0 .pool @080BE4D4: - ldr r0, =nullsub_38 + 1 + ldr r0, =nullsub_38 str r0, [r2, 0x1C] @080BE4D8: pop {r0} @@ -359646,7 +359646,7 @@ sub_80BE91C: ; 80BE91C lsrs r4, 24 ldr r1, =0x02039b54 str r0, [r1] - ldr r0, =sub_80BEA24 + 1 + ldr r0, =sub_80BEA24 movs r1, 0 bl AddTask adds r5, r0, 0 @@ -359720,7 +359720,7 @@ sub_80BE9C4: ; 80BE9C4 cmp r0, 0 bne @080BE9F0 ldr r1, [r1] - ldr r0, =sub_80BEDF4 + 1 + ldr r0, =sub_80BEDF4 cmp r1, r0 bne @080BE9F0 movs r0, 0 @@ -360131,7 +360131,7 @@ sub_80BEA24: ; 80BEA24 movs r1, 0x1 strh r1, [r0, 0xC] strh r1, [r0, 0xE] - ldr r1, =sub_80BEDF4 + 1 + ldr r1, =sub_80BEDF4 str r1, [r0] movs r3, 0x87 lsls r3, 3 @@ -360200,7 +360200,7 @@ sub_80BEDF4: ; 80BEDF4 movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, =sub_80BF038 + 1 + ldr r0, =sub_80BF038 str r0, [r4] movs r0, 0x6C bl audio_play @@ -360303,7 +360303,7 @@ sub_80BEDF4: ; 80BEDF4 movs r1, 0x3 @080BEEF0: strb r1, [r0] - ldr r0, =sub_80BEFD0 + 1 + ldr r0, =sub_80BEFD0 str r0, [r4] movs r0, 0x15 bl audio_play @@ -360319,7 +360319,7 @@ sub_80BEDF4: ; 80BEDF4 movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, =sub_80BF070 + 1 + ldr r0, =sub_80BF070 str r0, [r4] movs r0, 0x3 bl audio_play @@ -360433,17 +360433,17 @@ sub_80BEFD0: ; 80BEFD0 cmp r0, 0x3 beq @080BF028 @080BF008: - ldr r0, =sub_80BF0AC + 1 + ldr r0, =sub_80BF0AC b @080BF02A .align 2, 0 .pool @080BF020: - ldr r0, =sub_80BF250 + 1 + ldr r0, =sub_80BF250 b @080BF02A .align 2, 0 .pool @080BF028: - ldr r0, =sub_80BF82C + 1 + ldr r0, =sub_80BF82C @080BF02A: str r0, [r4] @080BF02C: @@ -360472,7 +360472,7 @@ sub_80BF038: ; 80BF038 adds r4, r0 ldrh r0, [r4, 0x10] bl sub_818D820 - ldr r0, =sub_80BEA24 + 1 + ldr r0, =sub_80BEA24 str r0, [r4] @080BF05E: pop {r4} @@ -360608,7 +360608,7 @@ sub_80BF0AC: ; 80BF0AC adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, =sub_80BF1B4 + 1 + ldr r1, =sub_80BF1B4 str r1, [r0] @080BF196: pop {r4-r7} @@ -360635,7 +360635,7 @@ sub_80BF1B4: ; 80BF1B4 adds r1, r2 lsls r1, 3 adds r1, r0 - ldr r0, =sub_80BF1EC + 1 + ldr r0, =sub_80BF1EC str r0, [r1] @080BF1D6: pop {r0} @@ -360670,7 +360670,7 @@ sub_80BF1EC: ; 80BF1EC adds r1, r2 lsls r1, 3 adds r1, r0 - ldr r0, =sub_80BEA24 + 1 + ldr r0, =sub_80BEA24 b @080BF240 .align 2, 0 .pool @@ -360680,7 +360680,7 @@ sub_80BF1EC: ; 80BF1EC adds r1, r2 lsls r1, 3 adds r1, r0 - ldr r0, =sub_80BF250 + 1 + ldr r0, =sub_80BF250 @080BF240: str r0, [r1] @080BF242: @@ -361036,7 +361036,7 @@ sub_80BF250: ; 80BF250 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_80BF5CC + 1 + ldr r1, =sub_80BF5CC str r1, [r0] @080BF5B2: add sp, 0x14 @@ -361122,7 +361122,7 @@ sub_80BF5CC: ; 80BF5CC adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_80BF790 + 1 + ldr r1, =sub_80BF790 str r1, [r0] movs r0, 0x3 bl audio_play @@ -361165,7 +361165,7 @@ sub_80BF5CC: ; 80BF5CC adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_80BF790 + 1 + ldr r1, =sub_80BF790 str r1, [r0] movs r0, 0x6D bl audio_play @@ -361222,7 +361222,7 @@ sub_80BF5CC: ; 80BF5CC adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_80BF790 + 1 + ldr r1, =sub_80BF790 str r1, [r0] movs r0, 0x6D bl audio_play @@ -361266,17 +361266,17 @@ sub_80BF790: ; 80BF790 cmp r0, 0x3 beq @080BF7EC @080BF7CC: - ldr r0, =sub_80BEA24 + 1 + ldr r0, =sub_80BEA24 b @080BF7EE .align 2, 0 .pool @080BF7E4: - ldr r0, =sub_80BF0AC + 1 + ldr r0, =sub_80BF0AC b @080BF7EE .align 2, 0 .pool @080BF7EC: - ldr r0, =sub_80BF82C + 1 + ldr r0, =sub_80BF82C @080BF7EE: str r0, [r4] @080BF7F0: @@ -361674,7 +361674,7 @@ sub_80BF82C: ; 80BF82C adds r0, r7 lsls r0, 3 adds r0, r1 - ldr r1, =sub_80BFBB0 + 1 + ldr r1, =sub_80BFBB0 str r1, [r0] @080BFB94: add sp, 0x44 @@ -361718,7 +361718,7 @@ sub_80BFBB0: ; 80BFBB0 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_80BFC78 + 1 + ldr r1, =sub_80BFC78 str r1, [r0] movs r0, 0x3 bl audio_play @@ -361759,7 +361759,7 @@ sub_80BFBB0: ; 80BFBB0 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, =sub_80BFC78 + 1 + ldr r1, =sub_80BFC78 str r1, [r0] movs r0, 0x6D bl audio_play @@ -361802,12 +361802,12 @@ sub_80BFC78: ; 80BFC78 cmp r0, 0x2 beq @080BFCCC @080BFCB2: - ldr r0, =sub_80BEA24 + 1 + ldr r0, =sub_80BEA24 b @080BFCCE .align 2, 0 .pool @080BFCCC: - ldr r0, =sub_80BF250 + 1 + ldr r0, =sub_80BF250 @080BFCCE: str r0, [r4] @080BFCD0: @@ -361981,7 +361981,7 @@ sub_80BFDF4: ; 80BFDF4 adds r6, r2, 0 lsls r4, 16 lsrs r4, 16 - ldr r0, =sub_80BFE38 + 1 + ldr r0, =sub_80BFE38 movs r1, 0 bl AddTask lsls r0, 24 @@ -362241,7 +362241,7 @@ sub_80BFE38: ; 80BFE38 lsls r0, 3 adds r0, r1 strh r6, [r0, 0xC] - ldr r1, =sub_80C0088 + 1 + ldr r1, =sub_80C0088 str r1, [r0] @080C0074: add sp, 0x4 @@ -362283,9 +362283,9 @@ sub_80C0088: ; 80C0088 lsls r0, 2 adds r3, 0x1C adds r0, r3 - ldr r2, =sub_80C01CC + 1 + ldr r2, =sub_80C01CC str r2, [r0] - ldr r0, =blockset_load_palette_to_gpu + 1 + ldr r0, =blockset_load_palette_to_gpu str r0, [r1] b @080C011E .align 2, 0 @@ -364570,7 +364570,7 @@ sub_80C0F30: ; 80C0F30 thumb_func_start sub_80C1258 sub_80C1258: ; 80C1258 push {lr} - ldr r0, =sub_80C12E0 + 1 + ldr r0, =sub_80C12E0 movs r1, 0 bl AddTask lsls r0, 24 @@ -364864,7 +364864,7 @@ sub_80C12E0: ; 80C12E0 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_80C1570 + 1 + ldr r1, =sub_80C1570 str r1, [r0] movs r1, 0x87 lsls r1, 3 @@ -364931,7 +364931,7 @@ sub_80C1570: ; 80C1570 bl Window_CopyToVram movs r0, 0x3 bl gpu_copy_wram_bg_tilemap_to_vram - ldr r0, =sub_80C15B0 + 1 + ldr r0, =sub_80C15B0 str r0, [r5] pop {r4,r5} pop {r0} @@ -364958,7 +364958,7 @@ sub_80C15B0: ; 80C15B0 adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, =sub_80C1D38 + 1 + ldr r0, =sub_80C1D38 str r0, [r1] b @080C16BC .align 2, 0 @@ -364999,7 +364999,7 @@ sub_80C15B0: ; 80C15B0 movs r0, 0x4 strh r0, [r5, 0xA] @080C1626: - ldr r0, =sub_80C16CC + 1 + ldr r0, =sub_80C16CC str r0, [r5] b @080C16BC .align 2, 0 @@ -365007,7 +365007,7 @@ sub_80C15B0: ; 80C15B0 @080C1630: movs r0, 0x3 bl audio_play - ldr r0, =sub_80C1D38 + 1 + ldr r0, =sub_80C1D38 str r0, [r5] b @080C16BC .align 2, 0 @@ -365097,7 +365097,7 @@ sub_80C16CC: ; 80C16CC bl Window_CopyToVram movs r0, 0x3 bl gpu_copy_wram_bg_tilemap_to_vram - ldr r0, =sub_80C170C + 1 + ldr r0, =sub_80C170C str r0, [r5] pop {r4,r5} pop {r0} @@ -365152,7 +365152,7 @@ sub_80C170C: ; 80C170C adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, =sub_80C1570 + 1 + ldr r0, =sub_80C1570 str r0, [r1] b @080C1994 .align 2, 0 @@ -365223,7 +365223,7 @@ sub_80C170C: ; 80C170C strh r1, [r0] movs r0, 0x3 bl audio_play - ldr r0, =sub_80C1D38 + 1 + ldr r0, =sub_80C1D38 str r0, [r6] b @080C1994 .align 2, 0 @@ -365231,7 +365231,7 @@ sub_80C170C: ; 80C170C @080C183C: ldr r0, =gUnknown_085E875B bl sub_80C2618 - ldr r0, =sub_80C19A4 + 1 + ldr r0, =sub_80C19A4 str r0, [r6] movs r0, 0x70 bl audio_play @@ -365244,7 +365244,7 @@ sub_80C170C: ; 80C170C @080C1860: movs r0, 0x15 bl audio_play - ldr r0, =sub_80C1B64 + 1 + ldr r0, =sub_80C1B64 str r0, [r6] b @080C1994 .align 2, 0 @@ -365455,7 +365455,7 @@ sub_80C19A4: ; 80C19A4 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, =sub_80C1A4C + 1 + ldr r1, =sub_80C1A4C str r1, [r0] add sp, 0x8 pop {r3-r5} @@ -365503,7 +365503,7 @@ sub_80C1A4C: ; 80C1A4C adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =sub_80C1AB8 + 1 + ldr r0, =sub_80C1AB8 str r0, [r1] movs r0, 0 movs r1, 0x2 @@ -365562,7 +365562,7 @@ sub_80C1AB8: ; 80C1AB8 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_80C1D38 + 1 + ldr r1, =sub_80C1D38 str r1, [r0] movs r0, 0x3 bl audio_play @@ -365575,7 +365575,7 @@ sub_80C1AB8: ; 80C1AB8 adds r1, r2 lsls r1, 3 adds r1, r0 - ldr r0, =sub_80C16CC + 1 + ldr r0, =sub_80C16CC str r0, [r1] movs r0, 0x17 bl audio_play @@ -365620,7 +365620,7 @@ sub_80C1B64: ; 80C1B64 bl sub_80C2294 ldrh r0, [r4] bl sub_80C2650 - ldr r0, =sub_80C1BCC + 1 + ldr r0, =sub_80C1BCC str r0, [r6] movs r0, 0 movs r1, 0x2 @@ -365694,7 +365694,7 @@ sub_80C1BCC: ; 80C1BCC ldrh r0, [r5, 0x26] strh r0, [r6] @080C1C50: - ldr r0, =sub_80C16CC + 1 + ldr r0, =sub_80C16CC str r0, [r5] movs r0, 0 movs r1, 0x2 @@ -365824,7 +365824,7 @@ sub_80C1D38: ; 80C1D38 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_80C1D70 + 1 + ldr r1, =sub_80C1D70 str r1, [r0] add sp, 0x4 pop {r4} @@ -366793,7 +366793,7 @@ sub_80C24E0: ; 80C24E0 lsls r0, 3 adds r0, r2 ldr r1, [r0] - ldr r0, =sub_80C1BCC + 1 + ldr r0, =sub_80C1BCC cmp r1, r0 bne @080C2580 movs r1, 0x30 @@ -366903,7 +366903,7 @@ sub_80C2594: ; 80C2594 adds r0, r4 mov r9, r0 add r1, r9 - ldr r0, =sub_80C24E0 + 1 + ldr r0, =sub_80C24E0 mov r8, r0 str r0, [r1] adds r0, r6, 0 @@ -367229,7 +367229,7 @@ sub_80C2760: ; 80C2760 movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - ldr r0, =sub_80C2690 + 1 + ldr r0, =sub_80C2690 bl SetVBlankCallback ldr r1, [r4] b @080C28D8 @@ -368603,7 +368603,7 @@ sub_80C3388: ; 80C3388 thumb_func_start sub_80C3404 sub_80C3404: ; 80C3404 push {lr} - ldr r0, =sub_80C2710 + 1 + ldr r0, =sub_80C2710 bl set_callback2 pop {r0} bx r0 @@ -368616,7 +368616,7 @@ sub_80C3414: ; 80C3414 push {lr} bl clear_tasks bl remove_some_task - ldr r0, =sub_80C2760 + 1 + ldr r0, =sub_80C2760 movs r1, 0 bl AddTask bl sub_80C4EE4 @@ -371027,14 +371027,14 @@ sub_80C4904: ; 80C4904 thumb_func_start sub_80C4918 sub_80C4918: ; 80C4918 push {r4,lr} - ldr r4, =sub_80C4960 + 1 + ldr r4, =sub_80C4960 adds r0, r4, 0 movs r1, 0 bl AddTask lsls r0, 24 lsrs r0, 24 bl _call_via_r4 - ldr r0, =sub_80C26D4 + 1 + ldr r0, =sub_80C26D4 bl SetHBlankCallback pop {r4} pop {r0} @@ -371046,7 +371046,7 @@ sub_80C4918: ; 80C4918 thumb_func_start sub_80C4940 sub_80C4940: ; 80C4940 push {lr} - ldr r0, =sub_80C4960 + 1 + ldr r0, =sub_80C4960 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -371622,7 +371622,7 @@ sub_80C4DB0: ; 80C4DB0 bl gpu_sync_bg_show movs r0, 0 bl SetHBlankCallback - ldr r0, =sub_80C4960 + 1 + ldr r0, =sub_80C4960 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -371647,7 +371647,7 @@ sub_80C4DDC: ; 80C4DDC lsls r2, 3 adds r0, r1, r2 str r5, [r0] - ldr r0, =sub_80C5868 + 1 + ldr r0, =sub_80C5868 cmp r5, r0 bne @080C4E18 ldr r0, =0x0000052c @@ -371688,7 +371688,7 @@ sub_80C4DDC: ; 80C4DDC ldr r2, =0x00000534 adds r0, r2 bl sub_80C3020 - ldr r0, =sub_80C2C80 + 1 + ldr r0, =sub_80C2C80 bl set_callback2 pop {r4,r5} pop {r0} @@ -371733,7 +371733,7 @@ sub_80C4E74: ; 80C4E74 ldr r2, =0x00007caa adds r1, r2 strb r0, [r1] - ldr r0, =sub_80C2C80 + 1 + ldr r0, =sub_80C2C80 bl set_callback2 pop {r4-r6} pop {r0} @@ -372078,7 +372078,7 @@ sub_80C50D0: ; 80C50D0 sub_80C51C4: ; 80C51C4 push {lr} bl sub_80C51F0 - ldr r0, =sub_80C544C + 1 + ldr r0, =sub_80C544C bl set_callback2 pop {r0} bx r0 @@ -372410,10 +372410,10 @@ sub_80C544C: ; 80C544C bl sub_80C5484 cmp r0, 0 beq @080C5464 - ldr r0, =sub_80C5A48 + 1 + ldr r0, =sub_80C5A48 movs r1, 0 bl AddTask - ldr r0, =sub_80C5438 + 1 + ldr r0, =sub_80C5438 bl set_callback2 @080C5464: pop {r0} @@ -372648,7 +372648,7 @@ sub_80C5484: ; 80C5484 movs r0, 0x2 bl gpu_sync_bg_show bl sub_80C62DC - ldr r0, =pokemon_details + 1 + ldr r0, =pokemon_details bl SetVBlankCallback movs r4, 0x1 negs r4, r4 @@ -372881,7 +372881,7 @@ sub_80C5868: ; 80C5868 blt @080C58AC cmp r0, 0x2 bgt @080C58AC - ldr r0, =sub_80C5BD8 + 1 + ldr r0, =sub_80C5BD8 movs r1, 0 bl AddTask lsls r0, 24 @@ -372903,11 +372903,11 @@ sub_80C5868: ; 80C5868 negs r0, r0 ands r0, r1 strb r0, [r2, 0xE] - ldr r0, =sub_80C5A48 + 1 + ldr r0, =sub_80C5A48 movs r1, 0 bl AddTask @080C58C0: - ldr r0, =sub_80C5438 + 1 + ldr r0, =sub_80C5438 bl set_callback2 @080C58C6: pop {r0} @@ -372954,7 +372954,7 @@ sub_80C58D4: ; 80C58D4 @080C5920: bl song_play_for_text @080C5924: - ldr r0, =sub_80C5868 + 1 + ldr r0, =sub_80C5868 bl set_callback2 pop {r4} pop {r0} @@ -372988,7 +372988,7 @@ sub_80C5934: ; 80C5934 beq @080C5970 b @080C599A @080C5962: - ldr r0, =sub_80C5868 + 1 + ldr r0, =sub_80C5868 bl sub_80C6454 b @080C599A .align 2, 0 @@ -373002,13 +373002,13 @@ sub_80C5934: ; 80C5934 ldrh r0, [r2, 0xA] strh r0, [r1, 0x6] bl sub_80C52E4 - ldr r0, =sub_80C58D4 + 1 + ldr r0, =sub_80C58D4 bl sub_8185E24 b @080C599A .align 2, 0 .pool @080C5994: - ldr r0, =sub_80C5868 + 1 + ldr r0, =sub_80C5868 bl sub_80C4DDC @080C599A: pop {r0} @@ -373053,7 +373053,7 @@ sub_80C59A4: ; 80C59A4 strb r0, [r2, 0xE] adds r0, r3, 0 bl remove_task - ldr r0, =sub_80C5934 + 1 + ldr r0, =sub_80C5934 bl set_callback2 b @080C5A1A .align 2, 0 @@ -373074,7 +373074,7 @@ sub_80C59A4: ; 80C59A4 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_80C5BD8 + 1 + ldr r1, =sub_80C5BD8 str r1, [r0] movs r1, 0 strh r1, [r0, 0x8] @@ -373235,7 +373235,7 @@ sub_80C5A48: ; 80C5A48 bne @080C5B5E movs r0, 0x3 bl audio_play - ldr r0, =sub_80C5470 + 1 + ldr r0, =sub_80C5470 bl set_callback2 adds r0, r6, 0 bl remove_task @@ -373248,7 +373248,7 @@ sub_80C5A48: ; 80C5A48 beq @080C5BCA movs r0, 0x3 bl audio_play - ldr r0, =sub_80C5470 + 1 + ldr r0, =sub_80C5470 bl set_callback2 adds r0, r6, 0 bl remove_task @@ -373375,7 +373375,7 @@ sub_80C5BD8: ; 80C5BD8 movs r0, 0x2 bl gpu_sync_bg_show bl sub_80C62DC - ldr r0, =pokemon_details + 1 + ldr r0, =pokemon_details bl SetVBlankCallback movs r5, 0x1 negs r5, r5 @@ -373472,7 +373472,7 @@ sub_80C5BD8: ; 80C5BD8 bne @080C5D64 adds r0, r4, 0 bl remove_task - ldr r0, =sub_80C5934 + 1 + ldr r0, =sub_80C5934 bl set_callback2 b @080C5D82 .align 2, 0 @@ -373490,7 +373490,7 @@ sub_80C5BD8: ; 80C5BD8 mov r0, r8 subs r0, 0x8 adds r0, r5, r0 - ldr r1, =sub_80C5A48 + 1 + ldr r1, =sub_80C5A48 str r1, [r0] @080C5D82: movs r0, 0x2 @@ -374338,10 +374338,10 @@ sub_80C6454: ; 80C6454 str r0, [r5] str r4, [r0] bl clear_tasks - ldr r0, =sub_80C67BC + 1 + ldr r0, =sub_80C67BC movs r1, 0 bl AddTask - ldr r0, =sub_80C5438 + 1 + ldr r0, =sub_80C5438 bl set_callback2 pop {r4,r5} pop {r0} @@ -374521,7 +374521,7 @@ sub_80C64CC: ; 80C64CC movs r0, 0x2 bl gpu_sync_bg_show bl sub_80C6974 - ldr r0, =pokemon_details + 1 + ldr r0, =pokemon_details bl SetVBlankCallback movs r5, 0x1 negs r5, r5 @@ -376444,7 +376444,7 @@ c3_0808C39C: ; 80C7268 thumb_func_start sub_80C7578 sub_80C7578: ; 80C7578 push {lr} - ldr r0, =c3_0808C39C + 1 + ldr r0, =c3_0808C39C movs r1, 0x50 bl AddTask lsls r0, 24 @@ -376471,7 +376471,7 @@ mapldr_0808C6D8: ; 80C75A8 ldr r5, [r0, 0xC] movs r0, 0 bl SetVBlankCallback - ldr r4, =c3_0808C39C + 1 + ldr r4, =c3_0808C39C adds r0, r4, 0 movs r1, 0x50 bl AddTask @@ -376562,9 +376562,9 @@ sub_80C7678: ; 80C7678 ldr r1, =0x02039d00 strb r0, [r1] ldr r1, =0x03005dac - ldr r0, =mapldr_0808C6D8 + 1 + ldr r0, =mapldr_0808C6D8 str r0, [r1] - ldr r0, =c2_exit_to_overworld_2_switch + 1 + ldr r0, =c2_exit_to_overworld_2_switch bl set_callback2 pop {r0} bx r0 @@ -376967,7 +376967,7 @@ sub_80C7958: ; 80C7958 str r2, [sp, 0x28] ldr r0, =gUnknown_082EC6A8 str r0, [sp, 0x2C] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [sp, 0x30] add r0, sp, 0x4 movs r2, 0x18 @@ -377121,7 +377121,7 @@ sub_80C7958: ; 80C7958 @080C7ACC: strh r1, [r2, 0x2E] ldr r1, [r0] - ldr r0, =sub_80C7CF4 + 1 + ldr r0, =sub_80C7CF4 str r0, [r1, 0x1C] @080C7AD4: adds r0, r4, 0x1 @@ -377448,7 +377448,7 @@ sub_80C7D74: ; 80C7D74 str r0, [r4] cmp r0, 0 bne @080C7DA8 - ldr r0, =sub_80C7678 + 1 + ldr r0, =sub_80C7678 bl set_callback2 b @080C7DD4 .align 2, 0 @@ -377463,7 +377463,7 @@ sub_80C7D74: ; 80C7D74 strh r2, [r0] ldr r0, [r4] strb r1, [r0] - ldr r0, =task_box_related_3 + 1 + ldr r0, =task_box_related_3 movs r1, 0x3 bl AddTask ldr r1, [r4] @@ -377471,7 +377471,7 @@ sub_80C7D74: ; 80C7D74 bl get_preferred_box ldr r1, =0x02039d10 strb r0, [r1] - ldr r0, =c2_Box + 1 + ldr r0, =c2_Box bl set_callback2 @080C7DD4: pop {r4,r5} @@ -377492,7 +377492,7 @@ c2_808CE60: ; 80C7DEC str r1, [r4] cmp r1, 0 bne @080C7E18 - ldr r0, =sub_80C7678 + 1 + ldr r0, =sub_80C7678 bl set_callback2 b @080C7E3C .align 2, 0 @@ -377507,12 +377507,12 @@ c2_808CE60: ; 80C7DEC strb r0, [r1, 0x3] ldr r0, [r4] strb r2, [r0] - ldr r0, =task_box_related_3 + 1 + ldr r0, =task_box_related_3 movs r1, 0x3 bl AddTask ldr r1, [r4] strb r0, [r1, 0x4] - ldr r0, =c2_Box + 1 + ldr r0, =c2_Box bl set_callback2 @080C7E3C: pop {r4} @@ -377804,7 +377804,7 @@ task_box_related_3: ; 80C7FA8 cmp r0, 0 bne @080C80DC @080C80D0: - ldr r0, =sub_80C9E50 + 1 + ldr r0, =sub_80C9E50 bl add_to_c3_somehow b @080C81A2 .align 2, 0 @@ -377864,7 +377864,7 @@ task_box_related_3: ; 80C7FA8 movs r1, 0x10 movs r2, 0 bl sub_80A2A20 - ldr r0, =sub_80C81AC + 1 + ldr r0, =sub_80C81AC bl add_to_c3_somehow b @080C8186 .align 2, 0 @@ -377875,10 +377875,10 @@ task_box_related_3: ; 80C7FA8 movs r1, 0x10 movs r2, 0 bl sub_80A2A20 - ldr r0, =box_related_2 + 1 + ldr r0, =box_related_2 bl add_to_c3_somehow @080C8186: - ldr r0, =sub_80C7D28 + 1 + ldr r0, =sub_80C7D28 bl SetVBlankCallback b @080C81A2 .align 2, 0 @@ -377927,7 +377927,7 @@ sub_80C81AC: ; 80C81AC lsls r0, 24 cmp r0, 0 bne @080C81EE - ldr r0, =task_pokemon_box_related + 1 + ldr r0, =task_pokemon_box_related bl add_to_c3_somehow @080C81EE: pop {r4} @@ -377987,7 +377987,7 @@ box_related_2: ; 80C81F8 .align 2, 0 .pool @080C825C: - ldr r0, =task_pokemon_box_related + 1 + ldr r0, =task_pokemon_box_related bl add_to_c3_somehow b @080C82A0 .align 2, 0 @@ -378017,7 +378017,7 @@ box_related_2: ; 80C81F8 lsls r0, 24 cmp r0, 0 bne @080C82A0 - ldr r0, =task_pokemon_box_related + 1 + ldr r0, =task_pokemon_box_related bl add_to_c3_somehow @080C82A0: add sp, 0x4 @@ -378132,7 +378132,7 @@ task_pokemon_box_related: ; 80C82AC .pool @080C83BC: bl sub_80CDC0C - ldr r0, =sub_80C87A8 + 1 + ldr r0, =sub_80C87A8 bl add_to_c3_somehow b @080C879E .align 2, 0 @@ -378165,19 +378165,19 @@ task_pokemon_box_related: ; 80C82AC beq @080C8406 b @080C879E @080C8406: - ldr r0, =sub_80C87E8 + 1 + ldr r0, =sub_80C87E8 bl add_to_c3_somehow b @080C879E .align 2, 0 .pool @080C8414: - ldr r0, =sub_80C9BE8 + 1 + ldr r0, =sub_80C9BE8 bl add_to_c3_somehow b @080C879E .align 2, 0 .pool @080C8420: - ldr r0, =sub_80C9D1C + 1 + ldr r0, =sub_80C9D1C bl add_to_c3_somehow b @080C879E .align 2, 0 @@ -378185,13 +378185,13 @@ task_pokemon_box_related: ; 80C82AC @080C842C: movs r0, 0x5 bl audio_play - ldr r0, =box_related + 1 + ldr r0, =box_related bl add_to_c3_somehow b @080C879E .align 2, 0 .pool @080C8440: - ldr r0, =sub_80C8864 + 1 + ldr r0, =sub_80C8864 bl add_to_c3_somehow b @080C879E .align 2, 0 @@ -378276,7 +378276,7 @@ task_pokemon_box_related: ; 80C82AC @080C84F8: movs r0, 0x5 bl audio_play - ldr r0, =sub_80C8D78 + 1 + ldr r0, =sub_80C8D78 bl add_to_c3_somehow b @080C879E .align 2, 0 @@ -378305,7 +378305,7 @@ task_pokemon_box_related: ; 80C82AC @080C8538: movs r0, 0x5 bl audio_play - ldr r0, =c3_0808DC50 + 1 + ldr r0, =c3_0808DC50 bl add_to_c3_somehow b @080C879E .align 2, 0 @@ -378313,7 +378313,7 @@ task_pokemon_box_related: ; 80C82AC @080C854C: movs r0, 0x5 bl audio_play - ldr r0, =sub_80C8C90 + 1 + ldr r0, =sub_80C8C90 bl add_to_c3_somehow b @080C879E .align 2, 0 @@ -378321,7 +378321,7 @@ task_pokemon_box_related: ; 80C82AC @080C8560: movs r0, 0x5 bl audio_play - ldr r0, =sub_80C8BEC + 1 + ldr r0, =sub_80C8BEC bl add_to_c3_somehow b @080C879E .align 2, 0 @@ -378329,7 +378329,7 @@ task_pokemon_box_related: ; 80C82AC @080C8574: movs r0, 0x5 bl audio_play - ldr r0, =sub_80C9128 + 1 + ldr r0, =sub_80C9128 bl add_to_c3_somehow b @080C879E .align 2, 0 @@ -378337,7 +378337,7 @@ task_pokemon_box_related: ; 80C82AC @080C8588: movs r0, 0x5 bl audio_play - ldr r0, =sub_80C91DC + 1 + ldr r0, =sub_80C91DC bl add_to_c3_somehow b @080C879E .align 2, 0 @@ -378345,7 +378345,7 @@ task_pokemon_box_related: ; 80C82AC @080C859C: movs r0, 0x5 bl audio_play - ldr r0, =sub_80C93B0 + 1 + ldr r0, =sub_80C93B0 bl add_to_c3_somehow b @080C879E .align 2, 0 @@ -378510,7 +378510,7 @@ task_pokemon_box_related: ; 80C82AC cmp r0, 0 beq @080C879E bl sub_80CADC4 - ldr r0, =task_pokemon_box_related + 1 + ldr r0, =task_pokemon_box_related bl add_to_c3_somehow b @080C879E .align 2, 0 @@ -378524,7 +378524,7 @@ task_pokemon_box_related: ; 80C82AC cmp r0, 0 bne @080C879E @080C872C: - ldr r0, =sub_80C8B90 + 1 + ldr r0, =sub_80C8B90 bl add_to_c3_somehow b @080C879E .align 2, 0 @@ -378610,7 +378610,7 @@ sub_80C87A8: ; 80C87A8 lsls r0, 24 cmp r0, 0 bne @080C87DE - ldr r0, =task_pokemon_box_related + 1 + ldr r0, =task_pokemon_box_related bl add_to_c3_somehow @080C87DE: pop {r4} @@ -378672,7 +378672,7 @@ sub_80C87E8: ; 80C87E8 beq @080C8850 bl BoxSetMosaic @080C8850: - ldr r0, =task_pokemon_box_related + 1 + ldr r0, =task_pokemon_box_related bl add_to_c3_somehow @080C8856: pop {r4} @@ -378809,7 +378809,7 @@ sub_80C8864: ; 80C8864 .4byte @080C8B30 @080C898C: bl sub_80CADC4 - ldr r0, =task_pokemon_box_related + 1 + ldr r0, =task_pokemon_box_related bl add_to_c3_somehow b @080C8B82 .align 2, 0 @@ -378822,7 +378822,7 @@ sub_80C8864: ; 80C8864 movs r0, 0x5 bl audio_play bl sub_80CADC4 - ldr r0, =sub_80C8B90 + 1 + ldr r0, =sub_80C8B90 bl add_to_c3_somehow b @080C8B82 .align 2, 0 @@ -378831,7 +378831,7 @@ sub_80C8864: ; 80C8864 movs r0, 0x5 bl audio_play bl sub_80CADC4 - ldr r0, =sub_80C8BEC + 1 + ldr r0, =sub_80C8BEC bl add_to_c3_somehow b @080C8B82 .align 2, 0 @@ -378844,7 +378844,7 @@ sub_80C8864: ; 80C8864 movs r0, 0x5 bl audio_play bl sub_80CADC4 - ldr r0, =c3_0808DC50 + 1 + ldr r0, =c3_0808DC50 bl add_to_c3_somehow b @080C8B82 .align 2, 0 @@ -378853,7 +378853,7 @@ sub_80C8864: ; 80C8864 movs r0, 0x5 bl audio_play bl sub_80CADC4 - ldr r0, =sub_80C8C90 + 1 + ldr r0, =sub_80C8C90 bl add_to_c3_somehow b @080C8B82 .align 2, 0 @@ -378875,7 +378875,7 @@ sub_80C8864: ; 80C8864 movs r0, 0x5 bl audio_play bl sub_80CADC4 - ldr r0, =sub_80C8D78 + 1 + ldr r0, =sub_80C8D78 bl add_to_c3_somehow b @080C8B82 .align 2, 0 @@ -378924,7 +378924,7 @@ sub_80C8864: ; 80C8864 @080C8A98: movs r0, 0x5 bl audio_play - ldr r0, =sub_80C8EB4 + 1 + ldr r0, =sub_80C8EB4 bl add_to_c3_somehow b @080C8B82 .align 2, 0 @@ -378932,7 +378932,7 @@ sub_80C8864: ; 80C8864 @080C8AAC: movs r0, 0x5 bl audio_play - ldr r0, =sub_80C9B28 + 1 + ldr r0, =sub_80C9B28 bl add_to_c3_somehow b @080C8B82 .align 2, 0 @@ -378940,7 +378940,7 @@ sub_80C8864: ; 80C8864 @080C8AC0: movs r0, 0x5 bl audio_play - ldr r0, =sub_80C90A4 + 1 + ldr r0, =sub_80C90A4 bl add_to_c3_somehow b @080C8B82 .align 2, 0 @@ -378948,7 +378948,7 @@ sub_80C8864: ; 80C8864 @080C8AD4: movs r0, 0x5 bl audio_play - ldr r0, =sub_80C9128 + 1 + ldr r0, =sub_80C9128 bl add_to_c3_somehow b @080C8B82 .align 2, 0 @@ -378956,13 +378956,13 @@ sub_80C8864: ; 80C8864 @080C8AE8: movs r0, 0x5 bl audio_play - ldr r0, =sub_80C91DC + 1 + ldr r0, =sub_80C91DC bl add_to_c3_somehow b @080C8B82 .align 2, 0 .pool @080C8AFC: - ldr r0, =sub_80C9298 + 1 + ldr r0, =sub_80C9298 bl add_to_c3_somehow b @080C8B82 .align 2, 0 @@ -378970,7 +378970,7 @@ sub_80C8864: ; 80C8864 @080C8B08: movs r0, 0x5 bl audio_play - ldr r0, =sub_80C93B0 + 1 + ldr r0, =sub_80C93B0 bl add_to_c3_somehow b @080C8B82 .align 2, 0 @@ -378978,13 +378978,13 @@ sub_80C8864: ; 80C8864 @080C8B1C: movs r0, 0x5 bl audio_play - ldr r0, =sub_80C9B88 + 1 + ldr r0, =sub_80C9B88 bl add_to_c3_somehow b @080C8B82 .align 2, 0 .pool @080C8B30: - ldr r0, =sub_80C9498 + 1 + ldr r0, =sub_80C9498 bl add_to_c3_somehow b @080C8B82 .align 2, 0 @@ -379020,7 +379020,7 @@ sub_80C8864: ; 80C8864 cmp r0, 0 beq @080C8B82 bl sub_80CADC4 - ldr r0, =task_pokemon_box_related + 1 + ldr r0, =task_pokemon_box_related bl add_to_c3_somehow @080C8B82: pop {r4} @@ -379060,13 +379060,13 @@ sub_80C8B90: ; 80C8B90 ldrb r0, [r0] cmp r0, 0 beq @080C8BDC - ldr r0, =sub_80C9670 + 1 + ldr r0, =sub_80C9670 bl add_to_c3_somehow b @080C8BE2 .align 2, 0 .pool @080C8BDC: - ldr r0, =task_pokemon_box_related + 1 + ldr r0, =task_pokemon_box_related bl add_to_c3_somehow @080C8BE2: pop {r4} @@ -379106,13 +379106,13 @@ sub_80C8BEC: ; 80C8BEC ldrb r0, [r0] cmp r0, 0 beq @080C8C38 - ldr r0, =sub_80C9670 + 1 + ldr r0, =sub_80C9670 bl add_to_c3_somehow b @080C8C3E .align 2, 0 .pool @080C8C38: - ldr r0, =task_pokemon_box_related + 1 + ldr r0, =task_pokemon_box_related bl add_to_c3_somehow @080C8C3E: pop {r4} @@ -379149,7 +379149,7 @@ c3_0808DC50: ; 80C8C48 cmp r0, 0 bne @080C8C84 bl BoxSetMosaic - ldr r0, =task_pokemon_box_related + 1 + ldr r0, =task_pokemon_box_related bl add_to_c3_somehow @080C8C84: pop {r4} @@ -379216,7 +379216,7 @@ sub_80C8C90: ; 80C8C90 cmp r0, 0 beq @080C8D6E bl sub_80CADC4 - ldr r0, =task_pokemon_box_related + 1 + ldr r0, =task_pokemon_box_related bl add_to_c3_somehow b @080C8D6E .align 2, 0 @@ -379254,7 +379254,7 @@ sub_80C8C90: ; 80C8C90 .align 2, 0 .pool @080C8D68: - ldr r0, =sub_80C87E8 + 1 + ldr r0, =sub_80C87E8 bl add_to_c3_somehow @080C8D6E: pop {r0} @@ -379368,7 +379368,7 @@ sub_80C8D78: ; 80C8D78 bl BoxSetMosaic bl sub_80CAB20 @080C8E7A: - ldr r0, =task_pokemon_box_related + 1 + ldr r0, =task_pokemon_box_related bl add_to_c3_somehow b @080C8EA2 .align 2, 0 @@ -379539,7 +379539,7 @@ sub_80C8EB4: ; 80C8EB4 bl sub_80CAB20 b @080C905C @080C8FF8: - ldr r0, =task_pokemon_box_related + 1 + ldr r0, =task_pokemon_box_related bl add_to_c3_somehow b @080C9096 .align 2, 0 @@ -379613,7 +379613,7 @@ sub_80C8EB4: ; 80C8EB4 cmp r0, 0 beq @080C9096 bl sub_80CADC4 - ldr r0, =task_pokemon_box_related + 1 + ldr r0, =task_pokemon_box_related bl add_to_c3_somehow @080C9096: pop {r0} @@ -379671,7 +379671,7 @@ sub_80C90A4: ; 80C90A4 ldrb r0, [r0] bl sub_80CE9A8 bl sub_80CA230 - ldr r0, =task_pokemon_box_related + 1 + ldr r0, =task_pokemon_box_related bl add_to_c3_somehow @080C9118: pop {r4} @@ -379715,7 +379715,7 @@ sub_80C9128: ; 80C9128 .align 2, 0 .pool @080C9168: - ldr r0, =sub_80C96B8 + 1 + ldr r0, =sub_80C96B8 bl add_to_c3_somehow b @080C91D2 .align 2, 0 @@ -379758,7 +379758,7 @@ sub_80C9128: ; 80C9128 lsls r0, 24 cmp r0, 0 bne @080C91D2 - ldr r0, =task_pokemon_box_related + 1 + ldr r0, =task_pokemon_box_related bl add_to_c3_somehow @080C91D2: pop {r4,r5} @@ -379842,7 +379842,7 @@ sub_80C91DC: ; 80C91DC lsls r0, 24 cmp r0, 0 bne @080C928C - ldr r0, =task_pokemon_box_related + 1 + ldr r0, =task_pokemon_box_related bl add_to_c3_somehow @080C928C: pop {r4} @@ -379953,7 +379953,7 @@ sub_80C9298: ; 80C9298 lsls r0, 24 cmp r0, 0 bne @080C93A2 - ldr r0, =task_pokemon_box_related + 1 + ldr r0, =task_pokemon_box_related bl add_to_c3_somehow b @080C93A2 .align 2, 0 @@ -379966,7 +379966,7 @@ sub_80C9298: ; 80C9298 cmp r0, 0 beq @080C93A2 bl sub_80CADC4 - ldr r0, =task_pokemon_box_related + 1 + ldr r0, =task_pokemon_box_related bl add_to_c3_somehow @080C93A2: pop {r4,r5} @@ -380014,7 +380014,7 @@ sub_80C93B0: ; 80C93B0 .align 2, 0 .pool @080C9404: - ldr r0, =sub_80C96B8 + 1 + ldr r0, =sub_80C96B8 bl add_to_c3_somehow b @080C948C .align 2, 0 @@ -380071,7 +380071,7 @@ sub_80C93B0: ; 80C93B0 lsls r0, 24 cmp r0, 0 bne @080C948C - ldr r0, =task_pokemon_box_related + 1 + ldr r0, =task_pokemon_box_related bl add_to_c3_somehow @080C948C: pop {r4} @@ -380156,7 +380156,7 @@ sub_80C9498: ; 80C9498 lsls r0, 24 cmp r0, 0 bne @080C9544 - ldr r0, =task_pokemon_box_related + 1 + ldr r0, =task_pokemon_box_related bl add_to_c3_somehow @080C9544: pop {r0} @@ -380281,7 +380281,7 @@ sub_80C954C: ; 80C954C movs r0, 0 bl sub_80CFE54 @080C9648: - ldr r0, =task_pokemon_box_related + 1 + ldr r0, =task_pokemon_box_related bl add_to_c3_somehow b @080C9664 .align 2, 0 @@ -380291,7 +380291,7 @@ sub_80C954C: ; 80C954C lsls r0, 24 cmp r0, 0 bne @080C9664 - ldr r0, =task_pokemon_box_related + 1 + ldr r0, =task_pokemon_box_related bl add_to_c3_somehow @080C9664: pop {r4} @@ -380328,7 +380328,7 @@ sub_80C9670: ; 80C9670 cmp r0, 0 bne @080C96AE bl sub_80CAB20 - ldr r0, =task_pokemon_box_related + 1 + ldr r0, =task_pokemon_box_related bl add_to_c3_somehow @080C96AE: pop {r4} @@ -380390,7 +380390,7 @@ sub_80C96B8: ; 80C96B8 lsls r0, 24 cmp r0, 0 bne @080C9720 - ldr r0, =task_pokemon_box_related + 1 + ldr r0, =task_pokemon_box_related bl add_to_c3_somehow @080C9720: pop {r4} @@ -380470,7 +380470,7 @@ box_related: ; 80C972C movs r0, 0x1 bl sub_80CD1A8 bl sub_80CADC4 - ldr r0, =task_pokemon_box_related + 1 + ldr r0, =task_pokemon_box_related bl add_to_c3_somehow b @080C9818 .align 2, 0 @@ -380478,7 +380478,7 @@ box_related: ; 80C972C @080C97DC: movs r0, 0x5 bl audio_play - ldr r0, =sub_80C9AC8 + 1 + ldr r0, =sub_80C9AC8 bl add_to_c3_somehow b @080C9818 .align 2, 0 @@ -380487,7 +380487,7 @@ box_related: ; 80C972C movs r0, 0x5 bl audio_play bl sub_80CADC4 - ldr r0, =sub_80C9824 + 1 + ldr r0, =sub_80C9824 bl add_to_c3_somehow b @080C9818 .align 2, 0 @@ -380496,7 +380496,7 @@ box_related: ; 80C972C movs r0, 0x5 bl audio_play bl sub_80CADC4 - ldr r0, =sub_80C99D8 + 1 + ldr r0, =sub_80C99D8 bl add_to_c3_somehow @080C9818: pop {r4} @@ -380678,7 +380678,7 @@ sub_80C9824: ; 80C9824 movs r0, 0x1 bl sub_80CD1A8 @080C99A0: - ldr r0, =task_pokemon_box_related + 1 + ldr r0, =task_pokemon_box_related bl add_to_c3_somehow b @080C99CC .align 2, 0 @@ -380778,7 +380778,7 @@ sub_80C99D8: ; 80C99D8 @080C9A6C: movs r0, 0x1 bl sub_80CD1A8 - ldr r0, =task_pokemon_box_related + 1 + ldr r0, =task_pokemon_box_related bl add_to_c3_somehow b @080C9AB8 .align 2, 0 @@ -380806,7 +380806,7 @@ sub_80C99D8: ; 80C99D8 adds r0, r2 ldrb r0, [r0] bl sub_80D1D18 - ldr r0, =task_pokemon_box_related + 1 + ldr r0, =task_pokemon_box_related bl add_to_c3_somehow @080C9AB8: add sp, 0x4 @@ -380855,7 +380855,7 @@ sub_80C9AC8: ; 80C9AC8 ldr r1, [r5] movs r0, 0x2 strb r0, [r1, 0x2] - ldr r0, =sub_80C9E50 + 1 + ldr r0, =sub_80C9E50 bl add_to_c3_somehow @080C9B18: add sp, 0x4 @@ -380904,7 +380904,7 @@ sub_80C9B28: ; 80C9B28 strb r1, [r0] ldr r0, [r5] strb r4, [r0, 0x2] - ldr r0, =sub_80C9E50 + 1 + ldr r0, =sub_80C9E50 bl add_to_c3_somehow @080C9B78: add sp, 0x4 @@ -380953,7 +380953,7 @@ sub_80C9B88: ; 80C9B88 ldr r1, [r4] movs r0, 0x3 strb r0, [r1, 0x2] - ldr r0, =sub_80C9E50 + 1 + ldr r0, =sub_80C9E50 bl add_to_c3_somehow @080C9BD6: add sp, 0x4 @@ -381009,7 +381009,7 @@ sub_80C9BE8: ; 80C9BE8 lsls r0, 24 cmp r0, 0 beq @080C9C58 - ldr r0, =sub_80C954C + 1 + ldr r0, =sub_80C954C bl add_to_c3_somehow b @080C9D08 .align 2, 0 @@ -381056,7 +381056,7 @@ sub_80C9BE8: ; 80C9BE8 bne @080C9D08 @080C9CAA: bl sub_80CADC4 - ldr r0, =task_pokemon_box_related + 1 + ldr r0, =task_pokemon_box_related bl add_to_c3_somehow b @080C9D08 .align 2, 0 @@ -381093,7 +381093,7 @@ sub_80C9BE8: ; 80C9BE8 ldr r0, =0x02039d08 ldr r0, [r0] strb r4, [r0, 0x2] - ldr r0, =sub_80C9E50 + 1 + ldr r0, =sub_80C9E50 bl add_to_c3_somehow @080C9D08: pop {r4} @@ -381148,7 +381148,7 @@ sub_80C9D1C: ; 80C9D1C lsls r0, 24 cmp r0, 0 beq @080C9D8C - ldr r0, =sub_80C954C + 1 + ldr r0, =sub_80C954C bl add_to_c3_somehow b @080C9E3C .align 2, 0 @@ -381196,7 +381196,7 @@ sub_80C9D1C: ; 80C9D1C b @080C9E3C @080C9DE0: bl sub_80CADC4 - ldr r0, =task_pokemon_box_related + 1 + ldr r0, =task_pokemon_box_related bl add_to_c3_somehow b @080C9E3C .align 2, 0 @@ -381233,7 +381233,7 @@ sub_80C9D1C: ; 80C9D1C ldr r0, =0x02039d08 ldr r0, [r0] strb r4, [r0, 0x2] - ldr r0, =sub_80C9E50 + 1 + ldr r0, =sub_80C9E50 bl add_to_c3_somehow @080C9E3C: pop {r4} @@ -381283,7 +381283,7 @@ sub_80C9E50: ; 80C9E50 beq @080C9F48 @080C9E9E: bl sub_80C9FC8 - ldr r0, =sub_80C7678 + 1 + ldr r0, =sub_80C7678 bl set_callback2 b @080C9F56 .align 2, 0 @@ -381309,7 +381309,7 @@ sub_80C9E50: ; 80C9E50 ldr r0, =0x02039d14 cmp r4, r0 bne @080C9F04 - ldr r0, =c2_808CE60 + 1 + ldr r0, =c2_808CE60 str r0, [sp] movs r0, 0 adds r1, r4, 0 @@ -381320,7 +381320,7 @@ sub_80C9E50: ; 80C9E50 .align 2, 0 .pool @080C9F04: - ldr r0, =c2_808CE60 + 1 + ldr r0, =c2_808CE60 str r0, [sp] adds r0, r5, 0 adds r1, r4, 0 @@ -381339,7 +381339,7 @@ sub_80C9E50: ; 80C9E50 adds r1, r0, 0 movs r0, 0 str r0, [sp] - ldr r0, =c2_808CE60 + 1 + ldr r0, =c2_808CE60 str r0, [sp, 0x4] movs r0, 0x1 movs r2, 0 @@ -381350,7 +381350,7 @@ sub_80C9E50: ; 80C9E50 .pool @080C9F48: bl sub_80C9FC8 - ldr r2, =c2_808CE60 + 1 + ldr r2, =c2_808CE60 movs r0, 0xB movs r1, 0 bl sub_81AAC90 @@ -381730,7 +381730,7 @@ BoxSetMosaic: ; 80CA260 movs r0, 0x1 strh r0, [r2, 0x30] ldr r2, [r1] - ldr r0, =BoxSetMosaic2 + 1 + ldr r0, =BoxSetMosaic2 str r0, [r2, 0x1C] ldr r0, [r1] ldrh r0, [r0, 0x2E] @@ -381795,7 +381795,7 @@ BoxSetMosaic2: ; 80CA2D0 negs r1, r1 ands r1, r0 strb r1, [r4, 0x1] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r4, 0x1C] @080CA30E: pop {r4} @@ -383339,7 +383339,7 @@ sub_80CAFC4: ; 80CAFC4 ldr r2, =0x00000a6c adds r1, r2 str r0, [r1] - ldr r1, =sub_80CC100 + 1 + ldr r1, =sub_80CC100 str r1, [r0, 0x1C] add sp, 0x8 pop {r4-r6} @@ -383585,7 +383585,7 @@ sub_80CB1F0: ; 80CB1F0 ldr r7, =0x02039d08 ldr r6, =0x00000a88 movs r5, 0x1 - ldr r4, =sub_80CB278 + 1 + ldr r4, =sub_80CB278 @080CB200: ldr r0, [r7] lsls r1, r2, 2 @@ -383638,7 +383638,7 @@ sub_80CB234: ; 80CB234 strh r0, [r1] ldrh r0, [r2, 0x34] strh r0, [r2, 0x20] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r2, 0x1C] @080CB266: pop {r0} @@ -383672,7 +383672,7 @@ sub_80CB278: ; 80CB278 lsrs r0, 16 cmp r0, 0xB6 bls @080CB2A8 - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r2, 0x1C] @080CB2A8: pop {r0} @@ -383816,7 +383816,7 @@ sub_80CB2F8: ; 80CB2F8 ldrh r3, [r3, 0x10] strh r3, [r0, 0x34] ldr r1, [r1] - ldr r0, =sub_80CB234 + 1 + ldr r0, =sub_80CB234 str r0, [r1, 0x1C] mov r0, r9 adds r0, 0x1 @@ -383889,7 +383889,7 @@ sub_80CB2F8: ; 80CB2F8 ldrh r6, [r6, 0x10] strh r6, [r0, 0x34] ldr r1, [r1] - ldr r0, =sub_80CB234 + 1 + ldr r0, =sub_80CB234 str r0, [r1, 0x1C] ldr r1, =0x00000c5c adds r0, r3, r1 @@ -384623,7 +384623,7 @@ sub_80CB9D0: ; 80CB9D0 strh r0, [r2, 0x38] movs r0, 0x8 strh r0, [r2, 0x3A] - ldr r0, =sub_80CBA3C + 1 + ldr r0, =sub_80CBA3C str r0, [r2, 0x1C] pop {r4} pop {r0} @@ -384679,7 +384679,7 @@ sub_80CBA3C: ; 80CBA3C adds r0, 0x10 @080CBA8E: strh r0, [r3, 0x22] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r3, 0x1C] ldr r0, =0x02039d08 ldr r2, [r0] @@ -384937,7 +384937,7 @@ sub_80CBC14: ; 80CBC14 ldr r4, =0x00000a6c adds r0, r4 ldr r1, [r0] - ldr r0, =sub_80CC100 + 1 + ldr r0, =sub_80CC100 str r0, [r1, 0x1C] bl sub_80CAFAC ldr r1, [r5] @@ -385038,7 +385038,7 @@ sub_80CBCAC: ; 80CBCAC ldr r0, =0x00000a6c adds r1, r0 ldr r2, [r1] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r2, 0x1C] movs r0, 0 str r0, [r1] @@ -385085,7 +385085,7 @@ sub_80CBD5C: ; 80CBD5C ldr r2, =0x00000a6c adds r0, r1, r2 ldr r2, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r2, 0x1C] ldr r4, =0x00000c5d adds r1, r4 @@ -385246,12 +385246,12 @@ sub_80CBDC4: ; 80CBDC4 mov r2, r8 adds r0, r1, r2 ldr r2, [r0] - ldr r0, =sub_80CC100 + 1 + ldr r0, =sub_80CC100 str r0, [r2, 0x1C] adds r1, r7 ldr r0, [r1] ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r1, 0x1C] @080CBEF2: movs r0, 0x1 @@ -385798,7 +385798,7 @@ sub_80CC32C: ; 80CC32C adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, =sub_80CC370 + 1 + ldr r0, =sub_80CC370 movs r1, 0x2 bl AddTask lsls r0, 24 @@ -385819,7 +385819,7 @@ sub_80CC32C: ; 80CC32C thumb_func_start sub_80CC35C sub_80CC35C: ; 80CC35C push {lr} - ldr r0, =sub_80CC370 + 1 + ldr r0, =sub_80CC370 bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 @@ -387131,7 +387131,7 @@ sub_80CCCFC: ; 80CCCFC movs r6, 0 strh r6, [r0, 0x32] ldr r0, [r2] - ldr r1, =sub_80CCF30 + 1 + ldr r1, =sub_80CCF30 str r1, [r0, 0x1C] lsls r1, r7, 24 lsrs r1, 24 @@ -387148,7 +387148,7 @@ sub_80CCCFC: ; 80CCCFC movs r1, 0x1 strh r1, [r2, 0x30] ldr r1, [r0] - ldr r0, =sub_80CCF64 + 1 + ldr r0, =sub_80CCF64 str r0, [r1, 0x1C] adds r0, r7, 0x1 lsls r0, 16 @@ -387231,7 +387231,7 @@ sub_80CCF30: ; 80CCF30 ldrsh r1, [r2, r3] cmp r0, r1 bne @080CCF5C - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r2, 0x1C] @080CCF5C: pop {r0} @@ -387755,7 +387755,7 @@ sub_80CD2E8: ; 80CD2E8 strb r0, [r6, 0x5] adds r5, 0x1C adds r4, r5 - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r4] adds r0, r6, 0 b @080CD362 @@ -388854,7 +388854,7 @@ sub_80CDC64: ; 80CDC64 ldr r1, [r0] ldr r2, =0x00000d8c adds r1, r2 - ldr r2, =sub_80CDEB4 + 1 + ldr r2, =sub_80CDEB4 b @080CDC8E .align 2, 0 .pool @@ -388863,7 +388863,7 @@ sub_80CDC64: ; 80CDC64 ldr r1, [r0] ldr r2, =0x00000d8c adds r1, r2 - ldr r2, =sub_80CDEC4 + 1 + ldr r2, =sub_80CDEC4 @080CDC8E: str r2, [r1] ldr r0, [r0] @@ -395479,10 +395479,10 @@ sub_80D1218: ; 80D1218 cmp r0, 0x8 beq @080D124E ldr r1, [r2, 0x1C] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 beq @080D1268 - ldr r0, =sub_80D1AD8 + 1 + ldr r0, =sub_80D1AD8 cmp r1, r0 beq @080D1268 @080D124E: @@ -396006,7 +396006,7 @@ sub_80D1604: ; 80D1604 ldr r1, [r0] strh r4, [r1, 0x2E] ldr r1, [r0] - ldr r0, =sub_80D1A48 + 1 + ldr r0, =sub_80D1A48 b @080D172C .align 2, 0 .pool @@ -396021,7 +396021,7 @@ sub_80D1604: ; 80D1604 movs r1, 0 strh r1, [r2, 0x2E] ldr r1, [r0] - ldr r0, =sub_80D1A74 + 1 + ldr r0, =sub_80D1A74 b @080D172C .align 2, 0 .pool @@ -396040,7 +396040,7 @@ sub_80D1604: ; 80D1604 ldr r1, [r0] strh r3, [r1, 0x3C] ldr r1, [r0] - ldr r0, =sub_80D1B14 + 1 + ldr r0, =sub_80D1B14 b @080D172C .align 2, 0 .pool @@ -396055,7 +396055,7 @@ sub_80D1604: ; 80D1604 movs r1, 0 strh r1, [r2, 0x2E] ldr r2, [r0] - ldr r1, =sub_80D1B94 + 1 + ldr r1, =sub_80D1B94 str r1, [r2, 0x1C] strh r5, [r2, 0x3A] ldr r0, [r0] @@ -396078,7 +396078,7 @@ sub_80D1604: ; 80D1604 ldr r1, [r0] strh r3, [r1, 0x3C] ldr r1, [r0] - ldr r0, =sub_80D1C30 + 1 + ldr r0, =sub_80D1C30 b @080D172C .align 2, 0 .pool @@ -396090,7 +396090,7 @@ sub_80D1604: ; 80D1604 adds r0, r2 adds r0, r1 ldr r1, [r0] - ldr r0, =sub_80D1CCC + 1 + ldr r0, =sub_80D1CCC @080D172C: str r0, [r1, 0x1C] @080D172E: @@ -396497,7 +396497,7 @@ sub_80D1A48: ; 80D1A48 lsrs r0, 24 movs r1, 0 bl sub_80D1740 - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r4, 0x1C] @080D1A68: pop {r4} @@ -396555,7 +396555,7 @@ sub_80D1A74: ; 80D1A74 asrs r0, 16 cmp r0, 0xB ble @080D1AD0 - ldr r0, =sub_80D1AD8 + 1 + ldr r0, =sub_80D1AD8 str r0, [r3, 0x1C] @080D1AD0: pop {r0} @@ -396654,7 +396654,7 @@ sub_80D1B14: ; 80D1B14 lsls r2, 24 lsrs r2, 24 bl sub_80D140C - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r4, 0x1C] @080D1B8A: pop {r4} @@ -396734,7 +396734,7 @@ sub_80D1B94: ; 80D1B94 bl sub_80D140C movs r0, 0 strh r0, [r4, 0x24] - ldr r0, =sub_80D1AD8 + 1 + ldr r0, =sub_80D1AD8 str r0, [r4, 0x1C] @080D1C20: pop {r4} @@ -396813,7 +396813,7 @@ sub_80D1C30: ; 80D1C30 lsls r2, 24 lsrs r2, 24 bl sub_80D140C - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x24] @@ -396841,7 +396841,7 @@ sub_80D1CCC: ; 80D1CCC negs r1, r1 cmp r0, r1 bge @080D1CFC - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r2, 0x1C] adds r0, r2, 0 bl sub_80D13C4 @@ -398860,7 +398860,7 @@ sub_80D2AEC: ; 80D2AEC str r0, [r1] strh r5, [r1, 0xC] strh r6, [r1, 0xA] - ldr r0, =sub_80D2B88 + 1 + ldr r0, =sub_80D2B88 str r0, [r1, 0x10] movs r0, 0x1 b @080D2B76 @@ -398946,7 +398946,7 @@ sub_80D2BC0: ; 80D2BC0 add r0, r12 str r0, [r1, 0x4] strh r5, [r1, 0xC] - ldr r0, =sub_80D2C1C + 1 + ldr r0, =sub_80D2C1C str r0, [r1, 0x10] movs r0, 0x1 b @080D2C16 @@ -399894,7 +399894,7 @@ exec_movement: ; 80D32E8 movs r0, 0x1 b @080D3332 @080D330A: - ldr r0, =sub_80D3660 + 1 + ldr r0, =sub_80D3660 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 @@ -399984,7 +399984,7 @@ sub_80D33AC: ; 80D33AC adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 - ldr r0, =sub_80D3660 + 1 + ldr r0, =sub_80D3660 bl AddTask lsls r0, 24 lsrs r0, 24 @@ -400017,7 +400017,7 @@ sub_80D33AC: ; 80D33AC thumb_func_start sub_80D33F4 sub_80D33F4: ; 80D33F4 push {lr} - ldr r0, =sub_80D3660 + 1 + ldr r0, =sub_80D3660 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -400471,10 +400471,10 @@ sub_80D3718: ; 80D3718 cmp r0, 0x1 bne @080D3754 ldr r1, =0x03005db0 - ldr r0, =hm_add_c3_launch_phase_2 + 1 + ldr r0, =hm_add_c3_launch_phase_2 str r0, [r1] ldr r1, =0x0203ceec - ldr r0, =sub_80D3A9C + 1 + ldr r0, =sub_80D3A9C str r0, [r1] movs r0, 0x1 b @080D3A2C @@ -400777,10 +400777,10 @@ sub_80D3718: ; 80D3718 bne @080D39F8 @080D39BC: ldr r1, =0x03005db0 - ldr r0, =hm_add_c3_launch_phase_2 + 1 + ldr r0, =hm_add_c3_launch_phase_2 str r0, [r1] ldr r1, =0x0203ceec - ldr r0, =hm2_ruin_valley + 1 + ldr r0, =hm2_ruin_valley str r0, [r1] ldr r0, =0x03001108 adds r0, r6, r0 @@ -400816,10 +400816,10 @@ sub_80D3718: ; 80D3718 bne @080D3A2A @080D3A1E: ldr r1, =0x03005db0 - ldr r0, =hm_add_c3_launch_phase_2 + 1 + ldr r0, =hm_add_c3_launch_phase_2 str r0, [r1] ldr r1, =0x0203ceec - ldr r0, =hm2_ruin_valley + 1 + ldr r0, =hm2_ruin_valley str r0, [r1] @080D3A2A: ldr r0, [sp, 0x10] @@ -400863,7 +400863,7 @@ sub_80D3A6C: ; 80D3A6C adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r2, =sub_80D3AEC + 1 + ldr r2, =sub_80D3AEC lsrs r0, r2, 16 strh r0, [r1, 0x18] strh r2, [r1, 0x1A] @@ -400903,7 +400903,7 @@ sub_80D3ABC: ; 80D3ABC adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r2, =sub_80D4354 + 1 + ldr r2, =sub_80D4354 lsrs r0, r2, 16 strh r0, [r1, 0x18] strh r2, [r1, 0x1A] @@ -401716,7 +401716,7 @@ objc_8097BA8: ; 80D4160 strh r1, [r0, 0x2E] strh r2, [r0, 0x30] strh r2, [r0, 0x34] - ldr r1, =objc_8097BBC + 1 + ldr r1, =objc_8097BBC str r1, [r0, 0x1C] bx lr .align 2, 0 @@ -401762,7 +401762,7 @@ objc_8097BBC: ; 80D4174 strh r0, [r4, 0x30] b @080D41C4 @080D41C0: - ldr r0, =sub_80D41D0 + 1 + ldr r0, =sub_80D41D0 str r0, [r4, 0x1C] @080D41C4: pop {r4} @@ -402590,7 +402590,7 @@ sub_80D47E4: ; 80D47E4 lsrs r0, 24 cmp r0, 0x1 beq @080D486C - ldr r4, =sub_80D487C + 1 + ldr r4, =sub_80D487C adds r0, r4, 0 bl is_function_an_active_task lsls r0, 24 @@ -402779,7 +402779,7 @@ sub_80D487C: ; 80D487C thumb_func_start call_203AE8C call_203AE8C: ; 80D4974 push {lr} - ldr r0, =sub_80D487C + 1 + ldr r0, =sub_80D487C bl is_function_an_active_task lsls r0, 24 cmp r0, 0 @@ -403099,7 +403099,7 @@ sub_80D4BE0: ; 80D4BE0 lsls r2, 3 ldr r3, =0x0000021d bl gpu_copy_bg_tile_pattern_data_to_vram - ldr r1, =sub_80D4A78 + 1 + ldr r1, =sub_80D4A78 adds r0, r5, 0 bl CallWindowFunction adds r0, r5, 0 @@ -403231,7 +403231,7 @@ sub_80D4D38: ; 80D4D38 beq @080D4D84 ldr r0, =0x0000fffb strh r0, [r2, 0x26] - ldr r0, =sub_80D4D94 + 1 + ldr r0, =sub_80D4D94 str r0, [r2, 0x1C] adds r0, r3, 0x1 strh r0, [r2, 0x2E] @@ -403270,7 +403270,7 @@ sub_80D4D94: ; 80D4D94 lsrs r1, 24 adds r0, r4, 0 bl obj_anim_image_start - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r4, 0x1C] @080D4DB8: pop {r4} @@ -403303,7 +403303,7 @@ sub_80D4DC4: ; 80D4DC4 adds r0, r4, 0 movs r1, 0x1 bl sub_8008258 - ldr r0, =sub_80D4E0C + 1 + ldr r0, =sub_80D4E0C str r0, [r4, 0x1C] @080D4DF4: pop {r4} @@ -403326,7 +403326,7 @@ sub_80D4E0C: ; 80D4E0C adds r0, r4, 0 movs r1, 0 bl sub_8008258 - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r4, 0x1C] @080D4E28: pop {r4} @@ -403432,7 +403432,7 @@ sub_80D4EB0: ; 80D4EB0 strh r0, [r4, 0x30] adds r0, r4, 0 bl sub_80D4E8C - ldr r0, =sub_80D4F14 + 1 + ldr r0, =sub_80D4F14 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -403822,7 +403822,7 @@ sub_80D51AC: ; 80D51AC strh r1, [r0, 0x10] ldrh r1, [r4, 0x4] strh r1, [r0, 0x12] - ldr r1, =sub_80D5220 + 1 + ldr r1, =sub_80D5220 str r1, [r0] adds r0, r5, 0 bl _call_via_r1 @@ -404036,7 +404036,7 @@ sub_80D52D0: ; 80D52D0 strh r1, [r0, 0x10] ldrh r1, [r2, 0x4] strh r1, [r0, 0x12] - ldr r1, =sub_80D53BC + 1 + ldr r1, =sub_80D53BC str r1, [r0] adds r0, r5, 0 bl _call_via_r1 @@ -404206,7 +404206,7 @@ sub_80D5484: ; 80D5484 ldrsh r0, [r4, r6] lsls r0, 1 strh r0, [r1, 0x14] - ldr r2, =sub_80D5508 + 1 + ldr r2, =sub_80D5508 str r2, [r1] adds r0, r5, 0 bl _call_via_r2 @@ -404413,7 +404413,7 @@ sub_80D5644: ; 80D5644 strh r0, [r1, 0xE] ldrh r0, [r5, 0x8] strh r0, [r1, 0x10] - ldr r2, =sub_80D56A4 + 1 + ldr r2, =sub_80D56A4 str r2, [r1] adds r0, r4, 0 bl _call_via_r2 @@ -404528,7 +404528,7 @@ sub_80D5738: ; 80D5738 ldr r2, =0x03005e00 mov r12, r2 lsls r4, r5, 2 - ldr r2, =sub_80D57B8 + 1 + ldr r2, =sub_80D57B8 mov r8, r2 cmp r1, r0 bge @080D5782 @@ -404690,10 +404690,10 @@ sub_80D5860: ; 80D5860 ldrb r0, [r0] strh r0, [r4, 0x34] strh r2, [r4, 0x36] - ldr r1, =sub_80D58D4 + 1 + ldr r1, =sub_80D58D4 adds r0, r4, 0 bl oamt_set_x3A_32 - ldr r0, =sub_80A6630 + 1 + ldr r0, =sub_80A6630 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -404710,9 +404710,9 @@ sub_80D58D4: ; 80D58D4 ldrh r1, [r0, 0x30] negs r1, r1 strh r1, [r0, 0x30] - ldr r1, =sub_80A6630 + 1 + ldr r1, =sub_80A6630 str r1, [r0, 0x1C] - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 bl oamt_set_x3A_32 pop {r0} bx r0 @@ -404743,10 +404743,10 @@ sub_80D58F8: ; 80D58F8 strh r1, [r4, 0x32] strh r0, [r4, 0x34] strh r2, [r4, 0x36] - ldr r1, =sub_80D5944 + 1 + ldr r1, =sub_80D5944 adds r0, r4, 0 bl oamt_set_x3A_32 - ldr r0, =sub_80A6630 + 1 + ldr r0, =sub_80A6630 str r0, [r4, 0x1C] pop {r4,r5} pop {r0} @@ -404763,9 +404763,9 @@ sub_80D5944: ; 80D5944 ldrh r1, [r0, 0x32] negs r1, r1 strh r1, [r0, 0x32] - ldr r1, =sub_80A6630 + 1 + ldr r1, =sub_80A6630 str r1, [r0, 0x1C] - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 bl oamt_set_x3A_32 pop {r0} bx r0 @@ -404850,7 +404850,7 @@ sub_80D5968: ; 80D5968 lsls r0, r7, 8 orrs r0, r1 strh r0, [r6, 0x3C] - ldr r0, =sub_80D5A24 + 1 + ldr r0, =sub_80D5A24 str r0, [r6, 0x1C] add sp, 0x4 pop {r4-r7} @@ -404993,10 +404993,10 @@ sub_80D5A94: ; 80D5A94 movs r1, 0x4 orrs r0, r1 strb r0, [r2] - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 adds r0, r5, 0 bl oamt_set_x3A_32 - ldr r0, =sub_80A6680 + 1 + ldr r0, =sub_80A6680 str r0, [r5, 0x1C] pop {r4-r6} pop {r0} @@ -405084,18 +405084,18 @@ sub_80D5B48: ; 80D5B48 lsls r0, 16 cmp r0, 0 bne @080D5C04 - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 adds r0, r6, 0 bl oamt_set_x3A_32 b @080D5C0C .align 2, 0 .pool @080D5C04: - ldr r1, =sub_80D5C20 + 1 + ldr r1, =sub_80D5C20 adds r0, r6, 0 bl oamt_set_x3A_32 @080D5C0C: - ldr r0, =sub_80A6680 + 1 + ldr r0, =sub_80A6680 str r0, [r6, 0x1C] pop {r4-r7} pop {r0} @@ -405190,7 +405190,7 @@ sub_80D5C50: ; 80D5C50 ldrh r0, [r5, 0xC] strh r0, [r4, 0x14] strh r7, [r4, 0x16] - ldr r0, =sub_80D5CE4 + 1 + ldr r0, =sub_80D5CE4 str r0, [r4] pop {r4-r7} pop {r0} @@ -405238,7 +405238,7 @@ sub_80D5CE4: ; 80D5CE4 lsls r0, 16 cmp r0, 0 bne @080D5D34 - ldr r0, =sub_80D5D48 + 1 + ldr r0, =sub_80D5D48 str r0, [r5] @080D5D34: pop {r4,r5} @@ -405383,7 +405383,7 @@ sub_80D5DB0: ; 80D5DB0 adds r1, r4, r6 lsls r1, 3 adds r1, r0 - ldr r0, =sub_80D5E6C + 1 + ldr r0, =sub_80D5E6C str r0, [r1] @080D5E58: pop {r4-r6} @@ -405487,7 +405487,7 @@ sub_80D5EB8: ; 80D5EB8 adds r0, r1 movs r1, 0x1 strh r1, [r0, 0x20] - ldr r1, =sub_80D5F3C + 1 + ldr r1, =sub_80D5F3C str r1, [r0] pop {r4-r6} pop {r0} @@ -405682,7 +405682,7 @@ sub_80D6064: ; 80D6064 lsls r1, 1 strh r1, [r0, 0x1C] strh r1, [r0, 0x1E] - ldr r1, =sub_80D60BC + 1 + ldr r1, =sub_80D60BC str r1, [r0] pop {r4-r6} pop {r0} @@ -405864,7 +405864,7 @@ sub_80D6134: ; 80D6134 adds r1, r3, r7 lsls r1, 3 adds r1, r0 - ldr r0, =sub_80D6308 + 1 + ldr r0, =sub_80D6308 str r0, [r1] pop {r3} mov r8, r3 @@ -405969,7 +405969,7 @@ sub_80D622C: ; 80D622C ldrsh r0, [r1, r7] negs r0, r0 strh r0, [r1, 0x10] - ldr r0, =sub_80D6308 + 1 + ldr r0, =sub_80D6308 str r0, [r1] pop {r3} mov r8, r3 @@ -406147,7 +406147,7 @@ sub_80D6388: ; 80D6388 strh r0, [r4, 0xA] ldrh r0, [r1, 0x4] strh r0, [r4, 0xC] - ldr r0, =sub_80D646C + 1 + ldr r0, =sub_80D646C str r0, [r4] pop {r3} mov r8, r3 @@ -409247,16 +409247,16 @@ sub_80D7B24: ; 80D7B24 movs r0, 0x7F ands r0, r1 strb r0, [r2, 0x8] - ldr r0, =vblank_cb_battle + 1 + ldr r0, =vblank_cb_battle bl SetVBlankCallback - ldr r0, =sub_80D7C7C + 1 + ldr r0, =sub_80D7C7C movs r1, 0xA bl AddTask ldr r1, =0x02039f34 ldr r1, [r1] ldr r1, [r1] strb r0, [r1, 0x8] - ldr r0, =sub_80D823C + 1 + ldr r0, =sub_80D823C bl set_callback2 ldr r0, =0x02039f2a ldrb r1, [r0] @@ -409295,7 +409295,7 @@ sub_80D7C7C: ; 80D7C7C lsls r1, 3 adds r1, r0 strh r2, [r1, 0x8] - ldr r0, =sub_80D7CB4 + 1 + ldr r0, =sub_80D7CB4 str r0, [r1] @080D7CA2: pop {r0} @@ -409391,7 +409391,7 @@ sub_80D7CB4: ; 80D7CB4 bne @080D7D62 bl sub_80DBF68 @080D7D62: - ldr r0, =sub_80D7DAC + 1 + ldr r0, =sub_80D7DAC movs r1, 0 bl AddTask ldr r1, =0x03005e00 @@ -409400,7 +409400,7 @@ sub_80D7CB4: ; 80D7CB4 lsls r0, 3 adds r0, r1 strh r4, [r0, 0x8] - ldr r1, =nullsub_41 + 1 + ldr r1, =nullsub_41 str r1, [r0] b @080D7D9E .align 2, 0 @@ -409411,7 +409411,7 @@ sub_80D7CB4: ; 80D7CB4 adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, =sub_80D80C8 + 1 + ldr r0, =sub_80D80C8 str r0, [r1] @080D7D9E: pop {r4-r6} @@ -409426,8 +409426,8 @@ sub_80D7DAC: ; 80D7DAC push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, =sub_80FC998 + 1 - ldr r2, =sub_80D7DC8 + 1 + ldr r1, =sub_80FC998 + ldr r2, =sub_80D7DC8 bl set_task_function_and_args_14_15 pop {r0} bx r0 @@ -409446,7 +409446,7 @@ sub_80D7DC8: ; 80D7DC8 adds r1, r2 movs r0, 0x1 strh r0, [r1, 0x8] - ldr r0, =sub_80D7DE8 + 1 + ldr r0, =sub_80D7DE8 str r0, [r1] bx lr .align 2, 0 @@ -409480,7 +409480,7 @@ sub_80D7DE8: ; 80D7DE8 adds r0, r1 lsls r0, 3 adds r0, r5 - ldr r1, =sub_80D80C8 + 1 + ldr r1, =sub_80D80C8 str r1, [r0] ldr r1, =0x03005d80 ldr r0, =0x030060b8 @@ -409772,7 +409772,7 @@ sub_80D80C8: ; 80D80C8 adds r1, r0 strh r2, [r1, 0x8] strh r2, [r1, 0xA] - ldr r0, =sub_80D8108 + 1 + ldr r0, =sub_80D8108 str r0, [r1] @080D80F8: pop {r0} @@ -409918,7 +409918,7 @@ sub_80D8108: ; 80D8108 adds r0, r2 strh r1, [r0, 0x8] strh r1, [r0, 0xA] - ldr r1, =sub_80D833C + 1 + ldr r1, =sub_80D833C str r1, [r0] @080D822C: add sp, 0x4 @@ -410099,7 +410099,7 @@ sub_80D833C: ; 80D833C cmp r0, 0 bne @080D841A strh r0, [r4, 0x8] - ldr r0, =sub_80D8424 + 1 + ldr r0, =sub_80D8424 str r0, [r4] @080D841A: pop {r4,r5} @@ -410139,7 +410139,7 @@ sub_80D8424: ; 80D8424 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =sub_80D8490 + 1 + ldr r0, =sub_80D8490 b @080D8480 .align 2, 0 .pool @@ -410149,7 +410149,7 @@ sub_80D8424: ; 80D8424 adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, =sub_80D8894 + 1 + ldr r0, =sub_80D8894 @080D8480: str r0, [r1] @080D8482: @@ -410313,7 +410313,7 @@ sub_80D8490: ; 80D8490 add r0, r9 lsls r0, 3 adds r0, r1 - ldr r1, =sub_80D8610 + 1 + ldr r1, =sub_80D8610 str r1, [r0] add sp, 0x24 pop {r3-r5} @@ -410365,7 +410365,7 @@ sub_80D8610: ; 80D8610 adds r1, r7 lsls r1, 3 adds r1, r0 - ldr r0, =sub_80D8894 + 1 + ldr r0, =sub_80D8894 str r0, [r1] b @080D87FA .align 2, 0 @@ -410438,7 +410438,7 @@ sub_80D8610: ; 80D8610 adds r0, r7 lsls r0, 3 adds r0, r1 - ldr r1, =sub_80D8424 + 1 + ldr r1, =sub_80D8424 str r1, [r0] b @080D87FA .align 2, 0 @@ -410639,13 +410639,13 @@ sub_80D8894: ; 80D8894 lsls r1, 2 adds r1, r3 strh r0, [r1, 0x6] - ldr r4, =sub_80FC9F8 + 1 + ldr r4, =sub_80FC9F8 adds r0, r4, 0 movs r1, 0 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, =sub_80D892C + 1 + ldr r2, =sub_80D892C adds r1, r4, 0 bl set_task_function_and_args_14_15 ldr r1, =0x03005e00 @@ -410653,7 +410653,7 @@ sub_80D8894: ; 80D8894 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, =nullsub_41 + 1 + ldr r1, =nullsub_41 str r1, [r0] bl sub_80DBF68 movs r0, 0 @@ -410668,7 +410668,7 @@ sub_80D8894: ; 80D8894 adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, =sub_80D895C + 1 + ldr r0, =sub_80D895C str r0, [r1] @080D891E: pop {r4,r5} @@ -410693,7 +410693,7 @@ sub_80D892C: ; 80D892C adds r0, r1 lsls r0, 3 adds r0, r2 - ldr r1, =sub_80D895C + 1 + ldr r1, =sub_80D895C str r1, [r0] pop {r0} bx r0 @@ -410760,7 +410760,7 @@ sub_80D895C: ; 80D895C movs r1, 0 strh r1, [r0, 0x8] strh r1, [r0, 0xA] - ldr r1, =sub_80D8A04 + 1 + ldr r1, =sub_80D8A04 str r1, [r0] pop {r4-r7} pop {r0} @@ -410798,7 +410798,7 @@ sub_80D8A04: ; 80D8A04 bl sub_80DDBE8 movs r0, 0x1 bl sub_80DE69C - ldr r0, =sub_80D8A50 + 1 + ldr r0, =sub_80D8A50 str r0, [r4] @080D8A42: pop {r4} @@ -410827,7 +410827,7 @@ sub_80D8A50: ; 80D8A50 adds r1, r2 lsls r1, 3 adds r1, r0 - ldr r0, =sub_80D8A88 + 1 + ldr r0, =sub_80D8A88 str r0, [r1] @080D8A76: pop {r0} @@ -410908,7 +410908,7 @@ sub_80D8A88: ; 80D8A88 adds r0, r1 movs r1, 0 strh r1, [r0, 0x8] - ldr r1, =sub_80D8B38 + 1 + ldr r1, =sub_80D8B38 str r1, [r0] @080D8B18: pop {r4-r7} @@ -411065,13 +411065,13 @@ sub_80D8B38: ; 80D8B38 ldrb r0, [r0, 0x11] bl sub_80DD080 @080D8CD4: - ldr r4, =sub_80FCC88 + 1 + ldr r4, =sub_80FCC88 adds r0, r4, 0 movs r1, 0 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, =sub_80DA110 + 1 + ldr r2, =sub_80DA110 adds r1, r4, 0 bl set_task_function_and_args_14_15 bl sub_80DBF68 @@ -411214,7 +411214,7 @@ sub_80D8B38: ; 80D8B38 strh r1, [r3, 0x24] adds r2, 0x1C adds r0, r2 - ldr r1, =sub_80DA134 + 1 + ldr r1, =sub_80DA134 str r1, [r0] ldr r0, =0x03005e00 mov r4, r10 @@ -411254,7 +411254,7 @@ sub_80D8B38: ; 80D8B38 adds r1, 0x1C adds r0, r1 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 beq @080D8EA0 bl @080DA100 @@ -413310,7 +413310,7 @@ sub_80D8B38: ; 80D8B38 lsls r0, 2 adds r1, 0x1C adds r0, r1 - ldr r1, =sub_80DA164 + 1 + ldr r1, =sub_80DA164 str r1, [r0] movs r0, 0xB strh r0, [r2, 0x8] @@ -413433,7 +413433,7 @@ sub_80D8B38: ; 80D8B38 strh r2, [r0, 0x8] strh r2, [r0, 0xA] strh r2, [r0, 0xC] - ldr r1, =sub_80DA198 + 1 + ldr r1, =sub_80DA198 str r1, [r0] b @080DA100 .align 2, 0 @@ -413497,7 +413497,7 @@ sub_80DA134: ; 80DA134 cmp r0, 0x1F bne @080DA15C strh r2, [r1, 0x2E] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r1, 0x1C] @080DA15C: pop {r0} @@ -413522,7 +413522,7 @@ sub_80DA164: ; 80DA164 negs r1, r1 cmp r0, r1 bge @080DA18E - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r2, 0x1C] adds r2, 0x3E ldrb r0, [r2] @@ -413583,13 +413583,13 @@ sub_80DA198: ; 80DA198 bl sub_80DB944 bl sub_80DBA18 @080DA1F4: - ldr r4, =sub_80FCC88 + 1 + ldr r4, =sub_80FCC88 adds r0, r4, 0 movs r1, 0 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, =sub_80DA110 + 1 + ldr r2, =sub_80DA110 adds r1, r4, 0 bl set_task_function_and_args_14_15 bl sub_80DBF68 @@ -413619,7 +413619,7 @@ sub_80DA198: ; 80DA198 @080DA248: movs r0, 0 strh r0, [r5, 0x8] - ldr r0, =sub_80DA25C + 1 + ldr r0, =sub_80DA25C str r0, [r5] @080DA250: pop {r4-r6} @@ -413645,7 +413645,7 @@ sub_80DA25C: ; 80DA25C movs r1, 0 strh r1, [r0, 0x8] strh r1, [r0, 0xA] - ldr r1, =sub_80DA28C + 1 + ldr r1, =sub_80DA28C str r1, [r0] pop {r4} pop {r0} @@ -413722,7 +413722,7 @@ sub_80DA28C: ; 80DA28C movs r0, 0 strh r0, [r4, 0x8] strh r0, [r4, 0xA] - ldr r0, =sub_80DA31C + 1 + ldr r0, =sub_80DA31C str r0, [r4] @080DA312: pop {r4,r5} @@ -413746,7 +413746,7 @@ sub_80DA31C: ; 80DA31C adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =sub_80DA348 + 1 + ldr r0, =sub_80DA348 str r0, [r1] @080DA33A: pop {r4} @@ -413777,7 +413777,7 @@ sub_80DA348: ; 80DA348 strh r0, [r1, 0x8] movs r0, 0x2 strh r0, [r1, 0xA] - ldr r0, =sub_80DA38C + 1 + ldr r0, =sub_80DA38C str r0, [r1] bx lr .align 2, 0 @@ -413809,7 +413809,7 @@ sub_80DA38C: ; 80DA38C lsls r0, 16 cmp r0, 0 bne @080DA3BE - ldr r0, =sub_80DA3CC + 1 + ldr r0, =sub_80DA3CC str r0, [r1] @080DA3BE: pop {r0} @@ -413870,7 +413870,7 @@ sub_80DA3CC: ; 80DA3CC cmp r0, 0 bne @080DA45A strh r0, [r6, 0x8] - ldr r0, =sub_80DA464 + 1 + ldr r0, =sub_80DA464 str r0, [r6] bl sub_80DCD48 @080DA45A: @@ -413901,7 +413901,7 @@ sub_80DA464: ; 80DA464 movs r0, 0 strh r0, [r4, 0x8] bl sub_80DC3AC - ldr r0, =sub_80DA49C + 1 + ldr r0, =sub_80DA49C str r0, [r4] @080DA48E: pop {r4} @@ -413927,7 +413927,7 @@ sub_80DA49C: ; 80DA49C adds r0, r1 movs r1, 0 strh r1, [r0, 0x8] - ldr r1, =sub_80DA4CC + 1 + ldr r1, =sub_80DA4CC str r1, [r0] @080DA4BE: pop {r4} @@ -413949,7 +413949,7 @@ sub_80DA4CC: ; 80DA4CC adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_80DE424 + 1 + ldr r1, =sub_80DE424 str r1, [r0] pop {r4} pop {r0} @@ -413970,7 +413970,7 @@ sub_80DA4F4: ; 80DA4F4 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_80DA51C + 1 + ldr r1, =sub_80DA51C str r1, [r0] pop {r4} pop {r0} @@ -414027,7 +414027,7 @@ sub_80DA51C: ; 80DA51C adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, =sub_80DA5E8 + 1 + ldr r0, =sub_80DA5E8 b @080DA5A0 .align 2, 0 .pool @@ -414038,7 +414038,7 @@ sub_80DA51C: ; 80DA51C adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, =sub_80DA5B4 + 1 + ldr r0, =sub_80DA5B4 @080DA5A0: str r0, [r1] add sp, 0x4 @@ -414067,7 +414067,7 @@ sub_80DA5B4: ; 80DA5B4 adds r1, r2 lsls r1, 3 adds r1, r0 - ldr r0, =sub_80D833C + 1 + ldr r0, =sub_80D833C str r0, [r1] @080DA5D8: pop {r0} @@ -414146,7 +414146,7 @@ sub_80DA5E8: ; 80DA5E8 adds r0, r1 movs r1, 0 strh r1, [r0, 0xC] - ldr r1, =sub_80DA6B4 + 1 + ldr r1, =sub_80DA6B4 str r1, [r0] pop {r4,r5} pop {r0} @@ -414179,7 +414179,7 @@ sub_80DA6B4: ; 80DA6B4 lsls r0, 3 adds r0, r1 strh r4, [r0, 0x8] - ldr r1, =sub_80DA700 + 1 + ldr r1, =sub_80DA700 str r1, [r0] @080DA6EA: pop {r4,r5} @@ -414212,7 +414212,7 @@ sub_80DA700: ; 80DA700 adds r1, r3 lsls r1, 3 adds r1, r0 - ldr r0, =sub_80DA740 + 1 + ldr r0, =sub_80DA740 str r0, [r1] strh r2, [r1, 0x8] @080DA72E: @@ -414248,7 +414248,7 @@ sub_80DA740: ; 80DA740 ands r1, r0 cmp r1, 0 beq @080DA780 - ldr r0, =sub_80DA7A0 + 1 + ldr r0, =sub_80DA7A0 b @080DA792 .align 2, 0 .pool @@ -414260,7 +414260,7 @@ sub_80DA740: ; 80DA740 movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, =sub_80DA830 + 1 + ldr r0, =sub_80DA830 @080DA792: str r0, [r4] @080DA794: @@ -414278,13 +414278,13 @@ sub_80DA7A0: ; 80DA7A0 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r5, =sub_80FCACC + 1 + ldr r5, =sub_80FCACC adds r0, r5, 0 movs r1, 0 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, =sub_80DA7EC + 1 + ldr r2, =sub_80DA7EC adds r1, r5, 0 bl set_task_function_and_args_14_15 ldr r1, =0x03005e00 @@ -414292,7 +414292,7 @@ sub_80DA7A0: ; 80DA7A0 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =nullsub_41 + 1 + ldr r1, =nullsub_41 str r1, [r0] bl sub_80DBF68 movs r0, 0 @@ -414327,7 +414327,7 @@ sub_80DA7EC: ; 80DA7EC adds r0, r1 lsls r0, 3 adds r0, r2 - ldr r1, =sub_80DA830 + 1 + ldr r1, =sub_80DA830 str r1, [r0] add sp, 0x4 pop {r0} @@ -414350,12 +414350,12 @@ sub_80DA830: ; 80DA830 adds r0, r2, 0 bl remove_task ldr r0, =0x03005dac - ldr r1, =sub_80DA874 + 1 + ldr r1, =sub_80DA874 str r1, [r0] bl Window_FreeMemory bl sub_80D7A5C bl sub_805F094 - ldr r0, =c2_exit_to_overworld_2_switch + 1 + ldr r0, =c2_exit_to_overworld_2_switch bl set_callback2 @080DA860: pop {r0} @@ -415468,7 +415468,7 @@ sub_80DB0C4: ; 80DB0C4 strb r1, [r5, 0x5] adds r4, 0x1C adds r2, r4 - ldr r1, =nullsub_12 + 1 + ldr r1, =nullsub_12 str r1, [r2] pop {r4,r5} pop {r1} @@ -415605,7 +415605,7 @@ sub_80DB174: ; 80DB174 mov r0, r8 adds r0, 0x1C adds r0, r6, r0 - ldr r1, =nullsub_12 + 1 + ldr r1, =nullsub_12 str r1, [r0] ldrb r0, [r4, 0x5] lsrs r0, 4 @@ -417461,7 +417461,7 @@ sub_80DC028: ; 80DC028 movs r2, 0x4 orrs r0, r2 strb r0, [r1, 0x2] - ldr r0, =sub_80DC0F4 + 1 + ldr r0, =sub_80DC0F4 movs r1, 0x14 bl AddTask lsls r0, 24 @@ -417874,7 +417874,7 @@ sub_80DC308: ; 80DC308 adds r1, r2, 0 adds r1, 0x1C adds r0, r1 - ldr r1, =sub_80DC408 + 1 + ldr r1, =sub_80DC408 str r1, [r0] pop {r4-r7} pop {r0} @@ -417963,7 +417963,7 @@ sub_80DC408: ; 80DC408 negs r0, r0 ands r0, r2 strb r0, [r1, 0x2] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r3, 0x1C] b @080DC446 .align 2, 0 @@ -418170,7 +418170,7 @@ sub_80DC594: ; 80DC594 thumb_func_start sub_80DC5E8 sub_80DC5E8: ; 80DC5E8 push {r4,lr} - ldr r0, =sub_80DC728 + 1 + ldr r0, =sub_80DC728 movs r1, 0x1E bl AddTask lsls r0, 24 @@ -418244,7 +418244,7 @@ sub_80DC674: ; 80DC674 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, =sub_80DC6A4 + 1 + ldr r0, =sub_80DC6A4 movs r1, 0x1F bl AddTask lsls r0, 24 @@ -418435,7 +418435,7 @@ sub_80DC728: ; 80DC728 thumb_func_start sub_80DC7EC sub_80DC7EC: ; 80DC7EC push {r4,lr} - ldr r0, =sub_80DC8D0 + 1 + ldr r0, =sub_80DC8D0 movs r1, 0x1E bl AddTask ldr r1, =0x02039f34 @@ -418972,10 +418972,10 @@ sub_80DCBE8: ; 80DCBE8 movs r2, 0x1C add r8, r2 add r6, r8 - ldr r0, =sub_80DCC84 + 1 + ldr r0, =sub_80DCC84 str r0, [r6] add r4, r8 - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r4] mov r3, r9 cmp r3, 0 @@ -419032,7 +419032,7 @@ sub_80DCC84: ; 80DCC84 ldrb r0, [r1] orrs r0, r2 strb r0, [r1] - ldr r0, =sub_80DCCD8 + 1 + ldr r0, =sub_80DCCD8 mov r1, r12 str r0, [r1, 0x1C] @080DCCCC: @@ -420365,7 +420365,7 @@ sub_80DD6DC: ; 80DD6DC movs r1, 0x4 orrs r0, r1 strb r0, [r3] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r2, 0x1C] ldr r0, =0x02039f34 ldr r0, [r0] @@ -420591,7 +420591,7 @@ sub_80DD720: ; 80DD720 strb r0, [r1] adds r4, 0x1C adds r2, r4 - ldr r0, =sub_80DD6DC + 1 + ldr r0, =sub_80DD6DC str r0, [r2] ldr r0, =0x02039f34 ldr r0, [r0] @@ -420716,7 +420716,7 @@ sub_80DD9F0: ; 80DD9F0 thumb_func_start sub_80DDA20 sub_80DDA20: ; 80DDA20 push {r4,r5,lr} - ldr r0, =c3_08130B10 + 1 + ldr r0, =c3_08130B10 movs r1, 0xA bl AddTask adds r5, r0, 0 @@ -420834,7 +420834,7 @@ c3_08130B10: ; 80DDA60 thumb_func_start sub_80DDB0C sub_80DDB0C: ; 80DDB0C push {r4,lr} - ldr r0, =sub_80DDB6C + 1 + ldr r0, =sub_80DDB6C movs r1, 0xA bl AddTask ldr r3, =0x02020630 @@ -420964,7 +420964,7 @@ sub_80DDBE8: ; 80DDBE8 .align 2, 0 .pool @080DDC1C: - ldr r0, =task08_080CD1CC + 1 + ldr r0, =task08_080CD1CC movs r1, 0xA bl AddTask ldr r2, [r4] @@ -421066,7 +421066,7 @@ sub_80DDCDC: ; 80DDCDC adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, =sub_80DDD20 + 1 + ldr r0, =sub_80DDD20 movs r1, 0x5 bl AddTask lsls r0, 24 @@ -421223,7 +421223,7 @@ sub_80DDDE4: ; 80DDDE4 thumb_func_start sub_80DDE0C sub_80DDE0C: ; 80DDE0C push {lr} - ldr r0, =sub_80DDE30 + 1 + ldr r0, =sub_80DDE30 movs r1, 0xF bl AddTask ldr r0, =0x02039f34 @@ -421320,7 +421320,7 @@ sub_80DDED0: ; 80DDED0 lsrs r4, 24 lsls r1, 24 lsrs r5, r1, 24 - ldr r0, =sub_80DDF80 + 1 + ldr r0, =sub_80DDF80 movs r1, 0xA bl AddTask lsls r0, 24 @@ -421990,7 +421990,7 @@ sub_80DE424: ; 80DE424 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_80DE464 + 1 + ldr r1, =sub_80DE464 str r1, [r0] pop {r4} pop {r0} @@ -422025,7 +422025,7 @@ sub_80DE464: ; 80DE464 strh r2, [r1, 0x8] strh r2, [r1, 0xA] strh r2, [r1, 0xC] - ldr r0, =sub_80DE4A8 + 1 + ldr r0, =sub_80DE4A8 str r0, [r1] @080DE496: pop {r0} @@ -422112,13 +422112,13 @@ sub_80DE4A8: ; 80DE4A8 beq @080DE552 bl sub_80DBAA0 @080DE552: - ldr r4, =sub_80FCC88 + 1 + ldr r4, =sub_80FCC88 adds r0, r4, 0 movs r1, 0 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, =sub_80DA110 + 1 + ldr r2, =sub_80DA110 adds r1, r4, 0 bl set_task_function_and_args_14_15 bl sub_80DBF68 @@ -422150,7 +422150,7 @@ sub_80DE4A8: ; 80DE4A8 bl sub_80DB2BC movs r0, 0 strh r0, [r5, 0x8] - ldr r0, =sub_80DE5F4 + 1 + ldr r0, =sub_80DE5F4 str r0, [r5] @080DE5B4: pop {r4-r6} @@ -422178,7 +422178,7 @@ sub_80DE5C0: ; 80DE5C0 adds r1, r2 lsls r1, 3 adds r1, r0 - ldr r0, =sub_80DA4F4 + 1 + ldr r0, =sub_80DA4F4 str r0, [r1] @080DE5E4: pop {r0} @@ -422232,7 +422232,7 @@ sub_80DE5F4: ; 80DE5F4 bne @080DE650 strh r2, [r1, 0xA] strh r2, [r1, 0xC] - ldr r0, =sub_80DE65C + 1 + ldr r0, =sub_80DE65C str r0, [r1] b @080DE654 .align 2, 0 @@ -422273,7 +422273,7 @@ sub_80DE65C: ; 80DE65C movs r0, 0x61 movs r1, 0 bl audio_play_and_stuff - ldr r0, =sub_80DE5C0 + 1 + ldr r0, =sub_80DE5C0 str r0, [r4] @080DE690: pop {r4} @@ -422375,7 +422375,7 @@ sub_80DE69C: ; 80DE69C adds r7, 0x1 cmp r7, 0x3 ble @080DE6AE - ldr r0, =sub_80DE794 + 1 + ldr r0, =sub_80DE794 movs r1, 0x5 bl AddTask lsls r0, 24 @@ -422743,7 +422743,7 @@ sub_80DE9DC: ; 80DE9DC thumb_func_start sub_80DEA20 sub_80DEA20: ; 80DEA20 push {lr} - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 bl object_new_hidden_with_callback ldr r1, =0x020241e4 strb r0, [r1, 0x3] @@ -424920,7 +424920,7 @@ CreateShopMainMenu: ; 80DFA78 ldrb r0, [r4, 0xE] movs r1, 0x1 bl Window_CopyToVram - ldr r0, =Task_ShopMenu + 1 + ldr r0, =Task_ShopMenu movs r1, 0x8 bl AddTask lsls r0, 24 @@ -425021,13 +425021,13 @@ HandleShopBuy: ; 80DFBD0 lsls r1, 3 ldr r2, =0x03005e08 adds r4, r1, r2 - ldr r3, =sub_80DFD94 + 1 + ldr r3, =sub_80DFD94 lsrs r0, r3, 16 strh r0, [r4, 0x10] strh r3, [r4, 0x12] subs r2, 0x8 adds r1, r2 - ldr r0, =sub_80DFCA4 + 1 + ldr r0, =sub_80DFCA4 str r0, [r1] movs r0, 0x1 movs r1, 0 @@ -425049,13 +425049,13 @@ HandleShopSell: ; 80DFC0C lsls r1, 3 ldr r2, =0x03005e08 adds r4, r1, r2 - ldr r3, =sub_81AAC00 + 1 + ldr r3, =sub_81AAC00 lsrs r0, r3, 16 strh r0, [r4, 0x10] strh r3, [r4, 0x12] subs r2, 0x8 adds r1, r2 - ldr r0, =sub_80DFCA4 + 1 + ldr r0, =sub_80DFCA4 str r0, [r1] movs r0, 0x1 movs r1, 0 @@ -425071,9 +425071,9 @@ HandleShopSell: ; 80DFC0C sub_80DFC48: ; 80DFC48 push {lr} ldr r0, =0x03005dac - ldr r1, =sub_80DFCE0 + 1 + ldr r1, =sub_80DFCE0 str r1, [r0] - ldr r0, =c2_exit_to_overworld_2_switch + 1 + ldr r0, =c2_exit_to_overworld_2_switch bl set_callback2 pop {r0} bx r0 @@ -425144,7 +425144,7 @@ sub_80DFCA4: ; 80DFCA4 sub_80DFCE0: ; 80DFCE0 push {lr} bl pal_fill_black - ldr r0, =sub_80DFCF8 + 1 + ldr r0, =sub_80DFCF8 movs r1, 0x8 bl AddTask pop {r0} @@ -425169,7 +425169,7 @@ sub_80DFCF8: ; 80DFCF8 cmp r0, 0x2 bne @080DFD2C ldr r1, =gUnknown_085E95C7 - ldr r2, =sub_80DFD44 + 1 + ldr r2, =sub_80DFD44 adds r0, r4, 0 bl sub_81978EC b @080DFD36 @@ -425177,7 +425177,7 @@ sub_80DFCF8: ; 80DFCF8 .pool @080DFD2C: ldr r1, =gUnknown_085E959B - ldr r2, =sub_80DFD44 + 1 + ldr r2, =sub_80DFD44 adds r0, r5, 0 bl sub_81978EC @080DFD36: @@ -425245,7 +425245,7 @@ sub_80DFD94: ; 80DFD94 @080DFDAC: bl CreateShopMoneyBox bl sub_80E01C8 - ldr r0, =sub_80E0AC8 + 1 + ldr r0, =sub_80E0AC8 movs r1, 0x8 bl AddTask adds r4, r0, 0 @@ -425276,9 +425276,9 @@ sub_80DFD94: ; 80DFD94 movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - ldr r0, =sub_80DFD80 + 1 + ldr r0, =sub_80DFD80 bl SetVBlankCallback - ldr r0, =sub_80DFD64 + 1 + ldr r0, =sub_80DFD64 bl set_callback2 b @080DFEF4 .align 2, 0 @@ -426647,7 +426647,7 @@ sub_80E08F0: ; 80E08F0 movs r0, 0x2 str r0, [sp] adds r0, r4, 0 - ldr r1, =nullsub_12 + 1 + ldr r1, =nullsub_12 bl sub_808DD68 lsls r0, 24 lsrs r4, r0, 24 @@ -426919,7 +426919,7 @@ sub_80E0AC8: ; 80E0AC8 cmp r0, 0 bne @080E0BD0 ldr r1, =gUnknown_085E9539 - ldr r2, =sub_80E10A0 + 1 + ldr r2, =sub_80E10A0 b @080E0C28 .align 2, 0 .pool @@ -426957,7 +426957,7 @@ sub_80E0AC8: ; 80E0AC8 @080E0C24: ldr r1, =gUnknown_085E93EF @080E0C26: - ldr r2, =sub_80E0CA4 + 1 + ldr r2, =sub_80E0CA4 @080E0C28: adds r0, r6, 0 bl sub_80E04E8 @@ -426993,7 +426993,7 @@ sub_80E0AC8: ; 80E0AC8 bl ExpandTextCodes @080E0C84: ldr r1, =0x02021fc4 - ldr r2, =sub_80E0EAC + 1 + ldr r2, =sub_80E0EAC adds r0, r6, 0 bl sub_80E04E8 @080E0C8E: @@ -427089,7 +427089,7 @@ sub_80E0CA4: ; 80E0CA4 adds r1, r6 lsls r1, 3 adds r1, r0 - ldr r0, =sub_80E0D88 + 1 + ldr r0, =sub_80E0D88 str r0, [r1] add sp, 0x8 pop {r4-r6} @@ -427184,7 +427184,7 @@ sub_80E0D88: ; 80E0D88 movs r3, 0x6 bl decimal_int_to_string ldr r1, =gUnknown_085E943F - ldr r2, =sub_80E0EAC + 1 + ldr r2, =sub_80E0EAC adds r0, r6, 0 bl sub_80E04E8 b @080E0EA4 @@ -427265,7 +427265,7 @@ sub_80E0EDC: ; 80E0EDC cmp r0, 0x1 bne @080E0F30 ldr r1, =gUnknown_085E94C5 - ldr r2, =sub_80E0F88 + 1 + ldr r2, =sub_80E0F88 adds r0, r5, 0 bl sub_80E04E8 adds r0, r5, 0 @@ -427275,7 +427275,7 @@ sub_80E0EDC: ; 80E0EDC .pool @080E0F30: ldr r1, =gUnknown_085E9558 - ldr r2, =sub_80E10A0 + 1 + ldr r2, =sub_80E10A0 b @080E0F60 .align 2, 0 .pool @@ -427295,7 +427295,7 @@ sub_80E0EDC: ; 80E0EDC @080E0F5C: ldr r1, =gUnknown_085E9510 @080E0F5E: - ldr r2, =sub_80E0F88 + 1 + ldr r2, =sub_80E0F88 @080E0F60: adds r0, r5, 0 bl sub_80E04E8 @@ -427304,7 +427304,7 @@ sub_80E0EDC: ; 80E0EDC .pool @080E0F70: ldr r1, =gUnknown_085E957F - ldr r2, =sub_80E10A0 + 1 + ldr r2, =sub_80E10A0 adds r0, r7, 0 bl sub_80E04E8 @080E0F7A: @@ -427352,7 +427352,7 @@ sub_80E0F88: ; 80E0F88 adds r1, r6 lsls r1, 3 adds r1, r0 - ldr r0, =sub_80E100C + 1 + ldr r0, =sub_80E100C b @080E0FFC .align 2, 0 .pool @@ -427362,7 +427362,7 @@ sub_80E0F88: ; 80E0F88 adds r1, r6 lsls r1, 3 adds r1, r0 - ldr r0, =sub_80E1078 + 1 + ldr r0, =sub_80E1078 @080E0FFC: str r0, [r1] pop {r4-r6} @@ -427406,7 +427406,7 @@ sub_80E100C: ; 80E100C cmp r0, 0x1 bne @080E106C ldr r1, =gUnknown_085E95EA - ldr r2, =sub_80E10A0 + 1 + ldr r2, =sub_80E10A0 adds r0, r4, 0 bl sub_80E04E8 b @080E1072 @@ -427469,7 +427469,7 @@ sub_80E10A0: ; 80E10A0 bl sub_80E01C8 subs r5, 0x8 adds r4, r5 - ldr r0, =sub_80E0AC8 + 1 + ldr r0, =sub_80E0AC8 str r0, [r4] pop {r4-r6} pop {r0} @@ -427538,7 +427538,7 @@ sub_80E1168: ; 80E1168 lsls r4, 24 lsrs r4, 24 ldr r1, =0x03005dac - ldr r0, =sub_80DFCE0 + 1 + ldr r0, =sub_80DFCE0 str r0, [r1] movs r0, 0x1 negs r0, r0 @@ -427552,7 +427552,7 @@ sub_80E1168: ; 80E1168 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_80E11B0 + 1 + ldr r1, =sub_80E11B0 str r1, [r0] add sp, 0x4 pop {r4} @@ -427575,7 +427575,7 @@ sub_80E11B0: ; 80E11B0 bne @080E11D6 bl sub_80E53F4 bl FreeShopItemNames - ldr r0, =c2_exit_to_overworld_2_switch + 1 + ldr r0, =c2_exit_to_overworld_2_switch bl set_callback2 adds r0, r4, 0 bl remove_task @@ -427682,7 +427682,7 @@ sub_80E1284: ; 80E1284 adds r0, r4, 0 bl SetShopItemsForSale bl sub_80E11E4 - ldr r0, =script_env_2_enable_and_set_ctx_running + 1 + ldr r0, =script_env_2_enable_and_set_ctx_running bl SetShopMenuCallback pop {r4} pop {r0} @@ -427699,7 +427699,7 @@ sub_80E12A8: ; 80E12A8 bl CreateShopMainMenu adds r0, r4, 0 bl SetShopItemsForSale - ldr r0, =script_env_2_enable_and_set_ctx_running + 1 + ldr r0, =script_env_2_enable_and_set_ctx_running bl SetShopMenuCallback pop {r4} pop {r0} @@ -427716,7 +427716,7 @@ sub_80E12C8: ; 80E12C8 bl CreateShopMainMenu adds r0, r4, 0 bl SetShopItemsForSale - ldr r0, =script_env_2_enable_and_set_ctx_running + 1 + ldr r0, =script_env_2_enable_and_set_ctx_running bl SetShopMenuCallback pop {r4} pop {r0} @@ -428014,7 +428014,7 @@ sub_80E150C: ; 80E150C adds r5, r0, 0 lsls r5, 16 lsrs r5, 16 - ldr r6, =sub_80E1444 + 1 + ldr r6, =sub_80E1444 adds r0, r6, 0 movs r1, 0 bl AddTask @@ -429025,7 +429025,7 @@ sub_80E1C54: ; 80E1C54 thumb_func_start sub_80E1C94 sub_80E1C94: ; 80E1C94 push {lr} - ldr r0, =c2_810A554 + 1 + ldr r0, =c2_810A554 bl set_callback2 pop {r0} bx r0 @@ -429221,7 +429221,7 @@ sub_80E1E08: ; 80E1E08 lsrs r5, r2, 24 lsls r3, 24 lsrs r4, r3, 24 - ldr r0, =sub_80E2058 + 1 + ldr r0, =sub_80E2058 bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 @@ -429268,7 +429268,7 @@ sub_80E1E58: ; 80E1E58 lsrs r5, r3, 24 lsls r4, 24 lsrs r4, 24 - ldr r0, =sub_80E2058 + 1 + ldr r0, =sub_80E2058 bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 @@ -429449,7 +429449,7 @@ sub_80E1FBC: ; 80E1FBC movs r0, 0x2 strb r0, [r1] movs r2, 0 - ldr r6, =sub_80E2058 + 1 + ldr r6, =sub_80E2058 ldr r5, =gUnknown_0858BB68 movs r3, 0xC @080E1FE6: @@ -429593,7 +429593,7 @@ sub_80E2058: ; 80E2058 thumb_func_start yes_no_box yes_no_box: ; 80E2108 push {r4,lr} - ldr r4, =task_yes_no_maybe + 1 + ldr r4, =task_yes_no_maybe adds r0, r4, 0 bl is_function_an_active_task lsls r0, 24 @@ -429723,7 +429723,7 @@ sub_80E21D0: ; 80E21D0 lsls r4, 24 lsrs r4, 24 mov r10, r4 - ldr r0, =sub_80E2308 + 1 + ldr r0, =sub_80E2308 bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 @@ -429785,7 +429785,7 @@ sub_80E21D0: ; 80E21D0 adds r6, r0, 0 lsls r6, 24 lsrs r6, 24 - ldr r0, =sub_80E2308 + 1 + ldr r0, =sub_80E2308 movs r1, 0x50 bl AddTask lsls r0, 24 @@ -429900,7 +429900,7 @@ sub_80E2308: ; 80E2308 ; bool sp109_CreatePCMenu() sp109_CreatePCMenu: ; 80E236C push {lr} - ldr r0, =sub_80E2058 + 1 + ldr r0, =sub_80E2058 bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 @@ -430112,7 +430112,7 @@ sub_80E2514: ; 80E2514 thumb_func_start sub_80E2548 sub_80E2548: ; 80E2548 push {lr} - ldr r0, =sub_80E2058 + 1 + ldr r0, =sub_80E2058 bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 @@ -430577,7 +430577,7 @@ sub_80E2900: ; 80E2900 lsrs r7, r1, 24 lsls r2, 24 lsrs r6, r2, 24 - ldr r4, =task_picbox + 1 + ldr r4, =task_picbox adds r0, r4, 0 bl get_task_id_by_function lsls r0, 24 @@ -430629,7 +430629,7 @@ sub_80E2900: ; 80E2900 adds r0, r4, 0 adds r0, 0x1C adds r0, r1, r0 - ldr r2, =nullsub_12 + 1 + ldr r2, =nullsub_12 str r2, [r0] adds r1, r4 ldrb r2, [r1, 0x5] @@ -430659,7 +430659,7 @@ sub_80E2900: ; 80E2900 thumb_func_start picbox_close picbox_close: ; 80E29C4 push {lr} - ldr r0, =task_picbox + 1 + ldr r0, =task_picbox bl get_task_id_by_function lsls r0, 24 lsrs r2, r0, 24 @@ -430673,7 +430673,7 @@ picbox_close: ; 80E29C4 ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - ldr r0, =sub_80E29FC + 1 + ldr r0, =sub_80E29FC b @080E29F6 .align 2, 0 .pool @@ -430687,7 +430687,7 @@ picbox_close: ; 80E29C4 thumb_func_start sub_80E29FC sub_80E29FC: ; 80E29FC push {lr} - ldr r0, =task_picbox + 1 + ldr r0, =task_picbox bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -430883,7 +430883,7 @@ sub_80E2A94: ; 80E2A94 thumb_func_start sp106_CreateStartMenu sp106_CreateStartMenu: ; 80E2B7C push {lr} - ldr r0, =sub_80E2058 + 1 + ldr r0, =sub_80E2058 bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 @@ -431035,7 +431035,7 @@ sub_80E2CC4: ; 80E2CC4 ldr r1, =0x02039f90 movs r0, 0x2 strb r0, [r1] - ldr r0, =sub_80E2058 + 1 + ldr r0, =sub_80E2058 movs r1, 0x50 bl AddTask lsls r0, 24 @@ -431176,7 +431176,7 @@ do_choose_name_or_words_screen: ; 80E2D78 bne @080E2DDC bl start_timer1 @080E2DDC: - ldr r0, =c2_choose_name_or_words_screen + 1 + ldr r0, =c2_choose_name_or_words_screen bl set_callback2 @080E2DE2: pop {r3} @@ -431592,10 +431592,10 @@ choose_name_or_words_screen_init_bgs: ; 80E2FE4 thumb_func_start sub_80E3194 sub_80E3194: ; 80E3194 push {lr} - ldr r0, =sub_80E31B0 + 1 + ldr r0, =sub_80E31B0 movs r1, 0x2 bl AddTask - ldr r0, =sub_80E4F58 + 1 + ldr r0, =sub_80E4F58 bl set_callback2 pop {r0} bx r0 @@ -431946,7 +431946,7 @@ sub_80E347C: ; 80E347C adds r0, r1 ldr r0, [r0] bl set_callback2 - ldr r0, =sub_80E31B0 + 1 + ldr r0, =sub_80E31B0 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -432218,7 +432218,7 @@ sub_80E3680: ; 80E3680 thumb_func_start sub_80E373C sub_80E373C: ; 80E373C push {r4,lr} - ldr r4, =sub_80E375C + 1 + ldr r4, =sub_80E375C adds r0, r4, 0 movs r1, 0 bl AddTask @@ -432264,7 +432264,7 @@ sub_80E375C: ; 80E375C thumb_func_start sub_80E3794 sub_80E3794: ; 80E3794 push {lr} - ldr r0, =sub_80E375C + 1 + ldr r0, =sub_80E375C bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -432444,7 +432444,7 @@ sub_80E3870: ; 80E3870 thumb_func_start sub_80E3904 sub_80E3904: ; 80E3904 push {lr} - ldr r0, =sub_80E375C + 1 + ldr r0, =sub_80E375C bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -432459,7 +432459,7 @@ sub_80E3904: ; 80E3904 thumb_func_start sub_80E3920 sub_80E3920: ; 80E3920 push {lr} - ldr r0, =c3_0809E58C + 1 + ldr r0, =c3_0809E58C movs r1, 0x3 bl AddTask lsls r0, 24 @@ -432486,7 +432486,7 @@ sub_80E3948: ; 80E3948 lsrs r7, r1, 24 lsls r2, 24 lsrs r6, r2, 24 - ldr r0, =c3_0809E58C + 1 + ldr r0, =c3_0809E58C bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -433793,7 +433793,7 @@ sub_80E4384: ; 80E4384 bl sub_808BD3C lsls r0, 24 lsrs r0, 24 - ldr r1, =nullsub_12 + 1 + ldr r1, =nullsub_12 movs r2, 0 str r2, [sp] movs r2, 0x38 @@ -433859,7 +433859,7 @@ sub_80E4420: ; 80E4420 ldr r1, =0x00001e34 adds r0, r3, r1 ldrh r0, [r0] - ldr r1, =nullsub_12 + 1 + ldr r1, =nullsub_12 movs r2, 0 str r2, [sp] ldr r2, =0x00001e38 @@ -433893,7 +433893,7 @@ sub_80E4420: ; 80E4420 sub_80E447C: ; 80E447C push {lr} sub sp, 0x4 - ldr r1, =nullsub_12 + 1 + ldr r1, =nullsub_12 movs r0, 0 str r0, [sp] movs r0, 0x13 @@ -434094,7 +434094,7 @@ sub_80E45E0: ; 80E45E0 thumb_func_start sub_80E45F8 sub_80E45F8: ; 80E45F8 push {lr} - ldr r0, =sub_80E465C + 1 + ldr r0, =sub_80E465C movs r1, 0x1 bl AddTask pop {r0} @@ -434106,7 +434106,7 @@ sub_80E45F8: ; 80E45F8 thumb_func_start sub_80E460C sub_80E460C: ; 80E460C push {lr} - ldr r0, =sub_80E465C + 1 + ldr r0, =sub_80E465C bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -434128,7 +434128,7 @@ sub_80E4630: ; 80E4630 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, =sub_80E465C + 1 + ldr r0, =sub_80E465C bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -435294,7 +435294,7 @@ sub_80E4F70: ; 80E4F70 thumb_func_start sub_80E4F84 sub_80E4F84: ; 80E4F84 push {lr} - ldr r0, =sub_80E4F94 + 1 + ldr r0, =sub_80E4F94 bl SetVBlankCallback pop {r0} bx r0 @@ -435410,7 +435410,7 @@ sub_80E5074: ; 80E5074 ldrb r2, [r1, 0x8] movs r0, 0 str r0, [sp] - ldr r0, =sub_8086194 + 1 + ldr r0, =sub_8086194 str r0, [sp, 0x4] movs r0, 0 movs r3, 0 @@ -435431,7 +435431,7 @@ sub_80E509C: ; 80E509C ldrb r2, [r1, 0x8] movs r0, 0 str r0, [sp] - ldr r0, =sub_8086194 + 1 + ldr r0, =sub_8086194 str r0, [sp, 0x4] movs r0, 0x1 movs r3, 0 @@ -435452,7 +435452,7 @@ sub_80E50C4: ; 80E50C4 ldrb r2, [r1, 0x8] movs r0, 0 str r0, [sp] - ldr r0, =sub_8086194 + 1 + ldr r0, =sub_8086194 str r0, [sp, 0x4] movs r0, 0x2 movs r3, 0 @@ -435473,7 +435473,7 @@ sub_80E50EC: ; 80E50EC ldrb r2, [r1, 0x8] movs r0, 0 str r0, [sp] - ldr r0, =sub_8086194 + 1 + ldr r0, =sub_8086194 str r0, [sp, 0x4] movs r0, 0x3 movs r3, 0 @@ -439122,7 +439122,7 @@ sub_80E6BB4: ; 80E6BB4 thumb_func_start sub_80E6BE8 sub_80E6BE8: ; 80E6BE8 push {lr} - ldr r0, =sub_80E715C + 1 + ldr r0, =sub_80E715C bl sub_80B37D4 pop {r0} bx r0 @@ -439686,13 +439686,13 @@ sub_80E715C: ; 80E715C bl sub_80FB00C movs r0, 0x1 strh r0, [r5] - ldr r0, =sub_80E7324 + 1 + ldr r0, =sub_80E7324 movs r1, 0x50 bl AddTask lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x14] - ldr r0, =sub_80E7128 + 1 + ldr r0, =sub_80E7128 movs r1, 0x51 bl AddTask lsls r0, 24 @@ -439723,7 +439723,7 @@ sub_80E715C: ; 80E715C .align 2, 0 .pool @080E724C: - ldr r0, =sub_80E7FF8 + 1 + ldr r0, =sub_80E7FF8 movs r1, 0xA bl AddTask lsls r0, 24 @@ -439797,7 +439797,7 @@ sub_80E715C: ; 80E715C ldrb r0, [r0] cmp r0, 0 beq @080E72F8 - ldr r0, =sub_80AF2B4 + 1 + ldr r0, =sub_80AF2B4 movs r1, 0xA bl AddTask @080E72F8: @@ -440013,7 +440013,7 @@ sub_80E7324: ; 80E7324 lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x12] - ldr r0, =sub_80E756C + 1 + ldr r0, =sub_80E756C str r0, [r5] bl sub_800A064 cmp r0, 0 @@ -440023,7 +440023,7 @@ sub_80E7324: ; 80E7324 adds r1, r5, 0 adds r1, 0xC bl sub_80E7808 - ldr r0, =sub_80E7630 + 1 + ldr r0, =sub_80E7630 movs r1, 0x50 bl AddTask lsls r0, 24 @@ -440051,7 +440051,7 @@ sub_80E7324: ; 80E7324 adds r1, r5, 0 adds r1, 0xC bl sub_80E7808 - ldr r0, =sub_80E7630 + 1 + ldr r0, =sub_80E7630 movs r1, 0x50 bl AddTask lsls r0, 24 @@ -440179,7 +440179,7 @@ sub_80E756C: ; 80E756C ldrb r0, [r1, 0x4] cmp r0, 0 bne @080E7624 - ldr r0, =sub_80E77D4 + 1 + ldr r0, =sub_80E77D4 str r0, [r5] @080E7624: pop {r4,r5} @@ -440382,7 +440382,7 @@ sub_80E77A0: ; 80E77A0 lsls r1, 3 ldr r0, =0x03005e00 adds r1, r0 - ldr r0, =sub_80E776C + 1 + ldr r0, =sub_80E776C str r0, [r1] ldr r0, =0x03001130 ldrb r0, [r0] @@ -440407,7 +440407,7 @@ sub_80E77D4: ; 80E77D4 adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r0, =sub_80E77A0 + 1 + ldr r0, =sub_80E77A0 str r0, [r1] ldr r1, =0x03001130 movs r0, 0x1 @@ -441549,14 +441549,14 @@ sub_80E7FF8: ; 80E7FF8 lsls r0, 24 cmp r0, 0 bne @080E810A - ldr r0, =sub_8153688 + 1 + ldr r0, =sub_8153688 movs r1, 0x5 bl AddTask b @080E80F2 .align 2, 0 .pool @080E80C0: - ldr r0, =sub_8153688 + 1 + ldr r0, =sub_8153688 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 @@ -443586,9 +443586,9 @@ sub_80E8FD0: ; 80E8FD0 bl sub_80E8F9C bl warp_in ldr r0, =0x03005dac - ldr r1, =sub_80AF168 + 1 + ldr r1, =sub_80AF168 str r1, [r0] - ldr r0, =c2_load_new_map + 1 + ldr r0, =c2_load_new_map bl set_callback2 adds r0, r4, 0 bl remove_task @@ -443603,7 +443603,7 @@ sub_80E8FD0: ; 80E8FD0 thumb_func_start sub_80E9068 sub_80E9068: ; 80E9068 push {lr} - ldr r0, =sub_80E8FD0 + 1 + ldr r0, =sub_80E8FD0 movs r1, 0 bl AddTask movs r0, 0x1 @@ -443714,7 +443714,7 @@ sub_80E9108: ; 80E9108 ldrsh r1, [r4, r2] bl cur_mapdata_draw_block_at bl pal_fill_black - ldr r0, =sub_80E90C8 + 1 + ldr r0, =sub_80E90C8 movs r1, 0 bl AddTask add sp, 0x4 @@ -443768,9 +443768,9 @@ sub_80E916C: ; 80E916C bl warp1_set bl warp_in ldr r1, =0x03005dac - ldr r0, =sub_80E9108 + 1 + ldr r0, =sub_80E9108 str r0, [r1] - ldr r0, =c2_load_new_map + 1 + ldr r0, =c2_load_new_map bl set_callback2 adds r0, r6, 0 bl remove_task @@ -443786,7 +443786,7 @@ sub_80E916C: ; 80E916C thumb_func_start sub_80E91F8 sub_80E91F8: ; 80E91F8 push {lr} - ldr r0, =sub_80E916C + 1 + ldr r0, =sub_80E916C movs r1, 0 bl AddTask movs r0, 0x1 @@ -444407,9 +444407,9 @@ sub_80E96A4: ; 80E96A4 bl copy_saved_warp2_bank_and_enter_x_to_warp1 bl warp_in ldr r0, =0x03005dac - ldr r1, =mapldr_default + 1 + ldr r1, =mapldr_default str r1, [r0] - ldr r0, =c2_load_new_map + 1 + ldr r0, =c2_load_new_map bl set_callback2 bl script_env_2_disable adds r0, r5, 0 @@ -444425,7 +444425,7 @@ sub_80E96A4: ; 80E96A4 thumb_func_start sub_80E9728 sub_80E9728: ; 80E9728 push {lr} - ldr r0, =sub_80E96A4 + 1 + ldr r0, =sub_80E96A4 movs r1, 0 bl AddTask movs r0, 0x1 @@ -445076,7 +445076,7 @@ sub_80E9C2C: ; 80E9C2C thumb_func_start sub_80E9C74 sub_80E9C74: ; 80E9C74 push {lr} - ldr r0, =sub_8126AD8 + 1 + ldr r0, =sub_8126AD8 movs r1, 0 bl AddTask pop {r0} @@ -445088,7 +445088,7 @@ sub_80E9C74: ; 80E9C74 thumb_func_start sub_80E9C88 sub_80E9C88: ; 80E9C88 push {lr} - ldr r0, =sub_80E9C9C + 1 + ldr r0, =sub_80E9C9C movs r1, 0 bl AddTask pop {r0} @@ -445138,14 +445138,14 @@ sub_80E9C9C: ; 80E9C9C mov r0, r8 subs r0, 0x8 adds r0, r7, r0 - ldr r1, =sub_80E9E90 + 1 + ldr r1, =sub_80E9E90 str r1, [r0] b @080E9D1A .align 2, 0 .pool @080E9D10: ldr r1, =gUnknown_085EA785 - ldr r2, =task_pc_turn_off + 1 + ldr r2, =task_pc_turn_off adds r0, r6, 0 bl sub_81978EC @080E9D1A: @@ -445452,7 +445452,7 @@ sub_80E9F20: ; 80E9F20 bl schedule_bg_copy_tilemap_to_vram subs r6, 0x8 adds r4, r6 - ldr r0, =sub_80E9FB0 + 1 + ldr r0, =sub_80E9FB0 str r0, [r4] add sp, 0x8 pop {r3} @@ -445535,7 +445535,7 @@ sub_80E9FFC: ; 80E9FFC ldr r1, =gUnknown_085EA737 adds r0, r4, 0 bl ExpandTextCodes - ldr r2, =sub_80EA06C + 1 + ldr r2, =sub_80EA06C adds r0, r5, 0 adds r1, r4, 0 bl sub_81978EC @@ -445617,7 +445617,7 @@ sub_80EA08C: ; 80EA08C negs r0, r0 add r8, r0 add r5, r8 - ldr r0, =sub_80E9E90 + 1 + ldr r0, =sub_80E9E90 str r0, [r5] pop {r3-r5} mov r8, r3 @@ -445636,7 +445636,7 @@ sub_80EA120: ; 80EA120 lsls r0, 24 lsrs r0, 24 ldr r1, =gUnknown_085EA762 - ldr r2, =sub_80EA08C + 1 + ldr r2, =sub_80EA08C bl sub_81978EC pop {r0} bx r0 @@ -445672,7 +445672,7 @@ sub_80EA13C: ; 80EA13C negs r0, r0 add r8, r0 add r4, r8 - ldr r0, =sub_80E9E90 + 1 + ldr r0, =sub_80E9E90 str r0, [r4] pop {r3} mov r8, r3 @@ -445705,7 +445705,7 @@ sub_80EA18C: ; 80EA18C bl schedule_bg_copy_tilemap_to_vram subs r6, 0x8 adds r4, r6 - ldr r0, =sub_80E9E90 + 1 + ldr r0, =sub_80E9E90 str r0, [r4] pop {r4-r6} pop {r0} @@ -456577,7 +456577,7 @@ sub_80EFDDC: ; 80EFDDC movs r2, 0 bl pokemon_getattr str r0, [sp] - ldr r0, =c2_080CC144 + 1 + ldr r0, =c2_080CC144 str r0, [sp, 0x4] movs r0, 0x3 mov r1, r10 @@ -456653,7 +456653,7 @@ sub_80EFEC4: ; 80EFEC4 movs r2, 0 bl pokemon_getattr_encrypted str r0, [sp] - ldr r0, =sub_80EFF48 + 1 + ldr r0, =sub_80EFF48 str r0, [sp, 0x4] movs r0, 0x3 mov r1, r8 @@ -466805,13 +466805,13 @@ sub_80F5B00: ; 80F5B00 movs r0, 0x7F ands r0, r1 strb r0, [r5, 0x8] - ldr r0, =sub_80F5CE4 + 1 + ldr r0, =sub_80F5CE4 movs r1, 0x5 bl AddTask ldr r1, [r4] ldr r1, [r1] strb r0, [r1, 0x2] - ldr r0, =sub_80F5C00 + 1 + ldr r0, =sub_80F5C00 bl set_callback2 ldr r1, =0x02022e28 movs r0, 0xF0 @@ -466820,7 +466820,7 @@ sub_80F5B00: ; 80F5B00 ldr r2, =0x000080a0 adds r0, r2, 0 strh r0, [r1] - ldr r0, =sub_80F68B4 + 1 + ldr r0, =sub_80F68B4 movs r1, 0x14 bl AddTask bl sub_80F7880 @@ -466841,7 +466841,7 @@ sub_80F5B00: ; 80F5B00 lsls r0, 1 bl song_play_for_text @080F5BEC: - ldr r0, =sub_80F5C24 + 1 + ldr r0, =sub_80F5C24 bl SetVBlankCallback add sp, 0x4 pop {r4-r6} @@ -467088,7 +467088,7 @@ sub_80F5CE4: ; 80F5CE4 beq @080F5E78 ldr r0, =gUnknown_085ED207 bl sub_80F707C - ldr r0, =sub_80F5ED8 + 1 + ldr r0, =sub_80F5ED8 b @080F5EB8 .align 2, 0 .pool @@ -467119,7 +467119,7 @@ sub_80F5CE4: ; 80F5CE4 strb r0, [r1] movs r0, 0x2 bl sub_813BADC - ldr r0, =sub_80F5F74 + 1 + ldr r0, =sub_80F5F74 @080F5EB8: str r0, [r4] @080F5EBA: @@ -467139,7 +467139,7 @@ sub_80F5ED8: ; 80F5ED8 ldrb r0, [r0] cmp r0, 0 beq @080F5EFC - ldr r0, =sub_80F5F14 + 1 + ldr r0, =sub_80F5F14 movs r1, 0 bl AddTask ldr r1, =0x03005e00 @@ -467147,7 +467147,7 @@ sub_80F5ED8: ; 80F5ED8 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =nullsub_4 + 1 + ldr r1, =nullsub_4 str r1, [r0] @080F5EFC: pop {r4} @@ -467162,8 +467162,8 @@ sub_80F5F14: ; 80F5F14 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, =sub_80FC998 + 1 - ldr r2, =sub_80F5F30 + 1 + ldr r1, =sub_80FC998 + ldr r2, =sub_80F5F30 bl set_task_function_and_args_14_15 pop {r0} bx r0 @@ -467191,7 +467191,7 @@ sub_80F5F30: ; 80F5F30 adds r0, r1 lsls r0, 3 adds r0, r2 - ldr r1, =sub_80F5F74 + 1 + ldr r1, =sub_80F5F74 str r1, [r0] bl sub_80F7144 @080F5F60: @@ -467217,7 +467217,7 @@ sub_80F5F74: ; 80F5F74 ldrsh r0, [r4, r2] cmp r0, 0 bne @080F5FC4 - ldr r0, =sub_80F68F0 + 1 + ldr r0, =sub_80F68F0 movs r1, 0x14 bl AddTask ldr r0, =gUnknown_085ED1B8 @@ -467297,7 +467297,7 @@ sub_80F5F74: ; 80F5F74 bne @080F6048 movs r0, 0 strh r0, [r4, 0x8] - ldr r0, =sub_80F6058 + 1 + ldr r0, =sub_80F6058 str r0, [r4] @080F6048: pop {r4} @@ -467379,7 +467379,7 @@ sub_80F6058: ; 80F6058 movs r0, 0 strh r0, [r4, 0x8] strh r0, [r4, 0xC] - ldr r0, =sub_80F60F0 + 1 + ldr r0, =sub_80F60F0 str r0, [r4] @080F60E6: pop {r4,r5} @@ -467436,7 +467436,7 @@ sub_80F60F0: ; 80F60F0 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =sub_80F616C + 1 + ldr r0, =sub_80F616C str r0, [r1] @080F615E: pop {r4,r5} @@ -467517,7 +467517,7 @@ sub_80F616C: ; 80F616C bl sub_80F6EF4 movs r0, 0 strh r0, [r4, 0x8] - ldr r0, =sub_80F6204 + 1 + ldr r0, =sub_80F6204 str r0, [r4] @080F61F8: pop {r4,r5} @@ -467603,7 +467603,7 @@ sub_80F6204: ; 80F6204 lsls r6, r5, 2 ldr r7, =0x03005e00 @080F6298: - ldr r0, =sub_80F73DC + 1 + ldr r0, =sub_80F73DC movs r1, 0xA bl AddTask lsls r0, 24 @@ -467647,7 +467647,7 @@ sub_80F6204: ; 80F6204 @080F62F2: movs r0, 0 strh r0, [r4, 0xA] - ldr r0, =sub_80F74BC + 1 + ldr r0, =sub_80F74BC movs r1, 0xA bl AddTask ldrh r0, [r4, 0x8] @@ -467754,7 +467754,7 @@ sub_80F6204: ; 80F6204 adds r0, r2 movs r1, 0 strh r1, [r0, 0x8] - ldr r1, =sub_80F6404 + 1 + ldr r1, =sub_80F6404 str r1, [r0] @080F63F4: add sp, 0x64 @@ -467902,7 +467902,7 @@ sub_80F6404: ; 80F6404 strb r1, [r3, 0x5] adds r5, 0x1C adds r2, r5 - ldr r1, =sub_80F75A8 + 1 + ldr r1, =sub_80F75A8 str r1, [r2] ldr r1, =0x0203a034 ldr r1, [r1] @@ -467912,7 +467912,7 @@ sub_80F6404: ; 80F6404 bl gpu_tile_obj_decompress_and_load ldr r0, =gUnknown_0858D880 bl gpu_pal_obj_decompress_and_apply - ldr r0, =sub_80F7670 + 1 + ldr r0, =sub_80F7670 movs r1, 0xA bl AddTask ldr r0, =0x03005e00 @@ -468003,7 +468003,7 @@ sub_80F6404: ; 80F6404 lsls r0, 2 adds r2, 0x1C adds r0, r2 - ldr r1, =sub_80F7620 + 1 + ldr r1, =sub_80F7620 str r1, [r0] ldrh r0, [r3, 0x8] adds r0, 0x1 @@ -468061,7 +468061,7 @@ sub_80F6404: ; 80F6404 lsls r0, 3 adds r0, r4 strh r1, [r0, 0x8] - ldr r1, =sub_80F66B4 + 1 + ldr r1, =sub_80F66B4 str r1, [r0] @080F669C: pop {r3-r5} @@ -468114,7 +468114,7 @@ sub_80F66B4: ; 80F66B4 adds r0, r1 movs r1, 0 strh r1, [r0, 0x1C] - ldr r1, =sub_80F671C + 1 + ldr r1, =sub_80F671C str r1, [r0] @080F6702: pop {r4-r7} @@ -468147,7 +468147,7 @@ sub_80F671C: ; 80F671C ldr r0, =gUnknown_085ED207 bl sub_80F707C bl sub_800AC34 - ldr r0, =sub_80F677C + 1 + ldr r0, =sub_80F677C str r0, [r4] b @080F676E .align 2, 0 @@ -468158,7 +468158,7 @@ sub_80F671C: ; 80F671C adds r1, r2 lsls r1, 3 adds r1, r0 - ldr r0, =task_repel + 1 + ldr r0, =task_repel str r0, [r1] @080F676E: pop {r4} @@ -468191,7 +468191,7 @@ sub_80F677C: ; 80F677C adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =task_repel + 1 + ldr r0, =task_repel str r0, [r1] @080F67AC: pop {r4} @@ -468232,7 +468232,7 @@ task_repel: ; 80F67C4 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_80F6820 + 1 + ldr r1, =sub_80F6820 str r1, [r0] add sp, 0x4 pop {r4} @@ -468296,7 +468296,7 @@ sub_80F6820: ; 80F6820 adds r0, r5, 0 bl remove_task bl Window_FreeMemory - ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 + ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music bl set_callback2 bl sub_80F7E64 @080F68A8: @@ -469064,7 +469064,7 @@ sub_80F6E9C: ; 80F6E9C strh r2, [r4, 0x38] strh r3, [r4, 0x3A] strh r6, [r4, 0x3C] - ldr r0, =sub_80F6F68 + 1 + ldr r0, =sub_80F6F68 str r0, [r4, 0x1C] mov r0, r8 ldr r1, [r0] @@ -469104,7 +469104,7 @@ sub_80F6EF4: ; 80F6EF4 strh r3, [r1, 0x24] strh r0, [r1, 0x3A] strh r3, [r1, 0x3C] - ldr r0, =sub_80F7014 + 1 + ldr r0, =sub_80F7014 str r0, [r1, 0x1C] ldr r1, [r4] movs r0, 0x3 @@ -469127,7 +469127,7 @@ sub_80F6F40: ; 80F6F40 strh r1, [r0, 0x22] strh r2, [r0, 0x26] strh r2, [r0, 0x24] - ldr r1, =nullsub_12 + 1 + ldr r1, =nullsub_12 str r1, [r0, 0x1C] ldr r0, =0x0203a034 ldr r0, [r0] @@ -469190,7 +469190,7 @@ sub_80F6F68: ; 80F6F68 ldrsh r0, [r3, r2] cmp r1, r0 bne @080F6FCC - ldr r0, =sub_80F6FDC + 1 + ldr r0, =sub_80F6FDC str r0, [r3, 0x1C] @080F6FCC: pop {r4-r7} @@ -469869,7 +469869,7 @@ sub_80F74BC: ; 80F74BC strh r4, [r0, 0x1C] movs r1, 0x1 strh r1, [r0, 0x20] - ldr r1, =sub_80F753C + 1 + ldr r1, =sub_80F753C str r1, [r0] ldr r0, [r6] ldr r0, [r0] @@ -469984,7 +469984,7 @@ sub_80F75A8: ; 80F75A8 ldrsh r0, [r4, r2] cmp r0, 0x78 bne @080F7610 - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x30] @@ -470024,7 +470024,7 @@ sub_80F7620: ; 80F7620 negs r1, r1 cmp r0, r1 bge @080F7664 - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r3, 0x1C] adds r2, r3, 0 adds r2, 0x3E @@ -470227,7 +470227,7 @@ sub_80F77E0: ; 80F77E0 lsrs r4, 24 lsls r5, 24 lsrs r5, 24 - ldr r0, =sub_80F7824 + 1 + ldr r0, =sub_80F7824 movs r1, 0x8 bl AddTask lsls r0, 24 @@ -470603,7 +470603,7 @@ sub_80F7A80: ; 80F7A80 str r0, [sp, 0x4] ldr r1, =0x000060b3 bl bg_fill_tilemap_rect - ldr r0, =sub_80F7CA8 + 1 + ldr r0, =sub_80F7CA8 movs r1, 0xA bl AddTask lsls r0, 24 @@ -470698,7 +470698,7 @@ sub_80F7A80: ; 80F7A80 str r7, [sp, 0x4] movs r0, 0x1 bl bg_fill_tilemap_rect - ldr r0, =sub_80F7CA8 + 1 + ldr r0, =sub_80F7CA8 movs r1, 0xA bl AddTask lsls r0, 24 @@ -471703,7 +471703,7 @@ sub_80F8390: ; 80F8390 thumb_func_start sub_80F83D0 sub_80F83D0: ; 80F83D0 push {lr} - ldr r0, =sub_80D7B24 + 1 + ldr r0, =sub_80D7B24 bl set_callback2 pop {r0} bx r0 @@ -471724,7 +471724,7 @@ sub_80F83E0: ; 80F83E0 bne @080F83FE adds r0, r2, 0 bl remove_task - ldr r0, =sub_80F83D0 + 1 + ldr r0, =sub_80F83D0 bl set_callback2 @080F83FE: pop {r0} @@ -471738,7 +471738,7 @@ sub_80F840C: ; 80F840C push {lr} sub sp, 0x4 bl script_env_2_enable - ldr r0, =sub_80F83E0 + 1 + ldr r0, =sub_80F83E0 movs r1, 0xA bl AddTask movs r0, 0x1 @@ -471783,7 +471783,7 @@ sub_80F8458: ; 80F8458 bne @080F8476 adds r0, r2, 0 bl remove_task - ldr r0, =sub_80F5B00 + 1 + ldr r0, =sub_80F5B00 bl set_callback2 @080F8476: pop {r0} @@ -471797,7 +471797,7 @@ sub_80F8484: ; 80F8484 push {lr} sub sp, 0x4 bl script_env_2_enable - ldr r0, =sub_80F8458 + 1 + ldr r0, =sub_80F8458 movs r1, 0xA bl AddTask movs r0, 0x1 @@ -471832,14 +471832,14 @@ sub_80F84C4: ; 80F84C4 lsls r5, 24 lsrs r5, 24 bl script_env_2_enable - ldr r6, =sub_80FC580 + 1 + ldr r6, =sub_80FC580 adds r0, r6, 0 movs r1, 0 bl AddTask adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r2, =sub_80F8508 + 1 + ldr r2, =sub_80F8508 adds r0, r4, 0 adds r1, r6, 0 bl set_task_function_and_args_14_15 @@ -471870,8 +471870,8 @@ sub_80F8508: ; 80F8508 ldr r0, =0x02039f24 ldrb r0, [r0] bl sub_80DA8C8 - ldr r1, =sub_80FC6BC + 1 - ldr r2, =sub_80F8568 + 1 + ldr r1, =sub_80FC6BC + ldr r2, =sub_80F8568 adds r0, r4, 0 bl set_task_function_and_args_14_15 b @080F8556 @@ -471886,7 +471886,7 @@ sub_80F8508: ; 80F8508 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81D9DE4 + 1 + ldr r1, =sub_81D9DE4 str r1, [r0] @080F8556: pop {r4} @@ -471901,8 +471901,8 @@ sub_80F8568: ; 80F8568 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, =sub_80FC804 + 1 - ldr r2, =sub_80F8584 + 1 + ldr r1, =sub_80FC804 + ldr r2, =sub_80F8584 bl set_task_function_and_args_14_15 pop {r0} bx r0 @@ -471915,8 +471915,8 @@ sub_80F8584: ; 80F8584 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, =sub_80FCE48 + 1 - ldr r2, =sub_80F85A0 + 1 + ldr r1, =sub_80FCE48 + ldr r2, =sub_80F85A0 bl set_task_function_and_args_14_15 pop {r0} bx r0 @@ -471929,8 +471929,8 @@ sub_80F85A0: ; 80F85A0 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, =sub_80FC894 + 1 - ldr r2, =sub_80F85BC + 1 + ldr r1, =sub_80FC894 + ldr r2, =sub_80F85BC bl set_task_function_and_args_14_15 pop {r0} bx r0 @@ -472044,8 +472044,8 @@ sub_80F85BC: ; 80F85BC ldr r0, =0x02039f2c ldrb r0, [r0] bl sub_80DB09C - ldr r1, =sub_80FCF40 + 1 - ldr r2, =sub_80F86B8 + 1 + ldr r1, =sub_80FCF40 + ldr r2, =sub_80F86B8 adds r0, r6, 0 bl set_task_function_and_args_14_15 add sp, 0x8 @@ -472067,8 +472067,8 @@ sub_80F86B8: ; 80F86B8 lsrs r4, 24 movs r0, 0 bl sub_80DCE58 - ldr r1, =sub_80FCFD0 + 1 - ldr r2, =sub_80F8714 + 1 + ldr r1, =sub_80FCFD0 + ldr r2, =sub_80F8714 adds r0, r4, 0 bl set_task_function_and_args_14_15 pop {r4} @@ -472129,7 +472129,7 @@ sub_80F8714: ; 80F8714 adds r1, r6 lsls r1, 3 adds r1, r0 - ldr r0, =sub_80F878C + 1 + ldr r0, =sub_80F878C str r0, [r1] b @080F877E .align 2, 0 @@ -472178,7 +472178,7 @@ sub_80F878C: ; 80F878C adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_80F87B4 + 1 + ldr r1, =sub_80F87B4 str r1, [r0] pop {r4} pop {r0} @@ -472604,7 +472604,7 @@ sub_80F8970: ; 80F8970 thumb_func_start sub_80F8ACC sub_80F8ACC: ; 80F8ACC push {lr} - ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 + ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music bl set_callback2 pop {r0} bx r0 @@ -472615,10 +472615,10 @@ sub_80F8ACC: ; 80F8ACC thumb_func_start sub_80F8ADC sub_80F8ADC: ; 80F8ADC push {lr} - ldr r0, =sub_812FDEC + 1 + ldr r0, =sub_812FDEC bl set_callback2 ldr r1, =0x030022c0 - ldr r0, =sub_80F8ACC + 1 + ldr r0, =sub_80F8ACC str r0, [r1, 0x8] pop {r0} bx r0 @@ -472884,7 +472884,7 @@ sub_80F8D28: ; 80F8D28 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r7, =sub_80F8EE8 + 1 + ldr r7, =sub_80F8EE8 adds r0, r7, 0 bl get_task_id_by_function lsls r0, 24 @@ -473031,7 +473031,7 @@ sub_80F8D28: ; 80F8D28 adds r0, r3, 0 adds r0, 0x1C adds r0, r1, r0 - ldr r2, =nullsub_12 + 1 + ldr r2, =nullsub_12 str r2, [r0] adds r1, r3 ldrb r2, [r1, 0x5] @@ -473054,7 +473054,7 @@ sub_80F8D28: ; 80F8D28 thumb_func_start sub_80F8EB8 sub_80F8EB8: ; 80F8EB8 push {lr} - ldr r0, =sub_80F8EE8 + 1 + ldr r0, =sub_80F8EE8 bl get_task_id_by_function lsls r0, 24 lsrs r2, r0, 24 @@ -473267,7 +473267,7 @@ sub_80F905C: ; 80F905C .align 2, 0 .pool @080F9074: - ldr r0, =sub_80F9088 + 1 + ldr r0, =sub_80F9088 movs r1, 0x5 bl AddTask movs r0, 0x1 @@ -473779,7 +473779,7 @@ sub_80F9400: ; 80F9400 sub_80F9438: ; 80F9438 push {lr} ldr r0, =0x030022c0 - ldr r1, =sub_80F9460 + 1 + ldr r1, =sub_80F9460 str r1, [r0, 0x8] ldr r0, =0x000040cf movs r1, 0x9 @@ -473809,7 +473809,7 @@ sub_80F9460: ; 80F9460 movs r0, 0x1 strh r0, [r1] @080F947E: - ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 + ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music bl set_callback2 pop {r0} bx r0 @@ -473821,7 +473821,7 @@ sub_80F9460: ; 80F9460 sub_80F9490: ; 80F9490 push {lr} ldr r1, =0x030022c0 - ldr r0, =sub_80F94B8 + 1 + ldr r0, =sub_80F94B8 str r0, [r1, 0x8] ldr r0, =0x020375e0 ldrb r0, [r0] @@ -473852,7 +473852,7 @@ sub_80F94B8: ; 80F94B8 movs r0, 0x1 strh r0, [r1] @080F94D6: - ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 + ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music bl set_callback2 pop {r0} bx r0 @@ -474162,7 +474162,7 @@ sub_80F9654: ; 80F9654 thumb_func_start sub_80F972C sub_80F972C: ; 80F972C push {lr} - ldr r0, =sub_80F9654 + 1 + ldr r0, =sub_80F9654 movs r1, 0x50 bl AddTask bl script_env_2_set_ctx_paused @@ -474751,7 +474751,7 @@ sub_80F9BCC: ; 80F9BCC lsrs r5, 16 lsls r3, 24 lsrs r3, 24 - ldr r0, =sub_80F9C90 + 1 + ldr r0, =sub_80F9C90 adds r1, r4, 0 adds r2, r5, 0 bl sub_80F9C44 @@ -474774,7 +474774,7 @@ sub_80F9BF4: ; 80F9BF4 lsrs r5, 16 lsls r3, 24 lsrs r3, 24 - ldr r0, =sub_80F9DFC + 1 + ldr r0, =sub_80F9DFC adds r1, r4, 0 adds r2, r5, 0 bl sub_80F9C44 @@ -474788,7 +474788,7 @@ sub_80F9BF4: ; 80F9BF4 thumb_func_start sub_80F9C1C sub_80F9C1C: ; 80F9C1C push {lr} - ldr r0, =sub_80F9C90 + 1 + ldr r0, =sub_80F9C90 bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 @@ -474801,7 +474801,7 @@ sub_80F9C1C: ; 80F9C1C thumb_func_start sub_80F9C30 sub_80F9C30: ; 80F9C30 push {lr} - ldr r0, =sub_80F9DFC + 1 + ldr r0, =sub_80F9DFC bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 @@ -475338,10 +475338,10 @@ sub_80FA004: ; 80FA004 bne @080FA070 bl sub_80F9F5C ldr r1, =0x03005db0 - ldr r0, =hm_add_c3_launch_phase_2 + 1 + ldr r0, =hm_add_c3_launch_phase_2 str r0, [r1] ldr r1, =0x0203ceec - ldr r0, =sub_80FA0DC + 1 + ldr r0, =sub_80FA0DC b @080FA0C0 .align 2, 0 .pool @@ -475354,10 +475354,10 @@ sub_80FA004: ; 80FA004 bne @080FA0A0 bl sub_80F9F5C ldr r1, =0x03005db0 - ldr r0, =hm_add_c3_launch_phase_2 + 1 + ldr r0, =hm_add_c3_launch_phase_2 str r0, [r1] ldr r1, =0x0203ceec - ldr r0, =sub_80FA1E8 + 1 + ldr r0, =sub_80FA1E8 b @080FA0C0 .align 2, 0 .pool @@ -475374,10 +475374,10 @@ sub_80FA004: ; 80FA004 @080FA0B2: bl sub_80F9F5C ldr r1, =0x03005db0 - ldr r0, =hm_add_c3_launch_phase_2 + 1 + ldr r0, =hm_add_c3_launch_phase_2 str r0, [r1] ldr r1, =0x0203ceec - ldr r0, =sub_80FA34C + 1 + ldr r0, =sub_80FA34C @080FA0C0: str r0, [r1] movs r0, 0x1 @@ -475416,7 +475416,7 @@ oei_sweet_scent: ; 80FA0FC adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r2, =sub_80FA128 + 1 + ldr r2, =sub_80FA128 lsrs r0, r2, 16 strh r0, [r1, 0x18] strh r2, [r1, 0x1A] @@ -475481,7 +475481,7 @@ sub_80FA18C: ; 80FA18C bl audio_play movs r0, 0 strh r0, [r4, 0x2E] - ldr r0, =sub_80FA1A8 + 1 + ldr r0, =sub_80FA1A8 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -475510,7 +475510,7 @@ sub_80FA1A8: ; 80FA1A8 @080FA1C8: movs r0, 0 strh r0, [r1, 0x2E] - ldr r0, =sub_80FA1D8 + 1 + ldr r0, =sub_80FA1D8 str r0, [r1, 0x1C] @080FA1D0: pop {r0} @@ -475556,7 +475556,7 @@ sub_80FA208: ; 80FA208 adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r2, =sub_80FA234 + 1 + ldr r2, =sub_80FA234 lsrs r0, r2, 16 strh r0, [r1, 0x18] strh r2, [r1, 0x1A] @@ -475656,7 +475656,7 @@ sub_80FA2D8: ; 80FA2D8 movs r0, 0 strb r1, [r2] strh r0, [r4, 0x2E] - ldr r0, =sub_80FA304 + 1 + ldr r0, =sub_80FA304 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -475687,7 +475687,7 @@ sub_80FA304: ; 80FA304 @080FA326: movs r0, 0 strh r0, [r4, 0x2E] - ldr r0, =sub_80FA33C + 1 + ldr r0, =sub_80FA33C str r0, [r4, 0x1C] @080FA32E: pop {r4} @@ -475734,7 +475734,7 @@ sub_80FA36C: ; 80FA36C adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r2, =sub_80FA398 + 1 + ldr r2, =sub_80FA398 lsrs r0, r2, 16 strh r0, [r1, 0x18] strh r2, [r1, 0x1A] @@ -475799,7 +475799,7 @@ sub_80FA3FC: ; 80FA3FC bl audio_play movs r0, 0 strh r0, [r4, 0x2E] - ldr r0, =sub_80FA418 + 1 + ldr r0, =sub_80FA418 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -475828,7 +475828,7 @@ sub_80FA418: ; 80FA418 @080FA438: movs r0, 0 strh r0, [r1, 0x2E] - ldr r0, =sub_80FA448 + 1 + ldr r0, =sub_80FA448 str r0, [r1, 0x1C] @080FA440: pop {r0} @@ -475856,7 +475856,7 @@ 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, =sub_80FA4A0 + 1 + ldr r0, =sub_80FA4A0 movs r1, 0 bl AddTask lsls r0, 24 @@ -476038,7 +476038,7 @@ sub_80FA5E4: ; 80FA5E4 lsrs r5, 16 lsls r6, 16 lsrs r6, 16 - ldr r0, =sub_80FA62C + 1 + ldr r0, =sub_80FA62C movs r1, 0 bl AddTask lsls r0, 24 @@ -476280,7 +476280,7 @@ sub_80FA794: ; 80FA794 @080FA7BC: cmp r0, 0x2 bne @080FA7DE - ldr r0, =sub_80FA754 + 1 + ldr r0, =sub_80FA754 movs r1, 0x5 bl AddTask lsls r0, 24 @@ -476448,7 +476448,7 @@ sub_80FA970: ; 80FA970 adds r4, r0, 0 lsls r4, 16 lsrs r4, 16 - ldr r0, =sub_80FA7EC + 1 + ldr r0, =sub_80FA7EC movs r1, 0x5 bl AddTask lsls r0, 24 @@ -476561,7 +476561,7 @@ sub_80FA9D0: ; 80FA9D0 strb r0, [r4, 0x5] adds r3, 0x1C adds r2, r3 - ldr r0, =sub_80FA9A4 + 1 + ldr r0, =sub_80FA9A4 str r0, [r2] movs r0, 0 strh r0, [r4, 0x2E] @@ -476750,7 +476750,7 @@ door_restore_tilemap: ; 80FABA4 bl cur_mapdata_draw_block_at movs r0, 0 strh r0, [r5, 0x2E] - ldr r0, =sub_80FAC24 + 1 + ldr r0, =sub_80FAC24 str r0, [r5, 0x1C] pop {r4,r5} pop {r0} @@ -476782,7 +476782,7 @@ sub_80FAC24: ; 80FAC24 bl cur_mapdata_draw_block_at movs r0, 0 strh r0, [r5, 0x2E] - ldr r0, =sub_80FAC68 + 1 + ldr r0, =sub_80FAC68 str r0, [r5, 0x1C] @080FAC54: pop {r4,r5} @@ -477061,7 +477061,7 @@ overworld_posion_effect: ; 80FAEA8 push {lr} movs r0, 0x4F bl audio_play - ldr r0, =task50_overworld_posion_effect + 1 + ldr r0, =task50_overworld_posion_effect movs r1, 0x50 bl AddTask pop {r0} @@ -477073,7 +477073,7 @@ overworld_posion_effect: ; 80FAEA8 thumb_func_start c3_80A0DD8_is_running c3_80A0DD8_is_running: ; 80FAEC0 push {lr} - ldr r0, =task50_overworld_posion_effect + 1 + ldr r0, =task50_overworld_posion_effect bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 @@ -477092,7 +477092,7 @@ sub_80FAED4: ; 80FAED4 adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r0, =sub_80FAEF0 + 1 + ldr r0, =sub_80FAEF0 str r0, [r1] bx lr .align 2, 0 @@ -477140,7 +477140,7 @@ sub_80FAEF0: ; 80FAEF0 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, =sub_80FAF64 + 1 + ldr r1, =sub_80FAF64 str r1, [r0] @080FAF4E: pop {r4,r5} @@ -477192,7 +477192,7 @@ sub_80FAF64: ; 80FAF64 .align 2, 0 .pool @080FAFC4: - ldr r0, =sub_80FAFD4 + 1 + ldr r0, =sub_80FAFD4 str r0, [r2] @080FAFC8: pop {r4,r5} @@ -477223,7 +477223,7 @@ sub_80FAFD4: ; 80FAFD4 thumb_func_start sub_80FAFF8 sub_80FAFF8: ; 80FAFF8 push {lr} - ldr r0, =sub_80FAED4 + 1 + ldr r0, =sub_80FAED4 movs r1, 0x50 bl AddTask pop {r0} @@ -477488,7 +477488,7 @@ sub_80FB1AC: ; 80FB1AC adds r0, r4, 0 subs r0, 0x8 adds r0, r3, r0 - ldr r1, =sub_80FB2C0 + 1 + ldr r1, =sub_80FB2C0 str r1, [r0] @080FB20C: movs r4, 0x2 @@ -477700,7 +477700,7 @@ sub_80FB36C: ; 80FB36C bl sub_808A2C0 movs r0, 0 strh r0, [r4, 0x2] - ldr r0, =sub_80FB0F8 + 1 + ldr r0, =sub_80FB0F8 movs r1, 0xA bl AddTask lsls r0, 24 @@ -477747,7 +477747,7 @@ sub_80FB36C: ; 80FB36C strh r2, [r4, 0x2] ldrb r0, [r4, 0x4] bl remove_task - ldr r0, =sub_80FB1AC + 1 + ldr r0, =sub_80FB1AC movs r1, 0xA bl AddTask lsls r0, 24 @@ -477852,7 +477852,7 @@ sub_80FB4E0: ; 80FB4E0 ldr r2, =0x01000100 mov r0, sp bl CpuFastSet - ldr r0, =sub_80FB36C + 1 + ldr r0, =sub_80FB36C movs r1, 0xA bl AddTask add sp, 0x4 @@ -477866,7 +477866,7 @@ sub_80FB4E0: ; 80FB4E0 sub_80FB540: ; 80FB540 push {r4-r6,lr} sub sp, 0x4 - ldr r0, =sub_80FB36C + 1 + ldr r0, =sub_80FB36C bl is_function_an_active_task lsls r0, 24 lsrs r6, r0, 24 @@ -478083,7 +478083,7 @@ sub_80FB5E8: ; 80FB5E8 sub_80FB6EC: ; 80FB6EC push {r4,lr} sub sp, 0x4 - ldr r1, =nullsub_12 + 1 + ldr r1, =nullsub_12 movs r0, 0 str r0, [sp] movs r0, 0x8C @@ -478151,7 +478151,7 @@ sub_80FB768: ; 80FB768 orrs r1, r2 strb r1, [r0, 0x1] bl pal_fill_black - ldr r0, =sub_80FB5E8 + 1 + ldr r0, =sub_80FB5E8 movs r1, 0x50 bl AddTask bl script_env_2_enable @@ -479501,7 +479501,7 @@ sub_80FC190: ; 80FC190 ldrb r0, [r0] cmp r0, 0 beq @080FC1D8 - ldr r0, =c2_exit_to_overworld_2_switch + 1 + ldr r0, =c2_exit_to_overworld_2_switch bl set_callback2 b @080FC21C .align 2, 0 @@ -479514,9 +479514,9 @@ sub_80FC190: ; 80FC190 bl script_env_2_execute_new_script bl warp_in ldr r1, =0x03005dac - ldr r0, =sub_80AF6F0 + 1 + ldr r0, =sub_80AF6F0 str r0, [r1] - ldr r0, =c2_load_new_map + 1 + ldr r0, =c2_load_new_map bl set_callback2 b @080FC21C .align 2, 0 @@ -479527,7 +479527,7 @@ sub_80FC190: ; 80FC190 ldr r0, =gUnknown_082A4B9B bl script_env_1_execute_new_script bl script_env_2_set_ctx_paused - ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 + ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music bl set_callback2 @080FC21C: pop {r0} @@ -479978,7 +479978,7 @@ sub_80FC580: ; 80FC580 lsrs r2, r0, 24 movs r1, 0 ldr r5, =0x03005e00 - ldr r6, =sub_80FC5C0 + 1 + ldr r6, =sub_80FC5C0 ldr r4, =0x020223c4 movs r3, 0xFF @080FC590: @@ -480013,7 +480013,7 @@ sub_80FC5C0: ; 80FC5C0 adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r0, =sub_80FC5DC + 1 + ldr r0, =sub_80FC5DC str r0, [r1] bx lr .align 2, 0 @@ -481371,7 +481371,7 @@ run_eventually_start: ; 80FD0DC cmp r0, 0x1 beq @080FD110 ldr r1, =0x03005dac - ldr r0, =sub_80FD124 + 1 + ldr r0, =sub_80FD124 str r0, [r1] adds r0, r2, 0 bl sub_80FD060 @@ -481394,7 +481394,7 @@ run_eventually_start: ; 80FD0DC sub_80FD124: ; 80FD124 push {lr} bl pal_fill_black - ldr r0, =sub_80FD13C + 1 + ldr r0, =sub_80FD13C movs r1, 0x8 bl AddTask pop {r0} @@ -481443,7 +481443,7 @@ sub_80FD164: ; 80FD164 lsls r0, 24 cmp r0, 0 bne @080FD1A0 - ldr r3, =sub_81ABBBC + 1 + ldr r3, =sub_81ABBBC adds r0, r5, 0 movs r1, 0x1 adds r2, r6, 0 @@ -481453,14 +481453,14 @@ sub_80FD164: ; 80FD164 .pool @080FD1A0: ldr r1, =gUnknown_085E8F31 - ldr r2, =sub_81C6714 + 1 + ldr r2, =sub_81C6714 adds r0, r5, 0 bl sub_81C6DD8 b @080FD1BE .align 2, 0 .pool @080FD1B4: - ldr r2, =sub_80FD1F8 + 1 + ldr r2, =sub_80FD1F8 adds r0, r5, 0 adds r1, r6, 0 bl sub_81978EC @@ -481527,7 +481527,7 @@ sub_80FD21C: ; 80FD21C lsrs r4, r0, 16 adds r0, r4, 0 bl itemid_get_overworld_function - ldr r1, =sub_80FDF48 + 1 + ldr r1, =sub_80FDF48 cmp r0, r1 bne @080FD238 movs r0, 0x1 @@ -481537,7 +481537,7 @@ sub_80FD21C: ; 80FD21C @080FD238: adds r0, r4, 0 bl itemid_get_overworld_function - ldr r1, =sub_80FE378 + 1 + ldr r1, =sub_80FE378 cmp r0, r1 beq @080FD24C movs r0, 0 @@ -481560,7 +481560,7 @@ sub_80FD254: ; 80FD254 ldr r0, =0x0203ce7c ldrh r0, [r0] strh r0, [r1, 0x20] - ldr r1, =sub_81AD40C + 1 + ldr r1, =sub_81AD40C mov r0, sp movs r2, 0 bl sub_8121478 @@ -481578,7 +481578,7 @@ sub_80FD278: ; 80FD278 lsrs r0, 24 ldr r1, =0x0203ce54 ldr r2, [r1] - ldr r1, =sub_80FD254 + 1 + ldr r1, =sub_80FD254 str r1, [r2] bl task_close_bag_menu_1 pop {r0} @@ -481658,7 +481658,7 @@ item_field_func_bike: ; 80FD298 cmp r0, 0 bne @080FD348 ldr r1, =0x0203a0f4 - ldr r0, =sub_80FD358 + 1 + ldr r0, =sub_80FD358 str r0, [r1] adds r0, r5, 0 bl run_eventually_start @@ -481787,7 +481787,7 @@ rod: ; 80FD428 cmp r0, 0x1 bne @080FD44C ldr r1, =0x0203a0f4 - ldr r0, =sub_80FD468 + 1 + ldr r0, =sub_80FD468 str r0, [r1] adds r0, r4, 0 bl run_eventually_start @@ -481841,7 +481841,7 @@ it_itemfinder: ; 80FD490 movs r0, 0x27 bl sav12_xor_increment ldr r1, =0x0203a0f4 - ldr r0, =sub_80FD4B8 + 1 + ldr r0, =sub_80FD4B8 str r0, [r1] adds r0, r4, 0 bl run_eventually_start @@ -481870,14 +481870,14 @@ sub_80FD4B8: ; 80FD4B8 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =sub_80FD504 + 1 + ldr r0, =sub_80FD504 str r0, [r1] b @080FD4F6 .align 2, 0 .pool @080FD4EC: ldr r1, =gUnknown_085E9002 - ldr r2, =sub_80FD5CC + 1 + ldr r2, =sub_80FD5CC adds r0, r4, 0 bl sub_81978EC @080FD4F6: @@ -481926,7 +481926,7 @@ sub_80FD504: ; 80FD504 mov r0, r8 subs r0, 0x8 adds r0, r7, r0 - ldr r1, =sub_80FDA94 + 1 + ldr r1, =sub_80FDA94 str r1, [r0] b @080FD5C2 .align 2, 0 @@ -481957,7 +481957,7 @@ sub_80FD504: ; 80FD504 adds r0, r3, r5 lsls r0, 3 adds r0, r1 - ldr r1, =sub_80FDADC + 1 + ldr r1, =sub_80FDADC str r1, [r0] movs r0, 0 strh r0, [r4, 0x6] @@ -482677,7 +482677,7 @@ sub_80FDA94: ; 80FDA94 cmp r0, 0x1 bne @080FDACA ldr r1, =gUnknown_085E8F93 - ldr r2, =sub_80FD5CC + 1 + ldr r2, =sub_80FD5CC adds r0, r4, 0 bl sub_81978EC @080FDACA: @@ -482742,7 +482742,7 @@ sub_80FDADC: ; 80FDADC cmp r0, 0x4 bne @080FDB50 ldr r1, =gUnknown_085E8FDB - ldr r2, =sub_80FD5CC + 1 + ldr r2, =sub_80FD5CC adds r0, r5, 0 bl sub_81978EC @080FDB50: @@ -482786,7 +482786,7 @@ sub_80FDB6C: ; 80FDB6C beq @080FDBC8 ldr r0, =0x0203ce54 ldr r1, [r0] - ldr r0, =sub_80FDBEC + 1 + ldr r0, =sub_80FDBEC str r0, [r1] adds r0, r4, 0 bl task_close_bag_menu_1 @@ -482795,12 +482795,12 @@ sub_80FDB6C: ; 80FDB6C .pool @080FDBC8: ldr r0, =0x03005dac - ldr r1, =sub_80AF6D4 + 1 + ldr r1, =sub_80AF6D4 str r1, [r0] movs r0, 0x1 movs r1, 0 bl fade_screen - ldr r0, =sub_80FDC00 + 1 + ldr r0, =sub_80FDC00 str r0, [r5] @080FDBDA: pop {r4,r5} @@ -482813,7 +482813,7 @@ sub_80FDB6C: ; 80FDB6C thumb_func_start sub_80FDBEC sub_80FDBEC: ; 80FDBEC push {lr} - ldr r1, =sub_81AD40C + 1 + ldr r1, =sub_81AD40C movs r0, 0 bl sub_81357FC pop {r0} @@ -482834,7 +482834,7 @@ sub_80FDC00: ; 80FDC00 cmp r0, 0 bne @080FDC24 bl overworld_free_bg_tilemaps - ldr r1, =c2_exit_to_overworld_2_switch + 1 + ldr r1, =c2_exit_to_overworld_2_switch movs r0, 0 bl sub_81357FC adds r0, r4, 0 @@ -482874,7 +482874,7 @@ sub_80FDC34: ; 80FDC34 ldrsh r0, [r0, r1] cmp r0, 0 bne @080FDC90 - ldr r3, =sub_81ABBBC + 1 + ldr r3, =sub_81ABBBC adds r0, r5, 0 movs r1, 0x1 adds r2, r4, 0 @@ -482883,7 +482883,7 @@ sub_80FDC34: ; 80FDC34 .align 2, 0 .pool @080FDC90: - ldr r2, =sub_80FD1F8 + 1 + ldr r2, =sub_80FD1F8 adds r0, r5, 0 adds r1, r4, 0 bl sub_81978EC @@ -482920,7 +482920,7 @@ sub_80FDCA4: ; 80FDCA4 ldrsh r0, [r0, r1] cmp r0, 0 bne @080FDCFC - ldr r3, =sub_81ABBBC + 1 + ldr r3, =sub_81ABBBC adds r0, r5, 0 movs r1, 0x1 adds r2, r4, 0 @@ -482929,7 +482929,7 @@ sub_80FDCA4: ; 80FDCA4 .align 2, 0 .pool @080FDCFC: - ldr r2, =sub_80FD1F8 + 1 + ldr r2, =sub_80FD1F8 adds r0, r5, 0 adds r1, r4, 0 bl sub_81978EC @@ -482952,14 +482952,14 @@ sub_80FDD10: ; 80FDD10 cmp r0, 0x1 bne @080FDD58 ldr r1, =0x0203a0f4 - ldr r0, =sub_80FDD74 + 1 + ldr r0, =sub_80FDD74 str r0, [r1] ldr r1, =0x03005dac - ldr r0, =sub_80FD124 + 1 + ldr r0, =sub_80FD124 str r0, [r1] ldr r0, =0x0203ce54 ldr r1, [r0] - ldr r0, =c2_exit_to_overworld_2_switch + 1 + ldr r0, =c2_exit_to_overworld_2_switch str r0, [r1] adds r0, r4, 0 bl task_close_bag_menu_1 @@ -483015,7 +483015,7 @@ sub_80FDDA4: ; 80FDDA4 cmp r0, 0x1 bne @080FDDC8 ldr r1, =0x0203a0f4 - ldr r0, =sub_80FDE7C + 1 + ldr r0, =sub_80FDE7C b @080FDDD8 .align 2, 0 .pool @@ -483026,7 +483026,7 @@ sub_80FDDA4: ; 80FDDA4 cmp r0, 0x1 bne @080FDDEC ldr r1, =0x0203a0f4 - ldr r0, =sub_80FDE08 + 1 + ldr r0, =sub_80FDE08 @080FDDD8: str r0, [r1] adds r0, r4, 0 @@ -483136,7 +483136,7 @@ item_field_func_recovery_item: ; 80FDEA0 lsls r0, 24 lsrs r0, 24 ldr r2, =0x03006328 - ldr r1, =sub_81B6588 + 1 + ldr r1, =sub_81B6588 str r1, [r2] bl sub_80FD060 pop {r0} @@ -483151,7 +483151,7 @@ sub_80FDEBC: ; 80FDEBC lsls r0, 24 lsrs r0, 24 ldr r2, =0x03006328 - ldr r1, =sub_81B67C8 + 1 + ldr r1, =sub_81B67C8 str r1, [r2] bl sub_80FD060 pop {r0} @@ -483166,7 +483166,7 @@ item_in_battle_func_sacred_ash: ; 80FDED8 lsls r0, 24 lsrs r0, 24 ldr r2, =0x03006328 - ldr r1, =sub_81B79E8 + 1 + ldr r1, =sub_81B79E8 str r1, [r2] bl sub_80FD060 pop {r0} @@ -483181,7 +483181,7 @@ item_field_func_pp_recovery_item: ; 80FDEF4 lsls r0, 24 lsrs r0, 24 ldr r2, =0x03006328 - ldr r1, =dp05_ether + 1 + ldr r1, =dp05_ether str r1, [r2] bl sub_80FD060 pop {r0} @@ -483196,7 +483196,7 @@ sub_80FDF10: ; 80FDF10 lsls r0, 24 lsrs r0, 24 ldr r2, =0x03006328 - ldr r1, =dp05_pp_up + 1 + ldr r1, =dp05_pp_up str r1, [r2] bl sub_80FD060 pop {r0} @@ -483211,7 +483211,7 @@ sub_80FDF2C: ; 80FDF2C lsls r0, 24 lsrs r0, 24 ldr r2, =0x03006328 - ldr r1, =dp05_rare_candy + 1 + ldr r1, =dp05_rare_candy str r1, [r2] bl sub_80FD060 pop {r0} @@ -483232,7 +483232,7 @@ sub_80FDF48: ; 80FDF48 cmp r1, r0 bls @080FDF74 ldr r2, =gUnknown_085E9047 - ldr r3, =sub_80FDF90 + 1 + ldr r3, =sub_80FDF90 adds r0, r4, 0 movs r1, 0x1 bl sub_81ABB4C @@ -483241,7 +483241,7 @@ sub_80FDF48: ; 80FDF48 .pool @080FDF74: ldr r2, =gUnknown_085E9037 - ldr r3, =sub_80FDF90 + 1 + ldr r3, =sub_80FDF90 adds r0, r4, 0 movs r1, 0x1 bl sub_81ABB4C @@ -483266,7 +483266,7 @@ sub_80FDF90: ; 80FDF90 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =task08_0809AD8C + 1 + ldr r1, =task08_0809AD8C str r1, [r0] pop {r4} pop {r0} @@ -483302,7 +483302,7 @@ task08_0809AD8C: ; 80FDFBC ldr r1, =gUnknown_085E9058 adds r0, r4, 0 bl ExpandTextCodes - ldr r3, =sub_80FE024 + 1 + ldr r3, =sub_80FE024 adds r0, r5, 0 movs r1, 0x1 adds r2, r4, 0 @@ -483335,7 +483335,7 @@ sub_80FE03C: ; 80FE03C lsls r0, 24 lsrs r0, 24 ldr r2, =0x03006328 - ldr r1, =sub_81B6DC4 + 1 + ldr r1, =sub_81B6DC4 str r1, [r2] bl sub_80FD060 pop {r0} @@ -483399,7 +483399,7 @@ sub_80FE0BC: ; 80FE0BC adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =sub_80FE124 + 1 + ldr r0, =sub_80FE124 str r0, [r1] b @080FE116 .align 2, 0 @@ -483410,7 +483410,7 @@ sub_80FE0BC: ; 80FE0BC cmp r0, 0 bne @080FE10C ldr r2, =gUnknown_085E9092 - ldr r3, =sub_81ABBBC + 1 + ldr r3, =sub_81ABBBC adds r0, r4, 0 movs r1, 0x1 bl sub_81ABB4C @@ -483419,7 +483419,7 @@ sub_80FE0BC: ; 80FE0BC .pool @080FE10C: ldr r1, =gUnknown_085E9092 - ldr r2, =sub_81C6714 + 1 + ldr r2, =sub_81C6714 adds r0, r5, 0 bl sub_81C6DD8 @080FE116: @@ -483454,7 +483454,7 @@ sub_80FE124: ; 80FE124 adds r0, r5, 0 subs r0, 0x8 adds r0, r4, r0 - ldr r1, =sub_80FE164 + 1 + ldr r1, =sub_80FE164 str r1, [r0] @080FE156: pop {r4,r5} @@ -483489,7 +483489,7 @@ sub_80FE164: ; 80FE164 cmp r0, 0 bne @080FE1B8 ldr r2, =0x02021fc4 - ldr r3, =sub_81ABBBC + 1 + ldr r3, =sub_81ABBBC adds r0, r5, 0 movs r1, 0x1 bl sub_81ABB4C @@ -483498,7 +483498,7 @@ sub_80FE164: ; 80FE164 .pool @080FE1B8: ldr r1, =0x02021fc4 - ldr r2, =sub_81C6714 + 1 + ldr r2, =sub_81C6714 adds r0, r6, 0 bl sub_81C6DD8 @080FE1C2: @@ -483534,7 +483534,7 @@ sub_80FE1D0: ; 80FE1D0 cmp r0, 0 bne @080FE21C ldr r2, =0x02021fc4 - ldr r3, =sub_81ABBBC + 1 + ldr r3, =sub_81ABBBC adds r0, r4, 0 movs r1, 0x1 bl sub_81ABB4C @@ -483543,7 +483543,7 @@ sub_80FE1D0: ; 80FE1D0 .pool @080FE21C: ldr r1, =0x02021fc4 - ldr r2, =sub_81C6714 + 1 + ldr r2, =sub_81C6714 adds r0, r5, 0 bl sub_81C6DD8 @080FE226: @@ -483592,7 +483592,7 @@ item_field_func_black_white_flutes: ; 80FE234 adds r0, r1 movs r1, 0 strh r1, [r0, 0x18] - ldr r1, =sub_80FE1D0 + 1 + ldr r1, =sub_80FE1D0 str r1, [r0] pop {r4,r5} pop {r0} @@ -483632,7 +483632,7 @@ re_escape_rope: ; 80FE2D8 movs r1, 0 strh r1, [r0, 0x8] ldr r1, =0x02021fc4 - ldr r2, =task08_080A1C44 + 1 + ldr r2, =task08_080A1C44 adds r0, r4, 0 bl sub_81978EC pop {r4} @@ -483673,7 +483673,7 @@ sub_80FE334: ; 80FE334 cmp r0, 0x1 bne @080FE35C ldr r1, =0x0203a0f4 - ldr r0, =re_escape_rope + 1 + ldr r0, =re_escape_rope str r0, [r1] adds r0, r4, 0 bl run_eventually_start @@ -483703,7 +483703,7 @@ sub_80FE378: ; 80FE378 lsls r0, 24 lsrs r0, 24 ldr r2, =0x03006328 - ldr r1, =sub_81B7C74 + 1 + ldr r1, =sub_81B7C74 str r1, [r2] bl sub_80FD060 pop {r0} @@ -483745,7 +483745,7 @@ item_in_battle_func_pokeball: ; 80FE394 cmp r0, 0 bne @080FE3F0 ldr r2, =gUnknown_085E9125 - ldr r3, =sub_81ABBBC + 1 + ldr r3, =sub_81ABBBC adds r0, r4, 0 movs r1, 0x1 bl sub_81ABB4C @@ -483754,7 +483754,7 @@ item_in_battle_func_pokeball: ; 80FE394 .pool @080FE3F0: ldr r1, =gUnknown_085E9125 - ldr r2, =sub_81C6714 + 1 + ldr r2, =sub_81C6714 adds r0, r5, 0 bl sub_81C6DD8 @080FE3FA: @@ -483826,7 +483826,7 @@ sub_80FE440: ; 80FE440 ldrh r0, [r4] bl sub_806CF78 adds r2, r0, 0 - ldr r3, =sub_80FE408 + 1 + ldr r3, =sub_80FE408 adds r0, r5, 0 movs r1, 0x1 bl sub_81ABB4C @@ -483837,7 +483837,7 @@ sub_80FE440: ; 80FE440 ldrh r0, [r4] bl sub_806CF78 adds r1, r0, 0 - ldr r2, =sub_80FE408 + 1 + ldr r2, =sub_80FE408 adds r0, r6, 0 bl sub_81C6DD8 @080FE4AC: @@ -483878,7 +483878,7 @@ status_incr_battle: ; 80FE4B8 cmp r0, 0 bne @080FE518 ldr r2, =gUnknown_085E96F6 - ldr r3, =sub_81ABBBC + 1 + ldr r3, =sub_81ABBBC adds r0, r4, 0 movs r1, 0x1 bl sub_81ABB4C @@ -483887,7 +483887,7 @@ status_incr_battle: ; 80FE4B8 .pool @080FE518: ldr r1, =gUnknown_085E96F6 - ldr r2, =sub_81C6714 + 1 + ldr r2, =sub_81C6714 adds r0, r4, 0 bl sub_81C6DD8 b @080FE53C @@ -483899,7 +483899,7 @@ status_incr_battle: ; 80FE4B8 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =sub_80FE440 + 1 + ldr r0, =sub_80FE440 str r0, [r1] strh r2, [r1, 0x18] @080FE53C: @@ -483921,7 +483921,7 @@ sub_80FE54C: ; 80FE54C bne @080FE574 ldr r0, =0x0203ce54 ldr r1, [r0] - ldr r0, =sub_81B89F0 + 1 + ldr r0, =sub_81B89F0 str r0, [r1] adds r0, r4, 0 bl task_close_bag_menu_1 @@ -483931,7 +483931,7 @@ sub_80FE54C: ; 80FE54C @080FE574: ldr r0, =0x0203cf2c ldr r1, [r0] - ldr r0, =sub_81B89F0 + 1 + ldr r0, =sub_81B89F0 str r0, [r1] adds r0, r4, 0 bl sub_81C5B14 @@ -483949,7 +483949,7 @@ item_in_battle_func_recovery_item: ; 80FE590 lsls r0, 24 lsrs r0, 24 ldr r2, =0x03006328 - ldr r1, =sub_81B6588 + 1 + ldr r1, =sub_81B6588 str r1, [r2] bl sub_80FE54C pop {r0} @@ -483964,7 +483964,7 @@ sub_80FE5AC: ; 80FE5AC lsls r0, 24 lsrs r0, 24 ldr r2, =0x03006328 - ldr r1, =sub_81B79E8 + 1 + ldr r1, =sub_81B79E8 str r1, [r2] bl sub_80FE54C pop {r0} @@ -483979,7 +483979,7 @@ item_in_battle_func_pp_recovery_item: ; 80FE5C8 lsls r0, 24 lsrs r0, 24 ldr r2, =0x03006328 - ldr r1, =dp05_ether + 1 + ldr r1, =dp05_ether str r1, [r2] bl sub_80FE54C pop {r0} @@ -484005,7 +484005,7 @@ sub_80FE5E4: ; 80FE5E4 cmp r0, 0 bne @080FE620 ldr r2, =0x02021fc4 - ldr r3, =task_close_bag_menu_1 + 1 + ldr r3, =task_close_bag_menu_1 adds r0, r4, 0 movs r1, 0x1 bl sub_81ABB4C @@ -484014,7 +484014,7 @@ sub_80FE5E4: ; 80FE5E4 .pool @080FE620: ldr r1, =0x02021fc4 - ldr r2, =sub_81C5B14 + 1 + ldr r2, =sub_81C5B14 adds r0, r4, 0 bl sub_81C6DD8 b @080FE646 @@ -484282,7 +484282,7 @@ sub_80FE840: ; 80FE840 ldr r0, =0x0203841e ldrh r0, [r0, 0xA] strh r0, [r4, 0x36] - ldr r0, =sub_80FE898 + 1 + ldr r0, =sub_80FE898 str r0, [r4, 0x1C] pop {r4,r5} pop {r0} @@ -484353,9 +484353,9 @@ sub_80FE8E0: ; 80FE8E0 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x36] - ldr r0, =sub_80A6EEC + 1 + ldr r0, =sub_80A6EEC str r0, [r4, 0x1C] - ldr r1, =move_anim_8074EE0 + 1 + ldr r1, =move_anim_8074EE0 adds r0, r4, 0 bl oamt_set_x3A_32 pop {r4,r5} @@ -484390,9 +484390,9 @@ sub_80FE930: ; 80FE930 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x36] - ldr r0, =sub_80A6EEC + 1 + ldr r0, =sub_80A6EEC str r0, [r4, 0x1C] - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 adds r0, r4, 0 bl oamt_set_x3A_32 pop {r4,r5} @@ -484432,7 +484432,7 @@ sub_80FE988: ; 80FE988 bl obj_translate_based_on_private_1_2_3_4 ldrh r0, [r6, 0x6] strh r0, [r4, 0x38] - ldr r1, =sub_80FE9E4 + 1 + ldr r1, =sub_80FE9E4 str r1, [r4, 0x1C] adds r0, r4, 0 bl _call_via_r1 @@ -484588,7 +484588,7 @@ sub_80FEAD8: ; 80FEAD8 strh r0, [r4, 0x38] adds r0, r4, 0 bl sub_80A68D4 - ldr r0, =sub_80FEB28 + 1 + ldr r0, =sub_80FEB28 str r0, [r4, 0x1C] pop {r4-r6} pop {r0} @@ -484687,7 +484687,7 @@ sub_80FEB44: ; 80FEB44 adds r0, 0x43 ldrb r0, [r0] strh r0, [r5, 0x3A] - ldr r1, =sub_80FEBFC + 1 + ldr r1, =sub_80FEBFC str r1, [r5, 0x1C] adds r0, r5, 0 bl _call_via_r1 @@ -484782,7 +484782,7 @@ sub_80FEC48: ; 80FEC48 strh r0, [r6, 0x38] adds r0, r6, 0 bl sub_80A68D4 - ldr r0, =sub_80FECB8 + 1 + ldr r0, =sub_80FECB8 str r0, [r6, 0x1C] pop {r4-r6} pop {r0} @@ -484807,9 +484807,9 @@ sub_80FECB8: ; 80FECB8 strb r0, [r2] movs r0, 0xA strh r0, [r4, 0x2E] - ldr r0, =sub_80A64B0 + 1 + ldr r0, =sub_80A64B0 str r0, [r4, 0x1C] - ldr r1, =sub_80FECF0 + 1 + ldr r1, =sub_80FECF0 adds r0, r4, 0 bl oamt_set_x3A_32 @080FECE2: @@ -484836,9 +484836,9 @@ sub_80FECF0: ; 80FECF0 bl obj_anim_image_start movs r0, 0x3C strh r0, [r4, 0x2E] - ldr r0, =sub_80A64B0 + 1 + ldr r0, =sub_80A64B0 str r0, [r4, 0x1C] - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 adds r0, r4, 0 bl oamt_set_x3A_32 pop {r4} @@ -484874,7 +484874,7 @@ sub_80FED28: ; 80FED28 strh r0, [r4, 0x2E] ldrh r0, [r5, 0x4] strh r0, [r4, 0x30] - ldr r1, =sub_80FED74 + 1 + ldr r1, =sub_80FED74 str r1, [r4, 0x1C] adds r0, r4, 0 bl _call_via_r1 @@ -485044,7 +485044,7 @@ sub_80FEE78: ; 80FEE78 bl obj_translate_based_on_private_1_2_3_4 movs r0, 0x40 strh r0, [r4, 0x38] - ldr r1, =sub_80FEECC + 1 + ldr r1, =sub_80FEECC str r1, [r4, 0x1C] adds r0, r4, 0 bl _call_via_r1 @@ -485144,7 +485144,7 @@ sub_80FEF44: ; 80FEF44 bl obj_translate_based_on_private_1_2_3_4 movs r0, 0x40 strh r0, [r4, 0x38] - ldr r1, =sub_80FEF98 + 1 + ldr r1, =sub_80FEF98 str r1, [r4, 0x1C] adds r0, r4, 0 bl _call_via_r1 @@ -485234,7 +485234,7 @@ sub_80FEFFC: ; 80FEFFC strh r0, [r4, 0x30] ldrh r0, [r1, 0x4] strh r0, [r4, 0x32] - ldr r0, =sub_80FF044 + 1 + ldr r0, =sub_80FF044 str r0, [r4, 0x1C] pop {r4,r5} pop {r0} @@ -485267,7 +485267,7 @@ sub_80FF044: ; 80FF044 strh r2, [r1, 0x30] strh r2, [r1, 0x32] @080FF06C: - ldr r0, =sub_80FF090 + 1 + ldr r0, =sub_80FF090 str r0, [r1, 0x1C] b @080FF08C .align 2, 0 @@ -485426,7 +485426,7 @@ sub_80FF0F4: ; 80FF0F4 movs r0, 0 @080FF1AE: strh r0, [r5, 0x2E] - ldr r0, =sub_80FF1C0 + 1 + ldr r0, =sub_80FF1C0 str r0, [r5, 0x1C] pop {r4-r6} pop {r0} @@ -485558,7 +485558,7 @@ sub_80FF268: ; 80FF268 strh r0, [r4, 0x34] ldrh r0, [r1, 0x8] strh r0, [r4, 0x36] - ldr r0, =sub_80FF2BC + 1 + ldr r0, =sub_80FF2BC str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -485683,7 +485683,7 @@ sub_80FF374: ; 80FF374 strh r0, [r5, 0x3A] ldrh r0, [r4, 0x6] strh r0, [r5, 0x3C] - ldr r0, =sub_80FF3B0 + 1 + ldr r0, =sub_80FF3B0 str r0, [r5, 0x1C] pop {r4,r5} pop {r0} @@ -485712,7 +485712,7 @@ sub_80FF3B0: ; 80FF3B0 movs r0, 0x80 lsls r0, 1 strh r0, [r4, 0x2E] - ldr r0, =sub_80FF3EC + 1 + ldr r0, =sub_80FF3EC str r0, [r4, 0x1C] @080FF3DA: pop {r4} @@ -485874,7 +485874,7 @@ sub_80FF458: ; 80FF458 movs r0, 0x80 lsls r0, 1 strh r0, [r6, 0x1E] - ldr r0, =sub_80FF53C + 1 + ldr r0, =sub_80FF53C str r0, [r6] @080FF51C: pop {r3-r5} @@ -485945,7 +485945,7 @@ sub_80FF53C: ; 80FF53C cmp r0, 0 bne @080FF5B4 strh r0, [r4, 0x8] - ldr r0, =sub_80FF5CC + 1 + ldr r0, =sub_80FF5CC str r0, [r4] @080FF5B4: pop {r4-r6} @@ -486139,9 +486139,9 @@ sub_80FF698: ; 80FF698 lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x36] - ldr r0, =sub_80A70C0 + 1 + ldr r0, =sub_80A70C0 str r0, [r5, 0x1C] - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 adds r0, r5, 0 bl oamt_set_x3A_32 @080FF756: @@ -486206,7 +486206,7 @@ sub_80FF768: ; 80FF768 adds r1, r0 strh r1, [r5, 0x22] @080FF7D4: - ldr r0, =sub_80FF8DC + 1 + ldr r0, =sub_80FF8DC str r0, [r5, 0x1C] pop {r4,r5} pop {r0} @@ -486299,7 +486299,7 @@ sub_80FF7EC: ; 80FF7EC ldrh r0, [r6, 0xA] mov r1, r9 strh r0, [r1, 0x32] - ldr r0, =sub_80FF8DC + 1 + ldr r0, =sub_80FF8DC str r0, [r1, 0x1C] ldr r1, =0x0203a0f8 mov r3, r9 @@ -486619,7 +486619,7 @@ sub_80FFAB4: ; 80FFAB4 beq @080FFB0E strh r5, [r4, 0x26] strh r5, [r4, 0x2E] - ldr r0, =sub_80FFA84 + 1 + ldr r0, =sub_80FFA84 str r0, [r4, 0x1C] @080FFB0E: pop {r4,r5} @@ -486677,7 +486677,7 @@ sub_80FFB18: ; 80FFB18 strh r0, [r5, 0x34] movs r0, 0x3C strh r0, [r5, 0x36] - ldr r0, =sub_80FFAB4 + 1 + ldr r0, =sub_80FFAB4 str r0, [r5, 0x1C] pop {r4-r6} pop {r0} @@ -486764,7 +486764,7 @@ sub_80FFBF4: ; 80FFBF4 strh r0, [r5, 0x34] movs r0, 0x3C strh r0, [r5, 0x36] - ldr r0, =sub_80FFAB4 + 1 + ldr r0, =sub_80FFAB4 b @080FFC62 .align 2, 0 .pool @@ -486788,7 +486788,7 @@ sub_80FFBF4: ; 80FFBF4 strh r0, [r5, 0x34] movs r0, 0x3C strh r0, [r5, 0x36] - ldr r0, =sub_80FFB90 + 1 + ldr r0, =sub_80FFB90 @080FFC62: str r0, [r5, 0x1C] pop {r4-r6} @@ -486884,7 +486884,7 @@ sub_80FFCB4: ; 80FFCB4 strh r0, [r5, 0x34] movs r0, 0x3C strh r0, [r5, 0x36] - ldr r0, =sub_80FFD2C + 1 + ldr r0, =sub_80FFD2C str r0, [r5, 0x1C] pop {r4-r6} pop {r0} @@ -486947,7 +486947,7 @@ sub_80FFD2C: ; 80FFD2C beq @080FFDB2 strh r5, [r4, 0x26] strh r5, [r4, 0x2E] - ldr r0, =sub_80FFA84 + 1 + ldr r0, =sub_80FFA84 str r0, [r4, 0x1C] movs r0, 0x40 negs r0, r0 @@ -487021,7 +487021,7 @@ sub_80FFDBC: ; 80FFDBC movs r1, 0x14 bl sine strh r0, [r4, 0x26] - ldr r0, =sub_80FFE58 + 1 + ldr r0, =sub_80FFE58 str r0, [r4, 0x1C] ldrh r0, [r4, 0x30] subs r0, 0x1 @@ -487097,7 +487097,7 @@ sub_80FFE58: ; 80FFE58 movs r0, 0 strh r0, [r4, 0x2E] strh r0, [r4, 0x32] - ldr r0, =sub_80FFEC4 + 1 + ldr r0, =sub_80FFEC4 str r0, [r4, 0x1C] @080FFEBA: pop {r4,r5} @@ -487135,7 +487135,7 @@ sub_80FFEC4: ; 80FFEC4 bne @080FFEFC movs r0, 0 strh r0, [r4, 0x2E] - ldr r0, =sub_80FFF7C + 1 + ldr r0, =sub_80FFF7C str r0, [r4, 0x1C] @080FFEFC: movs r0, 0 @@ -487399,7 +487399,7 @@ sub_80FFFC0: ; 80FFFC0 lsls r0, 2 adds r0, r4 bl sub_80A68D4 - ldr r0, =sub_8100128 + 1 + ldr r0, =sub_8100128 str r0, [r5] pop {r4-r6} pop {r0} @@ -487995,7 +487995,7 @@ sub_8100524: ; 8100524 mov r0, r8 adds r0, 0x1C adds r5, r0 - ldr r0, =sub_81005D4 + 1 + ldr r0, =sub_81005D4 str r0, [r5] @081005BA: pop {r3} @@ -488189,7 +488189,7 @@ sub_8100640: ; 8100640 orrs r1, r0 strb r1, [r4, 0x5] @08100738: - ldr r0, =sub_810074C + 1 + ldr r0, =sub_810074C str r0, [r4, 0x1C] pop {r4-r7} pop {r0} @@ -488484,7 +488484,7 @@ sub_8100898: ; 8100898 movs r1, 0 adds r2, r3, 0 bl sub_80A73E0 - ldr r0, =sub_81009A0 + 1 + ldr r0, =sub_81009A0 str r0, [r6, 0x1C] @0810098E: add sp, 0x4 @@ -488577,9 +488577,9 @@ sub_81009F8: ; 81009F8 ldrh r1, [r4, 0x22] adds r0, r1 strh r0, [r4, 0x22] - ldr r0, =sub_80A67D8 + 1 + ldr r0, =sub_80A67D8 str r0, [r4, 0x1C] - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 adds r0, r4, 0 bl oamt_set_x3A_32 pop {r4} @@ -488603,7 +488603,7 @@ sub_8100A50: ; 8100A50 movs r1, 0x1 bl obj_anim_image_start @08100A6A: - ldr r0, =sub_81009DC + 1 + ldr r0, =sub_81009DC str r0, [r5, 0x1C] ldr r4, =0x0203841e movs r0, 0 @@ -488645,10 +488645,10 @@ sub_8100A94: ; 8100A94 ldrb r1, [r1, 0xC] adds r0, r4, 0 bl sub_8008258 - ldr r1, =move_anim_8074EE0 + 1 + ldr r1, =move_anim_8074EE0 adds r0, r4, 0 bl oamt_set_x3A_32 - ldr r0, =sub_80A66DC + 1 + ldr r0, =sub_80A66DC str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -488683,7 +488683,7 @@ sub_8100AE0: ; 8100AE0 adds r0, 0x8 strh r0, [r5, 0x22] @08100B14: - ldr r0, =sub_8100CCC + 1 + ldr r0, =sub_8100CCC str r0, [r5, 0x1C] ldr r0, =0x0203841e movs r2, 0x4 @@ -488842,7 +488842,7 @@ sub_8100B88: ; 8100B88 adds r0, 0x8 strh r0, [r6, 0x22] @08100C56: - ldr r0, =sub_8100CCC + 1 + ldr r0, =sub_8100CCC str r0, [r6, 0x1C] ldr r0, =0x0203841e movs r2, 0x4 @@ -488944,12 +488944,12 @@ sub_8100CCC: ; 8100CCC asrs r0, 16 cmp r0, 0x14 bne @08100D28 - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 adds r0, r4, 0 bl oamt_set_x3A_32 movs r0, 0x3 strh r0, [r4, 0x2E] - ldr r0, =sub_80A64B0 + 1 + ldr r0, =sub_80A64B0 str r0, [r4, 0x1C] @08100D28: pop {r4} @@ -489114,7 +489114,7 @@ sub_8100E1C: ; 8100E1C strh r0, [r5, 0x22] ldrh r0, [r4, 0x8] strh r0, [r5, 0x34] - ldr r1, =sub_8100E80 + 1 + ldr r1, =sub_8100E80 str r1, [r5, 0x1C] adds r0, r5, 0 bl _call_via_r1 @@ -489281,7 +489281,7 @@ sub_8100EF0: ; 8100EF0 lsrs r1, 16 movs r0, 0x52 bl lcd_io_set - ldr r0, =sub_8100FD4 + 1 + ldr r0, =sub_8100FD4 str r0, [r5, 0x1C] pop {r4-r6} pop {r0} @@ -489411,7 +489411,7 @@ sub_8100FD4: ; 8100FD4 movs r1, 0x4 orrs r0, r1 strb r0, [r2] - ldr r0, =sub_80A67F4 + 1 + ldr r0, =sub_80A67F4 str r0, [r4, 0x1C] @081010C2: pop {r4-r6} @@ -489461,7 +489461,7 @@ sub_81010CC: ; 81010CC lsrs r1, 16 movs r0, 0x52 bl lcd_io_set - ldr r0, =sub_8101138 + 1 + ldr r0, =sub_8101138 str r0, [r4, 0x1C] pop {r4-r6} pop {r0} @@ -489743,10 +489743,10 @@ sub_810130C: ; 810130C strh r0, [r4, 0x30] ldrh r0, [r5, 0x8] strh r0, [r4, 0x32] - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 adds r0, r4, 0 bl oamt_set_x3A_32 - ldr r0, =sub_80A656C + 1 + ldr r0, =sub_80A656C str r0, [r4, 0x1C] pop {r4,r5} pop {r0} @@ -489848,10 +489848,10 @@ sub_810135C: ; 810135C strh r0, [r5, 0x30] ldrh r0, [r1, 0x8] strh r0, [r5, 0x32] - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 adds r0, r5, 0 bl oamt_set_x3A_32 - ldr r0, =sub_80A656C + 1 + ldr r0, =sub_80A656C str r0, [r5, 0x1C] pop {r4-r6} pop {r0} @@ -489897,7 +489897,7 @@ sub_8101440: ; 8101440 movs r1, 0x1 bl obj_anim_image_start @0810148E: - ldr r0, =sub_81014A0 + 1 + ldr r0, =sub_81014A0 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -489991,7 +489991,7 @@ sub_81014F4: ; 81014F4 movs r1, 0x1 bl sub_8008258 @0810154A: - ldr r0, =sub_8101560 + 1 + ldr r0, =sub_8101560 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -490050,9 +490050,9 @@ sub_81015AC: ; 81015AC strh r1, [r0, 0x22] movs r1, 0x14 strh r1, [r0, 0x2E] - ldr r1, =sub_80A64B0 + 1 + ldr r1, =sub_80A64B0 str r1, [r0, 0x1C] - ldr r1, =sub_81015D4 + 1 + ldr r1, =sub_81015D4 bl oamt_set_x3A_32 pop {r0} bx r0 @@ -490075,9 +490075,9 @@ sub_81015D4: ; 81015D4 b @0810166A @081015EA: strh r1, [r5, 0x2E] - ldr r0, =sub_80A64B0 + 1 + ldr r0, =sub_80A64B0 str r0, [r5, 0x1C] - ldr r1, =sub_81015D4 + 1 + ldr r1, =sub_81015D4 adds r0, r5, 0 bl oamt_set_x3A_32 b @0810166A @@ -490114,9 +490114,9 @@ sub_81015D4: ; 81015D4 asrs r0, 24 adds r4, r0 strh r4, [r5, 0x36] - ldr r0, =sub_80A6EEC + 1 + ldr r0, =sub_80A6EEC str r0, [r5, 0x1C] - ldr r1, =sub_8101684 + 1 + ldr r1, =sub_8101684 adds r0, r5, 0 bl oamt_set_x3A_32 movs r1, 0x80 @@ -490155,16 +490155,16 @@ sub_8101684: ; 8101684 bne @081016AC movs r0, 0xA strh r0, [r2, 0x2E] - ldr r0, =sub_80A64B0 + 1 + ldr r0, =sub_80A64B0 str r0, [r2, 0x1C] - ldr r1, =sub_81016B8 + 1 + ldr r1, =sub_81016B8 adds r0, r2, 0 bl oamt_set_x3A_32 b @081016B0 .align 2, 0 .pool @081016AC: - ldr r0, =sub_81015D4 + 1 + ldr r0, =sub_81015D4 str r0, [r2, 0x1C] @081016B0: pop {r0} @@ -490184,9 +490184,9 @@ sub_81016B8: ; 81016B8 strh r0, [r5, 0x2E] strh r1, [r5, 0x30] strh r1, [r5, 0x32] - ldr r0, =sub_80A64B0 + 1 + ldr r0, =sub_80A64B0 str r0, [r5, 0x1C] - ldr r1, =sub_8101774 + 1 + ldr r1, =sub_8101774 adds r0, r5, 0 bl oamt_set_x3A_32 b @08101760 @@ -490255,9 +490255,9 @@ sub_81016B8: ; 81016B8 lsrs r0, 24 adds r0, r6 strh r0, [r5, 0x36] - ldr r0, =sub_80A6EEC + 1 + ldr r0, =sub_80A6EEC str r0, [r5, 0x1C] - ldr r1, =sub_8101820 + 1 + ldr r1, =sub_8101820 adds r0, r5, 0 bl oamt_set_x3A_32 @08101760: @@ -490343,7 +490343,7 @@ sub_8101774: ; 8101774 @0810180C: cmp r0, 0 bne @08101814 - ldr r0, =sub_8101820 + 1 + ldr r0, =sub_8101820 str r0, [r4, 0x1C] @08101814: add sp, 0xC @@ -490366,7 +490366,7 @@ sub_8101820: ; 8101820 movs r0, 0 strh r0, [r2, 0x30] strh r0, [r2, 0x2E] - ldr r0, =sub_8101848 + 1 + ldr r0, =sub_8101848 str r0, [r2, 0x1C] @08101838: pop {r0} @@ -490495,7 +490495,7 @@ sub_8101898: ; 8101898 ands r0, r2 orrs r0, r1 strh r0, [r3, 0x4] - ldr r1, =sub_81015AC + 1 + ldr r1, =sub_81015AC str r1, [r3, 0x1C] adds r0, r3, 0 bl _call_via_r1 @@ -490535,22 +490535,22 @@ sub_8101940: ; 8101940 beq @08101984 b @0810198C @08101972: - ldr r0, =sub_8101998 + 1 + ldr r0, =sub_8101998 b @0810198E .align 2, 0 .pool @0810197C: - ldr r0, =sub_8101A74 + 1 + ldr r0, =sub_8101A74 b @0810198E .align 2, 0 .pool @08101984: - ldr r0, =sub_8101AC4 + 1 + ldr r0, =sub_8101AC4 b @0810198E .align 2, 0 .pool @0810198C: - ldr r0, =sub_8101B84 + 1 + ldr r0, =sub_8101B84 @0810198E: str r0, [r3, 0x1C] pop {r0} @@ -490584,10 +490584,10 @@ sub_8101998: ; 8101998 adds r0, r1 ldrb r0, [r0] strh r0, [r4, 0x34] - ldr r1, =sub_81019E8 + 1 + ldr r1, =sub_81019E8 adds r0, r4, 0 bl oamt_set_x3A_32 - ldr r0, =sub_80A6630 + 1 + ldr r0, =sub_80A6630 str r0, [r4, 0x1C] pop {r4,r5} pop {r0} @@ -490653,7 +490653,7 @@ sub_81019E8: ; 81019E8 ble @08101A5E movs r0, 0 strh r0, [r5, 0x2E] - ldr r0, =sub_8101B84 + 1 + ldr r0, =sub_8101B84 str r0, [r5, 0x1C] @08101A5E: pop {r4-r6} @@ -490688,10 +490688,10 @@ sub_8101A74: ; 8101A74 adds r0, r1 ldrb r0, [r0] strh r0, [r4, 0x34] - ldr r1, =sub_8101B84 + 1 + ldr r1, =sub_8101B84 adds r0, r4, 0 bl oamt_set_x3A_32 - ldr r0, =sub_80A6630 + 1 + ldr r0, =sub_80A6630 str r0, [r4, 0x1C] pop {r4,r5} pop {r0} @@ -490713,7 +490713,7 @@ sub_8101AC4: ; 8101AC4 ble @08101ADE movs r0, 0 strh r0, [r1, 0x2E] - ldr r0, =sub_8101AE8 + 1 + ldr r0, =sub_8101AE8 str r0, [r1, 0x1C] @08101ADE: pop {r0} @@ -490790,7 +490790,7 @@ sub_8101AE8: ; 8101AE8 lsls r0, 24 lsrs r0, 24 bl sub_80A7344 - ldr r0, =sub_8101B84 + 1 + ldr r0, =sub_8101B84 str r0, [r5, 0x1C] @08101B78: pop {r4,r5} @@ -490812,7 +490812,7 @@ sub_8101B84: ; 8101B84 sub_8101B90: ; 8101B90 movs r1, 0 strh r1, [r0, 0x2E] - ldr r1, =sub_8101BA0 + 1 + ldr r1, =sub_8101BA0 str r1, [r0, 0x1C] bx lr .align 2, 0 @@ -490986,7 +490986,7 @@ sub_8101C94: ; 8101C94 negs r0, r0 strh r0, [r5, 0x12] @08101CFC: - ldr r0, =sub_8101D2C + 1 + ldr r0, =sub_8101D2C b @08101D20 .align 2, 0 .pool @@ -491005,7 +491005,7 @@ sub_8101C94: ; 8101C94 negs r0, r1 strh r0, [r5, 0x12] @08101D1E: - ldr r0, =sub_8101EEC + 1 + ldr r0, =sub_8101EEC @08101D20: str r0, [r5] @08101D22: @@ -491333,10 +491333,10 @@ sub_8101F40: ; 8101F40 movs r0, 0 strh r0, [r5, 0x2E] strh r0, [r5, 0x30] - ldr r1, =sub_810208C + 1 + ldr r1, =sub_810208C adds r0, r5, 0 bl oamt_set_x3A_32 - ldr r0, =sub_80A67D8 + 1 + ldr r0, =sub_80A67D8 str r0, [r5, 0x1C] pop {r4-r6} pop {r0} @@ -491364,10 +491364,10 @@ sub_8101FA8: ; 8101FA8 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x22] - ldr r1, =sub_8102044 + 1 + ldr r1, =sub_8102044 adds r0, r4, 0 bl oamt_set_x3A_32 - ldr r0, =sub_80A67D8 + 1 + ldr r0, =sub_80A67D8 str r0, [r4, 0x1C] pop {r4,r5} pop {r0} @@ -491404,7 +491404,7 @@ sub_8101FF0: ; 8101FF0 bl obj_anim_image_start strh r6, [r4, 0x2E] strh r6, [r4, 0x30] - ldr r0, =sub_810208C + 1 + ldr r0, =sub_810208C str r0, [r4, 0x1C] pop {r4-r6} pop {r0} @@ -491430,10 +491430,10 @@ sub_8102044: ; 8102044 strh r0, [r4, 0x30] movs r0, 0 strh r0, [r4, 0x32] - ldr r1, =sub_810207C + 1 + ldr r1, =sub_810207C adds r0, r4, 0 bl oamt_set_x3A_32 - ldr r0, =sub_80A653C + 1 + ldr r0, =sub_80A653C str r0, [r4, 0x1C] @0810206E: pop {r4} @@ -491448,7 +491448,7 @@ sub_810207C: ; 810207C movs r1, 0 strh r1, [r0, 0x2E] strh r1, [r0, 0x30] - ldr r1, =sub_810208C + 1 + ldr r1, =sub_810208C str r1, [r0, 0x1C] bx lr .align 2, 0 @@ -491534,7 +491534,7 @@ sub_81020D8: ; 81020D8 ldr r0, =0x0203841e ldrh r0, [r0, 0x6] strh r0, [r5, 0x30] - ldr r0, =sub_810213C + 1 + ldr r0, =sub_810213C str r0, [r5, 0x1C] pop {r4-r6} pop {r0} @@ -491610,7 +491610,7 @@ sub_810217C: ; 810217C lsls r0, 24 asrs r0, 24 strh r0, [r4, 0x38] - ldr r0, =sub_81021CC + 1 + ldr r0, =sub_81021CC str r0, [r4, 0x1C] pop {r4-r6} pop {r0} @@ -491831,7 +491831,7 @@ sub_810234C: ; 810234C ldr r0, =0x0203841e ldrh r0, [r0, 0x4] strh r0, [r4, 0x2E] - ldr r0, =sub_810237C + 1 + ldr r0, =sub_810237C str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -491875,9 +491875,9 @@ sub_810237C: ; 810237C lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x36] - ldr r0, =sub_80A6EEC + 1 + ldr r0, =sub_80A6EEC str r0, [r5, 0x1C] - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 adds r0, r5, 0 bl oamt_set_x3A_32 @081023CC: @@ -492047,7 +492047,7 @@ sub_81024E0: ; 81024E0 strb r0, [r4, 0x3] movs r0, 0 strh r0, [r4, 0x2E] - ldr r0, =sub_8102528 + 1 + ldr r0, =sub_8102528 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -492094,7 +492094,7 @@ sub_8102540: ; 8102540 strh r1, [r4, 0x34] movs r0, 0x1 strh r0, [r4, 0x36] - ldr r0, =sub_8102584 + 1 + ldr r0, =sub_8102584 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -492224,7 +492224,7 @@ sub_81025C0: ; 81025C0 movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r1, =sub_81026A8 + 1 + ldr r1, =sub_81026A8 str r1, [r6] adds r0, r7, 0 bl _call_via_r1 @@ -492584,7 +492584,7 @@ sub_8102844: ; 8102844 orrs r0, r1 strb r0, [r5, 0x3] @08102958: - ldr r0, =sub_810296C + 1 + ldr r0, =sub_810296C str r0, [r5, 0x1C] pop {r4-r6} pop {r0} @@ -492726,7 +492726,7 @@ sub_81029B4: ; 81029B4 mov r0, r8 strh r0, [r4, 0x32] add r2, r9 - ldr r0, =sub_8102B3C + 1 + ldr r0, =sub_8102B3C str r0, [r2] ldrh r0, [r6, 0xE] adds r0, 0x1 @@ -492744,7 +492744,7 @@ sub_81029B4: ; 81029B4 cmp r0, 0 bge @08102A54 @08102A9A: - ldr r0, =sub_8102AE0 + 1 + ldr r0, =sub_8102AE0 str r0, [r6] ldr r0, =0x02038436 ldrb r0, [r0] @@ -492899,9 +492899,9 @@ sub_8102B3C: ; 8102B3C sub_8102BCC: ; 8102BCC push {r4,lr} adds r4, r0, 0 - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 bl oamt_set_x3A_32 - ldr r0, =sub_80A67D8 + 1 + ldr r0, =sub_80A67D8 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -493110,7 +493110,7 @@ sub_8102CD4: ; 8102CD4 movs r4, 0x28 str r4, [sp] bl sub_8102D8C - ldr r0, =sub_8102DE4 + 1 + ldr r0, =sub_8102DE4 str r0, [r5, 0x1C] add sp, 0x4 pop {r4-r6} @@ -493333,7 +493333,7 @@ sub_8102EB0: ; 8102EB0 movs r1, 0x5 bl __divsi3 strh r0, [r6, 0x3C] - ldr r0, =sub_8102F40 + 1 + ldr r0, =sub_8102F40 str r0, [r6, 0x1C] pop {r4-r7} pop {r0} @@ -493445,9 +493445,9 @@ sub_8102FB8: ; 8102FB8 strh r0, [r5, 0x22] movs r0, 0x8 strh r0, [r5, 0x2E] - ldr r0, =sub_80A64B0 + 1 + ldr r0, =sub_80A64B0 str r0, [r5, 0x1C] - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 adds r0, r5, 0 bl oamt_set_x3A_32 pop {r4-r6} @@ -493512,7 +493512,7 @@ sub_8103028: ; 8103028 bl obj_translate_based_on_private_1_2_3_4 ldrh r0, [r5, 0x6] strh r0, [r4, 0x38] - ldr r0, =sub_81030B0 + 1 + ldr r0, =sub_81030B0 str r0, [r4, 0x1C] pop {r4,r5} pop {r0} @@ -493650,10 +493650,10 @@ sub_8103164: ; 8103164 strh r0, [r5, 0x30] adds r0, r5, 0 bl obj_anim_image_start - ldr r1, =sub_81031D0 + 1 + ldr r1, =sub_81031D0 adds r0, r5, 0 bl oamt_set_x3A_32 - ldr r0, =sub_80A67D8 + 1 + ldr r0, =sub_80A67D8 str r0, [r5, 0x1C] pop {r4,r5} pop {r0} @@ -493672,7 +493672,7 @@ sub_81031D0: ; 81031D0 lsls r0, 16 cmp r0, 0 bne @081031F8 - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 adds r0, r4, 0 bl oamt_set_x3A_32 ldrh r1, [r4, 0x30] @@ -493680,7 +493680,7 @@ sub_81031D0: ; 81031D0 lsrs r1, 24 adds r0, r4, 0 bl obj_anim_image_start - ldr r0, =sub_80A67D8 + 1 + ldr r0, =sub_80A67D8 str r0, [r4, 0x1C] @081031F8: pop {r4} @@ -493711,10 +493711,10 @@ sub_8103208: ; 8103208 bl sub_810310C movs r0, 0 strh r0, [r4, 0x2E] - ldr r1, =sub_8103250 + 1 + ldr r1, =sub_8103250 adds r0, r4, 0 bl oamt_set_x3A_32 - ldr r0, =sub_80A67BC + 1 + ldr r0, =sub_80A67BC str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -493737,10 +493737,10 @@ sub_8103250: ; 8103250 adds r0, r4, 0 movs r1, 0x1 bl sub_8008258 - ldr r1, =move_anim_8074EE0 + 1 + ldr r1, =move_anim_8074EE0 adds r0, r4, 0 bl oamt_set_x3A_32 - ldr r0, =sub_80A67BC + 1 + ldr r0, =sub_80A67BC str r0, [r4, 0x1C] @08103276: pop {r4} @@ -493796,10 +493796,10 @@ sub_8103284: ; 8103284 adds r0, 0x4 strh r0, [r4, 0x34] strh r6, [r4, 0x36] - ldr r1, =sub_8103300 + 1 + ldr r1, =sub_8103300 adds r0, r4, 0 bl oamt_set_x3A_32 - ldr r0, =sub_80A67BC + 1 + ldr r0, =sub_80A67BC str r0, [r4, 0x1C] pop {r4-r6} pop {r0} @@ -493819,7 +493819,7 @@ sub_8103300: ; 8103300 asrs r0, 16 cmp r0, 0xC ble @08103316 - ldr r0, =sub_8103320 + 1 + ldr r0, =sub_8103320 str r0, [r1, 0x1C] @08103316: pop {r0} @@ -493847,7 +493847,7 @@ sub_8103320: ; 8103320 cmp r0, 0 bne @0810334C strh r0, [r2, 0x24] - ldr r0, =sub_8103250 + 1 + ldr r0, =sub_8103250 str r0, [r2, 0x1C] b @08103388 .align 2, 0 @@ -493932,7 +493932,7 @@ sub_8103390: ; 8103390 movs r0, 0x3 @081033DE: strh r0, [r5, 0x2E] - ldr r0, =sub_81033F0 + 1 + ldr r0, =sub_81033F0 str r0, [r5, 0x1C] pop {r4,r5} pop {r0} @@ -493959,10 +493959,10 @@ sub_81033F0: ; 81033F0 lsrs r1, 24 adds r0, r4, 0 bl obj_anim_image_start - ldr r1, =sub_810342C + 1 + ldr r1, =sub_810342C adds r0, r4, 0 bl oamt_set_x3A_32 - ldr r0, =sub_80A67D8 + 1 + ldr r0, =sub_80A67D8 str r0, [r4, 0x1C] @0810341E: pop {r4} @@ -494012,10 +494012,10 @@ sub_8103448: ; 8103448 strh r0, [r4, 0x34] ldrh r0, [r5, 0x6] strh r0, [r4, 0x36] - ldr r1, =move_anim_8074EE0 + 1 + ldr r1, =move_anim_8074EE0 adds r0, r4, 0 bl oamt_set_x3A_32 - ldr r1, =sub_80A6450 + 1 + ldr r1, =sub_80A6450 str r1, [r4, 0x1C] adds r0, r4, 0 bl _call_via_r1 @@ -494048,7 +494048,7 @@ sub_8103498: ; 8103498 movs r0, 0 strh r0, [r4, 0x2E] strh r0, [r4, 0x30] - ldr r0, =sub_81034D8 + 1 + ldr r0, =sub_81034D8 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -494211,7 +494211,7 @@ sub_810358C: ; 810358C ldrh r0, [r1, 0x6] strh r0, [r5, 0x30] strh r6, [r5, 0x32] - ldr r0, =sub_810353C + 1 + ldr r0, =sub_810353C str r0, [r5, 0x1C] adds r2, r5, 0 adds r2, 0x3E @@ -494239,9 +494239,9 @@ sub_8103620: ; 8103620 strh r0, [r4, 0x30] ldrh r0, [r1, 0x8] strh r0, [r4, 0x38] - ldr r0, =sub_80A64B0 + 1 + ldr r0, =sub_80A64B0 str r0, [r4, 0x1C] - ldr r1, =sub_8103658 + 1 + ldr r1, =sub_8103658 adds r0, r4, 0 bl oamt_set_x3A_32 pop {r4} @@ -494261,9 +494261,9 @@ sub_8103658: ; 8103658 ldrh r1, [r0, 0x22] adds r1, 0xF strh r1, [r0, 0x36] - ldr r1, =sub_80A6EEC + 1 + ldr r1, =sub_80A6EEC str r1, [r0, 0x1C] - ldr r1, =sub_8103680 + 1 + ldr r1, =sub_8103680 bl oamt_set_x3A_32 pop {r0} bx r0 @@ -494309,7 +494309,7 @@ sub_81036A0: ; 81036A0 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81036DC + 1 + ldr r1, =sub_81036DC str r1, [r0] pop {r4} pop {r0} @@ -494509,9 +494509,9 @@ sub_81037D8: ; 81037D8 orrs r0, r1 strb r0, [r2] @08103860: - ldr r0, =sub_80A67D8 + 1 + ldr r0, =sub_80A67D8 str r0, [r4, 0x1C] - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 adds r0, r4, 0 bl oamt_set_x3A_32 pop {r4,r5} @@ -494527,9 +494527,9 @@ sub_810387C: ; 810387C adds r4, r0, 0 movs r1, 0 bl sub_80A69CC - ldr r0, =sub_80A67BC + 1 + ldr r0, =sub_80A67BC str r0, [r4, 0x1C] - ldr r1, =sub_81038A0 + 1 + ldr r1, =sub_81038A0 adds r0, r4, 0 bl oamt_set_x3A_32 pop {r4} @@ -494549,9 +494549,9 @@ sub_81038A0: ; 81038A0 ldrh r1, [r0, 0x22] subs r1, 0x20 strh r1, [r0, 0x36] - ldr r1, =sub_80A6EEC + 1 + ldr r1, =sub_80A6EEC str r1, [r0, 0x1C] - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 bl oamt_set_x3A_32 pop {r0} bx r0 @@ -494660,9 +494660,9 @@ sub_81038C8: ; 81038C8 mov r0, r8 strh r0, [r5, 0x32] strh r7, [r5, 0x36] - ldr r0, =sub_80A6EEC + 1 + ldr r0, =sub_80A6EEC str r0, [r5, 0x1C] - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 adds r0, r5, 0 bl oamt_set_x3A_32 add sp, 0x4 @@ -494785,7 +494785,7 @@ sub_8103A00: ; 8103A00 bgt @08103A98 movs r0, 0x1E strh r0, [r2, 0x2E] - ldr r0, =sub_81039CC + 1 + ldr r0, =sub_81039CC str r0, [r2, 0x1C] @08103A98: pop {r4} @@ -494947,7 +494947,7 @@ sub_8103AA4: ; 8103AA4 adds r0, r4, 0 bl sub_8151534 strh r0, [r7, 0x36] - ldr r0, =sub_8103A00 + 1 + ldr r0, =sub_8103A00 str r0, [r7, 0x1C] @08103BD4: pop {r3} @@ -495083,7 +495083,7 @@ sub_8103C0C: ; 8103C0C ldrsh r0, [r4, r3] cmp r0, 0x2 ble @08103CE0 - ldr r0, =sub_8103BE4 + 1 + ldr r0, =sub_8103BE4 str r0, [r4] @08103CE0: pop {r4-r7} @@ -495425,7 +495425,7 @@ sub_8103CF0: ; 8103CF0 movs r0, 0x3 strh r0, [r1, 0xC] @08103FC8: - ldr r0, =sub_8103C0C + 1 + ldr r0, =sub_8103C0C str r0, [r1] add sp, 0x4 pop {r3-r5} @@ -495454,7 +495454,7 @@ sub_8103FE8: ; 8103FE8 lsls r1, 1 adds r0, r1 strh r0, [r4, 0x2E] - ldr r0, =sub_8104018 + 1 + ldr r0, =sub_8104018 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -495590,9 +495590,9 @@ sub_8104088: ; 8104088 strh r0, [r5, 0x2E] strh r6, [r5, 0x32] strh r7, [r5, 0x36] - ldr r0, =sub_80A7000 + 1 + ldr r0, =sub_80A7000 str r0, [r5, 0x1C] - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 adds r0, r5, 0 bl oamt_set_x3A_32 add sp, 0x4 @@ -495610,7 +495610,7 @@ sub_810413C: ; 810413C ldrh r1, [r0, 0x22] adds r1, 0x8 strh r1, [r0, 0x22] - ldr r1, =sub_8104154 + 1 + ldr r1, =sub_8104154 str r1, [r0, 0x1C] bx lr .align 2, 0 @@ -495696,7 +495696,7 @@ sub_81041C4: ; 81041C4 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x36] - ldr r0, =sub_80A6EEC + 1 + ldr r0, =sub_80A6EEC str r0, [r4, 0x1C] adds r2, r4, 0 adds r2, 0x2C @@ -495704,7 +495704,7 @@ sub_81041C4: ; 81041C4 movs r1, 0x80 orrs r0, r1 strb r0, [r2] - ldr r1, =sub_810421C + 1 + ldr r1, =sub_810421C adds r0, r4, 0 bl oamt_set_x3A_32 pop {r4,r5} @@ -495762,7 +495762,7 @@ sub_810421C: ; 810421C bl __umodsi3 adds r0, 0xA0 strh r0, [r4, 0x3C] - ldr r0, =sub_81042A0 + 1 + ldr r0, =sub_81042A0 str r0, [r4, 0x1C] adds r2, r4, 0 adds r2, 0x2C @@ -495858,9 +495858,9 @@ sub_8104304: ; 8104304 strh r0, [r4, 0x34] ldrh r0, [r1, 0x6] strh r0, [r4, 0x36] - ldr r0, =sub_80A62EC + 1 + ldr r0, =sub_80A62EC str r0, [r4, 0x1C] - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 adds r0, r4, 0 bl oamt_set_x3A_32 ldr r1, [r4, 0x1C] @@ -495924,9 +495924,9 @@ sub_8104364: ; 8104364 lsrs r0, 24 adds r0, r6 strh r0, [r5, 0x36] - ldr r0, =sub_80A6EEC + 1 + ldr r0, =sub_80A6EEC str r0, [r5, 0x1C] - ldr r1, =sub_81043F8 + 1 + ldr r1, =sub_81043F8 adds r0, r5, 0 bl oamt_set_x3A_32 pop {r3} @@ -496020,7 +496020,7 @@ sub_8104414: ; 8104414 strh r0, [r5, 0x38] ldrh r0, [r5, 0x2E] strh r0, [r5, 0x3A] - ldr r0, =sub_81044BC + 1 + ldr r0, =sub_81044BC str r0, [r5, 0x1C] pop {r3,r4} mov r8, r3 @@ -496080,7 +496080,7 @@ sub_81044BC: ; 81044BC strh r0, [r4, 0x32] strh r2, [r4, 0x36] strh r2, [r4, 0x34] - ldr r0, =sub_8104530 + 1 + ldr r0, =sub_8104530 str r0, [r4, 0x1C] @08104520: pop {r4} @@ -496135,7 +496135,7 @@ sub_8104530: ; 8104530 lsrs r1, 24 adds r0, r4, 0 bl obj_anim_image_start - ldr r0, =sub_8104594 + 1 + ldr r0, =sub_8104594 str r0, [r4, 0x1C] @0810458A: pop {r4} @@ -496197,7 +496197,7 @@ sub_81045B0: ; 81045B0 adds r0, r1 movs r1, 0x50 strh r1, [r0, 0x8] - ldr r1, =sub_8104614 + 1 + ldr r1, =sub_8104614 str r1, [r0] pop {r4,r5} pop {r0} @@ -496284,7 +496284,7 @@ sub_8104674: ; 8104674 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x16] - ldr r0, =sub_81046CC + 1 + ldr r0, =sub_81046CC str r0, [r4] pop {r4,r5} pop {r0} @@ -496532,7 +496532,7 @@ sub_8104800: ; 8104800 strh r0, [r4, 0x32] adds r5, 0x1C adds r3, r5 - ldr r0, =sub_81048F0 + 1 + ldr r0, =sub_81048F0 str r0, [r3] mov r1, r8 lsls r0, r1, 24 @@ -496642,7 +496642,7 @@ sub_8104938: ; 8104938 ldr r2, =gUnknown_085935E8 adds r0, r4, 0 bl sub_80A7CFC - ldr r0, =sub_8104998 + 1 + ldr r0, =sub_8104998 str r0, [r4] @0810498A: pop {r4,r5} @@ -496816,7 +496816,7 @@ sub_8104AB4: ; 8104AB4 ldr r2, =gUnknown_08593608 adds r0, r4, 0 bl sub_80A7CFC - ldr r0, =sub_8104AF0 + 1 + ldr r0, =sub_8104AF0 str r0, [r4] pop {r4} pop {r0} @@ -496900,10 +496900,10 @@ sub_8104B1C: ; 8104B1C strh r1, [r4, 0x32] strh r1, [r4, 0x34] strh r1, [r4, 0x36] - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 adds r0, r4, 0 bl oamt_set_x3A_32 - ldr r0, =sub_80A656C + 1 + ldr r0, =sub_80A656C str r0, [r4, 0x1C] pop {r4,r5} pop {r0} @@ -496965,10 +496965,10 @@ sub_8104BAC: ; 8104BAC movs r0, 0x8 strh r0, [r6, 0x22] @08104C16: - ldr r1, =move_anim_8074EE0 + 1 + ldr r1, =move_anim_8074EE0 adds r0, r6, 0 bl oamt_set_x3A_32 - ldr r0, =sub_80A67BC + 1 + ldr r0, =sub_80A67BC str r0, [r6, 0x1C] pop {r4-r6} pop {r0} @@ -496998,7 +496998,7 @@ sub_8104C38: ; 8104C38 ldr r2, =gUnknown_085936A4 adds r0, r4, 0 bl sub_80A7CFC - ldr r0, =sub_8104C78 + 1 + ldr r0, =sub_8104C78 str r0, [r4] pop {r4} pop {r0} @@ -497085,7 +497085,7 @@ sub_8104CA4: ; 8104CA4 negs r0, r0 strh r0, [r4, 0xC] @08104D0E: - ldr r0, =sub_8104D28 + 1 + ldr r0, =sub_8104D28 str r0, [r4] pop {r4} pop {r0} @@ -497361,7 +497361,7 @@ sub_8104E74: ; 8104E74 ldr r1, [sp, 0x4] ldr r2, [sp, 0x8] bl sub_80BA038 - ldr r0, =sub_8104F54 + 1 + ldr r0, =sub_8104F54 str r0, [r5] add sp, 0xC pop {r4-r6} @@ -497514,7 +497514,7 @@ sub_810501C: ; 810501C lsls r0, 24 asrs r0, 24 strh r0, [r4, 0x3A] - ldr r0, =sub_8105078 + 1 + ldr r0, =sub_8105078 str r0, [r4, 0x1C] pop {r4-r6} pop {r0} @@ -497784,7 +497784,7 @@ sub_81051C4: ; 81051C4 subs r0, r4 strh r0, [r1] @0810526A: - ldr r1, =sub_80A77C8 + 1 + ldr r1, =sub_80A77C8 str r1, [r6, 0x1C] adds r0, r6, 0 bl _call_via_r1 @@ -498063,7 +498063,7 @@ sub_81052A4: ; 81052A4 strh r0, [r5, 0x2E] adds r0, r5, 0 bl obj_translate_based_on_private_1_2_3_4 - ldr r1, =sub_8105284 + 1 + ldr r1, =sub_8105284 str r1, [r5, 0x1C] adds r0, r5, 0 bl _call_via_r1 @@ -498102,7 +498102,7 @@ sub_81054E8: ; 81054E8 adds r0, r4, 0 movs r1, 0x1 bl sub_8008258 - ldr r1, =sub_80A77C8 + 1 + ldr r1, =sub_80A77C8 str r1, [r4, 0x1C] adds r0, r4, 0 bl _call_via_r1 @@ -498135,7 +498135,7 @@ sub_8105538: ; 8105538 ldr r0, =0x0203841e ldrh r0, [r0, 0x4] strh r0, [r4, 0x3C] - ldr r0, =sub_810557C + 1 + ldr r0, =sub_810557C str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -498193,7 +498193,7 @@ sub_810557C: ; 810557C adds r0, r4, 0 movs r1, 0x1 bl sub_8008258 - ldr r0, =sub_81055F4 + 1 + ldr r0, =sub_81055F4 str r0, [r4, 0x1C] @081055E0: pop {r4,r5} @@ -498217,7 +498217,7 @@ sub_81055F4: ; 81055F4 adds r0, r4, 0 movs r1, 0x2 bl sub_8008258 - ldr r0, =sub_810561C + 1 + ldr r0, =sub_810561C str r0, [r4, 0x1C] @08105612: pop {r4} @@ -498257,7 +498257,7 @@ sub_810561C: ; 810561C ands r0, r2 orrs r0, r1 strh r0, [r4, 0x4] - ldr r0, =sub_8105694 + 1 + ldr r0, =sub_8105694 b @08105680 .align 2, 0 .pool @@ -498273,7 +498273,7 @@ sub_810561C: ; 810561C ands r0, r2 orrs r0, r1 strh r0, [r4, 0x4] - ldr r0, =sub_810571C + 1 + ldr r0, =sub_810571C @08105680: str r0, [r4, 0x1C] @08105682: @@ -498309,7 +498309,7 @@ sub_8105694: ; 8105694 ldrh r1, [r4, 0x2E] movs r0, 0x52 bl lcd_io_set - ldr r0, =sub_81056D4 + 1 + ldr r0, =sub_81056D4 str r0, [r4, 0x1C] @081056CA: pop {r4} @@ -498348,7 +498348,7 @@ sub_81056D4: ; 81056D4 ldrsh r0, [r4, r1] cmp r0, 0 bne @08105712 - ldr r0, =sub_810571C + 1 + ldr r0, =sub_810571C str r0, [r4, 0x1C] @08105712: pop {r4} @@ -498377,12 +498377,12 @@ sub_810571C: ; 810571C ldrsh r0, [r3, r1] cmp r0, 0 bne @08105750 - ldr r0, =sub_810575C + 1 + ldr r0, =sub_810575C b @08105752 .align 2, 0 .pool @08105750: - ldr r0, =move_anim_8072740 + 1 + ldr r0, =move_anim_8072740 @08105752: str r0, [r3, 0x1C] @08105754: @@ -498428,7 +498428,7 @@ sub_810577C: ; 810577C ldr r2, =gUnknown_085938B0 adds r0, r4, 0 bl sub_80A7CFC - ldr r0, =sub_81057B8 + 1 + ldr r0, =sub_81057B8 str r0, [r4] pop {r4} pop {r0} @@ -498522,7 +498522,7 @@ sub_8105810: ; 8105810 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x26] - ldr r0, =sub_8105878 + 1 + ldr r0, =sub_8105878 str r0, [r4] pop {r4} pop {r0} @@ -498714,7 +498714,7 @@ sub_810599C: ; 810599C lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x26] - ldr r0, =sub_81059E0 + 1 + ldr r0, =sub_81059E0 str r0, [r4] pop {r4} pop {r0} @@ -498864,7 +498864,7 @@ sub_8105AAC: ; 8105AAC lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x26] - ldr r0, =sub_8105B08 + 1 + ldr r0, =sub_8105B08 str r0, [r4] pop {r4,r5} pop {r0} @@ -499280,9 +499280,9 @@ sub_8105DE8: ; 8105DE8 ldrh r1, [r4, 0x6] adds r0, r1 strh r0, [r5, 0x36] - ldr r0, =sub_80A6EEC + 1 + ldr r0, =sub_80A6EEC str r0, [r5, 0x1C] - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 adds r0, r5, 0 bl oamt_set_x3A_32 ldrb r1, [r4, 0xA] @@ -499382,7 +499382,7 @@ sub_8105EB0: ; 8105EB0 adds r0, r1 strh r5, [r0, 0x8] strh r6, [r0, 0xA] - ldr r1, =sub_8105F30 + 1 + ldr r1, =sub_8105F30 str r1, [r0] pop {r4-r7} pop {r0} @@ -499416,7 +499416,7 @@ sub_8105F30: ; 8105F30 ldr r0, =0x02022e24 movs r1, 0 strh r1, [r0] - ldr r0, =sub_8105F84 + 1 + ldr r0, =sub_8105F84 str r0, [r3] b @08105F78 .align 2, 0 @@ -499665,7 +499665,7 @@ sub_8106140: ; 8106140 strh r0, [r4, 0x36] adds r0, r4, 0 bl obj_translate_based_on_private_1_2_3_4 - ldr r0, =sub_810618C + 1 + ldr r0, =sub_810618C str r0, [r4, 0x1C] pop {r4,r5} pop {r0} @@ -499787,9 +499787,9 @@ sub_810624C: ; 810624C strh r1, [r0, 0x2E] ldrh r1, [r2, 0x2] strh r1, [r0, 0x30] - ldr r1, =sub_80A64B0 + 1 + ldr r1, =sub_80A64B0 str r1, [r0, 0x1C] - ldr r1, =sub_810627C + 1 + ldr r1, =sub_810627C bl oamt_set_x3A_32 pop {r0} bx r0 @@ -499918,7 +499918,7 @@ sub_81062E8: ; 81062E8 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81063A8 + 1 + ldr r1, =sub_81063A8 str r1, [r0] add sp, 0x10 pop {r4,r5} @@ -500182,7 +500182,7 @@ sub_81064F8: ; 81064F8 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81065EC + 1 + ldr r1, =sub_81065EC str r1, [r0] add sp, 0x10 pop {r4,r5} @@ -500389,7 +500389,7 @@ sub_810673C: ; 810673C lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x3C] - ldr r1, =sub_810679C + 1 + ldr r1, =sub_810679C str r1, [r4, 0x1C] adds r0, r4, 0 bl _call_via_r1 @@ -500538,7 +500538,7 @@ sub_8106878: ; 8106878 movs r1, 0x7 bl cosine strh r0, [r5, 0x30] - ldr r0, =sub_81068CC + 1 + ldr r0, =sub_81068CC str r0, [r5, 0x1C] pop {r4,r5} pop {r0} @@ -500646,7 +500646,7 @@ sub_8106944: ; 8106944 strh r0, [r5, 0x30] ldrh r0, [r4, 0x2] strh r0, [r5, 0x32] - ldr r0, =sub_8106914 + 1 + ldr r0, =sub_8106914 str r0, [r5, 0x1C] pop {r4,r5} pop {r0} @@ -500678,7 +500678,7 @@ sub_81069B8: ; 81069B8 adds r4, r0, 0 movs r1, 0x1 bl sub_80A69CC - ldr r0, =sub_810699C + 1 + ldr r0, =sub_810699C str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -500865,7 +500865,7 @@ sub_8106AD0: ; 8106AD0 strh r0, [r4, 0x34] cmp r0, 0x46 ble @08106B48 - ldr r0, =sub_8106A64 + 1 + ldr r0, =sub_8106A64 str r0, [r4, 0x1C] ldrh r0, [r4, 0x24] ldrh r1, [r4, 0x20] @@ -501147,7 +501147,7 @@ sub_8106CD0: ; 8106CD0 lsrs r1, 24 adds r0, r5, 0 bl obj_anim_image_start - ldr r0, =sub_8106D5C + 1 + ldr r0, =sub_8106D5C str r0, [r5, 0x1C] @08106D50: pop {r4,r5} @@ -501207,7 +501207,7 @@ sub_8106D90: ; 8106D90 ldr r2, =gUnknown_08593B98 adds r0, r4, 0 bl sub_80A7CFC - ldr r0, =sub_8106DD4 + 1 + ldr r0, =sub_8106DD4 str r0, [r4] pop {r4,r5} pop {r0} @@ -501325,7 +501325,7 @@ sub_8106E00: ; 8106E00 ands r0, r2 orrs r0, r1 strh r0, [r5, 0x4] - ldr r0, =sub_8106EC8 + 1 + ldr r0, =sub_8106EC8 str r0, [r5, 0x1C] pop {r4-r7} pop {r0} @@ -501488,7 +501488,7 @@ sub_8106F60: ; 8106F60 ldrsh r0, [r6, r2] cmp r1, r0 ble @0810700A - ldr r0, =sub_8107018 + 1 + ldr r0, =sub_8107018 str r0, [r6, 0x1C] strh r5, [r6, 0x2E] adds r0, r6, 0 @@ -501521,7 +501521,7 @@ sub_8107018: ; 8107018 ble @08107032 movs r0, 0 strh r0, [r1, 0x2E] - ldr r0, =sub_810703C + 1 + ldr r0, =sub_810703C str r0, [r1, 0x1C] @08107032: pop {r0} @@ -501648,9 +501648,9 @@ sub_81070AC: ; 81070AC ldrh r0, [r5, 0x22] subs r0, 0x48 strh r0, [r5, 0x36] - ldr r0, =sub_80A6EEC + 1 + ldr r0, =sub_80A6EEC str r0, [r5, 0x1C] - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 adds r0, r5, 0 bl oamt_set_x3A_32 pop {r4,r5} @@ -501768,7 +501768,7 @@ sub_8107188: ; 8107188 thumb_func_start sub_810721C sub_810721C: ; 810721C - ldr r1, =sub_8107228 + 1 + ldr r1, =sub_8107228 str r1, [r0, 0x1C] bx lr .align 2, 0 @@ -501886,7 +501886,7 @@ sub_8107260: ; 8107260 strh r0, [r6, 0x36] adds r0, r6, 0 bl obj_translate_based_on_private_1_2_3_4 - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 bl object_new_hidden_with_callback adds r4, r0, 0 lsls r4, 24 @@ -501922,7 +501922,7 @@ sub_8107260: ; 8107260 strh r0, [r1, 0x34] ldrh r0, [r5, 0xC] strh r0, [r1, 0x36] - ldr r1, =sub_8107380 + 1 + ldr r1, =sub_8107380 str r1, [r6, 0x1C] adds r0, r6, 0 bl _call_via_r1 @@ -501987,7 +501987,7 @@ sub_8107380: ; 8107380 .align 2, 0 .pool @081073EC: - ldr r0, =sub_8107408 + 1 + ldr r0, =sub_8107408 str r0, [r5, 0x1C] adds r0, r7, 0 bl obj_delete_and_free_tiles @@ -502012,9 +502012,9 @@ sub_8107408: ; 8107408 negs r1, r1 ands r1, r2 strb r1, [r3] - ldr r1, =sub_80A67D8 + 1 + ldr r1, =sub_80A67D8 str r1, [r0, 0x1C] - ldr r1, =sub_8107430 + 1 + ldr r1, =sub_8107430 bl oamt_set_x3A_32 pop {r0} bx r0 @@ -502027,9 +502027,9 @@ sub_8107430: ; 8107430 push {lr} movs r1, 0xA strh r1, [r0, 0x2E] - ldr r1, =sub_80A64B0 + 1 + ldr r1, =sub_80A64B0 str r1, [r0, 0x1C] - ldr r1, =move_anim_8074EE0 + 1 + ldr r1, =move_anim_8074EE0 bl oamt_set_x3A_32 pop {r0} bx r0 @@ -502087,7 +502087,7 @@ sub_810744C: ; 810744C strh r0, [r5, 0x36] adds r0, r5, 0 bl obj_translate_based_on_private_1_2_3_4 - ldr r0, =sub_81074E4 + 1 + ldr r0, =sub_81074E4 str r0, [r5, 0x1C] adds r2, r5, 0 adds r2, 0x2C @@ -502160,7 +502160,7 @@ sub_8107528: ; 8107528 lsls r1, 1 adds r0, r1 strh r0, [r4, 0xC] - ldr r0, =sub_810756C + 1 + ldr r0, =sub_810756C str r0, [r4] pop {r4} pop {r0} @@ -502291,7 +502291,7 @@ sub_81075EC: ; 81075EC lsls r0, r1, 8 strh r0, [r5, 0x3A] @08107660: - ldr r1, =sub_8107674 + 1 + ldr r1, =sub_8107674 str r1, [r5, 0x1C] adds r0, r5, 0 bl _call_via_r1 @@ -502361,7 +502361,7 @@ sub_81076C8: ; 81076C8 movs r2, 0 strh r0, [r1, 0x8] strh r2, [r3, 0xE] - ldr r0, =sub_81076F4 + 1 + ldr r0, =sub_81076F4 str r0, [r1] bx lr .align 2, 0 @@ -502448,7 +502448,7 @@ sub_8107730: ; 8107730 adds r1, r4, 0 adds r1, 0x43 strb r0, [r1] - ldr r0, =sub_81077A4 + 1 + ldr r0, =sub_81077A4 str r0, [r4, 0x1C] pop {r4-r7} pop {r0} @@ -502559,9 +502559,9 @@ sub_81077C0: ; 81077C0 ldrh r5, [r5, 0x6] adds r0, r5 strh r0, [r6, 0x36] - ldr r0, =sub_80A6EEC + 1 + ldr r0, =sub_80A6EEC str r0, [r6, 0x1C] - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 adds r0, r6, 0 bl oamt_set_x3A_32 pop {r4-r7} @@ -502587,9 +502587,9 @@ sub_8107894: ; 8107894 ldrh r0, [r4, 0x22] adds r1, r0 strh r1, [r4, 0x36] - ldr r0, =sub_80A6EEC + 1 + ldr r0, =sub_80A6EEC str r0, [r4, 0x1C] - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 adds r0, r4, 0 bl oamt_set_x3A_32 pop {r4} @@ -502622,7 +502622,7 @@ sub_81078D0: ; 81078D0 ldr r0, =0x0203841e ldrh r0, [r0, 0x4] strh r0, [r4, 0x3C] - ldr r0, =sub_810790C + 1 + ldr r0, =sub_810790C str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -502761,7 +502761,7 @@ sub_8107954: ; 8107954 movs r2, 0x20 bl decompress_palette @08107A32: - ldr r0, =sub_8107D58 + 1 + ldr r0, =sub_8107D58 ldr r4, =0x03005e00 mov r2, r10 lsls r5, r2, 2 @@ -502887,7 +502887,7 @@ sub_8107954: ; 8107954 adds r0, r1 movs r1, 0x1 strh r1, [r0, 0x14] - ldr r1, =sub_8107B84 + 1 + ldr r1, =sub_8107B84 str r1, [r0] add sp, 0x10 pop {r3-r5} @@ -503050,7 +503050,7 @@ sub_8107B84: ; 8107B84 cmp r3, 0 bne @08107CA8 strh r3, [r2, 0x8] - ldr r0, =sub_8107CC4 + 1 + ldr r0, =sub_8107CC4 str r0, [r2] @08107CA8: add sp, 0x10 @@ -503551,7 +503551,7 @@ sub_8108034: ; 8108034 @0810807A: strh r5, [r4, 0x30] strh r1, [r4, 0x32] - ldr r0, =sub_8108098 + 1 + ldr r0, =sub_8108098 str r0, [r4, 0x1C] pop {r4-r6} pop {r0} @@ -503637,7 +503637,7 @@ sub_81080E4: ; 81080E4 lsrs r0, 24 movs r1, 0 bl sub_80A7270 - ldr r0, =sub_8108140 + 1 + ldr r0, =sub_8108140 str r0, [r4] pop {r4} pop {r0} @@ -504268,7 +504268,7 @@ sub_81085C8: ; 81085C8 adds r0, r1 adds r0, 0x5 strh r0, [r4, 0x20] - ldr r0, =sub_810862C + 1 + ldr r0, =sub_810862C str r0, [r4] pop {r4} pop {r0} @@ -504326,7 +504326,7 @@ sub_810862C: ; 810862C strh r0, [r5, 0x2] movs r0, 0xC strh r0, [r5, 0x4] - ldr r6, =sub_81152DC + 1 + ldr r6, =sub_81152DC adds r0, r6, 0 movs r1, 0x50 bl AddTask @@ -504433,7 +504433,7 @@ sub_810871C: ; 810871C adds r1, r3, 0 adds r1, 0x1C adds r1, r0, r1 - ldr r2, =sub_81087C0 + 1 + ldr r2, =sub_81087C0 str r2, [r1] adds r0, r3 strh r5, [r0, 0x38] @@ -504541,7 +504541,7 @@ sub_81087C0: ; 81087C0 lsls r0, 2 adds r4, 0x1C adds r0, r4 - ldr r1, =sub_810886C + 1 + ldr r1, =sub_810886C str r1, [r0] @08108850: adds r0, r5, 0 @@ -504676,7 +504676,7 @@ sub_81088E4: ; 81088E4 strh r0, [r5, 0x1A] strh r6, [r5, 0xA] strh r6, [r5, 0x8] - ldr r0, =sub_8108978 + 1 + ldr r0, =sub_8108978 str r0, [r5] pop {r4-r6} pop {r0} @@ -504890,7 +504890,7 @@ sub_8108AC0: ; 8108AC0 bl sub_80A68D4 adds r5, 0x1C adds r4, r5 - ldr r0, =sub_8108B2C + 1 + ldr r0, =sub_8108B2C str r0, [r4] ldrh r0, [r6, 0x18] adds r0, 0x1 @@ -504943,7 +504943,7 @@ sub_8108B2C: ; 8108B2C strh r1, [r6, 0x38] adds r0, r6, 0 bl sub_80A68D4 - ldr r0, =sub_8108B94 + 1 + ldr r0, =sub_8108B94 str r0, [r6, 0x1C] @08108B86: pop {r4-r6} @@ -504969,7 +504969,7 @@ sub_8108B94: ; 8108B94 lsls r0, 3 adds r2, r0, r6 ldr r1, [r2] - ldr r0, =sub_8108978 + 1 + ldr r0, =sub_8108978 cmp r1, r0 bne @08108BC6 movs r0, 0x1 @@ -505008,7 +505008,7 @@ sub_8108BE0: ; 8108BE0 strh r1, [r0, 0x32] ldrh r1, [r2, 0xA] strh r1, [r0, 0x34] - ldr r1, =sub_8108C08 + 1 + ldr r1, =sub_8108C08 str r1, [r0, 0x1C] bx lr .align 2, 0 @@ -505112,7 +505112,7 @@ sub_8108C94: ; 8108C94 strh r0, [r4, 0x34] ldrh r0, [r1, 0x6] strh r0, [r4, 0x36] - ldr r0, =sub_8108CDC + 1 + ldr r0, =sub_8108CDC str r0, [r4, 0x1C] pop {r4,r5} pop {r0} @@ -505377,10 +505377,10 @@ sub_8108EC8: ; 8108EC8 movs r0, 0xFE lsls r0, 8 strh r0, [r4, 0x36] - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 adds r0, r4, 0 bl oamt_set_x3A_32 - ldr r1, =sub_80A634C + 1 + ldr r1, =sub_80A634C str r1, [r4, 0x1C] adds r0, r4, 0 bl _call_via_r1 @@ -505410,9 +505410,9 @@ sub_8108F08: ; 8108F08 strh r0, [r4, 0x30] ldrh r0, [r5, 0x6] strh r0, [r4, 0x32] - ldr r0, =sub_80A656C + 1 + ldr r0, =sub_80A656C str r0, [r4, 0x1C] - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 adds r0, r4, 0 bl oamt_set_x3A_32 pop {r4,r5} @@ -505468,7 +505468,7 @@ sub_8108F4C: ; 8108F4C strh r0, [r4, 0x36] ldrh r0, [r1, 0xA] strh r0, [r4, 0x34] - ldr r0, =sub_8109028 + 1 + ldr r0, =sub_8109028 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -505522,7 +505522,7 @@ sub_8108FBC: ; 8108FBC strh r0, [r4, 0x36] ldrh r0, [r1, 0xA] strh r0, [r4, 0x34] - ldr r0, =sub_8109028 + 1 + ldr r0, =sub_8109028 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -505613,7 +505613,7 @@ sub_8109064: ; 8109064 ldrh r0, [r2, 0xC] strh r0, [r4, 0x36] strh r1, [r4, 0x38] - ldr r0, =sub_81090D8 + 1 + ldr r0, =sub_81090D8 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -505712,9 +505712,9 @@ sub_810916C: ; 810916C strh r1, [r0, 0x32] movs r1, 0x50 strh r1, [r0, 0x36] - ldr r1, =sub_80A6EEC + 1 + ldr r1, =sub_80A6EEC str r1, [r0, 0x1C] - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 bl oamt_set_x3A_32 pop {r0} bx r0 @@ -505757,7 +505757,7 @@ sub_8109198: ; 8109198 negs r0, r0 strh r0, [r1, 0x4] @081091DE: - ldr r1, =sub_80A7938 + 1 + ldr r1, =sub_80A7938 str r1, [r6, 0x1C] adds r0, r6, 0 bl _call_via_r1 @@ -505777,7 +505777,7 @@ sub_8109200: ; 8109200 ldrh r1, [r2, 0x4] negs r1, r1 strh r1, [r2, 0x4] - ldr r1, =sub_80A7938 + 1 + ldr r1, =sub_80A7938 str r1, [r0, 0x1C] bx lr .align 2, 0 @@ -505795,7 +505795,7 @@ sub_810921C: ; 810921C movs r1, 0 strh r0, [r4, 0x3C] strh r1, [r4, 0x2E] - ldr r0, =sub_8109244 + 1 + ldr r0, =sub_8109244 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -505837,7 +505837,7 @@ sub_8109244: ; 8109244 strh r0, [r5, 0x36] adds r0, r5, 0 bl obj_translate_based_on_private_1_2_3_4 - ldr r0, =sub_810929C + 1 + ldr r0, =sub_810929C str r0, [r5, 0x1C] @0810928E: pop {r4,r5} @@ -505872,7 +505872,7 @@ sub_810929C: ; 810929C strh r0, [r6, 0x22] strh r4, [r6, 0x26] strh r4, [r6, 0x24] - ldr r1, =sub_8109314 + 1 + ldr r1, =sub_8109314 str r1, [r6, 0x1C] adds r0, r6, 0 bl _call_via_r1 @@ -505968,10 +505968,10 @@ sub_8109364: ; 8109364 strh r0, [r4, 0x30] ldrh r0, [r1, 0x8] strh r0, [r4, 0x32] - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 adds r0, r4, 0 bl oamt_set_x3A_32 - ldr r0, =sub_80A653C + 1 + ldr r0, =sub_80A653C str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -505997,9 +505997,9 @@ sub_81093A4: ; 81093A4 movs r1, 0x4 orrs r0, r1 strb r0, [r2] - ldr r0, =sub_80A64B0 + 1 + ldr r0, =sub_80A64B0 str r0, [r4, 0x1C] - ldr r1, =sub_81093E4 + 1 + ldr r1, =sub_81093E4 adds r0, r4, 0 bl oamt_set_x3A_32 pop {r4} @@ -506023,7 +506023,7 @@ sub_81093E4: ; 81093E4 movs r2, 0 strh r1, [r0, 0x2E] strh r2, [r0, 0x30] - ldr r1, =sub_810940C + 1 + ldr r1, =sub_810940C str r1, [r0, 0x1C] bl _call_via_r1 pop {r0} @@ -506116,7 +506116,7 @@ sub_8109460: ; 8109460 lsrs r0, 24 movs r1, 0 bl sub_80A7270 - ldr r0, =sub_81094D0 + 1 + ldr r0, =sub_81094D0 str r0, [r4] pop {r4,r5} pop {r0} @@ -506836,7 +506836,7 @@ sub_8109A10: ; 8109A10 ands r1, r4 orrs r1, r2 strh r1, [r0, 0x4] - ldr r1, =sub_8109A64 + 1 + ldr r1, =sub_8109A64 str r1, [r0, 0x1C] pop {r4,r5} pop {r0} @@ -507087,7 +507087,7 @@ sub_8109AFC: ; 8109AFC strh r0, [r5, 0x36] adds r0, r5, 0 bl sub_80A6FD4 - ldr r0, =sub_8109C4C + 1 + ldr r0, =sub_8109C4C str r0, [r5, 0x1C] @08109C3E: pop {r4,r5} @@ -507327,7 +507327,7 @@ sub_8109DBC: ; 8109DBC lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x26] - ldr r0, =sub_8109E2C + 1 + ldr r0, =sub_8109E2C str r0, [r4] pop {r4} pop {r0} @@ -507829,7 +507829,7 @@ sub_810A1A8: ; 810A1A8 ldrh r1, [r4, 0x22] adds r0, r1 strh r0, [r4, 0x22] - ldr r0, =sub_810A1F8 + 1 + ldr r0, =sub_810A1F8 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -507880,7 +507880,7 @@ sub_810A214: ; 810A214 adds r0, r1 strh r0, [r4, 0x20] @0810A246: - ldr r0, =sub_810A258 + 1 + ldr r0, =sub_810A258 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -507961,10 +507961,10 @@ sub_810A274: ; 810A274 strh r0, [r5, 0x32] ldrh r0, [r2, 0x8] strh r0, [r5, 0x34] - ldr r1, =move_anim_8074EE0 + 1 + ldr r1, =move_anim_8074EE0 adds r0, r5, 0 bl oamt_set_x3A_32 - ldr r0, =sub_80A62EC + 1 + ldr r0, =sub_80A62EC str r0, [r5, 0x1C] pop {r4,r5} pop {r0} @@ -508137,7 +508137,7 @@ sub_810A308: ; 810A308 strh r0, [r2, 0x4] ldrh r0, [r6, 0x6] strh r0, [r5, 0x2E] - ldr r0, =sub_810E2C8 + 1 + ldr r0, =sub_810E2C8 str r0, [r5, 0x1C] pop {r4-r7} pop {r0} @@ -508194,7 +508194,7 @@ sub_810A46C: ; 810A46C ands r0, r2 orrs r0, r1 strh r0, [r4, 0x4] - ldr r1, =sub_810A4F4 + 1 + ldr r1, =sub_810A4F4 str r1, [r4, 0x1C] adds r0, r4, 0 bl _call_via_r1 @@ -508352,7 +508352,7 @@ sub_810A5BC: ; 810A5BC ldrh r0, [r4, 0x6] strh r0, [r6, 0x36] strh r0, [r6, 0x38] - ldr r0, =sub_810A56C + 1 + ldr r0, =sub_810A56C str r0, [r6, 0x1C] pop {r4-r6} pop {r0} @@ -508439,7 +508439,7 @@ sub_810A628: ; 810A628 ands r0, r2 orrs r0, r1 strh r0, [r5, 0x4] - ldr r1, =sub_810A6EC + 1 + ldr r1, =sub_810A6EC str r1, [r5, 0x1C] adds r0, r5, 0 bl _call_via_r1 @@ -508555,9 +508555,9 @@ sub_810A75C: ; 810A75C ldr r0, =0x0203841e ldrh r0, [r0, 0x4] strh r0, [r4, 0x2E] - ldr r0, =sub_80A64B0 + 1 + ldr r0, =sub_80A64B0 str r0, [r4, 0x1C] - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 adds r0, r4, 0 bl oamt_set_x3A_32 pop {r4,r5} @@ -508598,7 +508598,7 @@ sub_810A7DC: ; 810A7DC strh r0, [r4, 0xA] ldrh r0, [r5, 0x4] strh r0, [r4, 0xC] - ldr r0, =sub_810A834 + 1 + ldr r0, =sub_810A834 str r0, [r4] pop {r4-r6} pop {r0} @@ -508907,7 +508907,7 @@ sub_810AA2C: ; 810AA2C strb r0, [r1] adds r3, 0x1C adds r2, r3 - ldr r0, =sub_810AAB0 + 1 + ldr r0, =sub_810AAB0 str r0, [r2] str r0, [r4, 0x1C] pop {r4-r7} @@ -509007,7 +509007,7 @@ sub_810AAFC: ; 810AAFC strh r1, [r5, 0x20] ldrh r0, [r2, 0x4] strh r0, [r5, 0x22] - ldr r0, =sub_810AB78 + 1 + ldr r0, =sub_810AB78 str r0, [r5] pop {r4,r5} pop {r0} @@ -509094,10 +509094,10 @@ sub_810AB78: ; 810AB78 strh r6, [r4, 0x38] adds r0, r4, 0 bl obj_translate_based_on_private_1_2_3_4 - ldr r1, =sub_810ACC0 + 1 + ldr r1, =sub_810ACC0 adds r0, r4, 0 bl oamt_set_x3A_32 - ldr r0, =sub_80A67D8 + 1 + ldr r0, =sub_80A67D8 str r0, [r4, 0x1C] ldrh r0, [r5, 0x1A] adds r0, 0x1 @@ -509182,7 +509182,7 @@ sub_810ACC0: ; 810ACC0 adds r4, r0, 0 movs r1, 0x1 bl obj_anim_image_start - ldr r0, =sub_810AC8C + 1 + ldr r0, =sub_810AC8C str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -509219,10 +509219,10 @@ sub_810ACD8: ; 810ACD8 lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] - ldr r1, =move_anim_8074EE0 + 1 + ldr r1, =move_anim_8074EE0 adds r0, r5, 0 bl oamt_set_x3A_32 - ldr r0, =sub_80A67BC + 1 + ldr r0, =sub_80A67BC str r0, [r5, 0x1C] pop {r4,r5} pop {r0} @@ -509264,10 +509264,10 @@ sub_810AD30: ; 810AD30 strh r0, [r5, 0x24] ldrh r0, [r1, 0x4] strh r0, [r5, 0x26] - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 adds r0, r5, 0 bl oamt_set_x3A_32 - ldr r0, =sub_80A67D8 + 1 + ldr r0, =sub_80A67D8 str r0, [r5, 0x1C] pop {r4,r5} pop {r0} @@ -509313,7 +509313,7 @@ sub_810AD98: ; 810AD98 negs r0, r0 strh r0, [r5, 0x3C] @0810ADE6: - ldr r0, =sub_810ADF8 + 1 + ldr r0, =sub_810ADF8 str r0, [r5, 0x1C] pop {r4,r5} pop {r0} @@ -510423,7 +510423,7 @@ sub_810B614: ; 810B614 adds r1, r3, 0 adds r1, 0x1C adds r1, r0, r1 - ldr r2, =sub_810B684 + 1 + ldr r2, =sub_810B684 str r2, [r1] adds r0, r3 strh r5, [r0, 0x3A] @@ -510665,7 +510665,7 @@ sub_810B6C4: ; 810B6C4 strh r0, [r5, 0x34] ldrh r0, [r7, 0xC] strh r0, [r5, 0x36] - ldr r0, =sub_810B848 + 1 + ldr r0, =sub_810B848 str r0, [r5, 0x1C] add sp, 0x4 pop {r3-r5} @@ -510748,10 +510748,10 @@ sub_810B8AC: ; 810B8AC movs r0, 0xFE lsls r0, 8 strh r0, [r4, 0x36] - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 adds r0, r4, 0 bl oamt_set_x3A_32 - ldr r1, =sub_80A634C + 1 + ldr r1, =sub_80A634C str r1, [r4, 0x1C] adds r0, r4, 0 bl _call_via_r1 @@ -510808,10 +510808,10 @@ sub_810B8EC: ; 810B8EC strh r0, [r4, 0x36] ldrh r0, [r1, 0x8] strh r0, [r4, 0x2E] - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 adds r0, r4, 0 bl oamt_set_x3A_32 - ldr r0, =sub_80A6EEC + 1 + ldr r0, =sub_80A6EEC str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -510863,10 +510863,10 @@ sub_810B974: ; 810B974 adds r0, r1 strh r0, [r4, 0x22] @0810B9C6: - ldr r1, =sub_810B9E8 + 1 + ldr r1, =sub_810B9E8 adds r0, r4, 0 bl oamt_set_x3A_32 - ldr r0, =sub_80A67BC + 1 + ldr r0, =sub_80A67BC str r0, [r4, 0x1C] pop {r4,r5} pop {r0} @@ -511035,8 +511035,8 @@ sub_810BA24: ; 810BA24 strh r0, [r5, 0x22] strh r1, [r5, 0x26] strh r1, [r5, 0x24] - ldr r6, =sub_80A718C + 1 - ldr r1, =sub_810BB60 + 1 + ldr r6, =sub_80A718C + ldr r1, =sub_810BB60 mov r3, sp adds r2, r7, 0 movs r4, 0x7 @@ -511097,7 +511097,7 @@ sub_810BB60: ; 810BB60 bl cosine strh r0, [r4, 0x36] strh r5, [r4, 0x38] - ldr r1, =sub_810BBC8 + 1 + ldr r1, =sub_810BBC8 str r1, [r4, 0x1C] adds r0, r4, 0 bl _call_via_r1 @@ -511165,7 +511165,7 @@ sub_810BBC8: ; 810BBC8 strh r1, [r4, 0x24] strh r1, [r4, 0x36] strh r1, [r4, 0x34] - ldr r0, =sub_810BC4C + 1 + ldr r0, =sub_810BC4C str r0, [r4, 0x1C] @0810BC42: pop {r4} @@ -511346,7 +511346,7 @@ sub_810BC94: ; 810BC94 strh r1, [r5, 0x26] strh r1, [r5, 0x24] ldr r1, =0x0203841e - ldr r6, =sub_810BDD8 + 1 + ldr r6, =sub_810BDD8 mov r3, sp adds r2, r7, 0 movs r4, 0x7 @@ -511643,7 +511643,7 @@ sub_810BED0: ; 810BED0 bl obj_translate_based_on_private_1_2_3_4 movs r0, 0x40 strh r0, [r5, 0x38] - ldr r1, =sub_810C008 + 1 + ldr r1, =sub_810C008 str r1, [r5, 0x1C] adds r0, r5, 0 bl _call_via_r1 @@ -511797,7 +511797,7 @@ sub_810C0A0: ; 810C0A0 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, =sub_810C164 + 1 + ldr r1, =sub_810C164 str r1, [r0] add sp, 0x10 pop {r4,r5} @@ -512009,7 +512009,7 @@ sub_810C2F0: ; 810C2F0 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x22] - ldr r0, =sub_80A7820 + 1 + ldr r0, =sub_80A7820 str r0, [r4, 0x1C] pop {r4,r5} pop {r0} @@ -512086,7 +512086,7 @@ sub_810C324: ; 810C324 adds r0, r1 ldr r1, =0x0000ffff strh r1, [r0, 0x26] - ldr r1, =sub_810C3F0 + 1 + ldr r1, =sub_810C3F0 str r1, [r0] add sp, 0x10 pop {r4,r5} @@ -512432,7 +512432,7 @@ sub_810C560: ; 810C560 @0810C6B8: adds r0, r5, 0 bl obj_translate_based_on_private_1_2_3_4 - ldr r0, =sub_810C6D4 + 1 + ldr r0, =sub_810C6D4 str r0, [r5, 0x1C] pop {r3} mov r8, r3 @@ -512746,7 +512746,7 @@ sub_810C918: ; 810C918 lsls r1, 3 ldr r0, =0x03005e00 adds r1, r0 - ldr r0, =sub_810C934 + 1 + ldr r0, =sub_810C934 str r0, [r1] bx lr .align 2, 0 @@ -513085,7 +513085,7 @@ sub_810CB58: ; 810CB58 adds r1, r2, 0 adds r1, 0x1C adds r0, r1 - ldr r1, =sub_810CC3C + 1 + ldr r1, =sub_810CC3C str r1, [r0] movs r3, 0x2E ldrsh r1, [r4, r3] @@ -513240,7 +513240,7 @@ unc_080B06FC: ; 810CC88 strh r0, [r5, 0x38] adds r0, r5, 0 bl sub_80A68D4 - ldr r0, =sub_810CD1C + 1 + ldr r0, =sub_810CD1C str r0, [r5, 0x1C] pop {r4-r6} pop {r0} @@ -513260,9 +513260,9 @@ sub_810CD1C: ; 810CD1C adds r0, r4, 0 movs r1, 0x1 bl obj_anim_image_start - ldr r0, =sub_80A67D8 + 1 + ldr r0, =sub_80A67D8 str r0, [r4, 0x1C] - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 adds r0, r4, 0 bl oamt_set_x3A_32 @0810CD3E: @@ -513310,7 +513310,7 @@ sub_810CD4C: ; 810CD4C @0810CD92: strh r5, [r4, 0x30] strh r1, [r4, 0x32] - ldr r0, =sub_810CDB0 + 1 + ldr r0, =sub_810CDB0 str r0, [r4, 0x1C] pop {r4-r6} pop {r0} @@ -513403,9 +513403,9 @@ unc_080B08A0: ; 810CE2C strh r0, [r4, 0x22] movs r0, 0xF strh r0, [r4, 0x2E] - ldr r0, =sub_80A64B0 + 1 + ldr r0, =sub_80A64B0 str r0, [r4, 0x1C] - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 adds r0, r4, 0 bl oamt_set_x3A_32 pop {r4,r5} @@ -513502,9 +513502,9 @@ sub_810CEE0: ; 810CEE0 ldr r0, =0x0203841e ldrh r0, [r0, 0x4] strh r0, [r5, 0x2E] - ldr r0, =sub_80A64B0 + 1 + ldr r0, =sub_80A64B0 str r0, [r5, 0x1C] - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 adds r0, r5, 0 bl oamt_set_x3A_32 pop {r4,r5} @@ -513677,10 +513677,10 @@ sub_810CF30: ; 810CF30 lsls r0, 2 adds r4, 0x1C adds r0, r4 - ldr r1, =nullsub_12 + 1 + ldr r1, =nullsub_12 str r1, [r0] @0810D08C: - ldr r0, =sub_810D0B8 + 1 + ldr r0, =sub_810D0B8 str r0, [r5, 0x1C] pop {r3,r4} mov r8, r3 @@ -513770,9 +513770,9 @@ sub_810D10C: ; 810D10C ldrh r0, [r4, 0x22] subs r0, 0x14 strh r0, [r4, 0x36] - ldr r0, =sub_80A6EEC + 1 + ldr r0, =sub_80A6EEC str r0, [r4, 0x1C] - ldr r1, =sub_810D164 + 1 + ldr r1, =sub_810D164 adds r0, r4, 0 bl oamt_set_x3A_32 pop {r4} @@ -513810,9 +513810,9 @@ sub_810D164: ; 810D164 strh r1, [r5, 0x22] strh r6, [r5, 0x26] strh r6, [r5, 0x24] - ldr r0, =sub_80A6EEC + 1 + ldr r0, =sub_80A6EEC str r0, [r5, 0x1C] - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 adds r0, r5, 0 bl oamt_set_x3A_32 @0810D1A4: @@ -513880,7 +513880,7 @@ sub_810D1B4: ; 810D1B4 ldrh r0, [r4, 0x8] strh r0, [r6, 0x3A] strh r5, [r6, 0x3C] - ldr r0, =sub_810D240 + 1 + ldr r0, =sub_810D240 str r0, [r6, 0x1C] pop {r4-r6} pop {r0} @@ -513932,9 +513932,9 @@ sub_810D278: ; 810D278 bl obj_anim_image_start ldrh r0, [r5, 0x6] strh r0, [r4, 0x2E] - ldr r0, =sub_80A64B0 + 1 + ldr r0, =sub_80A64B0 str r0, [r4, 0x1C] - ldr r1, =sub_810D2B0 + 1 + ldr r1, =sub_810D2B0 adds r0, r4, 0 bl oamt_set_x3A_32 pop {r4,r5} @@ -513958,9 +513958,9 @@ sub_810D2B0: ; 810D2B0 strb r0, [r2] movs r0, 0x14 strh r0, [r4, 0x2E] - ldr r0, =sub_80A64B0 + 1 + ldr r0, =sub_80A64B0 str r0, [r4, 0x1C] - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 adds r0, r4, 0 bl oamt_set_x3A_32 pop {r4} @@ -513979,7 +513979,7 @@ sub_810D2E4: ; 810D2E4 ldr r0, =0x0203841e ldrh r0, [r0, 0x4] strh r0, [r4, 0x2E] - ldr r0, =sub_810D308 + 1 + ldr r0, =sub_810D308 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -514016,9 +514016,9 @@ sub_810D308: ; 810D308 lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x36] - ldr r0, =sub_80A6EEC + 1 + ldr r0, =sub_80A6EEC str r0, [r5, 0x1C] - ldr r1, =sub_810D360 + 1 + ldr r1, =sub_810D360 adds r0, r5, 0 bl oamt_set_x3A_32 @0810D34C: @@ -514034,9 +514034,9 @@ sub_810D360: ; 810D360 push {lr} movs r1, 0xF strh r1, [r0, 0x2E] - ldr r1, =sub_80A64B0 + 1 + ldr r1, =sub_80A64B0 str r1, [r0, 0x1C] - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 bl oamt_set_x3A_32 pop {r0} bx r0 @@ -514162,7 +514162,7 @@ sub_810D40C: ; 810D40C ldrh r0, [r1, 0x8] strh r0, [r5, 0x32] strh r2, [r5, 0x34] - ldr r0, =sub_810D47C + 1 + ldr r0, =sub_810D47C str r0, [r5, 0x1C] pop {r4,r5} pop {r0} @@ -514344,7 +514344,7 @@ sub_810D4F4: ; 810D4F4 bl move_anim_8072740 b @0810D5D2 @0810D5CE: - ldr r0, =sub_810D5DC + 1 + ldr r0, =sub_810D5DC str r0, [r5, 0x1C] @0810D5D2: pop {r4-r6} @@ -514441,7 +514441,7 @@ sub_810D608: ; 810D608 strh r0, [r5, 0x30] movs r0, 0x8 strh r0, [r5, 0x32] - ldr r0, =sub_810D6A8 + 1 + ldr r0, =sub_810D6A8 str r0, [r5, 0x1C] pop {r4,r5} pop {r0} @@ -514488,10 +514488,10 @@ sub_810D6A8: ; 810D6A8 strh r0, [r4, 0x36] adds r0, r4, 0 bl obj_translate_based_on_private_1_2_3_4 - ldr r1, =move_anim_8074EE0 + 1 + ldr r1, =move_anim_8074EE0 adds r0, r4, 0 bl oamt_set_x3A_32 - ldr r0, =sub_80A6F98 + 1 + ldr r0, =sub_80A6F98 str r0, [r4, 0x1C] @0810D704: pop {r4} @@ -514534,7 +514534,7 @@ sub_810D714: ; 810D714 ands r0, r2 orrs r0, r1 strh r0, [r5, 0x4] - ldr r0, =sub_810D770 + 1 + ldr r0, =sub_810D770 str r0, [r5, 0x1C] pop {r4,r5} pop {r0} @@ -514622,7 +514622,7 @@ sub_810D770: ; 810D770 ldrh r0, [r7, 0x22] lsls r0, 4 strh r0, [r7, 0x34] - ldr r0, =sub_810D830 + 1 + ldr r0, =sub_810D830 str r0, [r7, 0x1C] @0810D818: pop {r3} @@ -514769,10 +514769,10 @@ sub_810D874: ; 810D874 strh r0, [r5, 0x36] adds r0, r5, 0 bl obj_translate_based_on_private_1_2_3_4 - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 adds r0, r5, 0 bl oamt_set_x3A_32 - ldr r0, =sub_80A6F98 + 1 + ldr r0, =sub_80A6F98 str r0, [r5, 0x1C] pop {r4,r5} pop {r0} @@ -514859,7 +514859,7 @@ sub_810D984: ; 810D984 strh r0, [r5, 0x24] ldrh r0, [r5, 0x34] strh r0, [r5, 0x26] - ldr r0, =sub_810D960 + 1 + ldr r0, =sub_810D960 str r0, [r5, 0x1C] pop {r4-r6} pop {r0} @@ -514907,9 +514907,9 @@ sub_810DA10: ; 810DA10 movs r1, 0x1 bl obj_anim_image_start @0810DA5E: - ldr r0, =sub_80A67D8 + 1 + ldr r0, =sub_80A67D8 str r0, [r4, 0x1C] - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 adds r0, r4, 0 bl oamt_set_x3A_32 pop {r4} @@ -515105,7 +515105,7 @@ sub_810DBAC: ; 810DBAC strh r0, [r5, 0x38] adds r0, r5, 0 bl sub_80A68D4 - ldr r0, =sub_810DC10 + 1 + ldr r0, =sub_810DC10 str r0, [r5, 0x1C] pop {r4,r5} pop {r0} @@ -515180,7 +515180,7 @@ sub_810DC2C: ; 810DC2C strh r0, [r4, 0x38] adds r0, r4, 0 bl sub_80A68D4 - ldr r0, =sub_810DCB4 + 1 + ldr r0, =sub_810DCB4 str r0, [r4, 0x1C] add sp, 0x4 pop {r4-r6} @@ -515237,7 +515237,7 @@ sub_810DCD0: ; 810DCD0 ldrsh r1, [r5, r2] bl __divsi3 strh r0, [r4, 0x3A] - ldr r0, =sub_810DD24 + 1 + ldr r0, =sub_810DD24 str r0, [r4, 0x1C] pop {r4,r5} pop {r0} @@ -515310,9 +515310,9 @@ sub_810DD50: ; 810DD50 strh r2, [r4, 0x32] adds r1, r3 strh r1, [r4, 0x36] - ldr r0, =sub_80A6EEC + 1 + ldr r0, =sub_80A6EEC str r0, [r4, 0x1C] - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 adds r0, r4, 0 bl oamt_set_x3A_32 pop {r4} @@ -515365,7 +515365,7 @@ sub_810DDC4: ; 810DDC4 adds r0, r1 strh r0, [r4, 0x22] @0810DE16: - ldr r0, =sub_810DE2C + 1 + ldr r0, =sub_810DE2C str r0, [r4, 0x1C] pop {r4,r5} pop {r0} @@ -515421,7 +515421,7 @@ sub_810DE70: ; 810DE70 strh r0, [r4, 0x22] movs r0, 0xBF strh r0, [r4, 0x30] - ldr r1, =sub_810DE98 + 1 + ldr r1, =sub_810DE98 str r1, [r4, 0x1C] adds r0, r4, 0 bl _call_via_r1 @@ -515486,7 +515486,7 @@ sub_810DED8: ; 810DED8 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0xC] - ldr r0, =sub_810DF18 + 1 + ldr r0, =sub_810DF18 str r0, [r4] pop {r4} pop {r0} @@ -515609,9 +515609,9 @@ sub_810DFA8: ; 810DFA8 strh r0, [r6, 0x36] adds r0, r6, 0 bl obj_translate_based_on_private_1_2_3_4 - ldr r0, =sub_80A67BC + 1 + ldr r0, =sub_80A67BC str r0, [r6, 0x1C] - ldr r1, =sub_810E028 + 1 + ldr r1, =sub_810E028 adds r0, r6, 0 bl oamt_set_x3A_32 pop {r4-r6} @@ -515733,9 +515733,9 @@ sub_810E044: ; 810E044 ldrh r3, [r5, 0x36] adds r0, r3 strh r0, [r5, 0x36] - ldr r0, =sub_80A6EEC + 1 + ldr r0, =sub_80A6EEC str r0, [r5, 0x1C] - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 adds r0, r5, 0 bl oamt_set_x3A_32 ldrb r1, [r4, 0xA] @@ -515759,7 +515759,7 @@ sub_810E13C: ; 810E13C strh r0, [r4, 0x2E] ldrh r0, [r1, 0x6] strh r0, [r4, 0x30] - ldr r0, =sub_810E184 + 1 + ldr r0, =sub_810E184 str r0, [r4, 0x1C] movs r0, 0 bl obj_id_for_side_relative_to_move @@ -515869,7 +515869,7 @@ sub_810E1C8: ; 810E1C8 strh r0, [r5, 0x36] adds r0, r5, 0 bl obj_translate_based_on_private_1_2_3_4 - ldr r0, =sub_810E24C + 1 + ldr r0, =sub_810E24C str r0, [r5, 0x1C] pop {r4,r5} pop {r0} @@ -516230,7 +516230,7 @@ sub_810E314: ; 810E314 asrs r0, 16 negs r0, r0 strh r0, [r2, 0x4] - ldr r0, =sub_810E520 + 1 + ldr r0, =sub_810E520 str r0, [r7, 0x1C] pop {r3} mov r8, r3 @@ -516937,7 +516937,7 @@ sub_810E520: ; 810E520 blt @0810EA36 movs r0, 0 strh r0, [r5, 0x2E] - ldr r0, =sub_810E2C8 + 1 + ldr r0, =sub_810E2C8 str r0, [r5, 0x1C] @0810EA36: pop {r3,r4} @@ -516979,7 +516979,7 @@ sub_810EA4C: ; 810EA4C lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x22] - ldr r0, =sub_80A7820 + 1 + ldr r0, =sub_80A7820 str r0, [r4, 0x1C] pop {r4,r5} pop {r0} @@ -517055,7 +517055,7 @@ sub_810EAA0: ; 810EAA0 strh r1, [r5, 0x2E] ldrh r0, [r4, 0x6] strh r0, [r5, 0x3C] - ldr r0, =sub_810EB40 + 1 + ldr r0, =sub_810EB40 str r0, [r5, 0x1C] pop {r4,r5} pop {r0} @@ -517325,7 +517325,7 @@ sub_810ED28: ; 810ED28 strh r0, [r4, 0x2E] ldrh r0, [r1, 0x6] strh r0, [r4, 0x30] - ldr r0, =sub_810ED70 + 1 + ldr r0, =sub_810ED70 str r0, [r4, 0x1C] movs r0, 0 bl obj_id_for_side_relative_to_move @@ -517394,7 +517394,7 @@ sub_810ED70: ; 810ED70 asrs r0, 16 cmp r0, 0x14 ble @0810EDC8 - ldr r0, =sub_810EDD0 + 1 + ldr r0, =sub_810EDD0 str r0, [r2, 0x1C] @0810EDC8: pop {r0} @@ -517638,7 +517638,7 @@ sub_810EEF8: ; 810EEF8 lsrs r0, 24 adds r0, 0x20 strh r0, [r5, 0x22] - ldr r0, =sub_810EFA8 + 1 + ldr r0, =sub_810EFA8 str r0, [r5, 0x1C] pop {r4,r5} pop {r0} @@ -517706,7 +517706,7 @@ sub_810F004: ; 810F004 strh r1, [r0, 0x3A] movs r1, 0x40 strh r1, [r0, 0x3C] - ldr r1, =sub_810F018 + 1 + ldr r1, =sub_810F018 str r1, [r0, 0x1C] bx lr .align 2, 0 @@ -517847,7 +517847,7 @@ sub_810F084: ; 810F084 movs r1, 0x1 adds r2, r3, 0 bl sub_80A73E0 - ldr r0, =sub_810F140 + 1 + ldr r0, =sub_810F140 mov r2, r8 str r0, [r2, 0x1C] add sp, 0x4 @@ -518095,7 +518095,7 @@ sub_810F1EC: ; 810F1EC ldrh r0, [r5, 0x22] adds r0, 0x9 strh r0, [r5, 0x22] - ldr r1, =sub_810F3C8 + 1 + ldr r1, =sub_810F3C8 str r1, [r5, 0x1C] adds r0, r5, 0 bl _call_via_r1 @@ -518103,7 +518103,7 @@ sub_810F1EC: ; 810F1EC .align 2, 0 .pool @0810F32C: - ldr r0, =sub_810F340 + 1 + ldr r0, =sub_810F340 str r0, [r5, 0x1C] @0810F330: pop {r3} @@ -518171,7 +518171,7 @@ sub_810F340: ; 810F340 orrs r1, r2 strb r1, [r0] @0810F3AC: - ldr r1, =sub_810F3C8 + 1 + ldr r1, =sub_810F3C8 str r1, [r5, 0x1C] adds r0, r5, 0 bl _call_via_r1 @@ -518201,7 +518201,7 @@ sub_810F3C8: ; 810F3C8 ldrsh r0, [r4, r2] cmp r0, 0xD bne @0810F3F4 - ldr r0, =sub_810F400 + 1 + ldr r0, =sub_810F400 str r0, [r4, 0x1C] b @0810F3F8 .align 2, 0 @@ -518263,7 +518263,7 @@ sub_810F400: ; 810F400 asrs r0, 16 cmp r0, 0x10 bne @0810F45E - ldr r0, =sub_810F46C + 1 + ldr r0, =sub_810F46C str r0, [r3, 0x1C] @0810F45E: pop {r4-r7} @@ -518353,7 +518353,7 @@ sub_810F46C: ; 810F46C movs r1, 0x4 orrs r0, r1 strb r0, [r2] - ldr r0, =sub_810F524 + 1 + ldr r0, =sub_810F524 str r0, [r5, 0x1C] @0810F512: pop {r4-r6} @@ -518404,7 +518404,7 @@ sub_810F524: ; 810F524 adds r0, r5, 0 bl sub_80A477C @0810F57C: - ldr r0, =move_anim_8072740 + 1 + ldr r0, =move_anim_8072740 str r0, [r6, 0x1C] pop {r4-r6} pop {r0} @@ -518543,10 +518543,10 @@ sub_810F634: ; 810F634 movs r0, 0x1 @0810F692: strh r0, [r5, 0x30] - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 adds r0, r5, 0 bl oamt_set_x3A_32 - ldr r0, =sub_80A67D8 + 1 + ldr r0, =sub_80A67D8 str r0, [r5, 0x1C] pop {r4,r5} pop {r0} @@ -518611,10 +518611,10 @@ sub_810F6B0: ; 810F6B0 movs r0, 0x10 strh r0, [r5, 0x22] @0810F722: - ldr r1, =sub_810F740 + 1 + ldr r1, =sub_810F740 adds r0, r5, 0 bl oamt_set_x3A_32 - ldr r0, =sub_80A67D8 + 1 + ldr r0, =sub_80A67D8 str r0, [r5, 0x1C] pop {r4-r7} pop {r0} @@ -518640,7 +518640,7 @@ sub_810F740: ; 810F740 strh r0, [r4, 0x2E] adds r0, r4, 0 bl obj_alloc_rotscale_entry - ldr r0, =sub_810F774 + 1 + ldr r0, =sub_810F774 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -518720,7 +518720,7 @@ sub_810F7D4: ; 810F7D4 ldr r2, =gUnknown_0859675C adds r0, r4, 0 bl sub_80A7CFC - ldr r0, =sub_810F810 + 1 + ldr r0, =sub_810F810 str r0, [r4] pop {r4} pop {r0} @@ -518785,7 +518785,7 @@ sub_810F83C: ; 810F83C ldr r2, =gUnknown_0859677C adds r0, r4, 0 bl sub_80A7CFC - ldr r0, =sub_810F898 + 1 + ldr r0, =sub_810F898 str r0, [r4] pop {r4} pop {r0} @@ -518940,7 +518940,7 @@ sub_810F940: ; 810F940 movs r0, 0x52 movs r1, 0x10 bl lcd_io_set - ldr r0, =sub_810F9D4 + 1 + ldr r0, =sub_810F9D4 str r0, [r5] pop {r4-r6} pop {r0} @@ -519228,7 +519228,7 @@ sub_810FBA8: ; 810FBA8 @0810FBD4: ldrh r0, [r6, 0x2] strh r0, [r5, 0x2E] - ldr r0, =sub_810FB60 + 1 + ldr r0, =sub_810FB60 str r0, [r5, 0x1C] pop {r4-r6} pop {r0} @@ -519365,7 +519365,7 @@ sub_810FBF0: ; 810FBF0 strh r0, [r5, 0x24] movs r0, 0x6 strh r0, [r5, 0xA] - ldr r0, =sub_810FD3C + 1 + ldr r0, =sub_810FD3C str r0, [r5] pop {r4,r5} pop {r0} @@ -519613,7 +519613,7 @@ sub_810FE14: ; 810FE14 ldr r1, [sp, 0x4] ldr r2, [sp, 0x8] bl sub_80BA038 - ldr r0, =sub_810FF34 + 1 + ldr r0, =sub_810FF34 str r0, [r4] add sp, 0xC pop {r4-r6} @@ -519813,7 +519813,7 @@ sub_8110034: ; 8110034 adds r0, r2, 0 adds r0, 0x1C adds r0, r4, r0 - ldr r1, =nullsub_12 + 1 + ldr r1, =nullsub_12 str r1, [r0] adds r4, r2 ldrb r0, [r4, 0x1] @@ -519866,7 +519866,7 @@ sub_8110034: ; 8110034 strh r0, [r7, 0x24] mov r1, r9 strh r1, [r7, 0x26] - ldr r0, =sub_8110134 + 1 + ldr r0, =sub_8110134 str r0, [r7] @08110116: pop {r3-r5} @@ -520242,9 +520242,9 @@ sub_8110368: ; 8110368 ldrh r4, [r4, 0x6] adds r0, r4 strh r0, [r6, 0x36] - ldr r0, =sub_80A6EEC + 1 + ldr r0, =sub_80A6EEC str r0, [r6, 0x1C] - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 adds r0, r6, 0 bl oamt_set_x3A_32 pop {r4-r6} @@ -520319,9 +520319,9 @@ sub_8110438: ; 8110438 lsls r0, 24 lsrs r0, 24 strh r0, [r6, 0x36] - ldr r0, =sub_80A6EEC + 1 + ldr r0, =sub_80A6EEC str r0, [r6, 0x1C] - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 adds r0, r6, 0 bl oamt_set_x3A_32 pop {r4-r6} @@ -520392,7 +520392,7 @@ sub_81104E4: ; 81104E4 ldr r0, =0x0203841e ldrh r0, [r0, 0x6] strh r0, [r5, 0x38] - ldr r0, =sub_811057C + 1 + ldr r0, =sub_811057C str r0, [r5, 0x1C] pop {r4,r5} pop {r0} @@ -520480,7 +520480,7 @@ sub_81105B4: ; 81105B4 adds r0, 0x8 strh r0, [r4, 0x22] @08110618: - ldr r0, =sub_8110630 + 1 + ldr r0, =sub_8110630 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -520545,7 +520545,7 @@ sub_811067C: ; 811067C bl lcd_io_set movs r0, 0x10 strh r0, [r4, 0x2E] - ldr r0, =sub_81106A4 + 1 + ldr r0, =sub_81106A4 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -520595,7 +520595,7 @@ sub_81106A4: ; 81106A4 movs r1, 0x4 orrs r0, r1 strb r0, [r2] - ldr r0, =sub_8110700 + 1 + ldr r0, =sub_8110700 str r0, [r4, 0x1C] @081106F6: pop {r4} @@ -520746,9 +520746,9 @@ sub_8110720: ; 8110720 strh r0, [r7, 0x2E] strh r4, [r7, 0x32] strh r5, [r7, 0x36] - ldr r0, =sub_80A6EEC + 1 + ldr r0, =sub_80A6EEC str r0, [r7, 0x1C] - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 adds r0, r7, 0 bl oamt_set_x3A_32 add sp, 0x4 @@ -520800,7 +520800,7 @@ sub_8110850: ; 8110850 strh r0, [r6, 0x38] adds r0, r6, 0 bl sub_80A68D4 - ldr r0, =sub_81108CC + 1 + ldr r0, =sub_81108CC str r0, [r6, 0x1C] adds r2, r6, 0 adds r2, 0x3E @@ -520947,10 +520947,10 @@ sub_8110994: ; 8110994 lsrs r0, 24 adds r0, 0x12 strh r0, [r5, 0x22] - ldr r1, =move_anim_8074EE0 + 1 + ldr r1, =move_anim_8074EE0 adds r0, r5, 0 bl oamt_set_x3A_32 - ldr r0, =sub_80A67BC + 1 + ldr r0, =sub_80A67BC str r0, [r5, 0x1C] pop {r4,r5} pop {r0} @@ -521000,10 +521000,10 @@ sub_81109F0: ; 81109F0 strh r0, [r5, 0x36] ldrh r0, [r6, 0x4] strh r0, [r5, 0x38] - ldr r1, =sub_8110A70 + 1 + ldr r1, =sub_8110A70 adds r0, r5, 0 bl oamt_set_x3A_32 - ldr r1, =sub_80A6450 + 1 + ldr r1, =sub_80A6450 str r1, [r5, 0x1C] adds r0, r5, 0 bl _call_via_r1 @@ -521031,10 +521031,10 @@ sub_8110A70: ; 8110A70 strh r0, [r4, 0x34] ldr r0, =0x0000ffe8 strh r0, [r4, 0x36] - ldr r1, =move_anim_8074EE0 + 1 + ldr r1, =move_anim_8074EE0 adds r0, r4, 0 bl oamt_set_x3A_32 - ldr r1, =sub_80A6450 + 1 + ldr r1, =sub_80A6450 str r1, [r4, 0x1C] adds r0, r4, 0 bl _call_via_r1 @@ -521093,9 +521093,9 @@ sub_8110AB4: ; 8110AB4 bl sub_80A6E14 strh r4, [r5, 0x34] strh r4, [r5, 0x36] - ldr r0, =sub_80A656C + 1 + ldr r0, =sub_80A656C str r0, [r5, 0x1C] - ldr r1, =move_anim_8074EE0 + 1 + ldr r1, =move_anim_8074EE0 adds r0, r5, 0 bl oamt_set_x3A_32 pop {r4,r5} @@ -521134,7 +521134,7 @@ sub_8110B38: ; 8110B38 strh r0, [r4, 0x32] ldrh r0, [r1, 0xA] strh r0, [r4, 0x34] - ldr r0, =sub_8110B80 + 1 + ldr r0, =sub_8110B80 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -521262,7 +521262,7 @@ sub_8110BCC: ; 8110BCC lsls r1, 3 adds r1, r0 strh r5, [r1, 0x8] - ldr r0, =sub_8110CB0 + 1 + ldr r0, =sub_8110CB0 str r0, [r1] add sp, 0x10 pop {r4-r6} @@ -521569,7 +521569,7 @@ sub_8110E4C: ; 8110E4C cmp r0, r1 bge @08110F24 @08110F20: - ldr r0, =move_anim_8072740 + 1 + ldr r0, =move_anim_8072740 str r0, [r5, 0x1C] @08110F24: pop {r4,r5} @@ -521597,9 +521597,9 @@ sub_8110F30: ; 8110F30 ldrh r1, [r4, 0x22] adds r0, r1 strh r0, [r4, 0x36] - ldr r0, =sub_80A6EEC + 1 + ldr r0, =sub_80A6EEC str r0, [r4, 0x1C] - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 adds r0, r4, 0 bl oamt_set_x3A_32 pop {r4,r5} @@ -521740,7 +521740,7 @@ sub_8110F74: ; 8110F74 lsls r0, 24 lsrs r0, 24 strh r0, [r6, 0x26] - ldr r0, =sub_81110A4 + 1 + ldr r0, =sub_81110A4 str r0, [r6] pop {r3-r5} mov r8, r3 @@ -522076,7 +522076,7 @@ sub_811131C: ; 811131C lsls r0, 24 cmp r0, 0 beq @0811134E - ldr r0, =sub_81110A4 + 1 + ldr r0, =sub_81110A4 bl get_task_id_by_function lsls r0, 24 lsrs r2, r0, 24 @@ -522147,7 +522147,7 @@ sub_8111388: ; 8111388 strh r0, [r4, 0x2E] ldrh r0, [r5, 0x6] strh r0, [r4, 0x30] - ldr r0, =sub_81113C8 + 1 + ldr r0, =sub_81113C8 str r0, [r4, 0x1C] adds r4, 0x3E ldrb r0, [r4] @@ -522260,7 +522260,7 @@ sub_8111444: ; 8111444 ldrb r1, [r2, 0x6] adds r0, r4, 0 bl obj_anim_image_start - ldr r0, =sub_811149C + 1 + ldr r0, =sub_811149C str r0, [r4, 0x1C] pop {r4,r5} pop {r0} @@ -522481,7 +522481,7 @@ sub_811160C: ; 811160C strh r0, [r4, 0x36] adds r0, r4, 0 bl sub_80A6FD4 - ldr r0, =sub_8111674 + 1 + ldr r0, =sub_8111674 str r0, [r4, 0x1C] movs r0, 0x10 strh r0, [r4, 0x3A] @@ -522509,7 +522509,7 @@ sub_8111674: ; 8111674 lsls r0, 24 cmp r0, 0 beq @08111694 - ldr r0, =sub_81116E8 + 1 + ldr r0, =sub_81116E8 str r0, [r4, 0x1C] b @081116DE .align 2, 0 @@ -522609,7 +522609,7 @@ sub_81116E8: ; 81116E8 movs r1, 0x4 orrs r0, r1 strb r0, [r2] - ldr r0, =sub_80A67F4 + 1 + ldr r0, =sub_80A67F4 str r0, [r4, 0x1C] b @0811175E .align 2, 0 @@ -522709,7 +522709,7 @@ sub_81117F4: ; 81117F4 adds r4, r0, 0 movs r1, 0x1 bl sub_80A6980 - ldr r1, =sub_8111814 + 1 + ldr r1, =sub_8111814 str r1, [r4, 0x1C] adds r0, r4, 0 bl _call_via_r1 @@ -522835,7 +522835,7 @@ sub_811188C: ; 811188C strh r2, [r0, 0xC] movs r1, 0x10 strh r1, [r0, 0xE] - ldr r1, =sub_8111914 + 1 + ldr r1, =sub_8111914 str r1, [r0] pop {r4,r5} pop {r0} @@ -522879,7 +522879,7 @@ sub_8111914: ; 8111914 ldrsh r0, [r4, r1] cmp r0, 0x9 bne @0811195C - ldr r0, =sub_811196C + 1 + ldr r0, =sub_811196C str r0, [r4] @0811195C: pop {r4} @@ -523013,7 +523013,7 @@ sub_81119E0: ; 81119E0 adds r0, r6, 0 bl __divsi3 strh r0, [r4, 0x3C] - ldr r0, =sub_8111A88 + 1 + ldr r0, =sub_8111A88 str r0, [r4, 0x1C] add sp, 0x4 pop {r3,r4} @@ -523172,7 +523172,7 @@ sub_8111B9C: ; 8111B9C adds r4, r0, 0 movs r1, 0x1 bl sub_80A6980 - ldr r0, =sub_8111BB4 + 1 + ldr r0, =sub_8111BB4 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -523385,7 +523385,7 @@ sub_8111C50: ; 8111C50 adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, =nullsub_12 + 1 + ldr r1, =nullsub_12 bl oamt_set_x3A_32 movs r0, 0x8 ldrsh r1, [r5, r0] @@ -523394,9 +523394,9 @@ sub_8111C50: ; 8111C50 lsls r0, 2 adds r4, 0x1C adds r0, r4 - ldr r1, =sub_80A656C + 1 + ldr r1, =sub_80A656C str r1, [r0] - ldr r0, =sub_8111D78 + 1 + ldr r0, =sub_8111D78 str r0, [r5] @08111D5C: pop {r4-r6} @@ -523529,7 +523529,7 @@ sub_8111E50: ; 8111E50 adds r1, r2 movs r2, 0 strh r2, [r1, 0x26] - ldr r2, =sub_8111E78 + 1 + ldr r2, =sub_8111E78 str r2, [r1] bl _call_via_r2 pop {r0} @@ -523814,7 +523814,7 @@ sub_8111E78: ; 8111E78 movs r0, 0 bl lcd_io_set_bits @081120C2: - ldr r0, =sub_81120DC + 1 + ldr r0, =sub_81120DC str r0, [r5] @081120C6: ldrh r0, [r5, 0x26] @@ -523892,7 +523892,7 @@ sub_81120DC: ; 81120DC bne @0811215E movs r0, 0 strh r0, [r4, 0x26] - ldr r1, =sub_8112170 + 1 + ldr r1, =sub_8112170 str r1, [r4] adds r0, r5, 0 bl _call_via_r1 @@ -524132,7 +524132,7 @@ sub_8112264: ; 8112264 strh r6, [r7, 0x20] mov r2, r8 strh r2, [r7, 0x22] - ldr r0, =sub_8112384 + 1 + ldr r0, =sub_8112384 str r0, [r7, 0x1C] adds r2, r7, 0 adds r2, 0x3E @@ -524324,7 +524324,7 @@ sub_81123C4: ; 81123C4 strh r3, [r4, 0x3A] ldr r0, =0x0202064c adds r5, r0 - ldr r0, =sub_8112384 + 1 + ldr r0, =sub_8112384 str r0, [r5] ldr r2, [sp] movs r3, 0x20 @@ -524407,7 +524407,7 @@ sub_81123C4: ; 81123C4 strh r3, [r4, 0x3A] adds r6, 0x1C adds r5, r6 - ldr r0, =sub_8112384 + 1 + ldr r0, =sub_8112384 str r0, [r5] mov r1, r8 ldr r0, [sp] @@ -524416,7 +524416,7 @@ sub_81123C4: ; 81123C4 ldr r2, [sp] strh r0, [r2, 0x20] @081125B4: - ldr r0, =sub_81125E0 + 1 + ldr r0, =sub_81125E0 ldr r3, [sp] str r0, [r3] add sp, 0x14 @@ -524697,7 +524697,7 @@ sub_8112758: ; 8112758 strh r4, [r0, 0x10] strh r6, [r0, 0x12] strh r5, [r0, 0x14] - ldr r1, =sub_811280C + 1 + ldr r1, =sub_811280C str r1, [r0] pop {r4-r7} pop {r0} @@ -524852,7 +524852,7 @@ sub_811280C: ; 811280C movs r2, 0x10 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, =sub_8112994 + 1 + ldr r0, =sub_8112994 str r0, [r4] @08112966: ldr r1, =0x02022e24 @@ -524952,7 +524952,7 @@ sub_81129F0: ; 81129F0 strh r3, [r4, 0x30] movs r0, 0x3C strh r0, [r4, 0x2E] - ldr r0, =sub_8112A4C + 1 + ldr r0, =sub_8112A4C str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -525007,9 +525007,9 @@ sub_8112A4C: ; 8112A4C bne @08112AC0 movs r0, 0x1E strh r0, [r3, 0x2E] - ldr r0, =sub_80A64B0 + 1 + ldr r0, =sub_80A64B0 str r0, [r3, 0x1C] - ldr r1, =sub_8112ACC + 1 + ldr r1, =sub_8112ACC adds r0, r3, 0 bl oamt_set_x3A_32 b @08112AC4 @@ -525079,7 +525079,7 @@ sub_8112ACC: ; 8112ACC movs r1, 0x4 orrs r0, r1 strb r0, [r2] - ldr r0, =sub_8112B44 + 1 + ldr r0, =sub_8112B44 str r0, [r4, 0x1C] @08112B3A: pop {r4,r5} @@ -525210,7 +525210,7 @@ sub_8112B78: ; 8112B78 movs r1, 0x4 orrs r0, r1 strb r0, [r2] - ldr r0, =sub_8112C4C + 1 + ldr r0, =sub_8112C4C str r0, [r5, 0x1C] @08112C40: pop {r4-r7} @@ -525301,7 +525301,7 @@ sub_8112C6C: ; 8112C6C movs r0, 0x52 bl lcd_io_set strh r6, [r4, 0x18] - ldr r0, =sub_8112D10 + 1 + ldr r0, =sub_8112D10 str r0, [r4] pop {r3} mov r8, r3 @@ -525641,7 +525641,7 @@ sub_8112F60: ; 8112F60 strh r1, [r0, 0x32] ldrh r1, [r2, 0x2] strh r1, [r0, 0x34] - ldr r1, =sub_8112FB8 + 1 + ldr r1, =sub_8112FB8 str r1, [r0, 0x1C] ldr r2, =0x02020630 movs r3, 0x38 @@ -525733,7 +525733,7 @@ sub_8112FB8: ; 8112FB8 ldrh r1, [r0, 0x22] subs r1, 0x8 strh r1, [r0, 0x22] - ldr r0, =move_anim_8074EE0 + 1 + ldr r0, =move_anim_8074EE0 str r0, [r5, 0x1C] @08113054: pop {r4,r5} @@ -525805,10 +525805,10 @@ sub_8113064: ; 8113064 movs r1, 0x4 orrs r0, r1 strb r0, [r2] - ldr r1, =move_anim_8074EE0 + 1 + ldr r1, =move_anim_8074EE0 adds r0, r5, 0 bl oamt_set_x3A_32 - ldr r0, =sub_80A66DC + 1 + ldr r0, =sub_80A66DC str r0, [r5, 0x1C] pop {r4,r5} pop {r0} @@ -525885,9 +525885,9 @@ sub_8113100: ; 8113100 ldr r0, =0x0203841e ldrh r0, [r0, 0x8] strh r0, [r5, 0x2E] - ldr r0, =sub_80A6EEC + 1 + ldr r0, =sub_80A6EEC str r0, [r5, 0x1C] - ldr r1, =move_anim_8074EE0 + 1 + ldr r1, =move_anim_8074EE0 adds r0, r5, 0 bl oamt_set_x3A_32 pop {r4,r5} @@ -525934,9 +525934,9 @@ sub_81131B4: ; 81131B4 ldrh r1, [r5, 0x22] adds r0, r1 strh r0, [r5, 0x22] - ldr r0, =sub_80A67D8 + 1 + ldr r0, =sub_80A67D8 str r0, [r5, 0x1C] - ldr r1, =move_anim_8074EE0 + 1 + ldr r1, =move_anim_8074EE0 adds r0, r5, 0 bl oamt_set_x3A_32 pop {r4,r5} @@ -526026,7 +526026,7 @@ sub_8113250: ; 8113250 ldrsh r1, [r6, r2] bl sine strh r0, [r6, 0x26] - ldr r0, =sub_81132E0 + 1 + ldr r0, =sub_81132E0 str r0, [r6, 0x1C] pop {r4-r7} pop {r0} @@ -526254,7 +526254,7 @@ sub_81133E8: ; 81133E8 ldr r1, [sp, 0x4] ldr r2, [sp, 0x8] bl sub_80BA038 - ldr r0, =sub_81134B8 + 1 + ldr r0, =sub_81134B8 str r0, [r4] add sp, 0xC pop {r4-r6} @@ -526482,7 +526482,7 @@ sub_81135EC: ; 81135EC strh r0, [r4, 0x22] ldrh r0, [r5, 0x6] strh r0, [r4, 0x34] - ldr r0, =sub_811369C + 1 + ldr r0, =sub_811369C str r0, [r4, 0x1C] adds r4, 0x2E ldr r2, =0x0203a100 @@ -526584,7 +526584,7 @@ sub_81136E8: ; 81136E8 adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, =sub_811375C + 1 + ldr r0, =sub_811375C str r0, [r1] pop {r4,r5} pop {r0} @@ -526674,7 +526674,7 @@ sub_81137E4: ; 81137E4 movs r1, 0x80 lsls r1, 5 strh r1, [r2, 0xA] - ldr r0, =sub_811381C + 1 + ldr r0, =sub_811381C str r0, [r2] movs r0, 0x52 bl lcd_io_set @@ -526818,7 +526818,7 @@ sub_81138D4: ; 81138D4 strh r0, [r4, 0x36] ldr r0, =0x0000ffd8 strh r0, [r4, 0x3A] - ldr r1, =sub_8113950 + 1 + ldr r1, =sub_8113950 str r1, [r4, 0x1C] adds r0, r4, 0 bl _call_via_r1 @@ -526925,7 +526925,7 @@ sub_81139DC: ; 81139DC strh r0, [r4, 0x30] ldrh r0, [r5, 0xA] strh r0, [r4, 0x32] - ldr r0, =sub_8113A18 + 1 + ldr r0, =sub_8113A18 str r0, [r4, 0x1C] pop {r4,r5} pop {r0} @@ -526961,7 +526961,7 @@ sub_8113A18: ; 8113A18 ldrsh r1, [r2, r3] cmp r0, r1 bne @08113A4E - ldr r0, =sub_8113A58 + 1 + ldr r0, =sub_8113A58 str r0, [r2, 0x1C] @08113A4E: pop {r0} @@ -527114,7 +527114,7 @@ sub_8113A90: ; 8113A90 strh r0, [r4, 0x38] adds r0, r4, 0 bl sub_80A68D4 - ldr r0, =sub_8113B90 + 1 + ldr r0, =sub_8113B90 str r0, [r4, 0x1C] pop {r4-r7} pop {r0} @@ -527309,7 +527309,7 @@ sub_8113BAC: ; 8113BAC ldr r1, =0x02022e26 movs r0, 0xA0 strh r0, [r1] - ldr r0, =sub_8113D60 + 1 + ldr r0, =sub_8113D60 str r0, [r5] add sp, 0x1C pop {r4-r7} @@ -527717,7 +527717,7 @@ sub_8113E78: ; 8113E78 ldr r1, =0x0000080c movs r0, 0x52 bl lcd_io_set - ldr r0, =sub_81140C8 + 1 + ldr r0, =sub_81140C8 str r0, [r5] @081140A6: add sp, 0x1C @@ -528262,9 +528262,9 @@ sub_81144BC: ; 81144BC ldrb r1, [r1, 0x4] adds r0, r4, 0 bl obj_anim_image_start - ldr r0, =sub_80A67D8 + 1 + ldr r0, =sub_80A67D8 str r0, [r4, 0x1C] - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 adds r0, r4, 0 bl oamt_set_x3A_32 pop {r4} @@ -528501,7 +528501,7 @@ sub_81144F8: ; 81144F8 ldrh r1, [r2, 0x4] strh r1, [r0, 0xE] strh r6, [r0, 0x14] - ldr r1, =sub_8114748 + 1 + ldr r1, =sub_8114748 str r1, [r0] add sp, 0x10 pop {r4-r7} @@ -528821,7 +528821,7 @@ sub_8114994: ; 8114994 strh r0, [r4, 0x38] adds r0, r4, 0 bl sub_80A68D4 - ldr r0, =sub_81149FC + 1 + ldr r0, =sub_81149FC str r0, [r4, 0x1C] pop {r4,r5} pop {r0} @@ -528868,7 +528868,7 @@ sub_81149FC: ; 81149FC strh r0, [r5, 0x38] adds r0, r5, 0 bl sub_80A68D4 - ldr r0, =sub_8114A60 + 1 + ldr r0, =sub_8114A60 str r0, [r5, 0x1C] @08114A50: pop {r4,r5} @@ -528931,9 +528931,9 @@ sub_8114A7C: ; 8114A7C ldrh r4, [r4, 0x6] adds r0, r4 strh r0, [r6, 0x36] - ldr r0, =sub_80A6EEC + 1 + ldr r0, =sub_80A6EEC str r0, [r6, 0x1C] - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 adds r0, r6, 0 bl oamt_set_x3A_32 pop {r4-r6} @@ -528994,9 +528994,9 @@ sub_8114AF0: ; 8114AF0 strh r0, [r6, 0x32] adds r0, r7, r4 strh r0, [r6, 0x36] - ldr r0, =sub_80A6EEC + 1 + ldr r0, =sub_80A6EEC str r0, [r6, 0x1C] - ldr r1, =move_anim_8074EE0 + 1 + ldr r1, =move_anim_8074EE0 adds r0, r6, 0 bl oamt_set_x3A_32 pop {r3} @@ -529055,7 +529055,7 @@ sub_8114B80: ; 8114B80 movs r1, 0x1 @08114BDA: strh r1, [r5, 0x2E] - ldr r0, =sub_8114C10 + 1 + ldr r0, =sub_8114C10 b @08114C02 .align 2, 0 .pool @@ -529066,7 +529066,7 @@ sub_8114B80: ; 8114B80 strh r0, [r5, 0x22] negs r0, r0 strh r0, [r5, 0x26] - ldr r0, =sub_8114C4C + 1 + ldr r0, =sub_8114C4C @08114C02: str r0, [r5, 0x1C] pop {r4-r6} @@ -529186,12 +529186,12 @@ sub_8114CBC: ; 8114CBC ldrsh r0, [r0, r3] cmp r0, 0 bne @08114CE8 - ldr r0, =sub_8114CFC + 1 + ldr r0, =sub_8114CFC b @08114CEA .align 2, 0 .pool @08114CE8: - ldr r0, =sub_8114EB4 + 1 + ldr r0, =sub_8114EB4 @08114CEA: str r0, [r1] ldr r1, [r1] @@ -529478,12 +529478,12 @@ sub_8114F14: ; 8114F14 ldrsh r0, [r0, r3] cmp r0, 0 bne @08114F40 - ldr r0, =sub_8114F54 + 1 + ldr r0, =sub_8114F54 b @08114F42 .align 2, 0 .pool @08114F40: - ldr r0, =sub_8114FD8 + 1 + ldr r0, =sub_8114FD8 @08114F42: str r0, [r1] ldr r1, [r1] @@ -529845,7 +529845,7 @@ sub_81151A0: ; 81151A0 strh r0, [r5, 0x38] adds r0, r5, 0 bl sub_80A68D4 - ldr r0, =sub_8115228 + 1 + ldr r0, =sub_8115228 str r0, [r5, 0x1C] pop {r4-r7} pop {r0} @@ -529920,12 +529920,12 @@ sub_8115244: ; 8115244 ands r0, r2 orrs r0, r1 strh r0, [r6, 0x4] - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 adds r0, r6, 0 bl oamt_set_x3A_32 ldrh r0, [r4, 0x4] strh r0, [r6, 0x2E] - ldr r0, =sub_80A64B0 + 1 + ldr r0, =sub_80A64B0 str r0, [r6, 0x1C] pop {r4-r6} pop {r0} @@ -529976,7 +529976,7 @@ sub_81152DC: ; 81152DC ldr r0, =0x02022e20 ldrh r0, [r0] strh r0, [r4, 0x22] - ldr r0, =sub_81153AC + 1 + ldr r0, =sub_81153AC b @0811539E .align 2, 0 .pool @@ -530029,7 +530029,7 @@ sub_81152DC: ; 81152DC movs r0, 0x1 strh r0, [r4, 0x22] @0811539C: - ldr r0, =sub_81154A4 + 1 + ldr r0, =sub_81154A4 @0811539E: str r0, [r4] @081153A0: @@ -530414,7 +530414,7 @@ sub_8115628: ; 8115628 movs r0, 0x2 eors r5, r0 @0811565A: - ldr r0, =sub_81156D0 + 1 + ldr r0, =sub_81156D0 ldrb r1, [r6, 0x2] bl AddTask lsls r0, 24 @@ -530544,7 +530544,7 @@ sub_811572C: ; 811572C ldr r0, =0x0203841e ldrh r0, [r0, 0x8] strh r0, [r4, 0x34] - ldr r1, =sub_8115798 + 1 + ldr r1, =sub_8115798 str r1, [r4, 0x1C] adds r0, r4, 0 bl _call_via_r1 @@ -530631,7 +530631,7 @@ sub_81157FC: ; 81157FC movs r1, 0x4 orrs r0, r1 strb r0, [r2] - ldr r0, =sub_8115884 + 1 + ldr r0, =sub_8115884 str r0, [r5, 0x1C] add sp, 0x4 pop {r4,r5} @@ -530731,7 +530731,7 @@ sub_81158A4: ; 81158A4 movs r1, 0x4 orrs r0, r1 strb r0, [r2] - ldr r0, =sub_81158F8 + 1 + ldr r0, =sub_81158F8 str r0, [r5, 0x1C] pop {r4,r5} pop {r0} @@ -530763,7 +530763,7 @@ sub_81158F8: ; 81158F8 ldrsh r0, [r4, r1] cmp r0, 0 bne @08115930 - ldr r0, =sub_8115984 + 1 + ldr r0, =sub_8115984 str r0, [r4, 0x1C] b @0811597C .align 2, 0 @@ -530862,10 +530862,10 @@ sub_81159B4: ; 81159B4 movs r0, 0x70 strh r0, [r4, 0x36] strh r2, [r4, 0x38] - ldr r1, =move_anim_8074EE0 + 1 + ldr r1, =move_anim_8074EE0 adds r0, r4, 0 bl oamt_set_x3A_32 - ldr r1, =sub_80A634C + 1 + ldr r1, =sub_80A634C str r1, [r4, 0x1C] adds r0, r4, 0 bl _call_via_r1 @@ -530905,7 +530905,7 @@ sub_8115A04: ; 8115A04 lsrs r2, 24 movs r1, 0 bl sub_8115A54 - ldr r0, =sub_8115AA4 + 1 + ldr r0, =sub_8115AA4 str r0, [r4] pop {r4,r5} pop {r0} @@ -531091,7 +531091,7 @@ sub_8115B0C: ; 8115B0C adds r0, r6, 0 movs r1, 0 bl sub_8115BC8 - ldr r0, =sub_8115C18 + 1 + ldr r0, =sub_8115C18 str r0, [r4] pop {r3,r4} mov r8, r3 @@ -531231,7 +531231,7 @@ sub_8115C80: ; 8115C80 lsrs r2, 24 movs r1, 0 bl sub_8115CD0 - ldr r0, =sub_8115D2C + 1 + ldr r0, =sub_8115D2C str r0, [r4] pop {r4,r5} pop {r0} @@ -531386,7 +531386,7 @@ sub_8115D94: ; 8115D94 movs r1, 0 adds r2, r3, 0 bl sub_80A1AD4 - ldr r0, =sub_8115E00 + 1 + ldr r0, =sub_8115E00 str r0, [r4] add sp, 0x4 pop {r4,r5} @@ -531428,7 +531428,7 @@ sub_8115E00: ; 8115E00 ldrsh r0, [r4, r3] cmp r0, 0 bne @08115E4C - ldr r0, =sub_8115EB8 + 1 + ldr r0, =sub_8115EB8 str r0, [r4] b @08115EAC .align 2, 0 @@ -531803,7 +531803,7 @@ sub_81160A4: ; 81160A4 bhi @08116130 bl sub_81161F4 @08116130: - ldr r0, =sub_8116148 + 1 + ldr r0, =sub_8116148 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -532015,7 +532015,7 @@ sub_81162A4: ; 81162A4 ldr r4, =0x02022e22 ldrh r1, [r3, 0x2] strh r1, [r4] - ldr r1, =sub_81162F8 + 1 + ldr r1, =sub_81162F8 str r1, [r2] bl _call_via_r1 pop {r4} @@ -532125,9 +532125,9 @@ sub_8116388: ; 8116388 movs r1, 0x1 bl sub_80A6980 @081163B4: - ldr r0, =sub_80A67BC + 1 + ldr r0, =sub_80A67BC str r0, [r5, 0x1C] - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 adds r0, r5, 0 bl oamt_set_x3A_32 pop {r4,r5} @@ -532162,9 +532162,9 @@ sub_81163D0: ; 81163D0 ldr r0, =0x0203841e ldrh r0, [r0, 0x8] strh r0, [r5, 0x2E] - ldr r0, =sub_80A67BC + 1 + ldr r0, =sub_80A67BC str r0, [r5, 0x1C] - ldr r1, =sub_810E2C8 + 1 + ldr r1, =sub_810E2C8 adds r0, r5, 0 bl oamt_set_x3A_32 pop {r4,r5} @@ -532256,10 +532256,10 @@ sub_8116458: ; 8116458 ldrh r1, [r4, 0x26] adds r0, r1 strh r0, [r4, 0x26] - ldr r1, =move_anim_8074EE0 + 1 + ldr r1, =move_anim_8074EE0 adds r0, r4, 0 bl oamt_set_x3A_32 - ldr r0, =sub_80A67BC + 1 + ldr r0, =sub_80A67BC str r0, [r4, 0x1C] pop {r4,r5} pop {r0} @@ -532306,10 +532306,10 @@ sub_81164F0: ; 81164F0 ldrb r1, [r5, 0x6] adds r0, r4, 0 bl sub_8008258 - ldr r1, =move_anim_8074EE0 + 1 + ldr r1, =move_anim_8074EE0 adds r0, r4, 0 bl oamt_set_x3A_32 - ldr r0, =sub_80A67BC + 1 + ldr r0, =sub_80A67BC str r0, [r4, 0x1C] pop {r4,r5} pop {r0} @@ -532341,10 +532341,10 @@ sub_8116560: ; 8116560 ldr r0, =0x0203841e ldrh r0, [r0, 0x6] strh r0, [r4, 0x2E] - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 adds r0, r4, 0 bl oamt_set_x3A_32 - ldr r0, =sub_80A64B0 + 1 + ldr r0, =sub_80A64B0 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -532375,7 +532375,7 @@ sub_81165A8: ; 81165A8 movs r1, 0x1 bl sub_80A6980 @081165D4: - ldr r0, =sub_81165E4 + 1 + ldr r0, =sub_81165E4 str r0, [r5, 0x1C] pop {r4,r5} pop {r0} @@ -532722,7 +532722,7 @@ sub_8116874: ; 8116874 strh r1, [r2, 0x12] ldrh r1, [r3, 0x4] strh r1, [r2, 0x1C] - ldr r1, =sub_81168B8 + 1 + ldr r1, =sub_81168B8 str r1, [r2] bl _call_via_r1 pop {r0} @@ -532844,7 +532844,7 @@ sub_8116960: ; 8116960 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81169A0 + 1 + ldr r1, =sub_81169A0 str r1, [r0] add sp, 0x4 pop {r4,r5} @@ -532895,7 +532895,7 @@ sub_81169C0: ; 81169C0 ldrh r0, [r2, 0x6] strh r0, [r1, 0x10] strh r3, [r1, 0x12] - ldr r0, =sub_81169F8 + 1 + ldr r0, =sub_81169F8 str r0, [r1] bx lr .align 2, 0 @@ -532986,7 +532986,7 @@ sub_81169F8: ; 81169F8 adds r1, r6, 0 adds r1, 0x1C adds r0, r1 - ldr r1, =sub_8116AD0 + 1 + ldr r1, =sub_8116AD0 str r1, [r0] ldrh r0, [r4, 0x12] adds r0, 0x1 @@ -533278,7 +533278,7 @@ sub_8116B14: ; 8116B14 adds r0, r1 strh r5, [r0, 0x8] strh r7, [r0, 0x14] - ldr r1, =sub_8116D64 + 1 + ldr r1, =sub_8116D64 str r1, [r0] add sp, 0x14 pop {r3,r4} @@ -533465,7 +533465,7 @@ sub_8116EB4: ; 8116EB4 adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, =sub_8116F04 + 1 + ldr r0, =sub_8116F04 str r0, [r1] pop {r4,r5} pop {r0} @@ -533672,7 +533672,7 @@ sub_8116F04: ; 8116F04 adds r1, r6 lsls r1, 3 adds r1, r0 - ldr r0, =sub_81170EC + 1 + ldr r0, =sub_81170EC str r0, [r1] pop {r4-r6} pop {r0} @@ -533883,7 +533883,7 @@ sub_81170EC: ; 81170EC adds r0, r2 ldrb r0, [r0] strh r0, [r1, 0x16] - ldr r0, =sub_81172EC + 1 + ldr r0, =sub_81172EC str r0, [r1] movs r1, 0x4 ldrsh r0, [r3, r1] @@ -534160,7 +534160,7 @@ sub_8117494: ; 8117494 strh r6, [r4, 0x26] strh r5, [r4, 0x8] strh r5, [r4, 0xA] - ldr r0, =sub_8117500 + 1 + ldr r0, =sub_8117500 str r0, [r4] add sp, 0xC pop {r4-r6} @@ -534371,7 +534371,7 @@ sub_8117660: ; 8117660 lsrs r6, r0, 24 movs r0, 0 bl sub_80A6DAC - ldr r0, =sub_81176D8 + 1 + ldr r0, =sub_81176D8 movs r1, 0x5 bl AddTask lsls r0, 24 @@ -534818,7 +534818,7 @@ sub_8117854: ; 8117854 mov r2, sp ldrh r2, [r2, 0x20] strh r2, [r0, 0xE] - ldr r1, =sub_8117A60 + 1 + ldr r1, =sub_8117A60 str r1, [r0] add sp, 0x24 pop {r3-r5} @@ -535498,7 +535498,7 @@ sub_8117F60: ; 8117F60 movs r2, 0x1 orrs r0, r2 strb r0, [r1] - ldr r0, =sub_8117FD0 + 1 + ldr r0, =sub_8117FD0 str r0, [r3] ldr r1, =0x020383fe ldrb r0, [r1] @@ -535787,7 +535787,7 @@ battle_intro_launch: ; 81181D4 ldr r0, =0x00000c03 cmp r1, r0 beq @08118208 - ldr r0, =sub_8118D68 + 1 + ldr r0, =sub_8118D68 b @08118258 .align 2, 0 .pool @@ -535797,7 +535797,7 @@ battle_intro_launch: ; 81181D4 ands r0, r2 cmp r0, 0 beq @0811821C - ldr r0, =task00_battle_intro_wireless + 1 + ldr r0, =task00_battle_intro_wireless b @08118258 .align 2, 0 .pool @@ -535806,7 +535806,7 @@ battle_intro_launch: ; 81181D4 ands r0, r2 cmp r0, 0 beq @08118230 - ldr r0, =task_battle_intro_anim + 1 + ldr r0, =task_battle_intro_anim b @08118258 .align 2, 0 .pool @@ -535821,7 +535821,7 @@ battle_intro_launch: ; 81181D4 cmp r0, 0x2 beq @08118250 movs r4, 0x3 - ldr r0, =task00_battle_intro_80BC6C8 + 1 + ldr r0, =task00_battle_intro_80BC6C8 b @08118258 .align 2, 0 .pool @@ -536978,7 +536978,7 @@ task00_battle_intro_wireless: ; 8118AC0 adds r1, r4 mov r8, r1 add r0, r8 - ldr r6, =sub_8038B74 + 1 + ldr r6, =sub_8038B74 str r6, [r0] adds r3, 0x7E ldrb r1, [r3] @@ -539887,7 +539887,7 @@ sub_811A20C: ; 811A20C lsls r5, 24 lsrs r5, 24 bl clear_tasks - ldr r0, =sub_811A2C0 + 1 + ldr r0, =sub_811A2C0 movs r1, 0 bl AddTask adds r4, r0, 0 @@ -539908,7 +539908,7 @@ sub_811A20C: ; 811A20C movs r1, 0x4 mov r2, r9 bl set_word_task_arg - ldr r0, =sub_811A278 + 1 + ldr r0, =sub_811A278 bl set_callback2 pop {r3,r4} mov r8, r3 @@ -539981,7 +539981,7 @@ sub_811A2C0: ; 811A2C0 cmp r0, 0x1 beq @0811A2F2 @0811A2EA: - ldr r1, =sub_811A2FC + 1 + ldr r1, =sub_811A2FC adds r0, r4, 0 bl sub_811A2A4 @0811A2F2: @@ -540025,7 +540025,7 @@ sub_811A2FC: ; 811A2FC .4byte @0811A3EC .4byte @0811A40C @0811A344: - ldr r0, =sub_811A290 + 1 + ldr r0, =sub_811A290 bl SetVBlankCallback movs r4, 0x1 negs r4, r4 @@ -540519,7 +540519,7 @@ sub_811A4F0: ; 811A4F0 bl overworld_free_bg_tilemaps ldr r0, =0x020375e0 ldrb r0, [r0] - ldr r2, =sub_80861B0 + 1 + ldr r2, =sub_80861B0 adds r1, r4, 0 adds r3, r5, 0 bl sub_811A20C @@ -540588,7 +540588,7 @@ sub_811A7E4: ; 811A7E4 thumb_func_start sub_811A858 sub_811A858: ; 811A858 push {lr} - ldr r0, =sub_811A7E4 + 1 + ldr r0, =sub_811A7E4 bl set_callback2 pop {r0} bx r0 @@ -540663,7 +540663,7 @@ sub_811A8CC: ; 811A8CC ldr r1, [r0] ldr r0, =0x00003b6e adds r1, r0 - ldr r2, =sub_80861B0 + 1 + ldr r2, =sub_80861B0 movs r0, 0xF movs r3, 0x3 bl sub_811A20C @@ -540680,7 +540680,7 @@ sub_811A8F0: ; 811A8F0 ldr r1, [r0] ldr r0, =0x00003b5a adds r1, r0 - ldr r2, =sub_80861B0 + 1 + ldr r2, =sub_80861B0 movs r0, 0x10 movs r3, 0x3 bl sub_811A20C @@ -540697,7 +540697,7 @@ sub_811A914: ; 811A914 ldr r1, [r0] ldr r0, =0x00003b6c adds r1, r0 - ldr r2, =sub_80861B0 + 1 + ldr r2, =sub_80861B0 movs r0, 0x12 movs r3, 0x3 bl sub_811A20C @@ -540714,7 +540714,7 @@ sub_811A938: ; 811A938 ldr r1, [r0] ldr r0, =0x00003b5a adds r1, r0 - ldr r2, =sub_80861B0 + 1 + ldr r2, =sub_80861B0 movs r0, 0x11 movs r3, 0x3 bl sub_811A20C @@ -548359,7 +548359,7 @@ sub_811E288: ; 811E288 ldr r0, =0x02020630 adds r1, r0 str r1, [r2] - ldr r0, =sub_811E2DC + 1 + ldr r0, =sub_811E2DC str r0, [r1, 0x1C] ldrb r2, [r1, 0x5] movs r0, 0xD @@ -549131,7 +549131,7 @@ sub_811E828: ; 811E828 cmp r0, 0x4 bne @0811E8D0 adds r0, r4, 0 - ldr r5, =nullsub_12 + 1 + ldr r5, =nullsub_12 movs r4, 0 str r4, [sp] adds r1, r5, 0 @@ -551919,7 +551919,7 @@ sub_811FC80: ; 811FC80 str r7, [r4, 0xC] ldr r0, =gUnknown_082EC6A8 str r0, [r4, 0x10] - ldr r0, =nullsub_47 + 1 + ldr r0, =nullsub_47 str r0, [r4, 0x14] mov r0, sp bl gpu_tile_obj_alloc_and_load_multiple @@ -551989,7 +551989,7 @@ sub_811FC80: ; 811FC80 strh r0, [r4, 0x2] ldr r0, =gUnknown_0859EEDC str r0, [r4, 0x8] - ldr r0, =sub_811FF40 + 1 + ldr r0, =sub_811FF40 str r0, [r4, 0x14] ldr r0, =gUnknown_0859EE84 str r0, [r4, 0x4] @@ -552036,7 +552036,7 @@ sub_811FC80: ; 811FC80 lsrs r5, r0, 16 cmp r5, 0x3 bls @0811FDC8 - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r4, 0x14] adds r0, r4, 0 movs r1, 0 @@ -552092,7 +552092,7 @@ sub_811FC80: ; 811FC80 movs r0, 0 str r0, [r1, 0x28] @0811FEAE: - ldr r0, =sub_811FF7C + 1 + ldr r0, =sub_811FF7C str r0, [r4, 0x14] ldr r0, [sp, 0x48] movs r2, 0xC0 @@ -552290,7 +552290,7 @@ sub_811FFD4: ; 811FFD4 str r2, [sp, 0xC] ldr r0, =gUnknown_082EC6A8 str r0, [sp, 0x10] - ldr r0, =nullsub_47 + 1 + ldr r0, =nullsub_47 str r0, [sp, 0x14] lsls r3, 23 lsrs r3, 16 @@ -553125,7 +553125,7 @@ sub_81206C0: ; 81206C0 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, =sub_8120944 + 1 + ldr r0, =sub_8120944 movs r1, 0x50 bl AddTask lsls r0, 24 @@ -553174,7 +553174,7 @@ sub_8120708: ; 8120708 movs r4, 0x1 str r4, [sp] str r4, [sp, 0x4] - ldr r0, =sub_81206FC + 1 + ldr r0, =sub_81206FC str r0, [sp, 0x8] movs r0, 0 movs r1, 0x1 @@ -554811,7 +554811,7 @@ sub_81212FC: ; 81212FC thumb_func_start sub_8121388 sub_8121388: ; 8121388 push {lr} - ldr r0, =sub_81212FC + 1 + ldr r0, =sub_81212FC movs r1, 0x50 bl AddTask pop {r0} @@ -554949,12 +554949,12 @@ sub_8121478: ; 8121478 movs r3, 0x88 lsls r3, 2 adds r1, r4, r3 - ldr r0, =sub_811EBBC + 1 + ldr r0, =sub_811EBBC str r0, [r1] movs r0, 0x89 lsls r0, 2 adds r1, r4, r0 - ldr r0, =sub_811EC08 + 1 + ldr r0, =sub_811EC08 str r0, [r1] ldrh r1, [r5, 0x20] adds r0, r1, 0 @@ -555078,7 +555078,7 @@ sub_8121478: ; 8121478 adds r3, 0x4 adds r0, r1, r3 strb r6, [r0] - ldr r0, =sub_81219F0 + 1 + ldr r0, =sub_81219F0 bl set_callback2 add sp, 0x4 pop {r4-r7} @@ -555414,7 +555414,7 @@ sub_81215EC: ; 81215EC bne @081219D4 b @081219E2 @081218F6: - ldr r0, =sub_8121C50 + 1 + ldr r0, =sub_8121C50 bl SetVBlankCallback ldr r2, =0x02037fd4 ldrb r0, [r2, 0x8] @@ -555449,7 +555449,7 @@ sub_81215EC: ; 81215EC @08121940: adds r0, r4, 0 bl sub_80D2F68 - ldr r1, =nullsub_12 + 1 + ldr r1, =nullsub_12 movs r0, 0 str r0, [sp] str r0, [sp, 0x4] @@ -555461,7 +555461,7 @@ sub_81215EC: ; 81215EC @08121958: adds r0, r4, 0 bl sub_80D2F68 - ldr r1, =nullsub_12 + 1 + ldr r1, =nullsub_12 movs r0, 0 str r0, [sp] str r0, [sp, 0x4] @@ -555506,7 +555506,7 @@ sub_81215EC: ; 81215EC movs r1, 0x84 lsls r1, 2 adds r0, r1 - ldr r1, =sub_8121C98 + 1 + ldr r1, =sub_8121C98 str r1, [r0] movs r0, 0x1 b @081219E4 @@ -555540,7 +555540,7 @@ sub_81219F0: ; 81219F0 lsrs r0, 24 cmp r0, 0x1 bne @08121A0C - ldr r0, =sub_8121C64 + 1 + ldr r0, =sub_8121C64 bl set_callback2 b @08121A18 .align 2, 0 @@ -555872,7 +555872,7 @@ sub_8121C98: ; 8121C98 movs r1, 0x84 lsls r1, 2 adds r0, r1 - ldr r1, =sub_8121CC0 + 1 + ldr r1, =sub_8121CC0 str r1, [r0] @08121CB2: pop {r0} @@ -555903,7 +555903,7 @@ sub_8121CC0: ; 8121CC0 movs r1, 0x84 lsls r1, 2 adds r0, r1 - ldr r1, =sub_8121D00 + 1 + ldr r1, =sub_8121D00 str r1, [r0] @08121CEE: add sp, 0x4 @@ -556140,7 +556140,7 @@ sub_8121E7C: ; 8121E7C add r0, r8 lsls r0, 3 adds r0, r1 - ldr r1, =task_show_message + 1 + ldr r1, =task_show_message str r1, [r0] add sp, 0x10 pop {r3} @@ -556205,7 +556205,7 @@ sub_8121F68: ; 8121F68 adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r0, =sub_8121FDC + 1 + ldr r0, =sub_8121FDC str r0, [r1] bx lr .align 2, 0 @@ -556238,7 +556238,7 @@ sub_8121F94: ; 8121F94 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_8121FDC + 1 + ldr r1, =sub_8121FDC str r1, [r0] pop {r4,r5} pop {r0} @@ -558061,12 +558061,12 @@ sub_8122CF8: ; 8122CF8 ldr r1, [r3] cmp r2, 0x1 bne @08122D28 - ldr r0, =sub_8123254 + 1 + ldr r0, =sub_8123254 b @08122D2A .align 2, 0 .pool @08122D28: - ldr r0, =sub_81230C4 + 1 + ldr r0, =sub_81230C4 @08122D2A: str r0, [r1, 0x18] cmp r4, 0 @@ -558608,7 +558608,7 @@ sub_81230C4: ; 81230C4 movs r1, 0x4 strb r1, [r0] ldr r1, [r2] - ldr r0, =_swiopen + 1 + ldr r0, =_swiopen str r0, [r1, 0x18] @08123184: adds r0, r4, 0 @@ -558712,7 +558712,7 @@ _swiopen: ; 8123190 @0812323C: bl sub_8123FB0 ldr r1, [r5] - ldr r0, =sub_81230C4 + 1 + ldr r0, =sub_81230C4 str r0, [r1, 0x18] movs r0, 0x3 @08123248: @@ -558825,7 +558825,7 @@ sub_8123254: ; 8123254 cmp r4, 0x1 bne @0812331A ldr r0, [r6] - ldr r1, =sub_8123334 + 1 + ldr r1, =sub_8123334 str r1, [r0, 0x18] adds r0, 0x6C movs r1, 0 @@ -558942,7 +558942,7 @@ sub_8123334: ; 8123334 adds r1, 0x6C movs r0, 0 strh r0, [r1] - ldr r0, =sub_8123254 + 1 + ldr r0, =sub_8123254 str r0, [r2, 0x18] movs r0, 0x3 b @08123412 @@ -559144,10 +559144,10 @@ sub_8123514: ; 8123514 adds r0, r1, 0 adds r0, 0x78 ldrb r0, [r0] - ldr r2, =sub_8123254 + 1 + ldr r2, =sub_8123254 cmp r0, 0 bne @08123584 - ldr r2, =sub_81230C4 + 1 + ldr r2, =sub_81230C4 @08123584: str r2, [r1, 0x18] adds r0, r1, 0 @@ -560722,7 +560722,7 @@ sub_81240D4: ; 81240D4 subs r1, 0x84 orrs r0, r1 str r0, [r2, 0x4] - ldr r0, =sub_8124088 + 1 + ldr r0, =sub_8124088 b @0812416E .align 2, 0 .pool @@ -560737,7 +560737,7 @@ sub_81240D4: ; 81240D4 lsls r1, 3 orrs r0, r1 str r0, [r2, 0x4] - ldr r0, =nullsub_48 + 1 + ldr r0, =nullsub_48 @0812416E: str r0, [sp, 0x14] adds r0, r2, 0 @@ -560916,7 +560916,7 @@ sub_8124288: ; 8124288 str r5, [sp, 0xC] ldr r0, =gUnknown_082EC6A8 str r0, [sp, 0x10] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [sp, 0x14] ldr r0, =0x02037318 ldrb r0, [r0, 0x14] @@ -560978,7 +560978,7 @@ sub_8124288: ; 8124288 adds r0, 0x4 strh r0, [r1, 0x22] ldr r1, [r2, 0x20] - ldr r0, =sub_81244EC + 1 + ldr r0, =sub_81244EC b @081243A2 .align 2, 0 .pool @@ -560997,7 +560997,7 @@ sub_8124288: ; 8124288 subs r0, 0x42 strh r0, [r1, 0x22] ldr r1, [r2, 0x20] - ldr r0, =sub_812445C + 1 + ldr r0, =sub_812445C @081243A2: str r0, [r1, 0x1C] @081243A4: @@ -561024,7 +561024,7 @@ sub_81243B0: ; 81243B0 strb r0, [r2] ldr r0, [r3] ldr r1, [r0, 0x20] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r1, 0x1C] @081243CE: pop {r0} @@ -561060,7 +561060,7 @@ sub_81243DC: ; 81243DC subs r0, 0x42 strh r0, [r1, 0x22] ldr r1, [r3, 0x20] - ldr r0, =sub_812445C + 1 + ldr r0, =sub_812445C b @08124444 .align 2, 0 .pool @@ -561084,7 +561084,7 @@ sub_81243DC: ; 81243DC ldr r0, [r3, 0x20] strh r2, [r0, 0x26] ldr r1, [r3, 0x20] - ldr r0, =sub_81244EC + 1 + ldr r0, =sub_81244EC @08124444: str r0, [r1, 0x1C] adds r1, 0x3E @@ -561495,7 +561495,7 @@ sub_8124690: ; 8124690 str r0, [r4] cmp r0, 0 bne @08124754 - ldr r0, =sub_8086194 + 1 + ldr r0, =sub_8086194 bl set_callback2 b @081248AA .align 2, 0 @@ -561605,7 +561605,7 @@ sub_8124690: ; 8124690 movs r1, 0x10 movs r2, 0 bl sub_80A2A20 - ldr r0, =sub_81248C0 + 1 + ldr r0, =sub_81248C0 bl SetVBlankCallback b @0812489C .align 2, 0 @@ -561624,9 +561624,9 @@ sub_8124690: ; 8124690 bl gpu_sync_bg_show movs r0, 0x2 bl gpu_sync_bg_show - ldr r0, =sub_8124D14 + 1 + ldr r0, =sub_8124D14 bl sub_81248F4 - ldr r0, =sub_81248D4 + 1 + ldr r0, =sub_81248D4 bl set_callback2 @0812489C: ldr r1, =0x030022c0 @@ -561983,7 +561983,7 @@ sub_8124AD4: ; 8124AD4 mov r0, r8 adds r0, 0x1C adds r0, r6, r0 - ldr r1, =sub_8124CBC + 1 + ldr r1, =sub_8124CBC str r1, [r0] b @08124BA2 .align 2, 0 @@ -562101,7 +562101,7 @@ sub_8124BE4: ; 8124BE4 orrs r0, r1 strb r0, [r4, 0x3] add r2, r10 - ldr r0, =sub_8124CBC + 1 + ldr r0, =sub_8124CBC str r0, [r2] adds r0, r4, 0 movs r1, 0x6 @@ -562214,7 +562214,7 @@ sub_8124D14: ; 8124D14 lsls r0, 24 cmp r0, 0 bne @08124D56 - ldr r0, =sub_8124D64 + 1 + ldr r0, =sub_8124D64 bl sub_81248F4 @08124D56: add sp, 0x4 @@ -562272,7 +562272,7 @@ sub_8124D64: ; 8124D64 adds r0, r1 movs r1, 0x1 strb r1, [r0] - ldr r0, =sub_8124E0C + 1 + ldr r0, =sub_8124E0C bl sub_81248F4 b @08124DF8 .align 2, 0 @@ -562286,7 +562286,7 @@ sub_8124D64: ; 8124D64 adds r0, r1 movs r1, 0 strb r1, [r0] - ldr r0, =sub_8124E0C + 1 + ldr r0, =sub_8124E0C bl sub_81248F4 @08124DF8: pop {r4} @@ -562419,7 +562419,7 @@ sub_8124E0C: ; 8124E0C bl sub_80B69DC b @08124F06 @08124F00: - ldr r0, =sub_81B58A8 + 1 + ldr r0, =sub_81B58A8 bl set_callback2 @08124F06: ldr r4, =0x0203a148 @@ -565994,7 +565994,7 @@ sub_8126AD8: ; 8126AD8 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_8126B80 + 1 + ldr r1, =sub_8126B80 str r1, [r0] pop {r4} pop {r0} @@ -566028,7 +566028,7 @@ sub_8126B2C: ; 8126B2C adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_8126B80 + 1 + ldr r1, =sub_8126B80 str r1, [r0] pop {r4} pop {r0} @@ -566144,7 +566144,7 @@ sub_8126C48: ; 8126C48 ldr r1, =gUnknown_085EA83D adds r0, r4, 0 bl ExpandTextCodes - ldr r2, =sub_8126DA4 + 1 + ldr r2, =sub_8126DA4 adds r0, r5, 0 adds r1, r4, 0 bl sub_81978EC @@ -566186,7 +566186,7 @@ sub_8126CA4: ; 8126CA4 ldr r1, =gUnknown_085EAAEC adds r0, r4, 0 bl ExpandTextCodes - ldr r2, =sub_8126DA4 + 1 + ldr r2, =sub_8126DA4 adds r0, r5, 0 adds r1, r4, 0 bl sub_81978EC @@ -566209,7 +566209,7 @@ sub_8126CA4: ; 8126CA4 adds r0, r1 movs r1, 0 strh r1, [r0, 0xC] - ldr r1, =sub_8129ABC + 1 + ldr r1, =sub_8129ABC str r1, [r0] @08126D00: pop {r4,r5} @@ -566232,7 +566232,7 @@ sub_8126D10: ; 8126D10 ldr r1, =gUnknown_085EA83D adds r0, r4, 0 bl ExpandTextCodes - ldr r2, =sub_8126DA4 + 1 + ldr r2, =sub_8126DA4 adds r0, r5, 0 adds r1, r4, 0 bl sub_81978EC @@ -566299,7 +566299,7 @@ sub_8126DA4: ; 8126DA4 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_8126B80 + 1 + ldr r1, =sub_8126B80 str r1, [r0] pop {r4} pop {r0} @@ -566355,7 +566355,7 @@ sub_8126DFC: ; 8126DFC adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, =sub_8127088 + 1 + ldr r1, =sub_8127088 str r1, [r0] pop {r4,r5} pop {r0} @@ -566386,7 +566386,7 @@ sub_8126E44: ; 8126E44 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_8127088 + 1 + ldr r1, =sub_8127088 str r1, [r0] pop {r4,r5} pop {r0} @@ -566723,7 +566723,7 @@ sub_81270E8: ; 81270E8 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, =sub_8127620 + 1 + ldr r1, =sub_8127620 str r1, [r0] b @0812716E .align 2, 0 @@ -566735,7 +566735,7 @@ sub_81270E8: ; 81270E8 ldr r1, =gUnknown_085EA83D adds r0, r4, 0 bl ExpandTextCodes - ldr r2, =sub_8127180 + 1 + ldr r2, =sub_8127180 adds r0, r5, 0 adds r1, r4, 0 bl sub_81978EC @@ -566808,7 +566808,7 @@ sub_81271CC: ; 81271CC adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_8126B80 + 1 + ldr r1, =sub_8126B80 str r1, [r0] pop {r4} pop {r0} @@ -567318,7 +567318,7 @@ sub_8127620: ; 8127620 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_812764C + 1 + ldr r1, =sub_812764C str r1, [r0] pop {r4} pop {r0} @@ -567829,7 +567829,7 @@ sub_8127A30: ; 8127A30 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_8127A14 + 1 + ldr r1, =sub_8127A14 str r1, [r0] pop {r4} pop {r0} @@ -568503,7 +568503,7 @@ sub_8127F68: ; 8127F68 ldr r1, =gUnknown_085EA9AE adds r0, r4, 0 bl ExpandTextCodes - ldr r2, =sub_8127A5C + 1 + ldr r2, =sub_8127A5C adds r0, r5, 0 adds r1, r4, 0 bl sub_81978EC @@ -568531,7 +568531,7 @@ sub_8127F68: ; 8127F68 adds r0, r1 movs r1, 0 strh r1, [r0, 0xC] - ldr r1, =sub_8128060 + 1 + ldr r1, =sub_8128060 str r1, [r0] b @0812804C .align 2, 0 @@ -568558,7 +568558,7 @@ sub_8127F68: ; 8127F68 bl ExpandTextCodes @08128020: ldr r1, =0x02021fc4 - ldr r2, =sub_8127A5C + 1 + ldr r2, =sub_8127A5C adds r0, r5, 0 bl sub_81978EC b @0812804C @@ -568569,7 +568569,7 @@ sub_8127F68: ; 8127F68 ldr r1, =gUnknown_085EA8D2 adds r0, r4, 0 bl ExpandTextCodes - ldr r2, =sub_8127A5C + 1 + ldr r2, =sub_8127A5C adds r0, r5, 0 adds r1, r4, 0 bl sub_81978EC @@ -568705,7 +568705,7 @@ sub_8128118: ; 8128118 adds r0, r4, 0 adds r0, 0x1C adds r0, r2, r0 - ldr r1, =sub_81292D0 + 1 + ldr r1, =sub_81292D0 str r1, [r0] adds r2, r4 ldr r3, =gUnknown_085A7250 @@ -568775,14 +568775,14 @@ sub_81281A8: ; 81281A8 ldrb r0, [r0, 0x8] cmp r0, 0 bne @0812820C - ldr r1, =nullsub_12 + 1 + ldr r1, =nullsub_12 str r0, [sp] movs r0, 0xC1 b @08128214 .align 2, 0 .pool @0812820C: - ldr r1, =nullsub_12 + 1 + ldr r1, =nullsub_12 movs r0, 0 str r0, [sp] movs r0, 0xC2 @@ -569058,7 +569058,7 @@ sub_8128414: ; 8128414 ldr r1, =gUnknown_085EA8BF adds r0, r5, 0 bl ExpandTextCodes - ldr r2, =sub_8128B80 + 1 + ldr r2, =sub_8128B80 adds r0, r4, 0 adds r1, r5, 0 bl sub_81978EC @@ -569730,7 +569730,7 @@ sub_8128950: ; 8128950 ldr r1, =gUnknown_085EA897 adds r0, r4, 0 bl ExpandTextCodes - ldr r2, =sub_81289D0 + 1 + ldr r2, =sub_81289D0 adds r0, r5, 0 adds r1, r4, 0 bl sub_81978EC @@ -569744,7 +569744,7 @@ sub_8128950: ; 8128950 ldr r1, =gUnknown_085EA8A6 adds r0, r4, 0 bl ExpandTextCodes - ldr r2, =sub_8129020 + 1 + ldr r2, =sub_8129020 adds r0, r5, 0 adds r1, r4, 0 bl sub_81978EC @@ -570007,7 +570007,7 @@ sub_8128BBC: ; 8128BBC adds r0, r1 movs r1, 0 strh r1, [r0, 0xC] - ldr r1, =c1_overworld_prev_quest + 1 + ldr r1, =c1_overworld_prev_quest str r1, [r0] pop {r4} pop {r0} @@ -570055,9 +570055,9 @@ c1_overworld_prev_quest: ; 8128BEC ldr r0, =0x00000be5 bl gpu_pal_free_tag ldr r1, =0x03005dac - ldr r0, =sub_8128CD4 + 1 + ldr r0, =sub_8128CD4 str r0, [r1] - ldr r0, =c2_exit_to_overworld_2_switch + 1 + ldr r0, =c2_exit_to_overworld_2_switch bl set_callback2 adds r0, r4, 0 bl remove_task @@ -570121,7 +570121,7 @@ sub_8128C64: ; 8128C64 adds r0, r6, 0 subs r0, 0x8 adds r0, r5, r0 - ldr r1, =sub_812764C + 1 + ldr r1, =sub_812764C str r1, [r0] @08128CCA: pop {r4-r6} @@ -570136,7 +570136,7 @@ sub_8128CD4: ; 8128CD4 push {r4,lr} bl script_env_2_enable bl pal_fill_black - ldr r0, =sub_8128C64 + 1 + ldr r0, =sub_8128C64 movs r1, 0x8 bl AddTask adds r4, r0, 0 @@ -570549,7 +570549,7 @@ sub_8128FD8: ; 8128FD8 lsls r0, 3 adds r0, r1 strh r2, [r0, 0x1C] - ldr r1, =sub_8128E18 + 1 + ldr r1, =sub_8128E18 str r1, [r0] pop {r4} pop {r0} @@ -570937,7 +570937,7 @@ sub_81292D0: ; 81292D0 strh r1, [r0, 0x38] strh r1, [r0, 0x3A] strh r1, [r0, 0x3C] - ldr r1, =sub_81292E8 + 1 + ldr r1, =sub_81292E8 str r1, [r0, 0x1C] bx lr .align 2, 0 @@ -571039,7 +571039,7 @@ gpu_pal_decompress_alloc_tag_and_upload: ; 8129334 @081293B4: ldr r0, [r4, 0x1C] ldrh r0, [r0] - ldr r1, =nullsub_12 + 1 + ldr r1, =nullsub_12 movs r2, 0x1 str r2, [sp] movs r2, 0 @@ -571260,7 +571260,7 @@ sub_81294C0: ; 81294C0 @081295A4: ldr r0, [r4, 0x1C] ldrh r0, [r0] - ldr r1, =nullsub_12 + 1 + ldr r1, =nullsub_12 movs r2, 0x1 str r2, [sp] movs r2, 0 @@ -571753,7 +571753,7 @@ sub_81298EC: ; 81298EC ldr r1, =gUnknown_085EAAC5 adds r0, r4, 0 bl ExpandTextCodes - ldr r2, =sub_8129D64 + 1 + ldr r2, =sub_8129D64 adds r0, r5, 0 adds r1, r4, 0 bl sub_81978EC @@ -571832,14 +571832,14 @@ sub_81299DC: ; 81299DC ldrb r0, [r0, 0x8] cmp r0, 0 bne @08129A3C - ldr r1, =nullsub_12 + 1 + ldr r1, =nullsub_12 str r0, [sp] movs r0, 0xC1 b @08129A44 .align 2, 0 .pool @08129A3C: - ldr r1, =nullsub_12 + 1 + ldr r1, =nullsub_12 movs r0, 0 str r0, [sp] movs r0, 0xC2 @@ -571994,7 +571994,7 @@ sub_8129B34: ; 8129B34 adds r1, r4, 0 adds r1, 0x1C adds r0, r1 - ldr r1, =sub_812A36C + 1 + ldr r1, =sub_812A36C str r1, [r0] ldr r2, =0x0203aa39 ldrb r1, [r2] @@ -572017,7 +572017,7 @@ sub_8129B34: ; 8129B34 lsls r0, 3 adds r0, r1 strh r6, [r0, 0x1C] - ldr r1, =sub_8128E18 + 1 + ldr r1, =sub_8128E18 str r1, [r0] pop {r4-r6} pop {r0} @@ -572082,13 +572082,13 @@ sub_8129BF8: ; 8129BF8 lsls r0, 2 adds r3, 0x1C adds r0, r3 - ldr r1, =nullsub_12 + 1 + ldr r1, =nullsub_12 str r1, [r0] ldr r5, =0x02021fc4 ldr r1, =gUnknown_085EAA62 adds r0, r5, 0 bl ExpandTextCodes - ldr r2, =sub_812A1F0 + 1 + ldr r2, =sub_812A1F0 adds r0, r4, 0 adds r1, r5, 0 bl sub_81978EC @@ -572114,7 +572114,7 @@ sub_8129C74: ; 8129C74 ldr r1, =gUnknown_085EAAA3 adds r0, r4, 0 bl ExpandTextCodes - ldr r2, =sub_812A1A0 + 1 + ldr r2, =sub_812A1A0 b @08129D14 .align 2, 0 .pool @@ -572163,13 +572163,13 @@ sub_8129C74: ; 8129C74 lsls r0, 2 adds r3, 0x1C adds r0, r3 - ldr r1, =nullsub_12 + 1 + ldr r1, =nullsub_12 str r1, [r0] ldr r4, =0x02021fc4 ldr r1, =gUnknown_085EAA62 adds r0, r4, 0 bl ExpandTextCodes - ldr r2, =sub_812A1F0 + 1 + ldr r2, =sub_812A1F0 @08129D14: adds r0, r5, 0 adds r1, r4, 0 @@ -572182,7 +572182,7 @@ sub_8129C74: ; 8129C74 ldr r1, =gUnknown_085EAA81 adds r0, r4, 0 bl ExpandTextCodes - ldr r2, =sub_8129D64 + 1 + ldr r2, =sub_8129D64 adds r0, r5, 0 adds r1, r4, 0 bl sub_81978EC @@ -572323,7 +572323,7 @@ sub_8129E0C: ; 8129E0C adds r3, r5, 0 adds r3, 0x1C adds r2, r3 - ldr r3, =nullsub_12 + 1 + ldr r3, =nullsub_12 str r3, [r2] ldr r4, =0x0203aa39 ldrb r3, [r4] @@ -572773,7 +572773,7 @@ sub_812A1C0: ; 812A1C0 adds r0, r1 movs r1, 0 strh r1, [r0, 0xC] - ldr r1, =sub_81298EC + 1 + ldr r1, =sub_81298EC str r1, [r0] pop {r4} pop {r0} @@ -572831,7 +572831,7 @@ sub_812A22C: ; 812A22C adds r0, r1 movs r1, 0 strh r1, [r0, 0xC] - ldr r1, =sub_812A25C + 1 + ldr r1, =sub_812A25C str r1, [r0] pop {r4} pop {r0} @@ -572876,9 +572876,9 @@ sub_812A25C: ; 812A25C @0812A29C: bl sub_812A3C8 ldr r0, =0x03005dac - ldr r1, =sub_812A334 + 1 + ldr r1, =sub_812A334 str r1, [r0] - ldr r0, =c2_exit_to_overworld_2_switch + 1 + ldr r0, =c2_exit_to_overworld_2_switch bl set_callback2 adds r0, r4, 0 bl remove_task @@ -572942,7 +572942,7 @@ sub_812A2C4: ; 812A2C4 adds r0, r6, 0 subs r0, 0x8 adds r0, r5, r0 - ldr r1, =sub_8126B80 + 1 + ldr r1, =sub_8126B80 str r1, [r0] @0812A32A: pop {r4-r6} @@ -572960,7 +572960,7 @@ sub_812A334: ; 812A334 movs r1, 0x1 bl sub_81973C4 bl sub_8126ABC - ldr r0, =sub_812A2C4 + 1 + ldr r0, =sub_812A2C4 movs r1, 0x8 bl AddTask lsls r0, 24 @@ -573065,7 +573065,7 @@ sub_812A3D4: ; 812A3D4 ldr r1, =gUnknown_085EAA14 adds r0, r4, 0 bl ExpandTextCodes - ldr r2, =sub_812A458 + 1 + ldr r2, =sub_812A458 adds r0, r5, 0 adds r1, r4, 0 bl sub_81978EC @@ -573077,7 +573077,7 @@ sub_812A3D4: ; 812A3D4 ldr r1, =gUnknown_085EA9E0 adds r0, r4, 0 bl ExpandTextCodes - ldr r2, =sub_8127A5C + 1 + ldr r2, =sub_8127A5C adds r0, r5, 0 adds r1, r4, 0 bl sub_81978EC @@ -573132,7 +573132,7 @@ sub_812A478: ; 812A478 ldr r1, =gUnknown_085EAA3D adds r0, r5, 0 bl ExpandTextCodes - ldr r2, =sub_8127A5C + 1 + ldr r2, =sub_8127A5C adds r0, r4, 0 adds r1, r5, 0 bl sub_81978EC @@ -573182,7 +573182,7 @@ sub_812A4DC: ; 812A4DC ands r0, r1 cmp r0, 0 bne @0812A530 - ldr r0, =sub_812A588 + 1 + ldr r0, =sub_812A588 bl set_callback2 adds r0, r5, 0 bl remove_task @@ -573209,7 +573209,7 @@ sub_812A540: ; 812A540 adds r0, r4, 0 adds r1, r6, 0 bl sub_812A6D4 - ldr r0, =sub_812A4DC + 1 + ldr r0, =sub_812A4DC movs r1, 0 bl AddTask lsls r0, 24 @@ -573321,7 +573321,7 @@ sub_812A588: ; 812A588 .align 2, 0 .pool @0812A660: - ldr r0, =sub_812A670 + 1 + ldr r0, =sub_812A670 bl set_callback2 @0812A666: add sp, 0x4 @@ -573383,7 +573383,7 @@ sub_812A6D4: ; 812A6D4 adds r5, r1, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, =nullsub_49 + 1 + ldr r0, =nullsub_49 movs r1, 0xFF bl AddTask adds r1, r0, 0 @@ -573408,7 +573408,7 @@ sub_812A6D4: ; 812A6D4 thumb_func_start sub_812A710 sub_812A710: ; 812A710 push {lr} - ldr r0, =nullsub_49 + 1 + ldr r0, =nullsub_49 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -573471,7 +573471,7 @@ sub_812A750: ; 812A750 thumb_func_start sub_812A79C sub_812A79C: ; 812A79C push {lr} - ldr r0, =sub_812A688 + 1 + ldr r0, =sub_812A688 bl SetVBlankCallback movs r0, 0x1 bl enable_irqs @@ -573826,7 +573826,7 @@ sub_812AA90: ; 812AA90 thumb_func_start sub_812AAA8 sub_812AAA8: ; 812AAA8 push {r4,lr} - ldr r4, =sub_812AAC8 + 1 + ldr r4, =sub_812AAC8 adds r0, r4, 0 movs r1, 0 bl AddTask @@ -575874,7 +575874,7 @@ sub_812BA6C: ; 812BA6C thumb_func_start sub_812BABC sub_812BABC: ; 812BABC push {r4,lr} - ldr r4, =sub_812BAFC + 1 + ldr r4, =sub_812BAFC adds r0, r4, 0 movs r1, 0x4 bl AddTask @@ -575891,7 +575891,7 @@ sub_812BABC: ; 812BABC thumb_func_start sub_812BADC sub_812BADC: ; 812BADC push {lr} - ldr r0, =sub_812BAFC + 1 + ldr r0, =sub_812BAFC bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -576067,7 +576067,7 @@ sub_812BC20: ; 812BC20 lsls r0, 24 cmp r0, 0 beq @0812BC3A - ldr r0, =sub_812BAFC + 1 + ldr r0, =sub_812BAFC bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -576364,7 +576364,7 @@ sub_812BE0C: ; 812BE0C sub_812BE5C: ; 812BE5C push {r4-r6,lr} movs r4, 0 - ldr r5, =sub_812BF2C + 1 + ldr r5, =sub_812BF2C ldr r6, =0x03005e00 @0812BE64: adds r0, r5, 0 @@ -578398,7 +578398,7 @@ sub_812CD40: ; 812CD40 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r5, =sub_812CD74 + 1 + ldr r5, =sub_812CD74 adds r0, r5, 0 movs r1, 0x5 bl AddTask @@ -578632,7 +578632,7 @@ sub_812CEF4: ; 812CEF4 movs r4, 0 ldr r5, =0x02020630 @0812CEFA: - ldr r0, =sub_812D024 + 1 + ldr r0, =sub_812D024 bl obj_add_empty_with_callback lsls r0, 24 lsrs r0, 24 @@ -578874,7 +578874,7 @@ sub_812D024: ; 812D024 thumb_func_start sub_812D0B0 sub_812D0B0: ; 812D0B0 push {r4,lr} - ldr r4, =sub_812D128 + 1 + ldr r4, =sub_812D128 adds r0, r4, 0 movs r1, 0x6 bl AddTask @@ -578898,7 +578898,7 @@ sub_812D0B0: ; 812D0B0 thumb_func_start sub_812D0E0 sub_812D0E0: ; 812D0E0 push {lr} - ldr r0, =sub_812D128 + 1 + ldr r0, =sub_812D128 bl get_task_id_by_function lsls r0, 24 lsrs r2, r0, 24 @@ -578984,7 +578984,7 @@ sub_812D128: ; 812D128 thumb_func_start sub_812D188 sub_812D188: ; 812D188 push {lr} - ldr r0, =sub_812D230 + 1 + ldr r0, =sub_812D230 movs r1, 0x8 bl AddTask ldr r1, =0x0203ab34 @@ -579408,7 +579408,7 @@ sub_812D3B4: ; 812D3B4 thumb_func_start sub_812D4AC sub_812D4AC: ; 812D4AC push {r4,lr} - ldr r4, =sub_812D4EC + 1 + ldr r4, =sub_812D4EC adds r0, r4, 0 movs r1, 0x7 bl AddTask @@ -579425,7 +579425,7 @@ sub_812D4AC: ; 812D4AC thumb_func_start sub_812D4CC sub_812D4CC: ; 812D4CC push {lr} - ldr r0, =sub_812D4EC + 1 + ldr r0, =sub_812D4EC bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -580065,7 +580065,7 @@ sub_812D9A4: ; 812D9A4 ldrb r0, [r0, 0xA] cmp r0, 0 bne @0812DA04 - ldr r0, =sub_812D4EC + 1 + ldr r0, =sub_812D4EC bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -580139,7 +580139,7 @@ sub_812DA6C: ; 812DA6C lsls r0, 24 cmp r0, 0 beq @0812DA86 - ldr r0, =sub_812D4EC + 1 + ldr r0, =sub_812D4EC bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -580311,7 +580311,7 @@ sub_812DBBC: ; 812DBBC bl sub_812E8F8 bl sub_812E8C4 bl sub_812ED8C - ldr r0, =sub_812D4EC + 1 + ldr r0, =sub_812D4EC bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -580394,7 +580394,7 @@ sub_812DC80: ; 812DC80 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r5, =sub_812DCD4 + 1 + ldr r5, =sub_812DCD4 adds r0, r5, 0 movs r1, 0x1 bl AddTask @@ -580417,7 +580417,7 @@ sub_812DC80: ; 812DC80 thumb_func_start sub_812DCB4 sub_812DCB4: ; 812DCB4 push {lr} - ldr r0, =sub_812DCD4 + 1 + ldr r0, =sub_812DCD4 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -580658,7 +580658,7 @@ sub_812DE48: ; 812DE48 thumb_func_start sub_812DE7C sub_812DE7C: ; 812DE7C push {lr} - ldr r0, =sub_812DCD4 + 1 + ldr r0, =sub_812DCD4 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -580672,7 +580672,7 @@ sub_812DE7C: ; 812DE7C thumb_func_start sub_812DE94 sub_812DE94: ; 812DE94 push {lr} - ldr r0, =sub_812E0B0 + 1 + ldr r0, =sub_812E0B0 movs r1, 0x3 bl AddTask lsls r0, 24 @@ -583822,7 +583822,7 @@ sub_812F648: ; 812F648 ldrsh r0, [r0, r1] cmp r0, 0 beq @0812F76C - ldr r1, =nullsub_12 + 1 + ldr r1, =nullsub_12 movs r4, 0 str r4, [sp] movs r0, 0x5 @@ -584818,7 +584818,7 @@ sub_812FE58: ; 812FE58 ldr r0, [r0, 0x8] movs r0, 0x2 bl sub_80A2390 - ldr r0, =sub_81302D0 + 1 + ldr r0, =sub_81302D0 bl SetVBlankCallback ldr r0, =0x030011f0 strb r4, [r0] @@ -584826,7 +584826,7 @@ sub_812FE58: ; 812FE58 lsls r1, 5 movs r0, 0 bl lcd_io_set - ldr r0, =sub_812FDF8 + 1 + ldr r0, =sub_812FDF8 bl set_callback2 @0812FFA0: add sp, 0x4 @@ -584914,7 +584914,7 @@ sub_812FFC8: ; 812FFC8 ands r0, r1 cmp r0, 0 bne @0813006E - ldr r0, =sub_812FE0C + 1 + ldr r0, =sub_812FE0C bl set_callback2 @0813006E: ldr r0, =0x030011f6 @@ -592658,7 +592658,7 @@ sub_8133D2C: ; 8133D2C thumb_func_start sub_8133D8C sub_8133D8C: ; 8133D8C push {lr} - ldr r0, =sub_8127208 + 1 + ldr r0, =sub_8127208 movs r1, 0 bl AddTask pop {r0} @@ -592787,7 +592787,7 @@ sub_8133E38: ; 8133E38 thumb_func_start sub_8133EC0 sub_8133EC0: ; 8133EC0 push {lr} - ldr r0, =sub_8133C48 + 1 + ldr r0, =sub_8133C48 movs r1, 0 bl AddTask lsls r0, 24 @@ -592970,9 +592970,9 @@ set_256color_bg_bg0: ; 8133F0C bl sub_80A1AD4 movs r0, 0x1 bl enable_irqs - ldr r0, =sub_8133EF8 + 1 + ldr r0, =sub_8133EF8 bl SetVBlankCallback - ldr r0, =sub_81341E0 + 1 + ldr r0, =sub_81341E0 bl set_callback2 movs r0, 0x48 movs r1, 0x3F @@ -593005,7 +593005,7 @@ set_256color_bg_bg0: ; 8133F0C bl gpu_sync_bg_show movs r0, 0x3 bl gpu_sync_bg_show - ldr r0, =sub_81341FC + 1 + ldr r0, =sub_81341FC movs r1, 0 bl AddTask adds r4, r0, 0 @@ -593137,7 +593137,7 @@ sub_81341FC: ; 81341FC bl Window_WriteStandardTileMap movs r0, 0 bl schedule_bg_copy_tilemap_to_vram - ldr r0, =sub_813425C + 1 + ldr r0, =sub_813425C str r0, [r4] add sp, 0xC pop {r4} @@ -593201,10 +593201,10 @@ sub_813425C: ; 813425C str r3, [r2] adds r4, 0x1C adds r1, r4 - ldr r2, =sub_8134774 + 1 + ldr r2, =sub_8134774 str r2, [r1] strh r0, [r6, 0xA] - ldr r0, =sub_8134340 + 1 + ldr r0, =sub_8134340 str r0, [r6] b @08134334 .align 2, 0 @@ -593218,7 +593218,7 @@ sub_813425C: ; 813425C beq @08134314 subs r0, r7, 0x1 strh r0, [r6, 0x8] - ldr r0, =sub_8134640 + 1 + ldr r0, =sub_8134640 str r0, [r6] b @08134334 .align 2, 0 @@ -593238,7 +593238,7 @@ sub_813425C: ; 813425C ldrh r1, [r0, 0x8] adds r1, 0x1 strh r1, [r0, 0x8] - ldr r1, =sub_8134640 + 1 + ldr r1, =sub_8134640 str r1, [r0] @08134334: pop {r4-r7} @@ -593279,7 +593279,7 @@ sub_8134340: ; 8134340 ldrsh r0, [r1, r3] cmp r0, 0x40 bne @0813437E - ldr r0, =sub_8134390 + 1 + ldr r0, =sub_8134390 str r0, [r2] @0813437E: pop {r0} @@ -593325,7 +593325,7 @@ sub_8134390: ; 8134390 movs r2, 0xD movs r3, 0 bl sub_81996C0 - ldr r0, =sub_8134400 + 1 + ldr r0, =sub_8134400 str r0, [r4] add sp, 0xC pop {r4} @@ -593403,7 +593403,7 @@ sub_8134400: ; 8134400 bl rotscale_free_entry adds r0, r4, 0 bl obj_delete_and_free_tiles - ldr r0, =sub_81344AC + 1 + ldr r0, =sub_81344AC str r0, [r5] @0813449A: pop {r4-r6} @@ -593422,7 +593422,7 @@ sub_81344AC: ; 81344AC adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r0, =sub_81341FC + 1 + ldr r0, =sub_81341FC str r0, [r1] bx lr .align 2, 0 @@ -593605,7 +593605,7 @@ sub_8134640: ; 8134640 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_8134668 + 1 + ldr r1, =sub_8134668 str r1, [r0] pop {r4} pop {r0} @@ -593626,7 +593626,7 @@ sub_8134668: ; 8134668 adds r4, r1 ldrb r0, [r4, 0x8] bl sub_81344C8 - ldr r0, =sub_813425C + 1 + ldr r0, =sub_813425C str r0, [r4] pop {r4} pop {r0} @@ -593998,9 +593998,9 @@ sub_813498C: ; 813498C bl sub_80A1AD4 movs r0, 0x1 bl enable_irqs - ldr r0, =sub_81347B4 + 1 + ldr r0, =sub_81347B4 bl SetVBlankCallback - ldr r0, =sub_8134C9C + 1 + ldr r0, =sub_8134C9C bl set_callback2 movs r0, 0x50 movs r1, 0 @@ -594040,7 +594040,7 @@ sub_81349F4: ; 81349F4 ldr r0, =gUnknown_08DCC648 ldr r1, =0x06003800 bl LZ77UnCompVram - ldr r0, =sub_8134CB8 + 1 + ldr r0, =sub_8134CB8 movs r1, 0 bl AddTask adds r6, r0, 0 @@ -594182,7 +594182,7 @@ sub_8134B44: ; 8134B44 ldr r0, =gUnknown_08DCC908 ldr r1, =0x06003800 bl LZ77UnCompVram - ldr r0, =sub_8134F10 + 1 + ldr r0, =sub_8134F10 movs r1, 0 bl AddTask lsls r0, 24 @@ -594347,7 +594347,7 @@ sub_8134CB8: ; 8134CB8 adds r1, r2 lsls r1, 3 adds r1, r0 - ldr r0, =sub_8134CE8 + 1 + ldr r0, =sub_8134CE8 str r0, [r1] @08134CD8: pop {r0} @@ -594414,7 +594414,7 @@ sub_8134CE8: ; 8134CE8 ands r1, r0 cmp r1, 0 beq @08134D70 - ldr r0, =sub_8134DC4 + 1 + ldr r0, =sub_8134DC4 str r0, [r5] b @08134DBE .align 2, 0 @@ -594504,7 +594504,7 @@ sub_8134DC4: ; 8134DC4 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =c3_80BF560 + 1 + ldr r1, =c3_80BF560 str r1, [r0] add sp, 0xC pop {r4,r5} @@ -594543,7 +594543,7 @@ c3_80BF560: ; 8134E30 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =sub_8134EA4 + 1 + ldr r0, =sub_8134EA4 b @08134E94 .align 2, 0 .pool @@ -594560,7 +594560,7 @@ c3_80BF560: ; 8134E30 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =sub_8134CE8 + 1 + ldr r0, =sub_8134CE8 @08134E94: str r0, [r1] @08134E96: @@ -594594,7 +594594,7 @@ sub_8134EA4: ; 8134EA4 movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, =c2_080111BC + 1 + ldr r0, =c2_080111BC str r0, [r4] add sp, 0x4 pop {r4} @@ -594640,7 +594640,7 @@ sub_8134F10: ; 8134F10 adds r1, r2 lsls r1, 3 adds r1, r0 - ldr r0, =sub_8134F40 + 1 + ldr r0, =sub_8134F40 str r0, [r1] @08134F30: pop {r0} @@ -594667,7 +594667,7 @@ sub_8134F40: ; 8134F40 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =sub_8134F78 + 1 + ldr r0, =sub_8134F78 str r0, [r1] @08134F66: pop {r4} @@ -594696,7 +594696,7 @@ sub_8134F78: ; 8134F78 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_8134FB0 + 1 + ldr r1, =sub_8134FB0 str r1, [r0] add sp, 0x4 pop {r4} @@ -595376,7 +595376,7 @@ oei_task_add: ; 8135478 ldr r0, =0x0203ab40 adds r1, r0, 0x2 bl player_get_pos_to_plus_one_step_in_direction_player_is_facing - ldr r0, =task08_080C9820 + 1 + ldr r0, =task08_080C9820 movs r1, 0x8 bl AddTask lsls r0, 24 @@ -595425,7 +595425,7 @@ task08_080C9820: ; 813549C adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, =sub_8135578 + 1 + ldr r0, =sub_8135578 b @0813551C .align 2, 0 .pool @@ -595439,7 +595439,7 @@ task08_080C9820: ; 813549C adds r1, r6 lsls r1, 3 adds r1, r0 - ldr r0, =sub_813552C + 1 + ldr r0, =sub_813552C @0813551C: str r0, [r1] @0813551E: @@ -595474,7 +595474,7 @@ sub_813552C: ; 813552C adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =sub_8135578 + 1 + ldr r0, =sub_8135578 str r0, [r1] @08135560: pop {r4} @@ -595548,7 +595548,7 @@ sub_8135578: ; 8135578 adds r0, r7 lsls r0, 3 adds r0, r1 - ldr r1, =sub_813561C + 1 + ldr r1, =sub_813561C str r1, [r0] @081355FC: pop {r4-r7} @@ -595599,10 +595599,10 @@ sub_8135654: ; 8135654 lsrs r0, 24 strh r0, [r4] ldr r1, =0x03005db0 - ldr r0, =hm_add_c3_launch_phase_2 + 1 + ldr r0, =hm_add_c3_launch_phase_2 str r0, [r1] ldr r1, =0x0203ceec - ldr r0, =sub_8179834 + 1 + ldr r0, =sub_8179834 b @081356A8 .align 2, 0 .pool @@ -595617,10 +595617,10 @@ sub_8135654: ; 8135654 b @081356AC @0813569E: ldr r1, =0x03005db0 - ldr r0, =hm_add_c3_launch_phase_2 + 1 + ldr r0, =hm_add_c3_launch_phase_2 str r0, [r1] ldr r1, =0x0203ceec - ldr r0, =sub_81356C4 + 1 + ldr r0, =sub_81356C4 @081356A8: str r0, [r1] movs r0, 0x1 @@ -595659,7 +595659,7 @@ oei_rocksmash: ; 81356E4 adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r2, =sub_8135714 + 1 + ldr r2, =sub_8135714 lsrs r0, r2, 16 strh r0, [r1, 0x18] strh r2, [r1, 0x1A] @@ -595696,10 +595696,10 @@ sub_813572C: ; 813572C b @0813574C @0813573E: ldr r1, =0x03005db0 - ldr r0, =hm_add_c3_launch_phase_2 + 1 + ldr r0, =hm_add_c3_launch_phase_2 str r0, [r1] ldr r1, =0x0203ceec - ldr r0, =hm2_dig + 1 + ldr r0, =hm2_dig str r0, [r1] movs r0, 0x1 @0813574C: @@ -595737,7 +595737,7 @@ sub_8135780: ; 8135780 adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r2, =sub_81357BC + 1 + ldr r2, =sub_81357BC lsrs r0, r2, 16 strh r0, [r1, 0x18] strh r2, [r1, 0x1A] @@ -595768,7 +595768,7 @@ sub_81357BC: ; 81357BC bl sub_817963C b @081357EE @081357D6: - ldr r0, =task08_080A1C44 + 1 + ldr r0, =task08_080A1C44 movs r1, 0x8 bl AddTask lsls r0, 24 @@ -595879,7 +595879,7 @@ sub_81357FC: ; 81357FC @081358D2: strb r0, [r1] @081358D4: - ldr r0, =sub_813594C + 1 + ldr r0, =sub_813594C bl set_callback2 pop {r4-r6} pop {r0} @@ -595891,7 +595891,7 @@ sub_81357FC: ; 81357FC thumb_func_start sub_81358F4 sub_81358F4: ; 81358F4 push {lr} - ldr r1, =sub_8059D50 + 1 + ldr r1, =sub_8059D50 movs r0, 0x1 bl sub_81357FC pop {r0} @@ -595903,7 +595903,7 @@ sub_81358F4: ; 81358F4 thumb_func_start sub_8135908 sub_8135908: ; 8135908 push {lr} - ldr r1, =c2_exit_to_overworld_2_switch + 1 + ldr r1, =c2_exit_to_overworld_2_switch movs r0, 0x2 bl sub_81357FC pop {r0} @@ -596131,7 +596131,7 @@ sub_8135978: ; 8135978 bl sub_81363BC b @08135B9E @08135B1A: - ldr r0, =sub_81365C8 + 1 + ldr r0, =sub_81365C8 movs r1, 0 bl AddTask adds r4, r0, 0 @@ -596199,9 +596199,9 @@ sub_8135978: ; 8135978 .align 2, 0 .pool @08135BB8: - ldr r0, =sub_8135938 + 1 + ldr r0, =sub_8135938 bl SetVBlankCallback - ldr r0, =sub_813591C + 1 + ldr r0, =sub_813591C bl set_callback2 movs r0, 0x1 b @08135BD2 @@ -596634,7 +596634,7 @@ sub_8135F70: ; 8135F70 lsls r0, 2 adds r2, 0x1C adds r0, r2 - ldr r1, =sub_8136470 + 1 + ldr r1, =sub_8136470 str r1, [r0] @08135F9C: ldr r0, =0x0203ab50 @@ -597308,7 +597308,7 @@ sub_8136470: ; 8136470 lsls r0, 26 lsrs r0, 27 bl rotscale_free_entry - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r4, 0x1C] @081364E0: pop {r4,r5} @@ -597337,7 +597337,7 @@ sub_81364EC: ; 81364EC adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_8136524 + 1 + ldr r1, =sub_8136524 str r1, [r0] add sp, 0x4 pop {r4} @@ -597374,7 +597374,7 @@ sub_8136524: ; 8136524 cmp r0, 0x1 bhi @0813655A ldr r1, =0x03005dac - ldr r0, =sub_80AF168 + 1 + ldr r0, =sub_80AF168 str r0, [r1] @0813655A: ldrb r0, [r2] @@ -597490,7 +597490,7 @@ sub_81365C8: ; 81365C8 mov r0, r10 subs r0, 0x8 add r0, r8 - ldr r1, =sub_813671C + 1 + ldr r1, =sub_813671C str r1, [r0] b @08136708 .align 2, 0 @@ -597794,7 +597794,7 @@ sub_8136854: ; 8136854 adds r0, r5, r7 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81365C8 + 1 + ldr r1, =sub_81365C8 str r1, [r0] pop {r4-r7} pop {r0} @@ -597862,7 +597862,7 @@ sub_8136938: ; 8136938 adds r0, r7 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81369E0 + 1 + ldr r1, =sub_81369E0 str r1, [r0] pop {r4-r7} pop {r0} @@ -597932,7 +597932,7 @@ sub_8136A50: ; 8136A50 movs r2, 0x80 lsls r2, 4 adds r1, r2 - ldr r2, =sub_8136A74 + 1 + ldr r2, =sub_8136A74 str r2, [r1] bl sub_81364EC pop {r0} @@ -597952,7 +597952,7 @@ sub_8136A74: ; 8136A74 adds r1, r0 ldr r0, [r2] adds r0, r1 - ldr r1, =sub_8136AA0 + 1 + ldr r1, =sub_8136AA0 bl sub_8166204 pop {r0} bx r0 @@ -598014,7 +598014,7 @@ sub_8136AB4: ; 8136AB4 str r1, [sp] str r0, [sp, 0x4] str r5, [sp, 0x8] - ldr r0, =sub_8136B48 + 1 + ldr r0, =sub_8136B48 str r0, [sp, 0xC] adds r0, r4, 0 movs r1, 0xA @@ -598072,7 +598072,7 @@ sub_8136B78: ; 8136B78 str r1, [sp] str r0, [sp, 0x4] str r5, [sp, 0x8] - ldr r0, =sub_8136BC0 + 1 + ldr r0, =sub_8136BC0 str r0, [sp, 0xC] adds r0, r4, 0 movs r1, 0xA @@ -598161,7 +598161,7 @@ sub_8136C54: ; 8136C54 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81365C8 + 1 + ldr r1, =sub_81365C8 str r1, [r0] pop {r4} pop {r0} @@ -598336,7 +598336,7 @@ sub_8136DE8: ; 8136DE8 bl sub_81363BC subs r5, 0x8 adds r4, r5 - ldr r0, =sub_81365C8 + 1 + ldr r0, =sub_81365C8 str r0, [r4] pop {r4,r5} pop {r0} @@ -598761,10 +598761,10 @@ sub_81370FC: ; 81370FC lsrs r0, 24 strh r0, [r4] ldr r1, =0x03005db0 - ldr r0, =hm_add_c3_launch_phase_2 + 1 + ldr r0, =hm_add_c3_launch_phase_2 str r0, [r1] ldr r1, =0x0203ceec - ldr r0, =sub_8179918 + 1 + ldr r0, =sub_8179918 b @08137152 .align 2, 0 .pool @@ -598779,10 +598779,10 @@ sub_81370FC: ; 81370FC cmp r0, 0 bne @08137170 ldr r1, =0x03005db0 - ldr r0, =hm_add_c3_launch_phase_2 + 1 + ldr r0, =hm_add_c3_launch_phase_2 str r0, [r1] ldr r1, =0x0203ceec - ldr r0, =hm2_flash + 1 + ldr r0, =hm2_flash @08137152: str r0, [r1] movs r0, 0x1 @@ -598814,7 +598814,7 @@ hm2_flash: ; 8137178 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r2, =sub_81371B4 + 1 + ldr r2, =sub_81371B4 lsrs r1, r2, 16 strh r1, [r0, 0x18] strh r2, [r0, 0x1A] @@ -598939,9 +598939,9 @@ c2_change_map: ; 8137200 orrs r0, r1 strh r0, [r4] strh r2, [r3] - ldr r0, =sub_81371EC + 1 + ldr r0, =sub_81371EC bl SetVBlankCallback - ldr r0, =sub_81371D4 + 1 + ldr r0, =sub_81371D4 bl set_callback2 bl sub_8137304 lsls r0, 24 @@ -599099,7 +599099,7 @@ fade_type_for_given_maplight_pair: ; 81373A8 thumb_func_start sub_81373F0 sub_81373F0: ; 81373F0 push {lr} - ldr r0, =sub_8137404 + 1 + ldr r0, =sub_8137404 movs r1, 0 bl AddTask pop {r0} @@ -599117,7 +599117,7 @@ sub_8137404: ; 8137404 adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r0, =sub_8137420 + 1 + ldr r0, =sub_8137420 str r0, [r1] bx lr .align 2, 0 @@ -599168,7 +599168,7 @@ sub_8137420: ; 8137420 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81374C4 + 1 + ldr r1, =sub_81374C4 str r1, [r0] movs r2, 0 movs r1, 0x10 @@ -599210,7 +599210,7 @@ sub_81374C4: ; 81374C4 @081374F8: movs r0, 0 strh r0, [r5, 0xC] - ldr r0, =sub_813750C + 1 + ldr r0, =sub_813750C str r0, [r5] @08137500: pop {r4,r5} @@ -599256,7 +599256,7 @@ sub_813750C: ; 813750C movs r1, 0 movs r2, 0x20 bl gpu_pal_apply - ldr r0, =sub_8137574 + 1 + ldr r0, =sub_8137574 str r0, [r4] movs r0, 0x8 strh r0, [r4, 0xC] @@ -599302,7 +599302,7 @@ sub_8137574: ; 8137574 thumb_func_start sub_81375A8 sub_81375A8: ; 81375A8 push {lr} - ldr r0, =sub_81375BC + 1 + ldr r0, =sub_81375BC movs r1, 0 bl AddTask pop {r0} @@ -599320,7 +599320,7 @@ sub_81375BC: ; 81375BC adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r0, =sub_81375D8 + 1 + ldr r0, =sub_81375D8 str r0, [r1] bx lr .align 2, 0 @@ -599371,7 +599371,7 @@ sub_81375D8: ; 81375D8 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_8137678 + 1 + ldr r1, =sub_8137678 str r1, [r0] movs r2, 0 movs r1, 0x10 @@ -599420,7 +599420,7 @@ sub_8137678: ; 8137678 ldr r1, =0x00003e41 movs r0, 0x50 bl lcd_io_set - ldr r0, =sub_81376DC + 1 + ldr r0, =sub_81376DC str r0, [r4] @081376C8: pop {r4} @@ -599613,7 +599613,7 @@ sub_8137734: ; 8137734 movs r1, 0x43 bl sub_80EE4DC @0813785A: - ldr r0, =sub_8173694 + 1 + ldr r0, =sub_8173694 bl set_callback2 movs r0, 0 add sp, 0x1C @@ -599629,7 +599629,7 @@ sub_8137734: ; 8137734 thumb_func_start sp0C8_whiteout_maybe sp0C8_whiteout_maybe: ; 813787C push {lr} - ldr r0, =c2_whiteout + 1 + ldr r0, =c2_whiteout bl set_callback2 movs r0, 0 pop {r1} @@ -599821,7 +599821,7 @@ sub_81379D8: ; 81379D8 thumb_func_start sub_81379F8 sub_81379F8: ; 81379F8 push {lr} - ldr r0, =sub_81379D8 + 1 + ldr r0, =sub_81379D8 movs r1, 0x50 bl AddTask pop {r0} @@ -600122,7 +600122,7 @@ sub_8137C10: ; 8137C10 thumb_func_start sub_8137C28 sub_8137C28: ; 8137C28 push {lr} - ldr r0, =sub_8174194 + 1 + ldr r0, =sub_8174194 bl set_callback2 bl script_env_2_enable pop {r0} @@ -600134,10 +600134,10 @@ sub_8137C28: ; 8137C28 thumb_func_start sub_8137C3C sub_8137C3C: ; 8137C3C push {lr} - ldr r0, =c2_exit_to_overworld_2_switch + 1 + ldr r0, =c2_exit_to_overworld_2_switch bl set_callback2 ldr r1, =0x03005dac - ldr r0, =mapldr_080CA5C0 + 1 + ldr r0, =mapldr_080CA5C0 str r0, [r1] pop {r0} bx r0 @@ -600160,7 +600160,7 @@ mapldr_080CA5C0: ; 8137C5C movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - ldr r0, =sub_8137C94 + 1 + ldr r0, =sub_8137C94 movs r1, 0xA bl AddTask add sp, 0x4 @@ -600193,7 +600193,7 @@ sub_8137C94: ; 8137C94 thumb_func_start sub_8137CB4 sub_8137CB4: ; 8137CB4 push {lr} - ldr r0, =sub_8177888 + 1 + ldr r0, =sub_8177888 bl set_callback2 bl script_env_2_enable pop {r0} @@ -600206,9 +600206,9 @@ sub_8137CB4: ; 8137CB4 sub_8137CC8: ; 8137CC8 push {lr} ldr r0, =0x030022c0 - ldr r1, =c2_exit_to_overworld_2_switch + 1 + ldr r1, =c2_exit_to_overworld_2_switch str r1, [r0, 0x8] - ldr r0, =sub_8134B44 + 1 + ldr r0, =sub_8134B44 bl set_callback2 bl script_env_2_enable pop {r0} @@ -601709,7 +601709,7 @@ sub_81388E4: ; 81388E4 strb r1, [r0] movs r0, 0x2C bl audio_play - ldr r0, =sub_8138910 + 1 + ldr r0, =sub_8138910 movs r1, 0x8 bl AddTask pop {r0} @@ -602176,7 +602176,7 @@ sub_8138C04: ; 8138C04 thumb_func_start sub_8138C84 sub_8138C84: ; 8138C84 push {lr} - ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 + ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music bl sub_817018C pop {r0} bx r0 @@ -602187,7 +602187,7 @@ sub_8138C84: ; 8138C84 thumb_func_start sub_8138C94 sub_8138C94: ; 8138C94 push {lr} - ldr r0, =sub_8138C84 + 1 + ldr r0, =sub_8138C84 bl set_callback2 pop {r0} bx r0 @@ -602198,7 +602198,7 @@ sub_8138C94: ; 8138C94 thumb_func_start sp0D9_ComputerRelated sp0D9_ComputerRelated: ; 8138CA4 push {r4,lr} - ldr r4, =sub_8138CE8 + 1 + ldr r4, =sub_8138CE8 adds r0, r4, 0 bl is_function_an_active_task lsls r0, 24 @@ -602491,7 +602491,7 @@ sub_8138E2C: ; 8138E2C thumb_func_start sub_8138EC0 sub_8138EC0: ; 8138EC0 push {r4,lr} - ldr r4, =sub_8138F04 + 1 + ldr r4, =sub_8138F04 adds r0, r4, 0 bl is_function_an_active_task lsls r0, 24 @@ -603361,7 +603361,7 @@ sub_8139540: ; 8139540 thumb_func_start sub_8139560 sub_8139560: ; 8139560 push {lr} - ldr r0, =sub_81395BC + 1 + ldr r0, =sub_81395BC movs r1, 0x9 bl AddTask lsls r0, 24 @@ -604032,7 +604032,7 @@ sub_81399F4: ; 81399F4 thumb_func_start sub_8139A78 sub_8139A78: ; 8139A78 push {r4-r6,lr} - ldr r0, =sub_8139AF4 + 1 + ldr r0, =sub_8139AF4 movs r1, 0x9 bl AddTask lsls r0, 24 @@ -604238,7 +604238,7 @@ sub_8139C2C: ; 8139C2C lsrs r6, r0, 16 lsls r1, 24 lsrs r5, r1, 24 - ldr r4, =sub_8139C80 + 1 + ldr r4, =sub_8139C80 adds r0, r4, 0 bl is_function_an_active_task lsls r0, 24 @@ -604840,7 +604840,7 @@ sub_813A080: ; 813A080 thumb_func_start sub_813A128 sub_813A128: ; 813A128 push {r4,lr} - ldr r0, =sub_813A2DC + 1 + ldr r0, =sub_813A2DC movs r1, 0x8 bl AddTask lsls r0, 24 @@ -605192,7 +605192,7 @@ sub_813A2DC: ; 813A2DC adds r0, r7 lsls r0, 3 adds r0, r1 - ldr r1, =sub_813A4EC + 1 + ldr r1, =sub_813A4EC str r1, [r0] add sp, 0x20 pop {r3} @@ -605210,7 +605210,7 @@ sub_813A42C: ; 813A42C ldr r0, =0x0203ab64 ldr r0, [r0] str r0, [r1] - ldr r0, =sub_813A46C + 1 + ldr r0, =sub_813A46C str r0, [r1, 0x4] movs r0, 0 str r0, [r1, 0x8] @@ -605242,7 +605242,7 @@ sub_813A46C: ; 813A46C sub sp, 0x4 movs r0, 0x5 bl audio_play - ldr r0, =sub_813A4EC + 1 + ldr r0, =sub_813A4EC bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -605349,7 +605349,7 @@ sub_813A4EC: ; 813A4EC @0813A558: adds r0, r5, 0 bl sub_813A738 - ldr r0, =sub_813A600 + 1 + ldr r0, =sub_813A600 str r0, [r6] bl script_env_2_enable_and_set_ctx_running @0813A566: @@ -605440,7 +605440,7 @@ sub_813A600: ; 813A600 bne @0813A624 movs r0, 0x1 strh r0, [r1, 0x14] - ldr r0, =sub_813A664 + 1 + ldr r0, =sub_813A664 str r0, [r1] @0813A624: pop {r0} @@ -605452,7 +605452,7 @@ sub_813A600: ; 813A600 thumb_func_start sub_813A630 sub_813A630: ; 813A630 push {lr} - ldr r0, =sub_813A600 + 1 + ldr r0, =sub_813A600 bl get_task_id_by_function lsls r0, 24 lsrs r2, r0, 24 @@ -605492,7 +605492,7 @@ sub_813A664: ; 813A664 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_813A4EC + 1 + ldr r1, =sub_813A4EC str r1, [r0] pop {r4} pop {r0} @@ -606398,7 +606398,7 @@ sub_813ADD4: ; 813ADD4 mov r6, r8 push {r6,r7} sub sp, 0x18 - ldr r0, =sub_813A600 + 1 + ldr r0, =sub_813A600 bl get_task_id_by_function lsls r0, 24 lsrs r1, r0, 24 @@ -606565,7 +606565,7 @@ sub_813AEB4: ; 813AEB4 thumb_func_start sub_813AF48 sub_813AF48: ; 813AF48 push {r4,r5,lr} - ldr r0, =sub_813A600 + 1 + ldr r0, =sub_813A600 bl get_task_id_by_function lsls r0, 24 lsrs r5, r0, 24 @@ -606621,7 +606621,7 @@ sub_813AF48: ; 813AF48 thumb_func_start sub_813AFC8 sub_813AFC8: ; 813AFC8 push {lr} - ldr r0, =task_deoxys_sound + 1 + ldr r0, =task_deoxys_sound movs r1, 0x8 bl AddTask pop {r0} @@ -606754,7 +606754,7 @@ sub_813B0B4: ; 813B0B4 lsls r0, 1 bl audio_play @0813B0F8: - ldr r0, =sub_813B160 + 1 + ldr r0, =sub_813B160 movs r1, 0x8 bl AddTask ldr r3, =0x02038c08 @@ -607305,7 +607305,7 @@ sub_813B534: ; 813B534 ldrb r0, [r0] cmp r0, 0 bne @0813B552 - ldr r0, =sub_80B3AF8 + 1 + ldr r0, =sub_80B3AF8 movs r1, 0x5 bl AddTask @0813B552: @@ -607318,7 +607318,7 @@ sub_813B534: ; 813B534 thumb_func_start sub_813B568 sub_813B568: ; 813B568 push {lr} - ldr r0, =sub_813B57C + 1 + ldr r0, =sub_813B57C movs r1, 0x5 bl AddTask pop {r0} @@ -607363,7 +607363,7 @@ sub_813B57C: ; 813B57C .4byte @0813B784 .4byte @0813B7A8 @0813B5D0: - ldr r0, =sub_80B3AF8 + 1 + ldr r0, =sub_80B3AF8 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 @@ -607602,7 +607602,7 @@ sub_813B7D8: ; 813B7D8 ldrh r0, [r0] cmp r0, 0 bne @0813B7F8 - ldr r2, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 + ldr r2, =c2_exit_to_overworld_1_continue_scripts_restart_music movs r0, 0 movs r1, 0x1 bl sub_81D6720 @@ -607610,7 +607610,7 @@ sub_813B7D8: ; 813B7D8 .align 2, 0 .pool @0813B7F8: - ldr r2, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 + ldr r2, =c2_exit_to_overworld_1_continue_scripts_restart_music movs r0, 0x1 movs r1, 0 bl sub_81D6720 @@ -607624,7 +607624,7 @@ sub_813B7D8: ; 813B7D8 thumb_func_start sub_813B80C sub_813B80C: ; 813B80C push {lr} - ldr r0, =sub_813B824 + 1 + ldr r0, =sub_813B824 movs r1, 0x8 bl AddTask movs r0, 0x9D @@ -607683,7 +607683,7 @@ sub_813B824: ; 813B824 thumb_func_start sub_813B880 sub_813B880: ; 813B880 push {lr} - ldr r0, =_fwalk + 1 + ldr r0, =_fwalk movs r1, 0x8 bl AddTask lsls r0, 24 @@ -609345,7 +609345,7 @@ sub_813C5BC: ; 813C5BC adds r1, r2 lsls r1, 3 adds r1, r0 - ldr r0, =sub_813C5EC + 1 + ldr r0, =sub_813C5EC str r0, [r1] @0813C5DC: pop {r0} @@ -609377,7 +609377,7 @@ sub_813C5EC: ; 813C5EC @0813C610: movs r0, 0x5 bl audio_play - ldr r0, =sub_813C62C + 1 + ldr r0, =sub_813C62C str r0, [r4] @0813C61A: pop {r4} @@ -609406,7 +609406,7 @@ sub_813C62C: ; 813C62C adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_813C664 + 1 + ldr r1, =sub_813C664 str r1, [r0] add sp, 0x4 pop {r4} @@ -609427,7 +609427,7 @@ sub_813C664: ; 813C664 ands r0, r1 cmp r0, 0 bne @0813C694 - ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 + ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music bl set_callback2 ldr r0, =0x0203ab78 ldr r0, [r0] @@ -609725,7 +609725,7 @@ sub_813C904: ; 813C904 push {lr} movs r0, 0 bl SetVBlankCallback - ldr r0, =sub_813C91C + 1 + ldr r0, =sub_813C91C bl set_callback2 pop {r0} bx r0 @@ -609840,13 +609840,13 @@ sub_813C91C: ; 813C91C .pool @0813CA14: bl sub_813C880 - ldr r0, =sub_813C8D8 + 1 + ldr r0, =sub_813C8D8 bl SetVBlankCallback bl sub_81D5C8C - ldr r0, =sub_813C5BC + 1 + ldr r0, =sub_813C5BC movs r1, 0x8 bl AddTask - ldr r0, =sub_813C8EC + 1 + ldr r0, =sub_813C8EC bl set_callback2 ldr r0, =0x030022c0 movs r1, 0x87 @@ -611109,7 +611109,7 @@ sub_813D3D8: ; 813D3D8 adds r0, r2 str r6, [r0] strb r1, [r6] - ldr r0, =sub_813D42C + 1 + ldr r0, =sub_813D42C movs r1, 0 bl AddTask lsls r0, 24 @@ -611266,7 +611266,7 @@ sub_813D42C: ; 813D42C adds r0, r4 lsls r0, 3 adds r0, r2 - ldr r1, =sub_813D5A0 + 1 + ldr r1, =sub_813D5A0 str r1, [r0] movs r1, 0 strh r1, [r0, 0x8] @@ -611872,7 +611872,7 @@ sub_813DA40: ; 813DA40 lsrs r5, 24 lsls r6, 24 lsrs r6, 24 - ldr r0, =sub_813D9C0 + 1 + ldr r0, =sub_813D9C0 movs r1, 0 bl AddTask lsls r0, 24 @@ -611887,7 +611887,7 @@ sub_813DA40: ; 813DA40 strh r4, [r1, 0xC] strh r5, [r1, 0xE] strh r6, [r1, 0x1C] - ldr r0, =sub_813D9B0 + 1 + ldr r0, =sub_813D9B0 bl set_callback2 pop {r4-r6} pop {r0} @@ -612056,7 +612056,7 @@ evolution_cutscene: ; 813DA8C adds r6, r7, 0 adds r6, 0x1C adds r0, r1, r6 - ldr r2, =nullsub_18 + 1 + ldr r2, =nullsub_18 str r2, [r0] adds r1, r7 ldrb r2, [r1, 0x5] @@ -612109,7 +612109,7 @@ evolution_cutscene: ; 813DA8C adds r1, r3 lsls r1, 2 adds r6, r1, r6 - ldr r2, =nullsub_18 + 1 + ldr r2, =nullsub_18 str r2, [r6] adds r1, r7 ldrb r0, [r1, 0x5] @@ -612123,7 +612123,7 @@ evolution_cutscene: ; 813DA8C orrs r0, r2 strb r0, [r1] bl sub_817BE78 - ldr r0, =sub_813E570 + 1 + ldr r0, =sub_813E570 movs r1, 0 bl AddTask ldr r1, =0x0203ab80 @@ -612161,12 +612161,12 @@ evolution_cutscene: ; 813DA8C lsls r1, 5 movs r0, 0 bl lcd_io_set - ldr r0, =nullsub_83 + 1 + ldr r0, =nullsub_83 bl SetHBlankCallback - ldr r0, =sub_813FCDC + 1 + ldr r0, =sub_813FCDC bl SetVBlankCallback bl m4aMPlayAllStop - ldr r0, =sub_813E3A4 + 1 + ldr r0, =sub_813E3A4 bl set_callback2 add sp, 0x24 pop {r3-r5} @@ -612313,7 +612313,7 @@ sub_813DD7C: ; 813DD7C adds r0, r3, 0 adds r0, 0x1C adds r0, r1, r0 - ldr r2, =nullsub_18 + 1 + ldr r2, =nullsub_18 str r2, [r0] adds r1, r3 ldrb r2, [r1, 0x5] @@ -612326,11 +612326,11 @@ sub_813DD7C: ; 813DD7C lsls r1, 5 movs r0, 0 bl lcd_io_set - ldr r0, =nullsub_83 + 1 + ldr r0, =nullsub_83 bl SetHBlankCallback - ldr r0, =sub_813FCDC + 1 + ldr r0, =sub_813FCDC bl SetVBlankCallback - ldr r0, =sub_813E3A4 + 1 + ldr r0, =sub_813E3A4 bl set_callback2 movs r0, 0x1 negs r0, r0 @@ -612441,9 +612441,9 @@ sub_813DF70: ; 813DF70 .pool @0813E050: bl sub_80A1A74 - ldr r0, =nullsub_83 + 1 + ldr r0, =nullsub_83 bl SetHBlankCallback - ldr r0, =sub_813FD64 + 1 + ldr r0, =sub_813FD64 bl SetVBlankCallback ldr r1, =0x030022c0 movs r3, 0x87 @@ -612527,7 +612527,7 @@ sub_813DF70: ; 813DF70 adds r0, r3, 0 adds r0, 0x1C adds r0, r1, r0 - ldr r2, =nullsub_18 + 1 + ldr r2, =nullsub_18 str r2, [r0] adds r1, r3 ldrb r2, [r1, 0x5] @@ -612587,7 +612587,7 @@ sub_813DF70: ; 813DF70 bl gpu_sync_bg_show movs r0, 0x1 bl gpu_sync_bg_show - ldr r0, =sub_813E3C0 + 1 + ldr r0, =sub_813E3C0 bl set_callback2 movs r1, 0x9A lsls r1, 5 @@ -612697,7 +612697,7 @@ sub_813E1D4: ; 813E1D4 adds r0, r3, 0 adds r0, 0x1C adds r0, r1, r0 - ldr r2, =nullsub_18 + 1 + ldr r2, =nullsub_18 str r2, [r0] adds r1, r3 ldrb r2, [r1, 0x5] @@ -612712,7 +612712,7 @@ sub_813E1D4: ; 813E1D4 orrs r0, r2 strb r0, [r1] bl sub_817BE78 - ldr r0, =sub_813F1B8 + 1 + ldr r0, =sub_813F1B8 movs r1, 0 bl AddTask mov r1, r9 @@ -612759,9 +612759,9 @@ sub_813E1D4: ; 813E1D4 movs r1, 0x2 orrs r0, r1 strb r0, [r2] - ldr r0, =sub_813FD64 + 1 + ldr r0, =sub_813FD64 bl SetVBlankCallback - ldr r0, =sub_813E3C0 + 1 + ldr r0, =sub_813E3C0 bl set_callback2 add sp, 0x18 pop {r3-r5} @@ -614065,7 +614065,7 @@ sub_813E570: ; 813E570 subs r2, 0x1 lsls r2, 24 lsrs r2, 24 - ldr r3, =sub_813DD7C + 1 + ldr r3, =sub_813DD7C ldr r4, =0x020244e2 ldrh r4, [r4] str r4, [sp] @@ -614086,7 +614086,7 @@ sub_813E570: ; 813E570 b @0813F1A4 @0813EF96: ldr r1, [r6, 0x4] - ldr r0, =sub_813E3A4 + 1 + ldr r0, =sub_813E3A4 cmp r1, r0 beq @0813EFA0 b @0813F1A4 @@ -615255,7 +615255,7 @@ sub_813F1B8: ; 813F1B8 subs r2, 0x1 lsls r2, 24 lsrs r2, 24 - ldr r3, =sub_813DF70 + 1 + ldr r3, =sub_813DF70 ldr r4, =0x020244e2 ldrh r4, [r4] str r4, [sp] @@ -615277,7 +615277,7 @@ sub_813F1B8: ; 813F1B8 @0813FAB6: ldr r0, =0x030022c0 ldr r1, [r0, 0x4] - ldr r0, =sub_813E3C0 + 1 + ldr r0, =sub_813E3C0 cmp r1, r0 beq @0813FAC2 b @0813FCC4 @@ -615695,7 +615695,7 @@ sub_813FEA4: ; 813FEA4 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, =sub_813FEE8 + 1 + ldr r0, =sub_813FEE8 movs r1, 0x7 bl AddTask lsls r0, 24 @@ -615795,7 +615795,7 @@ sub_813FEE8: ; 813FEE8 bl sine adds r0, 0x10 strh r0, [r6] - ldr r0, =sub_813FDEC + 1 + ldr r0, =sub_813FDEC bl is_function_an_active_task lsls r0, 24 lsrs r4, r0, 24 @@ -615945,7 +615945,7 @@ sub_8140000: ; 8140000 movs r0, 0 bl lcd_io_set @081400DE: - ldr r0, =sub_813FDEC + 1 + ldr r0, =sub_813FDEC movs r1, 0x5 bl AddTask adds r0, r5, 0 @@ -615961,7 +615961,7 @@ sub_8140000: ; 8140000 thumb_func_start sub_8140100 sub_8140100: ; 8140100 push {lr} - ldr r0, =sub_813FDEC + 1 + ldr r0, =sub_813FDEC bl get_task_id_by_function lsls r0, 24 lsrs r2, r0, 24 @@ -615988,7 +615988,7 @@ sub_8140100: ; 8140100 thumb_func_start sub_8140134 sub_8140134: ; 8140134 push {lr} - ldr r0, =sub_813FDEC + 1 + ldr r0, =sub_813FDEC bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -615996,7 +615996,7 @@ sub_8140134: ; 8140134 beq @08140148 bl remove_task @08140148: - ldr r0, =sub_813FEE8 + 1 + ldr r0, =sub_813FEE8 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -616093,7 +616093,7 @@ sub_8140208: ; 8140208 adds r2, 0x1C adds r1, r2 ldr r1, [r1] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 beq @08140230 movs r0, 0 @@ -616667,7 +616667,7 @@ sub_81405CC: ; 81405CC @0814077A: movs r0, 0x1 bl enable_irqs - ldr r0, =sub_8140264 + 1 + ldr r0, =sub_8140264 bl SetVBlankCallback movs r0, 0x1 str r0, [sp] @@ -616676,7 +616676,7 @@ sub_81405CC: ; 81405CC movs r2, 0x10 movs r3, 0 bl sub_80A27B0 - ldr r0, =sub_81408A8 + 1 + ldr r0, =sub_81408A8 movs r1, 0 bl AddTask ldr r5, =0x0203ab88 @@ -616698,13 +616698,13 @@ sub_81405CC: ; 81405CC lsls r0, 16 lsrs r0, 16 bl sub_80EDE84 - ldr r0, =sub_8140814 + 1 + ldr r0, =sub_8140814 movs r1, 0x1 bl AddTask ldr r1, [r5] adds r1, 0xA5 strb r0, [r1] - ldr r0, =sub_8140238 + 1 + ldr r0, =sub_8140238 bl set_callback2 b @08140806 .align 2, 0 @@ -616836,7 +616836,7 @@ sub_81408A8: ; 81408A8 bl sub_81424FC movs r0, 0x6 bl sub_814372C - ldr r1, =sub_8140968 + 1 + ldr r1, =sub_8140968 ldr r2, =0x0000ffff adds r0, r4, 0 movs r3, 0x3 @@ -616900,7 +616900,7 @@ sub_8140968: ; 8140968 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_8140BD0 + 1 + ldr r1, =sub_8140BD0 str r1, [r0] pop {r4} pop {r0} @@ -617164,7 +617164,7 @@ sub_8140B8C: ; 8140B8C ldr r0, [r5] adds r0, 0x21 strb r6, [r0] - ldr r0, =sub_8141040 + 1 + ldr r0, =sub_8141040 str r0, [r4] pop {r4-r6} pop {r0} @@ -617268,7 +617268,7 @@ sub_8140BD0: ; 8140BD0 ldrb r0, [r4, 0x10] bl sub_8142284 strh r5, [r4, 0xA] - ldr r0, =sub_8140B8C + 1 + ldr r0, =sub_8140B8C str r0, [r4] pop {r4-r7} pop {r0} @@ -617658,7 +617658,7 @@ sub_8140F6C: ; 8140F6C adds r0, r1 movs r1, 0x20 strh r1, [r0, 0xA] - ldr r1, =sub_81410FC + 1 + ldr r1, =sub_81410FC str r1, [r0] pop {r4} pop {r0} @@ -617718,7 +617718,7 @@ sub_8140FC4: ; 8140FC4 @08141024: ldrh r0, [r5, 0x22] bl sub_8143514 - ldr r0, =sub_8140F6C + 1 + ldr r0, =sub_8140F6C str r0, [r5] pop {r4,r5} pop {r0} @@ -617813,7 +617813,7 @@ sub_8141040: ; 8141040 @081410E8: movs r0, 0x5F bl m4aSongNumStart - ldr r0, =sub_8140FC4 + 1 + ldr r0, =sub_8140FC4 str r0, [r4] @081410F2: pop {r4,r5} @@ -617866,7 +617866,7 @@ sub_81410FC: ; 81410FC lsls r0, 2 adds r2, 0x1C adds r0, r2 - ldr r1, =nullsub_12 + 1 + ldr r1, =nullsub_12 str r1, [r0] b @08141180 .align 2, 0 @@ -617878,7 +617878,7 @@ sub_81410FC: ; 81410FC movs r0, 0x1 movs r1, 0xFF bl sub_8143038 - ldr r0, =sub_8141344 + 1 + ldr r0, =sub_8141344 str r0, [r4] movs r0, 0 strh r0, [r4, 0xA] @@ -618338,7 +618338,7 @@ sub_8141344: ; 8141344 add r0, r10 lsls r0, 3 adds r0, r1 - ldr r1, =sub_814155C + 1 + ldr r1, =sub_814155C str r1, [r0] add sp, 0x8 pop {r3-r5} @@ -618377,7 +618377,7 @@ sub_814155C: ; 814155C ldr r2, =0x02020630 adds r1, r2 str r1, [r3, 0x38] - ldr r2, =sub_81446AC + 1 + ldr r2, =sub_81446AC str r2, [r1, 0x1C] ldr r1, =0x03005e00 lsls r4, r0, 2 @@ -618397,7 +618397,7 @@ sub_814155C: ; 814155C bl sub_814372C movs r0, 0x5C bl m4aSongNumStart - ldr r0, =sub_81415D4 + 1 + ldr r0, =sub_81415D4 str r0, [r4] pop {r4} pop {r0} @@ -618523,7 +618523,7 @@ sub_81415D4: ; 81415D4 bl sub_8143038 movs r0, 0x20 strh r0, [r4, 0xA] - ldr r0, =sub_81416D4 + 1 + ldr r0, =sub_81416D4 str r0, [r4] @081416C6: pop {r4-r7} @@ -618576,7 +618576,7 @@ sub_81416D4: ; 81416D4 lsls r0, 2 adds r2, 0x1C adds r0, r2 - ldr r1, =sub_814390C + 1 + ldr r1, =sub_814390C str r1, [r0] b @08141768 .align 2, 0 @@ -618601,7 +618601,7 @@ sub_81416D4: ; 81416D4 adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, =sub_8141778 + 1 + ldr r0, =sub_8141778 str r0, [r1] @08141768: pop {r4,r5} @@ -618667,7 +618667,7 @@ sub_8141778: ; 8141778 bl sub_8143038 b @081417F4 @081417E8: - ldr r1, =sub_814189C + 1 + ldr r1, =sub_814189C adds r0, r2, 0 movs r2, 0x1E movs r3, 0 @@ -618716,7 +618716,7 @@ sub_8141800: ; 8141800 movs r0, 0x1D bl sav12_xor_set @08141848: - ldr r1, =sub_8141A18 + 1 + ldr r1, =sub_8141A18 ldr r2, =0x0000ffff adds r0, r5, 0 movs r3, 0x3 @@ -618736,7 +618736,7 @@ sub_8141800: ; 8141800 lsls r0, 3 adds r0, r1 strh r2, [r0, 0x1E] - ldr r1, =sub_8141AC0 + 1 + ldr r1, =sub_8141AC0 ldr r2, =0x0000ffff adds r0, r5, 0 movs r3, 0x3 @@ -618838,7 +618838,7 @@ sub_814189C: ; 814189C adds r0, r1 movs r1, 0 strh r1, [r0, 0xA] - ldr r1, =sub_8141800 + 1 + ldr r1, =sub_8141800 str r1, [r0] add sp, 0xC pop {r4,r5} @@ -618909,7 +618909,7 @@ sub_8141984: ; 8141984 ldrsh r0, [r1, r2] cmp r0, 0 bne @08141A04 - ldr r1, =sub_8141AC0 + 1 + ldr r1, =sub_8141AC0 ldr r2, =0x0000ffff adds r0, r6, 0 movs r3, 0x3 @@ -618980,7 +618980,7 @@ sub_8141A18: ; 8141A18 muls r0, r1 strh r0, [r4, 0xA] strh r6, [r4, 0x16] - ldr r0, =sub_8141984 + 1 + ldr r0, =sub_8141984 str r0, [r4] add sp, 0xC pop {r3,r4} @@ -619053,7 +619053,7 @@ sub_8141AC0: ; 8141AC0 movs r2, 0x4 orrs r1, r2 strb r1, [r0] - ldr r0, =sub_8141B58 + 1 + ldr r0, =sub_8141B58 str r0, [r3] pop {r4-r6} pop {r0} @@ -619170,7 +619170,7 @@ sub_8141B58: ; 8141B58 ldrb r0, [r4] movs r1, 0x3 bl Window_CopyToVram - ldr r1, =dp01t_12_3_battle_menu + 1 + ldr r1, =dp01t_12_3_battle_menu b @08141C8E .align 2, 0 .pool @@ -619198,7 +619198,7 @@ sub_8141B58: ; 8141B58 ldrb r0, [r4] movs r1, 0x3 bl Window_CopyToVram - ldr r1, =sub_8140914 + 1 + ldr r1, =sub_8140914 @08141C8E: ldr r2, =0x0000ffff adds r0, r6, 0 @@ -619208,7 +619208,7 @@ sub_8141B58: ; 8141B58 .align 2, 0 .pool @08141CB0: - ldr r0, =sub_8140914 + 1 + ldr r0, =sub_8140914 str r0, [r2] b @08141CF2 .align 2, 0 @@ -619232,7 +619232,7 @@ sub_8141B58: ; 8141B58 ldrb r0, [r4] movs r1, 0x3 bl Window_CopyToVram - ldr r1, =sub_8140994 + 1 + ldr r1, =sub_8140994 adds r0, r6, 0 movs r2, 0x3C movs r3, 0x3 @@ -619320,7 +619320,7 @@ dp01t_12_3_battle_menu: ; 8141D0C ldrb r0, [r4] movs r1, 0x3 bl Window_CopyToVram - ldr r1, =sub_8140914 + 1 + ldr r1, =sub_8140914 ldr r2, =0x0000ffff adds r0, r5, 0 movs r3, 0x3 @@ -619329,7 +619329,7 @@ dp01t_12_3_battle_menu: ; 8141D0C .align 2, 0 .pool @08141DD4: - ldr r0, =sub_8140914 + 1 + ldr r0, =sub_8140914 str r0, [r2] @08141DD8: add sp, 0xC @@ -619394,7 +619394,7 @@ sub_8141DE4: ; 8141DE4 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, =sub_8141E7C + 1 + ldr r1, =sub_8141E7C str r1, [r0] add sp, 0x4 pop {r4,r5} @@ -619436,9 +619436,9 @@ sub_8141E7C: ; 8141E7C bl reset_all_obj_data bl sub_8140418 ldr r1, =0x03005dac - ldr r0, =sub_80AF168 + 1 + ldr r0, =sub_80AF168 str r0, [r1] - ldr r0, =c2_exit_to_overworld_2_switch + 1 + ldr r0, =c2_exit_to_overworld_2_switch bl set_callback2 adds r0, r5, 0 bl remove_task @@ -619570,7 +619570,7 @@ sub_8141F7C: ; 8141F7C adds r0, r6 lsls r0, 3 adds r0, r3 - ldr r1, =sub_8141EF8 + 1 + ldr r1, =sub_8141EF8 str r1, [r0] pop {r4-r7} pop {r0} @@ -620712,7 +620712,7 @@ sub_81428E4: ; 81428E4 bne @08142908 movs r0, 0 bl SetVBlankCallback - ldr r0, =sub_81405CC + 1 + ldr r0, =sub_81405CC bl set_callback2 adds r0, r4, 0 bl remove_task @@ -620759,7 +620759,7 @@ sub_8142918: ; 8142918 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81428E4 + 1 + ldr r1, =sub_81428E4 str r1, [r0] add sp, 0x4 pop {r4} @@ -620875,7 +620875,7 @@ sub_81429F0: ; 81429F0 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81428C4 + 1 + ldr r1, =sub_81428C4 str r1, [r0] @08142A60: add sp, 0xC @@ -620948,7 +620948,7 @@ sub_8142A88: ; 8142A88 movs r0, 0 movs r1, 0x3 bl Window_CopyToVram - ldr r0, =sub_81429F0 + 1 + ldr r0, =sub_81429F0 str r0, [r6] b @08142BB0 .align 2, 0 @@ -620979,7 +620979,7 @@ sub_8142A88: ; 8142A88 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81428C4 + 1 + ldr r1, =sub_81428C4 str r1, [r0] b @08142BB0 .align 2, 0 @@ -621005,7 +621005,7 @@ sub_8142A88: ; 8142A88 movs r0, 0 movs r1, 0x3 bl Window_CopyToVram - ldr r0, =sub_81429A0 + 1 + ldr r0, =sub_81429A0 str r0, [r6] strh r4, [r6, 0x22] strh r4, [r6, 0x8] @@ -621030,7 +621030,7 @@ sub_8142BC8: ; 8142BC8 movs r1, 0x1 movs r2, 0x1 bl sub_8145BAC - ldr r0, =sub_8142A88 + 1 + ldr r0, =sub_8142A88 movs r1, 0 bl AddTask adds r4, r0, 0 @@ -621521,7 +621521,7 @@ sub_8142F7C: ; 8142F7C adds r1, r4, 0 adds r1, 0x1C adds r0, r1 - ldr r1, =sub_814390C + 1 + ldr r1, =sub_814390C str r1, [r0] ldrb r1, [r2] lsls r0, r1, 4 @@ -622840,7 +622840,7 @@ sub_8143A40: ; 8143A40 strb r1, [r3] mov r1, r10 adds r2, r4, r1 - ldr r1, =nullsub_12 + 1 + ldr r1, =nullsub_12 str r1, [r2] movs r1, 0 bl obj_anim_image_start @@ -623246,7 +623246,7 @@ sub_8143CFC: ; 8143CFC lsls r1, 1 adds r1, 0xF strh r1, [r5, 0x3A] - ldr r0, =sub_8143C90 + 1 + ldr r0, =sub_8143C90 str r0, [r5, 0x1C] movs r0, 0x47 bl m4aSongNumStartOrChange @@ -623429,7 +623429,7 @@ sub_8143E14: ; 8143E14 negs r1, r1 ands r0, r1 strb r0, [r3] - ldr r0, =sub_8143CFC + 1 + ldr r0, =sub_8143CFC str r0, [r7, 0x1C] strh r2, [r7, 0x32] @08143F80: @@ -623505,7 +623505,7 @@ sub_8143FA4: ; 8143FA4 lsls r1, 1 adds r1, 0xF strh r1, [r5, 0x3A] - ldr r0, =sub_8143C90 + 1 + ldr r0, =sub_8143C90 str r0, [r5, 0x1C] movs r0, 0x47 bl m4aSongNumStartOrChange @@ -623620,7 +623620,7 @@ sub_8144050: ; 8144050 mov r1, r12 strb r0, [r1] strh r2, [r3, 0x32] - ldr r0, =sub_8143FA4 + 1 + ldr r0, =sub_8143FA4 str r0, [r3, 0x1C] movs r0, 0x3D bl m4aSongNumStart @@ -623658,7 +623658,7 @@ sub_8144128: ; 8144128 cmp r0, 0 beq @0814415C @08144154: - ldr r0, =sub_8144050 + 1 + ldr r0, =sub_8144050 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x32] @@ -623687,14 +623687,14 @@ sub_8144168: ; 8144168 @08144182: adds r0, r4, 0 bl sub_81446DC - ldr r0, =sub_8143E14 + 1 + ldr r0, =sub_8143E14 b @0814419C .align 2, 0 .pool @08144194: adds r0, r4, 0 bl sub_81448B8 - ldr r0, =sub_8144128 + 1 + ldr r0, =sub_8144128 @0814419C: str r0, [r4, 0x1C] pop {r4} @@ -623767,7 +623767,7 @@ prev_quest_read_x24_hm_usage: ; 81441A8 lsls r1, 1 adds r1, 0xF strh r1, [r5, 0x3A] - ldr r0, =sub_8143C90 + 1 + ldr r0, =sub_8143C90 str r0, [r5, 0x1C] movs r0, 0x47 bl m4aSongNumStartOrChange @@ -623850,7 +623850,7 @@ sub_8144264: ; 8144264 lsls r1, 1 adds r1, 0xF strh r1, [r6, 0x3A] - ldr r0, =sub_8143C90 + 1 + ldr r0, =sub_8143C90 str r0, [r6, 0x1C] movs r0, 0x47 bl m4aSongNumStartOrChange @@ -623976,7 +623976,7 @@ sub_8144264: ; 8144264 adds r0, 0x98 ldr r1, =0x3dae147b str r1, [r0] - ldr r0, =prev_quest_read_x24_hm_usage + 1 + ldr r0, =prev_quest_read_x24_hm_usage str r0, [r6, 0x1C] movs r0, 0x5 strh r0, [r6, 0x30] @@ -624054,7 +624054,7 @@ sub_8144410: ; 8144410 str r0, [r1] movs r0, 0x4 strh r0, [r6, 0x30] - ldr r0, =sub_8144264 + 1 + ldr r0, =sub_8144264 str r0, [r6, 0x1C] b @081444FA .align 2, 0 @@ -624171,7 +624171,7 @@ sub_8144514: ; 8144514 strb r0, [r2] movs r0, 0x3 strh r0, [r6, 0x30] - ldr r0, =sub_8144410 + 1 + ldr r0, =sub_8144410 str r0, [r6, 0x1C] @081445B8: pop {r3} @@ -624263,7 +624263,7 @@ sub_81445D8: ; 81445D8 strb r0, [r2] movs r0, 0x2 strh r0, [r6, 0x30] - ldr r0, =sub_8144514 + 1 + ldr r0, =sub_8144514 str r0, [r6, 0x1C] @0814468A: pop {r3} @@ -624292,7 +624292,7 @@ sub_81446AC: ; 81446AC negs r0, r0 ands r0, r1 strb r0, [r2] - ldr r0, =sub_81445D8 + 1 + ldr r0, =sub_81445D8 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -624982,7 +624982,7 @@ sub_8144A24: ; 8144A24 ldrb r0, [r0] @08144C54: strh r0, [r7, 0x3C] - ldr r1, =sub_8144168 + 1 + ldr r1, =sub_8144168 str r1, [r7, 0x1C] add sp, 0x14 pop {r3-r5} @@ -625183,7 +625183,7 @@ sub_8144D94: ; 8144D94 ble @08144E3E movs r0, 0 strh r0, [r5, 0x30] - ldr r3, =sub_8144C70 + 1 + ldr r3, =sub_8144C70 str r3, [r5, 0x1C] ldr r2, =0x02020630 movs r0, 0x3A @@ -625221,7 +625221,7 @@ sub_8144D94: ; 8144D94 adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, =sub_8144CD0 + 1 + ldr r1, =sub_8144CD0 str r1, [r0] movs r0, 0xD6 bl m4aSongNumStart @@ -625353,7 +625353,7 @@ sub_8144E60: ; 8144E60 adds r1, r2, 0 adds r1, 0x1C adds r0, r1 - ldr r1, =sub_8144D94 + 1 + ldr r1, =sub_8144D94 str r1, [r0] movs r0, 0x36 ldrsh r1, [r4, r0] @@ -625367,7 +625367,7 @@ sub_8144E60: ; 8144E60 negs r1, r1 ands r1, r2 strb r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x3C] @@ -625411,7 +625411,7 @@ sub_8144FB0: ; 8144FB0 strh r0, [r4, 0x22] b @0814501C @08144FC8: - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r4, 0x1C] adds r2, r4, 0 adds r2, 0x3E @@ -625522,7 +625522,7 @@ sub_8145030: ; 8145030 lsrs r1, 24 adds r0, r4, 0 bl obj_anim_image_start - ldr r0, =sub_8144FB0 + 1 + ldr r0, =sub_8144FB0 str r0, [r4, 0x1C] ldr r2, =0x02020630 movs r0, 0x3A @@ -625680,7 +625680,7 @@ sub_81450D8: ; 81450D8 bl obj_anim_image_start movs r0, 0x2D strh r0, [r4, 0x30] - ldr r0, =sub_8145030 + 1 + ldr r0, =sub_8145030 str r0, [r4, 0x1C] @08145208: add sp, 0x14 @@ -625742,7 +625742,7 @@ sub_8145218: ; 8145218 .align 2, 0 .pool @08145284: - ldr r0, =sub_8144F94 + 1 + ldr r0, =sub_8144F94 str r0, [r4, 0x1C] @08145288: add sp, 0x4 @@ -625824,7 +625824,7 @@ sub_8145294: ; 8145294 lsls r0, 2 adds r2, 0x1C adds r0, r2 - ldr r1, =sub_8145218 + 1 + ldr r1, =sub_8145218 str r1, [r0] movs r0, 0x36 ldrsh r1, [r4, r0] @@ -625832,7 +625832,7 @@ sub_8145294: ; 8145294 adds r0, r1 lsls r0, 2 adds r0, r2 - ldr r1, =sub_81450D8 + 1 + ldr r1, =sub_81450D8 str r1, [r0] movs r0, 0x2B bl m4aSongNumStart @@ -627215,10 +627215,10 @@ hm_prepare_rocksmash: ; 8145DC4 lsrs r0, 24 strh r0, [r4] ldr r1, =0x03005db0 - ldr r0, =hm_add_c3_launch_phase_2 + 1 + ldr r0, =hm_add_c3_launch_phase_2 str r0, [r1] ldr r1, =0x0203ceec - ldr r0, =sub_8145E0C + 1 + ldr r0, =sub_8145E0C str r0, [r1] movs r0, 0x1 @08145DF2: @@ -627256,7 +627256,7 @@ sub_8145E2C: ; 8145E2C adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r2, =sub_8145E74 + 1 + ldr r2, =sub_8145E74 lsrs r0, r2, 16 strh r0, [r1, 0x18] strh r2, [r1, 0x1A] @@ -627314,7 +627314,7 @@ sub_8145E84: ; 8145E84 beq @08145EC0 movs r0, 0 strb r0, [r4] - ldr r0, =c2_exit_to_overworld_2_switch + 1 + ldr r0, =c2_exit_to_overworld_2_switch bl set_callback2 @08145EC0: bl run_active_tasks @@ -627333,7 +627333,7 @@ sub_8145EDC: ; 8145EDC push {lr} ldr r1, =0x0300120a strb r0, [r1] - ldr r0, =sub_8145E84 + 1 + ldr r0, =sub_8145E84 bl set_callback2 pop {r0} bx r0 @@ -627347,7 +627347,7 @@ sub_8145EF4: ; 8145EF4 lsls r0, 24 lsrs r0, 24 ldr r2, =0x030022c0 - ldr r1, =sub_8085E50 + 1 + ldr r1, =sub_8085E50 str r1, [r2, 0x4] bl sub_8145F6C pop {r0} @@ -627369,7 +627369,7 @@ sub_8145F10: ; 8145F10 thumb_func_start sub_8145F20 sub_8145F20: ; 8145F20 push {r4,lr} - ldr r0, =sub_8145FA8 + 1 + ldr r0, =sub_8145FA8 bl get_task_id_by_function lsls r0, 24 lsrs r2, r0, 24 @@ -627409,7 +627409,7 @@ sub_8145F6C: ; 8145F6C adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, =sub_8145FA8 + 1 + ldr r0, =sub_8145FA8 movs r1, 0x2 bl AddTask lsls r0, 24 @@ -627736,7 +627736,7 @@ sub_81461D8: ; 81461D8 ands r0, r1 cmp r0, 0 bne @081461F4 - ldr r0, =sub_814610C + 1 + ldr r0, =sub_814610C bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -627804,9 +627804,9 @@ sub_814623C: ; 814623C movs r2, 0 movs r3, 0x2 bl sub_8149F98 - ldr r0, =sub_8146320 + 1 + ldr r0, =sub_8146320 bl SetVBlankCallback - ldr r0, =sub_8146358 + 1 + ldr r0, =sub_8146358 bl SetHBlankCallback movs r0, 0x3 bl enable_irqs @@ -627857,7 +627857,7 @@ sub_81462A8: ; 81462A8 ands r0, r1 cmp r0, 0 bne @081462FA - ldr r0, =sub_8146204 + 1 + ldr r0, =sub_8146204 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -627977,9 +627977,9 @@ sub_81463BC: ; 81463BC movs r2, 0xA0 lsls r2, 1 bl memset - ldr r0, =sub_81464B0 + 1 + ldr r0, =sub_81464B0 bl SetVBlankCallback - ldr r0, =sub_81464E8 + 1 + ldr r0, =sub_81464E8 bl SetHBlankCallback movs r0, 0x3 bl enable_irqs @@ -628045,7 +628045,7 @@ sub_8146420: ; 8146420 ands r0, r1 cmp r0, 0 bne @0814648E - ldr r0, =sub_8146384 + 1 + ldr r0, =sub_8146384 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -628356,7 +628356,7 @@ sub_814669C: ; 814669C subs r1, 0x1 cmp r1, 0 bge @081466E2 - ldr r0, =sub_8146F3C + 1 + ldr r0, =sub_8146F3C bl SetVBlankCallback pop {r4} pop {r0} @@ -629302,7 +629302,7 @@ sub_8146DF8: ; 8146DF8 bne @08146EA4 adds r0, r1, 0x1 strh r0, [r4, 0xE] - ldr r0, =sub_8146F68 + 1 + ldr r0, =sub_8146F68 bl SetVBlankCallback @08146EA4: ldr r0, =0x0203aba0 @@ -629547,7 +629547,7 @@ sub_81470A4: ; 81470A4 cmp r0, 0 bne @081470C4 bl sub_8149F84 - ldr r0, =sub_8146F94 + 1 + ldr r0, =sub_8146F94 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -629768,7 +629768,7 @@ sub_814723C: ; 814723C lsrs r1, r0, 16 cmp r1, 0x9F bls @08147262 - ldr r0, =sub_8147688 + 1 + ldr r0, =sub_8147688 bl SetVBlankCallback ldr r0, =0x0203aba0 ldr r1, [r0] @@ -630278,7 +630278,7 @@ sub_8147648: ; 8147648 strh r0, [r1, 0xA] ldrh r0, [r1, 0xA] bl sub_8149F84 - ldr r0, =sub_8147204 + 1 + ldr r0, =sub_8147204 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -630398,9 +630398,9 @@ sub_8147750: ; 8147750 lsrs r2, r0, 24 cmp r2, 0x9F bls @08147762 - ldr r0, =sub_8147888 + 1 + ldr r0, =sub_8147888 bl SetVBlankCallback - ldr r0, =sub_81478C0 + 1 + ldr r0, =sub_81478C0 bl SetHBlankCallback movs r0, 0x2 bl enable_irqs @@ -630500,7 +630500,7 @@ sub_81477A8: ; 81477A8 ands r0, r1 cmp r0, 0 bne @0814785A - ldr r0, =sub_8147718 + 1 + ldr r0, =sub_8147718 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -630628,7 +630628,7 @@ sub_8147924: ; 8147924 lsrs r1, r0, 24 cmp r1, 0x9F bls @0814794A - ldr r0, =sub_8147A58 + 1 + ldr r0, =sub_8147A58 bl SetVBlankCallback ldrh r0, [r4, 0x8] adds r0, 0x1 @@ -630738,7 +630738,7 @@ sub_8147A18: ; 8147A18 strh r0, [r1, 0xA] ldrh r0, [r1, 0xA] bl sub_8149F84 - ldr r0, =sub_81478EC + 1 + ldr r0, =sub_81478EC bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -630962,7 +630962,7 @@ sub_8147BBC: ; 8147BBC lsrs r1, r0, 24 cmp r1, 0x9F bls @08147BF0 - ldr r0, =sub_81480CC + 1 + ldr r0, =sub_81480CC bl SetVBlankCallback ldrh r0, [r4, 0x8] adds r0, 0x1 @@ -631044,7 +631044,7 @@ sub_8147C24: ; 8147C24 ble @08147C78 movs r0, 0x2 bl enable_irqs - ldr r0, =sub_81481E0 + 1 + ldr r0, =sub_81481E0 bl SetHBlankCallback mov r2, r8 ldrh r0, [r2, 0x8] @@ -631348,7 +631348,7 @@ sub_8147E88: ; 8147E88 ldr r1, [r7] movs r0, 0xBF strh r0, [r1, 0xE] - ldr r0, =sub_8148160 + 1 + ldr r0, =sub_8148160 bl SetVBlankCallback @08147F1C: movs r0, 0 @@ -631760,7 +631760,7 @@ sub_8148218: ; 8148218 adds r6, r0 lsls r6, 2 adds r6, r1 - ldr r0, =sub_8148380 + 1 + ldr r0, =sub_8148380 str r0, [r5, 0x1C] str r0, [r6, 0x1C] ldrb r0, [r5, 0x1] @@ -632132,9 +632132,9 @@ sub_8148508: ; 8148508 movs r0, 0x4 movs r1, 0x10 bl lcd_io_set_bits - ldr r0, =sub_814869C + 1 + ldr r0, =sub_814869C bl SetVBlankCallback - ldr r0, =sub_8148728 + 1 + ldr r0, =sub_8148728 bl SetHBlankCallback ldrh r0, [r5, 0x8] adds r0, 0x1 @@ -632269,7 +632269,7 @@ sub_814865C: ; 814865C strh r0, [r1, 0xA] ldrh r0, [r1, 0xA] bl sub_8149F84 - ldr r0, =sub_81484D0 + 1 + ldr r0, =sub_81484D0 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -632469,9 +632469,9 @@ sub_8148798: ; 8148798 strh r0, [r6, 0x14] movs r0, 0x2 bl enable_irqs - ldr r0, =sub_814869C + 1 + ldr r0, =sub_814869C bl SetVBlankCallback - ldr r0, =sub_8148728 + 1 + ldr r0, =sub_8148728 bl SetHBlankCallback ldrh r0, [r6, 0x8] adds r0, 0x1 @@ -632847,7 +632847,7 @@ sub_8148B14: ; 8148B14 strh r0, [r1, 0xA] ldrh r0, [r1, 0xA] bl sub_8149F84 - ldr r0, =sub_8148760 + 1 + ldr r0, =sub_8148760 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -632945,7 +632945,7 @@ sub_8148BC4: ; 8148BC4 cmp r1, 0 bge @08148BEE movs r4, 0 - ldr r0, =sub_8146F68 + 1 + ldr r0, =sub_8146F68 bl SetVBlankCallback ldrh r0, [r5, 0x8] adds r0, 0x1 @@ -633849,7 +633849,7 @@ sub_81492B4: ; 81492B4 lsrs r2, r0, 16 cmp r2, 0x9F bls @08149316 - ldr r0, =sub_8149508 + 1 + ldr r0, =sub_8149508 bl SetVBlankCallback movs r0, 0 add sp, 0xC @@ -634051,7 +634051,7 @@ sub_814946C: ; 814946C movs r0, 0xA0 strh r0, [r1, 0x8] movs r1, 0 - ldr r5, =sub_8146F68 + 1 + ldr r5, =sub_8146F68 ldr r3, =0x020393a8 movs r2, 0 @081494C4: @@ -634196,9 +634196,9 @@ sub_81495B0: ; 81495B0 bls @081495DC movs r0, 0x2 bl enable_irqs - ldr r0, =sub_8149840 + 1 + ldr r0, =sub_8149840 bl SetHBlankCallback - ldr r0, =sub_8149774 + 1 + ldr r0, =sub_8149774 bl SetVBlankCallback ldrh r0, [r5, 0x8] adds r0, 0x1 @@ -634223,7 +634223,7 @@ sub_8149628: ; 8149628 movs r5, 0 movs r4, 0 @0814963C: - ldr r0, =sub_8149864 + 1 + ldr r0, =sub_8149864 bl obj_add_empty_with_callback lsls r0, 24 lsrs r0, 24 @@ -634329,7 +634329,7 @@ sub_81496D8: ; 81496D8 strh r0, [r1, 0xE] movs r0, 0x3F strh r0, [r1, 0x2] - ldr r0, =sub_8149804 + 1 + ldr r0, =sub_8149804 bl SetVBlankCallback ldrh r0, [r6, 0x8] adds r0, 0x1 @@ -634355,7 +634355,7 @@ sub_8149740: ; 8149740 cmp r0, 0x10 bls @08149766 bl sub_8149F84 - ldr r0, =sub_8149578 + 1 + ldr r0, =sub_8149578 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -634725,7 +634725,7 @@ sub_8149A40: ; 8149A40 cmp r1, 0 bne @08149A60 bl sub_8149F84 - ldr r0, =sub_814995C + 1 + ldr r0, =sub_814995C bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -634800,7 +634800,7 @@ sub_8149AA4: ; 8149AA4 adds r0, r4, 0 movs r2, 0xA0 bl CpuSet - ldr r0, =sub_8149CE8 + 1 + ldr r0, =sub_8149CE8 bl SetVBlankCallback ldrh r0, [r5, 0x8] adds r0, 0x1 @@ -635014,7 +635014,7 @@ sub_8149C60: ; 8149C60 strh r0, [r1, 0xA] ldrh r0, [r1, 0xA] bl sub_8149F84 - ldr r0, =sub_8149A6C + 1 + ldr r0, =sub_8149A6C bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -635144,7 +635144,7 @@ sub_8149D78: ; 8149D78 lsrs r6, 16 lsls r3, 16 lsrs r3, 16 - ldr r0, =sub_8149DFC + 1 + ldr r0, =sub_8149DFC movs r1, 0x3 str r3, [sp] bl AddTask @@ -635176,7 +635176,7 @@ sub_8149D78: ; 8149D78 thumb_func_start sub_8149DDC sub_8149DDC: ; 8149DDC push {lr} - ldr r0, =sub_8149DFC + 1 + ldr r0, =sub_8149DFC bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -635317,7 +635317,7 @@ sub_8149E90: ; 8149E90 lsls r0, 16 cmp r0, 0 bne @08149EF8 - ldr r0, =sub_8149DFC + 1 + ldr r0, =sub_8149DFC bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -636133,7 +636133,7 @@ sub_814A500: ; 814A500 push {r4-r6,lr} adds r5, r0, 0 movs r2, 0 - ldr r6, =sub_814A684 + 1 + ldr r6, =sub_814A684 ldr r4, =0x020393a8 ldr r3, =0x0203aba0 @0814A50C: @@ -636149,7 +636149,7 @@ sub_814A500: ; 814A500 bls @0814A50C adds r0, r6, 0 bl SetVBlankCallback - ldr r0, =sub_814A6CC + 1 + ldr r0, =sub_814A6CC bl SetHBlankCallback movs r0, 0x2 bl enable_irqs @@ -636291,7 +636291,7 @@ sub_814A550: ; 814A550 ands r0, r1 cmp r0, 0 bne @0814A654 - ldr r0, =sub_814A3F4 + 1 + ldr r0, =sub_814A3F4 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -637067,7 +637067,7 @@ sub_814AC38: ; 814AC38 movs r0, 0x10 bl lcd_io_set strh r5, [r6, 0xC] - ldr r0, =sub_814ABE4 + 1 + ldr r0, =sub_814ABE4 movs r1, 0x1 bl AddTask lsls r0, 24 @@ -637260,7 +637260,7 @@ sub_814ADD8: ; 814ADD8 asrs r0, 16 cmp r0, 0x3F ble @0814AE2E - ldr r0, =sub_814ABE4 + 1 + ldr r0, =sub_814ABE4 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -637338,7 +637338,7 @@ sub_814AEB0: ; 814AEB0 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, =bx_exec_buffer_A_ch0_tbl4 + 1 + ldr r1, =bx_exec_buffer_A_ch0_tbl4 str r1, [r0] bx lr .align 2, 0 @@ -637396,7 +637396,7 @@ sub_814AF1C: ; 814AF1C adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 bne @0814AF40 bl dp01_tbl4_exec_completed @@ -637423,7 +637423,7 @@ sub_814AF54: ; 814AF54 adds r1, 0x1C adds r0, r1 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 bne @0814AFA4 movs r0, 0 @@ -637521,7 +637521,7 @@ sub_814B004: ; 814B004 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 bne @0814B094 b @0814B092 @@ -637541,7 +637541,7 @@ sub_814B004: ; 814B004 adds r4, 0x1C adds r0, r4 ldr r2, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r2, r0 bne @0814B094 movs r0, 0x2 @@ -637581,7 +637581,7 @@ sub_814B004: ; 814B004 ldrb r0, [r3] lsls r0, 2 adds r0, r1 - ldr r1, =sub_814AFBC + 1 + ldr r1, =sub_814AFBC str r1, [r0] @0814B0C6: pop {r4-r6} @@ -637647,7 +637647,7 @@ sub_814B0E8: ; 814B0E8 adds r5, 0x1C adds r0, r5 ldr r3, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r3, r0 bne @0814B252 ldr r0, =0x020241e4 @@ -637766,7 +637766,7 @@ sub_814B0E8: ; 814B0E8 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =sub_814B004 + 1 + ldr r1, =sub_814B004 str r1, [r0] @0814B252: pop {r3-r5} @@ -638067,7 +638067,7 @@ sub_814B4E0: ; 814B4E0 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 bne @0814B532 adds r0, r3, 0 @@ -638092,7 +638092,7 @@ sub_814B4E0: ; 814B4E0 ldrb r1, [r4] lsls r1, 2 adds r1, r0 - ldr r0, =sub_814B554 + 1 + ldr r0, =sub_814B554 str r0, [r1] @0814B532: pop {r4} @@ -638129,7 +638129,7 @@ sub_814B554: ; 814B554 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 bne @0814B590 bl dp01_tbl4_exec_completed @@ -638180,7 +638180,7 @@ sub_814B5A8: ; 814B5A8 bl gpu_tile_obj_free_by_tag adds r0, r4, 0 bl gpu_pal_free_tag - ldr r0, =c3_0802FDF4 + 1 + ldr r0, =c3_0802FDF4 movs r1, 0xA bl AddTask ldr r0, =0x0202406e @@ -638226,7 +638226,7 @@ sub_814B5A8: ; 814B5A8 ldrb r0, [r7] lsls r0, 2 adds r0, r1 - ldr r1, =sub_814B4E0 + 1 + ldr r1, =sub_814B4E0 str r1, [r0] @0814B664: pop {r3} @@ -638277,7 +638277,7 @@ sub_814B69C: ; 814B69C adds r0, 0x1C adds r0, r3, r0 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 bne @0814B714 ldr r0, [r6] @@ -638297,7 +638297,7 @@ sub_814B69C: ; 814B69C ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =sub_814B5A8 + 1 + ldr r1, =sub_814B5A8 str r1, [r0] @0814B714: pop {r4-r6} @@ -638316,7 +638316,7 @@ dp01_tbl4_exec_completed: ; 814B740 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =bx_exec_buffer_A_ch0_tbl4 + 1 + ldr r1, =bx_exec_buffer_A_ch0_tbl4 str r1, [r0] ldr r0, =0x02022fec ldr r0, [r0] @@ -640693,7 +640693,7 @@ sub_814CB0C: ; 814CB0C ldrb r0, [r6] lsls r0, 2 adds r0, r1 - ldr r1, =sub_814B290 + 1 + ldr r1, =sub_814B290 str r1, [r0] pop {r3} mov r8, r3 @@ -640742,7 +640742,7 @@ sub_814CC28: ; 814CC28 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, =sub_814B69C + 1 + ldr r1, =sub_814B69C str r1, [r0] pop {r4-r6} pop {r0} @@ -640785,7 +640785,7 @@ sub_814CC98: ; 814CC98 lsls r0, 16 lsrs r0, 16 mov r8, r0 - ldr r0, =sub_805D714 + 1 + ldr r0, =sub_805D714 bl object_new_hidden_with_callback ldr r1, =0x03005d7c mov r9, r1 @@ -640890,7 +640890,7 @@ sub_814CC98: ; 814CC98 adds r1, r5, 0 adds r1, 0x1C adds r0, r1 - ldr r1, =nullsub_12 + 1 + ldr r1, =nullsub_12 str r1, [r0] movs r0, 0 movs r1, 0xFF @@ -640939,7 +640939,7 @@ sub_814CE14: ; 814CE14 ldrb r0, [r6] lsls r0, 2 adds r0, r1 - ldr r1, =sub_814CEA4 + 1 + ldr r1, =sub_814CEA4 str r1, [r0] b @0814CE92 .align 2, 0 @@ -641038,7 +641038,7 @@ sub_814CEA4: ; 814CEA4 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, =sub_814B3DC + 1 + ldr r1, =sub_814B3DC str r1, [r0] @0814CF22: pop {r4-r6} @@ -641227,13 +641227,13 @@ sub_814CF30: ; 814CF30 lsls r0, 2 adds r4, 0x1C adds r0, r4 - ldr r1, =sub_805D7AC + 1 + ldr r1, =sub_805D7AC str r1, [r0] ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, =sub_814AF1C + 1 + ldr r1, =sub_814AF1C str r1, [r0] pop {r3} mov r8, r3 @@ -641302,7 +641302,7 @@ sub_814D0F0: ; 814D0F0 adds r1, r5, 0 adds r1, 0x1C adds r0, r1 - ldr r1, =sub_80A6EEC + 1 + ldr r1, =sub_80A6EEC str r1, [r0] ldrb r0, [r4] adds r0, r6 @@ -641311,13 +641311,13 @@ sub_814D0F0: ; 814D0F0 adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, =nullsub_12 + 1 + ldr r1, =nullsub_12 bl oamt_set_x3A_32 ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =sub_814AF54 + 1 + ldr r1, =sub_814AF54 str r1, [r0] pop {r4-r6} pop {r0} @@ -641417,13 +641417,13 @@ sub_814D19C: ; 814D19C lsls r0, 2 adds r2, 0x1C adds r0, r2 - ldr r1, =sub_8039C00 + 1 + ldr r1, =sub_8039C00 str r1, [r0] ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, =sub_814B340 + 1 + ldr r1, =sub_814B340 str r1, [r0] @0814D266: pop {r4-r6} @@ -641600,7 +641600,7 @@ sub_814D2B8: ; 814D2B8 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, =bx_move_anim_4 + 1 + ldr r1, =bx_move_anim_4 str r1, [r0] ldrh r1, [r4] ldr r2, [r7] @@ -641824,7 +641824,7 @@ sub_814D590: ; 814D590 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, =bx_t4_button_a + 1 + ldr r1, =bx_t4_button_a str r1, [r0] ldrh r0, [r4] bl sub_817C95C @@ -641976,7 +641976,7 @@ sub_814D63C: ; 814D63C ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, =bx_t4_healthbar_update + 1 + ldr r1, =bx_t4_healthbar_update str r1, [r0] add sp, 0x4 pop {r3,r4} @@ -642037,7 +642037,7 @@ sub_814D738: ; 814D738 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =sub_814B7B8 + 1 + ldr r1, =sub_814B7B8 str r1, [r0] @0814D78C: pop {r4} @@ -642085,7 +642085,7 @@ sub_814D7B0: ; 814D7B0 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, =sub_814B7B8 + 1 + ldr r1, =sub_814B7B8 str r1, [r0] @0814D800: pop {r4,r5} @@ -642287,7 +642287,7 @@ dp01t_29_4_blink: ; 814D918 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =dp01t_0F_4_move_anim + 1 + ldr r1, =dp01t_0F_4_move_anim str r1, [r0] @0814D976: pop {r4} @@ -642484,7 +642484,7 @@ sub_814DAA8: ; 814DAA8 adds r1, r4, 0 adds r1, 0x1C adds r0, r1 - ldr r1, =sub_80A6EEC + 1 + ldr r1, =sub_80A6EEC str r1, [r0] ldrb r2, [r6] adds r0, r2, r5 @@ -642501,7 +642501,7 @@ sub_814DAA8: ; 814DAA8 adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, =sub_805CC00 + 1 + ldr r1, =sub_805CC00 bl oamt_set_x3A_32 ldrb r0, [r6] adds r0, r5 @@ -642616,7 +642616,7 @@ sub_814DAA8: ; 814DAA8 ands r0, r2 orrs r0, r4 strb r0, [r1, 0x5] - ldr r0, =sub_814DCCC + 1 + ldr r0, =sub_814DCCC movs r1, 0x5 bl AddTask lsls r0, 24 @@ -642648,7 +642648,7 @@ sub_814DAA8: ; 814DAA8 adds r0, r1 lsls r0, 3 adds r0, r4 - ldr r1, =sub_8073C30 + 1 + ldr r1, =sub_8073C30 str r1, [r0] @0814DC80: ldr r0, [r3] @@ -642661,7 +642661,7 @@ sub_814DAA8: ; 814DAA8 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, =nullsub_112 + 1 + ldr r1, =nullsub_112 str r1, [r0] pop {r4-r7} pop {r0} @@ -642773,7 +642773,7 @@ sub_814DCCC: ; 814DCCC ldrb r0, [r2] lsls r0, 2 adds r0, r1 - ldr r1, =sub_814B0E8 + 1 + ldr r1, =sub_814B0E8 str r1, [r0] mov r3, r9 strb r3, [r2] @@ -642868,7 +642868,7 @@ sub_814DDD8: ; 814DDD8 ldrb r1, [r5] lsls r1, 2 adds r1, r0 - ldr r0, =sub_814DE9C + 1 + ldr r0, =sub_814DE9C str r0, [r1] @0814DE7C: pop {r4-r6} @@ -642940,7 +642940,7 @@ sub_814DEE4: ; 814DEE4 adds r0, r1 lsls r0, 3 adds r0, r2 - ldr r1, =sub_8073C30 + 1 + ldr r1, =sub_8073C30 str r1, [r0] @0814DF16: bl dp01_tbl4_exec_completed @@ -643043,7 +643043,7 @@ sub_814DFA0: ; 814DFA0 ldrb r1, [r5] lsls r1, 2 adds r1, r0 - ldr r0, =sub_814B7E8 + 1 + ldr r0, =sub_814B7E8 str r0, [r1] @0814DFFC: adds r0, r6, 0 @@ -643124,7 +643124,7 @@ sub_814E040: ; 814E040 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, =sub_80587B0 + 1 + ldr r1, =sub_80587B0 str r1, [r0] pop {r4,r5} pop {r0} @@ -646394,7 +646394,7 @@ sub_814FC70: ; 814FC70 ands r0, r1 cmp r0, 0 bne @0814FC8E - ldr r0, =sub_814FCC8 + 1 + ldr r0, =sub_814FCC8 bl set_callback2 adds r0, r4, 0 bl remove_task @@ -646411,7 +646411,7 @@ sub_814FC9C: ; 814FC9C push {lr} sub sp, 0x4 bl script_env_2_enable - ldr r0, =sub_814FC70 + 1 + ldr r0, =sub_814FC70 movs r1, 0x1 bl AddTask movs r0, 0x1 @@ -646971,23 +646971,23 @@ sub_814FCC8: ; 814FCC8 orrs r0, r1 strh r0, [r4] strh r2, [r3] - ldr r0, =sub_8150800 + 1 + ldr r0, =sub_8150800 bl SetVBlankCallback - ldr r0, =mainloop + 1 + ldr r0, =mainloop bl set_callback2 - ldr r0, =sub_81503E4 + 1 + ldr r0, =sub_81503E4 movs r1, 0 bl AddTask ldr r0, =0x020375e0 ldrh r0, [r0] cmp r0, 0 bne @08150218 - ldr r0, =sub_8150550 + 1 + ldr r0, =sub_8150550 b @0815021A .align 2, 0 .pool @08150218: - ldr r0, =sub_8150664 + 1 + ldr r0, =sub_8150664 @0815021A: movs r1, 0x1 bl AddTask @@ -647170,7 +647170,7 @@ c2_8011A1C: ; 8150258 bl warp_in ldr r0, =0x03005dac str r4, [r0] - ldr r0, =c2_load_new_map + 1 + ldr r0, =c2_load_new_map bl set_callback2 add sp, 0x8 pop {r3} @@ -647363,7 +647363,7 @@ sub_81503E4: ; 81503E4 ldr r0, [r5] ldrb r0, [r0] bl remove_task - ldr r0, =c2_8011A1C + 1 + ldr r0, =c2_8011A1C bl set_callback2 @08150542: add sp, 0x4 @@ -648365,7 +648365,7 @@ sub_8150D28: ; 8150D28 add r0, sp adds r0, 0xC ldrb r0, [r0] - ldr r1, =sub_8150948 + 1 + ldr r1, =sub_8150948 movs r2, 0x66 str r2, [sp] movs r2, 0xC8 @@ -648472,7 +648472,7 @@ sub_8150D28: ; 8150D28 add r0, sp adds r0, 0xC ldrb r0, [r0] - ldr r1, =sub_8150948 + 1 + ldr r1, =sub_8150948 movs r2, 0x66 str r2, [sp] movs r2, 0x80 @@ -654707,7 +654707,7 @@ dp03_step_water_reflection: ; 8153ED4 lsls r1, 2 ldr r0, =0x02020630 adds r7, r1, r0 - ldr r0, =objc_80DAF50 + 1 + ldr r0, =objc_80DAF50 str r0, [r7, 0x1C] ldrb r1, [r7, 0x5] movs r0, 0xC @@ -655726,7 +655726,7 @@ sub_81546C8: ; 81546C8 cmp r0, 0 beq @08154740 ldr r1, [r2, 0x1C] - ldr r0, =unc_grass_normal + 1 + ldr r0, =unc_grass_normal cmp r1, r0 bne @08154740 movs r1, 0x30 @@ -656767,7 +656767,7 @@ sub_8154EFC: ; 8154EFC lsls r0, 2 ldr r3, =0x02020630 adds r0, r3 - ldr r1, =sub_8154FB4 + 1 + ldr r1, =sub_8154FB4 str r1, [r0, 0x1C] adds r5, r0, 0 adds r5, 0x3E @@ -657931,7 +657931,7 @@ sub_8155800: ; 8155800 lsls r2, 2 ldr r1, =0x02020630 adds r2, r1 - ldr r1, =sub_8155850 + 1 + ldr r1, =sub_8155850 str r1, [r2, 0x1C] movs r1, 0x3E adds r1, r2 @@ -664826,7 +664826,7 @@ sub_8158B30: ; 8158B30 strh r0, [r6, 0x10] movs r0, 0xA strh r0, [r6, 0x1C] - ldr r0, =sub_8158B98 + 1 + ldr r0, =sub_8158B98 str r0, [r6] pop {r4-r6} pop {r0} @@ -664858,7 +664858,7 @@ sub_8158B98: ; 8158B98 movs r0, 0x5 strh r0, [r4, 0x1C] strh r1, [r4, 0x1E] - ldr r0, =sub_8158C04 + 1 + ldr r0, =sub_8158C04 str r0, [r4] b @08158BFE .align 2, 0 @@ -665002,7 +665002,7 @@ mas_80DCF38: ; 8158C58 strh r2, [r1, 0x1C] strh r4, [r1, 0x1E] strh r3, [r1, 0x20] - ldr r2, =sub_8158D08 + 1 + ldr r2, =sub_8158D08 str r2, [r1] mov r0, r8 bl _call_via_r2 @@ -665367,7 +665367,7 @@ sub_8158E9C: ; 8158E9C adds r1, r5, r6 lsls r1, 3 adds r1, r0 - ldr r0, =sub_8158FF4 + 1 + ldr r0, =sub_8158FF4 str r0, [r1] b @08158FEE .align 2, 0 @@ -665528,7 +665528,7 @@ sub_81590B8: ; 81590B8 strh r0, [r1, 0xC] cmp r2, 0 beq @08159130 - ldr r0, =sub_815913C + 1 + ldr r0, =sub_815913C str r0, [r1] b @08159136 .align 2, 0 @@ -665753,7 +665753,7 @@ sub_8159278: ; 8159278 strh r0, [r1, 0x12] strh r2, [r1, 0x1C] strh r4, [r1, 0x1E] - ldr r2, =sub_8159308 + 1 + ldr r2, =sub_8159308 str r2, [r1] mov r0, r8 bl _call_via_r2 @@ -665829,7 +665829,7 @@ sub_815936C: ; 815936C ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, =bx_exec_buffer_A_ch0_tbl6 + 1 + ldr r1, =bx_exec_buffer_A_ch0_tbl6 str r1, [r0] bx lr .align 2, 0 @@ -666070,7 +666070,7 @@ sub_815955C: ; 815955C adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 bne @08159580 bl dp01_tbl6_exec_completed @@ -666110,7 +666110,7 @@ sub_81595AC: ; 81595AC adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 bne @081595D0 bl dp01_tbl6_exec_completed @@ -666194,7 +666194,7 @@ sub_8159660: ; 8159660 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8159698 + 1 + ldr r1, =sub_8159698 str r1, [r0] bl Window_FreeMemory bl sub_81358F4 @@ -666210,7 +666210,7 @@ sub_8159698: ; 8159698 push {lr} ldr r0, =0x030022c0 ldr r1, [r0, 0x4] - ldr r0, =sub_8038420 + 1 + ldr r0, =sub_8038420 cmp r1, r0 bne @081596BE ldr r0, =0x02037fd4 @@ -666265,7 +666265,7 @@ dp01_tbl6_exec_completed: ; 8159704 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =bx_exec_buffer_A_ch0_tbl6 + 1 + ldr r1, =bx_exec_buffer_A_ch0_tbl6 str r1, [r0] ldr r0, =0x02022fec ldr r0, [r0] @@ -666468,13 +666468,13 @@ sub_8159800: ; 8159800 lsls r0, 2 adds r4, 0x1C adds r0, r4 - ldr r1, =sub_805D7AC + 1 + ldr r1, =sub_805D7AC str r1, [r0] ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, =sub_815955C + 1 + ldr r1, =sub_815955C str r1, [r0] pop {r4-r6} pop {r0} @@ -666541,7 +666541,7 @@ sub_8159910: ; 8159910 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, =bx_wait_t6 + 1 + ldr r1, =bx_wait_t6 str r1, [r0] pop {r4,r5} pop {r0} @@ -666581,7 +666581,7 @@ sub_8159964: ; 8159964 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, =bx_wait_t6 + 1 + ldr r1, =bx_wait_t6 str r1, [r0] pop {r4,r5} pop {r0} @@ -666628,7 +666628,7 @@ dp01t_10_6_message: ; 81599DC ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =bx_t6_button_a + 1 + ldr r1, =bx_t6_button_a str r1, [r0] pop {r4} pop {r0} @@ -666675,7 +666675,7 @@ sub_8159A54: ; 8159A54 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, =bx_battle_menu_t6_2 + 1 + ldr r1, =bx_battle_menu_t6_2 str r1, [r0] @08159A7A: pop {r0} @@ -666692,7 +666692,7 @@ sub_8159A94: ; 8159A94 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8159A54 + 1 + ldr r1, =sub_8159A54 str r1, [r0] ldr r0, =gUnknown_085CCA54 movs r1, 0x2 @@ -666756,7 +666756,7 @@ sub_8159B14: ; 8159B14 ldrb r0, [r2] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8159660 + 1 + ldr r1, =sub_8159660 str r1, [r0] ldr r1, =0x020244b8 ldrb r0, [r2] @@ -667108,7 +667108,7 @@ sub_8159D90: ; 8159D90 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =sub_81595AC + 1 + ldr r1, =sub_81595AC str r1, [r0] pop {r4,r5} pop {r0} @@ -667184,7 +667184,7 @@ sub_8159E1C: ; 8159E1C ldrb r1, [r6] lsls r1, 2 adds r1, r0 - ldr r0, =sub_81596D4 + 1 + ldr r0, =sub_81596D4 str r0, [r1] @08159E68: add sp, 0x4 @@ -667238,7 +667238,7 @@ sub_8159E90: ; 8159E90 ldrb r1, [r4] lsls r1, 2 adds r1, r0 - ldr r0, =sub_81595E4 + 1 + ldr r0, =sub_81595E4 str r0, [r1] @08159ECC: pop {r4} @@ -667256,10 +667256,10 @@ nullsub_115: ; 8159EEC thumb_func_start sub_8159EF0 sub_8159EF0: ; 8159EF0 ldr r1, =0x03005db0 - ldr r0, =hm_add_c3_launch_phase_2 + 1 + ldr r0, =hm_add_c3_launch_phase_2 str r0, [r1] ldr r1, =0x0203ceec - ldr r0, =hm2_sweet_scent + 1 + ldr r0, =hm2_sweet_scent str r0, [r1] movs r0, 0x1 bx lr @@ -667295,7 +667295,7 @@ sub_8159F2C: ; 8159F2C adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r2, =sub_8159F5C + 1 + ldr r2, =sub_8159F5C lsrs r0, r2, 16 strh r0, [r1, 0x18] strh r2, [r1, 0x1A] @@ -667343,7 +667343,7 @@ sub_8159F5C: ; 8159F5C movs r2, 0 movs r3, 0x8 bl sub_80A1AD4 - ldr r0, =sub_8159FEC + 1 + ldr r0, =sub_8159FEC movs r1, 0 bl AddTask lsls r0, 24 @@ -667406,7 +667406,7 @@ sub_8159FEC: ; 8159FEC .align 2, 0 .pool @0815A044: - ldr r0, =sub_815A090 + 1 + ldr r0, =sub_815A090 str r0, [r4] bl sub_808BCDC ldr r2, =0x02020630 @@ -667499,7 +667499,7 @@ sub_815A0D4: ; 815A0D4 strh r0, [r2, 0x2E] ldrh r0, [r1, 0x8] strh r0, [r2, 0x30] - ldr r0, =sub_815A114 + 1 + ldr r0, =sub_815A114 str r0, [r2, 0x1C] pop {r0} bx r0 @@ -667594,11 +667594,11 @@ sub_815A1B0: ; 815A1B0 adds r4, r0, 0 movs r0, 0x5A strh r0, [r4, 0x2E] - ldr r0, =sub_80A64B0 + 1 + ldr r0, =sub_80A64B0 str r0, [r4, 0x1C] movs r0, 0x7 strh r0, [r4, 0x30] - ldr r1, =sub_815A1F4 + 1 + ldr r1, =sub_815A1F4 adds r0, r4, 0 bl oamt_set_x3A_32 movs r1, 0xFD @@ -667646,7 +667646,7 @@ sub_815A1F4: ; 815A1F4 movs r1, 0x4 orrs r0, r1 strb r0, [r2] - ldr r0, =sub_815A234 + 1 + ldr r0, =sub_815A234 str r0, [r4, 0x1C] @0815A228: pop {r4} @@ -667730,9 +667730,9 @@ sub_815A254: ; 815A254 strh r0, [r5, 0x2E] strh r7, [r5, 0x32] strh r6, [r5, 0x36] - ldr r0, =sub_80A6EEC + 1 + ldr r0, =sub_80A6EEC str r0, [r5, 0x1C] - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 adds r0, r5, 0 bl oamt_set_x3A_32 add sp, 0x4 @@ -667757,7 +667757,7 @@ sub_815A2F0: ; 815A2F0 bl lcd_io_set movs r0, 0x4 strh r0, [r4, 0x2E] - ldr r0, =sub_815A31C + 1 + ldr r0, =sub_815A31C str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -667832,7 +667832,7 @@ sub_815A31C: ; 815A31C movs r1, 0x80 orrs r0, r1 strb r0, [r2] - ldr r0, =sub_815A3AC + 1 + ldr r0, =sub_815A3AC str r0, [r4, 0x1C] @0815A3A0: pop {r4} @@ -667872,7 +667872,7 @@ sub_815A3AC: ; 815A3AC ands r0, r1 cmp r0, 0 beq @0815A3E8 - ldr r0, =sub_815A3F0 + 1 + ldr r0, =sub_815A3F0 str r0, [r3, 0x1C] @0815A3E8: pop {r0} @@ -667957,7 +667957,7 @@ sub_815A3F0: ; 815A3F0 ldrh r1, [r4, 0x2E] movs r0, 0x52 bl lcd_io_set - ldr r0, =sub_815A49C + 1 + ldr r0, =sub_815A49C str r0, [r4, 0x1C] @0815A48C: pop {r4} @@ -668031,7 +668031,7 @@ sub_815A504: ; 815A504 adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r0, =sub_815A52C + 1 + ldr r0, =sub_815A52C str r0, [r1] ldr r1, =0x020383fe ldrb r0, [r1] @@ -668128,7 +668128,7 @@ c3_80DE6F0: ; 815A5C8 adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r0, =sub_815A5F0 + 1 + ldr r0, =sub_815A5F0 str r0, [r1] ldr r1, =0x020383fe ldrb r0, [r1] @@ -668285,7 +668285,7 @@ sub_815A6C4: ; 815A6C4 strh r0, [r4, 0x38] adds r0, r4, 0 bl sub_80A68D4 - ldr r0, =sub_815A73C + 1 + ldr r0, =sub_815A73C str r0, [r4, 0x1C] add sp, 0x4 pop {r4,r5} @@ -668307,9 +668307,9 @@ sub_815A73C: ; 815A73C movs r0, 0x1E strh r0, [r4, 0x2E] strh r1, [r4, 0x30] - ldr r0, =sub_80A64B0 + 1 + ldr r0, =sub_80A64B0 str r0, [r4, 0x1C] - ldr r1, =sub_815A76C + 1 + ldr r1, =sub_815A76C adds r0, r4, 0 bl oamt_set_x3A_32 @0815A75E: @@ -668373,9 +668373,9 @@ sub_815A7B0: ; 815A7B0 ldrh r1, [r4, 0x22] adds r0, r1 strh r0, [r4, 0x22] - ldr r0, =sub_80A67D8 + 1 + ldr r0, =sub_80A67D8 str r0, [r4, 0x1C] - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 adds r0, r4, 0 bl oamt_set_x3A_32 pop {r4,r5} @@ -668594,7 +668594,7 @@ sub_815A934: ; 815A934 movs r1, 0x4 orrs r0, r1 strb r0, [r2] - ldr r0, =sub_815A9A0 + 1 + ldr r0, =sub_815A9A0 str r0, [r5, 0x1C] pop {r4,r5} pop {r0} @@ -668699,7 +668699,7 @@ sub_815A9A0: ; 815A9A0 movs r1, 0x4 orrs r0, r1 strb r0, [r2] - ldr r0, =sub_815AA6C + 1 + ldr r0, =sub_815AA6C str r0, [r4, 0x1C] @0815AA60: pop {r4} @@ -668812,7 +668812,7 @@ sub_815AAA4: ; 815AAA4 ldrh r0, [r1, 0x4] strh r0, [r5, 0x34] @0815AB46: - ldr r0, =sub_815AB5C + 1 + ldr r0, =sub_815AB5C str r0, [r5, 0x1C] pop {r4-r6} pop {r0} @@ -669043,7 +669043,7 @@ sub_815ACD0: ; 815ACD0 ldrh r0, [r2, 0xA] strh r0, [r5, 0x34] strh r4, [r5, 0x36] - ldr r0, =sub_815AD4C + 1 + ldr r0, =sub_815AD4C str r0, [r5, 0x1C] pop {r4-r6} pop {r0} @@ -669236,7 +669236,7 @@ sub_815ADB0: ; 815ADB0 ldr r1, [sp, 0x4] ldr r2, [sp, 0x8] bl sub_80BA038 - ldr r0, =sub_815AED8 + 1 + ldr r0, =sub_815AED8 str r0, [r5] add sp, 0xC pop {r4-r7} @@ -669435,7 +669435,7 @@ sub_815AFF0: ; 815AFF0 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x26] - ldr r0, =sub_815B054 + 1 + ldr r0, =sub_815B054 str r0, [r4] pop {r4-r6} pop {r0} @@ -669540,7 +669540,7 @@ sub_815B054: ; 815B054 strb r0, [r3] adds r5, 0x1C adds r1, r5 - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r1] @0815B120: ldrh r1, [r6, 0xA] @@ -669647,7 +669647,7 @@ sub_815B054: ; 815B054 bl obj_anim_image_start mov r0, r8 adds r1, r4, r0 - ldr r0, =sub_815B23C + 1 + ldr r0, =sub_815B23C str r0, [r1] adds r0, r7, 0x1 lsls r0, 16 @@ -669776,7 +669776,7 @@ sub_815B27C: ; 815B27C ldrsh r0, [r5, r1] cmp r0, 0x3D bne @0815B324 - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 adds r0, r5, 0 bl oamt_set_x3A_32 ldrh r0, [r5, 0x24] @@ -669805,7 +669805,7 @@ sub_815B27C: ; 815B27C lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x36] - ldr r0, =sub_80A6EEC + 1 + ldr r0, =sub_80A6EEC str r0, [r5, 0x1C] @0815B324: pop {r4,r5} @@ -670018,7 +670018,7 @@ sub_815B49C: ; 815B49C strh r0, [r4, 0x20] movs r0, 0 strh r0, [r4, 0x22] - ldr r0, =sub_815B4D4 + 1 + ldr r0, =sub_815B4D4 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -670149,7 +670149,7 @@ sub_815B570: ; 815B570 lsls r0, 24 asrs r0, 24 strh r0, [r4, 0x26] - ldr r0, =sub_815B5D0 + 1 + ldr r0, =sub_815B5D0 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -671266,7 +671266,7 @@ sub_815BE04: ; 815BE04 add r10, r0 ldr r2, [sp] add r2, r10 - ldr r0, =sub_815C050 + 1 + ldr r0, =sub_815C050 str r0, [r2] add r6, r10 str r0, [r6] @@ -671274,7 +671274,7 @@ sub_815BE04: ; 815BE04 strh r1, [r7, 0x3A] mov r0, r8 strh r0, [r7, 0x3C] - ldr r0, =sub_815BF44 + 1 + ldr r0, =sub_815BF44 str r0, [r7, 0x1C] add sp, 0x4 pop {r3-r5} @@ -671372,7 +671372,7 @@ sub_815BF44: ; 815BF44 movs r1, 0x4 orrs r0, r1 strb r0, [r2] - ldr r0, =sub_815BFF4 + 1 + ldr r0, =sub_815BFF4 str r0, [r3, 0x1C] @0815BFE8: pop {r0} @@ -671395,7 +671395,7 @@ sub_815BFF4: ; 815BFF4 adds r6, 0x1C adds r0, r3, r6 ldr r2, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r2, r0 bne @0815C040 movs r1, 0x3C @@ -671464,7 +671464,7 @@ sub_815C050: ; 815C050 orrs r0, r1 mov r1, r12 strb r0, [r1] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r3, 0x1C] @0815C09C: pop {r0} @@ -672014,7 +672014,7 @@ sub_815C478: ; 815C478 lsrs r0, 24 movs r1, 0 bl sub_80A7270 - ldr r0, =sub_815C548 + 1 + ldr r0, =sub_815C548 str r0, [r4] @0815C538: pop {r4,r5} @@ -672235,7 +672235,7 @@ sub_815C6B0: ; 815C6B0 ldrb r1, [r1, 0x2] adds r0, r4, 0 bl obj_anim_image_start - ldr r0, =sub_815C700 + 1 + ldr r0, =sub_815C700 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -672333,7 +672333,7 @@ sub_815C770: ; 815C770 strh r0, [r4, 0x26] movs r1, 0 bl sub_80A7270 - ldr r0, =sub_815C7C4 + 1 + ldr r0, =sub_815C7C4 str r0, [r4] pop {r4} pop {r0} @@ -672903,7 +672903,7 @@ sub_815CB88: ; 815CB88 strh r0, [r4, 0x20] movs r0, 0x68 strh r0, [r4, 0x22] - ldr r0, =sub_815CC34 + 1 + ldr r0, =sub_815CC34 str r0, [r4, 0x1C] pop {r4,r5} pop {r0} @@ -673008,7 +673008,7 @@ sub_815CC94: ; 815CC94 movs r1, 0x4 orrs r0, r1 strb r0, [r2] - ldr r0, =sub_815CD0C + 1 + ldr r0, =sub_815CD0C str r0, [r5, 0x1C] pop {r4,r5} pop {r0} @@ -673129,7 +673129,7 @@ sub_815CDB4: ; 815CDB4 strh r0, [r4, 0x2E] ldrh r0, [r1, 0x2] strh r0, [r4, 0x30] - ldr r1, =sub_815CDFC + 1 + ldr r1, =sub_815CDFC str r1, [r4, 0x1C] adds r0, r4, 0 bl _call_via_r1 @@ -673525,7 +673525,7 @@ sub_815CED8: ; 815CED8 movs r0, 0x52 bl lcd_io_set strh r6, [r4, 0x8] - ldr r0, =sub_815D160 + 1 + ldr r0, =sub_815D160 str r0, [r4] add sp, 0x20 pop {r3-r5} @@ -673577,7 +673577,7 @@ sub_815D160: ; 815D160 lsls r0, 1 strh r0, [r4, 0x1C] strh r0, [r4, 0x1E] - ldr r0, =sub_815D1BC + 1 + ldr r0, =sub_815D1BC str r0, [r4] @0815D1AE: pop {r4} @@ -673639,7 +673639,7 @@ sub_815D1BC: ; 815D1BC bl sub_80A749C adds r0, r6, 0 bl sub_80A8610 - ldr r0, =sub_80A6814 + 1 + ldr r0, =sub_80A6814 str r0, [r5] @0815D22A: add sp, 0x4 @@ -673789,7 +673789,7 @@ sub_815D240: ; 815D240 ldr r1, [sp, 0x4] ldr r2, [sp, 0x8] bl sub_80BA038 - ldr r0, =sub_815D398 + 1 + ldr r0, =sub_815D398 str r0, [r4] add sp, 0xC pop {r4-r7} @@ -674171,7 +674171,7 @@ sub_815D64C: ; 815D64C ldr r2, =gUnknown_085CE5F0 adds r0, r4, 0 bl sub_80A7CFC - ldr r0, =sub_815D694 + 1 + ldr r0, =sub_815D694 str r0, [r4] pop {r4} pop {r0} @@ -674356,7 +674356,7 @@ sub_815D7B4: ; 815D7B4 bl sub_815D72C movs r0, 0 strh r0, [r4, 0x2E] - ldr r0, =sub_815D804 + 1 + ldr r0, =sub_815D804 str r0, [r4, 0x1C] add sp, 0x8 pop {r4-r6} @@ -674459,7 +674459,7 @@ sub_815D870: ; 815D870 ldrh r6, [r6, 0x4] adds r0, r6 strh r0, [r5, 0x22] - ldr r0, =sub_810E2C8 + 1 + ldr r0, =sub_810E2C8 str r0, [r5, 0x1C] pop {r4-r6} pop {r0} @@ -674824,7 +674824,7 @@ sub_815DA20: ; 815DA20 strh r0, [r2, 0x8] movs r0, 0 strh r0, [r2, 0x22] - ldr r0, =sub_815D8D8 + 1 + ldr r0, =sub_815D8D8 str r0, [r2] @0815DB80: pop {r3,r4} @@ -674952,7 +674952,7 @@ sub_815DB90: ; 815DB90 strh r1, [r0, 0x10] ldrh r1, [r5, 0xA] strh r1, [r0, 0x12] - ldr r1, =sub_815DA20 + 1 + ldr r1, =sub_815DA20 str r1, [r0] pop {r3} mov r8, r3 @@ -675026,7 +675026,7 @@ sub_815DCA4: ; 815DCA4 ldr r2, =gUnknown_085CE74C adds r0, r5, 0 bl sub_80A7CFC - ldr r0, =sub_815DD48 + 1 + ldr r0, =sub_815DD48 str r0, [r5] pop {r4,r5} pop {r0} @@ -675302,7 +675302,7 @@ sub_815DF0C: ; 815DF0C adds r1, r2, 0 adds r0, r1 strh r0, [r4, 0xC] - ldr r0, =sub_815DF64 + 1 + ldr r0, =sub_815DF64 str r0, [r4] pop {r4} pop {r0} @@ -675482,7 +675482,7 @@ sub_815E01C: ; 815E01C orrs r0, r1 strb r0, [r2] @0815E0C8: - ldr r0, =sub_815E0DC + 1 + ldr r0, =sub_815E0DC str r0, [r5, 0x1C] pop {r4-r6} pop {r0} @@ -675632,7 +675632,7 @@ sub_815E114: ; 815E114 lsls r0, 24 lsrs r0, 24 strh r0, [r6, 0x24] - ldr r0, =sub_815E20C + 1 + ldr r0, =sub_815E20C str r0, [r6] pop {r4-r6} pop {r0} @@ -675956,10 +675956,10 @@ sub_815E444: ; 815E444 strh r0, [r4, 0x36] ldrh r0, [r1, 0x8] strh r0, [r4, 0x2E] - ldr r1, =move_anim_8072740 + 1 + ldr r1, =move_anim_8072740 adds r0, r4, 0 bl oamt_set_x3A_32 - ldr r0, =sub_80A70C0 + 1 + ldr r0, =sub_80A70C0 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -676103,7 +676103,7 @@ sub_815E47C: ; 815E47C movs r1, 0x1 bl sub_8008258 @0815E596: - ldr r0, =sub_815E5CC + 1 + ldr r0, =sub_815E5CC str r0, [r7] b @0815E5BE .align 2, 0 @@ -676335,7 +676335,7 @@ sub_815E6D8: ; 815E6D8 adds r0, 0x8 @0815E772: strh r0, [r4, 0x20] - ldr r0, =sub_815E784 + 1 + ldr r0, =sub_815E784 str r0, [r4, 0x1C] pop {r4-r6} pop {r0} @@ -676482,7 +676482,7 @@ sub_815E840: ; 815E840 ldr r2, =gUnknown_085CE87C adds r0, r4, 0 bl sub_80A7CFC - ldr r0, =sub_815E898 + 1 + ldr r0, =sub_815E898 str r0, [r4] @0815E884: pop {r4} @@ -676624,7 +676624,7 @@ sub_815E954: ; 815E954 strh r2, [r5, 0x32] ldrh r0, [r1, 0x4] strh r0, [r5, 0x34] - ldr r0, =sub_815E9BC + 1 + ldr r0, =sub_815E9BC str r0, [r5, 0x1C] pop {r4,r5} pop {r0} @@ -676714,7 +676714,7 @@ sub_815EA14: ; 815EA14 strh r0, [r3, 0x3C] movs r0, 0x38 strh r0, [r3, 0x22] - ldr r0, =sub_815EA60 + 1 + ldr r0, =sub_815EA60 str r0, [r3, 0x1C] pop {r0} bx r0 @@ -677038,7 +677038,7 @@ sub_815EC48: ; 815EC48 @0815ECD2: strh r0, [r6, 0x24] @0815ECD4: - ldr r0, =sub_815ECE4 + 1 + ldr r0, =sub_815ECE4 str r0, [r6] pop {r4-r7} pop {r0} @@ -677319,7 +677319,7 @@ sub_815EE84: ; 815EE84 movs r0, 0x4 orrs r1, r0 strb r1, [r4, 0x1] - ldr r0, =sub_815EF08 + 1 + ldr r0, =sub_815EF08 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -677715,7 +677715,7 @@ sub_815F18C: ; 815F18C ldrh r0, [r5, 0x2E] strh r0, [r5, 0x20] strh r2, [r5, 0x22] - ldr r0, =sub_815F10C + 1 + ldr r0, =sub_815F10C str r0, [r5, 0x1C] pop {r4,r5} pop {r0} @@ -677837,7 +677837,7 @@ sub_815F20C: ; 815F20C @0815F2EE: mov r4, r9 adds r3, r7, 0 - ldr r5, =sub_815F330 + 1 + ldr r5, =sub_815F330 movs r1, 0xF mov r2, r8 adds r0, r4, r2 @@ -678077,7 +678077,7 @@ sub_815F48C: ; 815F48C lsrs r0, 24 strh r0, [r5, 0x22] strh r4, [r5, 0x26] - ldr r0, =sub_815F4F0 + 1 + ldr r0, =sub_815F4F0 str r0, [r5, 0x1C] pop {r4,r5} pop {r0} @@ -678396,7 +678396,7 @@ sub_815F620: ; 815F620 adds r3, r7, 0 adds r3, 0x1C adds r2, r3 - ldr r0, =sub_815F7C4 + 1 + ldr r0, =sub_815F7C4 str r0, [r2] adds r1, r3 str r0, [r1] @@ -678405,7 +678405,7 @@ sub_815F620: ; 815F620 lsls r0, 3 ldr r1, =0x03005e00 adds r0, r1 - ldr r1, =sub_815F79C + 1 + ldr r1, =sub_815F79C str r1, [r0] @0815F780: pop {r3-r5} @@ -679648,7 +679648,7 @@ sub_8160164: ; 8160164 movs r0, 0x1 strh r0, [r4, 0x1C] strh r5, [r4, 0x20] - ldr r0, =sub_81601DC + 1 + ldr r0, =sub_81601DC str r0, [r4] pop {r4,r5} pop {r0} @@ -679878,7 +679878,7 @@ sub_8160338: ; 8160338 adds r0, r1 strh r0, [r4, 0x22] @08160396: - ldr r0, =sub_81602E0 + 1 + ldr r0, =sub_81602E0 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -679913,7 +679913,7 @@ sub_81603A8: ; 81603A8 strh r0, [r5, 0x3A] movs r1, 0x10 strh r1, [r5, 0x3C] - ldr r0, =sub_81603F4 + 1 + ldr r0, =sub_81603F4 str r0, [r5, 0x1C] lsls r1, 8 movs r0, 0x52 @@ -680131,7 +680131,7 @@ sub_8160544: ; 8160544 ldr r2, =gUnknown_085CE9C8 adds r0, r4, 0 bl sub_80A7CFC - ldr r0, =sub_816058C + 1 + ldr r0, =sub_816058C str r0, [r4] pop {r4} pop {r0} @@ -680230,7 +680230,7 @@ sub_8160638: ; 8160638 push {lr} sub sp, 0x4 bl script_env_2_enable - ldr r0, =sub_8160664 + 1 + ldr r0, =sub_8160664 movs r1, 0xA bl AddTask movs r0, 0x1 @@ -680258,10 +680258,10 @@ sub_8160664: ; 8160664 ands r0, r1 cmp r0, 0 bne @08160688 - ldr r0, =sub_81606A0 + 1 + ldr r0, =sub_81606A0 bl set_callback2 ldr r1, =0x03005dac - ldr r0, =sub_80AF168 + 1 + ldr r0, =sub_80AF168 str r0, [r1] adds r0, r4, 0 bl remove_task @@ -680290,7 +680290,7 @@ sub_81606A0: ; 81606A0 adds r0, 0x44 movs r5, 0 strb r1, [r0] - ldr r0, =sub_8160624 + 1 + ldr r0, =sub_8160624 bl SetVBlankCallback bl sub_81607EC movs r0, 0 @@ -680319,7 +680319,7 @@ sub_81606A0: ; 81606A0 movs r1, 0 movs r2, 0x2 bl rboxid_80040B8 - ldr r0, =sub_816082C + 1 + ldr r0, =sub_816082C bl set_callback2 pop {r4-r6} pop {r0} @@ -680352,7 +680352,7 @@ sub_8160740: ; 8160740 ldrh r1, [r1] adds r0, 0x45 strb r1, [r0] - ldr r0, =sub_8160624 + 1 + ldr r0, =sub_8160624 bl SetVBlankCallback bl sub_81607EC ldr r4, =0x0203bc38 @@ -680377,7 +680377,7 @@ sub_8160740: ; 8160740 movs r1, 0 movs r2, 0x2 bl rboxid_80040B8 - ldr r0, =sub_816082C + 1 + ldr r0, =sub_816082C bl set_callback2 pop {r4,r5} pop {r0} @@ -680903,7 +680903,7 @@ sub_8160868: ; 8160868 subs r2, 0x1 lsls r2, 24 lsrs r2, 24 - ldr r3, =sub_8160740 + 1 + ldr r3, =sub_8160740 str r0, [sp] adds r0, r4, 0 bl sub_81BFA38 @@ -680954,7 +680954,7 @@ sub_8160868: ; 8160868 b @08160E8A @08160CE6: bl sub_8160EA0 - ldr r0, =c2_exit_to_overworld_2_switch + 1 + ldr r0, =c2_exit_to_overworld_2_switch bl set_callback2 b @08160E8A .align 2, 0 @@ -681973,7 +681973,7 @@ sub_8161560: ; 8161560 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81B1370 + 1 + ldr r1, =sub_81B1370 str r1, [r0] pop {r4} pop {r0} @@ -682008,7 +682008,7 @@ sub_81615A8: ; 81615A8 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81B1370 + 1 + ldr r1, =sub_81B1370 str r1, [r0] b @08161658 .align 2, 0 @@ -682057,7 +682057,7 @@ sub_81615A8: ; 81615A8 asrs r3, 16 movs r2, 0x1 negs r2, r2 - ldr r0, =sub_816166C + 1 + ldr r0, =sub_816166C str r0, [sp] ldr r0, [sp, 0x4] mov r1, r8 @@ -682099,7 +682099,7 @@ sub_816166C: ; 816166C lsls r3, 16 asrs r3, 16 ldrb r1, [r5, 0xA] - ldr r0, =sub_81616C0 + 1 + ldr r0, =sub_81616C0 str r0, [sp] adds r0, r4, 0 movs r2, 0x1 @@ -682141,7 +682141,7 @@ sub_81616C0: ; 81616C0 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, =sub_8161724 + 1 + ldr r1, =sub_8161724 str r1, [r0] pop {r4,r5} pop {r0} @@ -682183,7 +682183,7 @@ sub_8161724: ; 8161724 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81B1370 + 1 + ldr r1, =sub_81B1370 str r1, [r0] @08161772: pop {r4,r5} @@ -682210,7 +682210,7 @@ sub_8161784: ; 8161784 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =sub_81B1370 + 1 + ldr r0, =sub_81B1370 str r0, [r1] @081617AA: pop {r4} @@ -682238,7 +682238,7 @@ sub_81617B8: ; 81617B8 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_8161784 + 1 + ldr r1, =sub_8161784 str r1, [r0] pop {r4} pop {r0} @@ -686487,7 +686487,7 @@ sub_81639AC: ; 81639AC @08163A74: bl sub_816537C @08163A78: - ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 + ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music bl set_callback2 add sp, 0x4 pop {r4-r6} @@ -686508,9 +686508,9 @@ sub_8163A8C: ; 8163A8C cmp r0, 0x1 bne @08163AB0 ldr r0, =0x030022c0 - ldr r1, =sub_81639AC + 1 + ldr r1, =sub_81639AC str r1, [r0, 0x8] - ldr r0, =sub_8036760 + 1 + ldr r0, =sub_8036760 bl set_callback2 adds r0, r4, 0 bl remove_task @@ -686618,7 +686618,7 @@ sub_8163AC4: ; 8163AC4 movs r0, 0x2 bl sub_816306C @08163BA6: - ldr r0, =sub_8163A8C + 1 + ldr r0, =sub_8163A8C movs r1, 0x1 bl AddTask movs r0, 0 @@ -686651,7 +686651,7 @@ sub_8163AC4: ; 8163AC4 adds r5, 0x1 cmp r5, 0x5 ble @08163BC4 - ldr r0, =sub_8163A8C + 1 + ldr r0, =sub_8163A8C movs r1, 0x1 bl AddTask movs r0, 0 @@ -686687,7 +686687,7 @@ sub_8163AC4: ; 8163AC4 ldr r1, =0x02038bca movs r0, 0 strh r0, [r1] - ldr r0, =sub_8163A8C + 1 + ldr r0, =sub_8163A8C movs r1, 0x1 bl AddTask movs r0, 0 @@ -686718,7 +686718,7 @@ sub_8163AC4: ; 8163AC4 movs r0, 0x2 bl sub_8163048 @08163C9A: - ldr r0, =sub_8163A8C + 1 + ldr r0, =sub_8163A8C movs r1, 0x1 bl AddTask movs r0, 0 @@ -686759,7 +686759,7 @@ sub_8163AC4: ; 8163AC4 movs r0, 0x3 bl sub_81630A0 @08163D12: - ldr r0, =sub_8163A8C + 1 + ldr r0, =sub_8163A8C movs r1, 0x1 bl AddTask movs r0, 0 @@ -686790,7 +686790,7 @@ sub_8163AC4: ; 8163AC4 movs r0, 0x3 bl sub_81630A0 @08163D5E: - ldr r0, =sub_8163A8C + 1 + ldr r0, =sub_8163A8C movs r1, 0x1 bl AddTask movs r0, 0 @@ -686814,7 +686814,7 @@ sub_8163AC4: ; 8163AC4 str r0, [r4] @08163D8E: bl sub_8163590 - ldr r0, =sub_8163A8C + 1 + ldr r0, =sub_8163A8C movs r1, 0x1 bl AddTask movs r0, 0 @@ -686839,7 +686839,7 @@ sub_8163AC4: ; 8163AC4 str r0, [r1] movs r0, 0x3 bl sub_8163048 - ldr r0, =sub_8163A8C + 1 + ldr r0, =sub_8163A8C movs r1, 0x1 bl AddTask movs r0, 0 @@ -686855,7 +686855,7 @@ sub_8163AC4: ; 8163AC4 movs r0, 0x1 bl sub_816306C @08163E00: - ldr r0, =sub_8163A8C + 1 + ldr r0, =sub_8163A8C movs r1, 0x1 bl AddTask movs r0, 0 @@ -686887,7 +686887,7 @@ sub_8163AC4: ; 8163AC4 bl battle_configure_by_script ldr r0, =0x02038bce strh r5, [r0] - ldr r0, =sub_8163A8C + 1 + ldr r0, =sub_8163A8C movs r1, 0x1 bl AddTask movs r0, 0 @@ -691230,9 +691230,9 @@ sub_8166204: ; 8166204 str r0, [r1] str r5, [r0, 0x8] str r6, [r0, 0x4] - ldr r0, =sub_8166380 + 1 + ldr r0, =sub_8166380 bl launch_c3_walk_stairs_and_run_once - ldr r0, =sub_816631C + 1 + ldr r0, =sub_816631C bl set_callback2 pop {r4-r6} pop {r0} @@ -691273,9 +691273,9 @@ sub_816624C: ; 816624C adds r0, r5, 0 adds r0, 0x56 strb r1, [r0] - ldr r0, =sub_8166380 + 1 + ldr r0, =sub_8166380 bl launch_c3_walk_stairs_and_run_once - ldr r0, =sub_81662C0 + 1 + ldr r0, =sub_81662C0 bl set_callback2 pop {r4,r5} pop {r0} @@ -691296,14 +691296,14 @@ sub_81662C0: ; 81662C0 bl fade_and_return_progress_probably ldr r4, [r4] ldr r1, [r4] - ldr r0, =map_warp_consider_1_to_outside_or_stair_or_dive + 1 + ldr r0, =map_warp_consider_1_to_outside_or_stair_or_dive cmp r1, r0 bne @081662F0 adds r0, r4, 0 adds r0, 0x50 movs r1, 0 strb r1, [r0] - ldr r0, =sub_8166304 + 1 + ldr r0, =sub_8166304 bl set_callback2 @081662F0: pop {r4} @@ -691563,7 +691563,7 @@ sub_8166380: ; 8166380 .align 2, 0 .pool @08166550: - ldr r0, =map_warp_consider_1_to_outside_or_stair_or_dive + 1 + ldr r0, =map_warp_consider_1_to_outside_or_stair_or_dive bl launch_c3_walk_stairs_and_run_once @08166556: add sp, 0x4 @@ -691597,7 +691597,7 @@ map_warp_consider_1_to_outside_or_stair_or_dive: ; 8166564 movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - ldr r0, =sub_8166340 + 1 + ldr r0, =sub_8166340 bl SetVBlankCallback movs r0, 0 bl gpu_sync_bg_show @@ -691652,7 +691652,7 @@ map_warp_consider_1_to_outside_or_stair_or_dive: ; 8166564 ldrb r1, [r1] bl sub_81D3480 @0816660A: - ldr r0, =sub_8166634 + 1 + ldr r0, =sub_8166634 bl launch_c3_walk_stairs_and_run_once @08166610: add sp, 0x4 @@ -691803,7 +691803,7 @@ sub_8166634: ; 8166634 .align 2, 0 .pool @08166788: - ldr r0, =sub_8166BEC + 1 + ldr r0, =sub_8166BEC bl launch_c3_walk_stairs_and_run_once b @0816680E .align 2, 0 @@ -691850,7 +691850,7 @@ sub_8166634: ; 8166634 .align 2, 0 .pool @081667E8: - ldr r0, =sub_816681C + 1 + ldr r0, =sub_816681C bl launch_c3_walk_stairs_and_run_once b @0816680E .align 2, 0 @@ -691952,7 +691952,7 @@ sub_816681C: ; 816681C str r5, [r4] bl Window_FreeMemory ldr r1, =0x030022c0 - ldr r0, =sub_816624C + 1 + ldr r0, =sub_816624C str r0, [r1, 0x8] bl sub_8179D70 @081668D4: @@ -692053,7 +692053,7 @@ sub_81668F8: ; 81668F8 bl gpu_sync_bg_show b @081669DE @081669C8: - ldr r0, =sub_8166340 + 1 + ldr r0, =sub_8166340 bl SetVBlankCallback movs r0, 0x1 negs r0, r0 @@ -692085,9 +692085,9 @@ sub_81668F8: ; 81668F8 ldr r1, =0x00007b1c adds r0, r1 bl sub_81D3464 - ldr r0, =sub_8166A34 + 1 + ldr r0, =sub_8166A34 bl launch_c3_walk_stairs_and_run_once - ldr r0, =sub_816631C + 1 + ldr r0, =sub_816631C bl set_callback2 @08166A18: add sp, 0x4 @@ -692274,7 +692274,7 @@ sub_8166A34: ; 8166A34 ldr r0, =0x0203ce7c ldrb r0, [r0] bl sub_8136F68 - ldr r0, =sub_8166BEC + 1 + ldr r0, =sub_8166BEC bl launch_c3_walk_stairs_and_run_once @08166BDA: pop {r4-r6} @@ -693247,7 +693247,7 @@ sub_8167338: ; 8167338 adds r0, r1 lsls r0, 2 adds r0, r7 - ldr r1, =sub_81673DC + 1 + ldr r1, =sub_81673DC str r1, [r0] @081673A2: ldr r1, [r5] @@ -693616,7 +693616,7 @@ sub_8167608: ; 8167608 adds r1, r4, 0 adds r1, 0x1C adds r0, r1 - ldr r1, =sub_8168168 + 1 + ldr r1, =sub_8168168 str r1, [r0] ldrb r1, [r3] lsls r0, r1, 4 @@ -693744,7 +693744,7 @@ sub_8167760: ; 8167760 adds r1, r0, r7 strh r4, [r1, 0x2E] add r0, r8 - ldr r1, =sub_8168180 + 1 + ldr r1, =sub_8168180 str r1, [r0] b @08167808 .align 2, 0 @@ -693822,7 +693822,7 @@ sub_8167760: ; 8167760 @0816788A: movs r0, 0x66 strh r0, [r6] - ldr r0, =sub_81681B4 + 1 + ldr r0, =sub_81681B4 str r0, [r6, 0x14] lsls r2, r4, 2 adds r2, r4 @@ -694444,7 +694444,7 @@ sub_8167CA0: ; 8167CA0 ldr r0, [r5] ldr r3, =0x00008044 adds r0, r3 - ldr r1, =sub_8167EA4 + 1 + ldr r1, =sub_8167EA4 b @08167E90 .align 2, 0 .pool @@ -694454,7 +694454,7 @@ sub_8167CA0: ; 8167CA0 ldr r0, [r5] ldr r4, =0x00008044 adds r0, r4 - ldr r1, =sub_8167FA4 + 1 + ldr r1, =sub_8167FA4 b @08167E90 .align 2, 0 .pool @@ -694462,7 +694462,7 @@ sub_8167CA0: ; 8167CA0 ldr r0, [r6] ldr r1, =0x00008044 adds r0, r1 - ldr r1, =sub_8168048 + 1 + ldr r1, =sub_8168048 @08167E90: str r1, [r0] pop {r3} @@ -695093,7 +695093,7 @@ sub_8168374: ; 8168374 @081683A0: ldrh r0, [r2, 0x30] strh r0, [r2, 0x20] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r2, 0x1C] @081683A8: pop {r4} @@ -695115,7 +695115,7 @@ bx_goto_buffer_A_ch0_tbl3: ; 81683B8 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, =bx_exec_buffer_A_ch0_tbl2 + 1 + ldr r1, =bx_exec_buffer_A_ch0_tbl2 str r1, [r0] ldr r2, =0x0202449c ldr r0, [r2] @@ -695331,7 +695331,7 @@ sub_816856C: ; 816856C adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 bne @08168590 bl dp01_tbl5_exec_completed @@ -695385,7 +695385,7 @@ sub_81685D4: ; 81685D4 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8168610 + 1 + ldr r1, =sub_8168610 str r1, [r0] bl nullsub_35 bl Window_FreeMemory @@ -695402,7 +695402,7 @@ sub_8168610: ; 8168610 push {lr} ldr r0, =0x030022c0 ldr r1, [r0, 0x4] - ldr r0, =sub_8038420 + 1 + ldr r0, =sub_8038420 cmp r1, r0 bne @08168636 ldr r0, =0x02037fd4 @@ -695516,7 +695516,7 @@ sub_816864C: ; 816864C adds r4, 0x1C adds r0, r4 ldr r3, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r3, r0 bne @081687DC ldr r0, =0x020241e4 @@ -695616,7 +695616,7 @@ sub_816864C: ; 816864C ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8168818 + 1 + ldr r1, =sub_8168818 str r1, [r0] @081687DC: pop {r3} @@ -695647,7 +695647,7 @@ sub_8168818: ; 8168818 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 bne @08168842 movs r4, 0x1 @@ -695729,7 +695729,7 @@ sub_8168818: ; 8168818 bl gpu_tile_obj_free_by_tag adds r0, r4, 0 bl gpu_pal_free_tag - ldr r0, =c3_0802FDF4 + 1 + ldr r0, =c3_0802FDF4 movs r1, 0xA bl AddTask ldr r2, =0x0202406e @@ -695930,7 +695930,7 @@ sub_8168A90: ; 8168A90 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 bne @08168AB4 bl dp01_tbl5_exec_completed @@ -695975,7 +695975,7 @@ dp01_tbl5_exec_completed: ; 8168AF8 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =bx_exec_buffer_A_ch0_tbl2 + 1 + ldr r1, =bx_exec_buffer_A_ch0_tbl2 str r1, [r0] ldr r0, =0x02022fec ldr r0, [r0] @@ -698208,7 +698208,7 @@ sub_8169E44: ; 8169E44 ldrb r1, [r6] lsls r1, 2 adds r1, r0 - ldr r0, =sub_8168A20 + 1 + ldr r0, =sub_8168A20 str r0, [r1] b @08169EB6 .align 2, 0 @@ -698316,13 +698316,13 @@ sub_8169EC8: ; 8169EC8 lsls r0, 2 adds r5, 0x1C adds r0, r5 - ldr r1, =sub_805D7AC + 1 + ldr r1, =sub_805D7AC str r1, [r0] ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =sub_816856C + 1 + ldr r1, =sub_816856C str r1, [r0] pop {r4-r6} pop {r0} @@ -698402,13 +698402,13 @@ dp01t_07_6_: ; 8169F94 lsls r0, 2 adds r5, 0x1C adds r0, r5 - ldr r1, =sub_805D7AC + 1 + ldr r1, =sub_805D7AC str r1, [r0] ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8168A90 + 1 + ldr r1, =sub_8168A90 str r1, [r0] pop {r4-r6} pop {r0} @@ -698467,7 +698467,7 @@ sub_816A084: ; 816A084 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, =bx_wait_t5 + 1 + ldr r1, =bx_wait_t5 str r1, [r0] pop {r4,r5} pop {r0} @@ -698507,7 +698507,7 @@ sub_816A0D8: ; 816A0D8 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, =bx_wait_t5 + 1 + ldr r1, =bx_wait_t5 str r1, [r0] pop {r4,r5} pop {r0} @@ -698646,7 +698646,7 @@ sub_816A144: ; 816A144 ldrb r0, [r6] lsls r0, 2 adds r0, r1 - ldr r1, =bx_move_anim_5 + 1 + ldr r1, =bx_move_anim_5 str r1, [r0] @0816A25A: pop {r4-r6} @@ -698840,7 +698840,7 @@ sub_816A3B8: ; 816A3B8 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =sub_81685A4 + 1 + ldr r1, =sub_81685A4 str r1, [r0] pop {r4} pop {r0} @@ -698887,7 +698887,7 @@ sub_816A430: ; 816A430 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8168444 + 1 + ldr r1, =sub_8168444 str r1, [r0] @0816A456: pop {r0} @@ -698904,7 +698904,7 @@ dp01t_12_1_battle_menu: ; 816A470 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, =sub_816A430 + 1 + ldr r1, =sub_816A430 str r1, [r0] ldr r0, =gUnknown_085CCA3A movs r1, 0x2 @@ -699036,7 +699036,7 @@ sub_816A57C: ; 816A57C ldrb r0, [r2] lsls r0, 2 adds r0, r1 - ldr r1, =sub_81685D4 + 1 + ldr r1, =sub_81685D4 str r1, [r0] ldr r1, =0x020244b8 ldrb r0, [r2] @@ -699156,7 +699156,7 @@ sub_816A5D4: ; 816A5D4 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8168934 + 1 + ldr r1, =sub_8168934 str r1, [r0] add sp, 0x4 pop {r3,r4} @@ -699338,7 +699338,7 @@ sub_816A794: ; 816A794 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =bx_blink_t5 + 1 + ldr r1, =bx_blink_t5 str r1, [r0] @0816A7F2: pop {r4} @@ -699522,7 +699522,7 @@ sub_816A90C: ; 816A90C adds r1, r5, 0 adds r1, 0x1C adds r0, r1 - ldr r1, =sub_80A6EEC + 1 + ldr r1, =sub_80A6EEC str r1, [r0] ldrb r2, [r7] adds r0, r2, r6 @@ -699539,7 +699539,7 @@ sub_816A90C: ; 816A90C adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, =sub_805CC00 + 1 + ldr r1, =sub_805CC00 bl oamt_set_x3A_32 ldrb r0, [r7] adds r0, r6 @@ -699574,7 +699574,7 @@ sub_816A90C: ; 816A90C ands r0, r2 orrs r0, r4 strb r0, [r1, 0x5] - ldr r0, =sub_816AC04 + 1 + ldr r0, =sub_816AC04 movs r1, 0x5 bl AddTask lsls r0, 24 @@ -699606,7 +699606,7 @@ sub_816A90C: ; 816A90C adds r0, r1 lsls r0, 3 adds r0, r4 - ldr r1, =sub_8073C30 + 1 + ldr r1, =sub_8073C30 str r1, [r0] @0816AA24: ldr r0, [r3] @@ -699619,7 +699619,7 @@ sub_816A90C: ; 816A90C ldrb r0, [r7] lsls r0, 2 adds r0, r1 - ldr r1, =nullsub_21 + 1 + ldr r1, =nullsub_21 str r1, [r0] pop {r4-r7} pop {r0} @@ -699665,7 +699665,7 @@ sub_816AA80: ; 816AA80 lsls r0, 16 lsrs r0, 16 mov r8, r0 - ldr r0, =sub_805D714 + 1 + ldr r0, =sub_805D714 bl object_new_hidden_with_callback ldr r1, =0x03005d7c mov r9, r1 @@ -699770,7 +699770,7 @@ sub_816AA80: ; 816AA80 adds r1, r5, 0 adds r1, 0x1C adds r0, r1 - ldr r1, =nullsub_12 + 1 + ldr r1, =nullsub_12 str r1, [r0] movs r0, 0 movs r1, 0xFF @@ -699836,7 +699836,7 @@ sub_816AC04: ; 816AC04 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =sub_816864C + 1 + ldr r1, =sub_816864C str r1, [r0] strb r5, [r4] adds r0, r6, 0 @@ -699967,7 +699967,7 @@ sub_816AD20: ; 816AD20 ldrb r1, [r6] lsls r1, 2 adds r1, r0 - ldr r0, =sub_8168AC8 + 1 + ldr r0, =sub_8168AC8 str r0, [r1] @0816AD6C: add sp, 0x4 @@ -700021,7 +700021,7 @@ sub_816AD94: ; 816AD94 ldrb r1, [r4] lsls r1, 2 adds r1, r0 - ldr r0, =sub_80587B0 + 1 + ldr r0, =sub_80587B0 str r0, [r1] @0816ADD0: pop {r4} @@ -700096,13 +700096,13 @@ sub_816AE58: ; 816AE58 ldr r1, =0x0203bcb4 movs r0, 0x4 strb r0, [r1] - ldr r0, =nullsub_4 + 1 + ldr r0, =nullsub_4 movs r1, 0 bl AddTask lsls r0, 24 lsrs r0, 24 ldr r1, =gUnknown_085E8D80 - ldr r2, =sub_816AED8 + 1 + ldr r2, =sub_816AED8 bl sub_81978EC pop {r0} bx r0 @@ -700119,13 +700119,13 @@ sub_816AE98: ; 816AE98 ldr r1, =0x0203bcb4 movs r0, 0x3 strb r0, [r1] - ldr r0, =nullsub_4 + 1 + ldr r0, =nullsub_4 movs r1, 0 bl AddTask lsls r0, 24 lsrs r0, 24 ldr r1, =gUnknown_085E8D80 - ldr r2, =sub_816AED8 + 1 + ldr r2, =sub_816AED8 bl sub_81978EC pop {r0} bx r0 @@ -700202,7 +700202,7 @@ sub_816AED8: ; 816AED8 adds r0, r7 lsls r0, 3 adds r0, r1 - ldr r1, =sub_816AF98 + 1 + ldr r1, =sub_816AF98 str r1, [r0] add sp, 0x8 pop {r3} @@ -700262,7 +700262,7 @@ sub_816AF98: ; 816AF98 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, =sub_816B148 + 1 + ldr r1, =sub_816B148 str r1, [r0] b @0816B04C .align 2, 0 @@ -700306,7 +700306,7 @@ sub_816B060: ; 816B060 lsls r0, 24 lsrs r0, 24 ldr r1, =gUnknown_085E8D80 - ldr r2, =sub_816AED8 + 1 + ldr r2, =sub_816AED8 bl sub_81978EC pop {r0} bx r0 @@ -700328,7 +700328,7 @@ task_pc_itemstorage: ; 816B07C adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_816B248 + 1 + ldr r1, =sub_816B248 str r1, [r0] pop {r4} pop {r0} @@ -700351,7 +700351,7 @@ sub_816B0A8: ; 816B0A8 cmp r0, 0 bne @0816B0D8 ldr r1, =gUnknown_085EAC4B - ldr r2, =sub_816B060 + 1 + ldr r2, =sub_816B060 adds r0, r4, 0 bl sub_81978EC b @0816B12A @@ -700381,14 +700381,14 @@ sub_816B0A8: ; 816B0A8 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =sub_816B674 + 1 + ldr r0, =sub_816B674 str r0, [r1] b @0816B12A .align 2, 0 .pool @0816B120: ldr r1, =gUnknown_085EAC4B - ldr r2, =sub_816B060 + 1 + ldr r2, =sub_816B060 adds r0, r6, 0 bl sub_81978EC @0816B12A: @@ -700597,7 +700597,7 @@ sub_816B2C8: ; 816B2C8 adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r0, =sub_816B2F0 + 1 + ldr r0, =sub_816B2F0 str r0, [r1] movs r0, 0x1 movs r1, 0 @@ -700635,9 +700635,9 @@ sub_816B2F0: ; 816B2F0 sub_816B31C: ; 816B31C push {lr} ldr r0, =0x03005dac - ldr r1, =mapldr_080EBC0C + 1 + ldr r1, =mapldr_080EBC0C str r1, [r0] - ldr r0, =c2_exit_to_overworld_2_switch + 1 + ldr r0, =c2_exit_to_overworld_2_switch bl set_callback2 pop {r0} bx r0 @@ -700652,7 +700652,7 @@ mapldr_080EBC0C: ; 816B33C movs r0, 0 movs r1, 0x1 bl sub_81973C4 - ldr r0, =sub_816B368 + 1 + ldr r0, =sub_816B368 movs r1, 0 bl AddTask lsls r0, 24 @@ -700681,7 +700681,7 @@ sub_816B368: ; 816B368 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =sub_816B248 + 1 + ldr r0, =sub_816B248 str r0, [r1] @0816B388: pop {r4} @@ -700717,7 +700717,7 @@ sub_816B398: ; 816B398 adds r0, r5, 0 bl sub_816B4DC ldr r1, =gUnknown_085EABD1 - ldr r2, =task_pc_itemstorage + 1 + ldr r2, =task_pc_itemstorage adds r0, r5, 0 bl sub_81978EC @0816B3D4: @@ -700754,7 +700754,7 @@ sub_816B3E4: ; 816B3E4 adds r0, r5, 0 bl sub_816B4DC ldr r1, =gUnknown_085EABD1 - ldr r2, =task_pc_itemstorage + 1 + ldr r2, =task_pc_itemstorage adds r0, r5, 0 bl sub_81978EC @0816B420: @@ -700804,7 +700804,7 @@ sub_816B430: ; 816B430 bl sub_8197434 subs r6, 0x8 adds r5, r6 - ldr r0, =sub_816C158 + 1 + ldr r0, =sub_816C158 str r0, [r5] pop {r4-r6} pop {r0} @@ -701124,7 +701124,7 @@ sub_816B674: ; 816B674 mov r0, r10 subs r0, 0x8 add r0, r9 - ldr r1, =sub_816B730 + 1 + ldr r1, =sub_816B730 str r1, [r0] @0816B71E: pop {r3-r5} @@ -701167,7 +701167,7 @@ sub_816B730: ; 816B730 ldr r1, =gUnknown_085EAC63 adds r0, r5, 0 bl ExpandTextCodes - ldr r2, =sub_816B7DC + 1 + ldr r2, =sub_816B7DC adds r0, r4, 0 adds r1, r5, 0 bl sub_81978EC @@ -701235,7 +701235,7 @@ sub_816B7DC: ; 816B7DC adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, =sub_816B82C + 1 + ldr r1, =sub_816B82C str r1, [r0] pop {r4,r5} pop {r0} @@ -701297,7 +701297,7 @@ sub_816B878: ; 816B878 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_816B8A4 + 1 + ldr r1, =sub_816B8A4 str r1, [r0] pop {r4} pop {r0} @@ -701332,7 +701332,7 @@ sub_816B8A4: ; 816B8A4 adds r1, r0 ldr r0, [r2] adds r0, r1 - ldr r1, =sub_816B900 + 1 + ldr r1, =sub_816B900 movs r2, 0x1 bl sub_8121478 adds r0, r4, 0 @@ -701349,9 +701349,9 @@ sub_816B8A4: ; 816B8A4 sub_816B900: ; 816B900 push {lr} ldr r0, =0x03005dac - ldr r1, =pal_fill_for_maplights_or_black + 1 + ldr r1, =pal_fill_for_maplights_or_black str r1, [r0] - ldr r0, =c2_exit_to_overworld_2_switch + 1 + ldr r0, =c2_exit_to_overworld_2_switch bl set_callback2 pop {r0} bx r0 @@ -701363,7 +701363,7 @@ sub_816B900: ; 816B900 pal_fill_for_maplights_or_black: ; 816B920 push {r4,lr} bl sub_81973A4 - ldr r0, =task00_080EBBDC + 1 + ldr r0, =task00_080EBBDC movs r1, 0 bl AddTask lsls r0, 24 @@ -701405,7 +701405,7 @@ task00_080EBBDC: ; 816B964 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =sub_816B674 + 1 + ldr r0, =sub_816B674 str r0, [r1] @0816B984: pop {r4} @@ -701421,7 +701421,7 @@ sub_816B994: ; 816B994 lsls r0, 24 lsrs r0, 24 ldr r1, =gUnknown_085EAC8D - ldr r2, =sub_816B9B0 + 1 + ldr r2, =sub_816B9B0 bl sub_81978EC pop {r0} bx r0 @@ -701441,7 +701441,7 @@ sub_816B9B0: ; 816B9B0 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_816B9D8 + 1 + ldr r1, =sub_816B9D8 str r1, [r0] pop {r4} pop {r0} @@ -701510,7 +701510,7 @@ sub_816BA18: ; 816BA18 cmp r0, 0 bne @0816BA68 ldr r1, =gUnknown_085EACB5 - ldr r2, =sub_816BBD4 + 1 + ldr r2, =sub_816BBD4 adds r0, r6, 0 bl sub_81978EC b @0816BA9C @@ -701518,7 +701518,7 @@ sub_816BA18: ; 816BA18 .pool @0816BA68: ldr r1, =gUnknown_085EACC8 - ldr r2, =sub_816BBD4 + 1 + ldr r2, =sub_816BBD4 adds r0, r6, 0 bl sub_81978EC adds r0, r5, 0 @@ -701579,7 +701579,7 @@ sub_816BABC: ; 816BABC adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =sub_816BAF8 + 1 + ldr r0, =sub_816BAF8 str r0, [r1] @0816BAEA: pop {r4} @@ -701617,9 +701617,9 @@ sub_816BAF8: ; 816BAF8 sub_816BB28: ; 816BB28 push {lr} ldr r0, =0x03005dac - ldr r1, =sub_816BB48 + 1 + ldr r1, =sub_816BB48 str r1, [r0] - ldr r0, =c2_exit_to_overworld_2_switch + 1 + ldr r0, =c2_exit_to_overworld_2_switch bl set_callback2 pop {r0} bx r0 @@ -701630,7 +701630,7 @@ sub_816BB28: ; 816BB28 thumb_func_start sub_816BB48 sub_816BB48: ; 816BB48 push {r4-r6,lr} - ldr r0, =task00_080EBBDC + 1 + ldr r0, =task00_080EBBDC movs r1, 0 bl AddTask lsls r0, 24 @@ -701685,7 +701685,7 @@ sub_816BBB8: ; 816BBB8 lsls r0, 24 lsrs r0, 24 ldr r1, =gUnknown_085E8DE9 - ldr r2, =sub_816BBD4 + 1 + ldr r2, =sub_816BBD4 bl sub_81978EC pop {r0} bx r0 @@ -701713,7 +701713,7 @@ sub_816BBD4: ; 816BBD4 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_816B674 + 1 + ldr r1, =sub_816B674 str r1, [r0] pop {r4} pop {r0} @@ -702447,7 +702447,7 @@ sub_816C158: ; 816C158 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, =sub_816C30C + 1 + ldr r1, =sub_816C30C str r1, [r0] add sp, 0xC pop {r4-r7} @@ -702679,7 +702679,7 @@ bx_battle_menu_t3: ; 816C3A4 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =sub_816B248 + 1 + ldr r0, =sub_816B248 str r0, [r1] @0816C3F2: pop {r4,r5} @@ -702715,7 +702715,7 @@ sub_816C400: ; 816C400 bl sub_816BC58 subs r6, 0x8 adds r4, r6 - ldr r0, =bx_battle_menu_t3 + 1 + ldr r0, =bx_battle_menu_t3 str r0, [r4] pop {r4-r6} pop {r0} @@ -702782,7 +702782,7 @@ sub_816C450: ; 816C450 negs r1, r1 add r8, r1 add r4, r8 - ldr r0, =sub_816C4FC + 1 + ldr r0, =sub_816C4FC str r0, [r4] pop {r3,r4} mov r8, r3 @@ -702965,7 +702965,7 @@ sub_816C5A0: ; 816C5A0 adds r0, r7 lsls r0, 3 adds r0, r1 - ldr r1, =sub_816C30C + 1 + ldr r1, =sub_816C30C str r1, [r0] pop {r3} mov r8, r3 @@ -703138,7 +703138,7 @@ sub_816C71C: ; 816C71C adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, =sub_816C818 + 1 + ldr r1, =sub_816C818 str r1, [r0] @0816C7FE: add sp, 0x8 @@ -703303,7 +703303,7 @@ sub_816C8FC: ; 816C8FC mov r0, r8 subs r0, 0x8 adds r0, r6, r0 - ldr r1, =sub_816CB04 + 1 + ldr r1, =sub_816CB04 b @0816C9A2 .align 2, 0 .pool @@ -703316,7 +703316,7 @@ sub_816C8FC: ; 816C8FC mov r0, r8 subs r0, 0x8 adds r0, r6, r0 - ldr r1, =sub_816CB74 + 1 + ldr r1, =sub_816CB74 @0816C9A2: str r1, [r0] pop {r3} @@ -703405,7 +703405,7 @@ sub_816C9B8: ; 816C9B8 mov r0, r9 subs r0, 0x8 add r0, r8 - ldr r1, =sub_816CB74 + 1 + ldr r1, =sub_816CB74 str r1, [r0] @0816CA7C: add sp, 0x10 @@ -703433,7 +703433,7 @@ sub_816CA94: ; 816CA94 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_816CB04 + 1 + ldr r1, =sub_816CB04 str r1, [r0] pop {r4} pop {r0} @@ -703566,7 +703566,7 @@ sub_816CBC0: ; 816CBC0 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_816C30C + 1 + ldr r1, =sub_816C30C str r1, [r0] pop {r4} pop {r0} @@ -703603,7 +703603,7 @@ sub_816CC00: ; 816CC00 ands r0, r1 cmp r0, 0 bne @0816CC3C - ldr r0, =sub_816CC54 + 1 + ldr r0, =sub_816CC54 bl set_callback2 b @0816CC4C .align 2, 0 @@ -703631,7 +703631,7 @@ sub_816CC54: ; 816CC54 lsls r0, 24 cmp r0, 0 bne @0816CC66 - ldr r0, =c2_title_screen_1 + 1 + ldr r0, =c2_title_screen_1 bl set_callback2 @0816CC66: pop {r0} @@ -703778,7 +703778,7 @@ do_copyright_screen: ; 816CCC8 bl lcd_io_set movs r0, 0x1 bl enable_irqs - ldr r0, =sub_816CBE8 + 1 + ldr r0, =sub_816CBE8 bl SetVBlankCallback movs r1, 0x80 lsls r1, 19 @@ -703786,7 +703786,7 @@ do_copyright_screen: ; 816CCC8 lsls r2, 1 adds r0, r2, 0 strh r0, [r1] - ldr r0, =sub_816CCB8 + 1 + ldr r0, =sub_816CCB8 bl set_serial_callback ldr r0, =0x030062b0 bl sub_82DEE98 @@ -703829,10 +703829,10 @@ do_copyright_screen: ; 816CCC8 lsls r0, 24 cmp r0, 0 bne @0816CEA0 - ldr r0, =task_intro_1 + 1 + ldr r0, =task_intro_1 movs r1, 0 bl AddTask - ldr r0, =sub_816CC00 + 1 + ldr r0, =sub_816CC00 bl set_callback2 ldr r5, =0x030062b0 ldrb r0, [r5, 0x2] @@ -703861,7 +703861,7 @@ do_copyright_screen: ; 816CCC8 .pool @0816CE8C: bl sub_82DF012 - ldr r0, =sub_800BA38 + 1 + ldr r0, =sub_800BA38 bl set_serial_callback @0816CE96: movs r0, 0 @@ -704099,7 +704099,7 @@ task_intro_1: ; 816CF18 lsls r0, 24 lsrs r0, 24 strh r0, [r1, 0x8] - ldr r0, =task_intro_2 + 1 + ldr r0, =task_intro_2 str r0, [r1] add sp, 0xC pop {r3} @@ -704126,7 +704126,7 @@ task_intro_2: ; 816D12C movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - ldr r0, =sub_816CBE8 + 1 + ldr r0, =sub_816CBE8 bl SetVBlankCallback movs r1, 0xFA lsls r1, 5 @@ -704137,7 +704137,7 @@ task_intro_2: ; 816D12C adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =task_intro_3 + 1 + ldr r1, =task_intro_3 str r1, [r0] ldr r0, =0x030062a0 str r5, [r0] @@ -704182,7 +704182,7 @@ task_intro_3: ; 816D190 ldr r0, [r5] cmp r0, 0x80 bne @0816D1CC - ldr r0, =task_intro_3_1 + 1 + ldr r0, =task_intro_3_1 movs r1, 0 bl AddTask @0816D1CC: @@ -704209,7 +704209,7 @@ task_intro_3: ; 816D190 lsls r0, 1 cmp r1, r0 bne @0816D200 - ldr r0, =task_intro_3_2 + 1 + ldr r0, =task_intro_3_2 movs r1, 0 bl AddTask @0816D200: @@ -704250,7 +704250,7 @@ task_intro_3: ; 816D190 lsls r4, 2 cmp r0, r4 bne @0816D252 - ldr r0, =task_intro_3_3 + 1 + ldr r0, =task_intro_3_3 movs r1, 0 bl AddTask @0816D252: @@ -704272,7 +704272,7 @@ task_intro_3: ; 816D190 movs r1, 0x28 strh r1, [r0, 0x12] strh r2, [r0, 0x14] - ldr r1, =task_intro_4 + 1 + ldr r1, =task_intro_4 str r1, [r0] @0816D27A: add sp, 0x8 @@ -704479,7 +704479,7 @@ task_intro_4: ; 816D354 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =task_intro_5 + 1 + ldr r1, =task_intro_5 str r1, [r0] @0816D43E: add sp, 0x4 @@ -704505,7 +704505,7 @@ task_intro_5: ; 816D458 adds r1, r2 lsls r1, 3 adds r1, r0 - ldr r0, =task_intro_6 + 1 + ldr r0, =task_intro_6 str r0, [r1] @0816D476: pop {r0} @@ -704539,7 +704539,7 @@ task_intro_6: ; 816D48C adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =task_intro_7 + 1 + ldr r1, =task_intro_7 str r1, [r0] pop {r4} pop {r0} @@ -704624,7 +704624,7 @@ task_intro_7: ; 816D4E4 adds r5, r2, 0 adds r5, 0x1C adds r3, r0, r5 - ldr r1, =sub_816F9D4 + 1 + ldr r1, =sub_816F9D4 str r1, [r3] adds r2, 0x8 adds r0, r2 @@ -704651,7 +704651,7 @@ task_intro_7: ; 816D4E4 adds r0, r6 lsls r0, 2 adds r0, r5 - ldr r1, =sub_816FAB0 + 1 + ldr r1, =sub_816FAB0 str r1, [r0] strh r6, [r4, 0xC] movs r0, 0x1 @@ -704662,7 +704662,7 @@ task_intro_7: ; 816D4E4 movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - ldr r0, =sub_816CBE8 + 1 + ldr r0, =sub_816CBE8 bl SetVBlankCallback movs r1, 0x80 lsls r1, 7 @@ -704676,7 +704676,7 @@ task_intro_7: ; 816D4E4 strh r0, [r4, 0x8] movs r0, 0x1 bl sub_817B150 - ldr r0, =task_intro_8 + 1 + ldr r0, =task_intro_8 str r0, [r4] add sp, 0x4 pop {r4-r7} @@ -704728,7 +704728,7 @@ task_intro_8: ; 816D650 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =task_intro_9 + 1 + ldr r1, =task_intro_9 str r1, [r0] @0816D6A4: ldr r1, [r5] @@ -704888,7 +704888,7 @@ task_intro_9: ; 816D7E8 adds r1, r2 lsls r1, 3 adds r1, r0 - ldr r0, =task_intro_10 + 1 + ldr r0, =task_intro_10 str r0, [r1] @0816D806: pop {r0} @@ -705425,7 +705425,7 @@ task_intro_10: ; 816DBAC ldr r1, =0x00001441 movs r0, 0 bl lcd_io_set - ldr r0, =task_intro_11 + 1 + ldr r0, =task_intro_11 str r0, [r4] ldr r0, =0x030062a0 str r5, [r0] @@ -705472,7 +705472,7 @@ task_intro_11: ; 816DC64 .align 2, 0 .pool @0816DCA4: - ldr r0, =task_intro_12 + 1 + ldr r0, =task_intro_12 str r0, [r3] @0816DCA8: lsls r4, r5, 2 @@ -705526,7 +705526,7 @@ task_intro_12: ; 816DCFC adds r1, r2 lsls r1, 3 adds r1, r0 - ldr r0, =task_intro_13 + 1 + ldr r0, =task_intro_13 str r0, [r1] @0816DD18: pop {r0} @@ -705579,7 +705579,7 @@ task_intro_13: ; 816DD28 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =task_intro_14 + 1 + ldr r1, =task_intro_14 str r1, [r0] @0816DD94: pop {r4} @@ -705641,7 +705641,7 @@ task_intro_14: ; 816DDD8 strh r2, [r4, 0xE] movs r3, 0 bl sub_816F2A8 - ldr r0, =task_intro_15 + 1 + ldr r0, =task_intro_15 str r0, [r4] add sp, 0x4 pop {r4,r5} @@ -705686,7 +705686,7 @@ task_intro_15: ; 816DE7C lsls r1, 6 movs r0, 0x44 bl lcd_io_set - ldr r0, =task_intro_16 + 1 + ldr r0, =task_intro_16 str r0, [r4] @0816DEC6: pop {r4} @@ -705705,7 +705705,7 @@ task_intro_16: ; 816DED0 adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r0, =task_intro_17 + 1 + ldr r0, =task_intro_17 str r0, [r1] bx lr .align 2, 0 @@ -705725,7 +705725,7 @@ task_intro_17: ; 816DEEC adds r1, r2 movs r2, 0 strh r2, [r1, 0x8] - ldr r0, =task_intro_18 + 1 + ldr r0, =task_intro_18 str r0, [r1] movs r0, 0x1 str r0, [sp] @@ -706027,7 +706027,7 @@ task_intro_18: ; 816DF2C adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, =task_intro_19 + 1 + ldr r1, =task_intro_19 str r1, [r0] ldr r1, =0x02039b28 movs r0, 0x3 @@ -706065,7 +706065,7 @@ sub_816E190: ; 816E190 adds r0, r6, 0 adds r0, 0x1C adds r0, r2, r0 - ldr r1, =sub_816E1F8 + 1 + ldr r1, =sub_816E1F8 str r1, [r0] adds r2, r6 ldrb r0, [r2, 0x5] @@ -706219,7 +706219,7 @@ task_intro_19: ; 816E2A0 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =task_intro_20 + 1 + ldr r0, =task_intro_20 str r0, [r1] movs r4, 0 strh r4, [r1, 0x8] @@ -706668,7 +706668,7 @@ task_intro_20: ; 816E358 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, =task_intro_21 + 1 + ldr r1, =task_intro_21 str r1, [r0] ldr r1, =0x02039b28 movs r0, 0x3 @@ -706971,7 +706971,7 @@ task_intro_21: ; 816E888 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, =task_intro_22 + 1 + ldr r1, =task_intro_22 str r1, [r0] pop {r4,r5} pop {r0} @@ -706997,7 +706997,7 @@ task_intro_22: ; 816E954 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =task_intro_23 + 1 + ldr r1, =task_intro_23 str r1, [r0] pop {r4} pop {r0} @@ -707026,7 +707026,7 @@ task_intro_23: ; 816E998 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =task_intro_24 + 1 + ldr r1, =task_intro_24 str r1, [r0] movs r1, 0 strh r1, [r0, 0x8] @@ -707135,7 +707135,7 @@ task_intro_24: ; 816E9DC adds r0, r6, 0 subs r0, 0x8 adds r0, r5, r0 - ldr r1, =task_intro_25 + 1 + ldr r1, =task_intro_25 str r1, [r0] @0816EAA6: add sp, 0x4 @@ -707174,7 +707174,7 @@ task_intro_25: ; 816EAB8 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =task_intro_26 + 1 + ldr r1, =task_intro_26 str r1, [r0] movs r2, 0 strh r2, [r0, 0x8] @@ -707323,7 +707323,7 @@ task_intro_26: ; 816EB44 adds r0, r2, 0 subs r0, 0x8 adds r0, r1, r0 - ldr r1, =task_intro_27 + 1 + ldr r1, =task_intro_27 str r1, [r0] @0816EC62: pop {r4-r6} @@ -707448,7 +707448,7 @@ task_intro_27: ; 816ED20 adds r4, r5 lsls r4, 3 adds r4, r6 - ldr r0, =task_intro_28 + 1 + ldr r0, =task_intro_28 str r0, [r4] ldr r0, =0x0000ffde ldr r1, =0x00002949 @@ -707466,7 +707466,7 @@ task_intro_27: ; 816ED20 ldr r0, =0x0000ff78 strh r0, [r4, 0xE] strh r1, [r4, 0x10] - ldr r0, =sub_816EEA8 + 1 + ldr r0, =sub_816EEA8 movs r1, 0 bl AddTask lsls r0, 24 @@ -707594,7 +707594,7 @@ task_intro_28: ; 816EDB4 adds r0, r5, 0 subs r0, 0x8 adds r0, r4, r0 - ldr r1, =task_intro_29 + 1 + ldr r1, =task_intro_29 str r1, [r0] @0816EE86: pop {r4-r6} @@ -707610,7 +707610,7 @@ task_intro_29: ; 816EE90 lsls r0, 24 lsrs r0, 24 bl remove_task - ldr r0, =sub_816CC54 + 1 + ldr r0, =sub_816CC54 bl set_callback2 pop {r0} bx r0 @@ -708269,7 +708269,7 @@ sub_816F3A4: ; 816F3A4 ands r0, r1 lsls r0, 3 strh r0, [r4, 0x34] - ldr r0, =sub_816F318 + 1 + ldr r0, =sub_816F318 str r0, [r4, 0x1C] ldrb r1, [r4, 0x1] movs r0, 0x3F @@ -708326,7 +708326,7 @@ sub_816F454: ; 816F454 ldrsh r0, [r1, r2] cmp r0, 0 beq @0816F464 - ldr r0, =sub_816F46C + 1 + ldr r0, =sub_816F46C str r0, [r1, 0x1C] @0816F464: pop {r0} @@ -708361,7 +708361,7 @@ sub_816F46C: ; 816F46C strh r0, [r7, 0x24] movs r0, 0x80 strh r0, [r7, 0x36] - ldr r0, =sub_816F5B4 + 1 + ldr r0, =sub_816F5B4 str r0, [r7, 0x1C] b @0816F59E .align 2, 0 @@ -708585,7 +708585,7 @@ sub_816F5B4: ; 816F5B4 @0816F64C: movs r0, 0 strh r0, [r4, 0x36] - ldr r0, =sub_816F660 + 1 + ldr r0, =sub_816F660 str r0, [r4, 0x1C] @0816F654: add sp, 0x4 @@ -708649,7 +708649,7 @@ sub_816F660: ; 816F660 .align 2, 0 .pool @0816F6C0: - ldr r0, =sub_816F6D0 + 1 + ldr r0, =sub_816F6D0 str r0, [r1, 0x1C] @0816F6C4: pop {r4} @@ -708701,7 +708701,7 @@ sub_816F6D0: ; 816F6D0 ands r0, r1 lsls r0, 3 strh r0, [r4, 0x34] - ldr r0, =sub_816F318 + 1 + ldr r0, =sub_816F318 str r0, [r4, 0x1C] ldrb r1, [r4, 0x1] movs r0, 0x3F @@ -708768,7 +708768,7 @@ sub_816F750: ; 816F750 ands r0, r1 lsls r0, 3 strh r0, [r4, 0x34] - ldr r0, =sub_816F318 + 1 + ldr r0, =sub_816F318 str r0, [r4, 0x1C] ldrb r1, [r4, 0x1] movs r0, 0x3F @@ -708883,7 +708883,7 @@ sub_816F7D0: ; 816F7D0 mov r0, r9 adds r0, 0x1C adds r0, r5, r0 - ldr r1, =sub_816F454 + 1 + ldr r1, =sub_816F454 b @0816F8A0 .align 2, 0 .pool @@ -708891,7 +708891,7 @@ sub_816F7D0: ; 816F7D0 mov r0, r9 adds r0, 0x1C adds r0, r5, r0 - ldr r1, =sub_816F750 + 1 + ldr r1, =sub_816F750 @0816F8A0: str r1, [r0] str r7, [sp, 0x10] @@ -708943,7 +708943,7 @@ sub_816F7D0: ; 816F7D0 bl oam_center ldr r2, =0x0202064c adds r4, r2 - ldr r0, =sub_816F3A4 + 1 + ldr r0, =sub_816F3A4 str r0, [r4] ldr r0, =gUnknown_085E4D64 mov r1, r10 @@ -708985,7 +708985,7 @@ sub_816F7D0: ; 816F7D0 bl oam_center ldr r0, =0x0202064c adds r4, r0 - ldr r1, =sub_816F3A4 + 1 + ldr r1, =sub_816F3A4 str r1, [r4] ldr r2, [sp, 0xC] lsls r0, r2, 24 @@ -710013,7 +710013,7 @@ sub_81700F8: ; 81700F8 movs r1, 0xE0 lsls r1, 9 bl init_malloc - ldr r0, =sub_8086230 + 1 + ldr r0, =sub_8086230 bl set_callback2 pop {r4,r5} pop {r0} @@ -710038,7 +710038,7 @@ sub_817018C: ; 817018C movs r1, 0 strh r1, [r2] str r5, [r0] - ldr r0, =sub_81701C4 + 1 + ldr r0, =sub_81701C4 bl set_callback2 pop {r4,r5} pop {r0} @@ -710093,9 +710093,9 @@ sub_81701C4: ; 81701C4 movs r2, 0xD0 bl sub_809882C bl clear_scheduled_bg_copies_to_vram - ldr r0, =sub_8170274 + 1 + ldr r0, =sub_8170274 bl set_callback2 - ldr r0, =sub_8170260 + 1 + ldr r0, =sub_8170260 bl SetVBlankCallback pop {r0} bx r0 @@ -710414,12 +710414,12 @@ sub_8170478: ; 8170478 ldrh r6, [r4, 0x38] lsls r6, 24 lsrs r6, 24 - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 bl object_new_hidden_with_callback lsls r0, 24 lsrs r0, 24 str r0, [sp, 0x14] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 bl object_new_hidden_with_callback mov r10, r0 mov r2, r10 @@ -710491,7 +710491,7 @@ sub_8170478: ; 8170478 movs r0, 0x1C add r9, r0 add r6, r9 - ldr r1, =nullsub_12 + 1 + ldr r1, =nullsub_12 str r1, [r6] add r4, r9 str r1, [r4] @@ -710537,7 +710537,7 @@ sub_8170478: ; 8170478 strh r1, [r0, 0x8] mov r2, r10 strh r2, [r0, 0xC] - ldr r1, =sub_8170660 + 1 + ldr r1, =sub_8170660 str r1, [r0] add sp, 0x1C pop {r3-r5} @@ -711005,7 +711005,7 @@ sub_8170A0C: ; 8170A0C strh r0, [r1, 0x1C] ldrh r0, [r2, 0x2] strh r0, [r1, 0x1E] - ldr r0, =sub_8170A38 + 1 + ldr r0, =sub_8170A38 str r0, [r1] bx lr .align 2, 0 @@ -711548,7 +711548,7 @@ sub_8170E04: ; 8170E04 mov r0, r9 adds r0, 0x1C adds r4, r0 - ldr r0, =sub_8171104 + 1 + ldr r0, =sub_8171104 str r0, [r4] ldr r0, =0x020244d0 ldr r0, [r0] @@ -711580,7 +711580,7 @@ sub_8170E04: ; 8170E04 lsls r0, 3 adds r0, r1 strh r5, [r0, 0x8] - ldr r1, =sub_8170EF0 + 1 + ldr r1, =sub_8170EF0 str r1, [r0] pop {r3-r5} mov r8, r3 @@ -711702,7 +711702,7 @@ sub_8170F2C: ; 8170F2C movs r0, 0x1C add r9, r0 add r4, r9 - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r4] movs r0, 0 bl battle_get_side_with_given_state @@ -711715,7 +711715,7 @@ sub_8170F2C: ; 8170F2C adds r0, r1 lsls r0, 2 add r0, r9 - ldr r1, =sub_8039E84 + 1 + ldr r1, =sub_8039E84 str r1, [r0] ldr r1, =0x03005e00 lsls r0, r7, 2 @@ -711723,7 +711723,7 @@ sub_8170F2C: ; 8170F2C lsls r0, 3 adds r0, r1 strh r5, [r0, 0x8] - ldr r1, =sub_8171030 + 1 + ldr r1, =sub_8171030 str r1, [r0] pop {r3,r4} mov r8, r3 @@ -711772,12 +711772,12 @@ sub_8171030: ; 8171030 adds r1, r6, 0 adds r1, 0x1C adds r0, r1 - ldr r1, =sub_8171104 + 1 + ldr r1, =sub_8171104 str r1, [r0] - ldr r0, =sub_81710A8 + 1 + ldr r0, =sub_81710A8 movs r1, 0xA bl AddTask - ldr r0, =sub_8170EF0 + 1 + ldr r0, =sub_8170EF0 str r0, [r4] @0817108A: pop {r4-r6} @@ -711847,7 +711847,7 @@ sub_8171104: ; 8171104 strh r0, [r4, 0x38] adds r0, r4, 0 bl sub_80A68D4 - ldr r0, =sub_8171134 + 1 + ldr r0, =sub_8171134 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -711871,7 +711871,7 @@ sub_8171134: ; 8171134 ldrb r0, [r0, 0x8] cmp r0, 0x5 bne @08171160 - ldr r0, =sub_8171CAC + 1 + ldr r0, =sub_8171CAC str r0, [r4, 0x1C] b @081711D2 .align 2, 0 @@ -711903,7 +711903,7 @@ sub_8171134: ; 8171134 bge @08171188 movs r0, 0 strh r0, [r4, 0x38] - ldr r0, =sub_81711E8 + 1 + ldr r0, =sub_81711E8 str r0, [r4, 0x1C] ldr r0, =0x02024208 ldrh r0, [r0] @@ -711951,13 +711951,13 @@ sub_81711E8: ; 81711E8 asrs r0, 16 cmp r0, 0xA bne @08171224 - ldr r0, =nullsub_4 + 1 + ldr r0, =nullsub_4 movs r1, 0x32 bl AddTask lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x38] - ldr r0, =sub_8171240 + 1 + ldr r0, =sub_8171240 str r0, [r4, 0x1C] ldr r2, =0x02020630 ldr r1, =0x020241e4 @@ -712124,7 +712124,7 @@ sub_8171240: ; 8171240 bl obj_anim_image_start movs r0, 0 strh r0, [r7, 0x38] - ldr r0, =sub_817138C + 1 + ldr r0, =sub_817138C str r0, [r7, 0x1C] @0817137C: pop {r4-r7} @@ -712161,7 +712161,7 @@ sub_817138C: ; 817138C bl cosine negs r0, r0 strh r0, [r4, 0x26] - ldr r0, =sub_81713D0 + 1 + ldr r0, =sub_81713D0 str r0, [r4, 0x1C] @081713C6: pop {r4} @@ -712285,13 +712285,13 @@ sub_81713D0: ; 81713D0 cmp r0, 0 bne @081714C0 strh r5, [r4, 0x38] - ldr r0, =sub_81717B4 + 1 + ldr r0, =sub_81717B4 str r0, [r4, 0x1C] b @081714CA .align 2, 0 .pool @081714C0: - ldr r0, =sub_81714D4 + 1 + ldr r0, =sub_81714D4 str r0, [r4, 0x1C] movs r0, 0x1 strh r0, [r4, 0x36] @@ -712330,7 +712330,7 @@ sub_81714D4: ; 81714D4 ldr r0, [r0] ldr r0, [r0, 0x8] strh r5, [r0, 0xC] - ldr r0, =sub_8171520 + 1 + ldr r0, =sub_8171520 str r0, [r4, 0x1C] movs r0, 0x17 bl audio_play @@ -712614,7 +712614,7 @@ sub_8171520: ; 8171520 movs r1, 0x80 orrs r0, r1 strb r0, [r2] - ldr r0, =sub_81717B4 + 1 + ldr r0, =sub_81717B4 str r0, [r4, 0x1C] b @081717AE .align 2, 0 @@ -712624,7 +712624,7 @@ sub_8171520: ; 8171520 bne @08171754 cmp r1, 0x3 bne @08171754 - ldr r0, =sub_81717D8 + 1 + ldr r0, =sub_81717D8 str r0, [r4, 0x1C] b @0817175A .align 2, 0 @@ -712694,7 +712694,7 @@ sub_81717B4: ; 81717B4 bne @081717CE movs r0, 0 strh r0, [r1, 0x38] - ldr r0, =sub_8171AE4 + 1 + ldr r0, =sub_8171AE4 str r0, [r1, 0x1C] @081717CE: pop {r0} @@ -712711,7 +712711,7 @@ sub_81717D8: ; 81717D8 movs r2, 0x40 orrs r1, r2 strb r1, [r3] - ldr r1, =sub_81717F8 + 1 + ldr r1, =sub_81717F8 str r1, [r0, 0x1C] movs r1, 0 strh r1, [r0, 0x34] @@ -712810,7 +712810,7 @@ sub_81717F8: ; 81717F8 bl obj_delete_and_free_tiles mov r0, r8 strh r0, [r6, 0x2E] - ldr r0, =sub_81718D8 + 1 + ldr r0, =sub_81718D8 str r0, [r6, 0x1C] @081718BC: add sp, 0x4 @@ -712929,7 +712929,7 @@ sub_81718D8: ; 81718D8 movs r1, 0 bl lcd_io_set strh r5, [r4, 0x2E] - ldr r0, =sub_81719C0 + 1 + ldr r0, =sub_81719C0 str r0, [r4, 0x1C] @081719B0: add sp, 0x4 @@ -713035,7 +713035,7 @@ sub_81719EC: ; 81719EC adds r0, r5, 0 bl sub_80A68D4 add r4, r10 - ldr r0, =sub_8171AAC + 1 + ldr r0, =sub_8171AAC str r0, [r4] ldr r0, =gUnknown_085E51B4 ldrb r1, [r0, 0x4] @@ -713096,7 +713096,7 @@ sub_8171AE4: ; 8171AE4 adds r0, r4, 0 movs r1, 0 bl sub_8008258 - ldr r0, =sub_8171BAC + 1 + ldr r0, =sub_8171BAC str r0, [r4, 0x1C] ldr r0, =0x02024208 ldrh r0, [r0] @@ -713279,7 +713279,7 @@ sub_8171BAC: ; 8171BAC orrs r0, r1 strb r0, [r2] strh r5, [r7, 0x2E] - ldr r0, =sub_81719C0 + 1 + ldr r0, =sub_81719C0 str r0, [r7, 0x1C] ldr r0, =0x020244b9 strb r6, [r0] @@ -713308,7 +713308,7 @@ sub_8171CAC: ; 8171CAC strh r0, [r2, 0x22] strh r1, [r2, 0x26] strh r1, [r2, 0x24] - ldr r4, =sub_8171CE8 + 1 + ldr r4, =sub_8171CE8 movs r3, 0 movs r1, 0x5 adds r0, r2, 0 @@ -713375,7 +713375,7 @@ sub_8171CE8: ; 8171CE8 @08171D3E: movs r0, 0 strh r0, [r4, 0x2E] - ldr r0, =sub_81719C0 + 1 + ldr r0, =sub_81719C0 str r0, [r4, 0x1C] ldr r1, =0x020244b9 movs r0, 0 @@ -713563,7 +713563,7 @@ sub_8171E50: ; 8171E50 bl obj_anim_image_start adds r5, 0x1C adds r4, r5 - ldr r0, =sub_8171F68 + 1 + ldr r0, =sub_8171F68 str r0, [r4] movs r0, 0x3 mov r2, r9 @@ -713647,7 +713647,7 @@ sub_8171F68: ; 8171F68 ldrsh r0, [r1, r3] cmp r0, 0 bne @08171F80 - ldr r0, =sub_8171F88 + 1 + ldr r0, =sub_8171F88 str r0, [r1, 0x1C] b @08171F84 .align 2, 0 @@ -713753,7 +713753,7 @@ sub_8171FC4: ; 8171FC4 bl obj_anim_image_start ldr r0, =0x0202064c adds r4, r0 - ldr r0, =sub_8172508 + 1 + ldr r0, =sub_8172508 str r0, [r4] movs r0, 0x3 ldr r2, [sp, 0x8] @@ -713872,7 +713872,7 @@ sub_81720C8: ; 81720C8 bl obj_anim_image_start ldr r0, =0x0202064c adds r4, r0 - ldr r0, =sub_8172508 + 1 + ldr r0, =sub_8172508 str r0, [r4] movs r0, 0x3 ldr r2, [sp, 0x8] @@ -713990,7 +713990,7 @@ sub_81721CC: ; 81721CC bl obj_anim_image_start ldr r0, =0x0202064c adds r4, r0 - ldr r0, =sub_8172508 + 1 + ldr r0, =sub_8172508 str r0, [r4] movs r0, 0x3 ldr r2, [sp, 0x8] @@ -714108,7 +714108,7 @@ sub_81722CC: ; 81722CC bl obj_anim_image_start ldr r0, =0x0202064c adds r4, r0 - ldr r0, =sub_8172508 + 1 + ldr r0, =sub_8172508 str r0, [r4] movs r0, 0x3 ldr r2, [sp, 0x8] @@ -714240,7 +714240,7 @@ sub_81723D4: ; 81723D4 bl obj_anim_image_start ldr r0, =0x0202064c adds r4, r0 - ldr r0, =sub_8172508 + 1 + ldr r0, =sub_8172508 str r0, [r4] movs r0, 0x3 ldr r2, [sp, 0x8] @@ -714417,7 +714417,7 @@ sub_8172560: ; 8172560 bl obj_anim_image_start ldr r0, =0x0202064c adds r4, r0 - ldr r0, =sub_817265C + 1 + ldr r0, =sub_817265C str r0, [r4] movs r0, 0x3 ldr r2, [sp, 0x8] @@ -714585,7 +714585,7 @@ sub_81726BC: ; 81726BC bl obj_anim_image_start ldr r1, =0x0202064c adds r4, r1 - ldr r0, =sub_8172508 + 1 + ldr r0, =sub_8172508 str r0, [r4] movs r0, 0x3 ldr r1, [sp, 0xC] @@ -714720,7 +714720,7 @@ sub_81727E8: ; 81727E8 bl obj_anim_image_start ldr r0, =0x0202064c adds r4, r0 - ldr r0, =sub_81728E0 + 1 + ldr r0, =sub_81728E0 str r0, [r4] movs r0, 0x3 ldr r2, [sp, 0x8] @@ -714917,7 +714917,7 @@ sub_81729E8: ; 81729E8 lsrs r6, r1, 24 lsls r3, 24 lsrs r7, r3, 24 - ldr r0, =sub_8172AB0 + 1 + ldr r0, =sub_8172AB0 movs r1, 0x5 bl AddTask lsls r0, 24 @@ -714971,7 +714971,7 @@ sub_81729E8: ; 81729E8 strh r0, [r5, 0x8] ldr r0, =0x0000ffff strh r0, [r5, 0xA] - ldr r0, =sub_8172B40 + 1 + ldr r0, =sub_8172B40 str r0, [r5] @08172A7E: ldr r0, =0x00007fff @@ -715091,7 +715091,7 @@ sub_8172B40: ; 8172B40 movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - ldr r0, =sub_8172B90 + 1 + ldr r0, =sub_8172B90 str r0, [r4] @08172B78: add sp, 0x4 @@ -715583,7 +715583,7 @@ sub_8172EF0: ; 8172EF0 ldr r0, =gUnknown_08525B94 bl gpu_pal_obj_decompress_and_apply3 @08172F6E: - ldr r5, =sub_8172FEC + 1 + ldr r5, =sub_8172FEC adds r0, r5, 0 movs r1, 0xA bl AddTask @@ -715766,7 +715766,7 @@ sub_8172FEC: ; 8172FEC lsls r0, 2 adds r1, 0x1C adds r0, r1 - ldr r1, =sub_81731FC + 1 + ldr r1, =sub_81731FC str r1, [r0] adds r4, r2, 0 b @08173160 @@ -715780,7 +715780,7 @@ sub_8172FEC: ; 8172FEC adds r0, r3, 0 adds r0, 0x1C adds r0, r1, r0 - ldr r2, =sub_8173250 + 1 + ldr r2, =sub_8173250 str r2, [r0] adds r1, r3 ldr r0, =0x0000ffe0 @@ -715832,7 +715832,7 @@ sub_8172FEC: ; 8172FEC ldrsh r0, [r1, r4] cmp r0, 0x5 bne @08173190 - ldr r0, =sub_81731B0 + 1 + ldr r0, =sub_81731B0 str r0, [r1] @08173190: pop {r3,r4} @@ -716068,9 +716068,9 @@ sub_817330C: ; 817330C lsls r0, 2 adds r2, 0x1C adds r0, r2 - ldr r1, =sub_8039E84 + 1 + ldr r1, =sub_8039E84 str r1, [r0] - ldr r0, =sub_817339C + 1 + ldr r0, =sub_817339C str r0, [r4, 0x1C] pop {r4,r5} pop {r0} @@ -716097,7 +716097,7 @@ sub_817339C: ; 817339C ldrb r0, [r0] cmp r0, 0x1 bne @081733C0 - ldr r0, =sub_81733D4 + 1 + ldr r0, =sub_81733D4 str r0, [r3, 0x1C] @081733C0: pop {r0} @@ -716122,7 +716122,7 @@ sub_81733D4: ; 81733D4 movs r1, 0x4 orrs r0, r1 strb r0, [r2] - ldr r0, =sub_8173400 + 1 + ldr r0, =sub_8173400 str r0, [r4, 0x1C] @081733F6: pop {r4} @@ -716392,7 +716392,7 @@ sub_817357C: ; 817357C lsrs r4, r0, 24 cmp r4, 0 bne @08173688 - ldr r0, =sub_817354C + 1 + ldr r0, =sub_817354C bl SetVBlankCallback movs r0, 0x1 negs r0, r0 @@ -716420,7 +716420,7 @@ sub_817357C: ; 817357C ands r0, r1 cmp r0, 0 bne @08173688 - ldr r0, =sub_8173560 + 1 + ldr r0, =sub_8173560 bl set_callback2 movs r0, 0xDA lsls r0, 1 @@ -716446,7 +716446,7 @@ sub_8173694: ; 8173694 lsrs r4, r0, 24 cmp r4, 0 bne @081736C4 - ldr r0, =sub_817371C + 1 + ldr r0, =sub_817371C movs r1, 0 bl AddTask lsls r0, 24 @@ -716476,7 +716476,7 @@ sub_81736D8: ; 81736D8 lsls r0, 24 cmp r0, 0 bne @08173708 - ldr r0, =sub_817371C + 1 + ldr r0, =sub_817371C movs r1, 0 bl AddTask lsls r0, 24 @@ -716678,12 +716678,12 @@ sub_817371C: ; 817371C ldrsh r0, [r1, r2] cmp r0, 0 beq @081738A4 - ldr r0, =sub_8173A8C + 1 + ldr r0, =sub_8173A8C b @081738A6 .align 2, 0 .pool @081738A4: - ldr r0, =sub_81738BC + 1 + ldr r0, =sub_81738BC @081738A6: str r0, [r1] add sp, 0xC @@ -716806,7 +716806,7 @@ sub_81738BC: ; 81738BC add r0, r9 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81739C4 + 1 + ldr r1, =sub_81739C4 str r1, [r0] add sp, 0x10 pop {r3,r4} @@ -716825,7 +716825,7 @@ sub_81739C4: ; 81739C4 lsls r0, 24 lsrs r4, r0, 24 ldr r1, =0x03006214 - ldr r0, =sub_81736D8 + 1 + ldr r0, =sub_81736D8 str r0, [r1] movs r0, 0x3 bl save_game_when_memory_present @@ -716871,7 +716871,7 @@ sub_81739C4: ; 81739C4 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_8173A5C + 1 + ldr r1, =sub_8173A5C str r1, [r0] movs r1, 0x20 strh r1, [r0, 0xE] @@ -716904,7 +716904,7 @@ sub_8173A5C: ; 8173A5C .align 2, 0 .pool @08173A80: - ldr r0, =sub_8173A8C + 1 + ldr r0, =sub_8173A8C str r0, [r1] @08173A84: pop {r0} @@ -716922,7 +716922,7 @@ sub_8173A8C: ; 8173A8C adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r0, =sub_8173AA8 + 1 + ldr r0, =sub_8173AA8 str r0, [r1] bx lr .align 2, 0 @@ -717026,7 +717026,7 @@ sub_8173AA8: ; 8173AA8 strh r1, [r3, 0x3C] adds r4, 0x1C adds r2, r4 - ldr r1, =sub_8175120 + 1 + ldr r1, =sub_8175120 str r1, [r2] ldr r5, =0x03005e00 adds r1, r6, 0x5 @@ -717044,7 +717044,7 @@ sub_8173AA8: ; 8173AA8 movs r1, 0x1 bl sub_8197434 adds r4, r5 - ldr r0, =sub_8173BC0 + 1 + ldr r0, =sub_8173BC0 str r0, [r4] add sp, 0x10 pop {r3,r4} @@ -717087,7 +717087,7 @@ sub_8173BC0: ; 8173BC0 ldr r1, =0x02020630 adds r3, r0, r1 ldr r1, [r3, 0x1C] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 bne @08173C1A ldrb r1, [r3, 0x1] @@ -717101,7 +717101,7 @@ sub_8173BC0: ; 8173BC0 bl sub_8174A88 movs r0, 0x78 strh r0, [r5, 0xE] - ldr r0, =sub_8173C34 + 1 + ldr r0, =sub_8173C34 str r0, [r5] @08173C1A: pop {r4,r5} @@ -717201,7 +717201,7 @@ sub_8173C34: ; 8173C34 movs r2, 0x4 orrs r1, r2 strb r1, [r0, 0x5] - ldr r0, =sub_8173AA8 + 1 + ldr r0, =sub_8173AA8 str r0, [r4] b @08173D10 .align 2, 0 @@ -717211,7 +717211,7 @@ sub_8173C34: ; 8173C34 adds r0, r5 lsls r0, 3 add r0, r12 - ldr r1, =sub_8173D24 + 1 + ldr r1, =sub_8173D24 str r1, [r0] @08173D10: add sp, 0x4 @@ -717286,7 +717286,7 @@ sub_8173D24: ; 8173D24 movs r1, 0xC8 lsls r1, 1 strh r1, [r0, 0xE] - ldr r1, =sub_8173DC0 + 1 + ldr r1, =sub_8173DC0 str r1, [r0] add sp, 0x4 pop {r3} @@ -717391,7 +717391,7 @@ sub_8173DC0: ; 8173DC0 adds r0, r1 movs r1, 0x7 strh r1, [r0, 0xE] - ldr r1, =sub_8173EA4 + 1 + ldr r1, =sub_8173EA4 str r1, [r0] @08173E7E: add sp, 0x4 @@ -717421,7 +717421,7 @@ sub_8173EA4: ; 8173EA4 ldrsh r0, [r1, r3] cmp r0, 0xF ble @08173ECC - ldr r0, =sub_8173EE4 + 1 + ldr r0, =sub_8173EE4 str r0, [r1] b @08173EDE .align 2, 0 @@ -717494,7 +717494,7 @@ sub_8173EE4: ; 8173EE4 bl gpu_pal_apply movs r0, 0x78 strh r0, [r4, 0xE] - ldr r0, =sub_8173F84 + 1 + ldr r0, =sub_8173F84 str r0, [r4] add sp, 0x8 pop {r4-r6} @@ -717573,7 +717573,7 @@ sub_8173F84: ; 8173F84 movs r0, 0 movs r1, 0x3 bl Window_CopyToVram - ldr r0, =sub_8174028 + 1 + ldr r0, =sub_8174028 str r0, [r4] @08174018: add sp, 0x10 @@ -717602,7 +717602,7 @@ sub_8174028: ; 8174028 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =sub_8174060 + 1 + ldr r0, =sub_8174060 str r0, [r1] @0817404E: pop {r4} @@ -717637,7 +717637,7 @@ sub_8174060: ; 8174060 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81740B0 + 1 + ldr r1, =sub_81740B0 str r1, [r0] add sp, 0x4 pop {r4} @@ -717743,7 +717743,7 @@ sub_81740B0: ; 81740B0 thumb_func_start sub_8174184 sub_8174184: ; 8174184 push {lr} - ldr r0, =sub_8175620 + 1 + ldr r0, =sub_8175620 bl set_callback2 pop {r0} bx r0 @@ -717835,7 +717835,7 @@ sub_8174194: ; 8174194 movs r1, 0 movs r2, 0 bl sub_80F9BCC - ldr r0, =sub_817354C + 1 + ldr r0, =sub_817354C bl SetVBlankCallback ldr r1, =0x030022c0 movs r4, 0x87 @@ -717875,7 +717875,7 @@ sub_8174194: ; 8174194 movs r0, 0x54 movs r1, 0 bl lcd_io_set - ldr r0, =sub_8174324 + 1 + ldr r0, =sub_8174324 movs r1, 0 bl AddTask lsls r0, 24 @@ -717902,7 +717902,7 @@ sub_8174194: ; 8174194 lsls r0, 6 bl malloc_and_clear str r0, [r4] - ldr r0, =sub_8173560 + 1 + ldr r0, =sub_8173560 bl set_callback2 @08174308: pop {r4} @@ -717936,7 +717936,7 @@ sub_8174324: ; 8174324 adds r1, r6 lsls r1, 3 adds r1, r0 - ldr r0, =sub_81749A0 + 1 + ldr r0, =sub_81749A0 b @081743DA .align 2, 0 .pool @@ -717994,7 +717994,7 @@ sub_8174324: ; 8174324 lsls r1, 3 adds r1, r2 strh r0, [r1, 0xA] - ldr r0, =sub_81743EC + 1 + ldr r0, =sub_81743EC @081743DA: str r0, [r1] add sp, 0x4 @@ -718229,7 +718229,7 @@ sub_81743EC: ; 81743EC add r1, r8 lsls r1, 3 adds r1, r0 - ldr r0, =sub_81745FC + 1 + ldr r0, =sub_81745FC str r0, [r1] add sp, 0x18 pop {r3-r5} @@ -718368,7 +718368,7 @@ sub_81745FC: ; 81745FC movs r1, 0 movs r2, 0xE bl sub_8174A88 - ldr r0, =sub_8174728 + 1 + ldr r0, =sub_8174728 str r0, [r6] pop {r3-r5} mov r8, r3 @@ -718447,7 +718447,7 @@ sub_8174728: ; 8174728 subs r0, r2, 0x1 strh r0, [r1, 0xA] @081747A4: - ldr r0, =sub_81743EC + 1 + ldr r0, =sub_81743EC str r0, [r1] b @08174884 .align 2, 0 @@ -718464,7 +718464,7 @@ sub_8174728: ; 8174728 lsls r2, 1 bl MPlayVolumeControl @081747D2: - ldr r0, =sub_8174898 + 1 + ldr r0, =sub_8174898 str r0, [r4] b @08174884 .align 2, 0 @@ -718490,7 +718490,7 @@ sub_8174728: ; 8174728 adds r1, r6 lsls r1, 3 adds r1, r0 - ldr r0, =sub_8174898 + 1 + ldr r0, =sub_8174898 str r0, [r1] b @08174884 .align 2, 0 @@ -718512,7 +718512,7 @@ sub_8174728: ; 8174728 beq @08174858 subs r0, r2, 0x1 strh r0, [r1, 0xC] - ldr r0, =sub_81745FC + 1 + ldr r0, =sub_81745FC str r0, [r1] b @08174884 .align 2, 0 @@ -718538,7 +718538,7 @@ sub_8174728: ; 8174728 ldrh r0, [r2, 0xC] adds r0, 0x1 strh r0, [r2, 0xC] - ldr r0, =sub_81745FC + 1 + ldr r0, =sub_81745FC str r0, [r2] @08174884: pop {r3,r4} @@ -718577,7 +718577,7 @@ sub_8174898: ; 8174898 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81748F0 + 1 + ldr r1, =sub_81748F0 str r1, [r0] pop {r4,r5} pop {r0} @@ -718699,7 +718699,7 @@ sub_81749A0: ; 81749A0 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_8174A08 + 1 + ldr r1, =sub_8174A08 str r1, [r0] add sp, 0x10 pop {r4} @@ -718725,7 +718725,7 @@ sub_8174A08: ; 8174A08 adds r1, r2 lsls r1, 3 adds r1, r0 - ldr r0, =sub_8174898 + 1 + ldr r0, =sub_8174898 str r0, [r1] @08174A28: pop {r0} @@ -719710,7 +719710,7 @@ sub_8175280: ; 8175280 ldr r4, =0x020375e0 movs r0, 0xB4 strh r0, [r4] - ldr r0, =sub_8175364 + 1 + ldr r0, =sub_8175364 movs r1, 0 bl AddTask lsls r0, 24 @@ -719737,7 +719737,7 @@ sub_8175280: ; 8175280 thumb_func_start sub_81752C0 sub_81752C0: ; 81752C0 push {r4,lr} - ldr r0, =sub_8175364 + 1 + ldr r0, =sub_8175364 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -719919,7 +719919,7 @@ sub_8175364: ; 8175364 cmp r7, 0xFF beq @08175478 adds r4, r7, 0 - ldr r1, =sub_81752F4 + 1 + ldr r1, =sub_81752F4 adds r0, r4, 0 bl sub_8152438 bl GenerateRandomNumber @@ -720008,7 +720008,7 @@ sub_81754DC: ; 81754DC lsls r0, 3 adds r0, r2 ldr r1, [r0] - ldr r0, =sub_8175774 + 1 + ldr r0, =sub_8175774 cmp r1, r0 bne @08175522 bl sub_81754C8 @@ -720144,7 +720144,7 @@ sub_8175620: ; 8175620 bl sub_80A1A74 bl clear_tasks bl sub_8175548 - ldr r0, =sub_8175744 + 1 + ldr r0, =sub_8175744 movs r1, 0 bl AddTask lsls r0, 24 @@ -720186,7 +720186,7 @@ sub_8175620: ; 8175620 ldr r1, =0x0000fffc movs r0, 0x12 bl lcd_io_set - ldr r0, =sub_8175DA0 + 1 + ldr r0, =sub_8175DA0 movs r1, 0 bl AddTask lsls r0, 24 @@ -720206,11 +720206,11 @@ sub_8175620: ; 8175620 bl sub_80A1AD4 movs r0, 0x1 bl enable_irqs - ldr r0, =sub_81754C8 + 1 + ldr r0, =sub_81754C8 bl SetVBlankCallback ldr r0, =0x000001c7 bl m4aSongNumStart - ldr r0, =sub_81754DC + 1 + ldr r0, =sub_81754DC bl set_callback2 ldr r0, =0x0203bce5 mov r1, r8 @@ -720257,7 +720257,7 @@ sub_8175744: ; 8175744 adds r1, r2 lsls r1, 3 adds r1, r0 - ldr r0, =sub_8175774 + 1 + ldr r0, =sub_8175774 str r0, [r1] @08175764: pop {r0} @@ -720292,7 +720292,7 @@ sub_8175774: ; 8175774 movs r0, 0x80 lsls r0, 1 strh r0, [r4, 0x20] - ldr r0, =sub_8175A9C + 1 + ldr r0, =sub_8175A9C b @081757FA .align 2, 0 .pool @@ -720313,7 +720313,7 @@ sub_8175774: ; 8175774 movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, =sub_8175808 + 1 + ldr r0, =sub_8175808 b @081757FA .align 2, 0 .pool @@ -720329,7 +720329,7 @@ sub_8175774: ; 8175774 movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, =sub_81758A4 + 1 + ldr r0, =sub_81758A4 @081757FA: str r0, [r4] @081757FC: @@ -720362,7 +720362,7 @@ sub_8175808: ; 8175808 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =c2_080C9BFC + 1 + ldr r0, =c2_080C9BFC str r0, [r1] @08175836: pop {r4} @@ -720401,9 +720401,9 @@ c2_080C9BFC: ; 8175848 bl sub_80A1AD4 movs r0, 0x1 bl enable_irqs - ldr r0, =sub_81754C8 + 1 + ldr r0, =sub_81754C8 bl SetVBlankCallback - ldr r0, =sub_8175744 + 1 + ldr r0, =sub_8175744 str r0, [r5] @08175890: add sp, 0x4 @@ -720435,7 +720435,7 @@ sub_81758A4: ; 81758A4 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =sub_81758E4 + 1 + ldr r0, =sub_81758E4 str r0, [r1] @081758D2: pop {r4} @@ -720547,7 +720547,7 @@ sub_81758E4: ; 81758E4 .align 2, 0 .pool @081759F0: - ldr r0, =sub_81760FC + 1 + ldr r0, =sub_81760FC movs r1, 0 bl AddTask ldr r2, =0x03005e00 @@ -720608,7 +720608,7 @@ sub_81758E4: ; 81758E4 strb r0, [r1] ldr r0, =0x0203bd28 strh r5, [r0] - ldr r0, =sub_8175744 + 1 + ldr r0, =sub_8175744 str r0, [r4] @08175A7A: add sp, 0x4 @@ -720651,7 +720651,7 @@ sub_8175A9C: ; 8175A9C movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, =sub_8175AE4 + 1 + ldr r0, =sub_8175AE4 str r0, [r4] @08175AD8: add sp, 0x4 @@ -720680,7 +720680,7 @@ sub_8175AE4: ; 8175AE4 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =sub_8175B1C + 1 + ldr r0, =sub_8175B1C str r0, [r1] @08175B0A: pop {r4} @@ -720731,7 +720731,7 @@ sub_8175B1C: ; 8175B1C adds r0, r1 movs r1, 0xEB strh r1, [r0, 0x8] - ldr r1, =sub_8175B90 + 1 + ldr r1, =sub_8175B90 str r1, [r0] add sp, 0x4 pop {r4} @@ -720770,7 +720770,7 @@ sub_8175B90: ; 8175B90 movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, =sub_8175BD8 + 1 + ldr r0, =sub_8175BD8 str r0, [r4] @08175BCC: add sp, 0x4 @@ -720814,7 +720814,7 @@ sub_8175BD8: ; 8175BD8 movs r1, 0xE1 lsls r1, 5 strh r1, [r0, 0x8] - ldr r1, =sub_8175C34 + 1 + ldr r1, =sub_8175C34 str r1, [r0] @08175C1E: add sp, 0x4 @@ -720861,7 +720861,7 @@ sub_8175C34: ; 8175C34 movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, =sub_8175CC8 + 1 + ldr r0, =sub_8175CC8 str r0, [r4] b @08175CB8 .align 2, 0 @@ -721089,7 +721089,7 @@ sub_8175DA0: ; 8175DA0 lsls r0, 3 adds r5, r0, r5 ldr r1, [r5] - ldr r0, =sub_8175774 + 1 + ldr r0, =sub_8175774 mov r9, r2 cmp r1, r0 bne @08175F32 @@ -721488,7 +721488,7 @@ sub_81760FC: ; 81760FC lsls r0, 3 adds r0, r4 ldr r1, [r0] - ldr r0, =sub_8175774 + 1 + ldr r0, =sub_8175774 cmp r1, r0 bne @08176244 adds r0, r3, 0 @@ -722523,7 +722523,7 @@ sub_817664C: ; 817664C lsrs r0, 24 strh r0, [r4, 0x8] @081769E0: - ldr r0, =sub_817651C + 1 + ldr r0, =sub_817651C movs r1, 0 bl AddTask ldr r6, =0x03005e00 @@ -722557,7 +722557,7 @@ sub_817664C: ; 817664C lsls r0, 3 adds r0, r6 strh r7, [r0, 0xC] - ldr r0, =sub_817624C + 1 + ldr r0, =sub_817624C movs r1, 0 bl AddTask lsls r0, 24 @@ -722724,7 +722724,7 @@ sub_8176AB0: ; 8176AB0 adds r5, r6, 0 adds r5, 0x1C adds r2, r0, r5 - ldr r1, =sub_8176EE8 + 1 + ldr r1, =sub_8176EE8 str r1, [r2] adds r6, 0x8 adds r0, r6 @@ -722764,7 +722764,7 @@ sub_8176AB0: ; 8176AB0 adds r5, r6, 0 adds r5, 0x1C adds r2, r0, r5 - ldr r1, =sub_8176EE8 + 1 + ldr r1, =sub_8176EE8 str r1, [r2] adds r6, 0x8 adds r0, r6 @@ -722782,7 +722782,7 @@ sub_8176AB0: ; 8176AB0 adds r0, r2 lsls r0, 2 adds r5, r0, r5 - ldr r1, =sub_8176F90 + 1 + ldr r1, =sub_8176F90 str r1, [r5] adds r0, r6 ldr r1, =gUnknown_085E7010 @@ -723570,7 +723570,7 @@ sub_8177224: ; 8177224 adds r0, r6, 0 adds r0, 0x1C adds r1, r0 - ldr r0, =sub_8177050 + 1 + ldr r0, =sub_8177050 str r0, [r1] strh r4, [r2, 0x3A] ldr r0, =gUnknown_085E7068 @@ -724463,11 +724463,11 @@ sub_8177888: ; 8177888 bl sub_80A1AD4 movs r0, 0x1 bl enable_irqs - ldr r0, =sub_8177874 + 1 + ldr r0, =sub_8177874 bl SetVBlankCallback - ldr r0, =sub_8177A08 + 1 + ldr r0, =sub_8177A08 bl set_callback2 - ldr r0, =sub_8177A20 + 1 + ldr r0, =sub_8177A20 movs r1, 0 bl AddTask add sp, 0xC @@ -724505,7 +724505,7 @@ sub_8177A20: ; 8177A20 adds r1, r2 lsls r1, 3 adds r1, r0 - ldr r0, =sub_8177A50 + 1 + ldr r0, =sub_8177A50 str r0, [r1] @08177A40: pop {r0} @@ -724538,7 +724538,7 @@ sub_8177A50: ; 8177A50 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_8177A98 + 1 + ldr r1, =sub_8177A98 str r1, [r0] @08177A82: add sp, 0x4 @@ -724566,7 +724566,7 @@ sub_8177A98: ; 8177A98 bl Window_FreeMemory adds r0, r4, 0 bl remove_task - ldr r0, =sub_80861E8 + 1 + ldr r0, =sub_80861E8 bl set_callback2 @08177AC2: pop {r4} @@ -724732,7 +724732,7 @@ sub_8177C14: ; 8177C14 lsls r2, 5 adds r1, r2 strh r0, [r1] - ldr r0, =sub_8177C84 + 1 + ldr r0, =sub_8177C84 bl set_callback2 pop {r4} pop {r0} @@ -724889,7 +724889,7 @@ sub_8177CB0: ; 8177CB0 bl sub_8178404 b @08177DDC @08177DA6: - ldr r0, =sub_8178654 + 1 + ldr r0, =sub_8178654 movs r1, 0 bl AddTask b @08177DDC @@ -724928,9 +724928,9 @@ sub_8177CB0: ; 8177CB0 .align 2, 0 .pool @08177DF4: - ldr r0, =sub_8177C70 + 1 + ldr r0, =sub_8177C70 bl SetVBlankCallback - ldr r0, =sub_8177C54 + 1 + ldr r0, =sub_8177C54 bl set_callback2 movs r0, 0x1 b @08177E0E @@ -725862,7 +725862,7 @@ sub_81785D0: ; 81785D0 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_8178610 + 1 + ldr r1, =sub_8178610 str r1, [r0] add sp, 0x4 pop {r4} @@ -725889,7 +725889,7 @@ sub_8178610: ; 8178610 ldr r0, [r0] bl free bl Window_FreeMemory - ldr r0, =sub_81AD40C + 1 + ldr r0, =sub_81AD40C bl set_callback2 adds r0, r4, 0 bl remove_task @@ -725998,7 +725998,7 @@ sub_81786AC: ; 81786AC adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81787AC + 1 + ldr r1, =sub_81787AC str r1, [r0] @08178718: pop {r4-r7} @@ -726279,7 +726279,7 @@ sub_81787AC: ; 81787AC add r1, r8 lsls r1, 3 adds r1, r0 - ldr r0, =sub_8178654 + 1 + ldr r0, =sub_8178654 str r0, [r1] @08178922: pop {r3} @@ -726326,7 +726326,7 @@ sub_8178974: ; 8178974 bl reset_all_obj_data bl gpu_pal_allocator_reset bl clear_tasks - ldr r0, =sub_8178944 + 1 + ldr r0, =sub_8178944 bl SetVBlankCallback movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags @@ -726371,7 +726371,7 @@ sub_8178974: ; 8178974 movs r0, 0x50 movs r1, 0 bl lcd_io_set - ldr r0, =sub_8009404 + 1 + ldr r0, =sub_8009404 movs r1, 0 bl AddTask bl sub_80A2F30 @@ -726384,7 +726384,7 @@ sub_8178974: ; 8178974 movs r1, 0 movs r2, 0x2 bl rboxid_80040B8 - ldr r0, =sub_8178A78 + 1 + ldr r0, =sub_8178A78 bl set_callback2 @08178A22: add sp, 0x8 @@ -727017,7 +727017,7 @@ fullscreen_save_activate: ; 8178F90 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, =sub_8178FDC + 1 + ldr r0, =sub_8178FDC bl set_callback2 ldr r0, =0x0203bcfc strh r4, [r0] @@ -727250,7 +727250,7 @@ sub_8178FDC: ; 8178FDC bl sub_80A1AD4 movs r0, 0x1 bl enable_irqs - ldr r0, =sub_8178FC8 + 1 + ldr r0, =sub_8178FC8 bl SetVBlankCallback movs r1, 0x82 lsls r1, 5 @@ -727273,9 +727273,9 @@ sub_8178FDC: ; 8178FDC lsls r0, 24 cmp r0, 0 bne @08179272 - ldr r0, =sub_8179288 + 1 + ldr r0, =sub_8179288 bl set_callback2 - ldr r0, =sub_8179454 + 1 + ldr r0, =sub_8179454 bl SetVBlankCallback @08179272: add sp, 0xC @@ -727373,7 +727373,7 @@ sub_8179288: ; 8179288 movs r1, 0x1 movs r2, 0 bl sub_8178F44 - ldr r0, =sub_8179390 + 1 + ldr r0, =sub_8179390 bl set_callback2 b @08179380 .align 2, 0 @@ -727384,7 +727384,7 @@ sub_8179288: ; 8179288 movs r2, 0 bl sub_8178F44 @0817937A: - ldr r0, =sub_81793E0 + 1 + ldr r0, =sub_81793E0 bl set_callback2 @08179380: pop {r4-r6} @@ -727414,9 +727414,9 @@ sub_8179390: ; 8179390 movs r1, 0x1 movs r2, 0 bl sub_8178F44 - ldr r0, =sub_8178FC8 + 1 + ldr r0, =sub_8178FC8 bl SetVBlankCallback - ldr r0, =sub_81793E0 + 1 + ldr r0, =sub_81793E0 bl set_callback2 @081793C4: pop {r0} @@ -727444,9 +727444,9 @@ sub_81793E0: ; 81793E0 movs r1, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, =sub_8178FC8 + 1 + ldr r0, =sub_8178FC8 bl SetVBlankCallback - ldr r0, =sub_8179428 + 1 + ldr r0, =sub_8179428 bl set_callback2 @08179410: add sp, 0x4 @@ -727807,7 +727807,7 @@ nullsub_84: ; 81796FC thumb_func_start sub_8179700 sub_8179700: ; 8179700 push {lr} - ldr r0, =sub_8179778 + 1 + ldr r0, =sub_8179778 movs r1, 0x9 bl AddTask lsls r0, 24 @@ -727837,7 +727837,7 @@ sub_8179700: ; 8179700 thumb_func_start sub_817973C sub_817973C: ; 817973C push {lr} - ldr r0, =sub_8179778 + 1 + ldr r0, =sub_8179778 movs r1, 0x9 bl AddTask lsls r0, 24 @@ -728139,7 +728139,7 @@ sub_81799B8: ; 81799B8 adds r0, r2 lsls r0, 3 adds r0, r1 - ldr r2, =sub_8179934 + 1 + ldr r2, =sub_8179934 b @081799F0 .align 2, 0 .pool @@ -728149,7 +728149,7 @@ sub_81799B8: ; 81799B8 adds r0, r2 lsls r0, 3 adds r0, r1 - ldr r2, =sub_8179850 + 1 + ldr r2, =sub_8179850 @081799F0: lsrs r1, r2, 16 strh r1, [r0, 0x18] @@ -728531,9 +728531,9 @@ sub_8179B98: ; 8179B98 .align 2, 0 .pool @08179D4C: - ldr r0, =sub_8179B84 + 1 + ldr r0, =sub_8179B84 bl SetVBlankCallback - ldr r0, =sub_8179B68 + 1 + ldr r0, =sub_8179B68 bl set_callback2 movs r0, 0x1 b @08179D66 @@ -728930,7 +728930,7 @@ sub_817A030: ; 817A030 .align 2, 0 .pool @0817A0F8: - ldr r0, =sub_817A1C4 + 1 + ldr r0, =sub_817A1C4 str r0, [r1] b @0817A154 .align 2, 0 @@ -728985,7 +728985,7 @@ sub_817A030: ; 817A030 thumb_func_start sub_817A168 sub_817A168: ; 817A168 push {lr} - ldr r0, =sub_817A030 + 1 + ldr r0, =sub_817A030 movs r1, 0 bl AddTask lsls r0, 24 @@ -729021,7 +729021,7 @@ sub_817A194: ; 817A194 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =sub_817A320 + 1 + ldr r0, =sub_817A320 str r0, [r1] @0817A1B6: pop {r4} @@ -729116,7 +729116,7 @@ sub_817A1C4: ; 817A1C4 adds r0, r7 lsls r0, 3 adds r0, r1 - ldr r1, =sub_817A194 + 1 + ldr r1, =sub_817A194 str r1, [r0] add sp, 0x10 pop {r4-r7} @@ -729181,7 +729181,7 @@ sub_817A320: ; 817A320 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_817A2C0 + 1 + ldr r1, =sub_817A2C0 str r1, [r0] add sp, 0x4 pop {r4} @@ -729238,7 +729238,7 @@ sub_817A358: ; 817A358 adds r0, r7, 0 adds r0, 0x1C adds r0, r5, r0 - ldr r1, =nullsub_12 + 1 + ldr r1, =nullsub_12 str r1, [r0] mov r2, r9 ldr r0, [r2] @@ -729304,7 +729304,7 @@ sub_817A434: ; 817A434 strh r0, [r2, 0x30] adds r3, 0x1C adds r1, r3 - ldr r0, =sub_817A468 + 1 + ldr r0, =sub_817A468 str r0, [r1] bx lr .align 2, 0 @@ -729336,7 +729336,7 @@ sub_817A468: ; 817A468 ldrsh r0, [r4, r1] cmp r0, 0x9 bne @0817A49A - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r4, 0x1C] @0817A49A: pop {r4} @@ -729375,7 +729375,7 @@ sub_817A4A4: ; 817A4A4 str r2, [r1] adds r5, 0x1C adds r3, r5 - ldr r1, =nullsub_12 + 1 + ldr r1, =nullsub_12 str r1, [r3] bl obj_alloc_rotscale_entry adds r0, r4, 0 @@ -730255,7 +730255,7 @@ c2_clear_save_data_screen_2: ; 817ACC8 lsls r0, 24 cmp r0, 0 beq @0817ACDC - ldr r0, =sub_817ACE4 + 1 + ldr r0, =sub_817ACE4 movs r1, 0 bl AddTask @0817ACDC: @@ -730296,7 +730296,7 @@ sub_817ACE4: ; 817ACE4 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_817AD40 + 1 + ldr r1, =sub_817AD40 str r1, [r0] add sp, 0xC pop {r4} @@ -730346,7 +730346,7 @@ sub_817AD40: ; 817AD40 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, =sub_817ADC0 + 1 + ldr r1, =sub_817ADC0 str r1, [r0] b @0817ADB2 .align 2, 0 @@ -730356,7 +730356,7 @@ sub_817AD40: ; 817AD40 bl audio_play adds r0, r5, 0 bl remove_task - ldr r0, =sub_817AFD4 + 1 + ldr r0, =sub_817AFD4 bl set_callback2 @0817ADB2: add sp, 0xC @@ -730376,7 +730376,7 @@ sub_817ADC0: ; 817ADC0 bl calls_flash_erase_block adds r0, r4, 0 bl remove_task - ldr r0, =sub_817AFD4 + 1 + ldr r0, =sub_817AFD4 bl set_callback2 pop {r4} pop {r0} @@ -730547,7 +730547,7 @@ sub_817AE00: ; 817AE00 bl sub_80A1AD4 movs r0, 0x1 bl enable_irqs - ldr r0, =sub_817ADF4 + 1 + ldr r0, =sub_817ADF4 bl SetVBlankCallback ldr r0, =0x030022c0 movs r1, 0x87 @@ -730566,7 +730566,7 @@ sub_817AE00: ; 817AE00 ands r0, r1 cmp r0, 0 bne @0817AFC8 - ldr r0, =sub_817ADE4 + 1 + ldr r0, =sub_817ADE4 bl set_callback2 movs r0, 0x1 b @0817AFCA @@ -730965,7 +730965,7 @@ sub_817B3DC: ; 817B3DC mov r8, r0 lsls r3, 16 lsrs r3, 16 - ldr r1, =sub_817B458 + 1 + ldr r1, =sub_817B458 mov r9, r1 mov r0, r9 movs r1, 0 @@ -731680,7 +731680,7 @@ sub_817B948: ; 817B948 bl obj_anim_image_start adds r5, 0x1C adds r4, r5 - ldr r0, =sub_817B8E8 + 1 + ldr r0, =sub_817B8E8 str r0, [r4] adds r0, r6, 0 pop {r3} @@ -731736,7 +731736,7 @@ sub_817B9C4: ; 817B9C4 bl obj_anim_image_start adds r5, 0x1C adds r4, r5 - ldr r0, =sub_817B8E8 + 1 + ldr r0, =sub_817B8E8 str r0, [r4] adds r0, r6, 0 pop {r3} @@ -731921,7 +731921,7 @@ sub_817BB38: ; 817BB38 strb r0, [r2, 0x3] adds r4, 0x1C adds r3, r4 - ldr r0, =sub_817BA7C + 1 + ldr r0, =sub_817BA7C str r0, [r3] @0817BB82: pop {r4,r5} @@ -732032,7 +732032,7 @@ sub_817BC08: ; 817BC08 strb r0, [r2] adds r4, 0x1C adds r3, r4 - ldr r0, =sub_817BB94 + 1 + ldr r0, =sub_817BB94 str r0, [r3] @0817BC5E: pop {r4,r5} @@ -732123,7 +732123,7 @@ sub_817BCB8: ; 817BCB8 strb r0, [r2] adds r4, 0x1C adds r3, r4 - ldr r0, =sub_817BC70 + 1 + ldr r0, =sub_817BC70 str r0, [r3] @0817BD0E: pop {r4-r6} @@ -732297,7 +732297,7 @@ sub_817BDF0: ; 817BDF0 strb r0, [r4] adds r6, 0x1C adds r5, r6 - ldr r0, =sub_817BD20 + 1 + ldr r0, =sub_817BD20 str r0, [r5] @0817BE60: pop {r3} @@ -732328,7 +732328,7 @@ sub_817BE94: ; 817BE94 adds r4, r0, 0 lsls r4, 16 lsrs r4, 16 - ldr r0, =sub_817BEC4 + 1 + ldr r0, =sub_817BEC4 movs r1, 0 bl AddTask lsls r0, 24 @@ -732371,7 +732371,7 @@ sub_817BEC4: ; 817BEC4 movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, =sub_817BF14 + 1 + ldr r0, =sub_817BF14 str r0, [r5] movs r0, 0x8C bl audio_play @@ -732434,7 +732434,7 @@ sub_817BF14: ; 817BF14 @0817BF70: movs r0, 0x60 strh r0, [r1, 0x26] - ldr r0, =sub_817BF84 + 1 + ldr r0, =sub_817BF84 str r0, [r1] @0817BF78: pop {r4-r7} @@ -732476,7 +732476,7 @@ sub_817BF84: ; 817BF84 thumb_func_start sub_817BFB4 sub_817BFB4: ; 817BFB4 push {lr} - ldr r0, =sub_817BFCC + 1 + ldr r0, =sub_817BFCC movs r1, 0 bl AddTask lsls r0, 24 @@ -732501,7 +732501,7 @@ sub_817BFCC: ; 817BFCC adds r0, r1 movs r1, 0 strh r1, [r0, 0x26] - ldr r1, =sub_817C000 + 1 + ldr r1, =sub_817C000 str r1, [r0] movs r0, 0xB7 bl audio_play @@ -732551,7 +732551,7 @@ sub_817C000: ; 817C000 .align 2, 0 .pool @0817C048: - ldr r0, =sub_817C058 + 1 + ldr r0, =sub_817C058 str r0, [r1] @0817C04C: pop {r4-r6} @@ -732574,7 +732574,7 @@ sub_817C058: ; 817C058 thumb_func_start sub_817C068 sub_817C068: ; 817C068 push {lr} - ldr r0, =sub_817C080 + 1 + ldr r0, =sub_817C080 movs r1, 0 bl AddTask lsls r0, 24 @@ -732599,7 +732599,7 @@ sub_817C080: ; 817C080 adds r0, r1 movs r1, 0 strh r1, [r0, 0x26] - ldr r1, =sub_817C0B4 + 1 + ldr r1, =sub_817C0B4 str r1, [r0] movs r0, 0x66 bl audio_play @@ -732670,7 +732670,7 @@ sub_817C0B4: ; 817C0B4 .align 2, 0 .pool @0817C124: - ldr r0, =sub_817C134 + 1 + ldr r0, =sub_817C134 str r0, [r1] @0817C128: pop {r4-r6} @@ -732696,7 +732696,7 @@ sub_817C144: ; 817C144 adds r4, r0, 0 lsls r4, 16 lsrs r4, 16 - ldr r0, =sub_817C174 + 1 + ldr r0, =sub_817C174 movs r1, 0 bl AddTask lsls r0, 24 @@ -732740,7 +732740,7 @@ sub_817C174: ; 817C174 movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, =sub_817C1D4 + 1 + ldr r0, =sub_817C1D4 str r0, [r5] movs r0, 0xCA bl audio_play @@ -732812,7 +732812,7 @@ sub_817C1D4: ; 817C1D4 .align 2, 0 .pool @0817C250: - ldr r0, =sub_817C260 + 1 + ldr r0, =sub_817C260 str r0, [r1] @0817C254: add sp, 0x4 @@ -732849,7 +732849,7 @@ sub_817C280: ; 817C280 adds r4, r0, 0 lsls r4, 16 lsrs r4, 16 - ldr r0, =sub_817C2B0 + 1 + ldr r0, =sub_817C2B0 movs r1, 0 bl AddTask lsls r0, 24 @@ -732893,7 +732893,7 @@ sub_817C2B0: ; 817C2B0 movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, =sub_817C310 + 1 + ldr r0, =sub_817C310 str r0, [r5] movs r0, 0xCA bl audio_play @@ -732965,7 +732965,7 @@ sub_817C310: ; 817C310 .align 2, 0 .pool @0817C38C: - ldr r0, =sub_817C260 + 1 + ldr r0, =sub_817C260 str r0, [r1] @0817C390: add sp, 0x4 @@ -732994,7 +732994,7 @@ sub_817C3A0: ; 817C3A0 lsls r1, 24 lsrs r7, r1, 24 movs r1, 0 - ldr r3, =sub_817C4EC + 1 + ldr r3, =sub_817C4EC ldr r2, =0x00007fff @0817C3BA: lsls r0, r1, 1 @@ -733054,7 +733054,7 @@ sub_817C3A0: ; 817C3A0 mov r3, r9 adds r3, 0x1C adds r0, r2, r3 - ldr r1, =nullsub_68 + 1 + ldr r1, =nullsub_68 str r1, [r0] add r2, r9 ldrb r1, [r2, 0x1] @@ -733097,7 +733097,7 @@ sub_817C3A0: ; 817C3A0 lsls r1, 2 ldr r3, [sp, 0x24] adds r3, r1, r3 - ldr r0, =nullsub_68 + 1 + ldr r0, =nullsub_68 str r0, [r3] add r1, r9 ldrb r0, [r1, 0x1] @@ -733149,7 +733149,7 @@ sub_817C4EC: ; 817C4EC strh r0, [r1, 0x12] movs r0, 0x8 strh r0, [r1, 0x14] - ldr r0, =sub_817C510 + 1 + ldr r0, =sub_817C510 str r0, [r1] bx lr .align 2, 0 @@ -733191,7 +733191,7 @@ sub_817C510: ; 817C510 movs r1, 0x1 eors r0, r1 strh r0, [r2, 0x12] - ldr r0, =sub_817C560 + 1 + ldr r0, =sub_817C560 str r0, [r2] @0817C556: pop {r4} @@ -733217,7 +733217,7 @@ sub_817C560: ; 817C560 adds r5, r1, 0 cmp r0, 0 beq @0817C58C - ldr r0, =sub_817C72C + 1 + ldr r0, =sub_817C72C str r0, [r2] b @0817C670 .align 2, 0 @@ -733340,7 +733340,7 @@ sub_817C560: ; 817C560 bl rotscale_set_direct cmp r6, 0x2 bne @0817C670 - ldr r0, =sub_817C510 + 1 + ldr r0, =sub_817C510 str r0, [r5] @0817C670: add sp, 0x4 @@ -733674,10 +733674,10 @@ sub_817C8BC: ; 817C8BC .pool @0817C8D8: ldr r1, =0x03005db0 - ldr r0, =hm_add_c3_launch_phase_2 + 1 + ldr r0, =hm_add_c3_launch_phase_2 str r0, [r1] ldr r1, =0x0203ceec - ldr r0, =hm_teleport_run_dp02scr + 1 + ldr r0, =hm_teleport_run_dp02scr str r0, [r1] movs r0, 0x1 @0817C8E6: @@ -733715,7 +733715,7 @@ sub_817C91C: ; 817C91C adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r2, =sub_817C94C + 1 + ldr r2, =sub_817C94C lsrs r0, r2, 16 strh r0, [r1, 0x18] strh r2, [r1, 0x1A] @@ -738810,7 +738810,7 @@ sub_817F498: ; 817F498 movs r0, 0x8 ldrsh r4, [r2, r0] mov r8, r1 - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 mov r12, r0 cmp r4, 0 bne @0817F508 @@ -738880,7 +738880,7 @@ sub_817F544: ; 817F544 adds r5, r0, 0 lsls r4, r1, 24 lsrs r4, 24 - ldr r0, =sub_817F498 + 1 + ldr r0, =sub_817F498 movs r1, 0x80 bl AddTask lsls r0, 24 @@ -738923,7 +738923,7 @@ sub_817F594: ; 817F594 adds r5, r0, 0 lsls r6, r1, 24 lsrs r6, 24 - ldr r0, =sub_817F498 + 1 + ldr r0, =sub_817F498 movs r1, 0x80 bl AddTask lsls r0, 24 @@ -738970,7 +738970,7 @@ sub_817F594: ; 817F594 thumb_func_start sub_817F60C sub_817F60C: ; 817F60C - ldr r1, =nullsub_69 + 1 + ldr r1, =nullsub_69 str r1, [r0, 0x1C] bx lr .align 2, 0 @@ -739269,7 +739269,7 @@ pokemonanimfunc_01: ; 817F808 bl sub_817F6D4 adds r0, r6, 0 bl sub_817F77C - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r6, 0x1C] b @0817F88C .align 2, 0 @@ -739328,7 +739328,7 @@ pokemonanimfunc_02: ; 817F898 ldrsh r0, [r4, r2] cmp r0, 0x28 ble @0817F8B4 - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] movs r0, 0 b @0817F8EE @@ -739385,7 +739385,7 @@ sub_817F8FC: ; 817F8FC ldrsh r0, [r4, r2] cmp r1, r0 ble @0817F91C - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] movs r0, 0 b @0817F946 @@ -739432,7 +739432,7 @@ pokemonanimfunc_03: ; 817F95C strh r0, [r4, 0x2E] adds r0, r4, 0 bl sub_817F8FC - ldr r0, =sub_817F8FC + 1 + ldr r0, =sub_817F8FC str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -739452,7 +739452,7 @@ sub_817F978: ; 817F978 ldrsh r0, [r4, r2] cmp r1, r0 ble @0817F998 - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] movs r0, 0 b @0817F9C4 @@ -739500,7 +739500,7 @@ pokemonanimfunc_04: ; 817F9D8 strh r0, [r4, 0x2E] adds r0, r4, 0 bl sub_817F978 - ldr r0, =sub_817F978 + 1 + ldr r0, =sub_817F978 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -739519,7 +739519,7 @@ sub_817F9F4: ; 817F9F4 lsls r0, 1 cmp r1, r0 ble @0817FA14 - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x24] @@ -739584,7 +739584,7 @@ pokemonanimfunc_1E: ; 817FA6C strh r0, [r4, 0x2E] adds r0, r4, 0 bl sub_817F9F4 - ldr r0, =sub_817F9F4 + 1 + ldr r0, =sub_817F9F4 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -739603,7 +739603,7 @@ pokemonanimfunc_06: ; 817FA88 lsls r0, 2 cmp r2, r0 ble @0817FAA8 - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x24] @@ -739740,7 +739740,7 @@ pokemonanimfunc_09: ; 817FB64 bl sub_817F6D4 adds r0, r6, 0 bl sub_817F77C - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r6, 0x1C] b @0817FC12 .align 2, 0 @@ -739839,7 +739839,7 @@ sub_817FC20: ; 817FC20 adds r0, r1, 0 cmp r0, 0 bne @0817FC60 - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] b @0817FC6A .align 2, 0 @@ -739862,7 +739862,7 @@ sub_817FC20: ; 817FC20 asrs r0, 24 cmp r0, 0 bne @0817FC8C - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] b @0817FCBE .align 2, 0 @@ -739903,7 +739903,7 @@ pokemonanimfunc_0A: ; 817FCC4 push {r4,lr} adds r4, r0, 0 bl sub_817FC20 - ldr r0, =sub_817FC20 + 1 + ldr r0, =sub_817FC20 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -739922,7 +739922,7 @@ sub_817FCDC: ; 817FCDC lsls r0, 4 cmp r1, r0 ble @0817FCF8 - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] movs r0, 0 b @0817FD12 @@ -739963,7 +739963,7 @@ pokemonanimfunc_0F: ; 817FD24 strh r0, [r4, 0x3C] adds r0, r4, 0 bl sub_817FCDC - ldr r0, =sub_817FCDC + 1 + ldr r0, =sub_817FCDC str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -739982,7 +739982,7 @@ sub_817FD44: ; 817FD44 lsls r0, 4 cmp r1, r0 ble @0817FD60 - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] movs r0, 0 b @0817FD78 @@ -740020,7 +740020,7 @@ pokemonanimfunc_10: ; 817FD88 strh r0, [r4, 0x2E] adds r0, r4, 0 bl sub_817FD44 - ldr r0, =sub_817FD44 + 1 + ldr r0, =sub_817FD44 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -740040,7 +740040,7 @@ pokemonanimfunc_11: ; 817FDA4 lsls r0, 2 cmp r1, r0 ble @0817FDC8 - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r7, 0x1C] movs r0, 0 strh r0, [r7, 0x24] @@ -740175,7 +740175,7 @@ sub_817FE30: ; 817FE30 @0817FEB4: adds r0, r4, 0 bl sub_817F77C - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] b @0817FEF2 .align 2, 0 @@ -740233,7 +740233,7 @@ pokemonanimfunc_12: ; 817FF00 strh r3, [r1] adds r0, r4, 0 bl sub_817FE30 - ldr r0, =sub_817FE30 + 1 + ldr r0, =sub_817FE30 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -740274,7 +740274,7 @@ sub_817FF3C: ; 817FF3C bl sub_817F6D4 adds r0, r4, 0 bl sub_817F77C - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] b @0817FFAA .align 2, 0 @@ -740321,7 +740321,7 @@ pokemonanimfunc_1F: ; 817FFB8 strh r0, [r1, 0x8] adds r0, r4, 0 bl sub_817FF3C - ldr r0, =sub_817FF3C + 1 + ldr r0, =sub_817FF3C str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -740353,7 +740353,7 @@ sub_817FFF0: ; 817FFF0 movs r0, 0 strh r0, [r5, 0x24] strh r0, [r5, 0x26] - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r5, 0x1C] b @0818006A .align 2, 0 @@ -740430,7 +740430,7 @@ pokemonanimfunc_14: ; 8180090 strh r0, [r1, 0x2] adds r0, r4, 0 bl sub_817FFF0 - ldr r0, =sub_817FFF0 + 1 + ldr r0, =sub_817FFF0 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -740465,7 +740465,7 @@ pokemonanimfunc_15: ; 81800D0 movs r2, 0 movs r3, 0 bl pal_fade_1 - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] b @08180128 .align 2, 0 @@ -740517,7 +740517,7 @@ pokemonanimfunc_16: ; 8180134 bl sub_817F6D4 adds r0, r6, 0 bl sub_817F77C - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r6, 0x1C] b @08180204 .align 2, 0 @@ -740630,7 +740630,7 @@ pokemonanimfunc_17: ; 8180210 bl sub_817F6D4 adds r0, r5, 0 bl sub_817F77C - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r5, 0x1C] mov r0, r8 strh r0, [r5, 0x26] @@ -740770,7 +740770,7 @@ sub_818031C: ; 818031C @08180358: cmp r5, 0xFF bne @08180370 - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x26] @@ -740813,7 +740813,7 @@ pokemonanimfunc_19: ; 81803A0 strh r0, [r4, 0x2E] adds r0, r4, 0 bl sub_818031C - ldr r0, =sub_818031C + 1 + ldr r0, =sub_818031C str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -740850,7 +740850,7 @@ pokemonanimfunc_1A: ; 81803BC bl sub_817F6D4 adds r0, r4, 0 bl sub_817F77C - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x24] @@ -740939,7 +740939,7 @@ pokemonanimfunc_1B: ; 8180474 strh r0, [r6, 0x26] adds r0, r6, 0 bl sub_817F77C - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r6, 0x1C] b @081804E8 .align 2, 0 @@ -741005,7 +741005,7 @@ sub_81804F8: ; 81804F8 strh r5, [r6, 0x26] adds r0, r6, 0 bl sub_817F77C - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r6, 0x1C] b @08180582 .align 2, 0 @@ -741064,7 +741064,7 @@ pokemonanimfunc_1C: ; 8180594 strh r0, [r4, 0x2E] adds r0, r4, 0 bl sub_81804F8 - ldr r0, =sub_81804F8 + 1 + ldr r0, =sub_81804F8 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -741098,7 +741098,7 @@ sub_81805B0: ; 81805B0 strh r5, [r6, 0x26] adds r0, r6, 0 bl sub_817F77C - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r6, 0x1C] b @08180644 .align 2, 0 @@ -741162,7 +741162,7 @@ pokemonanimfunc_18: ; 8180654 strh r0, [r4, 0x2E] adds r0, r4, 0 bl sub_81805B0 - ldr r0, =sub_81805B0 + 1 + ldr r0, =sub_81805B0 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -741197,7 +741197,7 @@ pokemonanimfunc_1D: ; 8180670 strh r5, [r6, 0x24] adds r0, r6, 0 bl sub_817F77C - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r6, 0x1C] b @081806FC .align 2, 0 @@ -741281,7 +741281,7 @@ sub_8180714: ; 8180714 strh r6, [r4, 0x26] adds r0, r4, 0 bl sub_817F77C - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] b @081807FE .align 2, 0 @@ -741379,7 +741379,7 @@ pokemonanimfunc_00: ; 818080C strh r0, [r4, 0x2E] adds r0, r4, 0 bl sub_8180714 - ldr r0, =sub_8180714 + 1 + ldr r0, =sub_8180714 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -741413,7 +741413,7 @@ sub_8180828: ; 8180828 strh r6, [r5, 0x26] adds r0, r5, 0 bl sub_817F77C - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r5, 0x1C] b @081808D0 .align 2, 0 @@ -741575,7 +741575,7 @@ sub_8180900: ; 8180900 strh r5, [r4, 0x26] adds r0, r4, 0 bl sub_817F77C - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] b @08180A3A .align 2, 0 @@ -741682,7 +741682,7 @@ pokemonanimfunc_05: ; 8180A50 strh r0, [r1, 0x8] adds r0, r4, 0 bl sub_8180900 - ldr r0, =sub_8180900 + 1 + ldr r0, =sub_8180900 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -741717,7 +741717,7 @@ pokemonanimfunc_20: ; 8180A8C movs r1, 0x10 movs r2, 0 bl pal_fade_1 - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] b @08180AE8 .align 2, 0 @@ -741772,7 +741772,7 @@ pokemonanimfunc_21: ; 8180AF8 movs r2, 0 movs r3, 0x1F bl pal_fade_1 - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] b @08180B50 .align 2, 0 @@ -741826,7 +741826,7 @@ pokemonanimfunc_22: ; 8180B5C movs r1, 0x10 movs r2, 0 bl pal_fade_1 - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] b @08180BB6 .align 2, 0 @@ -741880,7 +741880,7 @@ pokemonanimfunc_23: ; 8180BC4 movs r1, 0x10 movs r2, 0 bl pal_fade_1 - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] b @08180C20 .align 2, 0 @@ -741935,7 +741935,7 @@ pokemonanimfunc_24: ; 8180C30 movs r1, 0x10 movs r2, 0 bl pal_fade_1 - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] b @08180C8C .align 2, 0 @@ -741969,7 +741969,7 @@ pokemonanimfunc_25: ; 8180C9C push {r4,lr} adds r4, r0, 0 bl sub_817F670 - ldr r0, =sub_8180CB4 + 1 + ldr r0, =sub_8180CB4 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -741994,7 +741994,7 @@ sub_8180CB4: ; 8180CB4 strh r0, [r4, 0x24] movs r0, 0x2 strh r0, [r4, 0x3C] - ldr r0, =sub_8180CE8 + 1 + ldr r0, =sub_8180CE8 str r0, [r4, 0x1C] @08180CD6: adds r0, r4, 0 @@ -742026,7 +742026,7 @@ sub_8180CE8: ; 8180CE8 movs r0, 0 strh r0, [r4, 0x3A] ldrh r1, [r4, 0x24] - ldr r5, =sub_8180D44 + 1 + ldr r5, =sub_8180D44 movs r3, 0x8 negs r3, r3 @08180D14: @@ -742106,7 +742106,7 @@ sub_8180D44: ; 8180D44 movs r0, 0 strh r0, [r4, 0x34] strh r5, [r4, 0x32] - ldr r0, =sub_8180DC0 + 1 + ldr r0, =sub_8180DC0 str r0, [r4, 0x1C] @08180DAE: adds r0, r4, 0 @@ -742149,7 +742149,7 @@ sub_8180DC0: ; 8180DC0 ldrsh r0, [r4, r1] cmp r0, 0 bne @08180E1C - ldr r0, =sub_8180E28 + 1 + ldr r0, =sub_8180E28 str r0, [r4, 0x1C] b @08180E1C .align 2, 0 @@ -742188,7 +742188,7 @@ sub_8180E28: ; 8180E28 strh r0, [r4, 0x24] adds r0, r4, 0 bl sub_817F77C - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] @08180E4A: adds r0, r4, 0 @@ -742207,7 +742207,7 @@ pokemonanimfunc_26: ; 8180E5C bl sub_817F670 movs r0, 0 strh r0, [r4, 0x34] - ldr r0, =sub_8180E78 + 1 + ldr r0, =sub_8180E78 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -742249,7 +742249,7 @@ sub_8180E78: ; 8180E78 ldr r0, =0x0000fff8 strh r0, [r4, 0x26] strh r1, [r4, 0x36] - ldr r0, =sub_8180ED0 + 1 + ldr r0, =sub_8180ED0 str r0, [r4, 0x1C] @08180EBA: adds r0, r4, 0 @@ -742286,7 +742286,7 @@ sub_8180ED0: ; 8180ED0 strh r0, [r4, 0x32] movs r0, 0xA strh r0, [r4, 0x34] - ldr r0, =sub_8180F2C + 1 + ldr r0, =sub_8180F2C str r0, [r4, 0x1C] @08180F08: ldrh r0, [r4, 0x36] @@ -742357,7 +742357,7 @@ sub_8180F2C: ; 8180F2C strh r5, [r4, 0x26] adds r0, r4, 0 bl sub_817F77C - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] @08180F96: adds r0, r4, 0 @@ -742413,7 +742413,7 @@ pokemonanimfunc_27: ; 8180FA8 ands r1, r0 mov r2, r12 strb r1, [r2] - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r3, 0x1C] @08180FFC: movs r0, 0x2 @@ -742431,7 +742431,7 @@ pokemonanimfunc_28: ; 818100C push {r4,lr} adds r4, r0, 0 bl sub_817F670 - ldr r0, =sub_8181024 + 1 + ldr r0, =sub_8181024 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -742461,7 +742461,7 @@ sub_8181024: ; 8181024 strh r0, [r4, 0x24] movs r0, 0x10 strh r0, [r4, 0x26] - ldr r0, =sub_8181068 + 1 + ldr r0, =sub_8181068 str r0, [r4, 0x1C] movs r0, 0xA0 strh r0, [r4, 0x32] @@ -742508,7 +742508,7 @@ sub_8181068: ; 8181068 ldrsh r0, [r4, r1] cmp r0, 0x20 bgt @081810B2 - ldr r0, =sub_81810C4 + 1 + ldr r0, =sub_81810C4 str r0, [r4, 0x1C] @081810B2: adds r0, r4, 0 @@ -742536,7 +742536,7 @@ sub_81810C4: ; 81810C4 bgt @081810E8 adds r0, r4, 0 bl sub_817F77C - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] @081810E8: adds r0, r4, 0 @@ -742553,7 +742553,7 @@ pokemonanimfunc_29: ; 81810F8 push {r4,lr} adds r4, r0, 0 bl sub_817F670 - ldr r0, =sub_8181110 + 1 + ldr r0, =sub_8181110 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -742579,7 +742579,7 @@ sub_8181110: ; 8181110 ble @08181134 movs r0, 0 strh r0, [r4, 0x32] - ldr r0, =sub_8181144 + 1 + ldr r0, =sub_8181144 str r0, [r4, 0x1C] @08181134: adds r0, r4, 0 @@ -742612,7 +742612,7 @@ sub_8181144: ; 8181144 strh r0, [r4, 0x26] movs r0, 0 strh r0, [r4, 0x32] - ldr r0, =sub_81811A4 + 1 + ldr r0, =sub_81811A4 str r0, [r4, 0x1C] b @08181186 .align 2, 0 @@ -742658,7 +742658,7 @@ sub_81811A4: ; 81811A4 strh r2, [r4, 0x26] adds r0, r4, 0 bl sub_817F77C - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] @081811CE: adds r0, r4, 0 @@ -742687,7 +742687,7 @@ pokemonanimfunc_2A: ; 81811E0 strh r0, [r1, 0x2] adds r0, r4, 0 bl sub_8181214 - ldr r0, =sub_8181214 + 1 + ldr r0, =sub_8181214 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -742840,7 +742840,7 @@ sub_8181214: ; 8181214 @08181328: adds r0, r4, 0 bl sub_817F77C - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] @08181332: movs r2, 0x80 @@ -742869,7 +742869,7 @@ pokemonanimfunc_2B: ; 8181354 movs r0, 0 strh r0, [r4, 0x3A] strh r0, [r4, 0x3C] - ldr r0, =sub_8181370 + 1 + ldr r0, =sub_8181370 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -742949,7 +742949,7 @@ sub_8181370: ; 8181370 bl sub_817F6D4 adds r0, r4, 0 bl sub_817F77C - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] @08181404: adds r0, r4, 0 @@ -742994,7 +742994,7 @@ pokemonanimfunc_2C: ; 8181418 ldrb r0, [r0] cmp r0, 0xFF bne @08181464 - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] b @081814CE .align 2, 0 @@ -743111,7 +743111,7 @@ sub_81814D4: ; 81814D4 @0818153C: adds r0, r6, 0 bl sub_817F77C - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r6, 0x1C] b @08181588 .align 2, 0 @@ -743173,7 +743173,7 @@ pokemonanimfunc_2D: ; 81815A0 strh r0, [r1, 0x8] adds r0, r4, 0 bl sub_81814D4 - ldr r0, =sub_81814D4 + 1 + ldr r0, =sub_81814D4 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -743236,7 +743236,7 @@ sub_81815D4: ; 81815D4 @0818163C: adds r0, r6, 0 bl sub_817F77C - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r6, 0x1C] b @0818168A .align 2, 0 @@ -743299,7 +743299,7 @@ pokemonanimfunc_2E: ; 81816A0 strh r0, [r1, 0x8] adds r0, r4, 0 bl sub_81815D4 - ldr r0, =sub_81815D4 + 1 + ldr r0, =sub_81815D4 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -743326,7 +743326,7 @@ pokemonanimfunc_2F: ; 81816D4 strh r0, [r4, 0x3A] movs r0, 0x80 strh r0, [r4, 0x3C] - ldr r0, =sub_8181708 + 1 + ldr r0, =sub_8181708 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -743375,7 +743375,7 @@ sub_8181708: ; 8181708 strh r0, [r4, 0x3C] movs r0, 0 strh r0, [r4, 0x34] - ldr r0, =sub_8181770 + 1 + ldr r0, =sub_8181770 str r0, [r4, 0x1C] @08181760: adds r0, r4, 0 @@ -743395,7 +743395,7 @@ sub_8181770: ; 8181770 ldrsh r0, [r1, r2] cmp r0, 0x14 bne @08181784 - ldr r0, =sub_8181794 + 1 + ldr r0, =sub_8181794 str r0, [r1, 0x1C] movs r0, 0 strh r0, [r1, 0x34] @@ -743457,7 +743457,7 @@ sub_8181794: ; 8181794 strh r6, [r4, 0x32] adds r0, r4, 0 bl sub_817F77C - ldr r0, =pokemonanimfunc_10 + 1 + ldr r0, =pokemonanimfunc_10 str r0, [r4, 0x1C] @08181800: adds r0, r4, 0 @@ -743611,7 +743611,7 @@ sub_8181810: ; 8181810 bl sub_817F6D4 adds r0, r5, 0 bl sub_817F77C - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r5, 0x1C] @0818193A: ldr r2, =0x03001240 @@ -743650,7 +743650,7 @@ pokemonanimfunc_30: ; 8181960 strh r0, [r1, 0x6] adds r0, r4, 0 bl sub_8181810 - ldr r0, =sub_8181810 + 1 + ldr r0, =sub_8181810 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -743671,7 +743671,7 @@ pokemonanimfunc_31: ; 8181994 lsls r0, 2 cmp r4, r0 ble @081819B8 - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r5, 0x1C] movs r0, 0 strh r0, [r5, 0x24] @@ -743813,7 +743813,7 @@ pokemonanimfunc_32: ; 8181A78 strh r5, [r4, 0x34] adds r0, r4, 0 bl sub_8181ABC - ldr r0, =sub_8181ABC + 1 + ldr r0, =sub_8181ABC str r0, [r4, 0x1C] pop {r4,r5} pop {r0} @@ -743851,7 +743851,7 @@ sub_8181ABC: ; 8181ABC cmp r0, 0x80 ble @08181AFC strh r5, [r4, 0x32] - ldr r0, =sub_8181B4C + 1 + ldr r0, =sub_8181B4C str r0, [r4, 0x1C] b @08181B3E .align 2, 0 @@ -743918,7 +743918,7 @@ sub_8181B4C: ; 8181B4C movs r0, 0 strh r0, [r4, 0x26] strh r0, [r4, 0x32] - ldr r0, =sub_8181C2C + 1 + ldr r0, =sub_8181C2C str r0, [r4, 0x1C] b @08181C1A .align 2, 0 @@ -744047,14 +744047,14 @@ sub_8181C2C: ; 8181C2C strh r2, [r4, 0x34] strh r2, [r4, 0x32] strh r2, [r4, 0x36] - ldr r0, =sub_8181ABC + 1 + ldr r0, =sub_8181ABC b @08181C84 .align 2, 0 .pool @08181C7C: adds r0, r4, 0 bl sub_817F77C - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 @08181C84: str r0, [r4, 0x1C] movs r0, 0 @@ -744161,7 +744161,7 @@ sub_8181CE8: ; 8181CE8 @08181D48: adds r0, r4, 0 bl sub_817F77C - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] @08181D52: adds r0, r4, 0 @@ -744226,7 +744226,7 @@ pokemonanimfunc_33: ; 8181DB0 strh r0, [r1, 0x6] adds r0, r4, 0 bl sub_8181CE8 - ldr r0, =sub_8181CE8 + 1 + ldr r0, =sub_8181CE8 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -744266,7 +744266,7 @@ pokemonanimfunc_34: ; 8181DE4 bl sub_817F6D4 adds r0, r4, 0 bl sub_817F77C - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] adds r0, r4, 0 bl sub_817F70C @@ -744369,7 +744369,7 @@ pokemonanimfunc_35: ; 8181E90 negs r1, r1 ands r1, r0 strb r1, [r2] - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r3, 0x1C] @08181EEE: pop {r4,r5} @@ -744386,7 +744386,7 @@ pokemonanimfunc_36: ; 8181EF8 bl sub_817F670 movs r0, 0 strh r0, [r4, 0x3C] - ldr r0, =sub_8181F14 + 1 + ldr r0, =sub_8181F14 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -744408,7 +744408,7 @@ sub_8181F14: ; 8181F14 movs r1, 0x20 strh r1, [r4, 0x3C] strh r0, [r4, 0x32] - ldr r0, =sub_8181F50 + 1 + ldr r0, =sub_8181F50 str r0, [r4, 0x1C] b @08181F38 .align 2, 0 @@ -744441,7 +744441,7 @@ sub_8181F50: ; 8181F50 lsls r0, 2 cmp r1, r0 ble @08181F74 - ldr r0, =sub_8181FC0 + 1 + ldr r0, =sub_8181FC0 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x3A] @@ -744505,7 +744505,7 @@ sub_8181FC0: ; 8181FC0 strh r1, [r4, 0x24] adds r0, r4, 0 bl sub_817F77C - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] b @08181FFE .align 2, 0 @@ -744563,7 +744563,7 @@ pokemonanimfunc_37: ; 818201C strh r0, [r4, 0x3C] adds r0, r4, 0 bl sub_817F77C - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] b @081820A6 .align 2, 0 @@ -744642,7 +744642,7 @@ pokemonanimfunc_38: ; 81820E0 movs r0, 0 strh r0, [r4, 0x3C] strh r0, [r4, 0x36] - ldr r0, =sub_81820FC + 1 + ldr r0, =sub_81820FC str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -744670,7 +744670,7 @@ sub_81820FC: ; 81820FC ble @0818214A movs r0, 0 strh r0, [r4, 0x36] - ldr r0, =sub_818216C + 1 + ldr r0, =sub_818216C str r0, [r4, 0x1C] b @0818214A .align 2, 0 @@ -744718,7 +744718,7 @@ sub_818216C: ; 818216C ble @0818218C movs r0, 0x1 strh r0, [r4, 0x3A] - ldr r0, =sub_81821CC + 1 + ldr r0, =sub_81821CC str r0, [r4, 0x1C] b @081821AA .align 2, 0 @@ -744771,7 +744771,7 @@ sub_81821CC: ; 81821CC ble @081821F0 movs r0, 0x20 strh r0, [r4, 0x3C] - ldr r0, =sub_8182248 + 1 + ldr r0, =sub_8182248 str r0, [r4, 0x1C] @081821F0: movs r1, 0x3C @@ -744831,7 +744831,7 @@ sub_8182248: ; 8182248 strh r0, [r4, 0x3C] adds r0, r4, 0 bl sub_817F77C - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] b @0818228E .align 2, 0 @@ -744877,7 +744877,7 @@ pokemonanimfunc_39: ; 81822B0 ldrsh r0, [r4, r2] cmp r0, 0x28 ble @081822D0 - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x24] @@ -745043,7 +745043,7 @@ pokemonanimfunc_3A: ; 8182370 bl sub_817F6D4 adds r0, r4, 0 bl sub_817F77C - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] @08182410: movs r2, 0x3C @@ -745153,7 +745153,7 @@ pokemonanimfunc_3B: ; 81824A0 bl sub_817F6D4 adds r0, r4, 0 bl sub_817F77C - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] b @08182540 .align 2, 0 @@ -745238,7 +745238,7 @@ pokemonanimfunc_3C: ; 8182548 bl sub_817F6D4 adds r0, r4, 0 bl sub_817F77C - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] b @081825D4 .align 2, 0 @@ -745287,7 +745287,7 @@ pokemonanimfunc_3D: ; 81825DC push {r4,lr} adds r4, r0, 0 bl sub_817F670 - ldr r0, =sub_81825F8 + 1 + ldr r0, =sub_81825F8 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x3C] @@ -745312,7 +745312,7 @@ sub_81825F8: ; 81825F8 ble @0818261C strh r1, [r4, 0x3C] strh r1, [r4, 0x3A] - ldr r0, =sub_8182648 + 1 + ldr r0, =sub_8182648 str r0, [r4, 0x1C] movs r0, 0x40 b @08182620 @@ -745423,7 +745423,7 @@ sub_8182648: ; 8182648 bne @081826EE movs r0, 0 strh r0, [r4, 0x3C] - ldr r0, =sub_81826F8 + 1 + ldr r0, =sub_81826F8 str r0, [r4, 0x1C] @081826EE: pop {r4,r5} @@ -745458,7 +745458,7 @@ sub_81826F8: ; 81826F8 ble @08182742 adds r0, r4, 0 bl sub_817F77C - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x26] @@ -745500,7 +745500,7 @@ sub_8182764: ; 8182764 strh r0, [r4, 0x24] adds r0, r4, 0 bl sub_817F77C - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] movs r2, 0x80 lsls r2, 1 @@ -745605,7 +745605,7 @@ sub_8182830: ; 8182830 strh r0, [r4, 0x24] adds r0, r4, 0 bl sub_817F77C - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] movs r2, 0x80 lsls r2, 1 @@ -745728,7 +745728,7 @@ pokemonanimfunc_40: ; 81828FC adds r1, r2, 0 movs r3, 0 bl sub_817F6D4 - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] b @0818299E .align 2, 0 @@ -745816,7 +745816,7 @@ pokemonanimfunc_41: ; 81829AC adds r1, r2, 0 movs r3, 0 bl sub_817F6D4 - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] b @08182A5E .align 2, 0 @@ -745912,7 +745912,7 @@ pokemonanimfunc_42: ; 8182A6C adds r1, r2, 0 movs r3, 0 bl sub_817F6D4 - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] b @08182B16 .align 2, 0 @@ -745983,7 +745983,7 @@ pokemonanimfunc_43: ; 8182B24 lsls r0, 4 cmp r1, r0 ble @08182B48 - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x3A] @@ -746230,7 +746230,7 @@ pokemonanimfunc_44: ; 8182C18 movs r0, 0 strh r0, [r4, 0x24] strh r0, [r4, 0x26] - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] @08182D12: adds r0, r4, 0 @@ -746250,7 +746250,7 @@ pokemonanimfunc_45: ; 8182D24 strh r0, [r4, 0x2E] adds r0, r4, 0 bl sub_8180714 - ldr r0, =sub_8180714 + 1 + ldr r0, =sub_8180714 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -746267,7 +746267,7 @@ pokemonanimfunc_46: ; 8182D40 strh r0, [r4, 0x2E] adds r0, r4, 0 bl sub_817F8FC - ldr r0, =sub_817F8FC + 1 + ldr r0, =sub_817F8FC str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -746284,7 +746284,7 @@ pokemonanimfunc_47: ; 8182D5C strh r0, [r4, 0x2E] adds r0, r4, 0 bl sub_817F978 - ldr r0, =sub_817F978 + 1 + ldr r0, =sub_817F978 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -746313,7 +746313,7 @@ pokemonanimfunc_48: ; 8182D78 strh r0, [r1, 0x8] adds r0, r4, 0 bl sub_8180900 - ldr r0, =sub_8180900 + 1 + ldr r0, =sub_8180900 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -746380,7 +746380,7 @@ pokemonanimfunc_4C: ; 8182E00 strh r0, [r4, 0x3C] adds r0, r4, 0 bl sub_817FCDC - ldr r0, =sub_817FCDC + 1 + ldr r0, =sub_817FCDC str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -746397,7 +746397,7 @@ pokemonanimfunc_4D: ; 8182E20 strh r0, [r4, 0x2E] adds r0, r4, 0 bl sub_817FD44 - ldr r0, =sub_817FD44 + 1 + ldr r0, =sub_817FD44 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -746428,7 +746428,7 @@ pokemonanimfunc_4E: ; 8182E3C strh r0, [r1, 0x4] adds r0, r4, 0 bl sub_817FE30 - ldr r0, =sub_817FE30 + 1 + ldr r0, =sub_817FE30 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -746459,7 +746459,7 @@ pokemonanimfunc_4F: ; 8182E7C strh r0, [r1, 0x2] adds r0, r4, 0 bl sub_817FFF0 - ldr r0, =sub_817FFF0 + 1 + ldr r0, =sub_817FFF0 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -746476,7 +746476,7 @@ pokemonanimfunc_50: ; 8182EBC strh r0, [r4, 0x2E] adds r0, r4, 0 bl sub_818031C - ldr r0, =sub_818031C + 1 + ldr r0, =sub_818031C str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -746493,7 +746493,7 @@ pokemonanimfunc_51: ; 8182ED8 strh r0, [r4, 0x2E] adds r0, r4, 0 bl sub_81804F8 - ldr r0, =sub_81804F8 + 1 + ldr r0, =sub_81804F8 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -746510,7 +746510,7 @@ pokemonanimfunc_52: ; 8182EF4 strh r0, [r4, 0x2E] adds r0, r4, 0 bl sub_817F9F4 - ldr r0, =sub_817F9F4 + 1 + ldr r0, =sub_817F9F4 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -746538,7 +746538,7 @@ pokemonanimfunc_53: ; 8182F10 strh r0, [r1, 0x8] adds r0, r4, 0 bl sub_817FF3C - ldr r0, =sub_817FF3C + 1 + ldr r0, =sub_817FF3C str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -746566,7 +746566,7 @@ pokemonanimfunc_54: ; 8182F48 strh r0, [r1, 0x4] adds r0, r4, 0 bl sub_8181214 - ldr r0, =sub_8181214 + 1 + ldr r0, =sub_8181214 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -746594,7 +746594,7 @@ pokemonanimfunc_55: ; 8182F80 strh r0, [r1, 0x4] adds r0, r4, 0 bl sub_8181810 - ldr r0, =sub_8181810 + 1 + ldr r0, =sub_8181810 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -746626,7 +746626,7 @@ pokemonanimfunc_56: ; 8182FB8 strh r5, [r4, 0x34] adds r0, r4, 0 bl sub_8181ABC - ldr r0, =sub_8181ABC + 1 + ldr r0, =sub_8181ABC str r0, [r4, 0x1C] pop {r4,r5} pop {r0} @@ -746652,7 +746652,7 @@ pokemonanimfunc_07: ; 8182FFC strh r0, [r1, 0x6] adds r0, r4, 0 bl sub_8181CE8 - ldr r0, =sub_8181CE8 + 1 + ldr r0, =sub_8181CE8 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -746680,7 +746680,7 @@ pokemonanimfunc_08: ; 8183030 strh r0, [r1, 0x4] adds r0, r4, 0 bl sub_8181CE8 - ldr r0, =sub_8181CE8 + 1 + ldr r0, =sub_8181CE8 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -746706,7 +746706,7 @@ pokemonanimfunc_0B: ; 8183068 strh r0, [r1, 0x8] adds r0, r4, 0 bl sub_81814D4 - ldr r0, =sub_81814D4 + 1 + ldr r0, =sub_81814D4 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -746734,7 +746734,7 @@ pokemonanimfunc_0C: ; 818309C strh r0, [r1, 0x4] adds r0, r4, 0 bl sub_81814D4 - ldr r0, =sub_81814D4 + 1 + ldr r0, =sub_81814D4 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -746760,7 +746760,7 @@ pokemonanimfunc_0D: ; 81830D4 strh r0, [r1, 0x8] adds r0, r4, 0 bl sub_81815D4 - ldr r0, =sub_81815D4 + 1 + ldr r0, =sub_81815D4 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -746788,7 +746788,7 @@ pokemonanimfunc_0E: ; 8183108 strh r0, [r1, 0x4] adds r0, r4, 0 bl sub_81815D4 - ldr r0, =sub_81815D4 + 1 + ldr r0, =sub_81815D4 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -746807,7 +746807,7 @@ sub_8183140: ; 8183140 lsls r0, 4 cmp r2, r0 ble @0818315C - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] movs r0, 0 b @08183180 @@ -746855,7 +746855,7 @@ pokemonanimfunc_57: ; 8183194 strh r0, [r4, 0x3C] adds r0, r4, 0 bl sub_8183140 - ldr r0, =sub_8183140 + 1 + ldr r0, =sub_8183140 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -746874,7 +746874,7 @@ pokemonanimfunc_58: ; 81831B4 strh r0, [r4, 0x3C] adds r0, r4, 0 bl sub_8183140 - ldr r0, =sub_8183140 + 1 + ldr r0, =sub_8183140 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -746894,7 +746894,7 @@ pokemonanimfunc_59: ; 81831D4 lsls r0, 4 cmp r1, r0 ble @081831F8 - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x3A] @@ -747050,7 +747050,7 @@ sub_81832C8: ; 81832C8 bgt @08183310 adds r0, r6, 0 bl sub_817F77C - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r6, 0x1C] b @081833DC .align 2, 0 @@ -747221,7 +747221,7 @@ sub_8183418: ; 8183418 bgt @08183460 adds r0, r6, 0 bl sub_817F77C - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r6, 0x1C] b @08183538 .align 2, 0 @@ -747410,7 +747410,7 @@ sub_8183574: ; 8183574 @081835C2: cmp r5, 0xFF bne @081835D8 - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x26] @@ -747463,7 +747463,7 @@ pokemonanimfunc_5C: ; 8183618 strh r0, [r4, 0x3C] adds r0, r4, 0 bl sub_8183574 - ldr r0, =sub_8183574 + 1 + ldr r0, =sub_8183574 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -747482,7 +747482,7 @@ pokemonanimfunc_5D: ; 8183638 strh r0, [r4, 0x3C] adds r0, r4, 0 bl sub_817FCDC - ldr r0, =sub_817FCDC + 1 + ldr r0, =sub_817FCDC str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -747499,7 +747499,7 @@ pokemonanimfunc_5E: ; 8183658 strh r0, [r4, 0x2E] adds r0, r4, 0 bl sub_817F8FC - ldr r0, =sub_817F8FC + 1 + ldr r0, =sub_817F8FC str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -747517,7 +747517,7 @@ pokemonanimfunc_5F: ; 8183674 ldrsh r0, [r4, r2] cmp r0, 0x28 ble @08183690 - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] movs r0, 0 b @081836CA @@ -747572,7 +747572,7 @@ pokemonanimfunc_60: ; 81836D8 ldrsh r0, [r4, r2] cmp r0, 0x28 ble @081836F4 - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] movs r0, 0 b @0818372E @@ -747628,7 +747628,7 @@ pokemonanimfunc_61: ; 818373C strh r0, [r4, 0x3C] adds r0, r4, 0 bl sub_8183140 - ldr r0, =sub_8183140 + 1 + ldr r0, =sub_8183140 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -747647,7 +747647,7 @@ pokemonanimfunc_62: ; 818375C strh r0, [r4, 0x3C] adds r0, r4, 0 bl sub_8183574 - ldr r0, =sub_8183574 + 1 + ldr r0, =sub_8183574 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -747666,7 +747666,7 @@ pokemonanimfunc_63: ; 818377C strh r0, [r4, 0x3C] adds r0, r4, 0 bl sub_8183574 - ldr r0, =sub_8183574 + 1 + ldr r0, =sub_8183574 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -747697,7 +747697,7 @@ pokemonanimfunc_64: ; 818379C strh r0, [r1, 0x2] adds r0, r4, 0 bl sub_817FFF0 - ldr r0, =sub_817FFF0 + 1 + ldr r0, =sub_817FFF0 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -747736,7 +747736,7 @@ sub_81837DC: ; 81837DC bgt @08183824 adds r0, r7, 0 bl sub_817F77C - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r7, 0x1C] b @0818392C .align 2, 0 @@ -747915,7 +747915,7 @@ pokemonanimfunc_66: ; 818396C lsls r0, 4 cmp r1, r0 ble @08183990 - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x3A] @@ -748051,7 +748051,7 @@ pokemonanimfunc_67: ; 8183A60 lsls r0, 4 cmp r1, r0 ble @08183A84 - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x3A] @@ -748225,7 +748225,7 @@ sub_8183B4C: ; 8183B4C lsls r0, 16 cmp r0, 0 bne @08183BC8 - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] b @08183C06 .align 2, 0 @@ -748277,7 +748277,7 @@ pokemonanimfunc_68: ; 8183C0C strh r0, [r4, 0x3A] adds r0, r4, 0 bl sub_8183B4C - ldr r0, =sub_8183B4C + 1 + ldr r0, =sub_8183B4C str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -748296,7 +748296,7 @@ pokemonanimfunc_69: ; 8183C2C strh r0, [r4, 0x3A] adds r0, r4, 0 bl sub_8183B4C - ldr r0, =sub_8183B4C + 1 + ldr r0, =sub_8183B4C str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -748314,7 +748314,7 @@ pokemonanimfunc_6A: ; 8183C4C strh r0, [r4, 0x3A] adds r0, r4, 0 bl sub_8183B4C - ldr r0, =sub_8183B4C + 1 + ldr r0, =sub_8183B4C str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -748339,7 +748339,7 @@ sub_8183C6C: ; 8183C6C bgt @08183CA4 adds r0, r4, 0 bl sub_817F77C - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] movs r2, 0x80 lsls r2, 1 @@ -748783,7 +748783,7 @@ sub_8183FA8: ; 8183FA8 ldrsh r0, [r4, r3] cmp r0, 0x1 bgt @08183FD0 - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x24] @@ -748947,7 +748947,7 @@ sub_81840C4: ; 81840C4 ldrsh r0, [r5, r3] cmp r1, r0 bgt @081840EC - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r5, 0x1C] b @081840F4 .align 2, 0 @@ -749273,7 +749273,7 @@ pokemonanimfunc_82: ; 81842DC bgt @08184348 adds r0, r4, 0 bl sub_817F77C - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] b @08184358 .align 2, 0 @@ -749340,7 +749340,7 @@ pokemonanimfunc_83: ; 8184360 bgt @081843CC adds r0, r4, 0 bl sub_817F77C - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] b @081843DC .align 2, 0 @@ -749407,7 +749407,7 @@ pokemonanimfunc_84: ; 81843E4 bgt @08184450 adds r0, r4, 0 bl sub_817F77C - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] b @08184460 .align 2, 0 @@ -749448,7 +749448,7 @@ sub_8184468: ; 8184468 bl sub_817F6D4 adds r0, r6, 0 bl sub_817F77C - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r6, 0x1C] b @08184544 .align 2, 0 @@ -749636,7 +749636,7 @@ sub_81845D4: ; 81845D4 strh r0, [r4, 0x24] movs r0, 0x2 strh r0, [r4, 0x3C] - ldr r0, =sub_8184610 + 1 + ldr r0, =sub_8184610 str r0, [r4, 0x1C] @081845FE: adds r0, r4, 0 @@ -749662,7 +749662,7 @@ sub_8184610: ; 8184610 lsls r1, 16 cmp r1, 0 blt @0818462E - ldr r0, =sub_8184640 + 1 + ldr r0, =sub_8184640 str r0, [r4, 0x1C] @0818462E: adds r0, r4, 0 @@ -749693,7 +749693,7 @@ sub_8184640: ; 8184640 cmp r1, r0 ble @08184668 strh r2, [r4, 0x24] - ldr r0, =sub_8184678 + 1 + ldr r0, =sub_8184678 str r0, [r4, 0x1C] @08184668: adds r0, r4, 0 @@ -749717,7 +749717,7 @@ sub_8184678: ; 8184678 ldrsh r0, [r4, r3] cmp r1, r0 blt @08184698 - ldr r0, =sub_81846B8 + 1 + ldr r0, =sub_81846B8 str r0, [r4, 0x1C] b @081846AC .align 2, 0 @@ -749756,7 +749756,7 @@ sub_81846B8: ; 81846B8 strh r0, [r4, 0x24] adds r0, r4, 0 bl sub_817F77C - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] @081846DA: adds r0, r4, 0 @@ -749784,7 +749784,7 @@ pokemonanimfunc_88: ; 81846EC strh r2, [r4, 0x34] movs r0, 0x2 strh r0, [r4, 0x32] - ldr r0, =sub_81845D4 + 1 + ldr r0, =sub_81845D4 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -749809,7 +749809,7 @@ pokemonanimfunc_89: ; 8184718 strh r2, [r4, 0x34] movs r0, 0x1 strh r0, [r4, 0x32] - ldr r0, =sub_81845D4 + 1 + ldr r0, =sub_81845D4 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -749833,7 +749833,7 @@ pokemonanimfunc_8A: ; 8184744 strh r1, [r4, 0x34] movs r0, 0x1 strh r0, [r4, 0x32] - ldr r0, =sub_81845D4 + 1 + ldr r0, =sub_81845D4 str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -749888,7 +749888,7 @@ sub_8184798: ; 8184798 bne @081847D0 movs r0, 0 strh r0, [r4, 0x24] - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] b @0818482E .align 2, 0 @@ -750058,7 +750058,7 @@ sub_81848E0: ; 81848E0 movs r2, 0 movs r3, 0x1F bl pal_fade_1 - ldr r0, =sub_8184D88 + 1 + ldr r0, =sub_8184D88 str r0, [r4, 0x1C] b @0818492A .align 2, 0 @@ -750699,7 +750699,7 @@ sub_8184D88: ; 8184D88 ands r0, r1 cmp r0, 0 beq @08184D9C - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r2, 0x1C] @08184D9C: pop {r0} @@ -751058,7 +751058,7 @@ sub_8185054: ; 8185054 movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, =sub_80384E4 + 1 + ldr r0, =sub_80384E4 bl set_callback2 movs r0, 0xFF b @081850C6 @@ -752303,9 +752303,9 @@ sub_8185B1C: ; 8185B1C cmp r1, 0 bne @08185B4A ldr r0, =0x030022c0 - ldr r1, =sub_8185AB0 + 1 + ldr r1, =sub_8185AB0 str r1, [r0, 0x8] - ldr r0, =sub_8036760 + 1 + ldr r0, =sub_8036760 bl set_callback2 adds r0, r4, 0 bl remove_task @@ -752621,7 +752621,7 @@ sub_8185E24: ; 8185E24 bl sub_8185EB8 adds r0, r4, 0 bl sub_8185B60 - ldr r0, =sub_8185B1C + 1 + ldr r0, =sub_8185B1C movs r1, 0x1 bl AddTask lsls r0, 24 @@ -752637,7 +752637,7 @@ sub_8185E24: ; 8185E24 str r5, [r0] movs r0, 0 bl current_map_music_set__default_for_battle - ldr r0, =sub_8185E8C + 1 + ldr r0, =sub_8185E8C bl set_callback2 @08185E6E: adds r0, r4, 0 @@ -753514,7 +753514,7 @@ sub_81864EC: ; 81864EC ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8186508 + 1 + ldr r1, =sub_8186508 str r1, [r0] bx lr .align 2, 0 @@ -753572,7 +753572,7 @@ sub_8186558: ; 8186558 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 bne @0818657C bl sub_81871AC @@ -753598,7 +753598,7 @@ sub_8186590: ; 8186590 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 bne @081865B4 bl sub_81871AC @@ -753625,7 +753625,7 @@ sub_81865C8: ; 81865C8 adds r0, 0x1C adds r0, r2, r0 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 bne @0818661A adds r0, r2, r5 @@ -753729,7 +753729,7 @@ sub_8186678: ; 8186678 adds r1, 0x1C adds r0, r1 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 mov r8, r2 cmp r1, r0 bne @08186764 @@ -753762,7 +753762,7 @@ sub_8186678: ; 8186678 adds r5, 0x1C adds r0, r5 ldr r4, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 mov r8, r2 cmp r4, r0 bne @08186764 @@ -753908,7 +753908,7 @@ sub_8186678: ; 8186678 ldrb r0, [r2] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8186630 + 1 + ldr r1, =sub_8186630 str r1, [r0] @0818683A: pop {r3,r4} @@ -754177,7 +754177,7 @@ sub_818686C: ; 818686C adds r2, 0x1C adds r0, r2 ldr r3, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r3, r0 bne @08186B26 ldr r0, =0x020241e4 @@ -754206,7 +754206,7 @@ sub_818686C: ; 818686C adds r2, 0x1C adds r0, r2 ldr r4, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r4, r0 bne @08186B26 ldr r6, =0x020241e4 @@ -754352,7 +754352,7 @@ sub_818686C: ; 818686C ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8186678 + 1 + ldr r1, =sub_8186678 str r1, [r0] @08186C10: pop {r3,r4} @@ -754381,7 +754381,7 @@ sub_8186C48: ; 8186C48 adds r0, 0x1C adds r0, r2, r0 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 bne @08186CFA adds r0, r2, r4 @@ -754658,7 +754658,7 @@ sub_8186EA4: ; 8186EA4 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 bne @08186EF0 ldr r0, =0x020244d0 @@ -754681,7 +754681,7 @@ sub_8186EA4: ; 8186EA4 ldrb r1, [r4] lsls r1, 2 adds r1, r0 - ldr r0, =sub_8186F14 + 1 + ldr r0, =sub_8186F14 str r0, [r1] @08186EF0: pop {r4} @@ -754723,10 +754723,10 @@ sub_8186F14: ; 8186F14 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 beq @08186F5E - ldr r0, =nullsub_18 + 1 + ldr r0, =nullsub_18 cmp r1, r0 bne @08186F6E @08186F5E: @@ -754772,7 +754772,7 @@ sub_8186F94: ; 8186F94 adds r1, 0x1C adds r0, r1 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 bne @08187050 ldrb r1, [r3] @@ -754831,7 +754831,7 @@ sub_8186F94: ; 8186F94 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8186EA4 + 1 + ldr r1, =sub_8186EA4 str r1, [r0] @08187050: pop {r4-r7} @@ -754880,7 +754880,7 @@ sub_8187084: ; 8187084 adds r0, 0x1C adds r0, r3, r0 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 bne @08187120 ldr r0, [r6] @@ -754916,7 +754916,7 @@ sub_8187084: ; 8187084 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8186F94 + 1 + ldr r1, =sub_8186F94 str r1, [r0] @08187120: pop {r4-r6} @@ -754985,7 +754985,7 @@ sub_81871AC: ; 81871AC ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8186508 + 1 + ldr r1, =sub_8186508 str r1, [r0] ldr r0, =0x02022fec ldr r0, [r0] @@ -757286,7 +757286,7 @@ sub_818843C: ; 818843C ldrb r0, [r6] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8186C48 + 1 + ldr r1, =sub_8186C48 str r1, [r0] pop {r3-r5} mov r8, r3 @@ -757323,7 +757323,7 @@ sub_818858C: ; 818858C ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8187084 + 1 + ldr r1, =sub_8187084 str r1, [r0] pop {r4} pop {r0} @@ -757369,7 +757369,7 @@ sub_81885D8: ; 81885D8 lsls r0, 16 lsrs r0, 16 mov r8, r0 - ldr r0, =sub_805D714 + 1 + ldr r0, =sub_805D714 bl object_new_hidden_with_callback ldr r1, =0x03005d7c mov r10, r1 @@ -757481,7 +757481,7 @@ sub_81885D8: ; 81885D8 adds r1, r5, 0 adds r1, 0x1C adds r0, r1 - ldr r1, =nullsub_12 + 1 + ldr r1, =nullsub_12 str r1, [r0] movs r0, 0 movs r1, 0xFE @@ -757530,7 +757530,7 @@ sub_8188768: ; 8188768 ldrb r0, [r6] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8188800 + 1 + ldr r1, =sub_8188800 str r1, [r0] b @081887EC .align 2, 0 @@ -757631,7 +757631,7 @@ sub_8188800: ; 8188800 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8186D9C + 1 + ldr r1, =sub_8186D9C str r1, [r0] @0818887E: pop {r4-r6} @@ -757813,13 +757813,13 @@ sub_818888C: ; 818888C lsls r0, 2 adds r4, 0x1C adds r0, r4 - ldr r1, =sub_805D7AC + 1 + ldr r1, =sub_805D7AC str r1, [r0] ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8186558 + 1 + ldr r1, =sub_8186558 str r1, [r0] pop {r3,r4} mov r8, r3 @@ -757890,7 +757890,7 @@ sub_8188A4C: ; 8188A4C adds r1, r5, 0 adds r1, 0x1C adds r0, r1 - ldr r1, =sub_80A6EEC + 1 + ldr r1, =sub_80A6EEC str r1, [r0] ldrb r0, [r4] adds r0, r6 @@ -757899,13 +757899,13 @@ sub_8188A4C: ; 8188A4C adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, =nullsub_12 + 1 + ldr r1, =nullsub_12 bl oamt_set_x3A_32 ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =sub_81865C8 + 1 + ldr r1, =sub_81865C8 str r1, [r0] pop {r4-r6} pop {r0} @@ -757977,13 +757977,13 @@ sub_8188AF8: ; 8188AF8 lsls r0, 2 adds r2, 0x1C adds r0, r2 - ldr r1, =sub_8039934 + 1 + ldr r1, =sub_8039934 str r1, [r0] ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8186D58 + 1 + ldr r1, =sub_8186D58 str r1, [r0] @08188B88: pop {r4-r6} @@ -758154,7 +758154,7 @@ sub_8188BD4: ; 8188BD4 ldrb r0, [r6] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8188D0C + 1 + ldr r1, =sub_8188D0C str r1, [r0] @08188CFA: pop {r4-r6} @@ -758372,7 +758372,7 @@ sub_8188E90: ; 8188E90 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8186E10 + 1 + ldr r1, =sub_8186E10 str r1, [r0] pop {r4} pop {r0} @@ -758590,7 +758590,7 @@ sub_8188FD0: ; 8188FD0 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8186D04 + 1 + ldr r1, =sub_8186D04 str r1, [r0] add sp, 0x4 pop {r3,r4} @@ -758651,7 +758651,7 @@ sub_81890CC: ; 81890CC ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =sub_818714C + 1 + ldr r1, =sub_818714C str r1, [r0] @08189120: pop {r4} @@ -758699,7 +758699,7 @@ sub_8189144: ; 8189144 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, =sub_818714C + 1 + ldr r1, =sub_818714C str r1, [r0] @08189194: pop {r4,r5} @@ -758901,7 +758901,7 @@ sub_81892AC: ; 81892AC ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =bx_blink_t2 + 1 + ldr r1, =bx_blink_t2 str r1, [r0] @0818930A: pop {r4} @@ -759098,7 +759098,7 @@ sub_8189438: ; 8189438 adds r1, r4, 0 adds r1, 0x1C adds r0, r1 - ldr r1, =sub_80A6EEC + 1 + ldr r1, =sub_80A6EEC str r1, [r0] ldrb r0, [r6] adds r0, r5 @@ -759107,9 +759107,9 @@ sub_8189438: ; 8189438 adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, =sub_818962C + 1 + ldr r1, =sub_818962C bl oamt_set_x3A_32 - ldr r0, =c3_0803D564 + 1 + ldr r0, =c3_0803D564 movs r1, 0x5 bl AddTask lsls r0, 24 @@ -759141,7 +759141,7 @@ sub_8189438: ; 8189438 adds r0, r1 lsls r0, 3 adds r0, r4 - ldr r1, =sub_8073C30 + 1 + ldr r1, =sub_8073C30 str r1, [r0] @081894FA: ldr r0, [r3] @@ -759154,7 +759154,7 @@ sub_8189438: ; 8189438 ldrb r0, [r6] lsls r0, 2 adds r0, r1 - ldr r1, =nullsub_70 + 1 + ldr r1, =nullsub_70 str r1, [r0] pop {r4-r6} pop {r0} @@ -759247,7 +759247,7 @@ c3_0803D564: ; 8189548 ldrb r0, [r2] lsls r0, 2 adds r0, r1 - ldr r1, =sub_818686C + 1 + ldr r1, =sub_818686C str r1, [r0] mov r0, r9 strb r0, [r2] @@ -759396,7 +759396,7 @@ sub_8189648: ; 8189648 ldrb r1, [r7] lsls r1, 2 adds r1, r0 - ldr r0, =sub_818975C + 1 + ldr r0, =sub_818975C str r0, [r1] @08189742: pop {r4-r7} @@ -759468,7 +759468,7 @@ sub_81897A4: ; 81897A4 adds r0, r1 lsls r0, 3 adds r0, r2 - ldr r1, =sub_8073C30 + 1 + ldr r1, =sub_8073C30 str r1, [r0] @081897D6: bl sub_81871AC @@ -759570,7 +759570,7 @@ sub_8189860: ; 8189860 ldrb r1, [r6] lsls r1, 2 adds r1, r0 - ldr r0, =sub_818717C + 1 + ldr r0, =sub_818717C str r0, [r1] @081898B8: add sp, 0x4 @@ -759630,7 +759630,7 @@ sub_81898E0: ; 81898E0 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, =sub_80587B0 + 1 + ldr r1, =sub_80587B0 str r1, [r0] pop {r0} bx r0 @@ -759655,7 +759655,7 @@ sub_818994C: ; 818994C ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8189968 + 1 + ldr r1, =sub_8189968 str r1, [r0] bx lr .align 2, 0 @@ -759713,7 +759713,7 @@ sub_81899B8: ; 81899B8 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 bne @081899DC bl sub_818A514 @@ -759740,7 +759740,7 @@ sub_81899F0: ; 81899F0 adds r1, 0x1C adds r0, r1 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 bne @08189A40 movs r0, 0 @@ -759848,7 +759848,7 @@ sub_8189AA0: ; 8189AA0 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 bne @08189B42 b @08189B48 @@ -759867,7 +759867,7 @@ sub_8189AA0: ; 8189AA0 adds r2, 0x1C adds r0, r2 ldr r4, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r4, r0 bne @08189B42 movs r0, 0x2 @@ -760036,7 +760036,7 @@ sub_8189AA0: ; 8189AA0 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 bne @08189CE6 b @08189CE4 @@ -760055,7 +760055,7 @@ sub_8189AA0: ; 8189AA0 adds r2, 0x1C adds r0, r2 ldr r4, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r4, r0 bne @08189CE6 movs r0, 0x2 @@ -760096,7 +760096,7 @@ sub_8189AA0: ; 8189AA0 @08189D10: lsls r0, 2 adds r0, r1 - ldr r1, =sub_8189A58 + 1 + ldr r1, =sub_8189A58 str r1, [r0] @08189D18: pop {r3,r4} @@ -760381,7 +760381,7 @@ sub_8189D40: ; 8189D40 adds r4, 0x1C adds r0, r4 ldr r2, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r2, r0 bne @0818A02A ldr r0, =0x020241e4 @@ -760461,7 +760461,7 @@ sub_8189D40: ; 8189D40 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8189AA0 + 1 + ldr r1, =sub_8189AA0 str r1, [r0] @0818A02A: pop {r3-r5} @@ -760762,7 +760762,7 @@ sub_818A2B4: ; 818A2B4 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 bne @0818A306 adds r0, r3, 0 @@ -760787,7 +760787,7 @@ sub_818A2B4: ; 818A2B4 ldrb r1, [r4] lsls r1, 2 adds r1, r0 - ldr r0, =sub_818A328 + 1 + ldr r0, =sub_818A328 str r0, [r1] @0818A306: pop {r4} @@ -760824,7 +760824,7 @@ sub_818A328: ; 818A328 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 bne @0818A364 bl sub_818A514 @@ -760875,7 +760875,7 @@ sub_818A37C: ; 818A37C bl gpu_tile_obj_free_by_tag adds r0, r4, 0 bl gpu_pal_free_tag - ldr r0, =c3_0802FDF4 + 1 + ldr r0, =c3_0802FDF4 movs r1, 0xA bl AddTask ldr r0, =0x0202406e @@ -760921,7 +760921,7 @@ sub_818A37C: ; 818A37C ldrb r0, [r7] lsls r0, 2 adds r0, r1 - ldr r1, =sub_818A2B4 + 1 + ldr r1, =sub_818A2B4 str r1, [r0] @0818A438: pop {r3} @@ -760972,7 +760972,7 @@ sub_818A470: ; 818A470 adds r0, 0x1C adds r0, r3, r0 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 bne @0818A4E8 ldr r0, [r6] @@ -760992,7 +760992,7 @@ sub_818A470: ; 818A470 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =sub_818A37C + 1 + ldr r1, =sub_818A37C str r1, [r0] @0818A4E8: pop {r4-r6} @@ -761011,7 +761011,7 @@ sub_818A514: ; 818A514 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8189968 + 1 + ldr r1, =sub_8189968 str r1, [r0] ldr r0, =0x02022fec ldr r0, [r0] @@ -763388,7 +763388,7 @@ sub_818B8E0: ; 818B8E0 ldrb r0, [r6] lsls r0, 2 adds r0, r1 - ldr r1, =sub_818A064 + 1 + ldr r1, =sub_818A064 str r1, [r0] pop {r3} mov r8, r3 @@ -763437,7 +763437,7 @@ sub_818B9FC: ; 818B9FC ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, =sub_818A470 + 1 + ldr r1, =sub_818A470 str r1, [r0] pop {r4-r6} pop {r0} @@ -763480,7 +763480,7 @@ sub_818BA6C: ; 818BA6C lsls r0, 16 lsrs r0, 16 mov r8, r0 - ldr r0, =sub_805D714 + 1 + ldr r0, =sub_805D714 bl object_new_hidden_with_callback ldr r1, =0x03005d7c mov r9, r1 @@ -763585,7 +763585,7 @@ sub_818BA6C: ; 818BA6C adds r1, r5, 0 adds r1, 0x1C adds r0, r1 - ldr r1, =nullsub_12 + 1 + ldr r1, =nullsub_12 str r1, [r0] movs r0, 0 movs r1, 0xFF @@ -763634,7 +763634,7 @@ sub_818BBE8: ; 818BBE8 ldrb r0, [r6] lsls r0, 2 adds r0, r1 - ldr r1, =sub_818BC78 + 1 + ldr r1, =sub_818BC78 str r1, [r0] b @0818BC66 .align 2, 0 @@ -763733,7 +763733,7 @@ sub_818BC78: ; 818BC78 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, =sub_818A1B0 + 1 + ldr r1, =sub_818A1B0 str r1, [r0] @0818BCF6: pop {r4-r6} @@ -763927,7 +763927,7 @@ sub_818BD04: ; 818BD04 adds r1, r5, 0 adds r1, 0x1C adds r0, r1 - ldr r1, =sub_805D7AC + 1 + ldr r1, =sub_805D7AC str r1, [r0] ldrb r0, [r6] adds r0, r4 @@ -764025,7 +764025,7 @@ sub_818BD04: ; 818BD04 lsls r0, 2 adds r4, 0x1C adds r0, r4 - ldr r1, =sub_805D7AC + 1 + ldr r1, =sub_805D7AC str r1, [r0] @0818BF72: ldr r1, =0x03005d60 @@ -764033,7 +764033,7 @@ sub_818BD04: ; 818BD04 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, =sub_81899B8 + 1 + ldr r1, =sub_81899B8 str r1, [r0] pop {r3,r4} mov r8, r3 @@ -764103,7 +764103,7 @@ sub_818BFB8: ; 818BFB8 adds r1, r5, 0 adds r1, 0x1C adds r0, r1 - ldr r1, =sub_80A6EEC + 1 + ldr r1, =sub_80A6EEC str r1, [r0] ldrb r0, [r4] adds r0, r6 @@ -764112,13 +764112,13 @@ sub_818BFB8: ; 818BFB8 adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, =nullsub_12 + 1 + ldr r1, =nullsub_12 bl oamt_set_x3A_32 ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =sub_81899F0 + 1 + ldr r1, =sub_81899F0 str r1, [r0] pop {r4-r6} pop {r0} @@ -764218,13 +764218,13 @@ sub_818C064: ; 818C064 lsls r0, 2 adds r2, 0x1C adds r0, r2 - ldr r1, =sub_8039C00 + 1 + ldr r1, =sub_8039C00 str r1, [r0] ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, =sub_818A114 + 1 + ldr r1, =sub_818A114 str r1, [r0] @0818C12E: pop {r4-r6} @@ -764395,7 +764395,7 @@ sub_818C180: ; 818C180 ldrb r0, [r6] lsls r0, 2 adds r0, r1 - ldr r1, =bx_move_anim_2 + 1 + ldr r1, =bx_move_anim_2 str r1, [r0] @0818C2A6: pop {r4-r6} @@ -764613,7 +764613,7 @@ sub_818C43C: ; 818C43C ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =sub_818A220 + 1 + ldr r1, =sub_818A220 str r1, [r0] pop {r4} pop {r0} @@ -764672,7 +764672,7 @@ sub_818C4D8: ; 818C4D8 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, =sub_818C49C + 1 + ldr r1, =sub_818C49C str r1, [r0] b @0818C522 .align 2, 0 @@ -764884,7 +764884,7 @@ sub_818C5E8: ; 818C5E8 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, =sub_818A0A4 + 1 + ldr r1, =sub_818A0A4 str r1, [r0] add sp, 0x4 pop {r3,r4} @@ -764945,7 +764945,7 @@ sub_818C6F4: ; 818C6F4 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =sub_818A58C + 1 + ldr r1, =sub_818A58C str r1, [r0] @0818C748: pop {r4} @@ -764993,7 +764993,7 @@ sub_818C76C: ; 818C76C ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, =sub_818A58C + 1 + ldr r1, =sub_818A58C str r1, [r0] @0818C7BC: pop {r4,r5} @@ -765195,7 +765195,7 @@ sub_818C8D4: ; 818C8D4 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =sub_818A238 + 1 + ldr r1, =sub_818A238 str r1, [r0] @0818C932: pop {r4} @@ -765392,7 +765392,7 @@ sub_818CA64: ; 818CA64 adds r1, r4, 0 adds r1, 0x1C adds r0, r1 - ldr r1, =sub_80A6EEC + 1 + ldr r1, =sub_80A6EEC str r1, [r0] ldrb r2, [r6] adds r0, r2, r5 @@ -765409,7 +765409,7 @@ sub_818CA64: ; 818CA64 adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, =sub_805CC00 + 1 + ldr r1, =sub_805CC00 bl oamt_set_x3A_32 ldrb r0, [r6] adds r0, r5 @@ -765472,7 +765472,7 @@ sub_818CA64: ; 818CA64 ands r0, r2 orrs r0, r4 strb r0, [r1, 0x5] - ldr r0, =sub_818CC24 + 1 + ldr r0, =sub_818CC24 movs r1, 0x5 bl AddTask lsls r0, 24 @@ -765504,7 +765504,7 @@ sub_818CA64: ; 818CA64 adds r0, r1 lsls r0, 3 adds r0, r4 - ldr r1, =sub_8073C30 + 1 + ldr r1, =sub_8073C30 str r1, [r0] @0818CBD4: ldr r0, [r3] @@ -765517,7 +765517,7 @@ sub_818CA64: ; 818CA64 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, =nullsub_120 + 1 + ldr r1, =nullsub_120 str r1, [r0] pop {r4-r6} pop {r0} @@ -765629,7 +765629,7 @@ sub_818CC24: ; 818CC24 ldrb r0, [r2] lsls r0, 2 adds r0, r1 - ldr r1, =sub_8189D40 + 1 + ldr r1, =sub_8189D40 str r1, [r0] mov r3, r9 strb r3, [r2] @@ -765724,7 +765724,7 @@ sub_818CD30: ; 818CD30 ldrb r1, [r5] lsls r1, 2 adds r1, r0 - ldr r0, =bx_increment_dp11b_field_5_till_x60_then_resume + 1 + ldr r0, =bx_increment_dp11b_field_5_till_x60_then_resume str r0, [r1] @0818CDD4: pop {r4-r6} @@ -765796,7 +765796,7 @@ sub_818CE3C: ; 818CE3C adds r0, r1 lsls r0, 3 adds r0, r2 - ldr r1, =sub_8073C30 + 1 + ldr r1, =sub_8073C30 str r1, [r0] @0818CE6E: bl sub_818A514 @@ -765898,7 +765898,7 @@ sub_818CEF8: ; 818CEF8 ldrb r1, [r6] lsls r1, 2 adds r1, r0 - ldr r0, =sub_818A5BC + 1 + ldr r0, =sub_818A5BC str r0, [r1] @0818CF50: add sp, 0x4 @@ -765946,7 +765946,7 @@ sub_818CF78: ; 818CF78 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =sub_80587B0 + 1 + ldr r1, =sub_80587B0 str r1, [r0] pop {r4} pop {r0} @@ -766378,7 +766378,7 @@ oamt_spawn_poke_or_trainer_picture: ; 818D1EC str r1, [r5, 0xC] ldr r0, =gUnknown_082EC6A8 str r0, [r5, 0x10] - ldr r0, =nullsub_122 + 1 + ldr r0, =nullsub_122 str r0, [r5, 0x14] mov r2, r10 str r2, [sp] @@ -766650,7 +766650,7 @@ sub_818D3E4: ; 818D3E4 ldr r0, =gUnknown_082EC6A8 str r0, [r4, 0x10] @0818D518: - ldr r2, =nullsub_122 + 1 + ldr r2, =nullsub_122 str r2, [r4, 0x14] ldr r0, [sp, 0x1C] str r0, [sp] @@ -769188,7 +769188,7 @@ sub_818E914: ; 818E914 thumb_func_start sub_818E92C sub_818E92C: ; 818E92C push {lr} - ldr r1, =c2_exit_to_overworld_2_switch + 1 + ldr r1, =c2_exit_to_overworld_2_switch movs r0, 0x3 bl sub_81357FC pop {r0} @@ -772375,7 +772375,7 @@ sub_819033C: ; 819033C thumb_func_start sub_81903B8 sub_81903B8: ; 81903B8 push {r4,r5,lr} - ldr r0, =sub_8190400 + 1 + ldr r0, =sub_8190400 movs r1, 0 bl AddTask lsls r0, 24 @@ -772394,7 +772394,7 @@ sub_81903B8: ; 81903B8 strh r0, [r4, 0xA] strh r5, [r4, 0xC] strh r5, [r4, 0xE] - ldr r0, =sub_8194B54 + 1 + ldr r0, =sub_8194B54 bl set_callback2 pop {r4,r5} pop {r0} @@ -772620,7 +772620,7 @@ sub_8190400: ; 8190400 .align 2, 0 .pool @08190634: - ldr r0, =sub_8194B70 + 1 + ldr r0, =sub_8194B70 bl SetVBlankCallback ldr r4, =0x0203cd78 movs r0, 0x14 @@ -772639,7 +772639,7 @@ sub_8190400: ; 8190400 cmp r6, 0xF ble @0819064A bl sub_80D2F04 - ldr r0, =sub_8190CD4 + 1 + ldr r0, =sub_8190CD4 movs r1, 0 bl AddTask lsls r0, 24 @@ -772807,7 +772807,7 @@ sub_8190790: ; 8190790 asrs r0, 16 cmp r0, 0x28 bne @081907F0 - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r2, 0x1C] b @081907F0 .align 2, 0 @@ -772863,7 +772863,7 @@ sub_81907F8: ; 81907F8 asrs r0, 16 cmp r0, 0x28 bne @08190858 - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r2, 0x1C] b @08190858 .align 2, 0 @@ -772923,7 +772923,7 @@ sub_8190860: ; 8190860 asrs r0, 16 cmp r0, 0x40 bne @081908C0 - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r2, 0x1C] b @081908C0 .align 2, 0 @@ -772980,7 +772980,7 @@ sub_81908CC: ; 81908CC asrs r0, 16 cmp r0, 0x40 bne @08190930 - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r2, 0x1C] b @08190930 .align 2, 0 @@ -773062,7 +773062,7 @@ sub_8190950: ; 8190950 asrs r0, 16 cmp r0, 0x28 bne @081909C0 - ldr r0, =sub_8190938 + 1 + ldr r0, =sub_8190938 str r0, [r4, 0x1C] b @081909C0 .align 2, 0 @@ -773126,7 +773126,7 @@ sub_81909CC: ; 81909CC asrs r0, 16 cmp r0, 0x28 bne @08190A3C - ldr r0, =sub_8190938 + 1 + ldr r0, =sub_8190938 str r0, [r4, 0x1C] b @08190A3C .align 2, 0 @@ -773194,7 +773194,7 @@ sub_8190A48: ; 8190A48 asrs r0, 16 cmp r0, 0x40 bne @08190AB8 - ldr r0, =sub_8190938 + 1 + ldr r0, =sub_8190938 str r0, [r4, 0x1C] b @08190AB8 .align 2, 0 @@ -773259,7 +773259,7 @@ sub_8190AC4: ; 8190AC4 asrs r0, 16 cmp r0, 0x40 bne @08190B34 - ldr r0, =sub_8190938 + 1 + ldr r0, =sub_8190938 str r0, [r4, 0x1C] b @08190B34 .align 2, 0 @@ -773931,7 +773931,7 @@ sub_8190CD4: ; 8190CD4 adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, =sub_8190790 + 1 + ldr r1, =sub_8190790 str r1, [r0] ldrb r0, [r2] lsls r1, r0, 4 @@ -773975,7 +773975,7 @@ sub_8190CD4: ; 8190CD4 adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, =sub_8190950 + 1 + ldr r1, =sub_8190950 str r1, [r0] ldrb r0, [r2] lsls r1, r0, 4 @@ -774028,7 +774028,7 @@ sub_8190CD4: ; 8190CD4 adds r0, r1 lsls r0, 2 adds r0, r7 - ldr r1, =sub_8190790 + 1 + ldr r1, =sub_8190790 str r1, [r0] ldrb r1, [r2] lsls r0, r1, 4 @@ -774070,7 +774070,7 @@ sub_8190CD4: ; 8190CD4 adds r0, r1 lsls r0, 2 adds r0, r7 - ldr r1, =sub_8190950 + 1 + ldr r1, =sub_8190950 str r1, [r0] ldrb r1, [r2] lsls r0, r1, 4 @@ -774331,7 +774331,7 @@ sub_8190CD4: ; 8190CD4 adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, =sub_81907F8 + 1 + ldr r1, =sub_81907F8 str r1, [r0] ldrb r0, [r2] lsls r1, r0, 4 @@ -774375,7 +774375,7 @@ sub_8190CD4: ; 8190CD4 adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, =sub_81909CC + 1 + ldr r1, =sub_81909CC str r1, [r0] ldrb r0, [r2] lsls r1, r0, 4 @@ -774428,7 +774428,7 @@ sub_8190CD4: ; 8190CD4 adds r0, r1 lsls r0, 2 adds r0, r7 - ldr r1, =sub_81907F8 + 1 + ldr r1, =sub_81907F8 str r1, [r0] ldrb r1, [r2] lsls r0, r1, 4 @@ -774470,7 +774470,7 @@ sub_8190CD4: ; 8190CD4 adds r0, r1 lsls r0, 2 adds r0, r7 - ldr r1, =sub_81909CC + 1 + ldr r1, =sub_81909CC str r1, [r0] ldrb r1, [r2] lsls r0, r1, 4 @@ -774636,7 +774636,7 @@ sub_8190CD4: ; 8190CD4 adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, =sub_8190860 + 1 + ldr r1, =sub_8190860 str r1, [r0] ldrb r0, [r2] lsls r1, r0, 4 @@ -774680,7 +774680,7 @@ sub_8190CD4: ; 8190CD4 adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, =sub_8190A48 + 1 + ldr r1, =sub_8190A48 str r1, [r0] ldrb r0, [r2] lsls r1, r0, 4 @@ -774733,7 +774733,7 @@ sub_8190CD4: ; 8190CD4 adds r0, r1 lsls r0, 2 adds r0, r7 - ldr r1, =sub_8190860 + 1 + ldr r1, =sub_8190860 str r1, [r0] ldrb r1, [r2] lsls r0, r1, 4 @@ -774775,7 +774775,7 @@ sub_8190CD4: ; 8190CD4 adds r0, r1 lsls r0, 2 adds r0, r7 - ldr r1, =sub_8190A48 + 1 + ldr r1, =sub_8190A48 str r1, [r0] ldrb r1, [r2] lsls r0, r1, 4 @@ -774928,7 +774928,7 @@ sub_8190CD4: ; 8190CD4 adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, =sub_8190860 + 1 + ldr r1, =sub_8190860 str r1, [r0] ldrb r0, [r2] lsls r1, r0, 4 @@ -774972,7 +774972,7 @@ sub_8190CD4: ; 8190CD4 adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, =sub_8190A48 + 1 + ldr r1, =sub_8190A48 str r1, [r0] ldrb r0, [r2] lsls r1, r0, 4 @@ -775025,7 +775025,7 @@ sub_8190CD4: ; 8190CD4 adds r0, r1 lsls r0, 2 adds r0, r7 - ldr r1, =sub_8190860 + 1 + ldr r1, =sub_8190860 str r1, [r0] ldrb r1, [r2] lsls r0, r1, 4 @@ -775067,7 +775067,7 @@ sub_8190CD4: ; 8190CD4 adds r0, r1 lsls r0, 2 adds r0, r7 - ldr r1, =sub_8190A48 + 1 + ldr r1, =sub_8190A48 str r1, [r0] ldrb r1, [r2] lsls r0, r1, 4 @@ -775205,7 +775205,7 @@ sub_8190CD4: ; 8190CD4 adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, =sub_81908CC + 1 + ldr r1, =sub_81908CC str r1, [r0] ldrb r1, [r3] lsls r0, r1, 4 @@ -775250,7 +775250,7 @@ sub_8190CD4: ; 8190CD4 adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, =sub_8190AC4 + 1 + ldr r1, =sub_8190AC4 str r1, [r0] ldrb r1, [r3] lsls r0, r1, 4 @@ -775304,7 +775304,7 @@ sub_8190CD4: ; 8190CD4 adds r0, r1 lsls r0, 2 adds r0, r7 - ldr r1, =sub_81908CC + 1 + ldr r1, =sub_81908CC str r1, [r0] ldrb r1, [r2] lsls r0, r1, 4 @@ -775346,7 +775346,7 @@ sub_8190CD4: ; 8190CD4 adds r0, r1 lsls r0, 2 adds r0, r7 - ldr r1, =sub_8190AC4 + 1 + ldr r1, =sub_8190AC4 str r1, [r0] ldrb r1, [r2] lsls r0, r1, 4 @@ -775492,7 +775492,7 @@ sub_8190CD4: ; 8190CD4 adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, =sub_81908CC + 1 + ldr r1, =sub_81908CC str r1, [r0] ldrb r0, [r2] lsls r1, r0, 4 @@ -775536,7 +775536,7 @@ sub_8190CD4: ; 8190CD4 adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, =sub_8190AC4 + 1 + ldr r1, =sub_8190AC4 str r1, [r0] ldrb r0, [r2] lsls r1, r0, 4 @@ -775589,7 +775589,7 @@ sub_8190CD4: ; 8190CD4 adds r0, r1 lsls r0, 2 adds r0, r7 - ldr r1, =sub_81908CC + 1 + ldr r1, =sub_81908CC str r1, [r0] ldrb r1, [r2] lsls r0, r1, 4 @@ -775631,7 +775631,7 @@ sub_8190CD4: ; 8190CD4 adds r0, r1 lsls r0, 2 adds r0, r7 - ldr r1, =sub_8190AC4 + 1 + ldr r1, =sub_8190AC4 str r1, [r0] ldrb r1, [r2] lsls r0, r1, 4 @@ -775865,13 +775865,13 @@ sub_8190CD4: ; 8190CD4 mov r0, r9 cmp r0, 0 bne @081921C4 - ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 + ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music bl set_callback2 b @081921FC .align 2, 0 .pool @081921C4: - ldr r0, =sub_8194220 + 1 + ldr r0, =sub_8194220 movs r1, 0 bl AddTask lsls r0, 24 @@ -776496,7 +776496,7 @@ sub_81924E0: ; 81924E0 str r1, [sp, 0x4] movs r1, 0x1 str r1, [sp, 0x8] - ldr r1, =sub_8190938 + 1 + ldr r1, =sub_8190938 bl sub_80D2CC4 ldr r1, [r6] adds r1, r4 @@ -778210,7 +778210,7 @@ sub_819314C: ; 819314C str r1, [sp, 0x4] mov r1, r10 str r1, [sp, 0x8] - ldr r1, =sub_8190938 + 1 + ldr r1, =sub_8190938 bl sub_80D2CC4 ldr r1, [r6] adds r1, r4 @@ -778360,7 +778360,7 @@ sub_819314C: ; 819314C str r7, [sp, 0x4] movs r1, 0x1 str r1, [sp, 0x8] - ldr r1, =sub_8190938 + 1 + ldr r1, =sub_8190938 bl sub_80D2CC4 ldr r1, [r6] adds r1, r4 @@ -778650,7 +778650,7 @@ sub_819314C: ; 819314C thumb_func_start sub_81938A4 sub_81938A4: ; 81938A4 push {lr} - ldr r0, =sub_8194220 + 1 + ldr r0, =sub_8194220 movs r1, 0 bl AddTask lsls r0, 24 @@ -778666,7 +778666,7 @@ sub_81938A4: ; 81938A4 movs r0, 0x2 strh r0, [r1, 0xC] strh r2, [r1, 0x10] - ldr r0, =sub_8194B54 + 1 + ldr r0, =sub_8194B54 bl set_callback2 pop {r0} bx r0 @@ -778700,7 +778700,7 @@ sub_81938E0: ; 81938E0 movs r4, 0 movs r1, 0x3 strh r1, [r0] - ldr r0, =sub_8194220 + 1 + ldr r0, =sub_8194220 movs r1, 0 bl AddTask lsls r0, 24 @@ -778716,7 +778716,7 @@ sub_81938E0: ; 81938E0 strh r0, [r1, 0xC] movs r0, 0x1 strh r0, [r1, 0x10] - ldr r0, =sub_8194B54 + 1 + ldr r0, =sub_8194B54 bl set_callback2 pop {r4} pop {r0} @@ -778901,7 +778901,7 @@ sub_819395C: ; 819395C ldr r0, [r4] bl free str r6, [r4] - ldr r0, =sub_8190400 + 1 + ldr r0, =sub_8190400 movs r1, 0 bl AddTask lsls r0, 24 @@ -778947,7 +778947,7 @@ sub_819395C: ; 819395C ldr r0, [r4] bl free str r6, [r4] - ldr r0, =sub_8190400 + 1 + ldr r0, =sub_8190400 movs r1, 0 bl AddTask lsls r0, 24 @@ -778988,7 +778988,7 @@ sub_819395C: ; 819395C ldr r0, [r4] bl free str r6, [r4] - ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 + ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music bl set_callback2 ldr r1, =0x03005e00 lsls r0, r5, 2 @@ -779186,7 +779186,7 @@ sub_8193BDC: ; 8193BDC thumb_func_start sub_8193D40 sub_8193D40: ; 8193D40 push {lr} - ldr r0, =sub_8194220 + 1 + ldr r0, =sub_8194220 movs r1, 0 bl AddTask lsls r0, 24 @@ -779203,7 +779203,7 @@ sub_8193D40: ; 8193D40 movs r0, 0x2 strh r0, [r1, 0xC] strh r2, [r1, 0x10] - ldr r0, =sub_8194B54 + 1 + ldr r0, =sub_8194B54 bl set_callback2 pop {r0} bx r0 @@ -780420,16 +780420,16 @@ sub_8194220: ; 8194220 movs r0, 0x2 movs r1, 0x3 bl Window_CopyToVram - ldr r0, =sub_8194BEC + 1 + ldr r0, =sub_8194BEC bl SetHBlankCallback - ldr r0, =sub_8194CE4 + 1 + ldr r0, =sub_8194CE4 bl SetVBlankCallback cmp r4, 0x2 bne @0819485C mov r2, r10 cmp r2, 0 bne @08194844 - ldr r0, =sub_819395C + 1 + ldr r0, =sub_819395C movs r1, 0 bl AddTask lsls r0, 24 @@ -780453,7 +780453,7 @@ sub_8194220: ; 8194220 .align 2, 0 .pool @08194844: - ldr r0, =sub_8194950 + 1 + ldr r0, =sub_8194950 movs r1, 0 bl AddTask lsls r0, 24 @@ -780806,7 +780806,7 @@ sub_8194950: ; 8194950 ands r0, r1 cmp r0, 0 bne @08194B3C - ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 + ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music bl set_callback2 adds r0, r4, 0 bl remove_task @@ -783422,7 +783422,7 @@ sub_8196080: ; 8196080 thumb_func_start sub_8196094 sub_8196094: ; 8196094 push {lr} - ldr r0, =sub_81960E0 + 1 + ldr r0, =sub_81960E0 bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 @@ -783446,7 +783446,7 @@ task_prev_quest: ; 81960A8 @081960C2: ldr r0, =0x00000107 bl audio_play - ldr r0, =sub_81960E0 + 1 + ldr r0, =sub_81960E0 movs r1, 0x1 bl AddTask pop {r0} @@ -783612,7 +783612,7 @@ sub_81961F0: ; 81961F0 movs r2, 0x1 movs r3, 0xF bl bg_write_sequence_to_wram_tile_map_rect - ldr r0, =sub_8196694 + 1 + ldr r0, =sub_8196694 movs r1, 0xA bl AddTask lsls r0, 24 @@ -785915,7 +785915,7 @@ sub_81973C4: ; 81973C4 lsrs r5, r0, 24 lsls r4, 24 lsrs r4, 24 - ldr r1, =sub_81975F4 + 1 + ldr r1, =sub_81975F4 adds r0, r5, 0 bl CallWindowFunction adds r0, r5, 0 @@ -785944,7 +785944,7 @@ sub_81973FC: ; 81973FC lsrs r5, r0, 24 lsls r4, 24 lsrs r4, 24 - ldr r1, =sub_81974A4 + 1 + ldr r1, =sub_81974A4 adds r0, r5, 0 bl CallWindowFunction adds r0, r5, 0 @@ -785973,7 +785973,7 @@ sub_8197434: ; 8197434 lsrs r5, r0, 24 lsls r4, 24 lsrs r4, 24 - ldr r1, =sub_8197804 + 1 + ldr r1, =sub_8197804 adds r0, r5, 0 bl CallWindowFunction adds r0, r5, 0 @@ -786002,7 +786002,7 @@ sub_819746C: ; 819746C lsrs r5, r0, 24 lsls r4, 24 lsrs r4, 24 - ldr r1, =sub_81977BC + 1 + ldr r1, =sub_81977BC adds r0, r5, 0 bl CallWindowFunction adds r0, r5, 0 @@ -786881,7 +786881,7 @@ sub_8197B1C: ; 8197B1C strh r2, [r0] ldr r0, =0x0203cd9e strb r3, [r0] - ldr r1, =sub_8197BB4 + 1 + ldr r1, =sub_8197BB4 adds r0, r5, 0 bl CallWindowFunction adds r0, r5, 0 @@ -786917,7 +786917,7 @@ sub_8197B64: ; 8197B64 movs r1, 0x5 bl Window_GetField strb r0, [r5] - ldr r1, =sub_8197BB4 + 1 + ldr r1, =sub_8197BB4 adds r0, r6, 0 bl CallWindowFunction adds r0, r6, 0 @@ -787214,7 +787214,7 @@ sub_8197DF8: ; 8197DF8 lsrs r5, r0, 24 lsls r4, 24 lsrs r4, 24 - ldr r1, =sub_8197E30 + 1 + ldr r1, =sub_8197E30 adds r0, r5, 0 bl CallWindowFunction adds r0, r5, 0 @@ -787290,7 +787290,7 @@ SetWindowBorderStyle: ; 8197E80 strh r2, [r0] ldr r0, =0x0203cd9e strb r3, [r0] - ldr r1, =DrawWindowBorder + 1 + ldr r1, =DrawWindowBorder adds r0, r5, 0 bl CallWindowFunction adds r0, r5, 0 @@ -787326,7 +787326,7 @@ sub_8197EC8: ; 8197EC8 movs r1, 0x5 bl Window_GetField strb r0, [r5] - ldr r1, =DrawWindowBorder + 1 + ldr r1, =DrawWindowBorder adds r0, r6, 0 bl CallWindowFunction adds r0, r6, 0 @@ -787520,7 +787520,7 @@ sub_8198070: ; 8198070 lsrs r5, r0, 24 lsls r4, 24 lsrs r4, 24 - ldr r1, =sub_81980A8 + 1 + ldr r1, =sub_81980A8 adds r0, r5, 0 bl CallWindowFunction adds r0, r5, 0 @@ -791085,7 +791085,7 @@ copy_decompressed_tile_data_to_vram_autofree: ; 8199B08 @08199B36: cmp r6, 0 beq @08199B6E - ldr r0, =task_free_buf_after_copying_tile_data_to_vram + 1 + ldr r0, =task_free_buf_after_copying_tile_data_to_vram movs r1, 0 bl AddTask adds r4, r0, 0 @@ -792390,7 +792390,7 @@ sub_819A4F8: ; 819A4F8 ldr r0, =0x0300127c movs r1, 0 str r1, [r0] - ldr r0, =sub_819A514 + 1 + ldr r0, =sub_819A514 bl set_callback2 pop {r0} bx r0 @@ -792667,7 +792667,7 @@ sub_819A514: ; 819A514 bl gpu_sync_bg_show movs r0, 0x1 bl gpu_sync_bg_show - ldr r0, =sub_819A4E4 + 1 + ldr r0, =sub_819A4E4 bl SetVBlankCallback movs r0, 0x1 negs r0, r0 @@ -792781,7 +792781,7 @@ sub_819A514: ; 819A514 .align 2, 0 .pool @0819A8FC: - ldr r0, =sub_819C69C + 1 + ldr r0, =sub_819C69C movs r1, 0 bl AddTask ldr r2, =0x0300127c @@ -792802,7 +792802,7 @@ sub_819A514: ; 819A514 lsls r0, 3 adds r0, r4 strh r5, [r0, 0x8] - ldr r0, =sub_819B378 + 1 + ldr r0, =sub_819B378 movs r1, 0 bl AddTask lsls r0, 24 @@ -792830,7 +792830,7 @@ sub_819A514: ; 819A514 ldr r1, =0x000002a2 adds r0, r3, r1 strb r2, [r0] - ldr r0, =sub_819B124 + 1 + ldr r0, =sub_819B124 movs r1, 0 bl AddTask lsls r0, 24 @@ -792842,7 +792842,7 @@ sub_819A514: ; 819A514 movs r1, 0xD strh r1, [r0, 0x8] @0819A988: - ldr r0, =sub_819A4C8 + 1 + ldr r0, =sub_819A4C8 bl set_callback2 @0819A98E: add sp, 0xC @@ -793565,7 +793565,7 @@ sub_819AE08: ; 819AE08 cmp r4, 0x5 bls @0819AF1A ldr r1, [r5] - ldr r0, =sub_819A514 + 1 + ldr r0, =sub_819A514 str r0, [sp] movs r0, 0x1 adds r2, r6, 0 @@ -793649,7 +793649,7 @@ bc_exit_to_overworld: ; 819AF68 bl free str r5, [r7] bl Window_FreeMemory - ldr r0, =sub_80861B0 + 1 + ldr r0, =sub_80861B0 bl set_callback2 adds r0, r6, 0 bl remove_task @@ -793723,7 +793723,7 @@ sub_819B02C: ; 819B02C bne @0819B0C6 bl sub_819C568 strh r4, [r5, 0x8] - ldr r0, =bc_exit_to_overworld + 1 + ldr r0, =bc_exit_to_overworld str r0, [r5] b @0819B11A .align 2, 0 @@ -793745,7 +793745,7 @@ sub_819B02C: ; 819B02C mov r1, r8 strb r1, [r0] strh r6, [r5, 0x8] - ldr r0, =sub_819B378 + 1 + ldr r0, =sub_819B378 str r0, [r5] b @0819B11A .align 2, 0 @@ -793899,7 +793899,7 @@ sub_819B124: ; 819B124 adds r0, r1 movs r1, 0xA strh r1, [r0, 0x8] - ldr r1, =sub_819B02C + 1 + ldr r1, =sub_819B02C str r1, [r0] b @0819B36E .align 2, 0 @@ -793925,7 +793925,7 @@ sub_819B124: ; 819B124 adds r0, r1 movs r1, 0x6 strh r1, [r0, 0x8] - ldr r1, =sub_819AE08 + 1 + ldr r1, =sub_819AE08 str r1, [r0] b @0819B36E .align 2, 0 @@ -793961,7 +793961,7 @@ sub_819B124: ; 819B124 adds r0, r1 strh r6, [r0, 0x8] @0819B2BA: - ldr r1, =sub_819B378 + 1 + ldr r1, =sub_819B378 str r1, [r0] b @0819B36E .align 2, 0 @@ -794112,7 +794112,7 @@ sub_819B378: ; 819B378 strb r1, [r0] movs r0, 0x2 strh r0, [r4, 0x8] - ldr r0, =sub_819B124 + 1 + ldr r0, =sub_819B124 str r0, [r4] b @0819B476 .align 2, 0 @@ -795671,7 +795671,7 @@ sub_819C040: ; 819C040 ldrb r1, [r0] orrs r1, r2 strb r1, [r0] - ldr r0, =sub_819C1D0 + 1 + ldr r0, =sub_819C1D0 movs r1, 0x1 bl AddTask lsls r0, 24 @@ -795683,7 +795683,7 @@ sub_819C040: ; 819C040 adds r1, r2 ldr r1, [r1] bl _call_via_r1 - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r4, 0x1C] @0819C0DC: pop {r4-r6} @@ -795972,7 +795972,7 @@ sub_819C2D4: ; 819C2D4 adds r6, r4, 0 adds r6, 0x1C adds r0, r6 - ldr r1, =sub_819C100 + 1 + ldr r1, =sub_819C100 str r1, [r0] ldr r0, =0x00000295 mov r9, r0 @@ -795996,7 +795996,7 @@ sub_819C2D4: ; 819C2D4 adds r0, r1 lsls r0, 2 adds r0, r6 - ldr r1, =nullsub_12 + 1 + ldr r1, =nullsub_12 mov r10, r1 str r1, [r0] ldr r5, =0x0000029d @@ -796185,7 +796185,7 @@ sub_819C4B4: ; 819C4B4 lsls r0, 2 adds r3, 0x1C adds r0, r3 - ldr r1, =sub_819C040 + 1 + ldr r1, =sub_819C040 str r1, [r0] adds r5, r2, r5 ldrb r1, [r5] @@ -796193,7 +796193,7 @@ sub_819C4B4: ; 819C4B4 adds r0, r1 lsls r0, 2 adds r0, r3 - ldr r5, =nullsub_12 + 1 + ldr r5, =nullsub_12 str r5, [r0] adds r4, r2, r4 ldrb r1, [r4] @@ -796238,7 +796238,7 @@ sub_819C568: ; 819C568 adds r0, r1 ldrb r0, [r0] bl sub_818D820 - ldr r0, =sub_819C2D4 + 1 + ldr r0, =sub_819C2D4 movs r1, 0x1 bl AddTask lsls r0, 24 @@ -796760,7 +796760,7 @@ sub_819C90C: ; 819C90C strh r0, [r2, 0x24] ldr r1, =0x020244ec ldrb r2, [r2, 0x3] - ldr r0, =sub_819DC1C + 1 + ldr r0, =sub_819DC1C str r0, [sp] movs r0, 0 movs r3, 0x2 @@ -796886,7 +796886,7 @@ sub_819CA08: ; 819CA08 bl free str r5, [r7] bl Window_FreeMemory - ldr r0, =sub_80861B0 + 1 + ldr r0, =sub_80861B0 bl set_callback2 adds r0, r6, 0 bl remove_task @@ -797012,20 +797012,20 @@ sub_819CBDC: ; 819CBDC bne @0819CC04 movs r0, 0 strh r0, [r2, 0x8] - ldr r0, =sub_819CA08 + 1 + ldr r0, =sub_819CA08 b @0819CC16 .align 2, 0 .pool @0819CC04: movs r0, 0 strh r0, [r2, 0x8] - ldr r1, =sub_819CE40 + 1 + ldr r1, =sub_819CE40 lsrs r0, r1, 16 strh r0, [r2, 0x14] strh r1, [r2, 0x16] movs r0, 0x1 strh r0, [r2, 0x12] - ldr r0, =sub_819D770 + 1 + ldr r0, =sub_819D770 @0819CC16: str r0, [r2] pop {r0} @@ -797056,11 +797056,11 @@ sub_819CC24: ; 819CC24 strb r5, [r0] movs r0, 0x4 strh r0, [r4, 0x8] - ldr r1, =sub_819CBDC + 1 + ldr r1, =sub_819CBDC lsrs r0, r1, 16 strh r0, [r4, 0x14] strh r1, [r4, 0x16] - ldr r0, =sub_819CB1C + 1 + ldr r0, =sub_819CB1C str r0, [r4] @0819CC5A: pop {r4,r5} @@ -797093,20 +797093,20 @@ sub_819CC74: ; 819CC74 bne @0819CCB0 movs r0, 0 strh r0, [r2, 0x8] - ldr r0, =sub_819CA08 + 1 + ldr r0, =sub_819CA08 b @0819CCC2 .align 2, 0 .pool @0819CCB0: movs r0, 0 strh r0, [r2, 0x8] - ldr r1, =sub_819CE40 + 1 + ldr r1, =sub_819CE40 lsrs r0, r1, 16 strh r0, [r2, 0x14] strh r1, [r2, 0x16] movs r0, 0x1 strh r0, [r2, 0x12] - ldr r0, =sub_819D770 + 1 + ldr r0, =sub_819D770 @0819CCC2: str r0, [r2] pop {r4} @@ -797145,11 +797145,11 @@ sub_819CCD4: ; 819CCD4 strb r1, [r0] movs r0, 0x4 strh r0, [r5, 0x8] - ldr r1, =sub_819CC74 + 1 + ldr r1, =sub_819CC74 lsrs r0, r1, 16 strh r0, [r5, 0x14] strh r1, [r5, 0x16] - ldr r0, =sub_819CB1C + 1 + ldr r0, =sub_819CB1C str r0, [r5] @0819CD1A: pop {r4,r5} @@ -797253,13 +797253,13 @@ sub_819CD34: ; 819CD34 movs r0, 0x3 bl sub_819EA64 strh r4, [r5, 0x8] - ldr r1, =sub_819CE40 + 1 + ldr r1, =sub_819CE40 lsrs r0, r1, 16 strh r0, [r5, 0x14] strh r1, [r5, 0x16] mov r1, r8 strh r1, [r5, 0x12] - ldr r0, =sub_819D770 + 1 + ldr r0, =sub_819D770 str r0, [r5] b @0819CE36 .align 2, 0 @@ -797358,13 +797358,13 @@ sub_819CE40: ; 819CE40 strb r5, [r0] bl sub_819EE08 bl sub_819EAC0 - ldr r1, =sub_819CC24 + 1 + ldr r1, =sub_819CC24 lsrs r0, r1, 16 strh r0, [r4, 0x14] strh r1, [r4, 0x16] strh r5, [r4, 0x8] strh r5, [r4, 0x12] - ldr r0, =sub_819D588 + 1 + ldr r0, =sub_819D588 str r0, [r4] b @0819CF4C .align 2, 0 @@ -798338,7 +798338,7 @@ sub_819D588: ; 819D588 ldrb r0, [r0, 0x14] cmp r0, 0x1 bne @0819D6B0 - ldr r0, =sub_819D324 + 1 + ldr r0, =sub_819D324 movs r1, 0 bl AddTask lsls r0, 24 @@ -798367,7 +798367,7 @@ sub_819D588: ; 819D588 .align 2, 0 .pool @0819D6B0: - ldr r0, =sub_819D324 + 1 + ldr r0, =sub_819D324 movs r1, 0 bl AddTask lsls r0, 24 @@ -798406,7 +798406,7 @@ sub_819D588: ; 819D588 ldrsh r7, [r6, r2] cmp r7, 0 bne @0819D734 - ldr r0, =sub_819D324 + 1 + ldr r0, =sub_819D324 movs r1, 0 bl AddTask lsls r0, 24 @@ -798515,7 +798515,7 @@ sub_819D770: ; 819D770 ldrb r7, [r0, 0x14] cmp r7, 0x1 bne @0819D828 - ldr r0, =sub_819D324 + 1 + ldr r0, =sub_819D324 movs r1, 0 bl AddTask lsls r0, 24 @@ -798544,7 +798544,7 @@ sub_819D770: ; 819D770 .align 2, 0 .pool @0819D828: - ldr r0, =sub_819D324 + 1 + ldr r0, =sub_819D324 movs r1, 0 bl AddTask lsls r0, 24 @@ -798582,7 +798582,7 @@ sub_819D770: ; 819D770 ldrsh r7, [r5, r2] cmp r7, 0 bne @0819D8A8 - ldr r0, =sub_819D324 + 1 + ldr r0, =sub_819D324 movs r1, 0 bl AddTask lsls r0, 24 @@ -798829,7 +798829,7 @@ sub_819D9EC: ; 819D9EC .align 2, 0 .pool @0819DA8C: - ldr r0, =sub_819D12C + 1 + ldr r0, =sub_819D12C movs r1, 0 bl AddTask ldr r2, =0x03005e00 @@ -798841,13 +798841,13 @@ sub_819D9EC: ; 819D9EC adds r0, r1 lsls r0, 3 adds r0, r2 - ldr r1, =sub_819D064 + 1 + ldr r1, =sub_819D064 str r1, [r0] b @0819DB90 .align 2, 0 .pool @0819DABC: - ldr r0, =sub_819D12C + 1 + ldr r0, =sub_819D12C bl is_function_an_active_task lsls r0, 24 cmp r0, 0 @@ -798929,7 +798929,7 @@ sub_819D9EC: ; 819D9EC adds r0, r1 lsls r0, 3 adds r0, r2 - ldr r1, =sub_819CF54 + 1 + ldr r1, =sub_819CF54 str r1, [r0] adds r3, 0x27 strb r5, [r3] @@ -798966,13 +798966,13 @@ sub_819D9EC: ; 819D9EC adds r0, r3 movs r1, 0 strh r1, [r0, 0x8] - ldr r2, =sub_819CE40 + 1 + ldr r2, =sub_819CE40 lsrs r1, r2, 16 strh r1, [r0, 0x14] strh r2, [r0, 0x16] movs r1, 0x1 strh r1, [r0, 0x12] - ldr r1, =sub_819D770 + 1 + ldr r1, =sub_819D770 str r1, [r0] @0819DBCA: pop {r4-r7} @@ -799012,7 +799012,7 @@ sub_819DC00: ; 819DC00 ldr r0, =0x03001284 movs r1, 0 str r1, [r0] - ldr r0, =sub_819DC1C + 1 + ldr r0, =sub_819DC1C bl set_callback2 pop {r0} bx r0 @@ -799256,7 +799256,7 @@ sub_819DC1C: ; 819DC1C bl gpu_tile_obj_alloc_and_load_multiple ldr r0, =gUnknown_086106A0 bl gpu_tile_obj_decompress_and_load - ldr r0, =sub_819C7FC + 1 + ldr r0, =sub_819C7FC bl SetVBlankCallback ldr r1, =0x030022c0 movs r0, 0x87 @@ -799411,7 +799411,7 @@ sub_819DC1C: ; 819DC1C .align 2, 0 .pool @0819E01C: - ldr r0, =sub_819CF54 + 1 + ldr r0, =sub_819CF54 movs r1, 0 bl AddTask ldr r6, =0x03001284 @@ -799430,7 +799430,7 @@ sub_819DC1C: ; 819DC1C lsls r0, 3 adds r0, r4 strh r5, [r0, 0x8] - ldr r0, =sub_819CE40 + 1 + ldr r0, =sub_819CE40 movs r1, 0 bl AddTask lsls r0, 24 @@ -799459,7 +799459,7 @@ sub_819DC1C: ; 819DC1C strh r1, [r0, 0x8] adds r2, 0x22 strb r3, [r2] - ldr r0, =sub_819CD34 + 1 + ldr r0, =sub_819CD34 movs r1, 0 bl AddTask lsls r0, 24 @@ -799471,7 +799471,7 @@ sub_819DC1C: ; 819DC1C movs r1, 0x2 strh r1, [r0, 0x8] @0819E0A4: - ldr r0, =sub_819C7E0 + 1 + ldr r0, =sub_819C7E0 bl set_callback2 @0819E0AA: add sp, 0xC @@ -801534,7 +801534,7 @@ sub_819F0CC: ; 819F0CC lsls r0, 3 adds r0, r1 strh r5, [r0, 0x8] - ldr r1, =sub_819D9EC + 1 + ldr r1, =sub_819D9EC str r1, [r0] pop {r4,r5} pop {r0} @@ -801554,7 +801554,7 @@ sub_819F114: ; 819F114 adds r1, r2 movs r0, 0x6 strh r0, [r1, 0x8] - ldr r0, =sub_819C90C + 1 + ldr r0, =sub_819C90C str r0, [r1] bx lr .align 2, 0 @@ -801582,13 +801582,13 @@ sub_819F134: ; 819F134 adds r0, r1 movs r1, 0 strh r1, [r0, 0x8] - ldr r2, =sub_819CE40 + 1 + ldr r2, =sub_819CE40 lsrs r1, r2, 16 strh r1, [r0, 0x14] strh r2, [r0, 0x16] movs r1, 0x1 strh r1, [r0, 0x12] - ldr r1, =sub_819D770 + 1 + ldr r1, =sub_819D770 str r1, [r0] pop {r4} pop {r0} @@ -801627,14 +801627,14 @@ sub_819F1AC: ; 819F1AC adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r2, =sub_819CC24 + 1 + ldr r2, =sub_819CC24 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, =sub_819D588 + 1 + ldr r0, =sub_819D588 str r0, [r1] bx lr .align 2, 0 @@ -801650,14 +801650,14 @@ sub_819F1DC: ; 819F1DC adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r2, =sub_819D9EC + 1 + ldr r2, =sub_819D9EC 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, =sub_819D588 + 1 + ldr r0, =sub_819D588 str r0, [r1] bx lr .align 2, 0 @@ -801679,7 +801679,7 @@ sub_819F20C: ; 819F20C adds r0, r4, r6 lsls r0, 3 adds r0, r3 - ldr r2, =sub_819CD34 + 1 + ldr r2, =sub_819CD34 lsrs r1, r2, 16 strh r1, [r0, 0x14] strh r2, [r0, 0x16] @@ -801709,7 +801709,7 @@ sub_819F20C: ; 819F20C movs r1, 0 strh r1, [r0, 0x8] strh r4, [r0, 0x12] - ldr r1, =sub_819F488 + 1 + ldr r1, =sub_819F488 b @0819F29E .align 2, 0 .pool @@ -801719,7 +801719,7 @@ sub_819F20C: ; 819F20C adds r0, r5, r6 lsls r0, 3 adds r0, r4 - ldr r2, =sub_819CCD4 + 1 + ldr r2, =sub_819CCD4 lsrs r1, r2, 16 movs r3, 0 strh r1, [r0, 0x14] @@ -801733,7 +801733,7 @@ sub_819F20C: ; 819F20C adds r0, r3 movs r1, 0 strh r1, [r0, 0x8] - ldr r1, =sub_819D588 + 1 + ldr r1, =sub_819D588 @0819F29E: str r1, [r0] pop {r4-r6} @@ -801764,7 +801764,7 @@ sub_819F2B4: ; 819F2B4 adds r1, r2, 0 adds r1, 0x1C adds r0, r1 - ldr r1, =sub_819F600 + 1 + ldr r1, =sub_819F600 str r1, [r0] ldrb r1, [r4] lsls r0, r1, 4 @@ -801903,7 +801903,7 @@ sub_819F3F8: ; 819F3F8 lsls r0, r4, 24 lsrs r0, 24 bl sub_818D820 - ldr r0, =sub_819F7B4 + 1 + ldr r0, =sub_819F7B4 movs r1, 0x1 bl AddTask lsls r0, 24 @@ -802074,7 +802074,7 @@ sub_819F488: ; 819F488 adds r0, r1 ldrh r1, [r0, 0x12] strh r1, [r0, 0x8] - ldr r1, =sub_819CE40 + 1 + ldr r1, =sub_819CE40 str r1, [r0] @0819F58A: pop {r4,r5} @@ -802149,7 +802149,7 @@ sub_819F600: ; 819F600 movs r1, 0x4 orrs r0, r1 strb r0, [r2] - ldr r0, =sub_819F69C + 1 + ldr r0, =sub_819F69C movs r1, 0x1 bl AddTask lsls r0, 24 @@ -802163,7 +802163,7 @@ sub_819F600: ; 819F600 strh r2, [r1, 0x16] ldr r1, [r1] bl _call_via_r1 - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r4, 0x1C] @0819F640: pop {r4} @@ -802394,7 +802394,7 @@ sub_819F7B4: ; 819F7B4 adds r1, r3, 0 adds r1, 0x1C adds r0, r1 - ldr r1, =sub_819F654 + 1 + ldr r1, =sub_819F654 str r1, [r0] movs r0, 0x14 ldrsh r1, [r4, r0] @@ -804468,7 +804468,7 @@ sub_81A0804: ; 81A0804 lsrs r5, 24 lsls r2, 24 lsrs r6, r2, 24 - ldr r0, =sub_81A070C + 1 + ldr r0, =sub_81A070C movs r1, 0x50 bl AddTask lsls r0, 24 @@ -804780,7 +804780,7 @@ sub_81A0A34: ; 81A0A34 ldrh r0, [r0] cmp r0, 0 beq @081A0A64 - ldr r0, =script_env_2_enable_and_set_ctx_running + 1 + ldr r0, =script_env_2_enable_and_set_ctx_running bl sub_81A172C b @081A0A68 .align 2, 0 @@ -805037,7 +805037,7 @@ sub_81A0A70: ; 81A0A70 bl ExpandTextCodes movs r0, 0x1 bl get_map_name - ldr r0, =sub_81A0A34 + 1 + ldr r0, =sub_81A0A34 movs r1, 0x1 bl AddTask @081A0C8E: @@ -806415,7 +806415,7 @@ sub_81A16DC: ; 81A16DC sub_81A172C: ; 81A172C push {r4,lr} adds r4, r0, 0 - ldr r0, =sub_81A16DC + 1 + ldr r0, =sub_81A16DC movs r1, 0x1 bl AddTask lsls r0, 24 @@ -806439,7 +806439,7 @@ sub_81A172C: ; 81A172C sub_81A175C: ; 81A175C push {r4,r5,lr} adds r5, r0, 0 - ldr r4, =sub_81A16B4 + 1 + ldr r4, =sub_81A16B4 adds r0, r4, 0 movs r1, 0x1 bl AddTask @@ -817663,7 +817663,7 @@ sub_81A7508: ; 81A7508 thumb_func_start sub_81A7580 sub_81A7580: ; 81A7580 push {lr} - ldr r0, =sub_81A7EE4 + 1 + ldr r0, =sub_81A7EE4 movs r1, 0x2 bl AddTask pop {r0} @@ -818809,7 +818809,7 @@ sub_81A7DE8: ; 81A7DE8 lsls r0, 16 cmp r0, 0 bne @081A7E50 - ldr r0, =sub_81A7D54 + 1 + ldr r0, =sub_81A7D54 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -818850,7 +818850,7 @@ sub_81A7E60: ; 81A7E60 lsrs r6, 16 lsls r3, 16 lsrs r3, 16 - ldr r0, =sub_81A7D54 + 1 + ldr r0, =sub_81A7D54 movs r1, 0x3 str r3, [sp] bl AddTask @@ -818882,7 +818882,7 @@ sub_81A7E60: ; 81A7E60 thumb_func_start sub_81A7EC4 sub_81A7EC4: ; 81A7EC4 push {lr} - ldr r0, =sub_81A7D54 + 1 + ldr r0, =sub_81A7D54 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -822019,7 +822019,7 @@ sub_81A975C: ; 81A975C thumb_func_start sub_81A97C8 sub_81A97C8: ; 81A97C8 push {lr} - ldr r0, =sub_81A97DC + 1 + ldr r0, =sub_81A97DC movs r1, 0 bl AddTask pop {r0} @@ -824553,7 +824553,7 @@ sub_81AAB70: ; 81AAB70 ; void c2_bag() c2_bag: ; 81AAB9C push {lr} - ldr r2, =sub_8086194 + 1 + ldr r2, =sub_8086194 movs r0, 0 movs r1, 0x5 bl sub_81AAC90 @@ -824570,7 +824570,7 @@ sub_81AABB0: ; 81AABB0 lsls r0, 24 cmp r0, 0 bne @081AABCC - ldr r2, =sub_8059D50 + 1 + ldr r2, =sub_8059D50 movs r0, 0x1 movs r1, 0x5 bl sub_81AAC90 @@ -824578,7 +824578,7 @@ sub_81AABB0: ; 81AABB0 .align 2, 0 .pool @081AABCC: - ldr r1, =sub_8059D50 + 1 + ldr r1, =sub_8059D50 movs r0, 0x1 bl sub_81C4F98 @081AABD4: @@ -824591,7 +824591,7 @@ sub_81AABB0: ; 81AABB0 thumb_func_start c2_810A554 c2_810A554: ; 81AABDC push {lr} - ldr r2, =sub_80861B0 + 1 + ldr r2, =sub_80861B0 movs r0, 0x4 movs r1, 0x3 bl sub_81AAC90 @@ -824615,7 +824615,7 @@ sub_81AABF0: ; 81AABF0 thumb_func_start sub_81AAC00 sub_81AAC00: ; 81AAC00 push {lr} - ldr r2, =sub_80DFC48 + 1 + ldr r2, =sub_80DFC48 movs r0, 0x3 movs r1, 0x5 bl sub_81AAC90 @@ -824628,7 +824628,7 @@ sub_81AAC00: ; 81AAC00 thumb_func_start sub_81AAC14 sub_81AAC14: ; 81AAC14 push {lr} - ldr r2, =sub_816B31C + 1 + ldr r2, =sub_816B31C movs r0, 0x6 movs r1, 0x5 bl sub_81AAC90 @@ -824641,7 +824641,7 @@ sub_81AAC14: ; 81AAC14 thumb_func_start sub_81AAC28 sub_81AAC28: ; 81AAC28 push {lr} - ldr r2, =sub_81ADE6C + 1 + ldr r2, =sub_81ADE6C movs r0, 0x9 movs r1, 0x5 bl sub_81AAC90 @@ -824659,7 +824659,7 @@ sub_81AAC28: ; 81AAC28 thumb_func_start sub_81AAC50 sub_81AAC50: ; 81AAC50 push {lr} - ldr r2, =sub_81ADEBC + 1 + ldr r2, =sub_81ADEBC movs r0, 0x7 movs r1, 0x5 bl sub_81AAC90 @@ -824675,7 +824675,7 @@ sub_81AAC50: ; 81AAC50 thumb_func_start sub_81AAC70 sub_81AAC70: ; 81AAC70 push {lr} - ldr r2, =sub_81ADF00 + 1 + ldr r2, =sub_81ADF00 movs r0, 0x8 movs r1, 0x5 bl sub_81AAC90 @@ -824770,7 +824770,7 @@ sub_81AAC90: ; 81AAC90 movs r1, 0xFF movs r2, 0xA bl memset - ldr r0, =c2_bag_2 + 1 + ldr r0, =c2_bag_2 bl set_callback2 @081AAD3A: pop {r4-r7} @@ -825094,9 +825094,9 @@ setup_bag_menu: ; 81AADB8 .align 2, 0 .pool @081AB02C: - ldr r0, =vblank_cb_bag_menu + 1 + ldr r0, =vblank_cb_bag_menu bl SetVBlankCallback - ldr r0, =c2_bag_3 + 1 + ldr r0, =c2_bag_3 bl set_callback2 movs r0, 0x1 b @081AB046 @@ -825300,12 +825300,12 @@ sub_81AB1F0: ; 81AB1F0 lsrs r0, 24 cmp r0, 0xA bne @081AB204 - ldr r0, =sub_81ADD98 + 1 + ldr r0, =sub_81ADD98 b @081AB206 .align 2, 0 .pool @081AB204: - ldr r0, =sub_81ABD28 + 1 + ldr r0, =sub_81ABD28 @081AB206: movs r1, 0 bl AddTask @@ -826139,7 +826139,7 @@ task_close_bag_menu_1: ; 81AB8F8 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =task_close_bag_menu_2 + 1 + ldr r1, =task_close_bag_menu_2 str r1, [r0] add sp, 0x4 pop {r4} @@ -826780,7 +826780,7 @@ sub_81ABD28: ; 81ABD28 subs r0, 0x8 ldr r3, [sp] adds r0, r3, r0 - ldr r1, =task_close_bag_menu_1 + 1 + ldr r1, =task_close_bag_menu_1 str r1, [r0] b @081ABEB2 .align 2, 0 @@ -826851,7 +826851,7 @@ set_callback3_to_bag: ; 81ABECC adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81ABD28 + 1 + ldr r1, =sub_81ABD28 str r1, [r0] pop {r4} pop {r0} @@ -827075,7 +827075,7 @@ sub_81ABFA8: ; 81ABFA8 bl sub_80D4CA8 asrs r0, r5, 16 bl sub_80D4E34 - ldr r1, =sub_81AC10C + 1 + ldr r1, =sub_81AC10C ldr r2, =0x03005e00 lsls r0, r6, 2 adds r0, r6 @@ -827402,7 +827402,7 @@ sub_81AC2E8: ; 81AC2E8 negs r2, r2 add r9, r2 add r4, r9 - ldr r0, =sub_81AC3C0 + 1 + ldr r0, =sub_81AC3C0 str r0, [r4] add sp, 0x14 pop {r3,r4} @@ -827610,7 +827610,7 @@ sub_81AC498: ; 81AC498 ldr r0, =0x03005e08 subs r0, 0x8 add r0, r10 - ldr r1, =sub_81ABD28 + 1 + ldr r1, =sub_81ABD28 str r1, [r0] @081AC566: pop {r3-r5} @@ -827690,7 +827690,7 @@ sub_81AC590: ; 81AC590 mov r0, r10 subs r0, 0x8 add r0, r9 - ldr r1, =sub_81ABD28 + 1 + ldr r1, =sub_81ABD28 str r1, [r0] pop {r3-r5} mov r8, r3 @@ -828289,7 +828289,7 @@ sub_81ACBB0: ; 81ACBB0 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =sub_81ACC04 + 1 + ldr r0, =sub_81ACC04 b @081ACBF4 .align 2, 0 .pool @@ -828299,7 +828299,7 @@ sub_81ACBB0: ; 81ACBB0 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =sub_81ACC78 + 1 + ldr r0, =sub_81ACC78 @081ACBF4: str r0, [r1] pop {r4} @@ -828724,7 +828724,7 @@ sub_81ACEF4: ; 81ACEF4 adds r0, r7, 0 subs r0, 0x8 adds r0, r6, r0 - ldr r1, =sub_81AD044 + 1 + ldr r1, =sub_81AD044 str r1, [r0] @081ACF6A: add sp, 0x14 @@ -828919,7 +828919,7 @@ display_threw_away_item_str: ; 81AD0CC bl sub_81AE0BC subs r5, 0x8 adds r4, r5 - ldr r0, =sub_81AD150 + 1 + ldr r0, =sub_81AD150 str r0, [r4] add sp, 0x14 pop {r4-r6} @@ -829069,7 +829069,7 @@ sub_81AD278: ; 81AD278 cmp r0, 0 bne @081AD2AC ldr r2, =gUnknown_085E8DCE - ldr r3, =sub_81AD350 + 1 + ldr r3, =sub_81AD350 adds r0, r4, 0 movs r1, 0x1 bl sub_81ABB4C @@ -829092,7 +829092,7 @@ sub_81AD278: ; 81AD278 @081AD2CA: ldr r0, =0x0203ce54 ldr r1, [r0] - ldr r0, =sub_81B7F60 + 1 + ldr r0, =sub_81B7F60 str r0, [r1] adds r0, r4, 0 bl task_close_bag_menu_1 @@ -829114,7 +829114,7 @@ sub_81AD2F0: ; 81AD2F0 lsls r0, 24 lsrs r0, 24 ldr r2, =gUnknown_085E8DE9 - ldr r3, =sub_81AD350 + 1 + ldr r3, =sub_81AD350 movs r1, 0x1 bl sub_81ABB4C pop {r0} @@ -829137,7 +829137,7 @@ sub_81AD30C: ; 81AD30C ldr r1, =gUnknown_085E8E11 adds r0, r5, 0 bl ExpandTextCodes - ldr r3, =sub_81AD350 + 1 + ldr r3, =sub_81AD350 adds r0, r4, 0 movs r1, 0x1 adds r2, r5, 0 @@ -829179,7 +829179,7 @@ sub_81AD378: ; 81AD378 lsrs r0, 24 ldr r1, =0x0203ce54 ldr r2, [r1] - ldr r1, =sub_8177C14 + 1 + ldr r1, =sub_8177C14 str r1, [r2] bl task_close_bag_menu_1 pop {r0} @@ -829266,7 +829266,7 @@ sub_81AD41C: ; 81AD41C cmp r0, 0 bne @081AD44C ldr r2, =gUnknown_085E8DCE - ldr r3, =sub_81AD350 + 1 + ldr r3, =sub_81AD350 adds r0, r5, 0 movs r1, 0x1 bl sub_81ABB4C @@ -829286,7 +829286,7 @@ sub_81AD41C: ; 81AD41C ldr r1, =gUnknown_085E8E27 adds r0, r4, 0 bl ExpandTextCodes - ldr r3, =sub_81AD350 + 1 + ldr r3, =sub_81AD350 adds r0, r5, 0 movs r1, 0x1 adds r2, r4, 0 @@ -829331,7 +829331,7 @@ sub_81AD4B4: ; 81AD4B4 cmp r0, 0x1 bne @081AD4E4 ldr r2, =gUnknown_085E8DCE - ldr r3, =sub_81AD350 + 1 + ldr r3, =sub_81AD350 adds r0, r4, 0 movs r1, 0x1 bl sub_81ABB4C @@ -829353,7 +829353,7 @@ sub_81AD4B4: ; 81AD4B4 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =task_close_bag_menu_1 + 1 + ldr r0, =task_close_bag_menu_1 str r0, [r1] b @081AD51A .align 2, 0 @@ -829475,7 +829475,7 @@ display_sell_item_ask_str: ; 81AD5DC ldr r1, =gUnknown_085E960F adds r0, r4, 0 bl ExpandTextCodes - ldr r3, =sub_81ABBBC + 1 + ldr r3, =sub_81ABBBC adds r0, r5, 0 movs r1, 0x1 adds r2, r4, 0 @@ -829502,7 +829502,7 @@ display_sell_item_ask_str: ; 81AD5DC ldr r1, =gUnknown_085E962F adds r0, r4, 0 bl ExpandTextCodes - ldr r3, =sub_81AD730 + 1 + ldr r3, =sub_81AD730 adds r0, r7, 0 movs r1, 0x1 adds r2, r4, 0 @@ -829543,7 +829543,7 @@ sub_81AD680: ; 81AD680 ldr r1, =gUnknown_085E9654 adds r0, r4, 0 bl ExpandTextCodes - ldr r3, =sub_81AD6E4 + 1 + ldr r3, =sub_81AD6E4 adds r0, r5, 0 movs r1, 0x1 adds r2, r4, 0 @@ -829629,7 +829629,7 @@ sub_81AD730: ; 81AD730 bl sub_81AE268 subs r6, 0x8 adds r4, r6 - ldr r0, =sub_81AD794 + 1 + ldr r0, =sub_81AD794 str r0, [r4] pop {r3} mov r8, r3 @@ -829754,7 +829754,7 @@ sub_81AD84C: ; 81AD84C ldr r1, =gUnknown_085E9677 adds r0, r4, 0 bl ExpandTextCodes - ldr r3, =sub_81AD8C8 + 1 + ldr r3, =sub_81AD8C8 adds r0, r5, 0 movs r1, 0x1 adds r2, r4, 0 @@ -829857,7 +829857,7 @@ sub_81AD8C8: ; 81AD8C8 ldr r0, =0x03005e08 subs r0, 0x8 adds r6, r0 - ldr r0, =sub_81AD9C0 + 1 + ldr r0, =sub_81AD9C0 str r0, [r6] pop {r3-r5} mov r8, r3 @@ -829945,7 +829945,7 @@ display_deposit_item_ask_str: ; 81AD9EC adds r0, r6, 0 subs r0, 0x8 adds r0, r5, r0 - ldr r1, =sub_81ADA7C + 1 + ldr r1, =sub_81ADA7C str r1, [r0] @081ADA5E: add sp, 0x14 @@ -830100,7 +830100,7 @@ sub_81ADB14: ; 81ADB14 mov r0, r9 subs r0, 0x8 adds r0, r7, r0 - ldr r1, =sub_81AD150 + 1 + ldr r1, =sub_81AD150 b @081ADBF2 .align 2, 0 .pool @@ -830119,7 +830119,7 @@ sub_81ADB14: ; 81ADB14 mov r0, r9 subs r0, 0x8 adds r0, r7, r0 - ldr r1, =sub_81ADC0C + 1 + ldr r1, =sub_81ADC0C @081ADBF2: str r1, [r0] add sp, 0x14 @@ -830316,7 +830316,7 @@ sub_81ADD70: ; 81ADD70 movs r0, 0x4 movs r1, 0x1 bl bag_add_item - ldr r2, =sub_8059D50 + 1 + ldr r2, =sub_8059D50 movs r0, 0xA movs r1, 0 bl sub_81AAC90 @@ -830430,9 +830430,9 @@ sub_81ADE38: ; 81ADE38 sub_81ADE6C: ; 81ADE6C push {lr} ldr r0, =0x03005dac - ldr r1, =sub_819FA50 + 1 + ldr r1, =sub_819FA50 str r1, [r0] - ldr r0, =c2_exit_to_overworld_2_switch + 1 + ldr r0, =c2_exit_to_overworld_2_switch bl set_callback2 pop {r0} bx r0 @@ -830467,9 +830467,9 @@ sub_81ADE8C: ; 81ADE8C sub_81ADEBC: ; 81ADEBC push {lr} ldr r0, =0x03005dac - ldr r1, =sub_818DEF4 + 1 + ldr r1, =sub_818DEF4 str r1, [r0] - ldr r0, =c2_exit_to_overworld_2_switch + 1 + ldr r0, =c2_exit_to_overworld_2_switch bl set_callback2 pop {r0} bx r0 @@ -830500,9 +830500,9 @@ sub_81ADEDC: ; 81ADEDC sub_81ADF00: ; 81ADF00 push {lr} ldr r0, =0x03005dac - ldr r1, =sub_818E564 + 1 + ldr r1, =sub_818E564 str r1, [r0] - ldr r0, =c2_exit_to_overworld_2_switch + 1 + ldr r0, =c2_exit_to_overworld_2_switch bl set_callback2 pop {r0} bx r0 @@ -831786,7 +831786,7 @@ calls_per_item_funcs_in_list: ; 81AE8D4 lsrs r5, 16 lsls r6, 16 lsrs r6, 16 - ldr r0, =nullsub_125 + 1 + ldr r0, =nullsub_125 movs r1, 0 bl AddTask lsls r0, 24 @@ -833237,7 +833237,7 @@ sub_81AF380: ; 81AF380 str r1, [r0, 0x4] bl gpu_pal_obj_alloc_tag_and_apply @081AF3EE: - ldr r0, =sub_81AF504 + 1 + ldr r0, =sub_81AF504 movs r1, 0 bl AddTask lsls r0, 24 @@ -833840,7 +833840,7 @@ sub_81AF828: ; 81AF828 str r1, [r0, 0x4] bl gpu_pal_obj_alloc_tag_and_apply @081AF896: - ldr r0, =nullsub_126 + 1 + ldr r0, =nullsub_126 movs r1, 0 bl AddTask lsls r0, 24 @@ -834106,7 +834106,7 @@ sub_81AFA60: ; 81AFA60 str r1, [r0, 0x4] bl gpu_pal_obj_alloc_tag_and_apply @081AFAC6: - ldr r0, =nullsub_127 + 1 + ldr r0, =nullsub_127 movs r1, 0 bl AddTask lsls r0, 24 @@ -834999,7 +834999,7 @@ sub_81B0038: ; 81B0038 ands r0, r1 strb r0, [r2] bl calc_player_party_count - ldr r0, =c2_811EBD0 + 1 + ldr r0, =c2_811EBD0 bl set_callback2 @081B0194: add sp, 0x4 @@ -835354,9 +835354,9 @@ sub_81B020C: ; 81B020C .align 2, 0 .pool @081B0498: - ldr r0, =sub_81B01CC + 1 + ldr r0, =sub_81B01CC bl SetVBlankCallback - ldr r0, =sub_81B01B0 + 1 + ldr r0, =sub_81B01B0 bl set_callback2 movs r0, 0x1 b @081B04B2 @@ -835382,12 +835382,12 @@ sub_81B04BC: ; 81B04BC movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, =sub_81B04F8 + 1 + ldr r0, =sub_81B04F8 movs r1, 0 bl AddTask - ldr r0, =sub_81B01CC + 1 + ldr r0, =sub_81B01CC bl SetVBlankCallback - ldr r0, =sub_81B01B0 + 1 + ldr r0, =sub_81B01B0 bl set_callback2 add sp, 0x4 pop {r0} @@ -837136,7 +837136,7 @@ sub_81B12C0: ; 81B12C0 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =c3_0811FAB4 + 1 + ldr r1, =c3_0811FAB4 str r1, [r0] add sp, 0x4 pop {r4} @@ -837370,14 +837370,14 @@ sub_81B140C: ; 81B140C cmp r0, 0x1 bne @081B14BE ldr r1, [r2] - ldr r0, =sub_81B9140 + 1 + ldr r0, =sub_81B9140 str r0, [r1, 0x4] @081B14BE: ldr r0, [r2] adds r0, 0xD bl sub_81B302C ldr r0, =0x03006328 - ldr r1, =sub_81B6794 + 1 + ldr r1, =sub_81B6794 ldr r2, [r0] adds r0, r5, 0 bl _call_via_r2 @@ -837604,7 +837604,7 @@ sub_81B1660: ; 81B1660 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81B16D4 + 1 + ldr r1, =sub_81B16D4 str r1, [r0] movs r0, 0x1 b @081B16CE @@ -837634,7 +837634,7 @@ sub_81B16D4: ; 81B16D4 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =sub_81B1708 + 1 + ldr r0, =sub_81B1708 str r0, [r1] @081B16F8: pop {r4} @@ -838251,7 +838251,7 @@ sub_81B1B5C: ; 81B1B5C lsls r4, r1, 24 lsrs r4, 24 bl sub_81B3300 - ldr r0, =sub_81B1B8C + 1 + ldr r0, =sub_81B1B8C movs r1, 0x1 bl AddTask lsls r0, 24 @@ -838309,7 +838309,7 @@ sub_81B1B8C: ; 81B1B8C thumb_func_start sub_81B1BD4 sub_81B1BD4: ; 81B1BD4 push {lr} - ldr r0, =sub_81B1B8C + 1 + ldr r0, =sub_81B1B8C bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 @@ -838336,7 +838336,7 @@ sub_81B1BE8: ; 81B1BE8 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =sub_81B1370 + 1 + ldr r0, =sub_81B1370 str r0, [r1] @081B1C0E: pop {r4} @@ -838372,7 +838372,7 @@ sub_81B1C1C: ; 81B1C1C adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =sub_81B1BE8 + 1 + ldr r0, =sub_81B1BE8 b @081B1C72 .align 2, 0 .pool @@ -838384,7 +838384,7 @@ sub_81B1C1C: ; 81B1C1C adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, =sub_81B1370 + 1 + ldr r0, =sub_81B1370 @081B1C72: str r0, [r1] @081B1C74: @@ -838747,7 +838747,7 @@ sub_81B1F18: ; 81B1F18 strh r0, [r4, 0x8] ldrh r0, [r4] strh r0, [r4, 0xA] - ldr r1, =sub_81B1E60 + 1 + ldr r1, =sub_81B1E60 mov r0, r8 adds r2, r7, 0 bl set_task_function_and_args_14_15 @@ -838808,7 +838808,7 @@ sub_81B1FA8: ; 81B1FA8 strh r2, [r3, 0x8] b @081B200A @081B2002: - ldr r1, =sub_81B1E60 + 1 + ldr r1, =sub_81B1E60 adds r0, r4, 0 bl set_task_function_and_args_14_15 @081B200A: @@ -839079,7 +839079,7 @@ sub_81B21AC: ; 81B21AC adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81B1C1C + 1 + ldr r1, =sub_81B1C1C str r1, [r0] @081B21FE: pop {r4,r5} @@ -839105,7 +839105,7 @@ sub_81B2210: ; 81B2210 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81B2248 + 1 + ldr r1, =sub_81B2248 str r1, [r0] pop {r4} pop {r0} @@ -839130,7 +839130,7 @@ sub_81B2248: ; 81B2248 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =sub_81B227C + 1 + ldr r0, =sub_81B227C str r0, [r1] @081B226C: pop {r4} @@ -839179,7 +839179,7 @@ sub_81B227C: ; 81B227C adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =sub_81B1C1C + 1 + ldr r0, =sub_81B1C1C str r0, [r1] @081B22C8: pop {r4} @@ -841620,7 +841620,7 @@ sub_81B3608: ; 81B3608 add r0, r8 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81B469C + 1 + ldr r1, =sub_81B469C str r1, [r0] movs r0, 0 b @081B36EC @@ -841672,7 +841672,7 @@ sub_81B36FC: ; 81B36FC adds r0, r1 movs r1, 0xFF strh r1, [r0, 0x8] - ldr r1, =sub_81B3730 + 1 + ldr r1, =sub_81B3730 str r1, [r0] @081B3720: pop {r4} @@ -841784,7 +841784,7 @@ sub_81B37FC: ; 81B37FC bl audio_play ldr r0, =0x0203cec4 ldr r1, [r0] - ldr r0, =sub_81B3828 + 1 + ldr r0, =sub_81B3828 str r0, [r1, 0x4] adds r0, r4, 0 bl sub_81B12C0 @@ -841813,7 +841813,7 @@ sub_81B3828: ; 81B3828 subs r3, 0x1 lsls r3, 24 lsrs r3, 24 - ldr r0, =sub_81B3894 + 1 + ldr r0, =sub_81B3894 str r0, [sp] movs r0, 0x1 bl sub_81BF8EC @@ -841828,7 +841828,7 @@ sub_81B3828: ; 81B3828 subs r3, 0x1 lsls r3, 24 lsrs r3, 24 - ldr r0, =sub_81B3894 + 1 + ldr r0, =sub_81B3894 str r0, [sp] movs r0, 0 bl sub_81BF8EC @@ -841860,7 +841860,7 @@ sub_81B3894: ; 81B3894 ldrb r2, [r3, 0xB] movs r1, 0x15 str r1, [sp] - ldr r1, =sub_81B36FC + 1 + ldr r1, =sub_81B36FC str r1, [sp, 0x4] ldr r1, [r3] str r1, [sp, 0x8] @@ -841904,7 +841904,7 @@ brm_switch: ; 81B38DC adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81B1370 + 1 + ldr r1, =sub_81B1370 str r1, [r0] pop {r4-r6} pop {r0} @@ -842087,7 +842087,7 @@ sub_81B3938: ; 81B3938 adds r0, r7 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81B3D48 + 1 + ldr r1, =sub_81B3D48 str r1, [r0] @081B3ABA: add sp, 0xC @@ -842530,7 +842530,7 @@ sub_81B3D48: ; 81B3D48 mov r0, r8 subs r0, 0x8 adds r0, r7, r0 - ldr r1, =sub_81B3E60 + 1 + ldr r1, =sub_81B3E60 str r1, [r0] @081B3E3A: add sp, 0xC @@ -842823,7 +842823,7 @@ sub_81B407C: ; 81B407C adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81B1370 + 1 + ldr r1, =sub_81B1370 str r1, [r0] pop {r4,r5} pop {r0} @@ -842866,7 +842866,7 @@ brm_cancel_1: ; 81B40D4 adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, =sub_81B1370 + 1 + ldr r0, =sub_81B1370 str r0, [r1] pop {r4,r5} pop {r0} @@ -842906,7 +842906,7 @@ sub_81B4134: ; 81B4134 adds r0, r1 movs r1, 0xFF strh r1, [r0, 0x8] - ldr r1, =sub_81B3730 + 1 + ldr r1, =sub_81B3730 str r1, [r0] pop {r4,r5} pop {r0} @@ -842925,7 +842925,7 @@ sub_81B4198: ; 81B4198 bl audio_play ldr r0, =0x0203cec4 ldr r1, [r0] - ldr r0, =sub_81B41C4 + 1 + ldr r0, =sub_81B41C4 str r0, [r1, 0x4] adds r0, r4, 0 bl sub_81B12C0 @@ -842943,7 +842943,7 @@ sub_81B41C4: ; 81B41C4 lsls r0, 24 cmp r0, 0 bne @081B41E0 - ldr r2, =c2_8123744 + 1 + ldr r2, =c2_8123744 movs r0, 0x2 movs r1, 0x5 bl sub_81AAC90 @@ -842951,7 +842951,7 @@ sub_81B41C4: ; 81B41C4 .align 2, 0 .pool @081B41E0: - ldr r1, =c2_8123744 + 1 + ldr r1, =c2_8123744 movs r0, 0x2 bl sub_81C4F98 @081B41E8: @@ -842978,7 +842978,7 @@ c2_8123744: ; 81B41F0 ldrb r2, [r3, 0xB] movs r1, 0x7F str r1, [sp] - ldr r1, =sub_81B36FC + 1 + ldr r1, =sub_81B36FC str r1, [sp, 0x4] ldr r1, [r3] b @081B425A @@ -843008,7 +843008,7 @@ c2_8123744: ; 81B41F0 ldrb r2, [r5, 0xB] movs r1, 0x7F str r1, [sp] - ldr r1, =sub_81B4350 + 1 + ldr r1, =sub_81B4350 str r1, [sp, 0x4] ldr r1, [r5] @081B425A: @@ -843045,7 +843045,7 @@ c2_8123744: ; 81B41F0 ldrb r2, [r5, 0xB] movs r1, 0x7F str r1, [sp] - ldr r1, =sub_81B42D0 + 1 + ldr r1, =sub_81B42D0 str r1, [sp, 0x4] ldr r1, [r5] str r1, [sp, 0x8] @@ -843106,7 +843106,7 @@ sub_81B42D0: ; 81B42D0 adds r0, r7 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81B469C + 1 + ldr r1, =sub_81B469C str r1, [r0] @081B432C: pop {r3} @@ -843145,7 +843145,7 @@ sub_81B4350: ; 81B4350 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81B43A8 + 1 + ldr r1, =sub_81B43A8 str r1, [r0] @081B4388: pop {r4} @@ -843171,7 +843171,7 @@ sub_81B43A8: ; 81B43A8 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =sub_81B43DC + 1 + ldr r0, =sub_81B43DC str r0, [r1] @081B43CC: pop {r4} @@ -843227,7 +843227,7 @@ sub_81B43DC: ; 81B43DC adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81B1C1C + 1 + ldr r1, =sub_81B1C1C str r1, [r0] b @081B44EC .align 2, 0 @@ -843252,7 +843252,7 @@ sub_81B43DC: ; 81B43DC adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81B44FC + 1 + ldr r1, =sub_81B44FC str r1, [r0] b @081B44EC .align 2, 0 @@ -843276,7 +843276,7 @@ sub_81B43DC: ; 81B43DC adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81B469C + 1 + ldr r1, =sub_81B469C str r1, [r0] b @081B44EC .align 2, 0 @@ -843290,7 +843290,7 @@ sub_81B43DC: ; 81B43DC adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =sub_81B1C1C + 1 + ldr r0, =sub_81B1C1C str r0, [r1] @081B44EC: pop {r4-r6} @@ -843312,7 +843312,7 @@ sub_81B44FC: ; 81B44FC beq @081B451C ldr r0, =0x0203cec4 ldr r1, [r0] - ldr r0, =sub_81B452C + 1 + ldr r0, =sub_81B452C str r0, [r1, 0x4] adds r0, r4, 0 bl sub_81B12C0 @@ -843346,7 +843346,7 @@ sub_81B452C: ; 81B452C adds r2, r0 ldr r1, [r1] adds r1, r2 - ldr r2, =sub_81B4578 + 1 + ldr r2, =sub_81B4578 movs r0, 0x4 movs r3, 0x3 bl sub_811A20C @@ -843397,7 +843397,7 @@ sub_81B4578: ; 81B4578 lsrs r0, 28 ldrb r2, [r6, 0xB] str r7, [sp] - ldr r1, =sub_81B36FC + 1 + ldr r1, =sub_81B36FC str r1, [sp, 0x4] ldr r1, [r6] str r1, [sp, 0x8] @@ -843414,7 +843414,7 @@ sub_81B4578: ; 81B4578 ldrb r2, [r6, 0xB] movs r1, 0x7F str r1, [sp] - ldr r1, =sub_81B4624 + 1 + ldr r1, =sub_81B4624 str r1, [sp, 0x4] ldr r1, [r6] str r1, [sp, 0x8] @@ -843474,7 +843474,7 @@ sub_81B4624: ; 81B4624 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =sub_81B469C + 1 + ldr r0, =sub_81B469C str r0, [r1] @081B468A: pop {r4} @@ -843616,7 +843616,7 @@ sub_81B4724: ; 81B4724 adds r1, r7 lsls r1, 3 adds r1, r0 - ldr r0, =sub_81B469C + 1 + ldr r0, =sub_81B469C str r0, [r1] pop {r4-r7} pop {r0} @@ -843668,7 +843668,7 @@ sub_81B47E0: ; 81B47E0 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81B469C + 1 + ldr r1, =sub_81B469C b @081B488A .align 2, 0 .pool @@ -843688,7 +843688,7 @@ sub_81B47E0: ; 81B47E0 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81B48A8 + 1 + ldr r1, =sub_81B48A8 @081B488A: str r1, [r0] pop {r4-r7} @@ -843714,7 +843714,7 @@ sub_81B48A8: ; 81B48A8 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =sub_81B48DC + 1 + ldr r0, =sub_81B48DC str r0, [r1] @081B48CC: pop {r4} @@ -843774,7 +843774,7 @@ sub_81B48DC: ; 81B48DC adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81B4988 + 1 + ldr r1, =sub_81B4988 str r1, [r0] b @081B4978 .align 2, 0 @@ -843788,7 +843788,7 @@ sub_81B48DC: ; 81B48DC adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, =sub_81B1C1C + 1 + ldr r0, =sub_81B1C1C str r0, [r1] @081B4978: pop {r4,r5} @@ -843844,7 +843844,7 @@ sub_81B4988: ; 81B4988 adds r0, r7 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81B1C1C + 1 + ldr r1, =sub_81B1C1C str r1, [r0] @081B49EC: add sp, 0x4 @@ -843886,7 +843886,7 @@ sub_81B4A08: ; 81B4A08 adds r0, r1 movs r1, 0xFF strh r1, [r0, 0x8] - ldr r1, =sub_81B3730 + 1 + ldr r1, =sub_81B3730 str r1, [r0] pop {r4,r5} pop {r0} @@ -843905,7 +843905,7 @@ sub_81B4A6C: ; 81B4A6C bl audio_play ldr r0, =0x0203cec4 ldr r1, [r0] - ldr r0, =sub_81B4A98 + 1 + ldr r0, =sub_81B4A98 str r0, [r1, 0x4] adds r0, r4, 0 bl sub_81B12C0 @@ -843936,7 +843936,7 @@ sub_81B4A98: ; 81B4A98 adds r1, r0 ldr r0, [r2] adds r0, r1 - ldr r1, =sub_81B4AE0 + 1 + ldr r1, =sub_81B4AE0 movs r2, 0x1 bl sub_8121478 pop {r0} @@ -843961,7 +843961,7 @@ sub_81B4AE0: ; 81B4AE0 ldrb r2, [r3, 0xB] movs r1, 0x15 str r1, [sp] - ldr r1, =sub_81B36FC + 1 + ldr r1, =sub_81B36FC str r1, [sp, 0x4] ldr r1, [r3] str r1, [sp, 0x8] @@ -843998,7 +843998,7 @@ brm_take_2: ; 81B4B20 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81B4B6C + 1 + ldr r1, =sub_81B4B6C str r1, [r0] pop {r4,r5} pop {r0} @@ -844023,7 +844023,7 @@ sub_81B4B6C: ; 81B4B6C adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =sub_81B4BA0 + 1 + ldr r0, =sub_81B4BA0 str r0, [r1] @081B4B90: pop {r4} @@ -844075,7 +844075,7 @@ sub_81B4BA0: ; 81B4BA0 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81B469C + 1 + ldr r1, =sub_81B469C b @081B4C4A .align 2, 0 .pool @@ -844088,7 +844088,7 @@ sub_81B4BA0: ; 81B4BA0 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81B1C1C + 1 + ldr r1, =sub_81B1C1C b @081B4C4A .align 2, 0 .pool @@ -844104,7 +844104,7 @@ sub_81B4BA0: ; 81B4BA0 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81B4C60 + 1 + ldr r1, =sub_81B4C60 @081B4C4A: str r1, [r0] @081B4C4C: @@ -844131,7 +844131,7 @@ sub_81B4C60: ; 81B4C60 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =sub_81B4C94 + 1 + ldr r0, =sub_81B4C94 str r0, [r1] @081B4C84: pop {r4} @@ -844199,7 +844199,7 @@ sub_81B4C94: ; 81B4C94 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81B469C + 1 + ldr r1, =sub_81B469C str r1, [r0] b @081B4D64 .align 2, 0 @@ -844215,7 +844215,7 @@ sub_81B4C94: ; 81B4C94 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81B1C1C + 1 + ldr r1, =sub_81B1C1C str r1, [r0] b @081B4D64 .align 2, 0 @@ -844229,7 +844229,7 @@ sub_81B4C94: ; 81B4C94 adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, =sub_81B1C1C + 1 + ldr r0, =sub_81B1C1C str r0, [r1] @081B4D64: pop {r3} @@ -844307,7 +844307,7 @@ sub_81B4D78: ; 81B4D78 adds r0, r1 movs r1, 0xFF strh r1, [r0, 0x8] - ldr r1, =sub_81B3730 + 1 + ldr r1, =sub_81B3730 str r1, [r0] pop {r3} mov r8, r3 @@ -844351,7 +844351,7 @@ brm_shift_sendout: ; 81B4E2C adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81B1C1C + 1 + ldr r1, =sub_81B1C1C str r1, [r0] @081B4E7A: pop {r4,r5} @@ -844421,7 +844421,7 @@ sub_81B4E8C: ; 81B4E8C @081B4F04: movs r0, 0 bl sub_81B3054 - ldr r0, =sub_81B1370 + 1 + ldr r0, =sub_81B1370 mov r1, r8 str r0, [r1] b @081B4F68 @@ -844453,7 +844453,7 @@ sub_81B4E8C: ; 81B4E8C adds r0, r7 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81B1C1C + 1 + ldr r1, =sub_81B1C1C str r1, [r0] @081B4F68: add sp, 0x4 @@ -844595,7 +844595,7 @@ sub_81B4FA8: ; 81B4FA8 adds r1, r7, r2 lsls r1, 3 adds r1, r0 - ldr r0, =sub_81B1370 + 1 + ldr r0, =sub_81B1370 str r0, [r1] pop {r3} mov r8, r3 @@ -844720,7 +844720,7 @@ sub_81B50C8: ; 81B50C8 adds r0, r7 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81B1C1C + 1 + ldr r1, =sub_81B1C1C str r1, [r0] @081B51B0: pop {r3,r4} @@ -844821,7 +844821,7 @@ brm_trade_1: ; 81B51D4 adds r0, r7 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81B1C1C + 1 + ldr r1, =sub_81B1C1C str r1, [r0] b @081B52D4 .align 2, 0 @@ -844919,7 +844919,7 @@ sub_81B52E4: ; 81B52E4 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81B53FC + 1 + ldr r1, =sub_81B53FC b @081B53E4 .align 2, 0 .pool @@ -844938,7 +844938,7 @@ sub_81B52E4: ; 81B52E4 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81B1C1C + 1 + ldr r1, =sub_81B1C1C @081B53E4: str r1, [r0] pop {r4,r5} @@ -844964,7 +844964,7 @@ sub_81B53FC: ; 81B53FC adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =sub_81B5430 + 1 + ldr r0, =sub_81B5430 str r0, [r1] @081B5420: pop {r4} @@ -845084,7 +845084,7 @@ sub_81B5470: ; 81B5470 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81B1C1C + 1 + ldr r1, =sub_81B1C1C str r1, [r0] b @081B5664 .align 2, 0 @@ -845185,13 +845185,13 @@ sub_81B5470: ; 81B5470 .pool @081B5614: ldr r1, =0x0203cec8 - ldr r0, =sub_8124690 + 1 + ldr r0, =sub_8124690 b @081B5628 .align 2, 0 .pool @081B5624: ldr r1, =0x0203cec8 - ldr r0, =c2_exit_to_overworld_2_switch + 1 + ldr r0, =c2_exit_to_overworld_2_switch @081B5628: str r0, [r1] adds r0, r6, 0 @@ -845219,7 +845219,7 @@ sub_81B5470: ; 81B5470 adds r1, r6 lsls r1, 3 adds r1, r0 - ldr r0, =task_brm_cancel_1_on_keypad_a_or_b + 1 + ldr r0, =task_brm_cancel_1_on_keypad_a_or_b str r0, [r1] @081B5664: pop {r4-r7} @@ -845243,7 +845243,7 @@ sub_81B5674: ; 81B5674 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81B56A4 + 1 + ldr r1, =sub_81B56A4 str r1, [r0] pop {r4} pop {r0} @@ -845268,7 +845268,7 @@ sub_81B56A4: ; 81B56A4 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =sub_81B56D8 + 1 + ldr r0, =sub_81B56D8 str r0, [r1] @081B56C8: pop {r4} @@ -845301,7 +845301,7 @@ sub_81B56D8: ; 81B56D8 b @081B572A @081B56FE: ldr r1, =0x0203cec8 - ldr r0, =c2_exit_to_overworld_2_switch + 1 + ldr r0, =c2_exit_to_overworld_2_switch str r0, [r1] adds r0, r4, 0 bl sub_81B12C0 @@ -845331,7 +845331,7 @@ sub_81B56D8: ; 81B56D8 hm_add_c3_launch_phase_2: ; 81B5738 push {lr} bl pal_fill_black - ldr r0, =task_launch_hm_phase_2 + 1 + ldr r0, =task_launch_hm_phase_2 movs r1, 0x8 bl AddTask movs r0, 0x1 @@ -845466,10 +845466,10 @@ sub_81B5820: ; 81B5820 cmp r0, 0x1 bne @081B585C ldr r1, =0x03005db0 - ldr r0, =hm_add_c3_launch_phase_2 + 1 + ldr r0, =hm_add_c3_launch_phase_2 str r0, [r1] ldr r1, =0x0203ceec - ldr r0, =hm_surf_run_dp02scr + 1 + ldr r0, =hm_surf_run_dp02scr str r0, [r1] movs r0, 0x1 b @081B585E @@ -845528,9 +845528,9 @@ sub_81B58A8: ; 81B58A8 sub sp, 0xC movs r0, 0 str r0, [sp] - ldr r0, =sub_81B1370 + 1 + ldr r0, =sub_81B1370 str r0, [sp, 0x4] - ldr r0, =sub_8086194 + 1 + ldr r0, =sub_8086194 str r0, [sp, 0x8] movs r0, 0 movs r1, 0 @@ -845588,10 +845588,10 @@ hm_prepare_waterfall: ; 81B58F0 cmp r0, 0x1 bne @081B594C ldr r1, =0x03005db0 - ldr r0, =hm_add_c3_launch_phase_2 + 1 + ldr r0, =hm_add_c3_launch_phase_2 str r0, [r1] ldr r1, =0x0203ceec - ldr r0, =hm2_waterfall + 1 + ldr r0, =hm2_waterfall str r0, [r1] movs r0, 0x1 b @081B594E @@ -845638,10 +845638,10 @@ sub_81B5974: ; 81B5974 .pool @081B5990: ldr r1, =0x03005db0 - ldr r0, =hm_add_c3_launch_phase_2 + 1 + ldr r0, =hm_add_c3_launch_phase_2 str r0, [r1] ldr r1, =0x0203ceec - ldr r0, =sub_81B5958 + 1 + ldr r0, =sub_81B5958 str r0, [r1] movs r0, 0x1 @081B599E: @@ -845718,7 +845718,7 @@ sub_81B5A2C: ; 81B5A2C lsrs r7, r3, 24 cmp r5, 0 beq @081B5A7A - ldr r1, =sub_80D3014 + 1 + ldr r1, =sub_80D3014 ldr r0, [r4, 0x4] ldrb r2, [r0] ldrb r3, [r0, 0x1] @@ -845905,7 +845905,7 @@ sub_81B5B6C: ; 81B5B6C mov r1, r12 adds r1, 0x1C adds r0, r1 - ldr r1, =sub_81B5C08 + 1 + ldr r1, =sub_81B5C08 b @081B5BD0 .align 2, 0 .pool @@ -845915,7 +845915,7 @@ sub_81B5B6C: ; 81B5B6C adds r0, r5, 0 adds r0, 0x1C adds r0, r6, r0 - ldr r1, =sub_81B5BDC + 1 + ldr r1, =sub_81B5BDC @081B5BD0: str r1, [r0] pop {r4-r7} @@ -846248,7 +846248,7 @@ sub_81B5DF0: ; 81B5DF0 movs r0, 0x1C add r8, r0 add r4, r8 - ldr r0, =sub_81B5E74 + 1 + ldr r0, =sub_81B5E74 str r0, [r4] strh r6, [r5, 0x3C] adds r0, r5, 0 @@ -846678,7 +846678,7 @@ sub_81B617C: ; 81B617C mov r7, r8 push {r7} sub sp, 0xC - ldr r0, =c2_815ABFC + 1 + ldr r0, =c2_815ABFC mov r8, r0 ldr r0, =0x030022c0 ldr r1, =0x00000439 @@ -846739,7 +846739,7 @@ sub_81B617C: ; 81B617C cmp r5, 0x5 bls @081B61D8 @081B6204: - ldr r0, =sub_81B6280 + 1 + ldr r0, =sub_81B6280 movs r1, 0x7F b @081B6230 .align 2, 0 @@ -846754,7 +846754,7 @@ sub_81B617C: ; 81B617C bne @081B622E movs r1, 0x4 @081B622E: - ldr r0, =sub_81B1370 + 1 + ldr r0, =sub_81B1370 @081B6230: str r1, [sp] str r0, [sp, 0x4] @@ -846818,11 +846818,11 @@ sub_81B6280: ; 81B6280 bne @081B62A6 ldr r0, =0x0203cec4 ldr r1, [r0] - ldr r0, =sub_81B9140 + 1 + ldr r0, =sub_81B9140 str r0, [r1, 0x4] @081B62A6: ldr r0, =0x03006328 - ldr r1, =sub_81B6794 + 1 + ldr r1, =sub_81B6794 ldr r2, [r0] adds r0, r3, 0 bl _call_via_r2 @@ -847275,7 +847275,7 @@ sub_81B6588: ; 81B6588 lsls r3, 16 asrs r3, 16 ldrb r1, [r7, 0x9] - ldr r0, =sub_81B672C + 1 + ldr r0, =sub_81B672C str r0, [sp] mov r0, r9 movs r2, 0x1 @@ -847350,7 +847350,7 @@ sub_81B672C: ; 81B672C adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81B6794 + 1 + ldr r1, =sub_81B6794 str r1, [r0] pop {r4,r5} pop {r0} @@ -847825,7 +847825,7 @@ dp05_ether: ; 81B6AFC adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81B6AB4 + 1 + ldr r1, =sub_81B6AB4 str r1, [r0] @081B6B6E: pop {r4} @@ -847869,7 +847869,7 @@ sub_81B6BB4: ; 81B6BB4 adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r0, =sub_81B1370 + 1 + ldr r0, =sub_81B1370 str r0, [r1] ldr r0, =0x0203cec4 ldr r0, [r0] @@ -847958,7 +847958,7 @@ sub_81B6BEC: ; 81B6BEC adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81B6794 + 1 + ldr r1, =sub_81B6794 str r1, [r0] pop {r3} mov r8, r3 @@ -847987,7 +847987,7 @@ dp05_pp_up: ; 81B6CC0 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81B6AB4 + 1 + ldr r1, =sub_81B6AB4 str r1, [r0] pop {r4} pop {r0} @@ -848102,7 +848102,7 @@ sub_81B6D98: ; 81B6D98 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81B6794 + 1 + ldr r1, =sub_81B6794 str r1, [r0] pop {r4} pop {r0} @@ -848171,7 +848171,7 @@ sub_81B6DC4: ; 81B6DC4 adds r1, r6 lsls r1, 3 adds r1, r0 - ldr r0, =sub_81B6EB4 + 1 + ldr r0, =sub_81B6EB4 str r0, [r1] b @081B6E9C .align 2, 0 @@ -848197,7 +848197,7 @@ sub_81B6DC4: ; 81B6DC4 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81B6FF4 + 1 + ldr r1, =sub_81B6FF4 str r1, [r0] @081B6E9C: pop {r3} @@ -848265,7 +848265,7 @@ sub_81B6EB4: ; 81B6EB4 adds r0, r7 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81B6F60 + 1 + ldr r1, =sub_81B6F60 str r1, [r0] pop {r4-r7} pop {r0} @@ -848291,7 +848291,7 @@ sub_81B6F60: ; 81B6F60 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81B6F98 + 1 + ldr r1, =sub_81B6F98 str r1, [r0] @081B6F86: pop {r4} @@ -848365,7 +848365,7 @@ sub_81B6FF4: ; 81B6FF4 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =sub_81B7028 + 1 + ldr r0, =sub_81B7028 str r0, [r1] @081B7018: pop {r4} @@ -848405,7 +848405,7 @@ sub_81B7028: ; 81B7028 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81B7088 + 1 + ldr r1, =sub_81B7088 str r1, [r0] b @081B7080 .align 2, 0 @@ -848434,7 +848434,7 @@ sub_81B7088: ; 81B7088 beq @081B70A8 ldr r0, =0x0203cec4 ldr r1, [r0] - ldr r0, =sub_81B70B8 + 1 + ldr r0, =sub_81B70B8 str r0, [r1, 0x4] adds r0, r4, 0 bl sub_81B12C0 @@ -848458,7 +848458,7 @@ sub_81B70B8: ; 81B70B8 subs r2, 0x1 lsls r2, 24 lsrs r2, 24 - ldr r3, =sub_81B70F0 + 1 + ldr r3, =sub_81B70F0 ldrh r4, [r4, 0xE] str r4, [sp] bl sub_81BFA38 @@ -848476,7 +848476,7 @@ sub_81B70F0: ; 81B70F0 sub sp, 0xC movs r0, 0x7F str r0, [sp] - ldr r0, =sub_81B711C + 1 + ldr r0, =sub_81B711C str r0, [sp, 0x4] ldr r0, =0x0203cec8 ldr r0, [r0] @@ -848564,7 +848564,7 @@ sub_81B7154: ; 81B7154 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81B71D4 + 1 + ldr r1, =sub_81B71D4 str r1, [r0] pop {r4-r6} pop {r0} @@ -848644,7 +848644,7 @@ sub_81B7230: ; 81B7230 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81B7294 + 1 + ldr r1, =sub_81B7294 str r1, [r0] pop {r4,r5} pop {r0} @@ -848669,7 +848669,7 @@ sub_81B7294: ; 81B7294 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =sub_81B72C8 + 1 + ldr r0, =sub_81B72C8 str r0, [r1] @081B72B8: pop {r4} @@ -848737,7 +848737,7 @@ sub_81B72C8: ; 81B72C8 adds r1, r6 lsls r1, 3 adds r1, r0 - ldr r0, =sub_81B73E4 + 1 + ldr r0, =sub_81B73E4 str r0, [r1] b @081B73C2 .align 2, 0 @@ -848753,7 +848753,7 @@ sub_81B72C8: ; 81B72C8 adds r1, r6 lsls r1, 3 adds r1, r0 - ldr r0, =sub_81B6794 + 1 + ldr r0, =sub_81B6794 str r0, [r1] b @081B73C2 .align 2, 0 @@ -848781,7 +848781,7 @@ sub_81B72C8: ; 81B72C8 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81B6FF4 + 1 + ldr r1, =sub_81B6FF4 str r1, [r0] @081B73C2: pop {r4-r7} @@ -848922,7 +848922,7 @@ dp05_rare_candy: ; 81B7404 adds r0, r7 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81B75D4 + 1 + ldr r1, =sub_81B75D4 @081B7516: str r1, [r0] pop {r3-r5} @@ -849033,7 +849033,7 @@ sub_81B75D4: ; 81B75D4 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =sub_81B7634 + 1 + ldr r0, =sub_81B7634 str r0, [r1] @081B7620: pop {r4} @@ -849068,7 +849068,7 @@ sub_81B7634: ; 81B7634 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =sub_81B7704 + 1 + ldr r0, =sub_81B7704 str r0, [r1] @081B7668: pop {r4} @@ -849212,7 +849212,7 @@ sub_81B7704: ; 81B7704 adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, =sub_81B77AC + 1 + ldr r0, =sub_81B77AC str r0, [r1] b @081B77A6 .align 2, 0 @@ -849316,7 +849316,7 @@ sub_81B7810: ; 81B7810 adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, =sub_81B6794 + 1 + ldr r0, =sub_81B6794 str r0, [r1] @081B786E: pop {r4-r7} @@ -849369,7 +849369,7 @@ sub_81B787C: ; 81B787C adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81B6FF4 + 1 + ldr r1, =sub_81B6FF4 str r1, [r0] pop {r3} mov r8, r3 @@ -849423,7 +849423,7 @@ sub_81B7910: ; 81B7910 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81B6F60 + 1 + ldr r1, =sub_81B6F60 str r1, [r0] pop {r3} mov r8, r3 @@ -849538,7 +849538,7 @@ sub_81B7A28: ; 81B7A28 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =task_intro_gamefreak + 1 + ldr r0, =task_intro_gamefreak str r0, [r1] b @081B7B2A .align 2, 0 @@ -849594,7 +849594,7 @@ sub_81B7A28: ; 81B7A28 lsls r3, 16 asrs r3, 16 ldrb r1, [r6, 0x9] - ldr r0, =sub_81B7C10 + 1 + ldr r0, =sub_81B7C10 str r0, [sp] mov r0, r8 movs r2, 0x1 @@ -849690,7 +849690,7 @@ task_intro_gamefreak: ; 81B7B4C adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81B6794 + 1 + ldr r1, =sub_81B6794 str r1, [r0] ldr r1, =0x0203cec8 movs r0, 0 @@ -849736,7 +849736,7 @@ sub_81B7C10: ; 81B7C10 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, =task_intro_gamefreak + 1 + ldr r1, =task_intro_gamefreak str r1, [r0] pop {r4,r5} pop {r0} @@ -850082,7 +850082,7 @@ sub_81B7E4C: ; 81B7E4C adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81B6FF4 + 1 + ldr r1, =sub_81B6FF4 str r1, [r0] @081B7F1C: pop {r3} @@ -850100,9 +850100,9 @@ sub_81B7F34: ; 81B7F34 sub sp, 0xC movs r0, 0 str r0, [sp] - ldr r0, =sub_81B1370 + 1 + ldr r0, =sub_81B1370 str r0, [sp, 0x4] - ldr r0, =sub_8086194 + 1 + ldr r0, =sub_8086194 str r0, [sp, 0x8] movs r0, 0 movs r1, 0 @@ -850122,14 +850122,14 @@ sub_81B7F60: ; 81B7F60 sub sp, 0xC bl sub_81A9E40 lsls r0, 24 - ldr r1, =sub_81C4F84 + 1 + ldr r1, =sub_81C4F84 cmp r0, 0 bne @081B7F72 - ldr r1, =c2_815ABFC + 1 + ldr r1, =c2_815ABFC @081B7F72: movs r0, 0x6 str r0, [sp] - ldr r0, =sub_81B1370 + 1 + ldr r0, =sub_81B1370 str r0, [sp, 0x4] str r1, [sp, 0x8] movs r0, 0 @@ -850206,7 +850206,7 @@ sub_81B7FAC: ; 81B7FAC adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81B82A0 + 1 + ldr r1, =sub_81B82A0 str r1, [r0] @081B8030: pop {r3,r4} @@ -850234,7 +850234,7 @@ sub_81B8044: ; 81B8044 bl sub_81B83F0 ldr r0, =0x0203cec4 ldr r1, [r0] - ldr r0, =sub_81B814C + 1 + ldr r0, =sub_81B814C str r0, [r1, 0x4] adds r0, r4, 0 bl sub_81B12C0 @@ -850293,7 +850293,7 @@ sub_81B8088: ; 81B8088 adds r0, r7 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81B8104 + 1 + ldr r1, =sub_81B8104 str r1, [r0] @081B80E4: pop {r3} @@ -850366,7 +850366,7 @@ sub_81B814C: ; 81B814C adds r2, r0 ldr r1, [r1] adds r1, r2 - ldr r2, =sub_81B81A8 + 1 + ldr r2, =sub_81B81A8 movs r0, 0x4 movs r3, 0x3 bl sub_811A20C @@ -850421,7 +850421,7 @@ sub_81B81A8: ; 81B81A8 ldrb r2, [r6, 0xB] movs r1, 0x7F str r1, [sp] - ldr r1, =sub_81B8230 + 1 + ldr r1, =sub_81B8230 str r1, [sp, 0x4] ldr r1, [r6] str r1, [sp, 0x8] @@ -850478,7 +850478,7 @@ sub_81B8230: ; 81B8230 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =sub_81B8104 + 1 + ldr r0, =sub_81B8104 str r0, [r1] @081B828A: pop {r4} @@ -850504,7 +850504,7 @@ sub_81B82A0: ; 81B82A0 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =sub_81B82D4 + 1 + ldr r0, =sub_81B82D4 str r0, [r1] @081B82C4: pop {r4} @@ -850565,7 +850565,7 @@ sub_81B82D4: ; 81B82D4 beq @081B835C ldr r0, =0x0203cec4 ldr r1, [r0] - ldr r0, =sub_81B814C + 1 + ldr r0, =sub_81B814C str r0, [r1, 0x4] adds r0, r5, 0 bl sub_81B12C0 @@ -850591,7 +850591,7 @@ sub_81B82D4: ; 81B82D4 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81B8104 + 1 + ldr r1, =sub_81B8104 str r1, [r0] b @081B83A8 .align 2, 0 @@ -850605,7 +850605,7 @@ sub_81B82D4: ; 81B82D4 adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, =sub_81B8104 + 1 + ldr r0, =sub_81B8104 str r0, [r1] @081B83A8: pop {r4-r7} @@ -850631,7 +850631,7 @@ sub_81B83B8: ; 81B83B8 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81B8104 + 1 + ldr r1, =sub_81B8104 str r1, [r0] pop {r4} pop {r0} @@ -850697,9 +850697,9 @@ sub_81B8448: ; 81B8448 sub sp, 0xC movs r0, 0x6 str r0, [sp] - ldr r0, =sub_81B1370 + 1 + ldr r0, =sub_81B1370 str r0, [sp, 0x4] - ldr r0, =sub_816BB28 + 1 + ldr r0, =sub_816BB28 str r0, [sp, 0x8] movs r0, 0 movs r1, 0 @@ -850769,7 +850769,7 @@ sub_81B8474: ; 81B8474 adds r1, r6 lsls r1, 3 adds r1, r0 - ldr r0, =sub_81B8104 + 1 + ldr r0, =sub_81B8104 str r0, [r1] pop {r4-r6} pop {r0} @@ -850785,7 +850785,7 @@ sub_81B8518: ; 81B8518 bl sub_81B8558 movs r0, 0 str r0, [sp] - ldr r0, =sub_81B1370 + 1 + ldr r0, =sub_81B1370 str r0, [sp, 0x4] ldr r0, =0x030022c0 ldr r0, [r0, 0x8] @@ -850796,7 +850796,7 @@ sub_81B8518: ; 81B8518 movs r3, 0 bl sub_81B0038 ldr r1, =0x0203cec8 - ldr r0, =sub_81B879C + 1 + ldr r0, =sub_81B879C str r0, [r1, 0x4] add sp, 0xC pop {r0} @@ -851126,7 +851126,7 @@ sub_81B879C: ; 81B879C adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, =sub_81B87E8 + 1 + ldr r0, =sub_81B87E8 str r0, [r1] b @081B87E0 .align 2, 0 @@ -851167,7 +851167,7 @@ sub_81B87E8: ; 81B87E8 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =sub_81B1370 + 1 + ldr r0, =sub_81B1370 str r0, [r1] @081B881C: pop {r4} @@ -851310,7 +851310,7 @@ sub_81B8904: ; 81B8904 lsrs r0, 24 movs r2, 0 str r2, [sp] - ldr r2, =sub_81B1370 + 1 + ldr r2, =sub_81B1370 str r2, [sp, 0x4] str r1, [sp, 0x8] movs r1, 0 @@ -851330,9 +851330,9 @@ sub_81B892C: ; 81B892C sub sp, 0xC movs r0, 0x4 str r0, [sp] - ldr r0, =sub_81B1370 + 1 + ldr r0, =sub_81B1370 str r0, [sp, 0x4] - ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 + ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music str r0, [sp, 0x8] movs r0, 0 movs r1, 0 @@ -851352,9 +851352,9 @@ sub_81B8958: ; 81B8958 sub sp, 0xC movs r0, 0x1 str r0, [sp] - ldr r0, =sub_81B1370 + 1 + ldr r0, =sub_81B1370 str r0, [sp, 0x4] - ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 + ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music str r0, [sp, 0x8] movs r0, 0xB movs r1, 0 @@ -851405,9 +851405,9 @@ sub_81B89AC: ; 81B89AC lsrs r1, 24 movs r0, 0 str r0, [sp] - ldr r0, =sub_81B1370 + 1 + ldr r0, =sub_81B1370 str r0, [sp, 0x4] - ldr r0, =sub_8059D40 + 1 + ldr r0, =sub_8059D40 str r0, [sp, 0x8] movs r0, 0x1 adds r2, r4, 0 @@ -851433,9 +851433,9 @@ sub_81B89F0: ; 81B89F0 lsrs r1, 24 movs r0, 0x5 str r0, [sp] - ldr r0, =sub_81B1370 + 1 + ldr r0, =sub_81B1370 str r0, [sp, 0x4] - ldr r0, =c2_815ABFC + 1 + ldr r0, =c2_815ABFC str r0, [sp, 0x8] movs r0, 0x1 movs r2, 0x3 @@ -852354,7 +852354,7 @@ sub_81B90D0: ; 81B90D0 thumb_func_start sub_81B9140 sub_81B9140: ; 81B9140 push {lr} - ldr r0, =sub_8059D40 + 1 + ldr r0, =sub_8059D40 bl set_callback2 pop {r0} bx r0 @@ -852368,7 +852368,7 @@ sub_81B9150: ; 81B9150 sub sp, 0xC movs r0, 0x7F str r0, [sp] - ldr r0, =sub_81B917C + 1 + ldr r0, =sub_81B917C str r0, [sp, 0x4] ldr r0, =0x030022c0 ldr r0, [r0, 0x8] @@ -852404,7 +852404,7 @@ sub_81B917C: ; 81B917C movs r0, 0x2 movs r2, 0 bl bg_change_x_offset - ldr r0, =sub_81B91B4 + 1 + ldr r0, =sub_81B91B4 str r0, [r4] pop {r4} pop {r0} @@ -852466,7 +852466,7 @@ sub_81B91B4: ; 81B91B4 adds r1, r6, r5 lsls r1, 3 adds r1, r0 - ldr r0, =sub_81B9240 + 1 + ldr r0, =sub_81B9240 str r0, [r1] @081B9220: pop {r4-r7} @@ -852602,9 +852602,9 @@ sub_81B9328: ; 81B9328 sub sp, 0xC movs r0, 0xF str r0, [sp] - ldr r0, =sub_81B1370 + 1 + ldr r0, =sub_81B1370 str r0, [sp, 0x4] - ldr r0, =sub_81B9390 + 1 + ldr r0, =sub_81B9390 str r0, [sp, 0x8] movs r0, 0x6 movs r1, 0 @@ -852625,13 +852625,13 @@ sub_81B9354: ; 81B9354 lsls r0, 24 lsrs r0, 24 ldr r2, =0x03005db0 - ldr r1, =hm_add_c3_without_phase_2 + 1 + ldr r1, =hm_add_c3_without_phase_2 str r1, [r2] movs r1, 0 str r1, [sp] - ldr r1, =sub_81B1370 + 1 + ldr r1, =sub_81B1370 str r1, [sp, 0x4] - ldr r1, =c2_exit_to_overworld_2_switch + 1 + ldr r1, =c2_exit_to_overworld_2_switch str r1, [sp, 0x8] movs r1, 0 movs r2, 0xB @@ -852658,9 +852658,9 @@ sub_81B9390: ; 81B9390 strh r0, [r4] @081B93A6: ldr r0, =0x03005db0 - ldr r1, =hm_add_c3_without_phase_2 + 1 + ldr r1, =hm_add_c3_without_phase_2 str r1, [r0] - ldr r0, =c2_exit_to_overworld_2_switch + 1 + ldr r0, =c2_exit_to_overworld_2_switch bl set_callback2 pop {r4} pop {r0} @@ -852673,7 +852673,7 @@ sub_81B9390: ; 81B9390 hm_add_c3_without_phase_2: ; 81B93C8 push {lr} bl pal_fill_black - ldr r0, =task_hm_without_phase_2 + 1 + ldr r0, =task_hm_without_phase_2 movs r1, 0xA bl AddTask movs r0, 0x1 @@ -852709,7 +852709,7 @@ sub_81B9404: ; 81B9404 movs r0, 0x1 movs r1, 0 bl fade_screen - ldr r0, =sub_81B9424 + 1 + ldr r0, =sub_81B9424 movs r1, 0xA bl AddTask pop {r0} @@ -852734,9 +852734,9 @@ sub_81B9424: ; 81B9424 bne @081B945C bl overworld_free_bg_tilemaps str r4, [sp] - ldr r0, =sub_81B1370 + 1 + ldr r0, =sub_81B1370 str r0, [sp, 0x4] - ldr r0, =sub_81B9470 + 1 + ldr r0, =sub_81B9470 str r0, [sp, 0x8] movs r0, 0x2 movs r1, 0 @@ -852771,9 +852771,9 @@ sub_81B9470: ; 81B9470 ldrb r0, [r2] strh r0, [r1] ldr r1, =0x03005db0 - ldr r0, =hm_add_c3_without_phase_2 + 1 + ldr r0, =hm_add_c3_without_phase_2 str r0, [r1] - ldr r0, =c2_exit_to_overworld_2_switch + 1 + ldr r0, =c2_exit_to_overworld_2_switch bl set_callback2 pop {r0} bx r0 @@ -852788,7 +852788,7 @@ sub_81B94B0: ; 81B94B0 movs r0, 0x1 movs r1, 0 bl fade_screen - ldr r0, =sub_81B94D0 + 1 + ldr r0, =sub_81B94D0 movs r1, 0xA bl AddTask pop {r0} @@ -852813,9 +852813,9 @@ sub_81B94D0: ; 81B94D0 bne @081B9508 bl overworld_free_bg_tilemaps str r4, [sp] - ldr r0, =sub_81B1370 + 1 + ldr r0, =sub_81B1370 str r0, [sp, 0x4] - ldr r0, =sub_81B9390 + 1 + ldr r0, =sub_81B9390 str r0, [sp, 0x8] movs r0, 0x3 movs r1, 0 @@ -852840,7 +852840,7 @@ sub_81B951C: ; 81B951C movs r0, 0x1 movs r1, 0 bl fade_screen - ldr r0, =sub_81B953C + 1 + ldr r0, =sub_81B953C movs r1, 0xA bl AddTask pop {r0} @@ -852865,9 +852865,9 @@ sub_81B953C: ; 81B953C bne @081B9574 bl overworld_free_bg_tilemaps str r4, [sp] - ldr r0, =sub_81B1370 + 1 + ldr r0, =sub_81B1370 str r0, [sp, 0x4] - ldr r0, =sub_81B9588 + 1 + ldr r0, =sub_81B9588 str r0, [sp, 0x8] movs r0, 0x7 movs r1, 0 @@ -852913,9 +852913,9 @@ sub_81B9588: ; 81B9588 strh r0, [r4] @081B95BA: ldr r0, =0x03005db0 - ldr r1, =hm_add_c3_without_phase_2 + 1 + ldr r1, =hm_add_c3_without_phase_2 str r1, [r0] - ldr r0, =c2_exit_to_overworld_2_switch + 1 + ldr r0, =c2_exit_to_overworld_2_switch bl set_callback2 pop {r4,r5} pop {r0} @@ -852967,7 +852967,7 @@ sub_81B9620: ; 81B9620 movs r0, 0x1 movs r1, 0 bl fade_screen - ldr r0, =sub_81B9640 + 1 + ldr r0, =sub_81B9640 movs r1, 0xA bl AddTask pop {r0} @@ -852992,9 +852992,9 @@ sub_81B9640: ; 81B9640 bne @081B9678 bl overworld_free_bg_tilemaps str r4, [sp] - ldr r0, =sub_81B1370 + 1 + ldr r0, =sub_81B1370 str r0, [sp, 0x4] - ldr r0, =sub_81B9390 + 1 + ldr r0, =sub_81B9390 str r0, [sp, 0x8] movs r0, 0xC movs r1, 0 @@ -853024,12 +853024,12 @@ sub_81B968C: ; 81B968C subs r3, 0x1 lsls r3, 24 lsrs r3, 24 - ldr r0, =c2_exit_to_overworld_2_switch + 1 + ldr r0, =c2_exit_to_overworld_2_switch str r0, [sp] movs r0, 0x3 bl sub_81BF8EC ldr r1, =0x03005dac - ldr r0, =sub_80AF168 + 1 + ldr r0, =sub_80AF168 str r0, [r1] add sp, 0x4 pop {r0} @@ -855986,7 +855986,7 @@ sub_81BADF4: ; 81BADF4 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, =bx_exec_buffer_A_ch0_tbl3 + 1 + ldr r1, =bx_exec_buffer_A_ch0_tbl3 str r1, [r0] bx lr .align 2, 0 @@ -856044,7 +856044,7 @@ sub_81BAE60: ; 81BAE60 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 bne @081BAE84 bl dp01_tbl3_exec_completed @@ -856071,7 +856071,7 @@ sub_81BAE98: ; 81BAE98 adds r1, 0x1C adds r0, r1 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 bne @081BAEE8 movs r0, 0 @@ -856169,7 +856169,7 @@ sub_81BAF48: ; 81BAF48 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 bne @081BAFD8 b @081BAFD6 @@ -856189,7 +856189,7 @@ sub_81BAF48: ; 81BAF48 adds r4, 0x1C adds r0, r4 ldr r2, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r2, r0 bne @081BAFD8 movs r0, 0x2 @@ -856229,7 +856229,7 @@ sub_81BAF48: ; 81BAF48 ldrb r0, [r3] lsls r0, 2 adds r0, r1 - ldr r1, =sub_81BAF00 + 1 + ldr r1, =sub_81BAF00 str r1, [r0] @081BB00A: pop {r4-r6} @@ -856295,7 +856295,7 @@ sub_81BB02C: ; 81BB02C adds r5, 0x1C adds r0, r5 ldr r3, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r3, r0 bne @081BB196 ldr r0, =0x020241e4 @@ -856414,7 +856414,7 @@ sub_81BB02C: ; 81BB02C ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =sub_81BAF48 + 1 + ldr r1, =sub_81BAF48 str r1, [r0] @081BB196: pop {r3-r5} @@ -856646,7 +856646,7 @@ sub_81BB29C: ; 81BB29C cmp r1, r0 bne @081BB3B8 @081BB396: - ldr r0, =sub_81BB628 + 1 + ldr r0, =sub_81BB628 b @081BB3FA .align 2, 0 .pool @@ -856657,7 +856657,7 @@ sub_81BB29C: ; 81BB29C add r1, r9 lsls r1, 3 adds r1, r0 - ldr r0, =sub_81BB740 + 1 + ldr r0, =sub_81BB740 b @081BB3FC .align 2, 0 .pool @@ -856671,7 +856671,7 @@ sub_81BB29C: ; 81BB29C ldr r3, [sp, 0x8] lsls r0, r3, 2 adds r0, r1 - ldr r1, =sub_81BB284 + 1 + ldr r1, =sub_81BB284 str r1, [r0] mov r0, r9 bl remove_task @@ -856679,7 +856679,7 @@ sub_81BB29C: ; 81BB29C .align 2, 0 .pool @081BB3F8: - ldr r0, =sub_81BB414 + 1 + ldr r0, =sub_81BB414 @081BB3FA: mov r1, r8 @081BB3FC: @@ -856775,7 +856775,7 @@ sub_81BB414: ; 81BB414 bl sub_807294C movs r0, 0x21 bl audio_play - ldr r0, =sub_81BB4E4 + 1 + ldr r0, =sub_81BB4E4 mov r1, r8 str r0, [r1] add sp, 0x4 @@ -856905,7 +856905,7 @@ sub_81BB4E4: ; 81BB4E4 movs r1, 0xB bl dp01_build_cmdbuf_x21_a_bb strb r5, [r4] - ldr r0, =sub_81BB628 + 1 + ldr r0, =sub_81BB628 str r0, [r6] b @081BB610 .align 2, 0 @@ -856919,7 +856919,7 @@ sub_81BB4E4: ; 81BB4E4 ldr r1, =0x03005d60 lsls r0, r7, 2 adds r0, r1 - ldr r1, =sub_81BB284 + 1 + ldr r1, =sub_81BB284 str r1, [r0] mov r0, r8 bl remove_task @@ -856974,7 +856974,7 @@ sub_81BB628: ; 81BB628 adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, =sub_81BB688 + 1 + ldr r0, =sub_81BB688 str r0, [r1] pop {r4-r6} pop {r0} @@ -857054,7 +857054,7 @@ sub_81BB688: ; 81BB688 adds r1, r6 lsls r1, 3 adds r1, r0 - ldr r0, =sub_81BB740 + 1 + ldr r0, =sub_81BB740 str r0, [r1] @081BB72A: pop {r4-r7} @@ -857086,7 +857086,7 @@ sub_81BB740: ; 81BB740 ldr r1, =0x03005d60 lsls r0, 2 adds r0, r1 - ldr r1, =sub_81BB284 + 1 + ldr r1, =sub_81BB284 str r1, [r0] adds r0, r5, 0 bl remove_task @@ -857301,7 +857301,7 @@ sub_81BB92C: ; 81BB92C adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 bne @081BB97E adds r0, r3, 0 @@ -857326,7 +857326,7 @@ sub_81BB92C: ; 81BB92C ldrb r1, [r4] lsls r1, 2 adds r1, r0 - ldr r0, =dp01t_35_3_free_vram + 1 + ldr r0, =dp01t_35_3_free_vram str r0, [r1] @081BB97E: pop {r4} @@ -857363,7 +857363,7 @@ dp01t_35_3_free_vram: ; 81BB9A0 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 bne @081BB9DC bl dp01_tbl3_exec_completed @@ -857414,7 +857414,7 @@ sub_81BB9F4: ; 81BB9F4 bl gpu_tile_obj_free_by_tag adds r0, r4, 0 bl gpu_pal_free_tag - ldr r0, =c3_0802FDF4 + 1 + ldr r0, =c3_0802FDF4 movs r1, 0xA bl AddTask ldr r0, =0x0202406e @@ -857460,7 +857460,7 @@ sub_81BB9F4: ; 81BB9F4 ldrb r0, [r7] lsls r0, 2 adds r0, r1 - ldr r1, =sub_81BB92C + 1 + ldr r1, =sub_81BB92C str r1, [r0] @081BBAB0: pop {r3} @@ -857511,7 +857511,7 @@ sub_81BBAE8: ; 81BBAE8 adds r0, 0x1C adds r0, r3, r0 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 bne @081BBB60 ldr r0, [r6] @@ -857531,7 +857531,7 @@ sub_81BBAE8: ; 81BBAE8 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =sub_81BB9F4 + 1 + ldr r1, =sub_81BB9F4 str r1, [r0] @081BBB60: pop {r4-r6} @@ -857550,7 +857550,7 @@ dp01_tbl3_exec_completed: ; 81BBB8C ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =bx_exec_buffer_A_ch0_tbl3 + 1 + ldr r1, =bx_exec_buffer_A_ch0_tbl3 str r1, [r0] ldr r0, =0x02022fec ldr r0, [r0] @@ -859927,7 +859927,7 @@ sub_81BCF58: ; 81BCF58 ldrb r0, [r6] lsls r0, 2 adds r0, r1 - ldr r1, =sub_81BB1D4 + 1 + ldr r1, =sub_81BB1D4 str r1, [r0] pop {r3} mov r8, r3 @@ -859976,7 +859976,7 @@ sub_81BD074: ; 81BD074 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, =sub_81BBAE8 + 1 + ldr r1, =sub_81BBAE8 str r1, [r0] pop {r4-r6} pop {r0} @@ -860019,7 +860019,7 @@ sub_81BD0E4: ; 81BD0E4 lsls r0, 16 lsrs r0, 16 mov r8, r0 - ldr r0, =sub_805D714 + 1 + ldr r0, =sub_805D714 bl object_new_hidden_with_callback ldr r1, =0x03005d7c mov r9, r1 @@ -860124,7 +860124,7 @@ sub_81BD0E4: ; 81BD0E4 adds r1, r5, 0 adds r1, 0x1C adds r0, r1 - ldr r1, =nullsub_12 + 1 + ldr r1, =nullsub_12 str r1, [r0] movs r0, 0 movs r1, 0xFF @@ -860173,7 +860173,7 @@ sub_81BD260: ; 81BD260 ldrb r0, [r6] lsls r0, 2 adds r0, r1 - ldr r1, =sub_81BD2F0 + 1 + ldr r1, =sub_81BD2F0 str r1, [r0] b @081BD2DE .align 2, 0 @@ -860272,7 +860272,7 @@ sub_81BD2F0: ; 81BD2F0 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, =sub_81BB828 + 1 + ldr r1, =sub_81BB828 str r1, [r0] @081BD36E: pop {r4-r6} @@ -860393,7 +860393,7 @@ sub_81BD37C: ; 81BD37C lsls r0, 2 adds r4, 0x1C adds r0, r4 - ldr r1, =sub_805D7AC + 1 + ldr r1, =sub_805D7AC str r1, [r0] b @081BD57C .align 2, 0 @@ -860483,7 +860483,7 @@ sub_81BD37C: ; 81BD37C adds r1, r5, 0 adds r1, 0x1C adds r0, r1 - ldr r1, =sub_805D7AC + 1 + ldr r1, =sub_805D7AC str r1, [r0] ldrb r0, [r6] adds r0, r4 @@ -860515,7 +860515,7 @@ sub_81BD37C: ; 81BD37C ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, =sub_81BAE60 + 1 + ldr r1, =sub_81BAE60 str r1, [r0] pop {r3,r4} mov r8, r3 @@ -860585,7 +860585,7 @@ sub_81BD5C8: ; 81BD5C8 adds r1, r5, 0 adds r1, 0x1C adds r0, r1 - ldr r1, =sub_80A6EEC + 1 + ldr r1, =sub_80A6EEC str r1, [r0] ldrb r0, [r4] adds r0, r6 @@ -860594,13 +860594,13 @@ sub_81BD5C8: ; 81BD5C8 adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, =nullsub_12 + 1 + ldr r1, =nullsub_12 bl oamt_set_x3A_32 ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =sub_81BAE98 + 1 + ldr r1, =sub_81BAE98 str r1, [r0] pop {r4-r6} pop {r0} @@ -860700,13 +860700,13 @@ sub_81BD674: ; 81BD674 lsls r0, 2 adds r2, 0x1C adds r0, r2 - ldr r1, =sub_8039C00 + 1 + ldr r1, =sub_8039C00 str r1, [r0] ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, =sub_81BB78C + 1 + ldr r1, =sub_81BB78C str r1, [r0] @081BD73E: pop {r4-r6} @@ -860877,7 +860877,7 @@ sub_81BD790: ; 81BD790 ldrb r0, [r6] lsls r0, 2 adds r0, r1 - ldr r1, =bx_move_anim_3 + 1 + ldr r1, =bx_move_anim_3 str r1, [r0] @081BD8B6: pop {r4-r6} @@ -861095,7 +861095,7 @@ sub_81BDA4C: ; 81BDA4C ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =sub_81BB898 + 1 + ldr r1, =sub_81BB898 str r1, [r0] pop {r4} pop {r0} @@ -861366,7 +861366,7 @@ sub_81BDC10: ; 81BDC10 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, =bx_t3_healthbar_update + 1 + ldr r1, =bx_t3_healthbar_update str r1, [r0] add sp, 0x4 pop {r3,r4} @@ -861419,7 +861419,7 @@ sub_81BDD00: ; 81BDD00 ldrb r0, [r1] lsls r0, 8 orrs r4, r0 - ldr r0, =sub_81BB29C + 1 + ldr r0, =sub_81BB29C movs r1, 0xA bl AddTask lsls r0, 24 @@ -861437,7 +861437,7 @@ sub_81BDD00: ; 81BDD00 ldrb r0, [r6] lsls r0, 2 adds r0, r1 - ldr r1, =nullsub_21 + 1 + ldr r1, =nullsub_21 str r1, [r0] @081BDD84: pop {r4-r7} @@ -861487,7 +861487,7 @@ sub_81BDD9C: ; 81BDD9C ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =sub_81BBC04 + 1 + ldr r1, =sub_81BBC04 str r1, [r0] @081BDDF0: pop {r4} @@ -861535,7 +861535,7 @@ sub_81BDE14: ; 81BDE14 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, =sub_81BBC04 + 1 + ldr r1, =sub_81BBC04 str r1, [r0] @081BDE64: pop {r4,r5} @@ -861737,7 +861737,7 @@ dp01t_29_3_blink: ; 81BDF7C ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =bx_blink_t3 + 1 + ldr r1, =bx_blink_t3 str r1, [r0] @081BDFDA: pop {r4} @@ -861934,7 +861934,7 @@ sub_81BE10C: ; 81BE10C adds r1, r4, 0 adds r1, 0x1C adds r0, r1 - ldr r1, =sub_80A6EEC + 1 + ldr r1, =sub_80A6EEC str r1, [r0] ldrb r2, [r5] adds r0, r2, r6 @@ -861951,7 +861951,7 @@ sub_81BE10C: ; 81BE10C adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, =sub_805CC00 + 1 + ldr r1, =sub_805CC00 bl oamt_set_x3A_32 ldrb r0, [r5] adds r0, r6 @@ -862012,7 +862012,7 @@ sub_81BE10C: ; 81BE10C ands r0, r2 orrs r0, r4 strb r0, [r1, 0x5] - ldr r0, =sub_81BE2C8 + 1 + ldr r0, =sub_81BE2C8 movs r1, 0x5 bl AddTask lsls r0, 24 @@ -862044,7 +862044,7 @@ sub_81BE10C: ; 81BE10C adds r0, r1 lsls r0, 3 adds r0, r4 - ldr r1, =sub_8073C30 + 1 + ldr r1, =sub_8073C30 str r1, [r0] @081BE27E: ldr r0, [r3] @@ -862057,7 +862057,7 @@ sub_81BE10C: ; 81BE10C ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, =nullsub_77 + 1 + ldr r1, =nullsub_77 str r1, [r0] pop {r4-r6} pop {r0} @@ -862169,7 +862169,7 @@ sub_81BE2C8: ; 81BE2C8 ldrb r0, [r2] lsls r0, 2 adds r0, r1 - ldr r1, =sub_81BB02C + 1 + ldr r1, =sub_81BB02C str r1, [r0] mov r3, r9 strb r3, [r2] @@ -862264,7 +862264,7 @@ dp01t_30_3_80EB11C: ; 81BE3D4 ldrb r1, [r5] lsls r1, 2 adds r1, r0 - ldr r0, =sub_81BE498 + 1 + ldr r0, =sub_81BE498 str r0, [r1] @081BE478: pop {r4-r6} @@ -862336,7 +862336,7 @@ sub_81BE4E0: ; 81BE4E0 adds r0, r1 lsls r0, 3 adds r0, r2 - ldr r1, =sub_8073C30 + 1 + ldr r1, =sub_8073C30 str r1, [r0] @081BE512: bl dp01_tbl3_exec_completed @@ -862438,7 +862438,7 @@ sub_81BE59C: ; 81BE59C ldrb r1, [r6] lsls r1, 2 adds r1, r0 - ldr r0, =bx_80E8A6C + 1 + ldr r0, =bx_80E8A6C str r0, [r1] @081BE5F4: add sp, 0x4 @@ -862486,7 +862486,7 @@ sub_81BE61C: ; 81BE61C ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, =sub_80587B0 + 1 + ldr r1, =sub_80587B0 str r1, [r0] pop {r4} pop {r0} @@ -862588,7 +862588,7 @@ sub_81BE6B8: ; 81BE6B8 movs r1, 0x1 movs r2, 0x1 bl sub_8151CA8 - ldr r0, =sub_81BE698 + 1 + ldr r0, =sub_81BE698 movs r1, 0xFF bl AddTask ldr r1, [r4] @@ -862621,7 +862621,7 @@ sub_81BE72C: ; 81BE72C ldr r0, [r4] cmp r0, 0 beq @081BE788 - ldr r0, =sub_81BE698 + 1 + ldr r0, =sub_81BE698 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 @@ -862700,7 +862700,7 @@ sub_81BE79C: ; 81BE79C thumb_func_start sub_81BE7F4 sub_81BE7F4: ; 81BE7F4 push {lr} - ldr r0, =sub_81BE808 + 1 + ldr r0, =sub_81BE808 movs r1, 0x8 bl AddTask pop {r0} @@ -862796,7 +862796,7 @@ sp136_strengh_sound: ; 81BE89C lsrs r5, 24 lsls r6, 24 lsrs r6, 24 - ldr r0, =sub_81BE900 + 1 + ldr r0, =sub_81BE900 movs r1, 0x9 bl AddTask lsls r0, 24 @@ -862880,7 +862880,7 @@ sub_81BE900: ; 81BE900 thumb_func_start sub_81BE968 sub_81BE968: ; 81BE968 push {lr} - ldr r0, =sub_81BE9C0 + 1 + ldr r0, =sub_81BE9C0 bl get_task_id_by_function lsls r0, 24 lsrs r2, r0, 24 @@ -862907,7 +862907,7 @@ sub_81BE994: ; 81BE994 ldr r0, =gUnknown_08617D94 bl gpu_tile_obj_alloc_and_load_multiple bl sub_81BEA20 - ldr r0, =sub_81BE9C0 + 1 + ldr r0, =sub_81BE9C0 movs r1, 0x8 bl AddTask movs r0, 0x2 @@ -862946,7 +862946,7 @@ sub_81BE9C0: ; 81BE9C0 adds r0, r4, 0 subs r0, 0x8 adds r0, r3, r0 - ldr r1, =sub_81BEA00 + 1 + ldr r1, =sub_81BEA00 str r1, [r0] @081BE9F0: pop {r4} @@ -863134,7 +863134,7 @@ sub_81BEB24: ; 81BEB24 thumb_func_start sub_81BEB54 sub_81BEB54: ; 81BEB54 push {lr} - ldr r0, =sub_81BED50 + 1 + ldr r0, =sub_81BED50 movs r1, 0x9 bl AddTask pop {r0} @@ -863146,7 +863146,7 @@ sub_81BEB54: ; 81BEB54 thumb_func_start sub_81BEB68 sub_81BEB68: ; 81BEB68 push {lr} - ldr r0, =sub_81BEBF4 + 1 + ldr r0, =sub_81BEBF4 movs r1, 0x9 bl AddTask pop {r0} @@ -863158,7 +863158,7 @@ sub_81BEB68: ; 81BEB68 thumb_func_start sub_81BEB7C sub_81BEB7C: ; 81BEB7C push {lr} - ldr r0, =sub_81BF028 + 1 + ldr r0, =sub_81BF028 movs r1, 0x9 bl AddTask pop {r0} @@ -863355,7 +863355,7 @@ sub_81BEBF4: ; 81BEBF4 movs r1, 0x2 strh r1, [r0] strh r2, [r0, 0x2] - ldr r0, =sub_81BEBB4 + 1 + ldr r0, =sub_81BEBB4 movs r1, 0xA bl AddTask adds r0, r5, 0 @@ -863628,7 +863628,7 @@ sub_81BED50: ; 81BED50 @081BEF64: movs r0, 0 bl bg_unset_tilemap - ldr r0, =sub_81BEBB4 + 1 + ldr r0, =sub_81BEBB4 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -863897,7 +863897,7 @@ sub_81BF028: ; 81BF028 lsls r0, 2 adds r2, 0x1C adds r0, r2 - ldr r1, =sub_81BF248 + 1 + ldr r1, =sub_81BF248 str r1, [r0] b @081BF228 .align 2, 0 @@ -863914,7 +863914,7 @@ sub_81BF028: ; 81BF028 adds r0, 0x1C adds r0, r2, r0 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 bne @081BF238 adds r0, r2, r3 @@ -863970,7 +863970,7 @@ sub_81BF248: ; 81BF248 ldrh r0, [r0, 0x10] cmp r0, 0xFF bls @081BF268 - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r5, 0x1C] b @081BF2B0 .align 2, 0 @@ -864148,7 +864148,7 @@ sub_81BF384: ; 81BF384 ldr r1, [r4] movs r0, 0x6 strb r0, [r1, 0x1] - ldr r0, =sub_81BF3DC + 1 + ldr r0, =sub_81BF3DC bl set_callback2 pop {r4} pop {r0} @@ -864858,7 +864858,7 @@ sub_81BF8EC: ; 81BF8EC movs r1, 0 bl sub_806F2AC @081BFA12: - ldr r0, =sub_81BFAE4 + 1 + ldr r0, =sub_81BFAE4 bl set_callback2 pop {r3} mov r8, r3 @@ -865247,14 +865247,14 @@ sub_81BFB10: ; 81BFB10 ldrb r0, [r0] cmp r0, 0x3 beq @081BFDA0 - ldr r0, =sub_81C0510 + 1 + ldr r0, =sub_81C0510 movs r1, 0 bl AddTask b @081BFDE6 .align 2, 0 .pool @081BFDA0: - ldr r0, =sub_81C171C + 1 + ldr r0, =sub_81C171C movs r1, 0 bl AddTask b @081BFDE6 @@ -865300,9 +865300,9 @@ sub_81BFB10: ; 81BFB10 .align 2, 0 .pool @081BFE00: - ldr r0, =sub_81BFAD0 + 1 + ldr r0, =sub_81BFAD0 bl SetVBlankCallback - ldr r0, =sub_81BFAB4 + 1 + ldr r0, =sub_81BFAB4 bl set_callback2 movs r0, 0x1 b @081BFE1A @@ -866013,7 +866013,7 @@ sub_81C044C: ; 81C044C adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81C0484 + 1 + ldr r1, =sub_81C0484 str r1, [r0] add sp, 0x4 pop {r4} @@ -866301,7 +866301,7 @@ sub_81C0604: ; 81C0604 lsls r0, 3 adds r0, r1 strh r2, [r0, 0x8] - ldr r1, =sub_81C0704 + 1 + ldr r1, =sub_81C0704 str r1, [r0] @081C06EE: pop {r4-r7} @@ -866505,7 +866505,7 @@ sub_81C0704: ; 81C0704 lsls r0, 24 cmp r0, 0 bne @081C08F2 - ldr r0, =sub_81C20F0 + 1 + ldr r0, =sub_81C20F0 bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 @@ -866515,7 +866515,7 @@ sub_81C0704: ; 81C0704 adds r0, r6, 0 subs r0, 0x8 adds r0, r4, r0 - ldr r1, =sub_81C0510 + 1 + ldr r1, =sub_81C0510 str r1, [r0] b @081C08F2 .align 2, 0 @@ -866813,7 +866813,7 @@ sub_81C0A8C: ; 81C0A8C strh r1, [r0] cmp r5, 0x1 bne @081C0B4C - ldr r1, =sub_81C0B8C + 1 + ldr r1, =sub_81C0B8C mov r0, r9 subs r0, 0x8 adds r0, r7, r0 @@ -866824,7 +866824,7 @@ sub_81C0A8C: ; 81C0A8C .align 2, 0 .pool @081C0B4C: - ldr r1, =sub_81C0CC4 + 1 + ldr r1, =sub_81C0CC4 mov r0, r9 subs r0, 0x8 adds r0, r7, r0 @@ -866938,7 +866938,7 @@ sub_81C0B8C: ; 81C0B8C adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, =sub_81C0C68 + 1 + ldr r0, =sub_81C0C68 str r0, [r1] @081C0C52: pop {r4,r5} @@ -867039,7 +867039,7 @@ sub_81C0CC4: ; 81C0CC4 adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, =sub_81C0D44 + 1 + ldr r0, =sub_81C0D44 str r0, [r1] @081C0D34: pop {r4,r5} @@ -867250,7 +867250,7 @@ sub_81C0E48: ; 81C0E48 adds r0, r7 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81C0F44 + 1 + ldr r1, =sub_81C0F44 str r1, [r0] pop {r3} mov r8, r3 @@ -867641,7 +867641,7 @@ sub_81C11F4: ; 81C11F4 adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, =sub_81C0510 + 1 + ldr r0, =sub_81C0510 str r0, [r1] pop {r4,r5} pop {r0} @@ -867673,7 +867673,7 @@ sub_81C129C: ; 81C129C adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81C12E4 + 1 + ldr r1, =sub_81C12E4 str r1, [r0] pop {r4} pop {r0} @@ -867877,7 +867877,7 @@ sub_81C13B0: ; 81C13B0 adds r0, r7 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81C0F44 + 1 + ldr r1, =sub_81C0F44 str r1, [r0] pop {r4-r7} pop {r0} @@ -868198,7 +868198,7 @@ sub_81C171C: ; 81C171C adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81C174C + 1 + ldr r1, =sub_81C174C str r1, [r0] pop {r4} pop {r0} @@ -868423,7 +868423,7 @@ sub_81C18F4: ; 81C18F4 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81C1940 + 1 + ldr r1, =sub_81C1940 str r1, [r0] pop {r4} pop {r0} @@ -868448,7 +868448,7 @@ sub_81C1940: ; 81C1940 mov r9, r0 mov r4, r8 add r4, r9 - ldr r0, =sub_81C1E20 + 1 + ldr r0, =sub_81C1E20 bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 @@ -868551,7 +868551,7 @@ sub_81C1940: ; 81C1940 mov r0, r9 subs r0, 0x8 add r0, r8 - ldr r1, =sub_81C174C + 1 + ldr r1, =sub_81C174C str r1, [r0] movs r1, 0x1 negs r1, r1 @@ -868608,7 +868608,7 @@ sub_81C1940: ; 81C1940 mov r0, r9 subs r0, 0x8 add r0, r8 - ldr r1, =sub_81C174C + 1 + ldr r1, =sub_81C174C str r1, [r0] adds r0, r7, 0 movs r1, 0x1 @@ -868677,7 +868677,7 @@ sub_81C1940: ; 81C1940 mov r0, r9 subs r0, 0x8 add r0, r8 - ldr r1, =sub_81C174C + 1 + ldr r1, =sub_81C174C str r1, [r0] @081C1B74: pop {r3,r4} @@ -868999,7 +868999,7 @@ sub_81C1DA4: ; 81C1DA4 .align 2, 0 .pool @081C1DE8: - ldr r5, =sub_81C1E20 + 1 + ldr r5, =sub_81C1E20 adds r0, r5, 0 bl get_task_id_by_function lsls r0, 24 @@ -869164,7 +869164,7 @@ sub_81C1EFC: ; 81C1EFC .align 2, 0 .pool @081C1F44: - ldr r5, =sub_81C1F80 + 1 + ldr r5, =sub_81C1F80 adds r0, r5, 0 bl get_task_id_by_function lsls r0, 24 @@ -869252,7 +869252,7 @@ sub_81C1F80: ; 81C1F80 ldrb r0, [r0] cmp r0, 0x3 bne @081C2006 - ldr r0, =sub_81C0B8C + 1 + ldr r0, =sub_81C0B8C bl is_function_an_active_task lsls r0, 24 cmp r0, 0 @@ -869342,7 +869342,7 @@ sub_81C2074: ; 81C2074 .align 2, 0 .pool @081C20C8: - ldr r0, =sub_81C20F0 + 1 + ldr r0, =sub_81C20F0 movs r1, 0x8 bl AddTask lsls r0, 24 @@ -873963,7 +873963,7 @@ sub_81C47B4: ; 81C47B4 strh r1, [r7, 0x32] adds r5, 0x1C adds r4, r5 - ldr r0, =sub_81C4844 + 1 + ldr r0, =sub_81C4844 str r0, [r4] ldrb r1, [r7, 0x5] movs r0, 0xD @@ -874079,7 +874079,7 @@ sub_81C48B4: ; 81C48B4 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r1, r0 beq @081C48E8 movs r0, 0x1 @@ -874120,7 +874120,7 @@ sub_81C48F0: ; 81C48F0 adds r1, r6, 0 adds r1, 0x1C adds r0, r1 - ldr r1, =nullsub_12 + 1 + ldr r1, =nullsub_12 str r1, [r0] bl sub_806EE98 ldr r0, [r5] @@ -874260,7 +874260,7 @@ sub_81C4A08: ; 81C4A08 adds r1, r4, 0 adds r1, 0x1C adds r0, r1 - ldr r1, =nullsub_12 + 1 + ldr r1, =nullsub_12 str r1, [r0] ldrb r1, [r2] lsls r0, r1, 4 @@ -874411,7 +874411,7 @@ sub_81C4AF8: ; 81C4AF8 adds r1, r6, 0 adds r1, 0x1C adds r0, r1 - ldr r1, =sub_81C4BE4 + 1 + ldr r1, =sub_81C4BE4 str r1, [r0] ldrb r1, [r4] lsls r0, r1, 4 @@ -874844,7 +874844,7 @@ sub_81C4EEC: ; 81C4EEC thumb_func_start sub_81C4EFC sub_81C4EFC: ; 81C4EFC push {lr} - ldr r1, =sub_8086194 + 1 + ldr r1, =sub_8086194 movs r0, 0 bl sub_81C4F98 pop {r0} @@ -874856,7 +874856,7 @@ sub_81C4EFC: ; 81C4EFC thumb_func_start sub_81C4F10 sub_81C4F10: ; 81C4F10 push {lr} - ldr r1, =sub_8059D50 + 1 + ldr r1, =sub_8059D50 movs r0, 0x1 bl sub_81C4F98 pop {r0} @@ -874872,7 +874872,7 @@ sub_81C4F24: ; 81C4F24 movs r0, 0x1 movs r1, 0 bl fade_screen - ldr r0, =sub_81C4F44 + 1 + ldr r0, =sub_81C4F44 movs r1, 0xA bl AddTask pop {r0} @@ -874894,9 +874894,9 @@ sub_81C4F44: ; 81C4F44 bne @081C4F6E bl overworld_free_bg_tilemaps ldr r0, =0x03005db0 - ldr r1, =hm_add_c3_without_phase_2 + 1 + ldr r1, =hm_add_c3_without_phase_2 str r1, [r0] - ldr r1, =c2_exit_to_overworld_2_switch + 1 + ldr r1, =c2_exit_to_overworld_2_switch movs r0, 0x3 bl sub_81C4F98 adds r0, r4, 0 @@ -874967,7 +874967,7 @@ sub_81C4F98: ; 81C4F98 movs r1, 0xFF movs r2, 0x5 bl memset - ldr r0, =sub_81C504C + 1 + ldr r0, =sub_81C504C bl set_callback2 pop {r4-r6} pop {r0} @@ -875163,9 +875163,9 @@ sub_81C5078: ; 81C5078 .align 2, 0 .pool @081C51BC: - ldr r0, =sub_81C5038 + 1 + ldr r0, =sub_81C5038 bl SetVBlankCallback - ldr r0, =sub_81C501C + 1 + ldr r0, =sub_81C501C bl set_callback2 movs r0, 0x1 b @081C51D6 @@ -875757,7 +875757,7 @@ sub_81C56CC: ; 81C56CC thumb_func_start sub_81C56F8 sub_81C56F8: ; 81C56F8 push {r4,lr} - ldr r0, =sub_81C5BC8 + 1 + ldr r0, =sub_81C5BC8 movs r1, 0 bl AddTask lsls r0, 24 @@ -876298,7 +876298,7 @@ sub_81C5B14: ; 81C5B14 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81C5B4C + 1 + ldr r1, =sub_81C5B4C str r1, [r0] add sp, 0x4 pop {r4} @@ -876655,7 +876655,7 @@ sub_81C5D20: ; 81C5D20 adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, =sub_81C5FE4 + 1 + ldr r0, =sub_81C5FE4 b @081C5E98 .align 2, 0 .pool @@ -876665,7 +876665,7 @@ sub_81C5D20: ; 81C5D20 adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, =sub_81C5F68 + 1 + ldr r0, =sub_81C5F68 @081C5E98: str r0, [r1] add sp, 0x10 @@ -877096,7 +877096,7 @@ sub_81C61E0: ; 81C61E0 @081C620C: bl sub_81C61A8 ldr r1, =gUnknown_085E8F31 - ldr r2, =sub_81C6714 + 1 + ldr r2, =sub_81C6714 adds r0, r5, 0 bl sub_81C6DD8 b @081C6252 @@ -877167,7 +877167,7 @@ sub_81C629C: ; 81C629C adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81C5BC8 + 1 + ldr r1, =sub_81C5BC8 str r1, [r0] pop {r4} pop {r0} @@ -877225,7 +877225,7 @@ sub_81C62C4: ; 81C62C4 adds r0, r7, 0 subs r0, 0x8 adds r0, r6, r0 - ldr r1, =sub_81C64B4 + 1 + ldr r1, =sub_81C64B4 str r1, [r0] @081C6334: add sp, 0x10 @@ -877498,7 +877498,7 @@ sub_81C654C: ; 81C654C bl sub_81C6C3C subs r5, 0x8 adds r4, r5 - ldr r0, =sub_81C65CC + 1 + ldr r0, =sub_81C65CC str r0, [r4] add sp, 0x10 pop {r4-r6} @@ -877573,7 +877573,7 @@ sub_81C6648: ; 81C6648 cmp r0, 0x1 bne @081C667C ldr r1, =gUnknown_085E8DCE - ldr r2, =sub_81C66EC + 1 + ldr r2, =sub_81C66EC adds r0, r4, 0 bl sub_81C6DD8 b @081C66A6 @@ -877587,7 +877587,7 @@ sub_81C6648: ; 81C6648 bne @081C66A0 ldr r0, =0x0203cf2c ldr r1, [r0] - ldr r0, =sub_81B7F60 + 1 + ldr r0, =sub_81B7F60 str r0, [r1] adds r0, r4, 0 bl sub_81C5B14 @@ -877617,7 +877617,7 @@ sub_81C66AC: ; 81C66AC ldr r1, =gUnknown_085E8E11 adds r0, r5, 0 bl ExpandTextCodes - ldr r2, =sub_81C66EC + 1 + ldr r2, =sub_81C66EC adds r0, r4, 0 adds r1, r5, 0 bl sub_81C6DD8 @@ -877691,7 +877691,7 @@ sub_81C674C: ; 81C674C cmp r0, 0 bne @081C677C ldr r1, =gUnknown_085E8DCE - ldr r2, =sub_81C66EC + 1 + ldr r2, =sub_81C66EC adds r0, r4, 0 bl sub_81C6DD8 b @081C6796 @@ -877816,7 +877816,7 @@ sub_81C67CC: ; 81C67CC negs r2, r2 add r9, r2 add r4, r9 - ldr r0, =sub_81C68B0 + 1 + ldr r0, =sub_81C68B0 str r0, [r4] add sp, 0x10 pop {r3,r4} @@ -878619,7 +878619,7 @@ sub_81C6F20: ; 81C6F20 adds r0, r4, 0 movs r1, 0x1 bl sub_8008258 - ldr r0, =sub_81C6F68 + 1 + ldr r0, =sub_81C6F68 str r0, [r4, 0x1C] @081C6F50: pop {r4} @@ -878642,7 +878642,7 @@ sub_81C6F68: ; 81C6F68 adds r0, r4, 0 movs r1, 0 bl sub_8008258 - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r4, 0x1C] @081C6F84: pop {r4} @@ -878776,12 +878776,12 @@ sub_81C7078: ; 81C7078 bl is_c1_link_related_active cmp r0, 0 bne @081C7090 - ldr r0, =sub_81C7170 + 1 + ldr r0, =sub_81C7170 b @081C7092 .align 2, 0 .pool @081C7090: - ldr r0, =sub_81C71E4 + 1 + ldr r0, =sub_81C71E4 @081C7092: lsls r1, r4, 24 lsrs r1, 24 @@ -878828,10 +878828,10 @@ sub_81C70D8: ; 81C70D8 cmp r0, 0 beq @081C711C ldr r2, [r1] - ldr r0, =sub_81C7170 + 1 + ldr r0, =sub_81C7170 cmp r2, r0 beq @081C70FE - ldr r0, =sub_81C71E4 + 1 + ldr r0, =sub_81C71E4 cmp r2, r0 bne @081C711C @081C70FE: @@ -878861,10 +878861,10 @@ sub_81C7124: ; 81C7124 cmp r0, 0 beq @081C7160 ldr r1, [r4] - ldr r0, =sub_81C7170 + 1 + ldr r0, =sub_81C7170 cmp r1, r0 beq @081C7140 - ldr r0, =sub_81C71E4 + 1 + ldr r0, =sub_81C71E4 cmp r1, r0 bne @081C7160 @081C7140: @@ -879014,7 +879014,7 @@ sub_81C7250: ; 81C7250 str r0, [r4] cmp r0, 0 bne @081C7270 - ldr r0, =sub_8086194 + 1 + ldr r0, =sub_8086194 bl set_callback2 b @081C7292 .align 2, 0 @@ -879024,12 +879024,12 @@ sub_81C7250: ; 81C7250 bl clear_tasks movs r0, 0 bl SetVBlankCallback - ldr r0, =sub_81C742C + 1 + ldr r0, =sub_81C742C movs r1, 0 bl AddTask - ldr r0, =sub_81C7400 + 1 + ldr r0, =sub_81C7400 bl set_callback2 - ldr r0, =sub_81C7418 + 1 + ldr r0, =sub_81C7418 bl SetVBlankCallback @081C7292: pop {r4} @@ -879042,7 +879042,7 @@ sub_81C7250: ; 81C7250 thumb_func_start sub_81C72A4 sub_81C72A4: ; 81C72A4 push {lr} - ldr r0, =sub_81C72BC + 1 + ldr r0, =sub_81C72BC bl set_callback2 movs r0, 0x1 movs r1, 0 @@ -879069,7 +879069,7 @@ sub_81C72BC: ; 81C72BC str r0, [r4] cmp r0, 0 bne @081C72F0 - ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 + ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music bl set_callback2 b @081C7320 .align 2, 0 @@ -879084,12 +879084,12 @@ sub_81C72BC: ; 81C72BC bl gpu_pal_allocator_reset movs r0, 0 bl SetVBlankCallback - ldr r0, =sub_81C742C + 1 + ldr r0, =sub_81C742C movs r1, 0 bl AddTask - ldr r0, =sub_81C7400 + 1 + ldr r0, =sub_81C7400 bl set_callback2 - ldr r0, =sub_81C7418 + 1 + ldr r0, =sub_81C7418 bl SetVBlankCallback @081C7320: pop {r4} @@ -879361,13 +879361,13 @@ sub_81C742C: ; 81C742C bl sub_81C7334 cmp r4, 0 beq @081C755C - ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 + ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music bl set_callback2 b @081C7562 .align 2, 0 .pool @081C755C: - ldr r0, =sub_8086194 + 1 + ldr r0, =sub_8086194 bl set_callback2 @081C7562: pop {r4-r7} @@ -879467,7 +879467,7 @@ c3args_set_0toR1_1to0: ; 81C7600 thumb_func_start sub_81C760C sub_81C760C: ; 81C760C push {lr} - ldr r0, =sub_81C7418 + 1 + ldr r0, =sub_81C7418 bl SetVBlankCallback pop {r0} bx r0 @@ -879600,7 +879600,7 @@ sub_81C76C4: ; 81C76C4 beq @081C76F4 bl reset_all_obj_data bl gpu_pal_allocator_reset - ldr r0, =sub_81C7764 + 1 + ldr r0, =sub_81C7764 movs r1, 0x1 bl sub_81C7078 str r0, [r4, 0xC] @@ -879813,7 +879813,7 @@ sub_81C7880: ; 81C7880 movs r0, 0 bl sub_81C763C adds r4, r0, 0 - ldr r0, =atk47_cmd47 + 1 + ldr r0, =atk47_cmd47 movs r1, 0x4 bl sub_81C7078 str r0, [r4, 0xC] @@ -879830,7 +879830,7 @@ sub_81C78A0: ; 81C78A0 movs r0, 0 bl sub_81C763C adds r4, r0, 0 - ldr r0, =sub_81C791C + 1 + ldr r0, =sub_81C791C movs r1, 0x4 bl sub_81C7078 str r0, [r4, 0xC] @@ -880402,7 +880402,7 @@ sub_81C7CCC: ; 81C7CCC movs r0, 0 bl sub_81C763C ldr r0, [r0, 0x18] - ldr r1, =nullsub_12 + 1 + ldr r1, =nullsub_12 str r1, [r0, 0x1C] pop {r1} bx r1 @@ -880423,7 +880423,7 @@ sub_81C7CE4: ; 81C7CE4 movs r1, 0xC strh r1, [r2, 0x22] ldr r2, [r0, 0x18] - ldr r1, =sub_81C7CB4 + 1 + ldr r1, =sub_81C7CB4 str r1, [r2, 0x1C] adds r2, 0x3E ldrb r3, [r2] @@ -880811,7 +880811,7 @@ sub_81C8010: ; 81C8010 adds r1, r0, 0 ldr r0, [r1, 0x1C] ldr r2, [r0, 0x1C] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r2, r0 bne @081C8034 ldr r0, [r1, 0x24] @@ -880998,7 +880998,7 @@ sub_81C814C: ; 81C814C strh r0, [r4, 0x30] strh r5, [r4, 0x32] strh r6, [r4, 0x3C] - ldr r0, =sub_81C817C + 1 + ldr r0, =sub_81C817C str r0, [r4, 0x1C] pop {r4-r6} pop {r0} @@ -881049,7 +881049,7 @@ sub_81C817C: ; 81C817C @081C81C4: ldrh r0, [r2, 0x3C] strh r0, [r2, 0x20] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r2, 0x1C] @081C81CC: pop {r0} @@ -881081,7 +881081,7 @@ sub_81C81D4: ; 81C81D4 bl sub_81C91AC cmp r0, 0 beq @081C821C - ldr r0, =sub_81C8254 + 1 + ldr r0, =sub_81C8254 movs r1, 0x6 bl sub_81C7078 movs r0, 0x1 @@ -881099,7 +881099,7 @@ sub_81C81D4: ; 81C81D4 thumb_func_start sub_81C8224 sub_81C8224: ; 81C8224 push {lr} - ldr r0, =sub_81C8254 + 1 + ldr r0, =sub_81C8254 bl sub_81C7124 pop {r1} bx r1 @@ -881313,7 +881313,7 @@ sub_81C83AC: ; 81C83AC str r5, [r1, 0x14] ldr r0, [sp, 0xC] str r0, [r1, 0x10] - ldr r0, =sub_81C83F0 + 1 + ldr r0, =sub_81C83F0 movs r1, 0x5 bl sub_81C7078 @081C83D6: @@ -881327,7 +881327,7 @@ sub_81C83AC: ; 81C83AC thumb_func_start sub_81C83E0 sub_81C83E0: ; 81C83E0 push {lr} - ldr r0, =sub_81C83F0 + 1 + ldr r0, =sub_81C83F0 bl sub_81C7124 pop {r1} bx r1 @@ -881558,7 +881558,7 @@ sub_81C8568: ; 81C8568 @081C8586: str r0, [r4, 0x30] str r5, [r4, 0x2C] - ldr r0, =sub_81C85A0 + 1 + ldr r0, =sub_81C85A0 movs r1, 0x6 bl sub_81C7078 str r0, [r4, 0x28] @@ -881855,7 +881855,7 @@ sub_81C877C: ; 81C877C adds r1, r4, r0 movs r0, 0 str r0, [r1] - ldr r0, =sub_81C8870 + 1 + ldr r0, =sub_81C8870 movs r1, 0x6 bl sub_81C7078 movs r1, 0x8A @@ -881887,7 +881887,7 @@ sub_81C87AC: ; 81C87AC ldr r1, =0x0000089c adds r0, r5, r1 str r2, [r0] - ldr r0, =sub_81C8958 + 1 + ldr r0, =sub_81C8958 movs r1, 0x6 bl sub_81C7078 movs r1, 0x8A @@ -881911,7 +881911,7 @@ sub_81C87F0: ; 81C87F0 adds r1, r4, r0 movs r0, 0 str r0, [r1] - ldr r0, =sub_81C8A28 + 1 + ldr r0, =sub_81C8A28 movs r1, 0x6 bl sub_81C7078 movs r1, 0x8A @@ -882860,7 +882860,7 @@ sub_81C8EF8: ; 81C8EF8 orrs r0, r1 strh r0, [r2, 0x4] ldr r1, [r5, 0x44] - ldr r0, =sub_81C90A0 + 1 + ldr r0, =sub_81C90A0 str r0, [r1, 0x1C] ldrb r2, [r5, 0x3] lsls r2, 3 @@ -882885,7 +882885,7 @@ sub_81C8EF8: ; 81C8EF8 orrs r4, r0 strh r4, [r1, 0x4] ldr r1, [r5, 0x40] - ldr r0, =sub_81C90F4 + 1 + ldr r0, =sub_81C90F4 str r0, [r1, 0x1C] pop {r3-r5} mov r8, r3 @@ -882925,7 +882925,7 @@ sub_81C9008: ; 81C9008 cmp r4, 0 beq @081C9028 ldr r2, [r5, 0x3C] - ldr r1, =nullsub_12 + 1 + ldr r1, =nullsub_12 str r1, [r2, 0x1C] ldr r0, [r5, 0x40] str r1, [r0, 0x1C] @@ -882936,13 +882936,13 @@ sub_81C9008: ; 81C9008 .pool @081C9028: ldr r2, [r5, 0x3C] - ldr r0, =sub_81C9080 + 1 + ldr r0, =sub_81C9080 str r0, [r2, 0x1C] ldr r1, [r5, 0x40] - ldr r0, =sub_81C90F4 + 1 + ldr r0, =sub_81C90F4 str r0, [r1, 0x1C] ldr r1, [r5, 0x44] - ldr r0, =sub_81C90A0 + 1 + ldr r0, =sub_81C90A0 str r0, [r1, 0x1C] @081C903A: adds r3, r2, 0 @@ -883438,12 +883438,12 @@ sub_81C939C: ; 81C939C bl sub_81C93EC b @081C93DE @081C93D4: - ldr r0, =sub_81C963C + 1 + ldr r0, =sub_81C963C b @081C93DE .align 2, 0 .pool @081C93DC: - ldr r0, =sub_81C96FC + 1 + ldr r0, =sub_81C96FC @081C93DE: str r0, [r4, 0xC] @081C93E0: @@ -883465,17 +883465,17 @@ sub_81C93EC: ; 81C93EC cmp r0, 0x2 beq @081C9410 @081C93FE: - ldr r0, =sub_81C943C + 1 + ldr r0, =sub_81C943C b @081C9412 .align 2, 0 .pool @081C9408: - ldr r0, =sub_81C9520 + 1 + ldr r0, =sub_81C9520 b @081C9412 .align 2, 0 .pool @081C9410: - ldr r0, =c2_pre_battle_1 + 1 + ldr r0, =c2_pre_battle_1 @081C9412: pop {r1} bx r1 @@ -883569,7 +883569,7 @@ sub_81C943C: ; 81C943C strh r1, [r4, 0x2] ldrb r0, [r3, 0x12] strh r0, [r4, 0x4] - ldr r0, =sub_81C963C + 1 + ldr r0, =sub_81C963C str r0, [r4, 0xC] movs r0, 0x2 b @081C951A @@ -883597,7 +883597,7 @@ sub_81C943C: ; 81C943C .align 2, 0 .pool @081C94FC: - ldr r0, =sub_81C9600 + 1 + ldr r0, =sub_81C9600 str r0, [r4, 0xC] movs r0, 0x6 b @081C951A @@ -883814,7 +883814,7 @@ sub_81C963C: ; 81C963C strh r3, [r4, 0x2] ldrb r0, [r5, 0x18] strh r0, [r4, 0x4] - ldr r0, =sub_81C96FC + 1 + ldr r0, =sub_81C96FC str r0, [r4, 0xC] movs r0, 0x4 b @081C96F6 @@ -883844,7 +883844,7 @@ sub_81C963C: ; 81C963C cmp r2, r0 beq @081C96E4 strh r0, [r4, 0x2] - ldr r0, =sub_81C9798 + 1 + ldr r0, =sub_81C9798 str r0, [r4, 0xC] movs r0, 0x1 b @081C96F6 @@ -883918,7 +883918,7 @@ sub_81C96FC: ; 81C96FC cmp r2, r0 beq @081C9780 strh r0, [r4, 0x2] - ldr r0, =sub_81C97A4 + 1 + ldr r0, =sub_81C97A4 str r0, [r4, 0xC] movs r0, 0x1 b @081C9792 @@ -883960,7 +883960,7 @@ sub_81C97A4: ; 81C97A4 thumb_func_start sub_81C97B0 sub_81C97B0: ; 81C97B0 str r1, [r0, 0x8] - ldr r1, =sub_81C97BC + 1 + ldr r1, =sub_81C97BC str r1, [r0, 0xC] bx lr .align 2, 0 @@ -883992,7 +883992,7 @@ sub_81C97C0: ; 81C97C0 adds r0, r2 ldrb r0, [r0] strh r0, [r4, 0x4] - ldr r0, =sub_81C943C + 1 + ldr r0, =sub_81C943C str r0, [r4, 0xC] pop {r4} pop {r0} @@ -884010,7 +884010,7 @@ sub_81C97F8: ; 81C97F8 ldr r1, =gUnknown_0861FC59 ldrb r1, [r1, 0x13] strh r1, [r0, 0x4] - ldr r1, =sub_81C963C + 1 + ldr r1, =sub_81C963C str r1, [r0, 0xC] bx lr .align 2, 0 @@ -884211,11 +884211,11 @@ sub_81C9958: ; 81C9958 beq @081C997A movs r0, 0 strb r0, [r4, 0xC] - ldr r0, =sub_81C9A10 + 1 + ldr r0, =sub_81C9A10 movs r1, 0x1 bl sub_81C7078 str r0, [r4, 0x4] - ldr r0, =sub_81C99FC + 1 + ldr r0, =sub_81C99FC str r0, [r4] @081C997A: adds r0, r4, 0 @@ -884240,7 +884240,7 @@ sub_81C9990: ; 81C9990 movs r1, 0x1 bl sub_81C7078 str r0, [r5, 0x4] - ldr r0, =sub_81C99FC + 1 + ldr r0, =sub_81C99FC str r0, [r5] pop {r4,r5} pop {r0} @@ -885427,7 +885427,7 @@ sub_81CA324: ; 81CA324 bl sub_81C763C adds r3, r0, 0 movs r2, 0 - ldr r4, =nullsub_12 + 1 + ldr r4, =nullsub_12 adds r1, r3, 0 adds r1, 0x2C @081CA336: @@ -885464,7 +885464,7 @@ sub_81CA35C: ; 81CA35C adds r5, r1, 0 mov r9, r2 adds r6, r3, 0 - ldr r0, =sub_81CA474 + 1 + ldr r0, =sub_81CA474 mov r8, r0 subs r0, r2, r5 lsls r0, 4 @@ -885528,7 +885528,7 @@ sub_81CA3B4: ; 81CA3B4 orrs r0, r1 strb r0, [r2, 0x1] ldr r1, [r4] - ldr r0, =sub_81CA4AC + 1 + ldr r0, =sub_81CA4AC str r0, [r1, 0x1C] movs r6, 0x8 strh r6, [r1, 0x2E] @@ -885548,7 +885548,7 @@ sub_81CA3B4: ; 81CA3B4 movs r0, 0x52 movs r1, 0x10 bl lcd_io_set - ldr r0, =sub_81CA580 + 1 + ldr r0, =sub_81CA580 movs r1, 0x3 bl AddTask lsls r0, 24 @@ -885621,7 +885621,7 @@ sub_81CA474: ; 81CA474 @081CA49A: ldrh r0, [r2, 0x3C] strh r0, [r2, 0x20] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r2, 0x1C] @081CA4A2: pop {r0} @@ -885732,7 +885732,7 @@ sub_81CA4AC: ; 81CA4AC negs r1, r1 ands r0, r1 strb r0, [r4, 0x1] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r4, 0x1C] b @081CA578 .align 2, 0 @@ -885868,7 +885868,7 @@ sub_81CA640: ; 81CA640 cmp r0, 0 beq @081CA684 ldr r1, [r4, 0x28] - ldr r0, =sub_81CA6AC + 1 + ldr r0, =sub_81CA6AC str r0, [r1, 0x1C] b @081CA690 .align 2, 0 @@ -886050,7 +886050,7 @@ sub_81CA7D4: ; 81CA7D4 movs r0, 0x2 bl sub_81C763C adds r4, r0, 0 - ldr r0, =sub_81CA808 + 1 + ldr r0, =sub_81CA808 movs r1, 0x2 bl AddTask strb r0, [r4, 0xA] @@ -886086,7 +886086,7 @@ sub_81CA808: ; 81CA808 thumb_func_start sub_81CA818 sub_81CA818: ; 81CA818 push {r4,r5,lr} - ldr r0, =sub_81CA8B0 + 1 + ldr r0, =sub_81CA8B0 movs r1, 0x3 bl AddTask adds r4, r0, 0 @@ -886125,7 +886125,7 @@ sub_81CA850: ; 81CA850 thumb_func_start sub_81CA864 sub_81CA864: ; 81CA864 push {r4,r5,lr} - ldr r0, =sub_81CA8B0 + 1 + ldr r0, =sub_81CA8B0 movs r1, 0x3 bl AddTask adds r4, r0, 0 @@ -886151,7 +886151,7 @@ sub_81CA864: ; 81CA864 thumb_func_start sub_81CA89C sub_81CA89C: ; 81CA89C push {lr} - ldr r0, =sub_81CA8B0 + 1 + ldr r0, =sub_81CA8B0 bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 @@ -886251,9 +886251,9 @@ titlescreen_0: ; 81CA92C ldr r1, [r2, 0x4] ldr r2, [r2, 0x8] bl sub_80BA038 - ldr r0, =sub_81CA914 + 1 + ldr r0, =sub_81CA914 bl c3args_set_0toR1_1to0 - ldr r0, =sub_81CA9EC + 1 + ldr r0, =sub_81CA9EC movs r1, 0x3 bl AddTask pop {r0} @@ -886273,7 +886273,7 @@ sub_81CA994: ; 81CA994 movs r0, 0 bl lcd_io_clear_bits bl remove_some_task - ldr r0, =sub_81CA9EC + 1 + ldr r0, =sub_81CA9EC bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -886435,12 +886435,12 @@ sub_81CAAE8: ; 81CAAE8 adds r4, r0, 0 cmp r4, 0 beq @081CAB1C - ldr r0, =sub_81CAB44 + 1 + ldr r0, =sub_81CAB44 str r0, [r4, 0x18] movs r0, 0 strh r0, [r4, 0x8] str r0, [r4, 0x10] - ldr r0, =sub_81CAD20 + 1 + ldr r0, =sub_81CAD20 movs r1, 0x1 bl sub_81C7078 str r0, [r4, 0x14] @@ -886520,7 +886520,7 @@ sub_81CAB44: ; 81CAB44 ands r0, r1 cmp r0, 0 beq @081CABD0 - ldr r0, =sub_81CAC04 + 1 + ldr r0, =sub_81CAC04 str r0, [r4, 0x18] strh r2, [r4] bl sub_81C875C @@ -886558,7 +886558,7 @@ sub_81CAB44: ; 81CAB44 bl sub_81C767C cmp r0, 0x1 beq @081CABEC - ldr r0, =sub_81CABFC + 1 + ldr r0, =sub_81CABFC str r0, [r4, 0x18] movs r0, 0xF b @081CABF4 @@ -886643,7 +886643,7 @@ sub_81CAC04: ; 81CAC04 movs r0, 0x2 bl sub_81C7688 @081CAC72: - ldr r0, =sub_81CACF8 + 1 + ldr r0, =sub_81CACF8 str r0, [r4, 0x18] bl sub_81CB1D0 cmp r0, 0 @@ -886656,7 +886656,7 @@ sub_81CAC04: ; 81CAC04 movs r0, 0x8 b @081CACAC @081CAC8C: - ldr r0, =sub_81CACB8 + 1 + ldr r0, =sub_81CACB8 str r0, [r4, 0x18] movs r0, 0xB b @081CACAC @@ -886671,7 +886671,7 @@ sub_81CAC04: ; 81CAC04 movs r0, 0 b @081CACAC @081CACA6: - ldr r0, =sub_81CAB44 + 1 + ldr r0, =sub_81CAB44 str r0, [r4, 0x18] movs r0, 0x7 @081CACAC: @@ -886712,7 +886712,7 @@ sub_81CACB8: ; 81CACB8 movs r0, 0 b @081CACF0 @081CACEA: - ldr r0, =sub_81CAB44 + 1 + ldr r0, =sub_81CAB44 str r0, [r3, 0x18] movs r0, 0xE @081CACF0: @@ -886737,7 +886737,7 @@ sub_81CACF8: ; 81CACF8 .align 2, 0 .pool @081CAD10: - ldr r0, =sub_81CAB44 + 1 + ldr r0, =sub_81CAB44 str r0, [r2, 0x18] movs r0, 0xA @081CAD16: @@ -887491,11 +887491,11 @@ sub_81CB260: ; 81CB260 beq @081CB294 movs r0, 0 strb r0, [r4, 0x19] - ldr r0, =sub_81CB324 + 1 + ldr r0, =sub_81CB324 movs r1, 0x1 bl sub_81C7078 str r0, [r4, 0x4] - ldr r0, =sub_81CB310 + 1 + ldr r0, =sub_81CB310 str r0, [r4] movs r0, 0x1 b @081CB296 @@ -887523,7 +887523,7 @@ sub_81CB29C: ; 81CB29C movs r1, 0x1 bl sub_81C7078 str r0, [r5, 0x4] - ldr r0, =sub_81CB310 + 1 + ldr r0, =sub_81CB310 str r0, [r5] pop {r4,r5} pop {r0} @@ -888700,14 +888700,14 @@ sub_81CBBB8: ; 81CBBB8 strb r0, [r1, 0xD] movs r0, 0x7 strb r0, [r1, 0xE] - ldr r0, =sub_81CB050 + 1 + ldr r0, =sub_81CB050 str r0, [sp, 0x10] - ldr r0, =sub_81CBCEC + 1 + ldr r0, =sub_81CBCEC str r0, [sp, 0x14] ldr r0, =gUnknown_08622794 movs r2, 0x2 bl sub_81C81D4 - ldr r0, =sub_81CBC64 + 1 + ldr r0, =sub_81CBC64 movs r1, 0x7 bl AddTask add sp, 0x18 @@ -888721,7 +888721,7 @@ sub_81CBBB8: ; 81CBBB8 sub_81CBC1C: ; 81CBC1C push {lr} bl sub_81C8234 - ldr r0, =sub_81CBC64 + 1 + ldr r0, =sub_81CBC64 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -888736,7 +888736,7 @@ sub_81CBC1C: ; 81CBC1C sub_81CBC38: ; 81CBC38 push {r4,lr} adds r4, r0, 0 - ldr r0, =sub_81CBC64 + 1 + ldr r0, =sub_81CBC64 bl get_task_id_by_function lsls r0, 24 lsrs r2, r0, 24 @@ -889739,7 +889739,7 @@ sub_81CC39C: ; 81CC39C ldr r0, [r7, 0x20] strh r4, [r0, 0x3C] ldr r1, [r7, 0x20] - ldr r0, =sub_81CC440 + 1 + ldr r0, =sub_81CC440 str r0, [r1, 0x1C] @081CC400: pop {r4-r7} @@ -889752,7 +889752,7 @@ sub_81CC39C: ; 81CC39C thumb_func_start sub_81CC420 sub_81CC420: ; 81CC420 ldr r1, [r0, 0x20] - ldr r0, =sub_81CC4A4 + 1 + ldr r0, =sub_81CC4A4 str r0, [r1, 0x1C] bx lr .align 2, 0 @@ -889763,7 +889763,7 @@ sub_81CC420: ; 81CC420 sub_81CC42C: ; 81CC42C ldr r0, [r0, 0x20] ldr r1, [r0, 0x1C] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 eors r1, r0 negs r0, r1 orrs r0, r1 @@ -889818,7 +889818,7 @@ sub_81CC440: ; 81CC440 blt @081CC498 movs r0, 0 strh r0, [r4, 0x24] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r4, 0x1C] @081CC498: pop {r4} @@ -889847,7 +889847,7 @@ sub_81CC4A4: ; 81CC4A4 movs r1, 0x4 orrs r0, r1 strb r0, [r2] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r3, 0x1C] @081CC4CA: pop {r0} @@ -889882,12 +889882,12 @@ sub_81CC4D4: ; 81CC4D4 str r0, [r4, 0xC] cmp r0, 0 bne @081CC514 - ldr r0, =sub_81CC568 + 1 + ldr r0, =sub_81CC568 b @081CC516 .align 2, 0 .pool @081CC514: - ldr r0, =sub_81CC5B4 + 1 + ldr r0, =sub_81CC5B4 @081CC516: str r0, [r4, 0x10] movs r0, 0x1 @@ -889967,7 +889967,7 @@ sub_81CC568: ; 81CC568 movs r0, 0x2 b @081CC5AE @081CC59E: - ldr r0, =sub_81CC5DC + 1 + ldr r0, =sub_81CC5DC str r0, [r4, 0x10] movs r0, 0x4 b @081CC5AE @@ -889996,7 +889996,7 @@ sub_81CC5B4: ; 81CC5B4 .align 2, 0 .pool @081CC5CC: - ldr r0, =sub_81CC5DC + 1 + ldr r0, =sub_81CC5DC str r0, [r2, 0x10] movs r0, 0x4 @081CC5D2: @@ -890033,11 +890033,11 @@ sub_81CC5F4: ; 81CC5F4 adds r4, r0, 0 cmp r4, 0 beq @081CC624 - ldr r0, =sub_81CC6F4 + 1 + ldr r0, =sub_81CC6F4 movs r1, 0x1 bl sub_81C7078 str r0, [r4, 0x4] - ldr r0, =sub_81CC6BC + 1 + ldr r0, =sub_81CC6BC str r0, [r4] movs r0, 0x1 b @081CC626 @@ -890065,7 +890065,7 @@ sub_81CC62C: ; 81CC62C movs r1, 0x1 bl sub_81C7078 str r0, [r5, 0x4] - ldr r0, =sub_81CC6BC + 1 + ldr r0, =sub_81CC6BC str r0, [r5] pop {r4,r5} pop {r0} @@ -890261,7 +890261,7 @@ sub_81CC6F4: ; 81CC6F4 bl gpu_sync_bg_show movs r0, 0x2 bl gpu_sync_bg_show - ldr r0, =sub_81CC6A4 + 1 + ldr r0, =sub_81CC6A4 bl c3args_set_0toR1_1to0 b @081CC77C .align 2, 0 @@ -890809,7 +890809,7 @@ sub_81CCC4C: ; 81CCC4C sub_81CCC5C: ; 81CCC5C push {r4,lr} adds r4, r0, 0 - ldr r0, =sub_81CCC9C + 1 + ldr r0, =sub_81CCC9C movs r1, 0x3 bl AddTask lsls r0, 24 @@ -890830,7 +890830,7 @@ sub_81CCC5C: ; 81CCC5C thumb_func_start sub_81CCC88 sub_81CCC88: ; 81CCC88 push {lr} - ldr r0, =sub_81CCC9C + 1 + ldr r0, =sub_81CCC9C bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 @@ -890900,7 +890900,7 @@ sub_81CCC9C: ; 81CCC9C thumb_func_start sub_81CCD10 sub_81CCD10: ; 81CCD10 push {lr} - ldr r0, =sub_81CCD34 + 1 + ldr r0, =sub_81CCD34 movs r1, 0x1 bl sub_81C7078 pop {r0} @@ -890912,7 +890912,7 @@ sub_81CCD10: ; 81CCD10 thumb_func_start sub_81CCD24 sub_81CCD24: ; 81CCD24 push {lr} - ldr r0, =sub_81CCD34 + 1 + ldr r0, =sub_81CCD34 bl sub_81C7124 pop {r1} bx r1 @@ -891292,7 +891292,7 @@ sub_81CCFD8: ; 81CCFD8 strh r0, [r1] ldr r0, =0x00006304 adds r1, r4, r0 - ldr r0, =sub_81CD08C + 1 + ldr r0, =sub_81CD08C str r0, [r1] movs r0, 0x1 b @081CD01E @@ -891324,7 +891324,7 @@ sub_81CD024: ; 81CD024 strh r0, [r1] ldr r0, =0x00006304 adds r1, r4, r0 - ldr r0, =sub_81CD08C + 1 + ldr r0, =sub_81CD08C str r0, [r1] movs r0, 0x1 b @081CD06A @@ -891392,7 +891392,7 @@ sub_81CD08C: ; 81CD08C bl audio_play ldr r0, =0x00006304 adds r1, r4, r0 - ldr r0, =sub_81CD19C + 1 + ldr r0, =sub_81CD19C str r0, [r1] movs r2, 0x2 b @081CD100 @@ -891404,7 +891404,7 @@ sub_81CD08C: ; 81CD08C movs r2, 0x5 ldr r0, =0x00006304 adds r1, r4, r0 - ldr r0, =sub_81CD110 + 1 + ldr r0, =sub_81CD110 str r0, [r1] @081CD100: adds r0, r2, 0 @@ -891468,7 +891468,7 @@ sub_81CD110: ; 81CD110 @081CD180: ldr r0, =0x00006304 adds r1, r6, r0 - ldr r0, =sub_81CD08C + 1 + ldr r0, =sub_81CD08C str r0, [r1] movs r4, 0x6 @081CD18A: @@ -893077,13 +893077,13 @@ sub_81CDDD4: ; 81CDDD4 adds r1, r4, r0 movs r0, 0xFF strb r0, [r1] - ldr r0, =sub_81CDE94 + 1 + ldr r0, =sub_81CDE94 movs r1, 0x1 bl sub_81C7078 str r0, [r4] ldr r0, =0x00001810 adds r1, r4, r0 - ldr r0, =sub_81CDE80 + 1 + ldr r0, =sub_81CDE80 str r0, [r1] ldr r0, =0x00002908 adds r1, r4, r0 @@ -893117,7 +893117,7 @@ sub_81CDE2C: ; 81CDE2C str r0, [r5] ldr r0, =0x00001810 adds r5, r0 - ldr r0, =sub_81CDE80 + 1 + ldr r0, =sub_81CDE80 str r0, [r5] pop {r4,r5} pop {r0} @@ -893521,7 +893521,7 @@ sub_81CDE94: ; 81CDE94 cmp r0, 0 bne @081CE2C0 @081CE230: - ldr r0, =sub_81CEE44 + 1 + ldr r0, =sub_81CEE44 bl c3args_set_0toR1_1to0 b @081CDFB0 .align 2, 0 @@ -894523,7 +894523,7 @@ sub_81CE9E4: ; 81CE9E4 strh r1, [r0, 0x20] movs r1, 0x20 strh r1, [r0, 0x22] - ldr r1, =sub_81CE9C8 + 1 + ldr r1, =sub_81CE9C8 str r1, [r0, 0x1C] ldr r2, =0x000028dc adds r1, r6, r2 @@ -894576,7 +894576,7 @@ sub_81CE9E4: ; 81CE9E4 strh r4, [r1, 0x2E] adds r2, 0x1C adds r0, r2 - ldr r1, =sub_81CE964 + 1 + ldr r1, =sub_81CE964 str r1, [r0] b @081CEAE2 .align 2, 0 @@ -894600,7 +894600,7 @@ sub_81CE9E4: ; 81CE9E4 blt @081CEA8C movs r0, 0x67 strh r0, [r7] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r7, 0x14] cmp r4, 0x5 bhi @081CEB5C @@ -894650,7 +894650,7 @@ sub_81CE9E4: ; 81CE9E4 @081CEB5C: movs r0, 0x66 strh r0, [r7] - ldr r0, =sub_81CE990 + 1 + ldr r0, =sub_81CE990 str r0, [r7, 0x14] lsls r2, r4, 2 adds r2, r4 @@ -894927,7 +894927,7 @@ sub_81CED30: ; 81CED30 lsls r0, 2 adds r2, 0x1C adds r0, r2 - ldr r1, =sub_81CED10 + 1 + ldr r1, =sub_81CED10 str r1, [r0] ldr r1, =0x0000181c add r1, r8 @@ -895119,9 +895119,9 @@ sub_81CEF3C: ; 81CEF3C str r0, [r4, 0x20] cmp r0, 0 beq @081CEF90 - ldr r0, =sub_81CF010 + 1 + ldr r0, =sub_81CF010 str r0, [r4] - ldr r0, =sub_81CF11C + 1 + ldr r0, =sub_81CF11C movs r1, 0x1 bl sub_81C7078 str r0, [r4, 0x4] @@ -895157,7 +895157,7 @@ sub_81CEF98: ; 81CEF98 movs r0, 0x12 bl sub_81C763C str r0, [r4, 0x20] - ldr r0, =sub_81CF030 + 1 + ldr r0, =sub_81CF030 str r0, [r4] movs r0, 0x1 str r0, [r4, 0x18] @@ -895215,7 +895215,7 @@ sub_81CF010: ; 81CF010 bl sub_81C70D8 cmp r0, 0 bne @081CF022 - ldr r0, =sub_81CF030 + 1 + ldr r0, =sub_81CF030 str r0, [r4] @081CF022: movs r0, 0 @@ -895270,7 +895270,7 @@ sub_81CF030: ; 81CF030 cmp r0, 0 beq @081CF088 str r2, [r4, 0x1C] - ldr r0, =sub_81CF0B0 + 1 + ldr r0, =sub_81CF0B0 str r0, [r4] movs r0, 0x5 b @081CF0A6 @@ -895289,7 +895289,7 @@ sub_81CF030: ; 81CF030 ldr r1, [r4, 0x20] strh r0, [r1, 0x2] str r5, [r4, 0x1C] - ldr r0, =sub_81CF0B8 + 1 + ldr r0, =sub_81CF0B8 str r0, [r4] movs r0, 0x6 @081CF0A6: @@ -895670,11 +895670,11 @@ sub_81CF330: ; 81CF330 adds r4, r0, 0 cmp r4, 0 beq @081CF360 - ldr r0, =sub_81CF418 + 1 + ldr r0, =sub_81CF418 movs r1, 0x1 bl sub_81C7078 str r0, [r4, 0x4] - ldr r0, =sub_81CF3E4 + 1 + ldr r0, =sub_81CF3E4 str r0, [r4] movs r0, 0 str r0, [r4, 0xC] @@ -895700,11 +895700,11 @@ sub_81CF368: ; 81CF368 adds r4, r0, 0 cmp r4, 0 beq @081CF398 - ldr r0, =sub_81CF418 + 1 + ldr r0, =sub_81CF418 movs r1, 0x1 bl sub_81C7078 str r0, [r4, 0x4] - ldr r0, =sub_81CF3E4 + 1 + ldr r0, =sub_81CF3E4 str r0, [r4] movs r0, 0x1 str r0, [r4, 0xC] @@ -895733,7 +895733,7 @@ sub_81CF3A0: ; 81CF3A0 movs r1, 0x1 bl sub_81C7078 str r0, [r5, 0x4] - ldr r0, =sub_81CF3E4 + 1 + ldr r0, =sub_81CF3E4 str r0, [r5] pop {r4,r5} pop {r0} @@ -896384,7 +896384,7 @@ sub_81CF88C: ; 81CF88C strb r0, [r1, 0xD] mov r0, sp strb r2, [r0, 0xE] - ldr r0, =sub_81CF8E4 + 1 + ldr r0, =sub_81CF8E4 str r0, [sp, 0x10] str r4, [sp, 0x14] ldr r0, =gUnknown_08623594 @@ -896512,9 +896512,9 @@ sub_81CF9BC: ; 81CF9BC str r0, [r4, 0x1C] cmp r0, 0 beq @081CF9FC - ldr r0, =sub_81CFA68 + 1 + ldr r0, =sub_81CFA68 str r0, [r4] - ldr r0, =sub_81CFB74 + 1 + ldr r0, =sub_81CFB74 movs r1, 0x1 bl sub_81C7078 str r0, [r4, 0x4] @@ -896544,7 +896544,7 @@ sub_81CFA04: ; 81CFA04 movs r0, 0x12 bl sub_81C763C str r0, [r4, 0x1C] - ldr r0, =sub_81CFA88 + 1 + ldr r0, =sub_81CFA88 str r0, [r4] movs r0, 0x1 str r0, [r4, 0x14] @@ -896595,7 +896595,7 @@ sub_81CFA68: ; 81CFA68 bl sub_81C70D8 cmp r0, 0 bne @081CFA7A - ldr r0, =sub_81CFA88 + 1 + ldr r0, =sub_81CFA88 str r0, [r4] @081CFA7A: movs r0, 0 @@ -896650,7 +896650,7 @@ sub_81CFA88: ; 81CFA88 cmp r0, 0 beq @081CFAE0 str r2, [r4, 0x18] - ldr r0, =sub_81CFB08 + 1 + ldr r0, =sub_81CFB08 str r0, [r4] movs r0, 0x5 b @081CFAFE @@ -896669,7 +896669,7 @@ sub_81CFA88: ; 81CFA88 ldr r1, [r4, 0x1C] strh r0, [r1, 0x2] str r5, [r4, 0x18] - ldr r0, =sub_81CFB10 + 1 + ldr r0, =sub_81CFB10 str r0, [r4] movs r0, 0x6 @081CFAFE: @@ -897081,11 +897081,11 @@ sub_81CFDD0: ; 81CFDD0 adds r4, r0, 0 cmp r4, 0 beq @081CFE00 - ldr r0, =sub_81CFEB8 + 1 + ldr r0, =sub_81CFEB8 movs r1, 0x1 bl sub_81C7078 str r0, [r4, 0x4] - ldr r0, =sub_81CFE84 + 1 + ldr r0, =sub_81CFE84 str r0, [r4] movs r0, 0 str r0, [r4, 0xC] @@ -897111,11 +897111,11 @@ sub_81CFE08: ; 81CFE08 adds r4, r0, 0 cmp r4, 0 beq @081CFE38 - ldr r0, =sub_81CFEB8 + 1 + ldr r0, =sub_81CFEB8 movs r1, 0x1 bl sub_81C7078 str r0, [r4, 0x4] - ldr r0, =sub_81CFE84 + 1 + ldr r0, =sub_81CFE84 str r0, [r4] movs r0, 0x1 str r0, [r4, 0xC] @@ -897144,7 +897144,7 @@ sub_81CFE40: ; 81CFE40 movs r1, 0x1 bl sub_81C7078 str r0, [r5, 0x4] - ldr r0, =sub_81CFE84 + 1 + ldr r0, =sub_81CFE84 str r0, [r5] pop {r4,r5} pop {r0} @@ -897782,7 +897782,7 @@ sub_81D0304: ; 81D0304 strb r0, [r1, 0xD] mov r0, sp strb r2, [r0, 0xE] - ldr r0, =sub_81D035C + 1 + ldr r0, =sub_81D035C str r0, [sp, 0x10] str r4, [sp, 0x14] ldr r0, =gUnknown_086237B4 @@ -897924,7 +897924,7 @@ sub_81D0450: ; 81D0450 bl sub_81D0814 adds r1, r4, 0 adds r1, 0x98 - ldr r0, =sub_81D04C4 + 1 + ldr r0, =sub_81D04C4 str r0, [r1] ldr r1, =0x030026fc movs r0, 0x3 @@ -898013,7 +898013,7 @@ sub_81D04C4: ; 81D04C4 beq @081D0528 adds r1, r4, 0 adds r1, 0x98 - ldr r0, =sub_81D0548 + 1 + ldr r0, =sub_81D0548 str r0, [r1] movs r0, 0x2 b @081D053E @@ -898029,7 +898029,7 @@ sub_81D04C4: ; 81D04C4 @081D0534: adds r1, r4, 0 adds r1, 0x98 - ldr r0, =sub_81D05D4 + 1 + ldr r0, =sub_81D05D4 str r0, [r1] movs r0, 0x5 @081D053E: @@ -898106,7 +898106,7 @@ sub_81D0548: ; 81D0548 @081D05C0: adds r1, r4, 0 adds r1, 0x98 - ldr r0, =sub_81D04C4 + 1 + ldr r0, =sub_81D04C4 str r0, [r1] movs r0, 0x4 @081D05CA: @@ -898646,11 +898646,11 @@ sub_81D0978: ; 81D0978 adds r4, r0, 0 cmp r4, 0 beq @081D09A8 - ldr r0, =sub_81D0A6C + 1 + ldr r0, =sub_81D0A6C movs r1, 0x1 bl sub_81C7078 str r0, [r4, 0x4] - ldr r0, =sub_81D0A58 + 1 + ldr r0, =sub_81D0A58 str r0, [r4] movs r0, 0x1 b @081D09AA @@ -898678,7 +898678,7 @@ sub_81D09B0: ; 81D09B0 movs r1, 0x1 bl sub_81C7078 str r0, [r5, 0x4] - ldr r0, =sub_81D0A58 + 1 + ldr r0, =sub_81D0A58 str r0, [r5] pop {r4,r5} pop {r0} @@ -899709,7 +899709,7 @@ sub_81D1234: ; 81D1234 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 eors r1, r0 negs r0, r1 orrs r0, r1 @@ -899735,7 +899735,7 @@ sub_81D1258: ; 81D1258 strh r0, [r4, 0x30] strh r5, [r4, 0x32] strh r6, [r4, 0x34] - ldr r0, =sub_81D1284 + 1 + ldr r0, =sub_81D1284 str r0, [r4, 0x1C] pop {r4-r6} pop {r0} @@ -899784,7 +899784,7 @@ sub_81D1284: ; 81D1284 @081D12C8: ldrh r0, [r2, 0x34] strh r0, [r2, 0x20] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r2, 0x1C] @081D12D0: pop {r0} @@ -900048,7 +900048,7 @@ sub_81D1448: ; 81D1448 mov r1, r8 strh r1, [r0, 0x2E] ldr r1, [r6, 0x14] - ldr r0, =sub_81D1538 + 1 + ldr r0, =sub_81D1538 str r0, [r1, 0x1C] pop {r3} mov r8, r3 @@ -900070,7 +900070,7 @@ sub_81D1500: ; 81D1500 movs r1, 0x2 bl sub_8008258 ldr r1, [r4, 0x14] - ldr r0, =sub_81D1538 + 1 + ldr r0, =sub_81D1538 str r0, [r1, 0x1C] pop {r4} pop {r0} @@ -900083,7 +900083,7 @@ sub_81D1500: ; 81D1500 sub_81D1524: ; 81D1524 ldr r0, [r0, 0x14] ldr r1, [r0, 0x1C] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 eors r1, r0 negs r0, r1 orrs r0, r1 @@ -900118,7 +900118,7 @@ sub_81D1538: ; 81D1538 orrs r0, r1 mov r1, r12 strb r0, [r1] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r3, 0x1C] @081D156A: pop {r0} @@ -901388,9 +901388,9 @@ sub_81D1DC0: ; 81D1DC0 ldr r4, =0x03006310 ldr r1, =0x0203cf48 mov r8, r1 - ldr r2, =sub_81D1E7C + 1 + ldr r2, =sub_81D1E7C mov r9, r2 - ldr r0, =sub_81D1D44 + 1 + ldr r0, =sub_81D1D44 mov r10, r0 ldrb r1, [r5, 0x5] cmp r3, r1 @@ -904181,7 +904181,7 @@ sub_81D32F4: ; 81D32F4 beq @081D330C movs r0, 0 strh r0, [r2, 0x30] - ldr r0, =sub_81D32D4 + 1 + ldr r0, =sub_81D32D4 str r0, [r2, 0x1C] @081D330C: pop {r0} @@ -904285,7 +904285,7 @@ sub_81D338C: ; 81D338C beq @081D33D0 @081D33C4: ldr r1, [r4] - ldr r0, =sub_81D3564 + 1 + ldr r0, =sub_81D3564 str r0, [r1, 0x1C] b @081D33F0 .align 2, 0 @@ -904296,7 +904296,7 @@ sub_81D338C: ; 81D338C ldr r0, [r4] bl sub_81D35E8 ldr r2, [r4] - ldr r0, =sub_81D32F4 + 1 + ldr r0, =sub_81D32F4 str r0, [r2, 0x1C] adds r2, 0x3E ldrb r0, [r2] @@ -904337,7 +904337,7 @@ sub_81D3408: ; 81D3408 movs r7, 0x1C adds r7, r5 mov r12, r7 - ldr r6, =sub_81D3564 + 1 + ldr r6, =sub_81D3564 @081D3428: lsls r1, r2, 4 adds r1, r2 @@ -904559,17 +904559,17 @@ sub_81D3564: ; 81D3564 bne @081D35D0 adds r0, r4, 0 bl sub_81D35E8 - ldr r0, =sub_81D32F4 + 1 + ldr r0, =sub_81D32F4 b @081D35DA .align 2, 0 .pool @081D35D0: - ldr r0, =sub_81D32D4 + 1 + ldr r0, =sub_81D32D4 b @081D35DA .align 2, 0 .pool @081D35D8: - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 @081D35DA: str r0, [r4, 0x1C] @081D35DC: @@ -907324,7 +907324,7 @@ sub_81D4A90: ; 81D4A90 movs r2, 0x8 orrs r0, r2 strb r0, [r1, 0x5] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r1, 0x1C] @081D4BC4: add sp, 0x4 @@ -907542,9 +907542,9 @@ sub_81D4D50: ; 81D4D50 movs r0, 0 strh r0, [r4] ldr r1, =0x03002710 - ldr r0, =sub_81D3FAC + 1 + ldr r0, =sub_81D3FAC str r0, [r1, 0x4] - ldr r0, =sub_81D3F9C + 1 + ldr r0, =sub_81D3F9C str r0, [r1, 0x8] bl sub_81D41A0 bl sub_81D4238 @@ -907881,7 +907881,7 @@ sub_81D4EE4: ; 81D4EE4 thumb_func_start sub_81D5014 sub_81D5014: ; 81D5014 push {r4,lr} - ldr r0, =sub_81D5084 + 1 + ldr r0, =sub_81D5084 movs r1, 0 bl AddTask lsls r0, 24 @@ -908398,7 +908398,7 @@ sub_81D5084: ; 81D5084 bl free adds r0, r5, 0 bl remove_task - ldr r0, =sub_80186A4 + 1 + ldr r0, =sub_80186A4 bl set_callback2 @081D548A: pop {r4,r5} @@ -910749,7 +910749,7 @@ sub_81D6720: ; 81D6720 ldr r1, =0x00002007 adds r0, r1 strb r5, [r0] - ldr r0, =sub_81D6774 + 1 + ldr r0, =sub_81D6774 bl set_callback2 pop {r3} mov r8, r3 @@ -910785,7 +910785,7 @@ sub_81D6774: ; 81D6774 ldr r0, [r0] movs r1, 0 bl AddTask - ldr r0, =sub_81D67D0 + 1 + ldr r0, =sub_81D67D0 bl set_callback2 pop {r0} bx r0 @@ -910870,7 +910870,7 @@ sub_81D6840: ; 81D6840 adds r1, r3 lsls r1, 3 adds r1, r0 - ldr r0, =sub_81D6800 + 1 + ldr r0, =sub_81D6800 b @081D68B0 .align 2, 0 .pool @@ -911019,7 +911019,7 @@ sub_81D6984: ; 81D6984 adds r0, r6, 0 adds r0, 0x1C adds r0, r4, r0 - ldr r1, =sub_81D6A20 + 1 + ldr r1, =sub_81D6A20 str r1, [r0] adds r0, r6, 0 adds r0, 0x2E @@ -911268,7 +911268,7 @@ sub_81D6B7C: ; 81D6B7C adds r0, r6, 0 adds r0, 0x1C adds r0, r4, r0 - ldr r1, =sub_81D6D20 + 1 + ldr r1, =sub_81D6D20 str r1, [r0] adds r0, r6, 0 adds r0, 0x2E @@ -911933,7 +911933,7 @@ task_add_00_WIN0V_open_close_above_and_more: ; 81D7134 ldr r2, [r2, 0x8] bl sub_80BA038 strh r4, [r5] - ldr r0, =sub_81D7228 + 1 + ldr r0, =sub_81D7228 movs r1, 0 bl AddTask lsls r0, 24 @@ -911957,7 +911957,7 @@ task_add_00_WIN0V_open_close_above_and_more: ; 81D7134 adds r0, r7, 0 subs r0, 0x8 adds r0, r6, r0 - ldr r1, =sub_81D691C + 1 + ldr r1, =sub_81D691C str r1, [r0] b @081D71EE .align 2, 0 @@ -911974,7 +911974,7 @@ task_add_00_WIN0V_open_close_above_and_more: ; 81D7134 adds r0, r7, 0 subs r0, 0x8 adds r0, r6, r0 - ldr r1, =sub_81D736C + 1 + ldr r1, =sub_81D736C str r1, [r0] bl sub_80A2F30 @081D71EE: @@ -911991,7 +911991,7 @@ task_add_00_WIN0V_open_close_above_and_more: ; 81D7134 movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - ldr r0, =sub_81D6FD0 + 1 + ldr r0, =sub_81D6FD0 bl SetVBlankCallback movs r0, 0x53 bl audio_play @@ -912237,7 +912237,7 @@ sub_81D736C: ; 81D736C adds r0, r1 lsls r0, 3 adds r0, r2 - ldr r1, =sub_81D752C + 1 + ldr r1, =sub_81D752C str r1, [r0] movs r0, 0x2 ldrsh r1, [r4, r0] @@ -912483,7 +912483,7 @@ sub_81D75B4: ; 81D75B4 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81D7600 + 1 + ldr r1, =sub_81D7600 str r1, [r0] add sp, 0x4 pop {r4,r5} @@ -912527,7 +912527,7 @@ sub_81D7600: ; 81D7600 adds r0, r7, 0 subs r0, 0x8 adds r0, r6, r0 - ldr r1, =sub_81D6840 + 1 + ldr r1, =sub_81D6840 str r1, [r0] @081D7652: pop {r4-r7} @@ -912558,7 +912558,7 @@ sub_81D7664: ; 81D7664 adds r0, r6, 0 adds r0, 0x1C adds r0, r4, r0 - ldr r1, =sub_81D7700 + 1 + ldr r1, =sub_81D7700 str r1, [r0] adds r0, r6, 0 adds r0, 0x2E @@ -912859,7 +912859,7 @@ sub_81D78BC: ; 81D78BC adds r0, r6, 0 adds r0, 0x1C adds r0, r4, r0 - ldr r1, =sub_81D7A60 + 1 + ldr r1, =sub_81D7A60 str r1, [r0] adds r0, r6, 0 adds r0, 0x2E @@ -913650,9 +913650,9 @@ sub_81D7F4C: ; 81D7F4C movs r1, 0x10 movs r2, 0 bl sub_80A2A20 - ldr r0, =sub_81D67EC + 1 + ldr r0, =sub_81D67EC bl SetVBlankCallback - ldr r0, =sub_81D81A4 + 1 + ldr r0, =sub_81D81A4 movs r1, 0 bl AddTask movs r0, 0 @@ -913660,7 +913660,7 @@ sub_81D7F4C: ; 81D7F4C strh r0, [r6, 0x2] subs r5, 0x8 adds r4, r5 - ldr r0, =sub_81D7FC0 + 1 + ldr r0, =sub_81D7FC0 str r0, [r4] pop {r4-r6} pop {r0} @@ -913907,7 +913907,7 @@ sub_81D8164: ; 81D8164 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =sub_81D6840 + 1 + ldr r0, =sub_81D6840 str r0, [r1] @081D8192: pop {r4} @@ -914298,7 +914298,7 @@ sub_81D84EC: ; 81D84EC movs r1, 0x10 movs r2, 0 bl sub_80A2A20 - ldr r0, =sub_81D67EC + 1 + ldr r0, =sub_81D67EC bl SetVBlankCallback ldr r0, =0x0203cf60 ldr r0, [r0] @@ -914317,7 +914317,7 @@ sub_81D84EC: ; 81D84EC strh r0, [r5, 0x8] subs r6, 0x8 adds r4, r6 - ldr r0, =sub_81D857C + 1 + ldr r0, =sub_81D857C str r0, [r4] pop {r3} mov r8, r3 @@ -914391,7 +914391,7 @@ sub_81D857C: ; 81D857C ldrh r0, [r5] adds r0, 0x1 strh r0, [r5] - ldr r0, =sub_81D844C + 1 + ldr r0, =sub_81D844C bl SetHBlankCallback movs r0, 0x3 bl enable_irqs @@ -914448,7 +914448,7 @@ sub_81D857C: ; 81D857C adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81D8684 + 1 + ldr r1, =sub_81D8684 str r1, [r0] @081D8674: add sp, 0x4 @@ -914481,7 +914481,7 @@ sub_81D8684: ; 81D8684 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, =sub_81D6840 + 1 + ldr r0, =sub_81D6840 str r0, [r1] @081D86B8: pop {r4} @@ -914524,7 +914524,7 @@ sub_81D86CC: ; 81D86CC subs r3, 0x2E subs r4, 0x12 adds r4, r5, r4 - ldr r0, =sub_81D874C + 1 + ldr r0, =sub_81D874C str r0, [r4] adds r5, r3 ldrb r0, [r5, 0x5] @@ -914812,12 +914812,12 @@ sub_81D8980: ; 81D8980 movs r1, 0x10 movs r2, 0 bl sub_80A2A20 - ldr r0, =sub_81D67EC + 1 + ldr r0, =sub_81D67EC bl SetVBlankCallback movs r0, 0 strh r0, [r6] strh r0, [r6, 0x2] - ldr r0, =sub_81D8AD8 + 1 + ldr r0, =sub_81D8AD8 movs r1, 0 bl AddTask lsls r0, 24 @@ -914825,7 +914825,7 @@ sub_81D8980: ; 81D8980 strh r0, [r6, 0x4] subs r5, 0x8 adds r4, r5 - ldr r0, =sub_81D89E0 + 1 + ldr r0, =sub_81D89E0 str r0, [r4] pop {r4-r6} pop {r0} @@ -914915,7 +914915,7 @@ sub_81D89E0: ; 81D89E0 adds r0, r1 lsls r0, 3 adds r0, r2 - ldr r1, =sub_81D8B2C + 1 + ldr r1, =sub_81D8B2C b @081D8AC4 .align 2, 0 .pool @@ -914949,7 +914949,7 @@ sub_81D89E0: ; 81D89E0 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, =sub_81D8BEC + 1 + ldr r1, =sub_81D8BEC @081D8AC4: str r1, [r0] @081D8AC6: @@ -915126,7 +915126,7 @@ sub_81D8BEC: ; 81D8BEC adds r0, r6, 0 subs r0, 0x8 adds r0, r5, r0 - ldr r1, =sub_81D6840 + 1 + ldr r1, =sub_81D6840 str r1, [r0] @081D8C26: pop {r4-r6} @@ -915286,16 +915286,16 @@ sub_81D8DB4: ; 81D8DB4 movs r1, 0x10 movs r2, 0 bl sub_80A2A20 - ldr r0, =sub_81D67EC + 1 + ldr r0, =sub_81D67EC bl SetVBlankCallback movs r0, 0 strh r0, [r6] strh r0, [r6, 0x2] subs r5, 0x8 adds r4, r5 - ldr r0, =sub_81D8E80 + 1 + ldr r0, =sub_81D8E80 str r0, [r4] - ldr r0, =sub_81D8FB0 + 1 + ldr r0, =sub_81D8FB0 movs r1, 0 bl AddTask lsls r0, 24 @@ -915403,7 +915403,7 @@ sub_81D8E80: ; 81D8E80 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, =sub_81D97E0 + 1 + ldr r0, =sub_81D97E0 cmp r1, r0 bne @081D8FA0 ldrh r1, [r4, 0x2] @@ -915482,7 +915482,7 @@ sub_81D8E80: ; 81D8E80 mov r0, r8 subs r0, 0x8 adds r0, r7, r0 - ldr r1, =sub_81D9034 + 1 + ldr r1, =sub_81D9034 str r1, [r0] @081D8FA0: add sp, 0xC @@ -915608,7 +915608,7 @@ sub_81D9034: ; 81D9034 adds r0, r7, 0 subs r0, 0x8 adds r0, r6, r0 - ldr r1, =sub_81D6840 + 1 + ldr r1, =sub_81D6840 str r1, [r0] b @081D90A0 .align 2, 0 @@ -915856,7 +915856,7 @@ sub_81D9274: ; 81D9274 adds r1, r3 mov r8, r1 add r0, r8 - ldr r6, =pokemon_alive_on_battle_side + 1 + ldr r6, =pokemon_alive_on_battle_side str r6, [r0] movs r0, 0x6 ldrsh r1, [r2, r0] @@ -916000,7 +916000,7 @@ pokemon_alive_on_battle_side: ; 81D9338 strh r2, [r4, 0x36] strh r2, [r4, 0x38] strh r2, [r4, 0x3A] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r4, 0x1C] b @081D93D2 .align 2, 0 @@ -916034,7 +916034,7 @@ sub_81D93D8: ; 81D93D8 adds r1, r3, 0 adds r1, 0x1C adds r0, r1 - ldr r1, =sub_81D9420 + 1 + ldr r1, =sub_81D9420 str r1, [r0] movs r0, 0x6 ldrsh r1, [r2, r0] @@ -916163,7 +916163,7 @@ sub_81D94D4: ; 81D94D4 adds r4, r0, r2 subs r2, 0x12 adds r0, r2 - ldr r3, =sub_81D9528 + 1 + ldr r3, =sub_81D9528 str r3, [r0] movs r0, 0 ldrsh r1, [r4, r0] @@ -916451,7 +916451,7 @@ sub_81D961C: ; 81D961C lsls r0, 1 movs r1, 0 bl cry_related - ldr r0, =sub_81D98B4 + 1 + ldr r0, =sub_81D98B4 movs r1, 0 bl AddTask b @081D979E @@ -916482,13 +916482,13 @@ sub_81D961C: ; 81D961C movs r2, 0x30 movs r3, 0x10 bl sub_81D9868 - ldr r0, =sub_81D97E0 + 1 + ldr r0, =sub_81D97E0 str r0, [r4, 0x1C] b @081D97D2 .align 2, 0 .pool @081D9790: - ldr r0, =sub_81D8E80 + 1 + ldr r0, =sub_81D8E80 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -916815,7 +916815,7 @@ sub_81D99E4: ; 81D99E4 bl gf_strcpy movs r0, 0 str r0, [sp] - ldr r0, =sub_81D9A1C + 1 + ldr r0, =sub_81D9A1C str r0, [sp, 0x4] movs r0, 0x4 adds r1, r4, 0 @@ -916873,9 +916873,9 @@ sub_81D9A1C: ; 81D9A1C adds r0, r4, 0 bl gf_strcpy ldr r1, =0x03005dac - ldr r0, =sub_80AF168 + 1 + ldr r0, =sub_80AF168 str r0, [r1] - ldr r0, =c2_exit_to_overworld_2_switch + 1 + ldr r0, =c2_exit_to_overworld_2_switch bl set_callback2 pop {r4,r5} pop {r0} @@ -917453,8 +917453,8 @@ sub_81D9DE4: ; 81D9DE4 adds r1, r5 adds r1, 0x2D strb r0, [r1] - ldr r1, =sub_81DA160 + 1 - ldr r2, =sub_81D9F14 + 1 + ldr r1, =sub_81DA160 + ldr r2, =sub_81D9F14 adds r0, r6, 0 bl set_task_function_and_args_14_15 pop {r4-r6} @@ -917469,8 +917469,8 @@ sub_81D9F14: ; 81D9F14 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, =sub_81DA244 + 1 - ldr r2, =sub_81D9F30 + 1 + ldr r1, =sub_81DA244 + ldr r2, =sub_81D9F30 bl set_task_function_and_args_14_15 pop {r0} bx r0 @@ -917483,8 +917483,8 @@ sub_81D9F30: ; 81D9F30 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, =sub_81DA2E8 + 1 - ldr r2, =sub_81D9F4C + 1 + ldr r1, =sub_81DA2E8 + ldr r2, =sub_81D9F4C bl set_task_function_and_args_14_15 pop {r0} bx r0 @@ -917497,8 +917497,8 @@ sub_81D9F4C: ; 81D9F4C push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, =sub_81DA3B8 + 1 - ldr r2, =sub_81D9F68 + 1 + ldr r1, =sub_81DA3B8 + ldr r2, =sub_81D9F68 bl set_task_function_and_args_14_15 pop {r0} bx r0 @@ -917690,8 +917690,8 @@ sub_81D9F68: ; 81D9F68 ldrb r0, [r0] cmp r0, 0x3 bhi @081DA0E8 - ldr r1, =sub_81DA488 + 1 - ldr r2, =sub_81DA10C + 1 + ldr r1, =sub_81DA488 + ldr r2, =sub_81DA10C adds r0, r6, 0 bl set_task_function_and_args_14_15 b @081DA0F6 @@ -917703,7 +917703,7 @@ sub_81D9F68: ; 81D9F68 adds r1, r6 lsls r1, 3 adds r1, r0 - ldr r0, =sub_81DA10C + 1 + ldr r0, =sub_81DA10C str r0, [r1] @081DA0F6: add sp, 0x8 @@ -917726,8 +917726,8 @@ sub_81DA10C: ; 81DA10C ldr r0, =0x02039f2c ldrb r0, [r0] bl sub_80DB09C - ldr r1, =sub_80FCF40 + 1 - ldr r2, =sub_81DA138 + 1 + ldr r1, =sub_80FCF40 + ldr r2, =sub_81DA138 adds r0, r4, 0 bl set_task_function_and_args_14_15 pop {r4} @@ -917745,8 +917745,8 @@ sub_81DA138: ; 81DA138 lsrs r4, 24 movs r0, 0 bl sub_80DCE58 - ldr r1, =sub_80FCFD0 + 1 - ldr r2, =sub_80F8714 + 1 + ldr r1, =sub_80FCFD0 + ldr r2, =sub_80F8714 adds r0, r4, 0 bl set_task_function_and_args_14_15 pop {r4} @@ -918601,7 +918601,7 @@ sub_81DA74C: ; 81DA74C adds r0, r6, 0 adds r0, 0x1C adds r4, r0 - ldr r0, =sub_81DA848 + 1 + ldr r0, =sub_81DA848 str r0, [r4] adds r0, r5, 0 add sp, 0x4 @@ -918634,7 +918634,7 @@ sub_81DA848: ; 81DA848 ldrsh r0, [r2, r4] cmp r1, r0 bne @081DA874 - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r3, 0x1C] b @081DA8B4 .align 2, 0 @@ -918798,7 +918798,7 @@ sub_81DA8BC: ; 81DA8BC adds r0, r2, 0 adds r0, 0x1C adds r4, r0 - ldr r0, =sub_81DA9BC + 1 + ldr r0, =sub_81DA9BC str r0, [r4] adds r0, r6, 0 add sp, 0xC @@ -918856,7 +918856,7 @@ sub_81DA9BC: ; 81DA9BC strh r0, [r4, 0x36] b @081DAA16 @081DAA12: - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 str r0, [r4, 0x1C] @081DAA16: pop {r4} @@ -918918,7 +918918,7 @@ sub_81DAA74: ; 81DAA74 adds r5, 0x1C adds r0, r5 ldr r4, [r0] - ldr r0, =nullsub_12 + 1 + ldr r0, =nullsub_12 cmp r4, r0 bne @081DAAC4 movs r0, 0x12 @@ -919187,7 +919187,7 @@ sub_81DAC80: ; 81DAC80 bne @081DACA4 adds r0, r2, 0 bl sub_81DAA20 - ldr r0, =sub_81DABDC + 1 + ldr r0, =sub_81DABDC bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -919296,7 +919296,7 @@ sub_81DAD58: ; 81DAD58 bne @081DAD7C adds r0, r2, 0 bl sub_81DAA20 - ldr r0, =sub_81DACB4 + 1 + ldr r0, =sub_81DACB4 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -919414,7 +919414,7 @@ sub_81DAE44: ; 81DAE44 bne @081DAE68 adds r0, r2, 0 bl sub_81DAA20 - ldr r0, =sub_81DAD8C + 1 + ldr r0, =sub_81DAD8C bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -919534,7 +919534,7 @@ sub_81DAF34: ; 81DAF34 bne @081DAF58 adds r0, r2, 0 bl sub_81DAA20 - ldr r0, =sub_81DAE78 + 1 + ldr r0, =sub_81DAE78 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -919661,7 +919661,7 @@ sub_81DB02C: ; 81DB02C bne @081DB050 adds r0, r2, 0 bl sub_81DAA20 - ldr r0, =sub_81DAF68 + 1 + ldr r0, =sub_81DAF68 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -919788,7 +919788,7 @@ sub_81DB124: ; 81DB124 bne @081DB148 adds r0, r2, 0 bl sub_81DAA20 - ldr r0, =sub_81DB060 + 1 + ldr r0, =sub_81DB060 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -919919,7 +919919,7 @@ sub_81DB224: ; 81DB224 bne @081DB248 adds r0, r2, 0 bl sub_81DAA20 - ldr r0, =sub_81DB158 + 1 + ldr r0, =sub_81DB158 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -920052,7 +920052,7 @@ sub_81DB328: ; 81DB328 bne @081DB34C adds r0, r2, 0 bl sub_81DAA20 - ldr r0, =sub_81DB258 + 1 + ldr r0, =sub_81DB258 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 diff --git a/asm/libagbbackup.s b/asm/libagbbackup.s index 6b9307f2c..a85c41a81 100644 --- a/asm/libagbbackup.s +++ b/asm/libagbbackup.s @@ -130,7 +130,7 @@ SetFlashTimerIntr: ; 82E1944 ldr r3, =0x04000100 adds r0, r3 str r0, [r1] - ldr r0, =FlashTimerIntr + 1 + ldr r0, =FlashTimerIntr str r0, [r2] movs r0, 0 b @082E197A @@ -258,11 +258,11 @@ SetReadFlash1: ; 82E1A70 ldr r1, =0x03007844 adds r0, r2, 0x1 str r0, [r1] - ldr r3, =ReadFlash1 + 1 + ldr r3, =ReadFlash1 movs r0, 0x1 eors r3, r0 - ldr r0, =SetReadFlash1 + 1 - ldr r1, =ReadFlash1 + 1 + ldr r0, =SetReadFlash1 + ldr r1, =ReadFlash1 subs r0, r1 lsls r0, 15 b @082E1AA4 @@ -336,12 +336,12 @@ ReadFlash: ; 82E1AD4 movs r0, 0xF ands r4, r0 @082E1B0C: - ldr r3, =ReadFlash_Core + 1 + ldr r3, =ReadFlash_Core movs r0, 0x1 eors r3, r0 mov r2, sp - ldr r0, =ReadFlash + 1 - ldr r1, =ReadFlash_Core + 1 + ldr r0, =ReadFlash + ldr r1, =ReadFlash_Core subs r0, r1 lsls r0, 15 b @082E1B40 @@ -439,12 +439,12 @@ VerifyFlashSector: ; 82E1BA0 movs r0, 0xF ands r4, r0 @082E1BD4: - ldr r3, =VerifyFlashSector_Core + 1 + ldr r3, =VerifyFlashSector_Core movs r0, 0x1 eors r3, r0 mov r2, sp - ldr r0, =VerifyFlashSector + 1 - ldr r1, =VerifyFlashSector_Core + 1 + ldr r0, =VerifyFlashSector + ldr r1, =VerifyFlashSector_Core subs r0, r1 lsls r0, 15 b @082E1C08 @@ -511,12 +511,12 @@ VerifyFlashSectorFirstNBytes: ; 82E1C38 movs r1, 0x3 orrs r0, r1 strh r0, [r2] - ldr r3, =VerifyFlashSector_Core + 1 + ldr r3, =VerifyFlashSector_Core movs r0, 0x1 eors r3, r0 mov r2, sp - ldr r0, =VerifyFlashSector + 1 - ldr r1, =VerifyFlashSector_Core + 1 + ldr r0, =VerifyFlashSector + ldr r1, =VerifyFlashSector_Core subs r0, r1 lsls r0, 15 b @082E1CA0 diff --git a/asm/libmks4agb.s b/asm/libmks4agb.s index 45e4b01d5..8ece53c9a 100644 --- a/asm/libmks4agb.s +++ b/asm/libmks4agb.s @@ -2039,7 +2039,7 @@ _082E00CC: pop {r0} bx r0 .align 2, 0 -_082E00F0: .4byte SoundMainRAM + 1 +_082E00F0: .4byte SoundMainRAM _082E00F4: .4byte 0x03001aa8 _082E00F8: .4byte 0x04000200 _082E00FC: .4byte 0x03006380 @@ -2514,18 +2514,18 @@ _082E0468: .4byte 0x04000063 _082E046C: .4byte 0x03007ff0 _082E0470: .4byte 0x68736d53 _082E0474: .4byte 0x03007460 -_082E0478: .4byte ply_memacc + 1 -_082E047C: .4byte ply_lfos_rev01 + 1 -_082E0480: .4byte ply_mod_rev01 + 1 -_082E0484: .4byte ply_xcmd + 1 -_082E0488: .4byte ply_endtie_rev01 + 1 -_082E048C: .4byte SampFreqSet_rev01 + 1 -_082E0490: .4byte TrackStop_rev01 + 1 -_082E0494: .4byte FadeOutBody_rev01 + 1 -_082E0498: .4byte TrkVolPitSet_rev01 + 1 -_082E049C: .4byte CgbSound + 1 -_082E04A0: .4byte CgbOscOff + 1 -_082E04A4: .4byte MidiKey2CgbFr + 1 +_082E0478: .4byte ply_memacc +_082E047C: .4byte ply_lfos_rev01 +_082E0480: .4byte ply_mod_rev01 +_082E0484: .4byte ply_xcmd +_082E0488: .4byte ply_endtie_rev01 +_082E048C: .4byte SampFreqSet_rev01 +_082E0490: .4byte TrackStop_rev01 +_082E0494: .4byte FadeOutBody_rev01 +_082E0498: .4byte TrkVolPitSet_rev01 +_082E049C: .4byte CgbSound +_082E04A0: .4byte CgbOscOff +_082E04A4: .4byte MidiKey2CgbFr _082E04A8: .4byte 0x00000000 _082E04AC: .4byte 0x05000040 thumb_func_end MPlayExtender @@ -2667,8 +2667,8 @@ _082E05B4: .4byte 0x040000a0 _082E05B8: .4byte 0x040000a4 _082E05BC: .4byte 0x03007ff0 _082E05C0: .4byte 0x050003ec -_082E05C4: .4byte ply_note_rev01 + 1 -_082E05C8: .4byte DummyFunc_rev + 1 +_082E05C4: .4byte ply_note_rev01 +_082E05C8: .4byte DummyFunc_rev _082E05CC: .4byte 0x03007460 _082E05D0: .4byte 0x68736d53 thumb_func_end SoundInit_rev01 @@ -3033,7 +3033,7 @@ _082E0880: .align 2, 0 _082E0888: .4byte 0x03007ff0 _082E088C: .4byte 0x68736d53 -_082E0890: .4byte MPlayMain_rev01 + 1 +_082E0890: .4byte MPlayMain_rev01 thumb_func_end MPlayOpen_rev01 thumb_func_start MPlayStart_rev01 diff --git a/asm/librfu.s b/asm/librfu.s index 4a70923c7..447d53867 100644 --- a/asm/librfu.s +++ b/asm/librfu.s @@ -125,7 +125,7 @@ STWI_init_timer: ; 82E2AF0 pop {r0} bx r0 .align 2, 0 -_082E2B1C: .4byte STWI_intr_timer + 1 +_082E2B1C: .4byte STWI_intr_timer _082E2B20: .4byte 0x03007868 _082E2B24: .4byte 0x04000208 _082E2B28: .4byte 0x04000200 @@ -2391,7 +2391,7 @@ _082E3FC4: .4byte 0x03007894 _082E3FC8: .4byte 0x03007898 _082E3FCC: .4byte 0x03007880 _082E3FD0: .4byte 0x03007870 -_082E3FD4: .4byte sub_82E53F4 + 1 +_082E3FD4: .4byte sub_82E53F4 _082E3FD8: .4byte 0x0000ffff thumb_func_end rfu_initializeAPI @@ -2470,7 +2470,7 @@ rfu_REQ_PARENT_resumeRetransmitAndChange: ; 82E4064 pop {r0} bx r0 .align 2, 0 -_082E4074: .4byte rfu_STC_REQ_callback + 1 +_082E4074: .4byte rfu_STC_REQ_callback thumb_func_end rfu_REQ_PARENT_resumeRetransmitAndChange thumb_func_start rfu_UNI_PARENT_getDRAC_ACK @@ -2623,7 +2623,7 @@ _082E4166: pop {r0} bx r0 .align 2, 0 -_082E416C: .4byte rfu_CB_defaultCallback + 1 +_082E416C: .4byte rfu_CB_defaultCallback _082E4170: .4byte 0x03007894 _082E4174: .4byte 0x03007898 thumb_func_end rfu_STC_REQ_callback @@ -2709,7 +2709,7 @@ rfu_REQ_RFUStatus: ; 82E41FC pop {r0} bx r0 .align 2, 0 -_082E420C: .4byte rfu_STC_REQ_callback + 1 +_082E420C: .4byte rfu_STC_REQ_callback thumb_func_end rfu_REQ_RFUStatus thumb_func_start rfu_getRFUStatus @@ -2875,7 +2875,7 @@ _082E433C: .4byte 0x00008001 _082E4340: .4byte 0x03007868 _082E4344: .4byte 0x04000100 _082E4348: .4byte 0x0105ffff -_082E434C: .4byte rfu_CB_stopMode + 1 +_082E434C: .4byte rfu_CB_stopMode _082E4350: ldr r1, _082E4368 movs r2, 0x80 @@ -2961,7 +2961,7 @@ rfu_REQ_reset: ; 82E43D4 pop {r0} bx r0 .align 2, 0 -_082E43E4: .4byte rfu_CB_reset + 1 +_082E43E4: .4byte rfu_CB_reset thumb_func_end rfu_REQ_reset thumb_func_start rfu_CB_reset @@ -3013,7 +3013,7 @@ rfu_REQ_configSystem: ; 82E440C strh r0, [r1, 0x1A] b _082E4466 .align 2, 0 -_082E4444: .4byte rfu_STC_REQ_callback + 1 +_082E4444: .4byte rfu_STC_REQ_callback _082E4448: .4byte 0x03007894 _082E444C: ldr r5, _082E446C @@ -3110,7 +3110,7 @@ _082E44E6: pop {r0} bx r0 .align 2, 0 -_082E44FC: .4byte rfu_CB_configGameData + 1 +_082E44FC: .4byte rfu_CB_configGameData thumb_func_end rfu_REQ_configGameData thumb_func_start rfu_CB_configGameData @@ -3234,7 +3234,7 @@ _082E45A6: bl rfu_STC_clearLinkStatus b _082E45F6 .align 2, 0 -_082E45E4: .4byte rfu_CB_defaultCallback + 1 +_082E45E4: .4byte rfu_CB_defaultCallback _082E45E8: .4byte 0x03007894 _082E45EC: .4byte 0x03007898 _082E45F0: @@ -3248,7 +3248,7 @@ _082E45F6: pop {r0} bx r0 .align 2, 0 -_082E4608: .4byte rfu_CB_startSearchChild + 1 +_082E4608: .4byte rfu_CB_startSearchChild thumb_func_end rfu_REQ_startSearchChild thumb_func_start rfu_CB_startSearchChild @@ -3337,7 +3337,7 @@ rfu_REQ_pollSearchChild: ; 82E4698 pop {r0} bx r0 .align 2, 0 -_082E46A8: .4byte rfu_CB_pollAndEndSearchChild + 1 +_082E46A8: .4byte rfu_CB_pollAndEndSearchChild thumb_func_end rfu_REQ_pollSearchChild thumb_func_start rfu_REQ_endSearchChild @@ -3349,7 +3349,7 @@ rfu_REQ_endSearchChild: ; 82E46AC pop {r0} bx r0 .align 2, 0 -_082E46BC: .4byte rfu_CB_pollAndEndSearchChild + 1 +_082E46BC: .4byte rfu_CB_pollAndEndSearchChild thumb_func_end rfu_REQ_endSearchChild thumb_func_start rfu_CB_pollAndEndSearchChild @@ -3389,7 +3389,7 @@ _082E46D2: b _082E4730 .align 2, 0 _082E4708: .4byte 0x03007890 -_082E470C: .4byte rfu_CB_defaultCallback + 1 +_082E470C: .4byte rfu_CB_defaultCallback _082E4710: .4byte 0x03007898 _082E4714: cmp r4, 0x1B @@ -3527,7 +3527,7 @@ rfu_REQ_startSearchParent: ; 82E4804 pop {r0} bx r0 .align 2, 0 -_082E4814: .4byte rfu_CB_startSearchParent + 1 +_082E4814: .4byte rfu_CB_startSearchParent thumb_func_end rfu_REQ_startSearchParent thumb_func_start rfu_CB_startSearchParent @@ -3560,7 +3560,7 @@ rfu_REQ_pollSearchParent: ; 82E483C pop {r0} bx r0 .align 2, 0 -_082E484C: .4byte sub_82E4850 + 1 +_082E484C: .4byte sub_82E4850 thumb_func_end rfu_REQ_pollSearchParent thumb_func_start sub_82E4850 @@ -3592,7 +3592,7 @@ rfu_REQ_endSearchParent: ; 82E4874 pop {r0} bx r0 .align 2, 0 -_082E4884: .4byte rfu_STC_REQ_callback + 1 +_082E4884: .4byte rfu_STC_REQ_callback thumb_func_end rfu_REQ_endSearchParent thumb_func_start rfu_STC_readParentCandidateList @@ -3783,7 +3783,7 @@ _082E49CC: .align 2, 0 _082E49E4: .4byte 0x03007890 _082E49E8: .4byte 0x03007894 -_082E49EC: .4byte rfu_STC_REQ_callback + 1 +_082E49EC: .4byte rfu_STC_REQ_callback _082E49F0: movs r0, 0x1F adds r1, r3, 0 @@ -3803,7 +3803,7 @@ rfu_REQ_pollConnectParent: ; 82E4A00 pop {r0} bx r0 .align 2, 0 -_082E4A10: .4byte rfu_CB_pollConnectParent + 1 +_082E4A10: .4byte rfu_CB_pollConnectParent thumb_func_end rfu_REQ_pollConnectParent thumb_func_start rfu_CB_pollConnectParent @@ -4007,7 +4007,7 @@ _082E4B90: pop {r0} bx r0 .align 2, 0 -_082E4B94: .4byte rfu_CB_pollConnectParent + 1 +_082E4B94: .4byte rfu_CB_pollConnectParent _082E4B98: .4byte 0x03007898 _082E4B9C: .4byte 0x03007894 thumb_func_end rfu_REQ_endConnectParent @@ -4312,7 +4312,7 @@ _082E4DBC: .align 2, 0 _082E4DDC: .4byte 0x03007898 _082E4DE0: .4byte 0x03007890 -_082E4DE4: .4byte rfu_CB_defaultCallback + 1 +_082E4DE4: .4byte rfu_CB_defaultCallback _082E4DE8: movs r0, 0x11 ldr r1, [sp, 0xC] @@ -4794,7 +4794,7 @@ _082E5178: bl rfu_STC_REQ_callback b _082E51B0 .align 2, 0 -_082E51A0: .4byte rfu_CB_defaultCallback + 1 +_082E51A0: .4byte rfu_CB_defaultCallback _082E51A4: ldr r0, _082E51B8 bl STWI_set_Callback_M @@ -4805,7 +4805,7 @@ _082E51B0: pop {r0} bx r0 .align 2, 0 -_082E51B8: .4byte rfu_CB_disconnect + 1 +_082E51B8: .4byte rfu_CB_disconnect thumb_func_end rfu_REQ_disconnect thumb_func_start rfu_CB_disconnect @@ -4913,7 +4913,7 @@ _082E5286: bx r0 .align 2, 0 _082E528C: .4byte 0x03007890 -_082E5290: .4byte rfu_CB_defaultCallback + 1 +_082E5290: .4byte rfu_CB_defaultCallback _082E5294: .4byte 0x03007898 _082E5298: .4byte 0x03007894 thumb_func_end rfu_CB_disconnect @@ -4961,7 +4961,7 @@ _082E52CA: bx r0 .align 2, 0 _082E52EC: .4byte 0x03007894 -_082E52F0: .4byte rfu_STC_REQ_callback + 1 +_082E52F0: .4byte rfu_STC_REQ_callback _082E52F4: .4byte 0x03007890 thumb_func_end rfu_REQ_CHILD_startConnectRecovery @@ -4974,7 +4974,7 @@ rfu_REQ_CHILD_pollConnectRecovery: ; 82E52F8 pop {r0} bx r0 .align 2, 0 -_082E5308: .4byte rfu_CB_CHILD_pollConnectRecovery + 1 +_082E5308: .4byte rfu_CB_CHILD_pollConnectRecovery thumb_func_end rfu_REQ_CHILD_pollConnectRecovery thumb_func_start rfu_CB_CHILD_pollConnectRecovery @@ -5100,7 +5100,7 @@ rfu_REQ_CHILD_endConnectRecovery: ; 82E53E0 pop {r0} bx r0 .align 2, 0 -_082E53F0: .4byte rfu_CB_CHILD_pollConnectRecovery + 1 +_082E53F0: .4byte rfu_CB_CHILD_pollConnectRecovery thumb_func_end rfu_REQ_CHILD_endConnectRecovery thumb_func_start sub_82E53F4 @@ -5149,7 +5149,7 @@ rfu_REQ_changeMasterSlave: ; 82E5424 bl STWI_send_MS_ChangeREQ b _082E544C .align 2, 0 -_082E5440: .4byte rfu_STC_REQ_callback + 1 +_082E5440: .4byte rfu_STC_REQ_callback _082E5444: movs r0, 0x27 movs r1, 0 @@ -6432,7 +6432,7 @@ _082E5D80: b _082E5E4E .align 2, 0 _082E5DA4: .4byte 0x03007898 -_082E5DA8: .4byte sub_82E5F00 + 1 +_082E5DA8: .4byte sub_82E5F00 _082E5DAC: ldr r0, [r4] adds r0, 0x68 @@ -6466,7 +6466,7 @@ _082E5DC4: bl STWI_send_DataTxAndChangeREQ b _082E5E4E .align 2, 0 -_082E5DF0: .4byte rfu_CB_sendData + 1 +_082E5DF0: .4byte rfu_CB_sendData _082E5DF4: .4byte 0x03007898 _082E5DF8: .4byte 0x03007894 _082E5DFC: @@ -6510,7 +6510,7 @@ _082E5E4E: pop {r0} bx r0 .align 2, 0 -_082E5E54: .4byte rfu_CB_sendData2 + 1 +_082E5E54: .4byte rfu_CB_sendData2 thumb_func_end rfu_REQ_sendData thumb_func_start rfu_CB_sendData @@ -7168,7 +7168,7 @@ _082E6320: .align 2, 0 _082E6328: .4byte 0x03007890 _082E632C: .4byte 0x03007894 -_082E6330: .4byte rfu_CB_recvData + 1 +_082E6330: .4byte rfu_CB_recvData thumb_func_end rfu_REQ_recvData thumb_func_start rfu_CB_recvData @@ -8517,7 +8517,7 @@ rfu_REQ_noise: ; 82E6D54 pop {r0} bx r0 .align 2, 0 -_082E6D68: .4byte rfu_STC_REQ_callback + 1 +_082E6D68: .4byte rfu_STC_REQ_callback thumb_func_end rfu_REQ_noise thumb_func_start sub_82E6D6C @@ -8559,7 +8559,7 @@ _082E6D88: .align 2, 0 _082E6DB4: .4byte 0x04000200 _082E6DB8: .4byte 0x03007868 -_082E6DBC: .4byte sub_82E6F88 + 1 +_082E6DBC: .4byte sub_82E6F88 _082E6DC0: .4byte 0x04000100 _082E6DC4: strh r6, [r4, 0x2] diff --git a/asm/main.s b/asm/main.s index cab084eb7..11fcf80e4 100644 --- a/asm/main.s +++ b/asm/main.s @@ -131,7 +131,7 @@ init_saveblock_ptrs_and_set_copyright_callback2: ; 80004D8 str r0, [r1] str r0, [r2, 0x24] str r0, [r2] - ldr r0, =c2_copyright_1 + 1 + ldr r0, =c2_copyright_1 bl set_callback2 ldr r1, =0x03005d90 ldr r0, =0x02024a54 @@ -421,9 +421,9 @@ SetVCountCallback: ; 8000708 ; void restore_serial_timer3_irq_handlers() restore_serial_timer3_irq_handlers: ; 8000714 ldr r0, =0x03002710 - ldr r1, =irq_serial + 1 + ldr r1, =irq_serial str r1, [r0, 0x4] - ldr r1, =irq_timer3 + 1 + ldr r1, =irq_timer3 str r1, [r0, 0x8] bx lr .align 2, 0 diff --git a/asm/task.s b/asm/task.s index e714b406b..388f11f0c 100644 --- a/asm/task.s +++ b/asm/task.s @@ -13,7 +13,7 @@ clear_tasks: ; 80A8F50 adds r2, r0, r6 movs r1, 0 strb r1, [r2, 0x4] - ldr r1, =nullsub_4 + 1 + ldr r1, =nullsub_4 str r1, [r2] strb r4, [r2, 0x5] adds r4, 0x1 diff --git a/asm/window.s b/asm/window.s index a74b8d2c1..ae74969eb 100644 --- a/asm/window.s +++ b/asm/window.s @@ -23,7 +23,7 @@ Window_InitFromTemplates: ; 80031C0 bl bg_get_tilemap cmp r0, 0 beq @080031E4 - ldr r0, =nullsub_8 + 1 + ldr r0, =nullsub_8 @080031E4: str r0, [r4] adds r4, 0x4 @@ -151,7 +151,7 @@ Window_InitFromTemplates: ; 80031C0 mov r2, r10 adds r5, r2, r0 ldr r1, [r5] - ldr r0, =nullsub_8 + 1 + ldr r0, =nullsub_8 cmp r1, r0 beq @08003250 adds r0, r1, 0 @@ -332,7 +332,7 @@ Window_AddFromTemplate: ; 8003380 ldr r3, [sp] adds r5, r3, r0 ldr r1, [r5] - ldr r0, =nullsub_8 + 1 + ldr r0, =nullsub_8 cmp r1, r0 beq @0800346A adds r0, r1, 0 @@ -509,7 +509,7 @@ Window_Remove: ; 8003574 lsls r1, r7, 2 adds r4, r1, r0 ldr r1, [r4] - ldr r0, =nullsub_8 + 1 + ldr r0, =nullsub_8 cmp r1, r0 beq @080035CE adds r0, r1, 0 @@ -546,7 +546,7 @@ Window_FreeMemory: ; 8003604 ldr r1, [r4] cmp r1, 0 beq @08003620 - ldr r0, =nullsub_8 + 1 + ldr r0, =nullsub_8 cmp r1, r0 beq @08003620 adds r0, r1, 0 @@ -2305,7 +2305,7 @@ Window_AddFromTemplate8Bpp: ; 8004260 lsls r1, r7, 2 adds r5, r1, r0 ldr r1, [r5] - ldr r0, =nullsub_9 + 1 + ldr r0, =nullsub_9 cmp r1, r0 beq @08004322 adds r0, r1, 0 diff --git a/data/contest_effect_function_table.s b/data/contest_effect_function_table.s index bde47f77f..ca59f4c72 100644 --- a/data/contest_effect_function_table.s +++ b/data/contest_effect_function_table.s @@ -1,51 +1,51 @@ .align 2, 0 gContestEffectFunctionTable: ; 858CECC - .4byte ContestEffectFunc_080E547C + 1 - .4byte ContestEffectFunc_080E5480 + 1 - .4byte ContestEffectFunc_080E54B0 + 1 - .4byte ContestEffectFunc_080E54E0 + 1 - .4byte ContestEffectFunc_080E5534 + 1 - .4byte ContestEffectFunc_080E5560 + 1 - .4byte ContestEffectFunc_080E5590 + 1 - .4byte ContestEffectFunc_080E55BC + 1 - .4byte ContestEffectFunc_080E55EC + 1 - .4byte ContestEffectFunc_080E5664 + 1 - .4byte ContestEffectFunc_080E55EC + 1 - .4byte ContestEffectFunc_080E5664 + 1 - .4byte ContestEffectFunc_080E55EC + 1 - .4byte ContestEffectFunc_080E5664 + 1 - .4byte ContestEffectFunc_080E56E0 + 1 - .4byte ContestEffectFunc_080E5718 + 1 - .4byte ContestEffectFunc_080E57CC + 1 - .4byte ContestEffectFunc_080E588C + 1 - .4byte ContestEffectFunc_080E5938 + 1 - .4byte ContestEffectFunc_080E5970 + 1 - .4byte ContestEffectFunc_080E59B0 + 1 - .4byte ContestEffectFunc_080E59D0 + 1 - .4byte ContestEffectFunc_080E59F0 + 1 - .4byte ContestEffectFunc_080E5A10 + 1 - .4byte ContestEffectFunc_080E5A30 + 1 - .4byte ContestEffectFunc_080E5A50 + 1 - .4byte ContestEffectFunc_080E5AD4 + 1 - .4byte ContestEffectFunc_080E5CD4 + 1 - .4byte ContestEffectFunc_080E5D7C + 1 - .4byte ContestEffectFunc_080E5E04 + 1 - .4byte ContestEffectFunc_080E5E5C + 1 - .4byte ContestEffectFunc_080E5EB4 + 1 - .4byte ContestEffectFunc_080E5F64 + 1 - .4byte ContestEffectFunc_080E5FE4 + 1 - .4byte ContestEffectFunc_080E6068 + 1 - .4byte ContestEffectFunc_080E611C + 1 - .4byte ContestEffectFunc_080E620C + 1 - .4byte ContestEffectFunc_080E62B8 + 1 - .4byte ContestEffectFunc_080E6334 + 1 - .4byte ContestEffectFunc_080E6398 + 1 - .4byte ContestEffectFunc_080E63E8 + 1 - .4byte ContestEffectFunc_080E6520 + 1 - .4byte ContestEffectFunc_080E6664 + 1 - .4byte ContestEffectFunc_080E6668 + 1 - .4byte ContestEffectFunc_080E6778 + 1 - .4byte ContestEffectFunc_080E67BC + 1 - .4byte ContestEffectFunc_080E6868 + 1 - .4byte ContestEffectFunc_080E68EC + 1 + .4byte ContestEffectFunc_080E547C + .4byte ContestEffectFunc_080E5480 + .4byte ContestEffectFunc_080E54B0 + .4byte ContestEffectFunc_080E54E0 + .4byte ContestEffectFunc_080E5534 + .4byte ContestEffectFunc_080E5560 + .4byte ContestEffectFunc_080E5590 + .4byte ContestEffectFunc_080E55BC + .4byte ContestEffectFunc_080E55EC + .4byte ContestEffectFunc_080E5664 + .4byte ContestEffectFunc_080E55EC + .4byte ContestEffectFunc_080E5664 + .4byte ContestEffectFunc_080E55EC + .4byte ContestEffectFunc_080E5664 + .4byte ContestEffectFunc_080E56E0 + .4byte ContestEffectFunc_080E5718 + .4byte ContestEffectFunc_080E57CC + .4byte ContestEffectFunc_080E588C + .4byte ContestEffectFunc_080E5938 + .4byte ContestEffectFunc_080E5970 + .4byte ContestEffectFunc_080E59B0 + .4byte ContestEffectFunc_080E59D0 + .4byte ContestEffectFunc_080E59F0 + .4byte ContestEffectFunc_080E5A10 + .4byte ContestEffectFunc_080E5A30 + .4byte ContestEffectFunc_080E5A50 + .4byte ContestEffectFunc_080E5AD4 + .4byte ContestEffectFunc_080E5CD4 + .4byte ContestEffectFunc_080E5D7C + .4byte ContestEffectFunc_080E5E04 + .4byte ContestEffectFunc_080E5E5C + .4byte ContestEffectFunc_080E5EB4 + .4byte ContestEffectFunc_080E5F64 + .4byte ContestEffectFunc_080E5FE4 + .4byte ContestEffectFunc_080E6068 + .4byte ContestEffectFunc_080E611C + .4byte ContestEffectFunc_080E620C + .4byte ContestEffectFunc_080E62B8 + .4byte ContestEffectFunc_080E6334 + .4byte ContestEffectFunc_080E6398 + .4byte ContestEffectFunc_080E63E8 + .4byte ContestEffectFunc_080E6520 + .4byte ContestEffectFunc_080E6664 + .4byte ContestEffectFunc_080E6668 + .4byte ContestEffectFunc_080E6778 + .4byte ContestEffectFunc_080E67BC + .4byte ContestEffectFunc_080E6868 + .4byte ContestEffectFunc_080E68EC