diff options
-rw-r--r-- | asm/battle_setup.s | 4 | ||||
-rw-r--r-- | asm/berry_tag_screen.s | 8 | ||||
-rw-r--r-- | asm/cable_club.s | 16 | ||||
-rw-r--r-- | asm/pokedex.s | 8 | ||||
-rw-r--r-- | asm/rom4.s | 8 | ||||
-rw-r--r-- | asm/rom6.s | 10 | ||||
-rw-r--r-- | asm/rom_806936C.s | 52 | ||||
-rw-r--r-- | asm/rom_806D7F8.s | 4 | ||||
-rw-r--r-- | asm/rom_8080874.s | 20 | ||||
-rw-r--r-- | asm/rom_80859BC.s | 4 | ||||
-rw-r--r-- | asm/rom_8094928.s | 96 | ||||
-rw-r--r-- | asm/rom_80B5054.s | 108 | ||||
-rw-r--r-- | asm/rom_81258BC.s | 60 | ||||
-rw-r--r-- | asm/rom_813BA94.s | 8 | ||||
-rw-r--r-- | asm/rom_81473B8.s | 4 | ||||
-rw-r--r-- | asm/trainer_see.s | 4 | ||||
-rw-r--r-- | common_syms/task.txt | 1 | ||||
-rw-r--r-- | src/task.c | 2 | ||||
-rw-r--r-- | sym_common.txt | 6 |
19 files changed, 210 insertions, 213 deletions
diff --git a/asm/battle_setup.s b/asm/battle_setup.s index 85330c8fa..6b9b758c1 100644 --- a/asm/battle_setup.s +++ b/asm/battle_setup.s @@ -14,7 +14,7 @@ task01_battle_start: @ 8081960 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _08081980 @ =gUnknown_03004B28 + ldr r1, _08081980 @ =gTasks + 0x8 adds r4, r0, r1 movs r1, 0 ldrsh r0, [r4, r1] @@ -24,7 +24,7 @@ task01_battle_start: @ 8081960 beq _0808199A b _080819BA .align 2, 0 -_08081980: .4byte gUnknown_03004B28 +_08081980: .4byte gTasks + 0x8 _08081984: bl c3_80A0DD8_is_running cmp r0, 0 diff --git a/asm/berry_tag_screen.s b/asm/berry_tag_screen.s index 6be1ca16c..00476338e 100644 --- a/asm/berry_tag_screen.s +++ b/asm/berry_tag_screen.s @@ -847,7 +847,7 @@ sub_81466E8: @ 81466E8 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 - ldr r1, _08146748 @ =gUnknown_03004B28 + ldr r1, _08146748 @ =gTasks + 0x8 adds r6, r0, r1 ldr r4, _0814674C @ =gUnknown_03005D10 movs r0, 0xC @@ -886,7 +886,7 @@ _08146728: strh r0, [r6, 0x2] b _08146766 .align 2, 0 -_08146748: .4byte gUnknown_03004B28 +_08146748: .4byte gTasks + 0x8 _0814674C: .4byte gUnknown_03005D10 _08146750: mov r4, r8 @@ -938,7 +938,7 @@ sub_8146798: @ 8146798 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _08146800 @ =gUnknown_03004B28 + ldr r1, _08146800 @ =gTasks + 0x8 adds r0, r1 ldr r2, _08146804 @ =gUnknown_030041B4 ldrh r1, [r0] @@ -987,7 +987,7 @@ _081467FA: pop {r0} bx r0 .align 2, 0 -_08146800: .4byte gUnknown_03004B28 +_08146800: .4byte gTasks + 0x8 _08146804: .4byte gUnknown_030041B4 _08146808: .4byte gTasks _0814680C: .4byte sub_8146480 diff --git a/asm/cable_club.s b/asm/cable_club.s index d69bb3aa1..1c3f4a966 100644 --- a/asm/cable_club.s +++ b/asm/cable_club.s @@ -88,7 +88,7 @@ sub_8082D60: @ 8082D60 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _08082D88 @ =gUnknown_03004B28 + ldr r0, _08082D88 @ =gTasks + 0x8 adds r1, r0 adds r5, r1, 0x6 movs r2, 0x6 @@ -100,7 +100,7 @@ sub_8082D60: @ 8082D60 bl sub_8082D4C b _08082D92 .align 2, 0 -_08082D88: .4byte gUnknown_03004B28 +_08082D88: .4byte gTasks + 0x8 _08082D8C: adds r0, r4, 0 bl sub_8082D18 @@ -336,7 +336,7 @@ sub_8082F20: @ 8082F20 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _08082F48 @ =gUnknown_03004B28 + ldr r0, _08082F48 @ =gTasks + 0x8 adds r4, r1, r0 movs r3, 0 ldrsh r2, [r4, r3] @@ -347,7 +347,7 @@ sub_8082F20: @ 8082F20 bl ResetLinkPlayers b _08082F58 .align 2, 0 -_08082F48: .4byte gUnknown_03004B28 +_08082F48: .4byte gTasks + 0x8 _08082F4C: cmp r2, 0x9 ble _08082F58 @@ -476,7 +476,7 @@ sub_808303C: @ 808303C adds r0, r4 lsls r0, 3 mov r8, r0 - ldr r0, _080830D0 @ =gUnknown_03004B28 + ldr r0, _080830D0 @ =gTasks + 0x8 mov r9, r0 mov r7, r8 add r7, r9 @@ -532,7 +532,7 @@ _080830C2: pop {r0} bx r0 .align 2, 0 -_080830D0: .4byte gUnknown_03004B28 +_080830D0: .4byte gTasks + 0x8 _080830D4: .4byte gMain _080830D8: .4byte gStringVar1 _080830DC: .4byte gUnknown_081A4975 @@ -1310,7 +1310,7 @@ sub_8083710: @ 8083710 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0808373C @ =gUnknown_03004B28 + ldr r0, _0808373C @ =gTasks + 0x8 adds r4, r1, r0 movs r3, 0 ldrsh r2, [r4, r3] @@ -1323,7 +1323,7 @@ sub_8083710: @ 8083710 bl CreateTask b _08083750 .align 2, 0 -_0808373C: .4byte gUnknown_03004B28 +_0808373C: .4byte gTasks + 0x8 _08083740: .4byte sub_8083C50 _08083744: cmp r2, 0x9 diff --git a/asm/pokedex.s b/asm/pokedex.s index 04ee23ec3..48a3944c4 100644 --- a/asm/pokedex.s +++ b/asm/pokedex.s @@ -7330,7 +7330,7 @@ _08091F50: lsls r0, r5, 2 adds r0, r5 lsls r1, r0, 3 - ldr r3, _08091FB4 @ =gUnknown_03004B28 + ldr r3, _08091FB4 @ =gTasks + 0x8 movs r2, 0 _08091F7C: lsls r0, r4, 1 @@ -7356,7 +7356,7 @@ _08091F7C: _08091FA8: .4byte gWindowConfig_81E7064 _08091FAC: .4byte gUnknown_083A05CC _08091FB0: .4byte gUnknown_083A05DC -_08091FB4: .4byte gUnknown_03004B28 +_08091FB4: .4byte gTasks + 0x8 _08091FB8: .4byte gMain _08091FBC: .4byte 0x0000043c _08091FC0: @@ -9137,7 +9137,7 @@ sub_8092E10: @ 8092E10 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _08092E50 @ =gUnknown_03004B28 + ldr r0, _08092E50 @ =gTasks + 0x8 adds r1, r0 ldr r2, _08092E54 @ =gUnknown_083B5A7C lsls r0, r3, 3 @@ -9161,7 +9161,7 @@ sub_8092E10: @ 8092E10 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08092E50: .4byte gUnknown_03004B28 +_08092E50: .4byte gTasks + 0x8 _08092E54: .4byte gUnknown_083B5A7C _08092E58: .4byte _08092E5C .align 2, 0 diff --git a/asm/rom4.s b/asm/rom4.s index 3fc50b3f6..7e2d4c20f 100644 --- a/asm/rom4.s +++ b/asm/rom4.s @@ -6828,7 +6828,7 @@ task50_overworld_door: @ 80584C8 lsls r2, r4, 2 adds r2, r4 lsls r2, 3 - ldr r0, _080584FC @ =gUnknown_03004B28 + ldr r0, _080584FC @ =gTasks + 0x8 adds r2, r0 ldrh r1, [r2] lsls r1, 16 @@ -6848,7 +6848,7 @@ _080584F6: pop {r0} bx r0 .align 2, 0 -_080584FC: .4byte gUnknown_03004B28 +_080584FC: .4byte gTasks + 0x8 thumb_func_end task50_overworld_door thumb_func_start door_frame_last @@ -6916,7 +6916,7 @@ task_overworld_door_add_if_inactive: @ 8058538 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r2, _08058588 @ =gUnknown_03004B28 + ldr r2, _08058588 @ =gTasks + 0x8 adds r1, r2 strh r7, [r1, 0xC] mov r2, r8 @@ -6932,7 +6932,7 @@ task_overworld_door_add_if_inactive: @ 8058538 b _08058590 .align 2, 0 _08058584: .4byte task50_overworld_door -_08058588: .4byte gUnknown_03004B28 +_08058588: .4byte gTasks + 0x8 _0805858C: movs r0, 0x1 negs r0, r0 diff --git a/asm/rom6.s b/asm/rom6.s index cc78aa7c3..d3702a5c4 100644 --- a/asm/rom6.s +++ b/asm/rom6.s @@ -21071,7 +21071,7 @@ sub_8115B58: @ 8115B58 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 - ldr r1, _08115D34 @ =gUnknown_03004B28 + ldr r1, _08115D34 @ =gTasks + 0x8 adds r0, r1 adds r0, 0x8 movs r1, 0 @@ -21090,7 +21090,7 @@ _08115B94: lsls r0, r7, 2 adds r0, r7 lsls r0, 3 - ldr r1, _08115D34 @ =gUnknown_03004B28 + ldr r1, _08115D34 @ =gTasks + 0x8 adds r0, r1 adds r0, 0x8 movs r1, 0x1 @@ -21109,7 +21109,7 @@ _08115BBA: lsls r0, r7, 2 adds r0, r7 lsls r0, 3 - ldr r1, _08115D34 @ =gUnknown_03004B28 + ldr r1, _08115D34 @ =gTasks + 0x8 adds r0, r1 adds r0, 0x8 movs r1, 0x2 @@ -21128,7 +21128,7 @@ _08115BE0: lsls r0, r7, 2 adds r0, r7 lsls r0, 3 - ldr r1, _08115D34 @ =gUnknown_03004B28 + ldr r1, _08115D34 @ =gTasks + 0x8 adds r0, r1 adds r0, 0x8 movs r1, 0x3 @@ -21286,7 +21286,7 @@ _08115D20: bx r0 .align 2, 0 _08115D30: .4byte gMain -_08115D34: .4byte gUnknown_03004B28 +_08115D34: .4byte gTasks + 0x8 _08115D38: .4byte gTasks _08115D3C: .4byte 0x020190b8 _08115D40: .4byte 0x0000ffff diff --git a/asm/rom_806936C.s b/asm/rom_806936C.s index 56104a779..b40e84987 100644 --- a/asm/rom_806936C.s +++ b/asm/rom_806936C.s @@ -232,7 +232,7 @@ sub_80694B8: @ 80694B8 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080694E8 @ =gUnknown_03004B28 + ldr r0, _080694E8 @ =gTasks + 0x8 adds r4, r1, r0 bl ScriptContext2_IsEnabled lsls r0, 24 @@ -248,7 +248,7 @@ _080694E0: pop {r0} bx r0 .align 2, 0 -_080694E8: .4byte gUnknown_03004B28 +_080694E8: .4byte gTasks + 0x8 thumb_func_end sub_80694B8 thumb_func_start overworld_ensure_per_step_coros_running @@ -317,7 +317,7 @@ activate_per_step_callback: @ 8069558 lsls r0, r1, 2 adds r0, r1 lsls r0, 3 - ldr r1, _08069594 @ =gUnknown_03004B28 + ldr r1, _08069594 @ =gTasks + 0x8 adds r1, r0, r1 movs r2, 0 adds r0, r1, 0 @@ -334,7 +334,7 @@ _0806957C: b _0806959A .align 2, 0 _08069590: .4byte task_per_step_callback_manager -_08069594: .4byte gUnknown_03004B28 +_08069594: .4byte gTasks + 0x8 _08069598: strh r4, [r1] _0806959A: @@ -359,7 +359,7 @@ wild_encounter_reset_coro_args: @ 80695A0 lsls r0, r1, 2 adds r0, r1 lsls r0, 3 - ldr r1, _080695D8 @ =gUnknown_03004B28 + ldr r1, _080695D8 @ =gTasks + 0x8 adds r0, r1 movs r1, 0 strh r1, [r0, 0x2] @@ -370,7 +370,7 @@ _080695CA: .align 2, 0 _080695D0: .4byte task_per_step_callback_manager _080695D4: .4byte sub_80694B8 -_080695D8: .4byte gUnknown_03004B28 +_080695D8: .4byte gTasks + 0x8 thumb_func_end wild_encounter_reset_coro_args thumb_func_start nullsub_51 @@ -730,7 +730,7 @@ sub_8069864: @ 8069864 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _08069898 @ =gUnknown_03004B28 + ldr r0, _08069898 @ =gTasks + 0x8 adds r4, r1, r0 mov r5, sp adds r5, 0x2 @@ -748,7 +748,7 @@ sub_8069864: @ 8069864 beq _080698A2 b _080699CE .align 2, 0 -_08069898: .4byte gUnknown_03004B28 +_08069898: .4byte gTasks + 0x8 _0806989C: cmp r0, 0x2 beq _0806998C @@ -1024,7 +1024,7 @@ sub_8069AA0: @ 8069AA0 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _08069ADC @ =gUnknown_03004B28 + ldr r0, _08069ADC @ =gTasks + 0x8 adds r6, r1, r0 mov r4, sp adds r4, 0x2 @@ -1042,7 +1042,7 @@ sub_8069AA0: @ 8069AA0 beq _08069AE8 b _08069CA6 .align 2, 0 -_08069ADC: .4byte gUnknown_03004B28 +_08069ADC: .4byte gTasks + 0x8 _08069AE0: cmp r5, 0x2 bne _08069AE6 @@ -1437,7 +1437,7 @@ sub_8069DD4: @ 8069DD4 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _08069DF8 @ =gUnknown_03004B28 + ldr r0, _08069DF8 @ =gTasks + 0x8 adds r5, r1, r0 movs r1, 0x2 ldrsh r0, [r5, r1] @@ -1449,7 +1449,7 @@ sub_8069DD4: @ 8069DD4 beq _08069E08 b _08069F56 .align 2, 0 -_08069DF8: .4byte gUnknown_03004B28 +_08069DF8: .4byte gTasks + 0x8 _08069DFC: cmp r0, 0x2 beq _08069EB6 @@ -1639,7 +1639,7 @@ sub_8069F64: @ 8069F64 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _08069FE8 @ =gUnknown_03004B28 + ldr r0, _08069FE8 @ =gTasks + 0x8 adds r5, r1, r0 mov r4, sp adds r4, 0x2 @@ -1695,7 +1695,7 @@ _08069F9E: bl ash b _0806A006 .align 2, 0 -_08069FE8: .4byte gUnknown_03004B28 +_08069FE8: .4byte gTasks + 0x8 _08069FEC: .4byte 0x0000020a _08069FF0: .4byte 0x00000212 _08069FF4: @@ -1774,7 +1774,7 @@ sub_806A07C: @ 806A07C lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0806A164 @ =gUnknown_03004B28 + ldr r0, _0806A164 @ =gTasks + 0x8 adds r5, r1, r0 mov r4, sp adds r4, 0x2 @@ -1879,7 +1879,7 @@ _0806A14A: strh r0, [r5, 0xC] b _0806A182 .align 2, 0 -_0806A164: .4byte gUnknown_03004B28 +_0806A164: .4byte gTasks + 0x8 _0806A168: .4byte 0x00004022 _0806A16C: movs r2, 0xE @@ -1961,7 +1961,7 @@ sub_806A1E8: @ 806A1E8 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0806A230 @ =gUnknown_03004B28 + ldr r0, _0806A230 @ =gTasks + 0x8 adds r4, r1, r0 mov r5, sp adds r5, 0x2 @@ -1987,7 +1987,7 @@ sub_806A1E8: @ 806A1E8 beq _0806A264 b _0806A2B8 .align 2, 0 -_0806A230: .4byte gUnknown_03004B28 +_0806A230: .4byte gTasks + 0x8 _0806A234: .4byte gSaveBlock1 _0806A238: strh r7, [r4] @@ -2927,7 +2927,7 @@ sub_806A958: @ 806A958 lsls r0, r6, 2 adds r0, r6 lsls r7, r0, 3 - ldr r0, _0806A99C @ =gUnknown_03004B28 + ldr r0, _0806A99C @ =gTasks + 0x8 mov r8, r0 adds r5, r7, r0 ldrb r4, [r5, 0x4] @@ -2953,7 +2953,7 @@ sub_806A958: @ 806A958 movs r0, 0x6 b _0806A9CC .align 2, 0 -_0806A99C: .4byte gUnknown_03004B28 +_0806A99C: .4byte gTasks + 0x8 _0806A9A0: .4byte gUnknown_08376414 _0806A9A4: .4byte gMain _0806A9A8: .4byte sub_806A92C @@ -3060,7 +3060,7 @@ sub_806AA64: @ 806AA64 lsls r6, r5, 2 adds r6, r5 lsls r6, 3 - ldr r0, _0806AACC @ =gUnknown_03004B28 + ldr r0, _0806AACC @ =gTasks + 0x8 mov r8, r0 adds r4, r6, r0 movs r0, 0 @@ -3102,7 +3102,7 @@ sub_806AA64: @ 806AA64 pop {r0} bx r0 .align 2, 0 -_0806AACC: .4byte gUnknown_03004B28 +_0806AACC: .4byte gTasks + 0x8 _0806AAD0: .4byte gLocalTime _0806AAD4: .4byte sub_806A958 thumb_func_end sub_806AA64 @@ -3244,7 +3244,7 @@ sub_806ABF4: @ 806ABF4 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0806AC14 @ =gUnknown_03004B28 + ldr r1, _0806AC14 @ =gTasks + 0x8 adds r4, r0, r1 movs r1, 0 ldrsh r0, [r4, r1] @@ -3254,7 +3254,7 @@ sub_806ABF4: @ 806ABF4 beq _0806AC80 b _0806ACC4 .align 2, 0 -_0806AC14: .4byte gUnknown_03004B28 +_0806AC14: .4byte gTasks + 0x8 _0806AC18: bl MenuZeroFillScreen movs r0, 0 @@ -3344,7 +3344,7 @@ sub_806ACCC: @ 806ACCC lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _0806ACF4 @ =gUnknown_03004B28 + ldr r1, _0806ACF4 @ =gTasks + 0x8 adds r5, r0, r1 movs r1, 0 ldrsh r0, [r5, r1] @@ -3358,7 +3358,7 @@ _0806ACE8: ldr r0, [r0] mov pc, r0 .align 2, 0 -_0806ACF4: .4byte gUnknown_03004B28 +_0806ACF4: .4byte gTasks + 0x8 _0806ACF8: .4byte _0806ACFC .align 2, 0 _0806ACFC: diff --git a/asm/rom_806D7F8.s b/asm/rom_806D7F8.s index be3c21821..eb0eead8b 100644 --- a/asm/rom_806D7F8.s +++ b/asm/rom_806D7F8.s @@ -4060,7 +4060,7 @@ sub_806F7E8: @ 806F7E8 lsls r3, r0, 2 adds r3, r0 lsls r3, 3 - ldr r0, _0806F898 @ =gUnknown_03004B28 + ldr r0, _0806F898 @ =gTasks + 0x8 adds r3, r0 movs r0, 0x14 ldrsh r1, [r3, r0] @@ -4142,7 +4142,7 @@ _0806F862: pop {r1} bx r1 .align 2, 0 -_0806F898: .4byte gUnknown_03004B28 +_0806F898: .4byte gTasks + 0x8 _0806F89C: .4byte 0x0201b000 _0806F8A0: .4byte 0x00000282 _0806F8A4: .4byte gUnknown_08376858 diff --git a/asm/rom_8080874.s b/asm/rom_8080874.s index 46da147df..309bd3ba9 100644 --- a/asm/rom_8080874.s +++ b/asm/rom_8080874.s @@ -1019,7 +1019,7 @@ sub_8081050: @ 8081050 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _08081074 @ =gUnknown_03004B28 + ldr r1, _08081074 @ =gTasks + 0x8 adds r4, r0, r1 movs r1, 0 ldrsh r0, [r4, r1] @@ -1031,7 +1031,7 @@ sub_8081050: @ 8081050 beq _0808107E b _080810CC .align 2, 0 -_08081074: .4byte gUnknown_03004B28 +_08081074: .4byte gTasks + 0x8 _08081078: cmp r0, 0x2 beq _080810B4 @@ -1509,7 +1509,7 @@ sub_8081424: @ 8081424 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _08081448 @ =gUnknown_03004B28 + ldr r1, _08081448 @ =gTasks + 0x8 adds r4, r0, r1 movs r1, 0 ldrsh r0, [r4, r1] @@ -1521,7 +1521,7 @@ sub_8081424: @ 8081424 beq _08081452 b _080814E2 .align 2, 0 -_08081448: .4byte gUnknown_03004B28 +_08081448: .4byte gTasks + 0x8 _0808144C: cmp r0, 0x2 beq _080814D8 @@ -1662,7 +1662,7 @@ sub_8081534: @ 8081534 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _0808157C @ =gUnknown_03004B28 + ldr r1, _0808157C @ =gTasks + 0x8 adds r1, r0, r1 strh r5, [r1, 0x6] strh r4, [r1, 0x8] @@ -1677,7 +1677,7 @@ sub_8081534: @ 8081534 b _08081584 .align 2, 0 _08081578: .4byte sub_8081424 -_0808157C: .4byte gUnknown_03004B28 +_0808157C: .4byte gTasks + 0x8 _08081580: negs r0, r7 strh r0, [r1, 0xA] @@ -1852,7 +1852,7 @@ sub_80816A8: @ 80816A8 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _080816D0 @ =gUnknown_03004B28 + ldr r1, _080816D0 @ =gTasks + 0x8 adds r7, r0, r1 movs r1, 0 ldrsh r0, [r7, r1] @@ -1866,7 +1866,7 @@ _080816C4: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080816D0: .4byte gUnknown_03004B28 +_080816D0: .4byte gTasks + 0x8 _080816D4: .4byte _080816D8 .align 2, 0 _080816D8: @@ -2087,7 +2087,7 @@ sub_80818A4: @ 80818A4 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080818D0 @ =gUnknown_03004B28 + ldr r0, _080818D0 @ =gTasks + 0x8 adds r1, r0 ldr r0, _080818D4 @ =gScriptResult ldrh r0, [r0] @@ -2098,7 +2098,7 @@ sub_80818A4: @ 80818A4 b _080818F0 .align 2, 0 _080818CC: .4byte sub_80816A8 -_080818D0: .4byte gUnknown_03004B28 +_080818D0: .4byte gTasks + 0x8 _080818D4: .4byte gScriptResult _080818D8: cmp r0, 0x1 diff --git a/asm/rom_80859BC.s b/asm/rom_80859BC.s index 7ad4216a4..a24402dc6 100644 --- a/asm/rom_80859BC.s +++ b/asm/rom_80859BC.s @@ -10230,7 +10230,7 @@ PokemonMenu_FieldMove: @ 808A984 lsls r0, r5, 2 adds r0, r5 lsls r6, r0, 3 - ldr r7, _0808A9D0 @ =gUnknown_03004B28 + ldr r7, _0808A9D0 @ =gTasks + 0x8 adds r4, r6, r7 bl sub_8072DEC ldr r1, _0808A9D4 @ =gUnknown_0202FFAA @@ -10259,7 +10259,7 @@ PokemonMenu_FieldMove: @ 808A984 movs r0, 0x9 b _0808AAB2 .align 2, 0 -_0808A9D0: .4byte gUnknown_03004B28 +_0808A9D0: .4byte gTasks + 0x8 _0808A9D4: .4byte gUnknown_0202FFAA _0808A9D8: .4byte gUnknown_0202FFA8 _0808A9DC: diff --git a/asm/rom_8094928.s b/asm/rom_8094928.s index cfed86787..3ad9480b0 100644 --- a/asm/rom_8094928.s +++ b/asm/rom_8094928.s @@ -20601,7 +20601,7 @@ sub_809EC38: @ 809EC38 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _0809EC5C @ =gUnknown_03004B28 + ldr r1, _0809EC5C @ =gTasks + 0x8 adds r6, r0, r1 movs r1, 0 ldrsh r0, [r6, r1] @@ -20615,7 +20615,7 @@ _0809EC52: ldr r0, [r0] mov pc, r0 .align 2, 0 -_0809EC5C: .4byte gUnknown_03004B28 +_0809EC5C: .4byte gTasks + 0x8 _0809EC60: .4byte _0809EC64 .align 2, 0 _0809EC64: @@ -20887,7 +20887,7 @@ sub_809EE74: @ 809EE74 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _0809EE98 @ =gUnknown_03004B28 + ldr r1, _0809EE98 @ =gTasks + 0x8 adds r6, r0, r1 movs r1, 0 ldrsh r0, [r6, r1] @@ -20901,7 +20901,7 @@ _0809EE8E: ldr r0, [r0] mov pc, r0 .align 2, 0 -_0809EE98: .4byte gUnknown_03004B28 +_0809EE98: .4byte gTasks + 0x8 _0809EE9C: .4byte _0809EEA0 .align 2, 0 _0809EEA0: @@ -22151,7 +22151,7 @@ sub_809F814: @ 809F814 lsls r0, r5, 2 adds r0, r5 lsls r6, r0, 3 - ldr r0, _0809F83C @ =gUnknown_03004B28 + ldr r0, _0809F83C @ =gTasks + 0x8 mov r8, r0 adds r4, r6, r0 ldrh r1, [r4, 0x1C] @@ -22163,7 +22163,7 @@ sub_809F814: @ 809F814 strh r0, [r4, 0x1C] b _0809F9C0 .align 2, 0 -_0809F83C: .4byte gUnknown_03004B28 +_0809F83C: .4byte gTasks + 0x8 _0809F840: ldr r7, _0809F874 @ =gMain ldrh r1, [r7, 0x2E] @@ -22369,7 +22369,7 @@ sub_809F9D0: @ 809F9D0 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r6, _0809FA24 @ =gUnknown_03004B28 + ldr r6, _0809FA24 @ =gTasks + 0x8 adds r2, r4, r6 movs r0, 0 strh r0, [r2, 0x1C] @@ -22399,7 +22399,7 @@ sub_809F9D0: @ 809F9D0 pop {r0} bx r0 .align 2, 0 -_0809FA24: .4byte gUnknown_03004B28 +_0809FA24: .4byte gTasks + 0x8 _0809FA28: .4byte gOtherText_CantForgetHMs _0809FA2C: .4byte sub_809F814 thumb_func_end sub_809F9D0 @@ -25113,7 +25113,7 @@ sub_80A1048: @ 80A1048 lsls r0, 2 add r0, r8 lsls r0, 3 - ldr r1, _080A10A0 @ =gUnknown_03004B28 + ldr r1, _080A10A0 @ =gTasks + 0x8 adds r6, r0, r1 ldrh r0, [r6] ldrh r1, [r6, 0x2] @@ -25149,7 +25149,7 @@ _080A106E: ldr r0, [r0, 0x8] b _080A10E0 .align 2, 0 -_080A10A0: .4byte gUnknown_03004B28 +_080A10A0: .4byte gTasks + 0x8 _080A10A4: .4byte 0x0000024a _080A10A8: .4byte gUnknown_08E73508 _080A10AC: .4byte 0x0600e480 @@ -25481,7 +25481,7 @@ sub_80A1334: @ 80A1334 lsls r0, 2 add r0, r10 lsls r0, 3 - ldr r1, _080A13E4 @ =gUnknown_03004B28 + ldr r1, _080A13E4 @ =gTasks + 0x8 adds r7, r0, r1 ldrh r0, [r7] ldrh r1, [r7, 0x2] @@ -25559,7 +25559,7 @@ _080A13C2: bls _080A13C2 b _080A1400 .align 2, 0 -_080A13E4: .4byte gUnknown_03004B28 +_080A13E4: .4byte gTasks + 0x8 _080A13E8: .4byte 0x06005b40 _080A13EC: .4byte 0x001fffff _080A13F0: .4byte gUnknown_08E73E88 @@ -25711,7 +25711,7 @@ sub_80A1500: @ 80A1500 lsls r0, 2 add r0, r10 lsls r0, 3 - ldr r1, _080A15B0 @ =gUnknown_03004B28 + ldr r1, _080A15B0 @ =gTasks + 0x8 adds r7, r0, r1 ldrh r0, [r7] ldrh r1, [r7, 0x2] @@ -25789,7 +25789,7 @@ _080A158E: bls _080A158E b _080A15CC .align 2, 0 -_080A15B0: .4byte gUnknown_03004B28 +_080A15B0: .4byte gTasks + 0x8 _080A15B4: .4byte 0x06006b40 _080A15B8: .4byte 0x001fffff _080A15BC: .4byte gUnknown_08E74688 @@ -27394,7 +27394,7 @@ sub_80A2198: @ 80A2198 lsls r1, r0, 2 adds r1, r0 lsls r3, r1, 3 - ldr r5, _080A21D8 @ =gUnknown_03004B28 + ldr r5, _080A21D8 @ =gTasks + 0x8 ldr r0, _080A21DC @ =0x0000ffff adds r4, r0, 0 _080A21B8: @@ -27414,7 +27414,7 @@ _080A21B8: bx r0 .align 2, 0 _080A21D4: .4byte sub_80A244C -_080A21D8: .4byte gUnknown_03004B28 +_080A21D8: .4byte gTasks + 0x8 _080A21DC: .4byte 0x0000ffff thumb_func_end sub_80A2198 @@ -27498,7 +27498,7 @@ sub_80A2260: @ 80A2260 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080A2284 @ =gUnknown_03004B28 + ldr r0, _080A2284 @ =gTasks + 0x8 adds r1, r0 adds r1, 0x2 movs r2, 0 @@ -27509,7 +27509,7 @@ _080A2278: adds r0, r2, 0 b _080A2296 .align 2, 0 -_080A2284: .4byte gUnknown_03004B28 +_080A2284: .4byte gTasks + 0x8 _080A2288: adds r0, r2, 0x1 lsls r0, 24 @@ -27533,7 +27533,7 @@ sub_80A229C: @ 80A229C lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080A22CC @ =gUnknown_03004B28 + ldr r0, _080A22CC @ =gTasks + 0x8 adds r1, r0 adds r1, 0x2 str r1, [r2] @@ -27552,7 +27552,7 @@ _080A22C8: pop {r0} bx r0 .align 2, 0 -_080A22CC: .4byte gUnknown_03004B28 +_080A22CC: .4byte gTasks + 0x8 thumb_func_end sub_80A229C thumb_func_start sub_80A22D0 @@ -27740,7 +27740,7 @@ sub_80A2408: @ 80A2408 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080A2444 @ =gUnknown_03004B28 + ldr r0, _080A2444 @ =gTasks + 0x8 adds r1, r0 adds r4, r1, 0x2 movs r5, 0 @@ -27766,7 +27766,7 @@ _080A2432: pop {r0} bx r0 .align 2, 0 -_080A2444: .4byte gUnknown_03004B28 +_080A2444: .4byte gTasks + 0x8 _080A2448: .4byte gMapObjects thumb_func_end sub_80A2408 @@ -33496,7 +33496,7 @@ sub_80A50C8: @ 80A50C8 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _080A5148 @ =gUnknown_03004B28 + ldr r1, _080A5148 @ =gTasks + 0x8 adds r5, r0, r1 ldr r0, _080A514C @ =gPaletteFade ldrb r1, [r0, 0x7] @@ -33554,7 +33554,7 @@ _080A5138: bl sub_80A3F50 b _080A526A .align 2, 0 -_080A5148: .4byte gUnknown_03004B28 +_080A5148: .4byte gTasks + 0x8 _080A514C: .4byte gPaletteFade _080A5150: .4byte gMain _080A5154: .4byte gUnknown_02038559 @@ -33733,7 +33733,7 @@ sub_80A52C4: @ 80A52C4 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080A52F4 @ =gUnknown_03004B28 + ldr r0, _080A52F4 @ =gTasks + 0x8 adds r1, r0 ldr r0, _080A52F8 @ =gMain ldrh r0, [r0, 0x30] @@ -33749,7 +33749,7 @@ sub_80A52C4: @ 80A52C4 adds r0, 0x1 b _080A5340 .align 2, 0 -_080A52F4: .4byte gUnknown_03004B28 +_080A52F4: .4byte gTasks + 0x8 _080A52F8: .4byte gMain _080A52FC: cmp r2, 0x80 @@ -33813,7 +33813,7 @@ sub_80A5350: @ 80A5350 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r2, _080A539C @ =gUnknown_03004B28 + ldr r2, _080A539C @ =gTasks + 0x8 adds r4, r1, r2 ldr r1, _080A53A0 @ =gUnknown_02038560 ldrb r1, [r1] @@ -33842,7 +33842,7 @@ sub_80A5350: @ 80A5350 bl sub_80A418C b _080A53BC .align 2, 0 -_080A539C: .4byte gUnknown_03004B28 +_080A539C: .4byte gTasks + 0x8 _080A53A0: .4byte gUnknown_02038560 _080A53A4: .4byte gUnknown_03005D24 _080A53A8: .4byte gUnknown_02038559 @@ -34745,7 +34745,7 @@ sub_80A5B00: @ 80A5B00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _080A5B38 @ =gUnknown_03004B28 + ldr r1, _080A5B38 @ =gTasks + 0x8 adds r2, r0, r1 ldr r0, _080A5B3C @ =gPaletteFade ldrb r1, [r0, 0x7] @@ -34766,7 +34766,7 @@ _080A5B32: pop {r0} bx r0 .align 2, 0 -_080A5B38: .4byte gUnknown_03004B28 +_080A5B38: .4byte gTasks + 0x8 _080A5B3C: .4byte gPaletteFade thumb_func_end sub_80A5B00 @@ -36685,7 +36685,7 @@ sub_80A6A84: @ 80A6A84 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 - ldr r6, _080A6AE8 @ =gUnknown_03004B28 + ldr r6, _080A6AE8 @ =gTasks + 0x8 adds r0, r4, r6 mov r8, r0 ldr r0, _080A6AEC @ =gBG1TilemapBuffer @@ -36720,7 +36720,7 @@ sub_80A6A84: @ 80A6A84 pop {r0} bx r0 .align 2, 0 -_080A6AE8: .4byte gUnknown_03004B28 +_080A6AE8: .4byte gTasks + 0x8 _080A6AEC: .4byte gBG1TilemapBuffer _080A6AF0: .4byte word_203855E _080A6AF4: .4byte gStringVar1 @@ -36787,7 +36787,7 @@ sub_80A6B64: @ 80A6B64 lsls r0, r4, 2 adds r0, r4 lsls r5, r0, 3 - ldr r6, _080A6B9C @ =gUnknown_03004B28 + ldr r6, _080A6B9C @ =gTasks + 0x8 adds r7, r5, r6 ldr r0, _080A6BA0 @ =word_203855E mov r8, r0 @@ -36806,7 +36806,7 @@ sub_80A6B64: @ 80A6B64 bl sub_80A7528 b _080A6BD2 .align 2, 0 -_080A6B9C: .4byte gUnknown_03004B28 +_080A6B9C: .4byte gTasks + 0x8 _080A6BA0: .4byte word_203855E _080A6BA4: .4byte sub_80A6B00 _080A6BA8: @@ -37612,7 +37612,7 @@ sub_80A7230: @ 80A7230 lsls r0, r5, 2 adds r0, r5 lsls r6, r0, 3 - ldr r0, _080A725C @ =gUnknown_03004B28 + ldr r0, _080A725C @ =gTasks + 0x8 mov r8, r0 adds r7, r6, r0 movs r0, 0x1E @@ -37625,7 +37625,7 @@ sub_80A7230: @ 80A7230 beq _080A726A b _080A7358 .align 2, 0 -_080A725C: .4byte gUnknown_03004B28 +_080A725C: .4byte gTasks + 0x8 _080A7260: movs r0, 0x99 lsls r0, 1 @@ -56306,7 +56306,7 @@ sub_80B0324: @ 80B0324 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r4, _080B0364 @ =gUnknown_03004B28 + ldr r4, _080B0364 @ =gTasks + 0x8 movs r3, 0xFF _080B0342: lsls r0, r2, 3 @@ -56324,7 +56324,7 @@ _080B0342: .align 2, 0 _080B035C: .4byte sub_80B0458 _080B0360: .4byte 0x02019204 -_080B0364: .4byte gUnknown_03004B28 +_080B0364: .4byte gTasks + 0x8 thumb_func_end sub_80B0324 thumb_func_start sub_80B0368 @@ -56465,7 +56465,7 @@ sub_80B0458: @ 80B0458 adds r1, r0 mov r9, r1 lsls r7, r1, 3 - ldr r0, _080B04A8 @ =gUnknown_03004B28 + ldr r0, _080B04A8 @ =gTasks + 0x8 mov r8, r0 movs r1, 0x8 negs r1, r1 @@ -56495,7 +56495,7 @@ _080B047C: adds r0, r4, 0x1 b _080B04AE .align 2, 0 -_080B04A8: .4byte gUnknown_03004B28 +_080B04A8: .4byte gTasks + 0x8 _080B04AC: subs r0, r4, 0x1 _080B04AE: @@ -56692,7 +56692,7 @@ sub_80B05FC: @ 80B05FC adds r1, r0 mov r9, r1 lsls r6, r1, 3 - ldr r0, _080B0664 @ =gUnknown_03004B28 + ldr r0, _080B0664 @ =gTasks + 0x8 mov r8, r0 ldr r1, _080B0668 @ =0x00004bff mov r10, r1 @@ -56733,7 +56733,7 @@ _080B061C: adds r0, 0x1 b _080B0670 .align 2, 0 -_080B0664: .4byte gUnknown_03004B28 +_080B0664: .4byte gTasks + 0x8 _080B0668: .4byte 0x00004bff _080B066C: ldrh r0, [r2] @@ -56812,7 +56812,7 @@ unref_sub_80B06E0: @ 80B06E0 lsls r0, r5, 2 adds r0, r5 lsls r6, r0, 3 - ldr r0, _080B0740 @ =gUnknown_03004B28 + ldr r0, _080B0740 @ =gTasks + 0x8 mov r8, r0 ldr r1, _080B0744 @ =0x02019338 mov r12, r1 @@ -56848,7 +56848,7 @@ _080B0726: bx r1 .align 2, 0 _080B073C: .4byte sub_80B0748 -_080B0740: .4byte gUnknown_03004B28 +_080B0740: .4byte gTasks + 0x8 _080B0744: .4byte 0x02019338 thumb_func_end unref_sub_80B06E0 @@ -65014,7 +65014,7 @@ sub_80B4710: @ 80B4710 lsls r0, r3, 2 adds r0, r3 lsls r0, 3 - ldr r1, _080B4738 @ =gUnknown_03004B28 + ldr r1, _080B4738 @ =gTasks + 0x8 adds r4, r0, r1 movs r0, 0x1 strh r0, [r4, 0x6] @@ -65028,7 +65028,7 @@ sub_80B4710: @ 80B4710 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080B4738: .4byte gUnknown_03004B28 +_080B4738: .4byte gTasks + 0x8 _080B473C: .4byte _080B4740 .align 2, 0 _080B4740: @@ -65124,7 +65124,7 @@ sub_80B47D8: @ 80B47D8 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _080B4820 @ =gUnknown_03004B28 + ldr r1, _080B4820 @ =gTasks + 0x8 adds r7, r0, r1 adds r0, r7, 0 adds r0, 0x8 @@ -65143,7 +65143,7 @@ sub_80B47D8: @ 80B47D8 bx r1 .align 2, 0 _080B481C: .4byte sub_80B4710 -_080B4820: .4byte gUnknown_03004B28 +_080B4820: .4byte gTasks + 0x8 thumb_func_end sub_80B47D8 thumb_func_start sub_80B4824 diff --git a/asm/rom_80B5054.s b/asm/rom_80B5054.s index 86f136b08..a973e7899 100644 --- a/asm/rom_80B5054.s +++ b/asm/rom_80B5054.s @@ -9178,7 +9178,7 @@ sub_80B9484: @ 80B9484 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080B94A8 @ =gUnknown_03004B28 + ldr r1, _080B94A8 @ =gTasks + 0x8 adds r4, r0, r1 movs r1, 0 ldrsh r0, [r4, r1] @@ -9192,7 +9192,7 @@ _080B949E: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080B94A8: .4byte gUnknown_03004B28 +_080B94A8: .4byte gTasks + 0x8 _080B94AC: .4byte _080B94B0 .align 2, 0 _080B94B0: @@ -15468,7 +15468,7 @@ sub_80BC62C: @ 80BC62C lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080BC688 @ =gUnknown_03004B28 + ldr r1, _080BC688 @ =gTasks + 0x8 adds r4, r0, r1 bl sub_80BC538 lsls r0, 24 @@ -15501,7 +15501,7 @@ _080BC65E: str r1, [r0] b _080BC6A0 .align 2, 0 -_080BC688: .4byte gUnknown_03004B28 +_080BC688: .4byte gTasks + 0x8 _080BC68C: .4byte gTasks _080BC690: .4byte sub_80BC824 _080BC694: @@ -15529,7 +15529,7 @@ sub_80BC6B0: @ 80BC6B0 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080BC6D8 @ =gUnknown_03004B28 + ldr r0, _080BC6D8 @ =gTasks + 0x8 adds r1, r0 mov r8, r1 movs r4, 0 @@ -15542,7 +15542,7 @@ sub_80BC6B0: @ 80BC6B0 movs r4, 0x1 b _080BC706 .align 2, 0 -_080BC6D8: .4byte gUnknown_03004B28 +_080BC6D8: .4byte gTasks + 0x8 _080BC6DC: adds r0, r5, 0 bl sub_80BC268 @@ -15678,7 +15678,7 @@ sub_80BC7D8: @ 80BC7D8 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 - ldr r0, _080BC820 @ =gUnknown_03004B28 + ldr r0, _080BC820 @ =gTasks + 0x8 adds r4, r0 movs r0, 0x11 movs r1, 0 @@ -15704,7 +15704,7 @@ sub_80BC7D8: @ 80BC7D8 pop {r0} bx r0 .align 2, 0 -_080BC820: .4byte gUnknown_03004B28 +_080BC820: .4byte gTasks + 0x8 thumb_func_end sub_80BC7D8 thumb_func_start sub_80BC824 @@ -15716,7 +15716,7 @@ sub_80BC824: @ 80BC824 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080BC858 @ =gUnknown_03004B28 + ldr r1, _080BC858 @ =gTasks + 0x8 adds r4, r0, r1 ldr r2, _080BC85C @ =gMain ldrh r1, [r2, 0x30] @@ -15734,7 +15734,7 @@ sub_80BC824: @ 80BC824 negs r0, r0 b _080BC8B6 .align 2, 0 -_080BC858: .4byte gUnknown_03004B28 +_080BC858: .4byte gTasks + 0x8 _080BC85C: .4byte gMain _080BC860: movs r2, 0x4 @@ -16011,7 +16011,7 @@ sub_80BCA84: @ 80BCA84 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 - ldr r0, _080BCAD8 @ =gUnknown_03004B28 + ldr r0, _080BCAD8 @ =gTasks + 0x8 adds r4, r0 movs r0, 0 bl SetBgTilemapBuffer @@ -16039,7 +16039,7 @@ sub_80BCA84: @ 80BCA84 pop {r0} bx r0 .align 2, 0 -_080BCAD8: .4byte gUnknown_03004B28 +_080BCAD8: .4byte gTasks + 0x8 _080BCADC: .4byte gStringVar1 _080BCAE0: .4byte gStringVar4 _080BCAE4: .4byte gOtherText_OkayToDeleteFromRegistry @@ -16075,7 +16075,7 @@ sub_80BCB10: @ 80BCB10 lsls r0, r5, 2 adds r0, r5 lsls r6, r0, 3 - ldr r7, _080BCB80 @ =gUnknown_03004B28 + ldr r7, _080BCB80 @ =gTasks + 0x8 adds r4, r6, r7 movs r0, 0 movs r1, 0 @@ -16125,7 +16125,7 @@ _080BCB6A: pop {r0} bx r0 .align 2, 0 -_080BCB80: .4byte gUnknown_03004B28 +_080BCB80: .4byte gTasks + 0x8 _080BCB84: .4byte gSaveBlock1 _080BCB88: .4byte 0x00001a09 _080BCB8C: .4byte sub_80BC824 @@ -16192,7 +16192,7 @@ sub_80BCBF8: @ 80BCBF8 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r5, _080BCC4C @ =gUnknown_03004B28 + ldr r5, _080BCC4C @ =gTasks + 0x8 adds r0, r4, r5 ldrb r3, [r0, 0x6] adds r3, 0x1 @@ -16224,7 +16224,7 @@ sub_80BCBF8: @ 80BCBF8 pop {r0} bx r0 .align 2, 0 -_080BCC4C: .4byte gUnknown_03004B28 +_080BCC4C: .4byte gTasks + 0x8 _080BCC50: .4byte sub_80BC824 thumb_func_end sub_80BCBF8 @@ -16592,7 +16592,7 @@ sub_80BCF1C: @ 80BCF1C lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080BCF40 @ =gUnknown_03004B28 + ldr r0, _080BCF40 @ =gTasks + 0x8 adds r4, r1, r0 movs r1, 0x2 ldrsh r0, [r4, r1] @@ -16604,7 +16604,7 @@ sub_80BCF1C: @ 80BCF1C beq _080BCF4A b _080BD02C .align 2, 0 -_080BCF40: .4byte gUnknown_03004B28 +_080BCF40: .4byte gTasks + 0x8 _080BCF44: cmp r0, 0x2 beq _080BD01C @@ -32074,7 +32074,7 @@ sub_80C4A44: @ 80C4A44 lsls r1, r5, 2 adds r0, r1, r5 lsls r4, r0, 3 - ldr r6, _080C4AA4 @ =gUnknown_03004B28 + ldr r6, _080C4AA4 @ =gTasks + 0x8 adds r7, r1, 0 _080C4A64: mov r0, sp @@ -32110,7 +32110,7 @@ _080C4A96: b _080C4AAA .align 2, 0 _080C4AA0: .4byte gUnknown_0202E8CC -_080C4AA4: .4byte gUnknown_03004B28 +_080C4AA4: .4byte gTasks + 0x8 _080C4AA8: movs r0, 0x1 _080C4AAA: @@ -32120,7 +32120,7 @@ _080C4AAA: mov r4, r12 adds r0, r7, r5 lsls r2, r0, 3 - ldr r6, _080C4AF8 @ =gUnknown_03004B28 + ldr r6, _080C4AF8 @ =gTasks + 0x8 _080C4AB8: adds r1, r4, r3 adds r0, r3, 0x5 @@ -32152,7 +32152,7 @@ _080C4AB8: pop {r0} bx r0 .align 2, 0 -_080C4AF8: .4byte gUnknown_03004B28 +_080C4AF8: .4byte gTasks + 0x8 _080C4AFC: .4byte gUnknown_0203869B _080C4B00: .4byte gUnknown_0203869C _080C4B04: .4byte sub_80C8EBC @@ -33808,7 +33808,7 @@ sub_80C5770: @ 80C5770 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080C5794 @ =gUnknown_03004B28 + ldr r1, _080C5794 @ =gTasks + 0x8 adds r4, r0, r1 movs r1, 0 ldrsh r0, [r4, r1] @@ -33820,7 +33820,7 @@ sub_80C5770: @ 80C5770 beq _080C579E b _080C581A .align 2, 0 -_080C5794: .4byte gUnknown_03004B28 +_080C5794: .4byte gTasks + 0x8 _080C5798: cmp r0, 0x2 beq _080C57DC @@ -35885,7 +35885,7 @@ sub_80C6760: @ 80C6760 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080C6788 @ =gUnknown_03004B28 + ldr r1, _080C6788 @ =gTasks + 0x8 adds r4, r0, r1 ldrh r0, [r4, 0x4] subs r0, 0x4 @@ -35899,7 +35899,7 @@ sub_80C6760: @ 80C6760 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080C6788: .4byte gUnknown_03004B28 +_080C6788: .4byte gTasks + 0x8 _080C678C: .4byte _080C6790 .align 2, 0 _080C6790: @@ -36067,7 +36067,7 @@ sub_80C68EC: @ 80C68EC lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080C690C @ =gUnknown_03004B28 + ldr r1, _080C690C @ =gTasks + 0x8 adds r4, r0, r1 ldrh r1, [r4, 0x6] movs r2, 0x6 @@ -36077,7 +36077,7 @@ sub_80C68EC: @ 80C68EC movs r0, 0 b _080C6912 .align 2, 0 -_080C690C: .4byte gUnknown_03004B28 +_080C690C: .4byte gTasks + 0x8 _080C6910: adds r0, r1, 0x1 _080C6912: @@ -36928,7 +36928,7 @@ task50_overworld_posion_effect: @ 80C7008 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _080C702C @ =gUnknown_03004B28 + ldr r1, _080C702C @ =gTasks + 0x8 adds r1, r0, r1 movs r3, 0 ldrsh r0, [r1, r3] @@ -36940,7 +36940,7 @@ task50_overworld_posion_effect: @ 80C7008 beq _080C7036 b _080C7062 .align 2, 0 -_080C702C: .4byte gUnknown_03004B28 +_080C702C: .4byte gTasks + 0x8 _080C7030: cmp r0, 0x2 beq _080C705A @@ -37304,7 +37304,7 @@ sub_80C72C4: @ 80C72C4 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080C7364 @ =gUnknown_03004B28 + ldr r0, _080C7364 @ =gTasks + 0x8 adds r5, r1, r0 movs r1, 0 ldrsh r0, [r5, r1] @@ -37370,7 +37370,7 @@ _080C7346: pop {r0} bx r0 .align 2, 0 -_080C7364: .4byte gUnknown_03004B28 +_080C7364: .4byte gTasks + 0x8 _080C7368: .4byte gSaveBlock1 _080C736C: .4byte 0xfffd0000 _080C7370: .4byte 0x75300000 @@ -37385,7 +37385,7 @@ sub_80C7374: @ 80C7374 lsls r0, r2, 2 adds r0, r2 lsls r3, r0, 3 - ldr r4, _080C73B4 @ =gUnknown_03004B28 + ldr r4, _080C73B4 @ =gTasks + 0x8 adds r7, r3, r4 ldrh r1, [r7] adds r1, 0x1 @@ -37410,7 +37410,7 @@ _080C73A4: bl DestroyTask b _080C746A .align 2, 0 -_080C73B4: .4byte gUnknown_03004B28 +_080C73B4: .4byte gTasks + 0x8 _080C73B8: ldr r2, _080C7474 @ =gUnknown_083D294C movs r1, 0x2 @@ -37518,7 +37518,7 @@ sub_80C7484: @ 80C7484 lsls r0, r3, 2 adds r0, r3 lsls r0, 3 - ldr r1, _080C74C4 @ =gUnknown_03004B28 + ldr r1, _080C74C4 @ =gTasks + 0x8 adds r2, r0, r1 ldrh r0, [r2] adds r0, 0x1 @@ -37540,7 +37540,7 @@ _080C74B4: bl DestroyTask b _080C7516 .align 2, 0 -_080C74C4: .4byte gUnknown_03004B28 +_080C74C4: .4byte gTasks + 0x8 _080C74C8: ldr r1, _080C7524 @ =gUnknown_083D294C movs r3, 0x2 @@ -37597,7 +37597,7 @@ sub_80C752C: @ 80C752C lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080C7550 @ =gUnknown_03004B28 + ldr r1, _080C7550 @ =gTasks + 0x8 adds r4, r0, r1 movs r1, 0 ldrsh r0, [r4, r1] @@ -37611,7 +37611,7 @@ _080C7546: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080C7550: .4byte gUnknown_03004B28 +_080C7550: .4byte gTasks + 0x8 _080C7554: .4byte _080C7558 .align 2, 0 _080C7558: @@ -37895,7 +37895,7 @@ sub_80C77A0: @ 80C77A0 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080C77CC @ =gUnknown_03004B28 + ldr r1, _080C77CC @ =gTasks + 0x8 adds r4, r0, r1 ldr r0, _080C77D0 @ =0x000040b4 bl GetVarPointer @@ -37911,7 +37911,7 @@ sub_80C77A0: @ 80C77A0 beq _080C77E2 b _080C7896 .align 2, 0 -_080C77CC: .4byte gUnknown_03004B28 +_080C77CC: .4byte gTasks + 0x8 _080C77D0: .4byte 0x000040b4 _080C77D4: .4byte gSaveBlock1 + 0x4 _080C77D8: @@ -41658,7 +41658,7 @@ sub_80C9458: @ 80C9458 lsls r6, r5, 2 adds r0, r6, r5 lsls r7, r0, 3 - ldr r0, _080C94AC @ =gUnknown_03004B28 + ldr r0, _080C94AC @ =gTasks + 0x8 mov r8, r0 adds r4, r7, r0 movs r1, 0x6 @@ -41690,7 +41690,7 @@ sub_80C9458: @ 80C9458 str r1, [r0] b _080C9516 .align 2, 0 -_080C94AC: .4byte gUnknown_03004B28 +_080C94AC: .4byte gTasks + 0x8 _080C94B0: .4byte gUnknown_083D61F0 _080C94B4: .4byte sub_80C99EC _080C94B8: @@ -42191,7 +42191,7 @@ sub_80C9838: @ 80C9838 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080C986C @ =gUnknown_03004B28 + ldr r0, _080C986C @ =gTasks + 0x8 adds r3, r1, r0 movs r1, 0x4 ldrsh r0, [r3, r1] @@ -42204,7 +42204,7 @@ sub_80C9838: @ 80C9838 strh r0, [r3, 0x4] b _080C98FA .align 2, 0 -_080C986C: .4byte gUnknown_03004B28 +_080C986C: .4byte gTasks + 0x8 _080C9870: movs r1, 0 ldrsh r0, [r3, r1] @@ -42466,7 +42466,7 @@ sub_80C9A38: @ 80C9A38 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080C9AB4 @ =gUnknown_03004B28 + ldr r1, _080C9AB4 @ =gTasks + 0x8 adds r4, r0, r1 movs r0, 0xFF movs r1, 0 @@ -42520,7 +42520,7 @@ _080C9AAE: pop {r0} bx r0 .align 2, 0 -_080C9AB4: .4byte gUnknown_03004B28 +_080C9AB4: .4byte gTasks + 0x8 _080C9AB8: .4byte gMapObjects _080C9ABC: .4byte gUnknown_083D61F0 _080C9AC0: .4byte gOtherText_ItemfinderFoundItem @@ -67161,7 +67161,7 @@ _080D588E: adds r0, r7 lsls r0, 3 add r0, r10 - ldr r1, _080D58F8 @ =gUnknown_03004B28 + ldr r1, _080D58F8 @ =gTasks + 0x8 adds r0, r1 ldrh r1, [r0] adds r1, 0x1 @@ -67187,7 +67187,7 @@ _080D58E8: .4byte gSprites _080D58EC: .4byte 0x000003ff _080D58F0: .4byte 0xfffffc00 _080D58F4: .4byte gUnknown_083D96DC + 0x2 -_080D58F8: .4byte gUnknown_03004B28 +_080D58F8: .4byte gTasks + 0x8 thumb_func_end sub_80D57C4 thumb_func_start sub_80D58FC @@ -155020,7 +155020,7 @@ sub_810038C: @ 810038C lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _081003BC @ =gUnknown_03004B28 + ldr r0, _081003BC @ =gTasks + 0x8 adds r2, r1, r0 ldr r0, _081003C0 @ =gUnknown_020391AA ldrb r1, [r0] @@ -155039,7 +155039,7 @@ sub_810038C: @ 810038C adds r0, 0x1 b _081003DE .align 2, 0 -_081003BC: .4byte gUnknown_03004B28 +_081003BC: .4byte gTasks + 0x8 _081003C0: .4byte gUnknown_020391AA _081003C4: ldrb r0, [r3] @@ -156487,7 +156487,7 @@ sub_8100E70: @ 8100E70 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _08100E94 @ =gUnknown_03004B28 + ldr r1, _08100E94 @ =gTasks + 0x8 adds r4, r0, r1 movs r1, 0x4 ldrsh r0, [r4, r1] @@ -156499,7 +156499,7 @@ sub_8100E70: @ 8100E70 beq _08100E9E b _08100EE6 .align 2, 0 -_08100E94: .4byte gUnknown_03004B28 +_08100E94: .4byte gTasks + 0x8 _08100E98: cmp r0, 0x2 beq _08100ED2 @@ -156714,7 +156714,7 @@ _0810104C: lsls r1, r5, 2 adds r1, r5 lsls r1, 3 - ldr r0, _081010BC @ =gUnknown_03004B28 + ldr r0, _081010BC @ =gTasks + 0x8 adds r1, r0 movs r2, 0 ldrsh r0, [r1, r2] @@ -156765,7 +156765,7 @@ _081010B0: bl DisplayItemMessageOnField b _081010E0 .align 2, 0 -_081010BC: .4byte gUnknown_03004B28 +_081010BC: .4byte gTasks + 0x8 _081010C0: .4byte gSprites _081010C4: .4byte gUnknown_020391A8 _081010C8: .4byte SpriteCallbackDummy diff --git a/asm/rom_81258BC.s b/asm/rom_81258BC.s index 0aa296523..1467e60c4 100644 --- a/asm/rom_81258BC.s +++ b/asm/rom_81258BC.s @@ -30838,7 +30838,7 @@ sub_813A118: @ 813A118 lsls r0, r5, 2 adds r0, r5 lsls r6, r0, 3 - ldr r7, _0813A174 @ =gUnknown_03004B28 + ldr r7, _0813A174 @ =gTasks + 0x8 adds r4, r6, r7 bl sub_8072DEC movs r0, 0 @@ -30873,7 +30873,7 @@ sub_813A118: @ 813A118 str r1, [r0] b _0813A188 .align 2, 0 -_0813A174: .4byte gUnknown_03004B28 +_0813A174: .4byte gTasks + 0x8 _0813A178: .4byte sub_813A280 _0813A17C: ldr r1, _0813A190 @ =gOtherText_NoItems @@ -30898,7 +30898,7 @@ sub_813A198: @ 813A198 lsls r0, r5, 2 adds r0, r5 lsls r6, r0, 3 - ldr r7, _0813A1F8 @ =gUnknown_03004B28 + ldr r7, _0813A1F8 @ =gTasks + 0x8 adds r4, r6, r7 bl sub_8072DEC movs r0, 0 @@ -30934,7 +30934,7 @@ sub_813A198: @ 813A198 str r1, [r0] b _0813A20C .align 2, 0 -_0813A1F8: .4byte gUnknown_03004B28 +_0813A1F8: .4byte gTasks + 0x8 _0813A1FC: .4byte sub_813A280 _0813A200: ldr r1, _0813A214 @ =gOtherText_NoItems @@ -30978,7 +30978,7 @@ sub_813A240: @ 813A240 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0813A260 @ =gUnknown_03004B28 + ldr r0, _0813A260 @ =gTasks + 0x8 adds r1, r0 ldrh r2, [r1, 0x4] movs r3, 0x4 @@ -30988,7 +30988,7 @@ sub_813A240: @ 813A240 movs r0, 0x8 b _0813A266 .align 2, 0 -_0813A260: .4byte gUnknown_03004B28 +_0813A260: .4byte gTasks + 0x8 _0813A264: adds r0, r2, 0x1 _0813A266: @@ -31018,7 +31018,7 @@ sub_813A280: @ 813A280 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0813A2DC @ =gUnknown_03004B28 + ldr r1, _0813A2DC @ =gTasks + 0x8 adds r4, r0, r1 ldr r2, _0813A2E0 @ =gMain ldrh r1, [r2, 0x30] @@ -31056,7 +31056,7 @@ _0813A2CC: beq _0813A34C b _0813A358 .align 2, 0 -_0813A2DC: .4byte gUnknown_03004B28 +_0813A2DC: .4byte gTasks + 0x8 _0813A2E0: .4byte gMain _0813A2E4: movs r1, 0x2 @@ -31291,7 +31291,7 @@ sub_813A4B4: @ 813A4B4 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _0813A500 @ =gUnknown_03004B28 + ldr r1, _0813A500 @ =gTasks + 0x8 adds r4, r0, r1 ldrb r0, [r4, 0x2] ldrb r1, [r4] @@ -31319,7 +31319,7 @@ sub_813A4B4: @ 813A4B4 bl sub_813A6FC b _0813A570 .align 2, 0 -_0813A500: .4byte gUnknown_03004B28 +_0813A500: .4byte gTasks + 0x8 _0813A504: .4byte gSaveBlock1 _0813A508: .4byte 0x0000049a _0813A50C: @@ -31391,7 +31391,7 @@ sub_813A584: @ 813A584 lsls r0, r5, 2 adds r0, r5 lsls r7, r0, 3 - ldr r0, _0813A5D0 @ =gUnknown_03004B28 + ldr r0, _0813A5D0 @ =gTasks + 0x8 mov r8, r0 adds r4, r7, r0 ldrb r0, [r4, 0x2] @@ -31420,7 +31420,7 @@ sub_813A584: @ 813A584 adds r0, 0x1 b _0813A64A .align 2, 0 -_0813A5D0: .4byte gUnknown_03004B28 +_0813A5D0: .4byte gTasks + 0x8 _0813A5D4: .4byte gMain _0813A5D8: .4byte gSaveBlock1 _0813A5DC: .4byte 0x0000049a @@ -31573,7 +31573,7 @@ sub_813A6FC: @ 813A6FC lsls r1, r0, 2 adds r1, r0 lsls r6, r1, 3 - ldr r7, _0813A758 @ =gUnknown_03004B28 + ldr r7, _0813A758 @ =gTasks + 0x8 adds r4, r6, r7 ldrb r0, [r4, 0x2] ldrb r1, [r4] @@ -31609,7 +31609,7 @@ sub_813A6FC: @ 813A6FC ldr r1, _0813A76C @ =sub_813A8F0 b _0813A782 .align 2, 0 -_0813A758: .4byte gUnknown_03004B28 +_0813A758: .4byte gTasks + 0x8 _0813A75C: .4byte gSaveBlock1 _0813A760: .4byte gStringVar1 _0813A764: .4byte gStringVar2 @@ -31644,7 +31644,7 @@ sub_813A794: @ 813A794 lsls r0, r6, 2 adds r0, r6 lsls r7, r0, 3 - ldr r0, _0813A7FC @ =gUnknown_03004B28 + ldr r0, _0813A7FC @ =gTasks + 0x8 mov r8, r0 adds r4, r7, r0 ldrb r0, [r4, 0x2] @@ -31682,7 +31682,7 @@ sub_813A794: @ 813A794 bl sub_80F914C b _0813A828 .align 2, 0 -_0813A7FC: .4byte gUnknown_03004B28 +_0813A7FC: .4byte gTasks + 0x8 _0813A800: .4byte gSaveBlock1 _0813A804: .4byte gStringVar1 _0813A808: .4byte gStringVar2 @@ -31747,7 +31747,7 @@ sub_813A878: @ 813A878 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r6, _0813A8E4 @ =gUnknown_03004B28 + ldr r6, _0813A8E4 @ =gTasks + 0x8 adds r5, r4, r6 movs r0, 0x6 movs r1, 0x6 @@ -31789,7 +31789,7 @@ sub_813A878: @ 813A878 pop {r0} bx r0 .align 2, 0 -_0813A8E4: .4byte gUnknown_03004B28 +_0813A8E4: .4byte gTasks + 0x8 _0813A8E8: .4byte gSaveBlock1 _0813A8EC: .4byte sub_813A280 thumb_func_end sub_813A878 @@ -31803,7 +31803,7 @@ sub_813A8F0: @ 813A8F0 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _0813A97C @ =gUnknown_03004B28 + ldr r1, _0813A97C @ =gTasks + 0x8 adds r5, r0, r1 ldr r0, _0813A980 @ =gMain ldrh r1, [r0, 0x2E] @@ -31864,7 +31864,7 @@ _0813A972: pop {r0} bx r0 .align 2, 0 -_0813A97C: .4byte gUnknown_03004B28 +_0813A97C: .4byte gTasks + 0x8 _0813A980: .4byte gMain thumb_func_end sub_813A8F0 @@ -31876,7 +31876,7 @@ sub_813A984: @ 813A984 lsls r1, r0, 2 adds r1, r0 lsls r4, r1, 3 - ldr r5, _0813A9DC @ =gUnknown_03004B28 + ldr r5, _0813A9DC @ =gTasks + 0x8 adds r3, r4, r5 ldr r0, _0813A9E0 @ =gMain ldrh r1, [r0, 0x2E] @@ -31914,7 +31914,7 @@ _0813A9D6: pop {r0} bx r0 .align 2, 0 -_0813A9DC: .4byte gUnknown_03004B28 +_0813A9DC: .4byte gTasks + 0x8 _0813A9E0: .4byte gMain _0813A9E4: .4byte gSaveBlock1 _0813A9E8: .4byte sub_813A280 @@ -31962,7 +31962,7 @@ sub_813AA30: @ 813AA30 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0813AA80 @ =gUnknown_03004B28 + ldr r0, _0813AA80 @ =gTasks + 0x8 adds r4, r1, r0 ldrb r0, [r4] ldrb r1, [r4, 0x2] @@ -31995,7 +31995,7 @@ sub_813AA30: @ 813AA30 str r3, [r0] b _0813AAB8 .align 2, 0 -_0813AA80: .4byte gUnknown_03004B28 +_0813AA80: .4byte gTasks + 0x8 _0813AA84: .4byte gSaveBlock1 _0813AA88: movs r1, 0x4 @@ -32197,7 +32197,7 @@ sub_813ABE8: @ 813ABE8 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0813AC0C @ =gUnknown_03004B28 + ldr r0, _0813AC0C @ =gTasks + 0x8 adds r6, r1, r0 movs r0, 0 mov r8, r0 @@ -32206,7 +32206,7 @@ sub_813ABE8: @ 813ABE8 ldrsh r1, [r6, r2] b _0813ACC4 .align 2, 0 -_0813AC0C: .4byte gUnknown_03004B28 +_0813AC0C: .4byte gTasks + 0x8 _0813AC10: subs r0, r5, r1 lsls r0, 17 @@ -32471,7 +32471,7 @@ sub_813AE0C: @ 813AE0C lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r2, _0813AE48 @ =gUnknown_03004B28 + ldr r2, _0813AE48 @ =gTasks + 0x8 adds r4, r1, r2 ldrh r1, [r4] ldrh r2, [r4, 0x2] @@ -32493,7 +32493,7 @@ sub_813AE0C: @ 813AE0C bl sub_813AD58 b _0813AE62 .align 2, 0 -_0813AE48: .4byte gUnknown_03004B28 +_0813AE48: .4byte gTasks + 0x8 _0813AE4C: .4byte 0x0000ffff _0813AE50: ldr r0, _0813AE68 @ =gSaveBlock1 @@ -32525,7 +32525,7 @@ sub_813AE6C: @ 813AE6C lsls r5, r6, 2 adds r5, r6 lsls r5, 3 - ldr r0, _0813AEF8 @ =gUnknown_03004B28 + ldr r0, _0813AEF8 @ =gTasks + 0x8 adds r5, r0 bl sub_80F944C bl InitMenuInUpperLeftCornerPlaySoundWhenAPressed @@ -32574,7 +32574,7 @@ sub_813AE6C: @ 813AE6C pop {r0} bx r0 .align 2, 0 -_0813AEF8: .4byte gUnknown_03004B28 +_0813AEF8: .4byte gTasks + 0x8 _0813AEFC: .4byte gSaveBlock1 _0813AF00: .4byte gUnknown_084062C0 thumb_func_end sub_813AE6C diff --git a/asm/rom_813BA94.s b/asm/rom_813BA94.s index f6cfb51f4..132b592a1 100644 --- a/asm/rom_813BA94.s +++ b/asm/rom_813BA94.s @@ -13617,7 +13617,7 @@ sub_8142570: @ 8142570 lsls r1, r4, 2 adds r0, r1, r4 lsls r5, r0, 3 - ldr r0, _08142608 @ =gUnknown_03004B28 + ldr r0, _08142608 @ =gTasks + 0x8 mov r12, r0 mov r8, r1 ldr r6, _0814260C @ =gSprites @@ -13675,7 +13675,7 @@ _081425C0: bx r0 .align 2, 0 _08142604: .4byte 0xffff0000 -_08142608: .4byte gUnknown_03004B28 +_08142608: .4byte gTasks + 0x8 _0814260C: .4byte gSprites _08142610: .4byte gTasks _08142614: .4byte sub_8142618 @@ -14546,7 +14546,7 @@ _08142CFE: lsls r6, r4, 2 adds r0, r6, r4 lsls r5, r0, 3 - ldr r1, _08142DD8 @ =gUnknown_03004B28 + ldr r1, _08142DD8 @ =gTasks + 0x8 mov r10, r1 ldr r2, _08142DDC @ =gSprites mov r12, r2 @@ -14648,7 +14648,7 @@ _08142DB2: .align 2, 0 _08142DD0: .4byte 0x0201e000 _08142DD4: .4byte gTasks -_08142DD8: .4byte gUnknown_03004B28 +_08142DD8: .4byte gTasks + 0x8 _08142DDC: .4byte gSprites _08142DE0: .4byte 0xffff0000 _08142DE4: .4byte gUnknown_0203931C diff --git a/asm/rom_81473B8.s b/asm/rom_81473B8.s index c540791c6..01af93d76 100644 --- a/asm/rom_81473B8.s +++ b/asm/rom_81473B8.s @@ -370,7 +370,7 @@ sub_81476B0: @ 81476B0 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _081476D4 @ =gUnknown_03004B28 + ldr r1, _081476D4 @ =gTasks + 0x8 adds r4, r0, r1 movs r1, 0 ldrsh r0, [r4, r1] @@ -382,7 +382,7 @@ sub_81476B0: @ 81476B0 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081476D4: .4byte gUnknown_03004B28 +_081476D4: .4byte gTasks + 0x8 _081476D8: .4byte _081476DC .align 2, 0 _081476DC: diff --git a/asm/trainer_see.s b/asm/trainer_see.s index 896b28f05..98a775bb6 100644 --- a/asm/trainer_see.s +++ b/asm/trainer_see.s @@ -1081,7 +1081,7 @@ sub_8084794: @ 8084794 lsls r0, r1, 2 adds r0, r1 lsls r0, 3 - ldr r1, _080847C4 @ =gUnknown_03004B28 + ldr r1, _080847C4 @ =gTasks + 0x8 adds r0, r1 adds r0, 0x2 adds r1, r4, 0 @@ -1091,7 +1091,7 @@ sub_8084794: @ 8084794 bx r0 .align 2, 0 _080847C0: .4byte sub_80846E4 -_080847C4: .4byte gUnknown_03004B28 +_080847C4: .4byte gTasks + 0x8 thumb_func_end sub_8084794 thumb_func_start sub_80847C8 diff --git a/common_syms/task.txt b/common_syms/task.txt new file mode 100644 index 000000000..6601bd11b --- /dev/null +++ b/common_syms/task.txt @@ -0,0 +1 @@ +gTasks diff --git a/src/task.c b/src/task.c index 22d1ed37c..4545c0168 100644 --- a/src/task.c +++ b/src/task.c @@ -6,7 +6,7 @@ #define HEAD_SENTINEL 0xFE #define TAIL_SENTINEL 0xFF -extern struct Task gTasks[]; +struct Task gTasks[NUM_TASKS]; static void InsertTask(u8 newTaskId); static u8 FindFirstActiveTask(); diff --git a/sym_common.txt b/sym_common.txt index 983f9eaea..d3b5665ff 100644 --- a/sym_common.txt +++ b/sym_common.txt @@ -218,11 +218,7 @@ gUnknown_03004B00: @ 3004B00 gUnknown_03004B10: @ 3004B10 .space 0x10 -gTasks: @ 3004B20 - .space 0x8 - -gUnknown_03004B28: @ 3004B28 - .space 0x278 + .include "task.o" gUnknown_03004DA0: @ 3004DA0 .space 0x20 |