diff options
119 files changed, 3552 insertions, 3870 deletions
diff --git a/asm/battle_1.s b/asm/battle_1.s index c89d50d7f..db55d2dcb 100644 --- a/asm/battle_1.s +++ b/asm/battle_1.s @@ -348,7 +348,7 @@ sub_800F460: @ 800F460 ands r0, r1 cmp r0, 0 beq _0800F548 - ldr r0, _0800F4BC @ =gUnknown_3005090 + ldr r0, _0800F4BC @ =gTasks lsls r1, r6, 2 adds r1, r6 lsls r1, 3 @@ -366,7 +366,7 @@ sub_800F460: @ 800F460 b _0800F504 .align 2, 0 _0800F4B8: .4byte gBattleTypeFlags -_0800F4BC: .4byte gUnknown_3005090 +_0800F4BC: .4byte gTasks _0800F4C0: cmp r5, 0x2 beq _0800F4CE @@ -453,7 +453,7 @@ _0800F548: ldrb r0, [r0] cmp r5, r0 bne _0800F56C - ldr r1, _0800F568 @ =gUnknown_3005090 + ldr r1, _0800F568 @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -462,9 +462,9 @@ _0800F548: b _0800F578 .align 2, 0 _0800F564: .4byte gBattleStruct -_0800F568: .4byte gUnknown_3005090 +_0800F568: .4byte gTasks _0800F56C: - ldr r1, _0800F5C4 @ =gUnknown_3005090 + ldr r1, _0800F5C4 @ =gTasks lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -510,7 +510,7 @@ _0800F5B6: pop {r0} bx r0 .align 2, 0 -_0800F5C4: .4byte gUnknown_3005090 +_0800F5C4: .4byte gTasks _0800F5C8: .4byte 0x00006001 thumb_func_end sub_800F460 @@ -668,7 +668,7 @@ sub_800F6FC: @ 800F6FC sub sp, 0x4 lsls r0, 24 lsrs r7, r0, 24 - ldr r1, _0800F728 @ =gUnknown_3005090 + ldr r1, _0800F728 @ =gTasks lsls r0, r7, 2 mov r8, r0 adds r0, r7 @@ -686,7 +686,7 @@ _0800F71E: beq _0800F734 b _0800FAC4 .align 2, 0 -_0800F728: .4byte gUnknown_3005090 +_0800F728: .4byte gTasks _0800F72C: cmp r0, 0x2 bne _0800F732 @@ -821,7 +821,7 @@ _0800F7F0: movs r3, 0x2 bl sub_800F460 _0800F830: - ldr r0, _0800F84C @ =gUnknown_3005090 + ldr r0, _0800F84C @ =gTasks mov r2, r8 adds r1, r2, r7 lsls r1, 3 @@ -833,7 +833,7 @@ _0800F830: .align 2, 0 _0800F844: .4byte gBattleStruct _0800F848: .4byte gUnknown_202273C -_0800F84C: .4byte gUnknown_3005090 +_0800F84C: .4byte gTasks _0800F850: ldr r0, _0800F8CC @ =0x00002710 bl AllocSpritePalette @@ -1007,7 +1007,7 @@ _0800F9BE: subs r0, 0xA4 strh r0, [r4] _0800F9C4: - ldr r1, _0800F9F8 @ =gUnknown_3005090 + ldr r1, _0800F9F8 @ =gTasks lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -1029,7 +1029,7 @@ _0800F9E8: .4byte gUnknown_2022978 _0800F9EC: .4byte gUnknown_202297A _0800F9F0: .4byte gUnknown_202297C _0800F9F4: .4byte gUnknown_202297E -_0800F9F8: .4byte gUnknown_3005090 +_0800F9F8: .4byte gTasks _0800F9FC: movs r3, 0x12 ldrsh r0, [r1, r3] diff --git a/asm/battle_2.s b/asm/battle_2.s index 3db6273b0..086603fe1 100644 --- a/asm/battle_2.s +++ b/asm/battle_2.s @@ -1102,7 +1102,7 @@ _0801067E: bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r1, _080106E4 @ =gUnknown_3005090 + ldr r1, _080106E4 @ =gTasks lsls r2, r0, 2 adds r2, r0 lsls r2, 3 @@ -1137,7 +1137,7 @@ _0801067E: b _080108B2 .align 2, 0 _080106E0: .4byte sub_800F6FC -_080106E4: .4byte gUnknown_3005090 +_080106E4: .4byte gTasks _080106E8: .4byte gBattleStruct _080106EC: .4byte gUnknown_2022118 _080106F0: .4byte gUnknown_2023E82 @@ -1845,7 +1845,7 @@ _08010CE2: bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _08010D58 @ =gUnknown_3005090 + ldr r2, _08010D58 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -1880,7 +1880,7 @@ _08010D3A: _08010D4C: .4byte gUnknown_201C000 _08010D50: .4byte gPlayerParty _08010D54: .4byte sub_800F6FC -_08010D58: .4byte gUnknown_3005090 +_08010D58: .4byte gTasks _08010D5C: .4byte gUnknown_2022118 _08010D60: .4byte gUnknown_202273C _08010D64: @@ -3412,7 +3412,7 @@ _08011948: mov r0, r8 cmp r0, 0x5 ble _080118D8 - ldr r1, _08011A18 @ =gUnknown_3005090 + ldr r1, _08011A18 @ =gTasks ldr r2, [sp, 0xC] ldr r3, [sp] adds r0, r2, r3 @@ -3491,7 +3491,7 @@ _080119E2: mov r1, r8 cmp r1, 0x5 ble _08011972 - ldr r1, _08011A18 @ =gUnknown_3005090 + ldr r1, _08011A18 @ =gTasks ldr r2, [sp, 0xC] ldr r3, [sp] adds r0, r2, r3 @@ -3509,7 +3509,7 @@ _080119E2: .align 2, 0 _08011A10: .4byte gPlayerParty _08011A14: .4byte gEnemyParty -_08011A18: .4byte gUnknown_3005090 +_08011A18: .4byte gTasks thumb_func_end sub_801184C thumb_func_start sub_8011A1C @@ -3619,7 +3619,7 @@ _08011A9C: bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _08011B88 @ =gUnknown_3005090 + ldr r2, _08011B88 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -3659,7 +3659,7 @@ _08011B78: .4byte gUnknown_8D004D8 _08011B7C: .4byte gReservedSpritePaletteCount _08011B80: .4byte sub_80116F4 _08011B84: .4byte sub_800F6FC -_08011B88: .4byte gUnknown_3005090 +_08011B88: .4byte gTasks _08011B8C: .4byte sub_8011B94 _08011B90: .4byte gUnknown_2023E82 thumb_func_end sub_8011A1C diff --git a/asm/battle_anim.s b/asm/battle_anim.s index 08fd1d03e..4bed76663 100644 --- a/asm/battle_anim.s +++ b/asm/battle_anim.s @@ -1016,7 +1016,7 @@ _08072C88: bl CreateTask lsls r0, 24 lsrs r3, r0, 24 - ldr r1, _08072CE4 @ =gUnknown_3005090 + ldr r1, _08072CE4 @ =gTasks lsls r0, r3, 2 adds r0, r3 lsls r0, 3 @@ -1046,7 +1046,7 @@ _08072C88: _08072CD8: .4byte gUnknown_2037F1B _08072CDC: .4byte gUnknown_2023D44 _08072CE0: .4byte task_pA_ma0A_obj_to_bg_pal -_08072CE4: .4byte gUnknown_3005090 +_08072CE4: .4byte gTasks _08072CE8: .4byte gSprites _08072CEC: .4byte gUnknown_2022978 _08072CF0: .4byte gUnknown_202297A @@ -1058,7 +1058,7 @@ _08072CF4: _08072CFC: ldrh r0, [r0] strh r0, [r2, 0x10] - ldr r0, _08072D94 @ =gUnknown_3005090 + ldr r0, _08072D94 @ =gTasks lsls r1, r3, 2 adds r1, r3 lsls r1, 3 @@ -1100,7 +1100,7 @@ _08072D3E: bl CreateTask lsls r0, 24 lsrs r3, r0, 24 - ldr r1, _08072D94 @ =gUnknown_3005090 + ldr r1, _08072D94 @ =gTasks lsls r0, r3, 2 adds r0, r3 lsls r0, 3 @@ -1129,7 +1129,7 @@ _08072D3E: .align 2, 0 _08072D8C: .4byte gUnknown_202297C _08072D90: .4byte gUnknown_202297E -_08072D94: .4byte gUnknown_3005090 +_08072D94: .4byte gTasks _08072D98: .4byte gUnknown_2037F14 _08072D9C: .4byte gUnknown_2023D44 _08072DA0: .4byte task_pA_ma0A_obj_to_bg_pal @@ -1144,7 +1144,7 @@ _08072DB0: _08072DB8: ldrh r0, [r0] strh r0, [r2, 0x10] - ldr r0, _08072DE4 @ =gUnknown_3005090 + ldr r0, _08072DE4 @ =gTasks lsls r1, r3, 2 adds r1, r3 lsls r1, 3 @@ -1164,7 +1164,7 @@ _08072DCE: .align 2, 0 _08072DDC: .4byte gUnknown_202297C _08072DE0: .4byte gUnknown_202297E -_08072DE4: .4byte gUnknown_3005090 +_08072DE4: .4byte gTasks _08072DE8: .4byte gUnknown_2037F14 _08072DEC: .4byte gUnknown_2037ED4 thumb_func_end sub_8072C30 @@ -1595,7 +1595,7 @@ task_pA_ma0A_obj_to_bg_pal: @ 8073174 sub sp, 0x10 lsls r0, 24 lsrs r0, 24 - ldr r2, _080731F0 @ =gUnknown_3005090 + ldr r2, _080731F0 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -1652,7 +1652,7 @@ task_pA_ma0A_obj_to_bg_pal: @ 8073174 bl CpuSet b _08073232 .align 2, 0 -_080731F0: .4byte gUnknown_3005090 +_080731F0: .4byte gTasks _080731F4: .4byte gSprites _080731F8: .4byte gUnknown_2022978 _080731FC: .4byte gUnknown_202297A @@ -1778,7 +1778,7 @@ _080732E6: bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _08073314 @ =gUnknown_3005090 + ldr r2, _08073314 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -1794,7 +1794,7 @@ _080732E6: bx r0 .align 2, 0 _08073310: .4byte sub_807331C -_08073314: .4byte gUnknown_3005090 +_08073314: .4byte gTasks _08073318: .4byte gUnknown_2037ED4 thumb_func_end ScriptCmd_clearmonbg @@ -1804,7 +1804,7 @@ sub_807331C: @ 807331C lsls r0, 24 lsrs r0, 24 adds r7, r0, 0 - ldr r1, _08073394 @ =gUnknown_3005090 + ldr r1, _08073394 @ =gTasks lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -1859,7 +1859,7 @@ _0807338E: pop {r0} bx r0 .align 2, 0 -_08073394: .4byte gUnknown_3005090 +_08073394: .4byte gTasks _08073398: .4byte gUnknown_2037F14 thumb_func_end sub_807331C @@ -2072,7 +2072,7 @@ _08073522: bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _08073550 @ =gUnknown_3005090 + ldr r2, _08073550 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -2088,7 +2088,7 @@ _08073522: bx r0 .align 2, 0 _0807354C: .4byte sub_8073558 -_08073550: .4byte gUnknown_3005090 +_08073550: .4byte gTasks _08073554: .4byte gUnknown_2037ED4 thumb_func_end sub_8073484 @@ -2100,7 +2100,7 @@ sub_8073558: @ 8073558 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r1, _080735DC @ =gUnknown_3005090 + ldr r1, _080735DC @ =gTasks lsls r0, 2 add r0, r8 lsls r0, 3 @@ -2159,7 +2159,7 @@ _080735D2: pop {r0} bx r0 .align 2, 0 -_080735DC: .4byte gUnknown_3005090 +_080735DC: .4byte gTasks thumb_func_end sub_8073558 thumb_func_start ScriptCmd_setalpha @@ -2434,7 +2434,7 @@ sub_80737A0: @ 80737A0 bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080737DC @ =gUnknown_3005090 + ldr r2, _080737DC @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -2449,7 +2449,7 @@ sub_80737A0: @ 80737A0 .align 2, 0 _080737D4: .4byte gUnknown_2037ED4 _080737D8: .4byte sub_8073850 -_080737DC: .4byte gUnknown_3005090 +_080737DC: .4byte gTasks _080737E0: .4byte gUnknown_2037F17 thumb_func_end sub_80737A0 @@ -2475,7 +2475,7 @@ sub_80737E4: @ 80737E4 lsls r0, 24 cmp r0, 0 bne _08073830 - ldr r1, _0807382C @ =gUnknown_3005090 + ldr r1, _0807382C @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -2486,9 +2486,9 @@ sub_80737E4: @ 80737E4 _08073820: .4byte gUnknown_2037ED4 _08073824: .4byte sub_8073850 _08073828: .4byte gUnknown_2037F1B -_0807382C: .4byte gUnknown_3005090 +_0807382C: .4byte gTasks _08073830: - ldr r1, _08073848 @ =gUnknown_3005090 + ldr r1, _08073848 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -2502,7 +2502,7 @@ _0807383C: pop {r0} bx r0 .align 2, 0 -_08073848: .4byte gUnknown_3005090 +_08073848: .4byte gTasks _0807384C: .4byte gUnknown_2037F17 thumb_func_end sub_80737E4 @@ -2512,7 +2512,7 @@ sub_8073850: @ 8073850 sub sp, 0x4 lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _08073884 @ =gUnknown_3005090 + ldr r1, _08073884 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -2534,7 +2534,7 @@ sub_8073850: @ 8073850 strh r0, [r4, 0x1C] b _08073918 .align 2, 0 -_08073884: .4byte gUnknown_3005090 +_08073884: .4byte gTasks _08073888: ldr r2, _080738A4 @ =gUnknown_2037AB8 ldrb r1, [r2, 0x7] @@ -2576,7 +2576,7 @@ _080738CA: movs r2, 0x10 movs r3, 0 bl BeginHardwarePaletteFade - ldr r1, _080738EC @ =gUnknown_3005090 + ldr r1, _080738EC @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -2586,7 +2586,7 @@ _080738CA: strh r1, [r0, 0x1C] b _08073918 .align 2, 0 -_080738EC: .4byte gUnknown_3005090 +_080738EC: .4byte gTasks _080738F0: ldrb r1, [r2, 0x7] movs r0, 0x80 @@ -2670,7 +2670,7 @@ ScriptCmd_restorebg: @ 8073978 bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080739B0 @ =gUnknown_3005090 + ldr r2, _080739B0 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -2685,7 +2685,7 @@ ScriptCmd_restorebg: @ 8073978 .align 2, 0 _080739A8: .4byte gUnknown_2037ED4 _080739AC: .4byte sub_8073850 -_080739B0: .4byte gUnknown_3005090 +_080739B0: .4byte gTasks _080739B4: .4byte 0x0000ffff _080739B8: .4byte gUnknown_2037F17 thumb_func_end ScriptCmd_restorebg @@ -3087,7 +3087,7 @@ ScriptCmd_panse_1B: @ 8073C2C bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _08073CE4 @ =gUnknown_3005090 + ldr r2, _08073CE4 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -3121,7 +3121,7 @@ ScriptCmd_panse_1B: @ 8073C2C .align 2, 0 _08073CDC: .4byte gUnknown_2037ED4 _08073CE0: .4byte Task_PanFromInitialToTarget -_08073CE4: .4byte gUnknown_3005090 +_08073CE4: .4byte gTasks _08073CE8: .4byte gUnknown_2037EE3 thumb_func_end ScriptCmd_panse_1B @@ -3131,7 +3131,7 @@ Task_PanFromInitialToTarget: @ 8073CEC lsls r0, 24 lsrs r5, r0, 24 movs r7, 0 - ldr r1, _08073D30 @ =gUnknown_3005090 + ldr r1, _08073D30 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -3161,7 +3161,7 @@ Task_PanFromInitialToTarget: @ 8073CEC lsls r2, r3, 16 b _08073D58 .align 2, 0 -_08073D30: .4byte gUnknown_3005090 +_08073D30: .4byte gTasks _08073D34: lsls r1, r6, 16 lsls r0, r3, 16 @@ -3233,7 +3233,7 @@ ScriptCmd_panse_26: @ 8073D7C bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _08073E08 @ =gUnknown_3005090 + ldr r2, _08073E08 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -3271,7 +3271,7 @@ ScriptCmd_panse_26: @ 8073D7C .align 2, 0 _08073E00: .4byte gUnknown_2037ED4 _08073E04: .4byte Task_PanFromInitialToTarget -_08073E08: .4byte gUnknown_3005090 +_08073E08: .4byte gTasks _08073E0C: .4byte gUnknown_2037EE3 thumb_func_end ScriptCmd_panse_26 @@ -3326,7 +3326,7 @@ ScriptCmd_panse_27: @ 8073E10 bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _08073EC8 @ =gUnknown_3005090 + ldr r2, _08073EC8 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -3363,7 +3363,7 @@ ScriptCmd_panse_27: @ 8073E10 .align 2, 0 _08073EC0: .4byte gUnknown_2037ED4 _08073EC4: .4byte Task_PanFromInitialToTarget -_08073EC8: .4byte gUnknown_3005090 +_08073EC8: .4byte gTasks _08073ECC: .4byte gUnknown_2037EE3 thumb_func_end ScriptCmd_panse_27 @@ -3396,7 +3396,7 @@ ScriptCmd_loopsewithpan: @ 8073ED0 bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _08073F50 @ =gUnknown_3005090 + ldr r2, _08073F50 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -3429,7 +3429,7 @@ ScriptCmd_loopsewithpan: @ 8073ED0 .align 2, 0 _08073F48: .4byte gUnknown_2037ED4 _08073F4C: .4byte Task_LoopAndPlaySE -_08073F50: .4byte gUnknown_3005090 +_08073F50: .4byte gTasks _08073F54: .4byte gUnknown_2037EE3 thumb_func_end ScriptCmd_loopsewithpan @@ -3438,7 +3438,7 @@ Task_LoopAndPlaySE: @ 8073F58 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _08073FAC @ =gUnknown_3005090 + ldr r1, _08073FAC @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -3477,7 +3477,7 @@ _08073FA6: pop {r0} bx r0 .align 2, 0 -_08073FAC: .4byte gUnknown_3005090 +_08073FAC: .4byte gTasks _08073FB0: .4byte gUnknown_2037EE3 thumb_func_end Task_LoopAndPlaySE @@ -3507,7 +3507,7 @@ ScriptCmd_waitplaysewithpan: @ 8073FB4 bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _08074020 @ =gUnknown_3005090 + ldr r2, _08074020 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -3533,7 +3533,7 @@ ScriptCmd_waitplaysewithpan: @ 8073FB4 .align 2, 0 _08074018: .4byte gUnknown_2037ED4 _0807401C: .4byte Task_WaitAndPlaySE -_08074020: .4byte gUnknown_3005090 +_08074020: .4byte gTasks _08074024: .4byte gUnknown_2037EE3 thumb_func_end ScriptCmd_waitplaysewithpan @@ -3542,7 +3542,7 @@ Task_WaitAndPlaySE: @ 8074028 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _08074064 @ =gUnknown_3005090 + ldr r1, _08074064 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -3568,7 +3568,7 @@ _0807405C: pop {r0} bx r0 .align 2, 0 -_08074064: .4byte gUnknown_3005090 +_08074064: .4byte gTasks _08074068: .4byte gUnknown_2037EE3 thumb_func_end Task_WaitAndPlaySE diff --git a/asm/battle_anim_8074480.s b/asm/battle_anim_8074480.s index e3b60c269..5e4dfecb0 100644 --- a/asm/battle_anim_8074480.s +++ b/asm/battle_anim_8074480.s @@ -3826,7 +3826,7 @@ _08076076: bge _0807607C ldr r6, _080760C4 @ =0x0000ffff _0807607C: - ldr r0, _080760C8 @ =gUnknown_3005090 + ldr r0, _080760C8 @ =gTasks lsls r4, r5, 2 adds r4, r5 lsls r4, 3 @@ -3862,7 +3862,7 @@ _0807607C: .align 2, 0 _080760C0: .4byte gUnknown_2037F02 _080760C4: .4byte 0x0000ffff -_080760C8: .4byte gUnknown_3005090 +_080760C8: .4byte gTasks _080760CC: .4byte sub_80760D0 thumb_func_end sub_8076048 @@ -3874,7 +3874,7 @@ sub_80760D0: @ 80760D0 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0807611C @ =gUnknown_3005090 + ldr r1, _0807611C @ =gTasks adds r4, r0, r1 ldrh r0, [r4, 0x8] adds r0, 0x1 @@ -3906,7 +3906,7 @@ sub_80760D0: @ 80760D0 strh r0, [r4, 0xE] b _08076134 .align 2, 0 -_0807611C: .4byte gUnknown_3005090 +_0807611C: .4byte gTasks _08076120: ldrh r2, [r4, 0x10] movs r0, 0x10 @@ -3965,7 +3965,7 @@ sub_807616C: @ 807616C .align 2, 0 _0807618C: .4byte gUnknown_2037F02 _08076190: - ldr r1, _080761BC @ =gUnknown_3005090 + ldr r1, _080761BC @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -3988,7 +3988,7 @@ _080761B6: pop {r0} bx r0 .align 2, 0 -_080761BC: .4byte gUnknown_3005090 +_080761BC: .4byte gTasks _080761C0: .4byte gSprites _080761C4: .4byte 0x00000101 thumb_func_end sub_807616C @@ -4025,7 +4025,7 @@ sub_80761F0: @ 80761F0 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _08076248 @ =gUnknown_3005090 + ldr r1, _08076248 @ =gTasks adds r4, r0, r1 ldrh r0, [r4, 0x10] adds r0, 0x1 @@ -4061,7 +4061,7 @@ sub_80761F0: @ 80761F0 strh r0, [r4, 0x14] b _08076280 .align 2, 0 -_08076248: .4byte gUnknown_3005090 +_08076248: .4byte gTasks _0807624C: ldrh r2, [r4, 0xC] subs r2, 0x1 @@ -4112,7 +4112,7 @@ sub_8076288: @ 8076288 .align 2, 0 _080762A8: .4byte gUnknown_2037F02 _080762AC: - ldr r1, _080762C8 @ =gUnknown_3005090 + ldr r1, _080762C8 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -4127,7 +4127,7 @@ _080762C2: pop {r0} bx r0 .align 2, 0 -_080762C8: .4byte gUnknown_3005090 +_080762C8: .4byte gTasks _080762CC: .4byte 0x00000101 thumb_func_end sub_8076288 @@ -5891,7 +5891,7 @@ sub_8077030: @ 8077030 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080770C4 @ =gUnknown_3005090 + ldr r0, _080770C4 @ =gTasks adds r5, r1, r0 movs r0, 0 bl GetAnimBankSpriteId @@ -5958,7 +5958,7 @@ _080770C0: movs r0, 0x2 b _080770D6 .align 2, 0 -_080770C4: .4byte gUnknown_3005090 +_080770C4: .4byte gTasks _080770C8: .4byte gUnknown_2037F1A _080770CC: .4byte gSprites _080770D0: .4byte 0x00002771 @@ -6001,7 +6001,7 @@ sub_8077118: @ 8077118 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0807713C @ =gUnknown_3005090 + ldr r1, _0807713C @ =gTasks adds r4, r0, r1 movs r1, 0xC ldrsh r0, [r4, r1] @@ -6013,7 +6013,7 @@ sub_8077118: @ 8077118 beq _08077146 b _080771D8 .align 2, 0 -_0807713C: .4byte gUnknown_3005090 +_0807713C: .4byte gTasks _08077140: cmp r0, 0x2 beq _080771C4 @@ -6175,7 +6175,7 @@ sub_8077268: @ 8077268 lsls r0, 16 cmp r0, 0 bne _08077292 - ldr r2, _08077298 @ =gUnknown_3005090 + ldr r2, _08077298 @ =gTasks movs r0, 0x30 ldrsh r1, [r3, r0] lsls r0, r1, 2 @@ -6191,7 +6191,7 @@ _08077292: pop {r0} bx r0 .align 2, 0 -_08077298: .4byte gUnknown_3005090 +_08077298: .4byte gTasks thumb_func_end sub_8077268 thumb_func_start sub_807729C diff --git a/asm/battle_anim_8078178.s b/asm/battle_anim_8078178.s index f9bad22dd..e4f15971d 100644 --- a/asm/battle_anim_8078178.s +++ b/asm/battle_anim_8078178.s @@ -29,7 +29,7 @@ sub_8078178: @ 8078178 bl sub_800F034 ldr r0, _08078228 @ =gUnknown_83AD950 bl sub_800F078 - ldr r1, _0807822C @ =gUnknown_3005090 + ldr r1, _0807822C @ =gTasks mov r2, r8 lsls r0, r2, 2 add r0, r8 @@ -92,7 +92,7 @@ _0807821C: .4byte gUnknown_2023D44 _08078220: .4byte sub_80782BC _08078224: .4byte gUnknown_83AD048 _08078228: .4byte gUnknown_83AD950 -_0807822C: .4byte gUnknown_3005090 +_0807822C: .4byte gTasks _08078230: .4byte gSprites _08078234: .4byte gUnknown_83BF574 _08078238: @@ -169,7 +169,7 @@ sub_80782BC: @ 80782BC push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _08078314 @ =gUnknown_3005090 + ldr r1, _08078314 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -209,7 +209,7 @@ sub_80782BC: @ 80782BC strh r0, [r4, 0x12] b _08078346 .align 2, 0 -_08078314: .4byte gUnknown_3005090 +_08078314: .4byte gTasks _08078318: ldrh r1, [r4, 0x10] subs r0, r1, 0x1 @@ -408,7 +408,7 @@ _08078484: adds r0, r1 ldr r1, _080784CC @ =gUnknown_83BF554 bl SetSubspriteTables - ldr r1, _080784D0 @ =gUnknown_3005090 + ldr r1, _080784D0 @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -429,7 +429,7 @@ _080784C0: .4byte 0x0000271a _080784C4: .4byte 0xffff0000 _080784C8: .4byte gSprites _080784CC: .4byte gUnknown_83BF554 -_080784D0: .4byte gUnknown_3005090 +_080784D0: .4byte gTasks _080784D4: .4byte sub_80784D8 thumb_func_end sub_80783FC @@ -438,7 +438,7 @@ sub_80784D8: @ 80784D8 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _08078504 @ =gUnknown_3005090 + ldr r2, _08078504 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -457,7 +457,7 @@ sub_80784D8: @ 80784D8 strh r0, [r1, 0xA] b _08078522 .align 2, 0 -_08078504: .4byte gUnknown_3005090 +_08078504: .4byte gTasks _08078508: .4byte sub_8078528 _0807850C: lsls r0, r2, 24 @@ -485,7 +485,7 @@ sub_8078528: @ 8078528 bl IndexOfSpritePaletteTag lsls r0, 24 lsrs r2, r0, 24 - ldr r1, _080785C4 @ =gUnknown_3005090 + ldr r1, _080785C4 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -554,7 +554,7 @@ _080785B8: bx r0 .align 2, 0 _080785C0: .4byte 0x0000271a -_080785C4: .4byte gUnknown_3005090 +_080785C4: .4byte gTasks _080785C8: .4byte gUnknown_20375F8 _080785CC: .4byte 0x0000010d _080785D0: .4byte 0x0000010f @@ -566,7 +566,7 @@ sub_80785D8: @ 80785D8 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _08078608 @ =gUnknown_3005090 + ldr r2, _08078608 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -587,7 +587,7 @@ sub_80785D8: @ 80785D8 strh r0, [r2, 0xA] b _08078626 .align 2, 0 -_08078608: .4byte gUnknown_3005090 +_08078608: .4byte gTasks _0807860C: .4byte sub_807862C _08078610: lsls r0, r3, 24 @@ -611,7 +611,7 @@ sub_807862C: @ 807862C lsls r0, 24 lsrs r0, 24 adds r4, r0, 0 - ldr r1, _0807866C @ =gUnknown_3005090 + ldr r1, _0807866C @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -637,7 +637,7 @@ sub_807862C: @ 807862C bl DestroySprite b _0807868E .align 2, 0 -_0807866C: .4byte gUnknown_3005090 +_0807866C: .4byte gTasks _08078670: .4byte gSprites _08078674: cmp r0, 0x27 @@ -874,7 +874,7 @@ _08078838: strh r1, [r0, 0x4] strh r1, [r0, 0x6] strh r3, [r0, 0x8] - ldr r1, _08078864 @ =gUnknown_3005090 + ldr r1, _08078864 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -889,7 +889,7 @@ _0807885A: bx r0 .align 2, 0 _08078860: .4byte gUnknown_2037F02 -_08078864: .4byte gUnknown_3005090 +_08078864: .4byte gTasks _08078868: .4byte sub_80BB088 thumb_func_end sub_8078694 @@ -913,7 +913,7 @@ LaunchStatusAnimation: @ 807886C bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080788B8 @ =gUnknown_3005090 + ldr r2, _080788B8 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -927,7 +927,7 @@ _080788A8: .4byte gUnknown_2037F1A _080788AC: .4byte gUnknown_2037F1B _080788B0: .4byte gUnknown_81C6E84 _080788B4: .4byte task0A_80788BC -_080788B8: .4byte gUnknown_3005090 +_080788B8: .4byte gTasks thumb_func_end LaunchStatusAnimation thumb_func_start task0A_80788BC @@ -944,7 +944,7 @@ task0A_80788BC: @ 80788BC bne _080788FE ldr r0, _0807890C @ =gUnknown_2024018 ldr r2, [r0] - ldr r1, _08078910 @ =gUnknown_3005090 + ldr r1, _08078910 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -971,7 +971,7 @@ _080788FE: _08078904: .4byte gUnknown_2037EDC _08078908: .4byte gUnknown_2037EE1 _0807890C: .4byte gUnknown_2024018 -_08078910: .4byte gUnknown_3005090 +_08078910: .4byte gTasks thumb_func_end task0A_80788BC .align 2, 0 @ Don't pad with nop. diff --git a/asm/battle_anim_80989F8.s b/asm/battle_anim_80989F8.s index b63d133e2..5d2362087 100644 --- a/asm/battle_anim_80989F8.s +++ b/asm/battle_anim_80989F8.s @@ -32,7 +32,7 @@ _08098A1C: strh r1, [r0, 0x24] ldrh r1, [r4, 0x4] strh r1, [r0, 0x26] - ldr r1, _08098A64 @ =gUnknown_3005090 + ldr r1, _08098A64 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -58,7 +58,7 @@ _08098A58: bx r0 .align 2, 0 _08098A60: .4byte gSprites -_08098A64: .4byte gUnknown_3005090 +_08098A64: .4byte gTasks _08098A68: .4byte sub_8098A6C thumb_func_end sub_80989F8 @@ -67,7 +67,7 @@ sub_8098A6C: @ 8098A6C push {r4-r7,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _08098AA8 @ =gUnknown_3005090 + ldr r1, _08098AA8 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -94,7 +94,7 @@ sub_8098A6C: @ 8098A6C strh r0, [r1, 0x24] b _08098AB2 .align 2, 0 -_08098AA8: .4byte gUnknown_3005090 +_08098AA8: .4byte gTasks _08098AAC: .4byte gSprites _08098AB0: strh r5, [r1, 0x24] @@ -250,7 +250,7 @@ _08098BB4: strh r1, [r0, 0x24] ldrh r1, [r2, 0x4] strh r1, [r0, 0x26] - ldr r1, _08098C00 @ =gUnknown_3005090 + ldr r1, _08098C00 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -277,7 +277,7 @@ _08098BF2: .align 2, 0 _08098BF8: .4byte gSprites _08098BFC: .4byte gUnknown_2037F02 -_08098C00: .4byte gUnknown_3005090 +_08098C00: .4byte gTasks _08098C04: .4byte sub_8098C08 thumb_func_end sub_8098B1C @@ -288,7 +288,7 @@ sub_8098C08: @ 8098C08 push {r7} lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _08098C4C @ =gUnknown_3005090 + ldr r1, _08098C4C @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -318,7 +318,7 @@ sub_8098C08: @ 8098C08 strh r0, [r4, 0x24] b _08098C56 .align 2, 0 -_08098C4C: .4byte gUnknown_3005090 +_08098C4C: .4byte gTasks _08098C50: .4byte gSprites _08098C54: strh r5, [r4, 0x24] @@ -420,7 +420,7 @@ _08098CF4: ldrh r6, [r1, 0x26] adds r0, r6 strh r0, [r1, 0x26] - ldr r0, _08098D4C @ =gUnknown_3005090 + ldr r0, _08098D4C @ =gTasks lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -450,7 +450,7 @@ _08098D42: bx r0 .align 2, 0 _08098D48: .4byte gSprites -_08098D4C: .4byte gUnknown_3005090 +_08098D4C: .4byte gTasks _08098D50: .4byte sub_8098D54 thumb_func_end sub_8098CD0 @@ -459,7 +459,7 @@ sub_8098D54: @ 8098D54 push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _08098DAC @ =gUnknown_3005090 + ldr r1, _08098DAC @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -501,7 +501,7 @@ _08098D72: adds r3, r2, 0 b _08098DDE .align 2, 0 -_08098DAC: .4byte gUnknown_3005090 +_08098DAC: .4byte gTasks _08098DB0: .4byte gSprites _08098DB4: ldr r3, _08098E40 @ =gSprites @@ -636,7 +636,7 @@ sub_8098E90: @ 8098E90 adds r1, r2 ldrh r2, [r5, 0x2] strh r2, [r1, 0x24] - ldr r2, _08098EE8 @ =gUnknown_3005090 + ldr r2, _08098EE8 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -660,7 +660,7 @@ sub_8098E90: @ 8098E90 .align 2, 0 _08098EE0: .4byte gUnknown_2037F02 _08098EE4: .4byte gSprites -_08098EE8: .4byte gUnknown_3005090 +_08098EE8: .4byte gTasks _08098EEC: .4byte sub_8098EF0 thumb_func_end sub_8098E90 @@ -669,7 +669,7 @@ sub_8098EF0: @ 8098EF0 push {r4-r7,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r2, _08098F7C @ =gUnknown_3005090 + ldr r2, _08098F7C @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -738,7 +738,7 @@ _08098F74: pop {r0} bx r0 .align 2, 0 -_08098F7C: .4byte gUnknown_3005090 +_08098F7C: .4byte gTasks _08098F80: .4byte gSprites thumb_func_end sub_8098EF0 @@ -766,7 +766,7 @@ _08098FA8: movs r2, 0x8 ldrsh r0, [r4, r2] adds r3, r4, 0 - ldr r2, _08098FFC @ =gUnknown_3005090 + ldr r2, _08098FFC @ =gTasks mov r12, r2 lsls r4, r5, 2 ldr r2, _08099000 @ =sub_8099004 @@ -805,7 +805,7 @@ _08098FCE: bx r0 .align 2, 0 _08098FF8: .4byte gUnknown_2037F02 -_08098FFC: .4byte gUnknown_3005090 +_08098FFC: .4byte gTasks _08099000: .4byte sub_8099004 thumb_func_end sub_8098F84 @@ -815,7 +815,7 @@ sub_8099004: @ 8099004 lsls r0, 24 lsrs r0, 24 adds r6, r0, 0 - ldr r1, _08099074 @ =gUnknown_3005090 + ldr r1, _08099074 @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -867,7 +867,7 @@ _0809906E: pop {r0} bx r0 .align 2, 0 -_08099074: .4byte gUnknown_3005090 +_08099074: .4byte gTasks _08099078: .4byte gSprites thumb_func_end sub_8099004 @@ -1431,7 +1431,7 @@ sub_809949C: @ 809949C _080994CE: ldrb r0, [r5] bl GetAnimBankSpriteId - ldr r1, _08099528 @ =gUnknown_3005090 + ldr r1, _08099528 @ =gTasks lsls r4, r6, 2 adds r4, r6 lsls r4, 3 @@ -1470,7 +1470,7 @@ _080994CE: .align 2, 0 _08099520: .4byte gUnknown_2037F02 _08099524: .4byte gUnknown_2037F1A -_08099528: .4byte gUnknown_3005090 +_08099528: .4byte gTasks _0809952C: .4byte sub_8099530 thumb_func_end sub_809949C @@ -1479,7 +1479,7 @@ sub_8099530: @ 8099530 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _08099588 @ =gUnknown_3005090 + ldr r2, _08099588 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -1520,7 +1520,7 @@ _08099580: pop {r0} bx r0 .align 2, 0 -_08099588: .4byte gUnknown_3005090 +_08099588: .4byte gTasks _0809958C: .4byte gSprites _08099590: .4byte sub_8099594 thumb_func_end sub_8099530 @@ -1531,7 +1531,7 @@ sub_8099594: @ 8099594 lsls r0, 24 lsrs r0, 24 adds r5, r0, 0 - ldr r1, _080995B8 @ =gUnknown_3005090 + ldr r1, _080995B8 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -1545,7 +1545,7 @@ sub_8099594: @ 8099594 strh r0, [r4, 0x10] b _080995F0 .align 2, 0 -_080995B8: .4byte gUnknown_3005090 +_080995B8: .4byte gTasks _080995BC: ldrb r0, [r4, 0x8] ldrh r2, [r4, 0x12] @@ -1634,7 +1634,7 @@ _0809965C: bl DestroyAnimVisualTask b _080996A4 _08099664: - ldr r1, _08099684 @ =gUnknown_3005090 + ldr r1, _08099684 @ =gTasks lsls r4, r6, 2 adds r0, r4, r6 lsls r0, 3 @@ -1650,7 +1650,7 @@ _08099664: ldrh r0, [r0, 0x2] b _08099696 .align 2, 0 -_08099684: .4byte gUnknown_3005090 +_08099684: .4byte gTasks _08099688: .4byte gUnknown_2037F1B _0809968C: .4byte gUnknown_2037F02 _08099690: @@ -1659,7 +1659,7 @@ _08099690: negs r0, r0 _08099696: strh r0, [r5, 0xA] - ldr r0, _080996B0 @ =gUnknown_3005090 + ldr r0, _080996B0 @ =gTasks adds r1, r4, r6 lsls r1, 3 adds r1, r0 @@ -1671,7 +1671,7 @@ _080996A4: bx r0 .align 2, 0 _080996AC: .4byte gUnknown_2037F02 -_080996B0: .4byte gUnknown_3005090 +_080996B0: .4byte gTasks _080996B4: .4byte sub_80996B8 thumb_func_end sub_80995FC @@ -1680,7 +1680,7 @@ sub_80996B8: @ 80996B8 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080996FC @ =gUnknown_3005090 + ldr r0, _080996FC @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -1712,7 +1712,7 @@ _080996F6: pop {r0} bx r0 .align 2, 0 -_080996FC: .4byte gUnknown_3005090 +_080996FC: .4byte gTasks _08099700: .4byte gSprites thumb_func_end sub_80996B8 @@ -1737,7 +1737,7 @@ _08099720: bl GetAnimBankSpriteId lsls r0, 24 lsrs r0, 24 - ldr r2, _0809975C @ =gUnknown_3005090 + ldr r2, _0809975C @ =gTasks lsls r3, r5, 2 adds r1, r3, r5 lsls r1, 3 @@ -1760,13 +1760,13 @@ _08099720: .align 2, 0 _08099754: .4byte gUnknown_2037F1A _08099758: .4byte gUnknown_2037F02 -_0809975C: .4byte gUnknown_3005090 +_0809975C: .4byte gTasks _08099760: ldr r0, _0809977C @ =gUnknown_2037F1B ldrb r0, [r0] _08099764: strh r0, [r2, 0x12] - ldr r1, _08099780 @ =gUnknown_3005090 + ldr r1, _08099780 @ =gTasks adds r0, r3, r5 lsls r0, 3 adds r0, r1 @@ -1779,7 +1779,7 @@ _08099764: bx r0 .align 2, 0 _0809977C: .4byte gUnknown_2037F1B -_08099780: .4byte gUnknown_3005090 +_08099780: .4byte gTasks _08099784: .4byte sub_8099788 thumb_func_end sub_8099704 @@ -1791,7 +1791,7 @@ sub_8099788: @ 8099788 push {r6,r7} lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _080997D8 @ =gUnknown_3005090 + ldr r1, _080997D8 @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -1825,7 +1825,7 @@ sub_8099788: @ 8099788 adds r4, r2, 0 b _08099826 .align 2, 0 -_080997D8: .4byte gUnknown_3005090 +_080997D8: .4byte gTasks _080997DC: .4byte gSprites _080997E0: ldrb r0, [r4, 0x12] @@ -1869,7 +1869,7 @@ _08099826: mov r5, r8 cmp r5, 0x7F bls _08099848 - ldr r1, _080998AC @ =gUnknown_3005090 + ldr r1, _080998AC @ =gTasks lsls r2, r6, 2 adds r0, r2, r6 lsls r0, 3 @@ -1887,7 +1887,7 @@ _08099848: mov r2, r8 cmp r2, 0x7E bhi _0809989C - ldr r1, _080998AC @ =gUnknown_3005090 + ldr r1, _080998AC @ =gTasks lsls r2, r6, 2 adds r0, r2, r6 lsls r0, 3 @@ -1935,7 +1935,7 @@ _0809989C: bx r0 .align 2, 0 _080998A8: .4byte gSprites -_080998AC: .4byte gUnknown_3005090 +_080998AC: .4byte gTasks thumb_func_end sub_8099788 thumb_func_start sub_80998B0 @@ -1953,7 +1953,7 @@ sub_80998B0: @ 80998B0 ldrb r1, [r6, 0x8] adds r0, r5, 0 bl sub_80758E0 - ldr r1, _08099900 @ =gUnknown_3005090 + ldr r1, _08099900 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -1978,7 +1978,7 @@ sub_80998B0: @ 80998B0 bx r0 .align 2, 0 _080998FC: .4byte gUnknown_2037F02 -_08099900: .4byte gUnknown_3005090 +_08099900: .4byte gTasks _08099904: .4byte sub_8099908 thumb_func_end sub_80998B0 @@ -1988,7 +1988,7 @@ sub_8099908: @ 8099908 lsls r0, 24 lsrs r0, 24 adds r5, r0, 0 - ldr r1, _08099968 @ =gUnknown_3005090 + ldr r1, _08099968 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -2032,7 +2032,7 @@ sub_8099908: @ 8099908 strh r1, [r4, 0xE] b _08099978 .align 2, 0 -_08099968: .4byte gUnknown_3005090 +_08099968: .4byte gTasks _0809996C: adds r0, r6, 0 bl sub_8075980 @@ -2059,7 +2059,7 @@ sub_8099980: @ 8099980 mov r8, r0 movs r1, 0 bl sub_80758E0 - ldr r1, _080999C0 @ =gUnknown_3005090 + ldr r1, _080999C0 @ =gTasks lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -2076,7 +2076,7 @@ sub_8099980: @ 8099980 b _080999D0 .align 2, 0 _080999BC: .4byte gUnknown_2037F02 -_080999C0: .4byte gUnknown_3005090 +_080999C0: .4byte gTasks _080999C4: ldrh r0, [r4] ldrh r1, [r4, 0x2] @@ -2085,7 +2085,7 @@ _080999C4: adds r0, r3, 0 strh r0, [r2, 0xE] _080999D0: - ldr r1, _080999FC @ =gUnknown_3005090 + ldr r1, _080999FC @ =gTasks lsls r4, r7, 2 adds r0, r4, r7 lsls r0, 3 @@ -2106,7 +2106,7 @@ _080999D0: strh r0, [r5, 0x16] b _08099A28 .align 2, 0 -_080999FC: .4byte gUnknown_3005090 +_080999FC: .4byte gTasks _08099A00: .4byte gUnknown_2037F02 _08099A04: movs r1, 0x4 @@ -2130,7 +2130,7 @@ _08099A16: _08099A26: strh r1, [r5, 0x16] _08099A28: - ldr r0, _08099A70 @ =gUnknown_3005090 + ldr r0, _08099A70 @ =gTasks mov r2, r8 adds r1, r2, r7 lsls r1, 3 @@ -2152,7 +2152,7 @@ _08099A28: negs r0, r0 strh r0, [r4, 0x10] _08099A54: - ldr r0, _08099A70 @ =gUnknown_3005090 + ldr r0, _08099A70 @ =gTasks mov r3, r8 adds r1, r3, r7 lsls r1, 3 @@ -2166,7 +2166,7 @@ _08099A54: bx r0 .align 2, 0 _08099A6C: .4byte gUnknown_2037F1B -_08099A70: .4byte gUnknown_3005090 +_08099A70: .4byte gTasks _08099A74: .4byte sub_8099B54 thumb_func_end sub_8099980 @@ -2185,7 +2185,7 @@ sub_8099A78: @ 8099A78 mov r8, r0 movs r1, 0 bl sub_80758E0 - ldr r1, _08099AB8 @ =gUnknown_3005090 + ldr r1, _08099AB8 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -2202,7 +2202,7 @@ sub_8099A78: @ 8099A78 b _08099AC2 .align 2, 0 _08099AB4: .4byte gUnknown_2037F02 -_08099AB8: .4byte gUnknown_3005090 +_08099AB8: .4byte gTasks _08099ABC: .4byte gUnknown_2037F1A _08099AC0: ldr r0, _08099AF0 @ =gUnknown_2037F1B @@ -2222,7 +2222,7 @@ _08099AD4: adds r6, r0, 0 cmp r1, 0x1 beq _08099AFC - ldr r2, _08099AF8 @ =gUnknown_3005090 + ldr r2, _08099AF8 @ =gTasks lsls r3, r5, 2 adds r0, r3, r5 lsls r0, 3 @@ -2233,9 +2233,9 @@ _08099AD4: .align 2, 0 _08099AF0: .4byte gUnknown_2037F1B _08099AF4: .4byte gUnknown_2037F02 -_08099AF8: .4byte gUnknown_3005090 +_08099AF8: .4byte gTasks _08099AFC: - ldr r3, _08099B4C @ =gUnknown_3005090 + ldr r3, _08099B4C @ =gTasks lsls r4, r5, 2 adds r0, r4, r5 lsls r0, 3 @@ -2276,7 +2276,7 @@ _08099B16: pop {r0} bx r0 .align 2, 0 -_08099B4C: .4byte gUnknown_3005090 +_08099B4C: .4byte gTasks _08099B50: .4byte sub_8099B54 thumb_func_end sub_8099A78 @@ -2285,7 +2285,7 @@ sub_8099B54: @ 8099B54 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _08099BAC @ =gUnknown_3005090 + ldr r1, _08099BAC @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -2326,7 +2326,7 @@ _08099B88: beq _08099BBE b _08099BB6 .align 2, 0 -_08099BAC: .4byte gUnknown_3005090 +_08099BAC: .4byte gTasks _08099BB0: ldrb r0, [r4, 0x12] bl sub_8075980 @@ -2362,7 +2362,7 @@ sub_8099BD4: @ 8099BD4 mov r8, r0 cmp r1, 0 bne _08099C0C - ldr r4, _08099C04 @ =gUnknown_3005090 + ldr r4, _08099C04 @ =gTasks lsls r5, r7, 2 adds r0, r5, r7 lsls r0, 3 @@ -2374,10 +2374,10 @@ sub_8099BD4: @ 8099BD4 b _08099C20 .align 2, 0 _08099C00: .4byte gUnknown_2037F02 -_08099C04: .4byte gUnknown_3005090 +_08099C04: .4byte gTasks _08099C08: .4byte gUnknown_2037EEC _08099C0C: - ldr r4, _08099CA8 @ =gUnknown_3005090 + ldr r4, _08099CA8 @ =gTasks lsls r5, r7, 2 adds r0, r5, r7 lsls r0, 3 @@ -2457,7 +2457,7 @@ _08099C3A: pop {r0} bx r0 .align 2, 0 -_08099CA8: .4byte gUnknown_3005090 +_08099CA8: .4byte gTasks _08099CAC: .4byte gUnknown_2037EE8 _08099CB0: .4byte gSprites _08099CB4: .4byte sub_8099CB8 @@ -2471,7 +2471,7 @@ sub_8099CB8: @ 8099CB8 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _08099D0C @ =gUnknown_3005090 + ldr r1, _08099D0C @ =gTasks adds r3, r0, r1 ldrh r0, [r3, 0x8] adds r0, 0x1 @@ -2507,7 +2507,7 @@ sub_8099CB8: @ 8099CB8 adds r1, r2 b _08099D28 .align 2, 0 -_08099D0C: .4byte gUnknown_3005090 +_08099D0C: .4byte gTasks _08099D10: .4byte gSprites _08099D14: ldr r2, _08099D50 @ =gSprites diff --git a/asm/battle_anim_80A22E8.s b/asm/battle_anim_80A22E8.s index e17cb5903..90b0c8c86 100644 --- a/asm/battle_anim_80A22E8.s +++ b/asm/battle_anim_80A22E8.s @@ -276,7 +276,7 @@ sub_80A2500: @ 80A2500 lsls r0, 24 lsrs r0, 24 adds r6, r0, 0 - ldr r1, _080A2570 @ =gUnknown_3005090 + ldr r1, _080A2570 @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -327,7 +327,7 @@ _080A2568: pop {r0} bx r0 .align 2, 0 -_080A2570: .4byte gUnknown_3005090 +_080A2570: .4byte gTasks _080A2574: .4byte gUnknown_2037F02 _080A2578: .4byte gUnknown_83E2A88 _080A257C: .4byte gUnknown_2037F1B @@ -1609,7 +1609,7 @@ _080A2F3C: adds r0, r2, 0 movs r1, 0x1 bl sub_80758E0 - ldr r1, _080A2F68 @ =gUnknown_3005090 + ldr r1, _080A2F68 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -1629,7 +1629,7 @@ _080A2F62: pop {r0} bx r0 .align 2, 0 -_080A2F68: .4byte gUnknown_3005090 +_080A2F68: .4byte gTasks _080A2F6C: .4byte gUnknown_2037F02 _080A2F70: .4byte sub_80A2F74 thumb_func_end sub_80A2F0C @@ -1645,7 +1645,7 @@ sub_80A2F74: @ 80A2F74 lsls r0, 24 lsrs r0, 24 adds r6, r0, 0 - ldr r1, _080A2FF4 @ =gUnknown_3005090 + ldr r1, _080A2FF4 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -1698,7 +1698,7 @@ _080A2FEC: pop {r0} bx r0 .align 2, 0 -_080A2FF4: .4byte gUnknown_3005090 +_080A2FF4: .4byte gTasks _080A2FF8: .4byte gSprites _080A2FFC: .4byte gUnknown_2037F1B _080A3000: .4byte sub_80A3004 @@ -1714,7 +1714,7 @@ sub_80A3004: @ 80A3004 ldr r0, _080A3054 @ =0x0000ffff cmp r1, r0 bne _080A3060 - ldr r0, _080A3058 @ =gUnknown_3005090 + ldr r0, _080A3058 @ =gTasks lsls r2, r3, 2 adds r1, r2, r3 lsls r1, 3 @@ -1745,10 +1745,10 @@ sub_80A3004: @ 80A3004 .align 2, 0 _080A3050: .4byte gUnknown_2037F02 _080A3054: .4byte 0x0000ffff -_080A3058: .4byte gUnknown_3005090 +_080A3058: .4byte gTasks _080A305C: .4byte gSprites _080A3060: - ldr r1, _080A3094 @ =gUnknown_3005090 + ldr r1, _080A3094 @ =gTasks lsls r2, r3, 2 adds r0, r2, r3 lsls r0, 3 @@ -1776,7 +1776,7 @@ _080A308E: pop {r0} bx r0 .align 2, 0 -_080A3094: .4byte gUnknown_3005090 +_080A3094: .4byte gTasks thumb_func_end sub_80A3004 thumb_func_start sub_80A3098 @@ -2991,7 +2991,7 @@ sub_80A39C0: @ 80A39C0 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _080A3B14 @ =gUnknown_3005090 + ldr r1, _080A3B14 @ =gTasks adds r5, r0, r1 ldr r4, _080A3B18 @ =gUnknown_2037F1B ldrb r0, [r4] @@ -3146,7 +3146,7 @@ _080A3A60: pop {r0} bx r0 .align 2, 0 -_080A3B14: .4byte gUnknown_3005090 +_080A3B14: .4byte gTasks _080A3B18: .4byte gUnknown_2037F1B _080A3B1C: .4byte gUnknown_83E2FF0 _080A3B20: .4byte gSprites @@ -3161,7 +3161,7 @@ sub_80A3B28: @ 80A3B28 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _080A3B6C @ =gUnknown_3005090 + ldr r1, _080A3B6C @ =gTasks adds r6, r0, r1 movs r0, 0xC ldrsh r1, [r6, r0] @@ -3192,7 +3192,7 @@ _080A3B5A: beq _080A3BE6 b _080A3EFC .align 2, 0 -_080A3B6C: .4byte gUnknown_3005090 +_080A3B6C: .4byte gTasks _080A3B70: .4byte gSprites _080A3B74: cmp r5, 0x5 @@ -3717,7 +3717,7 @@ sub_80A3F24: @ 80A3F24 strh r7, [r4, 0x3A] movs r0, 0xC strh r0, [r4, 0x3C] - ldr r0, _080A3FCC @ =gUnknown_3005090 + ldr r0, _080A3FCC @ =gTasks lsls r1, r7, 2 adds r1, r7 lsls r1, 3 @@ -3752,7 +3752,7 @@ _080A3FBA: .align 2, 0 _080A3FC4: .4byte gSprites _080A3FC8: .4byte gUnknown_83E2FF0 -_080A3FCC: .4byte gUnknown_3005090 +_080A3FCC: .4byte gTasks _080A3FD0: .4byte sub_80A3FD4 thumb_func_end sub_80A3F24 @@ -3789,7 +3789,7 @@ sub_80A3FD4: @ 80A3FD4 asrs r0, 16 cmp r0, 0x8 ble _080A4036 - ldr r3, _080A403C @ =gUnknown_3005090 + ldr r3, _080A403C @ =gTasks movs r0, 0x3C ldrsh r1, [r4, r0] lsls r1, 1 @@ -3811,7 +3811,7 @@ _080A4036: pop {r0} bx r0 .align 2, 0 -_080A403C: .4byte gUnknown_3005090 +_080A403C: .4byte gTasks thumb_func_end sub_80A3FD4 thumb_func_start sub_80A4040 @@ -4023,7 +4023,7 @@ sub_80A41C4: @ 80A41C4 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _080A41E4 @ =gUnknown_3005090 + ldr r1, _080A41E4 @ =gTasks adds r5, r0, r1 movs r1, 0x8 ldrsh r0, [r5, r1] @@ -4033,7 +4033,7 @@ sub_80A41C4: @ 80A41C4 beq _080A421C b _080A4276 .align 2, 0 -_080A41E4: .4byte gUnknown_3005090 +_080A41E4: .4byte gTasks _080A41E8: ldr r0, _080A4214 @ =0x0000274f bl IndexOfSpritePaletteTag @@ -6757,7 +6757,7 @@ sub_80A5694: @ 80A5694 push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _080A56D8 @ =gUnknown_3005090 + ldr r1, _080A56D8 @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -6786,7 +6786,7 @@ sub_80A5694: @ 80A5694 bl DestroyAnimVisualTask b _080A5722 .align 2, 0 -_080A56D8: .4byte gUnknown_3005090 +_080A56D8: .4byte gTasks _080A56DC: .4byte gUnknown_2023D44 _080A56E0: .4byte gUnknown_2037F1A _080A56E4: .4byte gUnknown_2037F02 @@ -6840,7 +6840,7 @@ sub_80A572C: @ 80A572C lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _080A5750 @ =gUnknown_3005090 + ldr r1, _080A5750 @ =gTasks adds r4, r0, r1 movs r1, 0xC ldrsh r0, [r4, r1] @@ -6854,7 +6854,7 @@ _080A5746: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080A5750: .4byte gUnknown_3005090 +_080A5750: .4byte gTasks _080A5754: .4byte _080A5758 .align 2, 0 _080A5758: @@ -7080,7 +7080,7 @@ sub_80A58EC: @ 80A58EC lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080A5928 @ =gUnknown_3005090 + ldr r1, _080A5928 @ =gTasks adds r4, r0, r1 movs r1, 0xE ldrsh r0, [r4, r1] @@ -7103,7 +7103,7 @@ sub_80A58EC: @ 80A58EC strh r0, [r4, 0xE] b _080A5938 .align 2, 0 -_080A5928: .4byte gUnknown_3005090 +_080A5928: .4byte gTasks _080A592C: ldrb r0, [r4, 0x8] bl sub_8075980 @@ -7593,7 +7593,7 @@ sub_80A5CD4: @ 80A5CD4 push {r4,lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r1, _080A5CF4 @ =gUnknown_3005090 + ldr r1, _080A5CF4 @ =gTasks lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -7607,7 +7607,7 @@ sub_80A5CD4: @ 80A5CD4 strh r0, [r1, 0xE] b _080A5D3E .align 2, 0 -_080A5CF4: .4byte gUnknown_3005090 +_080A5CF4: .4byte gTasks _080A5CF8: .4byte gUnknown_2037F02 _080A5CFC: .4byte 0x0000ffff _080A5D00: @@ -7731,7 +7731,7 @@ sub_80A5DE0: @ 80A5DE0 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _080A5E30 @ =gUnknown_3005090 + ldr r1, _080A5E30 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -7767,7 +7767,7 @@ _080A5E28: pop {r0} bx r0 .align 2, 0 -_080A5E30: .4byte gUnknown_3005090 +_080A5E30: .4byte gTasks thumb_func_end sub_80A5DE0 thumb_func_start sub_80A5E34 @@ -8006,7 +8006,7 @@ sub_80A5FC0: @ 80A5FC0 mov r1, r8 ands r1, r0 mov r8, r1 - ldr r0, _080A6094 @ =gUnknown_3005090 + ldr r0, _080A6094 @ =gTasks mov r9, r0 lsls r5, r7, 2 adds r5, r7 @@ -8082,7 +8082,7 @@ sub_80A5FC0: @ 80A5FC0 bx r0 .align 2, 0 _080A6090: .4byte 0x0000ffff -_080A6094: .4byte gUnknown_3005090 +_080A6094: .4byte gTasks _080A6098: .4byte 0x000027d2 _080A609C: .4byte 0x000027d3 _080A60A0: .4byte 0x00007fbb @@ -8100,7 +8100,7 @@ sub_80A60A8: @ 80A60A8 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _080A60D0 @ =gUnknown_3005090 + ldr r1, _080A60D0 @ =gTasks adds r4, r0, r1 movs r0, 0x8 ldrsh r1, [r4, r0] @@ -8112,7 +8112,7 @@ sub_80A60A8: @ 80A60A8 beq _080A60E2 b _080A6232 .align 2, 0 -_080A60D0: .4byte gUnknown_3005090 +_080A60D0: .4byte gTasks _080A60D4: cmp r1, 0x2 bne _080A60DA @@ -8503,7 +8503,7 @@ sub_80A63B4: @ 80A63B4 lsls r0, 2 add r0, r8 lsls r0, 3 - ldr r1, _080A6444 @ =gUnknown_3005090 + ldr r1, _080A6444 @ =gTasks adds r6, r0, r1 movs r0, 0 bl GetAnimBankSpriteId @@ -8563,7 +8563,7 @@ _080A640C: mov r9, r1 b _080A6488 .align 2, 0 -_080A6444: .4byte gUnknown_3005090 +_080A6444: .4byte gTasks _080A6448: .4byte 0x00002771 _080A644C: .4byte gSprites _080A6450: .4byte gUnknown_20371F8 @@ -8644,7 +8644,7 @@ sub_80A64E0: @ 80A64E0 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _080A6514 @ =gUnknown_3005090 + ldr r1, _080A6514 @ =gTasks adds r0, r1 movs r1, 0xE ldrsh r0, [r0, r1] @@ -8663,7 +8663,7 @@ sub_80A64E0: @ 80A64E0 bl SetGpuRegBits b _080A6526 .align 2, 0 -_080A6514: .4byte gUnknown_3005090 +_080A6514: .4byte gTasks _080A6518: .4byte gUnknown_2037F1A _080A651C: movs r1, 0x80 @@ -8704,7 +8704,7 @@ _080A6558: ldrsh r0, [r5, r1] cmp r0, 0x40 ble _080A6580 - ldr r2, _080A657C @ =gUnknown_3005090 + ldr r2, _080A657C @ =gTasks movs r0, 0x32 ldrsh r1, [r5, r0] lsls r0, r1, 2 @@ -8718,7 +8718,7 @@ _080A6558: bl obj_delete_but_dont_free_vram b _080A65C2 .align 2, 0 -_080A657C: .4byte gUnknown_3005090 +_080A657C: .4byte gTasks _080A6580: ldr r4, _080A65C8 @ =gUnknown_825E074 movs r1, 0x2E @@ -10204,7 +10204,7 @@ sub_80A70A0: @ 80A70A0 ldrb r0, [r0] movs r1, 0 bl sub_80758E0 - ldr r1, _080A70D4 @ =gUnknown_3005090 + ldr r1, _080A70D4 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -10217,7 +10217,7 @@ sub_80A70A0: @ 80A70A0 .align 2, 0 _080A70CC: .4byte gUnknown_2023D44 _080A70D0: .4byte gUnknown_2037F1A -_080A70D4: .4byte gUnknown_3005090 +_080A70D4: .4byte gTasks _080A70D8: .4byte sub_80A70DC thumb_func_end sub_80A70A0 @@ -10235,7 +10235,7 @@ sub_80A70DC: @ 80A70DC lsls r0, 24 cmp r0, 0 bne _080A7118 - ldr r1, _080A7114 @ =gUnknown_3005090 + ldr r1, _080A7114 @ =gTasks lsls r2, r5, 2 adds r0, r2, r5 lsls r0, 3 @@ -10249,9 +10249,9 @@ sub_80A70DC: @ 80A70DC .align 2, 0 _080A710C: .4byte gUnknown_2023D44 _080A7110: .4byte gUnknown_2037F1A -_080A7114: .4byte gUnknown_3005090 +_080A7114: .4byte gTasks _080A7118: - ldr r2, _080A7158 @ =gUnknown_3005090 + ldr r2, _080A7158 @ =gTasks lsls r1, r5, 2 adds r0, r1, r5 lsls r0, 3 @@ -10264,7 +10264,7 @@ _080A7126: adds r0, r4, 0 adds r1, r2, 0 bl obj_id_set_rotscale - ldr r1, _080A7158 @ =gUnknown_3005090 + ldr r1, _080A7158 @ =gTasks adds r0, r6, r5 lsls r0, 3 adds r1, r0, r1 @@ -10284,7 +10284,7 @@ _080A7126: adds r1, 0x1 b _080A718A .align 2, 0 -_080A7158: .4byte gUnknown_3005090 +_080A7158: .4byte gTasks _080A715C: .4byte gSprites _080A7160: cmp r0, 0x1 @@ -10313,7 +10313,7 @@ _080A718A: strh r1, [r0, 0x26] adds r0, r4, 0 bl sub_80759DC - ldr r0, _080A71C8 @ =gUnknown_3005090 + ldr r0, _080A71C8 @ =gTasks adds r1, r6, r5 lsls r1, 3 adds r1, r0 @@ -10338,7 +10338,7 @@ _080A71AA: b _080A71D0 .align 2, 0 _080A71C4: .4byte gSprites -_080A71C8: .4byte gUnknown_3005090 +_080A71C8: .4byte gTasks _080A71CC: adds r0, r2, 0x1 _080A71CE: @@ -10602,7 +10602,7 @@ sub_80A73CC: @ 80A73CC lsls r0, 16 cmp r0, 0 bgt _080A73F6 - ldr r2, _080A73FC @ =gUnknown_3005090 + ldr r2, _080A73FC @ =gTasks movs r0, 0x3C ldrsh r1, [r3, r0] lsls r0, r1, 2 @@ -10618,7 +10618,7 @@ _080A73F6: pop {r0} bx r0 .align 2, 0 -_080A73FC: .4byte gUnknown_3005090 +_080A73FC: .4byte gTasks thumb_func_end sub_80A73CC thumb_func_start sub_80A7400 @@ -10630,7 +10630,7 @@ sub_80A7400: @ 80A7400 lsls r0, r1, 2 adds r0, r1 lsls r0, 3 - ldr r1, _080A7430 @ =gUnknown_3005090 + ldr r1, _080A7430 @ =gTasks adds r4, r0, r1 movs r3, 0x2E ldrsh r1, [r2, r3] @@ -10647,7 +10647,7 @@ sub_80A7400: @ 80A7400 adds r0, r3 b _080A7442 .align 2, 0 -_080A7430: .4byte gUnknown_3005090 +_080A7430: .4byte gTasks _080A7434: ldrh r0, [r2, 0x38] ldrh r1, [r2, 0x34] @@ -10723,7 +10723,7 @@ sub_80A74A4: @ 80A74A4 lsls r0, r1, 2 adds r0, r1 lsls r0, 3 - ldr r1, _080A74E8 @ =gUnknown_3005090 + ldr r1, _080A74E8 @ =gTasks adds r6, r0, r1 ldrh r2, [r6, 0x16] movs r1, 0x2 @@ -10748,7 +10748,7 @@ sub_80A74A4: @ 80A74A4 negs r0, r0 b _080A74F0 .align 2, 0 -_080A74E8: .4byte gUnknown_3005090 +_080A74E8: .4byte gTasks _080A74EC: lsls r0, r2, 16 lsrs r0, 24 @@ -10881,7 +10881,7 @@ sub_80A75E4: @ 80A75E4 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r1, _080A7608 @ =gUnknown_3005090 + ldr r1, _080A7608 @ =gTasks lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -10896,7 +10896,7 @@ _080A7602: pop {r0} bx r0 .align 2, 0 -_080A7608: .4byte gUnknown_3005090 +_080A7608: .4byte gTasks thumb_func_end sub_80A75E4 thumb_func_start sub_80A760C @@ -10904,7 +10904,7 @@ sub_80A760C: @ 80A760C push {r4-r7,lr} lsls r0, 24 lsrs r7, r0, 24 - ldr r1, _080A7660 @ =gUnknown_3005090 + ldr r1, _080A7660 @ =gTasks lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -10942,7 +10942,7 @@ sub_80A760C: @ 80A760C beq _080A7682 b _080A7690 .align 2, 0 -_080A7660: .4byte gUnknown_3005090 +_080A7660: .4byte gTasks _080A7664: .4byte gUnknown_83E3C28 _080A7668: .4byte gSprites _080A766C: @@ -10966,7 +10966,7 @@ _080A7682: orrs r1, r0 strb r1, [r6, 0x3] _080A7690: - ldr r3, _080A76E8 @ =gUnknown_3005090 + ldr r3, _080A76E8 @ =gTasks lsls r2, r7, 2 adds r2, r7 lsls r2, 3 @@ -11009,7 +11009,7 @@ _080A76E0: pop {r0} bx r0 .align 2, 0 -_080A76E8: .4byte gUnknown_3005090 +_080A76E8: .4byte gTasks _080A76EC: .4byte sub_80A75E4 thumb_func_end sub_80A760C @@ -11037,7 +11037,7 @@ sub_80A76F0: @ 80A76F0 mov r10, r4 cmp r0, 0 beq _080A775C - ldr r1, _080A774C @ =gUnknown_3005090 + ldr r1, _080A774C @ =gTasks lsls r2, r7, 2 adds r0, r2, r7 lsls r0, 3 @@ -11060,7 +11060,7 @@ sub_80A76F0: @ 80A76F0 strh r0, [r3, 0x4] b _080A77B6 .align 2, 0 -_080A774C: .4byte gUnknown_3005090 +_080A774C: .4byte gTasks _080A7750: .4byte gUnknown_2037F02 _080A7754: movs r0, 0x1 @@ -11080,7 +11080,7 @@ _080A775C: mov r8, r2 cmp r0, 0 bne _080A77B6 - ldr r1, _080A77A8 @ =gUnknown_3005090 + ldr r1, _080A77A8 @ =gTasks adds r0, r2, r7 lsls r0, 3 adds r0, r1 @@ -11104,7 +11104,7 @@ _080A775C: .align 2, 0 _080A77A0: .4byte gUnknown_2023BD6 _080A77A4: .4byte gUnknown_2037F1B -_080A77A8: .4byte gUnknown_3005090 +_080A77A8: .4byte gTasks _080A77AC: .4byte gUnknown_2037F02 _080A77B0: movs r0, 0x1 @@ -11116,7 +11116,7 @@ _080A77B6: ldrb r0, [r5] movs r1, 0 bl sub_8074480 - ldr r1, _080A7814 @ =gUnknown_3005090 + ldr r1, _080A7814 @ =gTasks mov r3, r8 adds r4, r3, r7 lsls r4, 3 @@ -11154,7 +11154,7 @@ _080A77B6: b _080A7842 .align 2, 0 _080A7810: .4byte gUnknown_2037F1A -_080A7814: .4byte gUnknown_3005090 +_080A7814: .4byte gTasks _080A7818: .4byte gBattleTypeFlags _080A781C: .4byte gUnknown_2037F1B _080A7820: @@ -11175,7 +11175,7 @@ _080A7820: strh r0, [r1] _080A7842: mov r4, sp - ldr r0, _080A7880 @ =gUnknown_3005090 + ldr r0, _080A7880 @ =gTasks mov r2, r8 adds r1, r2, r7 lsls r1, 3 @@ -11205,7 +11205,7 @@ _080A7842: b _080A788A .align 2, 0 _080A787C: .4byte gUnknown_2037F1B -_080A7880: .4byte gUnknown_3005090 +_080A7880: .4byte gTasks _080A7884: .4byte gUnknown_2037F02 _080A7888: subs r0, r1, r2 @@ -11227,7 +11227,7 @@ _080A788A: asrs r1, 16 adds r0, r4, 0 bl sub_80D8AA0 - ldr r2, _080A7904 @ =gUnknown_3005090 + ldr r2, _080A7904 @ =gTasks mov r3, r8 adds r1, r3, r7 lsls r1, 3 @@ -11265,7 +11265,7 @@ _080A788A: b _080A7928 .align 2, 0 _080A7900: .4byte gUnknown_2037F02 -_080A7904: .4byte gUnknown_3005090 +_080A7904: .4byte gTasks _080A7908: subs r4, r1 lsls r4, 16 @@ -11282,7 +11282,7 @@ _080A7908: orrs r0, r1 strh r0, [r6, 0x18] _080A7928: - ldr r1, _080A7968 @ =gUnknown_3005090 + ldr r1, _080A7968 @ =gTasks mov r3, r8 adds r0, r3, r7 lsls r0, 3 @@ -11314,7 +11314,7 @@ _080A7928: adds r0, r1 b _080A79B0 .align 2, 0 -_080A7968: .4byte gUnknown_3005090 +_080A7968: .4byte gTasks _080A796C: .4byte gUnknown_2037F02 _080A7970: .4byte gUnknown_2037F1B _080A7974: .4byte 0x0000ffc0 @@ -11347,7 +11347,7 @@ _080A79A0: subs r0, r1 _080A79B0: strh r0, [r5, 0xC] - ldr r0, _080A79E0 @ =gUnknown_3005090 + ldr r0, _080A79E0 @ =gTasks mov r2, r8 adds r1, r2, r7 lsls r1, 3 @@ -11371,7 +11371,7 @@ _080A79C8: bx r0 .align 2, 0 _080A79DC: .4byte gUnknown_2037F1B -_080A79E0: .4byte gUnknown_3005090 +_080A79E0: .4byte gTasks _080A79E4: .4byte sub_80A760C thumb_func_end sub_80A76F0 @@ -12148,7 +12148,7 @@ sub_80A7FB0: @ 80A7FB0 adds r0, 0x10 movs r1, 0 bl sub_8075B48 - ldr r1, _080A800C @ =gUnknown_3005090 + ldr r1, _080A800C @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -12162,7 +12162,7 @@ sub_80A7FB0: @ 80A7FB0 bx r0 .align 2, 0 _080A8008: .4byte gSprites -_080A800C: .4byte gUnknown_3005090 +_080A800C: .4byte gTasks _080A8010: .4byte sub_80A8014 thumb_func_end sub_80A7FB0 @@ -12171,7 +12171,7 @@ sub_80A8014: @ 80A8014 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _080A806C @ =gUnknown_3005090 + ldr r1, _080A806C @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -12209,7 +12209,7 @@ _080A8064: pop {r0} bx r0 .align 2, 0 -_080A806C: .4byte gUnknown_3005090 +_080A806C: .4byte gTasks _080A8070: .4byte gSprites thumb_func_end sub_80A8014 @@ -12221,7 +12221,7 @@ sub_80A8074: @ 80A8074 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _080A80C0 @ =gUnknown_3005090 + ldr r0, _080A80C0 @ =gTasks adds r4, r0 movs r0, 0 bl GetAnimBankSpriteId @@ -12251,7 +12251,7 @@ sub_80A8074: @ 80A8074 pop {r0} bx r0 .align 2, 0 -_080A80C0: .4byte gUnknown_3005090 +_080A80C0: .4byte gTasks _080A80C4: .4byte gUnknown_2037F1A _080A80C8: .4byte sub_80A80CC thumb_func_end sub_80A8074 @@ -12264,7 +12264,7 @@ sub_80A80CC: @ 80A80CC lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080A80F0 @ =gUnknown_3005090 + ldr r1, _080A80F0 @ =gTasks adds r4, r0, r1 movs r1, 0xA ldrsh r0, [r4, r1] @@ -12278,7 +12278,7 @@ _080A80E6: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080A80F0: .4byte gUnknown_3005090 +_080A80F0: .4byte gTasks _080A80F4: .4byte _080A80F8 .align 2, 0 _080A80F8: @@ -12542,7 +12542,7 @@ sub_80A82F0: @ 80A82F0 lsls r0, 16 cmp r0, 0 bne _080A832E - ldr r3, _080A8334 @ =gUnknown_3005090 + ldr r3, _080A8334 @ =gTasks movs r0, 0x32 ldrsh r1, [r4, r0] lsls r1, 1 @@ -12568,7 +12568,7 @@ _080A832E: pop {r0} bx r0 .align 2, 0 -_080A8334: .4byte gUnknown_3005090 +_080A8334: .4byte gTasks thumb_func_end sub_80A82F0 thumb_func_start sub_80A8338 @@ -12579,7 +12579,7 @@ sub_80A8338: @ 80A8338 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _080A835C @ =gUnknown_3005090 + ldr r1, _080A835C @ =gTasks adds r4, r0, r1 ldr r5, _080A8360 @ =gUnknown_2037F02 movs r1, 0x2 @@ -12590,7 +12590,7 @@ sub_80A8338: @ 80A8338 bl DestroyAnimVisualTask b _080A838A .align 2, 0 -_080A835C: .4byte gUnknown_3005090 +_080A835C: .4byte gTasks _080A8360: .4byte gUnknown_2037F02 _080A8364: ldrb r0, [r5] @@ -12627,7 +12627,7 @@ sub_80A8398: @ 80A8398 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _080A83BC @ =gUnknown_3005090 + ldr r1, _080A83BC @ =gTasks adds r4, r0, r1 movs r0, 0xA ldrsh r5, [r4, r0] @@ -12639,7 +12639,7 @@ sub_80A8398: @ 80A8398 beq _080A83CA b _080A84A8 .align 2, 0 -_080A83BC: .4byte gUnknown_3005090 +_080A83BC: .4byte gTasks _080A83C0: cmp r5, 0x2 beq _080A8434 @@ -12773,7 +12773,7 @@ sub_80A84B4: @ 80A84B4 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _080A84E4 @ =gUnknown_3005090 + ldr r0, _080A84E4 @ =gTasks adds r4, r0 movs r0, 0 bl GetAnimBankSpriteId @@ -12789,7 +12789,7 @@ sub_80A84B4: @ 80A84B4 pop {r0} bx r0 .align 2, 0 -_080A84E4: .4byte gUnknown_3005090 +_080A84E4: .4byte gTasks _080A84E8: .4byte gUnknown_83E3E80 _080A84EC: .4byte sub_80A84F0 thumb_func_end sub_80A84B4 @@ -12802,7 +12802,7 @@ sub_80A84F0: @ 80A84F0 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _080A8518 @ =gUnknown_3005090 + ldr r1, _080A8518 @ =gTasks adds r0, r1 bl sub_8076308 lsls r0, 24 @@ -12815,7 +12815,7 @@ _080A8510: pop {r0} bx r0 .align 2, 0 -_080A8518: .4byte gUnknown_3005090 +_080A8518: .4byte gTasks thumb_func_end sub_80A84F0 thumb_func_start sub_80A851C @@ -12961,7 +12961,7 @@ sub_80A8638: @ 80A8638 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _080A866C @ =gUnknown_3005090 + ldr r0, _080A866C @ =gTasks adds r4, r0 movs r0, 0 bl GetAnimBankSpriteId @@ -12980,7 +12980,7 @@ sub_80A8638: @ 80A8638 pop {r0} bx r0 .align 2, 0 -_080A866C: .4byte gUnknown_3005090 +_080A866C: .4byte gTasks _080A8670: .4byte gUnknown_83E3F1C _080A8674: .4byte sub_80A8678 thumb_func_end sub_80A8638 @@ -12993,7 +12993,7 @@ sub_80A8678: @ 80A8678 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _080A86A0 @ =gUnknown_3005090 + ldr r1, _080A86A0 @ =gTasks adds r0, r1 bl sub_8076308 lsls r0, 24 @@ -13006,7 +13006,7 @@ _080A8698: pop {r0} bx r0 .align 2, 0 -_080A86A0: .4byte gUnknown_3005090 +_080A86A0: .4byte gTasks thumb_func_end sub_80A8678 thumb_func_start sub_80A86A4 @@ -13017,7 +13017,7 @@ sub_80A86A4: @ 80A86A4 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080A8718 @ =gUnknown_3005090 + ldr r0, _080A8718 @ =gTasks adds r4, r1, r0 movs r0, 0 bl GetAnimBankSpriteId @@ -13069,7 +13069,7 @@ _080A870E: pop {r0} bx r0 .align 2, 0 -_080A8718: .4byte gUnknown_3005090 +_080A8718: .4byte gTasks _080A871C: .4byte gSprites _080A8720: .4byte gUnknown_2037F1A _080A8724: .4byte sub_80A8728 @@ -13083,7 +13083,7 @@ sub_80A8728: @ 80A8728 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _080A8770 @ =gUnknown_3005090 + ldr r1, _080A8770 @ =gTasks adds r3, r0, r1 ldrh r0, [r3, 0x16] adds r0, 0x1 @@ -13113,7 +13113,7 @@ sub_80A8728: @ 80A8728 adds r1, r2 b _080A878C .align 2, 0 -_080A8770: .4byte gUnknown_3005090 +_080A8770: .4byte gTasks _080A8774: .4byte gSprites _080A8778: ldr r2, _080A87A0 @ =gSprites @@ -13259,7 +13259,7 @@ sub_80A8874: @ 80A8874 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080A88C4 @ =gUnknown_3005090 + ldr r0, _080A88C4 @ =gTasks adds r5, r1, r0 ldr r4, _080A88C8 @ =gUnknown_2037F1B ldrb r0, [r4] @@ -13290,7 +13290,7 @@ sub_80A8874: @ 80A8874 ldr r0, _080A88D0 @ =0x04000014 b _080A88DC .align 2, 0 -_080A88C4: .4byte gUnknown_3005090 +_080A88C4: .4byte gTasks _080A88C8: .4byte gUnknown_2037F1B _080A88CC: .4byte gUnknown_2022978 _080A88D0: .4byte 0x04000014 @@ -13368,7 +13368,7 @@ sub_80A8954: @ 80A8954 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _080A8974 @ =gUnknown_3005090 + ldr r1, _080A8974 @ =gTasks adds r3, r0, r1 movs r1, 0x10 ldrsh r0, [r3, r1] @@ -13378,7 +13378,7 @@ sub_80A8954: @ 80A8954 beq _080A898E b _080A8A0E .align 2, 0 -_080A8974: .4byte gUnknown_3005090 +_080A8974: .4byte gTasks _080A8978: ldrh r0, [r3, 0x12] adds r0, 0x1 @@ -14436,7 +14436,7 @@ sub_80A917C: @ 80A917C lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _080A91AC @ =gUnknown_3005090 + ldr r0, _080A91AC @ =gTasks adds r4, r0 movs r0, 0 bl GetAnimBankSpriteId @@ -14453,7 +14453,7 @@ sub_80A917C: @ 80A917C pop {r0} bx r0 .align 2, 0 -_080A91AC: .4byte gUnknown_3005090 +_080A91AC: .4byte gTasks _080A91B0: .4byte gUnknown_83E4128 _080A91B4: .4byte sub_80A91B8 thumb_func_end sub_80A917C @@ -14466,7 +14466,7 @@ sub_80A91B8: @ 80A91B8 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080A9208 @ =gUnknown_3005090 + ldr r1, _080A9208 @ =gTasks adds r4, r0, r1 adds r0, r4, 0 bl sub_8076308 @@ -14500,7 +14500,7 @@ _080A9202: pop {r0} bx r0 .align 2, 0 -_080A9208: .4byte gUnknown_3005090 +_080A9208: .4byte gTasks _080A920C: .4byte gSprites thumb_func_end sub_80A91B8 @@ -14512,7 +14512,7 @@ sub_80A9210: @ 80A9210 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080A9244 @ =gUnknown_3005090 + ldr r0, _080A9244 @ =gTasks adds r4, r1, r0 movs r0, 0 strh r0, [r4, 0x8] @@ -14532,7 +14532,7 @@ sub_80A9210: @ 80A9210 movs r0, 0x8 b _080A9256 .align 2, 0 -_080A9244: .4byte gUnknown_3005090 +_080A9244: .4byte gTasks _080A9248: .4byte gUnknown_2037F1B _080A924C: .4byte 0x0000ffff _080A9250: @@ -14564,7 +14564,7 @@ sub_80A9278: @ 80A9278 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080A929C @ =gUnknown_3005090 + ldr r1, _080A929C @ =gTasks adds r3, r0, r1 movs r0, 0x8 ldrsh r4, [r3, r0] @@ -14576,7 +14576,7 @@ sub_80A9278: @ 80A9278 beq _080A92AA b _080A9392 .align 2, 0 -_080A929C: .4byte gUnknown_3005090 +_080A929C: .4byte gTasks _080A92A0: cmp r4, 0x2 beq _080A9348 @@ -14721,7 +14721,7 @@ sub_80A939C: @ 80A939C lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _080A93D8 @ =gUnknown_3005090 + ldr r0, _080A93D8 @ =gTasks adds r4, r0 movs r0, 0 strh r0, [r4, 0x8] @@ -14745,7 +14745,7 @@ sub_80A939C: @ 80A939C pop {r0} bx r0 .align 2, 0 -_080A93D8: .4byte gUnknown_3005090 +_080A93D8: .4byte gTasks _080A93DC: .4byte sub_80A93E0 thumb_func_end sub_80A939C @@ -14757,7 +14757,7 @@ sub_80A93E0: @ 80A93E0 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080A9434 @ =gUnknown_3005090 + ldr r1, _080A9434 @ =gTasks adds r4, r0, r1 movs r0, 0x8 ldrsh r2, [r4, r0] @@ -14794,7 +14794,7 @@ sub_80A93E0: @ 80A93E0 ands r1, r2 b _080A9452 .align 2, 0 -_080A9434: .4byte gUnknown_3005090 +_080A9434: .4byte gTasks _080A9438: .4byte gSprites _080A943C: ldr r3, _080A9484 @ =gSprites @@ -14864,7 +14864,7 @@ sub_80A94AC: @ 80A94AC lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _080A94FC @ =gUnknown_3005090 + ldr r0, _080A94FC @ =gTasks adds r4, r0 movs r0, 0 strh r0, [r4, 0x8] @@ -14897,7 +14897,7 @@ sub_80A94AC: @ 80A94AC pop {r0} bx r0 .align 2, 0 -_080A94FC: .4byte gUnknown_3005090 +_080A94FC: .4byte gTasks _080A9500: .4byte gUnknown_2037F1A _080A9504: .4byte sub_80A9508 thumb_func_end sub_80A94AC @@ -14910,7 +14910,7 @@ sub_80A9508: @ 80A9508 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _080A952C @ =gUnknown_3005090 + ldr r1, _080A952C @ =gTasks adds r4, r0, r1 movs r0, 0x18 ldrsh r2, [r4, r0] @@ -14922,7 +14922,7 @@ sub_80A9508: @ 80A9508 beq _080A9536 b _080A9590 .align 2, 0 -_080A952C: .4byte gUnknown_3005090 +_080A952C: .4byte gTasks _080A9530: cmp r2, 0x2 beq _080A958C @@ -15073,7 +15073,7 @@ _080A9642: sub_80A9648: @ 80A9648 push {r4,lr} adds r3, r0, 0 - ldr r4, _080A96B0 @ =gUnknown_3005090 + ldr r4, _080A96B0 @ =gTasks movs r0, 0x2E ldrsh r1, [r3, r0] lsls r0, r1, 2 @@ -15124,7 +15124,7 @@ _080A96AA: pop {r0} bx r0 .align 2, 0 -_080A96B0: .4byte gUnknown_3005090 +_080A96B0: .4byte gTasks thumb_func_end sub_80A9648 thumb_func_start sub_80A96B4 @@ -15414,7 +15414,7 @@ _080A98C4: movs r0, 0x54 movs r1, 0x10 bl SetGpuReg - ldr r1, _080A9928 @ =gUnknown_3005090 + ldr r1, _080A9928 @ =gTasks lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -15431,7 +15431,7 @@ _080A9918: .4byte gUnknown_2022984 _080A991C: .4byte gUnknown_2022986 _080A9920: .4byte 0x00003f1f _080A9924: .4byte 0x00003f3f -_080A9928: .4byte gUnknown_3005090 +_080A9928: .4byte gTasks _080A992C: .4byte sub_80A9930 thumb_func_end sub_80A98B0 @@ -15440,7 +15440,7 @@ sub_80A9930: @ 80A9930 push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080A9964 @ =gUnknown_3005090 + ldr r2, _080A9964 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -15464,7 +15464,7 @@ sub_80A9930: @ 80A9930 str r0, [r3] b _080A9978 .align 2, 0 -_080A9964: .4byte gUnknown_3005090 +_080A9964: .4byte gTasks _080A9968: .4byte gUnknown_2022984 _080A996C: .4byte sub_80A9984 _080A9970: @@ -15487,7 +15487,7 @@ sub_80A9984: @ 80A9984 lsls r0, 24 lsrs r0, 24 adds r5, r0, 0 - ldr r1, _080A99D0 @ =gUnknown_3005090 + ldr r1, _080A99D0 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -15518,7 +15518,7 @@ sub_80A9984: @ 80A9984 bl BlendPalettes b _080A9A0C .align 2, 0 -_080A99D0: .4byte gUnknown_3005090 +_080A99D0: .4byte gTasks _080A99D4: .4byte 0x00007fff _080A99D8: cmp r0, 0x4 @@ -15563,7 +15563,7 @@ sub_80A9A20: @ 80A9A20 bl GetAnimBankSpriteId lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _080A9A70 @ =gUnknown_3005090 + ldr r1, _080A9A70 @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -15592,7 +15592,7 @@ sub_80A9A20: @ 80A9A20 strh r1, [r0, 0x24] b _080A9AA4 .align 2, 0 -_080A9A70: .4byte gUnknown_3005090 +_080A9A70: .4byte gTasks _080A9A74: .4byte gUnknown_83E4200 _080A9A78: .4byte gSprites _080A9A7C: @@ -15632,7 +15632,7 @@ sub_80A9AB0: @ 80A9AB0 bl GetAnimBankSpriteId lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _080A9B00 @ =gUnknown_3005090 + ldr r1, _080A9B00 @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -15661,7 +15661,7 @@ sub_80A9AB0: @ 80A9AB0 strh r1, [r0, 0x24] b _080A9B34 .align 2, 0 -_080A9B00: .4byte gUnknown_3005090 +_080A9B00: .4byte gTasks _080A9B04: .4byte gUnknown_83E4200 _080A9B08: .4byte gSprites _080A9B0C: @@ -15980,7 +15980,7 @@ _080A9D2A: movs r3, 0 bl sub_80730C0 _080A9D88: - ldr r0, _080A9DB8 @ =gUnknown_3005090 + ldr r0, _080A9DB8 @ =gTasks lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -15998,7 +15998,7 @@ _080A9DA8: .4byte gUnknown_202297A _080A9DAC: .4byte gUnknown_8D23F4C _080A9DB0: .4byte gUnknown_8D234B4 _080A9DB4: .4byte gUnknown_8D23F24 -_080A9DB8: .4byte gUnknown_3005090 +_080A9DB8: .4byte gTasks _080A9DBC: .4byte sub_80A9DC0 thumb_func_end sub_80A9CE8 @@ -16008,7 +16008,7 @@ sub_80A9DC0: @ 80A9DC0 sub sp, 0x10 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _080A9DE8 @ =gUnknown_3005090 + ldr r1, _080A9DE8 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -16026,7 +16026,7 @@ _080A9DDE: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080A9DE8: .4byte gUnknown_3005090 +_080A9DE8: .4byte gTasks _080A9DEC: .4byte _080A9DF0 .align 2, 0 _080A9DF0: @@ -16127,7 +16127,7 @@ _080A9EAE: mov r0, sp ldrb r0, [r0, 0x9] bl sub_8075358 - ldr r1, _080A9ED0 @ =gUnknown_3005090 + ldr r1, _080A9ED0 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -16137,7 +16137,7 @@ _080A9EAE: strh r1, [r0, 0x20] b _080A9F08 .align 2, 0 -_080A9ED0: .4byte gUnknown_3005090 +_080A9ED0: .4byte gTasks _080A9ED4: bl sub_8073788 lsls r0, 24 @@ -16268,7 +16268,7 @@ _080A9FC6: movs r3, 0 bl sub_80730C0 _080A9FFA: - ldr r0, _080AA01C @ =gUnknown_3005090 + ldr r0, _080AA01C @ =gTasks lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -16283,7 +16283,7 @@ _080A9FFA: _080AA010: .4byte gUnknown_8E7F690 _080AA014: .4byte gUnknown_8D24BCC _080AA018: .4byte gUnknown_8D24BA4 -_080AA01C: .4byte gUnknown_3005090 +_080AA01C: .4byte gTasks _080AA020: .4byte sub_80AA024 thumb_func_end sub_80A9F10 @@ -16293,7 +16293,7 @@ sub_80AA024: @ 80AA024 sub sp, 0x10 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _080AA04C @ =gUnknown_3005090 + ldr r1, _080AA04C @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -16311,7 +16311,7 @@ _080AA042: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080AA04C: .4byte gUnknown_3005090 +_080AA04C: .4byte gTasks _080AA050: .4byte _080AA054 .align 2, 0 _080AA054: @@ -16413,7 +16413,7 @@ _080AA112: bl sub_8075358 movs r0, 0x2 bl sub_8075358 - ldr r0, _080AA170 @ =gUnknown_3005090 + ldr r0, _080AA170 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -16449,7 +16449,7 @@ _080AA168: pop {r0} bx r0 .align 2, 0 -_080AA170: .4byte gUnknown_3005090 +_080AA170: .4byte gTasks thumb_func_end sub_80AA024 thumb_func_start sub_80AA174 @@ -17309,7 +17309,7 @@ sub_80AA7C8: @ 80AA7C8 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 - ldr r0, _080AA800 @ =gUnknown_3005090 + ldr r0, _080AA800 @ =gTasks adds r4, r0 ldr r2, _080AA804 @ =gUnknown_83E4410 adds r0, r4, 0 @@ -17321,7 +17321,7 @@ sub_80AA7C8: @ 80AA7C8 bx r0 .align 2, 0 _080AA7FC: .4byte gUnknown_2037F02 -_080AA800: .4byte gUnknown_3005090 +_080AA800: .4byte gTasks _080AA804: .4byte gUnknown_83E4410 _080AA808: .4byte sub_80AA80C thumb_func_end sub_80AA7C8 @@ -17334,7 +17334,7 @@ sub_80AA80C: @ 80AA80C lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _080AA834 @ =gUnknown_3005090 + ldr r1, _080AA834 @ =gTasks adds r0, r1 bl sub_8076308 lsls r0, 24 @@ -17347,7 +17347,7 @@ _080AA82C: pop {r0} bx r0 .align 2, 0 -_080AA834: .4byte gUnknown_3005090 +_080AA834: .4byte gTasks thumb_func_end sub_80AA80C thumb_func_start sub_80AA838 @@ -17823,7 +17823,7 @@ sub_80AABC0: @ 80AABC0 lsls r0, 24 lsrs r0, 24 adds r6, r0, 0 - ldr r1, _080AAC48 @ =gUnknown_3005090 + ldr r1, _080AAC48 @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -17884,7 +17884,7 @@ _080AAC42: pop {r0} bx r0 .align 2, 0 -_080AAC48: .4byte gUnknown_3005090 +_080AAC48: .4byte gTasks _080AAC4C: .4byte gUnknown_2037F02 _080AAC50: .4byte gUnknown_83E5898 thumb_func_end sub_80AABC0 @@ -18279,7 +18279,7 @@ sub_80AAF60: @ 80AAF60 push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _080AAF94 @ =gUnknown_3005090 + ldr r1, _080AAF94 @ =gTasks lsls r4, r0, 2 adds r4, r0 lsls r4, 3 @@ -18301,7 +18301,7 @@ sub_80AAF60: @ 80AAF60 pop {r0} bx r0 .align 2, 0 -_080AAF94: .4byte gUnknown_3005090 +_080AAF94: .4byte gTasks _080AAF98: .4byte gUnknown_2037F02 _080AAF9C: .4byte 0x0000279c _080AAFA0: .4byte sub_80AAFA4 @@ -18312,7 +18312,7 @@ sub_80AAFA4: @ 80AAFA4 push {r4-r7,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _080AB01C @ =gUnknown_3005090 + ldr r1, _080AB01C @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -18372,7 +18372,7 @@ _080AB016: pop {r0} bx r0 .align 2, 0 -_080AB01C: .4byte gUnknown_3005090 +_080AB01C: .4byte gTasks _080AB020: .4byte gUnknown_20375F8 thumb_func_end sub_80AAFA4 @@ -18491,7 +18491,7 @@ _080AB0F8: sub_80AB100: @ 80AB100 lsls r0, 24 lsrs r0, 24 - ldr r2, _080AB120 @ =gUnknown_3005090 + ldr r2, _080AB120 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -18505,7 +18505,7 @@ sub_80AB100: @ 80AB100 str r0, [r1] bx lr .align 2, 0 -_080AB120: .4byte gUnknown_3005090 +_080AB120: .4byte gTasks _080AB124: .4byte gUnknown_2037F02 _080AB128: .4byte sub_80AB12C thumb_func_end sub_80AB100 @@ -18521,7 +18521,7 @@ sub_80AB12C: @ 80AB12C movs r1, 0xFF ands r0, r1 strh r0, [r2, 0xE] - ldr r1, _080AB164 @ =gUnknown_3005090 + ldr r1, _080AB164 @ =gTasks lsls r0, r3, 2 adds r0, r3 lsls r0, 3 @@ -18539,7 +18539,7 @@ _080AB15A: bx r0 .align 2, 0 _080AB160: .4byte gUnknown_2037F02 -_080AB164: .4byte gUnknown_3005090 +_080AB164: .4byte gTasks thumb_func_end sub_80AB12C thumb_func_start sub_80AB168 @@ -18923,7 +18923,7 @@ _080AB468: bl LoadCompressedPalette _080AB476: ldr r0, _080AB4E4 @ =sub_80AB79C - ldr r4, _080AB4E8 @ =gUnknown_3005090 + ldr r4, _080AB4E8 @ =gTasks mov r2, r10 lsls r5, r2, 2 adds r1, r5, r2 @@ -18975,7 +18975,7 @@ _080AB476: .align 2, 0 _080AB4E0: .4byte gUnknown_8E7BAB0 _080AB4E4: .4byte sub_80AB79C -_080AB4E8: .4byte gUnknown_3005090 +_080AB4E8: .4byte gTasks _080AB4EC: .4byte 0x0000ffb0 _080AB4F0: .4byte gUnknown_2022978 _080AB4F4: .4byte gUnknown_202297A @@ -19029,7 +19029,7 @@ _080AB552: ldrh r1, [r2] movs r0, 0x16 bl SetGpuReg - ldr r1, _080AB594 @ =gUnknown_3005090 + ldr r1, _080AB594 @ =gTasks mov r2, r8 lsls r0, r2, 2 add r0, r8 @@ -19048,13 +19048,13 @@ _080AB584: .4byte gUnknown_2022978 _080AB588: .4byte 0x0000ffd0 _080AB58C: .4byte gUnknown_202297A _080AB590: .4byte 0x0000fffe -_080AB594: .4byte gUnknown_3005090 +_080AB594: .4byte gTasks _080AB598: movs r0, 0 strh r0, [r1, 0x10] _080AB59C: strh r0, [r1, 0x12] - ldr r1, _080AB5C0 @ =gUnknown_3005090 + ldr r1, _080AB5C0 @ =gTasks mov r2, r10 adds r0, r5, r2 lsls r0, 3 @@ -19072,7 +19072,7 @@ _080AB59C: pop {r0} bx r0 .align 2, 0 -_080AB5C0: .4byte gUnknown_3005090 +_080AB5C0: .4byte gTasks _080AB5C4: .4byte sub_80AB5C8 thumb_func_end sub_80AB38C @@ -19084,7 +19084,7 @@ sub_80AB5C8: @ 80AB5C8 lsrs r5, r0, 24 ldr r1, _080AB6F4 @ =gUnknown_2022978 ldr r2, _080AB6F8 @ =gUnknown_202297A - ldr r0, _080AB6FC @ =gUnknown_3005090 + ldr r0, _080AB6FC @ =gTasks lsls r4, r5, 2 adds r4, r5 lsls r4, 3 @@ -19146,14 +19146,14 @@ _080AB622: lsls r0, 1 adds r0, r7 strh r6, [r0] - ldr r1, _080AB6FC @ =gUnknown_3005090 + ldr r1, _080AB6FC @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 strh r2, [r0, 0x12] _080AB65C: - ldr r1, _080AB6FC @ =gUnknown_3005090 + ldr r1, _080AB6FC @ =gTasks lsls r2, r5, 2 adds r0, r2, r5 lsls r0, 3 @@ -19235,7 +19235,7 @@ _080AB6EC: .align 2, 0 _080AB6F4: .4byte gUnknown_2022978 _080AB6F8: .4byte gUnknown_202297A -_080AB6FC: .4byte gUnknown_3005090 +_080AB6FC: .4byte gTasks _080AB700: .4byte gUnknown_20375F8 _080AB704: .4byte sub_80AB708 thumb_func_end sub_80AB5C8 @@ -19251,7 +19251,7 @@ sub_80AB708: @ 80AB708 ldr r7, _080AB740 @ =gUnknown_2022978 ldr r0, _080AB744 @ =gUnknown_202297A mov r8, r0 - ldr r6, _080AB748 @ =gUnknown_3005090 + ldr r6, _080AB748 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -19271,7 +19271,7 @@ sub_80AB708: @ 80AB708 .align 2, 0 _080AB740: .4byte gUnknown_2022978 _080AB744: .4byte gUnknown_202297A -_080AB748: .4byte gUnknown_3005090 +_080AB748: .4byte gTasks _080AB74C: bl sub_8073788 lsls r0, 24 @@ -19321,7 +19321,7 @@ sub_80AB79C: @ 80AB79C lsls r0, r7, 2 adds r0, r7 lsls r0, 3 - ldr r1, _080AB7C4 @ =gUnknown_3005090 + ldr r1, _080AB7C4 @ =gTasks adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -19335,7 +19335,7 @@ _080AB7B8: beq _080AB7D0 b _080ABA66 .align 2, 0 -_080AB7C4: .4byte gUnknown_3005090 +_080AB7C4: .4byte gTasks _080AB7C8: cmp r0, 0x2 bne _080AB7CE @@ -19800,7 +19800,7 @@ sub_80ABB28: @ 80ABB28 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _080ABB78 @ =gUnknown_3005090 + ldr r0, _080ABB78 @ =gTasks adds r4, r0 movs r0, 0 bl GetAnimBankSpriteId @@ -19831,7 +19831,7 @@ sub_80ABB28: @ 80ABB28 pop {r0} bx r0 .align 2, 0 -_080ABB78: .4byte gUnknown_3005090 +_080ABB78: .4byte gTasks _080ABB7C: .4byte gSprites _080ABB80: .4byte sub_80ABB84 thumb_func_end sub_80ABB28 @@ -19845,7 +19845,7 @@ sub_80ABB84: @ 80ABB84 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _080ABBAC @ =gUnknown_3005090 + ldr r1, _080ABBAC @ =gTasks adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -19859,7 +19859,7 @@ _080ABBA0: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080ABBAC: .4byte gUnknown_3005090 +_080ABBAC: .4byte gTasks _080ABBB0: .4byte _080ABBB4 .align 2, 0 _080ABBB4: @@ -20397,7 +20397,7 @@ _080ABFA8: cmp r1, 0x78 ble _080AC002 _080ABFDE: - ldr r3, _080AC008 @ =gUnknown_3005090 + ldr r3, _080AC008 @ =gTasks movs r0, 0x3C ldrsh r1, [r4, r0] lsls r1, 1 @@ -20419,7 +20419,7 @@ _080AC002: pop {r0} bx r0 .align 2, 0 -_080AC008: .4byte gUnknown_3005090 +_080AC008: .4byte gTasks thumb_func_end sub_80ABF60 thumb_func_start sub_80AC00C @@ -20430,7 +20430,7 @@ sub_80AC00C: @ 80AC00C lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080AC03C @ =gUnknown_3005090 + ldr r0, _080AC03C @ =gTasks adds r4, r1, r0 bl sub_80ABDC8 lsls r0, 24 @@ -20447,7 +20447,7 @@ sub_80AC00C: @ 80AC00C movs r0, 0x28 b _080AC04A .align 2, 0 -_080AC03C: .4byte gUnknown_3005090 +_080AC03C: .4byte gTasks _080AC040: .4byte gUnknown_2037F1A _080AC044: movs r0, 0x10 @@ -20485,7 +20485,7 @@ sub_80AC070: @ 80AC070 lsls r0, r1, 2 adds r0, r1 lsls r0, 3 - ldr r7, _080AC094 @ =gUnknown_3005090 + ldr r7, _080AC094 @ =gTasks adds r4, r0, r7 movs r0, 0x8 ldrsh r2, [r4, r0] @@ -20495,7 +20495,7 @@ sub_80AC070: @ 80AC070 beq _080AC148 b _080AC156 .align 2, 0 -_080AC094: .4byte gUnknown_3005090 +_080AC094: .4byte gTasks _080AC098: ldrh r0, [r4, 0xC] adds r0, 0x1 @@ -20693,7 +20693,7 @@ sub_80AC204: @ 80AC204 ldrsh r1, [r5, r2] cmp r0, r1 blt _080AC29A - ldr r2, _080AC2A0 @ =gUnknown_3005090 + ldr r2, _080AC2A0 @ =gTasks movs r3, 0x3A ldrsh r1, [r5, r3] lsls r0, r1, 2 @@ -20756,7 +20756,7 @@ _080AC29A: pop {r0} bx r0 .align 2, 0 -_080AC2A0: .4byte gUnknown_3005090 +_080AC2A0: .4byte gTasks _080AC2A4: .4byte gUnknown_83E7C38 _080AC2A8: .4byte gSprites _080AC2AC: .4byte sub_80AC2B0 @@ -20795,7 +20795,7 @@ sub_80AC2B0: @ 80AC2B0 asrs r0, 16 cmp r0, 0xC bne _080AC31C - ldr r3, _080AC324 @ =gUnknown_3005090 + ldr r3, _080AC324 @ =gTasks movs r0, 0x3C ldrsh r1, [r4, r0] lsls r1, 1 @@ -20821,7 +20821,7 @@ _080AC31C: pop {r0} bx r0 .align 2, 0 -_080AC324: .4byte gUnknown_3005090 +_080AC324: .4byte gTasks thumb_func_end sub_80AC2B0 thumb_func_start sub_80AC328 @@ -20832,7 +20832,7 @@ sub_80AC328: @ 80AC328 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080AC3AC @ =gUnknown_3005090 + ldr r0, _080AC3AC @ =gTasks adds r5, r1, r0 ldr r4, _080AC3B0 @ =gUnknown_2037F1A ldrb r0, [r4] @@ -20890,7 +20890,7 @@ _080AC380: pop {r0} bx r0 .align 2, 0 -_080AC3AC: .4byte gUnknown_3005090 +_080AC3AC: .4byte gTasks _080AC3B0: .4byte gUnknown_2037F1A _080AC3B4: .4byte 0x0000ffe0 _080AC3B8: .4byte sub_80AC3BC @@ -20904,7 +20904,7 @@ sub_80AC3BC: @ 80AC3BC lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _080AC3E0 @ =gUnknown_3005090 + ldr r1, _080AC3E0 @ =gTasks adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -20918,7 +20918,7 @@ _080AC3D6: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080AC3E0: .4byte gUnknown_3005090 +_080AC3E0: .4byte gTasks _080AC3E4: .4byte _080AC3E8 .align 2, 0 _080AC3E8: @@ -21177,7 +21177,7 @@ sub_80AC5D8: @ 80AC5D8 cmp r0, 0 beq _080AC614 movs r4, 0 - ldr r6, _080AC61C @ =gUnknown_3005090 + ldr r6, _080AC61C @ =gTasks _080AC5EA: lsls r0, r4, 2 adds r0, r4 @@ -21205,7 +21205,7 @@ _080AC614: pop {r0} bx r0 .align 2, 0 -_080AC61C: .4byte gUnknown_3005090 +_080AC61C: .4byte gTasks _080AC620: .4byte sub_80AC3BC thumb_func_end sub_80AC5D8 @@ -22329,7 +22329,7 @@ sub_80ACEA4: @ 80ACEA4 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _080ACF04 @ =gUnknown_3005090 + ldr r0, _080ACF04 @ =gTasks adds r4, r0 movs r0, 0 bl GetAnimBankSpriteId @@ -22368,7 +22368,7 @@ sub_80ACEA4: @ 80ACEA4 pop {r0} bx r0 .align 2, 0 -_080ACF04: .4byte gUnknown_3005090 +_080ACF04: .4byte gTasks _080ACF08: .4byte gSprites _080ACF0C: .4byte gUnknown_2037F1A _080ACF10: .4byte sub_80ACF14 @@ -22383,7 +22383,7 @@ sub_80ACF14: @ 80ACF14 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080ACF3C @ =gUnknown_3005090 + ldr r1, _080ACF3C @ =gTasks adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -22397,7 +22397,7 @@ _080ACF30: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080ACF3C: .4byte gUnknown_3005090 +_080ACF3C: .4byte gTasks _080ACF40: .4byte _080ACF44 .align 2, 0 _080ACF44: @@ -22873,7 +22873,7 @@ _080AD2C2: adds r0, r7 lsls r0, 3 add r0, r10 - ldr r1, _080AD32C @ =gUnknown_3005098 + ldr r1, _080AD32C @ =gTasks+0x8 adds r0, r1 ldrh r1, [r0] adds r1, 0x1 @@ -22899,7 +22899,7 @@ _080AD31C: .4byte gSprites _080AD320: .4byte 0x000003ff _080AD324: .4byte 0xfffffc00 _080AD328: .4byte gUnknown_83E5E46 -_080AD32C: .4byte gUnknown_3005098 +_080AD32C: .4byte gTasks+0x8 thumb_func_end sub_80AD1F8 thumb_func_start sub_80AD330 @@ -22914,7 +22914,7 @@ sub_80AD330: @ 80AD330 ands r0, r1 cmp r0, 0 beq _080AD36A - ldr r3, _080AD370 @ =gUnknown_3005090 + ldr r3, _080AD370 @ =gTasks movs r0, 0x3C ldrsh r1, [r4, r0] lsls r1, 1 @@ -22936,7 +22936,7 @@ _080AD36A: pop {r0} bx r0 .align 2, 0 -_080AD370: .4byte gUnknown_3005090 +_080AD370: .4byte gTasks thumb_func_end sub_80AD330 thumb_func_start sub_80AD374 @@ -23560,7 +23560,7 @@ sub_80AD800: @ 80AD800 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080AD860 @ =gUnknown_3005090 + ldr r0, _080AD860 @ =gTasks adds r4, r1, r0 ldr r0, _080AD864 @ =gUnknown_2037F1A ldrb r0, [r0] @@ -23599,7 +23599,7 @@ _080AD826: pop {r0} bx r0 .align 2, 0 -_080AD860: .4byte gUnknown_3005090 +_080AD860: .4byte gTasks _080AD864: .4byte gUnknown_2037F1A _080AD868: .4byte gUnknown_2037F1B _080AD86C: .4byte sub_80AD870 @@ -23613,7 +23613,7 @@ sub_80AD870: @ 80AD870 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _080AD894 @ =gUnknown_3005090 + ldr r1, _080AD894 @ =gTasks adds r2, r0, r1 movs r0, 0x8 ldrsh r3, [r2, r0] @@ -23625,7 +23625,7 @@ sub_80AD870: @ 80AD870 beq _080AD8A6 b _080ADA98 .align 2, 0 -_080AD894: .4byte gUnknown_3005090 +_080AD894: .4byte gTasks _080AD898: cmp r3, 0x2 bne _080AD89E @@ -23946,7 +23946,7 @@ sub_80ADAD8: @ 80ADAD8 push {r5-r7} lsls r0, 24 lsrs r7, r0, 24 - ldr r1, _080ADB30 @ =gUnknown_3005090 + ldr r1, _080ADB30 @ =gTasks lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -23984,7 +23984,7 @@ _080ADB0E: ldrsh r0, [r2, r1] b _080ADB4A .align 2, 0 -_080ADB30: .4byte gUnknown_3005090 +_080ADB30: .4byte gTasks _080ADB34: .4byte gUnknown_2037F02 _080ADB38: .4byte gUnknown_2023D44 _080ADB3C: .4byte gUnknown_2037F1B @@ -24883,7 +24883,7 @@ sub_80AE220: @ 80AE220 ldrb r0, [r6] movs r1, 0 bl sub_8074480 - ldr r1, _080AE26C @ =gUnknown_3005090 + ldr r1, _080AE26C @ =gTasks lsls r4, r5, 2 adds r4, r5 lsls r4, 3 @@ -24911,7 +24911,7 @@ sub_80AE220: @ 80AE220 bx r0 .align 2, 0 _080AE268: .4byte gUnknown_2037F1B -_080AE26C: .4byte gUnknown_3005090 +_080AE26C: .4byte gTasks _080AE270: .4byte gUnknown_2037F02 _080AE274: .4byte sub_80AE278 thumb_func_end sub_80AE220 @@ -24929,7 +24929,7 @@ sub_80AE278: @ 80AE278 mov r9, r0 movs r5, 0 movs r7, 0 - ldr r1, _080AE2B8 @ =gUnknown_3005090 + ldr r1, _080AE2B8 @ =gTasks lsls r0, 2 add r0, r9 lsls r0, 3 @@ -24950,7 +24950,7 @@ sub_80AE278: @ 80AE278 mov r12, r1 b _080AE2C6 .align 2, 0 -_080AE2B8: .4byte gUnknown_3005090 +_080AE2B8: .4byte gTasks _080AE2BC: movs r2, 0x10 mov r12, r2 @@ -25103,7 +25103,7 @@ _080AE3BC: ldr r1, [r3] bl _call_via_r1 _080AE3F0: - ldr r0, _080AE41C @ =gUnknown_3005090 + ldr r0, _080AE41C @ =gTasks mov r1, r10 add r1, r9 lsls r1, 3 @@ -25124,7 +25124,7 @@ _080AE400: _080AE410: .4byte gSprites _080AE414: .4byte 0x000003ff _080AE418: .4byte 0xfffffc00 -_080AE41C: .4byte gUnknown_3005090 +_080AE41C: .4byte gTasks thumb_func_end sub_80AE278 thumb_func_start sub_80AE420 @@ -25286,7 +25286,7 @@ sub_80AE540: @ 80AE540 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080AE560 @ =gUnknown_3005090 + ldr r0, _080AE560 @ =gTasks adds r5, r1, r0 ldr r0, _080AE564 @ =gUnknown_2037F02 movs r1, 0 @@ -25296,7 +25296,7 @@ sub_80AE540: @ 80AE540 ldr r4, _080AE568 @ =gUnknown_2037F1A b _080AE56E .align 2, 0 -_080AE560: .4byte gUnknown_3005090 +_080AE560: .4byte gTasks _080AE564: .4byte gUnknown_2037F02 _080AE568: .4byte gUnknown_2037F1A _080AE56C: @@ -25347,7 +25347,7 @@ sub_80AE5BC: @ 80AE5BC lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _080AE6A4 @ =gUnknown_3005090 + ldr r1, _080AE6A4 @ =gTasks adds r5, r0, r1 movs r1, 0x14 ldrsh r0, [r5, r1] @@ -25456,7 +25456,7 @@ _080AE696: strh r0, [r5, 0x14] b _080AE6CA .align 2, 0 -_080AE6A4: .4byte gUnknown_3005090 +_080AE6A4: .4byte gTasks _080AE6A8: .4byte gUnknown_83E6120 _080AE6AC: .4byte gSprites _080AE6B0: .4byte gUnknown_83E60D0 @@ -25483,7 +25483,7 @@ sub_80AE6D0: @ 80AE6D0 lsls r0, 24 cmp r0, 0 beq _080AE6F8 - ldr r2, _080AE700 @ =gUnknown_3005090 + ldr r2, _080AE700 @ =gTasks movs r0, 0x38 ldrsh r1, [r4, r0] lsls r0, r1, 2 @@ -25500,7 +25500,7 @@ _080AE6F8: pop {r0} bx r0 .align 2, 0 -_080AE700: .4byte gUnknown_3005090 +_080AE700: .4byte gTasks thumb_func_end sub_80AE6D0 thumb_func_start sub_80AE704 @@ -25720,7 +25720,7 @@ sub_80AE8A0: @ 80AE8A0 lsls r0, r3, 2 adds r0, r3 lsls r0, 3 - ldr r1, _080AE8C4 @ =gUnknown_3005090 + ldr r1, _080AE8C4 @ =gTasks adds r5, r0, r1 movs r1, 0x8 ldrsh r0, [r5, r1] @@ -25732,7 +25732,7 @@ sub_80AE8A0: @ 80AE8A0 beq _080AE8D4 b _080AEA04 .align 2, 0 -_080AE8C4: .4byte gUnknown_3005090 +_080AE8C4: .4byte gTasks _080AE8C8: cmp r0, 0x2 beq _080AE990 @@ -25908,7 +25908,7 @@ sub_80AEA10: @ 80AEA10 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _080AEA34 @ =gUnknown_3005090 + ldr r1, _080AEA34 @ =gTasks adds r5, r0, r1 movs r1, 0x8 ldrsh r0, [r5, r1] @@ -25922,7 +25922,7 @@ _080AEA2A: beq _080AEA40 b _080AEB92 .align 2, 0 -_080AEA34: .4byte gUnknown_3005090 +_080AEA34: .4byte gTasks _080AEA38: cmp r0, 0x2 bne _080AEA3E @@ -26202,7 +26202,7 @@ sub_80AEC34: @ 80AEC34 asrs r0, 16 cmp r0, 0xC ble _080AEC74 - ldr r3, _080AEC7C @ =gUnknown_3005090 + ldr r3, _080AEC7C @ =gTasks movs r0, 0x3C ldrsh r1, [r4, r0] lsls r1, 1 @@ -26228,7 +26228,7 @@ _080AEC74: pop {r0} bx r0 .align 2, 0 -_080AEC7C: .4byte gUnknown_3005090 +_080AEC7C: .4byte gTasks thumb_func_end sub_80AEC34 thumb_func_start sub_80AEC80 @@ -26289,7 +26289,7 @@ sub_80AECE0: @ 80AECE0 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _080AED04 @ =gUnknown_3005090 + ldr r1, _080AED04 @ =gTasks adds r5, r0, r1 movs r1, 0x8 ldrsh r0, [r5, r1] @@ -26303,7 +26303,7 @@ _080AECFA: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080AED04: .4byte gUnknown_3005090 +_080AED04: .4byte gTasks _080AED08: .4byte _080AED0C .align 2, 0 _080AED0C: @@ -26620,7 +26620,7 @@ sub_80AEF60: @ 80AEF60 asrs r0, 16 cmp r0, 0xC ble _080AEF96 - ldr r3, _080AEF9C @ =gUnknown_3005090 + ldr r3, _080AEF9C @ =gTasks movs r0, 0x3C ldrsh r1, [r4, r0] lsls r1, 1 @@ -26642,7 +26642,7 @@ _080AEF96: pop {r0} bx r0 .align 2, 0 -_080AEF9C: .4byte gUnknown_3005090 +_080AEF9C: .4byte gTasks thumb_func_end sub_80AEF60 thumb_func_start sub_80AEFA0 @@ -26653,7 +26653,7 @@ sub_80AEFA0: @ 80AEFA0 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _080AEFC4 @ =gUnknown_3005090 + ldr r1, _080AEFC4 @ =gTasks adds r5, r0, r1 movs r1, 0x8 ldrsh r0, [r5, r1] @@ -26665,7 +26665,7 @@ sub_80AEFA0: @ 80AEFA0 beq _080AEFCE b _080AF052 .align 2, 0 -_080AEFC4: .4byte gUnknown_3005090 +_080AEFC4: .4byte gTasks _080AEFC8: cmp r0, 0x2 beq _080AF044 @@ -26813,7 +26813,7 @@ sub_80AF0C8: @ 80AF0C8 ands r0, r1 cmp r0, 0 beq _080AF0FC - ldr r3, _080AF104 @ =gUnknown_3005090 + ldr r3, _080AF104 @ =gTasks movs r0, 0x3C ldrsh r1, [r4, r0] lsls r1, 1 @@ -26835,7 +26835,7 @@ _080AF0FC: pop {r0} bx r0 .align 2, 0 -_080AF104: .4byte gUnknown_3005090 +_080AF104: .4byte gTasks thumb_func_end sub_80AF0C8 thumb_func_start sub_80AF108 @@ -28182,7 +28182,7 @@ _080AFB26: movs r3, 0 bl sub_80730C0 _080AFB88: - ldr r0, _080AFBB8 @ =gUnknown_3005090 + ldr r0, _080AFBB8 @ =gTasks lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -28200,7 +28200,7 @@ _080AFBA8: .4byte gUnknown_202297A _080AFBAC: .4byte gUnknown_83C3540 _080AFBB0: .4byte gUnknown_8E7F1F4 _080AFBB4: .4byte gUnknown_83C2CE0 -_080AFBB8: .4byte gUnknown_3005090 +_080AFBB8: .4byte gTasks _080AFBBC: .4byte sub_80AFBC0 thumb_func_end sub_80AFAE4 @@ -28216,7 +28216,7 @@ sub_80AFBC0: @ 80AFBC0 ldrh r2, [r1] adds r0, r2 strh r0, [r1] - ldr r1, _080AFBFC @ =gUnknown_3005090 + ldr r1, _080AFBFC @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -28236,7 +28236,7 @@ _080AFBEA: .align 2, 0 _080AFBF4: .4byte gUnknown_2022978 _080AFBF8: .4byte 0x0000ffff -_080AFBFC: .4byte gUnknown_3005090 +_080AFBFC: .4byte gTasks _080AFC00: .4byte _080AFC04 .align 2, 0 _080AFC04: @@ -28348,7 +28348,7 @@ _080AFCD6: bl sub_8075358 movs r0, 0x2 bl sub_8075358 - ldr r0, _080AFD40 @ =gUnknown_3005090 + ldr r0, _080AFD40 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -28389,7 +28389,7 @@ _080AFD36: pop {r0} bx r0 .align 2, 0 -_080AFD40: .4byte gUnknown_3005090 +_080AFD40: .4byte gTasks _080AFD44: .4byte gUnknown_2022978 _080AFD48: .4byte gUnknown_202297A thumb_func_end sub_80AFBC0 @@ -28493,7 +28493,7 @@ _080AFDC2: movs r3, 0 bl sub_80730C0 _080AFE24: - ldr r1, _080AFE58 @ =gUnknown_3005090 + ldr r1, _080AFE58 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -28513,7 +28513,7 @@ _080AFE48: .4byte gUnknown_202297A _080AFE4C: .4byte gUnknown_83C3540 _080AFE50: .4byte gUnknown_8E7F1F4 _080AFE54: .4byte gUnknown_83C2CE0 -_080AFE58: .4byte gUnknown_3005090 +_080AFE58: .4byte gTasks _080AFE5C: .4byte 0x0000ffff _080AFE60: .4byte sub_80AFE64 thumb_func_end sub_80AFD80 @@ -28525,7 +28525,7 @@ sub_80AFE64: @ 80AFE64 lsls r0, 24 lsrs r4, r0, 24 ldr r2, _080AFE94 @ =gUnknown_2022978 - ldr r3, _080AFE98 @ =gUnknown_3005090 + ldr r3, _080AFE98 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -28547,7 +28547,7 @@ _080AFE8A: mov pc, r0 .align 2, 0 _080AFE94: .4byte gUnknown_2022978 -_080AFE98: .4byte gUnknown_3005090 +_080AFE98: .4byte gTasks _080AFE9C: .4byte _080AFEA0 .align 2, 0 _080AFEA0: @@ -28649,7 +28649,7 @@ _080AFF5E: bl sub_8075358 movs r0, 0x2 bl sub_8075358 - ldr r0, _080AFFC8 @ =gUnknown_3005090 + ldr r0, _080AFFC8 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -28690,7 +28690,7 @@ _080AFFBE: pop {r0} bx r0 .align 2, 0 -_080AFFC8: .4byte gUnknown_3005090 +_080AFFC8: .4byte gTasks _080AFFCC: .4byte gUnknown_2022978 _080AFFD0: .4byte gUnknown_202297A thumb_func_end sub_80AFE64 @@ -29177,13 +29177,13 @@ sub_80B038C: @ 80B038C lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080B03A0 @ =gUnknown_3005090 + ldr r0, _080B03A0 @ =gTasks adds r1, r0 ldr r0, _080B03A4 @ =sub_80B03A8 str r0, [r1] bx lr .align 2, 0 -_080B03A0: .4byte gUnknown_3005090 +_080B03A0: .4byte gTasks _080B03A4: .4byte sub_80B03A8 thumb_func_end sub_80B038C @@ -29195,7 +29195,7 @@ sub_80B03A8: @ 80B03A8 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _080B03CC @ =gUnknown_3005090 + ldr r1, _080B03CC @ =gTasks adds r4, r0, r1 movs r0, 0x8 ldrsh r5, [r4, r0] @@ -29207,7 +29207,7 @@ sub_80B03A8: @ 80B03A8 beq _080B03D6 b _080B0450 .align 2, 0 -_080B03CC: .4byte gUnknown_3005090 +_080B03CC: .4byte gTasks _080B03D0: cmp r5, 0x2 beq _080B0442 @@ -29551,7 +29551,7 @@ _080B066C: .4byte gUnknown_83E63E0 _080B0670: .4byte gSprites _080B0674: .4byte sub_80B06B0 _080B0678: - ldr r3, _080B06AC @ =gUnknown_3005090 + ldr r3, _080B06AC @ =gTasks movs r2, 0x3C ldrsh r1, [r4, r2] lsls r1, 1 @@ -29577,7 +29577,7 @@ _080B06A6: pop {r0} bx r0 .align 2, 0 -_080B06AC: .4byte gUnknown_3005090 +_080B06AC: .4byte gTasks thumb_func_end sub_80B05CC thumb_func_start sub_80B06B0 @@ -29591,7 +29591,7 @@ sub_80B06B0: @ 80B06B0 asrs r0, 16 cmp r0, 0x14 bne _080B06F0 - ldr r3, _080B06F8 @ =gUnknown_3005090 + ldr r3, _080B06F8 @ =gTasks movs r0, 0x3C ldrsh r1, [r4, r0] lsls r1, 1 @@ -29617,7 +29617,7 @@ _080B06F0: pop {r0} bx r0 .align 2, 0 -_080B06F8: .4byte gUnknown_3005090 +_080B06F8: .4byte gTasks thumb_func_end sub_80B06B0 thumb_func_start unc_080B06FC @@ -31460,7 +31460,7 @@ sub_80B1530: @ 80B1530 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _080B1560 @ =gUnknown_3005090 + ldr r1, _080B1560 @ =gTasks adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -31477,7 +31477,7 @@ sub_80B1530: @ 80B1530 strh r0, [r4, 0x18] b _080B157A .align 2, 0 -_080B1560: .4byte gUnknown_3005090 +_080B1560: .4byte gTasks _080B1564: .4byte gUnknown_2037F02 _080B1568: ldrh r0, [r4, 0x18] @@ -31987,7 +31987,7 @@ sub_80B194C: @ 80B194C push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _080B197C @ =gUnknown_3005090 + ldr r1, _080B197C @ =gTasks lsls r4, r0, 2 adds r4, r0 lsls r4, 3 @@ -32008,7 +32008,7 @@ sub_80B194C: @ 80B194C pop {r0} bx r0 .align 2, 0 -_080B197C: .4byte gUnknown_3005090 +_080B197C: .4byte gTasks _080B1980: .4byte gUnknown_2037F02 _080B1984: .4byte 0x00002719 _080B1988: .4byte sub_80B198C @@ -32019,7 +32019,7 @@ sub_80B198C: @ 80B198C push {r4-r7,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r2, _080B1A0C @ =gUnknown_3005090 + ldr r2, _080B1A0C @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -32082,7 +32082,7 @@ _080B1A04: pop {r0} bx r0 .align 2, 0 -_080B1A0C: .4byte gUnknown_3005090 +_080B1A0C: .4byte gTasks _080B1A10: .4byte gUnknown_20375F8 _080B1A14: .4byte 0x00000107 _080B1A18: .4byte 0x00000101 @@ -33976,7 +33976,7 @@ sub_80B2868: @ 80B2868 lsls r0, 24 lsrs r0, 24 adds r6, r0, 0 - ldr r1, _080B2900 @ =gUnknown_3005090 + ldr r1, _080B2900 @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -34043,7 +34043,7 @@ _080B28F6: pop {r0} bx r0 .align 2, 0 -_080B2900: .4byte gUnknown_3005090 +_080B2900: .4byte gTasks _080B2904: .4byte gUnknown_2037EE2 _080B2908: .4byte gUnknown_2037F02 _080B290C: .4byte gUnknown_83E7C98 @@ -35515,7 +35515,7 @@ sub_80B3418: @ 80B3418 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _080B3448 @ =gUnknown_3005090 + ldr r0, _080B3448 @ =gTasks adds r4, r0 movs r0, 0 bl GetAnimBankSpriteId @@ -35532,7 +35532,7 @@ sub_80B3418: @ 80B3418 pop {r0} bx r0 .align 2, 0 -_080B3448: .4byte gUnknown_3005090 +_080B3448: .4byte gTasks _080B344C: .4byte gUnknown_83E700C _080B3450: .4byte sub_80B3454 thumb_func_end sub_80B3418 @@ -35545,7 +35545,7 @@ sub_80B3454: @ 80B3454 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _080B347C @ =gUnknown_3005090 + ldr r1, _080B347C @ =gTasks adds r0, r1 bl sub_8076308 lsls r0, 24 @@ -35558,7 +35558,7 @@ _080B3474: pop {r0} bx r0 .align 2, 0 -_080B347C: .4byte gUnknown_3005090 +_080B347C: .4byte gTasks thumb_func_end sub_80B3454 thumb_func_start sub_80B3480 @@ -35569,7 +35569,7 @@ sub_80B3480: @ 80B3480 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080B34CC @ =gUnknown_3005090 + ldr r0, _080B34CC @ =gTasks adds r4, r1, r0 movs r0, 0 bl GetAnimBankSpriteId @@ -35599,7 +35599,7 @@ _080B34B4: pop {r0} bx r0 .align 2, 0 -_080B34CC: .4byte gUnknown_3005090 +_080B34CC: .4byte gTasks _080B34D0: .4byte gUnknown_2037F1A _080B34D4: .4byte gUnknown_83E702C _080B34D8: .4byte sub_80B34DC @@ -35613,7 +35613,7 @@ sub_80B34DC: @ 80B34DC lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080B34FC @ =gUnknown_3005090 + ldr r1, _080B34FC @ =gTasks adds r4, r0, r1 movs r1, 0xA ldrsh r0, [r4, r1] @@ -35623,7 +35623,7 @@ sub_80B34DC: @ 80B34DC beq _080B351C b _080B357A .align 2, 0 -_080B34FC: .4byte gUnknown_3005090 +_080B34FC: .4byte gTasks _080B3500: adds r0, r4, 0 bl sub_8076308 @@ -35701,7 +35701,7 @@ sub_80B3584: @ 80B3584 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080B360C @ =gUnknown_3005090 + ldr r0, _080B360C @ =gTasks adds r5, r1, r0 movs r1, 0 movs r0, 0x10 @@ -35757,7 +35757,7 @@ _080B35EE: pop {r0} bx r0 .align 2, 0 -_080B360C: .4byte gUnknown_3005090 +_080B360C: .4byte gTasks _080B3610: .4byte gUnknown_2037F1A _080B3614: .4byte sub_80B3618 thumb_func_end sub_80B3584 @@ -35770,7 +35770,7 @@ sub_80B3618: @ 80B3618 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080B363C @ =gUnknown_3005090 + ldr r1, _080B363C @ =gTasks adds r4, r0, r1 movs r0, 0x8 ldrsh r1, [r4, r0] @@ -35782,7 +35782,7 @@ sub_80B3618: @ 80B3618 beq _080B364E b _080B379E .align 2, 0 -_080B363C: .4byte gUnknown_3005090 +_080B363C: .4byte gTasks _080B3640: cmp r1, 0x2 bne _080B3646 @@ -36060,7 +36060,7 @@ sub_80B3834: @ 80B3834 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080B3890 @ =gUnknown_3005090 + ldr r0, _080B3890 @ =gTasks adds r5, r1, r0 bl sub_8073788 lsls r0, 24 @@ -36096,7 +36096,7 @@ sub_80B3834: @ 80B3834 adds r0, 0x8 b _080B3962 .align 2, 0 -_080B3890: .4byte gUnknown_3005090 +_080B3890: .4byte gTasks _080B3894: .4byte gUnknown_2037F02 _080B3898: .4byte 0x0000fff6 _080B389C: .4byte gUnknown_2037F1B @@ -36207,7 +36207,7 @@ sub_80B3980: @ 80B3980 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _080B39A0 @ =gUnknown_3005090 + ldr r1, _080B39A0 @ =gTasks adds r5, r0, r1 movs r0, 0x8 ldrsh r1, [r5, r0] @@ -36217,7 +36217,7 @@ sub_80B3980: @ 80B3980 beq _080B3A18 b _080B3A2C .align 2, 0 -_080B39A0: .4byte gUnknown_3005090 +_080B39A0: .4byte gTasks _080B39A4: ldrh r0, [r5, 0xA] adds r0, 0x1 @@ -36318,7 +36318,7 @@ sub_80B3A58: @ 80B3A58 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080B3A90 @ =gUnknown_3005090 + ldr r0, _080B3A90 @ =gTasks adds r4, r1, r0 ldr r0, _080B3A94 @ =gUnknown_2037F1B ldrb r0, [r0] @@ -36339,7 +36339,7 @@ sub_80B3A58: @ 80B3A58 beq _080B3AA2 b _080B3ACA .align 2, 0 -_080B3A90: .4byte gUnknown_3005090 +_080B3A90: .4byte gTasks _080B3A94: .4byte gUnknown_2037F1B _080B3A98: .4byte gUnknown_2037F02 _080B3A9C: @@ -36468,7 +36468,7 @@ sub_80B3B78: @ 80B3B78 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _080B3BA0 @ =gUnknown_3005090 + ldr r1, _080B3BA0 @ =gTasks adds r5, r0, r1 movs r1, 0x8 ldrsh r0, [r5, r1] @@ -36480,7 +36480,7 @@ sub_80B3B78: @ 80B3B78 beq _080B3BAA b _080B3C6A .align 2, 0 -_080B3BA0: .4byte gUnknown_3005090 +_080B3BA0: .4byte gTasks _080B3BA4: cmp r0, 0x2 beq _080B3C64 @@ -36609,7 +36609,7 @@ sub_80B3C78: @ 80B3C78 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _080B3CAC @ =gUnknown_3005090 + ldr r1, _080B3CAC @ =gTasks adds r7, r0, r1 bl AllocOamMatrix lsls r0, 24 @@ -36622,7 +36622,7 @@ sub_80B3C78: @ 80B3C78 bl DestroyAnimVisualTask b _080B3D5A .align 2, 0 -_080B3CAC: .4byte gUnknown_3005090 +_080B3CAC: .4byte gTasks _080B3CB0: ldr r1, _080B3CD4 @ =gUnknown_2037F02 ldrb r0, [r1] @@ -36726,7 +36726,7 @@ sub_80B3D78: @ 80B3D78 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080B3D9C @ =gUnknown_3005090 + ldr r1, _080B3D9C @ =gTasks adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -36738,7 +36738,7 @@ sub_80B3D78: @ 80B3D78 beq _080B3DAA b _080B3E7C .align 2, 0 -_080B3D9C: .4byte gUnknown_3005090 +_080B3D9C: .4byte gTasks _080B3DA0: cmp r0, 0x2 beq _080B3E4C @@ -38138,7 +38138,7 @@ _080B48B0: beq _080B48CA movs r5, 0x1 _080B48CA: - ldr r0, _080B4904 @ =gUnknown_3005090 + ldr r0, _080B4904 @ =gTasks lsls r1, r6, 2 adds r1, r6 lsls r1, 3 @@ -38159,7 +38159,7 @@ _080B48F4: .4byte gUnknown_8E794D0 _080B48F8: .4byte gUnknown_8E799FC _080B48FC: .4byte gUnknown_2037F02 _080B4900: .4byte gUnknown_2037F1A -_080B4904: .4byte gUnknown_3005090 +_080B4904: .4byte gTasks _080B4908: .4byte sub_80B490C thumb_func_end do_boulder_dust @@ -38169,7 +38169,7 @@ sub_80B490C: @ 80B490C sub sp, 0x10 lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _080B4934 @ =gUnknown_3005090 + ldr r1, _080B4934 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -38186,7 +38186,7 @@ sub_80B490C: @ 80B490C adds r0, r3 b _080B4946 .align 2, 0 -_080B4934: .4byte gUnknown_3005090 +_080B4934: .4byte gTasks _080B4938: .4byte gUnknown_2022978 _080B493C: .4byte 0x0000fffa _080B4940: @@ -38315,7 +38315,7 @@ _080B4A36: mov r0, sp ldrb r0, [r0, 0x9] bl sub_8075358 - ldr r0, _080B4A54 @ =gUnknown_3005090 + ldr r0, _080B4A54 @ =gTasks adds r1, r4, r5 lsls r1, 3 adds r1, r0 @@ -38325,7 +38325,7 @@ _080B4A4C: strh r0, [r1, 0x20] b _080B4A96 .align 2, 0 -_080B4A54: .4byte gUnknown_3005090 +_080B4A54: .4byte gTasks _080B4A58: bl sub_8073788 lsls r0, 24 @@ -38523,7 +38523,7 @@ sub_80B4BD0: @ 80B4BD0 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080B4C50 @ =gUnknown_3005090 + ldr r0, _080B4C50 @ =gTasks adds r6, r1, r0 ldr r5, _080B4C54 @ =gUnknown_2037F1A ldrb r0, [r5] @@ -38574,7 +38574,7 @@ _080B4C40: movs r0, 0x20 b _080B4C62 .align 2, 0 -_080B4C50: .4byte gUnknown_3005090 +_080B4C50: .4byte gTasks _080B4C54: .4byte gUnknown_2037F1A _080B4C58: .4byte gUnknown_2037F1B _080B4C5C: @@ -38665,7 +38665,7 @@ sub_80B4D00: @ 80B4D00 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _080B4D24 @ =gUnknown_3005090 + ldr r1, _080B4D24 @ =gTasks adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -38679,7 +38679,7 @@ _080B4D1A: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080B4D24: .4byte gUnknown_3005090 +_080B4D24: .4byte gTasks _080B4D28: .4byte _080B4D2C .align 2, 0 _080B4D2C: @@ -38990,7 +38990,7 @@ sub_80B4F78: @ 80B4F78 lsrs r2, r0, 24 cmp r2, 0xFF beq _080B4FA4 - ldr r0, _080B4FB4 @ =gUnknown_3005090 + ldr r0, _080B4FB4 @ =gTasks lsls r1, r2, 2 adds r1, r2 lsls r1, 3 @@ -39007,7 +39007,7 @@ _080B4FAA: bx r0 .align 2, 0 _080B4FB0: .4byte sub_80B4D00 -_080B4FB4: .4byte gUnknown_3005090 +_080B4FB4: .4byte gTasks thumb_func_end sub_80B4F78 thumb_func_start sub_80B4FB8 @@ -39265,7 +39265,7 @@ sub_80B5188: @ 80B5188 push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _080B51E4 @ =gUnknown_3005090 + ldr r1, _080B51E4 @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -39306,7 +39306,7 @@ _080B51D6: pop {r0} bx r0 .align 2, 0 -_080B51E4: .4byte gUnknown_3005090 +_080B51E4: .4byte gTasks _080B51E8: .4byte gUnknown_2022982 thumb_func_end sub_80B5188 @@ -39316,7 +39316,7 @@ sub_80B51EC: @ 80B51EC lsls r0, 24 lsrs r0, 24 adds r5, r0, 0 - ldr r1, _080B5258 @ =gUnknown_3005090 + ldr r1, _080B5258 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -39364,7 +39364,7 @@ _080B5250: pop {r0} bx r0 .align 2, 0 -_080B5258: .4byte gUnknown_3005090 +_080B5258: .4byte gTasks _080B525C: .4byte gUnknown_2022982 _080B5260: .4byte gUnknown_2037F02 _080B5264: .4byte 0x00000fff @@ -39740,7 +39740,7 @@ sub_80B54E8: @ 80B54E8 negs r1, r1 ands r1, r2 strb r1, [r0] - ldr r1, _080B5564 @ =gUnknown_3005090 + ldr r1, _080B5564 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -39761,7 +39761,7 @@ sub_80B54E8: @ 80B54E8 bx r0 .align 2, 0 _080B5560: .4byte gSprites -_080B5564: .4byte gUnknown_3005090 +_080B5564: .4byte gTasks _080B5568: .4byte gUnknown_2037F02 _080B556C: .4byte sub_80B5570 thumb_func_end sub_80B54E8 @@ -39771,7 +39771,7 @@ sub_80B5570: @ 80B5570 push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080B55C0 @ =gUnknown_3005090 + ldr r2, _080B55C0 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -39808,7 +39808,7 @@ _080B55B8: pop {r0} bx r0 .align 2, 0 -_080B55C0: .4byte gUnknown_3005090 +_080B55C0: .4byte gTasks _080B55C4: .4byte sub_80B55C8 thumb_func_end sub_80B5570 @@ -39818,7 +39818,7 @@ sub_80B55C8: @ 80B55C8 lsls r0, 24 lsrs r0, 24 adds r5, r0, 0 - ldr r1, _080B55EC @ =gUnknown_3005090 + ldr r1, _080B55EC @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -39832,7 +39832,7 @@ sub_80B55C8: @ 80B55C8 strh r0, [r4, 0xA] b _080B5634 .align 2, 0 -_080B55EC: .4byte gUnknown_3005090 +_080B55EC: .4byte gTasks _080B55F0: movs r0, 0 bl GetAnimBankSpriteId @@ -40203,7 +40203,7 @@ sub_80B58AC: @ 80B58AC lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _080B58D8 @ =gUnknown_3005090 + ldr r1, _080B58D8 @ =gTasks adds r5, r0, r1 movs r0, 0x1 bl duplicate_obj_of_side_rel2move_in_transparent_mode @@ -40217,7 +40217,7 @@ sub_80B58AC: @ 80B58AC bl DestroyAnimVisualTask b _080B59B8 .align 2, 0 -_080B58D8: .4byte gUnknown_3005090 +_080B58D8: .4byte gTasks _080B58DC: strh r1, [r5, 0xA] movs r0, 0xF @@ -40345,7 +40345,7 @@ sub_80B59D4: @ 80B59D4 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _080B59F8 @ =gUnknown_3005090 + ldr r1, _080B59F8 @ =gTasks adds r4, r0, r1 movs r1, 0x10 ldrsh r0, [r4, r1] @@ -40357,7 +40357,7 @@ sub_80B59D4: @ 80B59D4 beq _080B5A02 b _080B5AA4 .align 2, 0 -_080B59F8: .4byte gUnknown_3005090 +_080B59F8: .4byte gTasks _080B59FC: cmp r0, 0x2 beq _080B5A9E @@ -40456,7 +40456,7 @@ sub_80B5AAC: @ 80B5AAC lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r2, _080B5ACC @ =gUnknown_3005090 + ldr r2, _080B5ACC @ =gTasks adds r1, r2 movs r2, 0 strh r2, [r1, 0x26] @@ -40466,7 +40466,7 @@ sub_80B5AAC: @ 80B5AAC pop {r0} bx r0 .align 2, 0 -_080B5ACC: .4byte gUnknown_3005090 +_080B5ACC: .4byte gTasks _080B5AD0: .4byte sub_80B5AD4 thumb_func_end sub_80B5AAC @@ -40481,7 +40481,7 @@ sub_80B5AD4: @ 80B5AD4 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _080B5B0C @ =gUnknown_3005090 + ldr r1, _080B5B0C @ =gTasks adds r5, r0, r1 ldr r0, _080B5B10 @ =gUnknown_2037F1B ldrb r0, [r0] @@ -40500,7 +40500,7 @@ _080B5B00: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080B5B0C: .4byte gUnknown_3005090 +_080B5B0C: .4byte gTasks _080B5B10: .4byte gUnknown_2037F1B _080B5B14: .4byte _080B5B18 .align 2, 0 @@ -40779,7 +40779,7 @@ sub_80B5D38: @ 80B5D38 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080B5DC0 @ =gUnknown_3005090 + ldr r1, _080B5DC0 @ =gTasks adds r4, r0, r1 ldrh r1, [r4, 0xA] adds r1, 0x1 @@ -40840,7 +40840,7 @@ _080B5DBA: pop {r0} bx r0 .align 2, 0 -_080B5DC0: .4byte gUnknown_3005090 +_080B5DC0: .4byte gTasks _080B5DC4: .4byte gUnknown_825E074 _080B5DC8: .4byte sub_80B5DCC thumb_func_end sub_80B5D38 @@ -40853,7 +40853,7 @@ sub_80B5DCC: @ 80B5DCC lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080B5DFC @ =gUnknown_3005090 + ldr r1, _080B5DFC @ =gTasks adds r4, r0, r1 ldr r0, _080B5E00 @ =gUnknown_2037F1B ldrb r0, [r0] @@ -40870,7 +40870,7 @@ sub_80B5DCC: @ 80B5DCC beq _080B5E0A b _080B5EB4 .align 2, 0 -_080B5DFC: .4byte gUnknown_3005090 +_080B5DFC: .4byte gTasks _080B5E00: .4byte gUnknown_2037F1B _080B5E04: cmp r0, 0x2 @@ -41148,7 +41148,7 @@ sub_80B6020: @ 80B6020 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080B6170 @ =gUnknown_3005090 + ldr r0, _080B6170 @ =gTasks adds r1, r0 str r1, [sp] movs r1, 0xFD @@ -41298,7 +41298,7 @@ _080B615E: ble _080B6092 b _080B6210 .align 2, 0 -_080B6170: .4byte gUnknown_3005090 +_080B6170: .4byte gTasks _080B6174: .4byte gUnknown_2037F02 _080B6178: .4byte gUnknown_2037F1A _080B617C: .4byte gUnknown_83E7668 @@ -41397,7 +41397,7 @@ sub_80B623C: @ 80B623C lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080B6260 @ =gUnknown_3005090 + ldr r1, _080B6260 @ =gTasks adds r4, r0, r1 movs r0, 0x8 ldrsh r1, [r4, r0] @@ -41409,7 +41409,7 @@ sub_80B623C: @ 80B623C beq _080B6272 b _080B63AE .align 2, 0 -_080B6260: .4byte gUnknown_3005090 +_080B6260: .4byte gTasks _080B6264: cmp r1, 0x2 bne _080B626A @@ -41648,7 +41648,7 @@ _080B6416: movs r1, 0xF0 subs r1, r2 movs r4, 0x48 - ldr r2, _080B6460 @ =gUnknown_3005090 + ldr r2, _080B6460 @ =gTasks lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -41668,7 +41668,7 @@ _080B6416: _080B6454: .4byte gUnknown_2022984 _080B6458: .4byte gUnknown_2022986 _080B645C: .4byte 0x00002828 -_080B6460: .4byte gUnknown_3005090 +_080B6460: .4byte gTasks _080B6464: .4byte sub_80B6468 thumb_func_end sub_80B63B4 @@ -41682,7 +41682,7 @@ sub_80B6468: @ 80B6468 sub sp, 0x20 lsls r0, 24 lsrs r0, 24 - ldr r2, _080B6588 @ =gUnknown_3005090 + ldr r2, _080B6588 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -41797,7 +41797,7 @@ _080B64A4: lsrs r5, r0, 16 b _080B65C2 .align 2, 0 -_080B6588: .4byte gUnknown_3005090 +_080B6588: .4byte gTasks _080B658C: .4byte 0x3fb00000 _080B6590: .4byte 0x00000000 _080B6594: @@ -42227,7 +42227,7 @@ sub_80B68C8: @ 80B68C8 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _080B6960 @ =gUnknown_3005090 + ldr r0, _080B6960 @ =gTasks adds r4, r0 movs r6, 0 strh r6, [r4, 0x8] @@ -42289,7 +42289,7 @@ sub_80B68C8: @ 80B68C8 pop {r0} bx r0 .align 2, 0 -_080B6960: .4byte gUnknown_3005090 +_080B6960: .4byte gTasks _080B6964: .4byte gUnknown_2037F1A _080B6968: .4byte sub_80B696C thumb_func_end sub_80B68C8 @@ -42302,7 +42302,7 @@ sub_80B696C: @ 80B696C lsls r0, r7, 2 adds r0, r7 lsls r0, 3 - ldr r1, _080B6990 @ =gUnknown_3005090 + ldr r1, _080B6990 @ =gTasks adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -42316,7 +42316,7 @@ _080B6986: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080B6990: .4byte gUnknown_3005090 +_080B6990: .4byte gTasks _080B6994: .4byte _080B6998 .align 2, 0 _080B6998: @@ -42532,7 +42532,7 @@ _080B6B0E: lsrs r0, 16 cmp r0, 0x7E bhi _080B6B50 - ldr r2, _080B6B4C @ =gUnknown_3005090 + ldr r2, _080B6B4C @ =gTasks movs r0, 0x2E ldrsh r1, [r4, r0] lsls r0, r1, 2 @@ -42545,9 +42545,9 @@ _080B6B0E: ands r1, r0 b _080B6B64 .align 2, 0 -_080B6B4C: .4byte gUnknown_3005090 +_080B6B4C: .4byte gTasks _080B6B50: - ldr r2, _080B6BB8 @ =gUnknown_3005090 + ldr r2, _080B6BB8 @ =gTasks movs r0, 0x2E ldrsh r1, [r4, r0] lsls r0, r1, 2 @@ -42579,7 +42579,7 @@ _080B6B64: movs r1, 0x7 bl Sin strh r0, [r4, 0x26] - ldr r2, _080B6BB8 @ =gUnknown_3005090 + ldr r2, _080B6BB8 @ =gTasks movs r0, 0x2E ldrsh r1, [r4, r0] lsls r0, r1, 2 @@ -42600,7 +42600,7 @@ _080B6BB2: pop {r0} bx r0 .align 2, 0 -_080B6BB8: .4byte gUnknown_3005090 +_080B6BB8: .4byte gTasks thumb_func_end sub_80B6AF8 thumb_func_start sub_80B6BBC @@ -42611,7 +42611,7 @@ sub_80B6BBC: @ 80B6BBC lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r2, _080B6BDC @ =gUnknown_3005090 + ldr r2, _080B6BDC @ =gTasks adds r1, r2 movs r2, 0 strh r2, [r1, 0x26] @@ -42621,7 +42621,7 @@ sub_80B6BBC: @ 80B6BBC pop {r0} bx r0 .align 2, 0 -_080B6BDC: .4byte gUnknown_3005090 +_080B6BDC: .4byte gTasks _080B6BE0: .4byte sub_80B6BE4 thumb_func_end sub_80B6BBC @@ -42634,7 +42634,7 @@ sub_80B6BE4: @ 80B6BE4 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080B6C18 @ =gUnknown_3005090 + ldr r0, _080B6C18 @ =gTasks adds r6, r1, r0 ldr r0, _080B6C1C @ =gUnknown_2037F1A ldrb r0, [r0] @@ -42653,7 +42653,7 @@ _080B6C0C: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080B6C18: .4byte gUnknown_3005090 +_080B6C18: .4byte gTasks _080B6C1C: .4byte gUnknown_2037F1A _080B6C20: .4byte _080B6C24 .align 2, 0 @@ -43031,7 +43031,7 @@ sub_80B6F30: @ 80B6F30 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080B6FB8 @ =gUnknown_3005090 + ldr r1, _080B6FB8 @ =gTasks adds r4, r0, r1 ldrh r1, [r4, 0xA] adds r1, 0x1 @@ -43092,7 +43092,7 @@ _080B6FB2: pop {r0} bx r0 .align 2, 0 -_080B6FB8: .4byte gUnknown_3005090 +_080B6FB8: .4byte gTasks _080B6FBC: .4byte gUnknown_825E074 _080B6FC0: .4byte sub_80B6FC4 thumb_func_end sub_80B6F30 @@ -43105,7 +43105,7 @@ sub_80B6FC4: @ 80B6FC4 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 - ldr r1, _080B6FE8 @ =gUnknown_3005090 + ldr r1, _080B6FE8 @ =gTasks adds r6, r0, r1 movs r1, 0x26 ldrsh r0, [r6, r1] @@ -43119,7 +43119,7 @@ _080B6FDE: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080B6FE8: .4byte gUnknown_3005090 +_080B6FE8: .4byte gTasks _080B6FEC: .4byte _080B6FF0 .align 2, 0 _080B6FF0: @@ -43868,7 +43868,7 @@ sub_80B75E0: @ 80B75E0 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080B760C @ =gUnknown_3005090 + ldr r0, _080B760C @ =gTasks adds r4, r1, r0 ldr r0, _080B7610 @ =gUnknown_2037F1A ldrb r0, [r0] @@ -43882,7 +43882,7 @@ sub_80B75E0: @ 80B75E0 ldr r0, _080B7618 @ =gUnknown_2022978 b _080B7622 .align 2, 0 -_080B760C: .4byte gUnknown_3005090 +_080B760C: .4byte gTasks _080B7610: .4byte gUnknown_2037F1A _080B7614: .4byte 0x04000014 _080B7618: .4byte gUnknown_2022978 @@ -43967,7 +43967,7 @@ sub_80B76B0: @ 80B76B0 lsls r0, r3, 2 adds r0, r3 lsls r0, 3 - ldr r1, _080B76D4 @ =gUnknown_3005090 + ldr r1, _080B76D4 @ =gTasks adds r2, r0, r1 movs r1, 0x8 ldrsh r0, [r2, r1] @@ -43979,7 +43979,7 @@ sub_80B76B0: @ 80B76B0 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080B76D4: .4byte gUnknown_3005090 +_080B76D4: .4byte gTasks _080B76D8: .4byte _080B76DC .align 2, 0 _080B76DC: @@ -44249,7 +44249,7 @@ sub_80B78E0: @ 80B78E0 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _080B791C @ =gUnknown_3005090 + ldr r1, _080B791C @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -44274,7 +44274,7 @@ sub_80B78E0: @ 80B78E0 bl SetGpuReg b _080B7934 .align 2, 0 -_080B791C: .4byte gUnknown_3005090 +_080B791C: .4byte gTasks _080B7920: .4byte gUnknown_2037F02 _080B7924: .4byte gUnknown_2037F1A _080B7928: .4byte 0x00003f42 @@ -44283,7 +44283,7 @@ _080B792C: movs r0, 0x50 bl SetGpuReg _080B7934: - ldr r0, _080B794C @ =gUnknown_3005090 + ldr r0, _080B794C @ =gTasks lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -44295,7 +44295,7 @@ _080B7934: bx r0 .align 2, 0 _080B7948: .4byte 0x00003f44 -_080B794C: .4byte gUnknown_3005090 +_080B794C: .4byte gTasks _080B7950: .4byte sub_80B7954 thumb_func_end sub_80B78E0 @@ -44304,7 +44304,7 @@ sub_80B7954: @ 80B7954 push {r4-r7,lr} lsls r0, 24 lsrs r7, r0, 24 - ldr r1, _080B79C0 @ =gUnknown_3005090 + ldr r1, _080B79C0 @ =gTasks lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -44353,7 +44353,7 @@ sub_80B7954: @ 80B7954 bl DestroyAnimVisualTask b _080B79D6 .align 2, 0 -_080B79C0: .4byte gUnknown_3005090 +_080B79C0: .4byte gTasks _080B79C4: .4byte gSprites _080B79C8: .4byte gUnknown_2023D44 _080B79CC: .4byte gUnknown_2037F1A @@ -44372,7 +44372,7 @@ sub_80B79DC: @ 80B79DC push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _080B7A08 @ =gUnknown_3005090 + ldr r1, _080B7A08 @ =gTasks lsls r2, r0, 2 adds r2, r0 lsls r2, 3 @@ -44390,7 +44390,7 @@ sub_80B79DC: @ 80B79DC pop {r0} bx r0 .align 2, 0 -_080B7A08: .4byte gUnknown_3005090 +_080B7A08: .4byte gTasks _080B7A0C: .4byte gUnknown_2037F02 _080B7A10: .4byte sub_80B7A14 thumb_func_end sub_80B79DC @@ -44400,7 +44400,7 @@ sub_80B7A14: @ 80B7A14 push {r4-r7,lr} lsls r0, 24 lsrs r7, r0, 24 - ldr r1, _080B7A70 @ =gUnknown_3005090 + ldr r1, _080B7A70 @ =gTasks lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -44440,7 +44440,7 @@ sub_80B7A14: @ 80B7A14 bl DestroyAnimVisualTask b _080B7A7A .align 2, 0 -_080B7A70: .4byte gUnknown_3005090 +_080B7A70: .4byte gTasks _080B7A74: ldrh r0, [r6, 0xC] adds r0, 0x1 @@ -44868,7 +44868,7 @@ sub_80B7DA4: @ 80B7DA4 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080B7E08 @ =gUnknown_3005090 + ldr r0, _080B7E08 @ =gTasks adds r5, r1, r0 ldr r4, _080B7E0C @ =gUnknown_2037F1A ldrb r0, [r4] @@ -44908,7 +44908,7 @@ sub_80B7DA4: @ 80B7DA4 ldr r0, _080B7E10 @ =0x0000fff4 b _080B7E16 .align 2, 0 -_080B7E08: .4byte gUnknown_3005090 +_080B7E08: .4byte gTasks _080B7E0C: .4byte gUnknown_2037F1A _080B7E10: .4byte 0x0000fff4 _080B7E14: @@ -45063,7 +45063,7 @@ sub_80B7F58: @ 80B7F58 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _080B7F7C @ =gUnknown_3005090 + ldr r1, _080B7F7C @ =gTasks adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -45077,7 +45077,7 @@ _080B7F72: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080B7F7C: .4byte gUnknown_3005090 +_080B7F7C: .4byte gTasks _080B7F80: .4byte _080B7F84 .align 2, 0 _080B7F84: @@ -45210,7 +45210,7 @@ sub_80B8070: @ 80B8070 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _080B8098 @ =gUnknown_3005090 + ldr r1, _080B8098 @ =gTasks adds r5, r0, r1 movs r1, 0x8 ldrsh r0, [r5, r1] @@ -45224,7 +45224,7 @@ _080B808C: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080B8098: .4byte gUnknown_3005090 +_080B8098: .4byte gTasks _080B809C: .4byte _080B80A0 .align 2, 0 _080B80A0: @@ -45487,7 +45487,7 @@ sub_80B82C0: @ 80B82C0 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080B82E4 @ =gUnknown_3005090 + ldr r1, _080B82E4 @ =gTasks adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -45501,7 +45501,7 @@ _080B82DA: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080B82E4: .4byte gUnknown_3005090 +_080B82E4: .4byte gTasks _080B82E8: .4byte _080B82EC .align 2, 0 _080B82EC: @@ -46250,7 +46250,7 @@ _080B88E0: movs r2, 0xB bl BlendPalette _080B88EC: - ldr r1, _080B8914 @ =gUnknown_3005090 + ldr r1, _080B8914 @ =gTasks lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -46271,7 +46271,7 @@ _080B88EC: pop {r0} bx r0 .align 2, 0 -_080B8914: .4byte gUnknown_3005090 +_080B8914: .4byte gTasks _080B8918: .4byte gUnknown_2037F02 _080B891C: .4byte sub_80B8920 thumb_func_end sub_80B86EC @@ -46283,7 +46283,7 @@ sub_80B8920: @ 80B8920 lsls r0, 24 lsrs r0, 24 adds r6, r0, 0 - ldr r1, _080B89E8 @ =gUnknown_3005090 + ldr r1, _080B89E8 @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -46375,7 +46375,7 @@ _080B8990: strb r0, [r2, 0x5] b _080B8A5E .align 2, 0 -_080B89E8: .4byte gUnknown_3005090 +_080B89E8: .4byte gTasks _080B89EC: .4byte gUnknown_2022978 _080B89F0: .4byte gSprites _080B89F4: .4byte gUnknown_2023D44 @@ -46968,7 +46968,7 @@ sub_80B8E94: @ 80B8E94 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _080B8EB4 @ =gUnknown_3005090 + ldr r1, _080B8EB4 @ =gTasks adds r1, r0, r1 ldr r0, _080B8EB8 @ =gUnknown_2037F02 movs r3, 0 @@ -46978,7 +46978,7 @@ sub_80B8E94: @ 80B8E94 ldr r0, _080B8EBC @ =sub_80B8ED4 b _080B8EC2 .align 2, 0 -_080B8EB4: .4byte gUnknown_3005090 +_080B8EB4: .4byte gTasks _080B8EB8: .4byte gUnknown_2037F02 _080B8EBC: .4byte sub_80B8ED4 _080B8EC0: @@ -47002,7 +47002,7 @@ sub_80B8ED4: @ 80B8ED4 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _080B8EF8 @ =gUnknown_3005090 + ldr r1, _080B8EF8 @ =gTasks adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -47016,7 +47016,7 @@ _080B8EEE: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080B8EF8: .4byte gUnknown_3005090 +_080B8EF8: .4byte gTasks _080B8EFC: .4byte _080B8F00 .align 2, 0 _080B8F00: @@ -47273,7 +47273,7 @@ sub_80B90EC: @ 80B90EC lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _080B910C @ =gUnknown_3005090 + ldr r1, _080B910C @ =gTasks adds r1, r0, r1 ldr r0, _080B9110 @ =gUnknown_2037F02 movs r3, 0 @@ -47283,7 +47283,7 @@ sub_80B90EC: @ 80B90EC ldr r0, _080B9114 @ =sub_80B912C b _080B911A .align 2, 0 -_080B910C: .4byte gUnknown_3005090 +_080B910C: .4byte gTasks _080B9110: .4byte gUnknown_2037F02 _080B9114: .4byte sub_80B912C _080B9118: @@ -47307,7 +47307,7 @@ sub_80B912C: @ 80B912C lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _080B914C @ =gUnknown_3005090 + ldr r1, _080B914C @ =gTasks adds r4, r0, r1 movs r0, 0x8 ldrsh r5, [r4, r0] @@ -47317,7 +47317,7 @@ sub_80B912C: @ 80B912C beq _080B91A4 b _080B91AA .align 2, 0 -_080B914C: .4byte gUnknown_3005090 +_080B914C: .4byte gTasks _080B9150: movs r0, 0 bl GetAnimBankSpriteId @@ -47377,7 +47377,7 @@ sub_80B91B0: @ 80B91B0 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _080B91D4 @ =gUnknown_3005090 + ldr r1, _080B91D4 @ =gTasks adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -47389,7 +47389,7 @@ sub_80B91B0: @ 80B91B0 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080B91D4: .4byte gUnknown_3005090 +_080B91D4: .4byte gTasks _080B91D8: .4byte _080B91DC .align 2, 0 _080B91DC: @@ -47763,7 +47763,7 @@ sub_80B94B4: @ 80B94B4 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080B94D8 @ =gUnknown_3005090 + ldr r1, _080B94D8 @ =gTasks adds r4, r0, r1 ldr r0, _080B94DC @ =gUnknown_2037F02 ldrh r2, [r0, 0x2] @@ -47775,7 +47775,7 @@ sub_80B94B4: @ 80B94B4 adds r0, r2, 0x3 b _080B94EC .align 2, 0 -_080B94D8: .4byte gUnknown_3005090 +_080B94D8: .4byte gTasks _080B94DC: .4byte gUnknown_2037F02 _080B94E0: ldr r0, _080B950C @ =gUnknown_2037EEC @@ -47872,7 +47872,7 @@ sub_80B9584: @ 80B9584 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _080B95A8 @ =gUnknown_3005090 + ldr r1, _080B95A8 @ =gTasks adds r3, r0, r1 movs r0, 0x8 ldrsh r1, [r3, r0] @@ -47884,7 +47884,7 @@ sub_80B9584: @ 80B9584 beq _080B95B2 b _080B9674 .align 2, 0 -_080B95A8: .4byte gUnknown_3005090 +_080B95A8: .4byte gTasks _080B95AC: cmp r1, 0x2 beq _080B9668 @@ -48007,7 +48007,7 @@ sub_80B967C: @ 80B967C lsls r0, r3, 2 adds r0, r3 lsls r0, 3 - ldr r1, _080B96A0 @ =gUnknown_3005090 + ldr r1, _080B96A0 @ =gTasks adds r4, r0, r1 movs r0, 0x8 ldrsh r5, [r4, r0] @@ -48019,7 +48019,7 @@ sub_80B967C: @ 80B967C beq _080B96AA b _080B9756 .align 2, 0 -_080B96A0: .4byte gUnknown_3005090 +_080B96A0: .4byte gTasks _080B96A4: cmp r5, 0x2 beq _080B9718 @@ -48248,7 +48248,7 @@ _080B9832: lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _080B9898 @ =gUnknown_3005090 + ldr r0, _080B9898 @ =gTasks adds r4, r0 adds r0, r5, 0 movs r1, 0x2 @@ -48286,7 +48286,7 @@ _080B9832: .align 2, 0 _080B9890: .4byte gUnknown_2037F1A _080B9894: .4byte sub_80B98A8 -_080B9898: .4byte gUnknown_3005090 +_080B9898: .4byte gTasks _080B989C: .4byte 0x000001ff _080B98A0: .4byte gUnknown_2022980 _080B98A4: .4byte gUnknown_2022982 @@ -48300,7 +48300,7 @@ sub_80B98A8: @ 80B98A8 lsls r0, r3, 2 adds r0, r3 lsls r0, 3 - ldr r1, _080B98D8 @ =gUnknown_3005090 + ldr r1, _080B98D8 @ =gTasks adds r2, r0, r1 ldr r0, _080B98DC @ =gUnknown_2037F02 movs r4, 0xE @@ -48318,7 +48318,7 @@ sub_80B98A8: @ 80B98A8 bl DestroyTask b _080B98F4 .align 2, 0 -_080B98D8: .4byte gUnknown_3005090 +_080B98D8: .4byte gTasks _080B98DC: .4byte gUnknown_2037F02 _080B98E0: .4byte gUnknown_2022980 _080B98E4: .4byte gUnknown_2022982 @@ -48723,7 +48723,7 @@ sub_80B9BDC: @ 80B9BDC push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _080B9C20 @ =gUnknown_3005090 + ldr r1, _080B9C20 @ =gTasks lsls r4, r0, 2 adds r4, r0 lsls r4, 3 @@ -48753,7 +48753,7 @@ sub_80B9BDC: @ 80B9BDC pop {r0} bx r0 .align 2, 0 -_080B9C20: .4byte gUnknown_3005090 +_080B9C20: .4byte gTasks _080B9C24: .4byte gUnknown_2037F02 _080B9C28: .4byte sub_80B9C7C thumb_func_end sub_80B9BDC @@ -48770,7 +48770,7 @@ sub_80B9C2C: @ 80B9C2C lsrs r5, 24 lsls r6, 24 lsrs r6, 24 - ldr r1, _080B9C78 @ =gUnknown_3005090 + ldr r1, _080B9C78 @ =gTasks lsls r4, r0, 2 adds r4, r0 lsls r4, 3 @@ -48797,7 +48797,7 @@ sub_80B9C2C: @ 80B9C2C pop {r0} bx r0 .align 2, 0 -_080B9C78: .4byte gUnknown_3005090 +_080B9C78: .4byte gTasks thumb_func_end sub_80B9C2C thumb_func_start sub_80B9C7C @@ -48812,7 +48812,7 @@ sub_80B9C7C: @ 80B9C7C ands r0, r1 cmp r0, 0 bne _080B9CDE - ldr r1, _080B9CB8 @ =gUnknown_3005090 + ldr r1, _080B9CB8 @ =gTasks lsls r2, r3, 2 adds r0, r2, r3 lsls r0, 3 @@ -48832,7 +48832,7 @@ sub_80B9C7C: @ 80B9C7C b _080B9CC0 .align 2, 0 _080B9CB4: .4byte gUnknown_2037AB8 -_080B9CB8: .4byte gUnknown_3005090 +_080B9CB8: .4byte gTasks _080B9CBC: ldrb r1, [r3, 0x10] ldrb r2, [r3, 0xE] @@ -48867,7 +48867,7 @@ sub_80B9CE4: @ 80B9CE4 lsls r0, 24 lsrs r6, r0, 24 movs r5, 0 - ldr r3, _080B9D88 @ =gUnknown_3005090 + ldr r3, _080B9D88 @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -48945,7 +48945,7 @@ _080B9D5A: pop {r0} bx r0 .align 2, 0 -_080B9D88: .4byte gUnknown_3005090 +_080B9D88: .4byte gTasks _080B9D8C: .4byte gUnknown_2037F02 _080B9D90: .4byte gUnknown_2023BCC _080B9D94: .4byte gUnknown_2037F1A @@ -48965,7 +48965,7 @@ sub_80B9DA0: @ 80B9DA0 lsrs r5, 24 lsls r3, 24 lsrs r3, 24 - ldr r1, _080B9DEC @ =gUnknown_3005090 + ldr r1, _080B9DEC @ =gTasks lsls r4, r0, 2 adds r4, r0 lsls r4, 3 @@ -48992,7 +48992,7 @@ sub_80B9DA0: @ 80B9DA0 pop {r0} bx r0 .align 2, 0 -_080B9DEC: .4byte gUnknown_3005090 +_080B9DEC: .4byte gTasks thumb_func_end sub_80B9DA0 thumb_func_start sub_80B9DF0 @@ -49007,7 +49007,7 @@ sub_80B9DF0: @ 80B9DF0 ands r0, r1 cmp r0, 0 bne _080B9E52 - ldr r1, _080B9E2C @ =gUnknown_3005090 + ldr r1, _080B9E2C @ =gTasks lsls r2, r3, 2 adds r0, r2, r3 lsls r0, 3 @@ -49027,7 +49027,7 @@ sub_80B9DF0: @ 80B9DF0 b _080B9E34 .align 2, 0 _080B9E28: .4byte gUnknown_2037AB8 -_080B9E2C: .4byte gUnknown_3005090 +_080B9E2C: .4byte gTasks _080B9E30: ldrb r1, [r3, 0x10] ldrb r2, [r3, 0xE] @@ -49058,7 +49058,7 @@ sub_80B9E58: @ 80B9E58 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _080B9E9C @ =gUnknown_3005090 + ldr r1, _080B9E9C @ =gTasks lsls r4, r0, 2 adds r4, r0 lsls r4, 3 @@ -49088,7 +49088,7 @@ sub_80B9E58: @ 80B9E58 pop {r0} bx r0 .align 2, 0 -_080B9E9C: .4byte gUnknown_3005090 +_080B9E9C: .4byte gTasks _080B9EA0: .4byte gUnknown_2037F02 _080B9EA4: .4byte sub_80B9F04 thumb_func_end sub_80B9E58 @@ -49105,7 +49105,7 @@ sub_80B9EA8: @ 80B9EA8 lsrs r5, 24 lsls r6, 24 lsrs r6, 24 - ldr r1, _080B9F00 @ =gUnknown_3005090 + ldr r1, _080B9F00 @ =gTasks lsls r4, r0, 2 adds r4, r0 lsls r4, 3 @@ -49137,7 +49137,7 @@ sub_80B9EA8: @ 80B9EA8 pop {r0} bx r0 .align 2, 0 -_080B9F00: .4byte gUnknown_3005090 +_080B9F00: .4byte gTasks thumb_func_end sub_80B9EA8 thumb_func_start sub_80B9F04 @@ -49152,7 +49152,7 @@ sub_80B9F04: @ 80B9F04 ands r0, r1 cmp r0, 0 bne _080B9F66 - ldr r1, _080B9F40 @ =gUnknown_3005090 + ldr r1, _080B9F40 @ =gTasks lsls r2, r3, 2 adds r0, r2, r3 lsls r0, 3 @@ -49172,7 +49172,7 @@ sub_80B9F04: @ 80B9F04 b _080B9F48 .align 2, 0 _080B9F3C: .4byte gUnknown_2037AB8 -_080B9F40: .4byte gUnknown_3005090 +_080B9F40: .4byte gTasks _080B9F44: ldrb r1, [r3, 0x10] ldrb r2, [r3, 0xE] @@ -49204,7 +49204,7 @@ sub_80B9F6C: @ 80B9F6C sub sp, 0x4 lsls r0, 24 lsrs r0, 24 - ldr r1, _080B9FCC @ =gUnknown_3005090 + ldr r1, _080B9FCC @ =gTasks lsls r4, r0, 2 adds r4, r0 lsls r4, 3 @@ -49247,7 +49247,7 @@ sub_80B9F6C: @ 80B9F6C pop {r0} bx r0 .align 2, 0 -_080B9FCC: .4byte gUnknown_3005090 +_080B9FCC: .4byte gTasks _080B9FD0: .4byte gUnknown_2037F02 _080B9FD4: .4byte sub_80B9FD8 thumb_func_end sub_80B9F6C @@ -49258,7 +49258,7 @@ sub_80B9FD8: @ 80B9FD8 sub sp, 0x4 lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _080B9FFC @ =gUnknown_3005090 + ldr r1, _080B9FFC @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -49272,7 +49272,7 @@ sub_80B9FD8: @ 80B9FD8 strh r0, [r4, 0x8] b _080BA084 .align 2, 0 -_080B9FFC: .4byte gUnknown_3005090 +_080B9FFC: .4byte gTasks _080BA000: ldr r0, _080BA01C @ =gUnknown_2037AB8 ldrb r1, [r0, 0x7] @@ -49321,7 +49321,7 @@ _080BA052: adds r2, r3, 0 bl BeginNormalPaletteFade _080BA062: - ldr r0, _080BA08C @ =gUnknown_3005090 + ldr r0, _080BA08C @ =gTasks lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -49344,7 +49344,7 @@ _080BA084: pop {r0} bx r0 .align 2, 0 -_080BA08C: .4byte gUnknown_3005090 +_080BA08C: .4byte gTasks thumb_func_end sub_80B9FD8 thumb_func_start sub_80BA090 @@ -49361,7 +49361,7 @@ sub_80BA090: @ 80BA090 lsrs r5, r0, 24 cmp r5, 0 bne _080BA0D6 - ldr r1, _080BA0E4 @ =gUnknown_3005090 + ldr r1, _080BA0E4 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -49388,7 +49388,7 @@ _080BA0D6: bx r0 .align 2, 0 _080BA0E0: .4byte gUnknown_2037AB8 -_080BA0E4: .4byte gUnknown_3005090 +_080BA0E4: .4byte gTasks thumb_func_end sub_80BA090 thumb_func_start sub_80BA0E8 @@ -49469,7 +49469,7 @@ sub_80BA16C: @ 80BA16C lsrs r0, 24 mov r8, r0 movs r5, 0 - ldr r1, _080BA260 @ =gUnknown_3005090 + ldr r1, _080BA260 @ =gTasks lsls r0, 2 add r0, r8 lsls r0, 3 @@ -49585,7 +49585,7 @@ _080BA252: pop {r0} bx r0 .align 2, 0 -_080BA260: .4byte gUnknown_3005090 +_080BA260: .4byte gTasks _080BA264: .4byte gUnknown_2037F02 _080BA268: .4byte gUnknown_2037F1A _080BA26C: .4byte gUnknown_2037F1B @@ -49867,7 +49867,7 @@ sub_80BA47C: @ 80BA47C push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _080BA4BC @ =gUnknown_3005090 + ldr r1, _080BA4BC @ =gTasks lsls r2, r0, 2 adds r2, r0 lsls r2, 3 @@ -49896,7 +49896,7 @@ sub_80BA47C: @ 80BA47C pop {r0} bx r0 .align 2, 0 -_080BA4BC: .4byte gUnknown_3005090 +_080BA4BC: .4byte gTasks _080BA4C0: .4byte gUnknown_2037F02 _080BA4C4: .4byte gUnknown_2022980 _080BA4C8: .4byte gUnknown_2022982 @@ -49908,7 +49908,7 @@ sub_80BA4D0: @ 80BA4D0 push {r4-r7,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _080BA500 @ =gUnknown_3005090 + ldr r1, _080BA500 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -49930,7 +49930,7 @@ sub_80BA4D0: @ 80BA4D0 negs r0, r0 b _080BA50A .align 2, 0 -_080BA500: .4byte gUnknown_3005090 +_080BA500: .4byte gTasks _080BA504: .4byte gUnknown_2022980 _080BA508: ldrh r0, [r3, 0x8] @@ -50605,7 +50605,7 @@ sub_80BAA4C: @ 80BAA4C push {lr} lsls r0, 24 lsrs r0, 24 - ldr r3, _080BAA84 @ =gUnknown_3005090 + ldr r3, _080BAA84 @ =gTasks lsls r2, r0, 2 adds r2, r0 lsls r2, 3 @@ -50630,7 +50630,7 @@ sub_80BAA4C: @ 80BAA4C pop {r0} bx r0 .align 2, 0 -_080BAA84: .4byte gUnknown_3005090 +_080BAA84: .4byte gTasks _080BAA88: .4byte gUnknown_2037F02 _080BAA8C: .4byte sub_80BAA90 thumb_func_end sub_80BAA4C @@ -50644,7 +50644,7 @@ sub_80BAA90: @ 80BAA90 lsls r0, 24 lsrs r7, r0, 24 movs r6, 0 - ldr r2, _080BAB10 @ =gUnknown_3005090 + ldr r2, _080BAB10 @ =gTasks lsls r5, r7, 2 adds r0, r5, r7 lsls r0, 3 @@ -50704,7 +50704,7 @@ _080BAAF2: strh r0, [r2, 0x1C] b _080BAB2C .align 2, 0 -_080BAB10: .4byte gUnknown_3005090 +_080BAB10: .4byte gTasks _080BAB14: cmp r3, r1 ble _080BAB1E @@ -50743,7 +50743,7 @@ sub_80BAB38: @ 80BAB38 ldrb r4, [r4, 0x8] str r4, [sp] bl BeginHardwarePaletteFade - ldr r1, _080BAB70 @ =gUnknown_3005090 + ldr r1, _080BAB70 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -50756,7 +50756,7 @@ sub_80BAB38: @ 80BAB38 bx r0 .align 2, 0 _080BAB6C: .4byte gUnknown_2037F02 -_080BAB70: .4byte gUnknown_3005090 +_080BAB70: .4byte gTasks _080BAB74: .4byte sub_80BAB78 thumb_func_end sub_80BAB38 @@ -50787,7 +50787,7 @@ sub_80BAB98: @ 80BAB98 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080BABC4 @ =gUnknown_3005090 + ldr r0, _080BABC4 @ =gTasks adds r1, r0 ldr r2, _080BABC8 @ =gUnknown_2037F02 ldrh r0, [r2] @@ -50805,7 +50805,7 @@ sub_80BAB98: @ 80BAB98 str r0, [r1] bx lr .align 2, 0 -_080BABC4: .4byte gUnknown_3005090 +_080BABC4: .4byte gTasks _080BABC8: .4byte gUnknown_2037F02 _080BABCC: .4byte sub_80BABD0 thumb_func_end sub_80BAB98 @@ -50819,7 +50819,7 @@ sub_80BABD0: @ 80BABD0 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080BABFC @ =gUnknown_3005090 + ldr r1, _080BABFC @ =gTasks adds r4, r0, r1 movs r1, 0x10 ldrsh r0, [r4, r1] @@ -50834,7 +50834,7 @@ sub_80BABD0: @ 80BABD0 strh r0, [r4, 0xA] b _080BACA2 .align 2, 0 -_080BABFC: .4byte gUnknown_3005090 +_080BABFC: .4byte gTasks _080BAC00: ldrb r0, [r4, 0x8] bl duplicate_obj_of_side_rel2move_in_transparent_mode @@ -50935,7 +50935,7 @@ sub_80BACA8: @ 80BACA8 strh r0, [r4, 0x2E] b _080BACE0 _080BACBC: - ldr r3, _080BACE8 @ =gUnknown_3005090 + ldr r3, _080BACE8 @ =gTasks movs r0, 0x32 ldrsh r1, [r4, r0] lsls r1, 1 @@ -50957,7 +50957,7 @@ _080BACE0: pop {r0} bx r0 .align 2, 0 -_080BACE8: .4byte gUnknown_3005090 +_080BACE8: .4byte gTasks thumb_func_end sub_80BACA8 thumb_func_start sub_80BACEC @@ -51186,7 +51186,7 @@ _080BAEAC: negs r0, r0 adds r0, 0x20 strh r0, [r2] - ldr r1, _080BAF30 @ =gUnknown_3005090 + ldr r1, _080BAF30 @ =gTasks mov r2, r9 lsls r0, r2, 2 add r0, r9 @@ -51213,7 +51213,7 @@ _080BAF20: .4byte gUnknown_83E7CC8 _080BAF24: .4byte gUnknown_2022978 _080BAF28: .4byte gSprites _080BAF2C: .4byte gUnknown_202297A -_080BAF30: .4byte gUnknown_3005090 +_080BAF30: .4byte gTasks _080BAF34: .4byte sub_80BAF38 thumb_func_end sub_80BACEC @@ -51226,7 +51226,7 @@ sub_80BAF38: @ 80BAF38 lsls r0, 24 lsrs r0, 24 adds r6, r0, 0 - ldr r1, _080BB068 @ =gUnknown_3005090 + ldr r1, _080BB068 @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -51359,7 +51359,7 @@ _080BB05A: pop {r0} bx r0 .align 2, 0 -_080BB068: .4byte gUnknown_3005090 +_080BB068: .4byte gTasks _080BB06C: .4byte gUnknown_202297A _080BB070: .4byte gUnknown_2022984 _080BB074: .4byte gUnknown_2022986 @@ -51393,7 +51393,7 @@ _080BB09C: lsrs r2, r0, 24 cmp r2, 0x7 bls _080BB09C - ldr r0, _080BB0D0 @ =gUnknown_3005090 + ldr r0, _080BB0D0 @ =gTasks lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -51406,7 +51406,7 @@ _080BB09C: .align 2, 0 _080BB0C8: .4byte gUnknown_20399B4 _080BB0CC: .4byte gUnknown_2037F02 -_080BB0D0: .4byte gUnknown_3005090 +_080BB0D0: .4byte gTasks _080BB0D4: .4byte sub_80BB0D8 thumb_func_end sub_80BB088 @@ -51599,7 +51599,7 @@ _080BB26E: bl GetMonData ldr r1, [r4] strh r0, [r1, 0x14] - ldr r0, _080BB298 @ =gUnknown_3005090 + ldr r0, _080BB298 @ =gTasks lsls r1, r6, 2 adds r1, r6 lsls r1, 3 @@ -51612,7 +51612,7 @@ _080BB26E: .align 2, 0 _080BB290: .4byte gBattlerPartyIndexes _080BB294: .4byte gPlayerParty -_080BB298: .4byte gUnknown_3005090 +_080BB298: .4byte gTasks _080BB29C: .4byte sub_80BB2A0 thumb_func_end sub_80BB0D8 @@ -51777,7 +51777,7 @@ _080BB3D2: bne _080BB414 movs r0, 0x40 strh r0, [r3] - ldr r2, _080BB40C @ =gUnknown_3005090 + ldr r2, _080BB40C @ =gTasks lsls r3, r5, 2 adds r0, r3, r5 lsls r0, 3 @@ -51789,10 +51789,10 @@ _080BB3FC: .4byte gUnknown_8D2DDBC _080BB400: .4byte gUnknown_2022978 _080BB404: .4byte gUnknown_202297A _080BB408: .4byte gUnknown_20399B4 -_080BB40C: .4byte gUnknown_3005090 +_080BB40C: .4byte gTasks _080BB410: .4byte 0x0000fffd _080BB414: - ldr r2, _080BB43C @ =gUnknown_3005090 + ldr r2, _080BB43C @ =gTasks lsls r3, r5, 2 adds r0, r3, r5 lsls r0, 3 @@ -51813,7 +51813,7 @@ _080BB420: movs r1, 0x14 b _080BB44C .align 2, 0 -_080BB43C: .4byte gUnknown_3005090 +_080BB43C: .4byte gTasks _080BB440: adds r0, r3, r5 lsls r0, 3 @@ -51881,7 +51881,7 @@ sub_80BB4B8: @ 80BB4B8 lsls r0, 24 lsrs r6, r0, 24 ldr r2, _080BB4E4 @ =gUnknown_202297A - ldr r1, _080BB4E8 @ =gUnknown_3005090 + ldr r1, _080BB4E8 @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -51901,7 +51901,7 @@ sub_80BB4B8: @ 80BB4B8 b _080BB644 .align 2, 0 _080BB4E4: .4byte gUnknown_202297A -_080BB4E8: .4byte gUnknown_3005090 +_080BB4E8: .4byte gTasks _080BB4EC: cmp r2, 0x2 beq _080BB544 @@ -52098,7 +52098,7 @@ sub_80BB660: @ 80BB660 adds r6, r0, 0 movs r1, 0 bl sub_80BB790 - ldr r0, _080BB6C0 @ =gUnknown_3005090 + ldr r0, _080BB6C0 @ =gTasks lsls r4, r5, 2 adds r4, r5 lsls r4, 3 @@ -52129,7 +52129,7 @@ sub_80BB660: @ 80BB660 pop {r0} bx r0 .align 2, 0 -_080BB6C0: .4byte gUnknown_3005090 +_080BB6C0: .4byte gTasks _080BB6C4: .4byte 0x0000ffff _080BB6C8: .4byte sub_80BB6CC thumb_func_end sub_80BB660 @@ -52142,7 +52142,7 @@ sub_80BB6CC: @ 80BB6CC lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _080BB6F0 @ =gUnknown_3005090 + ldr r1, _080BB6F0 @ =gTasks adds r4, r0, r1 movs r0, 0x8 ldrsh r1, [r4, r0] @@ -52154,7 +52154,7 @@ sub_80BB6CC: @ 80BB6CC beq _080BB6FA b _080BB78A .align 2, 0 -_080BB6F0: .4byte gUnknown_3005090 +_080BB6F0: .4byte gTasks _080BB6F4: cmp r1, 0x2 beq _080BB784 @@ -52359,7 +52359,7 @@ sub_80BB82C: @ 80BB82C negs r0, r0 strh r0, [r4, 0x2] _080BB868: - ldr r0, _080BB8A0 @ =gUnknown_3005090 + ldr r0, _080BB8A0 @ =gTasks lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -52383,7 +52383,7 @@ _080BB868: _080BB894: .4byte sub_80BB8A4 _080BB898: .4byte gUnknown_2037F02 _080BB89C: .4byte gUnknown_2037F1A -_080BB8A0: .4byte gUnknown_3005090 +_080BB8A0: .4byte gTasks thumb_func_end sub_80BB82C thumb_func_start sub_80BB8A4 @@ -52391,7 +52391,7 @@ sub_80BB8A4: @ 80BB8A4 push {r4-r7,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _080BB910 @ =gUnknown_3005090 + ldr r0, _080BB910 @ =gTasks lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -52442,7 +52442,7 @@ _080BB90A: pop {r0} bx r0 .align 2, 0 -_080BB910: .4byte gUnknown_3005090 +_080BB910: .4byte gTasks _080BB914: .4byte gUnknown_2022980 _080BB918: .4byte gUnknown_2022982 _080BB91C: .4byte gUnknown_2037F02 @@ -52777,7 +52777,7 @@ _080BBBA8: strh r1, [r0] ldr r0, _080BBC20 @ =gUnknown_202297A strh r1, [r0] - ldr r1, _080BBC24 @ =gUnknown_3005090 + ldr r1, _080BBC24 @ =gTasks mov r2, r9 lsls r0, r2, 2 add r0, r9 @@ -52816,7 +52816,7 @@ _080BBC14: .4byte gPlayerParty _080BBC18: .4byte gUnknown_2023D44 _080BBC1C: .4byte gUnknown_2022978 _080BBC20: .4byte gUnknown_202297A -_080BBC24: .4byte gUnknown_3005090 +_080BBC24: .4byte gTasks _080BBC28: .4byte sub_80BBC2C thumb_func_end sub_80BBA20 @@ -52826,7 +52826,7 @@ sub_80BBC2C: @ 80BBC2C sub sp, 0x4 lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _080BBC68 @ =gUnknown_3005090 + ldr r1, _080BBC68 @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -52853,7 +52853,7 @@ _080BBC4A: strh r0, [r2] b _080BBC7C .align 2, 0 -_080BBC68: .4byte gUnknown_3005090 +_080BBC68: .4byte gTasks _080BBC6C: .4byte gUnknown_202297A _080BBC70: ldr r1, _080BBCA0 @ =gUnknown_202297A @@ -53484,7 +53484,7 @@ sub_80BC12C: @ 80BC12C bl DestroyAnimVisualTask b _080BC180 _080BC144: - ldr r0, _080BC188 @ =gUnknown_3005090 + ldr r0, _080BC188 @ =gTasks lsls r3, r4, 2 adds r3, r4 lsls r3, 3 @@ -53519,7 +53519,7 @@ _080BC180: pop {r0} bx r0 .align 2, 0 -_080BC188: .4byte gUnknown_3005090 +_080BC188: .4byte gTasks _080BC18C: .4byte gUnknown_2024018 _080BC190: .4byte gUnknown_2037F1A _080BC194: .4byte sub_80BC19C @@ -53545,7 +53545,7 @@ sub_80BC19C: @ 80BC19C ldr r0, [r1] lsls r3, 2 adds r3, r0 - ldr r1, _080BC1F4 @ =gUnknown_3005090 + ldr r1, _080BC1F4 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -53569,7 +53569,7 @@ _080BC1E0: _080BC1E8: .4byte gUnknown_2037F02 _080BC1EC: .4byte gUnknown_2024018 _080BC1F0: .4byte gUnknown_2037F1A -_080BC1F4: .4byte gUnknown_3005090 +_080BC1F4: .4byte gTasks thumb_func_end sub_80BC19C thumb_func_start SetAnimBgAttribute @@ -53833,7 +53833,7 @@ _080BC3E8: bl CreateTask lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _080BC418 @ =gUnknown_3005090 + ldr r0, _080BC418 @ =gTasks lsls r1, r2, 2 adds r1, r2 lsls r1, 3 @@ -53851,7 +53851,7 @@ _080BC3E8: bx r0 .align 2, 0 _080BC414: .4byte gUnknown_83E7CD4 -_080BC418: .4byte gUnknown_3005090 +_080BC418: .4byte gTasks thumb_func_end sub_80BC3A0 thumb_func_start sub_80BC41C @@ -53909,7 +53909,7 @@ task_battle_intro_80BC47C: @ 80BC47C ldrh r0, [r1] adds r0, 0x6 strh r0, [r1] - ldr r1, _080BC4B8 @ =gUnknown_3005090 + ldr r1, _080BC4B8 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -53928,7 +53928,7 @@ _080BC4A8: mov pc, r0 .align 2, 0 _080BC4B4: .4byte gUnknown_2022978 -_080BC4B8: .4byte gUnknown_3005090 +_080BC4B8: .4byte gTasks _080BC4BC: .4byte _080BC4C0 .align 2, 0 _080BC4C0: @@ -54107,7 +54107,7 @@ _080BC5F6: bgt _080BC63A ldr r7, _080BC6A4 @ =gUnknown_2038700 ldr r6, _080BC6A0 @ =gUnknown_2039600 - ldr r1, _080BC6A8 @ =gUnknown_3005090 + ldr r1, _080BC6A8 @ =gTasks mov r2, r12 adds r0, r2, r4 lsls r0, 3 @@ -54171,7 +54171,7 @@ _080BC698: .4byte gUnknown_2022986 _080BC69C: .4byte 0xfffffc04 _080BC6A0: .4byte gUnknown_2039600 _080BC6A4: .4byte gUnknown_2038700 -_080BC6A8: .4byte gUnknown_3005090 +_080BC6A8: .4byte gTasks _080BC6AC: .4byte 0x0600e000 _080BC6B0: .4byte 0x05000200 _080BC6B4: @@ -54195,7 +54195,7 @@ task00_battle_intro_80BC6C8: @ 80BC6C8 sub sp, 0x4 lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _080BC6F4 @ =gUnknown_3005090 + ldr r1, _080BC6F4 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -54211,7 +54211,7 @@ task00_battle_intro_80BC6C8: @ 80BC6C8 beq _080BC6FC b _080BC710 .align 2, 0 -_080BC6F4: .4byte gUnknown_3005090 +_080BC6F4: .4byte gTasks _080BC6F8: cmp r0, 0x4 bne _080BC710 @@ -54266,7 +54266,7 @@ _080BC758: adds r0, r1, 0x6 _080BC75A: strh r0, [r4, 0x14] - ldr r2, _080BC790 @ =gUnknown_3005090 + ldr r2, _080BC790 @ =gTasks adds r0, r6, r5 lsls r0, 3 adds r3, r0, r2 @@ -54294,7 +54294,7 @@ _080BC784: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080BC790: .4byte gUnknown_3005090 +_080BC790: .4byte gTasks _080BC794: .4byte _080BC798 .align 2, 0 _080BC798: @@ -54304,7 +54304,7 @@ _080BC798: .4byte _080BC858 .4byte _080BC9A4 _080BC7AC: - ldr r1, _080BC7C8 @ =gUnknown_3005090 + ldr r1, _080BC7C8 @ =gTasks adds r0, r6, r5 lsls r0, 3 adds r2, r0, r1 @@ -54319,7 +54319,7 @@ _080BC7AC: strh r3, [r2, 0xC] b _080BC7D4 .align 2, 0 -_080BC7C8: .4byte gUnknown_3005090 +_080BC7C8: .4byte gTasks _080BC7CC: .4byte gBattleTypeFlags _080BC7D0: movs r0, 0x1 @@ -54330,7 +54330,7 @@ _080BC7D4: strh r0, [r2, 0x8] b _080BC9AA _080BC7DC: - ldr r0, _080BC804 @ =gUnknown_3005090 + ldr r0, _080BC804 @ =gTasks adds r1, r6, r5 lsls r1, 3 adds r1, r0 @@ -54350,7 +54350,7 @@ _080BC7F2: bl SetGpuReg b _080BC9AA .align 2, 0 -_080BC804: .4byte gUnknown_3005090 +_080BC804: .4byte gTasks _080BC808: ldr r1, _080BC848 @ =gUnknown_2022986 ldrh r0, [r1] @@ -54365,7 +54365,7 @@ _080BC808: beq _080BC820 b _080BC9AA _080BC820: - ldr r0, _080BC84C @ =gUnknown_3005090 + ldr r0, _080BC84C @ =gTasks adds r1, r6, r5 lsls r1, 3 adds r1, r0 @@ -54386,11 +54386,11 @@ _080BC820: b _080BC9AA .align 2, 0 _080BC848: .4byte gUnknown_2022986 -_080BC84C: .4byte gUnknown_3005090 +_080BC84C: .4byte gTasks _080BC850: .4byte gUnknown_2023F4C _080BC854: .4byte 0x0000fffe _080BC858: - ldr r0, _080BC890 @ =gUnknown_3005090 + ldr r0, _080BC890 @ =gTasks adds r1, r6, r5 lsls r1, 3 adds r1, r0 @@ -54415,7 +54415,7 @@ _080BC858: bl SetGpuReg b _080BC8B8 .align 2, 0 -_080BC890: .4byte gUnknown_3005090 +_080BC890: .4byte gTasks _080BC894: .4byte 0x00001842 _080BC898: ldrh r2, [r1, 0x10] @@ -54446,7 +54446,7 @@ _080BC8B8: adds r0, r1, r3 strh r0, [r2] _080BC8CC: - ldr r0, _080BC990 @ =gUnknown_3005090 + ldr r0, _080BC990 @ =gTasks adds r1, r6, r5 lsls r1, 3 adds r1, r0 @@ -54483,7 +54483,7 @@ _080BC8F0: ldr r0, _080BC998 @ =gUnknown_2038700 mov r12, r0 ldr r7, _080BC994 @ =gUnknown_2039600 - ldr r1, _080BC990 @ =gUnknown_3005090 + ldr r1, _080BC990 @ =gTasks adds r0, r6, r5 lsls r0, 3 adds r4, r0, r1 @@ -54502,7 +54502,7 @@ _080BC91A: cmp r3, 0x9F ble _080BC91A _080BC934: - ldr r1, _080BC990 @ =gUnknown_3005090 + ldr r1, _080BC990 @ =gTasks adds r0, r6, r5 lsls r0, 3 adds r1, r0, r1 @@ -54541,7 +54541,7 @@ _080BC934: .align 2, 0 _080BC988: .4byte gUnknown_2022986 _080BC98C: .4byte 0xfffffc04 -_080BC990: .4byte gUnknown_3005090 +_080BC990: .4byte gTasks _080BC994: .4byte gUnknown_2039600 _080BC998: .4byte gUnknown_2038700 _080BC99C: .4byte 0x0600e000 @@ -54550,7 +54550,7 @@ _080BC9A4: adds r0, r5, 0 bl sub_80BC41C _080BC9AA: - ldr r0, _080BC9D0 @ =gUnknown_3005090 + ldr r0, _080BC9D0 @ =gTasks adds r1, r6, r5 lsls r1, 3 adds r1, r0 @@ -54569,7 +54569,7 @@ _080BC9C2: pop {r0} bx r0 .align 2, 0 -_080BC9D0: .4byte gUnknown_3005090 +_080BC9D0: .4byte gTasks thumb_func_end task00_battle_intro_80BC6C8 thumb_func_start task_battle_intro_anim @@ -54584,7 +54584,7 @@ task_battle_intro_anim: @ 80BC9D4 ldrh r0, [r1] adds r0, 0x8 strh r0, [r1] - ldr r1, _080BCA0C @ =gUnknown_3005090 + ldr r1, _080BCA0C @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -54603,7 +54603,7 @@ _080BC9FE: mov pc, r0 .align 2, 0 _080BCA08: .4byte gUnknown_2022978 -_080BCA0C: .4byte gUnknown_3005090 +_080BCA0C: .4byte gTasks _080BCA10: .4byte _080BCA14 .align 2, 0 _080BCA14: @@ -54623,7 +54623,7 @@ _080BCA28: movs r0, 0x54 movs r1, 0 bl SetGpuReg - ldr r1, _080BCA68 @ =gUnknown_3005090 + ldr r1, _080BCA68 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -54640,7 +54640,7 @@ _080BCA28: .align 2, 0 _080BCA60: .4byte 0x00001842 _080BCA64: .4byte 0x00000808 -_080BCA68: .4byte gUnknown_3005090 +_080BCA68: .4byte gTasks _080BCA6C: .4byte gBattleTypeFlags _080BCA70: movs r0, 0x1 @@ -54651,7 +54651,7 @@ _080BCA72: strh r0, [r2, 0x8] b _080BCC22 _080BCA7C: - ldr r0, _080BCAA4 @ =gUnknown_3005090 + ldr r0, _080BCAA4 @ =gTasks lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -54672,7 +54672,7 @@ _080BCA94: bl SetGpuReg b _080BCC22 .align 2, 0 -_080BCAA4: .4byte gUnknown_3005090 +_080BCAA4: .4byte gTasks _080BCAA8: ldr r1, _080BCAE8 @ =gUnknown_2022986 ldrh r0, [r1] @@ -54687,7 +54687,7 @@ _080BCAA8: beq _080BCAC0 b _080BCC22 _080BCAC0: - ldr r0, _080BCAEC @ =gUnknown_3005090 + ldr r0, _080BCAEC @ =gTasks lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -54709,7 +54709,7 @@ _080BCAC0: b _080BCC22 .align 2, 0 _080BCAE8: .4byte gUnknown_2022986 -_080BCAEC: .4byte gUnknown_3005090 +_080BCAEC: .4byte gTasks _080BCAF0: .4byte gUnknown_2023F4C _080BCAF4: .4byte 0x0000fffe _080BCAF8: @@ -54789,7 +54789,7 @@ _080BCB66: bgt _080BCBAA ldr r7, _080BCC0C @ =gUnknown_2038700 ldr r6, _080BCC08 @ =gUnknown_2039600 - ldr r1, _080BCC10 @ =gUnknown_3005090 + ldr r1, _080BCC10 @ =gTasks mov r2, r12 adds r0, r2, r5 lsls r0, 3 @@ -54809,7 +54809,7 @@ _080BCB90: cmp r3, 0x9F ble _080BCB90 _080BCBAA: - ldr r1, _080BCC10 @ =gUnknown_3005090 + ldr r1, _080BCC10 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -54851,14 +54851,14 @@ _080BCC00: .4byte gUnknown_2022986 _080BCC04: .4byte 0xfffffc04 _080BCC08: .4byte gUnknown_2039600 _080BCC0C: .4byte gUnknown_2038700 -_080BCC10: .4byte gUnknown_3005090 +_080BCC10: .4byte gTasks _080BCC14: .4byte 0x0600e000 _080BCC18: .4byte 0x05000200 _080BCC1C: adds r0, r5, 0 bl sub_80BC41C _080BCC22: - ldr r0, _080BCC48 @ =gUnknown_3005090 + ldr r0, _080BCC48 @ =gTasks lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -54878,7 +54878,7 @@ _080BCC3C: pop {r0} bx r0 .align 2, 0 -_080BCC48: .4byte gUnknown_3005090 +_080BCC48: .4byte gTasks thumb_func_end task_battle_intro_anim thumb_func_start sub_80BCC4C @@ -54890,7 +54890,7 @@ sub_80BCC4C: @ 80BCC4C sub sp, 0x8 lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _080BCC98 @ =gUnknown_3005090 + ldr r1, _080BCC98 @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -54923,7 +54923,7 @@ _080BCC8A: strh r0, [r1] b _080BCCC2 .align 2, 0 -_080BCC98: .4byte gUnknown_3005090 +_080BCC98: .4byte gTasks _080BCC9C: .4byte gUnknown_2022978 _080BCCA0: .4byte gUnknown_202297C _080BCCA4: @@ -54941,7 +54941,7 @@ _080BCCA4: movs r0, 0x1 strh r0, [r7, 0x10] _080BCCC2: - ldr r0, _080BCCF0 @ =gUnknown_3005090 + ldr r0, _080BCCF0 @ =gTasks lsls r2, r6, 2 adds r1, r2, r6 lsls r1, 3 @@ -54963,7 +54963,7 @@ _080BCCDA: _080BCCE4: .4byte 0x0600e000 _080BCCE8: .4byte 0x05000200 _080BCCEC: .4byte 0x0600f000 -_080BCCF0: .4byte gUnknown_3005090 +_080BCCF0: .4byte gTasks _080BCCF4: .4byte _080BCCF8 .align 2, 0 _080BCCF8: @@ -55144,7 +55144,7 @@ _080BCE40: ldr r0, _080BCED8 @ =gUnknown_2038700 mov r8, r0 ldr r7, _080BCED4 @ =gUnknown_2039600 - ldr r1, _080BCEDC @ =gUnknown_3005090 + ldr r1, _080BCEDC @ =gTasks adds r0, r5, r6 lsls r0, 3 adds r4, r0, r1 @@ -55199,7 +55199,7 @@ _080BCECC: .4byte gUnknown_2022986 _080BCED0: .4byte 0xfffffc04 _080BCED4: .4byte gUnknown_2039600 _080BCED8: .4byte gUnknown_2038700 -_080BCEDC: .4byte gUnknown_3005090 +_080BCEDC: .4byte gTasks _080BCEE0: adds r0, r6, 0 bl sub_80BC41C diff --git a/asm/battle_anim_80DE2C0.s b/asm/battle_anim_80DE2C0.s index a1f859d03..b80374308 100644 --- a/asm/battle_anim_80DE2C0.s +++ b/asm/battle_anim_80DE2C0.s @@ -565,7 +565,7 @@ _080DE6EA: sub_80DE6F0: @ 80DE6F0 lsls r0, 24 lsrs r0, 24 - ldr r2, _080DE70C @ =gUnknown_3005090 + ldr r2, _080DE70C @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -578,7 +578,7 @@ sub_80DE6F0: @ 80DE6F0 strb r0, [r1] bx lr .align 2, 0 -_080DE70C: .4byte gUnknown_3005090 +_080DE70C: .4byte gTasks _080DE710: .4byte sub_80DE718 _080DE714: .4byte gUnknown_2037EE2 thumb_func_end sub_80DE6F0 @@ -594,7 +594,7 @@ sub_80DE718: @ 80DE718 bl sub_8075454 lsls r0, 24 lsrs r6, r0, 24 - ldr r7, _080DE7A4 @ =gUnknown_3005090 + ldr r7, _080DE7A4 @ =gTasks lsls r5, r4, 2 adds r1, r5, r4 lsls r1, 3 @@ -657,7 +657,7 @@ _080DE798: pop {r0} bx r0 .align 2, 0 -_080DE7A4: .4byte gUnknown_3005090 +_080DE7A4: .4byte gTasks _080DE7A8: .4byte gUnknown_20375F8 _080DE7AC: .4byte gUnknown_2037F02 _080DE7B0: .4byte 0x0000ffff @@ -667,7 +667,7 @@ _080DE7B0: .4byte 0x0000ffff sub_80DE7B4: @ 80DE7B4 lsls r0, 24 lsrs r0, 24 - ldr r2, _080DE7D0 @ =gUnknown_3005090 + ldr r2, _080DE7D0 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -680,7 +680,7 @@ sub_80DE7B4: @ 80DE7B4 strb r0, [r1] bx lr .align 2, 0 -_080DE7D0: .4byte gUnknown_3005090 +_080DE7D0: .4byte gTasks _080DE7D4: .4byte sub_80DE7DC _080DE7D8: .4byte gUnknown_2037EE2 thumb_func_end sub_80DE7B4 @@ -698,7 +698,7 @@ sub_80DE7DC: @ 80DE7DC bl sub_8075454 lsls r0, 24 lsrs r7, r0, 24 - ldr r5, _080DE89C @ =gUnknown_3005090 + ldr r5, _080DE89C @ =gTasks mov r0, r8 lsls r3, r0, 2 adds r1, r3, r0 @@ -766,7 +766,7 @@ _080DE85A: mov r0, r10 add r0, r8 lsls r0, 3 - ldr r2, _080DE89C @ =gUnknown_3005090 + ldr r2, _080DE89C @ =gTasks adds r0, r2 strh r1, [r0, 0x12] _080DE87E: @@ -786,7 +786,7 @@ _080DE88E: pop {r0} bx r0 .align 2, 0 -_080DE89C: .4byte gUnknown_3005090 +_080DE89C: .4byte gTasks _080DE8A0: .4byte gUnknown_20375F8 _080DE8A4: .4byte gUnknown_20371F8 _080DE8A8: .4byte gUnknown_2037F02 @@ -1695,7 +1695,7 @@ sub_80DEF9C: @ 80DEF9C lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080DEFBC @ =gUnknown_3005090 + ldr r0, _080DEFBC @ =gTasks adds r5, r1, r0 ldr r0, _080DEFC0 @ =gUnknown_2037F02 movs r1, 0 @@ -1705,7 +1705,7 @@ sub_80DEF9C: @ 80DEF9C ldr r4, _080DEFC4 @ =gUnknown_2037F1A b _080DEFCA .align 2, 0 -_080DEFBC: .4byte gUnknown_3005090 +_080DEFBC: .4byte gTasks _080DEFC0: .4byte gUnknown_2037F02 _080DEFC4: .4byte gUnknown_2037F1A _080DEFC8: @@ -1843,7 +1843,7 @@ sub_80DF0C4: @ 80DF0C4 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 - ldr r1, _080DF114 @ =gUnknown_3005090 + ldr r1, _080DF114 @ =gTasks adds r4, r0, r1 ldrh r0, [r4, 0x8] ldrh r1, [r4, 0x12] @@ -1879,7 +1879,7 @@ _080DF0EC: strh r0, [r4, 0x26] b _080DF11C .align 2, 0 -_080DF114: .4byte gUnknown_3005090 +_080DF114: .4byte gTasks _080DF118: subs r0, r1, 0x1 strh r0, [r4, 0x10] @@ -1997,7 +1997,7 @@ sub_80DF1DC: @ 80DF1DC lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _080DF230 @ =gUnknown_3005090 + ldr r0, _080DF230 @ =gTasks adds r4, r0 movs r5, 0 strh r5, [r4, 0x8] @@ -2031,7 +2031,7 @@ sub_80DF1DC: @ 80DF1DC pop {r0} bx r0 .align 2, 0 -_080DF230: .4byte gUnknown_3005090 +_080DF230: .4byte gTasks _080DF234: .4byte gUnknown_2037F1A _080DF238: .4byte 0x0000ffec _080DF23C: .4byte sub_80DF240 @@ -2048,7 +2048,7 @@ sub_80DF240: @ 80DF240 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _080DF26C @ =gUnknown_3005090 + ldr r1, _080DF26C @ =gTasks adds r6, r0, r1 movs r1, 0x8 ldrsh r0, [r6, r1] @@ -2062,7 +2062,7 @@ _080DF260: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080DF26C: .4byte gUnknown_3005090 +_080DF26C: .4byte gTasks _080DF270: .4byte _080DF274 .align 2, 0 _080DF274: @@ -2294,7 +2294,7 @@ sub_80DF428: @ 80DF428 ands r0, r1 cmp r0, 0 beq _080DF45C - ldr r3, _080DF464 @ =gUnknown_3005090 + ldr r3, _080DF464 @ =gTasks movs r0, 0x30 ldrsh r1, [r4, r0] lsls r1, 1 @@ -2316,7 +2316,7 @@ _080DF45C: pop {r0} bx r0 .align 2, 0 -_080DF464: .4byte gUnknown_3005090 +_080DF464: .4byte gTasks thumb_func_end sub_80DF428 thumb_func_start sub_80DF468 @@ -2421,7 +2421,7 @@ sub_80DF524: @ 80DF524 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _080DF544 @ =gUnknown_3005090 + ldr r1, _080DF544 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -2434,7 +2434,7 @@ sub_80DF524: @ 80DF524 beq _080DF568 b _080DF57A .align 2, 0 -_080DF544: .4byte gUnknown_3005090 +_080DF544: .4byte gTasks _080DF548: movs r0, 0 bl GetAnimBankSpriteId @@ -2847,7 +2847,7 @@ sub_80DF848: @ 80DF848 lsls r0, 24 lsrs r0, 24 adds r5, r0, 0 - ldr r1, _080DF880 @ =gUnknown_3005090 + ldr r1, _080DF880 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -2869,7 +2869,7 @@ sub_80DF848: @ 80DF848 strh r0, [r4, 0x8] b _080DF89A .align 2, 0 -_080DF880: .4byte gUnknown_3005090 +_080DF880: .4byte gTasks _080DF884: .4byte gUnknown_83FF198 _080DF888: adds r0, r4, 0 @@ -2891,7 +2891,7 @@ sub_80DF8A0: @ 80DF8A0 lsls r0, 24 lsrs r0, 24 adds r5, r0, 0 - ldr r1, _080DF8D8 @ =gUnknown_3005090 + ldr r1, _080DF8D8 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -2913,7 +2913,7 @@ sub_80DF8A0: @ 80DF8A0 strh r0, [r4, 0x8] b _080DF8F2 .align 2, 0 -_080DF8D8: .4byte gUnknown_3005090 +_080DF8D8: .4byte gTasks _080DF8DC: .4byte gUnknown_83FF1C0 _080DF8E0: adds r0, r4, 0 @@ -2992,7 +2992,7 @@ sub_80DF964: @ 80DF964 lsls r0, 24 lsrs r0, 24 adds r5, r0, 0 - ldr r1, _080DF99C @ =gUnknown_3005090 + ldr r1, _080DF99C @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -3014,7 +3014,7 @@ sub_80DF964: @ 80DF964 strh r0, [r4, 0x8] b _080DF9B6 .align 2, 0 -_080DF99C: .4byte gUnknown_3005090 +_080DF99C: .4byte gTasks _080DF9A0: .4byte gUnknown_83FF210 _080DF9A4: adds r0, r4, 0 @@ -3036,7 +3036,7 @@ sub_80DF9BC: @ 80DF9BC sub sp, 0x10 lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _080DF9E4 @ =gUnknown_3005090 + ldr r1, _080DF9E4 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -3054,7 +3054,7 @@ _080DF9DA: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080DF9E4: .4byte gUnknown_3005090 +_080DF9E4: .4byte gTasks _080DF9E8: .4byte _080DF9EC .align 2, 0 _080DF9EC: @@ -3087,7 +3087,7 @@ _080DFA28: movs r2, 0x1 bl SetAnimBgAttribute _080DFA32: - ldr r0, _080DFA44 @ =gUnknown_3005090 + ldr r0, _080DFA44 @ =gTasks lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -3097,7 +3097,7 @@ _080DFA32: strh r0, [r1, 0x1C] b _080DFB00 .align 2, 0 -_080DFA44: .4byte gUnknown_3005090 +_080DFA44: .4byte gTasks _080DFA48: .4byte gUnknown_2037F02 _080DFA4C: lsls r0, r5, 2 @@ -3182,7 +3182,7 @@ _080DFAC6: ldrh r3, [r0, 0xA] movs r0, 0x1 bl LoadBgTiles - ldr r0, _080DFB18 @ =gUnknown_3005090 + ldr r0, _080DFB18 @ =gTasks adds r1, r4, r5 lsls r1, 3 adds r1, r0 @@ -3196,7 +3196,7 @@ _080DFB08: .4byte gUnknown_202401C _080DFB0C: .4byte gUnknown_2024024 _080DFB10: .4byte gUnknown_2037F1A _080DFB14: .4byte 0x04000200 -_080DFB18: .4byte gUnknown_3005090 +_080DFB18: .4byte gTasks _080DFB1C: lsls r0, r5, 2 adds r0, r5 @@ -3263,7 +3263,7 @@ _080DFB8A: lsrs r0, 24 cmp r0, 0x1 bne _080DFBC8 - ldr r0, _080DFBDC @ =gUnknown_3005090 + ldr r0, _080DFBDC @ =gTasks lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -3290,7 +3290,7 @@ _080DFBCE: bx r0 .align 2, 0 _080DFBD8: .4byte gUnknown_2037F1A -_080DFBDC: .4byte gUnknown_3005090 +_080DFBDC: .4byte gTasks _080DFBE0: .4byte gUnknown_2024018 thumb_func_end sub_80DF9BC @@ -3354,7 +3354,7 @@ sub_80DFC50: @ 80DFC50 sub sp, 0x10 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _080DFC78 @ =gUnknown_3005090 + ldr r1, _080DFC78 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -3372,7 +3372,7 @@ _080DFC6E: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080DFC78: .4byte gUnknown_3005090 +_080DFC78: .4byte gTasks _080DFC7C: .4byte _080DFC80 .align 2, 0 _080DFC80: @@ -3469,7 +3469,7 @@ _080DFD5A: ldr r1, _080DFD88 @ =gUnknown_202297A movs r0, 0 strh r0, [r1] - ldr r0, _080DFD8C @ =gUnknown_3005090 + ldr r0, _080DFD8C @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -3487,7 +3487,7 @@ _080DFD5A: _080DFD80: .4byte gUnknown_2022978 _080DFD84: .4byte 0x0000fff6 _080DFD88: .4byte gUnknown_202297A -_080DFD8C: .4byte gUnknown_3005090 +_080DFD8C: .4byte gTasks _080DFD90: lsls r0, r4, 2 adds r0, r4 @@ -3996,7 +3996,7 @@ sub_80E017C: @ 80E017C sub sp, 0x10 lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _080E01A4 @ =gUnknown_3005090 + ldr r1, _080E01A4 @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -4014,7 +4014,7 @@ _080E019A: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080E01A4: .4byte gUnknown_3005090 +_080E01A4: .4byte gTasks _080E01A8: .4byte _080E01AC .align 2, 0 _080E01AC: @@ -4148,7 +4148,7 @@ _080E02D0: ldr r1, _080E02FC @ =gUnknown_202297A movs r0, 0 strh r0, [r1] - ldr r0, _080E0300 @ =gUnknown_3005090 + ldr r0, _080E0300 @ =gTasks lsls r1, r6, 2 adds r1, r6 lsls r1, 3 @@ -4165,9 +4165,9 @@ _080E02F0: .4byte gUnknown_2022978 _080E02F4: .4byte 0x0000ff79 _080E02F8: .4byte 0x0000fff6 _080E02FC: .4byte gUnknown_202297A -_080E0300: .4byte gUnknown_3005090 +_080E0300: .4byte gTasks _080E0304: - ldr r1, _080E0338 @ =gUnknown_3005090 + ldr r1, _080E0338 @ =gTasks lsls r4, r6, 2 adds r0, r4, r6 lsls r0, 3 @@ -4193,7 +4193,7 @@ _080E0304: adds r0, r5 b _080E035A .align 2, 0 -_080E0338: .4byte gUnknown_3005090 +_080E0338: .4byte gTasks _080E033C: .4byte gUnknown_2037F1B _080E0340: .4byte gUnknown_2022978 _080E0344: .4byte gUnknown_83FF284 @@ -4209,7 +4209,7 @@ _080E0348: subs r0, r1 _080E035A: strh r0, [r2] - ldr r0, _080E0380 @ =gUnknown_3005090 + ldr r0, _080E0380 @ =gTasks adds r1, r4, r6 lsls r1, 3 adds r1, r0 @@ -4225,7 +4225,7 @@ _080E035A: .align 2, 0 _080E0378: .4byte gUnknown_2022978 _080E037C: .4byte gUnknown_83FF284 -_080E0380: .4byte gUnknown_3005090 +_080E0380: .4byte gTasks _080E0384: ldrh r0, [r1, 0x8] adds r0, 0x1 @@ -4361,7 +4361,7 @@ sub_80E0488: @ 80E0488 lsls r0, 24 lsrs r0, 24 adds r5, r0, 0 - ldr r1, _080E04C0 @ =gUnknown_3005090 + ldr r1, _080E04C0 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -4383,7 +4383,7 @@ sub_80E0488: @ 80E0488 strh r0, [r4, 0x8] b _080E04DA .align 2, 0 -_080E04C0: .4byte gUnknown_3005090 +_080E04C0: .4byte gTasks _080E04C4: .4byte gUnknown_83FF290 _080E04C8: adds r0, r4, 0 @@ -4471,7 +4471,7 @@ sub_80E0558: @ 80E0558 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _080E057C @ =gUnknown_3005090 + ldr r1, _080E057C @ =gTasks adds r4, r0, r1 ldr r5, _080E0580 @ =gUnknown_2037F02 movs r1, 0x2 @@ -4482,7 +4482,7 @@ sub_80E0558: @ 80E0558 bl DestroyAnimVisualTask b _080E0618 .align 2, 0 -_080E057C: .4byte gUnknown_3005090 +_080E057C: .4byte gTasks _080E0580: .4byte gUnknown_2037F02 _080E0584: movs r1, 0x4 @@ -4577,7 +4577,7 @@ sub_80E0628: @ 80E0628 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080E064C @ =gUnknown_3005090 + ldr r1, _080E064C @ =gTasks adds r4, r0, r1 movs r0, 0x8 ldrsh r6, [r4, r0] @@ -4589,7 +4589,7 @@ sub_80E0628: @ 80E0628 beq _080E065C b _080E0788 .align 2, 0 -_080E064C: .4byte gUnknown_3005090 +_080E064C: .4byte gTasks _080E0650: cmp r6, 0x2 beq _080E0708 @@ -4858,7 +4858,7 @@ sub_80E0850: @ 80E0850 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _080E0898 @ =gUnknown_3005090 + ldr r0, _080E0898 @ =gTasks adds r4, r0 movs r0, 0 strh r0, [r4, 0x8] @@ -4886,7 +4886,7 @@ sub_80E0850: @ 80E0850 pop {r0} bx r0 .align 2, 0 -_080E0898: .4byte gUnknown_3005090 +_080E0898: .4byte gTasks _080E089C: .4byte gUnknown_2037F02 _080E08A0: .4byte sub_80E08A4 thumb_func_end sub_80E0850 @@ -4902,7 +4902,7 @@ sub_80E08A4: @ 80E08A4 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _080E08D0 @ =gUnknown_3005090 + ldr r1, _080E08D0 @ =gTasks adds r7, r0, r1 movs r1, 0x8 ldrsh r0, [r7, r1] @@ -4915,7 +4915,7 @@ sub_80E08A4: @ 80E08A4 beq _080E08DC b _080E09BA .align 2, 0 -_080E08D0: .4byte gUnknown_3005090 +_080E08D0: .4byte gTasks _080E08D4: mov r2, r8 cmp r2, 0x2 @@ -5209,7 +5209,7 @@ sub_80E0B00: @ 80E0B00 lsls r0, 24 lsrs r0, 24 adds r7, r0, 0 - ldr r1, _080E0B30 @ =gUnknown_3005090 + ldr r1, _080E0B30 @ =gTasks lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -5227,7 +5227,7 @@ sub_80E0B00: @ 80E0B00 ldr r0, _080E0B38 @ =gUnknown_2037F1A b _080E0B3E .align 2, 0 -_080E0B30: .4byte gUnknown_3005090 +_080E0B30: .4byte gTasks _080E0B34: .4byte gUnknown_2037F02 _080E0B38: .4byte gUnknown_2037F1A _080E0B3C: @@ -5240,7 +5240,7 @@ _080E0B3E: bl GetAnimBankSpriteId lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _080E0B7C @ =gUnknown_3005090 + ldr r1, _080E0B7C @ =gTasks lsls r4, r7, 2 adds r0, r4, r7 lsls r0, 3 @@ -5262,7 +5262,7 @@ _080E0B3E: b _080E0BE8 .align 2, 0 _080E0B78: .4byte gUnknown_2037F1B -_080E0B7C: .4byte gUnknown_3005090 +_080E0B7C: .4byte gTasks _080E0B80: cmp r0, 0x2 beq _080E0BAA @@ -5322,7 +5322,7 @@ _080E0BE8: adds r0, r1 movs r1, 0x2 strh r1, [r0, 0x24] - ldr r0, _080E0C08 @ =gUnknown_3005090 + ldr r0, _080E0C08 @ =gTasks adds r1, r4, r7 lsls r1, 3 adds r1, r0 @@ -5332,7 +5332,7 @@ _080E0BE8: b _080E0C58 .align 2, 0 _080E0C04: .4byte gSprites -_080E0C08: .4byte gUnknown_3005090 +_080E0C08: .4byte gTasks _080E0C0C: ldrb r5, [r2, 0x1C] ldrh r0, [r2, 0xC] @@ -6061,7 +6061,7 @@ _080E1112: lsls r1, 6 movs r0, 0x50 bl SetGpuReg - ldr r0, _080E1210 @ =gUnknown_3005090 + ldr r0, _080E1210 @ =gTasks ldr r1, [sp, 0x18] lsls r4, r1, 2 adds r4, r1 @@ -6093,7 +6093,7 @@ _080E1200: .4byte gUnknown_2037F1A _080E1204: .4byte gUnknown_2037F1B _080E1208: .4byte gSprites _080E120C: .4byte 0x00007fff -_080E1210: .4byte gUnknown_3005090 +_080E1210: .4byte gTasks _080E1214: .4byte sub_80E1218 thumb_func_end sub_80E0FB8 @@ -6102,7 +6102,7 @@ sub_80E1218: @ 80E1218 push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080E126C @ =gUnknown_3005090 + ldr r2, _080E126C @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -6142,7 +6142,7 @@ _080E1266: pop {r0} bx r0 .align 2, 0 -_080E126C: .4byte gUnknown_3005090 +_080E126C: .4byte gTasks _080E1270: .4byte sub_80E1274 thumb_func_end sub_80E1218 @@ -6152,7 +6152,7 @@ sub_80E1274: @ 80E1274 sub sp, 0x4 lsls r0, 24 lsrs r0, 24 - ldr r2, _080E12EC @ =gUnknown_3005090 + ldr r2, _080E12EC @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -6206,7 +6206,7 @@ _080E12E2: pop {r0} bx r0 .align 2, 0 -_080E12EC: .4byte gUnknown_3005090 +_080E12EC: .4byte gTasks _080E12F0: .4byte gSprites _080E12F4: .4byte sub_8074FA8 thumb_func_end sub_80E1274 @@ -6220,7 +6220,7 @@ sub_80E12F8: @ 80E12F8 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080E1318 @ =gUnknown_3005090 + ldr r0, _080E1318 @ =gTasks adds r4, r1, r0 ldr r0, _080E131C @ =gUnknown_2037F02 movs r1, 0 @@ -6230,7 +6230,7 @@ sub_80E12F8: @ 80E12F8 ldr r0, _080E1320 @ =gUnknown_2037F1A b _080E1326 .align 2, 0 -_080E1318: .4byte gUnknown_3005090 +_080E1318: .4byte gTasks _080E131C: .4byte gUnknown_2037F02 _080E1320: .4byte gUnknown_2037F1A _080E1324: @@ -6386,7 +6386,7 @@ sub_80E1450: @ 80E1450 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _080E1484 @ =gUnknown_3005090 + ldr r1, _080E1484 @ =gTasks adds r6, r0, r1 ldrb r0, [r6, 0x12] bl sub_80768B0 @@ -6400,7 +6400,7 @@ sub_80E1450: @ 80E1450 ldr r0, _080E148C @ =gUnknown_202297A b _080E1498 .align 2, 0 -_080E1484: .4byte gUnknown_3005090 +_080E1484: .4byte gTasks _080E1488: .4byte gUnknown_2022978 _080E148C: .4byte gUnknown_202297A _080E1490: @@ -6737,7 +6737,7 @@ sub_80E1704: @ 80E1704 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _080E173C @ =gUnknown_3005090 + ldr r0, _080E173C @ =gTasks adds r4, r0 movs r0, 0 strh r0, [r4, 0x8] @@ -6757,7 +6757,7 @@ sub_80E1704: @ 80E1704 pop {r0} bx r0 .align 2, 0 -_080E173C: .4byte gUnknown_3005090 +_080E173C: .4byte gTasks _080E1740: .4byte gUnknown_2037F02 _080E1744: .4byte gUnknown_83FF3D0 _080E1748: .4byte sub_80E174C @@ -6771,7 +6771,7 @@ sub_80E174C: @ 80E174C lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r2, _080E17A4 @ =gUnknown_3005090 + ldr r2, _080E17A4 @ =gTasks adds r3, r0, r2 ldrh r0, [r3, 0x8] adds r1, r0, 0x1 @@ -6809,7 +6809,7 @@ sub_80E174C: @ 80E174C strh r1, [r0, 0x24] b _080E17C0 .align 2, 0 -_080E17A4: .4byte gUnknown_3005090 +_080E17A4: .4byte gTasks _080E17A8: .4byte gSprites _080E17AC: .4byte 0x0000ffff _080E17B0: @@ -7065,7 +7065,7 @@ sub_80E1990: @ 80E1990 lsls r0, 24 lsrs r5, r0, 24 movs r7, 0 - ldr r2, _080E19E0 @ =gUnknown_3005090 + ldr r2, _080E19E0 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -7100,7 +7100,7 @@ sub_80E1990: @ 80E1990 strh r0, [r3, 0x10] b _080E19E6 .align 2, 0 -_080E19E0: .4byte gUnknown_3005090 +_080E19E0: .4byte gTasks _080E19E4: strh r7, [r3, 0x1A] _080E19E6: @@ -7241,7 +7241,7 @@ sub_80E1AD8: @ 80E1AD8 lsls r0, 24 lsrs r6, r0, 24 movs r7, 0 - ldr r2, _080E1B2C @ =gUnknown_3005090 + ldr r2, _080E1B2C @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -7276,7 +7276,7 @@ sub_80E1AD8: @ 80E1AD8 strh r0, [r3, 0x10] b _080E1B32 .align 2, 0 -_080E1B2C: .4byte gUnknown_3005090 +_080E1B2C: .4byte gTasks _080E1B30: strh r7, [r3, 0x1A] _080E1B32: @@ -7434,7 +7434,7 @@ sub_80E1C48: @ 80E1C48 push {r7} lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _080E1CA8 @ =gUnknown_3005090 + ldr r0, _080E1CA8 @ =gTasks mov r8, r0 lsls r7, r6, 2 adds r0, r7, r6 @@ -7477,7 +7477,7 @@ _080E1C8C: adds r4, r7, 0 b _080E1D2C .align 2, 0 -_080E1CA8: .4byte gUnknown_3005090 +_080E1CA8: .4byte gTasks _080E1CAC: .4byte gUnknown_2023D44 _080E1CB0: .4byte gUnknown_2037F1A _080E1CB4: .4byte gUnknown_2037F02 @@ -7512,7 +7512,7 @@ _080E1CE0: adds r5, r0, 0 cmp r1, 0 beq _080E1D18 - ldr r3, _080E1D10 @ =gUnknown_3005090 + ldr r3, _080E1D10 @ =gTasks lsls r4, r6, 2 adds r1, r4, r6 lsls r1, 3 @@ -7524,10 +7524,10 @@ _080E1CE0: .align 2, 0 _080E1D08: .4byte 0xffff8000 _080E1D0C: .4byte gUnknown_2037F02 -_080E1D10: .4byte gUnknown_3005090 +_080E1D10: .4byte gTasks _080E1D14: .4byte 0x00007fff _080E1D18: - ldr r3, _080E1D50 @ =gUnknown_3005090 + ldr r3, _080E1D50 @ =gTasks lsls r4, r6, 2 adds r1, r4, r6 lsls r1, 3 @@ -7557,7 +7557,7 @@ _080E1D2C: pop {r0} bx r0 .align 2, 0 -_080E1D50: .4byte gUnknown_3005090 +_080E1D50: .4byte gTasks _080E1D54: .4byte 0xffff8000 _080E1D58: .4byte sub_80E1AD8 thumb_func_end sub_80E1C48 @@ -7570,7 +7570,7 @@ sub_80E1D5C: @ 80E1D5C lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _080E1D94 @ =gUnknown_3005090 + ldr r1, _080E1D94 @ =gTasks adds r5, r0, r1 ldr r4, _080E1D98 @ =gUnknown_2037F02 movs r1, 0x2 @@ -7593,7 +7593,7 @@ _080E1D7C: ldr r0, _080E1D9C @ =gUnknown_2037F1A b _080E1DA2 .align 2, 0 -_080E1D94: .4byte gUnknown_3005090 +_080E1D94: .4byte gTasks _080E1D98: .4byte gUnknown_2037F02 _080E1D9C: .4byte gUnknown_2037F1A _080E1DA0: @@ -7647,7 +7647,7 @@ sub_80E1E00: @ 80E1E00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080E1E20 @ =gUnknown_3005090 + ldr r1, _080E1E20 @ =gTasks adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -7657,7 +7657,7 @@ sub_80E1E00: @ 80E1E00 beq _080E1E84 b _080E1E92 .align 2, 0 -_080E1E20: .4byte gUnknown_3005090 +_080E1E20: .4byte gTasks _080E1E24: ldrh r0, [r4, 0xA] adds r0, 0x1 @@ -7730,7 +7730,7 @@ sub_80E1E98: @ 80E1E98 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r2, _080E1EBC @ =gUnknown_3005090 + ldr r2, _080E1EBC @ =gTasks adds r4, r0, r2 cmp r1, 0 bne _080E1EC0 @@ -7738,7 +7738,7 @@ sub_80E1E98: @ 80E1E98 movs r3, 0xEC b _080E1EC4 .align 2, 0 -_080E1EBC: .4byte gUnknown_3005090 +_080E1EBC: .4byte gTasks _080E1EC0: movs r1, 0x1E movs r3, 0x14 @@ -7851,7 +7851,7 @@ sub_80E1F74: @ 80E1F74 asrs r0, 16 cmp r0, 0x6 ble _080E1FBA - ldr r3, _080E1FC0 @ =gUnknown_3005090 + ldr r3, _080E1FC0 @ =gTasks movs r0, 0x36 ldrsh r1, [r4, r0] lsls r1, 1 @@ -7873,7 +7873,7 @@ _080E1FBA: pop {r0} bx r0 .align 2, 0 -_080E1FC0: .4byte gUnknown_3005090 +_080E1FC0: .4byte gTasks thumb_func_end sub_80E1F74 thumb_func_start sub_80E1FC4 @@ -7881,7 +7881,7 @@ sub_80E1FC4: @ 80E1FC4 push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _080E200C @ =gUnknown_3005090 + ldr r1, _080E200C @ =gTasks lsls r4, r0, 2 adds r4, r0 lsls r4, 3 @@ -7914,7 +7914,7 @@ sub_80E1FC4: @ 80E1FC4 pop {r0} bx r0 .align 2, 0 -_080E200C: .4byte gUnknown_3005090 +_080E200C: .4byte gTasks _080E2010: .4byte gUnknown_2037F02 _080E2014: .4byte gSprites _080E2018: .4byte sub_80E201C @@ -7925,7 +7925,7 @@ sub_80E201C: @ 80E201C push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _080E2064 @ =gUnknown_3005090 + ldr r1, _080E2064 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -7959,7 +7959,7 @@ _080E205C: strh r0, [r4, 0xA] b _080E207E .align 2, 0 -_080E2064: .4byte gUnknown_3005090 +_080E2064: .4byte gTasks _080E2068: .4byte gUnknown_83FF564 _080E206C: ldrh r0, [r4, 0xC] @@ -8148,7 +8148,7 @@ sub_80E21CC: @ 80E21CC lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080E221C @ =gUnknown_3005090 + ldr r0, _080E221C @ =gTasks adds r6, r1, r0 movs r1, 0 movs r0, 0xC @@ -8181,7 +8181,7 @@ _080E2216: adds r0, r4, r0 b _080E2248 .align 2, 0 -_080E221C: .4byte gUnknown_3005090 +_080E221C: .4byte gTasks _080E2220: .4byte gUnknown_2037F1A _080E2224: ldrb r0, [r5] @@ -8257,7 +8257,7 @@ sub_80E22A8: @ 80E22A8 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 - ldr r1, _080E22D0 @ =gUnknown_3005090 + ldr r1, _080E22D0 @ =gTasks adds r5, r0, r1 movs r0, 0x8 ldrsh r1, [r5, r0] @@ -8269,7 +8269,7 @@ sub_80E22A8: @ 80E22A8 _080E22CC: b _080E23DA .align 2, 0 -_080E22D0: .4byte gUnknown_3005090 +_080E22D0: .4byte gTasks _080E22D4: ldrh r0, [r5, 0xA] adds r0, 0x1 @@ -8522,7 +8522,7 @@ sub_80E24A0: @ 80E24A0 asrs r0, 16 cmp r0, 0x24 ble _080E24D6 - ldr r3, _080E24DC @ =gUnknown_3005090 + ldr r3, _080E24DC @ =gTasks movs r0, 0x32 ldrsh r1, [r4, r0] lsls r1, 1 @@ -8544,7 +8544,7 @@ _080E24D6: pop {r0} bx r0 .align 2, 0 -_080E24DC: .4byte gUnknown_3005090 +_080E24DC: .4byte gTasks thumb_func_end sub_80E24A0 thumb_func_start sub_80E24E0 @@ -8589,7 +8589,7 @@ sub_80E2518: @ 80E2518 lsls r0, 2 add r0, r9 lsls r0, 3 - ldr r1, _080E2638 @ =gUnknown_3005090 + ldr r1, _080E2638 @ =gTasks adds r7, r0, r1 ldr r0, _080E263C @ =gUnknown_2037F1A mov r10, r0 @@ -8715,7 +8715,7 @@ _080E2632: str r0, [r7] b _080E265A .align 2, 0 -_080E2638: .4byte gUnknown_3005090 +_080E2638: .4byte gTasks _080E263C: .4byte gUnknown_2037F1A _080E2640: .4byte gUnknown_2037F1B _080E2644: .4byte gUnknown_83FF62C @@ -8743,7 +8743,7 @@ sub_80E2668: @ 80E2668 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _080E268C @ =gUnknown_3005090 + ldr r1, _080E268C @ =gTasks adds r4, r0, r1 movs r0, 0x8 ldrsh r1, [r4, r0] @@ -8755,7 +8755,7 @@ sub_80E2668: @ 80E2668 beq _080E269A b _080E276E .align 2, 0 -_080E268C: .4byte gUnknown_3005090 +_080E268C: .4byte gTasks _080E2690: cmp r1, 0x2 beq _080E26F4 @@ -9083,7 +9083,7 @@ sub_80E28DC: @ 80E28DC .align 2, 0 _080E28F4: .4byte gUnknown_2037F02 _080E28F8: - ldr r0, _080E2928 @ =gUnknown_3005090 + ldr r0, _080E2928 @ =gTasks lsls r4, r1, 2 adds r4, r1 lsls r4, 3 @@ -9106,7 +9106,7 @@ _080E2920: pop {r0} bx r0 .align 2, 0 -_080E2928: .4byte gUnknown_3005090 +_080E2928: .4byte gTasks _080E292C: .4byte gUnknown_83FF65C _080E2930: .4byte sub_80E2934 thumb_func_end sub_80E28DC @@ -9119,7 +9119,7 @@ sub_80E2934: @ 80E2934 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _080E2974 @ =gUnknown_3005090 + ldr r1, _080E2974 @ =gTasks adds r4, r0, r1 ldrh r0, [r4, 0xA] adds r0, 0x1 @@ -9145,7 +9145,7 @@ sub_80E2934: @ 80E2934 movs r1, 0x2 b _080E298C .align 2, 0 -_080E2974: .4byte gUnknown_3005090 +_080E2974: .4byte gTasks _080E2978: .4byte gSprites _080E297C: ldr r2, _080E29D4 @ =gSprites @@ -9182,7 +9182,7 @@ _080E298E: lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _080E29DC @ =gUnknown_3005090 + ldr r1, _080E29DC @ =gTasks adds r0, r1 ldrh r1, [r0, 0x26] lsls r1, 24 @@ -9195,7 +9195,7 @@ _080E298E: .align 2, 0 _080E29D4: .4byte gSprites _080E29D8: .4byte 0x0000fffe -_080E29DC: .4byte gUnknown_3005090 +_080E29DC: .4byte gTasks _080E29E0: .4byte gUnknown_83FF65C _080E29E4: adds r0, r6, 0 @@ -9610,7 +9610,7 @@ sub_80E2CE4: @ 80E2CE4 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080E2D34 @ =gUnknown_3005090 + ldr r0, _080E2D34 @ =gTasks adds r6, r1, r0 movs r0, 0 bl GetAnimBankSpriteId @@ -9641,7 +9641,7 @@ sub_80E2CE4: @ 80E2CE4 strh r7, [r6, 0x24] b _080E2D64 .align 2, 0 -_080E2D34: .4byte gUnknown_3005090 +_080E2D34: .4byte gTasks _080E2D38: .4byte gUnknown_2037F1A _080E2D3C: ldr r0, _080E2D40 @ =0x0000ffff @@ -9682,7 +9682,7 @@ sub_80E2D74: @ 80E2D74 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _080E2D98 @ =gUnknown_3005090 + ldr r1, _080E2D98 @ =gTasks adds r3, r0, r1 movs r1, 0x8 ldrsh r0, [r3, r1] @@ -9696,7 +9696,7 @@ _080E2D8E: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080E2D98: .4byte gUnknown_3005090 +_080E2D98: .4byte gTasks _080E2D9C: .4byte _080E2DA0 .align 2, 0 _080E2DA0: @@ -10364,7 +10364,7 @@ sub_80E3294: @ 80E3294 lsls r0, 24 lsrs r5, r0, 24 adds r2, r5, 0 - ldr r0, _080E32D8 @ =gUnknown_3005090 + ldr r0, _080E32D8 @ =gTasks mov r9, r0 lsls r7, r6, 2 adds r0, r7, r6 @@ -10385,7 +10385,7 @@ sub_80E3294: @ 80E3294 strh r0, [r4, 0xC] b _080E3328 .align 2, 0 -_080E32D8: .4byte gUnknown_3005090 +_080E32D8: .4byte gTasks _080E32DC: cmp r0, 0x1 bne _080E3334 @@ -10474,7 +10474,7 @@ sub_80E3374: @ 80E3374 bl GetAnimBankSpriteId lsls r0, 24 lsrs r3, r0, 24 - ldr r1, _080E33A0 @ =gUnknown_3005090 + ldr r1, _080E33A0 @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -10489,7 +10489,7 @@ sub_80E3374: @ 80E3374 beq _080E33AE b _080E34C6 .align 2, 0 -_080E33A0: .4byte gUnknown_3005090 +_080E33A0: .4byte gTasks _080E33A4: cmp r5, 0x2 beq _080E3444 @@ -10920,7 +10920,7 @@ _080E36B4: strh r7, [r6, 0x3A] strh r1, [r5, 0x3C] strh r1, [r6, 0x3C] - ldr r2, _080E374C @ =gUnknown_3005090 + ldr r2, _080E374C @ =gTasks lsls r3, r7, 2 adds r0, r3, r7 lsls r0, 3 @@ -10959,7 +10959,7 @@ _080E36B4: .align 2, 0 _080E3744: .4byte gSprites _080E3748: .4byte 0x0000fff0 -_080E374C: .4byte gUnknown_3005090 +_080E374C: .4byte gTasks _080E3750: .4byte gUnknown_2024018 _080E3754: .4byte gUnknown_2037F1B _080E3758: @@ -11032,7 +11032,7 @@ sub_80E37D4: @ 80E37D4 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r1, _080E37F8 @ =gUnknown_3005090 + ldr r1, _080E37F8 @ =gTasks lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -11047,7 +11047,7 @@ _080E37F2: pop {r0} bx r0 .align 2, 0 -_080E37F8: .4byte gUnknown_3005090 +_080E37F8: .4byte gTasks thumb_func_end sub_80E37D4 thumb_func_start sub_80E37FC @@ -11140,7 +11140,7 @@ _080E3890: lsls r0, 16 cmp r0, 0 bge _080E38CE - ldr r3, _080E38D4 @ =gUnknown_3005090 + ldr r3, _080E38D4 @ =gTasks movs r2, 0x3C ldrsh r1, [r4, r2] lsls r1, 1 @@ -11162,7 +11162,7 @@ _080E38CE: pop {r0} bx r0 .align 2, 0 -_080E38D4: .4byte gUnknown_3005090 +_080E38D4: .4byte gTasks thumb_func_end sub_80E37FC thumb_func_start sub_80E38D8 @@ -11223,7 +11223,7 @@ sub_80E392C: @ 80E392C lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r1, _080E395C @ =gUnknown_3005090 + ldr r1, _080E395C @ =gTasks lsls r0, 2 add r0, r8 lsls r0, 3 @@ -11240,7 +11240,7 @@ _080E3952: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080E395C: .4byte gUnknown_3005090 +_080E395C: .4byte gTasks _080E3960: .4byte _080E3964 .align 2, 0 _080E3964: @@ -11254,7 +11254,7 @@ _080E3978: bl GetAnimBankSpriteId lsls r0, 24 lsrs r7, r0, 24 - ldr r1, _080E39C4 @ =gUnknown_3005090 + ldr r1, _080E39C4 @ =gTasks mov r2, r8 lsls r4, r2, 2 adds r0, r4, r2 @@ -11286,7 +11286,7 @@ _080E3978: strh r0, [r1, 0x24] b _080E39EA .align 2, 0 -_080E39C4: .4byte gUnknown_3005090 +_080E39C4: .4byte gTasks _080E39C8: .4byte gUnknown_2037F1A _080E39CC: .4byte gSprites _080E39D0: @@ -11304,7 +11304,7 @@ _080E39D0: adds r2, r3, 0 adds r3, r4, 0 _080E39EA: - ldr r1, _080E3A28 @ =gUnknown_3005090 + ldr r1, _080E3A28 @ =gTasks mov r0, r9 add r0, r8 lsls r0, 3 @@ -11335,7 +11335,7 @@ _080E3A16: b _080E3E6C .align 2, 0 _080E3A24: .4byte gSprites -_080E3A28: .4byte gUnknown_3005090 +_080E3A28: .4byte gTasks _080E3A2C: ldr r4, _080E3A90 @ =gUnknown_2037F1A ldrb r0, [r4] @@ -11527,7 +11527,7 @@ _080E3B54: movs r2, 0x6 bl BlendPalette _080E3BBE: - ldr r0, _080E3BE8 @ =gUnknown_3005090 + ldr r0, _080E3BE8 @ =gTasks mov r3, r8 lsls r1, r3, 2 add r1, r8 @@ -11542,9 +11542,9 @@ _080E3BD8: .4byte gUnknown_2037F1B _080E3BDC: .4byte gUnknown_2037F1A _080E3BE0: .4byte gUnknown_2024018 _080E3BE4: .4byte 0x00007fff -_080E3BE8: .4byte gUnknown_3005090 +_080E3BE8: .4byte gTasks _080E3BEC: - ldr r1, _080E3C38 @ =gUnknown_3005090 + ldr r1, _080E3C38 @ =gTasks mov r0, r8 lsls r4, r0, 2 adds r0, r4, r0 @@ -11581,7 +11581,7 @@ _080E3BEC: adds r3, r4, 0 b _080E3C5A .align 2, 0 -_080E3C38: .4byte gUnknown_3005090 +_080E3C38: .4byte gTasks _080E3C3C: .4byte gUnknown_2037F1A _080E3C40: .4byte gSprites _080E3C44: @@ -11597,7 +11597,7 @@ _080E3C44: adds r0, r4 strh r0, [r1, 0x24] _080E3C5A: - ldr r1, _080E3CAC @ =gUnknown_3005090 + ldr r1, _080E3CAC @ =gTasks mov r0, r9 add r0, r8 lsls r0, 3 @@ -11635,7 +11635,7 @@ _080E3C5A: b _080E3CCE .align 2, 0 _080E3CA8: .4byte gSprites -_080E3CAC: .4byte gUnknown_3005090 +_080E3CAC: .4byte gTasks _080E3CB0: .4byte gUnknown_2037F1A _080E3CB4: .4byte gUnknown_2037F1B _080E3CB8: @@ -11667,7 +11667,7 @@ _080E3CDA: bhi _080E3CEC b _080E3E6C _080E3CEC: - ldr r0, _080E3D08 @ =gUnknown_3005090 + ldr r0, _080E3D08 @ =gTasks mov r1, r9 add r1, r8 lsls r1, 3 @@ -11679,13 +11679,13 @@ _080E3CEC: _080E3CFC: .4byte gUnknown_2037F1B _080E3D00: .4byte gUnknown_2037F02 _080E3D04: .4byte 0x0000ffff -_080E3D08: .4byte gUnknown_3005090 +_080E3D08: .4byte gTasks _080E3D0C: movs r0, 0 bl GetAnimBankSpriteId lsls r0, 24 lsrs r7, r0, 24 - ldr r1, _080E3D58 @ =gUnknown_3005090 + ldr r1, _080E3D58 @ =gTasks mov r3, r8 lsls r4, r3, 2 adds r0, r4, r3 @@ -11717,7 +11717,7 @@ _080E3D0C: strh r0, [r1, 0x24] b _080E3D78 .align 2, 0 -_080E3D58: .4byte gUnknown_3005090 +_080E3D58: .4byte gTasks _080E3D5C: .4byte gSprites _080E3D60: .4byte gUnknown_2037F1A _080E3D64: @@ -11732,7 +11732,7 @@ _080E3D64: subs r1, r2 strh r1, [r0, 0x24] _080E3D78: - ldr r0, _080E3D8C @ =gUnknown_3005090 + ldr r0, _080E3D8C @ =gTasks mov r1, r9 add r1, r8 lsls r1, 3 @@ -11743,13 +11743,13 @@ _080E3D82: strh r0, [r1, 0x8] b _080E3E6C .align 2, 0 -_080E3D8C: .4byte gUnknown_3005090 +_080E3D8C: .4byte gTasks _080E3D90: movs r0, 0 bl GetAnimBankSpriteId lsls r0, 24 lsrs r7, r0, 24 - ldr r1, _080E3E04 @ =gUnknown_3005090 + ldr r1, _080E3E04 @ =gTasks mov r0, r8 lsls r4, r0, 2 adds r0, r4, r0 @@ -11800,7 +11800,7 @@ _080E3D90: strh r2, [r6, 0x24] b _080E3E48 .align 2, 0 -_080E3E04: .4byte gUnknown_3005090 +_080E3E04: .4byte gTasks _080E3E08: .4byte gUnknown_2037F1A _080E3E0C: .4byte gSprites _080E3E10: @@ -11832,7 +11832,7 @@ _080E3E10: movs r4, 0 strh r4, [r6, 0x24] _080E3E48: - ldr r1, _080E3E80 @ =gUnknown_3005090 + ldr r1, _080E3E80 @ =gTasks mov r0, r9 add r0, r8 lsls r0, 3 @@ -11860,7 +11860,7 @@ _080E3E6C: bx r0 .align 2, 0 _080E3E7C: .4byte gSprites -_080E3E80: .4byte gUnknown_3005090 +_080E3E80: .4byte gTasks thumb_func_end sub_80E392C thumb_func_start sub_80E3E84 @@ -12023,7 +12023,7 @@ sub_80E3FC0: @ 80E3FC0 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _080E3FE8 @ =gUnknown_3005090 + ldr r1, _080E3FE8 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -12041,7 +12041,7 @@ _080E3FDC: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080E3FE8: .4byte gUnknown_3005090 +_080E3FE8: .4byte gTasks _080E3FEC: .4byte _080E3FF0 .align 2, 0 _080E3FF0: @@ -12065,7 +12065,7 @@ _080E4004: lsls r0, 24 lsrs r0, 24 adds r2, r0, 0 - ldr r1, _080E4050 @ =gUnknown_3005090 + ldr r1, _080E4050 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -12086,7 +12086,7 @@ _080E403A: .align 2, 0 _080E4048: .4byte gUnknown_2037F1A _080E404C: .4byte gUnknown_2037F1B -_080E4050: .4byte gUnknown_3005090 +_080E4050: .4byte gTasks _080E4054: ldr r1, _080E4090 @ =gUnknown_2023D44 ldr r0, _080E4094 @ =gUnknown_2037F1A @@ -12232,7 +12232,7 @@ sub_80E4160: @ 80E4160 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080E41C8 @ =gUnknown_3005090 + ldr r0, _080E41C8 @ =gTasks adds r4, r1, r0 movs r0, 0 bl GetAnimBankSpriteId @@ -12278,7 +12278,7 @@ _080E4194: pop {r0} bx r0 .align 2, 0 -_080E41C8: .4byte gUnknown_3005090 +_080E41C8: .4byte gTasks _080E41CC: .4byte gUnknown_2037F1A _080E41D0: .4byte gSprites _080E41D4: .4byte sub_80E41D8 @@ -12292,7 +12292,7 @@ sub_80E41D8: @ 80E41D8 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _080E41FC @ =gUnknown_3005090 + ldr r1, _080E41FC @ =gTasks adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -12304,7 +12304,7 @@ sub_80E41D8: @ 80E41D8 beq _080E4206 b _080E42D6 .align 2, 0 -_080E41FC: .4byte gUnknown_3005090 +_080E41FC: .4byte gTasks _080E4200: cmp r0, 0x2 beq _080E42D0 @@ -12751,7 +12751,7 @@ sub_80E4540: @ 80E4540 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _080E4578 @ =gUnknown_3005090 + ldr r0, _080E4578 @ =gTasks adds r4, r0 movs r0, 0 strh r0, [r4, 0x8] @@ -12771,7 +12771,7 @@ sub_80E4540: @ 80E4540 pop {r0} bx r0 .align 2, 0 -_080E4578: .4byte gUnknown_3005090 +_080E4578: .4byte gTasks _080E457C: .4byte gUnknown_2037F02 _080E4580: .4byte gUnknown_83FF7A8 _080E4584: .4byte sub_80E4588 @@ -12785,7 +12785,7 @@ sub_80E4588: @ 80E4588 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r2, _080E45E0 @ =gUnknown_3005090 + ldr r2, _080E45E0 @ =gTasks adds r3, r0, r2 ldrh r0, [r3, 0x8] adds r1, r0, 0x1 @@ -12823,7 +12823,7 @@ sub_80E4588: @ 80E4588 strh r1, [r0, 0x24] b _080E45FC .align 2, 0 -_080E45E0: .4byte gUnknown_3005090 +_080E45E0: .4byte gTasks _080E45E4: .4byte gSprites _080E45E8: .4byte 0x0000ffff _080E45EC: diff --git a/asm/battle_anim_80EEC0C.s b/asm/battle_anim_80EEC0C.s index 5dabfe561..84c8c93e2 100644 --- a/asm/battle_anim_80EEC0C.s +++ b/asm/battle_anim_80EEC0C.s @@ -178,7 +178,7 @@ sub_80EEC0C: @ 80EEC0C negs r0, r0 subs r0, 0x20 strh r0, [r1] - ldr r1, _080EEDEC @ =gUnknown_3005090 + ldr r1, _080EEDEC @ =gTasks ldr r2, [sp, 0x10] lsls r0, r2, 2 adds r0, r2 @@ -217,7 +217,7 @@ _080EEDDC: .4byte gUnknown_8D2EC24 _080EEDE0: .4byte gUnknown_8D2DF78 _080EEDE4: .4byte gUnknown_2022978 _080EEDE8: .4byte gUnknown_202297A -_080EEDEC: .4byte gUnknown_3005090 +_080EEDEC: .4byte gTasks _080EEDF0: .4byte sub_80EEDF4 thumb_func_end sub_80EEC0C @@ -231,7 +231,7 @@ sub_80EEDF4: @ 80EEDF4 ldr r0, _080EEE3C @ =gUnknown_2037F1A ldrb r0, [r0] mov r8, r0 - ldr r1, _080EEE40 @ =gUnknown_3005090 + ldr r1, _080EEE40 @ =gTasks lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -261,7 +261,7 @@ sub_80EEDF4: @ 80EEDF4 b _080EEFA8 .align 2, 0 _080EEE3C: .4byte gUnknown_2037F1A -_080EEE40: .4byte gUnknown_3005090 +_080EEE40: .4byte gTasks _080EEE44: .4byte gUnknown_202297A _080EEE48: cmp r0, 0x2 @@ -680,7 +680,7 @@ _080EF19C: .4byte gUnknown_2037F1A sub_80EF1A0: @ 80EF1A0 lsls r0, 24 lsrs r0, 24 - ldr r2, _080EF1C0 @ =gUnknown_3005090 + ldr r2, _080EF1C0 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -694,7 +694,7 @@ sub_80EF1A0: @ 80EF1A0 str r0, [r1] bx lr .align 2, 0 -_080EF1C0: .4byte gUnknown_3005090 +_080EF1C0: .4byte gTasks _080EF1C4: .4byte gUnknown_2037F02 _080EF1C8: .4byte sub_80EF1CC thumb_func_end sub_80EF1A0 @@ -704,7 +704,7 @@ sub_80EF1CC: @ 80EF1CC push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _080EF218 @ =gUnknown_3005090 + ldr r1, _080EF218 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -740,7 +740,7 @@ _080EF20A: beq _080EF25C b _080EF28C .align 2, 0 -_080EF218: .4byte gUnknown_3005090 +_080EF218: .4byte gTasks _080EF21C: .4byte 0x0000d709 _080EF220: ldrh r0, [r4, 0xC] @@ -814,7 +814,7 @@ sub_80EF298: @ 80EF298 ldrb r0, [r0] adds r0, r1 ldrb r5, [r0] - ldr r1, _080EF2CC @ =gUnknown_3005090 + ldr r1, _080EF2CC @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -831,7 +831,7 @@ sub_80EF298: @ 80EF298 .align 2, 0 _080EF2C4: .4byte gUnknown_2023D44 _080EF2C8: .4byte gUnknown_2037F1A -_080EF2CC: .4byte gUnknown_3005090 +_080EF2CC: .4byte gTasks _080EF2D0: cmp r0, 0x2 beq _080EF318 @@ -943,7 +943,7 @@ _080EF39C: lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r2, _080EF3D4 @ =gUnknown_3005090 + ldr r2, _080EF3D4 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -958,7 +958,7 @@ _080EF39C: .align 2, 0 _080EF3CC: .4byte gBattlerPartyIndexes _080EF3D0: .4byte gEnemyParty -_080EF3D4: .4byte gUnknown_3005090 +_080EF3D4: .4byte gTasks _080EF3D8: ldr r5, _080EF450 @ =gUnknown_2037F1A ldrb r0, [r5] @@ -1280,7 +1280,7 @@ sub_80EF5AC: @ 80EF5AC ands r0, r2 orrs r0, r1 strb r0, [r3, 0x9] - ldr r1, _080EF690 @ =gUnknown_3005090 + ldr r1, _080EF690 @ =gTasks mov r2, r10 lsls r0, r2, 2 add r0, r10 @@ -1304,7 +1304,7 @@ _080EF680: .4byte gUnknown_2037F1B _080EF684: .4byte sub_80EF8C0 _080EF688: .4byte gUnknown_2024018 _080EF68C: .4byte gUnknown_2023D44 -_080EF690: .4byte gUnknown_3005090 +_080EF690: .4byte gTasks _080EF694: .4byte sub_80EF698 thumb_func_end sub_80EF5AC @@ -1313,7 +1313,7 @@ sub_80EF698: @ 80EF698 push {lr} lsls r0, 24 lsrs r3, r0, 24 - ldr r1, _080EF6C8 @ =gUnknown_3005090 + ldr r1, _080EF6C8 @ =gTasks lsls r0, r3, 2 adds r0, r3 lsls r0, 3 @@ -1334,7 +1334,7 @@ _080EF6C2: pop {r0} bx r0 .align 2, 0 -_080EF6C8: .4byte gUnknown_3005090 +_080EF6C8: .4byte gTasks _080EF6CC: .4byte gSprites _080EF6D0: .4byte 0x0000ffff thumb_func_end sub_80EF698 @@ -1441,7 +1441,7 @@ _080EF708: add r0, r9 ldr r1, _080EF7E0 @ =sub_8012354 str r1, [r0] - ldr r1, _080EF7E4 @ =gUnknown_3005090 + ldr r1, _080EF7E4 @ =gTasks lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -1464,7 +1464,7 @@ _080EF7D4: .4byte gUnknown_2037F1B _080EF7D8: .4byte SpriteCallbackDummy _080EF7DC: .4byte gUnknown_2023D44 _080EF7E0: .4byte sub_8012354 -_080EF7E4: .4byte gUnknown_3005090 +_080EF7E4: .4byte gTasks _080EF7E8: .4byte sub_80EF7EC thumb_func_end sub_80EF6D4 @@ -1492,7 +1492,7 @@ sub_80EF7EC: @ 80EF7EC movs r0, 0x36 movs r1, 0 bl PlaySE12WithPanning - ldr r0, _080EF854 @ =gUnknown_3005090 + ldr r0, _080EF854 @ =gTasks lsls r4, r5, 2 adds r4, r5 lsls r4, 3 @@ -1519,7 +1519,7 @@ _080EF846: .align 2, 0 _080EF84C: .4byte gSprites _080EF850: .4byte gUnknown_2023D44 -_080EF854: .4byte gUnknown_3005090 +_080EF854: .4byte gTasks _080EF858: .4byte sub_80EF8C0 _080EF85C: .4byte sub_80EF864 _080EF860: .4byte sub_80EF698 @@ -1702,7 +1702,7 @@ sub_80EF9B4: @ 80EF9B4 asrs r0, 16 cmp r0, 0xA bne _080EF9F0 - ldr r0, _080EF9F8 @ =nullsub_43 + ldr r0, _080EF9F8 @ =TaskDummy movs r1, 0x32 bl CreateTask lsls r0, 24 @@ -1727,7 +1727,7 @@ _080EF9F0: pop {r0} bx r0 .align 2, 0 -_080EF9F8: .4byte nullsub_43 +_080EF9F8: .4byte TaskDummy _080EF9FC: .4byte sub_80EFA0C _080EFA00: .4byte gSprites _080EFA04: .4byte gUnknown_2023D44 @@ -1746,7 +1746,7 @@ sub_80EFA0C: @ 80EFA0C ldrh r0, [r7, 0x38] lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _080EFA58 @ =gUnknown_3005090 + ldr r1, _080EFA58 @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -1773,7 +1773,7 @@ _080EFA3E: .align 2, 0 _080EFA50: .4byte gUnknown_2023D44 _080EFA54: .4byte gUnknown_2037F1B -_080EFA58: .4byte gUnknown_3005090 +_080EFA58: .4byte gTasks _080EFA5C: cmp r0, 0x2 beq _080EFAF8 @@ -1869,7 +1869,7 @@ _080EFB12: .align 2, 0 _080EFB1C: .4byte gSprites _080EFB20: - ldr r0, _080EFB50 @ =gUnknown_3005090 + ldr r0, _080EFB50 @ =gTasks lsls r1, r6, 2 adds r1, r6 lsls r1, 3 @@ -1892,7 +1892,7 @@ _080EFB48: pop {r0} bx r0 .align 2, 0 -_080EFB50: .4byte gUnknown_3005090 +_080EFB50: .4byte gTasks _080EFB54: .4byte sub_80EFB58 thumb_func_end sub_80EFA0C @@ -3317,7 +3317,7 @@ LaunchBallStarsTask: @ 80F05EC adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r1, _080F0670 @ =gUnknown_3005090 + ldr r1, _080F0670 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -3342,7 +3342,7 @@ LaunchBallStarsTask: @ 80F05EC bx r1 .align 2, 0 _080F066C: .4byte gUnknown_840C074 -_080F0670: .4byte gUnknown_3005090 +_080F0670: .4byte gTasks thumb_func_end LaunchBallStarsTask thumb_func_start sub_80F0674 @@ -3382,7 +3382,7 @@ sub_80F06A4: @ 80F06A4 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r1, _080F0780 @ =gUnknown_3005090 + ldr r1, _080F0780 @ =gTasks lsls r0, 2 add r0, r8 lsls r0, 3 @@ -3450,7 +3450,7 @@ _080F073C: lsls r0, 5 strh r0, [r7, 0x2E] _080F0740: - ldr r0, _080F0780 @ =gUnknown_3005090 + ldr r0, _080F0780 @ =gTasks mov r4, r8 lsls r1, r4, 2 add r1, r8 @@ -3482,7 +3482,7 @@ _080F0776: bl DestroyTask b _080F07AC .align 2, 0 -_080F0780: .4byte gUnknown_3005090 +_080F0780: .4byte gTasks _080F0784: .4byte gUnknown_840C0A4 _080F0788: .4byte gSprites _080F078C: .4byte gUnknown_840C068 @@ -3573,7 +3573,7 @@ sub_80F0818: @ 80F0818 lsls r0, 24 lsrs r0, 24 mov r9, r0 - ldr r0, _080F08FC @ =gUnknown_3005090 + ldr r0, _080F08FC @ =gTasks mov r2, r9 lsls r1, r2, 2 add r1, r9 @@ -3678,7 +3678,7 @@ _080F08E6: pop {r0} bx r0 .align 2, 0 -_080F08FC: .4byte gUnknown_3005090 +_080F08FC: .4byte gTasks _080F0900: .4byte gSprites _080F0904: .4byte gUnknown_840C0A4 _080F0908: .4byte gUnknown_840C068 @@ -3699,7 +3699,7 @@ sub_80F091C: @ 80F091C lsls r0, 24 lsrs r0, 24 mov r9, r0 - ldr r0, _080F0A00 @ =gUnknown_3005090 + ldr r0, _080F0A00 @ =gTasks mov r2, r9 lsls r1, r2, 2 add r1, r9 @@ -3804,7 +3804,7 @@ _080F09EA: pop {r0} bx r0 .align 2, 0 -_080F0A00: .4byte gUnknown_3005090 +_080F0A00: .4byte gTasks _080F0A04: .4byte gSprites _080F0A08: .4byte gUnknown_840C0A4 _080F0A0C: .4byte gUnknown_840C068 @@ -3825,7 +3825,7 @@ sub_80F0A20: @ 80F0A20 lsls r0, 24 lsrs r0, 24 mov r9, r0 - ldr r1, _080F0B00 @ =gUnknown_3005090 + ldr r1, _080F0B00 @ =gTasks lsls r0, 2 add r0, r9 lsls r0, 3 @@ -3928,7 +3928,7 @@ _080F0AEA: pop {r0} bx r0 .align 2, 0 -_080F0B00: .4byte gUnknown_3005090 +_080F0B00: .4byte gTasks _080F0B04: .4byte gSprites _080F0B08: .4byte gUnknown_840C068 _080F0B0C: .4byte gUnknown_840C0A4 @@ -3949,7 +3949,7 @@ sub_80F0B20: @ 80F0B20 lsls r0, 24 lsrs r0, 24 mov r9, r0 - ldr r0, _080F0C08 @ =gUnknown_3005090 + ldr r0, _080F0C08 @ =gTasks mov r2, r9 lsls r1, r2, 2 add r1, r9 @@ -4056,7 +4056,7 @@ _080F0BF2: pop {r0} bx r0 .align 2, 0 -_080F0C08: .4byte gUnknown_3005090 +_080F0C08: .4byte gTasks _080F0C0C: .4byte gSprites _080F0C10: .4byte gUnknown_840C0A4 _080F0C14: .4byte gUnknown_840C068 @@ -4077,7 +4077,7 @@ sub_80F0C28: @ 80F0C28 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r1, _080F0C54 @ =gUnknown_3005090 + ldr r1, _080F0C54 @ =gTasks lsls r2, r0, 2 adds r0, r2, r0 lsls r0, 3 @@ -4091,7 +4091,7 @@ sub_80F0C28: @ 80F0C28 strh r0, [r3, 0x16] b _080F0D2A .align 2, 0 -_080F0C54: .4byte gUnknown_3005090 +_080F0C54: .4byte gTasks _080F0C58: ldrh r0, [r3, 0x26] lsls r0, 24 @@ -4165,7 +4165,7 @@ _080F0CE0: lsrs r7, r0, 24 cmp r7, 0x7 bls _080F0C84 - ldr r0, _080F0D50 @ =gUnknown_3005090 + ldr r0, _080F0D50 @ =gTasks ldr r1, [sp, 0x14] add r1, r8 lsls r1, 3 @@ -4212,7 +4212,7 @@ _080F0D40: .4byte gUnknown_840C068 _080F0D44: .4byte gUnknown_840C0A4 _080F0D48: .4byte gSprites + 0x1C _080F0D4C: .4byte sub_80F0D5C -_080F0D50: .4byte gUnknown_3005090 +_080F0D50: .4byte gTasks _080F0D54: .4byte gMain _080F0D58: .4byte 0x00000439 thumb_func_end sub_80F0C28 @@ -4273,7 +4273,7 @@ sub_80F0DB4: @ 80F0DB4 lsls r0, 24 lsrs r0, 24 mov r9, r0 - ldr r1, _080F0E90 @ =gUnknown_3005090 + ldr r1, _080F0E90 @ =gTasks lsls r0, 2 add r0, r9 lsls r0, 3 @@ -4374,7 +4374,7 @@ _080F0E7A: pop {r0} bx r0 .align 2, 0 -_080F0E90: .4byte gUnknown_3005090 +_080F0E90: .4byte gTasks _080F0E94: .4byte gSprites _080F0E98: .4byte gUnknown_840C068 _080F0E9C: .4byte gUnknown_840C0A4 @@ -4443,7 +4443,7 @@ sub_80F0F10: @ 80F0F10 lsls r0, 24 lsrs r0, 24 str r0, [sp] - ldr r0, _080F0FC4 @ =gUnknown_3005090 + ldr r0, _080F0FC4 @ =gTasks ldr r2, [sp] lsls r1, r2, 2 adds r1, r2 @@ -4523,7 +4523,7 @@ _080F0F5C: movs r0, 0x1 b _080F0FE2 .align 2, 0 -_080F0FC4: .4byte gUnknown_3005090 +_080F0FC4: .4byte gTasks _080F0FC8: .4byte gUnknown_840C0A4 _080F0FCC: .4byte gSprites _080F0FD0: .4byte gUnknown_840C068 @@ -4590,7 +4590,7 @@ sub_80F103C: @ 80F103C lsls r0, 24 lsrs r0, 24 mov r9, r0 - ldr r1, _080F1114 @ =gUnknown_3005090 + ldr r1, _080F1114 @ =gTasks lsls r0, 2 add r0, r9 lsls r0, 3 @@ -4688,7 +4688,7 @@ _080F10FC: pop {r0} bx r0 .align 2, 0 -_080F1114: .4byte gUnknown_3005090 +_080F1114: .4byte gTasks _080F1118: .4byte gSprites _080F111C: .4byte gUnknown_840C068 _080F1120: .4byte gUnknown_840C0A4 @@ -4833,7 +4833,7 @@ LaunchBallFadeMonTask: @ 80F1218 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r1, _080F1280 @ =gUnknown_3005090 + ldr r1, _080F1280 @ =gTasks lsls r0, 2 add r0, r8 lsls r0, 3 @@ -4864,7 +4864,7 @@ LaunchBallFadeMonTask: @ 80F1218 b _080F12AE .align 2, 0 _080F127C: .4byte sub_80F12E0 -_080F1280: .4byte gUnknown_3005090 +_080F1280: .4byte gTasks _080F1284: .4byte gUnknown_840C1C4 _080F1288: lsls r0, r6, 20 @@ -4915,7 +4915,7 @@ sub_80F12E0: @ 80F12E0 lsls r0, 24 lsrs r0, 24 adds r5, r0, 0 - ldr r1, _080F1330 @ =gUnknown_3005090 + ldr r1, _080F1330 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -4950,7 +4950,7 @@ sub_80F12E0: @ 80F12E0 strh r0, [r4, 0xC] b _080F1360 .align 2, 0 -_080F1330: .4byte gUnknown_3005090 +_080F1330: .4byte gTasks _080F1334: .4byte gUnknown_840C1C4 _080F1338: ldr r0, _080F1368 @ =gUnknown_2037AB8 @@ -4993,7 +4993,7 @@ sub_80F1370: @ 80F1370 ands r0, r1 cmp r0, 0 bne _080F13A8 - ldr r0, _080F13B4 @ =gUnknown_3005090 + ldr r0, _080F13B4 @ =gTasks lsls r4, r2, 2 adds r4, r2 lsls r4, 3 @@ -5017,7 +5017,7 @@ _080F13A8: bx r0 .align 2, 0 _080F13B0: .4byte gUnknown_2037AB8 -_080F13B4: .4byte gUnknown_3005090 +_080F13B4: .4byte gTasks _080F13B8: .4byte 0x00007fff _080F13BC: .4byte sub_80F13C0 thumb_func_end sub_80F1370 @@ -5027,7 +5027,7 @@ sub_80F13C0: @ 80F13C0 push {r4,lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r1, _080F140C @ =gUnknown_3005090 + ldr r1, _080F140C @ =gTasks lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -5062,7 +5062,7 @@ sub_80F13C0: @ 80F13C0 strh r0, [r4, 0xC] b _080F141A .align 2, 0 -_080F140C: .4byte gUnknown_3005090 +_080F140C: .4byte gTasks _080F1410: .4byte gUnknown_840C1C4 _080F1414: adds r0, r2, 0 @@ -5087,7 +5087,7 @@ sub_80F1420: @ 80F1420 ldrb r2, [r3] adds r0, r2, r0 ldrb r6, [r0] - ldr r1, _080F145C @ =gUnknown_3005090 + ldr r1, _080F145C @ =gTasks lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -5104,7 +5104,7 @@ sub_80F1420: @ 80F1420 .align 2, 0 _080F1454: .4byte gUnknown_2023D44 _080F1458: .4byte gUnknown_2037F1A -_080F145C: .4byte gUnknown_3005090 +_080F145C: .4byte gTasks _080F1460: cmp r0, 0x2 beq _080F150A @@ -5154,7 +5154,7 @@ _080F14A8: strh r0, [r2, 0x24] adds r2, r3, 0 _080F14C0: - ldr r1, _080F14F4 @ =gUnknown_3005090 + ldr r1, _080F14F4 @ =gTasks lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -5180,7 +5180,7 @@ _080F14C0: b _080F15BA .align 2, 0 _080F14F0: .4byte gSprites -_080F14F4: .4byte gUnknown_3005090 +_080F14F4: .4byte gTasks _080F14F8: ldrb r1, [r5, 0x1E] adds r0, r2, 0 @@ -5231,7 +5231,7 @@ _080F1540: strh r0, [r1, 0x24] adds r4, r2, 0 _080F1558: - ldr r1, _080F1590 @ =gUnknown_3005090 + ldr r1, _080F1590 @ =gTasks lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -5258,7 +5258,7 @@ _080F1558: b _080F15B4 .align 2, 0 _080F158C: .4byte gSprites -_080F1590: .4byte gUnknown_3005090 +_080F1590: .4byte gTasks _080F1594: .4byte gUnknown_2037F1A _080F1598: ldr r0, _080F15C4 @ =gSprites @@ -5294,7 +5294,7 @@ sub_80F15C8: @ 80F15C8 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _080F15EC @ =gUnknown_3005090 + ldr r1, _080F15EC @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -5309,7 +5309,7 @@ sub_80F15C8: @ 80F15C8 beq _080F15F6 b _080F16B4 .align 2, 0 -_080F15EC: .4byte gUnknown_3005090 +_080F15EC: .4byte gTasks _080F15F0: cmp r0, 0x2 beq _080F167E @@ -5337,7 +5337,7 @@ _080F1620: movs r0, 0x52 movs r1, 0x10 bl SetGpuReg - ldr r0, _080F1640 @ =gUnknown_3005090 + ldr r0, _080F1640 @ =gTasks lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -5348,7 +5348,7 @@ _080F1620: b _080F16B4 .align 2, 0 _080F163C: .4byte 0x00003f44 -_080F1640: .4byte gUnknown_3005090 +_080F1640: .4byte gTasks _080F1644: ldrh r0, [r4, 0xA] adds r1, r0, 0x1 @@ -5530,7 +5530,7 @@ _080F179E: bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r3, _080F17F4 @ =gUnknown_3005090 + ldr r3, _080F17F4 @ =gTasks lsls r2, r4, 2 adds r2, r4 lsls r2, 3 @@ -5553,7 +5553,7 @@ _080F17E4: .4byte 0x000027f9 _080F17E8: .4byte gUnknown_83AD350 _080F17EC: .4byte gUnknown_83ADC58 _080F17F0: .4byte sub_80F181C -_080F17F4: .4byte gUnknown_3005090 +_080F17F4: .4byte gTasks _080F17F8: ldr r0, _080F1818 @ =gUnknown_2024018 ldr r0, [r0] @@ -5584,7 +5584,7 @@ sub_80F181C: @ 80F181C push {r6,r7} lsls r0, 24 lsrs r7, r0, 24 - ldr r1, _080F1844 @ =gUnknown_3005090 + ldr r1, _080F1844 @ =gTasks lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -5598,7 +5598,7 @@ sub_80F181C: @ 80F181C strh r0, [r4, 0x22] b _080F19C0 .align 2, 0 -_080F1844: .4byte gUnknown_3005090 +_080F1844: .4byte gTasks _080F1848: ldr r0, _080F189C @ =gUnknown_2024018 ldr r0, [r0] @@ -5693,7 +5693,7 @@ _080F18F8: orrs r0, r1 strh r0, [r2, 0x4] _080F1906: - ldr r2, _080F1940 @ =gUnknown_3005090 + ldr r2, _080F1940 @ =gTasks lsls r1, r7, 2 adds r0, r1, r7 lsls r0, 3 @@ -5718,7 +5718,7 @@ _080F1930: .4byte gUnknown_83FF180 _080F1934: .4byte gSprites _080F1938: .4byte 0x000003ff _080F193C: .4byte 0xfffffc00 -_080F1940: .4byte gUnknown_3005090 +_080F1940: .4byte gTasks _080F1944: .4byte sub_80F1A2C _080F1948: ldr r3, _080F19CC @ =gSprites @@ -5762,7 +5762,7 @@ _080F1990: lsls r0, 2 adds r0, r1 strh r7, [r0, 0x2E] - ldr r1, _080F19D8 @ =gUnknown_3005090 + ldr r1, _080F19D8 @ =gTasks mov r2, r9 adds r0, r2, r7 lsls r0, 3 @@ -5793,7 +5793,7 @@ _080F19C0: _080F19CC: .4byte gSprites _080F19D0: .4byte sub_80F1A80 _080F19D4: .4byte 0x0000ffe0 -_080F19D8: .4byte gUnknown_3005090 +_080F19D8: .4byte gTasks _080F19DC: .4byte sub_80F19E0 thumb_func_end sub_80F181C @@ -5803,7 +5803,7 @@ sub_80F19E0: @ 80F19E0 lsls r0, 24 lsrs r0, 24 adds r3, r0, 0 - ldr r1, _080F1A24 @ =gUnknown_3005090 + ldr r1, _080F1A24 @ =gTasks lsls r0, r3, 2 adds r0, r3 lsls r0, 3 @@ -5835,7 +5835,7 @@ _080F1A20: pop {r0} bx r0 .align 2, 0 -_080F1A24: .4byte gUnknown_3005090 +_080F1A24: .4byte gTasks _080F1A28: .4byte gUnknown_2024018 thumb_func_end sub_80F19E0 @@ -5860,7 +5860,7 @@ sub_80F1A2C: @ 80F1A2C asrs r0, 16 cmp r0, 0xFF ble _080F1A76 - ldr r2, _080F1A7C @ =gUnknown_3005090 + ldr r2, _080F1A7C @ =gTasks movs r0, 0x2E ldrsh r1, [r4, r0] lsls r0, r1, 2 @@ -5879,7 +5879,7 @@ _080F1A76: pop {r0} bx r0 .align 2, 0 -_080F1A7C: .4byte gUnknown_3005090 +_080F1A7C: .4byte gTasks thumb_func_end sub_80F1A2C thumb_func_start sub_80F1A80 @@ -5912,7 +5912,7 @@ _080F1A94: asrs r1, 16 cmp r1, 0x20 ble _080F1AD6 - ldr r2, _080F1ADC @ =gUnknown_3005090 + ldr r2, _080F1ADC @ =gTasks movs r0, 0x2E ldrsh r1, [r4, r0] lsls r0, r1, 2 @@ -5931,7 +5931,7 @@ _080F1AD6: pop {r0} bx r0 .align 2, 0 -_080F1ADC: .4byte gUnknown_3005090 +_080F1ADC: .4byte gTasks thumb_func_end sub_80F1A80 thumb_func_start sub_80F1AE0 diff --git a/asm/battle_anim_sound_tasks.s b/asm/battle_anim_sound_tasks.s index 9b85eb2d9..d6e095db4 100644 --- a/asm/battle_anim_sound_tasks.s +++ b/asm/battle_anim_sound_tasks.s @@ -10,7 +10,7 @@ sub_80DCE10: @ 80DCE10 push {r4-r6,lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _080DCE6C @ =gUnknown_3005090 + ldr r1, _080DCE6C @ =gTasks lsls r6, r0, 2 adds r6, r0 lsls r6, 3 @@ -50,7 +50,7 @@ sub_80DCE10: @ 80DCE10 pop {r0} bx r0 .align 2, 0 -_080DCE6C: .4byte gUnknown_3005090 +_080DCE6C: .4byte gTasks _080DCE70: .4byte gUnknown_2037F02 _080DCE74: .4byte sub_80DCE78 thumb_func_end sub_80DCE10 @@ -60,7 +60,7 @@ sub_80DCE78: @ 80DCE78 push {r4-r6,lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080DCEA8 @ =gUnknown_3005090 + ldr r2, _080DCEA8 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -82,7 +82,7 @@ sub_80DCE78: @ 80DCE78 str r0, [r4] b _080DCEDE .align 2, 0 -_080DCEA8: .4byte gUnknown_3005090 +_080DCEA8: .4byte gTasks _080DCEAC: .4byte sub_80DCEE4 _080DCEB0: ldrh r0, [r4, 0x1C] @@ -118,7 +118,7 @@ sub_80DCEE4: @ 80DCEE4 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _080DCF34 @ =gUnknown_3005090 + ldr r1, _080DCF34 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -153,7 +153,7 @@ _080DCF2C: pop {r0} bx r0 .align 2, 0 -_080DCF34: .4byte gUnknown_3005090 +_080DCF34: .4byte gTasks thumb_func_end sub_80DCEE4 thumb_func_start mas_80DCF38 @@ -200,7 +200,7 @@ mas_80DCF38: @ 80DCF38 adds r1, r5, 0 adds r2, r6, 0 bl CalculatePanIncrement - ldr r2, _080DCFE0 @ =gUnknown_3005090 + ldr r2, _080DCFE0 @ =gTasks mov r3, r8 lsls r1, r3, 2 add r1, r8 @@ -237,7 +237,7 @@ mas_80DCF38: @ 80DCF38 bx r0 .align 2, 0 _080DCFDC: .4byte gUnknown_2037F02 -_080DCFE0: .4byte gUnknown_3005090 +_080DCFE0: .4byte gTasks _080DCFE4: .4byte sub_80DCFE8 thumb_func_end mas_80DCF38 @@ -246,7 +246,7 @@ sub_80DCFE8: @ 80DCFE8 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _080DD02C @ =gUnknown_3005090 + ldr r1, _080DD02C @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -276,9 +276,9 @@ sub_80DCFE8: @ 80DCFE8 bl DestroyAnimSoundTask b _080DD062 .align 2, 0 -_080DD02C: .4byte gUnknown_3005090 +_080DD02C: .4byte gTasks _080DD030: - ldr r1, _080DD068 @ =gUnknown_3005090 + ldr r1, _080DD068 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -307,7 +307,7 @@ _080DD062: pop {r0} bx r0 .align 2, 0 -_080DD068: .4byte gUnknown_3005090 +_080DD068: .4byte gTasks thumb_func_end sub_80DCFE8 thumb_func_start sub_80DD06C @@ -516,7 +516,7 @@ _080DD1F6: bl GetMonData lsls r0, 16 lsrs r3, r0, 16 - ldr r1, _080DD23C @ =gUnknown_3005090 + ldr r1, _080DD23C @ =gTasks lsls r2, r6, 2 adds r0, r2, r6 lsls r0, 3 @@ -542,14 +542,14 @@ _080DD1F6: .align 2, 0 _080DD234: .4byte gBattlerPartyIndexes _080DD238: .4byte gPlayerParty -_080DD23C: .4byte gUnknown_3005090 +_080DD23C: .4byte gTasks _080DD240: .4byte gUnknown_2037F02 _080DD244: adds r0, r3, 0 movs r2, 0x7 bl PlayCry3 _080DD24C: - ldr r0, _080DD25C @ =gUnknown_3005090 + ldr r0, _080DD25C @ =gTasks adds r1, r5, r6 lsls r1, 3 adds r1, r0 @@ -557,7 +557,7 @@ _080DD24C: str r0, [r1] b _080DD26A .align 2, 0 -_080DD25C: .4byte gUnknown_3005090 +_080DD25C: .4byte gTasks _080DD260: .4byte sub_80DD270 _080DD264: adds r0, r6, 0 @@ -577,7 +577,7 @@ sub_80DD270: @ 80DD270 lsls r0, 24 lsrs r4, r0, 24 mov r9, r4 - ldr r1, _080DD2A0 @ =gUnknown_3005090 + ldr r1, _080DD2A0 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -595,7 +595,7 @@ sub_80DD270: @ 80DD270 strh r0, [r1, 0x1A] b _080DD2E6 .align 2, 0 -_080DD2A0: .4byte gUnknown_3005090 +_080DD2A0: .4byte gTasks _080DD2A4: movs r2, 0x8 ldrsh r0, [r1, r2] @@ -640,7 +640,7 @@ sub_80DD2F4: @ 80DD2F4 lsls r0, 24 lsrs r0, 24 adds r4, r0, 0 - ldr r1, _080DD318 @ =gUnknown_3005090 + ldr r1, _080DD318 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -654,7 +654,7 @@ sub_80DD2F4: @ 80DD2F4 strh r0, [r1, 0x1A] b _080DD32C .align 2, 0 -_080DD318: .4byte gUnknown_3005090 +_080DD318: .4byte gTasks _080DD31C: bl IsCryPlaying lsls r0, 24 @@ -682,7 +682,7 @@ sub_80DD334: @ 80DD334 lsls r1, 1 adds r1, r2 ldrh r3, [r1] - ldr r2, _080DD37C @ =gUnknown_3005090 + ldr r2, _080DD37C @ =gTasks lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -702,7 +702,7 @@ sub_80DD334: @ 80DD334 .align 2, 0 _080DD374: .4byte gUnknown_2037F1C _080DD378: .4byte gUnknown_2037F1A -_080DD37C: .4byte gUnknown_3005090 +_080DD37C: .4byte gTasks _080DD380: .4byte sub_80DD390 _080DD384: adds r0, r5, 0 @@ -719,7 +719,7 @@ sub_80DD390: @ 80DD390 lsls r0, 24 lsrs r0, 24 adds r5, r0, 0 - ldr r1, _080DD3B4 @ =gUnknown_3005090 + ldr r1, _080DD3B4 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -733,7 +733,7 @@ sub_80DD390: @ 80DD390 strh r0, [r4, 0x1A] b _080DD3D4 .align 2, 0 -_080DD3B4: .4byte gUnknown_3005090 +_080DD3B4: .4byte gTasks _080DD3B8: bl IsCryPlaying lsls r0, 24 @@ -841,7 +841,7 @@ sub_80DD444: @ 80DD444 adds r1, r5, 0 adds r2, r6, 0 bl CalculatePanIncrement - ldr r2, _080DD4CC @ =gUnknown_3005090 + ldr r2, _080DD4CC @ =gTasks mov r3, r8 lsls r1, r3, 2 add r1, r8 @@ -869,7 +869,7 @@ sub_80DD444: @ 80DD444 bx r0 .align 2, 0 _080DD4C8: .4byte gUnknown_2037F02 -_080DD4CC: .4byte gUnknown_3005090 +_080DD4CC: .4byte gTasks _080DD4D0: .4byte sub_80DD4D4 thumb_func_end sub_80DD444 @@ -879,7 +879,7 @@ sub_80DD4D4: @ 80DD4D4 lsls r0, 24 lsrs r0, 24 adds r5, r0, 0 - ldr r1, _080DD52C @ =gUnknown_3005090 + ldr r1, _080DD52C @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -920,7 +920,7 @@ _080DD526: pop {r0} bx r0 .align 2, 0 -_080DD52C: .4byte gUnknown_3005090 +_080DD52C: .4byte gTasks _080DD530: .4byte gUnknown_2037F24 thumb_func_end sub_80DD4D4 diff --git a/asm/battle_controller_link_opponent.s b/asm/battle_controller_link_opponent.s index 7284f88fd..8114a4c7b 100644 --- a/asm/battle_controller_link_opponent.s +++ b/asm/battle_controller_link_opponent.s @@ -5676,7 +5676,7 @@ sub_803D454: @ 803D454 bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r4, _0803D54C @ =gUnknown_3005090 + ldr r4, _0803D54C @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -5728,7 +5728,7 @@ _0803D53C: .4byte gSprites _0803D540: .4byte sub_8075590 _0803D544: .4byte sub_803D648 _0803D548: .4byte sub_803D564 -_0803D54C: .4byte gUnknown_3005090 +_0803D54C: .4byte gTasks _0803D550: .4byte gUnknown_2024018 _0803D554: .4byte gUnknown_2024000 _0803D558: .4byte sub_80491B0 @@ -5748,7 +5748,7 @@ sub_803D564: @ 803D564 ldr r7, _0803D5BC @ =gActiveBattler ldrb r0, [r7] mov r9, r0 - ldr r1, _0803D5C0 @ =gUnknown_3005090 + ldr r1, _0803D5C0 @ =gTasks mov r2, r8 lsls r0, r2, 2 add r0, r8 @@ -5783,7 +5783,7 @@ _0803D59E: b _0803D610 .align 2, 0 _0803D5BC: .4byte gActiveBattler -_0803D5C0: .4byte gUnknown_3005090 +_0803D5C0: .4byte gTasks _0803D5C4: .4byte gBattleTypeFlags _0803D5C8: .4byte gUnknown_2022BC4 _0803D5CC: .4byte gBattlerPartyIndexes @@ -6060,7 +6060,7 @@ RecordedOpponentHandleCmd49: @ 803D7D8 ands r0, r1 cmp r0, 0 beq _0803D80A - ldr r2, _0803D81C @ =gUnknown_3005090 + ldr r2, _0803D81C @ =gTasks ldr r0, _0803D820 @ =gUnknown_2024000 adds r0, r3, r0 ldrb r1, [r0] @@ -6077,7 +6077,7 @@ _0803D80A: .align 2, 0 _0803D814: .4byte gUnknown_2024018 _0803D818: .4byte gActiveBattler -_0803D81C: .4byte gUnknown_3005090 +_0803D81C: .4byte gTasks _0803D820: .4byte gUnknown_2024000 _0803D824: .4byte sub_80491B0 thumb_func_end RecordedOpponentHandleCmd49 diff --git a/asm/battle_controller_link_partner.s b/asm/battle_controller_link_partner.s index 42682e47d..876d380ee 100644 --- a/asm/battle_controller_link_partner.s +++ b/asm/battle_controller_link_partner.s @@ -5405,7 +5405,7 @@ _080D6E0C: bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r4, _080D6EB8 @ =gUnknown_3005090 + ldr r4, _080D6EB8 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -5456,7 +5456,7 @@ _080D6EA8: .4byte gSprites _080D6EAC: .4byte gUnknown_2023D44 _080D6EB0: .4byte gActiveBattler _080D6EB4: .4byte sub_80D6ED0 -_080D6EB8: .4byte gUnknown_3005090 +_080D6EB8: .4byte gTasks _080D6EBC: .4byte gUnknown_2024018 _080D6EC0: .4byte gUnknown_2024000 _080D6EC4: .4byte sub_80491B0 @@ -5473,7 +5473,7 @@ sub_80D6ED0: @ 80D6ED0 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r1, _080D6EF8 @ =gUnknown_3005090 + ldr r1, _080D6EF8 @ =gTasks lsls r0, 2 add r0, r8 lsls r0, 3 @@ -5487,7 +5487,7 @@ sub_80D6ED0: @ 80D6ED0 strh r0, [r1, 0xA] b _080D6FB8 .align 2, 0 -_080D6EF8: .4byte gUnknown_3005090 +_080D6EF8: .4byte gTasks _080D6EFC: ldr r7, _080D6F3C @ =gActiveBattler ldrb r0, [r7] @@ -5741,7 +5741,7 @@ sub_80D70E8: @ 80D70E8 ands r0, r1 cmp r0, 0 beq _080D711A - ldr r2, _080D712C @ =gUnknown_3005090 + ldr r2, _080D712C @ =gTasks ldr r0, _080D7130 @ =gUnknown_2024000 adds r0, r3, r0 ldrb r1, [r0] @@ -5758,7 +5758,7 @@ _080D711A: .align 2, 0 _080D7124: .4byte gUnknown_2024018 _080D7128: .4byte gActiveBattler -_080D712C: .4byte gUnknown_3005090 +_080D712C: .4byte gTasks _080D7130: .4byte gUnknown_2024000 _080D7134: .4byte sub_80491B0 thumb_func_end sub_80D70E8 diff --git a/asm/battle_controller_oak.s b/asm/battle_controller_oak.s index 54b9c645c..b5905ade8 100644 --- a/asm/battle_controller_oak.s +++ b/asm/battle_controller_oak.s @@ -549,7 +549,7 @@ sub_80E79B8: @ 80E79B8 adds r0, r1 ldr r1, _080E7A08 @ =sub_80E7A14 str r1, [r0] - ldr r3, _080E7A0C @ =gUnknown_3005090 + ldr r3, _080E7A0C @ =gTasks ldr r1, _080E7A10 @ =gUnknown_3004FFC ldrb r0, [r2] adds r0, r1 @@ -572,7 +572,7 @@ _080E79FC: .4byte gUnknown_2037AB8 _080E7A00: .4byte gUnknown_3004FE0 _080E7A04: .4byte gActiveBattler _080E7A08: .4byte sub_80E7A14 -_080E7A0C: .4byte gUnknown_3005090 +_080E7A0C: .4byte gTasks _080E7A10: .4byte gUnknown_3004FFC thumb_func_end sub_80E79B8 @@ -1057,7 +1057,7 @@ sub_80E7E04: @ 80E7E04 lsls r0, 24 lsrs r0, 24 mov r9, r0 - ldr r1, _080E7F04 @ =gUnknown_3005090 + ldr r1, _080E7F04 @ =gTasks lsls r0, 2 add r0, r9 lsls r0, 3 @@ -1170,7 +1170,7 @@ _080E7EFE: ldr r0, _080E7F1C @ =sub_80E8190 b _080E7F62 .align 2, 0 -_080E7F04: .4byte gUnknown_3005090 +_080E7F04: .4byte gTasks _080E7F08: .4byte gBattlerPartyIndexes _080E7F0C: .4byte gPlayerParty _080E7F10: .4byte gUnknown_8253AE4 @@ -1178,7 +1178,7 @@ _080E7F14: .4byte gBaseStats _080E7F18: .4byte gActiveBattler _080E7F1C: .4byte sub_80E8190 _080E7F20: - ldr r0, _080E7F30 @ =gUnknown_3005090 + ldr r0, _080E7F30 @ =gTasks mov r2, r9 lsls r1, r2, 2 add r1, r9 @@ -1187,7 +1187,7 @@ _080E7F20: ldr r0, _080E7F34 @ =sub_80E82A8 b _080E7F64 .align 2, 0 -_080E7F30: .4byte gUnknown_3005090 +_080E7F30: .4byte gTasks _080E7F34: .4byte sub_80E82A8 _080E7F38: str r0, [sp, 0x4] @@ -1236,7 +1236,7 @@ sub_80E7F7C: @ 80E7F7C sub sp, 0x4 lsls r0, 24 lsrs r0, 24 - ldr r1, _080E8034 @ =gUnknown_3005090 + ldr r1, _080E8034 @ =gTasks lsls r2, r0, 2 mov r8, r2 add r8, r0 @@ -1316,7 +1316,7 @@ sub_80E7F7C: @ 80E7F7C pop {r0} bx r0 .align 2, 0 -_080E8034: .4byte gUnknown_3005090 +_080E8034: .4byte gTasks _080E8038: .4byte gPlayerParty _080E803C: .4byte gUnknown_8253AE4 _080E8040: .4byte gBaseStats @@ -1335,7 +1335,7 @@ sub_80E804C: @ 80E804C lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r1, _080E8078 @ =gUnknown_3005090 + ldr r1, _080E8078 @ =gTasks lsls r0, 2 add r0, r8 lsls r0, 3 @@ -1349,7 +1349,7 @@ sub_80E804C: @ 80E804C strh r0, [r6, 0x1C] b _080E8178 .align 2, 0 -_080E8078: .4byte gUnknown_3005090 +_080E8078: .4byte gTasks _080E807C: ldrb r0, [r6, 0x8] mov r9, r0 @@ -1481,7 +1481,7 @@ sub_80E8190: @ 80E8190 push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _080E81E4 @ =gUnknown_3005090 + ldr r1, _080E81E4 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -1509,7 +1509,7 @@ _080E81C4: adds r2, r4, 0 movs r3, 0 bl InitAndLaunchSpecialAnimation - ldr r0, _080E81E4 @ =gUnknown_3005090 + ldr r0, _080E81E4 @ =gTasks lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -1520,7 +1520,7 @@ _080E81C4: pop {r0} bx r0 .align 2, 0 -_080E81E4: .4byte gUnknown_3005090 +_080E81E4: .4byte gTasks _080E81E8: .4byte gBattlerPartyIndexes _080E81EC: .4byte sub_80E81F0 thumb_func_end sub_80E8190 @@ -1530,7 +1530,7 @@ sub_80E81F0: @ 80E81F0 push {r4-r7,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _080E825C @ =gUnknown_3005090 + ldr r1, _080E825C @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -1579,7 +1579,7 @@ sub_80E81F0: @ 80E81F0 bl UpdateHealthboxAttribute b _080E8284 .align 2, 0 -_080E825C: .4byte gUnknown_3005090 +_080E825C: .4byte gTasks _080E8260: .4byte gUnknown_2024018 _080E8264: .4byte gPlayerParty _080E8268: .4byte gBattlerPartyIndexes @@ -1595,7 +1595,7 @@ _080E8270: movs r2, 0 bl UpdateHealthboxAttribute _080E8284: - ldr r0, _080E82A0 @ =gUnknown_3005090 + ldr r0, _080E82A0 @ =gTasks lsls r1, r6, 2 adds r1, r6 lsls r1, 3 @@ -1609,7 +1609,7 @@ _080E8292: .align 2, 0 _080E8298: .4byte gUnknown_3004FF0 _080E829C: .4byte gPlayerParty -_080E82A0: .4byte gUnknown_3005090 +_080E82A0: .4byte gTasks _080E82A4: .4byte sub_80E82A8 thumb_func_end sub_80E81F0 @@ -1619,7 +1619,7 @@ sub_80E82A8: @ 80E82A8 adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r0, _080E82E4 @ =gUnknown_3005090 + ldr r0, _080E82E4 @ =gTasks lsls r4, r5, 2 adds r4, r5 lsls r4, 3 @@ -1643,7 +1643,7 @@ sub_80E82A8: @ 80E82A8 pop {r0} bx r0 .align 2, 0 -_080E82E4: .4byte gUnknown_3005090 +_080E82E4: .4byte gTasks _080E82E8: .4byte gPlayerParty _080E82EC: .4byte gUnknown_3004FE0 _080E82F0: .4byte sub_80E8930 @@ -6224,7 +6224,7 @@ _080EA8D0: .4byte gUnknown_2022BC4 sub_80EA8D4: @ 80EA8D4 push {r4-r6,lr} sub sp, 0x4 - ldr r0, _080EA984 @ =nullsub_43 + ldr r0, _080EA984 @ =TaskDummy movs r1, 0xFF bl CreateTask ldr r3, _080EA988 @ =gUnknown_3004FFC @@ -6232,7 +6232,7 @@ sub_80EA8D4: @ 80EA8D4 ldrb r1, [r4] adds r1, r3 strb r0, [r1] - ldr r5, _080EA990 @ =gUnknown_3005090 + ldr r5, _080EA990 @ =gTasks ldrb r2, [r4] adds r3, r2, r3 ldrb r0, [r3] @@ -6309,10 +6309,10 @@ _080EA940: pop {r0} bx r0 .align 2, 0 -_080EA984: .4byte nullsub_43 +_080EA984: .4byte TaskDummy _080EA988: .4byte gUnknown_3004FFC _080EA98C: .4byte gActiveBattler -_080EA990: .4byte gUnknown_3005090 +_080EA990: .4byte gTasks _080EA994: .4byte gUnknown_2022BC4 _080EA998: .4byte gBattleStruct _080EA99C: .4byte gUnknown_203B0DC @@ -6491,7 +6491,7 @@ _080EAAF0: bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080EAB48 @ =gUnknown_3005090 + ldr r2, _080EAB48 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -6512,7 +6512,7 @@ _080EAB3C: bx r0 .align 2, 0 _080EAB44: .4byte sub_80E7E04 -_080EAB48: .4byte gUnknown_3005090 +_080EAB48: .4byte gTasks _080EAB4C: .4byte gUnknown_3004FE0 _080EAB50: .4byte nullsub_81 thumb_func_end sub_80EAAB8 @@ -6921,7 +6921,7 @@ _080EAD64: bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r4, _080EAECC @ =gUnknown_3005090 + ldr r4, _080EAECC @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -6976,7 +6976,7 @@ _080EAEBC: .4byte 0x0000d6f8 _080EAEC0: .4byte gUnknown_8239FD4 _080EAEC4: .4byte gSaveBlock2Ptr _080EAEC8: .4byte sub_80EB0A8 -_080EAECC: .4byte gUnknown_3005090 +_080EAECC: .4byte gTasks _080EAED0: .4byte gUnknown_2024018 _080EAED4: .4byte gUnknown_2024000 _080EAED8: .4byte sub_80491B0 @@ -6997,7 +6997,7 @@ _080EAEE4: ands r0, r1 cmp r0, 0 beq _080EAF14 - ldr r2, _080EAF28 @ =gUnknown_3005090 + ldr r2, _080EAF28 @ =gTasks ldr r0, _080EAF2C @ =gUnknown_2024000 adds r0, r3, r0 ldrb r1, [r0] @@ -7016,7 +7016,7 @@ _080EAF18: .align 2, 0 _080EAF20: .4byte gUnknown_2024018 _080EAF24: .4byte gActiveBattler -_080EAF28: .4byte gUnknown_3005090 +_080EAF28: .4byte gTasks _080EAF2C: .4byte gUnknown_2024000 _080EAF30: .4byte sub_80491B0 thumb_func_end sub_80EAD54 @@ -7196,7 +7196,7 @@ sub_80EB0A8: @ 80EB0A8 push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _080EB0C8 @ =gUnknown_3005090 + ldr r1, _080EB0C8 @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -7210,7 +7210,7 @@ sub_80EB0A8: @ 80EB0A8 strh r0, [r1, 0xA] b _080EB102 .align 2, 0 -_080EB0C8: .4byte gUnknown_3005090 +_080EB0C8: .4byte gTasks _080EB0CC: ldr r4, _080EB108 @ =gActiveBattler ldrb r5, [r4] diff --git a/asm/battle_controller_opponent.s b/asm/battle_controller_opponent.s index 635aae83a..9de63d725 100644 --- a/asm/battle_controller_opponent.s +++ b/asm/battle_controller_opponent.s @@ -6165,7 +6165,7 @@ sub_8038C80: @ 8038C80 bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r4, _08038D78 @ =gUnknown_3005090 + ldr r4, _08038D78 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -6217,7 +6217,7 @@ _08038D68: .4byte gSprites _08038D6C: .4byte sub_8075590 _08038D70: .4byte sub_8038D90 _08038D74: .4byte sub_8038DC4 -_08038D78: .4byte gUnknown_3005090 +_08038D78: .4byte gTasks _08038D7C: .4byte gUnknown_2024018 _08038D80: .4byte gUnknown_2024000 _08038D84: .4byte sub_80491B0 @@ -6263,7 +6263,7 @@ sub_8038DC4: @ 8038DC4 ldr r7, _08038E1C @ =gActiveBattler ldrb r0, [r7] mov r9, r0 - ldr r1, _08038E20 @ =gUnknown_3005090 + ldr r1, _08038E20 @ =gTasks mov r2, r8 lsls r0, r2, 2 add r0, r8 @@ -6298,7 +6298,7 @@ _08038DFE: b _08038E70 .align 2, 0 _08038E1C: .4byte gActiveBattler -_08038E20: .4byte gUnknown_3005090 +_08038E20: .4byte gTasks _08038E24: .4byte gBattleTypeFlags _08038E28: .4byte gUnknown_2022BC4 _08038E2C: .4byte gBattlerPartyIndexes @@ -6549,7 +6549,7 @@ sub_8039004: @ 8039004 ands r0, r1 cmp r0, 0 beq _08039036 - ldr r2, _08039048 @ =gUnknown_3005090 + ldr r2, _08039048 @ =gTasks ldr r0, _0803904C @ =gUnknown_2024000 adds r0, r3, r0 ldrb r1, [r0] @@ -6566,7 +6566,7 @@ _08039036: .align 2, 0 _08039040: .4byte gUnknown_2024018 _08039044: .4byte gActiveBattler -_08039048: .4byte gUnknown_3005090 +_08039048: .4byte gTasks _0803904C: .4byte gUnknown_2024000 _08039050: .4byte sub_80491B0 thumb_func_end sub_8039004 diff --git a/asm/battle_controller_player.s b/asm/battle_controller_player.s index d1ef9e612..b036c9a78 100644 --- a/asm/battle_controller_player.s +++ b/asm/battle_controller_player.s @@ -3386,7 +3386,7 @@ sub_802FEAC: @ 802FEAC lsls r0, 24 lsrs r0, 24 mov r9, r0 - ldr r1, _0802FFAC @ =gUnknown_3005090 + ldr r1, _0802FFAC @ =gTasks lsls r0, 2 add r0, r9 lsls r0, 3 @@ -3499,7 +3499,7 @@ _0802FFA6: ldr r0, _0802FFC4 @ =sub_8030238 b _0803000A .align 2, 0 -_0802FFAC: .4byte gUnknown_3005090 +_0802FFAC: .4byte gTasks _0802FFB0: .4byte gBattlerPartyIndexes _0802FFB4: .4byte gPlayerParty _0802FFB8: .4byte gUnknown_8253AE4 @@ -3507,7 +3507,7 @@ _0802FFBC: .4byte gBaseStats _0802FFC0: .4byte gActiveBattler _0802FFC4: .4byte sub_8030238 _0802FFC8: - ldr r0, _0802FFD8 @ =gUnknown_3005090 + ldr r0, _0802FFD8 @ =gTasks mov r2, r9 lsls r1, r2, 2 add r1, r9 @@ -3516,7 +3516,7 @@ _0802FFC8: ldr r0, _0802FFDC @ =sub_8030350 b _0803000C .align 2, 0 -_0802FFD8: .4byte gUnknown_3005090 +_0802FFD8: .4byte gTasks _0802FFDC: .4byte sub_8030350 _0802FFE0: str r0, [sp, 0x4] @@ -3565,7 +3565,7 @@ sub_8030024: @ 8030024 sub sp, 0x4 lsls r0, 24 lsrs r0, 24 - ldr r1, _080300DC @ =gUnknown_3005090 + ldr r1, _080300DC @ =gTasks lsls r2, r0, 2 mov r8, r2 add r8, r0 @@ -3645,7 +3645,7 @@ sub_8030024: @ 8030024 pop {r0} bx r0 .align 2, 0 -_080300DC: .4byte gUnknown_3005090 +_080300DC: .4byte gTasks _080300E0: .4byte gPlayerParty _080300E4: .4byte gUnknown_8253AE4 _080300E8: .4byte gBaseStats @@ -3664,7 +3664,7 @@ sub_80300F4: @ 80300F4 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r1, _08030120 @ =gUnknown_3005090 + ldr r1, _08030120 @ =gTasks lsls r0, 2 add r0, r8 lsls r0, 3 @@ -3678,7 +3678,7 @@ sub_80300F4: @ 80300F4 strh r0, [r6, 0x1C] b _08030220 .align 2, 0 -_08030120: .4byte gUnknown_3005090 +_08030120: .4byte gTasks _08030124: ldrb r0, [r6, 0x8] mov r9, r0 @@ -3810,7 +3810,7 @@ sub_8030238: @ 8030238 push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _0803028C @ =gUnknown_3005090 + ldr r1, _0803028C @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -3838,7 +3838,7 @@ _0803026C: adds r2, r4, 0 movs r3, 0 bl InitAndLaunchSpecialAnimation - ldr r0, _0803028C @ =gUnknown_3005090 + ldr r0, _0803028C @ =gTasks lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -3849,7 +3849,7 @@ _0803026C: pop {r0} bx r0 .align 2, 0 -_0803028C: .4byte gUnknown_3005090 +_0803028C: .4byte gTasks _08030290: .4byte gBattlerPartyIndexes _08030294: .4byte sub_8030298 thumb_func_end sub_8030238 @@ -3859,7 +3859,7 @@ sub_8030298: @ 8030298 push {r4-r7,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _08030304 @ =gUnknown_3005090 + ldr r1, _08030304 @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -3908,7 +3908,7 @@ sub_8030298: @ 8030298 bl UpdateHealthboxAttribute b _0803032C .align 2, 0 -_08030304: .4byte gUnknown_3005090 +_08030304: .4byte gTasks _08030308: .4byte gUnknown_2024018 _0803030C: .4byte gPlayerParty _08030310: .4byte gBattlerPartyIndexes @@ -3924,7 +3924,7 @@ _08030318: movs r2, 0 bl UpdateHealthboxAttribute _0803032C: - ldr r0, _08030348 @ =gUnknown_3005090 + ldr r0, _08030348 @ =gTasks lsls r1, r6, 2 adds r1, r6 lsls r1, 3 @@ -3938,7 +3938,7 @@ _0803033A: .align 2, 0 _08030340: .4byte gUnknown_3004FF0 _08030344: .4byte gPlayerParty -_08030348: .4byte gUnknown_3005090 +_08030348: .4byte gTasks _0803034C: .4byte sub_8030350 thumb_func_end sub_8030298 @@ -3947,7 +3947,7 @@ sub_8030350: @ 8030350 push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _08030380 @ =gUnknown_3005090 + ldr r1, _08030380 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -3967,7 +3967,7 @@ sub_8030350: @ 8030350 strh r0, [r4, 0x26] b _08030398 .align 2, 0 -_08030380: .4byte gUnknown_3005090 +_08030380: .4byte gTasks _08030384: .4byte sub_80303A8 _08030388: ldr r0, _080303A0 @ =gUnknown_3004FE0 @@ -3998,7 +3998,7 @@ sub_80303A8: @ 80303A8 lsls r0, 2 add r0, r8 lsls r0, 3 - ldr r1, _080303FC @ =gUnknown_3005098 + ldr r1, _080303FC @ =gTasks+0x8 adds r5, r0, r1 ldrb r7, [r5, 0x4] adds r0, r7, 0 @@ -4030,7 +4030,7 @@ _080303F0: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080303FC: .4byte gUnknown_3005098 +_080303FC: .4byte gTasks+0x8 _08030400: .4byte gUnknown_2023D44 _08030404: .4byte gSprites _08030408: .4byte _0803040C @@ -4306,7 +4306,7 @@ sub_8030628: @ 8030628 adds r0, r1 ldr r1, _08030678 @ =sub_8030684 str r1, [r0] - ldr r3, _0803067C @ =gUnknown_3005090 + ldr r3, _0803067C @ =gTasks ldr r1, _08030680 @ =gUnknown_3004FFC ldrb r0, [r2] adds r0, r1 @@ -4329,7 +4329,7 @@ _0803066C: .4byte gUnknown_2037AB8 _08030670: .4byte gUnknown_3004FE0 _08030674: .4byte gActiveBattler _08030678: .4byte sub_8030684 -_0803067C: .4byte gUnknown_3005090 +_0803067C: .4byte gTasks _08030680: .4byte gUnknown_3004FFC thumb_func_end sub_8030628 @@ -9032,7 +9032,7 @@ _08032D4C: .4byte gUnknown_2022BC4 sub_8032D50: @ 8032D50 push {r4-r6,lr} sub sp, 0x4 - ldr r0, _08032E00 @ =nullsub_43 + ldr r0, _08032E00 @ =TaskDummy movs r1, 0xFF bl CreateTask ldr r3, _08032E04 @ =gUnknown_3004FFC @@ -9040,7 +9040,7 @@ sub_8032D50: @ 8032D50 ldrb r1, [r4] adds r1, r3 strb r0, [r1] - ldr r5, _08032E0C @ =gUnknown_3005090 + ldr r5, _08032E0C @ =gTasks ldrb r2, [r4] adds r3, r2, r3 ldrb r0, [r3] @@ -9117,10 +9117,10 @@ _08032DBC: pop {r0} bx r0 .align 2, 0 -_08032E00: .4byte nullsub_43 +_08032E00: .4byte TaskDummy _08032E04: .4byte gUnknown_3004FFC _08032E08: .4byte gActiveBattler -_08032E0C: .4byte gUnknown_3005090 +_08032E0C: .4byte gTasks _08032E10: .4byte gUnknown_2022BC4 _08032E14: .4byte gBattleStruct _08032E18: .4byte gUnknown_203B0DC @@ -9310,7 +9310,7 @@ _08032F84: bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _08032FDC @ =gUnknown_3005090 + ldr r2, _08032FDC @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -9331,7 +9331,7 @@ _08032FD0: bx r0 .align 2, 0 _08032FD8: .4byte sub_802FEAC -_08032FDC: .4byte gUnknown_3005090 +_08032FDC: .4byte gTasks _08032FE0: .4byte gUnknown_3004FE0 _08032FE4: .4byte nullsub_13 thumb_func_end PlayerHandleExpUpdate @@ -10039,7 +10039,7 @@ PlayerHandleIntroTrainerBallThrow: @ 8033478 bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r4, _080335E0 @ =gUnknown_3005090 + ldr r4, _080335E0 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -10095,7 +10095,7 @@ _080335D0: .4byte 0x0000d6f8 _080335D4: .4byte gUnknown_8239FD4 _080335D8: .4byte gSaveBlock2Ptr _080335DC: .4byte task05_08033660 -_080335E0: .4byte gUnknown_3005090 +_080335E0: .4byte gTasks _080335E4: .4byte gUnknown_2024018 _080335E8: .4byte gUnknown_2024000 _080335EC: .4byte sub_80491B0 @@ -10158,7 +10158,7 @@ task05_08033660: @ 8033660 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r1, _08033688 @ =gUnknown_3005090 + ldr r1, _08033688 @ =gTasks lsls r0, 2 add r0, r8 lsls r0, 3 @@ -10172,7 +10172,7 @@ task05_08033660: @ 8033660 strh r0, [r1, 0xA] b _08033748 .align 2, 0 -_08033688: .4byte gUnknown_3005090 +_08033688: .4byte gTasks _0803368C: ldr r7, _080336CC @ =gActiveBattler ldrb r0, [r7] @@ -10426,7 +10426,7 @@ PlayerHandleCmd49: @ 8033878 ands r0, r1 cmp r0, 0 beq _080338AA - ldr r2, _080338BC @ =gUnknown_3005090 + ldr r2, _080338BC @ =gTasks ldr r0, _080338C0 @ =gUnknown_2024000 adds r0, r3, r0 ldrb r1, [r0] @@ -10443,7 +10443,7 @@ _080338AA: .align 2, 0 _080338B4: .4byte gUnknown_2024018 _080338B8: .4byte gActiveBattler -_080338BC: .4byte gUnknown_3005090 +_080338BC: .4byte gTasks _080338C0: .4byte gUnknown_2024000 _080338C4: .4byte sub_80491B0 thumb_func_end PlayerHandleCmd49 diff --git a/asm/battle_controller_pokedude.s b/asm/battle_controller_pokedude.s index f114d7a05..fcfa5d275 100644 --- a/asm/battle_controller_pokedude.s +++ b/asm/battle_controller_pokedude.s @@ -1033,7 +1033,7 @@ sub_81568DC: @ 81568DC lsls r0, 24 lsrs r0, 24 mov r9, r0 - ldr r1, _081569DC @ =gUnknown_3005090 + ldr r1, _081569DC @ =gTasks lsls r0, 2 add r0, r9 lsls r0, 3 @@ -1146,7 +1146,7 @@ _081569D6: ldr r0, _081569F4 @ =sub_8156C68 b _08156A3A .align 2, 0 -_081569DC: .4byte gUnknown_3005090 +_081569DC: .4byte gTasks _081569E0: .4byte gBattlerPartyIndexes _081569E4: .4byte gPlayerParty _081569E8: .4byte gUnknown_8253AE4 @@ -1154,7 +1154,7 @@ _081569EC: .4byte gBaseStats _081569F0: .4byte gActiveBattler _081569F4: .4byte sub_8156C68 _081569F8: - ldr r0, _08156A08 @ =gUnknown_3005090 + ldr r0, _08156A08 @ =gTasks mov r2, r9 lsls r1, r2, 2 add r1, r9 @@ -1163,7 +1163,7 @@ _081569F8: ldr r0, _08156A0C @ =sub_8156D80 b _08156A3C .align 2, 0 -_08156A08: .4byte gUnknown_3005090 +_08156A08: .4byte gTasks _08156A0C: .4byte sub_8156D80 _08156A10: str r0, [sp, 0x4] @@ -1212,7 +1212,7 @@ sub_8156A54: @ 8156A54 sub sp, 0x4 lsls r0, 24 lsrs r0, 24 - ldr r1, _08156B0C @ =gUnknown_3005090 + ldr r1, _08156B0C @ =gTasks lsls r2, r0, 2 mov r8, r2 add r8, r0 @@ -1292,7 +1292,7 @@ sub_8156A54: @ 8156A54 pop {r0} bx r0 .align 2, 0 -_08156B0C: .4byte gUnknown_3005090 +_08156B0C: .4byte gTasks _08156B10: .4byte gPlayerParty _08156B14: .4byte gUnknown_8253AE4 _08156B18: .4byte gBaseStats @@ -1311,7 +1311,7 @@ sub_8156B24: @ 8156B24 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r1, _08156B50 @ =gUnknown_3005090 + ldr r1, _08156B50 @ =gTasks lsls r0, 2 add r0, r8 lsls r0, 3 @@ -1325,7 +1325,7 @@ sub_8156B24: @ 8156B24 strh r0, [r6, 0x1C] b _08156C50 .align 2, 0 -_08156B50: .4byte gUnknown_3005090 +_08156B50: .4byte gTasks _08156B54: ldrb r0, [r6, 0x8] mov r9, r0 @@ -1457,7 +1457,7 @@ sub_8156C68: @ 8156C68 push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _08156CBC @ =gUnknown_3005090 + ldr r1, _08156CBC @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -1485,7 +1485,7 @@ _08156C9C: adds r2, r4, 0 movs r3, 0 bl InitAndLaunchSpecialAnimation - ldr r0, _08156CBC @ =gUnknown_3005090 + ldr r0, _08156CBC @ =gTasks lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -1496,7 +1496,7 @@ _08156C9C: pop {r0} bx r0 .align 2, 0 -_08156CBC: .4byte gUnknown_3005090 +_08156CBC: .4byte gTasks _08156CC0: .4byte gBattlerPartyIndexes _08156CC4: .4byte sub_8156CC8 thumb_func_end sub_8156C68 @@ -1506,7 +1506,7 @@ sub_8156CC8: @ 8156CC8 push {r4-r7,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _08156D34 @ =gUnknown_3005090 + ldr r1, _08156D34 @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -1555,7 +1555,7 @@ sub_8156CC8: @ 8156CC8 bl UpdateHealthboxAttribute b _08156D5C .align 2, 0 -_08156D34: .4byte gUnknown_3005090 +_08156D34: .4byte gTasks _08156D38: .4byte gUnknown_2024018 _08156D3C: .4byte gPlayerParty _08156D40: .4byte gBattlerPartyIndexes @@ -1571,7 +1571,7 @@ _08156D48: movs r2, 0 bl UpdateHealthboxAttribute _08156D5C: - ldr r0, _08156D78 @ =gUnknown_3005090 + ldr r0, _08156D78 @ =gTasks lsls r1, r6, 2 adds r1, r6 lsls r1, 3 @@ -1585,7 +1585,7 @@ _08156D6A: .align 2, 0 _08156D70: .4byte gUnknown_3004FF0 _08156D74: .4byte gPlayerParty -_08156D78: .4byte gUnknown_3005090 +_08156D78: .4byte gTasks _08156D7C: .4byte sub_8156D80 thumb_func_end sub_8156CC8 @@ -1595,7 +1595,7 @@ sub_8156D80: @ 8156D80 adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r0, _08156DBC @ =gUnknown_3005090 + ldr r0, _08156DBC @ =gTasks lsls r4, r5, 2 adds r4, r5 lsls r4, 3 @@ -1619,7 +1619,7 @@ sub_8156D80: @ 8156D80 pop {r0} bx r0 .align 2, 0 -_08156DBC: .4byte gUnknown_3005090 +_08156DBC: .4byte gTasks _08156DC0: .4byte gPlayerParty _08156DC4: .4byte gUnknown_3004FE0 _08156DC8: .4byte sub_8156EE8 @@ -5352,7 +5352,7 @@ _08158CF0: .4byte gUnknown_2022BC4 sub_8158CF4: @ 8158CF4 push {r4-r6,lr} sub sp, 0x4 - ldr r0, _08158DA4 @ =nullsub_43 + ldr r0, _08158DA4 @ =TaskDummy movs r1, 0xFF bl CreateTask ldr r3, _08158DA8 @ =gUnknown_3004FFC @@ -5360,7 +5360,7 @@ sub_8158CF4: @ 8158CF4 ldrb r1, [r4] adds r1, r3 strb r0, [r1] - ldr r5, _08158DB0 @ =gUnknown_3005090 + ldr r5, _08158DB0 @ =gTasks ldrb r2, [r4] adds r3, r2, r3 ldrb r0, [r3] @@ -5437,10 +5437,10 @@ _08158D60: pop {r0} bx r0 .align 2, 0 -_08158DA4: .4byte nullsub_43 +_08158DA4: .4byte TaskDummy _08158DA8: .4byte gUnknown_3004FFC _08158DAC: .4byte gActiveBattler -_08158DB0: .4byte gUnknown_3005090 +_08158DB0: .4byte gTasks _08158DB4: .4byte gUnknown_2022BC4 _08158DB8: .4byte gBattleStruct _08158DBC: .4byte gUnknown_203B0DC @@ -5617,7 +5617,7 @@ _08158F08: bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _08158F60 @ =gUnknown_3005090 + ldr r2, _08158F60 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -5638,7 +5638,7 @@ _08158F54: bx r0 .align 2, 0 _08158F5C: .4byte sub_81568DC -_08158F60: .4byte gUnknown_3005090 +_08158F60: .4byte gTasks _08158F64: .4byte gUnknown_3004FE0 _08158F68: .4byte nullsub_99 thumb_func_end sub_8158ED0 @@ -6223,7 +6223,7 @@ sub_8159304: @ 8159304 bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r4, _08159460 @ =gUnknown_3005090 + ldr r4, _08159460 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -6278,7 +6278,7 @@ _08159450: .4byte sub_80335F8 _08159454: .4byte 0x0000d6f8 _08159458: .4byte gUnknown_8239FD4 _0815945C: .4byte sub_81595EC -_08159460: .4byte gUnknown_3005090 +_08159460: .4byte gTasks _08159464: .4byte gUnknown_2024018 _08159468: .4byte gUnknown_2024000 _0815946C: .4byte sub_80491B0 @@ -6461,7 +6461,7 @@ sub_81595EC: @ 81595EC push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _0815960C @ =gUnknown_3005090 + ldr r1, _0815960C @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -6475,7 +6475,7 @@ sub_81595EC: @ 81595EC strh r0, [r1, 0xA] b _08159646 .align 2, 0 -_0815960C: .4byte gUnknown_3005090 +_0815960C: .4byte gTasks _08159610: ldr r4, _0815964C @ =gActiveBattler ldrb r5, [r4] diff --git a/asm/battle_controllers.s b/asm/battle_controllers.s index 41cb46535..feb5fb81c 100644 --- a/asm/battle_controllers.s +++ b/asm/battle_controllers.s @@ -901,7 +901,7 @@ CreateTasksForSendRecvLinkBuffers: @ 800D93C bl CreateTask ldr r2, _0800D9D8 @ =gUnknown_202286C strb r0, [r2] - ldr r5, _0800D9DC @ =gUnknown_3005090 + ldr r5, _0800D9DC @ =gTasks ldrb r1, [r2] lsls r0, r1, 2 adds r0, r1 @@ -971,7 +971,7 @@ CreateTasksForSendRecvLinkBuffers: @ 800D93C .align 2, 0 _0800D9D4: .4byte sub_800DB6C _0800D9D8: .4byte gUnknown_202286C -_0800D9DC: .4byte gUnknown_3005090 +_0800D9DC: .4byte gTasks _0800D9E0: .4byte Task_HandleCopyReceivedLinkBuffersData _0800D9E4: .4byte gUnknown_202286D _0800D9E8: .4byte gUnknown_202286E @@ -995,7 +995,7 @@ PrepareBufferDataTransferLink: @ 800D9EC bics r0, r1 adds r0, 0x4 mov r8, r0 - ldr r2, _0800DB4C @ =gUnknown_3005090 + ldr r2, _0800DB4C @ =gTasks ldr r3, _0800DB50 @ =gUnknown_202286C ldrb r1, [r3] lsls r0, r1, 2 @@ -1159,7 +1159,7 @@ _0800DB2C: pop {r0} bx r0 .align 2, 0 -_0800DB4C: .4byte gUnknown_3005090 +_0800DB4C: .4byte gTasks _0800DB50: .4byte gUnknown_202286C _0800DB54: .4byte gUnknown_2023FEC _0800DB58: .4byte gActiveBattler @@ -1174,7 +1174,7 @@ sub_800DB6C: @ 800DB6C push {r4-r7,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _0800DB94 @ =gUnknown_3005090 + ldr r1, _0800DB94 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -1192,7 +1192,7 @@ _0800DB88: ldr r0, [r0] mov pc, r0 .align 2, 0 -_0800DB94: .4byte gUnknown_3005090 +_0800DB94: .4byte gTasks _0800DB98: .4byte _0800DB9C .align 2, 0 _0800DB9C: @@ -1263,7 +1263,7 @@ _0800DC1A: cmp r0, 0 beq _0800DC3C bl sub_800A5BC - ldr r0, _0800DC38 @ =gUnknown_3005090 + ldr r0, _0800DC38 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -1272,9 +1272,9 @@ _0800DC1A: adds r0, 0x1 b _0800DD1E .align 2, 0 -_0800DC38: .4byte gUnknown_3005090 +_0800DC38: .4byte gTasks _0800DC3C: - ldr r0, _0800DC4C @ =gUnknown_3005090 + ldr r0, _0800DC4C @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -1283,7 +1283,7 @@ _0800DC3C: adds r0, 0x1 b _0800DD1E .align 2, 0 -_0800DC4C: .4byte gUnknown_3005090 +_0800DC4C: .4byte gTasks _0800DC50: lsls r1, r4, 2 adds r0, r1, r4 @@ -1349,7 +1349,7 @@ _0800DCC6: lsls r0, 24 cmp r0, 0 beq _0800DD20 - ldr r0, _0800DCFC @ =gUnknown_3005090 + ldr r0, _0800DCFC @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -1371,7 +1371,7 @@ _0800DCC6: strh r0, [r1, 0x26] b _0800DD1C .align 2, 0 -_0800DCFC: .4byte gUnknown_3005090 +_0800DCFC: .4byte gTasks _0800DD00: .4byte gUnknown_2023FEC _0800DD04: lsls r0, r4, 2 @@ -1450,7 +1450,7 @@ _0800DD70: ldr r1, _0800DE3C @ =gUnknown_202211C adds r0, r1 ldrh r6, [r0] - ldr r7, _0800DE40 @ =gUnknown_3005090 + ldr r7, _0800DE40 @ =gTasks ldr r4, _0800DE44 @ =gUnknown_202286D mov r12, r4 ldrb r1, [r4] @@ -1535,7 +1535,7 @@ _0800DE28: .align 2, 0 _0800DE38: .4byte gBitTable _0800DE3C: .4byte gUnknown_202211C -_0800DE40: .4byte gUnknown_3005090 +_0800DE40: .4byte gTasks _0800DE44: .4byte gUnknown_202286D _0800DE48: .4byte gUnknown_2023FF0 thumb_func_end sub_800DD28 @@ -1548,7 +1548,7 @@ Task_HandleCopyReceivedLinkBuffersData: @ 800DE4C push {r6,r7} lsls r0, 24 lsrs r7, r0, 24 - ldr r1, _0800DEB4 @ =gUnknown_3005090 + ldr r1, _0800DEB4 @ =gTasks lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -1596,7 +1596,7 @@ _0800DE82: beq _0800DEC2 b _0800DF7A .align 2, 0 -_0800DEB4: .4byte gUnknown_3005090 +_0800DEB4: .4byte gTasks _0800DEB8: .4byte gUnknown_2023FF0 _0800DEBC: cmp r0, 0x2 @@ -1687,7 +1687,7 @@ _0800DF64: bics r0, r1 str r0, [r3] _0800DF7A: - ldr r0, _0800DFA0 @ =gUnknown_3005090 + ldr r0, _0800DFA0 @ =gTasks mov r2, r9 adds r1, r2, r7 lsls r1, 3 @@ -1706,7 +1706,7 @@ _0800DF8C: .align 2, 0 _0800DF98: .4byte gUnknown_2023BC8 _0800DF9C: .4byte gBitTable -_0800DFA0: .4byte gUnknown_3005090 +_0800DFA0: .4byte gTasks thumb_func_end Task_HandleCopyReceivedLinkBuffersData thumb_func_start EmitGetMonData diff --git a/asm/battle_gfx_sfx_util.s b/asm/battle_gfx_sfx_util.s index aecdd3488..c280b1ffd 100644 --- a/asm/battle_gfx_sfx_util.s +++ b/asm/battle_gfx_sfx_util.s @@ -437,7 +437,7 @@ _080340E0: bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _08034158 @ =gUnknown_3005090 + ldr r2, _08034158 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -471,7 +471,7 @@ _08034148: .4byte gUnknown_2037F1B _0803414C: .4byte gUnknown_2024018 _08034150: .4byte gUnknown_81C6EA8 _08034154: .4byte Task_ClearBitWhenBattleTableAnimDone -_08034158: .4byte gUnknown_3005090 +_08034158: .4byte gTasks thumb_func_end TryHandleLaunchBattleTableAnimation thumb_func_start Task_ClearBitWhenBattleTableAnimDone @@ -488,7 +488,7 @@ Task_ClearBitWhenBattleTableAnimDone: @ 803415C bne _0803419E ldr r0, _080341AC @ =gUnknown_2024018 ldr r2, [r0] - ldr r1, _080341B0 @ =gUnknown_3005090 + ldr r1, _080341B0 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -515,7 +515,7 @@ _0803419E: _080341A4: .4byte gUnknown_2037EDC _080341A8: .4byte gUnknown_2037EE1 _080341AC: .4byte gUnknown_2024018 -_080341B0: .4byte gUnknown_3005090 +_080341B0: .4byte gTasks thumb_func_end Task_ClearBitWhenBattleTableAnimDone thumb_func_start ShouldAnimBeDoneRegardlessOfSubsitute @@ -564,7 +564,7 @@ InitAndLaunchSpecialAnimation: @ 80341D8 bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _08034240 @ =gUnknown_3005090 + ldr r2, _08034240 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -591,7 +591,7 @@ _08034230: .4byte gUnknown_2037F1A _08034234: .4byte gUnknown_2037F1B _08034238: .4byte gUnknown_81C6F18 _0803423C: .4byte Task_ClearBitWhenSpecialAnimDone -_08034240: .4byte gUnknown_3005090 +_08034240: .4byte gTasks _08034244: .4byte gUnknown_2024018 thumb_func_end InitAndLaunchSpecialAnimation @@ -609,7 +609,7 @@ Task_ClearBitWhenSpecialAnimDone: @ 8034248 bne _0803428A ldr r0, _08034298 @ =gUnknown_2024018 ldr r2, [r0] - ldr r1, _0803429C @ =gUnknown_3005090 + ldr r1, _0803429C @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -636,7 +636,7 @@ _0803428A: _08034290: .4byte gUnknown_2037EDC _08034294: .4byte gUnknown_2037EE1 _08034298: .4byte gUnknown_2024018 -_0803429C: .4byte gUnknown_3005090 +_0803429C: .4byte gTasks thumb_func_end Task_ClearBitWhenSpecialAnimDone thumb_func_start IsMoveWithoutAnimation diff --git a/asm/battle_interface.s b/asm/battle_interface.s index 06af126e2..3e3fb6500 100644 --- a/asm/battle_interface.s +++ b/asm/battle_interface.s @@ -2817,12 +2817,12 @@ _0804913E: cmp r6, 0x5 ble _08049088 _08049148: - ldr r0, _080491A8 @ =nullsub_43 + ldr r0, _080491A8 @ =TaskDummy movs r1, 0x5 bl CreateTask lsls r0, 24 lsrs r4, r0, 24 - ldr r2, _080491AC @ =gUnknown_3005090 + ldr r2, _080491AC @ =gTasks lsls r3, r4, 2 adds r1, r3, r4 lsls r1, 3 @@ -2864,8 +2864,8 @@ _08049172: pop {r1} bx r1 .align 2, 0 -_080491A8: .4byte nullsub_43 -_080491AC: .4byte gUnknown_3005090 +_080491A8: .4byte TaskDummy +_080491AC: .4byte gTasks thumb_func_end sub_8048D14 thumb_func_start sub_80491B0 @@ -2879,7 +2879,7 @@ sub_80491B0: @ 80491B0 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r2, _080492C0 @ =gUnknown_3005090 + ldr r2, _080492C0 @ =gTasks lsls r3, r0, 2 adds r1, r3, r0 lsls r1, 3 @@ -2909,7 +2909,7 @@ _080491DE: movs r0, 0x52 movs r1, 0x10 bl SetGpuReg - ldr r1, _080492C0 @ =gUnknown_3005090 + ldr r1, _080492C0 @ =gTasks ldr r0, [sp, 0xC] add r0, r8 lsls r0, 3 @@ -3007,7 +3007,7 @@ _08049268: mov r12, r2 b _08049302 .align 2, 0 -_080492C0: .4byte gUnknown_3005090 +_080492C0: .4byte gTasks _080492C4: .4byte gSprites _080492C8: .4byte sub_8049630 _080492CC: @@ -3064,7 +3064,7 @@ _08049302: str r1, [r3] ldr r1, _08049354 @ =gUnknown_8260404 bl SetSubspriteTables - ldr r1, _08049358 @ =gUnknown_3005090 + ldr r1, _08049358 @ =gTasks ldr r0, [sp, 0xC] add r0, r8 lsls r0, 3 @@ -3077,10 +3077,10 @@ _08049348: .4byte sub_8049630 _0804934C: .4byte gSprites _08049350: .4byte sub_8049568 _08049354: .4byte gUnknown_8260404 -_08049358: .4byte gUnknown_3005090 +_08049358: .4byte gTasks _0804935C: .4byte sub_8049388 _08049360: - ldr r0, _08049380 @ =gUnknown_3005090 + ldr r0, _08049380 @ =gTasks ldr r1, [sp, 0xC] add r1, r8 lsls r1, 3 @@ -3097,7 +3097,7 @@ _0804936E: pop {r0} bx r0 .align 2, 0 -_08049380: .4byte gUnknown_3005090 +_08049380: .4byte gTasks _08049384: .4byte sub_804948C thumb_func_end sub_80491B0 @@ -3106,7 +3106,7 @@ sub_8049388: @ 8049388 push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080493DC @ =gUnknown_3005090 + ldr r2, _080493DC @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -3146,7 +3146,7 @@ _080493D4: pop {r0} bx r0 .align 2, 0 -_080493DC: .4byte gUnknown_3005090 +_080493DC: .4byte gTasks _080493E0: .4byte sub_80493E4 thumb_func_end sub_8049388 @@ -3156,7 +3156,7 @@ sub_80493E4: @ 80493E4 sub sp, 0x8 lsls r0, 24 lsrs r4, r0, 24 - ldr r7, _0804945C @ =gUnknown_3005090 + ldr r7, _0804945C @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r6, r0, 3 @@ -3212,7 +3212,7 @@ _08049442: ble _08049442 b _08049482 .align 2, 0 -_0804945C: .4byte gUnknown_3005090 +_0804945C: .4byte gTasks _08049460: .4byte gSprites _08049464: movs r0, 0x3 @@ -3241,7 +3241,7 @@ sub_804948C: @ 804948C lsls r0, 24 lsrs r0, 24 adds r4, r0, 0 - ldr r7, _080494C4 @ =gUnknown_3005090 + ldr r7, _080494C4 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r6, r0, 3 @@ -3263,7 +3263,7 @@ sub_804948C: @ 804948C bl SetGpuReg b _08049546 .align 2, 0 -_080494C4: .4byte gUnknown_3005090 +_080494C4: .4byte gTasks _080494C8: movs r0, 0x1 negs r0, r0 diff --git a/asm/battle_records.s b/asm/battle_records.s index 3464f4414..797830e95 100644 --- a/asm/battle_records.s +++ b/asm/battle_records.s @@ -195,7 +195,7 @@ sub_80CD3B8: @ 80CD3B8 ands r0, r1 cmp r0, 0 bne _080CD3D8 - ldr r0, _080CD3E0 @ =gUnknown_3005090 + ldr r0, _080CD3E0 @ =gTasks lsls r1, r2, 2 adds r1, r2 lsls r1, 3 @@ -207,7 +207,7 @@ _080CD3D8: bx r0 .align 2, 0 _080CD3DC: .4byte gUnknown_2037AB8 -_080CD3E0: .4byte gUnknown_3005090 +_080CD3E0: .4byte gTasks _080CD3E4: .4byte sub_80CD3E8 thumb_func_end sub_80CD3B8 @@ -219,7 +219,7 @@ sub_80CD3E8: @ 80CD3E8 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080CD41C @ =gUnknown_3005090 + ldr r0, _080CD41C @ =gTasks adds r4, r1, r0 ldr r0, _080CD420 @ =gMain ldrh r1, [r0, 0x2E] @@ -241,7 +241,7 @@ _080CD416: pop {r0} bx r0 .align 2, 0 -_080CD41C: .4byte gUnknown_3005090 +_080CD41C: .4byte gTasks _080CD420: .4byte gMain _080CD424: .4byte sub_80CD428 thumb_func_end sub_80CD3E8 @@ -260,7 +260,7 @@ sub_80CD428: @ 80CD428 movs r2, 0 movs r3, 0x10 bl BeginNormalPaletteFade - ldr r1, _080CD458 @ =gUnknown_3005090 + ldr r1, _080CD458 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -272,7 +272,7 @@ sub_80CD428: @ 80CD428 pop {r0} bx r0 .align 2, 0 -_080CD458: .4byte gUnknown_3005090 +_080CD458: .4byte gTasks _080CD45C: .4byte sub_80CD460 thumb_func_end sub_80CD428 diff --git a/asm/battle_script_commands.s b/asm/battle_script_commands.s index 130ba9b21..9d165dd4c 100644 --- a/asm/battle_script_commands.s +++ b/asm/battle_script_commands.s @@ -32474,7 +32474,7 @@ _0802DA72: ldr r0, _0802DAB4 @ =sub_8011100 cmp r1, r0 bne _0802DB6C - ldr r2, _0802DAB8 @ =gUnknown_3005090 + ldr r2, _0802DAB8 @ =gTasks ldr r4, _0802DABC @ =gUnknown_2023E82 ldrb r1, [r4, 0x1] lsls r0, r1, 2 @@ -32500,7 +32500,7 @@ _0802DA72: _0802DAAC: .4byte gUnknown_2037AB8 _0802DAB0: .4byte gMain _0802DAB4: .4byte sub_8011100 -_0802DAB8: .4byte gUnknown_3005090 +_0802DAB8: .4byte gTasks _0802DABC: .4byte gUnknown_2023E82 _0802DAC0: .4byte 0x05006000 _0802DAC4: .4byte sub_80116F4 diff --git a/asm/battle_setup.s b/asm/battle_setup.s index c8bf74c35..27ac6b473 100644 --- a/asm/battle_setup.s +++ b/asm/battle_setup.s @@ -13,7 +13,7 @@ sub_807F620: @ 807F620 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0807F640 @ =gUnknown_3005098 + ldr r1, _0807F640 @ =gTasks+0x8 adds r4, r0, r1 movs r1, 0 ldrsh r0, [r4, r1] @@ -23,7 +23,7 @@ sub_807F620: @ 807F620 beq _0807F65E b _0807F686 .align 2, 0 -_0807F640: .4byte gUnknown_3005098 +_0807F640: .4byte gTasks+0x8 _0807F644: bl c3_80A0DD8_is_running cmp r0, 0 @@ -71,7 +71,7 @@ sub_807F690: @ 807F690 bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _0807F6C8 @ =gUnknown_3005090 + ldr r2, _0807F6C8 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -84,7 +84,7 @@ sub_807F690: @ 807F690 bx r0 .align 2, 0 _0807F6C4: .4byte sub_807F620 -_0807F6C8: .4byte gUnknown_3005090 +_0807F6C8: .4byte gTasks thumb_func_end sub_807F690 thumb_func_start sub_807F6CC diff --git a/asm/battle_transition.s b/asm/battle_transition.s index 373ceac50..70453eb32 100644 --- a/asm/battle_transition.s +++ b/asm/battle_transition.s @@ -46,7 +46,7 @@ sub_80D08F8: @ 80D08F8 bl FindTaskIdByFunc lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _080D0920 @ =gUnknown_3005090 + ldr r1, _080D0920 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -59,7 +59,7 @@ sub_80D08F8: @ 80D08F8 b _080D093C .align 2, 0 _080D091C: .4byte sub_80D0978 -_080D0920: .4byte gUnknown_3005090 +_080D0920: .4byte gTasks _080D0924: bl sub_80D3DD0 ldr r4, _080D0944 @ =gUnknown_2039A2C @@ -89,7 +89,7 @@ LaunchBattleTransitionTask: @ 80D0948 bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080D0974 @ =gUnknown_3005090 + ldr r2, _080D0974 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -100,7 +100,7 @@ LaunchBattleTransitionTask: @ 80D0948 bx r0 .align 2, 0 _080D0970: .4byte sub_80D0978 -_080D0974: .4byte gUnknown_3005090 +_080D0974: .4byte gTasks thumb_func_end LaunchBattleTransitionTask thumb_func_start sub_80D0978 @@ -109,7 +109,7 @@ sub_80D0978: @ 80D0978 lsls r0, 24 lsrs r0, 24 ldr r5, _080D09A8 @ =gUnknown_83FA3B0 - ldr r2, _080D09AC @ =gUnknown_3005090 + ldr r2, _080D09AC @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -130,7 +130,7 @@ _080D098A: bx r0 .align 2, 0 _080D09A8: .4byte gUnknown_83FA3B0 -_080D09AC: .4byte gUnknown_3005090 +_080D09AC: .4byte gTasks thumb_func_end sub_80D0978 thumb_func_start Transition_Phase1 @@ -260,7 +260,7 @@ Phase1Task_TransitionAll: @ 80D0A8C lsls r0, 24 lsrs r0, 24 adds r4, r0, 0 - ldr r1, _080D0AC0 @ =gUnknown_3005090 + ldr r1, _080D0AC0 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -281,7 +281,7 @@ Phase1Task_TransitionAll: @ 80D0A8C bl CreatePhase1Task b _080D0AD4 .align 2, 0 -_080D0AC0: .4byte gUnknown_3005090 +_080D0AC0: .4byte gTasks _080D0AC4: bl sub_80D3CA4 lsls r0, 24 @@ -302,7 +302,7 @@ sub_80D0ADC: @ 80D0ADC lsls r0, 24 lsrs r0, 24 ldr r5, _080D0B0C @ =gUnknown_83FA3C0 - ldr r2, _080D0B10 @ =gUnknown_3005090 + ldr r2, _080D0B10 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -323,7 +323,7 @@ _080D0AEE: bx r0 .align 2, 0 _080D0B0C: .4byte gUnknown_83FA3C0 -_080D0B10: .4byte gUnknown_3005090 +_080D0B10: .4byte gTasks thumb_func_end sub_80D0ADC thumb_func_start sub_80D0B14 @@ -433,7 +433,7 @@ sub_80D0BD4: @ 80D0BD4 lsls r0, 24 lsrs r0, 24 ldr r5, _080D0C04 @ =gUnknown_83FA3CC - ldr r2, _080D0C08 @ =gUnknown_3005090 + ldr r2, _080D0C08 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -454,7 +454,7 @@ _080D0BE6: bx r0 .align 2, 0 _080D0C04: .4byte gUnknown_83FA3CC -_080D0C08: .4byte gUnknown_3005090 +_080D0C08: .4byte gTasks thumb_func_end sub_80D0BD4 thumb_func_start sub_80D0C0C @@ -621,7 +621,7 @@ sub_80D0D54: @ 80D0D54 lsls r0, 24 lsrs r0, 24 ldr r5, _080D0D84 @ =gUnknown_83FA3D4 - ldr r2, _080D0D88 @ =gUnknown_3005090 + ldr r2, _080D0D88 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -642,7 +642,7 @@ _080D0D66: bx r0 .align 2, 0 _080D0D84: .4byte gUnknown_83FA3D4 -_080D0D88: .4byte gUnknown_3005090 +_080D0D88: .4byte gTasks thumb_func_end sub_80D0D54 thumb_func_start sub_80D0D8C @@ -820,7 +820,7 @@ sub_80D0EE4: @ 80D0EE4 lsls r0, 24 lsrs r0, 24 ldr r5, _080D0F14 @ =gUnknown_83FA3DC - ldr r2, _080D0F18 @ =gUnknown_3005090 + ldr r2, _080D0F18 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -841,7 +841,7 @@ _080D0EF6: bx r0 .align 2, 0 _080D0F14: .4byte gUnknown_83FA3DC -_080D0F18: .4byte gUnknown_3005090 +_080D0F18: .4byte gTasks thumb_func_end sub_80D0EE4 thumb_func_start sub_80D0F1C @@ -1441,7 +1441,7 @@ sub_80D13C8: @ 80D13C8 lsls r0, 24 lsrs r0, 24 ldr r5, _080D13F8 @ =gUnknown_83FA3F4 - ldr r2, _080D13FC @ =gUnknown_3005090 + ldr r2, _080D13FC @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -1462,7 +1462,7 @@ _080D13DA: bx r0 .align 2, 0 _080D13F8: .4byte gUnknown_83FA3F4 -_080D13FC: .4byte gUnknown_3005090 +_080D13FC: .4byte gTasks thumb_func_end sub_80D13C8 thumb_func_start Phase2_Transition_PokeballsTrail_Func1 @@ -1753,7 +1753,7 @@ sub_80D1638: @ 80D1638 lsls r0, 24 lsrs r0, 24 ldr r5, _080D1668 @ =gUnknown_83FA414 - ldr r2, _080D166C @ =gUnknown_3005090 + ldr r2, _080D166C @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -1774,7 +1774,7 @@ _080D164A: bx r0 .align 2, 0 _080D1668: .4byte gUnknown_83FA414 -_080D166C: .4byte gUnknown_3005090 +_080D166C: .4byte gTasks thumb_func_end sub_80D1638 thumb_func_start sub_80D1670 @@ -2416,7 +2416,7 @@ sub_80D1B58: @ 80D1B58 lsls r0, 24 lsrs r0, 24 ldr r5, _080D1B88 @ =gUnknown_83FA430 - ldr r2, _080D1B8C @ =gUnknown_3005090 + ldr r2, _080D1B8C @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -2437,7 +2437,7 @@ _080D1B6A: bx r0 .align 2, 0 _080D1B88: .4byte gUnknown_83FA430 -_080D1B8C: .4byte gUnknown_3005090 +_080D1B8C: .4byte gTasks thumb_func_end sub_80D1B58 thumb_func_start sub_80D1B90 @@ -2651,7 +2651,7 @@ sub_80D1D2C: @ 80D1D2C lsls r0, 24 lsrs r0, 24 ldr r5, _080D1D5C @ =gUnknown_83FA438 - ldr r2, _080D1D60 @ =gUnknown_3005090 + ldr r2, _080D1D60 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -2672,7 +2672,7 @@ _080D1D3E: bx r0 .align 2, 0 _080D1D5C: .4byte gUnknown_83FA438 -_080D1D60: .4byte gUnknown_3005090 +_080D1D60: .4byte gTasks thumb_func_end sub_80D1D2C thumb_func_start sub_80D1D64 @@ -2902,7 +2902,7 @@ sub_80D1F2C: @ 80D1F2C lsls r0, 24 lsrs r0, 24 ldr r5, _080D1F5C @ =gUnknown_83FA464 - ldr r2, _080D1F60 @ =gUnknown_3005090 + ldr r2, _080D1F60 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -2923,7 +2923,7 @@ _080D1F3E: bx r0 .align 2, 0 _080D1F5C: .4byte gUnknown_83FA464 -_080D1F60: .4byte gUnknown_3005090 +_080D1F60: .4byte gTasks thumb_func_end sub_80D1F2C thumb_func_start sub_80D1F64 @@ -3978,7 +3978,7 @@ Phase2Task_Transition_Sydney: @ 80D2768 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080D2784 @ =gUnknown_3005090 + ldr r2, _080D2784 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -3989,7 +3989,7 @@ Phase2Task_Transition_Sydney: @ 80D2768 pop {r0} bx r0 .align 2, 0 -_080D2784: .4byte gUnknown_3005090 +_080D2784: .4byte gTasks thumb_func_end Phase2Task_Transition_Sydney thumb_func_start Phase2Task_Transition_Phoebe @@ -3997,7 +3997,7 @@ Phase2Task_Transition_Phoebe: @ 80D2788 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080D27A4 @ =gUnknown_3005090 + ldr r2, _080D27A4 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -4008,7 +4008,7 @@ Phase2Task_Transition_Phoebe: @ 80D2788 pop {r0} bx r0 .align 2, 0 -_080D27A4: .4byte gUnknown_3005090 +_080D27A4: .4byte gTasks thumb_func_end Phase2Task_Transition_Phoebe thumb_func_start Phase2Task_Transition_Glacia @@ -4016,7 +4016,7 @@ Phase2Task_Transition_Glacia: @ 80D27A8 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080D27C4 @ =gUnknown_3005090 + ldr r2, _080D27C4 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -4027,7 +4027,7 @@ Phase2Task_Transition_Glacia: @ 80D27A8 pop {r0} bx r0 .align 2, 0 -_080D27C4: .4byte gUnknown_3005090 +_080D27C4: .4byte gTasks thumb_func_end Phase2Task_Transition_Glacia thumb_func_start Phase2Task_Transition_Drake @@ -4035,7 +4035,7 @@ Phase2Task_Transition_Drake: @ 80D27C8 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080D27E4 @ =gUnknown_3005090 + ldr r2, _080D27E4 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -4046,7 +4046,7 @@ Phase2Task_Transition_Drake: @ 80D27C8 pop {r0} bx r0 .align 2, 0 -_080D27E4: .4byte gUnknown_3005090 +_080D27E4: .4byte gTasks thumb_func_end Phase2Task_Transition_Drake thumb_func_start Phase2Task_Transition_Steven @@ -4054,7 +4054,7 @@ Phase2Task_Transition_Steven: @ 80D27E8 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080D2804 @ =gUnknown_3005090 + ldr r2, _080D2804 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -4065,7 +4065,7 @@ Phase2Task_Transition_Steven: @ 80D27E8 pop {r0} bx r0 .align 2, 0 -_080D2804: .4byte gUnknown_3005090 +_080D2804: .4byte gTasks thumb_func_end Phase2Task_Transition_Steven thumb_func_start Phase2Task_MugShotTransition @@ -4074,7 +4074,7 @@ Phase2Task_MugShotTransition: @ 80D2808 lsls r0, 24 lsrs r0, 24 ldr r5, _080D2838 @ =gUnknown_83FA46C - ldr r2, _080D283C @ =gUnknown_3005090 + ldr r2, _080D283C @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -4095,7 +4095,7 @@ _080D281A: bx r0 .align 2, 0 _080D2838: .4byte gUnknown_83FA46C -_080D283C: .4byte gUnknown_3005090 +_080D283C: .4byte gTasks thumb_func_end Phase2Task_MugShotTransition thumb_func_start Phase2_Mugshot_Func1 @@ -5292,7 +5292,7 @@ sub_80D316C: @ 80D316C lsls r0, 24 lsrs r0, 24 ldr r5, _080D319C @ =gUnknown_83FA4E8 - ldr r2, _080D31A0 @ =gUnknown_3005090 + ldr r2, _080D31A0 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -5313,7 +5313,7 @@ _080D317E: bx r0 .align 2, 0 _080D319C: .4byte gUnknown_83FA4E8 -_080D31A0: .4byte gUnknown_3005090 +_080D31A0: .4byte gTasks thumb_func_end sub_80D316C thumb_func_start sub_80D31A4 @@ -5608,7 +5608,7 @@ sub_80D33EC: @ 80D33EC lsls r0, 24 lsrs r0, 24 ldr r5, _080D341C @ =gUnknown_83FA4F4 - ldr r2, _080D3420 @ =gUnknown_3005090 + ldr r2, _080D3420 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -5629,7 +5629,7 @@ _080D33FE: bx r0 .align 2, 0 _080D341C: .4byte gUnknown_83FA4F4 -_080D3420: .4byte gUnknown_3005090 +_080D3420: .4byte gTasks thumb_func_end sub_80D33EC thumb_func_start sub_80D3424 @@ -6141,7 +6141,7 @@ sub_80D3818: @ 80D3818 lsls r0, 24 lsrs r0, 24 ldr r5, _080D3848 @ =gUnknown_83FA514 - ldr r2, _080D384C @ =gUnknown_3005090 + ldr r2, _080D384C @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -6162,7 +6162,7 @@ _080D382A: bx r0 .align 2, 0 _080D3848: .4byte gUnknown_83FA514 -_080D384C: .4byte gUnknown_3005090 +_080D384C: .4byte gTasks thumb_func_end sub_80D3818 thumb_func_start Phase2_Transition_GridSquares_Func1 @@ -6279,7 +6279,7 @@ sub_80D3928: @ 80D3928 lsls r0, 24 lsrs r0, 24 ldr r5, _080D3958 @ =gUnknown_83FA520 - ldr r2, _080D395C @ =gUnknown_3005090 + ldr r2, _080D395C @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -6300,7 +6300,7 @@ _080D393A: bx r0 .align 2, 0 _080D3958: .4byte gUnknown_83FA520 -_080D395C: .4byte gUnknown_3005090 +_080D395C: .4byte gTasks thumb_func_end sub_80D3928 thumb_func_start sub_80D3960 @@ -6704,7 +6704,7 @@ CreatePhase1Task: @ 80D3C40 bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080D3CA0 @ =gUnknown_3005090 + ldr r2, _080D3CA0 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -6725,7 +6725,7 @@ CreatePhase1Task: @ 80D3C40 bx r0 .align 2, 0 _080D3C9C: .4byte sub_80D3CC4 -_080D3CA0: .4byte gUnknown_3005090 +_080D3CA0: .4byte gTasks thumb_func_end CreatePhase1Task thumb_func_start sub_80D3CA4 @@ -6754,7 +6754,7 @@ sub_80D3CC4: @ 80D3CC4 lsls r0, 24 lsrs r0, 24 ldr r5, _080D3CF4 @ =gUnknown_83FA588 - ldr r2, _080D3CF8 @ =gUnknown_3005090 + ldr r2, _080D3CF8 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -6775,7 +6775,7 @@ _080D3CD6: bx r0 .align 2, 0 _080D3CF4: .4byte gUnknown_83FA588 -_080D3CF8: .4byte gUnknown_3005090 +_080D3CF8: .4byte gTasks thumb_func_end sub_80D3CC4 thumb_func_start Phase1_TransitionAll_Func1 diff --git a/asm/berry_fix_program.s b/asm/berry_fix_program.s index 679a386e0..ec40e1d98 100644 --- a/asm/berry_fix_program.s +++ b/asm/berry_fix_program.s @@ -98,7 +98,7 @@ sub_815F74C: @ 815F74C bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _0815F7DC @ =gUnknown_3005090 + ldr r2, _0815F7DC @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -117,7 +117,7 @@ _0815F7CC: .4byte 0x85006000 _0815F7D0: .4byte 0x85000100 _0815F7D4: .4byte gUnknown_3005ECC _0815F7D8: .4byte sub_815F7F0 -_0815F7DC: .4byte gUnknown_3005090 +_0815F7DC: .4byte gTasks _0815F7E0: .4byte sub_815F7E4 thumb_func_end sub_815F74C @@ -138,7 +138,7 @@ sub_815F7F0: @ 815F7F0 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _0815F818 @ =gUnknown_3005098 + ldr r1, _0815F818 @ =gTasks+0x8 adds r5, r0, r1 movs r1, 0 ldrsh r0, [r5, r1] @@ -152,7 +152,7 @@ _0815F80C: ldr r0, [r0] mov pc, r0 .align 2, 0 -_0815F818: .4byte gUnknown_3005098 +_0815F818: .4byte gTasks+0x8 _0815F81C: .4byte _0815F820 .align 2, 0 _0815F820: diff --git a/asm/berry_pouch.s b/asm/berry_pouch.s index 9d68bb3e9..a9523846e 100644 --- a/asm/berry_pouch.s +++ b/asm/berry_pouch.s @@ -260,7 +260,7 @@ _0813CF62: ldrh r1, [r2, 0xA] ldrh r2, [r2, 0x8] bl ListMenuInit - ldr r2, _0813CFA0 @ =gUnknown_3005090 + ldr r2, _0813CFA0 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -275,7 +275,7 @@ _0813CF62: _0813CF94: .4byte sub_813DA68 _0813CF98: .4byte gUnknown_3005E70 _0813CF9C: .4byte gUnknown_203F370 -_0813CFA0: .4byte gUnknown_3005090 +_0813CFA0: .4byte gTasks _0813CFA4: bl sub_813EC08 b _0813CFD2 @@ -1373,7 +1373,7 @@ sub_813D808: @ 813D808 str r2, [sp] movs r3, 0x10 bl BeginNormalPaletteFade - ldr r1, _0813D83C @ =gUnknown_3005090 + ldr r1, _0813D83C @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -1385,7 +1385,7 @@ sub_813D808: @ 813D808 pop {r0} bx r0 .align 2, 0 -_0813D83C: .4byte gUnknown_3005090 +_0813D83C: .4byte gTasks _0813D840: .4byte sub_813D844 thumb_func_end sub_813D808 @@ -1397,7 +1397,7 @@ sub_813D844: @ 813D844 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0813D87C @ =gUnknown_3005098 + ldr r1, _0813D87C @ =gTasks+0x8 adds r2, r0, r1 ldr r0, _0813D880 @ =gUnknown_2037AB8 ldrb r1, [r0, 0x7] @@ -1418,7 +1418,7 @@ sub_813D844: @ 813D844 bl SetMainCallback2 b _0813D896 .align 2, 0 -_0813D87C: .4byte gUnknown_3005098 +_0813D87C: .4byte gTasks+0x8 _0813D880: .4byte gUnknown_2037AB8 _0813D884: .4byte gUnknown_203F37A _0813D888: .4byte gUnknown_203F36C @@ -1534,7 +1534,7 @@ sub_813D940: @ 813D940 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _0813D9E8 @ =gUnknown_3005098 + ldr r0, _0813D9E8 @ =gTasks+0x8 adds r4, r0 movs r0, 0x8 bl sub_813EA08 @@ -1598,7 +1598,7 @@ sub_813D940: @ 813D940 pop {r0} bx r0 .align 2, 0 -_0813D9E8: .4byte gUnknown_3005098 +_0813D9E8: .4byte gTasks+0x8 _0813D9EC: .4byte gStringVar1 _0813D9F0: .4byte gStringVar4 _0813D9F4: .4byte gUnknown_84162B9 @@ -1667,7 +1667,7 @@ sub_813DA68: @ 813DA68 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _0813DAD8 @ =gUnknown_3005098 + ldr r1, _0813DAD8 @ =gTasks+0x8 adds r7, r0, r1 ldr r0, _0813DADC @ =gUnknown_2037AB8 ldrb r1, [r0, 0x7] @@ -1713,7 +1713,7 @@ _0813DA9E: strh r1, [r0] b _0813DB48 .align 2, 0 -_0813DAD8: .4byte gUnknown_3005098 +_0813DAD8: .4byte gTasks+0x8 _0813DADC: .4byte gUnknown_2037AB8 _0813DAE0: .4byte gUnknown_203F37A _0813DAE4: .4byte gMain @@ -1791,7 +1791,7 @@ _0813DB58: bl sub_809A798 ldr r1, _0813DBA8 @ =gUnknown_203AD30 strh r0, [r1] - ldr r0, _0813DBAC @ =gUnknown_3005090 + ldr r0, _0813DBAC @ =gTasks lsls r1, r6, 2 adds r1, r6 lsls r1, 3 @@ -1811,7 +1811,7 @@ _0813DB9E: bx r0 .align 2, 0 _0813DBA8: .4byte gUnknown_203AD30 -_0813DBAC: .4byte gUnknown_3005090 +_0813DBAC: .4byte gTasks _0813DBB0: .4byte gUnknown_8464358 thumb_func_end sub_813DA68 @@ -1824,7 +1824,7 @@ sub_813DBB4: @ 813DBB4 movs r0, 0 bl sub_813D594 bl sub_813D5BC - ldr r1, _0813DBDC @ =gUnknown_3005090 + ldr r1, _0813DBDC @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -1835,7 +1835,7 @@ sub_813DBB4: @ 813DBB4 pop {r0} bx r0 .align 2, 0 -_0813DBDC: .4byte gUnknown_3005090 +_0813DBDC: .4byte gTasks _0813DBE0: .4byte sub_813DA68 thumb_func_end sub_813DBB4 @@ -1850,7 +1850,7 @@ sub_813DBE4: @ 813DBE4 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0813DC10 @ =gUnknown_3005098 + ldr r0, _0813DC10 @ =gTasks+0x8 adds r7, r1, r0 ldr r0, _0813DC14 @ =gUnknown_203F370 ldrb r0, [r0, 0x4] @@ -1863,7 +1863,7 @@ sub_813DBE4: @ 813DBE4 movs r0, 0x3 b _0813DC86 .align 2, 0 -_0813DC10: .4byte gUnknown_3005098 +_0813DC10: .4byte gTasks+0x8 _0813DC14: .4byte gUnknown_203F370 _0813DC18: .4byte gUnknown_203F384 _0813DC1C: .4byte gUnknown_84643B0 @@ -2025,7 +2025,7 @@ sub_813DD74: @ 813DD74 lsrs r4, 24 adds r0, r4, 0 bl sub_813DBE4 - ldr r1, _0813DD98 @ =gUnknown_3005090 + ldr r1, _0813DD98 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -2036,7 +2036,7 @@ sub_813DD74: @ 813DD74 pop {r0} bx r0 .align 2, 0 -_0813DD98: .4byte gUnknown_3005090 +_0813DD98: .4byte gTasks _0813DD9C: .4byte sub_813DDA0 thumb_func_end sub_813DD74 @@ -2179,7 +2179,7 @@ sub_813DEBC: @ 813DEBC lsls r0, r6, 2 adds r0, r6 lsls r7, r0, 3 - ldr r0, _0813DF24 @ =gUnknown_3005098 + ldr r0, _0813DF24 @ =gTasks+0x8 mov r8, r0 adds r5, r7, r0 ldr r4, _0813DF28 @ =gUnknown_203F388 @@ -2215,7 +2215,7 @@ sub_813DEBC: @ 813DEBC bl sub_813DF54 b _0813DF42 .align 2, 0 -_0813DF24: .4byte gUnknown_3005098 +_0813DF24: .4byte gTasks+0x8 _0813DF28: .4byte gUnknown_203F388 _0813DF2C: ldr r1, _0813DF4C @ =gUnknown_84163DB @@ -2248,7 +2248,7 @@ sub_813DF54: @ 813DF54 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 - ldr r0, _0813DFB4 @ =gUnknown_3005098 + ldr r0, _0813DFB4 @ =gTasks+0x8 adds r1, r0 ldr r0, _0813DFB8 @ =gStringVar2 movs r2, 0x10 @@ -2284,7 +2284,7 @@ sub_813DF54: @ 813DF54 pop {r0} bx r0 .align 2, 0 -_0813DFB4: .4byte gUnknown_3005098 +_0813DFB4: .4byte gTasks+0x8 _0813DFB8: .4byte gStringVar2 _0813DFBC: .4byte gStringVar4 _0813DFC0: .4byte gUnknown_8416409 @@ -2300,7 +2300,7 @@ sub_813DFC8: @ 813DFC8 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 - ldr r0, _0813E00C @ =gUnknown_3005098 + ldr r0, _0813E00C @ =gTasks+0x8 adds r4, r0 movs r0, 0x7 bl sub_813EA98 @@ -2321,7 +2321,7 @@ sub_813DFC8: @ 813DFC8 pop {r0} bx r0 .align 2, 0 -_0813E00C: .4byte gUnknown_3005098 +_0813E00C: .4byte gTasks+0x8 thumb_func_end sub_813DFC8 thumb_func_start sub_813E010 @@ -2333,7 +2333,7 @@ sub_813E010: @ 813E010 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0813E044 @ =gUnknown_3005098 + ldr r1, _0813E044 @ =gTasks+0x8 adds r4, r0, r1 adds r0, r4, 0 adds r0, 0x10 @@ -2350,7 +2350,7 @@ sub_813E010: @ 813E010 bl sub_813D9F8 b _0813E0D4 .align 2, 0 -_0813E044: .4byte gUnknown_3005098 +_0813E044: .4byte gTasks+0x8 _0813E048: ldr r0, _0813E08C @ =gMain ldrh r1, [r0, 0x2E] @@ -2419,7 +2419,7 @@ sub_813E0DC: @ 813E0DC lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r6, _0813E14C @ =gUnknown_3005098 + ldr r6, _0813E14C @ =gTasks+0x8 adds r5, r4, r6 movs r0, 0x7 bl sub_813EA98 @@ -2462,7 +2462,7 @@ sub_813E0DC: @ 813E0DC pop {r0} bx r0 .align 2, 0 -_0813E14C: .4byte gUnknown_3005098 +_0813E14C: .4byte gTasks+0x8 _0813E150: .4byte gStringVar1 _0813E154: .4byte gStringVar2 _0813E158: .4byte gStringVar4 @@ -2479,7 +2479,7 @@ sub_813E164: @ 813E164 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _0813E1EC @ =gUnknown_3005098 + ldr r1, _0813E1EC @ =gTasks+0x8 adds r5, r0, r1 ldr r0, _0813E1F0 @ =gMain ldrh r1, [r0, 0x2E] @@ -2530,7 +2530,7 @@ _0813E1E4: pop {r0} bx r0 .align 2, 0 -_0813E1EC: .4byte gUnknown_3005098 +_0813E1EC: .4byte gTasks+0x8 _0813E1F0: .4byte gMain _0813E1F4: .4byte gUnknown_203AD30 _0813E1F8: .4byte gUnknown_203F37A @@ -2572,7 +2572,7 @@ _0813E248: ldr r1, [r0] ldr r0, _0813E268 @ =sub_8126EDC str r0, [r1] - ldr r1, _0813E26C @ =gUnknown_3005090 + ldr r1, _0813E26C @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -2586,7 +2586,7 @@ _0813E25E: .align 2, 0 _0813E264: .4byte gUnknown_203F36C _0813E268: .4byte sub_8126EDC -_0813E26C: .4byte gUnknown_3005090 +_0813E26C: .4byte gTasks _0813E270: .4byte sub_813D808 thumb_func_end sub_813E200 @@ -2638,7 +2638,7 @@ sub_813E2B8: @ 813E2B8 lsls r5, r6, 2 adds r5, r6 lsls r5, 3 - ldr r0, _0813E314 @ =gUnknown_3005098 + ldr r0, _0813E314 @ =gTasks+0x8 adds r5, r0 movs r0, 0x5 bl sub_813EACC @@ -2669,7 +2669,7 @@ sub_813E2B8: @ 813E2B8 pop {r0} bx r0 .align 2, 0 -_0813E314: .4byte gUnknown_3005098 +_0813E314: .4byte gTasks+0x8 _0813E318: .4byte gUnknown_203F37A _0813E31C: .4byte gUnknown_3005E70 thumb_func_end sub_813E2B8 @@ -2696,7 +2696,7 @@ sub_813E320: @ 813E320 bl schedule_bg_copy_tilemap_to_vram movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram - ldr r1, _0813E378 @ =gUnknown_3005090 + ldr r1, _0813E378 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -2711,7 +2711,7 @@ sub_813E320: @ 813E320 bx r0 .align 2, 0 _0813E374: .4byte gUnknown_203F388 -_0813E378: .4byte gUnknown_3005090 +_0813E378: .4byte gTasks thumb_func_end sub_813E320 thumb_func_start sub_813E37C @@ -2722,7 +2722,7 @@ sub_813E37C: @ 813E37C lsls r0, r5, 2 adds r0, r5 lsls r6, r0, 3 - ldr r7, _0813E3C4 @ =gUnknown_3005098 + ldr r7, _0813E3C4 @ =gTasks+0x8 adds r0, r6, r7 ldrh r1, [r0, 0x2] movs r0, 0x5 @@ -2748,7 +2748,7 @@ sub_813E37C: @ 813E37C bl sub_813EB20 b _0813E3EA .align 2, 0 -_0813E3C4: .4byte gUnknown_3005098 +_0813E3C4: .4byte gTasks+0x8 _0813E3C8: .4byte gStringVar1 _0813E3CC: .4byte gStringVar4 _0813E3D0: .4byte gUnknown_8416374 @@ -2781,7 +2781,7 @@ sub_813E3FC: @ 813E3FC ldr r2, [r1] ldr r1, _0813E41C @ =sub_808CE60 str r1, [r2] - ldr r2, _0813E420 @ =gUnknown_3005090 + ldr r2, _0813E420 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -2792,7 +2792,7 @@ sub_813E3FC: @ 813E3FC .align 2, 0 _0813E418: .4byte gUnknown_203F36C _0813E41C: .4byte sub_808CE60 -_0813E420: .4byte gUnknown_3005090 +_0813E420: .4byte gTasks _0813E424: .4byte sub_813D808 thumb_func_end sub_813E3FC @@ -2805,7 +2805,7 @@ sub_813E428: @ 813E428 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0813E470 @ =gUnknown_3005098 + ldr r1, _0813E470 @ =gTasks+0x8 adds r4, r0, r1 ldr r6, _0813E474 @ =gUnknown_203AD30 ldrh r0, [r6] @@ -2830,7 +2830,7 @@ sub_813E428: @ 813E428 bl sub_813EB20 b _0813E4CE .align 2, 0 -_0813E470: .4byte gUnknown_3005098 +_0813E470: .4byte gTasks+0x8 _0813E474: .4byte gUnknown_203AD30 _0813E478: .4byte gStringVar1 _0813E47C: .4byte gStringVar4 @@ -2888,7 +2888,7 @@ sub_813E4E4: @ 813E4E4 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 - ldr r0, _0813E540 @ =gUnknown_3005098 + ldr r0, _0813E540 @ =gTasks+0x8 adds r4, r0 ldr r6, _0813E544 @ =gStringVar3 ldrh r1, [r4, 0x2] @@ -2922,7 +2922,7 @@ sub_813E4E4: @ 813E4E4 pop {r0} bx r0 .align 2, 0 -_0813E540: .4byte gUnknown_3005098 +_0813E540: .4byte gTasks+0x8 _0813E544: .4byte gStringVar3 _0813E548: .4byte gStringVar4 _0813E54C: .4byte gUnknown_8416936 @@ -2951,7 +2951,7 @@ sub_813E568: @ 813E568 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 - ldr r0, _0813E5B4 @ =gUnknown_3005098 + ldr r0, _0813E5B4 @ =gTasks+0x8 adds r4, r0 movs r0, 0x2 bl sub_813EA98 @@ -2974,7 +2974,7 @@ sub_813E568: @ 813E568 pop {r0} bx r0 .align 2, 0 -_0813E5B4: .4byte gUnknown_3005098 +_0813E5B4: .4byte gTasks+0x8 thumb_func_end sub_813E568 thumb_func_start sub_813E5B8 @@ -2989,7 +2989,7 @@ sub_813E5B8: @ 813E5B8 lsls r5, r0, 2 adds r5, r0 lsls r5, 3 - ldr r6, _0813E654 @ =gUnknown_3005098 + ldr r6, _0813E654 @ =gTasks+0x8 adds r0, r5, r6 mov r9, r0 movs r0, 0x1 @@ -3049,7 +3049,7 @@ sub_813E5B8: @ 813E5B8 pop {r0} bx r0 .align 2, 0 -_0813E654: .4byte gUnknown_3005098 +_0813E654: .4byte gTasks+0x8 _0813E658: .4byte gStringVar1 _0813E65C: .4byte gStringVar4 _0813E660: .4byte gUnknown_84162B9 @@ -3086,7 +3086,7 @@ sub_813E690: @ 813E690 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _0813E6E0 @ =gUnknown_3005098 + ldr r1, _0813E6E0 @ =gTasks+0x8 adds r5, r0, r1 adds r0, r5, 0 adds r0, 0x10 @@ -3115,7 +3115,7 @@ sub_813E690: @ 813E690 bl sub_813E668 b _0813E762 .align 2, 0 -_0813E6E0: .4byte gUnknown_3005098 +_0813E6E0: .4byte gTasks+0x8 _0813E6E4: ldr r0, _0813E714 @ =gMain ldrh r1, [r0, 0x2E] @@ -3179,7 +3179,7 @@ sub_813E768: @ 813E768 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 - ldr r0, _0813E7D4 @ =gUnknown_3005098 + ldr r0, _0813E7D4 @ =gTasks+0x8 adds r4, r0 movs r0, 0 bl PutWindowTilemap @@ -3218,7 +3218,7 @@ sub_813E768: @ 813E768 pop {r0} bx r0 .align 2, 0 -_0813E7D4: .4byte gUnknown_3005098 +_0813E7D4: .4byte gTasks+0x8 _0813E7D8: .4byte gUnknown_203AD30 _0813E7DC: .4byte gStringVar1 _0813E7E0: .4byte gStringVar3 @@ -3239,7 +3239,7 @@ sub_813E7F0: @ 813E7F0 lsls r6, r0, 2 adds r6, r0 lsls r6, 3 - ldr r0, _0813E8BC @ =gUnknown_3005098 + ldr r0, _0813E8BC @ =gTasks+0x8 mov r9, r0 adds r1, r6, 0 add r1, r9 @@ -3318,7 +3318,7 @@ sub_813E7F0: @ 813E7F0 pop {r0} bx r0 .align 2, 0 -_0813E8BC: .4byte gUnknown_3005098 +_0813E8BC: .4byte gTasks+0x8 _0813E8C0: .4byte gUnknown_203AD30 _0813E8C4: .4byte gSaveBlock1Ptr _0813E8C8: .4byte gUnknown_203F37A diff --git a/asm/cable_club.s b/asm/cable_club.s index d4d6d58d2..eeb9471db 100644 --- a/asm/cable_club.s +++ b/asm/cable_club.s @@ -24,7 +24,7 @@ sub_8080748: @ 8080748 bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _08080788 @ =gUnknown_3005090 + ldr r2, _08080788 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -37,7 +37,7 @@ _0808077C: bx r0 .align 2, 0 _08080784: .4byte sub_80809F8 -_08080788: .4byte gUnknown_3005090 +_08080788: .4byte gTasks thumb_func_end sub_8080748 thumb_func_start sub_808078C @@ -110,7 +110,7 @@ sub_8080808: @ 8080808 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _08080830 @ =gUnknown_3005098 + ldr r0, _08080830 @ =gTasks+0x8 adds r4, r1, r0 movs r1, 0x6 ldrsh r0, [r4, r1] @@ -122,7 +122,7 @@ sub_8080808: @ 8080808 bl sub_80807E8 b _0808083C .align 2, 0 -_08080830: .4byte gUnknown_3005098 +_08080830: .4byte gTasks+0x8 _08080834: ldrh r0, [r4, 0xA] adds r1, r5, 0 @@ -210,7 +210,7 @@ sub_80808BC: @ 80808BC movs r0, 0 b _080808E2 _080808D2: - ldr r0, _080808E8 @ =gUnknown_3005090 + ldr r0, _080808E8 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -223,7 +223,7 @@ _080808E2: pop {r1} bx r1 .align 2, 0 -_080808E8: .4byte gUnknown_3005090 +_080808E8: .4byte gTasks _080808EC: .4byte sub_8080FF0 thumb_func_end sub_80808BC @@ -245,7 +245,7 @@ sub_80808F0: @ 80808F0 bne _08080934 ldr r0, _08080928 @ =gUnknown_202271A strh r1, [r0] - ldr r1, _0808092C @ =gUnknown_3005090 + ldr r1, _0808092C @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -257,7 +257,7 @@ sub_80808F0: @ 80808F0 .align 2, 0 _08080924: .4byte gMain _08080928: .4byte gUnknown_202271A -_0808092C: .4byte gUnknown_3005090 +_0808092C: .4byte gTasks _08080930: .4byte sub_8080FB4 _08080934: movs r0, 0 @@ -293,7 +293,7 @@ _08080968: ldr r1, _08080984 @ =gUnknown_202271A movs r0, 0 strh r0, [r1] - ldr r1, _08080988 @ =gUnknown_3005090 + ldr r1, _08080988 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -307,7 +307,7 @@ _0808097E: bx r1 .align 2, 0 _08080984: .4byte gUnknown_202271A -_08080988: .4byte gUnknown_3005090 +_08080988: .4byte gTasks _0808098C: .4byte sub_8080FB4 thumb_func_end sub_808093C @@ -324,7 +324,7 @@ sub_8080990: @ 8080990 movs r0, 0 b _080809B6 _080809A6: - ldr r0, _080809BC @ =gUnknown_3005090 + ldr r0, _080809BC @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -337,7 +337,7 @@ _080809B6: pop {r1} bx r1 .align 2, 0 -_080809BC: .4byte gUnknown_3005090 +_080809BC: .4byte gTasks _080809C0: .4byte sub_8080FF0 thumb_func_end sub_8080990 @@ -346,7 +346,7 @@ sub_80809C4: @ 80809C4 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080809F4 @ =gUnknown_3005090 + ldr r0, _080809F4 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -367,7 +367,7 @@ _080809EE: pop {r0} bx r0 .align 2, 0 -_080809F4: .4byte gUnknown_3005090 +_080809F4: .4byte gTasks thumb_func_end sub_80809C4 thumb_func_start sub_80809F8 @@ -378,7 +378,7 @@ sub_80809F8: @ 80809F8 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _08080A28 @ =gUnknown_3005098 + ldr r0, _08080A28 @ =gTasks+0x8 adds r4, r1, r0 movs r3, 0 ldrsh r2, [r4, r3] @@ -392,7 +392,7 @@ sub_80809F8: @ 80809F8 strh r0, [r4, 0xA] b _08080A3C .align 2, 0 -_08080A28: .4byte gUnknown_3005098 +_08080A28: .4byte gTasks+0x8 _08080A2C: .4byte gUnknown_83C6AB0 _08080A30: cmp r2, 0x9 @@ -432,7 +432,7 @@ sub_8080A4C: @ 8080A4C bls _08080AC0 movs r0, 0x1 bl SetSuppressLinkErrorMessage - ldr r1, _08080AA4 @ =gUnknown_3005090 + ldr r1, _08080AA4 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -451,7 +451,7 @@ sub_8080A4C: @ 8080A4C ldr r0, _08080AAC @ =sub_8080AD0 b _08080ABE .align 2, 0 -_08080AA4: .4byte gUnknown_3005090 +_08080AA4: .4byte gTasks _08080AA8: .4byte gUnknown_81BC4CE _08080AAC: .4byte sub_8080AD0 _08080AB0: @@ -493,7 +493,7 @@ sub_8080AD0: @ 8080AD0 lsrs r2, r0, 24 cmp r2, 0 bne _08080B10 - ldr r0, _08080B18 @ =gUnknown_3005090 + ldr r0, _08080B18 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -506,7 +506,7 @@ _08080B10: pop {r0} bx r0 .align 2, 0 -_08080B18: .4byte gUnknown_3005090 +_08080B18: .4byte gTasks _08080B1C: .4byte sub_8080B20 thumb_func_end sub_8080AD0 @@ -522,7 +522,7 @@ sub_8080B20: @ 8080B20 adds r0, r4 lsls r0, 3 mov r8, r0 - ldr r0, _08080BB4 @ =gUnknown_3005098 + ldr r0, _08080BB4 @ =gTasks+0x8 mov r9, r0 mov r7, r8 add r7, r9 @@ -579,7 +579,7 @@ _08080BA8: pop {r0} bx r0 .align 2, 0 -_08080BB4: .4byte gUnknown_3005098 +_08080BB4: .4byte gTasks+0x8 _08080BB8: .4byte gMain _08080BBC: .4byte gStringVar1 _08080BC0: .4byte gUnknown_81BC50D @@ -624,7 +624,7 @@ sub_8080BC8: @ 8080BC8 _08080C16: ldr r0, _08080C30 @ =gUnknown_81BC4CE bl ShowFieldAutoScrollMessage - ldr r1, _08080C34 @ =gUnknown_3005090 + ldr r1, _08080C34 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -635,7 +635,7 @@ _08080C16: .align 2, 0 _08080C2C: .4byte gMain _08080C30: .4byte gUnknown_81BC4CE -_08080C34: .4byte gUnknown_3005090 +_08080C34: .4byte gTasks _08080C38: .4byte sub_8080AD0 _08080C3C: movs r0, 0x1 @@ -645,7 +645,7 @@ _08080C3C: movs r0, 0x5 bl PlaySE bl sub_800A5BC - ldr r0, _08080C64 @ =gUnknown_3005090 + ldr r0, _08080C64 @ =gTasks lsls r1, r6, 2 adds r1, r6 lsls r1, 3 @@ -657,7 +657,7 @@ _08080C5C: pop {r0} bx r0 .align 2, 0 -_08080C64: .4byte gUnknown_3005090 +_08080C64: .4byte gTasks _08080C68: .4byte sub_8080C6C thumb_func_end sub_8080BC8 @@ -666,7 +666,7 @@ sub_8080C6C: @ 8080C6C push {r4-r7,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _08080CB0 @ =gUnknown_3005090 + ldr r1, _08080CB0 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -693,7 +693,7 @@ sub_8080C6C: @ 8080C6C ldr r0, _08080CB4 @ =sub_8080FF0 b _08080CCC .align 2, 0 -_08080CB0: .4byte gUnknown_3005090 +_08080CB0: .4byte gTasks _08080CB4: .4byte sub_8080FF0 _08080CB8: ldr r4, _08080CD4 @ =gUnknown_20370D0 @@ -721,7 +721,7 @@ sub_8080CDC: @ 8080CDC push {r4-r7,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _08080D30 @ =gUnknown_3005090 + ldr r1, _08080D30 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -756,7 +756,7 @@ sub_8080CDC: @ 8080CDC ldr r0, _08080D38 @ =sub_8080F78 b _08080D72 .align 2, 0 -_08080D30: .4byte gUnknown_3005090 +_08080D30: .4byte gTasks _08080D34: .4byte gUnknown_20370D0 _08080D38: .4byte sub_8080F78 _08080D3C: @@ -863,7 +863,7 @@ _08080DFE: bl sub_80098B8 _08080E02: bl HideFieldMessageBox - ldr r0, _08080E18 @ =gUnknown_3005090 + ldr r0, _08080E18 @ =gTasks lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -872,7 +872,7 @@ _08080E02: str r0, [r1] b _08080E50 .align 2, 0 -_08080E18: .4byte gUnknown_3005090 +_08080E18: .4byte gTasks _08080E1C: .4byte sub_8080F78 _08080E20: bl GetLinkPlayerCount_2 @@ -885,7 +885,7 @@ _08080E20: bl sub_800A900 ldr r0, _08080E60 @ =gUnknown_2022618 bl sub_80898E8 - ldr r1, _08080E64 @ =gUnknown_3005090 + ldr r1, _08080E64 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -902,7 +902,7 @@ _08080E50: _08080E58: .4byte gUnknown_3005030 _08080E5C: .4byte gUnknown_300502C _08080E60: .4byte gUnknown_2022618 -_08080E64: .4byte gUnknown_3005090 +_08080E64: .4byte gTasks _08080E68: .4byte sub_8080E6C thumb_func_end sub_8080DC0 @@ -991,7 +991,7 @@ _08080EF8: ldr r0, _08080F48 @ =gUnknown_202271A ldrh r1, [r0] ldr r0, _08080F4C @ =0x00004411 - ldr r0, _08080F50 @ =gUnknown_3005090 + ldr r0, _08080F50 @ =gTasks mov r2, r8 adds r1, r2, r7 lsls r1, 3 @@ -1008,10 +1008,10 @@ _08080F40: .4byte gUnknown_2039624 _08080F44: .4byte gUnknown_20370D0 _08080F48: .4byte gUnknown_202271A _08080F4C: .4byte 0x00004411 -_08080F50: .4byte gUnknown_3005090 +_08080F50: .4byte gTasks _08080F54: bl sub_800AAC0 - ldr r0, _08080F70 @ =gUnknown_3005090 + ldr r0, _08080F70 @ =gTasks mov r2, r8 adds r1, r2, r7 lsls r1, 3 @@ -1025,7 +1025,7 @@ _08080F66: pop {r0} bx r0 .align 2, 0 -_08080F70: .4byte gUnknown_3005090 +_08080F70: .4byte gTasks _08080F74: .4byte sub_8080F78 thumb_func_end sub_8080E6C @@ -1038,7 +1038,7 @@ sub_8080F78: @ 8080F78 ldrb r0, [r0] cmp r0, 0 bne _08080FA6 - ldr r0, _08080FB0 @ =gUnknown_3005090 + ldr r0, _08080FB0 @ =gTasks lsls r4, r5, 2 adds r4, r5 lsls r4, 3 @@ -1056,7 +1056,7 @@ _08080FA6: bx r0 .align 2, 0 _08080FAC: .4byte gUnknown_3003F64 -_08080FB0: .4byte gUnknown_3005090 +_08080FB0: .4byte gTasks thumb_func_end sub_8080F78 thumb_func_start sub_8080FB4 @@ -1068,7 +1068,7 @@ sub_8080FB4: @ 8080FB4 ldr r1, _08080FE8 @ =gUnknown_20370D0 movs r0, 0x5 strh r0, [r1] - ldr r1, _08080FEC @ =gUnknown_3005090 + ldr r1, _08080FEC @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -1084,7 +1084,7 @@ sub_8080FB4: @ 8080FB4 bx r0 .align 2, 0 _08080FE8: .4byte gUnknown_20370D0 -_08080FEC: .4byte gUnknown_3005090 +_08080FEC: .4byte gTasks thumb_func_end sub_8080FB4 thumb_func_start sub_8080FF0 @@ -1096,7 +1096,7 @@ sub_8080FF0: @ 8080FF0 ldr r1, _08081024 @ =gUnknown_20370D0 movs r0, 0x6 strh r0, [r1] - ldr r1, _08081028 @ =gUnknown_3005090 + ldr r1, _08081028 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -1112,7 +1112,7 @@ sub_8080FF0: @ 8080FF0 bx r0 .align 2, 0 _08081024: .4byte gUnknown_20370D0 -_08081028: .4byte gUnknown_3005090 +_08081028: .4byte gTasks thumb_func_end sub_8080FF0 thumb_func_start sub_808102C @@ -1120,7 +1120,7 @@ sub_808102C: @ 808102C push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _08081050 @ =gUnknown_3005090 + ldr r2, _08081050 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -1136,7 +1136,7 @@ sub_808102C: @ 808102C movs r0, 0 b _0808105A .align 2, 0 -_08081050: .4byte gUnknown_3005090 +_08081050: .4byte gTasks _08081054: ldr r0, _08081060 @ =sub_8080FF0 str r0, [r2] @@ -1361,7 +1361,7 @@ sub_80811FC: @ 80811FC lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _08081228 @ =gUnknown_3005098 + ldr r0, _08081228 @ =gTasks+0x8 adds r4, r1, r0 movs r3, 0 ldrsh r2, [r4, r3] @@ -1374,7 +1374,7 @@ sub_80811FC: @ 80811FC bl CreateTask b _0808123C .align 2, 0 -_08081228: .4byte gUnknown_3005098 +_08081228: .4byte gTasks+0x8 _0808122C: .4byte sub_8081A90 _08081230: cmp r2, 0x9 @@ -1410,7 +1410,7 @@ sub_808124C: @ 808124C lsrs r0, 24 cmp r0, 0x1 bne _08081284 - ldr r0, _0808127C @ =gUnknown_3005090 + ldr r0, _0808127C @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -1418,10 +1418,10 @@ sub_808124C: @ 808124C ldr r0, _08081280 @ =sub_80812A0 b _08081290 .align 2, 0 -_0808127C: .4byte gUnknown_3005090 +_0808127C: .4byte gTasks _08081280: .4byte sub_80812A0 _08081284: - ldr r0, _08081298 @ =gUnknown_3005090 + ldr r0, _08081298 @ =gTasks lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -1434,7 +1434,7 @@ _08081292: pop {r0} bx r0 .align 2, 0 -_08081298: .4byte gUnknown_3005090 +_08081298: .4byte gTasks _0808129C: .4byte sub_80812D8 thumb_func_end sub_808124C @@ -1451,7 +1451,7 @@ sub_80812A0: @ 80812A0 cmp r4, r0 bne _080812CA bl sub_800A5BC - ldr r0, _080812D0 @ =gUnknown_3005090 + ldr r0, _080812D0 @ =gTasks lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -1463,7 +1463,7 @@ _080812CA: pop {r0} bx r0 .align 2, 0 -_080812D0: .4byte gUnknown_3005090 +_080812D0: .4byte gTasks _080812D4: .4byte sub_80812D8 thumb_func_end sub_80812A0 @@ -1509,7 +1509,7 @@ sub_8081318: @ 8081318 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0808133C @ =gUnknown_3005090 + ldr r1, _0808133C @ =gTasks adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -1523,7 +1523,7 @@ _08081332: ldr r0, [r0] mov pc, r0 .align 2, 0 -_0808133C: .4byte gUnknown_3005090 +_0808133C: .4byte gTasks _08081340: .4byte _08081344 .align 2, 0 _08081344: @@ -1664,7 +1664,7 @@ sub_8081454: @ 8081454 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _08081478 @ =gUnknown_3005098 + ldr r1, _08081478 @ =gTasks+0x8 adds r6, r0, r1 movs r1, 0 ldrsh r0, [r6, r1] @@ -1678,7 +1678,7 @@ _0808146E: ldr r0, [r0] mov pc, r0 .align 2, 0 -_08081478: .4byte gUnknown_3005098 +_08081478: .4byte gTasks+0x8 _0808147C: .4byte _08081480 .align 2, 0 _08081480: @@ -2052,7 +2052,7 @@ sub_808177C: @ 808177C lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _080817A0 @ =gUnknown_3005090 + ldr r1, _080817A0 @ =gTasks adds r5, r0, r1 movs r1, 0x8 ldrsh r0, [r5, r1] @@ -2064,7 +2064,7 @@ sub_808177C: @ 808177C beq _080817AE b _08081820 .align 2, 0 -_080817A0: .4byte gUnknown_3005090 +_080817A0: .4byte gTasks _080817A4: cmp r0, 0x2 beq _080817E0 @@ -2156,7 +2156,7 @@ sub_8081850: @ 8081850 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _08081874 @ =gUnknown_3005090 + ldr r1, _08081874 @ =gTasks adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -2168,7 +2168,7 @@ sub_8081850: @ 8081850 beq _08081882 b _080818D8 .align 2, 0 -_08081874: .4byte gUnknown_3005090 +_08081874: .4byte gTasks _08081878: cmp r0, 0x2 beq _080818A8 @@ -2232,7 +2232,7 @@ sub_80818E8: @ 80818E8 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0808190C @ =gUnknown_3005098 + ldr r1, _0808190C @ =gTasks+0x8 adds r4, r0, r1 movs r1, 0 ldrsh r0, [r4, r1] @@ -2244,7 +2244,7 @@ sub_80818E8: @ 80818E8 beq _0808191A b _08081970 .align 2, 0 -_0808190C: .4byte gUnknown_3005098 +_0808190C: .4byte gTasks+0x8 _08081910: cmp r0, 0x2 beq _08081940 @@ -2449,7 +2449,7 @@ sub_8081A90: @ 8081A90 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _08081AD8 @ =gUnknown_3005090 + ldr r1, _08081AD8 @ =gTasks adds r0, r1 ldrh r1, [r0, 0x8] adds r1, 0x1 @@ -2476,7 +2476,7 @@ _08081AD0: pop {r0} bx r0 .align 2, 0 -_08081AD8: .4byte gUnknown_3005090 +_08081AD8: .4byte gTasks _08081ADC: .4byte c2_800ACD4 _08081AE0: .4byte gUnknown_3003F64 thumb_func_end sub_8081A90 @@ -2508,7 +2508,7 @@ sub_8081B08: @ 8081B08 lsls r4, 24 lsrs r4, 24 bl sub_800AAC0 - ldr r1, _08081B28 @ =gUnknown_3005090 + ldr r1, _08081B28 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -2519,7 +2519,7 @@ sub_8081B08: @ 8081B08 pop {r0} bx r0 .align 2, 0 -_08081B28: .4byte gUnknown_3005090 +_08081B28: .4byte gTasks _08081B2C: .4byte sub_8081AE4 thumb_func_end sub_8081B08 diff --git a/asm/clear_save_data_screen.s b/asm/clear_save_data_screen.s index 4dbebc1ba..c5381bbf2 100644 --- a/asm/clear_save_data_screen.s +++ b/asm/clear_save_data_screen.s @@ -167,7 +167,7 @@ _080F56C0: bl BeginNormalPaletteFade ldr r0, _080F56F8 @ =sub_80F558C bl SetVBlankCallback - ldr r1, _080F56FC @ =gUnknown_3005090 + ldr r1, _080F56FC @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -188,7 +188,7 @@ _080F56EC: .align 2, 0 _080F56F4: .4byte 0x0000ffff _080F56F8: .4byte sub_80F558C -_080F56FC: .4byte gUnknown_3005090 +_080F56FC: .4byte gTasks _080F5700: .4byte sub_80F5708 _080F5704: .4byte gUnknown_203AB54 thumb_func_end sub_80F55DC diff --git a/asm/credits.s b/asm/credits.s index 15c3e9ead..6d9921366 100644 --- a/asm/credits.s +++ b/asm/credits.s @@ -1727,7 +1727,7 @@ sub_80F47F8: @ 80F47F8 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080F481C @ =gUnknown_3005098 + ldr r0, _080F481C @ =gTasks+0x8 adds r3, r1, r0 ldrb r0, [r3] cmp r0, 0x1 @@ -1740,7 +1740,7 @@ sub_80F47F8: @ 80F47F8 beq _080F4896 b _080F48C2 .align 2, 0 -_080F481C: .4byte gUnknown_3005098 +_080F481C: .4byte gTasks+0x8 _080F4820: ldr r4, _080F4848 @ =gSprites ldrb r0, [r3, 0x1] @@ -1844,7 +1844,7 @@ sub_80F48D0: @ 80F48D0 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _080F4928 @ =gUnknown_3005098 + ldr r0, _080F4928 @ =gTasks+0x8 adds r4, r0 ldrh r0, [r4, 0x2] bl FreeSpriteTilesByTag @@ -1875,7 +1875,7 @@ _080F491E: bx r0 .align 2, 0 _080F4924: .4byte gUnknown_203AB40 -_080F4928: .4byte gUnknown_3005098 +_080F4928: .4byte gTasks+0x8 _080F492C: .4byte gSprites thumb_func_end sub_80F48D0 @@ -1903,7 +1903,7 @@ _080F494A: lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r2, _080F4990 @ =gUnknown_3005098 + ldr r2, _080F4990 @ =gTasks+0x8 adds r6, r1, r2 ldr r1, [r4] strb r0, [r1, 0x2] @@ -1929,7 +1929,7 @@ _080F4980: .align 2, 0 _080F4988: .4byte gUnknown_203AB40 _080F498C: .4byte sub_80F47F8 -_080F4990: .4byte gUnknown_3005098 +_080F4990: .4byte gTasks+0x8 _080F4994: .4byte gUnknown_841431C _080F4998: movs r4, 0x88 diff --git a/asm/daycare.s b/asm/daycare.s index d89a828a5..9357c5cdb 100644 --- a/asm/daycare.s +++ b/asm/daycare.s @@ -2967,7 +2967,7 @@ Task_HandleDaycareLevelMenuInput: @ 80469FC lsls r0, 24 lsrs r0, 24 adds r5, r0, 0 - ldr r1, _08046A2C @ =gUnknown_3005090 + ldr r1, _08046A2C @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -2987,7 +2987,7 @@ Task_HandleDaycareLevelMenuInput: @ 80469FC beq _08046A40 b _08046A46 .align 2, 0 -_08046A2C: .4byte gUnknown_3005090 +_08046A2C: .4byte gTasks _08046A30: .4byte gMain _08046A34: ldr r0, _08046A3C @ =gUnknown_20370D0 @@ -3000,7 +3000,7 @@ _08046A40: movs r0, 0x2 strh r0, [r1] _08046A46: - ldr r0, _08046A78 @ =gUnknown_3005090 + ldr r0, _08046A78 @ =gTasks lsls r4, r5, 2 adds r4, r5 lsls r4, 3 @@ -3020,7 +3020,7 @@ _08046A46: b _08046AAC .align 2, 0 _08046A74: .4byte gUnknown_20370D0 -_08046A78: .4byte gUnknown_3005090 +_08046A78: .4byte gTasks _08046A7C: movs r1, 0x2 adds r0, r1, 0 @@ -3083,7 +3083,7 @@ ShowDaycareLevelMenu: @ 8046AB8 bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _08046B24 @ =gUnknown_3005090 + ldr r2, _08046B24 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -3098,7 +3098,7 @@ ShowDaycareLevelMenu: @ 8046AB8 _08046B18: .4byte gUnknown_825F7F4 _08046B1C: .4byte gUnknown_825F814 _08046B20: .4byte Task_HandleDaycareLevelMenuInput -_08046B24: .4byte gUnknown_3005090 +_08046B24: .4byte gTasks thumb_func_end ShowDaycareLevelMenu thumb_func_start ChooseSendDaycareMon diff --git a/asm/diploma.s b/asm/diploma.s index 763015118..651264528 100644 --- a/asm/diploma.s +++ b/asm/diploma.s @@ -155,7 +155,7 @@ _080F4D30: bne _080F4D50 movs r0, 0x5 bl sub_8071BC4 - ldr r0, _080F4D68 @ =gUnknown_3005090 + ldr r0, _080F4D68 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -175,7 +175,7 @@ _080F4D5A: bx r0 .align 2, 0 _080F4D64: .4byte gUnknown_2037AB8 -_080F4D68: .4byte gUnknown_3005090 +_080F4D68: .4byte gTasks _080F4D6C: .4byte sub_80F4D74 _080F4D70: .4byte gUnknown_203AB48 thumb_func_end sub_80F4C68 diff --git a/asm/egg_hatch.s b/asm/egg_hatch.s index 5bbbe17e4..16732a4d3 100644 --- a/asm/egg_hatch.s +++ b/asm/egg_hatch.s @@ -801,7 +801,7 @@ sub_80472E4: @ 80472E4 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _08047330 @ =gUnknown_3005090 + ldr r1, _08047330 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -836,7 +836,7 @@ _08047324: pop {r0} bx r0 .align 2, 0 -_08047330: .4byte gUnknown_3005090 +_08047330: .4byte gTasks _08047334: .4byte 0x00000107 thumb_func_end sub_80472E4 diff --git a/asm/evolution_graphics.s b/asm/evolution_graphics.s index 6bbc1b728..671d52e6c 100644 --- a/asm/evolution_graphics.s +++ b/asm/evolution_graphics.s @@ -594,7 +594,7 @@ LaunchTask_PreEvoSparklesSet1: @ 80F5DA0 bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080F5DCC @ =gUnknown_3005090 + ldr r2, _080F5DCC @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -605,7 +605,7 @@ LaunchTask_PreEvoSparklesSet1: @ 80F5DA0 bx r1 .align 2, 0 _080F5DC8: .4byte sub_80F5DD0 -_080F5DCC: .4byte gUnknown_3005090 +_080F5DCC: .4byte gTasks thumb_func_end LaunchTask_PreEvoSparklesSet1 thumb_func_start sub_80F5DD0 @@ -616,7 +616,7 @@ sub_80F5DD0: @ 80F5DD0 lsls r4, 24 lsrs r4, 24 bl SetEvoSparklesMatrices - ldr r0, _080F5E14 @ =gUnknown_3005090 + ldr r0, _080F5E14 @ =gTasks lsls r5, r4, 2 adds r5, r4 lsls r5, 3 @@ -642,7 +642,7 @@ sub_80F5DD0: @ 80F5DD0 pop {r0} bx r0 .align 2, 0 -_080F5E14: .4byte gUnknown_3005090 +_080F5E14: .4byte gTasks _080F5E18: .4byte 0x00007fff _080F5E1C: .4byte EvoTask_CreatePreEvoSparkleSet1 thumb_func_end sub_80F5DD0 @@ -652,7 +652,7 @@ EvoTask_CreatePreEvoSparkleSet1: @ 80F5E20 push {r4-r7,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _080F5E78 @ =gUnknown_3005090 + ldr r1, _080F5E78 @ =gTasks lsls r3, r5, 2 adds r0, r3, r5 lsls r0, 3 @@ -685,7 +685,7 @@ _080F5E48: cmp r4, 0x3 bls _080F5E48 _080F5E66: - ldr r0, _080F5E78 @ =gUnknown_3005090 + ldr r0, _080F5E78 @ =gTasks adds r1, r7, r5 lsls r1, 3 adds r1, r0 @@ -694,7 +694,7 @@ _080F5E66: strh r0, [r1, 0x26] b _080F5E84 .align 2, 0 -_080F5E78: .4byte gUnknown_3005090 +_080F5E78: .4byte gTasks _080F5E7C: movs r0, 0x60 strh r0, [r1, 0x26] @@ -713,7 +713,7 @@ EvoTask_WaitForPre1SparklesToGoUp: @ 80F5E90 push {r4,lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r1, _080F5EB0 @ =gUnknown_3005090 + ldr r1, _080F5EB0 @ =gTasks lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -727,7 +727,7 @@ EvoTask_WaitForPre1SparklesToGoUp: @ 80F5E90 strh r0, [r1, 0x26] b _080F5EBA .align 2, 0 -_080F5EB0: .4byte gUnknown_3005090 +_080F5EB0: .4byte gTasks _080F5EB4: adds r0, r2, 0 bl DestroyTask @@ -758,7 +758,7 @@ sub_80F5ED8: @ 80F5ED8 lsls r4, 24 lsrs r4, 24 bl SetEvoSparklesMatrices - ldr r1, _080F5F04 @ =gUnknown_3005090 + ldr r1, _080F5F04 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -773,7 +773,7 @@ sub_80F5ED8: @ 80F5ED8 pop {r0} bx r0 .align 2, 0 -_080F5F04: .4byte gUnknown_3005090 +_080F5F04: .4byte gTasks _080F5F08: .4byte EvoTask_CreatePreEvoSparklesSet2 thumb_func_end sub_80F5ED8 @@ -782,7 +782,7 @@ EvoTask_CreatePreEvoSparklesSet2: @ 80F5F0C push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _080F5F50 @ =gUnknown_3005090 + ldr r1, _080F5F50 @ =gTasks lsls r2, r5, 2 adds r0, r2, r5 lsls r0, 3 @@ -805,7 +805,7 @@ _080F5F2C: cmp r4, 0x8 bls _080F5F2C _080F5F3E: - ldr r0, _080F5F50 @ =gUnknown_3005090 + ldr r0, _080F5F50 @ =gTasks adds r1, r6, r5 lsls r1, 3 adds r1, r0 @@ -814,7 +814,7 @@ _080F5F3E: strh r0, [r1, 0x26] b _080F5F58 .align 2, 0 -_080F5F50: .4byte gUnknown_3005090 +_080F5F50: .4byte gTasks _080F5F54: ldr r0, _080F5F60 @ =sub_80F5F64 str r0, [r1] @@ -857,7 +857,7 @@ sub_80F5F8C: @ 80F5F8C lsls r4, 24 lsrs r4, 24 bl SetEvoSparklesMatrices - ldr r1, _080F5FB8 @ =gUnknown_3005090 + ldr r1, _080F5FB8 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -872,7 +872,7 @@ sub_80F5F8C: @ 80F5F8C pop {r0} bx r0 .align 2, 0 -_080F5FB8: .4byte gUnknown_3005090 +_080F5FB8: .4byte gTasks _080F5FBC: .4byte EvoTask_CreatePostEvoSparklesSet1 thumb_func_end sub_80F5F8C @@ -881,7 +881,7 @@ EvoTask_CreatePostEvoSparklesSet1: @ 80F5FC0 push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _080F602C @ =gUnknown_3005090 + ldr r1, _080F602C @ =gTasks lsls r2, r5, 2 adds r0, r2, r5 lsls r0, 3 @@ -905,7 +905,7 @@ _080F5FE0: cmp r4, 0xF bls _080F5FE0 _080F5FF4: - ldr r0, _080F602C @ =gUnknown_3005090 + ldr r0, _080F602C @ =gTasks adds r1, r6, r5 lsls r1, 3 adds r1, r0 @@ -925,7 +925,7 @@ _080F6006: cmp r4, 0xF bls _080F6006 _080F601A: - ldr r0, _080F602C @ =gUnknown_3005090 + ldr r0, _080F602C @ =gTasks adds r1, r6, r5 lsls r1, 3 adds r1, r0 @@ -934,7 +934,7 @@ _080F601A: strh r0, [r1, 0x26] b _080F6034 .align 2, 0 -_080F602C: .4byte gUnknown_3005090 +_080F602C: .4byte gTasks _080F6030: ldr r0, _080F603C @ =sub_80F6040 str r0, [r1] @@ -967,7 +967,7 @@ LaunchTask_PostEvoSparklesSet2AndFlash: @ 80F6050 bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080F607C @ =gUnknown_3005090 + ldr r2, _080F607C @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -978,7 +978,7 @@ LaunchTask_PostEvoSparklesSet2AndFlash: @ 80F6050 bx r1 .align 2, 0 _080F6078: .4byte sub_80F6080 -_080F607C: .4byte gUnknown_3005090 +_080F607C: .4byte gTasks thumb_func_end LaunchTask_PostEvoSparklesSet2AndFlash thumb_func_start sub_80F6080 @@ -989,7 +989,7 @@ sub_80F6080: @ 80F6080 lsls r4, 24 lsrs r4, 24 bl SetEvoSparklesMatrices - ldr r0, _080F60CC @ =gUnknown_3005090 + ldr r0, _080F60CC @ =gTasks lsls r5, r4, 2 adds r5, r4 lsls r5, 3 @@ -1017,7 +1017,7 @@ sub_80F6080: @ 80F6080 pop {r0} bx r0 .align 2, 0 -_080F60CC: .4byte gUnknown_3005090 +_080F60CC: .4byte gTasks _080F60D0: .4byte gUnknown_2037638 _080F60D4: .4byte gUnknown_2037238 _080F60D8: .4byte 0xfff90f1c @@ -1031,7 +1031,7 @@ sub_80F60E4: @ 80F60E4 sub sp, 0x4 lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _080F611C @ =gUnknown_3005090 + ldr r1, _080F611C @ =gTasks lsls r5, r6, 2 adds r0, r5, r6 lsls r0, 3 @@ -1053,7 +1053,7 @@ sub_80F60E4: @ 80F60E4 bl CreatePostEvoSparkleSet2 b _080F6144 .align 2, 0 -_080F611C: .4byte gUnknown_3005090 +_080F611C: .4byte gTasks _080F6120: movs r4, 0 _080F6122: @@ -1074,7 +1074,7 @@ _080F6134: movs r3, 0 bl BeginNormalPaletteFade _080F6144: - ldr r0, _080F615C @ =gUnknown_3005090 + ldr r0, _080F615C @ =gTasks adds r1, r5, r6 lsls r1, 3 adds r1, r0 @@ -1085,7 +1085,7 @@ _080F6144: .align 2, 0 _080F6154: .4byte 0xffff0f1c _080F6158: .4byte 0x00007fff -_080F615C: .4byte gUnknown_3005090 +_080F615C: .4byte gTasks _080F6160: ldr r0, _080F616C @ =sub_80F6170 str r0, [r1] @@ -1129,7 +1129,7 @@ sub_80F6190: @ 80F6190 bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080F61BC @ =gUnknown_3005090 + ldr r2, _080F61BC @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -1140,7 +1140,7 @@ sub_80F6190: @ 80F6190 bx r1 .align 2, 0 _080F61B8: .4byte sub_80F61C0 -_080F61BC: .4byte gUnknown_3005090 +_080F61BC: .4byte gTasks thumb_func_end sub_80F6190 thumb_func_start sub_80F61C0 @@ -1151,7 +1151,7 @@ sub_80F61C0: @ 80F61C0 lsls r4, 24 lsrs r4, 24 bl SetEvoSparklesMatrices - ldr r0, _080F620C @ =gUnknown_3005090 + ldr r0, _080F620C @ =gTasks lsls r5, r4, 2 adds r5, r4 lsls r5, 3 @@ -1179,7 +1179,7 @@ sub_80F61C0: @ 80F61C0 pop {r0} bx r0 .align 2, 0 -_080F620C: .4byte gUnknown_3005090 +_080F620C: .4byte gTasks _080F6210: .4byte gUnknown_2037638 _080F6214: .4byte gUnknown_2037238 _080F6218: .4byte 0xfff90f00 @@ -1193,7 +1193,7 @@ sub_80F6224: @ 80F6224 sub sp, 0x4 lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _080F625C @ =gUnknown_3005090 + ldr r1, _080F625C @ =gTasks lsls r5, r6, 2 adds r0, r5, r6 lsls r0, 3 @@ -1215,7 +1215,7 @@ sub_80F6224: @ 80F6224 bl CreatePostEvoSparkleSet2 b _080F6284 .align 2, 0 -_080F625C: .4byte gUnknown_3005090 +_080F625C: .4byte gTasks _080F6260: movs r4, 0 _080F6262: @@ -1236,7 +1236,7 @@ _080F6274: movs r3, 0 bl BeginNormalPaletteFade _080F6284: - ldr r0, _080F629C @ =gUnknown_3005090 + ldr r0, _080F629C @ =gTasks adds r1, r5, r6 lsls r1, 3 adds r1, r0 @@ -1247,7 +1247,7 @@ _080F6284: .align 2, 0 _080F6294: .4byte 0xffff0f00 _080F6298: .4byte 0x00007fff -_080F629C: .4byte gUnknown_3005090 +_080F629C: .4byte gTasks _080F62A0: ldr r0, _080F62AC @ =sub_80F6170 str r0, [r1] @@ -1298,7 +1298,7 @@ _080F62CE: lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r0, _080F63F0 @ =gUnknown_3005090 + ldr r0, _080F63F0 @ =gTasks mov r1, r8 lsls r6, r1, 2 add r6, r8 @@ -1419,7 +1419,7 @@ _080F62CE: .align 2, 0 _080F63E8: .4byte sub_80F6400 _080F63EC: .4byte 0x00007fff -_080F63F0: .4byte gUnknown_3005090 +_080F63F0: .4byte gTasks _080F63F4: .4byte gSprites _080F63F8: .4byte nullsub_86 _080F63FC: .4byte gUnknown_20377F8 @@ -1429,7 +1429,7 @@ _080F63FC: .4byte gUnknown_20377F8 sub_80F6400: @ 80F6400 lsls r0, 24 lsrs r0, 24 - ldr r2, _080F641C @ =gUnknown_3005090 + ldr r2, _080F641C @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -1442,7 +1442,7 @@ sub_80F6400: @ 80F6400 str r0, [r1] bx lr .align 2, 0 -_080F641C: .4byte gUnknown_3005090 +_080F641C: .4byte gTasks _080F6420: .4byte sub_80F6424 thumb_func_end sub_80F6400 @@ -1451,7 +1451,7 @@ sub_80F6424: @ 80F6424 push {r4,lr} lsls r0, 24 lsrs r3, r0, 24 - ldr r1, _080F6444 @ =gUnknown_3005090 + ldr r1, _080F6444 @ =gTasks lsls r0, r3, 2 adds r0, r3 lsls r0, 3 @@ -1464,7 +1464,7 @@ sub_80F6424: @ 80F6424 bl PreEvoVisible_PostEvoInvisible_KillTask b _080F646A .align 2, 0 -_080F6444: .4byte gUnknown_3005090 +_080F6444: .4byte gTasks _080F6448: ldrh r1, [r2, 0x14] movs r4, 0x14 @@ -1497,7 +1497,7 @@ sub_80F6474: @ 80F6474 sub sp, 0x4 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _080F6498 @ =gUnknown_3005090 + ldr r1, _080F6498 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -1511,7 +1511,7 @@ sub_80F6474: @ 80F6474 str r0, [r2] b _080F6584 .align 2, 0 -_080F6498: .4byte gUnknown_3005090 +_080F6498: .4byte gTasks _080F649C: .4byte PreEvoVisible_PostEvoInvisible_KillTask _080F64A0: movs r6, 0 @@ -1651,7 +1651,7 @@ PreEvoInvisible_PostEvoVisible_KillTask: @ 80F6590 lsrs r0, 24 ldr r1, _080F6638 @ =gSprites mov r8, r1 - ldr r1, _080F663C @ =gUnknown_3005090 + ldr r1, _080F663C @ =gTasks lsls r4, r0, 2 adds r4, r0 lsls r4, 3 @@ -1729,7 +1729,7 @@ PreEvoInvisible_PostEvoVisible_KillTask: @ 80F6590 bx r0 .align 2, 0 _080F6638: .4byte gSprites -_080F663C: .4byte gUnknown_3005090 +_080F663C: .4byte gTasks thumb_func_end PreEvoInvisible_PostEvoVisible_KillTask thumb_func_start PreEvoVisible_PostEvoInvisible_KillTask @@ -1741,7 +1741,7 @@ PreEvoVisible_PostEvoInvisible_KillTask: @ 80F6640 lsrs r0, 24 ldr r1, _080F66E8 @ =gSprites mov r8, r1 - ldr r1, _080F66EC @ =gUnknown_3005090 + ldr r1, _080F66EC @ =gTasks lsls r4, r0, 2 adds r4, r0 lsls r4, 3 @@ -1819,7 +1819,7 @@ PreEvoVisible_PostEvoInvisible_KillTask: @ 80F6640 bx r0 .align 2, 0 _080F66E8: .4byte gSprites -_080F66EC: .4byte gUnknown_3005090 +_080F66EC: .4byte gTasks thumb_func_end PreEvoVisible_PostEvoInvisible_KillTask .align 2, 0 @ Don't pad with nop. diff --git a/asm/evolution_scene.s b/asm/evolution_scene.s index e253b6c98..1966dcaca 100644 --- a/asm/evolution_scene.s +++ b/asm/evolution_scene.s @@ -21,7 +21,7 @@ Task_BeginEvolutionScene: @ 80CDD28 lsls r0, 24 lsrs r2, r0, 24 movs r7, 0 - ldr r1, _080CDD4C @ =gUnknown_3005090 + ldr r1, _080CDD4C @ =gTasks lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -34,7 +34,7 @@ Task_BeginEvolutionScene: @ 80CDD28 beq _080CDD68 b _080CDD98 .align 2, 0 -_080CDD4C: .4byte gUnknown_3005090 +_080CDD4C: .4byte gTasks _080CDD50: movs r0, 0x1 negs r0, r0 @@ -97,7 +97,7 @@ BeginEvolutionScene: @ 80CDDA8 bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080CDDEC @ =gUnknown_3005090 + ldr r2, _080CDDEC @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -114,7 +114,7 @@ BeginEvolutionScene: @ 80CDDA8 bx r0 .align 2, 0 _080CDDE8: .4byte Task_BeginEvolutionScene -_080CDDEC: .4byte gUnknown_3005090 +_080CDDEC: .4byte gTasks _080CDDF0: .4byte sub_80CDD18 thumb_func_end BeginEvolutionScene @@ -353,7 +353,7 @@ EvolutionScene: @ 80CDDF4 lsls r1, r0, 24 lsrs r3, r1, 24 strb r0, [r2, 0x2] - ldr r1, _080CE0D4 @ =gUnknown_3005090 + ldr r1, _080CE0D4 @ =gTasks lsls r0, r3, 2 adds r0, r3 lsls r0, 3 @@ -422,7 +422,7 @@ _080CE0C4: .4byte gDummySpriteAffineAnimTable _080CE0C8: .4byte gSprites _080CE0CC: .4byte nullsub_10 _080CE0D0: .4byte sub_80CE8DC -_080CE0D4: .4byte gUnknown_3005090 +_080CE0D4: .4byte gTasks _080CE0D8: .4byte gUnknown_2037238 _080CE0DC: .4byte nullsub_76 _080CE0E0: .4byte sub_80D0050 @@ -436,7 +436,7 @@ CB2_EvolutionSceneLoadGraphics: @ 80CE0E8 mov r5, r8 push {r5,r6} sub sp, 0x8 - ldr r2, _080CE280 @ =gUnknown_3005090 + ldr r2, _080CE280 @ =gTasks ldr r0, _080CE284 @ =gUnknown_2039A20 mov r8, r0 ldr r0, [r0] @@ -604,7 +604,7 @@ CB2_EvolutionSceneLoadGraphics: @ 80CE0E8 pop {r0} bx r0 .align 2, 0 -_080CE280: .4byte gUnknown_3005090 +_080CE280: .4byte gTasks _080CE284: .4byte gUnknown_2039A20 _080CE288: .4byte gPlayerParty _080CE28C: .4byte 0x05006000 @@ -633,7 +633,7 @@ _080CE2D8: .4byte sub_80CE710 CB2_TradeEvolutionSceneLoadGraphics: @ 80CE2DC push {r4-r6,lr} sub sp, 0xC - ldr r2, _080CE318 @ =gUnknown_3005090 + ldr r2, _080CE318 @ =gTasks ldr r0, _080CE31C @ =gUnknown_2039A20 ldr r0, [r0] ldrb r1, [r0, 0x2] @@ -663,7 +663,7 @@ _080CE30E: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080CE318: .4byte gUnknown_3005090 +_080CE318: .4byte gTasks _080CE31C: .4byte gUnknown_2039A20 _080CE320: .4byte gPlayerParty _080CE324: .4byte gMain @@ -1012,7 +1012,7 @@ TradeEvolutionScene: @ 80CE540 lsls r1, r0, 24 lsrs r6, r1, 24 strb r0, [r2, 0x2] - ldr r1, _080CE6E0 @ =gUnknown_3005090 + ldr r1, _080CE6E0 @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -1076,7 +1076,7 @@ _080CE6D0: .4byte gDummySpriteAffineAnimTable _080CE6D4: .4byte gSprites _080CE6D8: .4byte nullsub_10 _080CE6DC: .4byte sub_80CF53C -_080CE6E0: .4byte gUnknown_3005090 +_080CE6E0: .4byte gTasks _080CE6E4: .4byte gUnknown_2022974 _080CE6E8: .4byte gUnknown_2022976 _080CE6EC: .4byte gUnknown_2022978 @@ -1309,7 +1309,7 @@ sub_80CE8DC: @ 80CE8DC sub sp, 0x18 lsls r0, 24 lsrs r7, r0, 24 - ldr r4, _080CE93C @ =gUnknown_3005090 + ldr r4, _080CE93C @ =gTasks lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -1347,13 +1347,13 @@ sub_80CE8DC: @ 80CE8DC bl sub_80D04A8 bl _080CF528 .align 2, 0 -_080CE93C: .4byte gUnknown_3005090 +_080CE93C: .4byte gTasks _080CE940: .4byte gPlayerParty _080CE944: .4byte gUnknown_2023E82 _080CE948: ldr r0, _080CE9A0 @ =gMain ldrh r1, [r0, 0x2C] - ldr r3, _080CE9A4 @ =gUnknown_3005090 + ldr r3, _080CE9A4 @ =gTasks mov r10, r3 lsls r2, r7, 2 mov r8, r2 @@ -1394,7 +1394,7 @@ _080CE948: bl _080CF528 .align 2, 0 _080CE9A0: .4byte gMain -_080CE9A4: .4byte gUnknown_3005090 +_080CE9A4: .4byte gTasks _080CE9A8: .4byte gUnknown_2023E82 _080CE9AC: mov r1, r8 @@ -1461,7 +1461,7 @@ _080CEA2C: negs r1, r1 ands r1, r2 strb r1, [r0] - ldr r0, _080CEA8C @ =gUnknown_3005090 + ldr r0, _080CEA8C @ =gTasks mov r3, r8 adds r1, r3, r7 lsls r1, 3 @@ -1481,7 +1481,7 @@ _080CEA2C: .align 2, 0 _080CEA84: .4byte gSprites _080CEA88: .4byte gUnknown_2039A20 -_080CEA8C: .4byte gUnknown_3005090 +_080CEA8C: .4byte gTasks _080CEA90: ldr r0, _080CEAC0 @ =gUnknown_2037AB8 ldrb r1, [r0, 0x7] @@ -1498,7 +1498,7 @@ _080CEAA0: adds r0, r4, 0 movs r1, 0 bl sub_80D87BC - ldr r0, _080CEACC @ =gUnknown_3005090 + ldr r0, _080CEACC @ =gTasks mov r2, r8 adds r1, r2, r7 lsls r1, 3 @@ -1508,7 +1508,7 @@ _080CEAA0: _080CEAC0: .4byte gUnknown_2037AB8 _080CEAC4: .4byte gStringVar4 _080CEAC8: .4byte gUnknown_83FE672 -_080CEACC: .4byte gUnknown_3005090 +_080CEACC: .4byte gTasks _080CEAD0: movs r0, 0 bl IsTextPrinterActive @@ -1517,14 +1517,14 @@ _080CEAD0: beq _080CEAE0 bl _080CF528 _080CEAE0: - ldr r0, _080CEAEC @ =gUnknown_3005090 + ldr r0, _080CEAEC @ =gTasks mov r3, r8 adds r4, r3, r7 lsls r4, 3 adds r4, r0 b _080CEF26 .align 2, 0 -_080CEAEC: .4byte gUnknown_3005090 +_080CEAEC: .4byte gTasks _080CEAF0: bl IsCryFinished lsls r0, 24 @@ -1534,7 +1534,7 @@ _080CEAF0: _080CEAFE: ldr r0, _080CEB10 @ =0x00000107 bl PlaySE - ldr r0, _080CEB14 @ =gUnknown_3005090 + ldr r0, _080CEB14 @ =gTasks mov r2, r8 adds r1, r2, r7 lsls r1, 3 @@ -1542,7 +1542,7 @@ _080CEAFE: b _080CEFDE .align 2, 0 _080CEB10: .4byte 0x00000107 -_080CEB14: .4byte gUnknown_3005090 +_080CEB14: .4byte gTasks _080CEB18: bl IsSEPlaying lsls r0, 24 @@ -1554,7 +1554,7 @@ _080CEB28: movs r0, 0x84 lsls r0, 1 bl PlayNewMapMusic - ldr r0, _080CEB54 @ =gUnknown_3005090 + ldr r0, _080CEB54 @ =gTasks mov r3, r8 adds r1, r3, r7 lsls r1, 3 @@ -1570,7 +1570,7 @@ _080CEB28: bl BeginNormalPaletteFade bl _080CF528 .align 2, 0 -_080CEB54: .4byte gUnknown_3005090 +_080CEB54: .4byte gTasks _080CEB58: ldr r0, _080CEB84 @ =gUnknown_2037AB8 ldrb r1, [r0, 0x7] @@ -1586,7 +1586,7 @@ _080CEB68: bl LaunchTask_PreEvoSparklesSet1 ldr r1, _080CEB88 @ =gUnknown_2023E82 strb r0, [r1, 0x2] - ldr r0, _080CEB8C @ =gUnknown_3005090 + ldr r0, _080CEB8C @ =gTasks mov r2, r8 adds r1, r2, r7 lsls r1, 3 @@ -1595,7 +1595,7 @@ _080CEB68: .align 2, 0 _080CEB84: .4byte gUnknown_2037AB8 _080CEB88: .4byte gUnknown_2023E82 -_080CEB8C: .4byte gUnknown_3005090 +_080CEB8C: .4byte gTasks _080CEB90: ldr r4, _080CEBC8 @ =gUnknown_2023E82 ldrb r0, [r4, 0x2] @@ -1688,7 +1688,7 @@ _080CEC4C: bl sub_80F5F74 ldr r1, _080CEC60 @ =gUnknown_2023E82 strb r0, [r1, 0x2] - ldr r0, _080CEC64 @ =gUnknown_3005090 + ldr r0, _080CEC64 @ =gTasks mov r3, r8 adds r1, r3, r7 lsls r1, 3 @@ -1696,7 +1696,7 @@ _080CEC4C: b _080CEFDE .align 2, 0 _080CEC60: .4byte gUnknown_2023E82 -_080CEC64: .4byte gUnknown_3005090 +_080CEC64: .4byte gTasks _080CEC68: ldr r6, _080CEC90 @ =gUnknown_2023E82 ldrb r0, [r6, 0x2] @@ -1762,7 +1762,7 @@ _080CECCE: movs r2, 0x10 movs r3, 0 bl BeginNormalPaletteFade - ldr r0, _080CED08 @ =gUnknown_3005090 + ldr r0, _080CED08 @ =gTasks mov r3, r8 adds r1, r3, r7 lsls r1, 3 @@ -1771,7 +1771,7 @@ _080CECCE: .align 2, 0 _080CED00: .4byte gUnknown_2037238 _080CED04: .4byte gUnknown_2039A20 -_080CED08: .4byte gUnknown_3005090 +_080CED08: .4byte gTasks _080CED0C: ldr r0, _080CED28 @ =gUnknown_2037AB8 ldrb r1, [r0, 0x7] @@ -1805,7 +1805,7 @@ _080CED3A: bl sub_80D87BC ldr r0, _080CEDB0 @ =0x00000103 bl PlayBGM - ldr r2, _080CEDB4 @ =gUnknown_3005090 + ldr r2, _080CEDB4 @ =gTasks mov r3, r8 adds r1, r3, r7 lsls r1, 3 @@ -1843,7 +1843,7 @@ _080CED3A: _080CEDA8: .4byte gStringVar4 _080CEDAC: .4byte gUnknown_83FE688 _080CEDB0: .4byte 0x00000103 -_080CEDB4: .4byte gUnknown_3005090 +_080CEDB4: .4byte gTasks _080CEDB8: movs r0, 0 bl IsTextPrinterActive @@ -1853,7 +1853,7 @@ _080CEDB8: b _080CF528 _080CEDC6: bl sub_812B484 - ldr r1, _080CEE20 @ =gUnknown_3005090 + ldr r1, _080CEE20 @ =gTasks mov r2, r8 adds r0, r2, r7 lsls r0, 3 @@ -1891,7 +1891,7 @@ _080CEDC6: strh r0, [r5, 0x8] b _080CF528 .align 2, 0 -_080CEE20: .4byte gUnknown_3005090 +_080CEE20: .4byte gTasks _080CEE24: .4byte gUnknown_2022AB8 _080CEE28: .4byte 0x0000ffff _080CEE2C: @@ -1913,14 +1913,14 @@ _080CEE40: movs r2, 0 movs r3, 0x10 bl BeginNormalPaletteFade - ldr r0, _080CEE5C @ =gUnknown_3005090 + ldr r0, _080CEE5C @ =gTasks mov r2, r8 adds r1, r2, r7 lsls r1, 3 adds r1, r0 b _080CEFDE .align 2, 0 -_080CEE5C: .4byte gUnknown_3005090 +_080CEE5C: .4byte gTasks _080CEE60: ldr r0, _080CEEC4 @ =gUnknown_2037AB8 ldrb r1, [r0, 0x7] @@ -2031,7 +2031,7 @@ _080CEF3C: bne _080CEF48 b _080CF528 _080CEF48: - ldr r0, _080CEF64 @ =gUnknown_3005090 + ldr r0, _080CEF64 @ =gTasks mov r2, r8 adds r1, r2, r7 lsls r1, 3 @@ -2045,7 +2045,7 @@ _080CEF48: bl StringExpandPlaceholders b _080CEF78 .align 2, 0 -_080CEF64: .4byte gUnknown_3005090 +_080CEF64: .4byte gTasks _080CEF68: .4byte gStringVar4 _080CEF6C: .4byte gUnknown_83FE6D0 _080CEF70: @@ -2056,7 +2056,7 @@ _080CEF78: ldr r0, _080CEF90 @ =gStringVar4 movs r1, 0 bl sub_80D87BC - ldr r1, _080CEF98 @ =gUnknown_3005090 + ldr r1, _080CEF98 @ =gTasks mov r2, r8 adds r0, r2, r7 lsls r0, 3 @@ -2067,7 +2067,7 @@ _080CEF78: .align 2, 0 _080CEF90: .4byte gStringVar4 _080CEF94: .4byte gUnknown_83FE6B5 -_080CEF98: .4byte gUnknown_3005090 +_080CEF98: .4byte gTasks _080CEF9C: movs r0, 0 bl IsTextPrinterActive @@ -2091,7 +2091,7 @@ _080CEFB6: ldr r0, _080CEFF0 @ =gUnknown_202298C movs r1, 0 bl sub_80D87BC - ldr r0, _080CEFF4 @ =gUnknown_3005090 + ldr r0, _080CEFF4 @ =gTasks mov r3, r8 adds r1, r3, r7 lsls r1, 3 @@ -2107,7 +2107,7 @@ _080CEFDE: _080CEFE8: .4byte 0x00000101 _080CEFEC: .4byte gUnknown_83FDF3C _080CEFF0: .4byte gUnknown_202298C -_080CEFF4: .4byte gUnknown_3005090 +_080CEFF4: .4byte gTasks _080CEFF8: movs r0, 0 bl IsTextPrinterActive @@ -2122,7 +2122,7 @@ _080CF006: beq _080CF012 b _080CF528 _080CF012: - ldr r0, _080CF030 @ =gUnknown_3005090 + ldr r0, _080CF030 @ =gTasks mov r2, r8 adds r1, r2, r7 lsls r1, 3 @@ -2139,7 +2139,7 @@ _080CF02A: strh r0, [r1, 0x8] b _080CF528 .align 2, 0 -_080CF030: .4byte gUnknown_3005090 +_080CF030: .4byte gTasks _080CF034: mov r3, r8 adds r0, r3, r7 @@ -2194,7 +2194,7 @@ _080CF0A2: ldr r0, _080CF0CC @ =gUnknown_202298C movs r1, 0 bl sub_80D87BC - ldr r0, _080CF0D0 @ =gUnknown_3005090 + ldr r0, _080CF0D0 @ =gTasks mov r2, r8 adds r1, r2, r7 lsls r1, 3 @@ -2205,7 +2205,7 @@ _080CF0A2: .align 2, 0 _080CF0C8: .4byte gUnknown_83FDF3C _080CF0CC: .4byte gUnknown_202298C -_080CF0D0: .4byte gUnknown_3005090 +_080CF0D0: .4byte gTasks _080CF0D4: movs r0, 0 bl IsTextPrinterActive @@ -2226,7 +2226,7 @@ _080CF0EE: ldr r0, _080CF114 @ =gUnknown_202298C movs r1, 0 bl sub_80D87BC - ldr r0, _080CF118 @ =gUnknown_3005090 + ldr r0, _080CF118 @ =gTasks mov r3, r8 adds r1, r3, r7 lsls r1, 3 @@ -2237,7 +2237,7 @@ _080CF0EE: .align 2, 0 _080CF110: .4byte gUnknown_83FDF3C _080CF114: .4byte gUnknown_202298C -_080CF118: .4byte gUnknown_3005090 +_080CF118: .4byte gTasks _080CF11C: movs r0, 0 bl IsTextPrinterActive @@ -2254,7 +2254,7 @@ _080CF11C: ldr r0, _080CF1AC @ =gUnknown_202298C movs r1, 0 bl sub_80D87BC - ldr r0, _080CF1B0 @ =gUnknown_3005090 + ldr r0, _080CF1B0 @ =gTasks mov r2, r8 adds r1, r2, r7 lsls r1, 3 @@ -2290,7 +2290,7 @@ _080CF176: ldr r0, _080CF1B4 @ =gUnknown_83FE791 movs r1, 0xE bl sub_80D87BC - ldr r0, _080CF1B0 @ =gUnknown_3005090 + ldr r0, _080CF1B0 @ =gTasks mov r3, r8 adds r1, r3, r7 lsls r1, 3 @@ -2306,7 +2306,7 @@ _080CF176: .align 2, 0 _080CF1A8: .4byte gUnknown_83FDF3C _080CF1AC: .4byte gUnknown_202298C -_080CF1B0: .4byte gUnknown_3005090 +_080CF1B0: .4byte gTasks _080CF1B4: .4byte gUnknown_83FE791 _080CF1B8: .4byte gUnknown_2023E82 _080CF1BC: @@ -2363,7 +2363,7 @@ _080CF208: ldrb r2, [r0, 0x1] cmp r2, 0 beq _080CF250 - ldr r0, _080CF24C @ =gUnknown_3005090 + ldr r0, _080CF24C @ =gTasks mov r2, r8 adds r1, r2, r7 lsls r1, 3 @@ -2374,9 +2374,9 @@ _080CF208: .align 2, 0 _080CF244: .4byte gMain _080CF248: .4byte gUnknown_2023E82 -_080CF24C: .4byte gUnknown_3005090 +_080CF24C: .4byte gTasks _080CF250: - ldr r0, _080CF2AC @ =gUnknown_3005090 + ldr r0, _080CF2AC @ =gTasks mov r3, r8 adds r1, r3, r7 lsls r1, 3 @@ -2412,7 +2412,7 @@ _080CF284: bl sub_802DB7C movs r0, 0x5 bl PlaySE - ldr r1, _080CF2AC @ =gUnknown_3005090 + ldr r1, _080CF2AC @ =gTasks mov r2, r8 adds r0, r2, r7 lsls r0, 3 @@ -2421,7 +2421,7 @@ _080CF284: strh r1, [r0, 0x14] b _080CF528 .align 2, 0 -_080CF2AC: .4byte gUnknown_3005090 +_080CF2AC: .4byte gTasks _080CF2B0: .4byte gMain _080CF2B4: ldr r0, _080CF2F4 @ =gUnknown_2037AB8 @@ -2434,7 +2434,7 @@ _080CF2B4: _080CF2C2: bl FreeAllWindowBuffers ldr r0, _080CF2F8 @ =gPlayerParty - ldr r1, _080CF2FC @ =gUnknown_3005090 + ldr r1, _080CF2FC @ =gTasks mov r3, r8 adds r5, r3, r7 lsls r5, 3 @@ -2457,7 +2457,7 @@ _080CF2C2: .align 2, 0 _080CF2F4: .4byte gUnknown_2037AB8 _080CF2F8: .4byte gPlayerParty -_080CF2FC: .4byte gUnknown_3005090 +_080CF2FC: .4byte gTasks _080CF300: .4byte gUnknown_2024029 _080CF304: .4byte CB2_EvolutionSceneLoadGraphics _080CF308: .4byte gUnknown_2024022 @@ -2481,7 +2481,7 @@ _080CF324: lsrs r6, r0, 24 cmp r6, 0x4 bne _080CF34C - ldr r0, _080CF348 @ =gUnknown_3005090 + ldr r0, _080CF348 @ =gTasks mov r2, r8 adds r1, r2, r7 lsls r1, 3 @@ -2491,7 +2491,7 @@ _080CF324: .align 2, 0 _080CF340: .4byte gUnknown_2037AB8 _080CF344: .4byte sub_80CE710 -_080CF348: .4byte gUnknown_3005090 +_080CF348: .4byte gTasks _080CF34C: adds r1, r6, 0 adds r1, 0xD @@ -2511,7 +2511,7 @@ _080CF34C: ldr r0, _080CF390 @ =gUnknown_202298C movs r1, 0 bl sub_80D87BC - ldr r1, _080CF394 @ =gUnknown_3005090 + ldr r1, _080CF394 @ =gTasks mov r2, r8 adds r0, r2, r7 lsls r0, 3 @@ -2523,7 +2523,7 @@ _080CF34C: _080CF388: .4byte gUnknown_83FDF3C _080CF38C: .4byte 0x000004cc _080CF390: .4byte gUnknown_202298C -_080CF394: .4byte gUnknown_3005090 +_080CF394: .4byte gTasks _080CF398: ldr r1, _080CF3D4 @ =gUnknown_2022AC8 movs r0, 0xFD @@ -2545,7 +2545,7 @@ _080CF398: mov r0, r9 adds r2, r4, 0 bl SetMonMoveSlot - ldr r0, _080CF3DC @ =gUnknown_3005090 + ldr r0, _080CF3DC @ =gTasks mov r3, r8 adds r1, r3, r7 lsls r1, 3 @@ -2556,7 +2556,7 @@ _080CF398: .align 2, 0 _080CF3D4: .4byte gUnknown_2022AC8 _080CF3D8: .4byte gUnknown_2024022 -_080CF3DC: .4byte gUnknown_3005090 +_080CF3DC: .4byte gTasks _080CF3E0: ldr r0, _080CF408 @ =gUnknown_83FDF3C movs r1, 0xCF @@ -2567,7 +2567,7 @@ _080CF3E0: ldr r0, _080CF40C @ =gUnknown_202298C movs r1, 0 bl sub_80D87BC - ldr r0, _080CF410 @ =gUnknown_3005090 + ldr r0, _080CF410 @ =gTasks mov r2, r8 adds r1, r2, r7 lsls r1, 3 @@ -2578,7 +2578,7 @@ _080CF3E0: .align 2, 0 _080CF408: .4byte gUnknown_83FDF3C _080CF40C: .4byte gUnknown_202298C -_080CF410: .4byte gUnknown_3005090 +_080CF410: .4byte gTasks _080CF414: movs r0, 0 bl IsTextPrinterActive @@ -2599,7 +2599,7 @@ _080CF42E: ldr r0, _080CF454 @ =gUnknown_202298C movs r1, 0 bl sub_80D87BC - ldr r0, _080CF458 @ =gUnknown_3005090 + ldr r0, _080CF458 @ =gTasks mov r3, r8 adds r1, r3, r7 lsls r1, 3 @@ -2610,7 +2610,7 @@ _080CF42E: .align 2, 0 _080CF450: .4byte gUnknown_83FDF3C _080CF454: .4byte gUnknown_202298C -_080CF458: .4byte gUnknown_3005090 +_080CF458: .4byte gTasks _080CF45C: movs r0, 0 bl IsTextPrinterActive @@ -2630,7 +2630,7 @@ _080CF45C: ldr r0, _080CF49C @ =gUnknown_202298C movs r1, 0 bl sub_80D87BC - ldr r1, _080CF4A0 @ =gUnknown_3005090 + ldr r1, _080CF4A0 @ =gTasks mov r2, r8 adds r0, r2, r7 lsls r0, 3 @@ -2641,7 +2641,7 @@ _080CF45C: .align 2, 0 _080CF498: .4byte gUnknown_83FDF3C _080CF49C: .4byte gUnknown_202298C -_080CF4A0: .4byte gUnknown_3005090 +_080CF4A0: .4byte gTasks _080CF4A4: ldr r0, _080CF4CC @ =gUnknown_83FDF3C ldr r0, [r0, 0x20] @@ -2649,7 +2649,7 @@ _080CF4A4: ldr r0, _080CF4D0 @ =gUnknown_202298C movs r1, 0 bl sub_80D87BC - ldr r1, _080CF4D4 @ =gUnknown_3005090 + ldr r1, _080CF4D4 @ =gTasks mov r3, r8 adds r0, r3, r7 lsls r0, 3 @@ -2664,7 +2664,7 @@ _080CF4A4: .align 2, 0 _080CF4CC: .4byte gUnknown_83FDF3C _080CF4D0: .4byte gUnknown_202298C -_080CF4D4: .4byte gUnknown_3005090 +_080CF4D4: .4byte gTasks _080CF4D8: ldr r0, _080CF4F8 @ =gUnknown_83FDF3C ldr r0, [r0, 0x24] @@ -2672,7 +2672,7 @@ _080CF4D8: ldr r0, _080CF4FC @ =gUnknown_202298C movs r1, 0 bl sub_80D87BC - ldr r1, _080CF500 @ =gUnknown_3005090 + ldr r1, _080CF500 @ =gTasks mov r2, r8 adds r0, r2, r7 lsls r0, 3 @@ -2684,7 +2684,7 @@ _080CF4F2: .align 2, 0 _080CF4F8: .4byte gUnknown_83FDF3C _080CF4FC: .4byte gUnknown_202298C -_080CF500: .4byte gUnknown_3005090 +_080CF500: .4byte gTasks _080CF504: movs r0, 0 bl IsTextPrinterActive @@ -2695,7 +2695,7 @@ _080CF504: lsls r0, 24 cmp r0, 0 bne _080CF528 - ldr r0, _080CF538 @ =gUnknown_3005090 + ldr r0, _080CF538 @ =gTasks mov r3, r8 adds r1, r3, r7 lsls r1, 3 @@ -2713,7 +2713,7 @@ _080CF528: pop {r0} bx r0 .align 2, 0 -_080CF538: .4byte gUnknown_3005090 +_080CF538: .4byte gTasks thumb_func_end sub_80CE8DC thumb_func_start sub_80CF53C @@ -2724,7 +2724,7 @@ sub_80CF53C: @ 80CF53C sub sp, 0x20 lsls r0, 24 lsrs r6, r0, 24 - ldr r5, _080CF5BC @ =gUnknown_3005090 + ldr r5, _080CF5BC @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -2763,7 +2763,7 @@ sub_80CF53C: @ 80CF53C strh r2, [r1, 0x18] bl sub_80D04A8 _080CF598: - ldr r0, _080CF5BC @ =gUnknown_3005090 + ldr r0, _080CF5BC @ =gTasks lsls r2, r6, 2 adds r1, r2, r6 lsls r1, 3 @@ -2782,7 +2782,7 @@ _080CF5B2: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080CF5BC: .4byte gUnknown_3005090 +_080CF5BC: .4byte gTasks _080CF5C0: .4byte gPlayerParty _080CF5C4: .4byte gUnknown_2023E82 _080CF5C8: .4byte _080CF5CC @@ -2818,7 +2818,7 @@ _080CF620: adds r1, r4, 0 movs r2, 0x1 bl sub_8054508 - ldr r0, _080CF648 @ =gUnknown_3005090 + ldr r0, _080CF648 @ =gTasks adds r1, r7, r6 lsls r1, 3 adds r1, r0 @@ -2826,7 +2826,7 @@ _080CF620: .align 2, 0 _080CF640: .4byte gStringVar4 _080CF644: .4byte gUnknown_83FE672 -_080CF648: .4byte gUnknown_3005090 +_080CF648: .4byte gTasks _080CF64C: movs r0, 0 bl IsTextPrinterActive @@ -2835,13 +2835,13 @@ _080CF64C: beq _080CF65C bl _080D003A _080CF65C: - ldr r0, _080CF668 @ =gUnknown_3005090 + ldr r0, _080CF668 @ =gTasks adds r4, r7, r6 lsls r4, 3 adds r4, r0 b _080CFA88 .align 2, 0 -_080CF668: .4byte gUnknown_3005090 +_080CF668: .4byte gTasks _080CF66C: bl IsCryFinished lsls r0, 24 @@ -2854,14 +2854,14 @@ _080CF67A: bl m4aSongNumStop ldr r0, _080CF694 @ =0x00000107 bl PlaySE - ldr r0, _080CF698 @ =gUnknown_3005090 + ldr r0, _080CF698 @ =gTasks adds r1, r7, r6 lsls r1, 3 adds r1, r0 b _080CFB1A .align 2, 0 _080CF694: .4byte 0x00000107 -_080CF698: .4byte gUnknown_3005090 +_080CF698: .4byte gTasks _080CF69C: bl IsSEPlaying lsls r0, 24 @@ -2873,7 +2873,7 @@ _080CF6AC: movs r0, 0x84 lsls r0, 1 bl PlayBGM - ldr r0, _080CF6CC @ =gUnknown_3005090 + ldr r0, _080CF6CC @ =gTasks adds r1, r7, r6 lsls r1, 3 adds r1, r0 @@ -2885,7 +2885,7 @@ _080CF6AC: movs r1, 0x4 b _080CFD56 .align 2, 0 -_080CF6CC: .4byte gUnknown_3005090 +_080CF6CC: .4byte gTasks _080CF6D0: ldr r0, _080CF724 @ =gUnknown_2037AB8 ldrb r1, [r0, 0x7] @@ -2913,7 +2913,7 @@ _080CF6E0: bl LaunchTask_PreEvoSparklesSet1 ldr r1, _080CF730 @ =gUnknown_2023E82 strb r0, [r1, 0x2] - ldr r0, _080CF734 @ =gUnknown_3005090 + ldr r0, _080CF734 @ =gTasks adds r1, r7, r6 lsls r1, 3 adds r1, r0 @@ -2929,7 +2929,7 @@ _080CF724: .4byte gUnknown_2037AB8 _080CF728: .4byte gSprites _080CF72C: .4byte gUnknown_2039A20 _080CF730: .4byte gUnknown_2023E82 -_080CF734: .4byte gUnknown_3005090 +_080CF734: .4byte gTasks _080CF738: .4byte 0x00000603 _080CF73C: ldr r4, _080CF770 @ =gUnknown_2023E82 @@ -3020,14 +3020,14 @@ _080CF7EC: bl sub_80F5F74 ldr r1, _080CF800 @ =gUnknown_2023E82 strb r0, [r1, 0x2] - ldr r0, _080CF804 @ =gUnknown_3005090 + ldr r0, _080CF804 @ =gTasks adds r1, r7, r6 lsls r1, 3 adds r1, r0 b _080CFB1A .align 2, 0 _080CF800: .4byte gUnknown_2023E82 -_080CF804: .4byte gUnknown_3005090 +_080CF804: .4byte gTasks _080CF808: ldr r0, _080CF834 @ =gUnknown_2023E82 mov r8, r0 @@ -3078,7 +3078,7 @@ _080CF860: bne _080CF86E bl _080D003A _080CF86E: - ldr r0, _080CF890 @ =gUnknown_3005090 + ldr r0, _080CF890 @ =gTasks adds r4, r7, r6 lsls r4, 3 adds r4, r0 @@ -3093,7 +3093,7 @@ _080CF86E: bl memcpy b _080CFA90 .align 2, 0 -_080CF890: .4byte gUnknown_3005090 +_080CF890: .4byte gTasks _080CF894: .4byte gUnknown_2037238 _080CF898: .4byte gUnknown_2039A20 _080CF89C: @@ -3113,7 +3113,7 @@ _080CF8A8: bl sub_8054508 ldr r0, _080CF91C @ =0x00000103 bl PlayFanfare - ldr r2, _080CF920 @ =gUnknown_3005090 + ldr r2, _080CF920 @ =gTasks adds r1, r7, r6 lsls r1, 3 adds r4, r1, r2 @@ -3150,7 +3150,7 @@ _080CF8A8: _080CF914: .4byte gStringVar4 _080CF918: .4byte gUnknown_83FE688 _080CF91C: .4byte 0x00000103 -_080CF920: .4byte gUnknown_3005090 +_080CF920: .4byte gTasks _080CF924: movs r0, 0 bl IsTextPrinterActive @@ -3166,7 +3166,7 @@ _080CF932: beq _080CF940 b _080D003A _080CF940: - ldr r1, _080CF98C @ =gUnknown_3005090 + ldr r1, _080CF98C @ =gTasks adds r0, r7, r6 lsls r0, 3 adds r4, r0, r1 @@ -3201,7 +3201,7 @@ _080CF940: strh r0, [r4, 0x8] b _080D003A .align 2, 0 -_080CF98C: .4byte gUnknown_3005090 +_080CF98C: .4byte gTasks _080CF990: .4byte gUnknown_2022AB8 _080CF994: .4byte 0x0000ffff _080CF998: @@ -3223,14 +3223,14 @@ _080CF9AC: movs r0, 0 movs r2, 0x1 bl sub_8054508 - ldr r0, _080CF9CC @ =gUnknown_3005090 + ldr r0, _080CF9CC @ =gTasks adds r1, r7, r6 lsls r1, 3 adds r1, r0 b _080CFB1A .align 2, 0 _080CF9C8: .4byte gUnknown_841E325 -_080CF9CC: .4byte gUnknown_3005090 +_080CF9CC: .4byte gTasks _080CF9D0: movs r0, 0 bl IsTextPrinterActive @@ -3342,7 +3342,7 @@ _080CFAA8: adds r1, r4, 0 movs r2, 0x1 bl sub_8054508 - ldr r1, _080CFAD4 @ =gUnknown_3005090 + ldr r1, _080CFAD4 @ =gTasks adds r0, r7, r6 lsls r0, 3 adds r0, r1 @@ -3352,7 +3352,7 @@ _080CFAA8: .align 2, 0 _080CFACC: .4byte gStringVar4 _080CFAD0: .4byte gUnknown_83FE6D0 -_080CFAD4: .4byte gUnknown_3005090 +_080CFAD4: .4byte gTasks _080CFAD8: movs r0, 0 bl IsTextPrinterActive @@ -3377,7 +3377,7 @@ _080CFAF2: movs r0, 0 movs r2, 0x1 bl sub_8054508 - ldr r0, _080CFB30 @ =gUnknown_3005090 + ldr r0, _080CFB30 @ =gTasks adds r1, r7, r6 lsls r1, 3 adds r1, r0 @@ -3392,7 +3392,7 @@ _080CFB1A: _080CFB24: .4byte 0x00000101 _080CFB28: .4byte gUnknown_83FDF3C _080CFB2C: .4byte gUnknown_202298C -_080CFB30: .4byte gUnknown_3005090 +_080CFB30: .4byte gTasks _080CFB34: movs r0, 0 bl IsTextPrinterActive @@ -3408,7 +3408,7 @@ _080CFB42: beq _080CFB50 b _080D003A _080CFB50: - ldr r0, _080CFB6C @ =gUnknown_3005090 + ldr r0, _080CFB6C @ =gTasks adds r1, r7, r6 lsls r1, 3 adds r1, r0 @@ -3424,7 +3424,7 @@ _080CFB66: strh r0, [r1, 0x8] b _080D003A .align 2, 0 -_080CFB6C: .4byte gUnknown_3005090 +_080CFB6C: .4byte gTasks _080CFB70: adds r0, r7, r6 lsls r0, 3 @@ -3478,7 +3478,7 @@ _080CFBDA: movs r0, 0 movs r2, 0x1 bl sub_8054508 - ldr r0, _080CFC08 @ =gUnknown_3005090 + ldr r0, _080CFC08 @ =gTasks adds r1, r7, r6 lsls r1, 3 adds r1, r0 @@ -3488,7 +3488,7 @@ _080CFBDA: .align 2, 0 _080CFC00: .4byte gUnknown_83FDF3C _080CFC04: .4byte gUnknown_202298C -_080CFC08: .4byte gUnknown_3005090 +_080CFC08: .4byte gTasks _080CFC0C: movs r0, 0 bl IsTextPrinterActive @@ -3510,7 +3510,7 @@ _080CFC26: movs r0, 0 movs r2, 0x1 bl sub_8054508 - ldr r0, _080CFC50 @ =gUnknown_3005090 + ldr r0, _080CFC50 @ =gTasks adds r1, r7, r6 lsls r1, 3 adds r1, r0 @@ -3520,7 +3520,7 @@ _080CFC26: .align 2, 0 _080CFC48: .4byte gUnknown_83FDF3C _080CFC4C: .4byte gUnknown_202298C -_080CFC50: .4byte gUnknown_3005090 +_080CFC50: .4byte gTasks _080CFC54: movs r0, 0 bl IsTextPrinterActive @@ -3538,7 +3538,7 @@ _080CFC54: movs r0, 0 movs r2, 0x1 bl sub_8054508 - ldr r0, _080CFCF0 @ =gUnknown_3005090 + ldr r0, _080CFCF0 @ =gTasks adds r1, r7, r6 lsls r1, 3 adds r1, r0 @@ -3580,7 +3580,7 @@ _080CFCAE: bl sub_810FF60 ldr r3, _080CFCF8 @ =gUnknown_2023E82 strb r4, [r3, 0x1] - ldr r0, _080CFCF0 @ =gUnknown_3005090 + ldr r0, _080CFCF0 @ =gTasks adds r1, r7, r6 lsls r1, 3 adds r1, r0 @@ -3593,7 +3593,7 @@ _080CFCAE: .align 2, 0 _080CFCE8: .4byte gUnknown_83FDF3C _080CFCEC: .4byte gUnknown_202298C -_080CFCF0: .4byte gUnknown_3005090 +_080CFCF0: .4byte gTasks _080CFCF4: .4byte gUnknown_826D1CC _080CFCF8: .4byte gUnknown_2023E82 _080CFCFC: @@ -3626,7 +3626,7 @@ _080CFD1C: movs r0, 0 movs r2, 0x1 bl sub_8054508 - ldr r1, _080CFD6C @ =gUnknown_3005090 + ldr r1, _080CFD6C @ =gTasks adds r0, r7, r6 lsls r0, 3 adds r0, r1 @@ -3651,7 +3651,7 @@ _080CFD56: _080CFD60: .4byte gUnknown_2023E82 _080CFD64: .4byte gUnknown_83FDF3C _080CFD68: .4byte gUnknown_202298C -_080CFD6C: .4byte gUnknown_3005090 +_080CFD6C: .4byte gTasks _080CFD70: ldr r1, _080CFD9C @ =gUnknown_2023E82 movs r0, 0x1 @@ -3666,7 +3666,7 @@ _080CFD70: movs r0, 0 movs r2, 0x1 bl sub_8054508 - ldr r1, _080CFDA8 @ =gUnknown_3005090 + ldr r1, _080CFDA8 @ =gTasks adds r0, r7, r6 lsls r0, 3 adds r0, r1 @@ -3677,7 +3677,7 @@ _080CFD70: _080CFD9C: .4byte gUnknown_2023E82 _080CFDA0: .4byte gUnknown_83FDF3C _080CFDA4: .4byte gUnknown_202298C -_080CFDA8: .4byte gUnknown_3005090 +_080CFDA8: .4byte gTasks _080CFDAC: ldr r0, _080CFE14 @ =gUnknown_2037AB8 ldrb r1, [r0, 0x7] @@ -3704,7 +3704,7 @@ _080CFDC6: bl Free bl FreeAllWindowBuffers ldr r0, _080CFE1C @ =gPlayerParty - ldr r1, _080CFE20 @ =gUnknown_3005090 + ldr r1, _080CFE20 @ =gTasks adds r5, r7, r6 lsls r5, 3 adds r5, r1 @@ -3727,7 +3727,7 @@ _080CFDC6: _080CFE14: .4byte gUnknown_2037AB8 _080CFE18: .4byte gUnknown_3003F3C _080CFE1C: .4byte gPlayerParty -_080CFE20: .4byte gUnknown_3005090 +_080CFE20: .4byte gTasks _080CFE24: .4byte gUnknown_2024029 _080CFE28: .4byte CB2_TradeEvolutionSceneLoadGraphics _080CFE2C: .4byte gUnknown_2024022 @@ -3752,7 +3752,7 @@ _080CFE4A: lsrs r5, r0, 24 cmp r5, 0x4 bne _080CFE74 - ldr r0, _080CFE70 @ =gUnknown_3005090 + ldr r0, _080CFE70 @ =gTasks adds r1, r7, r6 lsls r1, 3 adds r1, r0 @@ -3762,7 +3762,7 @@ _080CFE4A: _080CFE64: .4byte gUnknown_2037AB8 _080CFE68: .4byte gMain _080CFE6C: .4byte sub_80CE72C -_080CFE70: .4byte gUnknown_3005090 +_080CFE70: .4byte gTasks _080CFE74: adds r1, r5, 0 adds r1, 0xD @@ -3783,7 +3783,7 @@ _080CFE74: movs r0, 0 movs r2, 0x1 bl sub_8054508 - ldr r1, _080CFEBC @ =gUnknown_3005090 + ldr r1, _080CFEBC @ =gTasks adds r0, r7, r6 lsls r0, 3 adds r0, r1 @@ -3794,7 +3794,7 @@ _080CFE74: _080CFEB0: .4byte gUnknown_83FDF3C _080CFEB4: .4byte 0x000004cc _080CFEB8: .4byte gUnknown_202298C -_080CFEBC: .4byte gUnknown_3005090 +_080CFEBC: .4byte gTasks _080CFEC0: ldr r1, _080CFF14 @ =gUnknown_2022AC8 movs r0, 0xFD @@ -3826,7 +3826,7 @@ _080CFEC0: movs r0, 0 movs r2, 0x1 bl sub_8054508 - ldr r0, _080CFF24 @ =gUnknown_3005090 + ldr r0, _080CFF24 @ =gTasks adds r1, r7, r6 lsls r1, 3 adds r1, r0 @@ -3838,7 +3838,7 @@ _080CFF14: .4byte gUnknown_2022AC8 _080CFF18: .4byte gUnknown_2024022 _080CFF1C: .4byte gUnknown_83FDF3C _080CFF20: .4byte gUnknown_202298C -_080CFF24: .4byte gUnknown_3005090 +_080CFF24: .4byte gTasks _080CFF28: movs r0, 0 bl IsTextPrinterActive @@ -3860,7 +3860,7 @@ _080CFF42: movs r0, 0 movs r2, 0x1 bl sub_8054508 - ldr r0, _080CFF6C @ =gUnknown_3005090 + ldr r0, _080CFF6C @ =gTasks adds r1, r7, r6 lsls r1, 3 adds r1, r0 @@ -3870,7 +3870,7 @@ _080CFF42: .align 2, 0 _080CFF64: .4byte gUnknown_83FDF3C _080CFF68: .4byte gUnknown_202298C -_080CFF6C: .4byte gUnknown_3005090 +_080CFF6C: .4byte gTasks _080CFF70: movs r0, 0 bl IsTextPrinterActive @@ -3891,7 +3891,7 @@ _080CFF70: movs r0, 0 movs r2, 0x1 bl sub_8054508 - ldr r1, _080CFFB4 @ =gUnknown_3005090 + ldr r1, _080CFFB4 @ =gTasks adds r0, r7, r6 lsls r0, 3 adds r0, r1 @@ -3901,7 +3901,7 @@ _080CFF70: .align 2, 0 _080CFFAC: .4byte gUnknown_83FDF3C _080CFFB0: .4byte gUnknown_202298C -_080CFFB4: .4byte gUnknown_3005090 +_080CFFB4: .4byte gTasks _080CFFB8: ldr r0, _080CFFE0 @ =gUnknown_83FDF3C ldr r0, [r0, 0x20] @@ -3910,7 +3910,7 @@ _080CFFB8: movs r0, 0 movs r2, 0x1 bl sub_8054508 - ldr r1, _080CFFE8 @ =gUnknown_3005090 + ldr r1, _080CFFE8 @ =gTasks adds r0, r7, r6 lsls r0, 3 adds r0, r1 @@ -3924,7 +3924,7 @@ _080CFFB8: .align 2, 0 _080CFFE0: .4byte gUnknown_83FDF3C _080CFFE4: .4byte gUnknown_202298C -_080CFFE8: .4byte gUnknown_3005090 +_080CFFE8: .4byte gTasks _080CFFEC: ldr r0, _080D000C @ =gUnknown_83FDF3C ldr r0, [r0, 0x24] @@ -3933,7 +3933,7 @@ _080CFFEC: movs r0, 0 movs r2, 0x1 bl sub_8054508 - ldr r1, _080D0014 @ =gUnknown_3005090 + ldr r1, _080D0014 @ =gTasks adds r0, r7, r6 lsls r0, 3 adds r0, r1 @@ -3944,7 +3944,7 @@ _080D0006: .align 2, 0 _080D000C: .4byte gUnknown_83FDF3C _080D0010: .4byte gUnknown_202298C -_080D0014: .4byte gUnknown_3005090 +_080D0014: .4byte gTasks _080D0018: movs r0, 0 bl IsTextPrinterActive @@ -3955,7 +3955,7 @@ _080D0018: lsls r0, 24 cmp r0, 0 bne _080D003A - ldr r0, _080D0048 @ =gUnknown_3005090 + ldr r0, _080D0048 @ =gTasks adds r1, r7, r6 lsls r1, 3 adds r1, r0 @@ -3970,7 +3970,7 @@ _080D003A: pop {r0} bx r0 .align 2, 0 -_080D0048: .4byte gUnknown_3005090 +_080D0048: .4byte gTasks thumb_func_end sub_80CF53C thumb_func_start nullsub_76 @@ -4090,7 +4090,7 @@ sub_80D0160: @ 80D0160 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _080D01E0 @ =gUnknown_3005098 + ldr r1, _080D01E0 @ =gTasks+0x8 adds r4, r0, r1 movs r0, 0xC ldrsh r5, [r4, r0] @@ -4149,7 +4149,7 @@ _080D01D2: ldrb r0, [r0] b _080D01FE .align 2, 0 -_080D01E0: .4byte gUnknown_3005098 +_080D01E0: .4byte gTasks+0x8 _080D01E4: .4byte gUnknown_83F846D _080D01E8: ldr r0, _080D0214 @ =gUnknown_2039A24 @@ -4191,7 +4191,7 @@ sub_80D0218: @ 80D0218 lsrs r2, r0, 24 cmp r4, 0 bne _080D0244 - ldr r1, _080D0240 @ =gUnknown_3005090 + ldr r1, _080D0240 @ =gTasks lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -4200,9 +4200,9 @@ sub_80D0218: @ 80D0218 b _080D0252 .align 2, 0 _080D023C: .4byte sub_80D025C -_080D0240: .4byte gUnknown_3005090 +_080D0240: .4byte gTasks _080D0244: - ldr r0, _080D0258 @ =gUnknown_3005090 + ldr r0, _080D0258 @ =gTasks lsls r1, r2, 2 adds r1, r2 lsls r1, 3 @@ -4214,7 +4214,7 @@ _080D0252: pop {r0} bx r0 .align 2, 0 -_080D0258: .4byte gUnknown_3005090 +_080D0258: .4byte gTasks thumb_func_end sub_80D0218 thumb_func_start sub_80D025C @@ -4229,7 +4229,7 @@ sub_80D025C: @ 80D025C mov r8, r0 ldr r1, _080D028C @ =gUnknown_202297A mov r9, r1 - ldr r1, _080D0290 @ =gUnknown_3005090 + ldr r1, _080D0290 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -4244,7 +4244,7 @@ sub_80D025C: @ 80D025C .align 2, 0 _080D0288: .4byte gUnknown_2022978 _080D028C: .4byte gUnknown_202297A -_080D0290: .4byte gUnknown_3005090 +_080D0290: .4byte gTasks _080D0294: .4byte gUnknown_202297C _080D0298: .4byte gUnknown_202297E _080D029C: @@ -4471,7 +4471,7 @@ sub_80D0474: @ 80D0474 lsrs r2, r0, 24 cmp r2, 0xFF beq _080D0492 - ldr r0, _080D04A4 @ =gUnknown_3005090 + ldr r0, _080D04A4 @ =gTasks lsls r1, r2, 2 adds r1, r2 lsls r1, 3 @@ -4487,7 +4487,7 @@ _080D0492: bx r0 .align 2, 0 _080D04A0: .4byte sub_80D0160 -_080D04A4: .4byte gUnknown_3005090 +_080D04A4: .4byte gTasks thumb_func_end sub_80D0474 thumb_func_start sub_80D04A8 diff --git a/asm/fame_checker.s b/asm/fame_checker.s index 3e0139313..d86263801 100644 --- a/asm/fame_checker.s +++ b/asm/fame_checker.s @@ -328,7 +328,7 @@ sub_812C664: @ 812C664 ands r0, r1 cmp r0, 0 bne _0812C684 - ldr r0, _0812C68C @ =gUnknown_3005090 + ldr r0, _0812C68C @ =gTasks lsls r1, r2, 2 adds r1, r2 lsls r1, 3 @@ -340,7 +340,7 @@ _0812C684: bx r0 .align 2, 0 _0812C688: .4byte gUnknown_2037AB8 -_0812C68C: .4byte gUnknown_3005090 +_0812C68C: .4byte gTasks _0812C690: .4byte sub_812C694 thumb_func_end sub_812C664 @@ -355,7 +355,7 @@ sub_812C694: @ 812C694 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 - ldr r0, _0812C714 @ =gUnknown_3005090 + ldr r0, _0812C714 @ =gTasks adds r7, r1, r0 adds r0, 0x8 adds r1, r0 @@ -407,7 +407,7 @@ _0812C6E8: bl PlaySE b _0812C8EA .align 2, 0 -_0812C714: .4byte gUnknown_3005090 +_0812C714: .4byte gTasks _0812C718: .4byte sub_812E110 _0812C71C: .4byte gMain _0812C720: .4byte gUnknown_203B0FC @@ -635,7 +635,7 @@ sub_812C8F8: @ 812C8F8 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0812C91C @ =gUnknown_3005090 + ldr r0, _0812C91C @ =gTasks adds r4, r1, r0 ldr r5, _0812C920 @ =gUnknown_203B0FC ldr r0, [r5] @@ -648,7 +648,7 @@ sub_812C8F8: @ 812C8F8 movs r0, 0 b _0812C982 .align 2, 0 -_0812C91C: .4byte gUnknown_3005090 +_0812C91C: .4byte gTasks _0812C920: .4byte gUnknown_203B0FC _0812C924: ldr r2, _0812C988 @ =gSprites @@ -737,7 +737,7 @@ sub_812C9BC: @ 812C9BC lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0812C9F8 @ =gUnknown_3005090 + ldr r0, _0812C9F8 @ =gTasks adds r4, r1, r0 ldr r2, _0812C9FC @ =gSprites movs r0, 0xC @@ -761,7 +761,7 @@ sub_812C9BC: @ 812C9BC str r0, [r4] b _0812CA14 .align 2, 0 -_0812C9F8: .4byte gUnknown_3005090 +_0812C9F8: .4byte gTasks _0812C9FC: .4byte gSprites _0812CA00: .4byte gUnknown_203B0FC _0812CA04: .4byte sub_812C694 @@ -785,7 +785,7 @@ sub_812CA1C: @ 812CA1C lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _0812CA44 @ =gUnknown_3005090 + ldr r1, _0812CA44 @ =gTasks adds r5, r0, r1 movs r0, 0x1 bl GetBgX @@ -798,7 +798,7 @@ sub_812CA1C: @ 812CA1C bl ChangeBgX b _0812CA52 .align 2, 0 -_0812CA44: .4byte gUnknown_3005090 +_0812CA44: .4byte gTasks _0812CA48: movs r0, 0x1 movs r1, 0 @@ -875,7 +875,7 @@ sub_812CAD8: @ 812CAD8 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 - ldr r0, _0812CB9C @ =gUnknown_3005090 + ldr r0, _0812CB9C @ =gTasks adds r5, r1, r0 adds r0, 0x8 adds r6, r1, r0 @@ -959,7 +959,7 @@ _0812CB80: str r0, [r5] b _0812CC62 .align 2, 0 -_0812CB9C: .4byte gUnknown_3005090 +_0812CB9C: .4byte gTasks _0812CBA0: .4byte gMain _0812CBA4: .4byte gUnknown_203B0FC _0812CBA8: .4byte gSprites @@ -1076,7 +1076,7 @@ sub_812CC68: @ 812CC68 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 - ldr r1, _0812CD18 @ =gUnknown_3005098 + ldr r1, _0812CD18 @ =gTasks+0x8 adds r6, r0, r1 movs r0, 0xBB bl PlaySE @@ -1146,7 +1146,7 @@ _0812CCBE: bl sub_812DA14 b _0812CD30 .align 2, 0 -_0812CD18: .4byte gUnknown_3005098 +_0812CD18: .4byte gTasks+0x8 _0812CD1C: .4byte gSprites _0812CD20: .4byte gUnknown_203B0FC _0812CD24: @@ -1267,7 +1267,7 @@ sub_812CE04: @ 812CE04 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _0812CE8C @ =gUnknown_3005098 + ldr r0, _0812CE8C @ =gTasks+0x8 adds r4, r0 bl sub_812E064 adds r5, r0, 0 @@ -1323,7 +1323,7 @@ sub_812CE04: @ 812CE04 pop {r0} bx r0 .align 2, 0 -_0812CE8C: .4byte gUnknown_3005098 +_0812CE8C: .4byte gTasks+0x8 _0812CE90: .4byte gStringVar4 _0812CE94: .4byte gUnknown_845F6BC _0812CE98: .4byte gUnknown_203B0FC @@ -1434,7 +1434,7 @@ sub_812CF3C: @ 812CF3C movs r2, 0 movs r3, 0x10 bl BeginNormalPaletteFade - ldr r1, _0812CF74 @ =gUnknown_3005090 + ldr r1, _0812CF74 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -1446,7 +1446,7 @@ sub_812CF3C: @ 812CF3C pop {r0} bx r0 .align 2, 0 -_0812CF74: .4byte gUnknown_3005090 +_0812CF74: .4byte gTasks _0812CF78: .4byte sub_812CF7C thumb_func_end sub_812CF3C @@ -1474,7 +1474,7 @@ sub_812CF7C: @ 812CF7C lsrs r1, 16 adds r0, r6, 0 bl sub_812D9A8 - ldr r0, _0812D07C @ =gUnknown_3005090 + ldr r0, _0812D07C @ =gTasks lsls r4, r6, 2 adds r4, r6 lsls r4, 3 @@ -1558,7 +1558,7 @@ _0812D06C: .align 2, 0 _0812D074: .4byte gUnknown_2037AB8 _0812D078: .4byte gUnknown_203B0FC -_0812D07C: .4byte gUnknown_3005090 +_0812D07C: .4byte gTasks _0812D080: .4byte gSprites _0812D084: .4byte gUnknown_203B0F0 _0812D088: .4byte gUnknown_203B0F4 @@ -2738,7 +2738,7 @@ sub_812D9A8: @ 812D9A8 lsls r2, r0, 2 adds r2, r0 lsls r2, 3 - ldr r0, _0812D9FC @ =gUnknown_3005098 + ldr r0, _0812D9FC @ =gTasks+0x8 adds r4, r2, r0 lsrs r1, 16 ldr r0, _0812DA00 @ =gUnknown_203B0FC @@ -2775,7 +2775,7 @@ _0812D9E8: bl DestroySprite b _0812DA0E .align 2, 0 -_0812D9FC: .4byte gUnknown_3005098 +_0812D9FC: .4byte gTasks+0x8 _0812DA00: .4byte gUnknown_203B0FC _0812DA04: .4byte gSprites _0812DA08: @@ -3029,7 +3029,7 @@ _0812DBFE: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _0812DC74 @ =gUnknown_3005090 + ldr r1, _0812DC74 @ =gTasks adds r5, r0, r1 movs r0, 0x5 bl PlaySE @@ -3078,7 +3078,7 @@ _0812DBFE: _0812DC68: .4byte gUnknown_203B104 _0812DC6C: .4byte gUnknown_203B0FC _0812DC70: .4byte sub_812C694 -_0812DC74: .4byte gUnknown_3005090 +_0812DC74: .4byte gTasks _0812DC78: .4byte sub_812DD50 _0812DC7C: ldr r4, _0812DCB8 @ =gSprites @@ -3197,7 +3197,7 @@ sub_812DD50: @ 812DD50 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _0812DD98 @ =gUnknown_3005090 + ldr r0, _0812DD98 @ =gTasks adds r4, r0 ldr r0, _0812DD9C @ =gUnknown_203B0FC ldr r0, [r0] @@ -3226,7 +3226,7 @@ sub_812DD50: @ 812DD50 pop {r0} bx r0 .align 2, 0 -_0812DD98: .4byte gUnknown_3005090 +_0812DD98: .4byte gTasks _0812DD9C: .4byte gUnknown_203B0FC _0812DDA0: .4byte gUnknown_203B104 _0812DDA4: .4byte gSprites @@ -3640,7 +3640,7 @@ sub_812E094: @ 812E094 lsls r0, 24 lsrs r2, r0, 24 _0812E0C8: - ldr r0, _0812E0F4 @ =gUnknown_3005090 + ldr r0, _0812E0F4 @ =gTasks lsls r1, r2, 2 adds r1, r2 lsls r1, 3 @@ -3661,7 +3661,7 @@ _0812E0C8: .align 2, 0 _0812E0EC: .4byte gUnknown_203B0FC _0812E0F0: .4byte sub_812E110 -_0812E0F4: .4byte gUnknown_3005090 +_0812E0F4: .4byte gTasks _0812E0F8: strh r0, [r1, 0xC] ldr r0, [r6] @@ -3686,7 +3686,7 @@ sub_812E110: @ 812E110 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0812E130 @ =gUnknown_3005090 + ldr r1, _0812E130 @ =gTasks adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -3696,7 +3696,7 @@ sub_812E110: @ 812E110 beq _0812E154 b _0812E170 .align 2, 0 -_0812E130: .4byte gUnknown_3005090 +_0812E130: .4byte gTasks _0812E134: ldrh r0, [r4, 0xA] subs r0, 0x1 diff --git a/asm/field_door.s b/asm/field_door.s index 0e5cc9b6f..398b27c55 100644 --- a/asm/field_door.s +++ b/asm/field_door.s @@ -165,7 +165,7 @@ sub_805B028: @ 805B028 lsls r2, r4, 2 adds r2, r4 lsls r2, 3 - ldr r0, _0805B05C @ =gUnknown_3005098 + ldr r0, _0805B05C @ =gTasks+0x8 adds r2, r0 ldrh r1, [r2] lsls r1, 16 @@ -185,7 +185,7 @@ _0805B056: pop {r0} bx r0 .align 2, 0 -_0805B05C: .4byte gUnknown_3005098 +_0805B05C: .4byte gTasks+0x8 thumb_func_end sub_805B028 thumb_func_start sub_805B060 @@ -293,7 +293,7 @@ task_overworld_door_add_if_inactive: @ 805B0E8 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r2, _0805B138 @ =gUnknown_3005098 + ldr r2, _0805B138 @ =gTasks+0x8 adds r1, r2 strh r7, [r1, 0xC] mov r2, r8 @@ -309,7 +309,7 @@ task_overworld_door_add_if_inactive: @ 805B0E8 b _0805B140 .align 2, 0 _0805B134: .4byte sub_805B028 -_0805B138: .4byte gUnknown_3005098 +_0805B138: .4byte gTasks+0x8 _0805B13C: movs r0, 0x1 negs r0, r0 diff --git a/asm/field_effect.s b/asm/field_effect.s index 4392c05f4..1382a6dae 100644 --- a/asm/field_effect.s +++ b/asm/field_effect.s @@ -1009,7 +1009,7 @@ sub_8083B8C: @ 8083B8C lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _08083BCC @ =gUnknown_3005090 + ldr r0, _08083BCC @ =gTasks adds r1, r0 strh r4, [r1, 0xA] movs r0, 0x5D @@ -1026,7 +1026,7 @@ sub_8083B8C: @ 8083B8C bx r1 .align 2, 0 _08083BC8: .4byte sub_8083BD0 -_08083BCC: .4byte gUnknown_3005090 +_08083BCC: .4byte gTasks thumb_func_end sub_8083B8C thumb_func_start sub_8083BD0 @@ -1037,7 +1037,7 @@ sub_8083BD0: @ 8083BD0 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _08083BF8 @ =gUnknown_3005090 + ldr r0, _08083BF8 @ =gTasks adds r1, r0 ldr r2, _08083BFC @ =gUnknown_83CBFD0 movs r3, 0x8 @@ -1050,7 +1050,7 @@ sub_8083BD0: @ 8083BD0 pop {r0} bx r0 .align 2, 0 -_08083BF8: .4byte gUnknown_3005090 +_08083BF8: .4byte gTasks _08083BFC: .4byte gUnknown_83CBFD0 thumb_func_end sub_8083BD0 @@ -1191,7 +1191,7 @@ sub_8083CE0: @ 8083CE0 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _08083D18 @ =gUnknown_3005090 + ldr r0, _08083D18 @ =gTasks adds r1, r0 strh r4, [r1, 0xA] movs r0, 0x75 @@ -1204,7 +1204,7 @@ sub_8083CE0: @ 8083CE0 bx r1 .align 2, 0 _08083D14: .4byte sub_8083D1C -_08083D18: .4byte gUnknown_3005090 +_08083D18: .4byte gTasks thumb_func_end sub_8083CE0 thumb_func_start sub_8083D1C @@ -1215,7 +1215,7 @@ sub_8083D1C: @ 8083D1C lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _08083D44 @ =gUnknown_3005090 + ldr r0, _08083D44 @ =gTasks adds r1, r0 ldr r2, _08083D48 @ =gUnknown_83CBFE0 movs r3, 0x8 @@ -1228,7 +1228,7 @@ sub_8083D1C: @ 8083D1C pop {r0} bx r0 .align 2, 0 -_08083D44: .4byte gUnknown_3005090 +_08083D44: .4byte gTasks _08083D48: .4byte gUnknown_83CBFE0 thumb_func_end sub_8083D1C @@ -2008,7 +2008,7 @@ task00_8084310: @ 8084310 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0808437C @ =gUnknown_3005090 + ldr r1, _0808437C @ =gTasks adds r4, r0, r1 movs r0, 0x8 ldrsh r6, [r4, r0] @@ -2052,7 +2052,7 @@ _08084376: pop {r0} bx r0 .align 2, 0 -_0808437C: .4byte gUnknown_3005090 +_0808437C: .4byte gTasks _08084380: .4byte gUnknown_20386E0 _08084384: .4byte sub_805671C _08084388: .4byte gUnknown_3005020 @@ -2115,7 +2115,7 @@ c3_080843F8: @ 80843F8 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0808444C @ =gUnknown_3005090 + ldr r1, _0808444C @ =gTasks adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -2147,7 +2147,7 @@ _08084444: pop {r0} bx r0 .align 2, 0 -_0808444C: .4byte gUnknown_3005090 +_0808444C: .4byte gTasks _08084450: .4byte gUnknown_2037AB8 thumb_func_end c3_080843F8 @@ -2180,7 +2180,7 @@ sub_8084484: @ 8084484 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080844B4 @ =gUnknown_3005090 + ldr r0, _080844B4 @ =gTasks adds r4, r1, r0 ldr r5, _080844B8 @ =gUnknown_83CC034 _08084496: @@ -2198,7 +2198,7 @@ _08084496: pop {r0} bx r0 .align 2, 0 -_080844B4: .4byte gUnknown_3005090 +_080844B4: .4byte gTasks _080844B8: .4byte gUnknown_83CC034 thumb_func_end sub_8084484 @@ -2572,7 +2572,7 @@ sub_8084784: @ 8084784 bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080847BC @ =gUnknown_3005090 + ldr r2, _080847BC @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -2589,7 +2589,7 @@ _080847B0: bx r0 .align 2, 0 _080847B8: .4byte sub_80847C0 -_080847BC: .4byte gUnknown_3005090 +_080847BC: .4byte gTasks thumb_func_end sub_8084784 thumb_func_start sub_80847C0 @@ -2600,7 +2600,7 @@ sub_80847C0: @ 80847C0 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080847F0 @ =gUnknown_3005090 + ldr r0, _080847F0 @ =gTasks adds r4, r1, r0 ldr r5, _080847F4 @ =gUnknown_83CC050 _080847D2: @@ -2618,7 +2618,7 @@ _080847D2: pop {r0} bx r0 .align 2, 0 -_080847F0: .4byte gUnknown_3005090 +_080847F0: .4byte gTasks _080847F4: .4byte gUnknown_83CC050 thumb_func_end sub_80847C0 @@ -2911,7 +2911,7 @@ sub_8084A24: @ 8084A24 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _08084A54 @ =gUnknown_3005090 + ldr r0, _08084A54 @ =gTasks adds r4, r1, r0 ldr r5, _08084A58 @ =gUnknown_83CC068 _08084A36: @@ -2929,7 +2929,7 @@ _08084A36: pop {r0} bx r0 .align 2, 0 -_08084A54: .4byte gUnknown_3005090 +_08084A54: .4byte gTasks _08084A58: .4byte gUnknown_83CC068 thumb_func_end sub_8084A24 @@ -3233,7 +3233,7 @@ oei_waterfall: @ 8084CA0 bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _08084CD0 @ =gUnknown_3005090 + ldr r2, _08084CD0 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -3248,7 +3248,7 @@ oei_waterfall: @ 8084CA0 bx r1 .align 2, 0 _08084CCC: .4byte sub_8084CD8 -_08084CD0: .4byte gUnknown_3005090 +_08084CD0: .4byte gTasks _08084CD4: .4byte gUnknown_20386E0 thumb_func_end oei_waterfall @@ -3258,7 +3258,7 @@ sub_8084CD8: @ 8084CD8 lsls r0, 24 lsrs r0, 24 ldr r5, _08084D14 @ =gUnknown_83CC084 - ldr r2, _08084D18 @ =gUnknown_3005090 + ldr r2, _08084D18 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -3286,7 +3286,7 @@ _08084CEA: bx r0 .align 2, 0 _08084D14: .4byte gUnknown_83CC084 -_08084D18: .4byte gUnknown_3005090 +_08084D18: .4byte gTasks _08084D1C: .4byte gUnknown_2037078 _08084D20: .4byte gUnknown_2036E38 thumb_func_end sub_8084CD8 @@ -3437,7 +3437,7 @@ FldEff_UseDive: @ 8084E24 bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _08084E58 @ =gUnknown_3005090 + ldr r2, _08084E58 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -3454,7 +3454,7 @@ FldEff_UseDive: @ 8084E24 bx r1 .align 2, 0 _08084E54: .4byte sub_8084E60 -_08084E58: .4byte gUnknown_3005090 +_08084E58: .4byte gTasks _08084E5C: .4byte gUnknown_20386E0 thumb_func_end FldEff_UseDive @@ -3464,7 +3464,7 @@ sub_8084E60: @ 8084E60 lsls r0, 24 lsrs r0, 24 ldr r5, _08084E90 @ =gUnknown_83CC098 - ldr r2, _08084E94 @ =gUnknown_3005090 + ldr r2, _08084E94 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -3485,7 +3485,7 @@ _08084E72: bx r0 .align 2, 0 _08084E90: .4byte gUnknown_83CC098 -_08084E94: .4byte gUnknown_3005090 +_08084E94: .4byte gTasks thumb_func_end sub_8084E60 thumb_func_start dive_1_lock @@ -3585,7 +3585,7 @@ sub_8084F44: @ 8084F44 lsls r0, 24 lsrs r0, 24 ldr r6, _08084F8C @ =gUnknown_83CC0A4 - ldr r2, _08084F90 @ =gUnknown_3005090 + ldr r2, _08084F90 @ =gTasks ldr r5, _08084F94 @ =gUnknown_2037078 lsls r1, r0, 2 adds r1, r0 @@ -3619,7 +3619,7 @@ _08084F58: bx r0 .align 2, 0 _08084F8C: .4byte gUnknown_83CC0A4 -_08084F90: .4byte gUnknown_3005090 +_08084F90: .4byte gTasks _08084F94: .4byte gUnknown_2037078 _08084F98: .4byte gUnknown_2036E38 _08084F9C: .4byte gSprites @@ -3931,7 +3931,7 @@ sub_80851E8: @ 80851E8 lsls r0, 24 lsrs r0, 24 ldr r6, _08085230 @ =gUnknown_83CC0BC - ldr r2, _08085234 @ =gUnknown_3005090 + ldr r2, _08085234 @ =gTasks ldr r5, _08085238 @ =gUnknown_2037078 lsls r1, r0, 2 adds r1, r0 @@ -3965,7 +3965,7 @@ _080851FC: bx r0 .align 2, 0 _08085230: .4byte gUnknown_83CC0BC -_08085234: .4byte gUnknown_3005090 +_08085234: .4byte gTasks _08085238: .4byte gUnknown_2037078 _0808523C: .4byte gUnknown_2036E38 _08085240: .4byte gSprites @@ -4194,7 +4194,7 @@ sub_80853E4: @ 80853E4 lsls r0, 24 lsrs r0, 24 ldr r6, _0808542C @ =gUnknown_83CC0CC - ldr r2, _08085430 @ =gUnknown_3005090 + ldr r2, _08085430 @ =gTasks ldr r5, _08085434 @ =gUnknown_2037078 lsls r1, r0, 2 adds r1, r0 @@ -4228,7 +4228,7 @@ _080853F8: bx r0 .align 2, 0 _0808542C: .4byte gUnknown_83CC0CC -_08085430: .4byte gUnknown_3005090 +_08085430: .4byte gTasks _08085434: .4byte gUnknown_2037078 _08085438: .4byte gUnknown_2036E38 _0808543C: .4byte gSprites @@ -4499,7 +4499,7 @@ sub_808563C: @ 808563C lsls r1, 24 lsrs r1, 24 ldr r3, _08085664 @ =gUnknown_83CC0E0 - ldr r2, _08085668 @ =gUnknown_3005090 + ldr r2, _08085668 @ =gTasks lsls r0, r1, 2 adds r0, r1 lsls r0, 3 @@ -4514,7 +4514,7 @@ sub_808563C: @ 808563C bx r0 .align 2, 0 _08085664: .4byte gUnknown_83CC0E0 -_08085668: .4byte gUnknown_3005090 +_08085668: .4byte gTasks thumb_func_end sub_808563C thumb_func_start sub_808566C @@ -5003,7 +5003,7 @@ sub_8085A24: @ 8085A24 lsls r1, 24 lsrs r1, 24 ldr r3, _08085A4C @ =gUnknown_83CC0F0 - ldr r2, _08085A50 @ =gUnknown_3005090 + ldr r2, _08085A50 @ =gTasks lsls r0, r1, 2 adds r0, r1 lsls r0, 3 @@ -5018,7 +5018,7 @@ sub_8085A24: @ 8085A24 bx r0 .align 2, 0 _08085A4C: .4byte gUnknown_83CC0F0 -_08085A50: .4byte gUnknown_3005090 +_08085A50: .4byte gTasks thumb_func_end sub_8085A24 thumb_func_start sub_8085A54 @@ -5175,7 +5175,7 @@ sub_8085B78: @ 8085B78 lsls r1, 24 lsrs r1, 24 ldr r3, _08085BA0 @ =gUnknown_83CC0F8 - ldr r2, _08085BA4 @ =gUnknown_3005090 + ldr r2, _08085BA4 @ =gTasks lsls r0, r1, 2 adds r0, r1 lsls r0, 3 @@ -5190,7 +5190,7 @@ sub_8085B78: @ 8085B78 bx r0 .align 2, 0 _08085BA0: .4byte gUnknown_83CC0F8 -_08085BA4: .4byte gUnknown_3005090 +_08085BA4: .4byte gTasks thumb_func_end sub_8085B78 thumb_func_start sub_8085BA8 @@ -5470,7 +5470,7 @@ sub_8085DDC: @ 8085DDC lsls r1, 24 lsrs r1, 24 ldr r3, _08085E04 @ =gUnknown_83CC110 - ldr r2, _08085E08 @ =gUnknown_3005090 + ldr r2, _08085E08 @ =gTasks lsls r0, r1, 2 adds r0, r1 lsls r0, 3 @@ -5485,7 +5485,7 @@ sub_8085DDC: @ 8085DDC bx r0 .align 2, 0 _08085E04: .4byte gUnknown_83CC110 -_08085E08: .4byte gUnknown_3005090 +_08085E08: .4byte gTasks thumb_func_end sub_8085DDC thumb_func_start sub_8085E0C @@ -5782,7 +5782,7 @@ _0808604A: ldr r1, [r2, 0x4] ldr r2, [r2, 0x8] bl sub_8086860 - ldr r2, _08086080 @ =gUnknown_3005090 + ldr r2, _08086080 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -5797,7 +5797,7 @@ _0808604A: .align 2, 0 _08086078: .4byte sub_8086468 _0808607C: .4byte gUnknown_20386E0 -_08086080: .4byte gUnknown_3005090 +_08086080: .4byte gTasks thumb_func_end FldEff_FieldMoveShowMon thumb_func_start FldEff_FieldMoveShowMonInit @@ -5850,7 +5850,7 @@ sub_80860E0: @ 80860E0 lsls r1, 24 lsrs r1, 24 ldr r3, _08086108 @ =gUnknown_83CC11C - ldr r2, _0808610C @ =gUnknown_3005090 + ldr r2, _0808610C @ =gTasks lsls r0, r1, 2 adds r0, r1 lsls r0, 3 @@ -5865,7 +5865,7 @@ sub_80860E0: @ 80860E0 bx r0 .align 2, 0 _08086108: .4byte gUnknown_83CC11C -_0808610C: .4byte gUnknown_3005090 +_0808610C: .4byte gTasks thumb_func_end sub_80860E0 thumb_func_start sub_8086110 @@ -6224,7 +6224,7 @@ sub_80863C0: @ 80863C0 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _08086424 @ =gUnknown_3005090 + ldr r0, _08086424 @ =gTasks adds r4, r0 adds r0, r4, 0 adds r0, 0x22 @@ -6256,7 +6256,7 @@ sub_80863C0: @ 80863C0 bx r0 .align 2, 0 _08086420: .4byte sub_80860E0 -_08086424: .4byte gUnknown_3005090 +_08086424: .4byte gTasks thumb_func_end sub_80863C0 thumb_func_start sub_8086428 @@ -6300,7 +6300,7 @@ sub_8086468: @ 8086468 lsls r1, 24 lsrs r1, 24 ldr r3, _08086490 @ =gUnknown_83CC138 - ldr r2, _08086494 @ =gUnknown_3005090 + ldr r2, _08086494 @ =gTasks lsls r0, r1, 2 adds r0, r1 lsls r0, 3 @@ -6315,7 +6315,7 @@ sub_8086468: @ 8086468 bx r0 .align 2, 0 _08086490: .4byte gUnknown_83CC138 -_08086494: .4byte gUnknown_3005090 +_08086494: .4byte gTasks thumb_func_end sub_8086468 thumb_func_start sub_8086498 @@ -6608,7 +6608,7 @@ sub_80866E0: @ 80866E0 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _08086724 @ =gUnknown_3005090 + ldr r0, _08086724 @ =gTasks adds r4, r0 adds r0, r4, 0 adds r0, 0x22 @@ -6628,7 +6628,7 @@ sub_80866E0: @ 80866E0 bx r0 .align 2, 0 _08086720: .4byte sub_8086468 -_08086724: .4byte gUnknown_3005090 +_08086724: .4byte gTasks thumb_func_end sub_80866E0 thumb_func_start sub_8086728 @@ -6940,7 +6940,7 @@ sub_8086944: @ 8086944 bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _08086984 @ =gUnknown_3005090 + ldr r2, _08086984 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -6963,7 +6963,7 @@ _08086978: bx r1 .align 2, 0 _08086980: .4byte sub_8086990 -_08086984: .4byte gUnknown_3005090 +_08086984: .4byte gTasks _08086988: .4byte gUnknown_20386E0 _0808698C: .4byte 0x00000131 thumb_func_end sub_8086944 @@ -6975,7 +6975,7 @@ sub_8086990: @ 8086990 lsls r1, 24 lsrs r1, 24 ldr r3, _080869B8 @ =gUnknown_83CC154 - ldr r2, _080869BC @ =gUnknown_3005090 + ldr r2, _080869BC @ =gTasks lsls r0, r1, 2 adds r0, r1 lsls r0, 3 @@ -6990,7 +6990,7 @@ sub_8086990: @ 8086990 bx r0 .align 2, 0 _080869B8: .4byte gUnknown_83CC154 -_080869BC: .4byte gUnknown_3005090 +_080869BC: .4byte gTasks thumb_func_end sub_8086990 thumb_func_start sub_80869C0 @@ -7253,7 +7253,7 @@ sub_8086BD0: @ 8086BD0 lsls r1, 24 lsrs r1, 24 ldr r3, _08086BF8 @ =gUnknown_83CC168 - ldr r2, _08086BFC @ =gUnknown_3005090 + ldr r2, _08086BFC @ =gTasks lsls r0, r1, 2 adds r0, r1 lsls r0, 3 @@ -7268,7 +7268,7 @@ sub_8086BD0: @ 8086BD0 bx r0 .align 2, 0 _08086BF8: .4byte gUnknown_83CC168 -_08086BFC: .4byte gUnknown_3005090 +_08086BFC: .4byte gTasks thumb_func_end sub_8086BD0 thumb_func_start sub_8086C00 @@ -7545,7 +7545,7 @@ FldEff_UseFly: @ 8086E10 bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _08086E38 @ =gUnknown_3005090 + ldr r2, _08086E38 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -7558,7 +7558,7 @@ FldEff_UseFly: @ 8086E10 bx r1 .align 2, 0 _08086E34: .4byte sub_8086E40 -_08086E38: .4byte gUnknown_3005090 +_08086E38: .4byte gTasks _08086E3C: .4byte gUnknown_20386E0 thumb_func_end FldEff_UseFly @@ -7569,7 +7569,7 @@ sub_8086E40: @ 8086E40 lsls r1, 24 lsrs r1, 24 ldr r3, _08086E68 @ =gUnknown_83CC178 - ldr r2, _08086E6C @ =gUnknown_3005090 + ldr r2, _08086E6C @ =gTasks lsls r0, r1, 2 adds r0, r1 lsls r0, 3 @@ -7584,7 +7584,7 @@ sub_8086E40: @ 8086E40 bx r0 .align 2, 0 _08086E68: .4byte gUnknown_83CC178 -_08086E6C: .4byte gUnknown_3005090 +_08086E6C: .4byte gTasks thumb_func_end sub_8086E40 thumb_func_start sub_8086E70 @@ -8403,7 +8403,7 @@ sub_8087498: @ 8087498 lsls r1, 24 lsrs r1, 24 ldr r3, _080874C0 @ =gUnknown_83CC1D4 - ldr r2, _080874C4 @ =gUnknown_3005090 + ldr r2, _080874C4 @ =gTasks lsls r0, r1, 2 adds r0, r1 lsls r0, 3 @@ -8418,7 +8418,7 @@ sub_8087498: @ 8087498 bx r0 .align 2, 0 _080874C0: .4byte gUnknown_83CC1D4 -_080874C4: .4byte gUnknown_3005090 +_080874C4: .4byte gTasks thumb_func_end sub_8087498 thumb_func_start sub_80874C8 @@ -9018,7 +9018,7 @@ sub_8087924: @ 8087924 bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r1, _080879D0 @ =gUnknown_3005090 + ldr r1, _080879D0 @ =gTasks lsls r2, r0, 2 adds r2, r0 lsls r2, 3 @@ -9057,7 +9057,7 @@ _080879BA: _080879C4: .4byte gUnknown_20386E0 _080879C8: .4byte gUnknown_2036E38 _080879CC: .4byte sub_80879D8 -_080879D0: .4byte gUnknown_3005090 +_080879D0: .4byte gTasks _080879D4: .4byte gSprites thumb_func_end sub_8087924 @@ -9069,7 +9069,7 @@ sub_80879D8: @ 80879D8 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 - ldr r1, _08087A04 @ =gUnknown_3005098 + ldr r1, _08087A04 @ =gTasks+0x8 adds r5, r0, r1 movs r0, 0x2 ldrsh r1, [r5, r0] @@ -9086,7 +9086,7 @@ sub_80879D8: @ 80879D8 beq _08087A4A b _08087AA8 .align 2, 0 -_08087A04: .4byte gUnknown_3005098 +_08087A04: .4byte gTasks+0x8 _08087A08: .4byte gSprites _08087A0C: ldrh r0, [r6, 0x20] @@ -9190,7 +9190,7 @@ sub_8087AB4: @ 8087AB4 bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _08087B00 @ =gUnknown_3005090 + ldr r2, _08087B00 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -9208,7 +9208,7 @@ sub_8087AB4: @ 8087AB4 .align 2, 0 _08087AF8: .4byte gUnknown_20386E0 _08087AFC: .4byte sub_8087BC0 -_08087B00: .4byte gUnknown_3005090 +_08087B00: .4byte gTasks _08087B04: movs r0, 0x44 bl FieldEffectActiveListRemove @@ -9228,7 +9228,7 @@ sub_8087B14: @ 8087B14 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _08087B4C @ =gUnknown_3005098 + ldr r1, _08087B4C @ =gTasks+0x8 adds r4, r0, r1 movs r1, 0xE ldrsh r0, [r4, r1] @@ -9251,7 +9251,7 @@ sub_8087B14: @ 8087B14 subs r0, r1, 0x1 b _08087B52 .align 2, 0 -_08087B4C: .4byte gUnknown_3005098 +_08087B4C: .4byte gTasks+0x8 _08087B50: movs r0, 0x4 _08087B52: @@ -9303,7 +9303,7 @@ _08087BA0: sub_8087BA8: @ 8087BA8 lsls r0, 24 lsrs r0, 24 - ldr r2, _08087BBC @ =gUnknown_3005090 + ldr r2, _08087BBC @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -9312,7 +9312,7 @@ sub_8087BA8: @ 8087BA8 strh r0, [r1, 0x16] bx lr .align 2, 0 -_08087BBC: .4byte gUnknown_3005090 +_08087BBC: .4byte gTasks thumb_func_end sub_8087BA8 thumb_func_start sub_8087BC0 @@ -9324,7 +9324,7 @@ sub_8087BC0: @ 8087BC0 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 - ldr r0, _08087BF8 @ =gUnknown_3005098 + ldr r0, _08087BF8 @ =gTasks+0x8 adds r4, r0 bl InstallCameraPanAheadCallback movs r0, 0 @@ -9342,7 +9342,7 @@ sub_8087BC0: @ 8087BC0 pop {r0} bx r0 .align 2, 0 -_08087BF8: .4byte gUnknown_3005098 +_08087BF8: .4byte gTasks+0x8 _08087BFC: .4byte gUnknown_83CC244 thumb_func_end sub_8087BC0 diff --git a/asm/field_fadetransition.s b/asm/field_fadetransition.s index 7b63386b2..1b3aaf9d3 100644 --- a/asm/field_fadetransition.s +++ b/asm/field_fadetransition.s @@ -310,7 +310,7 @@ task_mpl_807DD60: @ 807DD60 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r2, _0807DD84 @ =gUnknown_3005090 + ldr r2, _0807DD84 @ =gTasks adds r4, r0, r2 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -322,7 +322,7 @@ task_mpl_807DD60: @ 807DD60 beq _0807DD8E b _0807DDCA .align 2, 0 -_0807DD84: .4byte gUnknown_3005090 +_0807DD84: .4byte gTasks _0807DD88: cmp r0, 0x2 beq _0807DDB8 @@ -385,7 +385,7 @@ sub_807DDF0: @ 807DDF0 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0807DE14 @ =gUnknown_3005090 + ldr r1, _0807DE14 @ =gTasks adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -397,7 +397,7 @@ sub_807DDF0: @ 807DDF0 beq _0807DE1E b _0807DE50 .align 2, 0 -_0807DE14: .4byte gUnknown_3005090 +_0807DE14: .4byte gTasks _0807DE18: cmp r0, 0x2 beq _0807DE3A @@ -610,7 +610,7 @@ sub_807DFBC: @ 807DFBC lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0807DFF8 @ =gUnknown_3005090 + ldr r1, _0807DFF8 @ =gTasks adds r4, r0, r1 adds r6, r4, 0 adds r6, 0xC @@ -636,7 +636,7 @@ _0807DFEC: ldr r0, [r0] mov pc, r0 .align 2, 0 -_0807DFF8: .4byte gUnknown_3005090 +_0807DFF8: .4byte gTasks _0807DFFC: .4byte _0807E000 .align 2, 0 _0807E000: @@ -879,7 +879,7 @@ task_map_chg_seq_0807E20C: @ 807E20C lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _0807E238 @ =gUnknown_3005090 + ldr r1, _0807E238 @ =gTasks adds r5, r0, r1 adds r6, r5, 0 adds r6, 0xC @@ -895,7 +895,7 @@ task_map_chg_seq_0807E20C: @ 807E20C beq _0807E246 b _0807E2C6 .align 2, 0 -_0807E238: .4byte gUnknown_3005090 +_0807E238: .4byte gTasks _0807E23C: cmp r0, 0x2 beq _0807E2A8 @@ -967,7 +967,7 @@ task_map_chg_seq_0807E2CC: @ 807E2CC push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _0807E2EC @ =gUnknown_3005090 + ldr r1, _0807E2EC @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -980,7 +980,7 @@ task_map_chg_seq_0807E2CC: @ 807E2CC beq _0807E300 b _0807E316 .align 2, 0 -_0807E2EC: .4byte gUnknown_3005090 +_0807E2EC: .4byte gTasks _0807E2F0: bl player_bitmagic bl ScriptContext2_Enable @@ -1007,7 +1007,7 @@ sub_807E31C: @ 807E31C push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _0807E33C @ =gUnknown_3005090 + ldr r1, _0807E33C @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -1020,7 +1020,7 @@ sub_807E31C: @ 807E31C beq _0807E354 b _0807E372 .align 2, 0 -_0807E33C: .4byte gUnknown_3005090 +_0807E33C: .4byte gTasks _0807E340: bl player_bitmagic bl ScriptContext2_Enable @@ -1212,7 +1212,7 @@ sub_807E4A0: @ 807E4A0 bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _0807E4D8 @ =gUnknown_3005090 + ldr r2, _0807E4D8 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -1225,7 +1225,7 @@ sub_807E4A0: @ 807E4A0 bx r0 .align 2, 0 _0807E4D4: .4byte sub_807E980 -_0807E4D8: .4byte gUnknown_3005090 +_0807E4D8: .4byte gTasks thumb_func_end sub_807E4A0 thumb_func_start sub_807E4DC @@ -1377,7 +1377,7 @@ sub_807E5EC: @ 807E5EC lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0807E610 @ =gUnknown_3005090 + ldr r1, _0807E610 @ =gTasks adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -1389,7 +1389,7 @@ sub_807E5EC: @ 807E5EC beq _0807E61A b _0807E64A .align 2, 0 -_0807E610: .4byte gUnknown_3005090 +_0807E610: .4byte gTasks _0807E614: cmp r0, 0x2 beq _0807E63A @@ -1449,7 +1449,7 @@ sub_807E678: @ 807E678 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0807E69C @ =gUnknown_3005098 + ldr r1, _0807E69C @ =gTasks+0x8 adds r4, r0, r1 movs r1, 0 ldrsh r0, [r4, r1] @@ -1461,7 +1461,7 @@ sub_807E678: @ 807E678 beq _0807E6A6 b _0807E6F4 .align 2, 0 -_0807E69C: .4byte gUnknown_3005098 +_0807E69C: .4byte gTasks+0x8 _0807E6A0: cmp r0, 0x2 beq _0807E6DC @@ -1528,7 +1528,7 @@ sub_807E718: @ 807E718 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0807E73C @ =gUnknown_3005090 + ldr r1, _0807E73C @ =gTasks adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -1540,7 +1540,7 @@ sub_807E718: @ 807E718 beq _0807E746 b _0807E77A .align 2, 0 -_0807E73C: .4byte gUnknown_3005090 +_0807E73C: .4byte gTasks _0807E740: cmp r0, 0x2 beq _0807E76A @@ -1584,7 +1584,7 @@ sub_807E784: @ 807E784 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0807E7A8 @ =gUnknown_3005090 + ldr r1, _0807E7A8 @ =gTasks adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -1596,7 +1596,7 @@ sub_807E784: @ 807E784 beq _0807E7B6 b _0807E802 .align 2, 0 -_0807E7A8: .4byte gUnknown_3005090 +_0807E7A8: .4byte gTasks _0807E7AC: cmp r0, 0x2 beq _0807E7D8 @@ -1651,7 +1651,7 @@ sub_807E80C: @ 807E80C lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0807E83C @ =gUnknown_3005090 + ldr r0, _0807E83C @ =gTasks adds r5, r1, r0 adds r4, r5, 0 adds r4, 0xC @@ -1670,7 +1670,7 @@ _0807E830: ldr r0, [r0] mov pc, r0 .align 2, 0 -_0807E83C: .4byte gUnknown_3005090 +_0807E83C: .4byte gTasks _0807E840: .4byte _0807E844 .align 2, 0 _0807E844: @@ -1829,7 +1829,7 @@ sub_807E980: @ 807E980 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _0807E9C0 @ =gUnknown_3005098 + ldr r1, _0807E9C0 @ =gTasks+0x8 adds r5, r0, r1 ldr r2, _0807E9C4 @ =gUnknown_2037078 ldrb r1, [r2, 0x5] @@ -1854,7 +1854,7 @@ sub_807E980: @ 807E980 beq _0807E9DA b _0807EA9A .align 2, 0 -_0807E9C0: .4byte gUnknown_3005098 +_0807E9C0: .4byte gTasks+0x8 _0807E9C4: .4byte gUnknown_2037078 _0807E9C8: .4byte gUnknown_2036E38 _0807E9CC: .4byte gSprites @@ -2169,7 +2169,7 @@ sub_807EC34: @ 807EC34 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _0807EC6C @ =gUnknown_3005098 + ldr r1, _0807EC6C @ =gTasks+0x8 adds r5, r0, r1 movs r1, 0 ldrsh r0, [r5, r1] @@ -2186,7 +2186,7 @@ sub_807EC34: @ 807EC34 bl DestroyTask b _0807ECB2 .align 2, 0 -_0807EC6C: .4byte gUnknown_3005098 +_0807EC6C: .4byte gTasks+0x8 _0807EC70: bl sub_8055DC4 bl pal_fill_for_maplights diff --git a/asm/field_message_box.s b/asm/field_message_box.s index 13e81b7cc..78a5f8c8c 100644 --- a/asm/field_message_box.s +++ b/asm/field_message_box.s @@ -35,7 +35,7 @@ sub_8069370: @ 8069370 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _08069394 @ =gUnknown_3005090 + ldr r1, _08069394 @ =gTasks adds r5, r0, r1 movs r1, 0x8 ldrsh r0, [r5, r1] @@ -47,7 +47,7 @@ sub_8069370: @ 8069370 beq _0806939E b _08069402 .align 2, 0 -_08069394: .4byte gUnknown_3005090 +_08069394: .4byte gTasks _08069398: cmp r0, 0x2 beq _080693EA diff --git a/asm/field_player_avatar.s b/asm/field_player_avatar.s index 927a8881a..93a13f293 100644 --- a/asm/field_player_avatar.s +++ b/asm/field_player_avatar.s @@ -3445,7 +3445,7 @@ task_add_bump_boulder: @ 805CCD0 bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _0805CD08 @ =gUnknown_3005090 + ldr r2, _0805CD08 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -3458,7 +3458,7 @@ task_add_bump_boulder: @ 805CCD0 bx r0 .align 2, 0 _0805CD04: .4byte taskFF_bump_boulder -_0805CD08: .4byte gUnknown_3005090 +_0805CD08: .4byte gTasks thumb_func_end task_add_bump_boulder thumb_func_start taskFF_bump_boulder @@ -3467,7 +3467,7 @@ taskFF_bump_boulder: @ 805CD0C lsls r0, 24 lsrs r0, 24 ldr r6, _0805CD54 @ =gUnknown_835B8A0 - ldr r2, _0805CD58 @ =gUnknown_3005090 + ldr r2, _0805CD58 @ =gTasks ldr r5, _0805CD5C @ =gUnknown_2036E38 lsls r1, r0, 2 adds r1, r0 @@ -3501,7 +3501,7 @@ _0805CD20: bx r0 .align 2, 0 _0805CD54: .4byte gUnknown_835B8A0 -_0805CD58: .4byte gUnknown_3005090 +_0805CD58: .4byte gTasks _0805CD5C: .4byte gUnknown_2036E38 _0805CD60: .4byte gUnknown_2037078 thumb_func_end taskFF_bump_boulder @@ -3662,7 +3662,7 @@ sub_805CEA0: @ 805CEA0 lsls r0, 24 lsrs r0, 24 ldr r5, _0805CEDC @ =gUnknown_835B8AC - ldr r2, _0805CEE0 @ =gUnknown_3005090 + ldr r2, _0805CEE0 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -3690,7 +3690,7 @@ _0805CEB2: bx r0 .align 2, 0 _0805CEDC: .4byte gUnknown_835B8AC -_0805CEE0: .4byte gUnknown_3005090 +_0805CEE0: .4byte gTasks _0805CEE4: .4byte gUnknown_2037078 _0805CEE8: .4byte gUnknown_2036E38 thumb_func_end sub_805CEA0 @@ -3770,7 +3770,7 @@ sub_805CF78: @ 805CF78 lsls r0, 24 lsrs r0, 24 ldr r5, _0805CFB4 @ =gUnknown_835B8B0 - ldr r2, _0805CFB8 @ =gUnknown_3005090 + ldr r2, _0805CFB8 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -3798,7 +3798,7 @@ _0805CF8A: bx r0 .align 2, 0 _0805CFB4: .4byte gUnknown_835B8B0 -_0805CFB8: .4byte gUnknown_3005090 +_0805CFB8: .4byte gTasks _0805CFBC: .4byte gUnknown_2037078 _0805CFC0: .4byte gUnknown_2036E38 thumb_func_end sub_805CF78 @@ -3982,7 +3982,7 @@ sub_805D0F8: @ 805D0F8 bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _0805D150 @ =gUnknown_3005090 + ldr r2, _0805D150 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -3995,7 +3995,7 @@ sub_805D0F8: @ 805D0F8 .align 2, 0 _0805D148: .4byte gUnknown_2037078 _0805D14C: .4byte taskFF_0805D1D4 -_0805D150: .4byte gUnknown_3005090 +_0805D150: .4byte gTasks thumb_func_end sub_805D0F8 thumb_func_start sub_805D154 @@ -4021,7 +4021,7 @@ sub_805D154: @ 805D154 bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _0805D1A4 @ =gUnknown_3005090 + ldr r2, _0805D1A4 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -4034,7 +4034,7 @@ sub_805D154: @ 805D154 .align 2, 0 _0805D19C: .4byte gUnknown_2037078 _0805D1A0: .4byte taskFF_0805D1D4 -_0805D1A4: .4byte gUnknown_3005090 +_0805D1A4: .4byte gTasks thumb_func_end sub_805D154 thumb_func_start sub_805D1A8 @@ -4086,7 +4086,7 @@ _0805D200: ldrb r0, [r5, 0x1A] movs r1, 0x2 bl sub_80DC44C - ldr r0, _0805D238 @ =gUnknown_3005090 + ldr r0, _0805D238 @ =gTasks lsls r4, r6, 2 adds r4, r6 lsls r4, 3 @@ -4107,7 +4107,7 @@ _0805D228: .align 2, 0 _0805D230: .4byte gUnknown_2037078 _0805D234: .4byte gUnknown_2036E38 -_0805D238: .4byte gUnknown_3005090 +_0805D238: .4byte gTasks _0805D23C: .4byte sub_805D240 thumb_func_end taskFF_0805D1D4 @@ -4180,7 +4180,7 @@ sub_805D2C0: @ 805D2C0 bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _0805D300 @ =gUnknown_3005090 + ldr r2, _0805D300 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -4198,7 +4198,7 @@ _0805D2F4: bx r0 .align 2, 0 _0805D2FC: .4byte sub_805D304 -_0805D300: .4byte gUnknown_3005090 +_0805D300: .4byte gTasks thumb_func_end sub_805D2C0 thumb_func_start sub_805D304 @@ -4207,7 +4207,7 @@ sub_805D304: @ 805D304 lsls r0, 24 lsrs r0, 24 ldr r5, _0805D334 @ =gUnknown_835B8CC - ldr r2, _0805D338 @ =gUnknown_3005090 + ldr r2, _0805D338 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -4228,7 +4228,7 @@ _0805D316: bx r0 .align 2, 0 _0805D334: .4byte gUnknown_835B8CC -_0805D338: .4byte gUnknown_3005090 +_0805D338: .4byte gTasks thumb_func_end sub_805D304 thumb_func_start sub_805D33C @@ -5258,7 +5258,7 @@ sub_805DB04: @ 805DB04 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _0805DB54 @ =gUnknown_3005098 + ldr r1, _0805DB54 @ =gTasks+0x8 adds r5, r0, r1 movs r0, 0 ldrsh r6, [r5, r0] @@ -5273,7 +5273,7 @@ sub_805DB04: @ 805DB04 _0805DB48: .4byte gUnknown_2037078 _0805DB4C: .4byte gUnknown_2036E38 _0805DB50: .4byte gSprites -_0805DB54: .4byte gUnknown_3005098 +_0805DB54: .4byte gTasks+0x8 _0805DB58: cmp r6, 0x2 beq _0805DBF4 @@ -5418,7 +5418,7 @@ sub_805DC38: @ 805DC38 lsls r0, r1, 2 add r0, r8 lsls r0, 3 - ldr r1, _0805DC8C @ =gUnknown_3005098 + ldr r1, _0805DC8C @ =gTasks+0x8 adds r5, r0, r1 movs r2, 0 ldrsh r6, [r5, r2] @@ -5433,7 +5433,7 @@ sub_805DC38: @ 805DC38 _0805DC80: .4byte gUnknown_2037078 _0805DC84: .4byte gUnknown_2036E38 _0805DC88: .4byte gSprites -_0805DC8C: .4byte gUnknown_3005098 +_0805DC8C: .4byte gTasks+0x8 _0805DC90: cmp r6, 0x2 beq _0805DD58 diff --git a/asm/field_poison.s b/asm/field_poison.s index b3fb6132d..348812b06 100644 --- a/asm/field_poison.s +++ b/asm/field_poison.s @@ -141,7 +141,7 @@ Task_WhiteOut: @ 80A054C lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080A0570 @ =gUnknown_3005098 + ldr r1, _080A0570 @ =gTasks+0x8 adds r4, r0, r1 movs r1, 0 ldrsh r0, [r4, r1] @@ -153,7 +153,7 @@ Task_WhiteOut: @ 80A054C beq _080A057A b _080A05F6 .align 2, 0 -_080A0570: .4byte gUnknown_3005098 +_080A0570: .4byte gTasks+0x8 _080A0574: cmp r0, 0x2 beq _080A05B8 diff --git a/asm/field_screen_effect.s b/asm/field_screen_effect.s index d67cfc42a..2a6ee5c65 100644 --- a/asm/field_screen_effect.s +++ b/asm/field_screen_effect.s @@ -117,7 +117,7 @@ sub_807EEB8: @ 807EEB8 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0807EEDC @ =gUnknown_3005098 + ldr r1, _0807EEDC @ =gTasks+0x8 adds r4, r0, r1 movs r1, 0 ldrsh r0, [r4, r1] @@ -129,7 +129,7 @@ sub_807EEB8: @ 807EEB8 beq _0807EEE6 b _0807EF76 .align 2, 0 -_0807EEDC: .4byte gUnknown_3005098 +_0807EEDC: .4byte gTasks+0x8 _0807EEE0: cmp r0, 0x2 beq _0807EF6C @@ -270,7 +270,7 @@ sub_807EFC8: @ 807EFC8 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _0807F010 @ =gUnknown_3005098 + ldr r1, _0807F010 @ =gTasks+0x8 adds r1, r0, r1 strh r5, [r1, 0x6] strh r4, [r1, 0x8] @@ -285,7 +285,7 @@ sub_807EFC8: @ 807EFC8 b _0807F018 .align 2, 0 _0807F00C: .4byte sub_807EEB8 -_0807F010: .4byte gUnknown_3005098 +_0807F010: .4byte gTasks+0x8 _0807F014: negs r0, r7 strh r0, [r1, 0xA] @@ -409,7 +409,7 @@ sub_807F0EC: @ 807F0EC bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _0807F110 @ =gUnknown_3005090 + ldr r2, _0807F110 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -420,7 +420,7 @@ sub_807F0EC: @ 807F0EC bx r0 .align 2, 0 _0807F10C: .4byte sub_807F204 -_0807F110: .4byte gUnknown_3005090 +_0807F110: .4byte gTasks thumb_func_end sub_807F0EC thumb_func_start sub_807F114 @@ -431,7 +431,7 @@ sub_807F114: @ 807F114 bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _0807F138 @ =gUnknown_3005090 + ldr r2, _0807F138 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -442,7 +442,7 @@ sub_807F114: @ 807F114 bx r0 .align 2, 0 _0807F134: .4byte sub_807F204 -_0807F138: .4byte gUnknown_3005090 +_0807F138: .4byte gTasks thumb_func_end sub_807F114 thumb_func_start sub_807F13C @@ -453,7 +453,7 @@ sub_807F13C: @ 807F13C lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _0807F19C @ =gUnknown_3005098 + ldr r0, _0807F19C @ =gTasks+0x8 adds r4, r0 movs r0, 0 bl GetGpuReg @@ -486,7 +486,7 @@ sub_807F13C: @ 807F13C pop {r0} bx r0 .align 2, 0 -_0807F19C: .4byte gUnknown_3005098 +_0807F19C: .4byte gTasks+0x8 thumb_func_end sub_807F13C thumb_func_start sub_807F1A0 @@ -497,7 +497,7 @@ sub_807F1A0: @ 807F1A0 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _0807F200 @ =gUnknown_3005098 + ldr r0, _0807F200 @ =gTasks+0x8 adds r4, r0 ldrh r1, [r4] movs r0, 0 @@ -530,7 +530,7 @@ sub_807F1A0: @ 807F1A0 pop {r0} bx r0 .align 2, 0 -_0807F200: .4byte gUnknown_3005098 +_0807F200: .4byte gTasks+0x8 thumb_func_end sub_807F1A0 thumb_func_start sub_807F204 @@ -541,7 +541,7 @@ sub_807F204: @ 807F204 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _0807F228 @ =gUnknown_3005098 + ldr r1, _0807F228 @ =gTasks+0x8 adds r5, r0, r1 movs r1, 0x12 ldrsh r0, [r5, r1] @@ -553,7 +553,7 @@ sub_807F204: @ 807F204 beq _0807F236 b _0807F2F4 .align 2, 0 -_0807F228: .4byte gUnknown_3005098 +_0807F228: .4byte gTasks+0x8 _0807F22C: cmp r0, 0x2 beq _0807F2D0 @@ -657,7 +657,7 @@ sub_807F2FC: @ 807F2FC lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r4, _0807F348 @ =gUnknown_3005098 + ldr r4, _0807F348 @ =gTasks+0x8 adds r6, r0, r4 ldr r0, _0807F34C @ =sub_807F204 bl FindTaskIdByFunc @@ -684,7 +684,7 @@ sub_807F2FC: @ 807F2FC bl DestroyTask b _0807F39A .align 2, 0 -_0807F348: .4byte gUnknown_3005098 +_0807F348: .4byte gTasks+0x8 _0807F34C: .4byte sub_807F204 _0807F350: ldrh r0, [r6] @@ -749,7 +749,7 @@ sub_807F3A4: @ 807F3A4 lsls r3, 24 lsrs r3, 24 mov r9, r3 - ldr r2, _0807F3DC @ =gUnknown_3005090 + ldr r2, _0807F3DC @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -763,7 +763,7 @@ sub_807F3A4: @ 807F3A4 beq _0807F430 b _0807F448 .align 2, 0 -_0807F3DC: .4byte gUnknown_3005090 +_0807F3DC: .4byte gTasks _0807F3E0: adds r0, r7, 0 movs r1, 0 @@ -828,7 +828,7 @@ sub_807F45C: @ 807F45C push {r4-r7,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _0807F484 @ =gUnknown_3005090 + ldr r1, _0807F484 @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -846,7 +846,7 @@ _0807F478: ldr r0, [r0] mov pc, r0 .align 2, 0 -_0807F484: .4byte gUnknown_3005090 +_0807F484: .4byte gTasks _0807F488: .4byte _0807F48C .align 2, 0 _0807F48C: @@ -862,7 +862,7 @@ _0807F4A8: bl AddWindow lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _0807F51C @ =gUnknown_3005090 + ldr r1, _0807F51C @ =gTasks lsls r4, r6, 2 adds r0, r4, r6 lsls r0, 3 @@ -910,10 +910,10 @@ _0807F4A8: b _0807F5E4 .align 2, 0 _0807F518: .4byte gUnknown_83C68E4 -_0807F51C: .4byte gUnknown_3005090 +_0807F51C: .4byte gTasks _0807F520: .4byte gSaveBlock1Ptr _0807F524: - ldr r0, _0807F534 @ =gUnknown_3005090 + ldr r0, _0807F534 @ =gTasks adds r1, r4, r6 lsls r1, 3 adds r1, r0 @@ -921,7 +921,7 @@ _0807F524: strh r0, [r1, 0x8] b _0807F5E4 .align 2, 0 -_0807F534: .4byte gUnknown_3005090 +_0807F534: .4byte gTasks _0807F538: ldr r1, _0807F53C @ =gUnknown_841B554 b _0807F542 @@ -946,7 +946,7 @@ _0807F542: adds r0, r1 movs r1, 0x2 bl FieldObjectTurn - ldr r1, _0807F584 @ =gUnknown_3005090 + ldr r1, _0807F584 @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -959,7 +959,7 @@ _0807F542: _0807F578: .4byte gUnknown_841B5B6 _0807F57C: .4byte gUnknown_2037078 _0807F580: .4byte gUnknown_2036E38 -_0807F584: .4byte gUnknown_3005090 +_0807F584: .4byte gTasks _0807F588: lsls r4, r6, 2 adds r4, r6 @@ -1016,7 +1016,7 @@ sub_807F5F0: @ 807F5F0 bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _0807F61C @ =gUnknown_3005090 + ldr r2, _0807F61C @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -1027,7 +1027,7 @@ sub_807F5F0: @ 807F5F0 bx r0 .align 2, 0 _0807F618: .4byte sub_807F45C -_0807F61C: .4byte gUnknown_3005090 +_0807F61C: .4byte gTasks thumb_func_end sub_807F5F0 .align 2, 0 @ Don't pad with nop. diff --git a/asm/field_specials.s b/asm/field_specials.s index 6ab1b38c8..5132df30e 100644 --- a/asm/field_specials.s +++ b/asm/field_specials.s @@ -347,7 +347,7 @@ sub_80CA86C: @ 80CA86C bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080CA8A4 @ =gUnknown_3005090 + ldr r2, _080CA8A4 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -361,7 +361,7 @@ _080CA89A: bx r0 .align 2, 0 _080CA8A0: .4byte sub_80CA8A8 -_080CA8A4: .4byte gUnknown_3005090 +_080CA8A4: .4byte gTasks thumb_func_end sub_80CA86C thumb_func_start sub_80CA8A8 @@ -372,7 +372,7 @@ sub_80CA8A8: @ 80CA8A8 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080CA8F4 @ =gUnknown_3005098 + ldr r1, _080CA8F4 @ =gTasks+0x8 adds r4, r0, r1 movs r1, 0x2 ldrsh r0, [r4, r1] @@ -402,7 +402,7 @@ _080CA8E6: pop {r0} bx r0 .align 2, 0 -_080CA8F4: .4byte gUnknown_3005098 +_080CA8F4: .4byte gTasks+0x8 thumb_func_end sub_80CA8A8 thumb_func_start sub_80CA8F8 @@ -857,7 +857,7 @@ sub_80CAC28: @ 80CAC28 bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080CAC70 @ =gUnknown_3005090 + ldr r2, _080CAC70 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -884,7 +884,7 @@ sub_80CAC28: @ 80CAC28 bx r0 .align 2, 0 _080CAC6C: .4byte sub_80CAC84 -_080CAC70: .4byte gUnknown_3005090 +_080CAC70: .4byte gTasks _080CAC74: .4byte gUnknown_20370C2 _080CAC78: .4byte gUnknown_20370C4 _080CAC7C: .4byte gUnknown_20370C6 @@ -899,7 +899,7 @@ sub_80CAC84: @ 80CAC84 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080CACE4 @ =gUnknown_3005098 + ldr r1, _080CACE4 @ =gTasks+0x8 adds r4, r0, r1 ldrh r0, [r4, 0x2] adds r0, 0x1 @@ -938,7 +938,7 @@ _080CACDC: pop {r0} bx r0 .align 2, 0 -_080CACE4: .4byte gUnknown_3005098 +_080CACE4: .4byte gTasks+0x8 thumb_func_end sub_80CAC84 thumb_func_start sub_80CACE8 @@ -1948,7 +1948,7 @@ sub_80CB498: @ 80CB498 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080CB4D4 @ =gUnknown_3005098 + ldr r0, _080CB4D4 @ =gTasks+0x8 adds r4, r1, r0 movs r3, 0 strh r3, [r4, 0x2] @@ -1968,7 +1968,7 @@ sub_80CB498: @ 80CB498 b _080CB4E8 .align 2, 0 _080CB4D0: .4byte sub_80CB514 -_080CB4D4: .4byte gUnknown_3005098 +_080CB4D4: .4byte gTasks+0x8 _080CB4D8: .4byte gUnknown_20370C2 _080CB4DC: .4byte gUnknown_20370C4 _080CB4E0: @@ -2007,7 +2007,7 @@ sub_80CB514: @ 80CB514 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080CB57C @ =gUnknown_3005098 + ldr r1, _080CB57C @ =gTasks+0x8 adds r4, r0, r1 ldrh r0, [r4, 0x2] adds r0, 0x1 @@ -2048,7 +2048,7 @@ _080CB574: pop {r0} bx r0 .align 2, 0 -_080CB57C: .4byte gUnknown_3005098 +_080CB57C: .4byte gTasks+0x8 thumb_func_end sub_80CB514 thumb_func_start sub_80CB580 @@ -2170,7 +2170,7 @@ sub_80CB658: @ 80CB658 bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080CB6A4 @ =gUnknown_3005090 + ldr r2, _080CB6A4 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -2189,7 +2189,7 @@ _080CB698: bx r0 .align 2, 0 _080CB6A0: .4byte sub_80CB6AC -_080CB6A4: .4byte gUnknown_3005090 +_080CB6A4: .4byte gTasks _080CB6A8: .4byte gUnknown_83F5BC1 thumb_func_end sub_80CB658 @@ -2208,7 +2208,7 @@ sub_80CB6AC: @ 80CB6AC ldr r1, [sp] adds r0, r1 lsls r0, 3 - ldr r1, _080CB734 @ =gUnknown_3005098 + ldr r1, _080CB734 @ =gTasks+0x8 adds r6, r0, r1 movs r2, 0x2 ldrsh r0, [r6, r2] @@ -2264,7 +2264,7 @@ _080CB6F6: bls _080CB6E6 b _080CB78E .align 2, 0 -_080CB734: .4byte gUnknown_3005098 +_080CB734: .4byte gTasks+0x8 _080CB738: .4byte gUnknown_83F5B94 _080CB73C: movs r1, 0 @@ -2355,7 +2355,7 @@ _080CB7D6: lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080CB810 @ =gUnknown_3005090 + ldr r1, _080CB810 @ =gTasks adds r3, r0, r1 ldr r0, _080CB814 @ =gUnknown_20370C0 ldrh r4, [r0] @@ -2373,7 +2373,7 @@ _080CB7D6: .align 2, 0 _080CB808: .4byte sub_809D6D4 _080CB80C: .4byte sub_80CB904 -_080CB810: .4byte gUnknown_3005090 +_080CB810: .4byte gTasks _080CB814: .4byte gUnknown_20370C0 _080CB818: cmp r4, 0x5 @@ -2516,7 +2516,7 @@ sub_80CB904: @ 80CB904 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 - ldr r1, _080CB934 @ =gUnknown_3005090 + ldr r1, _080CB934 @ =gTasks adds r5, r0, r1 bl ScriptContext2_Enable ldr r0, _080CB938 @ =gUnknown_20370C0 @@ -2529,7 +2529,7 @@ sub_80CB904: @ 80CB904 strh r1, [r0] b _080CB94A .align 2, 0 -_080CB934: .4byte gUnknown_3005090 +_080CB934: .4byte gTasks _080CB938: .4byte gUnknown_20370C0 _080CB93C: .4byte gUnknown_2039A18 _080CB940: .4byte gUnknown_2039A0E @@ -2657,7 +2657,7 @@ _080CB9D2: lsrs r0, 24 movs r1, 0x3 bl CopyWindowToVram - ldr r1, _080CBA74 @ =gUnknown_3005090 + ldr r1, _080CBA74 @ =gTasks mov r2, r10 adds r0, r2, r7 lsls r0, 3 @@ -2678,7 +2678,7 @@ _080CBA64: .4byte gUnknown_2039A14 _080CBA68: .4byte gUnknown_83F5BCC _080CBA6C: .4byte gUnknown_20370C0 _080CBA70: .4byte gUnknown_3005360 -_080CBA74: .4byte gUnknown_3005090 +_080CBA74: .4byte gTasks _080CBA78: .4byte sub_80CBB28 thumb_func_end sub_80CB904 @@ -2745,7 +2745,7 @@ sub_80CBADC: @ 80CBADC lsls r0, r1, 2 adds r0, r1 lsls r0, 3 - ldr r1, _080CBB1C @ =gUnknown_3005090 + ldr r1, _080CBB1C @ =gTasks adds r0, r1 ldrh r0, [r0, 0x24] lsls r0, 24 @@ -2763,7 +2763,7 @@ _080CBB12: bx r0 .align 2, 0 _080CBB18: .4byte sub_80CBB28 -_080CBB1C: .4byte gUnknown_3005090 +_080CBB1C: .4byte gTasks _080CBB20: .4byte gUnknown_3005378 _080CBB24: .4byte gUnknown_2039A18 thumb_func_end sub_80CBADC @@ -2776,7 +2776,7 @@ sub_80CBB28: @ 80CBB28 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080CBB54 @ =gUnknown_3005090 + ldr r1, _080CBB54 @ =gTasks adds r6, r0, r1 ldrh r0, [r6, 0x24] lsls r0, 24 @@ -2792,7 +2792,7 @@ sub_80CBB28: @ 80CBB28 bne _080CBB6C b _080CBBA2 .align 2, 0 -_080CBB54: .4byte gUnknown_3005090 +_080CBB54: .4byte gTasks _080CBB58: ldr r1, _080CBB68 @ =gUnknown_20370D0 movs r0, 0x7F @@ -2845,7 +2845,7 @@ sub_80CBBAC: @ 80CBBAC lsls r4, r5, 2 adds r4, r5 lsls r4, 3 - ldr r0, _080CBC24 @ =gUnknown_3005090 + ldr r0, _080CBC24 @ =gTasks adds r4, r0 adds r0, r5, 0 bl sub_80CBD50 @@ -2888,7 +2888,7 @@ sub_80CBBAC: @ 80CBBAC pop {r0} bx r0 .align 2, 0 -_080CBC24: .4byte gUnknown_3005090 +_080CBC24: .4byte gTasks _080CBC28: .4byte gUnknown_2039A14 thumb_func_end sub_80CBBAC @@ -2897,7 +2897,7 @@ sub_80CBC2C: @ 80CBC2C push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080CBC54 @ =gUnknown_3005090 + ldr r2, _080CBC54 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -2916,7 +2916,7 @@ _080CBC50: pop {r0} bx r0 .align 2, 0 -_080CBC54: .4byte gUnknown_3005090 +_080CBC54: .4byte gTasks _080CBC58: .4byte sub_80CBC90 thumb_func_end sub_80CBC2C @@ -2934,7 +2934,7 @@ sub_80CBC5C: @ 80CBC5C .align 2, 0 _080CBC74: .4byte sub_80CBC2C _080CBC78: - ldr r0, _080CBC8C @ =gUnknown_3005090 + ldr r0, _080CBC8C @ =gTasks lsls r1, r2, 2 adds r1, r2 lsls r1, 3 @@ -2946,7 +2946,7 @@ _080CBC88: pop {r0} bx r0 .align 2, 0 -_080CBC8C: .4byte gUnknown_3005090 +_080CBC8C: .4byte gTasks thumb_func_end sub_80CBC5C thumb_func_start sub_80CBC90 @@ -2958,7 +2958,7 @@ sub_80CBC90: @ 80CBC90 bl ScriptContext2_Enable adds r0, r4, 0 bl sub_80CBCC0 - ldr r1, _080CBCB8 @ =gUnknown_3005090 + ldr r1, _080CBCB8 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -2969,7 +2969,7 @@ sub_80CBC90: @ 80CBC90 pop {r0} bx r0 .align 2, 0 -_080CBCB8: .4byte gUnknown_3005090 +_080CBCB8: .4byte gTasks _080CBCBC: .4byte sub_80CBB28 thumb_func_end sub_80CBC90 @@ -2982,7 +2982,7 @@ sub_80CBCC0: @ 80CBCC0 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080CBD44 @ =gUnknown_3005090 + ldr r0, _080CBD44 @ =gTasks adds r4, r1, r0 mov r1, sp ldr r0, _080CBD48 @ =gUnknown_83F5D1C @@ -3042,7 +3042,7 @@ _080CBD3C: pop {r0} bx r0 .align 2, 0 -_080CBD44: .4byte gUnknown_3005090 +_080CBD44: .4byte gTasks _080CBD48: .4byte gUnknown_83F5D1C _080CBD4C: .4byte gUnknown_2039A18 thumb_func_end sub_80CBCC0 @@ -3055,7 +3055,7 @@ sub_80CBD50: @ 80CBD50 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080CBD7C @ =gUnknown_3005090 + ldr r0, _080CBD7C @ =gTasks adds r2, r1, r0 movs r0, 0x8 ldrsh r1, [r2, r0] @@ -3071,7 +3071,7 @@ _080CBD76: pop {r0} bx r0 .align 2, 0 -_080CBD7C: .4byte gUnknown_3005090 +_080CBD7C: .4byte gTasks thumb_func_end sub_80CBD50 thumb_func_start sub_80CBD80 @@ -4642,7 +4642,7 @@ sub_80CC974: @ 80CC974 lsls r1, r0, 2 adds r1, r0 lsls r5, r1, 3 - ldr r6, _080CC9AC @ =gUnknown_3005098 + ldr r6, _080CC9AC @ =gTasks+0x8 adds r4, r5, r6 movs r0, 0x3 bl FlagGet @@ -4658,7 +4658,7 @@ sub_80CC974: @ 80CC974 b _080CCA08 .align 2, 0 _080CC9A8: .4byte sub_80CCA18 -_080CC9AC: .4byte gUnknown_3005098 +_080CC9AC: .4byte gTasks+0x8 _080CC9B0: .4byte sub_80CCAF4 _080CC9B4: ldr r0, _080CC9D8 @ =gSaveBlock1Ptr @@ -4715,7 +4715,7 @@ sub_80CCA18: @ 80CCA18 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080CCAA4 @ =gUnknown_3005098 + ldr r0, _080CCAA4 @ =gTasks+0x8 adds r4, r1, r0 ldr r0, _080CCAA8 @ =gUnknown_2037AB8 ldrb r1, [r0, 0x7] @@ -4778,7 +4778,7 @@ _080CCA78: bl LoadPalette b _080CCADE .align 2, 0 -_080CCAA4: .4byte gUnknown_3005098 +_080CCAA4: .4byte gTasks+0x8 _080CCAA8: .4byte gUnknown_2037AB8 _080CCAAC: .4byte gUnknown_2036E28 _080CCAB0: .4byte gSaveBlock1Ptr @@ -5687,7 +5687,7 @@ sub_80CD1CC: @ 80CD1CC lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080CD21C @ =gUnknown_3005098 + ldr r1, _080CD21C @ =gTasks+0x8 adds r4, r0, r1 ldrh r0, [r4, 0x2] adds r0, 0x1 @@ -5720,7 +5720,7 @@ _080CD214: pop {r0} bx r0 .align 2, 0 -_080CD21C: .4byte gUnknown_3005098 +_080CD21C: .4byte gTasks+0x8 _080CD220: .4byte gUnknown_20370C2 _080CD224: .4byte gUnknown_20370C0 thumb_func_end sub_80CD1CC diff --git a/asm/field_tasks.s b/asm/field_tasks.s index 7e19f99a3..88b65274f 100644 --- a/asm/field_tasks.s +++ b/asm/field_tasks.s @@ -10,7 +10,7 @@ task_per_step_callback_manager: @ 806E810 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _0806E834 @ =gUnknown_3005090 + ldr r2, _0806E834 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -25,7 +25,7 @@ task_per_step_callback_manager: @ 806E810 pop {r0} bx r0 .align 2, 0 -_0806E834: .4byte gUnknown_3005090 +_0806E834: .4byte gTasks _0806E838: .4byte gUnknown_83A7310 thumb_func_end task_per_step_callback_manager @@ -37,7 +37,7 @@ sub_806E83C: @ 806E83C lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0806E874 @ =gUnknown_3005098 + ldr r0, _0806E874 @ =gTasks+0x8 adds r4, r1, r0 bl ScriptContext2_IsEnabled lsls r0, 24 @@ -58,7 +58,7 @@ _0806E86C: pop {r0} bx r0 .align 2, 0 -_0806E874: .4byte gUnknown_3005098 +_0806E874: .4byte gTasks+0x8 _0806E878: .4byte gUnknown_203ADFA thumb_func_end sub_806E83C @@ -77,7 +77,7 @@ sub_806E87C: @ 806E87C bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _0806E8C8 @ =gUnknown_3005090 + ldr r2, _0806E8C8 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -99,7 +99,7 @@ _0806E8BC: bx r0 .align 2, 0 _0806E8C4: .4byte task_per_step_callback_manager -_0806E8C8: .4byte gUnknown_3005090 +_0806E8C8: .4byte gTasks _0806E8CC: .4byte sub_806E83C thumb_func_end sub_806E87C @@ -117,7 +117,7 @@ ActivatePerStepCallback: @ 806E8D0 lsls r0, r1, 2 adds r0, r1 lsls r0, 3 - ldr r1, _0806E90C @ =gUnknown_3005098 + ldr r1, _0806E90C @ =gTasks+0x8 adds r1, r0, r1 movs r2, 0 adds r0, r1, 0 @@ -134,7 +134,7 @@ _0806E8F4: b _0806E912 .align 2, 0 _0806E908: .4byte task_per_step_callback_manager -_0806E90C: .4byte gUnknown_3005098 +_0806E90C: .4byte gTasks+0x8 _0806E910: strh r4, [r1] _0806E912: @@ -159,7 +159,7 @@ wild_encounter_reset_coro_args: @ 806E918 lsls r0, r1, 2 adds r0, r1 lsls r0, 3 - ldr r1, _0806E950 @ =gUnknown_3005098 + ldr r1, _0806E950 @ =gTasks+0x8 adds r0, r1 movs r1, 0 strh r1, [r0, 0x2] @@ -170,7 +170,7 @@ _0806E942: .align 2, 0 _0806E948: .4byte task_per_step_callback_manager _0806E94C: .4byte sub_806E83C -_0806E950: .4byte gUnknown_3005098 +_0806E950: .4byte gTasks+0x8 thumb_func_end wild_encounter_reset_coro_args thumb_func_start nullsub_40 @@ -262,7 +262,7 @@ sub_806E9E0: @ 806E9E0 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0806EA04 @ =gUnknown_3005098 + ldr r0, _0806EA04 @ =gTasks+0x8 adds r5, r1, r0 movs r1, 0x2 ldrsh r0, [r5, r1] @@ -274,7 +274,7 @@ sub_806E9E0: @ 806E9E0 beq _0806EA12 b _0806EB42 .align 2, 0 -_0806EA04: .4byte gUnknown_3005098 +_0806EA04: .4byte gTasks+0x8 _0806EA08: cmp r0, 0x2 beq _0806EAB0 @@ -448,7 +448,7 @@ sub_806EB54: @ 806EB54 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0806EBD8 @ =gUnknown_3005098 + ldr r0, _0806EBD8 @ =gTasks+0x8 adds r5, r1, r0 mov r4, sp adds r4, 0x2 @@ -504,7 +504,7 @@ _0806EB8E: bl ash b _0806EBF6 .align 2, 0 -_0806EBD8: .4byte gUnknown_3005098 +_0806EBD8: .4byte gTasks+0x8 _0806EBDC: .4byte 0x0000020a _0806EBE0: .4byte 0x00000212 _0806EBE4: @@ -564,7 +564,7 @@ sub_806EC40: @ 806EC40 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0806ED10 @ =gUnknown_3005098 + ldr r0, _0806ED10 @ =gTasks+0x8 adds r5, r1, r0 mov r4, sp adds r4, 0x2 @@ -659,7 +659,7 @@ _0806ECF8: strh r0, [r5, 0xC] b _0806ED2E .align 2, 0 -_0806ED10: .4byte gUnknown_3005098 +_0806ED10: .4byte gTasks+0x8 _0806ED14: .4byte 0x00004030 _0806ED18: movs r2, 0xE diff --git a/asm/field_weather.s b/asm/field_weather.s index e0cb6c41d..8a3208f55 100644 --- a/asm/field_weather.s +++ b/asm/field_weather.s @@ -236,7 +236,7 @@ Task_WeatherInit: @ 8079DBC adds r0, r1 ldr r0, [r0] bl _call_via_r0 - ldr r1, _08079E04 @ =gUnknown_3005090 + ldr r1, _08079E04 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -250,7 +250,7 @@ _08079DF4: .align 2, 0 _08079DFC: .4byte gUnknown_2037F34 _08079E00: .4byte gUnknown_83C2BC0 -_08079E04: .4byte gUnknown_3005090 +_08079E04: .4byte gTasks _08079E08: .4byte Task_WeatherMain thumb_func_end Task_WeatherInit diff --git a/asm/field_weather_effects.s b/asm/field_weather_effects.s index 7e4f90209..fd9b2361a 100644 --- a/asm/field_weather_effects.s +++ b/asm/field_weather_effects.s @@ -546,7 +546,7 @@ task50_0807B6D4: @ 807B6D4 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0807B6F8 @ =gUnknown_3005090 + ldr r1, _0807B6F8 @ =gTasks adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -558,7 +558,7 @@ task50_0807B6D4: @ 807B6D4 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0807B6F8: .4byte gUnknown_3005090 +_0807B6F8: .4byte gTasks _0807B6FC: .4byte _0807B700 .align 2, 0 _0807B700: diff --git a/asm/fldeff_cut.s b/asm/fldeff_cut.s index 71ca8f080..697b80bd5 100644 --- a/asm/fldeff_cut.s +++ b/asm/fldeff_cut.s @@ -162,7 +162,7 @@ sub_80979A0: @ 80979A0 bl oei_task_add lsls r0, 24 lsrs r0, 24 - ldr r2, _080979C8 @ =gUnknown_3005090 + ldr r2, _080979C8 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -177,7 +177,7 @@ sub_80979A0: @ 80979A0 pop {r1} bx r1 .align 2, 0 -_080979C8: .4byte gUnknown_3005090 +_080979C8: .4byte gTasks _080979CC: .4byte sub_8097A20 thumb_func_end sub_80979A0 @@ -204,7 +204,7 @@ sub_80979F0: @ 80979F0 bl oei_task_add lsls r0, 24 lsrs r0, 24 - ldr r2, _08097A18 @ =gUnknown_3005090 + ldr r2, _08097A18 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -219,7 +219,7 @@ sub_80979F0: @ 80979F0 pop {r1} bx r1 .align 2, 0 -_08097A18: .4byte gUnknown_3005090 +_08097A18: .4byte gTasks _08097A1C: .4byte sub_8097C6C thumb_func_end sub_80979F0 diff --git a/asm/fldeff_flash.s b/asm/fldeff_flash.s index 2d45b81c5..8fc9af0e3 100644 --- a/asm/fldeff_flash.s +++ b/asm/fldeff_flash.s @@ -51,7 +51,7 @@ sub_80C9B74: @ 80C9B74 lsls r0, 24 lsrs r0, 24 str r0, [r1] - ldr r1, _080C9BA8 @ =gUnknown_3005090 + ldr r1, _080C9BA8 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -65,7 +65,7 @@ sub_80C9B74: @ 80C9B74 bx r0 .align 2, 0 _080C9BA4: .4byte gUnknown_20386E0 -_080C9BA8: .4byte gUnknown_3005090 +_080C9BA8: .4byte gTasks _080C9BAC: .4byte sub_80C9BB0 thumb_func_end sub_80C9B74 @@ -389,7 +389,7 @@ _080C9E2C: .4byte sub_80C9E30 sub_80C9E30: @ 80C9E30 lsls r0, 24 lsrs r0, 24 - ldr r2, _080C9E44 @ =gUnknown_3005090 + ldr r2, _080C9E44 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -398,7 +398,7 @@ sub_80C9E30: @ 80C9E30 str r0, [r1] bx lr .align 2, 0 -_080C9E44: .4byte gUnknown_3005090 +_080C9E44: .4byte gTasks _080C9E48: .4byte sub_80C9E4C thumb_func_end sub_80C9E30 @@ -441,7 +441,7 @@ sub_80C9E4C: @ 80C9E4C lsls r1, 5 movs r0, 0 bl SetGpuReg - ldr r1, _080C9EE8 @ =gUnknown_3005090 + ldr r1, _080C9EE8 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -464,7 +464,7 @@ _080C9ED8: .4byte gUnknown_83F5804 _080C9EDC: .4byte gUnknown_83F5854 _080C9EE0: .4byte 0x00003e41 _080C9EE4: .4byte 0x00001f0c -_080C9EE8: .4byte gUnknown_3005090 +_080C9EE8: .4byte gTasks _080C9EEC: .4byte sub_80C9EF0 thumb_func_end sub_80C9E4C @@ -473,7 +473,7 @@ sub_80C9EF0: @ 80C9EF0 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080C9F20 @ =gUnknown_3005090 + ldr r2, _080C9F20 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -493,7 +493,7 @@ sub_80C9EF0: @ 80C9EF0 strh r0, [r5, 0xA] b _080C9F2C .align 2, 0 -_080C9F20: .4byte gUnknown_3005090 +_080C9F20: .4byte gTasks _080C9F24: movs r0, 0 strh r0, [r5, 0xC] @@ -516,7 +516,7 @@ sub_80C9F38: @ 80C9F38 ldr r1, _080C9F74 @ =0x00001010 movs r0, 0x52 bl SetGpuReg - ldr r1, _080C9F78 @ =gUnknown_3005090 + ldr r1, _080C9F78 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -538,7 +538,7 @@ sub_80C9F38: @ 80C9F38 b _080C9F92 .align 2, 0 _080C9F74: .4byte 0x00001010 -_080C9F78: .4byte gUnknown_3005090 +_080C9F78: .4byte gTasks _080C9F7C: .4byte gUnknown_83F5854 _080C9F80: ldr r0, _080C9F98 @ =gUnknown_83F5804 @@ -563,7 +563,7 @@ sub_80C9FA0: @ 80C9FA0 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080C9FC0 @ =gUnknown_3005090 + ldr r2, _080C9FC0 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -577,7 +577,7 @@ sub_80C9FA0: @ 80C9FA0 strh r0, [r1, 0xC] b _080C9FCC .align 2, 0 -_080C9FC0: .4byte gUnknown_3005090 +_080C9FC0: .4byte gTasks _080C9FC4: ldr r0, _080C9FD0 @ =gMain ldr r0, [r0, 0x8] @@ -605,7 +605,7 @@ _080C9FE4: .4byte sub_80C9FE8 sub_80C9FE8: @ 80C9FE8 lsls r0, 24 lsrs r0, 24 - ldr r2, _080C9FFC @ =gUnknown_3005090 + ldr r2, _080C9FFC @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -614,7 +614,7 @@ sub_80C9FE8: @ 80C9FE8 str r0, [r1] bx lr .align 2, 0 -_080C9FFC: .4byte gUnknown_3005090 +_080C9FFC: .4byte gTasks _080CA000: .4byte sub_80CA004 thumb_func_end sub_80C9FE8 @@ -657,7 +657,7 @@ sub_80CA004: @ 80CA004 movs r1, 0 movs r2, 0x20 bl LoadPalette - ldr r1, _080CA09C @ =gUnknown_3005090 + ldr r1, _080CA09C @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -680,7 +680,7 @@ _080CA08C: .4byte 0x0600f800 _080CA090: .4byte 0x00001f0c _080CA094: .4byte gUnknown_83F5804 _080CA098: .4byte gUnknown_83F5824 -_080CA09C: .4byte gUnknown_3005090 +_080CA09C: .4byte gTasks _080CA0A0: .4byte sub_80CA0A4 thumb_func_end sub_80CA004 @@ -689,7 +689,7 @@ sub_80CA0A4: @ 80CA0A4 push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080CA0D8 @ =gUnknown_3005090 + ldr r2, _080CA0D8 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -711,7 +711,7 @@ sub_80CA0A4: @ 80CA0A4 bl LoadPalette b _080CA0F4 .align 2, 0 -_080CA0D8: .4byte gUnknown_3005090 +_080CA0D8: .4byte gTasks _080CA0DC: .4byte gUnknown_83F5844 _080CA0E0: ldr r1, _080CA0FC @ =0x00001010 @@ -737,7 +737,7 @@ sub_80CA108: @ 80CA108 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080CA13C @ =gUnknown_3005090 + ldr r2, _080CA13C @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -760,7 +760,7 @@ sub_80CA108: @ 80CA108 strh r0, [r5, 0xA] b _080CA152 .align 2, 0 -_080CA13C: .4byte gUnknown_3005090 +_080CA13C: .4byte gTasks _080CA140: ldr r0, _080CA158 @ =gUnknown_83F5824 movs r1, 0 @@ -789,7 +789,7 @@ sub_80CA160: @ 80CA160 bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080CA18C @ =gUnknown_3005090 + ldr r2, _080CA18C @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -800,7 +800,7 @@ sub_80CA160: @ 80CA160 bx r0 .align 2, 0 _080CA188: .4byte sub_80CA190 -_080CA18C: .4byte gUnknown_3005090 +_080CA18C: .4byte gTasks thumb_func_end sub_80CA160 thumb_func_start sub_80CA190 @@ -812,7 +812,7 @@ sub_80CA190: @ 80CA190 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080CA1B8 @ =gUnknown_3005098 + ldr r1, _080CA1B8 @ =gTasks+0x8 adds r4, r0, r1 movs r1, 0 ldrsh r0, [r4, r1] @@ -826,7 +826,7 @@ _080CA1AC: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080CA1B8: .4byte gUnknown_3005098 +_080CA1B8: .4byte gTasks+0x8 _080CA1BC: .4byte _080CA1C0 .align 2, 0 _080CA1C0: @@ -945,7 +945,7 @@ _080CA2B6: movs r1, 0x8 ldrsh r0, [r4, r1] bl sub_80F8234 - ldr r1, _080CA2DC @ =gUnknown_3005090 + ldr r1, _080CA2DC @ =gTasks adds r0, r6, r5 lsls r0, 3 adds r0, r1 @@ -957,7 +957,7 @@ _080CA2D2: pop {r0} bx r0 .align 2, 0 -_080CA2DC: .4byte gUnknown_3005090 +_080CA2DC: .4byte gTasks _080CA2E0: .4byte sub_80CA004 thumb_func_end sub_80CA190 diff --git a/asm/fldeff_poison.s b/asm/fldeff_poison.s index 8f5f3433c..dd3bb622e 100644 --- a/asm/fldeff_poison.s +++ b/asm/fldeff_poison.s @@ -13,7 +13,7 @@ task50_overworld_poison_effect: @ 80A0DD8 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _080A0DFC @ =gUnknown_3005098 + ldr r1, _080A0DFC @ =gTasks+0x8 adds r1, r0, r1 movs r3, 0 ldrsh r0, [r1, r3] @@ -25,7 +25,7 @@ task50_overworld_poison_effect: @ 80A0DD8 beq _080A0E06 b _080A0E32 .align 2, 0 -_080A0DFC: .4byte gUnknown_3005098 +_080A0DFC: .4byte gTasks+0x8 _080A0E00: cmp r0, 0x2 beq _080A0E2A diff --git a/asm/fldeff_softboiled.s b/asm/fldeff_softboiled.s index e310222ab..857686ab3 100644 --- a/asm/fldeff_softboiled.s +++ b/asm/fldeff_softboiled.s @@ -67,7 +67,7 @@ sub_80E56DC: @ 80E56DC bl sub_811F818 movs r0, 0x5 bl sub_8121D0C - ldr r1, _080E571C @ =gUnknown_3005090 + ldr r1, _080E571C @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -79,7 +79,7 @@ sub_80E56DC: @ 80E56DC bx r0 .align 2, 0 _080E5718: .4byte gUnknown_203B0A0 -_080E571C: .4byte gUnknown_3005090 +_080E571C: .4byte gTasks _080E5720: .4byte sub_811FB28 thumb_func_end sub_80E56DC @@ -104,7 +104,7 @@ sub_80E5724: @ 80E5724 movs r0, 0 strb r0, [r1, 0xB] bl sub_8121D0C - ldr r1, _080E5760 @ =gUnknown_3005090 + ldr r1, _080E5760 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -114,7 +114,7 @@ sub_80E5724: @ 80E5724 b _080E57D4 .align 2, 0 _080E575C: .4byte gUnknown_203B0A0 -_080E5760: .4byte gUnknown_3005090 +_080E5760: .4byte gTasks _080E5764: .4byte sub_811FB28 _080E5768: movs r0, 0x64 @@ -241,7 +241,7 @@ sub_80E583C: @ 80E583C bl sub_81202F8 movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram - ldr r1, _080E5898 @ =gUnknown_3005090 + ldr r1, _080E5898 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -257,7 +257,7 @@ _080E5888: .4byte gPlayerParty _080E588C: .4byte gStringVar1 _080E5890: .4byte gStringVar4 _080E5894: .4byte gUnknown_8416F27 -_080E5898: .4byte gUnknown_3005090 +_080E5898: .4byte gTasks _080E589C: .4byte sub_80E58A0 thumb_func_end sub_80E583C @@ -289,7 +289,7 @@ sub_80E58A0: @ 80E58A0 bl ClearWindowTilemap movs r0, 0 bl sub_8121D0C - ldr r1, _080E58F8 @ =gUnknown_3005090 + ldr r1, _080E58F8 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -302,7 +302,7 @@ _080E58EE: bx r0 .align 2, 0 _080E58F4: .4byte gUnknown_203B0A0 -_080E58F8: .4byte gUnknown_3005090 +_080E58F8: .4byte gTasks _080E58FC: .4byte sub_811FB28 thumb_func_end sub_80E58A0 @@ -318,7 +318,7 @@ sub_80E5900: @ 80E5900 beq _080E5926 movs r0, 0x5 bl sub_8121D0C - ldr r0, _080E592C @ =gUnknown_3005090 + ldr r0, _080E592C @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -330,7 +330,7 @@ _080E5926: pop {r0} bx r0 .align 2, 0 -_080E592C: .4byte gUnknown_3005090 +_080E592C: .4byte gTasks _080E5930: .4byte sub_811FB28 thumb_func_end sub_80E5900 @@ -347,7 +347,7 @@ sub_80E5934: @ 80E5934 bl sub_81202F8 movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram - ldr r1, _080E5968 @ =gUnknown_3005090 + ldr r1, _080E5968 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -359,7 +359,7 @@ sub_80E5934: @ 80E5934 bx r0 .align 2, 0 _080E5964: .4byte gUnknown_84169F8 -_080E5968: .4byte gUnknown_3005090 +_080E5968: .4byte gTasks _080E596C: .4byte sub_80E5900 thumb_func_end sub_80E5934 diff --git a/asm/fldeff_strength.s b/asm/fldeff_strength.s index 0ebc38112..e74be1bd3 100644 --- a/asm/fldeff_strength.s +++ b/asm/fldeff_strength.s @@ -70,7 +70,7 @@ sub_80D0860: @ 80D0860 bl oei_task_add lsls r0, 24 lsrs r0, 24 - ldr r2, _080D0894 @ =gUnknown_3005090 + ldr r2, _080D0894 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -91,7 +91,7 @@ sub_80D0860: @ 80D0860 pop {r1} bx r1 .align 2, 0 -_080D0894: .4byte gUnknown_3005090 +_080D0894: .4byte gTasks _080D0898: .4byte sub_80D08A8 _080D089C: .4byte gUnknown_20386E0 _080D08A0: .4byte gPlayerParty diff --git a/asm/fldeff_sweetscent.s b/asm/fldeff_sweetscent.s index a44f60980..dfa734b91 100644 --- a/asm/fldeff_sweetscent.s +++ b/asm/fldeff_sweetscent.s @@ -58,7 +58,7 @@ FldEff_SweetScent: @ 80DE104 bl oei_task_add lsls r0, 24 lsrs r0, 24 - ldr r2, _080DE12C @ =gUnknown_3005090 + ldr r2, _080DE12C @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -71,7 +71,7 @@ FldEff_SweetScent: @ 80DE104 pop {r1} bx r1 .align 2, 0 -_080DE12C: .4byte gUnknown_3005090 +_080DE12C: .4byte gTasks _080DE130: .4byte sub_80DE134 thumb_func_end FldEff_SweetScent @@ -122,7 +122,7 @@ sub_80DE134: @ 80DE134 bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080DE1CC @ =gUnknown_3005090 + ldr r2, _080DE1CC @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -141,7 +141,7 @@ _080DE1BC: .4byte gUnknown_20371F8 _080DE1C0: .4byte gUnknown_20375F8 _080DE1C4: .4byte gSprites _080DE1C8: .4byte sub_80DE1D0 -_080DE1CC: .4byte gUnknown_3005090 +_080DE1CC: .4byte gTasks thumb_func_end sub_80DE134 thumb_func_start sub_80DE1D0 @@ -153,7 +153,7 @@ sub_80DE1D0: @ 80DE1D0 lsls r0, r4, 2 adds r0, r4 lsls r5, r0, 3 - ldr r6, _080DE21C @ =gUnknown_3005098 + ldr r6, _080DE21C @ =gTasks+0x8 adds r2, r5, r6 ldr r0, _080DE220 @ =gUnknown_2037AB8 ldrb r1, [r0, 0x7] @@ -181,7 +181,7 @@ sub_80DE1D0: @ 80DE1D0 bl DestroyTask b _080DE26C .align 2, 0 -_080DE21C: .4byte gUnknown_3005098 +_080DE21C: .4byte gTasks+0x8 _080DE220: .4byte gUnknown_2037AB8 _080DE224: .4byte gUnknown_203AAB0 _080DE228: diff --git a/asm/fldeff_teleport.s b/asm/fldeff_teleport.s index 4d3eadb81..0ac09c3f1 100644 --- a/asm/fldeff_teleport.s +++ b/asm/fldeff_teleport.s @@ -60,7 +60,7 @@ FldEff_UseTeleport: @ 80F6750 bl oei_task_add lsls r0, 24 lsrs r0, 24 - ldr r2, _080F6778 @ =gUnknown_3005090 + ldr r2, _080F6778 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -75,7 +75,7 @@ FldEff_UseTeleport: @ 80F6750 pop {r1} bx r1 .align 2, 0 -_080F6778: .4byte gUnknown_3005090 +_080F6778: .4byte gTasks _080F677C: .4byte sub_80F6780 thumb_func_end FldEff_UseTeleport diff --git a/asm/hall_of_fame.s b/asm/hall_of_fame.s index 879061aaa..a344a99c9 100644 --- a/asm/hall_of_fame.s +++ b/asm/hall_of_fame.s @@ -168,7 +168,7 @@ CB2_DoHallOfFameScreen: @ 80F1EFC bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080F1F38 @ =gUnknown_3005090 + ldr r2, _080F1F38 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -184,7 +184,7 @@ _080F1F2C: bx r0 .align 2, 0 _080F1F34: .4byte Task_Hof_InitMonData -_080F1F38: .4byte gUnknown_3005090 +_080F1F38: .4byte gTasks _080F1F3C: .4byte gUnknown_203AB38 thumb_func_end CB2_DoHallOfFameScreen @@ -200,7 +200,7 @@ CB2_DoHallOfFameScreenDontSaveData: @ 80F1F40 bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080F1F70 @ =gUnknown_3005090 + ldr r2, _080F1F70 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -212,7 +212,7 @@ _080F1F66: bx r0 .align 2, 0 _080F1F6C: .4byte Task_Hof_InitMonData -_080F1F70: .4byte gUnknown_3005090 +_080F1F70: .4byte gTasks thumb_func_end CB2_DoHallOfFameScreenDontSaveData thumb_func_start Task_Hof_InitMonData @@ -225,7 +225,7 @@ Task_Hof_InitMonData: @ 80F1F74 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r1, _080F2050 @ =gUnknown_3005090 + ldr r1, _080F2050 @ =gTasks lsls r0, 2 add r0, r8 lsls r0, 3 @@ -313,7 +313,7 @@ _080F2022: lsrs r2, r0, 16 cmp r2, 0x9 bls _080F2022 - ldr r0, _080F2050 @ =gUnknown_3005090 + ldr r0, _080F2050 @ =gTasks mov r2, r8 adds r1, r5, r2 lsls r1, 3 @@ -323,7 +323,7 @@ _080F2022: strh r0, [r1, 0xC] b _080F2098 .align 2, 0 -_080F2050: .4byte gUnknown_3005090 +_080F2050: .4byte gTasks _080F2054: .4byte gUnknown_203AB38 _080F2058: .4byte gPlayerParty _080F205C: .4byte 0x000001ff @@ -366,7 +366,7 @@ _080F20A4: ldr r0, _080F20F0 @ =gUnknown_203AB34 movs r3, 0 str r3, [r0] - ldr r4, _080F20F4 @ =gUnknown_3005090 + ldr r4, _080F20F4 @ =gTasks mov r6, r8 adds r1, r5, r6 lsls r1, 3 @@ -402,7 +402,7 @@ _080F20C2: .align 2, 0 _080F20EC: .4byte 0xfffffe00 _080F20F0: .4byte gUnknown_203AB34 -_080F20F4: .4byte gUnknown_3005090 +_080F20F4: .4byte gTasks _080F20F8: .4byte sub_80F2294 _080F20FC: ldr r0, _080F2110 @ =Task_Hof_InitTeamSaveData @@ -525,7 +525,7 @@ _080F21B2: movs r0, 0 movs r1, 0x3 bl CopyWindowToVram - ldr r1, _080F2218 @ =gUnknown_3005090 + ldr r1, _080F2218 @ =gTasks mov r0, r8 add r0, r9 lsls r0, 3 @@ -544,7 +544,7 @@ _080F2208: .4byte 0x000001ff _080F220C: .4byte gUnknown_201C000 _080F2210: .4byte gUnknown_203AB38 _080F2214: .4byte gUnknown_8419F54 -_080F2218: .4byte gUnknown_3005090 +_080F2218: .4byte gTasks _080F221C: .4byte sub_80F2220 thumb_func_end Task_Hof_InitTeamSaveData @@ -561,7 +561,7 @@ sub_80F2220: @ 80F2220 bl TrySavingData movs r0, 0x30 bl PlaySE - ldr r1, _080F225C @ =gUnknown_3005090 + ldr r1, _080F225C @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -576,7 +576,7 @@ sub_80F2220: @ 80F2220 .align 2, 0 _080F2254: .4byte gUnknown_30053A4 _080F2258: .4byte CB2_DoHallOfFameScreenDontSaveData -_080F225C: .4byte gUnknown_3005090 +_080F225C: .4byte gTasks _080F2260: .4byte sub_80F2264 thumb_func_end sub_80F2220 @@ -585,7 +585,7 @@ sub_80F2264: @ 80F2264 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080F2284 @ =gUnknown_3005090 + ldr r2, _080F2284 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -599,7 +599,7 @@ sub_80F2264: @ 80F2264 strh r0, [r1, 0xE] b _080F228C .align 2, 0 -_080F2284: .4byte gUnknown_3005090 +_080F2284: .4byte gTasks _080F2288: ldr r0, _080F2290 @ =sub_80F2294 str r0, [r1] @@ -614,7 +614,7 @@ _080F2290: .4byte sub_80F2294 sub_80F2294: @ 80F2294 lsls r0, 24 lsrs r0, 24 - ldr r2, _080F22A8 @ =gUnknown_3005090 + ldr r2, _080F22A8 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -623,7 +623,7 @@ sub_80F2294: @ 80F2294 str r0, [r1] bx lr .align 2, 0 -_080F22A8: .4byte gUnknown_3005090 +_080F22A8: .4byte gTasks _080F22AC: .4byte sub_80F22B0 thumb_func_end sub_80F2294 @@ -636,7 +636,7 @@ sub_80F22B0: @ 80F22B0 sub sp, 0x10 lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _080F22E4 @ =gUnknown_3005090 + ldr r0, _080F22E4 @ =gTasks lsls r1, r7, 2 adds r1, r7 lsls r1, 3 @@ -655,7 +655,7 @@ sub_80F22B0: @ 80F22B0 ldr r1, _080F22EC @ =gUnknown_840C268 b _080F22F2 .align 2, 0 -_080F22E4: .4byte gUnknown_3005090 +_080F22E4: .4byte gTasks _080F22E8: .4byte gUnknown_203AB38 _080F22EC: .4byte gUnknown_840C268 _080F22F0: @@ -710,7 +710,7 @@ _080F22F2: adds r1, r3 ldr r2, _080F2394 @ =sub_80F3870 str r2, [r1] - ldr r5, _080F2398 @ =gUnknown_3005090 + ldr r5, _080F2398 @ =gTasks adds r1, r6, 0x5 lsls r1, 1 lsls r4, r7, 2 @@ -739,7 +739,7 @@ _080F2388: .4byte gUnknown_840C298 _080F238C: .4byte 0x0000ffff _080F2390: .4byte gSprites _080F2394: .4byte sub_80F3870 -_080F2398: .4byte gUnknown_3005090 +_080F2398: .4byte gTasks _080F239C: .4byte sub_80F23A0 thumb_func_end sub_80F22B0 @@ -748,7 +748,7 @@ sub_80F23A0: @ 80F23A0 push {r4-r6,lr} lsls r0, 24 lsrs r0, 24 - ldr r4, _080F2410 @ =gUnknown_3005090 + ldr r4, _080F2410 @ =gTasks lsls r3, r0, 2 adds r3, r0 lsls r3, 3 @@ -801,7 +801,7 @@ _080F2408: pop {r0} bx r0 .align 2, 0 -_080F2410: .4byte gUnknown_3005090 +_080F2410: .4byte gTasks _080F2414: .4byte gUnknown_203AB38 _080F2418: .4byte gSprites _080F241C: .4byte 0x000001ff @@ -817,7 +817,7 @@ Task_Hof_TryDisplayAnotherMon: @ 80F2424 sub sp, 0x4 lsls r0, 24 lsrs r5, r0, 24 - ldr r2, _080F2460 @ =gUnknown_3005090 + ldr r2, _080F2460 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r6, r0, 3 @@ -840,7 +840,7 @@ Task_Hof_TryDisplayAnotherMon: @ 80F2424 strh r0, [r4, 0xE] b _080F2500 .align 2, 0 -_080F2460: .4byte gUnknown_3005090 +_080F2460: .4byte gTasks _080F2464: .4byte gUnknown_203AB38 _080F2468: ldr r2, _080F24E0 @ =gUnknown_203AB34 @@ -945,7 +945,7 @@ Task_Hof_PaletteFadeAndPrintWelcomeText: @ 80F2514 lsls r1, r4, 2 adds r0, r1, r4 lsls r5, r0, 3 - ldr r0, _080F25A0 @ =gUnknown_3005098 + ldr r0, _080F25A0 @ =gTasks+0x8 mov r12, r0 mov r8, r1 ldr r6, _080F25A4 @ =gSprites @@ -980,7 +980,7 @@ _080F2564: bl HallOfFame_PrintWelcomeText movs r0, 0x62 bl PlaySE - ldr r1, _080F25A8 @ =gUnknown_3005090 + ldr r1, _080F25A8 @ =gTasks mov r2, r8 adds r0, r2, r4 lsls r0, 3 @@ -998,9 +998,9 @@ _080F2564: bx r0 .align 2, 0 _080F259C: .4byte 0xffff0000 -_080F25A0: .4byte gUnknown_3005098 +_080F25A0: .4byte gTasks+0x8 _080F25A4: .4byte gSprites -_080F25A8: .4byte gUnknown_3005090 +_080F25A8: .4byte gTasks _080F25AC: .4byte sub_80F25B0 thumb_func_end Task_Hof_PaletteFadeAndPrintWelcomeText @@ -1014,7 +1014,7 @@ sub_80F25B0: @ 80F25B0 sub sp, 0x4 lsls r0, 24 lsrs r6, r0, 24 - ldr r7, _080F25F0 @ =gUnknown_3005090 + ldr r7, _080F25F0 @ =gTasks lsls r4, r6, 2 adds r0, r4, r6 lsls r5, r0, 3 @@ -1037,7 +1037,7 @@ sub_80F25B0: @ 80F25B0 bl sub_80F3930 b _080F266E .align 2, 0 -_080F25F0: .4byte gUnknown_3005090 +_080F25F0: .4byte gTasks _080F25F4: movs r3, 0 mov r9, r4 @@ -1090,7 +1090,7 @@ _080F2630: movs r0, 0 movs r1, 0x3 bl CopyWindowToVram - ldr r1, _080F268C @ =gUnknown_3005090 + ldr r1, _080F268C @ =gTasks mov r2, r9 adds r0, r2, r6 lsls r0, 3 @@ -1112,7 +1112,7 @@ _080F266E: _080F2680: .4byte gUnknown_203AB34 _080F2684: .4byte gSprites _080F2688: .4byte 0x00007716 -_080F268C: .4byte gUnknown_3005090 +_080F268C: .4byte gTasks _080F2690: .4byte sub_80F2694 thumb_func_end sub_80F25B0 @@ -1121,7 +1121,7 @@ sub_80F2694: @ 80F2694 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080F26B4 @ =gUnknown_3005090 + ldr r2, _080F26B4 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -1135,7 +1135,7 @@ sub_80F2694: @ 80F2694 str r0, [r1] b _080F26CE .align 2, 0 -_080F26B4: .4byte gUnknown_3005090 +_080F26B4: .4byte gTasks _080F26B8: .4byte sub_80F26D4 _080F26BC: adds r0, r2, 0x1 @@ -1183,7 +1183,7 @@ sub_80F26D4: @ 80F26D4 movs r2, 0x78 movs r3, 0x48 bl sub_810C2A4 - ldr r1, _080F2750 @ =gUnknown_3005090 + ldr r1, _080F2750 @ =gTasks lsls r4, r5, 2 adds r4, r5 lsls r4, 3 @@ -1206,7 +1206,7 @@ sub_80F26D4: @ 80F26D4 .align 2, 0 _080F2748: .4byte gSaveBlock2Ptr _080F274C: .4byte 0x0000ffff -_080F2750: .4byte gUnknown_3005090 +_080F2750: .4byte gTasks _080F2754: .4byte gUnknown_840C234 _080F2758: .4byte 0x0000021d _080F275C: .4byte Task_Hof_WaitAndPrintPlayerInfo @@ -1218,7 +1218,7 @@ Task_Hof_WaitAndPrintPlayerInfo: @ 80F2760 sub sp, 0x10 lsls r0, 24 lsrs r0, 24 - ldr r2, _080F2784 @ =gUnknown_3005090 + ldr r2, _080F2784 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -1232,7 +1232,7 @@ Task_Hof_WaitAndPrintPlayerInfo: @ 80F2760 strh r0, [r4, 0xE] b _080F27F4 .align 2, 0 -_080F2784: .4byte gUnknown_3005090 +_080F2784: .4byte gTasks _080F2788: ldr r2, _080F27A8 @ =gSprites movs r3, 0x10 @@ -1306,7 +1306,7 @@ Task_Hof_ExitOnKeyPressed: @ 80F2804 beq _080F282A movs r0, 0x4 bl FadeOutBGM - ldr r0, _080F2834 @ =gUnknown_3005090 + ldr r0, _080F2834 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -1319,7 +1319,7 @@ _080F282A: bx r0 .align 2, 0 _080F2830: .4byte gMain -_080F2834: .4byte gUnknown_3005090 +_080F2834: .4byte gTasks _080F2838: .4byte Task_Hof_HandlePaletteOnExit thumb_func_end Task_Hof_ExitOnKeyPressed @@ -1343,7 +1343,7 @@ Task_Hof_HandlePaletteOnExit: @ 80F283C movs r2, 0 movs r3, 0x10 bl BeginNormalPaletteFade - ldr r1, _080F2884 @ =gUnknown_3005090 + ldr r1, _080F2884 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -1357,7 +1357,7 @@ Task_Hof_HandlePaletteOnExit: @ 80F283C .align 2, 0 _080F287C: .4byte gUnknown_20375F8 _080F2880: .4byte gUnknown_20371F8 -_080F2884: .4byte gUnknown_3005090 +_080F2884: .4byte gTasks _080F2888: .4byte Task_Hof_HandleExit thumb_func_end Task_Hof_HandlePaletteOnExit @@ -1373,7 +1373,7 @@ Task_Hof_HandleExit: @ 80F288C cmp r0, 0 bne _080F291E lsls r7, r6, 2 - ldr r1, _080F2928 @ =gUnknown_3005090 + ldr r1, _080F2928 @ =gTasks adds r0, r7, r6 lsls r0, 3 adds r1, 0x12 @@ -1389,7 +1389,7 @@ _080F28B6: subs r5, 0x1 cmp r5, 0 bge _080F28AC - ldr r0, _080F2928 @ =gUnknown_3005090 + ldr r0, _080F2928 @ =gTasks adds r1, r7, r6 lsls r1, 3 adds r1, r0 @@ -1433,7 +1433,7 @@ _080F291E: bx r0 .align 2, 0 _080F2924: .4byte gUnknown_2037AB8 -_080F2928: .4byte gUnknown_3005090 +_080F2928: .4byte gTasks _080F292C: .4byte gUnknown_203AB3C _080F2930: .4byte gUnknown_203AB38 thumb_func_end Task_Hof_HandleExit @@ -1614,7 +1614,7 @@ sub_80F2AA4: @ 80F2AA4 lsrs r0, 24 cmp r0, 0x1 beq _080F2AE4 - ldr r0, _080F2ADC @ =gUnknown_3005090 + ldr r0, _080F2ADC @ =gTasks lsls r1, r6, 2 adds r1, r6 lsls r1, 3 @@ -1623,7 +1623,7 @@ sub_80F2AA4: @ 80F2AA4 b _080F2B5A .align 2, 0 _080F2AD8: .4byte 0x00000226 -_080F2ADC: .4byte gUnknown_3005090 +_080F2ADC: .4byte gTasks _080F2AE0: .4byte sub_80F30A4 _080F2AE4: ldr r0, _080F2B2C @ =gUnknown_201C000 @@ -1656,7 +1656,7 @@ _080F2B04: _080F2B1A: cmp r2, 0x31 bhi _080F2B3C - ldr r0, _080F2B38 @ =gUnknown_3005090 + ldr r0, _080F2B38 @ =gTasks adds r1, r5, r6 lsls r1, 3 adds r1, r0 @@ -1666,9 +1666,9 @@ _080F2B1A: _080F2B2C: .4byte gUnknown_201C000 _080F2B30: .4byte gUnknown_203AB38 _080F2B34: .4byte 0x000001ff -_080F2B38: .4byte gUnknown_3005090 +_080F2B38: .4byte gTasks _080F2B3C: - ldr r0, _080F2B64 @ =gUnknown_3005090 + ldr r0, _080F2B64 @ =gTasks adds r1, r5, r6 lsls r1, 3 adds r1, r0 @@ -1677,7 +1677,7 @@ _080F2B46: strh r0, [r1, 0x8] movs r0, 0xA bl GetGameStat - ldr r2, _080F2B64 @ =gUnknown_3005090 + ldr r2, _080F2B64 @ =gTasks adds r1, r5, r6 lsls r1, 3 adds r1, r2 @@ -1690,7 +1690,7 @@ _080F2B5A: pop {r0} bx r0 .align 2, 0 -_080F2B64: .4byte gUnknown_3005090 +_080F2B64: .4byte gTasks _080F2B68: .4byte sub_80F2B6C thumb_func_end sub_80F2AA4 @@ -1708,7 +1708,7 @@ sub_80F2B6C: @ 80F2B6C ldr r0, _080F2C24 @ =gUnknown_203AB38 ldr r3, [r0] movs r5, 0 - ldr r1, _080F2C28 @ =gUnknown_3005090 + ldr r1, _080F2C28 @ =gTasks mov r2, r9 lsls r0, r2, 2 add r0, r9 @@ -1761,7 +1761,7 @@ _080F2BD6: bls _080F2BC6 adds r6, r3, 0 movs r5, 0 - ldr r1, _080F2C28 @ =gUnknown_3005090 + ldr r1, _080F2C28 @ =gTasks ldr r0, [sp, 0x14] add r0, r9 lsls r0, 3 @@ -1794,7 +1794,7 @@ _080F2BF8: b _080F2C4C .align 2, 0 _080F2C24: .4byte gUnknown_203AB38 -_080F2C28: .4byte gUnknown_3005090 +_080F2C28: .4byte gTasks _080F2C2C: .4byte gUnknown_203AB34 _080F2C30: .4byte 0x000001ff _080F2C34: .4byte gUnknown_840C268 @@ -1870,7 +1870,7 @@ _080F2CB4: movs r1, 0xC bl BlendPalettes ldr r0, _080F2D10 @ =gStringVar1 - ldr r1, _080F2D14 @ =gUnknown_3005090 + ldr r1, _080F2D14 @ =gTasks ldr r4, [sp, 0x14] add r4, r9 lsls r4, 3 @@ -1900,7 +1900,7 @@ _080F2CB4: _080F2D08: .4byte 0xffff0000 _080F2D0C: .4byte 0x00007716 _080F2D10: .4byte gStringVar1 -_080F2D14: .4byte gUnknown_3005090 +_080F2D14: .4byte gTasks _080F2D18: .4byte gStringVar4 _080F2D1C: .4byte gUnknown_84160B4 _080F2D20: .4byte gUnknown_8415D78 @@ -1913,7 +1913,7 @@ _080F2D24: movs r3, 0 bl sub_810F650 _080F2D34: - ldr r0, _080F2D58 @ =gUnknown_3005090 + ldr r0, _080F2D58 @ =gTasks ldr r1, [sp, 0x14] add r1, r9 lsls r1, 3 @@ -1930,7 +1930,7 @@ _080F2D34: bx r0 .align 2, 0 _080F2D54: .4byte gUnknown_8415D60 -_080F2D58: .4byte gUnknown_3005090 +_080F2D58: .4byte gTasks _080F2D5C: .4byte Task_HofPC_PrintMonInfo thumb_func_end sub_80F2B6C @@ -1946,7 +1946,7 @@ Task_HofPC_PrintMonInfo: @ 80F2D60 ldr r0, _080F2E68 @ =gUnknown_203AB38 ldr r5, [r0] movs r3, 0 - ldr r1, _080F2E6C @ =gUnknown_3005090 + ldr r1, _080F2E6C @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -1968,7 +1968,7 @@ _080F2D94: lsls r7, r4, 2 adds r0, r7, r4 lsls r6, r0, 3 - ldr r0, _080F2E70 @ =gUnknown_3005098 + ldr r0, _080F2E70 @ =gTasks+0x8 mov r10, r0 ldr r1, _080F2E74 @ =gSprites mov r8, r1 @@ -2003,14 +2003,14 @@ _080F2DD0: bls _080F2DAE adds r1, r7, r4 lsls r1, 3 - ldr r0, _080F2E6C @ =gUnknown_3005090 + ldr r0, _080F2E6C @ =gTasks adds r6, r1, r0 movs r2, 0xC ldrsh r0, [r6, r2] adds r0, 0x5 lsls r0, 1 adds r0, r1 - ldr r1, _080F2E6C @ =gUnknown_3005090 + ldr r1, _080F2E6C @ =gTasks adds r1, 0x8 adds r0, r1 ldrh r1, [r0] @@ -2070,8 +2070,8 @@ _080F2E4A: bx r0 .align 2, 0 _080F2E68: .4byte gUnknown_203AB38 -_080F2E6C: .4byte gUnknown_3005090 -_080F2E70: .4byte gUnknown_3005098 +_080F2E6C: .4byte gTasks +_080F2E70: .4byte gTasks+0x8 _080F2E74: .4byte gSprites _080F2E78: .4byte 0xffff0000 _080F2E7C: .4byte gUnknown_203AB34 @@ -2094,7 +2094,7 @@ Task_HofPC_HandleInput: @ 80F2E8C adds r3, r1, 0 cmp r0, 0 beq _080F2F38 - ldr r7, _080F2F04 @ =gUnknown_3005090 + ldr r7, _080F2F04 @ =gTasks lsls r0, r5, 2 adds r1, r0, r5 lsls r3, r1, 3 @@ -2125,7 +2125,7 @@ _080F2ED6: lsrs r4, r0, 16 cmp r4, 0x5 bls _080F2EC4 - ldr r0, _080F2F04 @ =gUnknown_3005090 + ldr r0, _080F2F04 @ =gTasks mov r2, r8 adds r1, r2, r5 lsls r1, 3 @@ -2143,7 +2143,7 @@ _080F2EF8: b _080F2FD8 .align 2, 0 _080F2F00: .4byte gMain -_080F2F04: .4byte gUnknown_3005090 +_080F2F04: .4byte gTasks _080F2F08: .4byte sub_80F2B6C _080F2F0C: bl IsCryPlayingOrClearCrySongs @@ -2180,7 +2180,7 @@ _080F2F38: lsls r2, 1 bl m4aMPlayVolumeControl _080F2F5A: - ldr r0, _080F2F74 @ =gUnknown_3005090 + ldr r0, _080F2F74 @ =gTasks lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -2191,14 +2191,14 @@ _080F2F5A: .align 2, 0 _080F2F6C: .4byte gMPlay_BGM _080F2F70: .4byte 0x0000ffff -_080F2F74: .4byte gUnknown_3005090 +_080F2F74: .4byte gTasks _080F2F78: .4byte sub_80F2FEC _080F2F7C: movs r0, 0x40 ands r0, r2 cmp r0, 0 beq _080F2FAC - ldr r0, _080F2FA4 @ =gUnknown_3005090 + ldr r0, _080F2FA4 @ =gTasks lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -2214,7 +2214,7 @@ _080F2F7C: str r0, [r1] b _080F2FD8 .align 2, 0 -_080F2FA4: .4byte gUnknown_3005090 +_080F2FA4: .4byte gTasks _080F2FA8: .4byte Task_HofPC_PrintMonInfo _080F2FAC: ldrh r1, [r3, 0x2E] @@ -2222,7 +2222,7 @@ _080F2FAC: ands r0, r1 cmp r0, 0 beq _080F2FD8 - ldr r1, _080F2FE4 @ =gUnknown_3005090 + ldr r1, _080F2FE4 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -2246,7 +2246,7 @@ _080F2FD8: pop {r0} bx r0 .align 2, 0 -_080F2FE4: .4byte gUnknown_3005090 +_080F2FE4: .4byte gTasks _080F2FE8: .4byte Task_HofPC_PrintMonInfo thumb_func_end Task_HofPC_HandleInput @@ -2265,7 +2265,7 @@ sub_80F2FEC: @ 80F2FEC movs r1, 0 movs r2, 0 bl sub_80A0A70 - ldr r1, _080F3028 @ =gUnknown_3005090 + ldr r1, _080F3028 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -2278,7 +2278,7 @@ sub_80F2FEC: @ 80F2FEC .align 2, 0 _080F3020: .4byte gUnknown_20375F8 _080F3024: .4byte gUnknown_20371F8 -_080F3028: .4byte gUnknown_3005090 +_080F3028: .4byte gTasks _080F302C: .4byte sub_80F3030 thumb_func_end sub_80F2FEC @@ -2362,7 +2362,7 @@ sub_80F30A4: @ 80F30A4 movs r0, 0 movs r1, 0x3 bl CopyWindowToVram - ldr r1, _080F3104 @ =gUnknown_3005090 + ldr r1, _080F3104 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -2376,7 +2376,7 @@ sub_80F30A4: @ 80F30A4 .align 2, 0 _080F30FC: .4byte gUnknown_8415D8C _080F3100: .4byte gUnknown_8416090 -_080F3104: .4byte gUnknown_3005090 +_080F3104: .4byte gTasks _080F3108: .4byte Task_HofPC_ExitOnButtonPress thumb_func_end sub_80F30A4 @@ -2391,7 +2391,7 @@ Task_HofPC_ExitOnButtonPress: @ 80F310C ands r0, r1 cmp r0, 0 beq _080F312C - ldr r0, _080F3134 @ =gUnknown_3005090 + ldr r0, _080F3134 @ =gTasks lsls r1, r2, 2 adds r1, r2 lsls r1, 3 @@ -2403,7 +2403,7 @@ _080F312C: bx r0 .align 2, 0 _080F3130: .4byte gMain -_080F3134: .4byte gUnknown_3005090 +_080F3134: .4byte gTasks _080F3138: .4byte sub_80F2FEC thumb_func_end Task_HofPC_ExitOnButtonPress diff --git a/asm/intro.s b/asm/intro.s index 0658c0965..2d8a626b4 100644 --- a/asm/intro.s +++ b/asm/intro.s @@ -1321,7 +1321,7 @@ sub_80ED0AC: @ 80ED0AC lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080ED114 @ =gUnknown_3005098 + ldr r0, _080ED114 @ =gTasks+0x8 adds r4, r1, r0 ldrh r0, [r4] adds r0, 0x1 @@ -1368,7 +1368,7 @@ _080ED10C: pop {r0} bx r0 .align 2, 0 -_080ED114: .4byte gUnknown_3005098 +_080ED114: .4byte gTasks+0x8 thumb_func_end sub_80ED0AC thumb_func_start sub_80ED118 @@ -1378,7 +1378,7 @@ sub_80ED118: @ 80ED118 bl FindTaskIdByFunc lsls r0, 24 lsrs r0, 24 - ldr r2, _080ED13C @ =gUnknown_3005090 + ldr r2, _080ED13C @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -1389,7 +1389,7 @@ sub_80ED118: @ 80ED118 bx r0 .align 2, 0 _080ED138: .4byte sub_80ED0AC -_080ED13C: .4byte gUnknown_3005090 +_080ED13C: .4byte gTasks thumb_func_end sub_80ED118 thumb_func_start sub_80ED140 @@ -1400,7 +1400,7 @@ sub_80ED140: @ 80ED140 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080ED184 @ =gUnknown_3005098 + ldr r0, _080ED184 @ =gTasks+0x8 adds r1, r0 ldrh r0, [r1] adds r0, 0x1 @@ -1429,7 +1429,7 @@ _080ED17E: pop {r0} bx r0 .align 2, 0 -_080ED184: .4byte gUnknown_3005098 +_080ED184: .4byte gTasks+0x8 thumb_func_end sub_80ED140 thumb_func_start sub_80ED188 @@ -2009,7 +2009,7 @@ sub_80ED69C: @ 80ED69C push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080ED6C4 @ =gUnknown_3005090 + ldr r2, _080ED6C4 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -2025,7 +2025,7 @@ sub_80ED69C: @ 80ED69C bl ChangeBgX b _080ED6D2 .align 2, 0 -_080ED6C4: .4byte gUnknown_3005090 +_080ED6C4: .4byte gTasks _080ED6C8: movs r0, 0x1 movs r1, 0x20 @@ -2055,7 +2055,7 @@ sub_80ED6EC: @ 80ED6EC bl FindTaskIdByFunc lsls r0, 24 lsrs r0, 24 - ldr r2, _080ED710 @ =gUnknown_3005090 + ldr r2, _080ED710 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -2066,7 +2066,7 @@ sub_80ED6EC: @ 80ED6EC bx r0 .align 2, 0 _080ED70C: .4byte sub_80ED69C -_080ED710: .4byte gUnknown_3005090 +_080ED710: .4byte gTasks thumb_func_end sub_80ED6EC thumb_func_start sub_80ED714 @@ -2077,7 +2077,7 @@ sub_80ED714: @ 80ED714 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080ED75C @ =gUnknown_3005098 + ldr r0, _080ED75C @ =gTasks+0x8 adds r2, r1, r0 movs r0, 0 ldrsh r1, [r2, r0] @@ -2108,7 +2108,7 @@ _080ED758: pop {r0} bx r0 .align 2, 0 -_080ED75C: .4byte gUnknown_3005098 +_080ED75C: .4byte gTasks+0x8 thumb_func_end sub_80ED714 thumb_func_start sub_80ED760 @@ -2118,7 +2118,7 @@ sub_80ED760: @ 80ED760 bl FindTaskIdByFunc lsls r0, 24 lsrs r0, 24 - ldr r2, _080ED784 @ =gUnknown_3005090 + ldr r2, _080ED784 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -2129,7 +2129,7 @@ sub_80ED760: @ 80ED760 bx r0 .align 2, 0 _080ED780: .4byte sub_80ED714 -_080ED784: .4byte gUnknown_3005090 +_080ED784: .4byte gTasks thumb_func_end sub_80ED760 thumb_func_start sub_80ED788 @@ -2139,7 +2139,7 @@ sub_80ED788: @ 80ED788 bl FindTaskIdByFunc lsls r0, 24 lsrs r0, 24 - ldr r2, _080ED7AC @ =gUnknown_3005090 + ldr r2, _080ED7AC @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -2150,7 +2150,7 @@ sub_80ED788: @ 80ED788 bx r0 .align 2, 0 _080ED7A8: .4byte sub_80ED714 -_080ED7AC: .4byte gUnknown_3005090 +_080ED7AC: .4byte gTasks thumb_func_end sub_80ED788 thumb_func_start sub_80ED7B0 @@ -2160,7 +2160,7 @@ sub_80ED7B0: @ 80ED7B0 bl FindTaskIdByFunc lsls r0, 24 lsrs r0, 24 - ldr r2, _080ED7D0 @ =gUnknown_3005090 + ldr r2, _080ED7D0 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -2170,7 +2170,7 @@ sub_80ED7B0: @ 80ED7B0 bx r1 .align 2, 0 _080ED7CC: .4byte sub_80ED714 -_080ED7D0: .4byte gUnknown_3005090 +_080ED7D0: .4byte gTasks thumb_func_end sub_80ED7B0 thumb_func_start sub_80ED7D4 @@ -2976,7 +2976,7 @@ sub_80EDE04: @ 80EDE04 lsls r0, 2 add r0, r9 lsls r0, 3 - ldr r1, _080EDEB0 @ =gUnknown_3005098 + ldr r1, _080EDEB0 @ =gTasks+0x8 adds r0, r1 mov r8, r0 ldrh r1, [r0, 0x4] @@ -3050,7 +3050,7 @@ _080EDE88: bl DestroyTask b _080EDECA .align 2, 0 -_080EDEB0: .4byte gUnknown_3005098 +_080EDEB0: .4byte gTasks+0x8 _080EDEB4: .4byte gUnknown_840BC84 _080EDEB8: .4byte gUnknown_840BC08 _080EDEBC: .4byte gSprites @@ -3089,7 +3089,7 @@ sub_80EDEEC: @ 80EDEEC lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080EDF5C @ =gUnknown_3005098 + ldr r1, _080EDF5C @ =gTasks+0x8 adds r4, r0, r1 movs r1, 0 ldrsh r0, [r4, r1] @@ -3140,7 +3140,7 @@ _080EDF56: pop {r0} bx r0 .align 2, 0 -_080EDF5C: .4byte gUnknown_3005098 +_080EDF5C: .4byte gTasks+0x8 _080EDF60: .4byte gUnknown_840BCBC _080EDF64: .4byte gUnknown_840BC08 thumb_func_end sub_80EDEEC @@ -3184,7 +3184,7 @@ sub_80EDF94: @ 80EDF94 movs r1, 0x5 adds r2, r4, 0 bl SetWordTaskArg - ldr r0, _080EDFD4 @ =gUnknown_3005090 + ldr r0, _080EDFD4 @ =gTasks lsls r4, r5, 2 adds r4, r5 lsls r4, 3 @@ -3199,7 +3199,7 @@ sub_80EDF94: @ 80EDF94 bx r0 .align 2, 0 _080EDFD0: .4byte sub_80EE024 -_080EDFD4: .4byte gUnknown_3005090 +_080EDFD4: .4byte gTasks thumb_func_end sub_80EDF94 thumb_func_start sub_80EDFD8 @@ -3248,7 +3248,7 @@ sub_80EE024: @ 80EE024 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _080EE048 @ =gUnknown_3005098 + ldr r1, _080EE048 @ =gTasks+0x8 adds r5, r0, r1 movs r1, 0 ldrsh r0, [r5, r1] @@ -3260,7 +3260,7 @@ sub_80EE024: @ 80EE024 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080EE048: .4byte gUnknown_3005098 +_080EE048: .4byte gTasks+0x8 _080EE04C: .4byte _080EE050 .align 2, 0 _080EE050: @@ -3493,7 +3493,7 @@ sub_80EE200: @ 80EE200 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _080EE220 @ =gUnknown_3005098 + ldr r1, _080EE220 @ =gTasks+0x8 adds r1, r0, r1 movs r2, 0 ldrsh r0, [r1, r2] @@ -3503,7 +3503,7 @@ sub_80EE200: @ 80EE200 beq _080EE232 b _080EE28A .align 2, 0 -_080EE220: .4byte gUnknown_3005098 +_080EE220: .4byte gTasks+0x8 _080EE224: movs r3, 0x80 lsls r3, 3 diff --git a/asm/item_menu.s b/asm/item_menu.s index 36c696505..07fefddfe 100644 --- a/asm/item_menu.s +++ b/asm/item_menu.s @@ -361,7 +361,7 @@ _0810806E: adds r2, r4 ldrh r2, [r2] bl ListMenuInit - ldr r2, _081080B4 @ =gUnknown_3005090 + ldr r2, _081080B4 @ =gTasks lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -376,7 +376,7 @@ _0810806E: .align 2, 0 _081080AC: .4byte gUnknown_203ACFC _081080B0: .4byte gUnknown_3005E70 -_081080B4: .4byte gUnknown_3005090 +_081080B4: .4byte gTasks _081080B8: ldr r0, _081080C4 @ =gUnknown_203ACFC ldrb r0, [r0, 0x6] @@ -1754,7 +1754,7 @@ sub_8108B50: @ 8108B50 str r2, [sp] movs r3, 0x10 bl BeginNormalPaletteFade - ldr r1, _08108B84 @ =gUnknown_3005090 + ldr r1, _08108B84 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -1766,7 +1766,7 @@ sub_8108B50: @ 8108B50 pop {r0} bx r0 .align 2, 0 -_08108B84: .4byte gUnknown_3005090 +_08108B84: .4byte gTasks _08108B88: .4byte sub_8108B8C thumb_func_end sub_8108B50 @@ -1778,7 +1778,7 @@ sub_8108B8C: @ 8108B8C lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _08108BE0 @ =gUnknown_3005098 + ldr r1, _08108BE0 @ =gTasks+0x8 adds r4, r0, r1 ldr r0, _08108BE4 @ =gUnknown_2037AB8 ldrb r1, [r0, 0x7] @@ -1811,7 +1811,7 @@ sub_8108B8C: @ 8108B8C bl SetMainCallback2 b _08108BFA .align 2, 0 -_08108BE0: .4byte gUnknown_3005098 +_08108BE0: .4byte gTasks+0x8 _08108BE4: .4byte gUnknown_2037AB8 _08108BE8: .4byte sub_8108CFC _08108BEC: .4byte gUnknown_203ACFC @@ -1883,7 +1883,7 @@ _08108C6C: bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _08108CAC @ =gUnknown_3005090 + ldr r2, _08108CAC @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -1901,7 +1901,7 @@ _08108C9E: bx r0 .align 2, 0 _08108CA8: .4byte sub_8108CFC -_08108CAC: .4byte gUnknown_3005090 +_08108CAC: .4byte gTasks _08108CB0: .4byte 0x0000fff0 thumb_func_end sub_8108C10 @@ -1913,7 +1913,7 @@ sub_8108CB4: @ 8108CB4 bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _08108CE4 @ =gUnknown_3005090 + ldr r2, _08108CE4 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -1929,7 +1929,7 @@ sub_8108CB4: @ 8108CB4 bx r0 .align 2, 0 _08108CE0: .4byte sub_8108CFC -_08108CE4: .4byte gUnknown_3005090 +_08108CE4: .4byte gTasks _08108CE8: .4byte 0x0000fff0 _08108CEC: .4byte gUnknown_203ACFC thumb_func_end sub_8108CB4 @@ -1952,7 +1952,7 @@ sub_8108CFC: @ 8108CFC lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _08108D28 @ =gUnknown_3005098 + ldr r1, _08108D28 @ =gTasks+0x8 adds r4, r0, r1 ldrh r0, [r4, 0x2] ldrh r1, [r4] @@ -1967,7 +1967,7 @@ sub_8108CFC: @ 8108CFC bl SetGpuReg b _08108D34 .align 2, 0 -_08108D28: .4byte gUnknown_3005098 +_08108D28: .4byte gTasks+0x8 _08108D2C: ldrh r1, [r4] movs r0, 0x44 @@ -2168,7 +2168,7 @@ sub_8108E70: @ 8108E70 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 - ldr r0, _08108EDC @ =gUnknown_3005098 + ldr r0, _08108EDC @ =gTasks+0x8 adds r4, r0 movs r0, 0x5 bl sub_810BA70 @@ -2201,7 +2201,7 @@ sub_8108E70: @ 8108E70 pop {r0} bx r0 .align 2, 0 -_08108EDC: .4byte gUnknown_3005098 +_08108EDC: .4byte gTasks+0x8 thumb_func_end sub_8108E70 thumb_func_start sub_8108EE0 @@ -2243,7 +2243,7 @@ sub_8108F0C: @ 8108F0C lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _08108F78 @ =gUnknown_3005098 + ldr r1, _08108F78 @ =gTasks+0x8 adds r7, r0, r1 ldr r0, _08108F7C @ =gUnknown_2037AB8 ldrb r1, [r0, 0x7] @@ -2290,7 +2290,7 @@ _08108F4A: bne _08108FE4 b _08108FA0 .align 2, 0 -_08108F78: .4byte gUnknown_3005098 +_08108F78: .4byte gTasks+0x8 _08108F7C: .4byte gUnknown_2037AB8 _08108F80: .4byte sub_8108CFC _08108F84: .4byte gUnknown_203ACFC @@ -2371,7 +2371,7 @@ _08109018: movs r0, 0 strh r0, [r1] bl sub_8108CB4 - ldr r1, _0810903C @ =gUnknown_3005090 + ldr r1, _0810903C @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -2380,7 +2380,7 @@ _08109018: b _081090C4 .align 2, 0 _08109038: .4byte gUnknown_203AD30 -_0810903C: .4byte gUnknown_3005090 +_0810903C: .4byte gTasks _08109040: .4byte sub_8108B50 _08109044: movs r0, 0x5 @@ -2397,7 +2397,7 @@ _08109044: movs r0, 0 strh r0, [r1] bl sub_8108CB4 - ldr r1, _0810907C @ =gUnknown_3005090 + ldr r1, _0810907C @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -2407,7 +2407,7 @@ _08109044: .align 2, 0 _08109074: .4byte gUnknown_203AD10 _08109078: .4byte gUnknown_203AD30 -_0810907C: .4byte gUnknown_3005090 +_0810907C: .4byte gTasks _08109080: .4byte sub_8108B50 _08109084: bl sub_8108978 @@ -2432,7 +2432,7 @@ _08109084: bl sub_809A798 ldr r1, _081090D0 @ =gUnknown_203AD30 strh r0, [r1] - ldr r1, _081090D4 @ =gUnknown_3005090 + ldr r1, _081090D4 @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -2447,7 +2447,7 @@ _081090C6: bx r0 .align 2, 0 _081090D0: .4byte gUnknown_203AD30 -_081090D4: .4byte gUnknown_3005090 +_081090D4: .4byte gTasks _081090D8: .4byte sub_81090DC thumb_func_end sub_8108F0C @@ -2485,7 +2485,7 @@ sub_810910C: @ 810910C bl sub_8109140 bl sub_8108888 bl sub_81088D8 - ldr r1, _08109138 @ =gUnknown_3005090 + ldr r1, _08109138 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -2496,7 +2496,7 @@ sub_810910C: @ 810910C pop {r0} bx r0 .align 2, 0 -_08109138: .4byte gUnknown_3005090 +_08109138: .4byte gTasks _0810913C: .4byte sub_8108F0C thumb_func_end sub_810910C @@ -2593,7 +2593,7 @@ sub_81091D0: @ 81091D0 lsls r0, r5, 2 adds r0, r5 lsls r7, r0, 3 - ldr r0, _08109288 @ =gUnknown_3005098 + ldr r0, _08109288 @ =gTasks+0x8 mov r8, r0 adds r4, r7, r0 movs r0, 0 @@ -2661,7 +2661,7 @@ _08109242: pop {r0} bx r0 .align 2, 0 -_08109288: .4byte gUnknown_3005098 +_08109288: .4byte gTasks+0x8 _0810928C: .4byte gUnknown_203ACFC _08109290: .4byte gUnknown_203AD10 _08109294: .4byte sub_8109298 @@ -2675,7 +2675,7 @@ sub_8109298: @ 8109298 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _081092DC @ =gUnknown_3005098 + ldr r1, _081092DC @ =gTasks+0x8 adds r5, r0, r1 bl sub_80BF708 lsls r0, 24 @@ -2701,7 +2701,7 @@ sub_8109298: @ 8109298 beq _081092FA b _08109314 .align 2, 0 -_081092DC: .4byte gUnknown_3005098 +_081092DC: .4byte gTasks+0x8 _081092E0: .4byte gUnknown_203ACFC _081092E4: ldrh r0, [r5, 0x16] @@ -2821,7 +2821,7 @@ sub_81093B8: @ 81093B8 lsls r5, r0, 2 adds r5, r0 lsls r5, 3 - ldr r0, _08109494 @ =gUnknown_3005098 + ldr r0, _08109494 @ =gTasks+0x8 mov r9, r0 adds r1, r5, 0 add r1, r9 @@ -2905,7 +2905,7 @@ sub_81093B8: @ 81093B8 pop {r0} bx r0 .align 2, 0 -_08109494: .4byte gUnknown_3005098 +_08109494: .4byte gTasks+0x8 _08109498: .4byte gUnknown_203AD10 _0810949C: .4byte gStringVar1 _081094A0: .4byte gUnknown_203ACFC @@ -2923,7 +2923,7 @@ sub_81094B0: @ 81094B0 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _08109538 @ =gUnknown_3005098 + ldr r1, _08109538 @ =gTasks+0x8 adds r4, r0, r1 bl sub_80BF72C lsls r0, 24 @@ -2976,7 +2976,7 @@ sub_81094B0: @ 81094B0 bl sub_81095AC b _0810959E .align 2, 0 -_08109538: .4byte gUnknown_3005098 +_08109538: .4byte gTasks+0x8 _0810953C: .4byte gUnknown_203ACFC _08109540: .4byte gMain _08109544: .4byte gUnknown_203AD10 @@ -3044,7 +3044,7 @@ sub_81095AC: @ 81095AC adds r0, r1 lsls r0, 3 mov r9, r0 - ldr r0, _081095E4 @ =gUnknown_3005098 + ldr r0, _081095E4 @ =gTasks+0x8 mov r10, r0 mov r6, r9 add r6, r10 @@ -3061,7 +3061,7 @@ _081095DA: bl sub_810967C b _0810965C .align 2, 0 -_081095E4: .4byte gUnknown_3005098 +_081095E4: .4byte gTasks+0x8 _081095E8: ldr r1, _0810966C @ =gUnknown_203988C ldr r4, _08109670 @ =gUnknown_203ACFC @@ -3145,7 +3145,7 @@ sub_810967C: @ 810967C adds r1, r0 lsls r1, 3 mov r8, r1 - ldr r0, _0810970C @ =gUnknown_3005098 + ldr r0, _0810970C @ =gTasks+0x8 mov r10, r0 mov r6, r8 add r6, r10 @@ -3202,7 +3202,7 @@ _081096CA: pop {r0} bx r0 .align 2, 0 -_0810970C: .4byte gUnknown_3005098 +_0810970C: .4byte gTasks+0x8 _08109710: .4byte gUnknown_203ACFC _08109714: .4byte gUnknown_3005E70 _08109718: .4byte sub_8108F0C @@ -3765,7 +3765,7 @@ sub_8109BB8: @ 8109BB8 lsrs r4, 24 adds r0, r4, 0 bl sub_8109890 - ldr r1, _08109BDC @ =gUnknown_3005090 + ldr r1, _08109BDC @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -3776,7 +3776,7 @@ sub_8109BB8: @ 8109BB8 pop {r0} bx r0 .align 2, 0 -_08109BDC: .4byte gUnknown_3005090 +_08109BDC: .4byte gTasks _08109BE0: .4byte sub_8109BE4 thumb_func_end sub_8109BB8 @@ -3891,7 +3891,7 @@ sub_8109CC0: @ 8109CC0 lsls r0, r5, 2 adds r0, r5 lsls r6, r0, 3 - ldr r7, _08109D14 @ =gUnknown_3005098 + ldr r7, _08109D14 @ =gTasks+0x8 adds r4, r6, r7 movs r0, 0xA bl sub_810BAD8 @@ -3919,7 +3919,7 @@ sub_8109CC0: @ 8109CC0 bl sub_8109D38 b _08109D2A .align 2, 0 -_08109D14: .4byte gUnknown_3005098 +_08109D14: .4byte gTasks+0x8 _08109D18: ldrh r0, [r4, 0x2] ldr r1, _08109D30 @ =gUnknown_84163DB @@ -3948,7 +3948,7 @@ sub_8109D38: @ 8109D38 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 - ldr r0, _08109D9C @ =gUnknown_3005098 + ldr r0, _08109D9C @ =gTasks+0x8 adds r1, r0 ldr r0, _08109DA0 @ =gStringVar2 movs r2, 0x10 @@ -3985,7 +3985,7 @@ sub_8109D38: @ 8109D38 pop {r0} bx r0 .align 2, 0 -_08109D9C: .4byte gUnknown_3005098 +_08109D9C: .4byte gTasks+0x8 _08109DA0: .4byte gStringVar2 _08109DA4: .4byte gStringVar4 _08109DA8: .4byte gUnknown_8416409 @@ -4001,7 +4001,7 @@ sub_8109DB0: @ 8109DB0 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 - ldr r0, _08109DE8 @ =gUnknown_3005098 + ldr r0, _08109DE8 @ =gTasks+0x8 adds r4, r0 movs r0, 0x6 bl sub_810BA3C @@ -4018,7 +4018,7 @@ sub_8109DB0: @ 8109DB0 pop {r0} bx r0 .align 2, 0 -_08109DE8: .4byte gUnknown_3005098 +_08109DE8: .4byte gTasks+0x8 thumb_func_end sub_8109DB0 thumb_func_start sub_8109DEC @@ -4030,7 +4030,7 @@ sub_8109DEC: @ 8109DEC lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _08109E1C @ =gUnknown_3005098 + ldr r1, _08109E1C @ =gTasks+0x8 adds r4, r0, r1 adds r0, r4, 0 adds r0, 0x10 @@ -4046,7 +4046,7 @@ sub_8109DEC: @ 8109DEC bl sub_81097E4 b _08109EA2 .align 2, 0 -_08109E1C: .4byte gUnknown_3005098 +_08109E1C: .4byte gTasks+0x8 _08109E20: ldr r0, _08109E60 @ =gMain ldrh r1, [r0, 0x2E] @@ -4111,7 +4111,7 @@ sub_8109EA8: @ 8109EA8 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r5, _08109F28 @ =gUnknown_3005098 + ldr r5, _08109F28 @ =gTasks+0x8 adds r6, r4, r5 movs r0, 0x6 bl sub_810BA3C @@ -4162,7 +4162,7 @@ sub_8109EA8: @ 8109EA8 pop {r0} bx r0 .align 2, 0 -_08109F28: .4byte gUnknown_3005098 +_08109F28: .4byte gTasks+0x8 _08109F2C: .4byte gUnknown_203ACFC _08109F30: .4byte gStringVar1 _08109F34: .4byte gStringVar2 @@ -4182,7 +4182,7 @@ sub_8109F44: @ 8109F44 lsls r0, 2 add r0, r8 lsls r0, 3 - ldr r1, _08109FEC @ =gUnknown_3005098 + ldr r1, _08109FEC @ =gTasks+0x8 adds r7, r0, r1 ldr r0, _08109FF0 @ =gMain ldrh r1, [r0, 0x2E] @@ -4247,7 +4247,7 @@ _08109FE0: pop {r0} bx r0 .align 2, 0 -_08109FEC: .4byte gUnknown_3005098 +_08109FEC: .4byte gTasks+0x8 _08109FF0: .4byte gMain _08109FF4: .4byte gUnknown_203AD30 _08109FF8: .4byte gUnknown_203ACFC @@ -4265,7 +4265,7 @@ sub_810A000: @ 810A000 lsls r0, 2 add r0, r8 lsls r0, 3 - ldr r1, _0810A040 @ =gUnknown_3005098 + ldr r1, _0810A040 @ =gTasks+0x8 adds r7, r0, r1 ldr r0, _0810A044 @ =gUnknown_203ACFC ldrb r0, [r0, 0x6] @@ -4287,7 +4287,7 @@ sub_810A000: @ 810A000 strh r0, [r1] b _0810A052 .align 2, 0 -_0810A040: .4byte gUnknown_3005098 +_0810A040: .4byte gTasks+0x8 _0810A044: .4byte gUnknown_203ACFC _0810A048: .4byte gSaveBlock1Ptr _0810A04C: .4byte 0x00000296 @@ -4344,7 +4344,7 @@ sub_810A0A8: @ 810A0A8 lsls r0, r4, 2 adds r0, r4 lsls r6, r0, 3 - ldr r0, _0810A110 @ =gUnknown_3005098 + ldr r0, _0810A110 @ =gTasks+0x8 mov r8, r0 adds r1, r6, r0 ldr r0, _0810A114 @ =gUnknown_203ACFC @@ -4379,7 +4379,7 @@ sub_810A0A8: @ 810A0A8 bl sub_8108E70 b _0810A166 .align 2, 0 -_0810A110: .4byte gUnknown_3005098 +_0810A110: .4byte gTasks+0x8 _0810A114: .4byte gUnknown_203ACFC _0810A118: .4byte gUnknown_841630F _0810A11C: .4byte sub_810A1D0 @@ -4504,7 +4504,7 @@ sub_810A1F8: @ 810A1F8 lsls r5, r0, 2 add r5, r8 lsls r5, 3 - ldr r0, _0810A27C @ =gUnknown_3005098 + ldr r0, _0810A27C @ =gTasks+0x8 adds r5, r0 movs r0, 0x5 bl sub_810BA9C @@ -4551,7 +4551,7 @@ sub_810A1F8: @ 810A1F8 pop {r0} bx r0 .align 2, 0 -_0810A27C: .4byte gUnknown_3005098 +_0810A27C: .4byte gTasks+0x8 _0810A280: .4byte gUnknown_203ACFC _0810A284: .4byte gUnknown_3005E70 thumb_func_end sub_810A1F8 @@ -4566,7 +4566,7 @@ sub_810A288: @ 810A288 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 - ldr r0, _0810A2D8 @ =gUnknown_3005098 + ldr r0, _0810A2D8 @ =gTasks+0x8 adds r4, r0 ldrb r0, [r4] mov r6, sp @@ -4593,7 +4593,7 @@ sub_810A288: @ 810A288 pop {r0} bx r0 .align 2, 0 -_0810A2D8: .4byte gUnknown_3005098 +_0810A2D8: .4byte gTasks+0x8 thumb_func_end sub_810A288 thumb_func_start sub_810A2DC @@ -4612,7 +4612,7 @@ sub_810A2DC: @ 810A2DC bl PutWindowTilemap movs r0, 0 bl schedule_bg_copy_tilemap_to_vram - ldr r1, _0810A320 @ =gUnknown_3005090 + ldr r1, _0810A320 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -4626,7 +4626,7 @@ sub_810A2DC: @ 810A2DC pop {r0} bx r0 .align 2, 0 -_0810A320: .4byte gUnknown_3005090 +_0810A320: .4byte gTasks thumb_func_end sub_810A2DC thumb_func_start sub_810A324 @@ -4674,7 +4674,7 @@ sub_810A370: @ 810A370 lsls r0, r5, 2 adds r0, r5 lsls r7, r0, 3 - ldr r0, _0810A3BC @ =gUnknown_3005098 + ldr r0, _0810A3BC @ =gTasks+0x8 mov r9, r0 adds r1, r7, r0 ldr r2, _0810A3C0 @ =gUnknown_203ACFC @@ -4700,7 +4700,7 @@ sub_810A370: @ 810A370 bl sub_8108E70 b _0810A426 .align 2, 0 -_0810A3BC: .4byte gUnknown_3005098 +_0810A3BC: .4byte gTasks+0x8 _0810A3C0: .4byte gUnknown_203ACFC _0810A3C4: .4byte gUnknown_841630F _0810A3C8: .4byte sub_810A1D0 @@ -4802,7 +4802,7 @@ sub_810A468: @ 810A468 lsls r0, r5, 2 adds r0, r5 lsls r7, r0, 3 - ldr r0, _0810A4B4 @ =gUnknown_3005098 + ldr r0, _0810A4B4 @ =gTasks+0x8 mov r9, r0 adds r1, r7, r0 ldr r2, _0810A4B8 @ =gUnknown_203ACFC @@ -4829,7 +4829,7 @@ sub_810A468: @ 810A468 bl sub_8108E70 b _0810A51E .align 2, 0 -_0810A4B4: .4byte gUnknown_3005098 +_0810A4B4: .4byte gTasks+0x8 _0810A4B8: .4byte gUnknown_203ACFC _0810A4BC: .4byte gUnknown_841630F _0810A4C0: .4byte sub_810A1D0 @@ -4934,7 +4934,7 @@ sub_810A568: @ 810A568 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0810A58C @ =gUnknown_3005098 + ldr r1, _0810A58C @ =gTasks+0x8 adds r4, r0, r1 ldr r6, _0810A590 @ =gUnknown_203AD30 ldrh r1, [r6] @@ -4945,7 +4945,7 @@ sub_810A568: @ 810A568 ldr r0, _0810A594 @ =sub_810A654 b _0810A5A0 .align 2, 0 -_0810A58C: .4byte gUnknown_3005098 +_0810A58C: .4byte gTasks+0x8 _0810A590: .4byte gUnknown_203AD30 _0810A594: .4byte sub_810A654 _0810A598: @@ -5079,7 +5079,7 @@ sub_810A690: @ 810A690 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 - ldr r0, _0810A6F4 @ =gUnknown_3005098 + ldr r0, _0810A6F4 @ =gTasks+0x8 adds r4, r0 ldr r6, _0810A6F8 @ =gStringVar3 ldr r0, _0810A6FC @ =gUnknown_203ACFC @@ -5117,7 +5117,7 @@ sub_810A690: @ 810A690 pop {r0} bx r0 .align 2, 0 -_0810A6F4: .4byte gUnknown_3005098 +_0810A6F4: .4byte gTasks+0x8 _0810A6F8: .4byte gStringVar3 _0810A6FC: .4byte gUnknown_203ACFC _0810A700: .4byte gStringVar4 @@ -5147,7 +5147,7 @@ sub_810A720: @ 810A720 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 - ldr r0, _0810A76C @ =gUnknown_3005098 + ldr r0, _0810A76C @ =gTasks+0x8 adds r4, r0 movs r0, 0x2 bl sub_810BA3C @@ -5170,7 +5170,7 @@ sub_810A720: @ 810A720 pop {r0} bx r0 .align 2, 0 -_0810A76C: .4byte gUnknown_3005098 +_0810A76C: .4byte gTasks+0x8 thumb_func_end sub_810A720 thumb_func_start sub_810A770 @@ -5185,7 +5185,7 @@ sub_810A770: @ 810A770 lsls r5, r0, 2 adds r5, r0 lsls r5, 3 - ldr r0, _0810A81C @ =gUnknown_3005098 + ldr r0, _0810A81C @ =gTasks+0x8 mov r8, r0 adds r2, r5, 0 add r2, r8 @@ -5253,7 +5253,7 @@ sub_810A770: @ 810A770 pop {r0} bx r0 .align 2, 0 -_0810A81C: .4byte gUnknown_3005098 +_0810A81C: .4byte gTasks+0x8 _0810A820: .4byte gStringVar1 _0810A824: .4byte gStringVar4 _0810A828: .4byte gUnknown_84162B9 @@ -5291,7 +5291,7 @@ sub_810A85C: @ 810A85C lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _0810A8B4 @ =gUnknown_3005098 + ldr r1, _0810A8B4 @ =gTasks+0x8 adds r5, r0, r1 adds r0, r5, 0 adds r0, 0x10 @@ -5323,7 +5323,7 @@ sub_810A85C: @ 810A85C bl sub_810A834 b _0810A93A .align 2, 0 -_0810A8B4: .4byte gUnknown_3005098 +_0810A8B4: .4byte gTasks+0x8 _0810A8B8: .4byte gUnknown_203ACFC _0810A8BC: ldr r0, _0810A8EC @ =gMain @@ -5388,7 +5388,7 @@ sub_810A940: @ 810A940 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 - ldr r0, _0810A9B4 @ =gUnknown_3005098 + ldr r0, _0810A9B4 @ =gTasks+0x8 adds r4, r0 movs r0, 0 bl PutWindowTilemap @@ -5431,7 +5431,7 @@ sub_810A940: @ 810A940 pop {r0} bx r0 .align 2, 0 -_0810A9B4: .4byte gUnknown_3005098 +_0810A9B4: .4byte gTasks+0x8 _0810A9B8: .4byte gUnknown_203AD30 _0810A9BC: .4byte gStringVar1 _0810A9C0: .4byte gStringVar3 @@ -5453,7 +5453,7 @@ sub_810A9D4: @ 810A9D4 lsls r6, r0, 2 adds r6, r0 lsls r6, 3 - ldr r0, _0810AAD8 @ =gUnknown_3005098 + ldr r0, _0810AAD8 @ =gTasks+0x8 mov r10, r0 adds r1, r6, 0 add r1, r10 @@ -5558,7 +5558,7 @@ sub_810A9D4: @ 810A9D4 pop {r0} bx r0 .align 2, 0 -_0810AAD8: .4byte gUnknown_3005098 +_0810AAD8: .4byte gTasks+0x8 _0810AADC: .4byte gUnknown_203AD30 _0810AAE0: .4byte gSaveBlock1Ptr _0810AAE4: .4byte gUnknown_203ACFC @@ -5614,7 +5614,7 @@ sub_810AB40: @ 810AB40 lsls r0, r2, 2 adds r0, r2 lsls r4, r0, 3 - ldr r5, _0810AB64 @ =gUnknown_3005098 + ldr r5, _0810AB64 @ =gTasks+0x8 adds r1, r4, r5 movs r0, 0x1 strh r0, [r1, 0x10] @@ -5626,7 +5626,7 @@ sub_810AB40: @ 810AB40 bl sub_810AC40 b _0810AB7A .align 2, 0 -_0810AB64: .4byte gUnknown_3005098 +_0810AB64: .4byte gTasks+0x8 _0810AB68: ldrh r0, [r1, 0x2] ldr r1, _0810AB80 @ =gUnknown_841638F @@ -5654,7 +5654,7 @@ sub_810AB88: @ 810AB88 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0810ABB8 @ =gUnknown_3005098 + ldr r1, _0810ABB8 @ =gTasks+0x8 adds r4, r0, r1 adds r0, r4, 0 adds r0, 0x10 @@ -5670,7 +5670,7 @@ sub_810AB88: @ 810AB88 bl sub_81097E4 b _0810AC38 .align 2, 0 -_0810ABB8: .4byte gUnknown_3005098 +_0810ABB8: .4byte gTasks+0x8 _0810ABBC: ldr r0, _0810ABFC @ =gMain ldrh r1, [r0, 0x2E] @@ -5737,7 +5737,7 @@ sub_810AC40: @ 810AC40 adds r0, r4 lsls r0, 3 mov r8, r0 - ldr r0, _0810ACCC @ =gUnknown_3005098 + ldr r0, _0810ACCC @ =gTasks+0x8 mov r9, r0 mov r7, r8 add r7, r9 @@ -5790,7 +5790,7 @@ sub_810AC40: @ 810AC40 str r1, [r0] b _0810ACF8 .align 2, 0 -_0810ACCC: .4byte gUnknown_3005098 +_0810ACCC: .4byte gTasks+0x8 _0810ACD0: .4byte gUnknown_203AD30 _0810ACD4: .4byte 0x0000ffff _0810ACD8: .4byte gStringVar1 @@ -5859,7 +5859,7 @@ _0810AD1E: bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _0810AD8C @ =gUnknown_3005090 + ldr r2, _0810AD8C @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -5870,7 +5870,7 @@ _0810AD1E: _0810AD80: .4byte gSaveBlock1Ptr _0810AD84: .4byte 0x00000296 _0810AD88: .4byte gUnknown_203AD30 -_0810AD8C: .4byte gUnknown_3005090 +_0810AD8C: .4byte gTasks _0810AD90: ldr r0, [r4] adds r0, r5 @@ -6142,7 +6142,7 @@ sub_810AF9C: @ 810AF9C lsls r0, r4, 2 adds r0, r4 lsls r6, r0, 3 - ldr r7, _0810AFCC @ =gUnknown_3005098 + ldr r7, _0810AFCC @ =gTasks+0x8 adds r5, r6, r7 ldr r0, _0810AFD0 @ =gUnknown_2037AB8 ldrb r1, [r0, 0x7] @@ -6160,7 +6160,7 @@ sub_810AF9C: @ 810AF9C beq _0810AFE4 b _0810B064 .align 2, 0 -_0810AFCC: .4byte gUnknown_3005098 +_0810AFCC: .4byte gTasks+0x8 _0810AFD0: .4byte gUnknown_2037AB8 _0810AFD4: movs r0, 0x99 @@ -6248,7 +6248,7 @@ sub_810B070: @ 810B070 str r2, [sp] movs r3, 0x10 bl BeginNormalPaletteFade - ldr r1, _0810B0A4 @ =gUnknown_3005090 + ldr r1, _0810B0A4 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -6260,7 +6260,7 @@ sub_810B070: @ 810B070 pop {r0} bx r0 .align 2, 0 -_0810B0A4: .4byte gUnknown_3005090 +_0810B0A4: .4byte gTasks _0810B0A8: .4byte sub_810B0AC thumb_func_end sub_810B070 @@ -6388,7 +6388,7 @@ _0810B19C: ldr r1, [r0] ldr r0, _0810B1C8 @ =sub_815ABFC str r0, [r1] - ldr r1, _0810B1CC @ =gUnknown_3005090 + ldr r1, _0810B1CC @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -6403,7 +6403,7 @@ _0810B1BC: .align 2, 0 _0810B1C4: .4byte gUnknown_203AD10 _0810B1C8: .4byte sub_815ABFC -_0810B1CC: .4byte gUnknown_3005090 +_0810B1CC: .4byte gTasks _0810B1D0: .4byte sub_810B070 thumb_func_end sub_810B180 @@ -6415,7 +6415,7 @@ sub_810B1D4: @ 810B1D4 lsls r0, r4, 2 adds r0, r4 lsls r5, r0, 3 - ldr r6, _0810B220 @ =gUnknown_3005098 + ldr r6, _0810B220 @ =gTasks+0x8 adds r7, r5, r6 ldr r0, _0810B224 @ =gUnknown_2037AB8 ldrb r1, [r0, 0x7] @@ -6449,7 +6449,7 @@ _0810B202: beq _0810B254 b _0810B36C .align 2, 0 -_0810B220: .4byte gUnknown_3005098 +_0810B220: .4byte gTasks+0x8 _0810B224: .4byte gUnknown_2037AB8 _0810B228: movs r0, 0x99 @@ -6612,7 +6612,7 @@ sub_810B378: @ 810B378 lsls r0, r5, 2 adds r0, r5 lsls r6, r0, 3 - ldr r7, _0810B3B0 @ =gUnknown_3005098 + ldr r7, _0810B3B0 @ =gTasks+0x8 adds r4, r6, r7 ldr r0, _0810B3B4 @ =gUnknown_2037AB8 ldrb r1, [r0, 0x7] @@ -6632,7 +6632,7 @@ _0810B396: bl sub_804C230 b _0810B4B6 .align 2, 0 -_0810B3B0: .4byte gUnknown_3005098 +_0810B3B0: .4byte gTasks+0x8 _0810B3B4: .4byte gUnknown_2037AB8 _0810B3B8: movs r0, 0x10 @@ -6771,7 +6771,7 @@ sub_810B4BC: @ 810B4BC adds r0, r4 lsls r0, 3 mov r8, r0 - ldr r0, _0810B504 @ =gUnknown_3005098 + ldr r0, _0810B504 @ =gTasks+0x8 mov r9, r0 mov r5, r8 add r5, r9 @@ -6794,7 +6794,7 @@ sub_810B4BC: @ 810B4BC bl sub_804C230 b _0810B5C6 .align 2, 0 -_0810B504: .4byte gUnknown_3005098 +_0810B504: .4byte gTasks+0x8 _0810B508: .4byte gUnknown_2037AB8 _0810B50C: movs r0, 0x10 @@ -6897,7 +6897,7 @@ sub_810B5D4: @ 810B5D4 adds r0, r4 lsls r0, 3 mov r8, r0 - ldr r0, _0810B624 @ =gUnknown_3005098 + ldr r0, _0810B624 @ =gTasks+0x8 mov r9, r0 mov r6, r8 add r6, r9 @@ -6926,7 +6926,7 @@ sub_810B5D4: @ 810B5D4 beq _0810B63C b _0810B6E0 .align 2, 0 -_0810B624: .4byte gUnknown_3005098 +_0810B624: .4byte gTasks+0x8 _0810B628: .4byte gUnknown_2037AB8 _0810B62C: movs r0, 0x99 diff --git a/asm/item_pc.s b/asm/item_pc.s index f79e0bede..d209e7c0d 100644 --- a/asm/item_pc.s +++ b/asm/item_pc.s @@ -238,7 +238,7 @@ _0810D5CC: ldrh r1, [r2, 0x4] ldrh r2, [r2, 0x6] bl ListMenuInit - ldr r2, _0810D604 @ =gUnknown_3005090 + ldr r2, _0810D604 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -251,7 +251,7 @@ _0810D5CC: _0810D5F8: .4byte sub_810DEA0 _0810D5FC: .4byte gUnknown_3005E70 _0810D600: .4byte gUnknown_203ADCC -_0810D604: .4byte gUnknown_3005090 +_0810D604: .4byte gTasks _0810D608: bl sub_810DB5C b _0810D674 @@ -1114,7 +1114,7 @@ _0810DCB4: movs r0, 0x3 bl PlaySE _0810DCC4: - ldr r0, _0810DCDC @ =gUnknown_3005090 + ldr r0, _0810DCDC @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -1126,7 +1126,7 @@ _0810DCC4: pop {r0} bx r0 .align 2, 0 -_0810DCDC: .4byte gUnknown_3005090 +_0810DCDC: .4byte gTasks _0810DCE0: .4byte sub_810DCE4 thumb_func_end sub_810DC8C @@ -1138,7 +1138,7 @@ sub_810DCE4: @ 810DCE4 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0810DD28 @ =gUnknown_3005098 + ldr r1, _0810DD28 @ =gTasks+0x8 adds r4, r0, r1 ldr r0, _0810DD2C @ =gUnknown_2037AB8 ldrb r1, [r0, 0x7] @@ -1163,7 +1163,7 @@ sub_810DCE4: @ 810DCE4 bl SetMainCallback2 b _0810DD40 .align 2, 0 -_0810DD28: .4byte gUnknown_3005098 +_0810DD28: .4byte gTasks+0x8 _0810DD2C: .4byte gUnknown_2037AB8 _0810DD30: .4byte gUnknown_203ADD0 _0810DD34: .4byte gUnknown_203ADBC @@ -1380,7 +1380,7 @@ sub_810DEA0: @ 810DEA0 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0810DF10 @ =gUnknown_3005098 + ldr r1, _0810DF10 @ =gTasks+0x8 adds r6, r0, r1 ldr r0, _0810DF14 @ =gUnknown_2037AB8 ldrb r1, [r0, 0x7] @@ -1425,7 +1425,7 @@ sub_810DEA0: @ 810DEA0 bl sub_810DFE0 b _0810DF9E .align 2, 0 -_0810DF10: .4byte gUnknown_3005098 +_0810DF10: .4byte gTasks+0x8 _0810DF14: .4byte gUnknown_2037AB8 _0810DF18: .4byte gMain _0810DF1C: .4byte gUnknown_203ADBC @@ -1452,7 +1452,7 @@ _0810DF48: bl PlaySE movs r0, 0 bl sub_810DE94 - ldr r0, _0810DF64 @ =gUnknown_3005090 + ldr r0, _0810DF64 @ =gTasks lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -1461,7 +1461,7 @@ _0810DF48: str r0, [r1] b _0810DF9E .align 2, 0 -_0810DF64: .4byte gUnknown_3005090 +_0810DF64: .4byte gTasks _0810DF68: .4byte sub_810DC8C _0810DF6C: movs r0, 0x5 @@ -1477,7 +1477,7 @@ _0810DF6C: ldrb r0, [r6] movs r1, 0x2 bl sub_810DAB4 - ldr r1, _0810DFA8 @ =gUnknown_3005090 + ldr r1, _0810DFA8 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -1490,7 +1490,7 @@ _0810DF9E: pop {r0} bx r0 .align 2, 0 -_0810DFA8: .4byte gUnknown_3005090 +_0810DFA8: .4byte gTasks _0810DFAC: .4byte sub_810E274 thumb_func_end sub_810DEA0 @@ -1503,7 +1503,7 @@ sub_810DFB0: @ 810DFB0 movs r0, 0 bl sub_810DE6C bl sub_810DB5C - ldr r1, _0810DFD8 @ =gUnknown_3005090 + ldr r1, _0810DFD8 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -1514,7 +1514,7 @@ sub_810DFB0: @ 810DFB0 pop {r0} bx r0 .align 2, 0 -_0810DFD8: .4byte gUnknown_3005090 +_0810DFD8: .4byte gTasks _0810DFDC: .4byte sub_810DEA0 thumb_func_end sub_810DFB0 @@ -1533,7 +1533,7 @@ sub_810DFE0: @ 810DFE0 lsls r5, r0, 2 adds r5, r0 lsls r5, 3 - ldr r0, _0810E09C @ =gUnknown_3005098 + ldr r0, _0810E09C @ =gTasks+0x8 mov r8, r0 adds r6, r5, r0 ldrb r0, [r6] @@ -1603,7 +1603,7 @@ sub_810DFE0: @ 810DFE0 pop {r0} bx r0 .align 2, 0 -_0810E09C: .4byte gUnknown_3005098 +_0810E09C: .4byte gTasks+0x8 _0810E0A0: .4byte gUnknown_203ADBC _0810E0A4: .4byte gStringVar1 _0810E0A8: .4byte gStringVar4 @@ -1622,7 +1622,7 @@ sub_810E0B4: @ 810E0B4 lsls r4, r6, 2 adds r4, r6 lsls r4, 3 - ldr r0, _0810E11C @ =gUnknown_3005098 + ldr r0, _0810E11C @ =gTasks+0x8 adds r4, r0 ldrb r0, [r4] bl ListMenuHandleInput @@ -1660,7 +1660,7 @@ sub_810E0B4: @ 810E0B4 bl sub_810E160 b _0810E150 .align 2, 0 -_0810E11C: .4byte gUnknown_3005098 +_0810E11C: .4byte gTasks+0x8 _0810E120: .4byte gUnknown_203ADD0 _0810E124: .4byte gMain _0810E128: .4byte gUnknown_203ADBC @@ -1702,7 +1702,7 @@ sub_810E160: @ 810E160 lsls r0, r2, 2 adds r0, r2 lsls r7, r0, 3 - ldr r0, _0810E190 @ =gUnknown_3005098 + ldr r0, _0810E190 @ =gTasks+0x8 mov r8, r0 adds r6, r7, r0 movs r0, 0x2 @@ -1718,7 +1718,7 @@ _0810E186: bl sub_810E200 b _0810E1E6 .align 2, 0 -_0810E190: .4byte gUnknown_3005098 +_0810E190: .4byte gTasks+0x8 _0810E194: ldr r0, _0810E1F0 @ =gSaveBlock1Ptr ldr r0, [r0] @@ -1781,7 +1781,7 @@ sub_810E200: @ 810E200 lsls r1, r0, 2 adds r1, r0 lsls r7, r1, 3 - ldr r0, _0810E264 @ =gUnknown_3005098 + ldr r0, _0810E264 @ =gTasks+0x8 mov r8, r0 adds r6, r7, r0 ldrb r0, [r6] @@ -1820,7 +1820,7 @@ _0810E234: pop {r0} bx r0 .align 2, 0 -_0810E264: .4byte gUnknown_3005098 +_0810E264: .4byte gTasks+0x8 _0810E268: .4byte gUnknown_203ADD0 _0810E26C: .4byte gUnknown_3005E70 _0810E270: .4byte sub_810DEA0 @@ -1838,7 +1838,7 @@ sub_810E274: @ 810E274 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _0810E340 @ =gUnknown_3005098 + ldr r0, _0810E340 @ =gTasks+0x8 mov r9, r0 adds r6, r4, r0 movs r0, 0x4 @@ -1919,7 +1919,7 @@ sub_810E274: @ 810E274 pop {r0} bx r0 .align 2, 0 -_0810E340: .4byte gUnknown_3005098 +_0810E340: .4byte gTasks+0x8 _0810E344: .4byte gUnknown_8453F74 _0810E348: .4byte gStringVar1 _0810E34C: .4byte gStringVar4 @@ -1974,7 +1974,7 @@ sub_810E3A4: @ 810E3A4 lsls r0, r5, 2 adds r0, r5 lsls r6, r0, 3 - ldr r7, _0810E3F0 @ =gUnknown_3005098 + ldr r7, _0810E3F0 @ =gTasks+0x8 adds r4, r6, r7 movs r0, 0x4 movs r1, 0 @@ -1999,7 +1999,7 @@ sub_810E3A4: @ 810E3A4 bl sub_810E418 b _0810E40E .align 2, 0 -_0810E3F0: .4byte gUnknown_3005098 +_0810E3F0: .4byte gTasks+0x8 _0810E3F4: movs r0, 0 bl PutWindowTilemap @@ -2028,7 +2028,7 @@ sub_810E418: @ 810E418 lsls r1, r0, 2 adds r1, r0 lsls r6, r1, 3 - ldr r7, _0810E49C @ =gUnknown_3005098 + ldr r7, _0810E49C @ =gTasks+0x8 adds r5, r6, r7 ldrh r0, [r5, 0x2] bl sub_810DD68 @@ -2079,7 +2079,7 @@ sub_810E418: @ 810E418 ldr r1, _0810E4B4 @ =sub_810E4F4 b _0810E4E0 .align 2, 0 -_0810E49C: .4byte gUnknown_3005098 +_0810E49C: .4byte gTasks+0x8 _0810E4A0: .4byte 0x0000ffff _0810E4A4: .4byte gStringVar1 _0810E4A8: .4byte gStringVar2 @@ -2125,7 +2125,7 @@ sub_810E4F4: @ 810E4F4 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _0810E540 @ =gUnknown_3005098 + ldr r1, _0810E540 @ =gTasks+0x8 adds r5, r0, r1 ldr r0, _0810E544 @ =gMain ldrh r1, [r0, 0x2E] @@ -2154,7 +2154,7 @@ _0810E53A: pop {r0} bx r0 .align 2, 0 -_0810E540: .4byte gUnknown_3005098 +_0810E540: .4byte gTasks+0x8 _0810E544: .4byte gMain thumb_func_end sub_810E4F4 @@ -2195,7 +2195,7 @@ sub_810E578: @ 810E578 lsls r5, r6, 2 adds r5, r6 lsls r5, 3 - ldr r0, _0810E5D4 @ =gUnknown_3005098 + ldr r0, _0810E5D4 @ =gTasks+0x8 adds r5, r0 movs r0, 0x2 bl sub_810EAF0 @@ -2225,7 +2225,7 @@ sub_810E578: @ 810E578 pop {r0} bx r0 .align 2, 0 -_0810E5D4: .4byte gUnknown_3005098 +_0810E5D4: .4byte gTasks+0x8 _0810E5D8: .4byte gUnknown_203ADD0 _0810E5DC: .4byte gUnknown_3005E70 thumb_func_end sub_810E578 @@ -2352,7 +2352,7 @@ sub_810E6D8: @ 810E6D8 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0810E708 @ =gUnknown_3005098 + ldr r1, _0810E708 @ =gTasks+0x8 adds r4, r0, r1 adds r0, r4, 0 adds r0, 0x10 @@ -2367,7 +2367,7 @@ sub_810E6D8: @ 810E6D8 bl sub_810E670 b _0810E796 .align 2, 0 -_0810E708: .4byte gUnknown_3005098 +_0810E708: .4byte gTasks+0x8 _0810E70C: ldr r0, _0810E74C @ =gMain ldrh r1, [r0, 0x2E] @@ -2516,7 +2516,7 @@ sub_810E848: @ 810E848 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _0810E898 @ =gUnknown_3005098 + ldr r1, _0810E898 @ =gTasks+0x8 adds r5, r0, r1 ldr r0, _0810E89C @ =gMain ldrh r1, [r0, 0x2E] @@ -2545,7 +2545,7 @@ _0810E892: pop {r0} bx r0 .align 2, 0 -_0810E898: .4byte gUnknown_3005098 +_0810E898: .4byte gTasks+0x8 _0810E89C: .4byte gMain thumb_func_end sub_810E848 @@ -2558,7 +2558,7 @@ sub_810E8A0: @ 810E8A0 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 - ldr r0, _0810E8EC @ =gUnknown_3005098 + ldr r0, _0810E8EC @ =gTasks+0x8 adds r4, r0 movs r0, 0x4 movs r1, 0 @@ -2582,7 +2582,7 @@ sub_810E8A0: @ 810E8A0 pop {r0} bx r0 .align 2, 0 -_0810E8EC: .4byte gUnknown_3005098 +_0810E8EC: .4byte gTasks+0x8 thumb_func_end sub_810E8A0 thumb_func_start sub_810E8F0 diff --git a/asm/item_use.s b/asm/item_use.s index c8515d01d..cb8143749 100644 --- a/asm/item_use.s +++ b/asm/item_use.s @@ -14,7 +14,7 @@ sub_80A0FBC: @ 80A0FBC ldrh r0, [r1] cmp r0, 0xAF bne _080A0FE0 - ldr r0, _080A0FDC @ =gUnknown_3005090 + ldr r0, _080A0FDC @ =gTasks lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -23,7 +23,7 @@ sub_80A0FBC: @ 80A0FBC b _080A0FE6 .align 2, 0 _080A0FD8: .4byte gUnknown_203AD30 -_080A0FDC: .4byte gUnknown_3005090 +_080A0FDC: .4byte gTasks _080A0FE0: ldrh r0, [r1] bl ItemId_GetType @@ -74,7 +74,7 @@ sub_80A103C: @ 80A103C push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r1, _080A1064 @ =gUnknown_3005090 + ldr r1, _080A1064 @ =gTasks lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -90,7 +90,7 @@ sub_80A103C: @ 80A103C bl sub_80A0FBC b _080A107A .align 2, 0 -_080A1064: .4byte gUnknown_3005090 +_080A1064: .4byte gTasks _080A1068: .4byte gUnknown_3005020 _080A106C: .4byte sub_80A1084 _080A1070: @@ -383,7 +383,7 @@ sub_80A122C: @ 80A122C cmp r0, 0x1 bne _080A12BC _080A129A: - ldr r1, _080A12B4 @ =gUnknown_3005090 + ldr r1, _080A12B4 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -395,7 +395,7 @@ _080A129A: bl sub_80A10C4 b _080A12F6 .align 2, 0 -_080A12B4: .4byte gUnknown_3005090 +_080A12B4: .4byte gTasks _080A12B8: .4byte gUnknown_8416451 _080A12BC: bl sub_8055C9C @@ -415,7 +415,7 @@ _080A12BC: _080A12DC: .4byte gUnknown_2039998 _080A12E0: .4byte sub_80A1304 _080A12E4: - ldr r0, _080A1300 @ =gUnknown_3005090 + ldr r0, _080A1300 @ =gTasks lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -429,7 +429,7 @@ _080A12F6: pop {r0} bx r0 .align 2, 0 -_080A1300: .4byte gUnknown_3005090 +_080A1300: .4byte gTasks thumb_func_end sub_80A122C thumb_func_start sub_80A1304 @@ -476,7 +476,7 @@ sub_80A1338: @ 80A1338 _080A1358: .4byte gUnknown_2039998 _080A135C: .4byte ItemUseOnFieldCB_Rod _080A1360: - ldr r0, _080A1378 @ =gUnknown_3005090 + ldr r0, _080A1378 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -489,7 +489,7 @@ _080A1372: pop {r0} bx r0 .align 2, 0 -_080A1378: .4byte gUnknown_3005090 +_080A1378: .4byte gTasks thumb_func_end sub_80A1338 thumb_func_start sub_80A137C @@ -631,7 +631,7 @@ sub_80A1460: @ 80A1460 movs r0, 0x4 movs r1, 0 bl sub_80A2294 - ldr r1, _080A14C8 @ =gUnknown_3005090 + ldr r1, _080A14C8 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -652,7 +652,7 @@ _080A14B8: .4byte gStringVar4 _080A14BC: .4byte gUnknown_8416537 _080A14C0: .4byte gUnknown_203AD30 _080A14C4: .4byte 0x0000ffff -_080A14C8: .4byte gUnknown_3005090 +_080A14C8: .4byte gTasks _080A14CC: .4byte sub_810A1F8 _080A14D0: ldr r3, _080A14E4 @ =sub_80A112C @@ -690,7 +690,7 @@ sub_80A14E8: @ 80A14E8 movs r0, 0x4 movs r1, 0 bl sub_80A2294 - ldr r1, _080A154C @ =gUnknown_3005090 + ldr r1, _080A154C @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -711,7 +711,7 @@ _080A153C: .4byte gStringVar4 _080A1540: .4byte gUnknown_8416644 _080A1544: .4byte gUnknown_203AD30 _080A1548: .4byte 0x0000ffff -_080A154C: .4byte gUnknown_3005090 +_080A154C: .4byte gTasks _080A1550: .4byte sub_810A1F8 _080A1554: ldr r3, _080A1568 @ =sub_80A112C @@ -766,7 +766,7 @@ _080A1598: movs r0, 0x4 movs r1, 0 bl sub_80A2294 - ldr r1, _080A15DC @ =gUnknown_3005090 + ldr r1, _080A15DC @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -782,7 +782,7 @@ _080A1598: _080A15D0: .4byte gPlayerParty _080A15D4: .4byte gUnknown_203AD30 _080A15D8: .4byte 0x0000ffff -_080A15DC: .4byte gUnknown_3005090 +_080A15DC: .4byte gTasks _080A15E0: .4byte gUnknown_8416690 _080A15E4: .4byte sub_80A1648 _080A15E8: @@ -796,7 +796,7 @@ _080A15E8: _080A15F8: .4byte gUnknown_8416690 _080A15FC: .4byte sub_80A1648 _080A1600: - ldr r0, _080A1620 @ =gUnknown_3005090 + ldr r0, _080A1620 @ =gTasks lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -813,7 +813,7 @@ _080A1616: bl sub_8108E70 b _080A1638 .align 2, 0 -_080A1620: .4byte gUnknown_3005090 +_080A1620: .4byte gTasks _080A1624: .4byte gUnknown_841665C _080A1628: .4byte sub_810A1F8 _080A162C: @@ -839,7 +839,7 @@ sub_80A1648: @ 80A1648 lsrs r4, 24 movs r0, 0xB bl sub_8071BC4 - ldr r1, _080A166C @ =gUnknown_3005090 + ldr r1, _080A166C @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -850,7 +850,7 @@ sub_80A1648: @ 80A1648 pop {r0} bx r0 .align 2, 0 -_080A166C: .4byte gUnknown_3005090 +_080A166C: .4byte gTasks _080A1670: .4byte sub_80A1674 thumb_func_end sub_80A1648 @@ -865,7 +865,7 @@ sub_80A1674: @ 80A1674 lsls r0, 24 cmp r0, 0 beq _080A16C0 - ldr r0, _080A16A8 @ =gUnknown_3005090 + ldr r0, _080A16A8 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -881,7 +881,7 @@ sub_80A1674: @ 80A1674 bl sub_8108E70 b _080A16C0 .align 2, 0 -_080A16A8: .4byte gUnknown_3005090 +_080A16A8: .4byte gTasks _080A16AC: .4byte gUnknown_84166A7 _080A16B0: .4byte sub_810A1F8 _080A16B4: @@ -1010,7 +1010,7 @@ sub_80A1788: @ 80A1788 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _080A17B0 @ =gUnknown_3005090 + ldr r1, _080A17B0 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -1025,7 +1025,7 @@ sub_80A1788: @ 80A1788 bl sub_8108B50 b _080A17C8 .align 2, 0 -_080A17B0: .4byte gUnknown_3005090 +_080A17B0: .4byte gTasks _080A17B4: .4byte sub_80A17D4 _080A17B8: bl sub_80CCB68 @@ -1088,7 +1088,7 @@ sub_80A1820: @ 80A1820 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _080A1848 @ =gUnknown_3005090 + ldr r1, _080A1848 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -1103,7 +1103,7 @@ sub_80A1820: @ 80A1820 bl sub_8108B50 b _080A1860 .align 2, 0 -_080A1848: .4byte gUnknown_3005090 +_080A1848: .4byte gTasks _080A184C: .4byte sub_80A186C _080A1850: bl sub_80CCB68 @@ -1202,7 +1202,7 @@ sub_80A18EC: @ 80A18EC movs r0, 0x4 movs r1, 0 bl sub_80A2294 - ldr r1, _080A1928 @ =gUnknown_3005090 + ldr r1, _080A1928 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -1219,7 +1219,7 @@ sub_80A18EC: @ 80A18EC .align 2, 0 _080A1920: .4byte gUnknown_203AD30 _080A1924: .4byte 0x0000ffff -_080A1928: .4byte gUnknown_3005090 +_080A1928: .4byte gTasks _080A192C: .4byte sub_80A194C _080A1930: bl sub_80CCB68 @@ -1287,7 +1287,7 @@ sub_80A1998: @ 80A1998 bne _080A19CC movs r0, 0x29 bl PlaySE - ldr r0, _080A19C4 @ =gUnknown_3005090 + ldr r0, _080A19C4 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -1297,7 +1297,7 @@ sub_80A1998: @ 80A1998 b _080A19D8 .align 2, 0 _080A19C0: .4byte 0x00004020 -_080A19C4: .4byte gUnknown_3005090 +_080A19C4: .4byte gTasks _080A19C8: .4byte sub_80A19E8 _080A19CC: ldr r2, _080A19E0 @ =gUnknown_841659E @@ -1413,7 +1413,7 @@ sub_80A1A94: @ 80A1A94 ldr r0, _080A1AE8 @ =gStringVar4 ldr r1, _080A1AEC @ =gUnknown_84165D2 bl StringExpandPlaceholders - ldr r1, _080A1AF0 @ =gUnknown_3005090 + ldr r1, _080A1AF0 @ =gTasks lsls r0, r4, 2 adds r0, r4 b _080A1B1A @@ -1425,7 +1425,7 @@ _080A1AE0: .4byte 0x00000804 _080A1AE4: .4byte gStringVar2 _080A1AE8: .4byte gStringVar4 _080A1AEC: .4byte gUnknown_84165D2 -_080A1AF0: .4byte gUnknown_3005090 +_080A1AF0: .4byte gTasks _080A1AF4: cmp r0, 0x2A bne _080A1B26 @@ -1439,7 +1439,7 @@ _080A1AF4: ldr r0, _080A1B38 @ =gStringVar4 ldr r1, _080A1B3C @ =gUnknown_8416600 bl StringExpandPlaceholders - ldr r1, _080A1B40 @ =gUnknown_3005090 + ldr r1, _080A1B40 @ =gTasks lsls r0, r6, 2 adds r0, r6 _080A1B1A: @@ -1459,7 +1459,7 @@ _080A1B30: .4byte 0x00000803 _080A1B34: .4byte gStringVar2 _080A1B38: .4byte gStringVar4 _080A1B3C: .4byte gUnknown_8416600 -_080A1B40: .4byte gUnknown_3005090 +_080A1B40: .4byte gTasks _080A1B44: .4byte sub_80A1B48 thumb_func_end sub_80A1A94 @@ -1468,7 +1468,7 @@ sub_80A1B48: @ 80A1B48 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080A1B80 @ =gUnknown_3005090 + ldr r0, _080A1B80 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -1492,7 +1492,7 @@ _080A1B78: pop {r0} bx r0 .align 2, 0 -_080A1B80: .4byte gUnknown_3005090 +_080A1B80: .4byte gTasks _080A1B84: .4byte gStringVar4 _080A1B88: .4byte sub_810A1F8 thumb_func_end sub_80A1B48 @@ -1546,7 +1546,7 @@ _080A1BE0: .4byte gMapHeader _080A1BE4: .4byte gUnknown_2039998 _080A1BE8: .4byte sub_80A1C08 _080A1BEC: - ldr r0, _080A1C04 @ =gUnknown_3005090 + ldr r0, _080A1C04 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -1559,7 +1559,7 @@ _080A1BFE: pop {r0} bx r0 .align 2, 0 -_080A1C04: .4byte gUnknown_3005090 +_080A1C04: .4byte gTasks thumb_func_end ItemUseOutOfBattle_EscapeRope thumb_func_start sub_80A1C08 @@ -1570,7 +1570,7 @@ sub_80A1C08: @ 80A1C08 lsrs r4, 24 bl sub_8054D70 bl sub_80A1A44 - ldr r1, _080A1C38 @ =gUnknown_3005090 + ldr r1, _080A1C38 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -1586,7 +1586,7 @@ sub_80A1C08: @ 80A1C08 pop {r0} bx r0 .align 2, 0 -_080A1C38: .4byte gUnknown_3005090 +_080A1C38: .4byte gTasks _080A1C3C: .4byte gStringVar4 _080A1C40: .4byte sub_80A1C44 thumb_func_end sub_80A1C08 @@ -1611,7 +1611,7 @@ sub_80A1C60: @ 80A1C60 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _080A1C88 @ =gUnknown_3005090 + ldr r1, _080A1C88 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -1626,7 +1626,7 @@ sub_80A1C60: @ 80A1C60 bl sub_8108B50 b _080A1CA0 .align 2, 0 -_080A1C88: .4byte gUnknown_3005090 +_080A1C88: .4byte gTasks _080A1C8C: .4byte sub_80A1CAC _080A1C90: bl sub_80CCB68 @@ -1693,7 +1693,7 @@ sub_80A1CF8: @ 80A1CF8 movs r0, 0x4 movs r1, 0 bl sub_80A2294 - ldr r1, _080A1D34 @ =gUnknown_3005090 + ldr r1, _080A1D34 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -1710,7 +1710,7 @@ sub_80A1CF8: @ 80A1CF8 .align 2, 0 _080A1D2C: .4byte gUnknown_203AD30 _080A1D30: .4byte 0x0000ffff -_080A1D34: .4byte gUnknown_3005090 +_080A1D34: .4byte gTasks _080A1D38: .4byte sub_80A1D58 _080A1D3C: bl sub_80CCB68 @@ -1795,7 +1795,7 @@ _080A1DB2: cmp r0, 0x79 bne _080A1DF4 _080A1DD2: - ldr r0, _080A1DF0 @ =gUnknown_3005090 + ldr r0, _080A1DF0 @ =gTasks lsls r1, r2, 2 adds r1, r2 lsls r1, 3 @@ -1807,7 +1807,7 @@ _080A1DD2: .align 2, 0 _080A1DE8: .4byte gMapHeader _080A1DEC: .4byte gSaveBlock1Ptr -_080A1DF0: .4byte gUnknown_3005090 +_080A1DF0: .4byte gTasks _080A1DF4: ldr r1, _080A1E04 @ =gUnknown_2039998 ldr r0, _080A1E08 @ =sub_810C670 @@ -1919,7 +1919,7 @@ _080A1EC8: .4byte gUnknown_203AD30 _080A1ECC: .4byte gUnknown_84169DC _080A1ED0: .4byte sub_810A1F8 _080A1ED4: - ldr r0, _080A1EEC @ =gUnknown_3005090 + ldr r0, _080A1EEC @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -1932,7 +1932,7 @@ _080A1EE4: pop {r0} bx r0 .align 2, 0 -_080A1EEC: .4byte gUnknown_3005090 +_080A1EEC: .4byte gTasks _080A1EF0: .4byte sub_80A1EF4 thumb_func_end sub_80A1E7C @@ -1944,7 +1944,7 @@ sub_80A1EF4: @ 80A1EF4 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 - ldr r0, _080A1F3C @ =gUnknown_3005098 + ldr r0, _080A1F3C @ =gTasks+0x8 adds r1, r0 ldrh r0, [r1, 0x10] adds r0, 0x1 @@ -1972,7 +1972,7 @@ _080A1F36: pop {r0} bx r0 .align 2, 0 -_080A1F3C: .4byte gUnknown_3005098 +_080A1F3C: .4byte gTasks+0x8 _080A1F40: .4byte gUnknown_203AD30 _080A1F44: .4byte sub_80A1F48 thumb_func_end sub_80A1EF4 @@ -2172,7 +2172,7 @@ _080A2094: .4byte _080A213C .4byte _080A2158 _080A20E8: - ldr r0, _080A2100 @ =gUnknown_3005090 + ldr r0, _080A2100 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -2183,9 +2183,9 @@ _080A20E8: bl sub_80A16E0 b _080A2188 .align 2, 0 -_080A2100: .4byte gUnknown_3005090 +_080A2100: .4byte gTasks _080A2104: - ldr r0, _080A211C @ =gUnknown_3005090 + ldr r0, _080A211C @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -2196,9 +2196,9 @@ _080A2104: bl sub_80A176C b _080A2188 .align 2, 0 -_080A211C: .4byte gUnknown_3005090 +_080A211C: .4byte gTasks _080A2120: - ldr r0, _080A2138 @ =gUnknown_3005090 + ldr r0, _080A2138 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -2209,9 +2209,9 @@ _080A2120: bl sub_80A1734 b _080A2188 .align 2, 0 -_080A2138: .4byte gUnknown_3005090 +_080A2138: .4byte gTasks _080A213C: - ldr r0, _080A2154 @ =gUnknown_3005090 + ldr r0, _080A2154 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -2222,9 +2222,9 @@ _080A213C: bl sub_80A1718 b _080A2188 .align 2, 0 -_080A2154: .4byte gUnknown_3005090 +_080A2154: .4byte gTasks _080A2158: - ldr r0, _080A2170 @ =gUnknown_3005090 + ldr r0, _080A2170 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -2235,9 +2235,9 @@ _080A2158: bl sub_80A16FC b _080A2188 .align 2, 0 -_080A2170: .4byte gUnknown_3005090 +_080A2170: .4byte gTasks _080A2174: - ldr r0, _080A2190 @ =gUnknown_3005090 + ldr r0, _080A2190 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -2251,7 +2251,7 @@ _080A2188: pop {r0} bx r0 .align 2, 0 -_080A2190: .4byte gUnknown_3005090 +_080A2190: .4byte gTasks thumb_func_end ItemUseOutOfBattle_EnigmaBerry thumb_func_start ItemUseInBattle_EnigmaBerry @@ -2347,7 +2347,7 @@ _080A226C: .4byte gStringVar4 _080A2270: .4byte gUnknown_8416425 _080A2274: .4byte sub_813E2B8 _080A2278: - ldr r0, _080A2290 @ =gUnknown_3005090 + ldr r0, _080A2290 @ =gTasks lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -2360,7 +2360,7 @@ _080A228A: pop {r0} bx r0 .align 2, 0 -_080A2290: .4byte gUnknown_3005090 +_080A2290: .4byte gTasks thumb_func_end sub_80A2238 thumb_func_start sub_80A2294 diff --git a/asm/itemfinder.s b/asm/itemfinder.s index 5f861463e..bf4580c1f 100644 --- a/asm/itemfinder.s +++ b/asm/itemfinder.s @@ -15,7 +15,7 @@ sub_813EC8C: @ 813EC8C lsls r1, r4, 2 adds r0, r1, r4 lsls r3, r0, 3 - ldr r5, _0813ECE4 @ =gUnknown_3005098 + ldr r5, _0813ECE4 @ =gTasks+0x8 adds r6, r1, 0 movs r1, 0 _0813ECA2: @@ -36,7 +36,7 @@ _0813ECA2: cmp r0, 0x1 bne _0813ECFC bl sub_813F3EC - ldr r0, _0813ECE8 @ =gUnknown_3005090 + ldr r0, _0813ECE8 @ =gTasks adds r1, r6, r4 lsls r1, 3 adds r1, r0 @@ -49,8 +49,8 @@ _0813ECA2: b _0813ED08 .align 2, 0 _0813ECE0: .4byte gMapHeader -_0813ECE4: .4byte gUnknown_3005098 -_0813ECE8: .4byte gUnknown_3005090 +_0813ECE4: .4byte gTasks+0x8 +_0813ECE8: .4byte gTasks _0813ECEC: .4byte sub_813EDB0 _0813ECF0: ldr r0, _0813ECF8 @ =sub_813ED3C @@ -99,7 +99,7 @@ sub_813ED3C: @ 813ED3C lsls r1, r0, 2 adds r1, r0 lsls r6, r1, 3 - ldr r7, _0813ED80 @ =gUnknown_3005098 + ldr r7, _0813ED80 @ =gTasks+0x8 adds r4, r6, r7 movs r1, 0x6 ldrsh r0, [r4, r1] @@ -126,7 +126,7 @@ sub_813ED3C: @ 813ED3C str r1, [r0] b _0813EDA8 .align 2, 0 -_0813ED80: .4byte gUnknown_3005098 +_0813ED80: .4byte gTasks+0x8 _0813ED84: .4byte sub_813F364 _0813ED88: movs r0, 0x41 @@ -158,7 +158,7 @@ sub_813EDB0: @ 813EDB0 lsls r1, r0, 2 adds r1, r0 lsls r5, r1, 3 - ldr r6, _0813EDE4 @ =gUnknown_3005098 + ldr r6, _0813EDE4 @ =gTasks+0x8 adds r4, r5, r6 movs r1, 0x6 ldrsh r0, [r4, r1] @@ -178,7 +178,7 @@ sub_813EDB0: @ 813EDB0 str r1, [r0] b _0813EE0E .align 2, 0 -_0813EDE4: .4byte gUnknown_3005098 +_0813EDE4: .4byte gTasks+0x8 _0813EDE8: .4byte sub_813F3A8 _0813EDEC: movs r0, 0x41 @@ -220,7 +220,7 @@ sub_813EE14: @ 813EE14 mov r0, sp adds r1, r4, 0 bl PlayerGetDestCoords - ldr r1, _0813EEC8 @ =gUnknown_3005090 + ldr r1, _0813EEC8 @ =gTasks mov r2, r9 lsls r0, r2, 2 add r0, r9 @@ -292,7 +292,7 @@ _0813EE4E: bl sub_813EF40 b _0813EF2E .align 2, 0 -_0813EEC8: .4byte gUnknown_3005090 +_0813EEC8: .4byte gTasks _0813EECC: lsls r0, r5, 16 asrs r1, r0, 16 @@ -325,7 +325,7 @@ _0813EEF2: _0813EF04: mov r0, r9 bl sub_813F108 - ldr r0, _0813EF24 @ =gUnknown_3005090 + ldr r0, _0813EF24 @ =gTasks mov r2, r9 lsls r1, r2, 2 add r1, r9 @@ -338,7 +338,7 @@ _0813EF04: movs r0, 0 b _0813EF30 .align 2, 0 -_0813EF24: .4byte gUnknown_3005090 +_0813EF24: .4byte gTasks _0813EF28: mov r0, r9 bl sub_813EF9C @@ -364,7 +364,7 @@ sub_813EF40: @ 813EF40 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _0813EF8C @ =gUnknown_3005098 + ldr r0, _0813EF8C @ =gTasks+0x8 adds r4, r0 adds r0, r5, 0 movs r1, 0x1 @@ -393,7 +393,7 @@ sub_813EF40: @ 813EF40 pop {r0} bx r0 .align 2, 0 -_0813EF8C: .4byte gUnknown_3005098 +_0813EF8C: .4byte gTasks+0x8 _0813EF90: .4byte gUnknown_20370C0 _0813EF94: .4byte gUnknown_20370C2 _0813EF98: .4byte gUnknown_20370C4 @@ -407,7 +407,7 @@ sub_813EF9C: @ 813EF9C lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0813EFEC @ =gUnknown_3005098 + ldr r0, _0813EFEC @ =gTasks+0x8 adds r1, r0 ldrh r3, [r1, 0x2] ldrh r2, [r1] @@ -445,7 +445,7 @@ _0813EFD8: movs r0, 0x2 b _0813EFFA .align 2, 0 -_0813EFEC: .4byte gUnknown_3005098 +_0813EFEC: .4byte gTasks+0x8 _0813EFF0: cmp r0, 0x3 ble _0813EFF8 @@ -768,7 +768,7 @@ sub_813F220: @ 813F220 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0813F254 @ =gUnknown_3005098 + ldr r0, _0813F254 @ =gTasks+0x8 adds r3, r1, r0 movs r1, 0x4 ldrsh r0, [r3, r1] @@ -781,7 +781,7 @@ sub_813F220: @ 813F220 strh r0, [r3, 0x4] b _0813F2E2 .align 2, 0 -_0813F254: .4byte gUnknown_3005098 +_0813F254: .4byte gTasks+0x8 _0813F258: movs r1, 0 ldrsh r0, [r3, r1] diff --git a/asm/link.s b/asm/link.s index c8f1093fc..a08422258 100644 --- a/asm/link.s +++ b/asm/link.s @@ -406,7 +406,7 @@ task02_080097CC: @ 80097CC push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _080097FC @ =gUnknown_3005090 + ldr r0, _080097FC @ =gTasks lsls r1, r2, 2 adds r1, r2 lsls r1, 3 @@ -427,7 +427,7 @@ _080097F6: pop {r0} bx r0 .align 2, 0 -_080097FC: .4byte gUnknown_3005090 +_080097FC: .4byte gTasks _08009800: .4byte gUnknown_3003F84 thumb_func_end task02_080097CC diff --git a/asm/link_rfu.s b/asm/link_rfu.s index 588b6e5bb..3f8d3735c 100644 --- a/asm/link_rfu.s +++ b/asm/link_rfu.s @@ -3189,7 +3189,7 @@ sub_80FEBAC: @ 80FEBAC adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r1, _080FEC04 @ =gUnknown_3005090 + ldr r1, _080FEC04 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -3212,7 +3212,7 @@ sub_80FEBAC: @ 80FEBAC bx r0 .align 2, 0 _080FEC00: .4byte sub_80FEC54 -_080FEC04: .4byte gUnknown_3005090 +_080FEC04: .4byte gTasks _080FEC08: .4byte sub_80FEC0C thumb_func_end sub_80FEBAC @@ -3241,7 +3241,7 @@ sub_80FEC24: @ 80FEC24 sub_80FEC38: @ 80FEC38 lsls r0, 24 lsrs r0, 24 - ldr r3, _080FEC50 @ =gUnknown_3005090 + ldr r3, _080FEC50 @ =gTasks lsls r2, r0, 2 adds r2, r0 lsls r2, 3 @@ -3251,7 +3251,7 @@ sub_80FEC38: @ 80FEC38 strh r0, [r2, 0x8] bx lr .align 2, 0 -_080FEC50: .4byte gUnknown_3005090 +_080FEC50: .4byte gTasks thumb_func_end sub_80FEC38 thumb_func_start sub_80FEC54 @@ -3297,7 +3297,7 @@ sub_80FEC90: @ 80FEC90 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _080FECB4 @ =gUnknown_3005098 + ldr r1, _080FECB4 @ =gTasks+0x8 adds r6, r0, r1 movs r0, 0 ldrsh r5, [r6, r0] @@ -3309,7 +3309,7 @@ sub_80FEC90: @ 80FEC90 beq _080FECC2 b _080FED6E .align 2, 0 -_080FECB4: .4byte gUnknown_3005098 +_080FECB4: .4byte gTasks+0x8 _080FECB8: cmp r5, 0x2 beq _080FED28 @@ -3414,7 +3414,7 @@ sub_80FED80: @ 80FED80 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080FEDA4 @ =gUnknown_3005098 + ldr r1, _080FEDA4 @ =gTasks+0x8 adds r6, r0, r1 movs r1, 0 ldrsh r0, [r6, r1] @@ -3426,7 +3426,7 @@ sub_80FED80: @ 80FED80 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080FEDA4: .4byte gUnknown_3005098 +_080FEDA4: .4byte gTasks+0x8 _080FEDA8: .4byte _080FEDAC .align 2, 0 _080FEDAC: diff --git a/asm/link_rfu_2.s b/asm/link_rfu_2.s index ba75c7f15..9ae197c87 100644 --- a/asm/link_rfu_2.s +++ b/asm/link_rfu_2.s @@ -208,7 +208,7 @@ _080F87AC: ldr r0, _080F87CC @ =gUnknown_3005450 movs r2, 0x1 strh r2, [r0, 0x4] - ldr r1, _080F87D0 @ =gUnknown_3005090 + ldr r1, _080F87D0 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -218,7 +218,7 @@ _080F87AC: .align 2, 0 _080F87C8: .4byte gUnknown_203ABF0 _080F87CC: .4byte gUnknown_3005450 -_080F87D0: .4byte gUnknown_3005090 +_080F87D0: .4byte gTasks _080F87D4: ldr r4, _080F87F8 @ =gUnknown_3005450 ldrb r0, [r4, 0xC] @@ -228,7 +228,7 @@ _080F87D4: bl sub_80FD538 movs r0, 0x3 strh r0, [r4, 0x4] - ldr r1, _080F8800 @ =gUnknown_3005090 + ldr r1, _080F8800 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -239,7 +239,7 @@ _080F87D4: .align 2, 0 _080F87F8: .4byte gUnknown_3005450 _080F87FC: .4byte gUnknown_843EC8C -_080F8800: .4byte gUnknown_3005090 +_080F8800: .4byte gTasks _080F8804: movs r0, 0 bl sub_80FD760 @@ -262,7 +262,7 @@ _080F8818: bl sub_80F8AEC movs r0, 0x14 strh r0, [r4, 0x4] - ldr r1, _080F8864 @ =gUnknown_3005090 + ldr r1, _080F8864 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -282,7 +282,7 @@ _080F8852: _080F8858: .4byte gUnknown_3005450 _080F885C: .4byte 0x00000993 _080F8860: .4byte sub_80F8DA8 -_080F8864: .4byte gUnknown_3005090 +_080F8864: .4byte gTasks _080F8868: .4byte sub_80FA834 thumb_func_end sub_80F8738 @@ -463,7 +463,7 @@ _080F89AC: movs r2, 0x7 strh r2, [r7, 0x4] _080F89BC: - ldr r1, _080F89D0 @ =gUnknown_3005090 + ldr r1, _080F89D0 @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -472,9 +472,9 @@ _080F89BC: b _080F8A8A .align 2, 0 _080F89CC: .4byte gUnknown_843EC8C -_080F89D0: .4byte gUnknown_3005090 +_080F89D0: .4byte gTasks _080F89D4: - ldr r0, _080F89E4 @ =gUnknown_3005090 + ldr r0, _080F89E4 @ =gTasks lsls r1, r6, 2 adds r1, r6 lsls r1, 3 @@ -483,7 +483,7 @@ _080F89D4: strh r0, [r1, 0xA] b _080F8A8A .align 2, 0 -_080F89E4: .4byte gUnknown_3005090 +_080F89E4: .4byte gTasks _080F89E8: bl sub_80FA788 cmp r0, 0x6 @@ -539,7 +539,7 @@ _080F8A2C: adds r0, r5, 0 movs r2, 0xE bl rfu_UNI_setSendData - ldr r1, _080F8A98 @ =gUnknown_3005090 + ldr r1, _080F8A98 @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -567,7 +567,7 @@ _080F8A8A: .align 2, 0 _080F8A90: .4byte 0x000008f6 _080F8A94: .4byte 0x000008f7 -_080F8A98: .4byte gUnknown_3005090 +_080F8A98: .4byte gTasks _080F8A9C: .4byte gUnknown_203AC08 _080F8AA0: .4byte sub_80FA834 thumb_func_end sub_80F893C @@ -711,7 +711,7 @@ _080F8BD8: ldr r0, _080F8BF8 @ =gUnknown_3005450 movs r2, 0x1 strh r2, [r0, 0x4] - ldr r1, _080F8BFC @ =gUnknown_3005090 + ldr r1, _080F8BFC @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -721,7 +721,7 @@ _080F8BD8: .align 2, 0 _080F8BF4: .4byte gUnknown_203ABF0 _080F8BF8: .4byte gUnknown_3005450 -_080F8BFC: .4byte gUnknown_3005090 +_080F8BFC: .4byte gTasks _080F8C00: ldr r3, _080F8C1C @ =gUnknown_843EC8C movs r0, 0x2 @@ -757,7 +757,7 @@ _080F8C28: strb r0, [r6, 0xC] adds r0, r5, 0 bl DestroyTask - ldr r0, _080F8C70 @ =gUnknown_3005090 + ldr r0, _080F8C70 @ =gTasks lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -772,7 +772,7 @@ _080F8C28: b _080F8CE6 .align 2, 0 _080F8C6C: .4byte 0x000008f6 -_080F8C70: .4byte gUnknown_3005090 +_080F8C70: .4byte gTasks _080F8C74: .4byte sub_80FACF0 _080F8C78: ldr r0, _080F8C84 @ =sub_80FA834 @@ -804,7 +804,7 @@ _080F8C9C: bl sub_80F8AEC movs r0, 0x14 strh r0, [r6, 0x4] - ldr r1, _080F8CF4 @ =gUnknown_3005090 + ldr r1, _080F8CF4 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -829,7 +829,7 @@ _080F8CE6: .align 2, 0 _080F8CEC: .4byte 0x00000993 _080F8CF0: .4byte sub_80F8DA8 -_080F8CF4: .4byte gUnknown_3005090 +_080F8CF4: .4byte gTasks _080F8CF8: .4byte sub_80FA834 thumb_func_end sub_80F8B34 @@ -4469,7 +4469,7 @@ sub_80FA834: @ 80FA834 adds r0, r6, 0 bl DestroyTask _080FA85C: - ldr r2, _080FA888 @ =gUnknown_3005090 + ldr r2, _080FA888 @ =gTasks lsls r1, r6, 2 adds r0, r1, r6 lsls r0, 3 @@ -4490,7 +4490,7 @@ _080FA85C: b _080FA9BC .align 2, 0 _080FA884: .4byte gUnknown_3005450 -_080FA888: .4byte gUnknown_3005090 +_080FA888: .4byte gTasks _080FA88C: cmp r0, 0x5 beq _080FA938 @@ -4530,7 +4530,7 @@ _080FA8D0: lsls r0, 7 bl sub_80F9D04 _080FA8D8: - ldr r0, _080FA8E8 @ =gUnknown_3005090 + ldr r0, _080FA8E8 @ =gTasks adds r1, r7, r6 lsls r1, 3 adds r1, r0 @@ -4538,7 +4538,7 @@ _080FA8D8: strh r0, [r1, 0x8] b _080FA9BC .align 2, 0 -_080FA8E8: .4byte gUnknown_3005090 +_080FA8E8: .4byte gTasks _080FA8EC: ldr r0, _080FA8FC @ =gUnknown_3003F50 ldrh r0, [r0] @@ -4596,7 +4596,7 @@ _080FA940: cmp r4, r2 blt _080FA940 _080FA956: - ldr r0, _080FA968 @ =gUnknown_3005090 + ldr r0, _080FA968 @ =gTasks adds r1, r7, r6 lsls r1, 3 adds r1, r0 @@ -4605,7 +4605,7 @@ _080FA956: strh r0, [r1, 0x8] b _080FA9BC .align 2, 0 -_080FA968: .4byte gUnknown_3005090 +_080FA968: .4byte gTasks _080FA96C: adds r0, r6, 0 bl DestroyTask @@ -4797,7 +4797,7 @@ sub_80FAA94: @ 80FAA94 adds r0, r6, 0 bl DestroyTask _080FAAD2: - ldr r0, _080FAB04 @ =gUnknown_3005090 + ldr r0, _080FAB04 @ =gTasks lsls r2, r6, 2 adds r1, r2, r6 lsls r1, 3 @@ -4820,7 +4820,7 @@ _080FAAF4: .4byte gUnknown_3005450 _080FAAF8: .4byte gUnknown_843EC38 _080FAAFC: .4byte 0x000009a1 _080FAB00: .4byte 0x00000996 -_080FAB04: .4byte gUnknown_3005090 +_080FAB04: .4byte gTasks _080FAB08: .4byte _080FAB0C .align 2, 0 _080FAB0C: @@ -4923,7 +4923,7 @@ _080FABC6: adds r0, 0x14 movs r2, 0x8C bl memcpy - ldr r0, _080FAC54 @ =gUnknown_3005090 + ldr r0, _080FAC54 @ =gTasks adds r1, r7, r6 lsls r1, 3 adds r1, r0 @@ -4963,7 +4963,7 @@ _080FAC04: cmp r0, 0 beq _080FACD6 _080FAC2E: - ldr r0, _080FAC54 @ =gUnknown_3005090 + ldr r0, _080FAC54 @ =gTasks adds r1, r7, r6 lsls r1, 3 adds r1, r0 @@ -4978,7 +4978,7 @@ _080FAC44: .4byte gUnknown_843EDE4 _080FAC48: .4byte gUnknown_3005450 _080FAC4C: .4byte 0x00000996 _080FAC50: .4byte gUnknown_202273C -_080FAC54: .4byte gUnknown_3005090 +_080FAC54: .4byte gTasks _080FAC58: adds r0, r3, 0 lsls r0, r2 @@ -5069,7 +5069,7 @@ sub_80FACF0: @ 80FACF0 adds r0, r5, 0 bl DestroyTask _080FAD0E: - ldr r1, _080FAD30 @ =gUnknown_3005090 + ldr r1, _080FAD30 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -5085,7 +5085,7 @@ _080FAD0E: b _080FAD8A .align 2, 0 _080FAD2C: .4byte gUnknown_3005450 -_080FAD30: .4byte gUnknown_3005090 +_080FAD30: .4byte gTasks _080FAD34: cmp r0, 0x2 beq _080FAD66 @@ -7283,7 +7283,7 @@ sub_80FBDB8: @ 80FBDB8 movs r0, 0xED lsls r0, 8 bl sub_80F9D04 - ldr r1, _080FBE18 @ =gUnknown_3005090 + ldr r1, _080FBE18 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -7311,7 +7311,7 @@ _080FBE08: .align 2, 0 _080FBE10: .4byte gUnknown_3003F50 _080FBE14: .4byte gUnknown_3005450 -_080FBE18: .4byte gUnknown_3005090 +_080FBE18: .4byte gTasks _080FBE1C: .4byte gUnknown_843EC41 thumb_func_end sub_80FBDB8 @@ -7332,7 +7332,7 @@ sub_80FBE20: @ 80FBE20 bl CreateTask lsls r0, 24 lsrs r2, r0, 24 - ldr r1, _080FBE54 @ =gUnknown_3005090 + ldr r1, _080FBE54 @ =gTasks lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -7341,9 +7341,9 @@ sub_80FBE20: @ 80FBE20 b _080FBE68 .align 2, 0 _080FBE50: .4byte sub_80FBDB8 -_080FBE54: .4byte gUnknown_3005090 +_080FBE54: .4byte gTasks _080FBE58: - ldr r0, _080FBE7C @ =gUnknown_3005090 + ldr r0, _080FBE7C @ =gTasks lsls r1, r2, 2 adds r1, r2 lsls r1, 3 @@ -7352,7 +7352,7 @@ _080FBE58: orrs r4, r0 strh r4, [r1, 0x8] _080FBE68: - ldr r1, _080FBE7C @ =gUnknown_3005090 + ldr r1, _080FBE7C @ =gTasks lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -7362,7 +7362,7 @@ _080FBE68: pop {r0} bx r0 .align 2, 0 -_080FBE7C: .4byte gUnknown_3005090 +_080FBE7C: .4byte gTasks thumb_func_end sub_80FBE20 thumb_func_start sub_80FBE80 @@ -7373,7 +7373,7 @@ sub_80FBE80: @ 80FBE80 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _080FBED8 @ =gUnknown_3005098 + ldr r1, _080FBED8 @ =gTasks+0x8 adds r4, r0, r1 bl sub_80F8EA4 lsls r0, 24 @@ -7407,7 +7407,7 @@ sub_80FBE80: @ 80FBE80 beq _080FBF36 b _080FBF10 .align 2, 0 -_080FBED8: .4byte gUnknown_3005098 +_080FBED8: .4byte gTasks+0x8 _080FBEDC: .4byte gUnknown_3007460 _080FBEE0: .4byte gUnknown_3005450 _080FBEE4: .4byte 0x000008f5 @@ -7484,7 +7484,7 @@ sub_80FBF54: @ 80FBF54 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _080FBF94 @ =gUnknown_3005098 + ldr r0, _080FBF94 @ =gTasks+0x8 adds r4, r0 adds r0, r4, 0 adds r1, r6, 0 @@ -7496,7 +7496,7 @@ sub_80FBF54: @ 80FBF54 .align 2, 0 _080FBF8C: .4byte gUnknown_3005450 _080FBF90: .4byte sub_80FBE80 -_080FBF94: .4byte gUnknown_3005098 +_080FBF94: .4byte gTasks+0x8 thumb_func_end sub_80FBF54 thumb_func_start sub_80FBF98 @@ -7593,7 +7593,7 @@ sub_80FC028: @ 80FC028 adds r0, r5, 0 bl DestroyTask _080FC046: - ldr r1, _080FC0E4 @ =gUnknown_3005090 + ldr r1, _080FC0E4 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -7666,7 +7666,7 @@ _080FC070: b _080FC108 .align 2, 0 _080FC0E0: .4byte gUnknown_3005450 -_080FC0E4: .4byte gUnknown_3005090 +_080FC0E4: .4byte gTasks _080FC0E8: .4byte 0x00000985 _080FC0EC: .4byte gUnknown_3005E10 _080FC0F0: .4byte 0x00000119 @@ -7717,7 +7717,7 @@ sub_80FC114: @ 80FC114 bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r5, _080FC194 @ =gUnknown_3005090 + ldr r5, _080FC194 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -7744,7 +7744,7 @@ _080FC184: .4byte gUnknown_3005450 _080FC188: .4byte 0x00000987 _080FC18C: .4byte 0x00000119 _080FC190: .4byte sub_80FC028 -_080FC194: .4byte gUnknown_3005090 +_080FC194: .4byte gTasks _080FC198: .4byte sub_80F8B34 _080FC19C: cmp r2, 0xFF diff --git a/asm/link_rfu_3.s b/asm/link_rfu_3.s index 7f8862156..f4e12b60f 100644 --- a/asm/link_rfu_3.s +++ b/asm/link_rfu_3.s @@ -222,7 +222,7 @@ sub_8115A24: @ 8115A24 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _08115A5C @ =gUnknown_3005098 + ldr r0, _08115A5C @ =gTasks+0x8 adds r1, r0 str r1, [r2] ldr r0, _08115A60 @ =gUnknown_3002024 @@ -237,7 +237,7 @@ sub_8115A24: @ 8115A24 .align 2, 0 _08115A54: .4byte sub_8115A68 _08115A58: .4byte gUnknown_203B05C -_08115A5C: .4byte gUnknown_3005098 +_08115A5C: .4byte gTasks+0x8 _08115A60: .4byte gUnknown_3002024 _08115A64: .4byte gUnknown_20370D0 thumb_func_end sub_8115A24 @@ -1759,7 +1759,7 @@ BerryBlenderLinkJoinGroup: @ 81166F4 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0811672C @ =gUnknown_3005098 + ldr r0, _0811672C @ =gTasks+0x8 adds r1, r0 str r1, [r2] ldr r0, _08116730 @ =gUnknown_3002028 @@ -1774,7 +1774,7 @@ BerryBlenderLinkJoinGroup: @ 81166F4 .align 2, 0 _08116724: .4byte sub_8116738 _08116728: .4byte gUnknown_203B05C -_0811672C: .4byte gUnknown_3005098 +_0811672C: .4byte gTasks+0x8 _08116730: .4byte gUnknown_3002028 _08116734: .4byte gUnknown_20370D0 thumb_func_end BerryBlenderLinkJoinGroup @@ -2540,7 +2540,7 @@ sub_8116DE0: @ 8116DE0 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r2, _08116E14 @ =gUnknown_3005098 + ldr r2, _08116E14 @ =gTasks+0x8 adds r1, r2 str r1, [r3] movs r2, 0 @@ -2553,7 +2553,7 @@ sub_8116DE0: @ 8116DE0 .align 2, 0 _08116E0C: .4byte sub_8116E1C _08116E10: .4byte gUnknown_203B05C -_08116E14: .4byte gUnknown_3005098 +_08116E14: .4byte gTasks+0x8 _08116E18: .4byte gUnknown_3002028 thumb_func_end sub_8116DE0 @@ -2634,7 +2634,7 @@ _08116EC8: movs r0, 0x2 bl PlaySE _08116EDA: - ldr r0, _08116EF4 @ =gUnknown_3005090 + ldr r0, _08116EF4 @ =gTasks lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -2647,7 +2647,7 @@ _08116EDA: strb r0, [r4, 0x8] b _08116F20 .align 2, 0 -_08116EF4: .4byte gUnknown_3005090 +_08116EF4: .4byte gTasks _08116EF8: ldrb r0, [r4, 0x11] bl DestroyTask @@ -2977,7 +2977,7 @@ sub_8117130: @ 8117130 mov r0, r8 bl sub_811B1EC adds r7, r0, 0 - ldr r1, _08117170 @ =gUnknown_3005090 + ldr r1, _08117170 @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -2993,7 +2993,7 @@ sub_8117130: @ 8117130 b _0811725C .align 2, 0 _0811716C: .4byte gUnknown_203B06C -_08117170: .4byte gUnknown_3005090 +_08117170: .4byte gTasks _08117174: cmp r0, 0x2 beq _081171D8 @@ -3119,7 +3119,7 @@ sub_8117280: @ 8117280 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r1, _081172A4 @ =gUnknown_3005090 + ldr r1, _081172A4 @ =gTasks lsls r0, 2 add r0, r8 lsls r0, 3 @@ -3132,7 +3132,7 @@ sub_8117280: @ 8117280 beq _081172C0 b _0811734A .align 2, 0 -_081172A4: .4byte gUnknown_3005090 +_081172A4: .4byte gTasks _081172A8: bl GetMultiplayerId lsls r0, 24 @@ -3812,7 +3812,7 @@ sub_8117900: @ 8117900 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _08117924 @ =gUnknown_3005098 + ldr r1, _08117924 @ =gTasks+0x8 adds r4, r0, r1 movs r1, 0 ldrsh r0, [r4, r1] @@ -3824,7 +3824,7 @@ sub_8117900: @ 8117900 beq _08117932 b _08117988 .align 2, 0 -_08117924: .4byte gUnknown_3005098 +_08117924: .4byte gTasks+0x8 _08117928: cmp r0, 0x2 beq _08117958 @@ -3897,7 +3897,7 @@ sub_81179A4: @ 81179A4 bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _081179C8 @ =gUnknown_3005090 + ldr r2, _081179C8 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -3908,7 +3908,7 @@ sub_81179A4: @ 81179A4 bx r0 .align 2, 0 _081179C4: .4byte sub_81175BC -_081179C8: .4byte gUnknown_3005090 +_081179C8: .4byte gTasks thumb_func_end sub_81179A4 thumb_func_start sub_81179CC @@ -3924,7 +3924,7 @@ sub_81179CC: @ 81179CC lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _08117A04 @ =gUnknown_3005098 + ldr r0, _08117A04 @ =gTasks+0x8 adds r1, r0 str r1, [r2] movs r2, 0 @@ -3939,7 +3939,7 @@ sub_81179CC: @ 81179CC .align 2, 0 _081179FC: .4byte sub_8117A0C _08117A00: .4byte gUnknown_203B05C -_08117A04: .4byte gUnknown_3005098 +_08117A04: .4byte gTasks+0x8 _08117A08: .4byte gUnknown_20370D0 thumb_func_end sub_81179CC @@ -4503,7 +4503,7 @@ sub_8117ED4: @ 8117ED4 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _08117F14 @ =gUnknown_3005098 + ldr r0, _08117F14 @ =gTasks+0x8 adds r1, r0 str r1, [r2] ldr r0, _08117F18 @ =gUnknown_3002028 @@ -4521,7 +4521,7 @@ sub_8117ED4: @ 8117ED4 .align 2, 0 _08117F0C: .4byte sub_8117F20 _08117F10: .4byte gUnknown_203B05C -_08117F14: .4byte gUnknown_3005098 +_08117F14: .4byte gTasks+0x8 _08117F18: .4byte gUnknown_3002028 _08117F1C: .4byte gUnknown_20370D0 thumb_func_end sub_8117ED4 @@ -4923,7 +4923,7 @@ sub_8118290: @ 8118290 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _081182D0 @ =gUnknown_3005098 + ldr r0, _081182D0 @ =gTasks+0x8 adds r1, r0 str r1, [r2] ldr r0, _081182D4 @ =gUnknown_3002028 @@ -4941,7 +4941,7 @@ sub_8118290: @ 8118290 .align 2, 0 _081182C8: .4byte sub_81182DC _081182CC: .4byte gUnknown_203B05C -_081182D0: .4byte gUnknown_3005098 +_081182D0: .4byte gTasks+0x8 _081182D4: .4byte gUnknown_3002028 _081182D8: .4byte gUnknown_20370D0 thumb_func_end sub_8118290 @@ -5444,7 +5444,7 @@ sub_81186E0: @ 81186E0 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _08118714 @ =gUnknown_3005098 + ldr r1, _08118714 @ =gTasks+0x8 adds r7, r0, r1 ldrb r0, [r6, 0x14] cmp r0, 0x38 @@ -5458,7 +5458,7 @@ _08118706: mov pc, r0 .align 2, 0 _08118710: .4byte gUnknown_203B05C -_08118714: .4byte gUnknown_3005098 +_08118714: .4byte gTasks+0x8 _08118718: .4byte _0811871C .align 2, 0 _0811871C: @@ -8021,7 +8021,7 @@ sub_8119D34: @ 8119D34 lsls r0, 2 add r0, r10 lsls r0, 3 - ldr r1, _08119E24 @ =gUnknown_3005098 + ldr r1, _08119E24 @ =gTasks+0x8 adds r6, r0, r1 movs r7, 0 mov r0, sp @@ -8043,7 +8043,7 @@ _08119D58: lsls r1, r2, 2 add r1, r10 lsls r1, 3 - ldr r3, _08119E28 @ =gUnknown_3005090 + ldr r3, _08119E28 @ =gTasks adds r1, r3 movs r5, 0x10 ldrsh r1, [r1, r5] @@ -8131,8 +8131,8 @@ _08119DEC: strb r0, [r3, 0x18] b _08119E68 .align 2, 0 -_08119E24: .4byte gUnknown_3005098 -_08119E28: .4byte gUnknown_3005090 +_08119E24: .4byte gTasks+0x8 +_08119E28: .4byte gTasks _08119E2C: .4byte gUnknown_8457034 _08119E30: ldr r1, [r6] @@ -8194,7 +8194,7 @@ sub_8119E84: @ 8119E84 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r2, _08119EB4 @ =gUnknown_3005098 + ldr r2, _08119EB4 @ =gTasks+0x8 adds r3, r1, r2 str r4, [r3] str r5, [r3, 0x4] @@ -8205,7 +8205,7 @@ sub_8119E84: @ 8119E84 bx r1 .align 2, 0 _08119EB0: .4byte sub_8119D34 -_08119EB4: .4byte gUnknown_3005098 +_08119EB4: .4byte gTasks+0x8 thumb_func_end sub_8119E84 thumb_func_start sub_8119EB8 @@ -8222,7 +8222,7 @@ sub_8119EB8: @ 8119EB8 lsls r0, 2 add r0, r10 lsls r0, 3 - ldr r1, _08119FA4 @ =gUnknown_3005098 + ldr r1, _08119FA4 @ =gTasks+0x8 adds r6, r0, r1 movs r3, 0 _08119ED6: @@ -8246,7 +8246,7 @@ _08119ED6: lsls r1, r2, 2 add r1, r10 lsls r1, 3 - ldr r7, _08119FA8 @ =gUnknown_3005090 + ldr r7, _08119FA8 @ =gTasks adds r1, r7 movs r2, 0xC ldrsh r1, [r1, r2] @@ -8329,8 +8329,8 @@ _08119F66: pop {r0} bx r0 .align 2, 0 -_08119FA4: .4byte gUnknown_3005098 -_08119FA8: .4byte gUnknown_3005090 +_08119FA4: .4byte gTasks+0x8 +_08119FA8: .4byte gTasks _08119FAC: .4byte gUnknown_8457034 thumb_func_end sub_8119EB8 @@ -8372,7 +8372,7 @@ sub_8119FD8: @ 8119FD8 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0811A04C @ =gUnknown_3005098 + ldr r0, _0811A04C @ =gTasks+0x8 adds r4, r1, r0 movs r6, 0 subs r0, 0x8 @@ -8422,7 +8422,7 @@ _0811A01A: pop {r0} bx r0 .align 2, 0 -_0811A04C: .4byte gUnknown_3005098 +_0811A04C: .4byte gTasks+0x8 _0811A050: .4byte gUnknown_8457034 thumb_func_end sub_8119FD8 @@ -8439,7 +8439,7 @@ sub_811A054: @ 811A054 lsls r2, r0, 2 adds r2, r0 lsls r2, 3 - ldr r1, _0811A080 @ =gUnknown_3005098 + ldr r1, _0811A080 @ =gTasks+0x8 adds r3, r2, r1 str r4, [r3] adds r1, r2 @@ -8449,7 +8449,7 @@ sub_811A054: @ 811A054 bx r1 .align 2, 0 _0811A07C: .4byte sub_8119EB8 -_0811A080: .4byte gUnknown_3005098 +_0811A080: .4byte gTasks+0x8 thumb_func_end sub_811A054 thumb_func_start sub_811A084 @@ -8465,7 +8465,7 @@ sub_811A084: @ 811A084 lsls r2, r0, 2 adds r2, r0 lsls r2, 3 - ldr r1, _0811A0B0 @ =gUnknown_3005098 + ldr r1, _0811A0B0 @ =gTasks+0x8 adds r3, r2, r1 str r4, [r3] adds r1, r2 @@ -8475,7 +8475,7 @@ sub_811A084: @ 811A084 bx r1 .align 2, 0 _0811A0AC: .4byte sub_8119FD8 -_0811A0B0: .4byte gUnknown_3005098 +_0811A0B0: .4byte gTasks+0x8 thumb_func_end sub_811A084 thumb_func_start sub_811A0B4 diff --git a/asm/link_rfu_4.s b/asm/link_rfu_4.s index 2723ad418..4749a278a 100644 --- a/asm/link_rfu_4.s +++ b/asm/link_rfu_4.s @@ -1385,7 +1385,7 @@ task_add_00_mystery_gift: @ 8142E58 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _08142E9C @ =gUnknown_3005098 + ldr r0, _08142E9C @ =gTasks+0x8 adds r4, r0 movs r0, 0 strb r0, [r4, 0x8] @@ -1408,7 +1408,7 @@ task_add_00_mystery_gift: @ 8142E58 bx r0 .align 2, 0 _08142E98: .4byte sub_8142EA0 -_08142E9C: .4byte gUnknown_3005098 +_08142E9C: .4byte gTasks+0x8 thumb_func_end task_add_00_mystery_gift thumb_func_start sub_8142EA0 @@ -1420,7 +1420,7 @@ sub_8142EA0: @ 8142EA0 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _08142EC4 @ =gUnknown_3005098 + ldr r1, _08142EC4 @ =gTasks+0x8 adds r5, r0, r1 ldrb r0, [r5, 0x8] cmp r0, 0x25 @@ -1433,7 +1433,7 @@ _08142EBA: ldr r0, [r0] mov pc, r0 .align 2, 0 -_08142EC4: .4byte gUnknown_3005098 +_08142EC4: .4byte gTasks+0x8 _08142EC8: .4byte _08142ECC .align 2, 0 _08142ECC: diff --git a/asm/list_menu.s b/asm/list_menu.s index 80c40423e..760c55311 100644 --- a/asm/list_menu.s +++ b/asm/list_menu.s @@ -235,7 +235,7 @@ ListMenuHandleInput: @ 8107078 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _081070A4 @ =gUnknown_3005098 + ldr r0, _081070A4 @ =gTasks+0x8 adds r3, r1, r0 ldr r2, _081070A8 @ =gMain ldrh r1, [r2, 0x2E] @@ -252,7 +252,7 @@ ListMenuHandleInput: @ 8107078 ldr r0, [r0, 0x4] b _08107136 .align 2, 0 -_081070A4: .4byte gUnknown_3005098 +_081070A4: .4byte gTasks+0x8 _081070A8: .4byte gMain _081070AC: movs r0, 0x2 @@ -350,7 +350,7 @@ sub_810713C: @ 810713C lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _0810717C @ =gUnknown_3005098 + ldr r1, _0810717C @ =gTasks+0x8 adds r1, r0, r1 cmp r3, 0 beq _08107158 @@ -376,7 +376,7 @@ _08107170: pop {r0} bx r0 .align 2, 0 -_0810717C: .4byte gUnknown_3005098 +_0810717C: .4byte gTasks+0x8 thumb_func_end sub_810713C thumb_func_start sub_8107180 @@ -387,7 +387,7 @@ sub_8107180: @ 8107180 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _081071C0 @ =gUnknown_3005098 + ldr r0, _081071C0 @ =gTasks+0x8 adds r4, r0 ldrb r0, [r4, 0x10] ldrb r2, [r4, 0x15] @@ -410,7 +410,7 @@ sub_8107180: @ 8107180 pop {r0} bx r0 .align 2, 0 -_081071C0: .4byte gUnknown_3005098 +_081071C0: .4byte gTasks+0x8 thumb_func_end sub_8107180 thumb_func_start sub_81071C4 @@ -425,7 +425,7 @@ sub_81071C4: @ 81071C4 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _08107204 @ =gUnknown_3005098 + ldr r0, _08107204 @ =gTasks+0x8 adds r4, r0 lsrs r1, 20 ldrb r6, [r4, 0x14] @@ -448,7 +448,7 @@ sub_81071C4: @ 81071C4 pop {r0} bx r0 .align 2, 0 -_08107204: .4byte gUnknown_3005098 +_08107204: .4byte gTasks+0x8 thumb_func_end sub_81071C4 thumb_func_start sub_8107208 @@ -465,7 +465,7 @@ sub_8107208: @ 8107208 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _08107240 @ =gUnknown_3005098 + ldr r0, _08107240 @ =gTasks+0x8 adds r4, r0 ldrb r0, [r4, 0x10] movs r1, 0x1 @@ -479,7 +479,7 @@ sub_8107208: @ 8107208 pop {r0} bx r0 .align 2, 0 -_08107240: .4byte gUnknown_3005098 +_08107240: .4byte gTasks+0x8 thumb_func_end sub_8107208 thumb_func_start sub_8107244 @@ -548,7 +548,7 @@ sub_81072AC: @ 81072AC lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _081072D0 @ =gUnknown_3005098 + ldr r0, _081072D0 @ =gTasks+0x8 adds r1, r0 cmp r2, 0 beq _081072CA @@ -560,7 +560,7 @@ _081072CA: pop {r0} bx r0 .align 2, 0 -_081072D0: .4byte gUnknown_3005098 +_081072D0: .4byte gTasks+0x8 thumb_func_end sub_81072AC thumb_func_start get_coro_args_x18_x1A @@ -572,7 +572,7 @@ get_coro_args_x18_x1A: @ 81072D4 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _081072FC @ =gUnknown_3005098 + ldr r0, _081072FC @ =gTasks+0x8 adds r1, r0 cmp r3, 0 beq _081072EE @@ -587,7 +587,7 @@ _081072F6: pop {r0} bx r0 .align 2, 0 -_081072FC: .4byte gUnknown_3005098 +_081072FC: .4byte gTasks+0x8 thumb_func_end get_coro_args_x18_x1A thumb_func_start ListMenuGetYCoordForPrintingArrowCursor @@ -598,7 +598,7 @@ ListMenuGetYCoordForPrintingArrowCursor: @ 8107300 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _08107344 @ =gUnknown_3005098 + ldr r0, _08107344 @ =gTasks+0x8 adds r4, r0 ldrb r0, [r4, 0x17] lsls r0, 26 @@ -625,7 +625,7 @@ ListMenuGetYCoordForPrintingArrowCursor: @ 8107300 pop {r1} bx r1 .align 2, 0 -_08107344: .4byte gUnknown_3005098 +_08107344: .4byte gTasks+0x8 thumb_func_end ListMenuGetYCoordForPrintingArrowCursor thumb_func_start ListMenuInitInternal @@ -649,7 +649,7 @@ ListMenuInitInternal: @ 8107348 lsls r0, 2 add r0, r8 lsls r0, 3 - ldr r1, _0810741C @ =gUnknown_3005098 + ldr r1, _0810741C @ =gTasks+0x8 adds r7, r0, r1 adds r0, r7, 0 ldm r4!, {r1-r3} @@ -731,7 +731,7 @@ _081073E0: bx r1 .align 2, 0 _08107418: .4byte nullsub_90 -_0810741C: .4byte gUnknown_3005098 +_0810741C: .4byte gTasks+0x8 _08107420: .4byte gUnknown_3005E60 _08107424: .4byte 0xfffc0fff thumb_func_end ListMenuInitInternal @@ -1658,7 +1658,7 @@ sub_8107B00: @ 8107B00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _08107B24 @ =gUnknown_3005098 + ldr r0, _08107B24 @ =gTasks+0x8 adds r2, r1, r0 cmp r3, 0x10 bhi _08107BC8 @@ -1668,7 +1668,7 @@ sub_8107B00: @ 8107B00 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08107B24: .4byte gUnknown_3005098 +_08107B24: .4byte gTasks+0x8 _08107B28: .4byte _08107B2C .align 2, 0 _08107B2C: @@ -1768,7 +1768,7 @@ sub_8107BD0: @ 8107BD0 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _08107BF4 @ =gUnknown_3005098 + ldr r0, _08107BF4 @ =gTasks+0x8 adds r3, r1, r0 cmp r4, 0x10 bhi _08107CD0 @@ -1778,7 +1778,7 @@ sub_8107BD0: @ 8107BD0 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08107BF4: .4byte gUnknown_3005098 +_08107BF4: .4byte gTasks+0x8 _08107BF8: .4byte _08107BFC .align 2, 0 _08107BFC: diff --git a/asm/main_menu.s b/asm/main_menu.s index 9bcf07957..9c1302cdc 100644 --- a/asm/main_menu.s +++ b/asm/main_menu.s @@ -191,7 +191,7 @@ sub_800C318: @ 800C318 bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _0800C4CC @ =gUnknown_3005090 + ldr r2, _0800C4CC @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -215,7 +215,7 @@ _0800C4BC: .4byte gUnknown_8234648 _0800C4C0: .4byte gUnknown_8234668 _0800C4C4: .4byte sub_800C2D4 _0800C4C8: .4byte sub_800C4D0 -_0800C4CC: .4byte gUnknown_3005090 +_0800C4CC: .4byte gTasks thumb_func_end sub_800C318 thumb_func_start sub_800C4D0 @@ -280,7 +280,7 @@ _0800C54A: bl sub_806E2BC cmp r0, 0x1 bne _0800C570 - ldr r2, _0800C56C @ =gUnknown_3005090 + ldr r2, _0800C56C @ =gTasks lsls r3, r5, 2 adds r0, r3, r5 lsls r0, 3 @@ -291,9 +291,9 @@ _0800C54A: adds r2, r3, 0 b _0800C57E .align 2, 0 -_0800C56C: .4byte gUnknown_3005090 +_0800C56C: .4byte gTasks _0800C570: - ldr r0, _0800C588 @ =gUnknown_3005090 + ldr r0, _0800C588 @ =gTasks lsls r2, r5, 2 adds r1, r2, r5 lsls r1, 3 @@ -306,11 +306,11 @@ _0800C57E: adds r0, r1 b _0800C5FC .align 2, 0 -_0800C588: .4byte gUnknown_3005090 +_0800C588: .4byte gTasks _0800C58C: movs r0, 0 bl sub_800D094 - ldr r0, _0800C5A8 @ =gUnknown_3005090 + ldr r0, _0800C5A8 @ =gTasks lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -321,12 +321,12 @@ _0800C58C: bl sub_800C634 b _0800C626 .align 2, 0 -_0800C5A8: .4byte gUnknown_3005090 +_0800C5A8: .4byte gTasks _0800C5AC: .4byte gUnknown_8415C42 _0800C5B0: movs r0, 0 bl sub_800D094 - ldr r1, _0800C5DC @ =gUnknown_3005090 + ldr r1, _0800C5DC @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -343,7 +343,7 @@ _0800C5B0: strh r0, [r4, 0x8] b _0800C626 .align 2, 0 -_0800C5DC: .4byte gUnknown_3005090 +_0800C5DC: .4byte gTasks _0800C5E0: .4byte gUnknown_8415BFF _0800C5E4: strh r6, [r4, 0x8] @@ -351,7 +351,7 @@ _0800C5E4: _0800C5E8: movs r0, 0 bl sub_800D044 - ldr r1, _0800C604 @ =gUnknown_3005090 + ldr r1, _0800C604 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -363,12 +363,12 @@ _0800C5FC: str r1, [r0] b _0800C626 .align 2, 0 -_0800C604: .4byte gUnknown_3005090 +_0800C604: .4byte gTasks _0800C608: .4byte sub_800C704 _0800C60C: movs r0, 0 bl sub_800D094 - ldr r0, _0800C62C @ =gUnknown_3005090 + ldr r0, _0800C62C @ =gTasks lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -382,7 +382,7 @@ _0800C626: pop {r0} bx r0 .align 2, 0 -_0800C62C: .4byte gUnknown_3005090 +_0800C62C: .4byte gTasks _0800C630: .4byte gUnknown_8415C64 thumb_func_end sub_800C4D0 @@ -395,7 +395,7 @@ sub_800C634: @ 800C634 lsls r4, 24 lsrs r4, 24 bl sub_800CDF8 - ldr r1, _0800C678 @ =gUnknown_3005090 + ldr r1, _0800C678 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -419,7 +419,7 @@ sub_800C634: @ 800C634 pop {r0} bx r0 .align 2, 0 -_0800C678: .4byte gUnknown_3005090 +_0800C678: .4byte gTasks _0800C67C: .4byte sub_800C688 _0800C680: .4byte 0x0000ffff _0800C684: .4byte sub_800C2EC @@ -454,7 +454,7 @@ sub_800C688: @ 800C688 bl sub_800D1E8 movs r0, 0 bl sub_800D044 - ldr r1, _0800C6EC @ =gUnknown_3005090 + ldr r1, _0800C6EC @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -469,7 +469,7 @@ sub_800C688: @ 800C688 _0800C6E0: .4byte gUnknown_2037AB8 _0800C6E4: .4byte gMain _0800C6E8: .4byte gUnknown_8234638 -_0800C6EC: .4byte gUnknown_3005090 +_0800C6EC: .4byte gTasks _0800C6F0: .4byte sub_800C704 _0800C6F4: ldr r0, _0800C700 @ =sub_800C7A0 @@ -515,7 +515,7 @@ sub_800C704: @ 800C704 movs r0, 0x54 movs r1, 0x7 bl SetGpuReg - ldr r0, _0800C768 @ =gUnknown_3005090 + ldr r0, _0800C768 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -528,7 +528,7 @@ sub_800C704: @ 800C704 b _0800C772 .align 2, 0 _0800C764: .4byte gUnknown_2037AB8 -_0800C768: .4byte gUnknown_3005090 +_0800C768: .4byte gTasks _0800C76C: .4byte sub_800CA94 _0800C770: ldr r0, _0800C77C @ =sub_800C780 @@ -610,7 +610,7 @@ _0800C7FE: movs r1, 0xF1 movs r2, 0x2 bl LoadPalette - ldr r2, _0800C860 @ =gUnknown_3005090 + ldr r2, _0800C860 @ =gTasks lsls r1, r7, 2 adds r0, r1, r7 lsls r0, 3 @@ -648,7 +648,7 @@ _0800C828: b _0800C8D8 .align 2, 0 _0800C85C: .4byte 0x0000547f -_0800C860: .4byte gUnknown_3005090 +_0800C860: .4byte gTasks _0800C864: .4byte gUnknown_8234688 _0800C868: .4byte gUnknown_8415A6E _0800C86C: .4byte gUnknown_8234618 @@ -772,7 +772,7 @@ _0800C8F0: movs r1, 0x3 bl CopyWindowToVram _0800C994: - ldr r0, _0800C9C4 @ =gUnknown_3005090 + ldr r0, _0800C9C4 @ =gTasks mov r2, r8 adds r1, r2, r7 lsls r1, 3 @@ -791,7 +791,7 @@ _0800C9B4: .4byte gUnknown_8415A77 _0800C9B8: .4byte gUnknown_8415A6E _0800C9BC: .4byte gUnknown_8415A97 _0800C9C0: .4byte gUnknown_8234620 -_0800C9C4: .4byte gUnknown_3005090 +_0800C9C4: .4byte gTasks _0800C9C8: .4byte sub_800C9CC thumb_func_end sub_800C7A0 @@ -809,7 +809,7 @@ sub_800C9CC: @ 800C9CC asrs r0, 16 cmp r0, r5 beq _0800CA10 - ldr r1, _0800CA18 @ =gUnknown_3005090 + ldr r1, _0800CA18 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -833,7 +833,7 @@ _0800CA10: pop {r0} bx r0 .align 2, 0 -_0800CA18: .4byte gUnknown_3005090 +_0800CA18: .4byte gTasks _0800CA1C: .4byte sub_800CA28 _0800CA20: .4byte 0x0000ffff _0800CA24: .4byte sub_800C2EC @@ -844,7 +844,7 @@ sub_800CA28: @ 800CA28 push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _0800CA4C @ =gUnknown_3005090 + ldr r1, _0800CA4C @ =gTasks lsls r4, r0, 2 adds r4, r0 lsls r4, 3 @@ -858,7 +858,7 @@ sub_800CA28: @ 800CA28 pop {r0} bx r0 .align 2, 0 -_0800CA4C: .4byte gUnknown_3005090 +_0800CA4C: .4byte gTasks _0800CA50: .4byte sub_800CA54 thumb_func_end sub_800CA28 @@ -878,7 +878,7 @@ sub_800CA54: @ 800CA54 lsls r0, 24 cmp r0, 0 beq _0800CA80 - ldr r0, _0800CA8C @ =gUnknown_3005090 + ldr r0, _0800CA8C @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -891,7 +891,7 @@ _0800CA80: bx r0 .align 2, 0 _0800CA88: .4byte gUnknown_2037AB8 -_0800CA8C: .4byte gUnknown_3005090 +_0800CA8C: .4byte gTasks _0800CA90: .4byte sub_800CA28 thumb_func_end sub_800CA54 @@ -907,7 +907,7 @@ sub_800CA94: @ 800CA94 ands r0, r1 cmp r0, 0 bne _0800CB84 - ldr r1, _0800CAC8 @ =gUnknown_3005090 + ldr r1, _0800CAC8 @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -923,7 +923,7 @@ sub_800CA94: @ 800CA94 b _0800CAEE .align 2, 0 _0800CAC4: .4byte gUnknown_2037AB8 -_0800CAC8: .4byte gUnknown_3005090 +_0800CAC8: .4byte gTasks _0800CACC: movs r1, 0xA ldrsh r0, [r4, r1] @@ -1026,7 +1026,7 @@ sub_800CB90: @ 800CB90 sub sp, 0x8 lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _0800CBB4 @ =gUnknown_3005090 + ldr r1, _0800CBB4 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -1041,7 +1041,7 @@ sub_800CB90: @ 800CB90 beq _0800CBC2 b _0800CC58 .align 2, 0 -_0800CBB4: .4byte gUnknown_3005090 +_0800CBB4: .4byte gTasks _0800CBB8: cmp r1, 0x2 beq _0800CC1C @@ -1071,7 +1071,7 @@ _0800CBEC: ldr r0, _0800CC04 @ =gUnknown_8415ACB bl sub_800CDF8 _0800CBF2: - ldr r0, _0800CC08 @ =gUnknown_3005090 + ldr r0, _0800CC08 @ =gTasks lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -1082,7 +1082,7 @@ _0800CBF2: b _0800CC58 .align 2, 0 _0800CC04: .4byte gUnknown_8415ACB -_0800CC08: .4byte gUnknown_3005090 +_0800CC08: .4byte gTasks _0800CC0C: ldr r0, _0800CC18 @ =gUnknown_2037AB8 ldrb r1, [r0, 0x7] @@ -1235,7 +1235,7 @@ sub_800CCF8: @ 800CCF8 movs r2, 0 movs r3, 0x10 bl BeginNormalPaletteFade - ldr r1, _0800CD3C @ =gUnknown_3005090 + ldr r1, _0800CD3C @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -1245,7 +1245,7 @@ sub_800CCF8: @ 800CCF8 b _0800CDEC .align 2, 0 _0800CD38: .4byte gMain -_0800CD3C: .4byte gUnknown_3005090 +_0800CD3C: .4byte gTasks _0800CD40: .4byte sub_800CA94 _0800CD44: movs r0, 0x2 @@ -1267,7 +1267,7 @@ _0800CD44: movs r0, 0x44 movs r1, 0xA0 bl SetGpuReg - ldr r1, _0800CD84 @ =gUnknown_3005090 + ldr r1, _0800CD84 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -1276,14 +1276,14 @@ _0800CD44: str r1, [r0] b _0800CDEC .align 2, 0 -_0800CD84: .4byte gUnknown_3005090 +_0800CD84: .4byte gTasks _0800CD88: .4byte sub_800CC68 _0800CD8C: movs r0, 0x40 ands r0, r1 cmp r0, 0 beq _0800CDB4 - ldr r0, _0800CDB0 @ =gUnknown_3005090 + ldr r0, _0800CDB0 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -1298,14 +1298,14 @@ _0800CD8C: movs r0, 0x1 b _0800CDEE .align 2, 0 -_0800CDB0: .4byte gUnknown_3005090 +_0800CDB0: .4byte gTasks _0800CDB4: ldrh r1, [r3, 0x2E] movs r0, 0x80 ands r0, r1 cmp r0, 0 beq _0800CDEC - ldr r1, _0800CDE4 @ =gUnknown_3005090 + ldr r1, _0800CDE4 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -1325,7 +1325,7 @@ _0800CDB4: movs r0, 0x1 b _0800CDEE .align 2, 0 -_0800CDE4: .4byte gUnknown_3005090 +_0800CDE4: .4byte gTasks _0800CDE8: .4byte gUnknown_8234694 _0800CDEC: movs r0, 0 diff --git a/asm/map_name_popup.s b/asm/map_name_popup.s index c4c0ae302..3c67e682a 100644 --- a/asm/map_name_popup.s +++ b/asm/map_name_popup.s @@ -43,7 +43,7 @@ sub_8098110: @ 8098110 movs r0, 0 movs r2, 0 bl ChangeBgY - ldr r1, _08098184 @ =gUnknown_3005090 + ldr r1, _08098184 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -57,9 +57,9 @@ sub_8098110: @ 8098110 _08098178: .4byte gUnknown_203ADFA _0809817C: .4byte sub_80981AC _08098180: .4byte 0xffffef7f -_08098184: .4byte gUnknown_3005090 +_08098184: .4byte gTasks _08098188: - ldr r0, _080981A8 @ =gUnknown_3005090 + ldr r0, _080981A8 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -78,7 +78,7 @@ _080981A2: pop {r0} bx r0 .align 2, 0 -_080981A8: .4byte gUnknown_3005090 +_080981A8: .4byte gTasks thumb_func_end sub_8098110 thumb_func_start sub_80981AC @@ -89,7 +89,7 @@ sub_80981AC: @ 80981AC lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _080981D0 @ =gUnknown_3005090 + ldr r1, _080981D0 @ =gTasks adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -103,7 +103,7 @@ _080981C6: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080981D0: .4byte gUnknown_3005090 +_080981D0: .4byte gTasks _080981D4: .4byte _080981D8 .align 2, 0 _080981D8: @@ -252,7 +252,7 @@ sub_80982EC: @ 80982EC lsls r0, r1, 2 adds r0, r1 lsls r0, 3 - ldr r1, _0809831C @ =gUnknown_3005098 + ldr r1, _0809831C @ =gTasks+0x8 adds r1, r0, r1 movs r2, 0 ldrsh r0, [r1, r2] @@ -265,7 +265,7 @@ _08098312: bx r0 .align 2, 0 _08098318: .4byte sub_80981AC -_0809831C: .4byte gUnknown_3005098 +_0809831C: .4byte gTasks+0x8 thumb_func_end sub_80982EC thumb_func_start sub_8098320 diff --git a/asm/map_obj_lock.s b/asm/map_obj_lock.s index cc0b11174..2b3cbfc5a 100644 --- a/asm/map_obj_lock.s +++ b/asm/map_obj_lock.s @@ -82,7 +82,7 @@ sub_80695CC: @ 80695CC lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _0806963C @ =gUnknown_3005090 + ldr r1, _0806963C @ =gTasks adds r5, r0, r1 movs r1, 0x8 ldrsh r0, [r5, r1] @@ -131,7 +131,7 @@ _08069634: pop {r0} bx r0 .align 2, 0 -_0806963C: .4byte gUnknown_3005090 +_0806963C: .4byte gTasks _08069640: .4byte gUnknown_2036E38 _08069644: .4byte gUnknown_3005074 thumb_func_end sub_80695CC @@ -179,7 +179,7 @@ LockSelectedMapObject: @ 806966C blt _080696AA adds r0, r1, 0 bl FreezeMapObject - ldr r0, _080696BC @ =gUnknown_3005090 + ldr r0, _080696BC @ =gTasks lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -194,7 +194,7 @@ _080696AA: _080696B0: .4byte gUnknown_3005074 _080696B4: .4byte sub_80695CC _080696B8: .4byte gUnknown_2036E38 -_080696BC: .4byte gUnknown_3005090 +_080696BC: .4byte gTasks thumb_func_end LockSelectedMapObject thumb_func_start sub_80696C0 diff --git a/asm/map_preview_screen.s b/asm/map_preview_screen.s index 7a619348b..c8f063d5a 100644 --- a/asm/map_preview_screen.s +++ b/asm/map_preview_screen.s @@ -228,7 +228,7 @@ sub_80F8268: @ 80F8268 movs r0, 0 movs r1, 0x7 bl GetBgAttribute - ldr r1, _080F830C @ =gUnknown_3005090 + ldr r1, _080F830C @ =gTasks lsls r5, r4, 2 adds r5, r4 lsls r5, 3 @@ -281,7 +281,7 @@ sub_80F8268: @ 80F8268 bx r0 .align 2, 0 _080F8308: .4byte sub_80F83D0 -_080F830C: .4byte gUnknown_3005090 +_080F830C: .4byte gTasks _080F8310: .4byte 0x00003e41 _080F8314: .4byte 0x00002020 thumb_func_end sub_80F8268 @@ -388,7 +388,7 @@ sub_80F83D0: @ 80F83D0 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080F83F8 @ =gUnknown_3005098 + ldr r1, _080F83F8 @ =gTasks+0x8 adds r4, r0, r1 movs r1, 0 ldrsh r0, [r4, r1] @@ -402,7 +402,7 @@ _080F83EC: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080F83F8: .4byte gUnknown_3005098 +_080F83F8: .4byte gTasks+0x8 _080F83FC: .4byte _080F8400 .align 2, 0 _080F8400: diff --git a/asm/menu_helpers.s b/asm/menu_helpers.s index a1ff12456..c0e8f1333 100644 --- a/asm/menu_helpers.s +++ b/asm/menu_helpers.s @@ -61,7 +61,7 @@ _080BF4B8: ldr r1, _080BF50C @ =gUnknown_20399CC ldr r0, [sp, 0x34] str r0, [r1] - ldr r1, _080BF510 @ =gUnknown_3005090 + ldr r1, _080BF510 @ =gTasks mov r2, r8 lsls r0, r2, 2 add r0, r8 @@ -80,7 +80,7 @@ _080BF500: .4byte gUnknown_20399D0 _080BF504: .4byte gStringVar4 _080BF508: .4byte gTextFlags _080BF50C: .4byte gUnknown_20399CC -_080BF510: .4byte gUnknown_3005090 +_080BF510: .4byte gTasks _080BF514: .4byte Task_ContinueTaskAfterMessagePrints thumb_func_end DisplayMessageAndContinueTask @@ -148,7 +148,7 @@ _080BF580: _080BF586: movs r0, 0x5 bl PlaySE - ldr r1, _080BF5A0 @ =gUnknown_3005090 + ldr r1, _080BF5A0 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -158,12 +158,12 @@ _080BF586: ldr r1, [r1] b _080BF5BE .align 2, 0 -_080BF5A0: .4byte gUnknown_3005090 +_080BF5A0: .4byte gTasks _080BF5A4: .4byte gUnknown_20399C8 _080BF5A8: movs r0, 0x5 bl PlaySE - ldr r1, _080BF5C8 @ =gUnknown_3005090 + ldr r1, _080BF5C8 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -178,7 +178,7 @@ _080BF5C0: pop {r0} bx r0 .align 2, 0 -_080BF5C8: .4byte gUnknown_3005090 +_080BF5C8: .4byte gTasks _080BF5CC: .4byte gUnknown_20399C8 thumb_func_end sub_80BF560 @@ -213,7 +213,7 @@ sub_80BF5D0: @ 80BF5D0 bl sub_810FF60 ldr r0, _080BF624 @ =gUnknown_20399C8 str r7, [r0] - ldr r1, _080BF628 @ =gUnknown_3005090 + ldr r1, _080BF628 @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -226,7 +226,7 @@ sub_80BF5D0: @ 80BF5D0 bx r0 .align 2, 0 _080BF624: .4byte gUnknown_20399C8 -_080BF628: .4byte gUnknown_3005090 +_080BF628: .4byte gTasks _080BF62C: .4byte sub_80BF560 thumb_func_end sub_80BF5D0 diff --git a/asm/menu_indicators.s b/asm/menu_indicators.s index 93529959f..0dad7d3c1 100644 --- a/asm/menu_indicators.s +++ b/asm/menu_indicators.s @@ -218,7 +218,7 @@ _08133A8E: lsls r0, 2 add r0, r8 lsls r0, 3 - ldr r1, _08133B34 @ =gUnknown_3005098 + ldr r1, _08133B34 @ =gTasks+0x8 adds r7, r0, r1 movs r0, 0 strb r0, [r7] @@ -289,7 +289,7 @@ _08133B1C: .align 2, 0 _08133B2C: .4byte gUnknown_8463308 _08133B30: .4byte sub_8133BA4 -_08133B34: .4byte gUnknown_3005098 +_08133B34: .4byte gTasks+0x8 _08133B38: .4byte 0x0000ffff _08133B3C: .4byte gSprites thumb_func_end AddScrollIndicatorArrowPair @@ -355,7 +355,7 @@ sub_8133BA4: @ 8133BA4 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _08133BD4 @ =gUnknown_3005098 + ldr r0, _08133BD4 @ =gTasks+0x8 adds r4, r1, r0 ldr r0, [r4, 0x4] ldrh r5, [r0] @@ -374,7 +374,7 @@ sub_8133BA4: @ 8133BA4 orrs r1, r2 b _08133BF2 .align 2, 0 -_08133BD4: .4byte gUnknown_3005098 +_08133BD4: .4byte gTasks+0x8 _08133BD8: .4byte gSprites _08133BDC: ldr r3, _08133C10 @ =gSprites @@ -432,7 +432,7 @@ RemoveScrollIndicatorArrowPair: @ 8133C30 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _08133C84 @ =gUnknown_3005098 + ldr r1, _08133C84 @ =gTasks+0x8 adds r5, r0, r1 ldrh r0, [r5, 0xE] ldr r4, _08133C88 @ =0x0000ffff @@ -464,7 +464,7 @@ _08133C58: pop {r0} bx r0 .align 2, 0 -_08133C84: .4byte gUnknown_3005098 +_08133C84: .4byte gTasks+0x8 _08133C88: .4byte 0x0000ffff _08133C8C: .4byte gSprites thumb_func_end RemoveScrollIndicatorArrowPair @@ -766,7 +766,7 @@ _08133EA6: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _08133F94 @ =gUnknown_3005098 + ldr r1, _08133F94 @ =gTasks+0x8 adds r5, r0, r1 ldrh r0, [r6, 0x6] movs r3, 0 @@ -870,7 +870,7 @@ _08133F7E: .align 2, 0 _08133F8C: .4byte gUnknown_8463308 _08133F90: .4byte nullsub_94 -_08133F94: .4byte gUnknown_3005098 +_08133F94: .4byte gTasks+0x8 _08133F98: .4byte gDummySpriteTemplate _08133F9C: .4byte gSprites _08133FA0: .4byte 0x0000ffff @@ -888,7 +888,7 @@ ListMenuUpdateRedOutlineCursorObject: @ 8133FA4 lsls r3, r0, 2 adds r3, r0 lsls r3, 3 - ldr r0, _08133FE0 @ =gUnknown_3005098 + ldr r0, _08133FE0 @ =gTasks+0x8 adds r3, r0 ldr r5, _08133FE4 @ =gSprites ldrb r4, [r3, 0xC] @@ -909,7 +909,7 @@ ListMenuUpdateRedOutlineCursorObject: @ 8133FA4 pop {r0} bx r0 .align 2, 0 -_08133FE0: .4byte gUnknown_3005098 +_08133FE0: .4byte gTasks+0x8 _08133FE4: .4byte gSprites thumb_func_end ListMenuUpdateRedOutlineCursorObject @@ -922,7 +922,7 @@ ListMenuRemoveRedOutlineCursorObject: @ 8133FE8 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _08134034 @ =gUnknown_3005098 + ldr r1, _08134034 @ =gTasks+0x8 adds r4, r0, r1 ldr r0, [r4, 0x8] bl Free @@ -950,7 +950,7 @@ _08134016: pop {r0} bx r0 .align 2, 0 -_08134034: .4byte gUnknown_3005098 +_08134034: .4byte gTasks+0x8 _08134038: .4byte 0x0000ffff _0813403C: .4byte gSprites thumb_func_end ListMenuRemoveRedOutlineCursorObject @@ -1043,7 +1043,7 @@ _081340D6: lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _08134168 @ =gUnknown_3005098 + ldr r1, _08134168 @ =gTasks+0x8 adds r4, r0, r1 ldrh r0, [r5, 0x6] strh r0, [r4, 0x2] @@ -1105,7 +1105,7 @@ _08134156: .align 2, 0 _08134160: .4byte gUnknown_8463308 _08134164: .4byte nullsub_95 -_08134168: .4byte gUnknown_3005098 +_08134168: .4byte gTasks+0x8 _0813416C: .4byte gUnknown_84632F0 _08134170: .4byte gSprites _08134174: .4byte 0x0000ffff @@ -1119,7 +1119,7 @@ ListMenuUpdateRedArrowCursorObject: @ 8134178 lsls r3, r0, 2 adds r3, r0 lsls r3, 3 - ldr r0, _081341A8 @ =gUnknown_3005098 + ldr r0, _081341A8 @ =gTasks+0x8 adds r3, r0 ldr r5, _081341AC @ =gSprites ldrb r4, [r3] @@ -1138,7 +1138,7 @@ ListMenuUpdateRedArrowCursorObject: @ 8134178 pop {r0} bx r0 .align 2, 0 -_081341A8: .4byte gUnknown_3005098 +_081341A8: .4byte gTasks+0x8 _081341AC: .4byte gSprites thumb_func_end ListMenuUpdateRedArrowCursorObject @@ -1151,7 +1151,7 @@ ListMenuRemoveRedArrowCursorObject: @ 81341B0 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _081341F4 @ =gUnknown_3005098 + ldr r1, _081341F4 @ =gTasks+0x8 adds r4, r0, r1 ldrh r0, [r4, 0x2] ldr r6, _081341F8 @ =0x0000ffff @@ -1177,7 +1177,7 @@ _081341D8: pop {r0} bx r0 .align 2, 0 -_081341F4: .4byte gUnknown_3005098 +_081341F4: .4byte gTasks+0x8 _081341F8: .4byte 0x0000ffff _081341FC: .4byte gSprites thumb_func_end ListMenuRemoveRedArrowCursorObject diff --git a/asm/mevent.s b/asm/mevent.s index 9110a1d0a..5d90586d5 100644 --- a/asm/mevent.s +++ b/asm/mevent.s @@ -378,7 +378,7 @@ sub_81438A0: @ 81438A0 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _081438E4 @ =gUnknown_3005098 + ldr r0, _081438E4 @ =gTasks+0x8 adds r4, r0 movs r0, 0 strb r0, [r4, 0x8] @@ -401,7 +401,7 @@ sub_81438A0: @ 81438A0 bx r0 .align 2, 0 _081438E0: .4byte sub_8143910 -_081438E4: .4byte gUnknown_3005098 +_081438E4: .4byte gTasks+0x8 thumb_func_end sub_81438A0 thumb_func_start sub_81438E8 @@ -441,7 +441,7 @@ sub_8143910: @ 8143910 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _08143934 @ =gUnknown_3005098 + ldr r1, _08143934 @ =gTasks+0x8 adds r4, r0, r1 ldrb r0, [r4, 0x8] cmp r0, 0x1A @@ -454,7 +454,7 @@ _08143928: ldr r0, [r0] mov pc, r0 .align 2, 0 -_08143934: .4byte gUnknown_3005098 +_08143934: .4byte gTasks+0x8 _08143938: .4byte _0814393C .align 2, 0 _0814393C: diff --git a/asm/naming_screen.s b/asm/naming_screen.s index e4d67f534..e42ed45d8 100644 --- a/asm/naming_screen.s +++ b/asm/naming_screen.s @@ -1174,7 +1174,7 @@ sub_809E32C: @ 809E32C lsls r0, 24 lsrs r0, 24 ldr r5, _0809E35C @ =gUnknown_83E2354 - ldr r2, _0809E360 @ =gUnknown_3005090 + ldr r2, _0809E360 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -1195,7 +1195,7 @@ _0809E33E: bx r0 .align 2, 0 _0809E35C: .4byte gUnknown_83E2354 -_0809E360: .4byte gUnknown_3005090 +_0809E360: .4byte gTasks thumb_func_end sub_809E32C thumb_func_start sub_809E364 @@ -1410,7 +1410,7 @@ sub_809E4F0: @ 809E4F0 bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _0809E514 @ =gUnknown_3005090 + ldr r2, _0809E514 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -1421,7 +1421,7 @@ sub_809E4F0: @ 809E4F0 bx r0 .align 2, 0 _0809E510: .4byte c3_0809E58C -_0809E514: .4byte gUnknown_3005090 +_0809E514: .4byte gTasks thumb_func_end sub_809E4F0 thumb_func_start sub_809E518 @@ -1440,7 +1440,7 @@ sub_809E518: @ 809E518 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0809E554 @ =gUnknown_3005090 + ldr r0, _0809E554 @ =gTasks adds r4, r1, r0 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -1454,7 +1454,7 @@ sub_809E518: @ 809E518 b _0809E584 .align 2, 0 _0809E550: .4byte c3_0809E58C -_0809E554: .4byte gUnknown_3005090 +_0809E554: .4byte gTasks _0809E558: cmp r5, 0x3 bne _0809E568 @@ -1492,7 +1492,7 @@ c3_0809E58C: @ 809E58C lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0809E5F4 @ =gUnknown_3005090 + ldr r0, _0809E5F4 @ =gTasks adds r4, r1, r0 ldrh r1, [r4, 0x8] movs r2, 0x8 @@ -1538,7 +1538,7 @@ _0809E5D8: adds r0, r2, r1 b _0809E606 .align 2, 0 -_0809E5F4: .4byte gUnknown_3005090 +_0809E5F4: .4byte gTasks _0809E5F8: movs r0, 0x10 strh r0, [r4, 0xE] @@ -3140,7 +3140,7 @@ GetInputEvent: @ 809F21C bl FindTaskIdByFunc lsls r0, 24 lsrs r0, 24 - ldr r2, _0809F23C @ =gUnknown_3005090 + ldr r2, _0809F23C @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -3150,7 +3150,7 @@ GetInputEvent: @ 809F21C bx r1 .align 2, 0 _0809F238: .4byte sub_809F26C -_0809F23C: .4byte gUnknown_3005090 +_0809F23C: .4byte gTasks thumb_func_end GetInputEvent thumb_func_start SetInputState @@ -3163,7 +3163,7 @@ SetInputState: @ 809F240 bl FindTaskIdByFunc lsls r0, 24 lsrs r0, 24 - ldr r2, _0809F268 @ =gUnknown_3005090 + ldr r2, _0809F268 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -3174,7 +3174,7 @@ SetInputState: @ 809F240 bx r0 .align 2, 0 _0809F264: .4byte sub_809F26C -_0809F268: .4byte gUnknown_3005090 +_0809F268: .4byte gTasks thumb_func_end SetInputState thumb_func_start sub_809F26C @@ -3184,7 +3184,7 @@ sub_809F26C: @ 809F26C lsls r1, 24 lsrs r1, 24 ldr r3, _0809F294 @ =gUnknown_83E23E0 - ldr r2, _0809F298 @ =gUnknown_3005090 + ldr r2, _0809F298 @ =gTasks lsls r0, r1, 2 adds r0, r1 lsls r0, 3 @@ -3199,7 +3199,7 @@ sub_809F26C: @ 809F26C bx r0 .align 2, 0 _0809F294: .4byte gUnknown_83E23E0 -_0809F298: .4byte gUnknown_3005090 +_0809F298: .4byte gTasks thumb_func_end sub_809F26C thumb_func_start InputState_Disabled diff --git a/asm/new_menu_helpers.s b/asm/new_menu_helpers.s index 036da9237..b3844a165 100644 --- a/asm/new_menu_helpers.s +++ b/asm/new_menu_helpers.s @@ -312,7 +312,7 @@ _080F699A: adds r1, r6, 0 mov r3, r9 bl sub_80F6AD0 - ldr r2, _080F69E4 @ =gUnknown_3005090 + ldr r2, _080F69E4 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -332,7 +332,7 @@ _080F69D2: bx r0 .align 2, 0 _080F69E0: .4byte task_free_buf_after_copying_tile_data_to_vram -_080F69E4: .4byte gUnknown_3005090 +_080F69E4: .4byte gTasks thumb_func_end sub_80F696C thumb_func_start sub_80F69E8 @@ -375,7 +375,7 @@ _080F6A14: adds r1, r5, 0 mov r3, r8 bl sub_80F6AD0 - ldr r2, _080F6A60 @ =gUnknown_3005090 + ldr r2, _080F6A60 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -394,7 +394,7 @@ _080F6A4E: bx r0 .align 2, 0 _080F6A5C: .4byte task_free_buf_after_copying_tile_data_to_vram -_080F6A60: .4byte gUnknown_3005090 +_080F6A60: .4byte gTasks thumb_func_end sub_80F69E8 thumb_func_start task_free_buf_after_copying_tile_data_to_vram @@ -402,7 +402,7 @@ task_free_buf_after_copying_tile_data_to_vram: @ 80F6A64 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _080F6A9C @ =gUnknown_3005090 + ldr r1, _080F6A9C @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -424,7 +424,7 @@ _080F6A94: pop {r0} bx r0 .align 2, 0 -_080F6A9C: .4byte gUnknown_3005090 +_080F6A9C: .4byte gTasks thumb_func_end task_free_buf_after_copying_tile_data_to_vram thumb_func_start malloc_and_decompress diff --git a/asm/oak_speech.s b/asm/oak_speech.s index bceb94837..c5591fc0e 100644 --- a/asm/oak_speech.s +++ b/asm/oak_speech.s @@ -39,7 +39,7 @@ sub_812E944: @ 812E944 bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r1, _0812E9E0 @ =gUnknown_3005090 + ldr r1, _0812E9E0 @ =gTasks lsls r4, r0, 2 adds r4, r0 lsls r4, 3 @@ -81,7 +81,7 @@ sub_812E944: @ 812E944 bx r0 .align 2, 0 _0812E9DC: .4byte sub_812E9F8 -_0812E9E0: .4byte gUnknown_3005090 +_0812E9E0: .4byte gTasks thumb_func_end sub_812E944 thumb_func_start sub_812E9E4 @@ -105,7 +105,7 @@ sub_812E9F8: @ 812E9F8 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0812EA28 @ =gUnknown_3005098 + ldr r1, _0812EA28 @ =gTasks+0x8 adds r4, r0, r1 ldrh r1, [r4, 0x10] movs r2, 0x10 @@ -123,7 +123,7 @@ sub_812E9F8: @ 812E9F8 movs r0, 0x1 b _0812EA4C .align 2, 0 -_0812EA28: .4byte gUnknown_3005098 +_0812EA28: .4byte gTasks+0x8 _0812EA2C: subs r0, r1, 0x1 strh r0, [r4, 0x10] @@ -572,7 +572,7 @@ _0812ED9A: movs r2, 0x95 movs r3, 0 bl sub_8006300 - ldr r2, _0812EE2C @ =gUnknown_3005090 + ldr r2, _0812EE2C @ =gTasks lsls r1, r6, 2 adds r1, r6 lsls r1, 3 @@ -591,7 +591,7 @@ _0812EE1C: .4byte 0x0000d00f _0812EE20: .4byte 0x0000d002 _0812EE24: .4byte 0x0000d00e _0812EE28: .4byte gUnknown_2037AB8 -_0812EE2C: .4byte gUnknown_3005090 +_0812EE2C: .4byte gTasks _0812EE30: movs r0, 0x1 negs r0, r0 @@ -613,7 +613,7 @@ _0812EE30: bl SetVBlankCallback ldr r0, _0812EE84 @ =0x00000143 bl PlayBGM - ldr r1, _0812EE88 @ =gUnknown_3005090 + ldr r1, _0812EE88 @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -629,7 +629,7 @@ _0812EE30: .align 2, 0 _0812EE80: .4byte sub_812EAFC _0812EE84: .4byte 0x00000143 -_0812EE88: .4byte gUnknown_3005090 +_0812EE88: .4byte gTasks _0812EE8C: .4byte sub_812F0B0 _0812EE90: .4byte gMain _0812EE94: @@ -862,7 +862,7 @@ _0812F06A: movs r2, 0x10 movs r3, 0 bl BeginNormalPaletteFade - ldr r1, _0812F0A8 @ =gUnknown_3005090 + ldr r1, _0812F0A8 @ =gTasks mov r0, r10 add r0, r8 lsls r0, 3 @@ -880,7 +880,7 @@ _0812F06A: .align 2, 0 _0812F0A0: .4byte gUnknown_8460E34 _0812F0A4: .4byte 0xffffdfff -_0812F0A8: .4byte gUnknown_3005090 +_0812F0A8: .4byte gTasks _0812F0AC: .4byte sub_812F0B0 thumb_func_end sub_812EF50 @@ -907,7 +907,7 @@ sub_812F0B0: @ 812F0B0 ands r0, r1 cmp r0, 0 beq _0812F120 - ldr r1, _0812F114 @ =gUnknown_3005090 + ldr r1, _0812F114 @ =gTasks lsls r2, r5, 2 adds r0, r2, r5 lsls r0, 3 @@ -933,7 +933,7 @@ sub_812F0B0: @ 812F0B0 .align 2, 0 _0812F10C: .4byte gUnknown_2037AB8 _0812F110: .4byte gMain -_0812F114: .4byte gUnknown_3005090 +_0812F114: .4byte gTasks _0812F118: .4byte gUnknown_203B108 _0812F11C: .4byte 0xffffdfff _0812F120: @@ -942,7 +942,7 @@ _0812F120: ldrh r0, [r0, 0x12] cmp r0, 0 beq _0812F162 - ldr r1, _0812F170 @ =gUnknown_3005090 + ldr r1, _0812F170 @ =gTasks lsls r4, r5, 2 adds r0, r4, r5 lsls r0, 3 @@ -962,7 +962,7 @@ _0812F120: _0812F150: movs r0, 0x5 bl PlaySE - ldr r0, _0812F170 @ =gUnknown_3005090 + ldr r0, _0812F170 @ =gTasks adds r1, r4, r5 lsls r1, 3 adds r1, r0 @@ -975,7 +975,7 @@ _0812F162: bx r0 .align 2, 0 _0812F16C: .4byte gUnknown_203B108 -_0812F170: .4byte gUnknown_3005090 +_0812F170: .4byte gTasks _0812F174: .4byte 0x0000ffff _0812F178: .4byte 0xffffdfff _0812F17C: .4byte sub_812F180 @@ -1019,7 +1019,7 @@ _0812F1B8: mov r8, r2 _0812F1C4: ldr r2, [r5] - ldr r1, _0812F244 @ =gUnknown_3005090 + ldr r1, _0812F244 @ =gTasks lsls r3, r7, 2 adds r0, r3, r7 lsls r0, 3 @@ -1072,7 +1072,7 @@ _0812F1EA: cmp r6, r8 bcc _0812F1EA _0812F234: - ldr r0, _0812F244 @ =gUnknown_3005090 + ldr r0, _0812F244 @ =gTasks mov r2, r9 adds r1, r2, r7 lsls r1, 3 @@ -1081,7 +1081,7 @@ _0812F234: str r0, [r1] b _0812F260 .align 2, 0 -_0812F244: .4byte gUnknown_3005090 +_0812F244: .4byte gTasks _0812F248: .4byte sub_812EF50 _0812F24C: movs r0, 0x1 @@ -1167,7 +1167,7 @@ _0812F292: bl FillBgTilemapBufferRect_Palette0 movs r0, 0x1 bl CopyBgTilemapBufferToVram - ldr r0, _0812F334 @ =gUnknown_3005090 + ldr r0, _0812F334 @ =gTasks mov r1, r8 lsls r4, r1, 2 add r4, r8 @@ -1196,7 +1196,7 @@ _0812F320: .align 2, 0 _0812F32C: .4byte gUnknown_2037AB8 _0812F330: .4byte gUnknown_203B108 -_0812F334: .4byte gUnknown_3005090 +_0812F334: .4byte gTasks _0812F338: .4byte sub_812F33C thumb_func_end sub_812F274 @@ -1213,7 +1213,7 @@ sub_812F33C: @ 812F33C adds r0, r7 lsls r0, 3 mov r8, r0 - ldr r0, _0812F370 @ =gUnknown_3005098 + ldr r0, _0812F370 @ =gTasks+0x8 mov r9, r0 mov r5, r8 add r5, r9 @@ -1228,7 +1228,7 @@ sub_812F33C: @ 812F33C strh r0, [r5, 0x6] b _0812F476 .align 2, 0 -_0812F370: .4byte gUnknown_3005098 +_0812F370: .4byte gTasks+0x8 _0812F374: movs r0, 0xA2 lsls r0, 1 @@ -1373,7 +1373,7 @@ sub_812F4A8: @ 812F4A8 lsls r0, r2, 2 adds r0, r2 lsls r6, r0, 3 - ldr r7, _0812F4D8 @ =gUnknown_3005098 + ldr r7, _0812F4D8 @ =gTasks+0x8 adds r5, r6, r7 ldr r0, _0812F4DC @ =gMain movs r1, 0x87 @@ -1391,7 +1391,7 @@ _0812F4CC: ldr r0, [r0] mov pc, r0 .align 2, 0 -_0812F4D8: .4byte gUnknown_3005098 +_0812F4D8: .4byte gTasks+0x8 _0812F4DC: .4byte gMain _0812F4E0: .4byte _0812F4E4 .align 2, 0 @@ -1591,7 +1591,7 @@ _0812F676: .align 2, 0 _0812F684: .4byte gMain _0812F688: - ldr r1, _0812F6B4 @ =gUnknown_3005090 + ldr r1, _0812F6B4 @ =gTasks lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -1612,7 +1612,7 @@ _0812F6A2: strb r0, [r1] b _0812F71C .align 2, 0 -_0812F6B4: .4byte gUnknown_3005090 +_0812F6B4: .4byte gTasks _0812F6B8: .4byte 0x00000145 _0812F6BC: .4byte gMain _0812F6C0: @@ -1678,7 +1678,7 @@ sub_812F72C: @ 812F72C lsls r0, r5, 2 adds r0, r5 lsls r7, r0, 3 - ldr r0, _0812F7B4 @ =gUnknown_3005098 + ldr r0, _0812F7B4 @ =gTasks+0x8 mov r8, r0 adds r4, r7, r0 ldr r0, _0812F7B8 @ =gUnknown_2037AB8 @@ -1730,7 +1730,7 @@ _0812F7A6: pop {r0} bx r0 .align 2, 0 -_0812F7B4: .4byte gUnknown_3005098 +_0812F7B4: .4byte gTasks+0x8 _0812F7B8: .4byte gUnknown_2037AB8 _0812F7BC: .4byte sub_812F7C0 thumb_func_end sub_812F72C @@ -1746,7 +1746,7 @@ sub_812F7C0: @ 812F7C0 lsls r0, r4, 2 adds r0, r4 lsls r7, r0, 3 - ldr r0, _0812F7EC @ =gUnknown_3005098 + ldr r0, _0812F7EC @ =gTasks+0x8 mov r8, r0 adds r5, r7, r0 movs r0, 0 @@ -1760,7 +1760,7 @@ sub_812F7C0: @ 812F7C0 strh r0, [r5, 0x6] b _0812F862 .align 2, 0 -_0812F7EC: .4byte gUnknown_3005098 +_0812F7EC: .4byte gTasks+0x8 _0812F7F0: ldr r0, _0812F870 @ =gUnknown_8460CA4 add r1, sp, 0x4 @@ -1832,7 +1832,7 @@ sub_812F880: @ 812F880 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _0812F8B0 @ =gUnknown_3005098 + ldr r1, _0812F8B0 @ =gTasks+0x8 adds r2, r0, r1 ldr r0, _0812F8B4 @ =gUnknown_2037AB8 ldrb r1, [r0, 0x7] @@ -1849,7 +1849,7 @@ sub_812F880: @ 812F880 strh r0, [r2, 0x6] b _0812F92E .align 2, 0 -_0812F8B0: .4byte gUnknown_3005098 +_0812F8B0: .4byte gTasks+0x8 _0812F8B4: .4byte gUnknown_2037AB8 _0812F8B8: movs r0, 0 @@ -1899,7 +1899,7 @@ _0812F918: movs r0, 0 movs r1, 0x3 bl CopyWindowToVram - ldr r0, _0812F93C @ =gUnknown_3005090 + ldr r0, _0812F93C @ =gTasks lsls r1, r6, 2 adds r1, r6 lsls r1, 3 @@ -1913,7 +1913,7 @@ _0812F92E: bx r0 .align 2, 0 _0812F938: .4byte gUnknown_203B108 -_0812F93C: .4byte gUnknown_3005090 +_0812F93C: .4byte gTasks _0812F940: .4byte sub_812F944 thumb_func_end sub_812F880 @@ -1976,7 +1976,7 @@ _0812F9BC: movs r0, 0 movs r1, 0x3 bl CopyWindowToVram - ldr r1, _0812F9E4 @ =gUnknown_3005090 + ldr r1, _0812F9E4 @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -1992,7 +1992,7 @@ _0812F9D6: bx r0 .align 2, 0 _0812F9E0: .4byte gUnknown_203B108 -_0812F9E4: .4byte gUnknown_3005090 +_0812F9E4: .4byte gTasks _0812F9E8: .4byte sub_812F9EC thumb_func_end sub_812F944 @@ -2005,7 +2005,7 @@ sub_812F9EC: @ 812F9EC lsls r1, r0, 2 adds r1, r0 lsls r6, r1, 3 - ldr r7, _0812FA68 @ =gUnknown_3005098 + ldr r7, _0812FA68 @ =gTasks+0x8 adds r4, r6, r7 movs r0, 0 bl IsTextPrinterActive @@ -2060,7 +2060,7 @@ _0812FA5E: pop {r0} bx r0 .align 2, 0 -_0812FA68: .4byte gUnknown_3005098 +_0812FA68: .4byte gTasks+0x8 _0812FA6C: .4byte gSprites _0812FA70: .4byte 0xffff1fff _0812FA74: .4byte sub_812FA78 @@ -2076,7 +2076,7 @@ sub_812FA78: @ 812FA78 lsls r0, 24 cmp r0, 0 beq _0812FAA0 - ldr r0, _0812FAFC @ =gUnknown_3005090 + ldr r0, _0812FAFC @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -2088,7 +2088,7 @@ sub_812FA78: @ 812FA78 ldr r0, _0812FB00 @ =sub_812FB4C str r0, [r1] _0812FAA0: - ldr r1, _0812FAFC @ =gUnknown_3005090 + ldr r1, _0812FAFC @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -2132,7 +2132,7 @@ _0812FAA0: bl AddTextPrinterParametrized b _0812FB30 .align 2, 0 -_0812FAFC: .4byte gUnknown_3005090 +_0812FAFC: .4byte gTasks _0812FB00: .4byte sub_812FB4C _0812FB04: .4byte 0x00003fff _0812FB08: .4byte gUnknown_81C5D12 @@ -2227,7 +2227,7 @@ _0812FBC4: movs r0, 0 movs r1, 0x3 bl CopyWindowToVram - ldr r0, _0812FBE8 @ =gUnknown_3005090 + ldr r0, _0812FBE8 @ =gTasks lsls r1, r6, 2 adds r1, r6 lsls r1, 3 @@ -2241,7 +2241,7 @@ _0812FBDA: bx r0 .align 2, 0 _0812FBE4: .4byte gUnknown_203B108 -_0812FBE8: .4byte gUnknown_3005090 +_0812FBE8: .4byte gTasks _0812FBEC: .4byte sub_812FBF0 thumb_func_end sub_812FB4C @@ -2260,7 +2260,7 @@ sub_812FBF0: @ 812FBF0 movs r0, 0 movs r1, 0x1 bl sub_80F6F54 - ldr r0, _0812FC58 @ =gUnknown_3005090 + ldr r0, _0812FC58 @ =gTasks lsls r4, r6, 2 adds r4, r6 lsls r4, 3 @@ -2297,7 +2297,7 @@ _0812FC4E: pop {r0} bx r0 .align 2, 0 -_0812FC58: .4byte gUnknown_3005090 +_0812FC58: .4byte gTasks _0812FC5C: .4byte gSprites _0812FC60: .4byte 0xffff1f3f _0812FC64: .4byte sub_812FC68 @@ -2312,7 +2312,7 @@ sub_812FC68: @ 812FC68 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _0812FCA4 @ =gUnknown_3005098 + ldr r1, _0812FCA4 @ =gTasks+0x8 adds r5, r0, r1 movs r1, 0 ldrsh r0, [r5, r1] @@ -2336,7 +2336,7 @@ _0812FC9A: strh r0, [r5] b _0812FD62 .align 2, 0 -_0812FCA4: .4byte gUnknown_3005098 +_0812FCA4: .4byte gTasks+0x8 _0812FCA8: .4byte gSprites _0812FCAC: movs r1, 0x6 @@ -2417,7 +2417,7 @@ _0812FD4C: movs r0, 0 movs r1, 0x3 bl CopyWindowToVram - ldr r0, _0812FD70 @ =gUnknown_3005090 + ldr r0, _0812FD70 @ =gTasks lsls r1, r6, 2 adds r1, r6 lsls r1, 3 @@ -2431,7 +2431,7 @@ _0812FD62: bx r0 .align 2, 0 _0812FD6C: .4byte gUnknown_203B108 -_0812FD70: .4byte gUnknown_3005090 +_0812FD70: .4byte gTasks _0812FD74: .4byte sub_812FD78 thumb_func_end sub_812FC68 @@ -2443,7 +2443,7 @@ sub_812FD78: @ 812FD78 lsls r0, r4, 2 adds r0, r4 lsls r5, r0, 3 - ldr r7, _0812FDB8 @ =gUnknown_3005098 + ldr r7, _0812FDB8 @ =gTasks+0x8 adds r6, r5, r7 movs r0, 0 bl IsTextPrinterActive @@ -2468,7 +2468,7 @@ _0812FDB2: pop {r0} bx r0 .align 2, 0 -_0812FDB8: .4byte gUnknown_3005098 +_0812FDB8: .4byte gTasks+0x8 _0812FDBC: .4byte sub_812FDC0 thumb_func_end sub_812FD78 @@ -2481,7 +2481,7 @@ sub_812FDC0: @ 812FDC0 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _0812FDEC @ =gUnknown_3005098 + ldr r1, _0812FDEC @ =gTasks+0x8 adds r1, r0, r1 movs r2, 0x4 ldrsh r0, [r1, r2] @@ -2496,7 +2496,7 @@ sub_812FDC0: @ 812FDC0 strh r0, [r1, 0x6] b _0812FE72 .align 2, 0 -_0812FDEC: .4byte gUnknown_3005098 +_0812FDEC: .4byte gTasks+0x8 _0812FDF0: movs r2, 0x3C negs r2, r2 @@ -2550,7 +2550,7 @@ _0812FE5C: movs r0, 0 movs r1, 0x3 bl CopyWindowToVram - ldr r0, _0812FE80 @ =gUnknown_3005090 + ldr r0, _0812FE80 @ =gTasks lsls r1, r6, 2 adds r1, r6 lsls r1, 3 @@ -2564,7 +2564,7 @@ _0812FE72: bx r0 .align 2, 0 _0812FE7C: .4byte gUnknown_203B108 -_0812FE80: .4byte gUnknown_3005090 +_0812FE80: .4byte gTasks _0812FE84: .4byte sub_812FE88 thumb_func_end sub_812FDC0 @@ -2585,7 +2585,7 @@ sub_812FE88: @ 812FE88 bne _0812FF7E ldr r0, _0812FF8C @ =gUnknown_8462EC8 bl AddWindow - ldr r1, _0812FF90 @ =gUnknown_3005090 + ldr r1, _0812FF90 @ =gTasks lsls r5, r4, 2 adds r5, r4 lsls r5, 3 @@ -2692,7 +2692,7 @@ _0812FF7E: bx r0 .align 2, 0 _0812FF8C: .4byte gUnknown_8462EC8 -_0812FF90: .4byte gUnknown_3005090 +_0812FF90: .4byte gTasks _0812FF94: .4byte gUnknown_203B108 _0812FF98: .4byte gUnknown_8415D93 _0812FF9C: .4byte gUnknown_8415D97 @@ -2724,7 +2724,7 @@ _0812FFC8: ldr r0, [r0] strb r1, [r0, 0x8] _0812FFCE: - ldr r0, _0812FFE8 @ =gUnknown_3005090 + ldr r0, _0812FFE8 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -2737,7 +2737,7 @@ _0812FFDC: bx r0 .align 2, 0 _0812FFE4: .4byte gSaveBlock2Ptr -_0812FFE8: .4byte gUnknown_3005090 +_0812FFE8: .4byte gTasks _0812FFEC: .4byte sub_812FFF0 thumb_func_end sub_812FFA4 @@ -2750,7 +2750,7 @@ sub_812FFF0: @ 812FFF0 lsls r5, r0, 2 adds r5, r0 lsls r5, 3 - ldr r6, _08130048 @ =gUnknown_3005098 + ldr r6, _08130048 @ =gTasks+0x8 adds r4, r5, r6 ldrb r0, [r4, 0x1A] movs r1, 0x1 @@ -2782,7 +2782,7 @@ sub_812FFF0: @ 812FFF0 pop {r0} bx r0 .align 2, 0 -_08130048: .4byte gUnknown_3005098 +_08130048: .4byte gTasks+0x8 _0813004C: .4byte sub_8130050 thumb_func_end sub_812FFF0 @@ -2810,7 +2810,7 @@ _08130078: adds r0, r4, 0 movs r1, 0x2 bl sub_81315CC - ldr r1, _08130098 @ =gUnknown_3005090 + ldr r1, _08130098 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -2823,7 +2823,7 @@ _08130078: pop {r0} bx r0 .align 2, 0 -_08130098: .4byte gUnknown_3005090 +_08130098: .4byte gTasks _0813009C: .4byte sub_81300A0 thumb_func_end sub_8130050 @@ -2836,7 +2836,7 @@ sub_81300A0: @ 81300A0 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _081300CC @ =gUnknown_3005098 + ldr r1, _081300CC @ =gTasks+0x8 adds r1, r0, r1 movs r2, 0x4 ldrsh r0, [r1, r2] @@ -2851,7 +2851,7 @@ sub_81300A0: @ 81300A0 strh r0, [r1, 0x6] b _0813014A .align 2, 0 -_081300CC: .4byte gUnknown_3005098 +_081300CC: .4byte gTasks+0x8 _081300D0: strh r4, [r1, 0x2] movs r0, 0 @@ -2901,7 +2901,7 @@ _08130134: movs r0, 0 movs r1, 0x3 bl CopyWindowToVram - ldr r0, _08130158 @ =gUnknown_3005090 + ldr r0, _08130158 @ =gTasks lsls r1, r6, 2 adds r1, r6 lsls r1, 3 @@ -2915,7 +2915,7 @@ _0813014A: bx r0 .align 2, 0 _08130154: .4byte gUnknown_203B108 -_08130158: .4byte gUnknown_3005090 +_08130158: .4byte gTasks _0813015C: .4byte sub_8130160 thumb_func_end sub_81300A0 @@ -2941,7 +2941,7 @@ sub_8130160: @ 8130160 ldr r0, _081301A4 @ =gUnknown_203B108 ldr r0, [r0] strh r4, [r0, 0x10] - ldr r1, _081301A8 @ =gUnknown_3005090 + ldr r1, _081301A8 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -2955,7 +2955,7 @@ _0813019A: bx r0 .align 2, 0 _081301A4: .4byte gUnknown_203B108 -_081301A8: .4byte gUnknown_3005090 +_081301A8: .4byte gTasks _081301AC: .4byte sub_81303B4 thumb_func_end sub_8130160 @@ -2968,7 +2968,7 @@ sub_81301B0: @ 81301B0 lsls r0, r5, 2 adds r0, r5 lsls r6, r0, 3 - ldr r7, _081301F8 @ =gUnknown_3005098 + ldr r7, _081301F8 @ =gTasks+0x8 adds r4, r6, r7 movs r0, 0 bl IsTextPrinterActive @@ -2995,7 +2995,7 @@ sub_81301B0: @ 81301B0 bl ChangeBgX b _08130218 .align 2, 0 -_081301F8: .4byte gUnknown_3005098 +_081301F8: .4byte gTasks+0x8 _081301FC: .4byte gSpriteCoordOffsetX _08130200: strh r1, [r4, 0x2] @@ -3123,7 +3123,7 @@ _081302FE: movs r1, 0x3 bl CopyWindowToVram _08130306: - ldr r0, _0813031C @ =gUnknown_3005090 + ldr r0, _0813031C @ =gTasks lsls r1, r6, 2 adds r1, r6 lsls r1, 3 @@ -3135,7 +3135,7 @@ _08130306: pop {r0} bx r0 .align 2, 0 -_0813031C: .4byte gUnknown_3005090 +_0813031C: .4byte gTasks _08130320: .4byte sub_8130324 thumb_func_end sub_8130228 @@ -3148,7 +3148,7 @@ sub_8130324: @ 8130324 lsls r1, r0, 2 adds r1, r0 lsls r6, r1, 3 - ldr r7, _0813037C @ =gUnknown_3005098 + ldr r7, _0813037C @ =gTasks+0x8 adds r5, r6, r7 bl ProcessMenuInput lsls r0, 24 @@ -3181,7 +3181,7 @@ sub_8130324: @ 8130324 ldr r1, _08130384 @ =sub_8130464 b _081303A6 .align 2, 0 -_0813037C: .4byte gUnknown_3005098 +_0813037C: .4byte gTasks+0x8 _08130380: .4byte gUnknown_203B108 _08130384: .4byte sub_8130464 _08130388: @@ -3248,7 +3248,7 @@ _081303FC: .4byte gUnknown_203B108 _08130400: .4byte gSaveBlock2Ptr _08130404: .4byte sub_8130C64 _08130408: - ldr r0, _08130454 @ =gUnknown_3005090 + ldr r0, _08130454 @ =gTasks lsls r4, r6, 2 adds r4, r6 lsls r4, 3 @@ -3284,7 +3284,7 @@ _0813044C: pop {r0} bx r0 .align 2, 0 -_08130454: .4byte gUnknown_3005090 +_08130454: .4byte gTasks _08130458: .4byte gSaveBlock1Ptr _0813045C: .4byte 0x00003a4c _08130460: .4byte sub_8130C64 @@ -3299,7 +3299,7 @@ sub_8130464: @ 8130464 lsls r1, r0, 2 adds r1, r0 lsls r6, r1, 3 - ldr r7, _081304A0 @ =gUnknown_3005098 + ldr r7, _081304A0 @ =gTasks+0x8 adds r5, r6, r7 ldr r0, _081304A4 @ =gUnknown_2037AB8 ldrb r1, [r0, 0x7] @@ -3321,7 +3321,7 @@ sub_8130464: @ 8130464 bl StringExpandPlaceholders b _081304BC .align 2, 0 -_081304A0: .4byte gUnknown_3005098 +_081304A0: .4byte gTasks+0x8 _081304A4: .4byte gUnknown_2037AB8 _081304A8: .4byte gUnknown_203B108 _081304AC: .4byte gStringVar4 @@ -3428,7 +3428,7 @@ _08130576: _0813057C: movs r0, 0x5 bl PlaySE - ldr r1, _081305B0 @ =gUnknown_3005090 + ldr r1, _081305B0 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -3450,7 +3450,7 @@ _0813057C: str r0, [r6] b _0813063E .align 2, 0 -_081305B0: .4byte gUnknown_3005090 +_081305B0: .4byte gTasks _081305B4: .4byte gUnknown_203B108 _081305B8: .4byte sub_8130650 _081305BC: @@ -3492,7 +3492,7 @@ _08130604: ldrh r0, [r0, 0x10] cmp r0, 0 bne _08130630 - ldr r0, _08130628 @ =gUnknown_3005090 + ldr r0, _08130628 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -3501,10 +3501,10 @@ _08130604: b _0813063C .align 2, 0 _08130624: .4byte gUnknown_203B108 -_08130628: .4byte gUnknown_3005090 +_08130628: .4byte gTasks _0813062C: .4byte sub_8130160 _08130630: - ldr r0, _08130648 @ =gUnknown_3005090 + ldr r0, _08130648 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -3518,7 +3518,7 @@ _0813063E: pop {r0} bx r0 .align 2, 0 -_08130648: .4byte gUnknown_3005090 +_08130648: .4byte gTasks _0813064C: .4byte sub_8130228 thumb_func_end sub_8130554 @@ -3530,7 +3530,7 @@ sub_8130650: @ 8130650 lsls r1, r0, 2 adds r1, r0 lsls r5, r1, 3 - ldr r6, _0813067C @ =gUnknown_3005098 + ldr r6, _0813067C @ =gTasks+0x8 adds r4, r5, r6 movs r1, 0x4 ldrsh r0, [r4, r1] @@ -3546,7 +3546,7 @@ sub_8130650: @ 8130650 strh r0, [r4, 0x6] b _0813068A .align 2, 0 -_0813067C: .4byte gUnknown_3005098 +_0813067C: .4byte gTasks+0x8 _08130680: adds r0, r6, 0 subs r0, 0x8 @@ -3577,7 +3577,7 @@ sub_8130694: @ 8130694 adds r0, r4, 0 movs r1, 0x2 bl sub_813144C - ldr r0, _081306CC @ =gUnknown_3005090 + ldr r0, _081306CC @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -3589,7 +3589,7 @@ _081306C4: pop {r0} bx r0 .align 2, 0 -_081306CC: .4byte gUnknown_3005090 +_081306CC: .4byte gTasks _081306D0: .4byte sub_81307D0 thumb_func_end sub_8130694 @@ -3603,7 +3603,7 @@ sub_81306D4: @ 81306D4 movs r1, 0 movs r2, 0 bl ChangeBgX - ldr r0, _08130710 @ =gUnknown_3005090 + ldr r0, _08130710 @ =gTasks lsls r4, r5, 2 adds r4, r5 lsls r4, 3 @@ -3623,7 +3623,7 @@ sub_81306D4: @ 81306D4 pop {r0} bx r0 .align 2, 0 -_08130710: .4byte gUnknown_3005090 +_08130710: .4byte gTasks _08130714: .4byte gSpriteCoordOffsetX _08130718: .4byte sub_813071C thumb_func_end sub_81306D4 @@ -3637,7 +3637,7 @@ sub_813071C: @ 813071C lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _08130770 @ =gUnknown_3005098 + ldr r1, _08130770 @ =gTasks+0x8 adds r0, r1 movs r1, 0x4 ldrsh r0, [r0, r1] @@ -3670,7 +3670,7 @@ sub_813071C: @ 813071C bl AddTextPrinterParametrized b _0813079E .align 2, 0 -_08130770: .4byte gUnknown_3005098 +_08130770: .4byte gTasks+0x8 _08130774: .4byte gUnknown_81C5E2E _08130778: .4byte gStringVar4 _0813077C: .4byte gUnknown_203B108 @@ -3697,7 +3697,7 @@ _0813079E: ldr r1, [r0] movs r0, 0x1 strh r0, [r1, 0x10] - ldr r1, _081307C8 @ =gUnknown_3005090 + ldr r1, _081307C8 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -3711,7 +3711,7 @@ _081307BC: bx r0 .align 2, 0 _081307C4: .4byte gUnknown_203B108 -_081307C8: .4byte gUnknown_3005090 +_081307C8: .4byte gTasks _081307CC: .4byte sub_81301B0 thumb_func_end sub_813071C @@ -3723,7 +3723,7 @@ sub_81307D0: @ 81307D0 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _081307FC @ =gUnknown_3005098 + ldr r1, _081307FC @ =gTasks+0x8 adds r4, r0, r1 movs r1, 0x4 ldrsh r0, [r4, r1] @@ -3739,7 +3739,7 @@ sub_81307D0: @ 81307D0 strh r0, [r4, 0x6] b _08130846 .align 2, 0 -_081307FC: .4byte gUnknown_3005098 +_081307FC: .4byte gTasks+0x8 _08130800: ldr r0, _08130814 @ =gSaveBlock2Ptr ldr r0, [r0] @@ -3757,7 +3757,7 @@ _08130818: movs r1, 0 bl sub_81311F4 _08130820: - ldr r0, _0813084C @ =gUnknown_3005090 + ldr r0, _0813084C @ =gTasks lsls r4, r5, 2 adds r4, r5 lsls r4, 3 @@ -3779,7 +3779,7 @@ _08130846: pop {r0} bx r0 .align 2, 0 -_0813084C: .4byte gUnknown_3005090 +_0813084C: .4byte gTasks _08130850: .4byte gSpriteCoordOffsetX _08130854: .4byte sub_8130858 thumb_func_end sub_81307D0 @@ -3790,7 +3790,7 @@ sub_8130858: @ 8130858 sub sp, 0x10 lsls r0, 24 lsrs r0, 24 - ldr r2, _081308BC @ =gUnknown_3005090 + ldr r2, _081308BC @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -3834,7 +3834,7 @@ _081308B4: pop {r0} bx r0 .align 2, 0 -_081308BC: .4byte gUnknown_3005090 +_081308BC: .4byte gTasks _081308C0: .4byte gStringVar4 _081308C4: .4byte gUnknown_81C5EF4 _081308C8: .4byte gUnknown_203B108 @@ -3851,7 +3851,7 @@ sub_81308D0: @ 81308D0 lsls r0, 16 cmp r0, 0 bne _0813090A - ldr r0, _081308FC @ =gUnknown_3005090 + ldr r0, _081308FC @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -3865,7 +3865,7 @@ sub_81308D0: @ 81308D0 strh r0, [r4, 0xE] b _0813090A .align 2, 0 -_081308FC: .4byte gUnknown_3005090 +_081308FC: .4byte gTasks _08130900: movs r0, 0x4 bl FadeOutBGM @@ -3910,7 +3910,7 @@ sub_8130940: @ 8130940 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r6, _08130978 @ =gUnknown_3005098 + ldr r6, _08130978 @ =gTasks+0x8 adds r5, r4, r6 movs r0, 0x2 movs r1, 0x6 @@ -3932,7 +3932,7 @@ sub_8130940: @ 8130940 pop {r0} bx r0 .align 2, 0 -_08130978: .4byte gUnknown_3005098 +_08130978: .4byte gTasks+0x8 _0813097C: .4byte sub_8130980 thumb_func_end sub_8130940 @@ -3947,7 +3947,7 @@ sub_8130980: @ 8130980 lsls r1, r0, 2 adds r1, r0 lsls r7, r1, 3 - ldr r0, _08130A2C @ =gUnknown_3005098 + ldr r0, _08130A2C @ =gTasks+0x8 mov r8, r0 adds r5, r7, r0 ldr r0, _08130A30 @ =gUnknown_203B108 @@ -4021,7 +4021,7 @@ _08130A1E: pop {r0} bx r0 .align 2, 0 -_08130A2C: .4byte gUnknown_3005098 +_08130A2C: .4byte gTasks+0x8 _08130A30: .4byte gUnknown_203B108 _08130A34: .4byte sub_8130BA8 thumb_func_end sub_8130980 @@ -4038,7 +4038,7 @@ sub_8130A38: @ 8130A38 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _08130A78 @ =gUnknown_3005098 + ldr r0, _08130A78 @ =gTasks+0x8 adds r1, r0 movs r0, 0 strh r0, [r1] @@ -4057,7 +4057,7 @@ sub_8130A38: @ 8130A38 bx r0 .align 2, 0 _08130A74: .4byte sub_8130A80 -_08130A78: .4byte gUnknown_3005098 +_08130A78: .4byte gTasks+0x8 _08130A7C: .4byte 0xffff0fcf thumb_func_end sub_8130A38 @@ -4070,7 +4070,7 @@ sub_8130A80: @ 8130A80 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _08130AB8 @ =gUnknown_3005098 + ldr r1, _08130AB8 @ =gTasks+0x8 adds r2, r0, r1 ldr r0, _08130ABC @ =gUnknown_2037AB8 ldrb r1, [r0, 0x7] @@ -4090,7 +4090,7 @@ sub_8130A80: @ 8130A80 bl sub_8131168 b _08130AD4 .align 2, 0 -_08130AB8: .4byte gUnknown_3005098 +_08130AB8: .4byte gTasks+0x8 _08130ABC: .4byte gUnknown_2037AB8 _08130AC0: adds r0, 0x1 @@ -4120,7 +4120,7 @@ sub_8130ADC: @ 8130ADC lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _08130B0C @ =gUnknown_3005098 + ldr r0, _08130B0C @ =gTasks+0x8 adds r1, r0 movs r2, 0x8 strh r2, [r1] @@ -4133,7 +4133,7 @@ sub_8130ADC: @ 8130ADC bx r0 .align 2, 0 _08130B08: .4byte sub_8130B10 -_08130B0C: .4byte gUnknown_3005098 +_08130B0C: .4byte gTasks+0x8 thumb_func_end sub_8130ADC thumb_func_start sub_8130B10 @@ -4144,7 +4144,7 @@ sub_8130B10: @ 8130B10 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _08130B30 @ =gUnknown_3005098 + ldr r1, _08130B30 @ =gTasks+0x8 adds r4, r0, r1 ldrh r1, [r4] movs r2, 0 @@ -4155,7 +4155,7 @@ sub_8130B10: @ 8130B10 strh r0, [r4] b _08130B96 .align 2, 0 -_08130B30: .4byte gUnknown_3005098 +_08130B30: .4byte gTasks+0x8 _08130B34: movs r1, 0x2 ldrsh r0, [r4, r1] @@ -4222,7 +4222,7 @@ sub_8130BA8: @ 8130BA8 sub sp, 0x4 lsls r0, 24 lsrs r0, 24 - ldr r2, _08130BCC @ =gUnknown_3005090 + ldr r2, _08130BCC @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -4236,7 +4236,7 @@ sub_8130BA8: @ 8130BA8 strh r0, [r4, 0x8] b _08130BE2 .align 2, 0 -_08130BCC: .4byte gUnknown_3005090 +_08130BCC: .4byte gTasks _08130BD0: str r1, [sp] movs r0, 0x30 @@ -4266,7 +4266,7 @@ sub_8130BF0: @ 8130BF0 ands r0, r1 cmp r0, 0 bne _08130C10 - ldr r0, _08130C18 @ =gUnknown_3005090 + ldr r0, _08130C18 @ =gTasks lsls r1, r2, 2 adds r1, r2 lsls r1, 3 @@ -4278,7 +4278,7 @@ _08130C10: bx r0 .align 2, 0 _08130C14: .4byte gUnknown_2037AB8 -_08130C18: .4byte gUnknown_3005090 +_08130C18: .4byte gTasks _08130C1C: .4byte sub_8130C20 thumb_func_end sub_8130BF0 @@ -4542,7 +4542,7 @@ _08130E72: movs r1, 0 bl sub_81311F4 _08130E7A: - ldr r0, _08130EA8 @ =gUnknown_3005090 + ldr r0, _08130EA8 @ =gTasks lsls r4, r5, 2 adds r4, r5 lsls r4, 3 @@ -4564,7 +4564,7 @@ _08130E7A: strh r0, [r4, 0x26] b _08130F10 .align 2, 0 -_08130EA8: .4byte gUnknown_3005090 +_08130EA8: .4byte gTasks _08130EAC: .4byte 0x0000ffc4 _08130EB0: .4byte gSpriteCoordOffsetX _08130EB4: .4byte 0xffffc400 @@ -4665,7 +4665,7 @@ sub_8130F2C: @ 8130F2C ldrb r1, [r2] orrs r1, r3 strb r1, [r2] - ldr r2, _08130FB4 @ =gUnknown_3005090 + ldr r2, _08130FB4 @ =gTasks lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -4680,7 +4680,7 @@ _08130FA4: .4byte gUnknown_82373F4 _08130FA8: .4byte gUnknown_20244DC _08130FAC: .4byte gSprites _08130FB0: .4byte SpriteCallbackDummy -_08130FB4: .4byte gUnknown_3005090 +_08130FB4: .4byte gTasks thumb_func_end sub_8130F2C thumb_func_start sub_8130FB8 @@ -4749,7 +4749,7 @@ _08130FF4: adds r0, r5, 0 ands r0, r2 strb r0, [r1, 0x5] - ldr r0, _081310C0 @ =gUnknown_3005090 + ldr r0, _081310C0 @ =gTasks mov r1, r9 lsls r4, r1, 2 add r4, r9 @@ -4810,7 +4810,7 @@ _081310B0: .4byte gUnknown_8462EFC _081310B4: .4byte gUnknown_8462F1C _081310B8: .4byte gUnknown_846302C _081310BC: .4byte gSprites -_081310C0: .4byte gUnknown_3005090 +_081310C0: .4byte gTasks _081310C4: .4byte sub_8130FB8 _081310C8: ldr r0, _08131154 @ =gUnknown_8462F14 @@ -4819,7 +4819,7 @@ _081310C8: bl LoadSpritePalette mov r2, r9 lsls r5, r2, 2 - ldr r3, _0813115C @ =gUnknown_3005098 + ldr r3, _0813115C @ =gTasks+0x8 mov r8, r3 ldr r6, _08131160 @ =gSprites _081310DE: @@ -4885,7 +4885,7 @@ _08131146: .align 2, 0 _08131154: .4byte gUnknown_8462F14 _08131158: .4byte gUnknown_8462F24 -_0813115C: .4byte gUnknown_3005098 +_0813115C: .4byte gTasks+0x8 _08131160: .4byte gSprites _08131164: .4byte gUnknown_8462F50 thumb_func_end sub_8130FD4 @@ -4901,7 +4901,7 @@ sub_8131168: @ 8131168 lsls r1, r0, 2 adds r1, r0 lsls r5, r1, 3 - ldr r7, _081311AC @ =gUnknown_3005098 + ldr r7, _081311AC @ =gTasks+0x8 _0813117C: adds r0, r4, 0x7 lsls r0, 1 @@ -4926,7 +4926,7 @@ _0813117C: beq _081311DC b _081311EC .align 2, 0 -_081311AC: .4byte gUnknown_3005098 +_081311AC: .4byte gTasks+0x8 _081311B0: .4byte gSprites _081311B4: ldr r0, _081311D0 @ =0x00001003 @@ -5122,7 +5122,7 @@ sub_8131338: @ 8131338 lsls r0, 24 lsrs r6, r0, 24 movs r4, 0 - ldr r1, _081313A8 @ =gUnknown_3005090 + ldr r1, _081313A8 @ =gTasks lsls r0, r6, 2 mov r9, r0 adds r0, r6 @@ -5171,7 +5171,7 @@ _08131380: bls _08131380 b _0813143A .align 2, 0 -_081313A8: .4byte gUnknown_3005090 +_081313A8: .4byte gTasks _081313AC: .4byte gSprites _081313B0: ldrh r1, [r2, 0x10] @@ -5278,7 +5278,7 @@ sub_813144C: @ 813144C movs r0, 0x54 movs r1, 0 bl SetGpuReg - ldr r0, _081314D4 @ =gUnknown_3005090 + ldr r0, _081314D4 @ =gTasks mov r8, r0 lsls r5, r4, 2 adds r5, r4 @@ -5324,7 +5324,7 @@ _081314AC: bx r0 .align 2, 0 _081314D0: .4byte 0x00001244 -_081314D4: .4byte gUnknown_3005090 +_081314D4: .4byte gTasks _081314D8: .4byte sub_8131338 thumb_func_end sub_813144C @@ -5338,7 +5338,7 @@ sub_81314DC: @ 81314DC lsls r0, 24 lsrs r6, r0, 24 movs r4, 0 - ldr r1, _08131528 @ =gUnknown_3005090 + ldr r1, _08131528 @ =gTasks lsls r5, r6, 2 adds r0, r5, r6 lsls r0, 3 @@ -5368,7 +5368,7 @@ sub_81314DC: @ 81314DC bl DestroyTask b _081315BA .align 2, 0 -_08131528: .4byte gUnknown_3005090 +_08131528: .4byte gTasks _0813152C: .4byte gUnknown_2037AB8 _08131530: ldrh r1, [r2, 0x10] @@ -5476,7 +5476,7 @@ sub_81315CC: @ 81315CC movs r0, 0x54 movs r1, 0 bl SetGpuReg - ldr r0, _08131658 @ =gUnknown_3005090 + ldr r0, _08131658 @ =gTasks mov r8, r0 lsls r5, r4, 2 adds r5, r4 @@ -5522,7 +5522,7 @@ _0813162E: bx r0 .align 2, 0 _08131654: .4byte 0x00001244 -_08131658: .4byte gUnknown_3005090 +_08131658: .4byte gTasks _0813165C: .4byte sub_81314DC thumb_func_end sub_81315CC @@ -5541,7 +5541,7 @@ sub_8131660: @ 8131660 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r5, _081316DC @ =gUnknown_3005098 + ldr r5, _081316DC @ =gTasks+0x8 adds r7, r4, r5 ldr r0, _081316E0 @ =gUnknown_8462ED8 bl AddWindow @@ -5584,7 +5584,7 @@ sub_8131660: @ 8131660 ldr r6, _081316F0 @ =gUnknown_846308C b _081316F6 .align 2, 0 -_081316DC: .4byte gUnknown_3005098 +_081316DC: .4byte gTasks+0x8 _081316E0: .4byte gUnknown_8462ED8 _081316E4: .4byte gUnknown_81C574F _081316E8: .4byte gSaveBlock2Ptr diff --git a/asm/overworld.s b/asm/overworld.s index 4dc2c60e0..9dbce6c55 100644 --- a/asm/overworld.s +++ b/asm/overworld.s @@ -5592,7 +5592,7 @@ sub_805781C: @ 805781C movs r2, 0 movs r3, 0x10 bl BeginNormalPaletteFade - ldr r1, _0805784C @ =gUnknown_3005090 + ldr r1, _0805784C @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -5604,7 +5604,7 @@ sub_805781C: @ 805781C pop {r0} bx r0 .align 2, 0 -_0805784C: .4byte gUnknown_3005090 +_0805784C: .4byte gTasks _08057850: .4byte sub_8057854 thumb_func_end sub_805781C diff --git a/asm/palette.s b/asm/palette.s index 50213af8b..a99aeda10 100644 --- a/asm/palette.s +++ b/asm/palette.s @@ -2758,7 +2758,7 @@ sub_80717A8: @ 80717A8 bl CreateTask lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _08071804 @ =gUnknown_3005090 + ldr r1, _08071804 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -2774,7 +2774,7 @@ sub_80717A8: @ 80717A8 b _08071810 .align 2, 0 _08071800: .4byte sub_80718B8 -_08071804: .4byte gUnknown_3005090 +_08071804: .4byte gTasks _08071808: movs r0, 0 strh r0, [r1, 0xE] @@ -2785,7 +2785,7 @@ _08071810: lsls r4, r5, 2 cmp r6, r7 bcs _08071828 - ldr r0, _08071858 @ =gUnknown_3005090 + ldr r0, _08071858 @ =gTasks adds r1, r4, r5 lsls r1, 3 adds r1, r0 @@ -2798,7 +2798,7 @@ _08071828: movs r1, 0x5 mov r2, r10 bl SetWordTaskArg - ldr r0, _08071858 @ =gUnknown_3005090 + ldr r0, _08071858 @ =gTasks adds r1, r4, r5 lsls r1, 3 adds r1, r0 @@ -2817,7 +2817,7 @@ _08071828: pop {r0} bx r0 .align 2, 0 -_08071858: .4byte gUnknown_3005090 +_08071858: .4byte gTasks thumb_func_end sub_80717A8 thumb_func_start sub_807185C @@ -2827,7 +2827,7 @@ sub_807185C: @ 807185C lsrs r3, r0, 24 movs r2, 0 ldr r4, _08071880 @ =sub_80718B8 - ldr r1, _08071884 @ =gUnknown_3005090 + ldr r1, _08071884 @ =gTasks _08071868: ldrb r0, [r1, 0x4] cmp r0, 0x1 @@ -2843,7 +2843,7 @@ _08071868: b _08071892 .align 2, 0 _08071880: .4byte sub_80718B8 -_08071884: .4byte gUnknown_3005090 +_08071884: .4byte gTasks _08071888: adds r1, 0x28 adds r2, 0x1 @@ -2883,7 +2883,7 @@ sub_80718B8: @ 80718B8 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0807190C @ =gUnknown_3005098 + ldr r1, _0807190C @ =gTasks+0x8 adds r4, r0, r1 adds r0, r5, 0 movs r1, 0x5 @@ -2916,7 +2916,7 @@ sub_80718B8: @ 80718B8 bl DestroyTask b _08071930 .align 2, 0 -_0807190C: .4byte gUnknown_3005098 +_0807190C: .4byte gTasks+0x8 _08071910: ldrh r0, [r4, 0x4] adds r1, r0 diff --git a/asm/party_menu.s b/asm/party_menu.s index b1942669d..a0a504527 100644 --- a/asm/party_menu.s +++ b/asm/party_menu.s @@ -2071,7 +2071,7 @@ sub_811FA78: @ 811FA78 str r2, [sp] movs r3, 0x10 bl BeginNormalPaletteFade - ldr r1, _0811FAAC @ =gUnknown_3005090 + ldr r1, _0811FAAC @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -2083,7 +2083,7 @@ sub_811FA78: @ 811FA78 pop {r0} bx r0 .align 2, 0 -_0811FAAC: .4byte gUnknown_3005090 +_0811FAAC: .4byte gTasks _0811FAB0: .4byte sub_811FAB4 thumb_func_end sub_811FA78 @@ -2535,7 +2535,7 @@ sub_811FE24: @ 811FE24 adds r0, r5, 0 movs r1, 0x1 bl sub_81202F8 - ldr r1, _0811FE68 @ =gUnknown_3005090 + ldr r1, _0811FE68 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -2549,7 +2549,7 @@ sub_811FE24: @ 811FE24 _0811FE5C: .4byte gUnknown_203B09C _0811FE60: .4byte gStringVar4 _0811FE64: .4byte gUnknown_84176CF -_0811FE68: .4byte gUnknown_3005090 +_0811FE68: .4byte gTasks _0811FE6C: .4byte sub_811FE70 thumb_func_end sub_811FE24 @@ -2564,7 +2564,7 @@ sub_811FE70: @ 811FE70 cmp r0, 0x1 beq _0811FE94 bl sub_812200C - ldr r0, _0811FE9C @ =gUnknown_3005090 + ldr r0, _0811FE9C @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -2576,7 +2576,7 @@ _0811FE94: pop {r0} bx r0 .align 2, 0 -_0811FE9C: .4byte gUnknown_3005090 +_0811FE9C: .4byte gTasks _0811FEA0: .4byte sub_811FEA4 thumb_func_end sub_811FE70 @@ -3197,7 +3197,7 @@ sub_81202F8: @ 81202F8 bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _08120324 @ =gUnknown_3005090 + ldr r2, _08120324 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -3208,7 +3208,7 @@ sub_81202F8: @ 81202F8 bx r1 .align 2, 0 _08120320: .4byte sub_8120328 -_08120324: .4byte gUnknown_3005090 +_08120324: .4byte gTasks thumb_func_end sub_81202F8 thumb_func_start sub_8120328 @@ -3223,7 +3223,7 @@ sub_8120328: @ 8120328 lsrs r0, 16 cmp r0, 0x1 beq _08120364 - ldr r0, _0812036C @ =gUnknown_3005090 + ldr r0, _0812036C @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -3245,7 +3245,7 @@ _08120364: pop {r0} bx r0 .align 2, 0 -_0812036C: .4byte gUnknown_3005090 +_0812036C: .4byte gTasks thumb_func_end sub_8120328 thumb_func_start sub_8120370 @@ -3273,7 +3273,7 @@ sub_8120384: @ 8120384 beq _081203AA movs r0, 0 bl sub_8121D0C - ldr r0, _081203B0 @ =gUnknown_3005090 + ldr r0, _081203B0 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -3285,7 +3285,7 @@ _081203AA: pop {r0} bx r0 .align 2, 0 -_081203B0: .4byte gUnknown_3005090 +_081203B0: .4byte gTasks _081203B4: .4byte sub_811FB28 thumb_func_end sub_8120384 @@ -3310,7 +3310,7 @@ sub_81203B8: @ 81203B8 lsrs r0, 24 cmp r0, 0x1 bne _081203FC - ldr r0, _081203F4 @ =gUnknown_3005090 + ldr r0, _081203F4 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -3318,12 +3318,12 @@ sub_81203B8: @ 81203B8 ldr r0, _081203F8 @ =sub_8120384 b _0812040E .align 2, 0 -_081203F4: .4byte gUnknown_3005090 +_081203F4: .4byte gTasks _081203F8: .4byte sub_8120384 _081203FC: movs r0, 0 bl sub_8121D0C - ldr r0, _08120418 @ =gUnknown_3005090 + ldr r0, _08120418 @ =gTasks lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -3336,7 +3336,7 @@ _08120410: pop {r0} bx r0 .align 2, 0 -_08120418: .4byte gUnknown_3005090 +_08120418: .4byte gTasks _0812041C: .4byte sub_811FB28 thumb_func_end sub_81203B8 @@ -3655,7 +3655,7 @@ sub_81206A8: @ 81206A8 lsls r0, 2 add r0, r8 lsls r0, 3 - ldr r1, _08120750 @ =gUnknown_3005098 + ldr r1, _08120750 @ =gTasks+0x8 adds r7, r0, r1 ldrh r0, [r7, 0x4] ldrh r1, [r7] @@ -3729,7 +3729,7 @@ _08120746: pop {r0} bx r0 .align 2, 0 -_08120750: .4byte gUnknown_3005098 +_08120750: .4byte gTasks+0x8 _08120754: .4byte gPlayerParty _08120758: .4byte gUnknown_203B0B4 _0812075C: .4byte gStringVar2 @@ -3769,7 +3769,7 @@ sub_8120760: @ 8120760 lsls r4, r0, 2 add r4, r8 lsls r4, 3 - ldr r0, _081207E8 @ =gUnknown_3005098 + ldr r0, _081207E8 @ =gTasks+0x8 adds r4, r0 adds r0, r6, 0 movs r1, 0x39 @@ -3801,7 +3801,7 @@ sub_8120760: @ 8120760 bx r0 .align 2, 0 _081207E4: .4byte gPlayerParty -_081207E8: .4byte gUnknown_3005098 +_081207E8: .4byte gTasks+0x8 _081207EC: .4byte sub_81206A8 thumb_func_end sub_8120760 @@ -3815,7 +3815,7 @@ sub_81207F0: @ 81207F0 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _08120814 @ =gUnknown_3005098 + ldr r1, _08120814 @ =gTasks+0x8 adds r3, r0, r1 cmp r5, 0x5 bhi _08120852 @@ -3825,7 +3825,7 @@ sub_81207F0: @ 81207F0 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08120814: .4byte gUnknown_3005098 +_08120814: .4byte gTasks+0x8 _08120818: .4byte _0812081C .align 2, 0 _0812081C: @@ -4122,7 +4122,7 @@ _08120A24: bl sub_81202F8 movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram - ldr r1, _08120A50 @ =gUnknown_3005090 + ldr r1, _08120A50 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -4135,7 +4135,7 @@ _08120A46: bx r0 .align 2, 0 _08120A4C: .4byte gUnknown_8417696 -_08120A50: .4byte gUnknown_3005090 +_08120A50: .4byte gTasks _08120A54: .4byte sub_81203B8 thumb_func_end sub_81209F4 @@ -4150,7 +4150,7 @@ sub_8120A58: @ 8120A58 bl sub_81202F8 movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram - ldr r1, _08120A88 @ =gUnknown_3005090 + ldr r1, _08120A88 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -4162,7 +4162,7 @@ sub_8120A58: @ 8120A58 bx r0 .align 2, 0 _08120A84: .4byte gUnknown_84176B8 -_08120A88: .4byte gUnknown_3005090 +_08120A88: .4byte gTasks _08120A8C: .4byte sub_8120A90 thumb_func_end sub_8120A58 @@ -4177,7 +4177,7 @@ sub_8120A90: @ 8120A90 cmp r0, 0x1 beq _08120AB4 bl sub_812200C - ldr r0, _08120ABC @ =gUnknown_3005090 + ldr r0, _08120ABC @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -4189,7 +4189,7 @@ _08120AB4: pop {r0} bx r0 .align 2, 0 -_08120ABC: .4byte gUnknown_3005090 +_08120ABC: .4byte gTasks _08120AC0: .4byte sub_8120AC4 thumb_func_end sub_8120A90 @@ -4227,7 +4227,7 @@ _08120AFC: movs r0, 0x5 bl PlaySE _08120B02: - ldr r0, _08120B18 @ =gUnknown_3005090 + ldr r0, _08120B18 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -4239,7 +4239,7 @@ _08120B10: pop {r0} bx r0 .align 2, 0 -_08120B18: .4byte gUnknown_3005090 +_08120B18: .4byte gTasks _08120B1C: .4byte sub_81203B8 thumb_func_end sub_8120AC4 @@ -4419,7 +4419,7 @@ sub_8120C3C: @ 8120C3C ands r0, r1 cmp r0, 0 bne _08120C5C - ldr r0, _08120C64 @ =gUnknown_3005090 + ldr r0, _08120C64 @ =gTasks lsls r1, r2, 2 adds r1, r2 lsls r1, 3 @@ -4431,7 +4431,7 @@ _08120C5C: bx r0 .align 2, 0 _08120C60: .4byte gUnknown_2037AB8 -_08120C64: .4byte gUnknown_3005090 +_08120C64: .4byte gTasks _08120C68: .4byte sub_8120C6C thumb_func_end sub_8120C3C @@ -4449,7 +4449,7 @@ sub_8120C6C: @ 8120C6C movs r2, 0 movs r3, 0x6 bl BeginNormalPaletteFade - ldr r1, _08120CA0 @ =gUnknown_3005090 + ldr r1, _08120CA0 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -4462,7 +4462,7 @@ sub_8120C6C: @ 8120C6C bx r0 .align 2, 0 _08120C9C: .4byte 0xffff1fff -_08120CA0: .4byte gUnknown_3005090 +_08120CA0: .4byte gTasks _08120CA4: .4byte sub_8120CA8 thumb_func_end sub_8120C6C @@ -4477,7 +4477,7 @@ sub_8120CA8: @ 8120CA8 ands r0, r1 cmp r0, 0 bne _08120CC8 - ldr r0, _08120CD0 @ =gUnknown_3005090 + ldr r0, _08120CD0 @ =gTasks lsls r1, r2, 2 adds r1, r2 lsls r1, 3 @@ -4489,7 +4489,7 @@ _08120CC8: bx r0 .align 2, 0 _08120CCC: .4byte gUnknown_2037AB8 -_08120CD0: .4byte gUnknown_3005090 +_08120CD0: .4byte gTasks _08120CD4: .4byte sub_8120CD8 thumb_func_end sub_8120CA8 @@ -4500,7 +4500,7 @@ sub_8120CD8: @ 8120CD8 lsls r4, 24 lsrs r4, 24 bl sub_81220D4 - ldr r2, _08120D00 @ =gUnknown_3005090 + ldr r2, _08120D00 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -4514,7 +4514,7 @@ sub_8120CD8: @ 8120CD8 pop {r0} bx r0 .align 2, 0 -_08120D00: .4byte gUnknown_3005090 +_08120D00: .4byte gTasks _08120D04: .4byte sub_8120D08 thumb_func_end sub_8120CD8 @@ -4526,7 +4526,7 @@ sub_8120D08: @ 8120D08 lsls r1, r0, 2 adds r1, r0 lsls r4, r1, 3 - ldr r5, _08120D38 @ =gUnknown_3005098 + ldr r5, _08120D38 @ =gTasks+0x8 adds r0, r4, r5 ldrb r0, [r0] bl sub_80BF518 @@ -4544,7 +4544,7 @@ _08120D30: pop {r0} bx r0 .align 2, 0 -_08120D38: .4byte gUnknown_3005098 +_08120D38: .4byte gTasks+0x8 _08120D3C: .4byte sub_8120D40 thumb_func_end sub_8120D08 @@ -4562,7 +4562,7 @@ sub_8120D40: @ 8120D40 movs r2, 0x6 movs r3, 0 bl BeginNormalPaletteFade - ldr r1, _08120D74 @ =gUnknown_3005090 + ldr r1, _08120D74 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -4575,7 +4575,7 @@ sub_8120D40: @ 8120D40 bx r0 .align 2, 0 _08120D70: .4byte 0xffff0008 -_08120D74: .4byte gUnknown_3005090 +_08120D74: .4byte gTasks _08120D78: .4byte sub_8120D7C thumb_func_end sub_8120D40 @@ -4590,7 +4590,7 @@ sub_8120D7C: @ 8120D7C ands r0, r1 cmp r0, 0 bne _08120D9C - ldr r0, _08120DA4 @ =gUnknown_3005090 + ldr r0, _08120DA4 @ =gTasks lsls r1, r2, 2 adds r1, r2 lsls r1, 3 @@ -4602,7 +4602,7 @@ _08120D9C: bx r0 .align 2, 0 _08120DA0: .4byte gUnknown_2037AB8 -_08120DA4: .4byte gUnknown_3005090 +_08120DA4: .4byte gTasks _08120DA8: .4byte sub_8120DAC thumb_func_end sub_8120D7C @@ -4614,7 +4614,7 @@ sub_8120DAC: @ 8120DAC lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r5, _08120DD4 @ =gUnknown_3005098 + ldr r5, _08120DD4 @ =gTasks+0x8 adds r0, r4, r5 ldrb r0, [r0] ldr r1, _08120DD8 @ =gUnknown_8417494 @@ -4627,7 +4627,7 @@ sub_8120DAC: @ 8120DAC pop {r0} bx r0 .align 2, 0 -_08120DD4: .4byte gUnknown_3005098 +_08120DD4: .4byte gTasks+0x8 _08120DD8: .4byte gUnknown_8417494 _08120DDC: .4byte sub_8120DE0 thumb_func_end sub_8120DAC @@ -4640,7 +4640,7 @@ sub_8120DE0: @ 8120DE0 lsls r1, r0, 2 adds r1, r0 lsls r5, r1, 3 - ldr r6, _08120E14 @ =gUnknown_3005098 + ldr r6, _08120E14 @ =gTasks+0x8 adds r4, r5, r6 ldrb r0, [r4] bl sub_80BF518 @@ -4660,7 +4660,7 @@ _08120E0E: pop {r0} bx r0 .align 2, 0 -_08120E14: .4byte gUnknown_3005098 +_08120E14: .4byte gTasks+0x8 _08120E18: .4byte sub_8120E1C thumb_func_end sub_8120DE0 @@ -4678,7 +4678,7 @@ sub_8120E1C: @ 8120E1C movs r2, 0x6 movs r3, 0 bl BeginNormalPaletteFade - ldr r1, _08120E50 @ =gUnknown_3005090 + ldr r1, _08120E50 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -4691,7 +4691,7 @@ sub_8120E1C: @ 8120E1C bx r0 .align 2, 0 _08120E4C: .4byte 0x0000fff7 -_08120E50: .4byte gUnknown_3005090 +_08120E50: .4byte gTasks _08120E54: .4byte sub_8120E58 thumb_func_end sub_8120E1C @@ -4728,7 +4728,7 @@ _08120E98: movs r0, 0 bl sub_8121D0C _08120E9E: - ldr r0, _08120EB4 @ =gUnknown_3005090 + ldr r0, _08120EB4 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -4740,7 +4740,7 @@ _08120EAC: pop {r0} bx r0 .align 2, 0 -_08120EB4: .4byte gUnknown_3005090 +_08120EB4: .4byte gTasks _08120EB8: .4byte sub_811FB28 thumb_func_end sub_8120E58 @@ -4751,7 +4751,7 @@ sub_8120EBC: @ 8120EBC lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _08120ED8 @ =gUnknown_3005098 + ldr r0, _08120ED8 @ =gTasks+0x8 adds r3, r1, r0 movs r2, 0 strh r2, [r3] @@ -4761,7 +4761,7 @@ sub_8120EBC: @ 8120EBC str r0, [r1] bx lr .align 2, 0 -_08120ED8: .4byte gUnknown_3005098 +_08120ED8: .4byte gTasks+0x8 _08120EDC: .4byte sub_8120EE0 thumb_func_end sub_8120EBC @@ -4773,7 +4773,7 @@ sub_8120EE0: @ 8120EE0 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _08120F1C @ =gUnknown_3005098 + ldr r1, _08120F1C @ =gTasks+0x8 adds r6, r0, r1 ldr r0, _08120F20 @ =gUnknown_2037AB8 ldrb r1, [r0, 0x7] @@ -4797,7 +4797,7 @@ sub_8120EE0: @ 8120EE0 beq _08120F2A b _08120F62 .align 2, 0 -_08120F1C: .4byte gUnknown_3005098 +_08120F1C: .4byte gTasks+0x8 _08120F20: .4byte gUnknown_2037AB8 _08120F24: cmp r0, 0xF0 @@ -4894,7 +4894,7 @@ sub_8120FCC: @ 8120FCC lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _08120FE8 @ =gUnknown_3005098 + ldr r0, _08120FE8 @ =gTasks+0x8 adds r3, r1, r0 movs r2, 0 strh r2, [r3] @@ -4904,7 +4904,7 @@ sub_8120FCC: @ 8120FCC str r0, [r1] bx lr .align 2, 0 -_08120FE8: .4byte gUnknown_3005098 +_08120FE8: .4byte gTasks+0x8 _08120FEC: .4byte sub_8120FF0 thumb_func_end sub_8120FCC @@ -4917,7 +4917,7 @@ sub_8120FF0: @ 8120FF0 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _0812102C @ =gUnknown_3005098 + ldr r1, _0812102C @ =gTasks+0x8 adds r4, r0, r1 ldr r0, _08121030 @ =gUnknown_2037AB8 ldrb r1, [r0, 0x7] @@ -4940,7 +4940,7 @@ sub_8120FF0: @ 8120FF0 strh r0, [r4] b _08121048 .align 2, 0 -_0812102C: .4byte gUnknown_3005098 +_0812102C: .4byte gTasks+0x8 _08121030: .4byte gUnknown_2037AB8 _08121034: ldr r0, _08121050 @ =gUnknown_203B09C @@ -8507,7 +8507,7 @@ sub_8122C30: @ 8122C30 lsls r4, 24 lsrs r4, 24 bl sub_8122BD4 - ldr r1, _08122C54 @ =gUnknown_3005090 + ldr r1, _08122C54 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -8520,7 +8520,7 @@ sub_8122C30: @ 8122C30 pop {r0} bx r0 .align 2, 0 -_08122C54: .4byte gUnknown_3005090 +_08122C54: .4byte gTasks _08122C58: .4byte sub_8122C5C thumb_func_end sub_8122C30 @@ -8543,7 +8543,7 @@ sub_8122C5C: @ 8122C5C lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _08122C98 @ =gUnknown_3005098 + ldr r1, _08122C98 @ =gTasks+0x8 adds r7, r0, r1 ldr r0, _08122C9C @ =gUnknown_203B09C ldr r0, [r0] @@ -8554,7 +8554,7 @@ sub_8122C5C: @ 8122C5C b _08122CA4 .align 2, 0 _08122C94: .4byte gUnknown_2037AB8 -_08122C98: .4byte gUnknown_3005098 +_08122C98: .4byte gTasks+0x8 _08122C9C: .4byte gUnknown_203B09C _08122CA0: bl ProcessMenuInput_other @@ -8752,7 +8752,7 @@ brm_switch: @ 8122E00 bl sub_811F818 ldrb r0, [r5, 0x9] strb r0, [r5, 0xA] - ldr r1, _08122E54 @ =gUnknown_3005090 + ldr r1, _08122E54 @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -8765,7 +8765,7 @@ brm_switch: @ 8122E00 .align 2, 0 _08122E4C: .4byte gUnknown_203B0A0 _08122E50: .4byte gUnknown_203B09C -_08122E54: .4byte gUnknown_3005090 +_08122E54: .4byte gTasks _08122E58: .4byte sub_811FB28 thumb_func_end brm_switch @@ -8778,7 +8778,7 @@ sub_8122E5C: @ 8122E5C lsls r0, r7, 2 adds r0, r7 lsls r0, 3 - ldr r1, _08122E84 @ =gUnknown_3005098 + ldr r1, _08122E84 @ =gTasks+0x8 adds r6, r0, r1 ldr r4, _08122E88 @ =gUnknown_203B0A0 movs r1, 0xA @@ -8791,7 +8791,7 @@ sub_8122E5C: @ 8122E5C bl sub_81235E8 b _08122FE2 .align 2, 0 -_08122E84: .4byte gUnknown_3005098 +_08122E84: .4byte gTasks+0x8 _08122E88: .4byte gUnknown_203B0A0 _08122E8C: bl sub_812358C @@ -8941,7 +8941,7 @@ _08122F56: bl sub_811F818 adds r0, r7, 0 bl sub_81231E8 - ldr r1, _08122FF8 @ =gUnknown_3005090 + ldr r1, _08122FF8 @ =gTasks lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -8957,7 +8957,7 @@ _08122FE2: _08122FEC: .4byte gUnknown_203B0C8 _08122FF0: .4byte gUnknown_203B0CC _08122FF4: .4byte gUnknown_203B0A0 -_08122FF8: .4byte gUnknown_3005090 +_08122FF8: .4byte gTasks _08122FFC: .4byte sub_8123270 thumb_func_end sub_8122E5C @@ -9177,7 +9177,7 @@ sub_8123188: @ 8123188 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _081231DC @ =gUnknown_3005098 + ldr r0, _081231DC @ =gTasks+0x8 adds r4, r1, r0 movs r1, 0x14 ldrsh r0, [r4, r1] @@ -9213,7 +9213,7 @@ _081231D4: pop {r0} bx r0 .align 2, 0 -_081231DC: .4byte gUnknown_3005098 +_081231DC: .4byte gTasks+0x8 _081231E0: .4byte gUnknown_203B0B4 _081231E4: .4byte gUnknown_203B0A0 thumb_func_end sub_8123188 @@ -9227,7 +9227,7 @@ sub_81231E8: @ 81231E8 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _08123264 @ =gUnknown_3005098 + ldr r0, _08123264 @ =gTasks+0x8 adds r5, r1, r0 movs r1, 0x14 ldrsh r0, [r5, r1] @@ -9282,7 +9282,7 @@ _08123256: pop {r0} bx r0 .align 2, 0 -_08123264: .4byte gUnknown_3005098 +_08123264: .4byte gTasks+0x8 _08123268: .4byte gUnknown_203B0C8 _0812326C: .4byte gUnknown_203B0CC thumb_func_end sub_81231E8 @@ -9299,7 +9299,7 @@ sub_8123270: @ 8123270 lsls r0, r4, 2 adds r0, r4 lsls r7, r0, 3 - ldr r0, _08123370 @ =gUnknown_3005098 + ldr r0, _08123370 @ =gTasks+0x8 mov r8, r0 adds r6, r7, r0 adds r0, r4, 0 @@ -9407,7 +9407,7 @@ _08123362: pop {r0} bx r0 .align 2, 0 -_08123370: .4byte gUnknown_3005098 +_08123370: .4byte gTasks+0x8 _08123374: .4byte gUnknown_203B0A0 _08123378: .4byte gUnknown_203B0B4 _0812337C: .4byte gUnknown_203B0C8 @@ -9423,7 +9423,7 @@ sub_8123388: @ 8123388 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _081233E8 @ =gUnknown_3005098 + ldr r1, _081233E8 @ =gTasks+0x8 adds r4, r0, r1 adds r0, r6, 0 bl sub_81231E8 @@ -9459,7 +9459,7 @@ sub_8123388: @ 8123388 bl sub_81235E8 b _08123418 .align 2, 0 -_081233E8: .4byte gUnknown_3005098 +_081233E8: .4byte gTasks+0x8 _081233EC: .4byte gUnknown_203B0A0 _081233F0: .4byte gUnknown_203B0B4 _081233F4: @@ -9731,7 +9731,7 @@ sub_81235E8: @ 81235E8 bl sub_811F818 movs r0, 0 bl sub_8121D0C - ldr r1, _08123638 @ =gUnknown_3005090 + ldr r1, _08123638 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -9744,7 +9744,7 @@ sub_81235E8: @ 81235E8 .align 2, 0 _08123630: .4byte gUnknown_203B09C _08123634: .4byte gUnknown_203B0A0 -_08123638: .4byte gUnknown_3005090 +_08123638: .4byte gTasks _0812363C: .4byte sub_811FB28 thumb_func_end sub_81235E8 @@ -9778,7 +9778,7 @@ _0812367C: movs r0, 0 bl sub_8121D0C _08123682: - ldr r0, _08123698 @ =gUnknown_3005090 + ldr r0, _08123698 @ =gTasks lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -9789,7 +9789,7 @@ _08123682: pop {r0} bx r0 .align 2, 0 -_08123698: .4byte gUnknown_3005090 +_08123698: .4byte gTasks _0812369C: .4byte sub_811FB28 thumb_func_end brm_cancel_1 @@ -9817,7 +9817,7 @@ sub_81236A0: @ 81236A0 bl sub_8121E5C movs r0, 0x19 bl sub_8121D0C - ldr r1, _081236FC @ =gUnknown_3005090 + ldr r1, _081236FC @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -9833,7 +9833,7 @@ sub_81236A0: @ 81236A0 _081236F0: .4byte gUnknown_203B09C _081236F4: .4byte gPlayerParty _081236F8: .4byte gUnknown_203B0A0 -_081236FC: .4byte gUnknown_3005090 +_081236FC: .4byte gTasks _08123700: .4byte sub_8122C5C thumb_func_end sub_81236A0 @@ -10017,7 +10017,7 @@ sub_8123824: @ 8123824 adds r0, r4, 0 movs r1, 0x1 bl sub_809A1D8 - ldr r1, _0812389C @ =gUnknown_3005090 + ldr r1, _0812389C @ =gTasks lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -10035,7 +10035,7 @@ _0812388C: .4byte gUnknown_2037AB8 _08123890: .4byte gUnknown_203AD30 _08123894: .4byte gUnknown_203B0A0 _08123898: .4byte gPlayerParty -_0812389C: .4byte gUnknown_3005090 +_0812389C: .4byte gTasks _081238A0: .4byte sub_8123BF0 thumb_func_end sub_8123824 @@ -10061,7 +10061,7 @@ sub_81238A4: @ 81238A4 ldrh r1, [r1] movs r2, 0x1 bl sub_812050C - ldr r1, _081238F4 @ =gUnknown_3005090 + ldr r1, _081238F4 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -10077,7 +10077,7 @@ _081238E4: .4byte gUnknown_2037AB8 _081238E8: .4byte gUnknown_203B0A0 _081238EC: .4byte gPlayerParty _081238F0: .4byte gUnknown_203B0D8 -_081238F4: .4byte gUnknown_3005090 +_081238F4: .4byte gTasks _081238F8: .4byte sub_81238FC thumb_func_end sub_81238A4 @@ -10092,7 +10092,7 @@ sub_81238FC: @ 81238FC cmp r0, 0x1 beq _08123920 bl sub_812200C - ldr r0, _08123928 @ =gUnknown_3005090 + ldr r0, _08123928 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -10104,7 +10104,7 @@ _08123920: pop {r0} bx r0 .align 2, 0 -_08123928: .4byte gUnknown_3005090 +_08123928: .4byte gTasks _0812392C: .4byte sub_8123930 thumb_func_end sub_81238FC @@ -10149,7 +10149,7 @@ _08123956: ldr r0, _081239A0 @ =gStringVar4 movs r1, 0 bl sub_81202F8 - ldr r1, _081239A4 @ =gUnknown_3005090 + ldr r1, _081239A4 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -10161,7 +10161,7 @@ _08123956: _08123998: .4byte gUnknown_203AD30 _0812399C: .4byte gUnknown_203B0D8 _081239A0: .4byte gStringVar4 -_081239A4: .4byte gUnknown_3005090 +_081239A4: .4byte gTasks _081239A8: .4byte sub_81203B8 _081239AC: ldrh r0, [r5] @@ -10178,7 +10178,7 @@ _081239AC: adds r0, r1 ldrh r1, [r5] bl sub_81205C8 - ldr r1, _081239E4 @ =gUnknown_3005090 + ldr r1, _081239E4 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -10189,7 +10189,7 @@ _081239AC: .align 2, 0 _081239DC: .4byte gUnknown_203B0A0 _081239E0: .4byte gPlayerParty -_081239E4: .4byte gUnknown_3005090 +_081239E4: .4byte gTasks _081239E8: .4byte sub_8123A50 _081239EC: ldr r0, _08123A1C @ =gUnknown_203B0A0 @@ -10205,7 +10205,7 @@ _081239EC: ldrh r1, [r6] movs r2, 0x1 bl sub_8120558 - ldr r1, _08123A24 @ =gUnknown_3005090 + ldr r1, _08123A24 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -10216,13 +10216,13 @@ _081239EC: .align 2, 0 _08123A1C: .4byte gUnknown_203B0A0 _08123A20: .4byte gPlayerParty -_08123A24: .4byte gUnknown_3005090 +_08123A24: .4byte gTasks _08123A28: .4byte sub_8123BF0 _08123A2C: movs r0, 0x5 bl PlaySE _08123A32: - ldr r0, _08123A48 @ =gUnknown_3005090 + ldr r0, _08123A48 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -10234,7 +10234,7 @@ _08123A40: pop {r0} bx r0 .align 2, 0 -_08123A48: .4byte gUnknown_3005090 +_08123A48: .4byte gTasks _08123A4C: .4byte sub_81203B8 thumb_func_end sub_8123930 @@ -10419,7 +10419,7 @@ _08123BC4: movs r2, 0 bl sub_8120558 _08123BD0: - ldr r0, _08123BE8 @ =gUnknown_3005090 + ldr r0, _08123BE8 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -10432,7 +10432,7 @@ _08123BDE: bx r0 .align 2, 0 _08123BE4: .4byte gUnknown_203AD30 -_08123BE8: .4byte gUnknown_3005090 +_08123BE8: .4byte gTasks _08123BEC: .4byte sub_8123BF0 thumb_func_end sub_8123B78 @@ -10538,7 +10538,7 @@ _08123CC8: _08123CCE: movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram - ldr r0, _08123CEC @ =gUnknown_3005090 + ldr r0, _08123CEC @ =gTasks lsls r1, r7, 2 adds r1, r7 lsls r1, 3 @@ -10550,7 +10550,7 @@ _08123CCE: bx r0 .align 2, 0 _08123CE8: .4byte gStringVar4 -_08123CEC: .4byte gUnknown_3005090 +_08123CEC: .4byte gTasks _08123CF0: .4byte sub_8123BF0 thumb_func_end sub_8123C38 @@ -10578,7 +10578,7 @@ sub_8123CF4: @ 8123CF4 bl sub_8121E5C movs r0, 0x1A bl sub_8121D0C - ldr r1, _08123D50 @ =gUnknown_3005090 + ldr r1, _08123D50 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -10594,7 +10594,7 @@ sub_8123CF4: @ 8123CF4 _08123D44: .4byte gUnknown_203B09C _08123D48: .4byte gPlayerParty _08123D4C: .4byte gUnknown_203B0A0 -_08123D50: .4byte gUnknown_3005090 +_08123D50: .4byte gTasks _08123D54: .4byte sub_8122C5C thumb_func_end sub_8123CF4 @@ -10703,7 +10703,7 @@ brm_take_2: @ 8123E0C ldr r0, _08123E4C @ =gUnknown_8416B64 movs r1, 0x1 bl sub_81202F8 - ldr r1, _08123E50 @ =gUnknown_3005090 + ldr r1, _08123E50 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -10716,7 +10716,7 @@ brm_take_2: @ 8123E0C .align 2, 0 _08123E48: .4byte gUnknown_203B09C _08123E4C: .4byte gUnknown_8416B64 -_08123E50: .4byte gUnknown_3005090 +_08123E50: .4byte gTasks _08123E54: .4byte sub_8123E58 thumb_func_end brm_take_2 @@ -10731,7 +10731,7 @@ sub_8123E58: @ 8123E58 cmp r0, 0x1 beq _08123E7C bl sub_812200C - ldr r0, _08123E84 @ =gUnknown_3005090 + ldr r0, _08123E84 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -10743,7 +10743,7 @@ _08123E7C: pop {r0} bx r0 .align 2, 0 -_08123E84: .4byte gUnknown_3005090 +_08123E84: .4byte gTasks _08123E88: .4byte sub_8123E8C thumb_func_end sub_8123E58 @@ -10784,7 +10784,7 @@ _08123EB2: ldr r0, _08123EEC @ =gUnknown_8416B86 movs r1, 0 bl sub_81202F8 - ldr r1, _08123EF0 @ =gUnknown_3005090 + ldr r1, _08123EF0 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -10795,13 +10795,13 @@ _08123EB2: _08123EE4: .4byte gUnknown_203B0A0 _08123EE8: .4byte gPlayerParty _08123EEC: .4byte gUnknown_8416B86 -_08123EF0: .4byte gUnknown_3005090 +_08123EF0: .4byte gTasks _08123EF4: .4byte sub_8123BF0 _08123EF8: ldr r0, _08123F10 @ =gUnknown_8416BA6 movs r1, 0 bl sub_81202F8 - ldr r1, _08123F14 @ =gUnknown_3005090 + ldr r1, _08123F14 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -10810,7 +10810,7 @@ _08123EF8: b _08123F36 .align 2, 0 _08123F10: .4byte gUnknown_8416BA6 -_08123F14: .4byte gUnknown_3005090 +_08123F14: .4byte gTasks _08123F18: .4byte sub_81203B8 _08123F1C: movs r0, 0x5 @@ -10819,7 +10819,7 @@ _08123F22: ldr r0, _08123F40 @ =gUnknown_8416BC3 movs r1, 0x1 bl sub_81202F8 - ldr r1, _08123F44 @ =gUnknown_3005090 + ldr r1, _08123F44 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -10833,7 +10833,7 @@ _08123F38: bx r0 .align 2, 0 _08123F40: .4byte gUnknown_8416BC3 -_08123F44: .4byte gUnknown_3005090 +_08123F44: .4byte gTasks _08123F48: .4byte sub_8123F4C thumb_func_end sub_8123E8C @@ -10848,7 +10848,7 @@ sub_8123F4C: @ 8123F4C cmp r0, 0x1 beq _08123F70 bl sub_812200C - ldr r0, _08123F78 @ =gUnknown_3005090 + ldr r0, _08123F78 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -10860,7 +10860,7 @@ _08123F70: pop {r0} bx r0 .align 2, 0 -_08123F78: .4byte gUnknown_3005090 +_08123F78: .4byte gTasks _08123F7C: .4byte sub_8123F80 thumb_func_end sub_8123F4C @@ -10917,7 +10917,7 @@ _08123FAA: ldr r0, _08124004 @ =gUnknown_8416CC7 movs r1, 0 bl sub_81202F8 - ldr r1, _08124008 @ =gUnknown_3005090 + ldr r1, _08124008 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -10929,7 +10929,7 @@ _08123FAA: _08123FFC: .4byte gUnknown_203B0A0 _08124000: .4byte gPlayerParty _08124004: .4byte gUnknown_8416CC7 -_08124008: .4byte gUnknown_3005090 +_08124008: .4byte gTasks _0812400C: .4byte sub_8123BF0 _08124010: adds r0, r4, 0 @@ -10937,7 +10937,7 @@ _08124010: ldr r0, _08124030 @ =gStringVar4 movs r1, 0 bl sub_81202F8 - ldr r1, _08124034 @ =gUnknown_3005090 + ldr r1, _08124034 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -10947,13 +10947,13 @@ _08124010: b _08124050 .align 2, 0 _08124030: .4byte gStringVar4 -_08124034: .4byte gUnknown_3005090 +_08124034: .4byte gTasks _08124038: .4byte sub_81203B8 _0812403C: movs r0, 0x5 bl PlaySE _08124042: - ldr r0, _0812405C @ =gUnknown_3005090 + ldr r0, _0812405C @ =gTasks lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -10967,7 +10967,7 @@ _08124050: pop {r0} bx r0 .align 2, 0 -_0812405C: .4byte gUnknown_3005090 +_0812405C: .4byte gTasks _08124060: .4byte sub_81203B8 thumb_func_end sub_8123F80 @@ -11013,7 +11013,7 @@ sub_8124064: @ 8124064 bl sub_8121E5C movs r0, 0x16 bl sub_8121D0C - ldr r1, _081240EC @ =gUnknown_3005090 + ldr r1, _081240EC @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -11032,7 +11032,7 @@ sub_8124064: @ 8124064 _081240E0: .4byte gUnknown_203B0A0 _081240E4: .4byte gPlayerParty _081240E8: .4byte gUnknown_203B09C -_081240EC: .4byte gUnknown_3005090 +_081240EC: .4byte gTasks _081240F0: .4byte sub_8122C5C thumb_func_end sub_8124064 @@ -11064,7 +11064,7 @@ _08124124: ldr r0, _08124148 @ =gStringVar4 movs r1, 0x1 bl sub_81202F8 - ldr r1, _0812414C @ =gUnknown_3005090 + ldr r1, _0812414C @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -11077,7 +11077,7 @@ _08124142: bx r0 .align 2, 0 _08124148: .4byte gStringVar4 -_0812414C: .4byte gUnknown_3005090 +_0812414C: .4byte gTasks _08124150: .4byte sub_81203B8 thumb_func_end sub_81240F4 @@ -11124,7 +11124,7 @@ _0812418C: cmp r5, r8 bcs _08124222 ldr r6, _08124204 @ =gUnknown_203B0A0 - ldr r1, _08124208 @ =gUnknown_3005090 + ldr r1, _08124208 @ =gTasks mov r2, r9 adds r0, r2, r7 lsls r0, 3 @@ -11167,7 +11167,7 @@ _081241F0: _081241FC: .4byte gUnknown_8416B16 _08124200: .4byte gUnknown_203B09C _08124204: .4byte gUnknown_203B0A0 -_08124208: .4byte gUnknown_3005090 +_08124208: .4byte gTasks _0812420C: .4byte gUnknown_203B0D4 _08124210: .4byte gUnknown_203B0B4 _08124214: .4byte sub_811FB28 @@ -11183,7 +11183,7 @@ _08124222: ldr r0, [sp] movs r1, 0x1 bl sub_81202F8 - ldr r0, _08124250 @ =gUnknown_3005090 + ldr r0, _08124250 @ =gTasks mov r2, r9 adds r1, r2, r7 lsls r1, 3 @@ -11200,7 +11200,7 @@ _0812423C: pop {r0} bx r0 .align 2, 0 -_08124250: .4byte gUnknown_3005090 +_08124250: .4byte gTasks _08124254: .4byte sub_81203B8 thumb_func_end sub_8124154 @@ -11312,7 +11312,7 @@ _08124312: _08124328: movs r0, 0 bl sub_8121D0C - ldr r0, _0812434C @ =gUnknown_3005090 + ldr r0, _0812434C @ =gTasks lsls r1, r7, 2 adds r1, r7 lsls r1, 3 @@ -11325,7 +11325,7 @@ _08124328: .align 2, 0 _08124344: .4byte gUnknown_203B0B4 _08124348: .4byte gUnknown_203B0D4 -_0812434C: .4byte gUnknown_3005090 +_0812434C: .4byte gTasks _08124350: .4byte sub_811FB28 thumb_func_end sub_8124278 @@ -11449,7 +11449,7 @@ _08124434: adds r0, r4, 0 movs r1, 0x1 bl sub_81202F8 - ldr r1, _08124488 @ =gUnknown_3005090 + ldr r1, _08124488 @ =gTasks lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -11468,7 +11468,7 @@ _08124478: .4byte gStringVar4 _0812447C: .4byte gUnknown_84170E0 _08124480: .4byte gUnknown_203B09C _08124484: .4byte gUnknown_84169D9 -_08124488: .4byte gUnknown_3005090 +_08124488: .4byte gTasks _0812448C: .4byte sub_81203B8 thumb_func_end sub_8124384 @@ -11555,7 +11555,7 @@ brm_trade_1: @ 8124490 adds r0, r5, 0 movs r1, 0x1 bl sub_81202F8 - ldr r1, _0812457C @ =gUnknown_3005090 + ldr r1, _0812457C @ =gTasks lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -11573,7 +11573,7 @@ _0812456C: .4byte gStringVar4 _08124570: .4byte gUnknown_845A7E8 _08124574: .4byte gUnknown_203B09C _08124578: .4byte gUnknown_84169D9 -_0812457C: .4byte gUnknown_3005090 +_0812457C: .4byte gTasks _08124580: .4byte sub_81203B8 _08124584: movs r0, 0x5 @@ -11665,7 +11665,7 @@ _0812461C: ldr r0, _0812464C @ =gUnknown_8416AE2 movs r1, 0x1 bl sub_81202F8 - ldr r1, _08124650 @ =gUnknown_3005090 + ldr r1, _08124650 @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -11675,7 +11675,7 @@ _0812461C: b _081247B4 .align 2, 0 _0812464C: .4byte gUnknown_8416AE2 -_08124650: .4byte gUnknown_3005090 +_08124650: .4byte gTasks _08124654: .4byte sub_81203B8 _08124658: ldr r1, _08124680 @ =gUnknown_845A788 @@ -11824,7 +11824,7 @@ _081247A0: _081247A2: bl sub_8121D0C _081247A6: - ldr r0, _081247BC @ =gUnknown_3005090 + ldr r0, _081247BC @ =gTasks lsls r1, r6, 2 adds r1, r6 lsls r1, 3 @@ -11836,7 +11836,7 @@ _081247B4: pop {r0} bx r0 .align 2, 0 -_081247BC: .4byte gUnknown_3005090 +_081247BC: .4byte gTasks _081247C0: .4byte task_brm_cancel_1_on_keypad_a_or_b thumb_func_end sub_81245A4 @@ -11849,7 +11849,7 @@ sub_81247C4: @ 81247C4 ldr r0, _081247E8 @ =gStringVar4 movs r1, 0x1 bl sub_81202F8 - ldr r1, _081247EC @ =gUnknown_3005090 + ldr r1, _081247EC @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -11861,7 +11861,7 @@ sub_81247C4: @ 81247C4 bx r0 .align 2, 0 _081247E8: .4byte gStringVar4 -_081247EC: .4byte gUnknown_3005090 +_081247EC: .4byte gTasks _081247F0: .4byte sub_81247F4 thumb_func_end sub_81247C4 @@ -11876,7 +11876,7 @@ sub_81247F4: @ 81247F4 cmp r0, 0x1 beq _08124818 bl sub_812200C - ldr r0, _08124820 @ =gUnknown_3005090 + ldr r0, _08124820 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -11888,7 +11888,7 @@ _08124818: pop {r0} bx r0 .align 2, 0 -_08124820: .4byte gUnknown_3005090 +_08124820: .4byte gTasks _08124824: .4byte sub_8124828 thumb_func_end sub_81247F4 @@ -13294,7 +13294,7 @@ _08125342: bl sub_81202F8 movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram - ldr r1, _0812537C @ =gUnknown_3005090 + ldr r1, _0812537C @ =gTasks lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -13306,7 +13306,7 @@ _08125342: _08125370: .4byte gUnknown_203B0A0 _08125374: .4byte gUnknown_203B0C0 _08125378: .4byte gUnknown_84169DC -_0812537C: .4byte gUnknown_3005090 +_0812537C: .4byte gTasks _08125380: ldr r3, _081253A4 @ =0x0000ffff movs r0, 0x4 @@ -13502,7 +13502,7 @@ _0812551C: bl sub_81202F8 movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram - ldr r1, _08125550 @ =gUnknown_3005090 + ldr r1, _08125550 @ =gTasks mov r2, r9 lsls r0, r2, 2 add r0, r9 @@ -13522,7 +13522,7 @@ _08125538: .align 2, 0 _08125548: .4byte gStringVar1 _0812554C: .4byte gStringVar4 -_08125550: .4byte gUnknown_3005090 +_08125550: .4byte gTasks thumb_func_end ItemUseCB_Medicine thumb_func_start sub_8125554 @@ -13550,7 +13550,7 @@ sub_8125554: @ 8125554 movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram bl sub_803539C - ldr r1, _081255B4 @ =gUnknown_3005090 + ldr r1, _081255B4 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -13566,7 +13566,7 @@ _081255A4: .4byte gPlayerParty _081255A8: .4byte gStringVar1 _081255AC: .4byte gStringVar4 _081255B0: .4byte gUnknown_8416F27 -_081255B4: .4byte gUnknown_3005090 +_081255B4: .4byte gTasks _081255B8: .4byte sub_81255BC thumb_func_end sub_8125554 @@ -13787,7 +13787,7 @@ _0812575C: ldr r0, _08125784 @ =gUnknown_203B0A0 ldrb r0, [r0, 0x9] bl sub_81255F0 - ldr r1, _08125788 @ =gUnknown_3005090 + ldr r1, _08125788 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -13800,7 +13800,7 @@ _0812577E: bx r0 .align 2, 0 _08125784: .4byte gUnknown_203B0A0 -_08125788: .4byte gUnknown_3005090 +_08125788: .4byte gTasks _0812578C: .4byte sub_81256C0 thumb_func_end sub_81256F8 @@ -13843,7 +13843,7 @@ sub_81257D4: @ 81257D4 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _08125800 @ =gUnknown_3005090 + ldr r2, _08125800 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -13861,7 +13861,7 @@ sub_81257D4: @ 81257D4 pop {r0} bx r0 .align 2, 0 -_08125800: .4byte gUnknown_3005090 +_08125800: .4byte gTasks _08125804: .4byte sub_811FB28 _08125808: .4byte gUnknown_203B09C thumb_func_end sub_81257D4 @@ -13898,7 +13898,7 @@ sub_812580C: @ 812580C bl sub_81202F8 movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram - ldr r1, _08125874 @ =gUnknown_3005090 + ldr r1, _08125874 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -13912,7 +13912,7 @@ _08125864: .4byte gPlayerParty _08125868: .4byte gUnknown_203AD30 _0812586C: .4byte gUnknown_203B0C0 _08125870: .4byte gUnknown_84169DC -_08125874: .4byte gUnknown_3005090 +_08125874: .4byte gTasks _08125878: .4byte sub_81255BC _0812587C: adds r0, r5, 0 @@ -13985,7 +13985,7 @@ sub_8125898: @ 8125898 bl sub_81202F8 movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram - ldr r1, _08125950 @ =gUnknown_3005090 + ldr r1, _08125950 @ =gTasks mov r2, r8 lsls r0, r2, 2 add r0, r8 @@ -14007,7 +14007,7 @@ _08125940: .4byte 0x0000ffff _08125944: .4byte gStringVar1 _08125948: .4byte gUnknown_8247094 _0812594C: .4byte gStringVar4 -_08125950: .4byte gUnknown_3005090 +_08125950: .4byte gTasks _08125954: .4byte sub_81255BC thumb_func_end sub_8125898 @@ -14087,7 +14087,7 @@ _081259F6: bl sub_81202F8 movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram - ldr r1, _08125A34 @ =gUnknown_3005090 + ldr r1, _08125A34 @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -14106,7 +14106,7 @@ _08125A24: .4byte 0x0000ffff _08125A28: .4byte gStringVar1 _08125A2C: .4byte gUnknown_8247094 _08125A30: .4byte gStringVar4 -_08125A34: .4byte gUnknown_3005090 +_08125A34: .4byte gTasks _08125A38: .4byte sub_81255BC thumb_func_end sub_8125958 @@ -14123,7 +14123,7 @@ dp05_pp_up: @ 8125A3C ldr r0, _08125A6C @ =gUnknown_203B0A0 ldrb r0, [r0, 0x9] bl sub_81255F0 - ldr r1, _08125A70 @ =gUnknown_3005090 + ldr r1, _08125A70 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -14135,7 +14135,7 @@ dp05_pp_up: @ 8125A3C bx r0 .align 2, 0 _08125A6C: .4byte gUnknown_203B0A0 -_08125A70: .4byte gUnknown_3005090 +_08125A70: .4byte gTasks _08125A74: .4byte sub_81256C0 thumb_func_end dp05_pp_up @@ -14241,7 +14241,7 @@ sub_8125B14: @ 8125B14 lsls r4, 24 lsrs r4, 24 bl sub_8125AF0 - ldr r1, _08125B38 @ =gUnknown_3005090 + ldr r1, _08125B38 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -14252,7 +14252,7 @@ sub_8125B14: @ 8125B14 pop {r0} bx r0 .align 2, 0 -_08125B38: .4byte gUnknown_3005090 +_08125B38: .4byte gTasks _08125B3C: .4byte sub_81255BC thumb_func_end sub_8125B14 @@ -14348,7 +14348,7 @@ _08125C08: .4byte gUnknown_8416F10 _08125C0C: ldr r0, _08125C2C @ =gUnknown_8416DF7 bl sub_8125AF0 - ldr r1, _08125C30 @ =gUnknown_3005090 + ldr r1, _08125C30 @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -14363,7 +14363,7 @@ _08125C20: bx r0 .align 2, 0 _08125C2C: .4byte gUnknown_8416DF7 -_08125C30: .4byte gUnknown_3005090 +_08125C30: .4byte gTasks _08125C34: .4byte sub_8125D88 thumb_func_end sub_8125B40 @@ -14428,7 +14428,7 @@ _08125C84: bl sub_81202F8 movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram - ldr r1, _08125CEC @ =gUnknown_3005090 + ldr r1, _08125CEC @ =gTasks lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -14447,7 +14447,7 @@ _08125CDC: .4byte gStringVar2 _08125CE0: .4byte gUnknown_8247094 _08125CE4: .4byte gStringVar4 _08125CE8: .4byte gUnknown_8416DB3 -_08125CEC: .4byte gUnknown_3005090 +_08125CEC: .4byte gTasks _08125CF0: .4byte sub_8125CF4 thumb_func_end sub_8125C48 @@ -14463,7 +14463,7 @@ sub_8125CF4: @ 8125CF4 beq _08125D1A ldr r0, _08125D20 @ =0x00000101 bl PlayFanfare - ldr r1, _08125D24 @ =gUnknown_3005090 + ldr r1, _08125D24 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -14476,7 +14476,7 @@ _08125D1A: bx r0 .align 2, 0 _08125D20: .4byte 0x00000101 -_08125D24: .4byte gUnknown_3005090 +_08125D24: .4byte gTasks _08125D28: .4byte sub_8125D2C thumb_func_end sub_8125CF4 @@ -14540,7 +14540,7 @@ sub_8125D88: @ 8125D88 cmp r0, 0x1 beq _08125DAC bl sub_812200C - ldr r0, _08125DB4 @ =gUnknown_3005090 + ldr r0, _08125DB4 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -14552,7 +14552,7 @@ _08125DAC: pop {r0} bx r0 .align 2, 0 -_08125DB4: .4byte gUnknown_3005090 +_08125DB4: .4byte gTasks _08125DB8: .4byte sub_8125DBC thumb_func_end sub_8125D88 @@ -14581,7 +14581,7 @@ _08125DE2: ldr r0, _08125DFC @ =gUnknown_8416EA4 movs r1, 0x1 bl sub_81202F8 - ldr r1, _08125E00 @ =gUnknown_3005090 + ldr r1, _08125E00 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -14591,7 +14591,7 @@ _08125DE2: b _08125E14 .align 2, 0 _08125DFC: .4byte gUnknown_8416EA4 -_08125E00: .4byte gUnknown_3005090 +_08125E00: .4byte gTasks _08125E04: .4byte sub_8125E1C _08125E08: movs r0, 0x5 @@ -14869,7 +14869,7 @@ sub_8125FFC: @ 8125FFC bl StringCopy ldr r0, _08126070 @ =gUnknown_8416EC6 bl sub_8125AF0 - ldr r1, _08126074 @ =gUnknown_3005090 + ldr r1, _08126074 @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -14886,7 +14886,7 @@ _08126064: .4byte gStringVar1 _08126068: .4byte gStringVar2 _0812606C: .4byte gUnknown_8247094 _08126070: .4byte gUnknown_8416EC6 -_08126074: .4byte gUnknown_3005090 +_08126074: .4byte gTasks _08126078: .4byte sub_812607C thumb_func_end sub_8125FFC @@ -14957,7 +14957,7 @@ sub_81260D8: @ 81260D8 bl sub_81202F8 movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram - ldr r1, _08126134 @ =gUnknown_3005090 + ldr r1, _08126134 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -14973,7 +14973,7 @@ _08126124: .4byte gUnknown_203B0A0 _08126128: .4byte gUnknown_8247094 _0812612C: .4byte gStringVar4 _08126130: .4byte gUnknown_8416E6B -_08126134: .4byte gUnknown_3005090 +_08126134: .4byte gTasks _08126138: .4byte sub_812613C thumb_func_end sub_81260D8 @@ -14988,7 +14988,7 @@ sub_812613C: @ 812613C cmp r0, 0x1 beq _08126160 bl sub_812200C - ldr r0, _08126168 @ =gUnknown_3005090 + ldr r0, _08126168 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -15000,7 +15000,7 @@ _08126160: pop {r0} bx r0 .align 2, 0 -_08126168: .4byte gUnknown_3005090 +_08126168: .4byte gTasks _0812616C: .4byte sub_8126170 thumb_func_end sub_812613C @@ -15058,7 +15058,7 @@ _081261AE: ldrsh r0, [r7, r3] cmp r0, 0x1 bne _08126210 - ldr r0, _08126208 @ =gUnknown_3005090 + ldr r0, _08126208 @ =gTasks lsls r1, r6, 2 adds r1, r6 lsls r1, 3 @@ -15072,7 +15072,7 @@ _081261F8: .4byte gStringVar2 _081261FC: .4byte gUnknown_8247094 _08126200: .4byte gStringVar4 _08126204: .4byte gUnknown_8416E84 -_08126208: .4byte gUnknown_3005090 +_08126208: .4byte gTasks _0812620C: .4byte sub_812628C _08126210: cmp r0, 0x2 @@ -15080,7 +15080,7 @@ _08126210: ldr r0, _08126228 @ =gUnknown_20370D0 strh r5, [r0] _08126218: - ldr r0, _0812622C @ =gUnknown_3005090 + ldr r0, _0812622C @ =gTasks lsls r1, r6, 2 adds r1, r6 lsls r1, 3 @@ -15090,7 +15090,7 @@ _08126218: b _0812626A .align 2, 0 _08126228: .4byte gUnknown_20370D0 -_0812622C: .4byte gUnknown_3005090 +_0812622C: .4byte gTasks _08126230: .4byte sub_81255BC _08126234: movs r0, 0x5 @@ -15110,7 +15110,7 @@ _0812623A: bl StringCopy ldr r0, _08126280 @ =gUnknown_8416DF7 bl sub_8125AF0 - ldr r1, _08126284 @ =gUnknown_3005090 + ldr r1, _08126284 @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -15127,7 +15127,7 @@ _08126274: .4byte gStringVar2 _08126278: .4byte gUnknown_203B0A0 _0812627C: .4byte gUnknown_8247094 _08126280: .4byte gUnknown_8416DF7 -_08126284: .4byte gUnknown_3005090 +_08126284: .4byte gTasks _08126288: .4byte sub_8125D88 thumb_func_end sub_8126170 @@ -15198,7 +15198,7 @@ _081262F6: bl sub_81202F8 movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram - ldr r1, _0812632C @ =gUnknown_3005090 + ldr r1, _0812632C @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -15209,7 +15209,7 @@ _081262F6: .align 2, 0 _08126324: .4byte gUnknown_203B0C0 _08126328: .4byte gUnknown_84169DC -_0812632C: .4byte gUnknown_3005090 +_0812632C: .4byte gTasks _08126330: adds r0, r6, 0 bl sub_8124DC0 @@ -15299,7 +15299,7 @@ sub_8126350: @ 8126350 bl sub_81202F8 movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram - ldr r1, _08126438 @ =gUnknown_3005090 + ldr r1, _08126438 @ =gTasks mov r2, r8 lsls r0, r2, 2 add r0, r8 @@ -15323,7 +15323,7 @@ _08126428: .4byte gStringVar1 _0812642C: .4byte gStringVar2 _08126430: .4byte gStringVar4 _08126434: .4byte gUnknown_8417017 -_08126438: .4byte gUnknown_3005090 +_08126438: .4byte gTasks _0812643C: .4byte sub_81264C8 thumb_func_end sub_8126350 @@ -15420,7 +15420,7 @@ _081264FA: bl PlaySE adds r0, r4, 0 bl sub_8126570 - ldr r0, _08126520 @ =gUnknown_3005090 + ldr r0, _08126520 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -15433,7 +15433,7 @@ _08126514: bx r0 .align 2, 0 _0812651C: .4byte gMain -_08126520: .4byte gUnknown_3005090 +_08126520: .4byte gTasks _08126524: .4byte sub_8126528 thumb_func_end sub_81264C8 @@ -15457,7 +15457,7 @@ _08126542: bl PlaySE adds r0, r4, 0 bl sub_81265BC - ldr r0, _08126568 @ =gUnknown_3005090 + ldr r0, _08126568 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -15470,7 +15470,7 @@ _0812655C: bx r0 .align 2, 0 _08126564: .4byte gMain -_08126568: .4byte gUnknown_3005090 +_08126568: .4byte gTasks _0812656C: .4byte sub_81265F8 thumb_func_end sub_8126528 @@ -15606,7 +15606,7 @@ _08126674: bl sub_8126770 b _0812669A _0812667C: - ldr r0, _0812668C @ =gUnknown_3005090 + ldr r0, _0812668C @ =gTasks lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -15615,7 +15615,7 @@ _0812667C: str r0, [r1] b _0812669A .align 2, 0 -_0812668C: .4byte gUnknown_3005090 +_0812668C: .4byte gTasks _08126690: .4byte sub_81266A0 _08126694: adds r0, r5, 0 @@ -15715,7 +15715,7 @@ _08126748: .4byte gUnknown_203B0A0 _0812674C: .4byte gPlayerParty _08126750: .4byte gUnknown_300537C _08126754: - ldr r0, _08126768 @ =gUnknown_3005090 + ldr r0, _08126768 @ =gTasks lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -15727,7 +15727,7 @@ _08126762: pop {r0} bx r0 .align 2, 0 -_08126768: .4byte gUnknown_3005090 +_08126768: .4byte gTasks _0812676C: .4byte sub_81255BC thumb_func_end sub_8126704 @@ -15769,7 +15769,7 @@ sub_8126770: @ 8126770 ldrh r0, [r6] mov r1, r8 strh r0, [r1, 0xE] - ldr r1, _081267FC @ =gUnknown_3005090 + ldr r1, _081267FC @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -15790,7 +15790,7 @@ _081267EC: .4byte gUnknown_2024022 _081267F0: .4byte gUnknown_8247094 _081267F4: .4byte gStringVar4 _081267F8: .4byte gUnknown_8416DF7 -_081267FC: .4byte gUnknown_3005090 +_081267FC: .4byte gTasks _08126800: .4byte sub_8125D88 thumb_func_end sub_8126770 @@ -15832,7 +15832,7 @@ sub_8126804: @ 8126804 bl schedule_bg_copy_tilemap_to_vram mov r0, r8 strh r5, [r0, 0xE] - ldr r1, _0812688C @ =gUnknown_3005090 + ldr r1, _0812688C @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -15852,7 +15852,7 @@ _0812687C: .4byte gStringVar2 _08126880: .4byte gUnknown_8247094 _08126884: .4byte gStringVar4 _08126888: .4byte gUnknown_8416DB3 -_0812688C: .4byte gUnknown_3005090 +_0812688C: .4byte gTasks _08126890: .4byte sub_8125CF4 thumb_func_end sub_8126804 @@ -15927,7 +15927,7 @@ sub_81268D4: @ 81268D4 cmp r0, 0 beq _08126944 _08126920: - ldr r0, _0812693C @ =gUnknown_3005090 + ldr r0, _0812693C @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -15939,7 +15939,7 @@ _08126920: _08126930: .4byte gUnknown_203B0A0 _08126934: .4byte gPlayerParty _08126938: .4byte gUnknown_203AD30 -_0812693C: .4byte gUnknown_3005090 +_0812693C: .4byte gTasks _08126940: .4byte sub_8126A18 _08126944: movs r0, 0x1 @@ -16119,7 +16119,7 @@ _08126AB4: movs r1, 0x1 bl sub_809A1D8 _08126ABE: - ldr r1, _08126AE4 @ =gUnknown_3005090 + ldr r1, _08126AE4 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -16135,7 +16135,7 @@ _08126AD4: .4byte gUnknown_203B0C0 _08126AD8: .4byte gUnknown_203B0D0 _08126ADC: .4byte gUnknown_203AD30 _08126AE0: .4byte 0x0000ffff -_08126AE4: .4byte gUnknown_3005090 +_08126AE4: .4byte gTasks _08126AE8: .4byte sub_81255BC _08126AEC: .4byte gUnknown_203B0A0 _08126AF0: @@ -16171,7 +16171,7 @@ sub_8126AFC: @ 8126AFC bl sub_81202F8 movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram - ldr r1, _08126B58 @ =gUnknown_3005090 + ldr r1, _08126B58 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -16187,7 +16187,7 @@ _08126B48: .4byte gPlayerParty _08126B4C: .4byte gStringVar1 _08126B50: .4byte gStringVar4 _08126B54: .4byte gUnknown_8416F27 -_08126B58: .4byte gUnknown_3005090 +_08126B58: .4byte gTasks _08126B5C: .4byte sub_8126A18 thumb_func_end sub_8126AFC @@ -16222,7 +16222,7 @@ sub_8126B60: @ 8126B60 bl sub_81202F8 movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram - ldr r1, _08126BC4 @ =gUnknown_3005090 + ldr r1, _08126BC4 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -16235,7 +16235,7 @@ _08126BB4: .4byte gPlayerParty _08126BB8: .4byte gUnknown_203AD30 _08126BBC: .4byte gUnknown_203B0C0 _08126BC0: .4byte gUnknown_84169DC -_08126BC4: .4byte gUnknown_3005090 +_08126BC4: .4byte gTasks _08126BC8: adds r0, r4, 0 bl sub_8124DC0 @@ -16607,7 +16607,7 @@ _08126E80: .4byte gUnknown_8416F10 _08126E84: ldr r0, _08126EA4 @ =gUnknown_8416DF7 bl sub_8125AF0 - ldr r1, _08126EA8 @ =gUnknown_3005090 + ldr r1, _08126EA8 @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -16622,7 +16622,7 @@ _08126E98: bx r0 .align 2, 0 _08126EA4: .4byte gUnknown_8416DF7 -_08126EA8: .4byte gUnknown_3005090 +_08126EA8: .4byte gTasks _08126EAC: .4byte sub_8125D88 thumb_func_end sub_8126DC8 @@ -16754,7 +16754,7 @@ _08126FA0: ldrh r1, [r5] movs r2, 0x1 bl sub_812050C - ldr r1, _08126FD0 @ =gUnknown_3005090 + ldr r1, _08126FD0 @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -16769,7 +16769,7 @@ _08126FC4: pop {r0} bx r0 .align 2, 0 -_08126FD0: .4byte gUnknown_3005090 +_08126FD0: .4byte gTasks _08126FD4: .4byte sub_8127234 thumb_func_end sub_8126F40 @@ -16844,7 +16844,7 @@ sub_812701C: @ 812701C bl sub_81205C8 adds r0, r5, 0 bl sub_8127384 - ldr r1, _08127090 @ =gUnknown_3005090 + ldr r1, _08127090 @ =gTasks lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -16861,7 +16861,7 @@ _08127078: _08127084: .4byte gUnknown_2037AB8 _08127088: .4byte gUnknown_203B0A0 _0812708C: .4byte gPlayerParty -_08127090: .4byte gUnknown_3005090 +_08127090: .4byte gTasks _08127094: .4byte sub_8127098 thumb_func_end sub_812701C @@ -17043,7 +17043,7 @@ _081271F8: movs r3, 0x1 bl sub_8120420 _08127210: - ldr r0, _0812722C @ =gUnknown_3005090 + ldr r0, _0812722C @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -17057,7 +17057,7 @@ _0812721E: .align 2, 0 _08127224: .4byte gUnknown_203B0A0 _08127228: .4byte gPlayerParty -_0812722C: .4byte gUnknown_3005090 +_0812722C: .4byte gTasks _08127230: .4byte sub_8127098 thumb_func_end sub_81271C4 @@ -17072,7 +17072,7 @@ sub_8127234: @ 8127234 cmp r0, 0x1 beq _08127258 bl sub_812200C - ldr r0, _08127260 @ =gUnknown_3005090 + ldr r0, _08127260 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -17084,7 +17084,7 @@ _08127258: pop {r0} bx r0 .align 2, 0 -_08127260: .4byte gUnknown_3005090 +_08127260: .4byte gTasks _08127264: .4byte sub_8127268 thumb_func_end sub_8127234 @@ -17163,7 +17163,7 @@ _081272F0: movs r2, 0x1 bl sub_8120558 _0812730C: - ldr r1, _08127320 @ =gUnknown_3005090 + ldr r1, _08127320 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -17173,13 +17173,13 @@ _0812730C: b _0812733C .align 2, 0 _0812731C: .4byte gPlayerParty -_08127320: .4byte gUnknown_3005090 +_08127320: .4byte gTasks _08127324: .4byte sub_8127098 _08127328: movs r0, 0x5 bl PlaySE _0812732E: - ldr r0, _08127344 @ =gUnknown_3005090 + ldr r0, _08127344 @ =gTasks lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -17191,7 +17191,7 @@ _0812733C: pop {r0} bx r0 .align 2, 0 -_08127344: .4byte gUnknown_3005090 +_08127344: .4byte gTasks _08127348: .4byte sub_8127098 thumb_func_end sub_8127268 @@ -17206,7 +17206,7 @@ sub_812734C: @ 812734C bl sub_81202F8 movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram - ldr r1, _0812737C @ =gUnknown_3005090 + ldr r1, _0812737C @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -17218,7 +17218,7 @@ sub_812734C: @ 812734C bx r0 .align 2, 0 _08127378: .4byte gUnknown_8416BFB -_0812737C: .4byte gUnknown_3005090 +_0812737C: .4byte gTasks _08127380: .4byte sub_8127098 thumb_func_end sub_812734C @@ -17352,7 +17352,7 @@ _0812746C: _08127482: movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram - ldr r0, _081274A0 @ =gUnknown_3005090 + ldr r0, _081274A0 @ =gTasks lsls r1, r6, 2 adds r1, r6 lsls r1, 3 @@ -17364,7 +17364,7 @@ _08127482: bx r0 .align 2, 0 _0812749C: .4byte gUnknown_8416D4F -_081274A0: .4byte gUnknown_3005090 +_081274A0: .4byte gTasks _081274A4: .4byte sub_8127098 thumb_func_end sub_8127404 @@ -17733,12 +17733,12 @@ sub_812773C: @ 812773C bl PlaySE adds r0, r4, 0 bl sub_8121D0C - ldr r0, _08127764 @ =gUnknown_3005090 + ldr r0, _08127764 @ =gTasks lsls r1, r5, 2 adds r1, r5 b _08127796 .align 2, 0 -_08127764: .4byte gUnknown_3005090 +_08127764: .4byte gTasks _08127768: ldr r0, _08127780 @ =gUnknown_203B0D4 ldrb r0, [r0] @@ -17756,7 +17756,7 @@ _08127784: bl PlaySE movs r0, 0xE bl sub_8121D0C - ldr r0, _081277A4 @ =gUnknown_3005090 + ldr r0, _081277A4 @ =gTasks lsls r1, r6, 2 adds r1, r6 _08127796: @@ -17769,7 +17769,7 @@ _0812779E: pop {r0} bx r0 .align 2, 0 -_081277A4: .4byte gUnknown_3005090 +_081277A4: .4byte gTasks _081277A8: .4byte sub_81277AC thumb_func_end sub_812773C @@ -17793,7 +17793,7 @@ _081277C6: bl PlaySE movs r0, 0 bl sub_8121D0C - ldr r0, _081277EC @ =gUnknown_3005090 + ldr r0, _081277EC @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -17806,7 +17806,7 @@ _081277E0: bx r0 .align 2, 0 _081277E8: .4byte gMain -_081277EC: .4byte gUnknown_3005090 +_081277EC: .4byte gTasks _081277F0: .4byte sub_811FB28 thumb_func_end sub_81277AC @@ -19083,7 +19083,7 @@ sub_81281C4: @ 81281C4 push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _081281F4 @ =gUnknown_3005090 + ldr r1, _081281F4 @ =gTasks lsls r4, r0, 2 adds r4, r0 lsls r4, 3 @@ -19103,7 +19103,7 @@ sub_81281C4: @ 81281C4 pop {r0} bx r0 .align 2, 0 -_081281F4: .4byte gUnknown_3005090 +_081281F4: .4byte gTasks _081281F8: .4byte sub_81281FC thumb_func_end sub_81281C4 @@ -19115,7 +19115,7 @@ sub_81281FC: @ 81281FC lsls r6, r5, 2 adds r0, r6, r5 lsls r0, 3 - ldr r1, _08128270 @ =gUnknown_3005098 + ldr r1, _08128270 @ =gTasks+0x8 adds r4, r0, r1 ldr r0, _08128274 @ =gUnknown_2037AB8 ldrb r1, [r0, 0x7] @@ -19156,7 +19156,7 @@ _0812824C: bls _08128230 movs r0, 0x71 bl PlaySE - ldr r0, _08128280 @ =gUnknown_3005090 + ldr r0, _08128280 @ =gTasks adds r1, r6, r5 lsls r1, 3 adds r1, r0 @@ -19167,11 +19167,11 @@ _08128268: pop {r0} bx r0 .align 2, 0 -_08128270: .4byte gUnknown_3005098 +_08128270: .4byte gTasks+0x8 _08128274: .4byte gUnknown_2037AB8 _08128278: .4byte gUnknown_2022B58 _0812827C: .4byte gUnknown_203B0B4 -_08128280: .4byte gUnknown_3005090 +_08128280: .4byte gTasks _08128284: .4byte sub_8128288 thumb_func_end sub_81281FC @@ -19183,7 +19183,7 @@ sub_8128288: @ 8128288 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _081282B4 @ =gUnknown_3005098 + ldr r1, _081282B4 @ =gTasks+0x8 adds r0, r1 ldrh r1, [r0] adds r1, 0x1 @@ -19199,7 +19199,7 @@ _081282AE: pop {r0} bx r0 .align 2, 0 -_081282B4: .4byte gUnknown_3005098 +_081282B4: .4byte gTasks+0x8 thumb_func_end sub_8128288 thumb_func_start sub_81282B8 @@ -19232,7 +19232,7 @@ sub_81282DC: @ 81282DC lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _08128364 @ =gUnknown_3005098 + ldr r0, _08128364 @ =gTasks+0x8 adds r5, r1, r0 movs r6, 0x3 ldr r7, _08128368 @ =gUnknown_203B0B4 @@ -19292,7 +19292,7 @@ _08128348: pop {r0} bx r0 .align 2, 0 -_08128364: .4byte gUnknown_3005098 +_08128364: .4byte gTasks+0x8 _08128368: .4byte gUnknown_203B0B4 _0812836C: .4byte gUnknown_2022B58 thumb_func_end sub_81282DC diff --git a/asm/pc_screen_effect.s b/asm/pc_screen_effect.s index 95e93e10d..b8e48f91c 100644 --- a/asm/pc_screen_effect.s +++ b/asm/pc_screen_effect.s @@ -90,7 +90,7 @@ sub_80A0AC0: @ 80A0AC0 lsls r0, 24 lsrs r0, 24 adds r2, r0, 0 - ldr r1, _080A0B08 @ =gUnknown_3005090 + ldr r1, _080A0B08 @ =gTasks lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -116,7 +116,7 @@ _080A0AF8: pop {r0} bx r0 .align 2, 0 -_080A0B08: .4byte gUnknown_3005090 +_080A0B08: .4byte gTasks thumb_func_end sub_80A0AC0 thumb_func_start sub_80A0B0C @@ -127,7 +127,7 @@ sub_80A0B0C: @ 80A0B0C lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080A0B30 @ =gUnknown_3005090 + ldr r1, _080A0B30 @ =gTasks adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -139,7 +139,7 @@ sub_80A0B0C: @ 80A0B0C beq _080A0B3E b _080A0C5A .align 2, 0 -_080A0B30: .4byte gUnknown_3005090 +_080A0B30: .4byte gTasks _080A0B34: cmp r0, 0x2 beq _080A0BAE @@ -306,7 +306,7 @@ sub_80A0C78: @ 80A0C78 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080A0C9C @ =gUnknown_3005090 + ldr r1, _080A0C9C @ =gTasks adds r4, r0, r1 movs r0, 0x8 ldrsh r1, [r4, r0] @@ -318,7 +318,7 @@ sub_80A0C78: @ 80A0C78 beq _080A0CAA b _080A0DA8 .align 2, 0 -_080A0C9C: .4byte gUnknown_3005090 +_080A0C9C: .4byte gTasks _080A0CA0: cmp r1, 0x2 beq _080A0D02 diff --git a/asm/player_pc.s b/asm/player_pc.s index f16d191cb..a113049c4 100644 --- a/asm/player_pc.s +++ b/asm/player_pc.s @@ -63,7 +63,7 @@ sub_80EB6AC: @ 80EB6AC ldr r1, _080EB6EC @ =gUnknown_203AAC0 movs r0, 0x3 strb r0, [r1] - ldr r0, _080EB6F0 @ =nullsub_43 + ldr r0, _080EB6F0 @ =TaskDummy movs r1, 0 bl CreateTask lsls r0, 24 @@ -79,7 +79,7 @@ _080EB6E0: .4byte gUnknown_203AAC4 _080EB6E4: .4byte gUnknown_203AABC _080EB6E8: .4byte gUnknown_8402200 _080EB6EC: .4byte gUnknown_203AAC0 -_080EB6F0: .4byte nullsub_43 +_080EB6F0: .4byte TaskDummy _080EB6F4: .4byte gUnknown_8416262 _080EB6F8: .4byte sub_80EB74C thumb_func_end sub_80EB6AC @@ -97,7 +97,7 @@ sub_80EB6FC: @ 80EB6FC ldr r1, _080EB73C @ =gUnknown_203AAC0 movs r0, 0x3 strb r0, [r1] - ldr r0, _080EB740 @ =nullsub_43 + ldr r0, _080EB740 @ =TaskDummy movs r1, 0 bl CreateTask lsls r0, 24 @@ -113,7 +113,7 @@ _080EB730: .4byte gUnknown_203AAC4 _080EB734: .4byte gUnknown_203AABC _080EB738: .4byte gUnknown_8402203 _080EB73C: .4byte gUnknown_203AAC0 -_080EB740: .4byte nullsub_43 +_080EB740: .4byte TaskDummy _080EB744: .4byte gUnknown_8416262 _080EB748: .4byte sub_80EB74C thumb_func_end sub_80EB6FC @@ -130,7 +130,7 @@ sub_80EB74C: @ 80EB74C lsls r0, 2 add r0, r8 lsls r0, 3 - ldr r1, _080EB770 @ =gUnknown_3005098 + ldr r1, _080EB770 @ =gTasks+0x8 adds r7, r0, r1 ldr r0, _080EB774 @ =gUnknown_203AAC0 ldrb r0, [r0] @@ -139,7 +139,7 @@ sub_80EB74C: @ 80EB74C ldr r0, _080EB778 @ =gUnknown_8402248 b _080EB77E .align 2, 0 -_080EB770: .4byte gUnknown_3005098 +_080EB770: .4byte gTasks+0x8 _080EB774: .4byte gUnknown_203AAC0 _080EB778: .4byte gUnknown_8402248 _080EB77C: @@ -190,7 +190,7 @@ _080EB77E: bl sub_810F7D8 movs r0, 0 bl schedule_bg_copy_tilemap_to_vram - ldr r1, _080EB814 @ =gUnknown_3005090 + ldr r1, _080EB814 @ =gTasks mov r2, r8 lsls r0, r2, 2 add r0, r8 @@ -209,7 +209,7 @@ _080EB804: .4byte gUnknown_8402250 _080EB808: .4byte gUnknown_203AAC0 _080EB80C: .4byte gUnknown_84021E8 _080EB810: .4byte gUnknown_203AABC -_080EB814: .4byte gUnknown_3005090 +_080EB814: .4byte gTasks _080EB818: .4byte sub_80EB81C thumb_func_end sub_80EB74C @@ -221,7 +221,7 @@ sub_80EB81C: @ 80EB81C lsls r1, r0, 2 adds r1, r0 lsls r6, r1, 3 - ldr r7, _080EB870 @ =gUnknown_3005098 + ldr r7, _080EB870 @ =gTasks+0x8 adds r4, r6, r7 bl ProcessMenuInputNoWrapAround lsls r0, 24 @@ -251,7 +251,7 @@ sub_80EB81C: @ 80EB81C str r1, [r0] b _080EB8AC .align 2, 0 -_080EB870: .4byte gUnknown_3005098 +_080EB870: .4byte gTasks+0x8 _080EB874: .4byte sub_80EB9B8 _080EB878: ldrb r0, [r4, 0x14] @@ -314,7 +314,7 @@ sub_80EB8E4: @ 80EB8E4 adds r0, r4, 0 movs r1, 0 bl sub_80EB9E8 - ldr r1, _080EB908 @ =gUnknown_3005090 + ldr r1, _080EB908 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -325,7 +325,7 @@ sub_80EB8E4: @ 80EB8E4 pop {r0} bx r0 .align 2, 0 -_080EB908: .4byte gUnknown_3005090 +_080EB908: .4byte gTasks _080EB90C: .4byte sub_80EBAB8 thumb_func_end sub_80EB8E4 @@ -379,7 +379,7 @@ _080EB962: bl sub_80F6F54 adds r0, r5, 0 bl sub_80EBEB0 - ldr r0, _080EB994 @ =gUnknown_3005090 + ldr r0, _080EB994 @ =gTasks lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -389,7 +389,7 @@ _080EB962: b _080EB9A8 .align 2, 0 _080EB990: .4byte gUnknown_203AAC4 -_080EB994: .4byte gUnknown_3005090 +_080EB994: .4byte gTasks _080EB998: .4byte sub_80EBF40 _080EB99C: ldr r2, _080EB9B0 @ =gUnknown_84177EE @@ -442,7 +442,7 @@ sub_80EB9E8: @ 80EB9E8 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080EBA10 @ =gUnknown_3005098 + ldr r0, _080EBA10 @ =gTasks+0x8 adds r6, r1, r0 ldr r0, _080EBA14 @ =gUnknown_203AAC4 ldrb r0, [r0, 0x9] @@ -452,7 +452,7 @@ sub_80EB9E8: @ 80EB9E8 bl sub_812B1F0 b _080EBA1E .align 2, 0 -_080EBA10: .4byte gUnknown_3005098 +_080EBA10: .4byte gTasks+0x8 _080EBA14: .4byte gUnknown_203AAC4 _080EBA18: movs r0, 0x1D @@ -653,7 +653,7 @@ sub_80EBBB4: @ 80EBBB4 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080EBBD4 @ =gUnknown_3005090 + ldr r2, _080EBBD4 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -666,7 +666,7 @@ sub_80EBBB4: @ 80EBBB4 pop {r0} bx r0 .align 2, 0 -_080EBBD4: .4byte gUnknown_3005090 +_080EBBD4: .4byte gTasks _080EBBD8: .4byte sub_80EBB70 thumb_func_end sub_80EBBB4 @@ -680,7 +680,7 @@ sub_80EBBDC: @ 80EBBDC lsrs r0, 24 cmp r0, 0x1 bne _080EBBFC - ldr r0, _080EBC04 @ =gUnknown_3005090 + ldr r0, _080EBC04 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -692,7 +692,7 @@ _080EBBFC: pop {r0} bx r0 .align 2, 0 -_080EBC04: .4byte gUnknown_3005090 +_080EBC04: .4byte gTasks _080EBC08: .4byte sub_80EBAB8 thumb_func_end sub_80EBBDC @@ -725,7 +725,7 @@ sub_80EBC38: @ 80EBC38 lsls r0, r5, 2 adds r0, r5 lsls r6, r0, 3 - ldr r7, _080EBC6C @ =gUnknown_3005098 + ldr r7, _080EBC6C @ =gTasks+0x8 adds r4, r6, r7 bl sub_809A33C lsls r0, 24 @@ -745,7 +745,7 @@ sub_80EBC38: @ 80EBC38 str r0, [r1] b _080EBC9C .align 2, 0 -_080EBC6C: .4byte gUnknown_3005098 +_080EBC6C: .4byte gTasks+0x8 _080EBC70: .4byte sub_80EBD18 _080EBC74: .4byte gUnknown_3005020 _080EBC78: .4byte sub_80EBCAC @@ -800,7 +800,7 @@ sub_80EBCD8: @ 80EBCD8 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _080EBD0C @ =gUnknown_3005098 + ldr r1, _080EBD0C @ =gTasks+0x8 adds r5, r0, r1 ldr r0, _080EBD10 @ =gUnknown_2037AB8 ldrb r1, [r0, 0x7] @@ -819,7 +819,7 @@ _080EBD06: pop {r0} bx r0 .align 2, 0 -_080EBD0C: .4byte gUnknown_3005098 +_080EBD0C: .4byte gTasks+0x8 _080EBD10: .4byte gUnknown_2037AB8 _080EBD14: .4byte c2_exit_to_overworld_2_switch thumb_func_end sub_80EBCD8 @@ -829,7 +829,7 @@ sub_80EBD18: @ 80EBD18 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080EBD40 @ =gUnknown_3005090 + ldr r2, _080EBD40 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -844,7 +844,7 @@ sub_80EBD18: @ 80EBD18 pop {r0} bx r0 .align 2, 0 -_080EBD40: .4byte gUnknown_3005090 +_080EBD40: .4byte gTasks _080EBD44: .4byte sub_80EBCD8 thumb_func_end sub_80EBD18 @@ -857,7 +857,7 @@ sub_80EBD48: @ 80EBD48 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 - ldr r0, _080EBD84 @ =gUnknown_3005098 + ldr r0, _080EBD84 @ =gTasks+0x8 adds r4, r0 ldrb r0, [r4, 0x14] movs r1, 0 @@ -875,7 +875,7 @@ sub_80EBD48: @ 80EBD48 pop {r0} bx r0 .align 2, 0 -_080EBD84: .4byte gUnknown_3005098 +_080EBD84: .4byte gTasks+0x8 thumb_func_end sub_80EBD48 thumb_func_start sub_80EBD88 @@ -886,7 +886,7 @@ sub_80EBD88: @ 80EBD88 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080EBDA8 @ =gUnknown_3005098 + ldr r0, _080EBDA8 @ =gTasks+0x8 adds r1, r0 ldrh r2, [r1, 0x4] movs r3, 0x4 @@ -896,7 +896,7 @@ sub_80EBD88: @ 80EBD88 movs r0, 0x8 b _080EBDAE .align 2, 0 -_080EBDA8: .4byte gUnknown_3005098 +_080EBDA8: .4byte gTasks+0x8 _080EBDAC: adds r0, r2, 0x1 _080EBDAE: @@ -1088,7 +1088,7 @@ sub_80EBEB0: @ 80EBEB0 ldr r4, _080EBF38 @ =gUnknown_203AAC4 adds r0, r4, 0 bl sub_810EC98 - ldr r2, _080EBF3C @ =gUnknown_3005090 + ldr r2, _080EBF3C @ =gTasks lsls r1, r6, 2 adds r1, r6 lsls r1, 3 @@ -1107,7 +1107,7 @@ sub_80EBEB0: @ 80EBEB0 .align 2, 0 _080EBF34: .4byte gUnknown_84176FE _080EBF38: .4byte gUnknown_203AAC4 -_080EBF3C: .4byte gUnknown_3005090 +_080EBF3C: .4byte gTasks thumb_func_end sub_80EBEB0 thumb_func_start sub_80EBF40 @@ -1123,7 +1123,7 @@ sub_80EBF40: @ 80EBF40 adds r0, r5 lsls r0, 3 mov r9, r0 - ldr r0, _080EBF94 @ =gUnknown_3005098 + ldr r0, _080EBF94 @ =gTasks+0x8 mov r10, r0 mov r4, r9 add r4, r10 @@ -1152,7 +1152,7 @@ sub_80EBF40: @ 80EBF40 bne _080EBFB6 b _080EBFEA .align 2, 0 -_080EBF94: .4byte gUnknown_3005098 +_080EBF94: .4byte gTasks+0x8 _080EBF98: .4byte gUnknown_2037AB8 _080EBF9C: .4byte gUnknown_203AAC6 _080EBFA0: @@ -1279,7 +1279,7 @@ sub_80EC094: @ 80EC094 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 - ldr r0, _080EC0D4 @ =gUnknown_3005098 + ldr r0, _080EC0D4 @ =gTasks+0x8 adds r4, r0 movs r0, 0 bl sub_810EBE0 @@ -1298,7 +1298,7 @@ sub_80EC094: @ 80EC094 pop {r0} bx r0 .align 2, 0 -_080EC0D4: .4byte gUnknown_3005098 +_080EC0D4: .4byte gTasks+0x8 thumb_func_end sub_80EC094 thumb_func_start sub_80EC0D8 @@ -1344,7 +1344,7 @@ sub_80EC0D8: @ 80EC0D8 bl sub_810F7D8 movs r0, 0 bl schedule_bg_copy_tilemap_to_vram - ldr r1, _080EC154 @ =gUnknown_3005090 + ldr r1, _080EC154 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -1359,7 +1359,7 @@ sub_80EC0D8: @ 80EC0D8 bx r0 .align 2, 0 _080EC150: .4byte gUnknown_8402228 -_080EC154: .4byte gUnknown_3005090 +_080EC154: .4byte gTasks _080EC158: .4byte sub_80EC15C thumb_func_end sub_80EC0D8 @@ -1411,7 +1411,7 @@ sub_80EC1A8: @ 80EC1A8 movs r0, 0x1 movs r1, 0 bl fade_screen - ldr r1, _080EC1CC @ =gUnknown_3005090 + ldr r1, _080EC1CC @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -1422,7 +1422,7 @@ sub_80EC1A8: @ 80EC1A8 pop {r0} bx r0 .align 2, 0 -_080EC1CC: .4byte gUnknown_3005090 +_080EC1CC: .4byte gTasks _080EC1D0: .4byte sub_80EC1D4 thumb_func_end sub_80EC1A8 @@ -1479,7 +1479,7 @@ sub_80EC230: @ 80EC230 lsrs r0, 24 cmp r0, 0x1 bne _080EC250 - ldr r0, _080EC258 @ =gUnknown_3005090 + ldr r0, _080EC258 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -1491,7 +1491,7 @@ _080EC250: pop {r0} bx r0 .align 2, 0 -_080EC258: .4byte gUnknown_3005090 +_080EC258: .4byte gTasks _080EC25C: .4byte sub_80EBF40 thumb_func_end sub_80EC230 @@ -1579,7 +1579,7 @@ sub_80EC2FC: @ 80EC2FC lsls r4, 24 lsrs r4, 24 bl sub_80F7858 - ldr r1, _080EC31C @ =gUnknown_3005090 + ldr r1, _080EC31C @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -1590,7 +1590,7 @@ sub_80EC2FC: @ 80EC2FC pop {r0} bx r0 .align 2, 0 -_080EC31C: .4byte gUnknown_3005090 +_080EC31C: .4byte gTasks _080EC320: .4byte sub_80EC324 thumb_func_end sub_80EC2FC @@ -1725,7 +1725,7 @@ _080EC420: movs r0, 0x1 movs r1, 0 bl fade_screen - ldr r0, _080EC43C @ =gUnknown_3005090 + ldr r0, _080EC43C @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -1737,7 +1737,7 @@ _080EC436: pop {r0} bx r0 .align 2, 0 -_080EC43C: .4byte gUnknown_3005090 +_080EC43C: .4byte gTasks _080EC440: .4byte sub_80EC444 thumb_func_end sub_80EC408 @@ -1876,7 +1876,7 @@ sub_80EC53C: @ 80EC53C bl sub_80EBEB0 movs r0, 0 bl schedule_bg_copy_tilemap_to_vram - ldr r1, _080EC56C @ =gUnknown_3005090 + ldr r1, _080EC56C @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -1887,7 +1887,7 @@ sub_80EC53C: @ 80EC53C pop {r0} bx r0 .align 2, 0 -_080EC56C: .4byte gUnknown_3005090 +_080EC56C: .4byte gTasks _080EC570: .4byte sub_80EBF40 thumb_func_end sub_80EC53C @@ -1901,7 +1901,7 @@ sub_80EC574: @ 80EC574 bl sub_810EBE0 movs r0, 0 bl schedule_bg_copy_tilemap_to_vram - ldr r1, _080EC59C @ =gUnknown_3005090 + ldr r1, _080EC59C @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -1912,7 +1912,7 @@ sub_80EC574: @ 80EC574 pop {r0} bx r0 .align 2, 0 -_080EC59C: .4byte gUnknown_3005090 +_080EC59C: .4byte gTasks _080EC5A0: .4byte sub_80EC53C thumb_func_end sub_80EC574 diff --git a/asm/pokeball.s b/asm/pokeball.s index 0e2351b4d..77d9152c5 100644 --- a/asm/pokeball.s +++ b/asm/pokeball.s @@ -35,7 +35,7 @@ DoPokeballSendOutAnimation: @ 804A938 bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _0804A99C @ =gUnknown_3005090 + ldr r2, _0804A99C @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -53,7 +53,7 @@ _0804A98C: .4byte gUnknown_2024005 _0804A990: .4byte gUnknown_2024018 _0804A994: .4byte gActiveBattler _0804A998: .4byte sub_804A9A0 -_0804A99C: .4byte gUnknown_3005090 +_0804A99C: .4byte gTasks thumb_func_end DoPokeballSendOutAnimation thumb_func_start sub_804A9A0 @@ -69,7 +69,7 @@ sub_804A9A0: @ 804A9A0 str r0, [sp] movs r0, 0 str r0, [sp, 0x4] - ldr r1, _0804A9D4 @ =gUnknown_3005090 + ldr r1, _0804A9D4 @ =gTasks ldr r2, [sp] lsls r0, r2, 2 adds r0, r2 @@ -84,7 +84,7 @@ sub_804A9A0: @ 804A9A0 strh r0, [r1, 0x8] b _0804ABB8 .align 2, 0 -_0804A9D4: .4byte gUnknown_3005090 +_0804A9D4: .4byte gTasks _0804A9D8: ldrh r0, [r1, 0xC] mov r9, r0 @@ -294,7 +294,7 @@ _0804AB6C: mov r0, sp ldrh r0, [r0] strh r0, [r4, 0x6] - ldr r1, _0804ABCC @ =gUnknown_3005090 + ldr r1, _0804ABCC @ =gTasks ldr r2, [sp] lsls r0, r2, 2 adds r0, r2 @@ -302,7 +302,7 @@ _0804AB6C: adds r0, r1 ldrb r1, [r5] strh r1, [r0, 0x10] - ldr r1, _0804ABD0 @ =nullsub_43 + ldr r1, _0804ABD0 @ =TaskDummy str r1, [r0] movs r0, 0x36 bl PlaySE @@ -317,8 +317,8 @@ _0804ABB8: bx r0 .align 2, 0 _0804ABC8: .4byte 0x0000ffd8 -_0804ABCC: .4byte gUnknown_3005090 -_0804ABD0: .4byte nullsub_43 +_0804ABCC: .4byte gTasks +_0804ABD0: .4byte TaskDummy thumb_func_end sub_804A9A0 thumb_func_start SpriteCB_TestBallThrow @@ -333,7 +333,7 @@ SpriteCB_TestBallThrow: @ 804ABD4 cmp r0, 0 beq _0804AC74 ldrb r6, [r7, 0x6] - ldr r1, _0804AC80 @ =gUnknown_3005090 + ldr r1, _0804AC80 @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -404,7 +404,7 @@ _0804AC74: pop {r0} bx r0 .align 2, 0 -_0804AC80: .4byte gUnknown_3005090 +_0804AC80: .4byte gTasks _0804AC84: .4byte sub_804AC88 thumb_func_end SpriteCB_TestBallThrow @@ -936,7 +936,7 @@ Task_PlayCryWhenReleasedFromBall: @ 804B070 push {r4-r7,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r2, _0804B0A4 @ =gUnknown_3005090 + ldr r2, _0804B0A4 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -959,7 +959,7 @@ Task_PlayCryWhenReleasedFromBall: @ 804B070 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0804B0A4: .4byte gUnknown_3005090 +_0804B0A4: .4byte gTasks _0804B0A8: .4byte _0804B0AC .align 2, 0 _0804B0AC: @@ -1033,7 +1033,7 @@ _0804B166: b _0804B1C6 _0804B174: bl StopCryAndClearCrySongs - ldr r1, _0804B18C @ =gUnknown_3005090 + ldr r1, _0804B18C @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -1044,7 +1044,7 @@ _0804B174: strh r1, [r0, 0x26] b _0804B262 .align 2, 0 -_0804B18C: .4byte gUnknown_3005090 +_0804B18C: .4byte gTasks _0804B190: lsls r0, r4, 2 adds r0, r4 @@ -1104,7 +1104,7 @@ _0804B1F8: cmp r0, 0 bne _0804B262 bl StopCryAndClearCrySongs - ldr r0, _0804B21C @ =gUnknown_3005090 + ldr r0, _0804B21C @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -1116,7 +1116,7 @@ _0804B1F8: strh r0, [r1, 0x26] b _0804B262 .align 2, 0 -_0804B21C: .4byte gUnknown_3005090 +_0804B21C: .4byte gTasks _0804B220: lsls r0, r4, 2 adds r0, r4 @@ -1345,7 +1345,7 @@ _0804B3F2: bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _0804B478 @ =gUnknown_3005090 + ldr r2, _0804B478 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -1404,7 +1404,7 @@ _0804B420: bx r0 .align 2, 0 _0804B474: .4byte Task_PlayCryWhenReleasedFromBall -_0804B478: .4byte gUnknown_3005090 +_0804B478: .4byte gTasks _0804B47C: .4byte gUnknown_2023D44 _0804B480: .4byte gSprites thumb_func_end sub_804B268 diff --git a/asm/pokedex_area_markers.s b/asm/pokedex_area_markers.s index 5f156c18b..6062b95ee 100644 --- a/asm/pokedex_area_markers.s +++ b/asm/pokedex_area_markers.s @@ -12,7 +12,7 @@ sub_8134200: @ 8134200 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _08134228 @ =gUnknown_3005098 + ldr r0, _08134228 @ =gTasks+0x8 adds r1, r0 ldr r2, _0813422C @ =gSprites ldrb r1, [r1, 0xD] @@ -28,7 +28,7 @@ sub_8134200: @ 8134200 strb r1, [r0] bx lr .align 2, 0 -_08134228: .4byte gUnknown_3005098 +_08134228: .4byte gTasks+0x8 _0813422C: .4byte gSprites thumb_func_end sub_8134200 @@ -87,7 +87,7 @@ sub_8134230: @ 8134230 lsls r4, r0, 2 add r4, r10 lsls r4, 3 - ldr r0, _081343D8 @ =gUnknown_3005098 + ldr r0, _081343D8 @ =gTasks+0x8 adds r4, r0 movs r0, 0 strb r0, [r4, 0xC] @@ -223,7 +223,7 @@ _081343C8: .4byte 0xffff0000 _081343CC: .4byte 0x0000ffff _081343D0: .4byte gUnknown_846341C _081343D4: .4byte sub_8134200 -_081343D8: .4byte gUnknown_3005098 +_081343D8: .4byte gTasks+0x8 _081343DC: .4byte 0x00002f42 _081343E0: .4byte 0x0000080c _081343E4: .4byte 0x00001f1f @@ -242,7 +242,7 @@ sub_81343F4: @ 81343F4 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 - ldr r0, _08134498 @ =gUnknown_3005098 + ldr r0, _08134498 @ =gTasks+0x8 adds r4, r0 ldrh r0, [r4, 0xE] bl FreeSpriteTilesByTag @@ -301,7 +301,7 @@ sub_81343F4: @ 81343F4 pop {r0} bx r0 .align 2, 0 -_08134498: .4byte gUnknown_3005098 +_08134498: .4byte gTasks+0x8 _0813449C: .4byte gSprites _081344A0: .4byte 0x00001f1f thumb_func_end sub_81343F4 @@ -346,12 +346,12 @@ sub_81344E0: @ 81344E0 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _081344F4 @ =gUnknown_3005098 + ldr r0, _081344F4 @ =gTasks+0x8 adds r1, r0 ldrb r0, [r1] bx lr .align 2, 0 -_081344F4: .4byte gUnknown_3005098 +_081344F4: .4byte gTasks+0x8 thumb_func_end sub_81344E0 .align 2, 0 @ Don't pad with nop. diff --git a/asm/pokedex_screen.s b/asm/pokedex_screen.s index 09f527137..9cd8b78f0 100644 --- a/asm/pokedex_screen.s +++ b/asm/pokedex_screen.s @@ -785,7 +785,7 @@ _08102B24: ldr r0, [r4] adds r0, 0x2F strb r2, [r0] - ldr r1, _08102B8C @ =gUnknown_3005090 + ldr r1, _08102B8C @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -796,7 +796,7 @@ _08102B24: strb r2, [r0, 0x1] b _08102C18 .align 2, 0 -_08102B8C: .4byte gUnknown_3005090 +_08102B8C: .4byte gTasks _08102B90: .4byte sub_8103AC8 _08102B94: ldr r2, [r4] @@ -816,7 +816,7 @@ _08102B94: ldr r0, [r4] adds r0, 0x16 bl sub_81047B0 - ldr r1, _08102BD0 @ =gUnknown_3005090 + ldr r1, _08102BD0 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -824,7 +824,7 @@ _08102B94: ldr r1, _08102BD4 @ =sub_8103238 b _08102C10 .align 2, 0 -_08102BD0: .4byte gUnknown_3005090 +_08102BD0: .4byte gTasks _08102BD4: .4byte sub_8103238 _08102BD8: ldr r2, [r4] @@ -844,7 +844,7 @@ _08102BD8: ldr r0, [r4] adds r0, 0x16 bl sub_81047B0 - ldr r1, _08102C20 @ =gUnknown_3005090 + ldr r1, _08102C20 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -862,7 +862,7 @@ _08102C18: pop {r0} bx r0 .align 2, 0 -_08102C20: .4byte gUnknown_3005090 +_08102C20: .4byte gTasks _08102C24: .4byte sub_8102F80 thumb_func_end sub_810287C @@ -1315,7 +1315,7 @@ _08102FF8: ldr r0, [r4] adds r0, 0x40 bl sub_81047B0 - ldr r1, _08103020 @ =gUnknown_3005090 + ldr r1, _08103020 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -1323,7 +1323,7 @@ _08102FF8: ldr r1, _08103024 @ =sub_810287C b _08103164 .align 2, 0 -_08103020: .4byte gUnknown_3005090 +_08103020: .4byte gTasks _08103024: .4byte sub_810287C _08103028: bl sub_810317C @@ -1460,7 +1460,7 @@ _0810312C: ldr r0, [r4] adds r0, 0x40 bl sub_81047B0 - ldr r1, _08103174 @ =gUnknown_3005090 + ldr r1, _08103174 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -1478,7 +1478,7 @@ _0810316C: pop {r0} bx r0 .align 2, 0 -_08103174: .4byte gUnknown_3005090 +_08103174: .4byte gTasks _08103178: .4byte sub_81042EC thumb_func_end sub_8102F80 @@ -1628,7 +1628,7 @@ _081032B0: ldr r0, [r4] adds r0, 0x40 bl sub_81047B0 - ldr r1, _081032E0 @ =gUnknown_3005090 + ldr r1, _081032E0 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -1640,7 +1640,7 @@ _081032B0: strb r0, [r1, 0x1] b _0810344C .align 2, 0 -_081032E0: .4byte gUnknown_3005090 +_081032E0: .4byte gTasks _081032E4: .4byte sub_810287C _081032E8: bl sub_810345C @@ -1792,7 +1792,7 @@ _08103404: movs r2, 0 movs r1, 0x1 strb r1, [r0] - ldr r1, _08103454 @ =gUnknown_3005090 + ldr r1, _08103454 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -1807,7 +1807,7 @@ _0810344C: pop {r0} bx r0 .align 2, 0 -_08103454: .4byte gUnknown_3005090 +_08103454: .4byte gTasks _08103458: .4byte sub_8103AC8 thumb_func_end sub_8103238 @@ -2703,7 +2703,7 @@ _08103B98: cmp r0, 0x1 beq _08103BD4 _08103BB8: - ldr r0, _08103BCC @ =gUnknown_3005090 + ldr r0, _08103BCC @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -2712,10 +2712,10 @@ _08103BB8: b _08103BE0 .align 2, 0 _08103BC8: .4byte gUnknown_203ACF0 -_08103BCC: .4byte gUnknown_3005090 +_08103BCC: .4byte gTasks _08103BD0: .4byte sub_810287C _08103BD4: - ldr r0, _08103BEC @ =gUnknown_3005090 + ldr r0, _08103BEC @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -2728,7 +2728,7 @@ _08103BE0: movs r0, 0 b _08104226 .align 2, 0 -_08103BEC: .4byte gUnknown_3005090 +_08103BEC: .4byte gTasks _08103BF0: .4byte sub_8103238 _08103BF4: .4byte gUnknown_203ACF0 _08103BF8: @@ -3642,7 +3642,7 @@ _08104368: bl HideBg movs r0, 0x1 bl HideBg - ldr r1, _0810438C @ =gUnknown_3005090 + ldr r1, _0810438C @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -3654,7 +3654,7 @@ _08104368: movs r0, 0 b _08104654 .align 2, 0 -_0810438C: .4byte gUnknown_3005090 +_0810438C: .4byte gTasks _08104390: .4byte sub_8102F80 _08104394: .4byte gUnknown_203ACF0 _08104398: @@ -8628,7 +8628,7 @@ sub_8106B60: @ 8106B60 _08106BA0: .4byte sub_8106BD8 _08106BA4: bl sub_810250C - ldr r2, _08106BCC @ =gUnknown_3005090 + ldr r2, _08106BCC @ =gTasks ldr r4, _08106BD0 @ =gUnknown_203ACF0 ldr r0, [r4] ldrb r1, [r0] @@ -8647,7 +8647,7 @@ _08106BC6: pop {r1} bx r1 .align 2, 0 -_08106BCC: .4byte gUnknown_3005090 +_08106BCC: .4byte gTasks _08106BD0: .4byte gUnknown_203ACF0 _08106BD4: .4byte sub_8106BE8 thumb_func_end sub_8106B60 @@ -8795,7 +8795,7 @@ _08106D10: .4byte gUnknown_2037AB8 _08106D14: .4byte 0x0000ffff _08106D18: .4byte gUnknown_203ACF0 _08106D1C: - ldr r1, _08106D40 @ =gUnknown_3005090 + ldr r1, _08106D40 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -8813,7 +8813,7 @@ _08106D1C: movs r0, 0x6 b _08106E68 .align 2, 0 -_08106D40: .4byte gUnknown_3005090 +_08106D40: .4byte gTasks _08106D44: .4byte gUnknown_84524C4 _08106D48: .4byte gUnknown_203ACF0 _08106D4C: @@ -8831,7 +8831,7 @@ _08106D4C: adds r2, 0x2C ldrb r2, [r2] bl sub_8105178 - ldr r1, _08106D88 @ =gUnknown_3005090 + ldr r1, _08106D88 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -8845,7 +8845,7 @@ _08106D4C: strh r0, [r1, 0x8] b _08106E6A .align 2, 0 -_08106D88: .4byte gUnknown_3005090 +_08106D88: .4byte gTasks _08106D8C: ldr r0, [r4] adds r0, 0x61 diff --git a/asm/pokemon_special_anim.s b/asm/pokemon_special_anim.s index f07f73c1b..9ebfd51bb 100644 --- a/asm/pokemon_special_anim.s +++ b/asm/pokemon_special_anim.s @@ -247,7 +247,7 @@ sub_811C718: @ 811C718 adds r0, 0x92 movs r1, 0 strh r1, [r0] - ldr r1, _0811C744 @ =gUnknown_3005090 + ldr r1, _0811C744 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -257,7 +257,7 @@ sub_811C718: @ 811C718 pop {r0} bx r0 .align 2, 0 -_0811C744: .4byte gUnknown_3005090 +_0811C744: .4byte gTasks thumb_func_end sub_811C718 thumb_func_start sub_811C748 @@ -2531,7 +2531,7 @@ sub_811D948: @ 811D948 adds r0, r4, 0 movs r1, 0x6 bl SetWordTaskArg - ldr r1, _0811D994 @ =gUnknown_3005090 + ldr r1, _0811D994 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -2548,7 +2548,7 @@ sub_811D948: @ 811D948 b _0811D99A .align 2, 0 _0811D990: .4byte sub_811D9BC -_0811D994: .4byte gUnknown_3005090 +_0811D994: .4byte gTasks _0811D998: ldr r0, _0811D9A4 @ =0x0000ffff _0811D99A: @@ -2585,7 +2585,7 @@ sub_811D9BC: @ 811D9BC lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _0811D9F0 @ =gUnknown_3005098 + ldr r1, _0811D9F0 @ =gTasks+0x8 adds r4, r0, r1 adds r0, r6, 0 movs r1, 0x6 @@ -2601,7 +2601,7 @@ sub_811D9BC: @ 811D9BC beq _0811D9FA b _0811DA90 .align 2, 0 -_0811D9F0: .4byte gUnknown_3005098 +_0811D9F0: .4byte gTasks+0x8 _0811D9F4: cmp r0, 0x2 beq _0811DA7A @@ -2973,7 +2973,7 @@ sub_811DC54: @ 811DC54 adds r0, r4, 0 movs r1, 0x4 bl SetWordTaskArg - ldr r0, _0811DCE0 @ =gUnknown_3005090 + ldr r0, _0811DCE0 @ =gTasks lsls r5, r4, 2 adds r5, r4 lsls r5, 3 @@ -2998,7 +2998,7 @@ _0811DCD2: bx r0 .align 2, 0 _0811DCDC: .4byte sub_811DDA4 -_0811DCE0: .4byte gUnknown_3005090 +_0811DCE0: .4byte gTasks _0811DCE4: .4byte gUnknown_84599AA thumb_func_end sub_811DC54 @@ -3115,7 +3115,7 @@ sub_811DDA4: @ 811DDA4 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _0811DDD4 @ =gUnknown_3005098 + ldr r1, _0811DDD4 @ =gTasks+0x8 adds r4, r0, r1 adds r0, r6, 0 movs r1, 0x4 @@ -3133,7 +3133,7 @@ _0811DDCA: ldr r0, [r0] mov pc, r0 .align 2, 0 -_0811DDD4: .4byte gUnknown_3005098 +_0811DDD4: .4byte gTasks+0x8 _0811DDD8: .4byte _0811DDDC .align 2, 0 _0811DDDC: @@ -3426,7 +3426,7 @@ sub_811DFC0: @ 811DFC0 .align 2, 0 _0811E018: .4byte gUnknown_825E074 _0811E01C: - ldr r2, _0811E03C @ =gUnknown_3005090 + ldr r2, _0811E03C @ =gTasks movs r5, 0xE ldrsh r1, [r3, r5] lsls r0, r1, 2 @@ -3443,7 +3443,7 @@ _0811E036: pop {r0} bx r0 .align 2, 0 -_0811E03C: .4byte gUnknown_3005090 +_0811E03C: .4byte gTasks thumb_func_end sub_811DFC0 thumb_func_start sub_811E040 @@ -3455,7 +3455,7 @@ sub_811E040: @ 811E040 lsrs r2, r0, 24 cmp r2, 0xFF beq _0811E05E - ldr r0, _0811E068 @ =gUnknown_3005090 + ldr r0, _0811E068 @ =gTasks lsls r1, r2, 2 adds r1, r2 lsls r1, 3 @@ -3467,7 +3467,7 @@ _0811E05E: bx r0 .align 2, 0 _0811E064: .4byte sub_811DDA4 -_0811E068: .4byte gUnknown_3005090 +_0811E068: .4byte gTasks thumb_func_end sub_811E040 thumb_func_start sub_811E06C @@ -3658,7 +3658,7 @@ sub_811E194: @ 811E194 adds r0, r4, 0 movs r1, 0x9 bl SetWordTaskArg - ldr r1, _0811E1F0 @ =gUnknown_3005090 + ldr r1, _0811E1F0 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -3677,7 +3677,7 @@ sub_811E194: @ 811E194 b _0811E1F8 .align 2, 0 _0811E1EC: .4byte sub_811D9BC -_0811E1F0: .4byte gUnknown_3005090 +_0811E1F0: .4byte gTasks _0811E1F4: ldr r0, _0811E200 @ =0x0000ffff strh r0, [r1, 0xE] @@ -3864,7 +3864,7 @@ sub_811E348: @ 811E348 adds r0, r4, 0 movs r1, 0x3 bl SetWordTaskArg - ldr r1, _0811E384 @ =gUnknown_3005090 + ldr r1, _0811E384 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -3877,7 +3877,7 @@ sub_811E348: @ 811E348 .align 2, 0 _0811E37C: .4byte sub_811E3B4 _0811E380: .4byte 0x78865321 -_0811E384: .4byte gUnknown_3005090 +_0811E384: .4byte gTasks thumb_func_end sub_811E348 thumb_func_start sub_811E388 @@ -3889,7 +3889,7 @@ sub_811E388: @ 811E388 lsrs r2, r0, 24 cmp r2, 0xFF beq _0811E3A6 - ldr r0, _0811E3B0 @ =gUnknown_3005090 + ldr r0, _0811E3B0 @ =gTasks lsls r1, r2, 2 adds r1, r2 lsls r1, 3 @@ -3901,7 +3901,7 @@ _0811E3A6: bx r0 .align 2, 0 _0811E3AC: .4byte sub_811E3B4 -_0811E3B0: .4byte gUnknown_3005090 +_0811E3B0: .4byte gTasks thumb_func_end sub_811E388 thumb_func_start sub_811E3B4 @@ -3917,7 +3917,7 @@ sub_811E3B4: @ 811E3B4 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _0811E3DC @ =gUnknown_3005098 + ldr r1, _0811E3DC @ =gTasks+0x8 adds r5, r0, r1 movs r1, 0 ldrsh r0, [r5, r1] @@ -3927,7 +3927,7 @@ sub_811E3B4: @ 811E3B4 beq _0811E4CE b _0811E4DC .align 2, 0 -_0811E3DC: .4byte gUnknown_3005098 +_0811E3DC: .4byte gTasks+0x8 _0811E3E0: ldrh r0, [r5, 0x2] movs r3, 0x2 @@ -4099,7 +4099,7 @@ sub_811E520: @ 811E520 asrs r0, 16 cmp r0, 0xFF ble _0811E554 - ldr r2, _0811E550 @ =gUnknown_3005090 + ldr r2, _0811E550 @ =gTasks movs r5, 0x3A ldrsh r1, [r4, r5] lsls r0, r1, 2 @@ -4113,7 +4113,7 @@ sub_811E520: @ 811E520 bl DestroySprite b _0811E582 .align 2, 0 -_0811E550: .4byte gUnknown_3005090 +_0811E550: .4byte gTasks _0811E554: movs r1, 0x36 ldrsh r0, [r4, r1] @@ -4224,7 +4224,7 @@ sub_811E5B8: @ 811E5B8 bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _0811E678 @ =gUnknown_3005090 + ldr r2, _0811E678 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -4260,7 +4260,7 @@ _0811E668: .4byte gUnknown_8459888 _0811E66C: .4byte gUnknown_3002038 _0811E670: .4byte gUnknown_8459868 _0811E674: .4byte sub_811E694 -_0811E678: .4byte gUnknown_3005090 +_0811E678: .4byte gTasks _0811E67C: .4byte 0x0000060c thumb_func_end sub_811E5B8 @@ -4285,7 +4285,7 @@ sub_811E694: @ 811E694 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0811E6B4 @ =gUnknown_3005098 + ldr r1, _0811E6B4 @ =gTasks+0x8 adds r4, r0, r1 movs r0, 0 ldrsh r1, [r4, r0] @@ -4295,7 +4295,7 @@ sub_811E694: @ 811E694 beq _0811E6EE b _0811E708 .align 2, 0 -_0811E6B4: .4byte gUnknown_3005098 +_0811E6B4: .4byte gTasks+0x8 _0811E6B8: ldrh r2, [r4, 0x6] movs r3, 0x6 @@ -4438,7 +4438,7 @@ sub_811E7B4: @ 811E7B4 negs r1, r1 cmp r0, r1 bge _0811E7E8 - ldr r2, _0811E7EC @ =gUnknown_3005090 + ldr r2, _0811E7EC @ =gTasks movs r0, 0x3C ldrsh r1, [r3, r0] lsls r0, r1, 2 @@ -4454,7 +4454,7 @@ _0811E7E8: pop {r0} bx r0 .align 2, 0 -_0811E7EC: .4byte gUnknown_3005090 +_0811E7EC: .4byte gTasks thumb_func_end sub_811E7B4 thumb_func_start sub_811E7F0 diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index a1073d77d..67dea9b9e 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -1387,7 +1387,7 @@ c3_0808C39C: @ 808C39C lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _0808C3C4 @ =gUnknown_3005090 + ldr r1, _0808C3C4 @ =gTasks adds r5, r0, r1 movs r1, 0x8 ldrsh r0, [r5, r1] @@ -1401,7 +1401,7 @@ _0808C3B8: ldr r0, [r0] mov pc, r0 .align 2, 0 -_0808C3C4: .4byte gUnknown_3005090 +_0808C3C4: .4byte gTasks _0808C3C8: .4byte _0808C3CC .align 2, 0 _0808C3CC: @@ -1759,7 +1759,7 @@ sub_808C6A8: @ 808C6A8 bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _0808C6D4 @ =gUnknown_3005090 + ldr r2, _0808C6D4 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -1772,7 +1772,7 @@ sub_808C6A8: @ 808C6A8 bx r0 .align 2, 0 _0808C6D0: .4byte c3_0808C39C -_0808C6D4: .4byte gUnknown_3005090 +_0808C6D4: .4byte gTasks thumb_func_end sub_808C6A8 thumb_func_start mapldr_0808C6D8 @@ -1788,7 +1788,7 @@ mapldr_0808C6D8: @ 808C6D8 bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _0808C724 @ =gUnknown_3005090 + ldr r2, _0808C724 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -1808,7 +1808,7 @@ mapldr_0808C6D8: @ 808C6D8 .align 2, 0 _0808C71C: .4byte gMain _0808C720: .4byte c3_0808C39C -_0808C724: .4byte gUnknown_3005090 +_0808C724: .4byte gTasks _0808C728: .4byte gUnknown_20397A8 thumb_func_end mapldr_0808C6D8 @@ -2921,7 +2921,7 @@ _0808CFF4: .4byte 0x00000b07 thumb_func_start add_to_c3_somehow add_to_c3_somehow: @ 808CFF8 push {r4,lr} - ldr r4, _0808D018 @ =gUnknown_3005090 + ldr r4, _0808D018 @ =gTasks ldr r1, _0808D01C @ =gUnknown_20397B0 ldr r3, [r1] ldrb r2, [r3, 0x4] @@ -2936,7 +2936,7 @@ add_to_c3_somehow: @ 808CFF8 pop {r0} bx r0 .align 2, 0 -_0808D018: .4byte gUnknown_3005090 +_0808D018: .4byte gTasks _0808D01C: .4byte gUnknown_20397B0 thumb_func_end add_to_c3_somehow @@ -11375,7 +11375,7 @@ sub_80913DC: @ 80913DC bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _08091408 @ =gUnknown_3005090 + ldr r2, _08091408 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -11386,7 +11386,7 @@ sub_80913DC: @ 80913DC bx r0 .align 2, 0 _08091404: .4byte sub_8091420 -_08091408: .4byte gUnknown_3005090 +_08091408: .4byte gTasks thumb_func_end sub_80913DC thumb_func_start sub_809140C @@ -11410,7 +11410,7 @@ sub_8091420: @ 8091420 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _08091444 @ =gUnknown_3005090 + ldr r1, _08091444 @ =gTasks adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -11422,7 +11422,7 @@ sub_8091420: @ 8091420 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08091444: .4byte gUnknown_3005090 +_08091444: .4byte gTasks _08091448: .4byte _0809144C .align 2, 0 _0809144C: diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s index 67d402992..ead0c8a01 100644 --- a/asm/pokemon_summary_screen.s +++ b/asm/pokemon_summary_screen.s @@ -747,7 +747,7 @@ _08134AFC: .4byte 0x00003214 _08134B00: .4byte sub_8134BAC _08134B04: .4byte 0x00003270 _08134B08: - ldr r2, _08134B28 @ =gUnknown_3005090 + ldr r2, _08134B28 @ =gTasks ldr r1, _08134B2C @ =0x00003018 adds r0, r3, r1 ldrb r1, [r0] @@ -763,7 +763,7 @@ _08134B08: strb r0, [r1] b _08134B9A .align 2, 0 -_08134B28: .4byte gUnknown_3005090 +_08134B28: .4byte gTasks _08134B2C: .4byte 0x00003018 _08134B30: .4byte sub_8134E84 _08134B34: .4byte 0x00003270 @@ -832,7 +832,7 @@ sub_8134BAC: @ 8134BAC lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r6, _08134BD4 @ =gUnknown_3005098 + ldr r6, _08134BD4 @ =gTasks+0x8 adds r7, r0, r6 movs r1, 0 ldrsh r0, [r7, r1] @@ -846,7 +846,7 @@ _08134BCA: ldr r0, [r0] mov pc, r0 .align 2, 0 -_08134BD4: .4byte gUnknown_3005098 +_08134BD4: .4byte gTasks+0x8 _08134BD8: .4byte _08134BDC .align 2, 0 _08134BDC: @@ -1439,7 +1439,7 @@ _08135114: b _08135180 _08135132: bl sub_8138440 - ldr r3, _08135168 @ =gUnknown_3005090 + ldr r3, _08135168 @ =gTasks ldr r2, [r4] ldr r1, _0813516C @ =0x00003018 adds r0, r2, r1 @@ -1464,7 +1464,7 @@ _08135132: strb r1, [r0] b _0813518E .align 2, 0 -_08135168: .4byte gUnknown_3005090 +_08135168: .4byte gTasks _0813516C: .4byte 0x00003018 _08135170: .4byte sub_8138CD8 _08135174: .4byte 0x00003284 @@ -1742,7 +1742,7 @@ _081353EC: b _0813544C _08135400: bl sub_8138440 - ldr r3, _08135434 @ =gUnknown_3005090 + ldr r3, _08135434 @ =gTasks ldr r2, [r4] ldr r1, _08135438 @ =0x00003018 adds r0, r2, r1 @@ -1767,7 +1767,7 @@ _08135400: strb r1, [r0] b _0813545A .align 2, 0 -_08135434: .4byte gUnknown_3005090 +_08135434: .4byte gTasks _08135438: .4byte 0x00003018 _0813543C: .4byte sub_8134840 _08135440: .4byte 0x00003284 @@ -9046,7 +9046,7 @@ _08138FDC: .4byte gUnknown_203B16E _08138FE0: .4byte 0x00003224 _08138FE4: .4byte 0x00003214 _08138FE8: - ldr r2, _08139004 @ =gUnknown_3005090 + ldr r2, _08139004 @ =gTasks ldr r6, _08139008 @ =0x00003018 adds r0, r6 ldrb r1, [r0] @@ -9060,7 +9060,7 @@ _08138FE8: strb r0, [r3] b _08139094 .align 2, 0 -_08139004: .4byte gUnknown_3005090 +_08139004: .4byte gTasks _08139008: .4byte 0x00003018 _0813900C: .4byte sub_81351A0 _08139010: diff --git a/asm/quest_log.s b/asm/quest_log.s index 7526b69bd..9b7c29ccc 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -2252,7 +2252,7 @@ _081119F2: bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _08111A28 @ =gUnknown_3005090 + ldr r2, _08111A28 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -2268,7 +2268,7 @@ _081119F2: .align 2, 0 _08111A20: .4byte gUnknown_3005E88 _08111A24: .4byte sub_8111A34 -_08111A28: .4byte gUnknown_3005090 +_08111A28: .4byte gTasks _08111A2C: movs r0, 0 _08111A2E: @@ -2286,7 +2286,7 @@ sub_8111A34: @ 8111A34 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _08111A54 @ =gUnknown_3005098 + ldr r1, _08111A54 @ =gTasks+0x8 adds r4, r0, r1 movs r0, 0x2 ldrsh r1, [r4, r0] @@ -2296,7 +2296,7 @@ sub_8111A34: @ 8111A34 beq _08111A90 b _08111AC0 .align 2, 0 -_08111A54: .4byte gUnknown_3005098 +_08111A54: .4byte gTasks+0x8 _08111A58: ldrh r0, [r4] adds r0, 0x1 @@ -2999,7 +2999,7 @@ sub_8111F8C: @ 8111F8C lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _08111FC4 @ =gUnknown_3005090 + ldr r0, _08111FC4 @ =gTasks adds r4, r1, r0 bl ScriptContext2_IsEnabled lsls r0, 24 @@ -3017,7 +3017,7 @@ _08111FBC: pop {r0} bx r0 .align 2, 0 -_08111FC4: .4byte gUnknown_3005090 +_08111FC4: .4byte gTasks _08111FC8: .4byte sub_8111FCC thumb_func_end sub_8111F8C @@ -3029,7 +3029,7 @@ sub_8111FCC: @ 8111FCC lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _08112024 @ =gUnknown_3005090 + ldr r0, _08112024 @ =gTasks adds r5, r1, r0 ldr r0, _08112028 @ =gUnknown_2037AB8 ldrb r1, [r0, 0x7] @@ -3065,7 +3065,7 @@ _0811201E: pop {r0} bx r0 .align 2, 0 -_08112024: .4byte gUnknown_3005090 +_08112024: .4byte gTasks _08112028: .4byte gUnknown_2037AB8 _0811202C: .4byte gUnknown_203AE94 _08112030: .4byte gStringVar1 @@ -3083,7 +3083,7 @@ sub_8112044: @ 8112044 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0811208C @ =gUnknown_3005090 + ldr r0, _0811208C @ =gTasks adds r4, r1, r0 ldr r0, _08112090 @ =gMain ldrh r1, [r0, 0x2E] @@ -3113,7 +3113,7 @@ _08112076: strb r1, [r0] b _081120A4 .align 2, 0 -_0811208C: .4byte gUnknown_3005090 +_0811208C: .4byte gTasks _08112090: .4byte gMain _08112094: .4byte gUnknown_203AE94 _08112098: .4byte sub_81120AC @@ -3136,7 +3136,7 @@ sub_81120AC: @ 81120AC lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _081120D0 @ =gUnknown_3005098 + ldr r1, _081120D0 @ =gTasks+0x8 adds r6, r0, r1 movs r0, 0 ldrsh r1, [r6, r0] @@ -3148,7 +3148,7 @@ sub_81120AC: @ 81120AC beq _081120DA b _08112164 .align 2, 0 -_081120D0: .4byte gUnknown_3005098 +_081120D0: .4byte gTasks+0x8 _081120D4: cmp r1, 0x2 beq _0811214C @@ -3277,7 +3277,7 @@ sub_81121D8: @ 81121D8 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0811227C @ =gUnknown_3005098 + ldr r0, _0811227C @ =gTasks+0x8 adds r7, r1, r0 ldrh r1, [r7, 0x2] movs r2, 0x2 @@ -3347,7 +3347,7 @@ sub_81121D8: @ 81121D8 movs r0, 0 b _08112292 .align 2, 0 -_0811227C: .4byte gUnknown_3005098 +_0811227C: .4byte gTasks+0x8 _08112280: .4byte gUnknown_20371FA _08112284: .4byte gUnknown_20375FA _08112288: .4byte gUnknown_203ADFE diff --git a/asm/quest_log_8150454.s b/asm/quest_log_8150454.s index 85e29c548..1fe631d20 100644 --- a/asm/quest_log_8150454.s +++ b/asm/quest_log_8150454.s @@ -153,7 +153,7 @@ _08150558: bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _08150590 @ =gUnknown_3005090 + ldr r2, _08150590 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -166,7 +166,7 @@ _08150580: .4byte gUnknown_2036E38 _08150584: .4byte gSprites _08150588: .4byte gUnknown_3005E88 _0815058C: .4byte sub_81505C4 -_08150590: .4byte gUnknown_3005090 +_08150590: .4byte gTasks _08150594: movs r0, 0x4 bl sub_805C808 @@ -213,7 +213,7 @@ sub_81505C4: @ 81505C4 lsls r0, 2 ldr r1, _08150614 @ =gSprites adds r7, r0, r1 - ldr r1, _08150618 @ =gUnknown_3005090 + ldr r1, _08150618 @ =gTasks mov r2, r8 lsls r0, r2, 2 add r0, r8 @@ -232,7 +232,7 @@ sub_81505C4: @ 81505C4 _0815060C: .4byte gUnknown_2037078 _08150610: .4byte gUnknown_2036E38 _08150614: .4byte gSprites -_08150618: .4byte gUnknown_3005090 +_08150618: .4byte gTasks _0815061C: cmp r6, 0x2 beq _0815067C diff --git a/asm/region_map.s b/asm/region_map.s index 83b897991..aa684531d 100644 --- a/asm/region_map.s +++ b/asm/region_map.s @@ -1187,7 +1187,7 @@ _080C07F4: .4byte 0x000047b8 sub_80C07F8: @ 80C07F8 lsls r0, 24 lsrs r0, 24 - ldr r2, _080C0814 @ =gUnknown_3005090 + ldr r2, _080C0814 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -1200,7 +1200,7 @@ sub_80C07F8: @ 80C07F8 str r0, [r1] bx lr .align 2, 0 -_080C0814: .4byte gUnknown_3005090 +_080C0814: .4byte gTasks _080C0818: .4byte gUnknown_20399D4 _080C081C: .4byte 0x000047b8 thumb_func_end sub_80C07F8 @@ -2123,7 +2123,7 @@ _080C0F64: bl sub_80C4AAC ldr r0, _080C0FD4 @ =gUnknown_8418EB0 bl sub_80C4E74 - ldr r1, _080C0FD8 @ =gUnknown_3005090 + ldr r1, _080C0FD8 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -2143,7 +2143,7 @@ _080C0FC8: .4byte 0x00001cca _080C0FCC: .4byte 0x00001cd0 _080C0FD0: .4byte 0x00001ccb _080C0FD4: .4byte gUnknown_8418EB0 -_080C0FD8: .4byte gUnknown_3005090 +_080C0FD8: .4byte gTasks _080C0FDC: .4byte sub_80C1098 thumb_func_end sub_80C0E70 @@ -2467,7 +2467,7 @@ sub_80C1280: @ 80C1280 push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080C12D4 @ =gUnknown_3005090 + ldr r2, _080C12D4 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -2500,7 +2500,7 @@ _080C12CC: pop {r0} bx r0 .align 2, 0 -_080C12D4: .4byte gUnknown_3005090 +_080C12D4: .4byte gTasks _080C12D8: .4byte gUnknown_20399D8 _080C12DC: .4byte 0x00001cd0 _080C12E0: .4byte gUnknown_8418EB5 @@ -3370,7 +3370,7 @@ _080C199E: bl sub_80C4AAC bl sub_80C4BE4 bl sub_80C0CA0 - ldr r1, _080C19F4 @ =gUnknown_3005090 + ldr r1, _080C19F4 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -3386,7 +3386,7 @@ _080C19E4: .4byte 0x00003e28 _080C19E8: .4byte 0x00003d48 _080C19EC: .4byte 0x00003d4a _080C19F0: .4byte 0x00003e14 -_080C19F4: .4byte gUnknown_3005090 +_080C19F4: .4byte gTasks _080C19F8: .4byte sub_80C1A94 thumb_func_end sub_80C195C @@ -3574,7 +3574,7 @@ _080C1B74: bne _080C1BD0 b _080C1BC2 _080C1B84: - ldr r0, _080C1B94 @ =gUnknown_3005090 + ldr r0, _080C1B94 @ =gTasks lsls r1, r2, 2 adds r1, r2 lsls r1, 3 @@ -3583,7 +3583,7 @@ _080C1B84: str r0, [r1] b _080C1BD0 .align 2, 0 -_080C1B94: .4byte gUnknown_3005090 +_080C1B94: .4byte gTasks _080C1B98: .4byte sub_80C1BE0 _080C1B9C: movs r0, 0x1 @@ -3864,7 +3864,7 @@ _080C1DE4: .4byte gUnknown_20399DC _080C1DE8: .4byte 0x00003d48 _080C1DEC: .4byte 0x00003d49 _080C1DF0: - ldr r0, _080C1E0C @ =gUnknown_3005090 + ldr r0, _080C1E0C @ =gTasks lsls r1, r2, 2 adds r1, r2 lsls r1, 3 @@ -3879,7 +3879,7 @@ _080C1DFE: pop {r0} bx r0 .align 2, 0 -_080C1E0C: .4byte gUnknown_3005090 +_080C1E0C: .4byte gTasks _080C1E10: .4byte sub_80C1A94 thumb_func_end sub_80C1BE0 @@ -3888,7 +3888,7 @@ sub_80C1E14: @ 80C1E14 push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080C1E68 @ =gUnknown_3005090 + ldr r2, _080C1E68 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -3920,7 +3920,7 @@ _080C1E60: pop {r0} bx r0 .align 2, 0 -_080C1E68: .4byte gUnknown_3005090 +_080C1E68: .4byte gTasks _080C1E6C: .4byte gUnknown_20399DC _080C1E70: .4byte 0x00003d44 _080C1E74: .4byte gUnknown_8418E8D @@ -4420,7 +4420,7 @@ _080C2224: adds r0, r1 mov r2, r9 str r2, [r0] - ldr r1, _080C22BC @ =gUnknown_3005090 + ldr r1, _080C22BC @ =gTasks mov r2, r8 lsls r0, r2, 2 add r0, r8 @@ -4441,7 +4441,7 @@ _080C22AC: .4byte 0x0000040c _080C22B0: .4byte 0x00000404 _080C22B4: .4byte 0x00000406 _080C22B8: .4byte 0x00000cc8 -_080C22BC: .4byte gUnknown_3005090 +_080C22BC: .4byte gTasks _080C22C0: .4byte sub_80C267C thumb_func_end sub_80C2208 @@ -4787,7 +4787,7 @@ _080C2590: .4byte gUnknown_20399E0 sub_80C2594: @ 80C2594 lsls r0, 24 lsrs r0, 24 - ldr r2, _080C25B0 @ =gUnknown_3005090 + ldr r2, _080C25B0 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -4800,7 +4800,7 @@ sub_80C2594: @ 80C2594 str r0, [r1] bx lr .align 2, 0 -_080C25B0: .4byte gUnknown_3005090 +_080C25B0: .4byte gTasks _080C25B4: .4byte gUnknown_20399E0 _080C25B8: .4byte 0x00000cc8 thumb_func_end sub_80C2594 @@ -5582,7 +5582,7 @@ _080C2C18: .4byte 0x0000ffff sub_80C2C1C: @ 80C2C1C lsls r0, 24 lsrs r0, 24 - ldr r2, _080C2C30 @ =gUnknown_3005090 + ldr r2, _080C2C30 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -5591,7 +5591,7 @@ sub_80C2C1C: @ 80C2C1C str r0, [r1] bx lr .align 2, 0 -_080C2C30: .4byte gUnknown_3005090 +_080C2C30: .4byte gTasks _080C2C34: .4byte sub_80C2C7C thumb_func_end sub_80C2C1C @@ -5797,7 +5797,7 @@ _080C2DEC: _080C2DF4: .4byte gUnknown_20399E0 _080C2DF8: .4byte 0x00000ccf _080C2DFC: - ldr r1, _080C2E14 @ =gUnknown_3005090 + ldr r1, _080C2E14 @ =gTasks lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -5811,7 +5811,7 @@ _080C2E0E: pop {r0} bx r0 .align 2, 0 -_080C2E14: .4byte gUnknown_3005090 +_080C2E14: .4byte gTasks _080C2E18: .4byte 0x00000cc8 thumb_func_end sub_80C2C7C @@ -8443,7 +8443,7 @@ sub_80C4398: @ 80C4398 ldr r1, [r5] adds r1, 0x40 bl LZ77UnCompWram - ldr r1, _080C4404 @ =gUnknown_3005090 + ldr r1, _080C4404 @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -8460,7 +8460,7 @@ _080C43F4: .4byte gUnknown_20399EC _080C43F8: .4byte 0x0000046c _080C43FC: .4byte gUnknown_83F18D8 _080C4400: .4byte gUnknown_83F1908 -_080C4404: .4byte gUnknown_3005090 +_080C4404: .4byte gTasks _080C4408: .4byte sub_80C440C thumb_func_end sub_80C4398 @@ -8571,7 +8571,7 @@ _080C44DC: sub_80C44E4: @ 80C44E4 lsls r0, 24 lsrs r0, 24 - ldr r2, _080C4504 @ =gUnknown_3005090 + ldr r2, _080C4504 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -8585,7 +8585,7 @@ sub_80C44E4: @ 80C44E4 str r0, [r1] bx lr .align 2, 0 -_080C4504: .4byte gUnknown_3005090 +_080C4504: .4byte gTasks _080C4508: .4byte gUnknown_20399EC thumb_func_end sub_80C44E4 diff --git a/asm/rom6.s b/asm/rom6.s index f15c1f1d1..a438b9276 100644 --- a/asm/rom6.s +++ b/asm/rom6.s @@ -99,7 +99,7 @@ _080C9856: bne _080C9888 movs r0, 0x3B bl FieldEffectStart - ldr r0, _080C9880 @ =gUnknown_3005090 + ldr r0, _080C9880 @ =gTasks lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -110,14 +110,14 @@ _080C9856: _080C9874: .4byte gUnknown_2037078 _080C9878: .4byte gUnknown_2036E38 _080C987C: .4byte gMapHeader -_080C9880: .4byte gUnknown_3005090 +_080C9880: .4byte gTasks _080C9884: .4byte sub_80C98FC _080C9888: bl sub_805CB70 adds r0, r4, 0 movs r1, 0x45 bl sub_8063CA4 - ldr r0, _080C98A8 @ =gUnknown_3005090 + ldr r0, _080C98A8 @ =gTasks lsls r1, r6, 2 adds r1, r6 lsls r1, 3 @@ -130,7 +130,7 @@ _080C98A2: pop {r0} bx r0 .align 2, 0 -_080C98A8: .4byte gUnknown_3005090 +_080C98A8: .4byte gTasks _080C98AC: .4byte sub_80C98B0 thumb_func_end task08_080C9820 @@ -153,7 +153,7 @@ sub_80C98B0: @ 80C98B0 bne _080C98E4 movs r0, 0x3B bl FieldEffectStart - ldr r0, _080C98F4 @ =gUnknown_3005090 + ldr r0, _080C98F4 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -167,7 +167,7 @@ _080C98E4: .align 2, 0 _080C98EC: .4byte gUnknown_2037078 _080C98F0: .4byte gUnknown_2036E38 -_080C98F4: .4byte gUnknown_3005090 +_080C98F4: .4byte gTasks _080C98F8: .4byte sub_80C98FC thumb_func_end sub_80C98B0 @@ -230,7 +230,7 @@ _080C993C: bl StartSpriteAnim movs r0, 0x6 bl FieldEffectActiveListRemove - ldr r1, _080C9998 @ =gUnknown_3005090 + ldr r1, _080C9998 @ =gTasks lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -246,7 +246,7 @@ _080C9988: .4byte gUnknown_20386E0 _080C998C: .4byte gUnknown_2037078 _080C9990: .4byte gUnknown_2036E38 _080C9994: .4byte gSprites -_080C9998: .4byte gUnknown_3005090 +_080C9998: .4byte gTasks _080C999C: .4byte sub_80C99A0 thumb_func_end sub_80C98FC @@ -256,7 +256,7 @@ sub_80C99A0: @ 80C99A0 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r1, _080C99D0 @ =gUnknown_3005090 + ldr r1, _080C99D0 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -275,7 +275,7 @@ sub_80C99A0: @ 80C99A0 pop {r0} bx r0 .align 2, 0 -_080C99D0: .4byte gUnknown_3005090 +_080C99D0: .4byte gTasks _080C99D4: .4byte gUnknown_2037078 thumb_func_end sub_80C99A0 @@ -331,7 +331,7 @@ oei_rocksmash: @ 80C9A30 bl oei_task_add lsls r0, 24 lsrs r0, 24 - ldr r2, _080C9A58 @ =gUnknown_3005090 + ldr r2, _080C9A58 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -346,7 +346,7 @@ oei_rocksmash: @ 80C9A30 pop {r1} bx r1 .align 2, 0 -_080C9A58: .4byte gUnknown_3005090 +_080C9A58: .4byte gTasks _080C9A5C: .4byte sub_80C9A60 thumb_func_end oei_rocksmash @@ -413,7 +413,7 @@ sub_80C9ACC: @ 80C9ACC bl oei_task_add lsls r0, 24 lsrs r0, 24 - ldr r2, _080C9AF4 @ =gUnknown_3005090 + ldr r2, _080C9AF4 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -428,7 +428,7 @@ sub_80C9ACC: @ 80C9ACC pop {r1} bx r1 .align 2, 0 -_080C9AF4: .4byte gUnknown_3005090 +_080C9AF4: .4byte gTasks _080C9AF8: .4byte sub_80C9AFC thumb_func_end sub_80C9ACC @@ -442,7 +442,7 @@ sub_80C9AFC: @ 80C9AFC bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080C9B28 @ =gUnknown_3005090 + ldr r2, _080C9B28 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -453,7 +453,7 @@ sub_80C9AFC: @ 80C9AFC bx r0 .align 2, 0 _080C9B24: .4byte sub_80A1C44 -_080C9B28: .4byte gUnknown_3005090 +_080C9B28: .4byte gTasks thumb_func_end sub_80C9AFC .align 2, 0 @ Don't pad with nop. diff --git a/asm/save.s b/asm/save.s index 2d870bb99..1d8d61769 100644 --- a/asm/save.s +++ b/asm/save.s @@ -1934,7 +1934,7 @@ sub_80DA634: @ 80DA634 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _080DA65C @ =gUnknown_3005090 + ldr r1, _080DA65C @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -1952,7 +1952,7 @@ _080DA650: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080DA65C: .4byte gUnknown_3005090 +_080DA65C: .4byte gTasks _080DA660: .4byte _080DA664 .align 2, 0 _080DA664: @@ -1983,7 +1983,7 @@ _080DA694: _080DA6A8: .4byte gSoftResetDisabled _080DA6AC: bl sub_800AB9C - ldr r0, _080DA6C0 @ =gUnknown_3005090 + ldr r0, _080DA6C0 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -1992,7 +1992,7 @@ _080DA6AC: strh r0, [r1, 0x8] b _080DA7F6 .align 2, 0 -_080DA6C0: .4byte gUnknown_3005090 +_080DA6C0: .4byte gTasks _080DA6C4: bl sub_800A4BC lsls r0, 24 @@ -2001,7 +2001,7 @@ _080DA6C4: b _080DA7F6 _080DA6D0: bl sub_80590D8 - ldr r0, _080DA6E4 @ =gUnknown_3005090 + ldr r0, _080DA6E4 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -2010,7 +2010,7 @@ _080DA6D0: strh r0, [r1, 0x8] b _080DA7F6 .align 2, 0 -_080DA6E4: .4byte gUnknown_3005090 +_080DA6E4: .4byte gTasks _080DA6E8: bl sub_804C1C0 bl sub_80DA3AC @@ -2038,7 +2038,7 @@ _080DA712: lsls r0, 24 cmp r0, 0 beq _080DA730 - ldr r0, _080DA72C @ =gUnknown_3005090 + ldr r0, _080DA72C @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -2047,9 +2047,9 @@ _080DA712: strh r0, [r1, 0x8] b _080DA7F6 .align 2, 0 -_080DA72C: .4byte gUnknown_3005090 +_080DA72C: .4byte gTasks _080DA730: - ldr r0, _080DA740 @ =gUnknown_3005090 + ldr r0, _080DA740 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -2058,10 +2058,10 @@ _080DA730: strh r0, [r1, 0x8] b _080DA7F6 .align 2, 0 -_080DA740: .4byte gUnknown_3005090 +_080DA740: .4byte gTasks _080DA744: bl sub_80DA40C - ldr r0, _080DA758 @ =gUnknown_3005090 + ldr r0, _080DA758 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -2070,11 +2070,11 @@ _080DA744: strh r0, [r1, 0x8] b _080DA7F6 .align 2, 0 -_080DA758: .4byte gUnknown_3005090 +_080DA758: .4byte gTasks _080DA75C: bl sav2_gender2_inplace_and_xFE bl sub_800AB9C - ldr r0, _080DA774 @ =gUnknown_3005090 + ldr r0, _080DA774 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -2083,14 +2083,14 @@ _080DA75C: strh r0, [r1, 0x8] b _080DA7F6 .align 2, 0 -_080DA774: .4byte gUnknown_3005090 +_080DA774: .4byte gTasks _080DA778: bl sub_800A4BC lsls r0, 24 cmp r0, 0 beq _080DA7F6 bl sub_80DA434 - ldr r0, _080DA798 @ =gUnknown_3005090 + ldr r0, _080DA798 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -2099,10 +2099,10 @@ _080DA778: strh r0, [r1, 0x8] b _080DA7F6 .align 2, 0 -_080DA798: .4byte gUnknown_3005090 +_080DA798: .4byte gTasks _080DA79C: bl sub_800AB9C - ldr r0, _080DA7B0 @ =gUnknown_3005090 + ldr r0, _080DA7B0 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -2111,13 +2111,13 @@ _080DA79C: strh r0, [r1, 0x8] b _080DA7F6 .align 2, 0 -_080DA7B0: .4byte gUnknown_3005090 +_080DA7B0: .4byte gTasks _080DA7B4: bl sub_800A4BC lsls r0, 24 cmp r0, 0 beq _080DA7F6 - ldr r0, _080DA7D0 @ =gUnknown_3005090 + ldr r0, _080DA7D0 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -2127,7 +2127,7 @@ _080DA7B4: strh r0, [r1, 0x8] b _080DA7F6 .align 2, 0 -_080DA7D0: .4byte gUnknown_3005090 +_080DA7D0: .4byte gTasks _080DA7D4: lsls r1, r4, 2 adds r1, r4 diff --git a/asm/script_menu.s b/asm/script_menu.s index f0396389b..08f1c32b4 100644 --- a/asm/script_menu.s +++ b/asm/script_menu.s @@ -409,7 +409,7 @@ _0809CC44: bl CreateTask lsls r0, 24 lsrs r2, r0, 24 - ldr r1, _0809CC70 @ =gUnknown_3005090 + ldr r1, _0809CC70 @ =gTasks lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -422,12 +422,12 @@ _0809CC44: .align 2, 0 _0809CC68: .4byte gUnknown_2039988 _0809CC6C: .4byte sub_809CC98 -_0809CC70: .4byte gUnknown_3005090 +_0809CC70: .4byte gTasks _0809CC74: movs r0, 0 _0809CC76: strh r0, [r1, 0x12] - ldr r1, _0809CC94 @ =gUnknown_3005090 + ldr r1, _0809CC94 @ =gTasks lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -440,7 +440,7 @@ _0809CC76: pop {r0} bx r0 .align 2, 0 -_0809CC94: .4byte gUnknown_3005090 +_0809CC94: .4byte gTasks thumb_func_end sub_809CC18 thumb_func_start sub_809CC98 @@ -451,7 +451,7 @@ sub_809CC98: @ 809CC98 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _0809CCC4 @ =gUnknown_3005098 + ldr r1, _0809CCC4 @ =gTasks+0x8 adds r5, r0, r1 ldr r0, _0809CCC8 @ =gUnknown_2037AB8 ldrb r1, [r0, 0x7] @@ -467,7 +467,7 @@ sub_809CC98: @ 809CC98 strb r0, [r1] b _0809CD3C .align 2, 0 -_0809CCC4: .4byte gUnknown_3005098 +_0809CCC4: .4byte gTasks+0x8 _0809CCC8: .4byte gUnknown_2037AB8 _0809CCCC: .4byte gUnknown_2039988 _0809CCD0: @@ -674,7 +674,7 @@ task_yes_no_maybe: @ 809CE54 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _0809CE74 @ =gUnknown_3005090 + ldr r1, _0809CE74 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -688,7 +688,7 @@ task_yes_no_maybe: @ 809CE54 strh r0, [r1, 0xC] b _0809CEBC .align 2, 0 -_0809CE74: .4byte gUnknown_3005090 +_0809CE74: .4byte gTasks _0809CE78: bl ProcessMenuInputNoWrap_ lsls r0, 24 @@ -800,7 +800,7 @@ _0809CF08: bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r1, _0809CFD8 @ =gUnknown_3005090 + ldr r1, _0809CFD8 @ =gTasks lsls r4, r0, 2 adds r4, r0 lsls r4, 3 @@ -861,7 +861,7 @@ _0809CFBA: _0809CFCC: .4byte gUnknown_20370D0 _0809CFD0: .4byte sub_809D6D4 _0809CFD4: .4byte gUnknown_83E04B0 -_0809CFD8: .4byte gUnknown_3005090 +_0809CFD8: .4byte gTasks thumb_func_end sub_809CEC8 thumb_func_start sub_809CFDC @@ -872,7 +872,7 @@ sub_809CFDC: @ 809CFDC lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _0809D018 @ =gUnknown_3005098 + ldr r1, _0809D018 @ =gTasks+0x8 adds r5, r0, r1 bl sub_8110650 lsls r0, 24 @@ -895,7 +895,7 @@ sub_809CFDC: @ 809CFDC strh r0, [r1] b _0809D024 .align 2, 0 -_0809D018: .4byte gUnknown_3005098 +_0809D018: .4byte gTasks+0x8 _0809D01C: .4byte gUnknown_20370D0 _0809D020: ldr r0, _0809D03C @ =gUnknown_20370D0 @@ -1194,7 +1194,7 @@ sub_809D288: @ 809D288 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0809D2AC @ =gUnknown_3005090 + ldr r1, _0809D2AC @ =gTasks adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -1206,7 +1206,7 @@ sub_809D288: @ 809D288 beq _0809D2CE b _0809D2E8 .align 2, 0 -_0809D2AC: .4byte gUnknown_3005090 +_0809D2AC: .4byte gTasks _0809D2B0: cmp r0, 0x2 beq _0809D2BA @@ -1296,7 +1296,7 @@ _0809D31C: movs r2, 0x8 movs r3, 0x8 bl CreateWindowFromRect - ldr r1, _0809D3B4 @ =gUnknown_3005090 + ldr r1, _0809D3B4 @ =gTasks lsls r3, r4, 2 adds r3, r4 lsls r3, 3 @@ -1333,7 +1333,7 @@ _0809D31C: b _0809D3C2 .align 2, 0 _0809D3B0: .4byte sub_809D288 -_0809D3B4: .4byte gUnknown_3005090 +_0809D3B4: .4byte gTasks _0809D3B8: .4byte gSprites _0809D3BC: .4byte SpriteCallbackDummy _0809D3C0: @@ -1355,7 +1355,7 @@ sub_809D3CC: @ 809D3CC lsrs r2, r0, 24 cmp r2, 0xFF beq _0809D3FC - ldr r0, _0809D3F4 @ =gUnknown_3005090 + ldr r0, _0809D3F4 @ =gTasks lsls r1, r2, 2 adds r1, r2 lsls r1, 3 @@ -1367,7 +1367,7 @@ sub_809D3CC: @ 809D3CC b _0809D3FE .align 2, 0 _0809D3F0: .4byte sub_809D288 -_0809D3F4: .4byte gUnknown_3005090 +_0809D3F4: .4byte gTasks _0809D3F8: .4byte sub_809D404 _0809D3FC: movs r0, 0 @@ -1408,7 +1408,7 @@ sub_809D424: @ 809D424 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0809D454 @ =gUnknown_3005090 + ldr r1, _0809D454 @ =gTasks adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -1421,7 +1421,7 @@ sub_809D424: @ 809D424 b _0809D48C .align 2, 0 _0809D450: .4byte sub_809D288 -_0809D454: .4byte gUnknown_3005090 +_0809D454: .4byte gTasks _0809D458: movs r0, 0xC ldrsh r1, [r4, r0] @@ -1458,7 +1458,7 @@ sub_809D494: @ 809D494 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0809D4B8 @ =gUnknown_3005090 + ldr r1, _0809D4B8 @ =gTasks adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -1470,7 +1470,7 @@ sub_809D494: @ 809D494 beq _0809D4DE b _0809D4FC .align 2, 0 -_0809D4B8: .4byte gUnknown_3005090 +_0809D4B8: .4byte gTasks _0809D4BC: cmp r0, 0x2 beq _0809D4C6 @@ -1601,7 +1601,7 @@ _0809D572: movs r2, 0x8 movs r3, 0x8 bl CreateWindowFromRect - ldr r2, _0809D61C @ =gUnknown_3005090 + ldr r2, _0809D61C @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -1632,7 +1632,7 @@ _0809D60C: .4byte gUnknown_20370C2 _0809D610: .4byte gUnknown_20370C4 _0809D614: .4byte gSprites _0809D618: .4byte sub_809D494 -_0809D61C: .4byte gUnknown_3005090 +_0809D61C: .4byte gTasks thumb_func_end sub_809D504 thumb_func_start sub_809D620 @@ -1644,7 +1644,7 @@ sub_809D620: @ 809D620 lsrs r2, r0, 24 cmp r2, 0xFF beq _0809D64C - ldr r0, _0809D648 @ =gUnknown_3005090 + ldr r0, _0809D648 @ =gTasks lsls r1, r2, 2 adds r1, r2 lsls r1, 3 @@ -1656,7 +1656,7 @@ sub_809D620: @ 809D620 b _0809D64E .align 2, 0 _0809D644: .4byte sub_809D494 -_0809D648: .4byte gUnknown_3005090 +_0809D648: .4byte gTasks _0809D64C: movs r0, 0 _0809D64E: @@ -1743,7 +1743,7 @@ sub_809D6D4: @ 809D6D4 lsls r0, r1, 2 adds r0, r1 lsls r0, 3 - ldr r1, _0809D754 @ =gUnknown_3005098 + ldr r1, _0809D754 @ =gTasks+0x8 adds r2, r0, r1 movs r1, 0 ldrsh r0, [r2, r1] @@ -1768,7 +1768,7 @@ _0809D710: lsls r0, r1, 2 adds r0, r1 lsls r0, 3 - ldr r1, _0809D754 @ =gUnknown_3005098 + ldr r1, _0809D754 @ =gTasks+0x8 adds r2, r0, r1 movs r1, 0 ldrsh r0, [r2, r1] @@ -1790,7 +1790,7 @@ _0809D748: .align 2, 0 _0809D74C: .4byte gUnknown_81A7AE0 _0809D750: .4byte sub_809D288 -_0809D754: .4byte gUnknown_3005098 +_0809D754: .4byte gTasks+0x8 _0809D758: .4byte gSprites _0809D75C: .4byte sub_809D494 _0809D760: .4byte 0x00001b58 diff --git a/asm/script_movement.s b/asm/script_movement.s index 1554055b4..58becc75a 100644 --- a/asm/script_movement.s +++ b/asm/script_movement.s @@ -122,7 +122,7 @@ sub_80974F8: @ 80974F8 lsls r1, r0, 2 adds r1, r0 lsls r3, r1, 3 - ldr r5, _08097538 @ =gUnknown_3005098 + ldr r5, _08097538 @ =gTasks+0x8 ldr r0, _0809753C @ =0x0000ffff adds r4, r0, 0 _08097518: @@ -142,7 +142,7 @@ _08097518: bx r0 .align 2, 0 _08097534: .4byte Task_80A244C -_08097538: .4byte gUnknown_3005098 +_08097538: .4byte gTasks+0x8 _0809753C: .4byte 0x0000ffff thumb_func_end sub_80974F8 @@ -226,7 +226,7 @@ sub_80975C0: @ 80975C0 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080975E4 @ =gUnknown_3005098 + ldr r0, _080975E4 @ =gTasks+0x8 adds r1, r0 adds r1, 0x2 movs r2, 0 @@ -237,7 +237,7 @@ _080975D8: adds r0, r2, 0 b _080975F6 .align 2, 0 -_080975E4: .4byte gUnknown_3005098 +_080975E4: .4byte gTasks+0x8 _080975E8: adds r0, r2, 0x1 lsls r0, 24 @@ -261,7 +261,7 @@ sub_80975FC: @ 80975FC lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0809762C @ =gUnknown_3005098 + ldr r0, _0809762C @ =gTasks+0x8 adds r1, r0 adds r1, 0x2 str r1, [r2] @@ -280,7 +280,7 @@ _08097628: pop {r0} bx r0 .align 2, 0 -_0809762C: .4byte gUnknown_3005098 +_0809762C: .4byte gTasks+0x8 thumb_func_end sub_80975FC thumb_func_start sub_8097630 @@ -336,7 +336,7 @@ sub_8097678: @ 8097678 mvns r2, r2 lsls r2, 16 lsrs r2, 16 - ldr r3, _080976A4 @ =gUnknown_3005090 + ldr r3, _080976A4 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -347,7 +347,7 @@ sub_8097678: @ 8097678 bx lr .align 2, 0 _080976A0: .4byte gBitTable -_080976A4: .4byte gUnknown_3005090 +_080976A4: .4byte gTasks thumb_func_end sub_8097678 thumb_func_start sub_80976A8 @@ -355,7 +355,7 @@ sub_80976A8: @ 80976A8 lsls r0, 24 lsrs r0, 24 lsls r1, 24 - ldr r3, _080976C8 @ =gUnknown_3005090 + ldr r3, _080976C8 @ =gTasks lsls r2, r0, 2 adds r2, r0 lsls r2, 3 @@ -369,7 +369,7 @@ sub_80976A8: @ 80976A8 strh r0, [r2, 0x8] bx lr .align 2, 0 -_080976C8: .4byte gUnknown_3005090 +_080976C8: .4byte gTasks _080976CC: .4byte gBitTable thumb_func_end sub_80976A8 @@ -379,7 +379,7 @@ sub_80976D0: @ 80976D0 lsls r0, 24 lsrs r0, 24 lsls r1, 24 - ldr r3, _080976F8 @ =gUnknown_3005090 + ldr r3, _080976F8 @ =gTasks lsls r2, r0, 2 adds r2, r0 lsls r2, 3 @@ -395,7 +395,7 @@ sub_80976D0: @ 80976D0 movs r0, 0 b _08097702 .align 2, 0 -_080976F8: .4byte gUnknown_3005090 +_080976F8: .4byte gTasks _080976FC: .4byte gBitTable _08097700: movs r0, 0x1 @@ -468,7 +468,7 @@ UnfreezeObjects: @ 8097768 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080977A4 @ =gUnknown_3005098 + ldr r0, _080977A4 @ =gTasks+0x8 adds r1, r0 adds r4, r1, 0x2 movs r5, 0 @@ -494,7 +494,7 @@ _08097792: pop {r0} bx r0 .align 2, 0 -_080977A4: .4byte gUnknown_3005098 +_080977A4: .4byte gTasks+0x8 _080977A8: .4byte gUnknown_2036E38 thumb_func_end UnfreezeObjects diff --git a/asm/script_pokemon_util_80BF8FC.s b/asm/script_pokemon_util_80BF8FC.s index 3b4fac8d2..81b861413 100644 --- a/asm/script_pokemon_util_80BF8FC.s +++ b/asm/script_pokemon_util_80BF8FC.s @@ -15,7 +15,7 @@ sub_80BF8FC: @ 80BF8FC bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080BF938 @ =gUnknown_3005090 + ldr r2, _080BF938 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -33,7 +33,7 @@ sub_80BF8FC: @ 80BF8FC bx r0 .align 2, 0 _080BF934: .4byte sub_80BF97C -_080BF938: .4byte gUnknown_3005090 +_080BF938: .4byte gTasks thumb_func_end sub_80BF8FC thumb_func_start sub_80BF93C @@ -46,7 +46,7 @@ sub_80BF93C: @ 80BF93C bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080BF978 @ =gUnknown_3005090 + ldr r2, _080BF978 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -64,7 +64,7 @@ sub_80BF93C: @ 80BF93C bx r0 .align 2, 0 _080BF974: .4byte sub_80BF97C -_080BF978: .4byte gUnknown_3005090 +_080BF978: .4byte gTasks thumb_func_end sub_80BF93C thumb_func_start sub_80BF97C @@ -82,7 +82,7 @@ sub_80BF97C: @ 80BF97C movs r1, 0x80 orrs r0, r1 strb r0, [r2, 0x8] - ldr r1, _080BF9B8 @ =gUnknown_3005090 + ldr r1, _080BF9B8 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -97,7 +97,7 @@ _080BF9AC: bx r0 .align 2, 0 _080BF9B4: .4byte gUnknown_2037AB8 -_080BF9B8: .4byte gUnknown_3005090 +_080BF9B8: .4byte gTasks thumb_func_end sub_80BF97C thumb_func_start sub_80BF9BC diff --git a/asm/seagallop.s b/asm/seagallop.s index 17ed641b8..45ff92759 100644 --- a/asm/seagallop.s +++ b/asm/seagallop.s @@ -237,7 +237,7 @@ sub_814706C: @ 814706C sub_8147084: @ 8147084 lsls r0, 24 lsrs r0, 24 - ldr r2, _08147098 @ =gUnknown_3005090 + ldr r2, _08147098 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -246,7 +246,7 @@ sub_8147084: @ 8147084 str r0, [r1] bx lr .align 2, 0 -_08147098: .4byte gUnknown_3005090 +_08147098: .4byte gTasks _0814709C: .4byte sub_81470CC thumb_func_end sub_8147084 @@ -283,7 +283,7 @@ sub_81470CC: @ 81470CC lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _08147100 @ =gUnknown_3005090 + ldr r0, _08147100 @ =gTasks adds r4, r1, r0 bl sub_81470A0 ldrh r0, [r4, 0xA] @@ -302,7 +302,7 @@ _081470FA: pop {r0} bx r0 .align 2, 0 -_08147100: .4byte gUnknown_3005090 +_08147100: .4byte gTasks _08147104: .4byte sub_8147108 thumb_func_end sub_81470CC diff --git a/asm/shop.s b/asm/shop.s index 614094ce1..8c39c795f 100644 --- a/asm/shop.s +++ b/asm/shop.s @@ -240,7 +240,7 @@ sub_809AC5C: @ 809AC5C movs r0, 0x1 movs r1, 0 bl fade_screen - ldr r1, _0809AC90 @ =gUnknown_3005090 + ldr r1, _0809AC90 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -252,7 +252,7 @@ sub_809AC5C: @ 809AC5C bx r0 .align 2, 0 _0809AC8C: .4byte sub_809AE14 -_0809AC90: .4byte gUnknown_3005090 +_0809AC90: .4byte gTasks _0809AC94: .4byte sub_809AD40 thumb_func_end sub_809AC5C @@ -269,7 +269,7 @@ sub_809AC98: @ 809AC98 movs r0, 0x1 movs r1, 0 bl fade_screen - ldr r1, _0809ACCC @ =gUnknown_3005090 + ldr r1, _0809ACCC @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -281,7 +281,7 @@ sub_809AC98: @ 809AC98 bx r0 .align 2, 0 _0809ACC8: .4byte sub_809ACD4 -_0809ACCC: .4byte gUnknown_3005090 +_0809ACCC: .4byte gTasks _0809ACD0: .4byte sub_809AD40 thumb_func_end sub_809AC98 @@ -481,7 +481,7 @@ _0809AE2C: movs r1, 0 movs r2, 0 bl ListMenuInit - ldr r2, _0809AEA0 @ =gUnknown_3005090 + ldr r2, _0809AEA0 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -511,7 +511,7 @@ _0809AE90: .4byte gMain _0809AE94: .4byte gUnknown_2039934 _0809AE98: .4byte sub_809BBC0 _0809AE9C: .4byte gUnknown_3005E70 -_0809AEA0: .4byte gUnknown_3005090 +_0809AEA0: .4byte gTasks _0809AEA4: .4byte sub_809AE00 _0809AEA8: .4byte sub_809ADE4 _0809AEAC: @@ -2099,7 +2099,7 @@ sub_809BB44: @ 809BB44 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _0809BBAC @ =gUnknown_3005098 + ldr r0, _0809BBAC @ =gTasks+0x8 adds r4, r0 movs r0, 0x3 movs r1, 0x11 @@ -2140,7 +2140,7 @@ sub_809BB44: @ 809BB44 pop {r0} bx r0 .align 2, 0 -_0809BBAC: .4byte gUnknown_3005098 +_0809BBAC: .4byte gTasks+0x8 _0809BBB0: .4byte gUnknown_2039934 _0809BBB4: .4byte gStringVar1 _0809BBB8: .4byte gStringVar4 @@ -2155,7 +2155,7 @@ sub_809BBC0: @ 809BBC0 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _0809BC00 @ =gUnknown_3005098 + ldr r1, _0809BC00 @ =gTasks+0x8 adds r5, r0, r1 ldr r0, _0809BC04 @ =gUnknown_2037AB8 ldrb r1, [r0, 0x7] @@ -2180,7 +2180,7 @@ sub_809BBC0: @ 809BBC0 bne _0809BC1A b _0809BC8E .align 2, 0 -_0809BC00: .4byte gUnknown_3005098 +_0809BC00: .4byte gTasks+0x8 _0809BC04: .4byte gUnknown_2037AB8 _0809BC08: .4byte gUnknown_2039942 _0809BC0C: @@ -2256,7 +2256,7 @@ sub_809BCA0: @ 809BCA0 lsls r5, r7, 2 adds r5, r7 lsls r5, 3 - ldr r0, _0809BD40 @ =gUnknown_3005098 + ldr r0, _0809BD40 @ =gTasks+0x8 adds r5, r0 ldrh r0, [r5, 0xA] bl sub_809A7DC @@ -2318,7 +2318,7 @@ sub_809BCA0: @ 809BCA0 movs r0, 0x63 b _0809BD5E .align 2, 0 -_0809BD40: .4byte gUnknown_3005098 +_0809BD40: .4byte gTasks+0x8 _0809BD44: .4byte gStringVar1 _0809BD48: .4byte gStringVar4 _0809BD4C: .4byte gUnknown_8416749 @@ -2334,7 +2334,7 @@ _0809BD5E: beq _0809BD68 bl sub_809B6FC _0809BD68: - ldr r0, _0809BD84 @ =gUnknown_3005090 + ldr r0, _0809BD84 @ =gTasks lsls r1, r7, 2 adds r1, r7 lsls r1, 3 @@ -2347,7 +2347,7 @@ _0809BD68: bx r0 .align 2, 0 _0809BD80: .4byte gUnknown_2039934 -_0809BD84: .4byte gUnknown_3005090 +_0809BD84: .4byte gTasks _0809BD88: .4byte sub_809BD8C thumb_func_end sub_809BCA0 @@ -2360,7 +2360,7 @@ sub_809BD8C: @ 809BD8C lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0809BDCC @ =gUnknown_3005098 + ldr r1, _0809BDCC @ =gTasks+0x8 adds r4, r0, r1 adds r0, r4, 0x2 ldr r6, _0809BDD0 @ =gUnknown_2039934 @@ -2382,7 +2382,7 @@ sub_809BD8C: @ 809BD8C bl sub_809BB44 b _0809BE88 .align 2, 0 -_0809BDCC: .4byte gUnknown_3005098 +_0809BDCC: .4byte gTasks+0x8 _0809BDD0: .4byte gUnknown_2039934 _0809BDD4: ldr r0, _0809BE3C @ =gMain @@ -2479,7 +2479,7 @@ sub_809BEA4: @ 809BEA4 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0809BEE8 @ =gUnknown_3005098 + ldr r1, _0809BEE8 @ =gTasks+0x8 adds r4, r0, r1 movs r0, 0x4 bl PutWindowTilemap @@ -2502,7 +2502,7 @@ sub_809BEA4: @ 809BEA4 bl sub_809C09C b _0809BEFE .align 2, 0 -_0809BEE8: .4byte gUnknown_3005098 +_0809BEE8: .4byte gTasks+0x8 _0809BEEC: .4byte gUnknown_84167E7 _0809BEF0: .4byte sub_809BF0C _0809BEF4: @@ -2544,7 +2544,7 @@ sub_809BF0C: @ 809BF0C movs r0, 0 movs r2, 0 bl sub_809FE40 - ldr r1, _0809BF60 @ =gUnknown_3005090 + ldr r1, _0809BF60 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -2557,7 +2557,7 @@ sub_809BF0C: @ 809BF0C .align 2, 0 _0809BF58: .4byte gSaveBlock1Ptr _0809BF5C: .4byte gUnknown_2039934 -_0809BF60: .4byte gUnknown_3005090 +_0809BF60: .4byte gTasks _0809BF64: .4byte sub_809BF68 thumb_func_end sub_809BF0C @@ -2597,7 +2597,7 @@ sub_809BF98: @ 809BF98 lsls r1, r0, 2 adds r1, r0 lsls r5, r1, 3 - ldr r6, _0809BFF8 @ =gUnknown_3005098 + ldr r6, _0809BFF8 @ =gTasks+0x8 adds r4, r5, r6 movs r0, 0x2 movs r1, 0 @@ -2632,7 +2632,7 @@ _0809BFDC: pop {r0} bx r0 .align 2, 0 -_0809BFF8: .4byte gUnknown_3005098 +_0809BFF8: .4byte gTasks+0x8 _0809BFFC: .4byte gUnknown_2039934 _0809C000: .4byte sub_809BBC0 thumb_func_end sub_809BF98 @@ -2654,7 +2654,7 @@ sub_809C004: @ 809C004 movs r2, 0 movs r3, 0x10 bl BeginNormalPaletteFade - ldr r1, _0809C044 @ =gUnknown_3005090 + ldr r1, _0809C044 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -2668,7 +2668,7 @@ sub_809C004: @ 809C004 .align 2, 0 _0809C03C: .4byte gUnknown_3005020 _0809C040: .4byte sub_809AD74 -_0809C044: .4byte gUnknown_3005090 +_0809C044: .4byte gTasks _0809C048: .4byte sub_809C04C thumb_func_end sub_809C004 @@ -2680,7 +2680,7 @@ sub_809C04C: @ 809C04C lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _0809C088 @ =gUnknown_3005098 + ldr r1, _0809C088 @ =gTasks+0x8 adds r2, r0, r1 ldr r0, _0809C08C @ =gUnknown_2037AB8 ldrb r1, [r0, 0x7] @@ -2702,7 +2702,7 @@ _0809C082: pop {r0} bx r0 .align 2, 0 -_0809C088: .4byte gUnknown_3005098 +_0809C088: .4byte gTasks+0x8 _0809C08C: .4byte gUnknown_2037AB8 _0809C090: .4byte c2_exit_to_overworld_2_switch thumb_func_end sub_809C04C @@ -2895,7 +2895,7 @@ sub_809C1D8: @ 809C1D8 lsls r2, 16 lsrs r2, 16 mov r10, r2 - ldr r2, _0809C26C @ =gUnknown_3005090 + ldr r2, _0809C26C @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -2958,7 +2958,7 @@ _0809C238: bl MapGridSetMetatileIdAt b _0809C280 .align 2, 0 -_0809C26C: .4byte gUnknown_3005090 +_0809C26C: .4byte gTasks _0809C270: mov r1, r9 ldrh r0, [r1] @@ -3071,7 +3071,7 @@ sub_809C334: @ 809C334 lsls r0, r3, 2 adds r0, r3 lsls r0, 3 - ldr r1, _0809C35C @ =gUnknown_3005098 + ldr r1, _0809C35C @ =gTasks+0x8 adds r4, r0, r1 movs r0, 0x1 strh r0, [r4, 0x6] @@ -3085,7 +3085,7 @@ sub_809C334: @ 809C334 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0809C35C: .4byte gUnknown_3005098 +_0809C35C: .4byte gTasks+0x8 _0809C360: .4byte _0809C364 .align 2, 0 _0809C364: @@ -3181,7 +3181,7 @@ sub_809C3FC: @ 809C3FC lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _0809C444 @ =gUnknown_3005098 + ldr r1, _0809C444 @ =gTasks+0x8 adds r7, r0, r1 adds r0, r7, 0 adds r0, 0x8 @@ -3200,7 +3200,7 @@ sub_809C3FC: @ 809C3FC bx r1 .align 2, 0 _0809C440: .4byte sub_809C334 -_0809C444: .4byte gUnknown_3005098 +_0809C444: .4byte gTasks+0x8 thumb_func_end sub_809C3FC thumb_func_start sub_809C448 @@ -3232,7 +3232,7 @@ _0809C470: .4byte gUnknown_2039984 thumb_func_start sub_809C474 sub_809C474: @ 809C474 push {lr} - ldr r2, _0809C498 @ =gUnknown_3005090 + ldr r2, _0809C498 @ =gTasks ldr r0, _0809C49C @ =gUnknown_2039984 ldrb r1, [r0] lsls r0, r1, 2 @@ -3250,7 +3250,7 @@ sub_809C474: @ 809C474 movs r0, 0 b _0809C4A2 .align 2, 0 -_0809C498: .4byte gUnknown_3005090 +_0809C498: .4byte gTasks _0809C49C: .4byte gUnknown_2039984 _0809C4A0: movs r0, 0x1 @@ -3267,7 +3267,7 @@ sub_809C4A8: @ 809C4A8 bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _0809C4E4 @ =gUnknown_3005090 + ldr r2, _0809C4E4 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -3289,7 +3289,7 @@ sub_809C4A8: @ 809C4A8 b _0809C4F0 .align 2, 0 _0809C4E0: .4byte sub_809C500 -_0809C4E4: .4byte gUnknown_3005090 +_0809C4E4: .4byte gTasks _0809C4E8: .4byte gUnknown_20370C0 _0809C4EC: ldrh r0, [r4, 0xC] @@ -3312,7 +3312,7 @@ sub_809C500: @ 809C500 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0809C544 @ =gUnknown_3005098 + ldr r1, _0809C544 @ =gTasks+0x8 adds r4, r0, r1 movs r1, 0 ldrsh r0, [r4, r1] @@ -3338,7 +3338,7 @@ sub_809C500: @ 809C500 bl MapGridSetMetatileIdAt b _0809C56E .align 2, 0 -_0809C544: .4byte gUnknown_3005098 +_0809C544: .4byte gTasks+0x8 _0809C548: .4byte 0x00000eb5 _0809C54C: .4byte 0x00000eb7 _0809C550: @@ -3429,7 +3429,7 @@ sub_809C5FC: @ 809C5FC bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _0809C63C @ =gUnknown_3005090 + ldr r2, _0809C63C @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -3453,7 +3453,7 @@ sub_809C5FC: @ 809C5FC bx r0 .align 2, 0 _0809C638: .4byte sub_809C640 -_0809C63C: .4byte gUnknown_3005090 +_0809C63C: .4byte gTasks thumb_func_end sub_809C5FC thumb_func_start sub_809C640 @@ -3464,7 +3464,7 @@ sub_809C640: @ 809C640 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0809C6A8 @ =gUnknown_3005098 + ldr r1, _0809C6A8 @ =gTasks+0x8 adds r4, r0, r1 movs r1, 0 ldrsh r0, [r4, r1] @@ -3506,7 +3506,7 @@ sub_809C640: @ 809C640 bl DestroyTask b _0809C70A .align 2, 0 -_0809C6A8: .4byte gUnknown_3005098 +_0809C6A8: .4byte gTasks+0x8 _0809C6AC: .4byte 0x00000e85 _0809C6B0: .4byte 0x00000eb4 _0809C6B4: diff --git a/asm/slot_machine.s b/asm/slot_machine.s index f0572862d..1f4cd16c8 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -188,7 +188,7 @@ sub_813F964: @ 813F964 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0813F988 @ =gUnknown_3005098 + ldr r0, _0813F988 @ =gTasks+0x8 adds r6, r1, r0 movs r1, 0 ldrsh r0, [r6, r1] @@ -202,7 +202,7 @@ _0813F97E: ldr r0, [r0] mov pc, r0 .align 2, 0 -_0813F988: .4byte gUnknown_3005098 +_0813F988: .4byte gTasks+0x8 _0813F98C: .4byte _0813F990 .align 2, 0 _0813F990: @@ -465,7 +465,7 @@ sub_813FBC0: @ 813FBC0 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0813FBE4 @ =gUnknown_3005098 + ldr r0, _0813FBE4 @ =gTasks+0x8 adds r4, r1, r0 movs r1, 0 ldrsh r0, [r4, r1] @@ -477,7 +477,7 @@ sub_813FBC0: @ 813FBC0 beq _0813FBEE b _0813FC1C .align 2, 0 -_0813FBE4: .4byte gUnknown_3005098 +_0813FBE4: .4byte gTasks+0x8 _0813FBE8: cmp r0, 0x2 beq _0813FC0A @@ -523,7 +523,7 @@ sub_813FC2C: @ 813FC2C lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0813FC50 @ =gUnknown_3005098 + ldr r0, _0813FC50 @ =gTasks+0x8 adds r4, r1, r0 movs r1, 0 ldrsh r0, [r4, r1] @@ -535,7 +535,7 @@ sub_813FC2C: @ 813FC2C beq _0813FC5E b _0813FCA0 .align 2, 0 -_0813FC50: .4byte gUnknown_3005098 +_0813FC50: .4byte gTasks+0x8 _0813FC54: cmp r0, 0x2 beq _0813FC6E @@ -592,7 +592,7 @@ sub_813FCAC: @ 813FCAC lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0813FCD0 @ =gUnknown_3005098 + ldr r0, _0813FCD0 @ =gTasks+0x8 adds r4, r1, r0 movs r1, 0 ldrsh r0, [r4, r1] @@ -604,7 +604,7 @@ sub_813FCAC: @ 813FCAC ldr r0, [r0] mov pc, r0 .align 2, 0 -_0813FCD0: .4byte gUnknown_3005098 +_0813FCD0: .4byte gTasks+0x8 _0813FCD4: .4byte _0813FCD8 .align 2, 0 _0813FCD8: @@ -698,7 +698,7 @@ sub_813FD84: @ 813FD84 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0813FDA8 @ =gUnknown_3005098 + ldr r0, _0813FDA8 @ =gTasks+0x8 adds r5, r1, r0 movs r0, 0 ldrsh r4, [r5, r0] @@ -710,7 +710,7 @@ sub_813FD84: @ 813FD84 beq _0813FDB2 b _0813FE10 .align 2, 0 -_0813FDA8: .4byte gUnknown_3005098 +_0813FDA8: .4byte gTasks+0x8 _0813FDAC: cmp r4, 0x2 beq _0813FDEC @@ -774,7 +774,7 @@ sub_813FE1C: @ 813FE1C lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0813FE40 @ =gUnknown_3005098 + ldr r0, _0813FE40 @ =gTasks+0x8 adds r5, r1, r0 movs r1, 0 ldrsh r0, [r5, r1] @@ -788,7 +788,7 @@ _0813FE36: ldr r0, [r0] mov pc, r0 .align 2, 0 -_0813FE40: .4byte gUnknown_3005098 +_0813FE40: .4byte gTasks+0x8 _0813FE44: .4byte _0813FE48 .align 2, 0 _0813FE48: @@ -987,7 +987,7 @@ sub_813FFD8: @ 813FFD8 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0813FFF8 @ =gUnknown_3005098 + ldr r0, _0813FFF8 @ =gTasks+0x8 adds r4, r1, r0 movs r1, 0 ldrsh r0, [r4, r1] @@ -997,7 +997,7 @@ sub_813FFD8: @ 813FFD8 beq _0814000C b _08140024 .align 2, 0 -_0813FFF8: .4byte gUnknown_3005098 +_0813FFF8: .4byte gTasks+0x8 _0813FFFC: movs r0, 0x1 movs r1, 0 @@ -1027,7 +1027,7 @@ _0814002C: .4byte gUnknown_203F3A0 thumb_func_start sub_8140030 sub_8140030: @ 8140030 push {r4,lr} - ldr r4, _08140058 @ =gUnknown_3005090 + ldr r4, _08140058 @ =gTasks ldr r1, _0814005C @ =gUnknown_203F3A0 ldr r3, [r1] ldrb r2, [r3, 0x10] @@ -1047,7 +1047,7 @@ sub_8140030: @ 8140030 pop {r0} bx r0 .align 2, 0 -_08140058: .4byte gUnknown_3005090 +_08140058: .4byte gTasks _0814005C: .4byte gUnknown_203F3A0 thumb_func_end sub_8140030 @@ -4371,7 +4371,7 @@ sub_814191C: @ 814191C lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _08141940 @ =gUnknown_3005098 + ldr r1, _08141940 @ =gTasks+0x8 adds r5, r0, r1 movs r1, 0 ldrsh r0, [r5, r1] @@ -4383,7 +4383,7 @@ sub_814191C: @ 814191C beq _08141952 b _08141AA8 .align 2, 0 -_08141940: .4byte gUnknown_3005098 +_08141940: .4byte gTasks+0x8 _08141944: cmp r0, 0x2 bne _0814194A @@ -4571,7 +4571,7 @@ sub_8141AB0: @ 8141AB0 push {lr} ldr r0, _08141AD0 @ =sub_814191C bl FindTaskIdByFunc - ldr r2, _08141AD4 @ =gUnknown_3005090 + ldr r2, _08141AD4 @ =gTasks lsls r0, 24 lsrs r0, 24 lsls r1, r0, 2 @@ -4584,7 +4584,7 @@ sub_8141AB0: @ 8141AB0 bx r0 .align 2, 0 _08141AD0: .4byte sub_814191C -_08141AD4: .4byte gUnknown_3005090 +_08141AD4: .4byte gTasks thumb_func_end sub_8141AB0 thumb_func_start sub_8141AD8 diff --git a/asm/ss_anne.s b/asm/ss_anne.s index 0211fc212..5ba63dea3 100644 --- a/asm/ss_anne.s +++ b/asm/ss_anne.s @@ -15,7 +15,7 @@ sub_815D334: @ 815D334 bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _0815D360 @ =gUnknown_3005090 + ldr r2, _0815D360 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -26,7 +26,7 @@ sub_815D334: @ 815D334 bx r0 .align 2, 0 _0815D35C: .4byte sub_815D364 -_0815D360: .4byte gUnknown_3005090 +_0815D360: .4byte gTasks thumb_func_end sub_815D334 thumb_func_start sub_815D364 @@ -37,7 +37,7 @@ sub_815D364: @ 815D364 lsls r1, r0, 2 adds r1, r0 lsls r4, r1, 3 - ldr r5, _0815D39C @ =gUnknown_3005098 + ldr r5, _0815D39C @ =gTasks+0x8 adds r1, r4, r5 ldrh r0, [r1] subs r0, 0x1 @@ -58,7 +58,7 @@ _0815D394: pop {r0} bx r0 .align 2, 0 -_0815D39C: .4byte gUnknown_3005098 +_0815D39C: .4byte gTasks+0x8 _0815D3A0: .4byte gUnknown_8479C58 _0815D3A4: .4byte sub_815D3A8 thumb_func_end sub_815D364 @@ -72,7 +72,7 @@ sub_815D3A8: @ 815D3A8 lsls r1, r0, 2 adds r1, r0 lsls r6, r1, 3 - ldr r7, _0815D424 @ =gUnknown_3005098 + ldr r7, _0815D424 @ =gTasks+0x8 adds r5, r6, r7 ldrh r1, [r5, 0x2] adds r1, 0x1 @@ -126,7 +126,7 @@ _0815D3D6: str r1, [r0] b _0815D44A .align 2, 0 -_0815D424: .4byte gUnknown_3005098 +_0815D424: .4byte gTasks+0x8 _0815D428: .4byte gSaveBlock1Ptr _0815D42C: .4byte gUnknown_2036E38 _0815D430: .4byte gSprites @@ -155,7 +155,7 @@ sub_815D454: @ 815D454 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 - ldr r0, _0815D490 @ =gUnknown_3005098 + ldr r0, _0815D490 @ =gTasks+0x8 adds r1, r0 ldrh r0, [r1, 0x6] adds r0, 0x1 @@ -177,7 +177,7 @@ _0815D48A: pop {r0} bx r0 .align 2, 0 -_0815D490: .4byte gUnknown_3005098 +_0815D490: .4byte gTasks+0x8 _0815D494: .4byte 0x00000fa1 thumb_func_end sub_815D454 diff --git a/asm/start_menu.s b/asm/start_menu.s index be76f5ae8..263e27504 100644 --- a/asm/start_menu.s +++ b/asm/start_menu.s @@ -586,7 +586,7 @@ sub_806F1F0: @ 806F1F0 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0806F210 @ =gUnknown_3005098 + ldr r1, _0806F210 @ =gTasks+0x8 adds r4, r0, r1 movs r1, 0 ldrsh r0, [r4, r1] @@ -596,7 +596,7 @@ sub_806F1F0: @ 806F1F0 beq _0806F238 b _0806F24E .align 2, 0 -_0806F210: .4byte gUnknown_3005098 +_0806F210: .4byte gTasks+0x8 _0806F214: bl InUnionRoom cmp r0, 0x1 @@ -1858,7 +1858,7 @@ sub_806FBB8: @ 806FBB8 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _0806FBEC @ =gUnknown_3005098 + ldr r1, _0806FBEC @ =gTasks+0x8 adds r5, r0, r1 ldr r0, _0806FBF0 @ =gUnknown_2037AB8 ldrb r1, [r0, 0x7] @@ -1880,7 +1880,7 @@ _0806FBE2: ldr r0, [r0] mov pc, r0 .align 2, 0 -_0806FBEC: .4byte gUnknown_3005098 +_0806FBEC: .4byte gTasks+0x8 _0806FBF0: .4byte gUnknown_2037AB8 _0806FBF4: .4byte _0806FBF8 .align 2, 0 diff --git a/asm/task.s b/asm/task.s deleted file mode 100644 index 7e6b0eb0b..000000000 --- a/asm/task.s +++ /dev/null @@ -1,537 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start ResetTasks -ResetTasks: @ 80773BC - push {r4-r7,lr} - movs r4, 0 - ldr r6, _08077410 @ =gUnknown_3005090 - adds r7, r6, 0 - adds r7, 0x8 -_080773C6: - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r2, r0, r6 - movs r1, 0 - strb r1, [r2, 0x4] - ldr r1, _08077414 @ =nullsub_43 - str r1, [r2] - strb r4, [r2, 0x5] - adds r4, 0x1 - strb r4, [r2, 0x6] - movs r1, 0x1 - negs r1, r1 - adds r5, r1, 0 - movs r1, 0xFF - strb r1, [r2, 0x7] - adds r0, r7 - movs r1, 0 - movs r2, 0x20 - bl memset - lsls r4, 24 - lsrs r4, 24 - cmp r4, 0xF - bls _080773C6 - ldr r0, _08077410 @ =gUnknown_3005090 - movs r1, 0xFE - strb r1, [r0, 0x5] - ldr r1, _08077418 @ =0x0000025e - adds r0, r1 - ldrb r1, [r0] - orrs r1, r5 - strb r1, [r0] - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08077410: .4byte gUnknown_3005090 -_08077414: .4byte nullsub_43 -_08077418: .4byte 0x0000025e - thumb_func_end ResetTasks - - thumb_func_start CreateTask -CreateTask: @ 807741C - push {r4-r7,lr} - adds r2, r0, 0 - lsls r1, 24 - lsrs r1, 24 - movs r6, 0 - ldr r7, _08077458 @ =gUnknown_3005090 -_08077428: - lsls r0, r6, 2 - adds r0, r6 - lsls r5, r0, 3 - adds r4, r5, r7 - ldrb r0, [r4, 0x4] - cmp r0, 0 - bne _0807745C - str r2, [r4] - strb r1, [r4, 0x7] - adds r0, r6, 0 - bl InsertTask - adds r0, r7, 0 - adds r0, 0x8 - adds r0, r5, r0 - movs r1, 0 - movs r2, 0x20 - bl memset - movs r0, 0x1 - strb r0, [r4, 0x4] - adds r0, r6, 0 - b _08077468 - .align 2, 0 -_08077458: .4byte gUnknown_3005090 -_0807745C: - adds r0, r6, 0x1 - lsls r0, 24 - lsrs r6, r0, 24 - cmp r6, 0xF - bls _08077428 - movs r0, 0 -_08077468: - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end CreateTask - - thumb_func_start InsertTask -InsertTask: @ 8077470 - push {r4-r7,lr} - mov r7, r8 - push {r7} - lsls r0, 24 - lsrs r4, r0, 24 - bl FindFirstActiveTask - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x10 - bne _080774A0 - ldr r1, _0807749C @ =gUnknown_3005090 - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r0, r1 - movs r1, 0xFE - strb r1, [r0, 0x5] - movs r1, 0xFF - strb r1, [r0, 0x6] - b _080774FC - .align 2, 0 -_0807749C: .4byte gUnknown_3005090 -_080774A0: - ldr r6, _080774DC @ =gUnknown_3005090 - lsls r0, r4, 2 - mov r12, r0 - mov r8, r6 - adds r0, r4 - lsls r0, 3 - adds r2, r0, r6 -_080774AE: - lsls r0, r1, 2 - adds r0, r1 - lsls r5, r0, 3 - mov r7, r8 - adds r3, r5, r7 - ldrb r0, [r2, 0x7] - ldrb r7, [r3, 0x7] - cmp r0, r7 - bcs _080774E0 - ldrb r0, [r3, 0x5] - strb r0, [r2, 0x5] - strb r1, [r2, 0x6] - ldrb r0, [r3, 0x5] - cmp r0, 0xFE - beq _080774D8 - adds r1, r0, 0 - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 3 - add r0, r8 - strb r4, [r0, 0x6] -_080774D8: - strb r4, [r3, 0x5] - b _080774FC - .align 2, 0 -_080774DC: .4byte gUnknown_3005090 -_080774E0: - ldrb r0, [r3, 0x6] - cmp r0, 0xFF - beq _080774EA - adds r1, r0, 0 - b _080774AE -_080774EA: - mov r2, r12 - adds r0, r2, r4 - lsls r0, 3 - adds r0, r6 - strb r1, [r0, 0x5] - adds r2, r5, r6 - ldrb r1, [r2, 0x6] - strb r1, [r0, 0x6] - strb r4, [r2, 0x6] -_080774FC: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end InsertTask - - thumb_func_start DestroyTask -DestroyTask: @ 8077508 - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r4, _0807753C @ =gUnknown_3005090 - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r2, r1, r4 - ldrb r0, [r2, 0x4] - cmp r0, 0 - beq _08077572 - movs r0, 0 - strb r0, [r2, 0x4] - ldrb r3, [r2, 0x5] - cmp r3, 0xFE - bne _08077540 - ldrb r0, [r2, 0x6] - cmp r0, 0xFF - beq _08077572 - adds r1, r0, 0 - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 3 - adds r0, r4 - strb r3, [r0, 0x5] - b _08077572 - .align 2, 0 -_0807753C: .4byte gUnknown_3005090 -_08077540: - ldrb r3, [r2, 0x6] - adds r0, r3, 0 - cmp r0, 0xFF - bne _08077558 - ldrb r0, [r2, 0x5] - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r4 - movs r0, 0xFF - strb r0, [r1, 0x6] - b _08077572 -_08077558: - ldrb r1, [r2, 0x5] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 3 - adds r0, r4 - strb r3, [r0, 0x6] - ldrb r1, [r2, 0x6] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 3 - adds r0, r4 - ldrb r1, [r2, 0x5] - strb r1, [r0, 0x5] -_08077572: - pop {r4} - pop {r0} - bx r0 - thumb_func_end DestroyTask - - thumb_func_start RunTasks -RunTasks: @ 8077578 - push {r4,r5,lr} - bl FindFirstActiveTask - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x10 - beq _0807759C - ldr r5, _080775A4 @ =gUnknown_3005090 -_08077588: - lsls r4, r0, 2 - adds r4, r0 - lsls r4, 3 - adds r4, r5 - ldr r1, [r4] - bl _call_via_r1 - ldrb r0, [r4, 0x6] - cmp r0, 0xFF - bne _08077588 -_0807759C: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080775A4: .4byte gUnknown_3005090 - thumb_func_end RunTasks - - thumb_func_start FindFirstActiveTask -FindFirstActiveTask: @ 80775A8 - push {lr} - movs r2, 0 - ldr r0, _080775E0 @ =gUnknown_3005090 - ldrb r1, [r0, 0x4] - adds r3, r0, 0 - cmp r1, 0x1 - bne _080775BC - ldrb r0, [r3, 0x5] - cmp r0, 0xFE - beq _080775DA -_080775BC: - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0xF - bhi _080775DA - lsls r0, r2, 2 - adds r0, r2 - lsls r0, 3 - adds r1, r0, r3 - ldrb r0, [r1, 0x4] - cmp r0, 0x1 - bne _080775BC - ldrb r0, [r1, 0x5] - cmp r0, 0xFE - bne _080775BC -_080775DA: - adds r0, r2, 0 - pop {r1} - bx r1 - .align 2, 0 -_080775E0: .4byte gUnknown_3005090 - thumb_func_end FindFirstActiveTask - - thumb_func_start nullsub_43 -nullsub_43: @ 80775E4 - bx lr - thumb_func_end nullsub_43 - - thumb_func_start SetTaskFuncWithFollowupFunc -SetTaskFuncWithFollowupFunc: @ 80775E8 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r5, _08077618 @ =gUnknown_3005090 - lsls r3, r0, 2 - adds r3, r0 - lsls r3, 3 - adds r0, r3, 0 - adds r0, 0x1C - adds r4, r5, 0 - adds r4, 0x8 - adds r0, r4 - strh r2, [r0] - adds r0, r3, 0 - adds r0, 0x1E - adds r0, r4 - lsrs r2, 16 - strh r2, [r0] - adds r3, r5 - str r1, [r3] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08077618: .4byte gUnknown_3005090 - thumb_func_end SetTaskFuncWithFollowupFunc - - thumb_func_start SwitchTaskToFollowupFunc -SwitchTaskToFollowupFunc: @ 807761C - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r3, _0807764C @ =gUnknown_3005090 - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r3 - adds r0, r1, 0 - adds r0, 0x1C - adds r3, 0x8 - adds r0, r3 - ldrh r2, [r0] - adds r1, 0x1E - adds r1, r3 - movs r3, 0 - ldrsh r0, [r1, r3] - lsls r0, 16 - orrs r2, r0 - str r2, [r4] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0807764C: .4byte gUnknown_3005090 - thumb_func_end SwitchTaskToFollowupFunc - - thumb_func_start FuncIsActiveTask -FuncIsActiveTask: @ 8077650 - push {r4,lr} - adds r3, r0, 0 - movs r2, 0 - ldr r4, _08077670 @ =gUnknown_3005090 -_08077658: - lsls r0, r2, 2 - adds r0, r2 - lsls r0, 3 - adds r1, r0, r4 - ldrb r0, [r1, 0x4] - cmp r0, 0x1 - bne _08077674 - ldr r0, [r1] - cmp r0, r3 - bne _08077674 - movs r0, 0x1 - b _08077680 - .align 2, 0 -_08077670: .4byte gUnknown_3005090 -_08077674: - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0xF - bls _08077658 - movs r0, 0 -_08077680: - pop {r4} - pop {r1} - bx r1 - thumb_func_end FuncIsActiveTask - - thumb_func_start FindTaskIdByFunc -FindTaskIdByFunc: @ 8077688 - push {lr} - adds r3, r0, 0 - movs r2, 0 - ldr r1, _080776A4 @ =gUnknown_3005090 -_08077690: - ldrb r0, [r1, 0x4] - cmp r0, 0x1 - bne _080776A8 - ldr r0, [r1] - cmp r0, r3 - bne _080776A8 - lsls r0, r2, 24 - lsrs r0, 24 - b _080776B2 - .align 2, 0 -_080776A4: .4byte gUnknown_3005090 -_080776A8: - adds r1, 0x28 - adds r2, 0x1 - cmp r2, 0xF - ble _08077690 - movs r0, 0xFF -_080776B2: - pop {r1} - bx r1 - thumb_func_end FindTaskIdByFunc - - thumb_func_start GetTaskCount -GetTaskCount: @ 80776B8 - push {lr} - movs r2, 0 - movs r1, 0 - ldr r3, _080776E4 @ =gUnknown_3005090 -_080776C0: - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 3 - adds r0, r3 - ldrb r0, [r0, 0x4] - cmp r0, 0x1 - bne _080776D4 - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 -_080776D4: - adds r0, r1, 0x1 - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0xF - bls _080776C0 - adds r0, r2, 0 - pop {r1} - bx r1 - .align 2, 0 -_080776E4: .4byte gUnknown_3005090 - thumb_func_end GetTaskCount - - thumb_func_start SetWordTaskArg -SetWordTaskArg: @ 80776E8 - push {r4,r5,lr} - adds r5, r2, 0 - lsls r0, 24 - lsrs r4, r0, 24 - lsls r1, 24 - lsrs r3, r1, 24 - cmp r3, 0xE - bhi _08077716 - ldr r2, _0807771C @ =gUnknown_3005090 - lsls r0, r3, 1 - lsls r1, r4, 2 - adds r1, r4 - lsls r1, 3 - adds r0, r1 - adds r2, 0x8 - adds r0, r2 - strh r5, [r0] - adds r0, r3, 0x1 - lsls r0, 1 - adds r0, r1 - adds r0, r2 - lsrs r1, r5, 16 - strh r1, [r0] -_08077716: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_0807771C: .4byte gUnknown_3005090 - thumb_func_end SetWordTaskArg - - thumb_func_start GetWordTaskArg -GetWordTaskArg: @ 8077720 - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - lsls r1, 24 - lsrs r1, 24 - cmp r1, 0xE - bls _08077732 - movs r0, 0 - b _08077754 -_08077732: - ldr r3, _0807775C @ =gUnknown_3005090 - lsls r0, r1, 1 - lsls r2, r4, 2 - adds r2, r4 - lsls r2, 3 - adds r0, r2 - adds r3, 0x8 - adds r0, r3 - ldrh r0, [r0] - adds r1, 0x1 - lsls r1, 1 - adds r1, r2 - adds r1, r3 - movs r2, 0 - ldrsh r1, [r1, r2] - lsls r1, 16 - orrs r0, r1 -_08077754: - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_0807775C: .4byte gUnknown_3005090 - thumb_func_end GetWordTaskArg - - .align 2, 0 @ Don't pad with nop. diff --git a/asm/teachy_tv.s b/asm/teachy_tv.s index a9edb5b44..70b02bbd5 100644 --- a/asm/teachy_tv.s +++ b/asm/teachy_tv.s @@ -155,7 +155,7 @@ _0815AC9C: lsls r0, 24 lsrs r5, r0, 24 bl sub_815B014 - ldr r2, _0815ACE8 @ =gUnknown_3005090 + ldr r2, _0815ACE8 @ =gTasks lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -169,7 +169,7 @@ _0815AC9C: .align 2, 0 _0815ACE0: .4byte gUnknown_203F444 _0815ACE4: .4byte sub_815BA54 -_0815ACE8: .4byte gUnknown_3005090 +_0815ACE8: .4byte gTasks _0815ACEC: ldr r0, _0815AD78 @ =sub_815B2C0 movs r1, 0 @@ -177,7 +177,7 @@ _0815ACEC: lsls r0, 24 lsrs r5, r0, 24 bl sub_815AEE8 - ldr r1, _0815AD7C @ =gUnknown_3005090 + ldr r1, _0815AD7C @ =gTasks lsls r4, r5, 2 adds r4, r5 lsls r4, 3 @@ -229,7 +229,7 @@ _0815AD6E: bx r0 .align 2, 0 _0815AD78: .4byte sub_815B2C0 -_0815AD7C: .4byte gUnknown_3005090 +_0815AD7C: .4byte gTasks _0815AD80: .4byte sub_815ABB0 _0815AD84: .4byte sub_815AB94 thumb_func_end sub_815AC2C @@ -682,7 +682,7 @@ sub_815B118: @ 815B118 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _0815B190 @ =gUnknown_3005098 + ldr r1, _0815B190 @ =gTasks+0x8 adds r5, r0, r1 movs r0, 0x2 ldrsh r1, [r5, r0] @@ -730,7 +730,7 @@ sub_815B118: @ 815B118 strb r0, [r1] b _0815B1B8 .align 2, 0 -_0815B190: .4byte gUnknown_3005098 +_0815B190: .4byte gTasks+0x8 _0815B194: .4byte gSprites _0815B198: .4byte gUnknown_203F444 _0815B19C: .4byte gUnknown_203F450 @@ -828,7 +828,7 @@ sub_815B23C: @ 815B23C movs r2, 0 movs r3, 0x10 bl BeginNormalPaletteFade - ldr r1, _0815B26C @ =gUnknown_3005090 + ldr r1, _0815B26C @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -840,7 +840,7 @@ sub_815B23C: @ 815B23C pop {r0} bx r0 .align 2, 0 -_0815B26C: .4byte gUnknown_3005090 +_0815B26C: .4byte gTasks _0815B270: .4byte sub_815B274 thumb_func_end sub_815B23C @@ -890,7 +890,7 @@ sub_815B2C0: @ 815B2C0 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 - ldr r1, _0815B31C @ =gUnknown_3005098 + ldr r1, _0815B31C @ =gTasks+0x8 adds r6, r0, r1 bl sub_815B0CC ldr r0, _0815B320 @ =gUnknown_2037AB8 @@ -928,7 +928,7 @@ _0815B30A: bne _0815B33E b _0815B37A .align 2, 0 -_0815B31C: .4byte gUnknown_3005098 +_0815B31C: .4byte gTasks+0x8 _0815B320: .4byte gUnknown_2037AB8 _0815B324: .4byte gUnknown_203F44A _0815B328: .4byte gMain @@ -957,7 +957,7 @@ _0815B33E: bl sub_815AFAC strh r4, [r6, 0x6] strh r4, [r6, 0x4] - ldr r1, _0815B384 @ =gUnknown_3005090 + ldr r1, _0815B384 @ =gTasks lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -970,7 +970,7 @@ _0815B37A: bx r0 .align 2, 0 _0815B380: .4byte gUnknown_203F444 -_0815B384: .4byte gUnknown_3005090 +_0815B384: .4byte gTasks _0815B388: .4byte sub_815B4EC thumb_func_end sub_815B2C0 @@ -983,7 +983,7 @@ sub_815B38C: @ 815B38C lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0815B3F8 @ =gUnknown_3005098 + ldr r0, _0815B3F8 @ =gTasks+0x8 adds r4, r1, r0 bl sub_815B0CC ldrh r0, [r4, 0x4] @@ -1027,7 +1027,7 @@ _0815B3F0: pop {r0} bx r0 .align 2, 0 -_0815B3F8: .4byte gUnknown_3005098 +_0815B3F8: .4byte gTasks+0x8 _0815B3FC: .4byte gUnknown_203F450 _0815B400: .4byte 0x00003004 thumb_func_end sub_815B38C @@ -1041,7 +1041,7 @@ sub_815B404: @ 815B404 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0815B450 @ =gUnknown_3005098 + ldr r0, _0815B450 @ =gTasks+0x8 adds r4, r1, r0 ldrh r0, [r4, 0x4] adds r0, 0x1 @@ -1072,7 +1072,7 @@ _0815B448: pop {r0} bx r0 .align 2, 0 -_0815B450: .4byte gUnknown_3005098 +_0815B450: .4byte gTasks+0x8 thumb_func_end sub_815B404 thumb_func_start sub_815B454 @@ -1083,7 +1083,7 @@ sub_815B454: @ 815B454 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0815B484 @ =gUnknown_3005098 + ldr r0, _0815B484 @ =gTasks+0x8 adds r4, r1, r0 movs r0, 0x2 ldrsh r1, [r4, r0] @@ -1101,7 +1101,7 @@ sub_815B454: @ 815B454 strh r0, [r4, 0x4] b _0815B4B8 .align 2, 0 -_0815B484: .4byte gUnknown_3005098 +_0815B484: .4byte gTasks+0x8 _0815B488: .4byte gSprites _0815B48C: ldrh r2, [r1, 0x24] @@ -1139,7 +1139,7 @@ sub_815B4C0: @ 815B4C0 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0815B4E8 @ =gUnknown_3005098 + ldr r0, _0815B4E8 @ =gTasks+0x8 adds r4, r1, r0 movs r0, 0 bl sub_80BF518 @@ -1154,7 +1154,7 @@ _0815B4E2: pop {r0} bx r0 .align 2, 0 -_0815B4E8: .4byte gUnknown_3005098 +_0815B4E8: .4byte gTasks+0x8 thumb_func_end sub_815B4C0 thumb_func_start sub_815B4EC @@ -1165,7 +1165,7 @@ sub_815B4EC: @ 815B4EC lsls r0, r2, 2 adds r0, r2 lsls r6, r0, 3 - ldr r7, _0815B548 @ =gUnknown_3005098 + ldr r7, _0815B548 @ =gTasks+0x8 adds r5, r6, r7 ldr r0, _0815B54C @ =gMain ldrh r1, [r0, 0x2E] @@ -1201,7 +1201,7 @@ sub_815B4EC: @ 815B4EC str r1, [r0] b _0815B578 .align 2, 0 -_0815B548: .4byte gUnknown_3005098 +_0815B548: .4byte gTasks+0x8 _0815B54C: .4byte gMain _0815B550: .4byte gUnknown_203F450 _0815B554: .4byte 0x00004006 @@ -1237,7 +1237,7 @@ sub_815B588: @ 815B588 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _0815B5B4 @ =gUnknown_3005098 + ldr r0, _0815B5B4 @ =gTasks+0x8 adds r4, r0 ldr r1, _0815B5B8 @ =gUnknown_8479560 ldr r0, _0815B5BC @ =gUnknown_203F444 @@ -1253,7 +1253,7 @@ sub_815B588: @ 815B588 pop {r0} bx r0 .align 2, 0 -_0815B5B4: .4byte gUnknown_3005098 +_0815B5B4: .4byte gTasks+0x8 _0815B5B8: .4byte gUnknown_8479560 _0815B5BC: .4byte gUnknown_203F444 thumb_func_end sub_815B588 @@ -1266,7 +1266,7 @@ sub_815B5C0: @ 815B5C0 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _0815B5EC @ =gUnknown_3005098 + ldr r0, _0815B5EC @ =gTasks+0x8 adds r4, r0 ldr r1, _0815B5F0 @ =gUnknown_8479578 ldr r0, _0815B5F4 @ =gUnknown_203F444 @@ -1282,7 +1282,7 @@ sub_815B5C0: @ 815B5C0 pop {r0} bx r0 .align 2, 0 -_0815B5EC: .4byte gUnknown_3005098 +_0815B5EC: .4byte gTasks+0x8 _0815B5F0: .4byte gUnknown_8479578 _0815B5F4: .4byte gUnknown_203F444 thumb_func_end sub_815B5C0 @@ -1295,7 +1295,7 @@ sub_815B5F8: @ 815B5F8 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0815B620 @ =gUnknown_3005098 + ldr r0, _0815B620 @ =gTasks+0x8 adds r4, r1, r0 movs r0, 0 bl sub_80BF518 @@ -1310,7 +1310,7 @@ _0815B61A: pop {r0} bx r0 .align 2, 0 -_0815B620: .4byte gUnknown_3005098 +_0815B620: .4byte gTasks+0x8 thumb_func_end sub_815B5F8 thumb_func_start sub_815B624 @@ -1321,7 +1321,7 @@ sub_815B624: @ 815B624 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0815B65C @ =gUnknown_3005098 + ldr r0, _0815B65C @ =gTasks+0x8 adds r4, r1, r0 ldr r0, _0815B660 @ =gMain ldrh r1, [r0, 0x2E] @@ -1343,7 +1343,7 @@ _0815B656: pop {r0} bx r0 .align 2, 0 -_0815B65C: .4byte gUnknown_3005098 +_0815B65C: .4byte gTasks+0x8 _0815B660: .4byte gMain thumb_func_end sub_815B624 @@ -1355,7 +1355,7 @@ sub_815B664: @ 815B664 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _0815B6A0 @ =gUnknown_3005098 + ldr r0, _0815B6A0 @ =gTasks+0x8 adds r4, r0 movs r0, 0x2 ldrsh r1, [r4, r0] @@ -1378,7 +1378,7 @@ sub_815B664: @ 815B664 pop {r0} bx r0 .align 2, 0 -_0815B6A0: .4byte gUnknown_3005098 +_0815B6A0: .4byte gTasks+0x8 _0815B6A4: .4byte gSprites thumb_func_end sub_815B664 @@ -1391,7 +1391,7 @@ sub_815B6A8: @ 815B6A8 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0815B730 @ =gUnknown_3005098 + ldr r1, _0815B730 @ =gTasks+0x8 adds r4, r0, r1 movs r0, 0x2 ldrsh r1, [r4, r0] @@ -1451,7 +1451,7 @@ _0815B726: pop {r0} bx r0 .align 2, 0 -_0815B730: .4byte gUnknown_3005098 +_0815B730: .4byte gTasks+0x8 _0815B734: .4byte gSprites _0815B738: .4byte gUnknown_203F450 _0815B73C: .4byte 0x00004005 @@ -1467,7 +1467,7 @@ sub_815B740: @ 815B740 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0815B7D4 @ =gUnknown_3005098 + ldr r1, _0815B7D4 @ =gTasks+0x8 adds r4, r0, r1 movs r0, 0x2 ldrsh r1, [r4, r0] @@ -1533,7 +1533,7 @@ _0815B7CA: pop {r0} bx r0 .align 2, 0 -_0815B7D4: .4byte gUnknown_3005098 +_0815B7D4: .4byte gTasks+0x8 _0815B7D8: .4byte gSprites _0815B7DC: .4byte gUnknown_203F450 _0815B7E0: .4byte 0x00004004 @@ -1549,7 +1549,7 @@ sub_815B7E4: @ 815B7E4 lsls r5, r6, 2 adds r5, r6 lsls r5, 3 - ldr r0, _0815B838 @ =gUnknown_3005098 + ldr r0, _0815B838 @ =gTasks+0x8 adds r5, r0 movs r1, 0x2 ldrsh r0, [r5, r1] @@ -1581,7 +1581,7 @@ sub_815B7E4: @ 815B7E4 pop {r0} bx r0 .align 2, 0 -_0815B838: .4byte gUnknown_3005098 +_0815B838: .4byte gTasks+0x8 _0815B83C: .4byte gSprites thumb_func_end sub_815B7E4 @@ -1594,7 +1594,7 @@ sub_815B840: @ 815B840 lsls r0, r3, 2 adds r0, r3 lsls r0, 3 - ldr r1, _0815B890 @ =gUnknown_3005098 + ldr r1, _0815B890 @ =gTasks+0x8 adds r5, r0, r1 movs r0, 0x2 ldrsh r1, [r5, r0] @@ -1628,7 +1628,7 @@ _0815B87E: strh r0, [r5, 0x6] b _0815B89C .align 2, 0 -_0815B890: .4byte gUnknown_3005098 +_0815B890: .4byte gTasks+0x8 _0815B894: .4byte gSprites _0815B898: subs r0, r1, 0x1 @@ -1649,7 +1649,7 @@ sub_815B8A4: @ 815B8A4 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0815B900 @ =gUnknown_3005098 + ldr r0, _0815B900 @ =gTasks+0x8 adds r4, r1, r0 movs r1, 0x4 ldrsh r0, [r4, r1] @@ -1688,7 +1688,7 @@ _0815B8F8: pop {r0} bx r0 .align 2, 0 -_0815B900: .4byte gUnknown_3005098 +_0815B900: .4byte gTasks+0x8 _0815B904: .4byte gUnknown_8479590 thumb_func_end sub_815B8A4 @@ -1720,7 +1720,7 @@ sub_815B92C: @ 815B92C lsls r1, r0, 2 adds r1, r0 lsls r6, r1, 3 - ldr r7, _0815B9DC @ =gUnknown_3005098 + ldr r7, _0815B9DC @ =gTasks+0x8 adds r5, r6, r7 movs r1, 0x4 ldrsh r0, [r5, r1] @@ -1793,7 +1793,7 @@ _0815B9D4: pop {r0} bx r0 .align 2, 0 -_0815B9DC: .4byte gUnknown_3005098 +_0815B9DC: .4byte gTasks+0x8 _0815B9E0: .4byte sub_815B2C0 _0815B9E4: .4byte gUnknown_203F450 _0815B9E8: .4byte 0x00004004 @@ -1862,7 +1862,7 @@ sub_815BA54: @ 815BA54 lsls r1, r0, 2 adds r1, r0 lsls r2, r1, 3 - ldr r4, _0815BA8C @ =gUnknown_3005098 + ldr r4, _0815BA8C @ =gTasks+0x8 adds r3, r2, r4 ldr r0, _0815BA90 @ =gUnknown_2037AB8 ldrb r1, [r0, 0x7] @@ -1886,7 +1886,7 @@ _0815BA86: pop {r0} bx r0 .align 2, 0 -_0815BA8C: .4byte gUnknown_3005098 +_0815BA8C: .4byte gTasks+0x8 _0815BA90: .4byte gUnknown_2037AB8 _0815BA94: .4byte gUnknown_8479390 _0815BA98: .4byte gUnknown_203F444 @@ -2000,7 +2000,7 @@ sub_815BB6C: @ 815BB6C lsls r0, r1, 2 adds r0, r1 lsls r0, 3 - ldr r1, _0815BBA4 @ =gUnknown_3005098 + ldr r1, _0815BBA4 @ =gTasks+0x8 adds r4, r0, r1 movs r2, 0x2 ldrsh r1, [r4, r2] @@ -2020,7 +2020,7 @@ sub_815BB6C: @ 815BB6C bl DestroySprite b _0815BC3A .align 2, 0 -_0815BBA4: .4byte gUnknown_3005098 +_0815BBA4: .4byte gTasks+0x8 _0815BBA8: .4byte gSprites _0815BBAC: .4byte gUnknown_203F450 _0815BBB0: .4byte 0x00004006 @@ -2151,7 +2151,7 @@ sub_815BC90: @ 815BC90 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _0815BCCC @ =gUnknown_3005098 + ldr r1, _0815BCCC @ =gTasks+0x8 adds r5, r0, r1 bl sub_815B220 ldr r1, _0815BCD0 @ =gUnknown_20370C0 @@ -2171,7 +2171,7 @@ sub_815BC90: @ 815BC90 movs r0, 0x9 b _0815BCE2 .align 2, 0 -_0815BCCC: .4byte gUnknown_3005098 +_0815BCCC: .4byte gTasks+0x8 _0815BCD0: .4byte gUnknown_20370C0 _0815BCD4: .4byte gUnknown_203F444 _0815BCD8: .4byte gMain @@ -2182,7 +2182,7 @@ _0815BCE2: strh r0, [r5, 0xC] movs r0, 0 strh r0, [r5, 0xE] - ldr r1, _0815BCFC @ =gUnknown_3005090 + ldr r1, _0815BCFC @ =gTasks lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -2193,7 +2193,7 @@ _0815BCE2: pop {r0} bx r0 .align 2, 0 -_0815BCFC: .4byte gUnknown_3005090 +_0815BCFC: .4byte gTasks _0815BD00: .4byte sub_815BD04 thumb_func_end sub_815BC90 @@ -2205,7 +2205,7 @@ sub_815BD04: @ 815BD04 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0815BD24 @ =gUnknown_3005098 + ldr r1, _0815BD24 @ =gTasks+0x8 adds r4, r0, r1 movs r1, 0xE ldrsh r0, [r4, r1] @@ -2215,7 +2215,7 @@ sub_815BD04: @ 815BD04 beq _0815BD36 b _0815BD4C .align 2, 0 -_0815BD24: .4byte gUnknown_3005098 +_0815BD24: .4byte gTasks+0x8 _0815BD28: ldrb r0, [r4, 0xC] bl sub_80D08B8 diff --git a/asm/title_screen.s b/asm/title_screen.s index e3c2adb02..33c7d7386 100644 --- a/asm/title_screen.s +++ b/asm/title_screen.s @@ -297,7 +297,7 @@ sub_8078BB4: @ 8078BB4 ldrb r0, [r1] cmp r0, 0xFF beq _08078BE0 - ldr r2, _08078BE8 @ =gUnknown_3005090 + ldr r2, _08078BE8 @ =gTasks adds r1, r0, 0 lsls r0, r1, 2 adds r0, r1 @@ -311,7 +311,7 @@ _08078BE0: bx r0 .align 2, 0 _08078BE4: .4byte gUnknown_2037F30 -_08078BE8: .4byte gUnknown_3005090 +_08078BE8: .4byte gTasks thumb_func_end sub_8078BB4 thumb_func_start sub_8078BEC @@ -322,7 +322,7 @@ sub_8078BEC: @ 8078BEC lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _08078C18 @ =gUnknown_3005098 + ldr r1, _08078C18 @ =gTasks+0x8 adds r0, r1 movs r3, 0 ldrsh r1, [r0, r3] @@ -338,7 +338,7 @@ _08078C12: pop {r0} bx r0 .align 2, 0 -_08078C18: .4byte gUnknown_3005098 +_08078C18: .4byte gTasks+0x8 _08078C1C: .4byte 0x00000a8b _08078C20: .4byte gUnknown_2037F30 thumb_func_end sub_8078BEC @@ -351,7 +351,7 @@ sub_8078C24: @ 8078C24 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _08078C6C @ =gUnknown_3005098 + ldr r0, _08078C6C @ =gTasks+0x8 adds r4, r1, r0 ldr r0, _08078C70 @ =gMain ldrh r1, [r0, 0x2E] @@ -377,7 +377,7 @@ sub_8078C24: @ 8078C24 bl sub_8078C90 b _08078C86 .align 2, 0 -_08078C6C: .4byte gUnknown_3005098 +_08078C6C: .4byte gTasks+0x8 _08078C70: .4byte gMain _08078C74: ldr r0, _08078C8C @ =gUnknown_83BFB84 @@ -1158,7 +1158,7 @@ sub_80792C8: @ 80792C8 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080792EC @ =gUnknown_3005098 + ldr r1, _080792EC @ =gTasks+0x8 adds r4, r0, r1 movs r1, 0 ldrsh r0, [r4, r1] @@ -1172,7 +1172,7 @@ _080792E2: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080792EC: .4byte gUnknown_3005098 +_080792EC: .4byte gTasks+0x8 _080792F0: .4byte _080792F4 .align 2, 0 _080792F4: @@ -1321,7 +1321,7 @@ sub_807941C: @ 807941C lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _08079460 @ =gUnknown_3005098 + ldr r1, _08079460 @ =gTasks+0x8 adds r5, r0, r1 movs r1, 0x1E ldrsh r0, [r5, r1] @@ -1350,7 +1350,7 @@ _08079444: bl DestroyTask b _08079510 .align 2, 0 -_08079460: .4byte gUnknown_3005098 +_08079460: .4byte gTasks+0x8 _08079464: .4byte gUnknown_2037AB8 _08079468: movs r1, 0x2 @@ -1458,7 +1458,7 @@ sub_8079528: @ 8079528 bl FindTaskIdByFunc lsls r0, 24 lsrs r0, 24 - ldr r2, _0807954C @ =gUnknown_3005090 + ldr r2, _0807954C @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -1469,7 +1469,7 @@ sub_8079528: @ 8079528 bx r0 .align 2, 0 _08079548: .4byte sub_807941C -_0807954C: .4byte gUnknown_3005090 +_0807954C: .4byte gTasks thumb_func_end sub_8079528 thumb_func_start sub_8079550 @@ -1878,7 +1878,7 @@ sub_8079840: @ 8079840 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _08079868 @ =gUnknown_3005098 + ldr r1, _08079868 @ =gTasks+0x8 adds r6, r0, r1 movs r1, 0 ldrsh r0, [r6, r1] @@ -1888,7 +1888,7 @@ sub_8079840: @ 8079840 beq _08079884 b _0807998A .align 2, 0 -_08079868: .4byte gUnknown_3005098 +_08079868: .4byte gTasks+0x8 _0807986C: ldr r2, _08079880 @ =0x00007878 adds r0, r5, 0 diff --git a/asm/tm_case.s b/asm/tm_case.s index ce72101c4..303586153 100644 --- a/asm/tm_case.s +++ b/asm/tm_case.s @@ -229,7 +229,7 @@ _081319CA: ldrh r1, [r2, 0xA] ldrh r2, [r2, 0x8] bl ListMenuInit - ldr r2, _08131A00 @ =gUnknown_3005090 + ldr r2, _08131A00 @ =gTasks lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -242,7 +242,7 @@ _081319CA: _081319F4: .4byte sub_81322D4 _081319F8: .4byte gUnknown_3005E70 _081319FC: .4byte gUnknown_203B10C -_08131A00: .4byte gUnknown_3005090 +_08131A00: .4byte gTasks _08131A04: bl sub_8132018 b _08131A52 @@ -1288,7 +1288,7 @@ sub_8132230: @ 8132230 str r2, [sp] movs r3, 0x10 bl BeginNormalPaletteFade - ldr r1, _08132264 @ =gUnknown_3005090 + ldr r1, _08132264 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -1300,7 +1300,7 @@ sub_8132230: @ 8132230 pop {r0} bx r0 .align 2, 0 -_08132264: .4byte gUnknown_3005090 +_08132264: .4byte gTasks _08132268: .4byte sub_813226C thumb_func_end sub_8132230 @@ -1312,7 +1312,7 @@ sub_813226C: @ 813226C lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _081322A4 @ =gUnknown_3005098 + ldr r1, _081322A4 @ =gTasks+0x8 adds r2, r0, r1 ldr r0, _081322A8 @ =gUnknown_2037AB8 ldrb r1, [r0, 0x7] @@ -1333,7 +1333,7 @@ sub_813226C: @ 813226C bl SetMainCallback2 b _081322BE .align 2, 0 -_081322A4: .4byte gUnknown_3005098 +_081322A4: .4byte gTasks+0x8 _081322A8: .4byte gUnknown_2037AB8 _081322AC: .4byte gUnknown_203B116 _081322B0: .4byte gUnknown_203B118 @@ -1363,7 +1363,7 @@ sub_81322D4: @ 81322D4 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 - ldr r1, _08132340 @ =gUnknown_3005098 + ldr r1, _08132340 @ =gTasks+0x8 adds r6, r0, r1 ldr r0, _08132344 @ =gUnknown_2037AB8 ldrb r1, [r0, 0x7] @@ -1405,7 +1405,7 @@ sub_81322D4: @ 81322D4 strh r1, [r0] b _08132370 .align 2, 0 -_08132340: .4byte gUnknown_3005098 +_08132340: .4byte gTasks+0x8 _08132344: .4byte gUnknown_2037AB8 _08132348: .4byte gUnknown_203B116 _0813234C: .4byte gMain @@ -1452,7 +1452,7 @@ _0813237C: bl sub_809A798 ldr r1, _081323D4 @ =gUnknown_203AD30 strh r0, [r1] - ldr r0, _081323D8 @ =gUnknown_3005090 + ldr r0, _081323D8 @ =gTasks lsls r1, r7, 2 adds r1, r7 lsls r1, 3 @@ -1472,7 +1472,7 @@ _081323C8: bx r0 .align 2, 0 _081323D4: .4byte gUnknown_203AD30 -_081323D8: .4byte gUnknown_3005090 +_081323D8: .4byte gTasks _081323DC: .4byte gUnknown_8463140 _081323E0: .4byte gUnknown_203B10C thumb_func_end sub_81322D4 @@ -1486,7 +1486,7 @@ sub_81323E4: @ 81323E4 movs r0, 0 bl sub_8131F64 bl sub_8132018 - ldr r1, _0813240C @ =gUnknown_3005090 + ldr r1, _0813240C @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -1497,7 +1497,7 @@ sub_81323E4: @ 81323E4 pop {r0} bx r0 .align 2, 0 -_0813240C: .4byte gUnknown_3005090 +_0813240C: .4byte gTasks _08132410: .4byte sub_81322D4 thumb_func_end sub_81323E4 @@ -1628,7 +1628,7 @@ _08132528: bl schedule_bg_copy_tilemap_to_vram movs r0, 0x1 bl schedule_bg_copy_tilemap_to_vram - ldr r0, _08132560 @ =gUnknown_3005090 + ldr r0, _08132560 @ =gTasks lsls r1, r7, 2 adds r1, r7 lsls r1, 3 @@ -1645,7 +1645,7 @@ _08132550: .4byte gUnknown_846316B _08132554: .4byte gUnknown_8463150 _08132558: .4byte gUnknown_203AD30 _0813255C: .4byte gUnknown_8416301 -_08132560: .4byte gUnknown_3005090 +_08132560: .4byte gTasks _08132564: .4byte sub_8132568 thumb_func_end sub_8132414 @@ -1770,7 +1770,7 @@ sub_813265C: @ 813265C lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _081326D0 @ =gUnknown_3005098 + ldr r1, _081326D0 @ =gTasks+0x8 adds r0, r1 ldrh r1, [r0, 0x2] movs r0, 0x4 @@ -1810,7 +1810,7 @@ sub_813265C: @ 813265C bl sub_81326F8 b _081326F2 .align 2, 0 -_081326D0: .4byte gUnknown_3005098 +_081326D0: .4byte gTasks+0x8 _081326D4: .4byte gUnknown_203B118 _081326D8: ldr r1, [r6] @@ -1908,7 +1908,7 @@ sub_8132780: @ 8132780 lsls r5, r6, 2 adds r5, r6 lsls r5, 3 - ldr r0, _081327F0 @ =gUnknown_3005098 + ldr r0, _081327F0 @ =gTasks+0x8 adds r5, r0 ldrb r0, [r5] ldr r4, _081327F4 @ =gUnknown_203B116 @@ -1946,7 +1946,7 @@ sub_8132780: @ 8132780 pop {r0} bx r0 .align 2, 0 -_081327F0: .4byte gUnknown_3005098 +_081327F0: .4byte gTasks+0x8 _081327F4: .4byte gUnknown_203B116 _081327F8: .4byte gUnknown_3005E70 thumb_func_end sub_8132780 @@ -1960,7 +1960,7 @@ sub_81327FC: @ 81327FC lsls r4, r5, 2 adds r4, r5 lsls r4, 3 - ldr r0, _08132860 @ =gUnknown_3005098 + ldr r0, _08132860 @ =gTasks+0x8 adds r4, r0 ldr r0, _08132864 @ =gUnknown_203B118 ldr r0, [r0] @@ -1992,7 +1992,7 @@ sub_81327FC: @ 81327FC pop {r0} bx r0 .align 2, 0 -_08132860: .4byte gUnknown_3005098 +_08132860: .4byte gTasks+0x8 _08132864: .4byte gUnknown_203B118 thumb_func_end sub_81327FC @@ -2004,7 +2004,7 @@ sub_8132868: @ 8132868 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _081328A0 @ =gUnknown_3005098 + ldr r1, _081328A0 @ =gTasks+0x8 adds r0, r1 ldrh r1, [r0, 0x2] movs r0, 0x4 @@ -2023,7 +2023,7 @@ sub_8132868: @ 8132868 bl sub_8132230 b _081328B2 .align 2, 0 -_081328A0: .4byte gUnknown_3005098 +_081328A0: .4byte gTasks+0x8 _081328A4: .4byte gUnknown_203B118 _081328A8: .4byte c2_8123744 _081328AC: @@ -2043,7 +2043,7 @@ sub_81328B8: @ 81328B8 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _081328F0 @ =gUnknown_3005098 + ldr r1, _081328F0 @ =gTasks+0x8 adds r0, r1 ldrh r1, [r0, 0x2] movs r0, 0x4 @@ -2062,7 +2062,7 @@ sub_81328B8: @ 81328B8 bl sub_8132230 b _08132902 .align 2, 0 -_081328F0: .4byte gUnknown_3005098 +_081328F0: .4byte gTasks+0x8 _081328F4: .4byte gUnknown_203B118 _081328F8: .4byte sub_808CE60 _081328FC: @@ -2083,7 +2083,7 @@ sub_8132908: @ 8132908 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _08132950 @ =gUnknown_3005098 + ldr r1, _08132950 @ =gTasks+0x8 adds r4, r0, r1 ldr r6, _08132954 @ =gUnknown_203AD30 ldrh r0, [r6] @@ -2108,7 +2108,7 @@ sub_8132908: @ 8132908 bl sub_813337C b _081329AE .align 2, 0 -_08132950: .4byte gUnknown_3005098 +_08132950: .4byte gTasks+0x8 _08132954: .4byte gUnknown_203AD30 _08132958: .4byte gStringVar1 _0813295C: .4byte gStringVar4 @@ -2166,7 +2166,7 @@ sub_81329C4: @ 81329C4 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 - ldr r0, _08132A20 @ =gUnknown_3005098 + ldr r0, _08132A20 @ =gTasks+0x8 adds r4, r0 ldr r6, _08132A24 @ =gStringVar3 ldrh r1, [r4, 0x2] @@ -2200,7 +2200,7 @@ sub_81329C4: @ 81329C4 pop {r0} bx r0 .align 2, 0 -_08132A20: .4byte gUnknown_3005098 +_08132A20: .4byte gTasks+0x8 _08132A24: .4byte gStringVar3 _08132A28: .4byte gStringVar4 _08132A2C: .4byte gUnknown_8416936 @@ -2229,7 +2229,7 @@ sub_8132A48: @ 8132A48 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 - ldr r0, _08132AA8 @ =gUnknown_3005098 + ldr r0, _08132AA8 @ =gTasks+0x8 adds r4, r0 movs r0, 0x8 movs r1, 0 @@ -2260,7 +2260,7 @@ sub_8132A48: @ 8132A48 pop {r0} bx r0 .align 2, 0 -_08132AA8: .4byte gUnknown_3005098 +_08132AA8: .4byte gTasks+0x8 thumb_func_end sub_8132A48 thumb_func_start sub_8132AAC @@ -2274,7 +2274,7 @@ sub_8132AAC: @ 8132AAC lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r6, _08132B48 @ =gUnknown_3005098 + ldr r6, _08132B48 @ =gTasks+0x8 adds r0, r4, r6 mov r8, r0 movs r0, 0x7 @@ -2333,7 +2333,7 @@ sub_8132AAC: @ 8132AAC pop {r0} bx r0 .align 2, 0 -_08132B48: .4byte gUnknown_3005098 +_08132B48: .4byte gTasks+0x8 _08132B4C: .4byte gStringVar1 _08132B50: .4byte gStringVar4 _08132B54: .4byte gUnknown_84162B9 @@ -2400,7 +2400,7 @@ sub_8132BC8: @ 8132BC8 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _08132C14 @ =gUnknown_3005098 + ldr r1, _08132C14 @ =gTasks+0x8 adds r5, r0, r1 adds r0, r5, 0 adds r0, 0x10 @@ -2427,7 +2427,7 @@ sub_8132BC8: @ 8132BC8 bl sub_8132B5C b _08132CA6 .align 2, 0 -_08132C14: .4byte gUnknown_3005098 +_08132C14: .4byte gTasks+0x8 _08132C18: ldr r0, _08132C4C @ =gMain ldrh r1, [r0, 0x2E] @@ -2497,7 +2497,7 @@ sub_8132CAC: @ 8132CAC lsls r4, r5, 2 adds r4, r5 lsls r4, 3 - ldr r0, _08132D18 @ =gUnknown_3005098 + ldr r0, _08132D18 @ =gTasks+0x8 adds r4, r0 movs r0, 0 bl PutWindowTilemap @@ -2536,7 +2536,7 @@ sub_8132CAC: @ 8132CAC pop {r0} bx r0 .align 2, 0 -_08132D18: .4byte gUnknown_3005098 +_08132D18: .4byte gTasks+0x8 _08132D1C: .4byte gUnknown_203AD30 _08132D20: .4byte gStringVar1 _08132D24: .4byte gStringVar3 @@ -2557,7 +2557,7 @@ sub_8132D34: @ 8132D34 lsls r6, r0, 2 adds r6, r0 lsls r6, 3 - ldr r0, _08132DF4 @ =gUnknown_3005098 + ldr r0, _08132DF4 @ =gTasks+0x8 mov r9, r0 adds r1, r6, 0 add r1, r9 @@ -2631,7 +2631,7 @@ sub_8132D34: @ 8132D34 pop {r0} bx r0 .align 2, 0 -_08132DF4: .4byte gUnknown_3005098 +_08132DF4: .4byte gTasks+0x8 _08132DF8: .4byte gUnknown_203AD30 _08132DFC: .4byte gSaveBlock1Ptr _08132E00: .4byte gUnknown_203B116 @@ -2768,7 +2768,7 @@ sub_8132F20: @ 8132F20 lsls r1, r0, 2 adds r1, r0 lsls r3, r1, 3 - ldr r4, _08132F54 @ =gUnknown_3005098 + ldr r4, _08132F54 @ =gTasks+0x8 adds r2, r3, r4 ldr r0, _08132F58 @ =gUnknown_2037AB8 ldrb r1, [r0, 0x7] @@ -2790,7 +2790,7 @@ _08132F4E: pop {r0} bx r0 .align 2, 0 -_08132F54: .4byte gUnknown_3005098 +_08132F54: .4byte gTasks+0x8 _08132F58: .4byte gUnknown_2037AB8 _08132F5C: .4byte sub_8132F60 thumb_func_end sub_8132F20 @@ -2804,7 +2804,7 @@ sub_8132F60: @ 8132F60 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _08132FA4 @ =gUnknown_3005098 + ldr r1, _08132FA4 @ =gTasks+0x8 adds r6, r0, r1 ldr r0, _08132FA8 @ =gMain ldrh r1, [r0, 0x2E] @@ -2832,7 +2832,7 @@ _08132F98: ldr r0, [r0] mov pc, r0 .align 2, 0 -_08132FA4: .4byte gUnknown_3005098 +_08132FA4: .4byte gTasks+0x8 _08132FA8: .4byte gMain _08132FAC: .4byte _08132FB0 .align 2, 0 @@ -2956,7 +2956,7 @@ _081330B0: movs r1, 0x4 movs r3, 0 bl sub_813337C - ldr r1, _081330D8 @ =gUnknown_3005090 + ldr r1, _081330D8 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -2966,7 +2966,7 @@ _081330B0: b _081331EA .align 2, 0 _081330D4: .4byte gUnknown_841C587 -_081330D8: .4byte gUnknown_3005090 +_081330D8: .4byte gTasks _081330DC: .4byte sub_8132F60 _081330E0: bl RunTextPrinters @@ -3012,7 +3012,7 @@ _0813312C: movs r1, 0x4 movs r3, 0 bl sub_813337C - ldr r1, _08133154 @ =gUnknown_3005090 + ldr r1, _08133154 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -3022,7 +3022,7 @@ _0813312C: b _081331EA .align 2, 0 _08133150: .4byte gUnknown_841C693 -_08133154: .4byte gUnknown_3005090 +_08133154: .4byte gTasks _08133158: .4byte sub_8132F60 _0813315C: ldr r0, _0813316C @ =gMain diff --git a/asm/trade.s b/asm/trade.s index cbcf57400..8351a9a73 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -12659,7 +12659,7 @@ _08053180: bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080531E4 @ =gUnknown_3005090 + ldr r2, _080531E4 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -12683,7 +12683,7 @@ _080531D8: .align 2, 0 _080531DC: .4byte gUnknown_2031DAC _080531E0: .4byte c3_08054588 -_080531E4: .4byte gUnknown_3005090 +_080531E4: .4byte gTasks _080531E8: ldr r0, [r7] adds r0, 0x90 @@ -15012,7 +15012,7 @@ c3_08054588: @ 8054588 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080545C0 @ =gUnknown_3005098 + ldr r1, _080545C0 @ =gTasks+0x8 adds r4, r0, r1 ldr r1, _080545C4 @ =gUnknown_826D250 movs r2, 0 @@ -15035,7 +15035,7 @@ c3_08054588: @ 8054588 adds r0, r1 b _080545D6 .align 2, 0 -_080545C0: .4byte gUnknown_3005098 +_080545C0: .4byte gTasks+0x8 _080545C4: .4byte gUnknown_826D250 _080545C8: .4byte gUnknown_826BB5C _080545CC: @@ -15125,7 +15125,7 @@ c3_0805465C: @ 805465C lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _08054728 @ =gUnknown_3005098 + ldr r1, _08054728 @ =gTasks+0x8 adds r7, r0, r1 movs r0, 0 ldrsh r4, [r7, r0] @@ -15215,7 +15215,7 @@ _0805471E: pop {r0} bx r0 .align 2, 0 -_08054728: .4byte gUnknown_3005098 +_08054728: .4byte gTasks+0x8 _0805472C: .4byte gUnknown_2031DAC _08054730: .4byte 0x0000010b thumb_func_end c3_0805465C @@ -15229,7 +15229,7 @@ sub_8054734: @ 8054734 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 - ldr r1, _080547E8 @ =gUnknown_3005098 + ldr r1, _080547E8 @ =gTasks+0x8 adds r6, r0, r1 movs r1, 0 ldrsh r0, [r6, r1] @@ -15308,7 +15308,7 @@ _08054774: bl BlendPalettes b _0805480C .align 2, 0 -_080547E8: .4byte gUnknown_3005098 +_080547E8: .4byte gTasks+0x8 _080547EC: .4byte gUnknown_2031DAC _080547F0: .4byte 0x00000109 _080547F4: .4byte 0x0000010b diff --git a/asm/trainer_card.s b/asm/trainer_card.s index f0647f9eb..5d0cab90e 100644 --- a/asm/trainer_card.s +++ b/asm/trainer_card.s @@ -4147,7 +4147,7 @@ sub_808B21C: @ 808B21C lsls r0, 24 lsrs r0, 24 ldr r5, _0808B24C @ =gUnknown_83CD908 - ldr r2, _0808B250 @ =gUnknown_3005090 + ldr r2, _0808B250 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -4168,7 +4168,7 @@ _0808B22E: bx r0 .align 2, 0 _0808B24C: .4byte gUnknown_83CD908 -_0808B250: .4byte gUnknown_3005090 +_0808B250: .4byte gTasks thumb_func_end sub_808B21C thumb_func_start sub_808B254 diff --git a/asm/trainer_see.s b/asm/trainer_see.s index 59bc4d419..29c9b1983 100644 --- a/asm/trainer_see.s +++ b/asm/trainer_see.s @@ -470,7 +470,7 @@ sub_8081E68: @ 8081E68 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _08081E98 @ =gUnknown_3005090 + ldr r0, _08081E98 @ =gTasks adds r1, r0 lsrs r0, r5, 16 strh r0, [r1, 0xA] @@ -481,7 +481,7 @@ sub_8081E68: @ 8081E68 bx r0 .align 2, 0 _08081E94: .4byte RunTrainerSeeFuncList -_08081E98: .4byte gUnknown_3005090 +_08081E98: .4byte gTasks thumb_func_end sub_8081E68 thumb_func_start sub_8081E9C @@ -498,7 +498,7 @@ sub_8081E9C: @ 8081E9C adds r1, r5, 0 adds r2, r6, 0 bl SetTaskFuncWithFollowupFunc - ldr r1, _08081ED8 @ =gUnknown_3005090 + ldr r1, _08081ED8 @ =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -512,7 +512,7 @@ sub_8081E9C: @ 8081E9C bx r0 .align 2, 0 _08081ED4: .4byte RunTrainerSeeFuncList -_08081ED8: .4byte gUnknown_3005090 +_08081ED8: .4byte gTasks thumb_func_end sub_8081E9C thumb_func_start RunTrainerSeeFuncList @@ -523,7 +523,7 @@ RunTrainerSeeFuncList: @ 8081EDC lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _08081F08 @ =gUnknown_3005090 + ldr r1, _08081F08 @ =gTasks adds r5, r0, r1 movs r1, 0xA ldrsh r0, [r5, r1] @@ -538,7 +538,7 @@ RunTrainerSeeFuncList: @ 8081EDC bl SwitchTaskToFollowupFunc b _08081F28 .align 2, 0 -_08081F08: .4byte gUnknown_3005090 +_08081F08: .4byte gTasks _08081F0C: ldr r7, _08081F30 @ =gUnknown_83C7258 _08081F0E: @@ -1238,7 +1238,7 @@ sub_808243C: @ 808243C lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080824D0 @ =gUnknown_3005090 + ldr r1, _080824D0 @ =gTasks adds r4, r0, r1 adds r0, r4, 0 adds r0, 0xA @@ -1297,7 +1297,7 @@ _0808246E: bl DestroyTask b _080824E2 .align 2, 0 -_080824D0: .4byte gUnknown_3005090 +_080824D0: .4byte gTasks _080824D4: .4byte gUnknown_83C7294 _080824D8: ldr r2, [sp] @@ -1325,7 +1325,7 @@ sub_80824EC: @ 80824EC lsls r0, r1, 2 adds r0, r1 lsls r0, 3 - ldr r1, _0808251C @ =gUnknown_3005098 + ldr r1, _0808251C @ =gTasks+0x8 adds r0, r1 adds r0, 0x2 adds r1, r4, 0 @@ -1335,7 +1335,7 @@ sub_80824EC: @ 80824EC bx r0 .align 2, 0 _08082518: .4byte sub_808243C -_0808251C: .4byte gUnknown_3005098 +_0808251C: .4byte gTasks+0x8 thumb_func_end sub_80824EC thumb_func_start ScrSpecial_EndTrainerApproach diff --git a/asm/union_room_chat.s b/asm/union_room_chat.s index b56512278..48a4e478f 100644 --- a/asm/union_room_chat.s +++ b/asm/union_room_chat.s @@ -2713,7 +2713,7 @@ sub_81298F8: @ 81298F8 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0812991C @ =gUnknown_3005098 + ldr r1, _0812991C @ =gTasks+0x8 adds r4, r0, r1 movs r1, 0 ldrsh r0, [r4, r1] @@ -2727,7 +2727,7 @@ _08129912: ldr r0, [r0] mov pc, r0 .align 2, 0 -_0812991C: .4byte gUnknown_3005098 +_0812991C: .4byte gTasks+0x8 _08129920: .4byte _08129924 .align 2, 0 _08129924: diff --git a/asm/unk_810C3A4.s b/asm/unk_810C3A4.s index 1b7288808..a202dc769 100644 --- a/asm/unk_810C3A4.s +++ b/asm/unk_810C3A4.s @@ -25,7 +25,7 @@ sub_810C3B8: @ 810C3B8 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _0810C43C @ =gUnknown_3005090 + ldr r1, _0810C43C @ =gTasks adds r5, r0, r1 movs r1, 0x8 ldrsh r0, [r5, r1] @@ -84,7 +84,7 @@ _0810C436: pop {r0} bx r0 .align 2, 0 -_0810C43C: .4byte gUnknown_3005090 +_0810C43C: .4byte gTasks _0810C440: .4byte gUnknown_2036E38 thumb_func_end sub_810C3B8 diff --git a/asm/unk_8147500.s b/asm/unk_8147500.s index aa99e352c..23a3b1b9c 100644 --- a/asm/unk_8147500.s +++ b/asm/unk_8147500.s @@ -133,7 +133,7 @@ sub_81475C0: @ 81475C0 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _08147604 @ =gUnknown_3005090 + ldr r1, _08147604 @ =gTasks adds r0, r1 movs r1, 0x1 strh r1, [r0, 0x8] @@ -150,7 +150,7 @@ sub_81475C0: @ 81475C0 bx r1 .align 2, 0 _08147600: .4byte sub_8147654 -_08147604: .4byte gUnknown_3005090 +_08147604: .4byte gTasks _08147608: .4byte gUnknown_846B4AC thumb_func_end sub_81475C0 @@ -163,7 +163,7 @@ sub_814760C: @ 814760C lsrs r2, r0, 24 cmp r2, 0xFF beq _08147638 - ldr r0, _08147634 @ =gUnknown_3005090 + ldr r0, _08147634 @ =gTasks lsls r1, r2, 2 adds r1, r2 lsls r1, 3 @@ -174,7 +174,7 @@ sub_814760C: @ 814760C b _0814763A .align 2, 0 _08147630: .4byte sub_8147654 -_08147634: .4byte gUnknown_3005090 +_08147634: .4byte gTasks _08147638: movs r0, 0 _0814763A: @@ -203,7 +203,7 @@ sub_8147654: @ 8147654 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _08147678 @ =gUnknown_3005098 + ldr r1, _08147678 @ =gTasks+0x8 adds r4, r0, r1 movs r1, 0 ldrsh r0, [r4, r1] @@ -215,7 +215,7 @@ sub_8147654: @ 8147654 beq _08147682 b _081476D6 .align 2, 0 -_08147678: .4byte gUnknown_3005098 +_08147678: .4byte gTasks+0x8 _0814767C: cmp r0, 0x4 beq _081476BC @@ -389,7 +389,7 @@ sub_81477C0: @ 81477C0 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r1, _08147840 @ =gUnknown_3005098 + ldr r1, _08147840 @ =gTasks+0x8 adds r4, r1 movs r5, 0 strh r5, [r4, 0x4] @@ -444,7 +444,7 @@ sub_81477C0: @ 81477C0 pop {r0} bx r0 .align 2, 0 -_08147840: .4byte gUnknown_3005098 +_08147840: .4byte gTasks+0x8 _08147844: .4byte gSprites _08147848: .4byte 0x0000ffe0 thumb_func_end sub_81477C0 @@ -458,11 +458,11 @@ sub_814784C: @ 814784C lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _08147860 @ =gUnknown_3005098 + ldr r0, _08147860 @ =gTasks+0x8 adds r4, r1, r0 b _08147880 .align 2, 0 -_08147860: .4byte gUnknown_3005098 +_08147860: .4byte gTasks+0x8 _08147864: lsls r0, r5, 1 adds r0, r4 @@ -514,7 +514,7 @@ sub_81478BC: @ 81478BC lsls r0, r1, 2 adds r0, r1 lsls r0, 3 - ldr r1, _08147900 @ =gUnknown_3005098 + ldr r1, _08147900 @ =gTasks+0x8 adds r5, r0, r1 movs r1, 0x16 ldrsh r0, [r5, r1] @@ -541,7 +541,7 @@ sub_81478BC: @ 81478BC ldr r0, [r0] mov pc, r0 .align 2, 0 -_08147900: .4byte gUnknown_3005098 +_08147900: .4byte gTasks+0x8 _08147904: .4byte _08147908 .align 2, 0 _08147908: @@ -653,7 +653,7 @@ sub_81479D4: @ 81479D4 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r5, _08147A28 @ =gUnknown_3005098 + ldr r5, _08147A28 @ =gTasks+0x8 adds r6, r4, r5 movs r0, 0x31 bl PlaySE @@ -688,7 +688,7 @@ sub_81479D4: @ 81479D4 pop {r0} bx r0 .align 2, 0 -_08147A28: .4byte gUnknown_3005098 +_08147A28: .4byte gTasks+0x8 _08147A2C: .4byte gSprites _08147A30: .4byte sub_81478BC thumb_func_end sub_81479D4 @@ -702,7 +702,7 @@ sub_8147A34: @ 8147A34 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _08147A88 @ =gUnknown_3005098 + ldr r0, _08147A88 @ =gTasks+0x8 adds r4, r1, r0 ldr r0, _08147A8C @ =gUnknown_3003F64 ldrb r0, [r0] @@ -736,7 +736,7 @@ _08147A5C: bl sub_80F9E2C b _08147A9E .align 2, 0 -_08147A88: .4byte gUnknown_3005098 +_08147A88: .4byte gTasks+0x8 _08147A8C: .4byte gUnknown_3003F64 _08147A90: .4byte gUnknown_3003ED0 _08147A94: .4byte 0x00007fff diff --git a/asm/unk_8147AA8.s b/asm/unk_8147AA8.s index 9ec376b6f..fc9620900 100644 --- a/asm/unk_8147AA8.s +++ b/asm/unk_8147AA8.s @@ -2626,7 +2626,7 @@ sub_8148E80: @ 8148E80 lsls r0, 2 add r0, r10 lsls r0, 3 - ldr r1, _08148EB4 @ =gUnknown_3005098 + ldr r1, _08148EB4 @ =gTasks+0x8 adds r6, r0, r1 mov r0, r10 movs r1, 0xE @@ -2640,7 +2640,7 @@ sub_8148E80: @ 8148E80 beq _08148ED8 b _08148F44 .align 2, 0 -_08148EB4: .4byte gUnknown_3005098 +_08148EB4: .4byte gTasks+0x8 _08148EB8: bl sub_8147C20 mov r0, r10 @@ -7833,7 +7833,7 @@ sub_814B524: @ 814B524 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0814B548 @ =gUnknown_3005098 + ldr r1, _0814B548 @ =gTasks+0x8 adds r4, r0, r1 movs r1, 0 ldrsh r0, [r4, r1] @@ -7845,7 +7845,7 @@ sub_814B524: @ 814B524 beq _0814B556 b _0814B5BE .align 2, 0 -_0814B548: .4byte gUnknown_3005098 +_0814B548: .4byte gTasks+0x8 _0814B54C: cmp r0, 0x2 beq _0814B57C diff --git a/asm/unk_814D5C8.s b/asm/unk_814D5C8.s index 4eccb9200..313bf9f78 100644 --- a/asm/unk_814D5C8.s +++ b/asm/unk_814D5C8.s @@ -2272,7 +2272,7 @@ sub_814E830: @ 814E830 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _0814E864 @ =gUnknown_3005098 + ldr r1, _0814E864 @ =gTasks+0x8 adds r7, r0, r1 movs r1, 0 ldrsh r0, [r7, r1] @@ -2284,7 +2284,7 @@ sub_814E830: @ 814E830 beq _0814E876 b _0814EA66 .align 2, 0 -_0814E864: .4byte gUnknown_3005098 +_0814E864: .4byte gTasks+0x8 _0814E868: cmp r0, 0x2 bne _0814E86E @@ -2535,7 +2535,7 @@ sub_814EA7C: @ 814EA7C bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _0814EAC8 @ =gUnknown_3005090 + ldr r2, _0814EAC8 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -2563,7 +2563,7 @@ sub_814EA7C: @ 814EA7C bx r0 .align 2, 0 _0814EAC4: .4byte sub_814E830 -_0814EAC8: .4byte gUnknown_3005090 +_0814EAC8: .4byte gTasks _0814EACC: .4byte gSaveBlock2Ptr _0814EAD0: .4byte 0x00000af6 thumb_func_end sub_814EA7C diff --git a/asm/unk_81507FC.s b/asm/unk_81507FC.s index 48658e337..7f189f1d3 100644 --- a/asm/unk_81507FC.s +++ b/asm/unk_81507FC.s @@ -1947,7 +1947,7 @@ sub_8151750: @ 8151750 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 - ldr r1, _08151774 @ =gUnknown_3005098 + ldr r1, _08151774 @ =gTasks+0x8 adds r6, r0, r1 movs r0, 0 ldrsh r5, [r6, r0] @@ -1959,7 +1959,7 @@ sub_8151750: @ 8151750 beq _0815177E b _08151836 .align 2, 0 -_08151774: .4byte gUnknown_3005098 +_08151774: .4byte gTasks+0x8 _08151778: cmp r5, 0x2 beq _081517BA @@ -6373,7 +6373,7 @@ sub_8153830: @ 8153830 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _08153854 @ =gUnknown_3005098 + ldr r1, _08153854 @ =gTasks+0x8 adds r4, r0, r1 movs r1, 0 ldrsh r0, [r4, r1] @@ -6385,7 +6385,7 @@ sub_8153830: @ 8153830 beq _08153862 b _081538CA .align 2, 0 -_08153854: .4byte gUnknown_3005098 +_08153854: .4byte gTasks+0x8 _08153858: cmp r0, 0x2 beq _08153888 diff --git a/asm/unk_815F138.s b/asm/unk_815F138.s index f133d4e27..eaca7d2a4 100644 --- a/asm/unk_815F138.s +++ b/asm/unk_815F138.s @@ -32,7 +32,7 @@ sub_815F138: @ 815F138 bl CreateTask lsls r0, 24 lsrs r0, 24 - ldr r2, _0815F194 @ =gUnknown_3005090 + ldr r2, _0815F194 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -52,7 +52,7 @@ sub_815F138: @ 815F138 bx r0 .align 2, 0 _0815F190: .4byte sub_815F1AC -_0815F194: .4byte gUnknown_3005090 +_0815F194: .4byte gTasks thumb_func_end sub_815F138 thumb_func_start sub_815F198 @@ -77,7 +77,7 @@ sub_815F1AC: @ 815F1AC lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _0815F1D0 @ =gUnknown_3005098 + ldr r1, _0815F1D0 @ =gTasks+0x8 adds r5, r0, r1 movs r1, 0 ldrsh r0, [r5, r1] @@ -89,7 +89,7 @@ sub_815F1AC: @ 815F1AC beq _0815F1DA b _0815F29E .align 2, 0 -_0815F1D0: .4byte gUnknown_3005098 +_0815F1D0: .4byte gTasks+0x8 _0815F1D4: cmp r0, 0x2 beq _0815F260 diff --git a/asm/unknown_task.s b/asm/unknown_task.s index fbe75f05e..6f417a4a1 100644 --- a/asm/unknown_task.s +++ b/asm/unknown_task.s @@ -255,7 +255,7 @@ task00_for_dp12: @ 8088020 _08088048: .4byte gUnknown_203961C _0808804C: .4byte gUnknown_2039600 _08088050: - ldr r1, _0808807C @ =gUnknown_3005090 + ldr r1, _0808807C @ =gTasks mov r0, r12 lsls r2, r0, 2 adds r0, r2, r0 @@ -277,7 +277,7 @@ _08088050: ldr r0, [r0] mov pc, r0 .align 2, 0 -_0808807C: .4byte gUnknown_3005090 +_0808807C: .4byte gTasks _08088080: .4byte _08088084 .align 2, 0 _08088084: @@ -559,7 +559,7 @@ sub_8088230: @ 8088230 bl CreateTask lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _08088348 @ =gUnknown_3005090 + ldr r0, _08088348 @ =gTasks lsls r4, r7, 2 adds r4, r7 lsls r4, 3 @@ -634,7 +634,7 @@ _0808832A: _0808833C: .4byte 0x04000010 _08088340: .4byte 0xa2600001 _08088344: .4byte task00_for_dp12 -_08088348: .4byte gUnknown_3005090 +_08088348: .4byte gTasks _0808834C: .4byte gUnknown_2039600 _08088350: .4byte gUnknown_203961C _08088354: .4byte gUnknown_2038980 diff --git a/asm/vs_seeker.s b/asm/vs_seeker.s index 9d77618fb..00f880d86 100644 --- a/asm/vs_seeker.s +++ b/asm/vs_seeker.s @@ -15,7 +15,7 @@ sub_810C670: @ 810C670 lsls r1, r4, 2 adds r0, r1, r4 lsls r3, r0, 3 - ldr r5, _0810C6C4 @ =gUnknown_3005098 + ldr r5, _0810C6C4 @ =gTasks+0x8 adds r6, r1, 0 movs r1, 0 _0810C686: @@ -45,7 +45,7 @@ _0810C686: b _0810C6DC .align 2, 0 _0810C6C0: .4byte gUnknown_203ADB8 -_0810C6C4: .4byte gUnknown_3005098 +_0810C6C4: .4byte gTasks+0x8 _0810C6C8: .4byte 0x00000434 _0810C6CC: .4byte gUnknown_81C137C _0810C6D0: @@ -74,7 +74,7 @@ _0810C6F0: bl sub_80A2294 movs r0, 0x41 bl FieldEffectStart - ldr r1, _0810C728 @ =gUnknown_3005090 + ldr r1, _0810C728 @ =gTasks adds r0, r6, r4 lsls r0, 3 adds r0, r1 @@ -89,7 +89,7 @@ _0810C718: .align 2, 0 _0810C720: .4byte gUnknown_203AD30 _0810C724: .4byte 0x0000ffff -_0810C728: .4byte gUnknown_3005090 +_0810C728: .4byte gTasks _0810C72C: .4byte sub_810C730 thumb_func_end sub_810C670 @@ -98,7 +98,7 @@ sub_810C730: @ 810C730 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _0810C758 @ =gUnknown_3005090 + ldr r2, _0810C758 @ =gTasks lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -117,7 +117,7 @@ _0810C754: pop {r0} bx r0 .align 2, 0 -_0810C758: .4byte gUnknown_3005090 +_0810C758: .4byte gTasks _0810C75C: .4byte sub_810C760 thumb_func_end sub_810C730 @@ -129,7 +129,7 @@ sub_810C760: @ 810C760 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0810C7E8 @ =gUnknown_3005098 + ldr r1, _0810C7E8 @ =gTasks+0x8 adds r4, r0, r1 movs r1, 0x4 ldrsh r0, [r4, r1] @@ -177,7 +177,7 @@ _0810C794: ldr r3, _0810C7FC @ =gUnknown_8453F5C movs r0, 0xFF bl ScriptMovement_StartObjectMovementScript - ldr r1, _0810C800 @ =gUnknown_3005090 + ldr r1, _0810C800 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -189,13 +189,13 @@ _0810C7E2: pop {r0} bx r0 .align 2, 0 -_0810C7E8: .4byte gUnknown_3005098 +_0810C7E8: .4byte gTasks+0x8 _0810C7EC: .4byte gUnknown_845318C _0810C7F0: .4byte gUnknown_203ADB8 _0810C7F4: .4byte 0x00000431 _0810C7F8: .4byte gSaveBlock1Ptr _0810C7FC: .4byte gUnknown_8453F5C -_0810C800: .4byte gUnknown_3005090 +_0810C800: .4byte gTasks _0810C804: .4byte sub_810C8EC thumb_func_end sub_810C760 diff --git a/asm/wireless_communication_status_screen.s b/asm/wireless_communication_status_screen.s index d5f6ef747..5b3186c32 100644 --- a/asm/wireless_communication_status_screen.s +++ b/asm/wireless_communication_status_screen.s @@ -331,7 +331,7 @@ sub_814F46C: @ 814F46C sub sp, 0x8 lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _0814F498 @ =gUnknown_3005090 + ldr r1, _0814F498 @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -349,7 +349,7 @@ _0814F48E: ldr r0, [r0] mov pc, r0 .align 2, 0 -_0814F498: .4byte gUnknown_3005090 +_0814F498: .4byte gTasks _0814F49C: .4byte _0814F4A0 .align 2, 0 _0814F4A0: @@ -361,7 +361,7 @@ _0814F4A0: .4byte _0814F630 _0814F4B8: bl sub_814F3A8 - ldr r0, _0814F4D0 @ =gUnknown_3005090 + ldr r0, _0814F4D0 @ =gTasks lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -371,7 +371,7 @@ _0814F4B8: strh r0, [r1, 0x8] b _0814F648 .align 2, 0 -_0814F4D0: .4byte gUnknown_3005090 +_0814F4D0: .4byte gTasks _0814F4D4: movs r0, 0x1 negs r0, r0 @@ -485,7 +485,7 @@ _0814F5A4: _0814F5B8: movs r0, 0x5 bl PlaySE - ldr r2, _0814F5FC @ =gUnknown_3005090 + ldr r2, _0814F5FC @ =gTasks ldr r0, _0814F600 @ =gUnknown_3002040 ldr r0, [r0] adds r0, 0x61 @@ -507,7 +507,7 @@ _0814F5E2: mov r2, r8 adds r1, r2, r5 lsls r1, 3 - ldr r0, _0814F604 @ =gUnknown_3005098 + ldr r0, _0814F604 @ =gTasks+0x8 adds r1, r0 adds r0, r1, 0 adds r0, 0xE @@ -516,9 +516,9 @@ _0814F5E2: b _0814F648 .align 2, 0 _0814F5F8: .4byte gMain -_0814F5FC: .4byte gUnknown_3005090 +_0814F5FC: .4byte gTasks _0814F600: .4byte gUnknown_3002040 -_0814F604: .4byte gUnknown_3005098 +_0814F604: .4byte gTasks+0x8 _0814F608: movs r0, 0x1 negs r0, r0 @@ -528,7 +528,7 @@ _0814F608: movs r3, 0x10 bl BeginNormalPaletteFade _0814F618: - ldr r1, _0814F62C @ =gUnknown_3005090 + ldr r1, _0814F62C @ =gTasks lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -539,7 +539,7 @@ _0814F622: strh r1, [r0, 0x8] b _0814F648 .align 2, 0 -_0814F62C: .4byte gUnknown_3005090 +_0814F62C: .4byte gTasks _0814F630: ldr r0, _0814F654 @ =gUnknown_2037AB8 ldrb r1, [r0, 0x7] @@ -801,7 +801,7 @@ sub_814F7E4: @ 814F7E4 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _0814F84C @ =gUnknown_3005098 + ldr r1, _0814F84C @ =gTasks+0x8 adds r7, r0, r1 movs r4, 0 _0814F812: @@ -833,7 +833,7 @@ _0814F82C: movs r0, 0 b _0814F876 .align 2, 0 -_0814F84C: .4byte gUnknown_3005098 +_0814F84C: .4byte gTasks+0x8 _0814F850: adds r1, r6, 0 mov r0, sp 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/ld_script.txt b/ld_script.txt index c738889d4..f7071f2be 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -118,7 +118,7 @@ SECTIONS { asm/sound.o(.text); asm/battle_anim.o(.text); asm/battle_anim_8074480.o(.text); - asm/task.o(.text); + src/task.o(.text); asm/reshow_battle_screen.o(.text); asm/battle_anim_8078178.o(.text); asm/title_screen.o(.text); diff --git a/src/task.c b/src/task.c new file mode 100644 index 000000000..fafa7c70d --- /dev/null +++ b/src/task.c @@ -0,0 +1,219 @@ +#include "global.h" +#include "task.h" + +#define HEAD_SENTINEL 0xFE +#define TAIL_SENTINEL 0xFF + +struct Task gTasks[NUM_TASKS]; + +static void InsertTask(u8 newTaskId); +static u8 FindFirstActiveTask(); + +void ResetTasks(void) +{ + u8 i; + + for (i = 0; i < NUM_TASKS; i++) + { + gTasks[i].isActive = FALSE; + gTasks[i].func = TaskDummy; + gTasks[i].prev = i; + gTasks[i].next = i + 1; + gTasks[i].priority = -1; + memset(gTasks[i].data, 0, sizeof(gTasks[i].data)); + } + + gTasks[0].prev = HEAD_SENTINEL; + gTasks[NUM_TASKS - 1].next = TAIL_SENTINEL; +} + +u8 CreateTask(TaskFunc func, u8 priority) +{ + u8 i; + + for (i = 0; i < NUM_TASKS; i++) + { + if (!gTasks[i].isActive) + { + gTasks[i].func = func; + gTasks[i].priority = priority; + InsertTask(i); + memset(gTasks[i].data, 0, sizeof(gTasks[i].data)); + gTasks[i].isActive = TRUE; + return i; + } + } + + return 0; +} + +static void InsertTask(u8 newTaskId) +{ + u8 taskId = FindFirstActiveTask(); + + if (taskId == NUM_TASKS) + { + // The new task is the only task. + gTasks[newTaskId].prev = HEAD_SENTINEL; + gTasks[newTaskId].next = TAIL_SENTINEL; + return; + } + + while (1) + { + if (gTasks[newTaskId].priority < gTasks[taskId].priority) + { + // We've found a task with a higher priority value, + // so we insert the new task before it. + gTasks[newTaskId].prev = gTasks[taskId].prev; + gTasks[newTaskId].next = taskId; + if (gTasks[taskId].prev != HEAD_SENTINEL) + gTasks[gTasks[taskId].prev].next = newTaskId; + gTasks[taskId].prev = newTaskId; + return; + } + if (gTasks[taskId].next == TAIL_SENTINEL) + { + // We've reached the end. + gTasks[newTaskId].prev = taskId; + gTasks[newTaskId].next = gTasks[taskId].next; + gTasks[taskId].next = newTaskId; + return; + } + taskId = gTasks[taskId].next; + } +} + +void DestroyTask(u8 taskId) +{ + if (gTasks[taskId].isActive) + { + gTasks[taskId].isActive = FALSE; + + if (gTasks[taskId].prev == HEAD_SENTINEL) + { + if (gTasks[taskId].next != TAIL_SENTINEL) + gTasks[gTasks[taskId].next].prev = HEAD_SENTINEL; + } + else + { + if (gTasks[taskId].next == TAIL_SENTINEL) + { + gTasks[gTasks[taskId].prev].next = TAIL_SENTINEL; + } + else + { + gTasks[gTasks[taskId].prev].next = gTasks[taskId].next; + gTasks[gTasks[taskId].next].prev = gTasks[taskId].prev; + } + } + } +} + +void RunTasks(void) +{ + u8 taskId = FindFirstActiveTask(); + + if (taskId != NUM_TASKS) + { + do + { + gTasks[taskId].func(taskId); + taskId = gTasks[taskId].next; + } while (taskId != TAIL_SENTINEL); + } +} + +static u8 FindFirstActiveTask() +{ + u8 taskId; + + for (taskId = 0; taskId < NUM_TASKS; taskId++) + if (gTasks[taskId].isActive == TRUE && gTasks[taskId].prev == HEAD_SENTINEL) + break; + + return taskId; +} + +void TaskDummy(u8 taskId) +{ +} + +#define TASK_DATA_OP(taskId, offset, op) \ +{ \ + u32 tasksAddr = (u32)gTasks; \ + u32 addr = taskId * sizeof(struct Task) + offset; \ + u32 dataAddr = tasksAddr + offsetof(struct Task, data); \ + addr += dataAddr; \ + op; \ +} + +void SetTaskFuncWithFollowupFunc(u8 taskId, TaskFunc func, TaskFunc followupFunc) +{ + TASK_DATA_OP(taskId, 28, *((u16 *)addr) = (u32)followupFunc) + TASK_DATA_OP(taskId, 30, *((u16 *)addr) = (u32)followupFunc >> 16) + gTasks[taskId].func = func; +} + +void SwitchTaskToFollowupFunc(u8 taskId) +{ + s32 func; + + gTasks[taskId].func = NULL; + + TASK_DATA_OP(taskId, 28, func = *((u16 *)addr)) + TASK_DATA_OP(taskId, 30, func |= *((s16 *)addr) << 16) + + gTasks[taskId].func = (TaskFunc)func; +} + +bool8 FuncIsActiveTask(TaskFunc func) +{ + u8 i; + + for (i = 0; i < NUM_TASKS; i++) + if (gTasks[i].isActive == TRUE && gTasks[i].func == func) + return TRUE; + + return FALSE; +} + +u8 FindTaskIdByFunc(TaskFunc func) +{ + s32 i; + + for (i = 0; i < NUM_TASKS; i++) + if (gTasks[i].isActive == TRUE && gTasks[i].func == func) + return (u8)i; + + return -1; +} + +u8 GetTaskCount(void) +{ + u8 i; + u8 count = 0; + + for (i = 0; i < NUM_TASKS; i++) + if (gTasks[i].isActive == TRUE) + count++; + + return count; +} + +void SetWordTaskArg(u8 taskId, u8 dataElem, u32 value) +{ + if (dataElem <= 14) + { + gTasks[taskId].data[dataElem] = value; + gTasks[taskId].data[dataElem + 1] = value >> 16; + } +} + +u32 GetWordTaskArg(u8 taskId, u8 dataElem) +{ + if (dataElem <= 14) + return (u16)gTasks[taskId].data[dataElem] | (gTasks[taskId].data[dataElem + 1] << 16); + else + return 0; +} diff --git a/sym_common.txt b/sym_common.txt index 28c32662a..37c344e35 100644 --- a/sym_common.txt +++ b/sym_common.txt @@ -198,11 +198,10 @@ gUnknown_300507C: @ 300507C gUnknown_3005080: @ 3005080 .space 0x10 -gUnknown_3005090: @ 3005090 - .space 0x8 - -gUnknown_3005098: @ 3005098 - .space 0x298 + .include "task.o" + + @ what is this? + .space 0x20 gUnknown_3005330: @ 3005330 .space 0x4 |