diff options
Diffstat (limited to 'asm/field_specials.s')
| -rw-r--r-- | asm/field_specials.s | 188 |
1 files changed, 94 insertions, 94 deletions
diff --git a/asm/field_specials.s b/asm/field_specials.s index 760bd5bc5..5132df30e 100644 --- a/asm/field_specials.s +++ b/asm/field_specials.s @@ -205,7 +205,7 @@ sub_80CA76C: @ 80CA76C lsrs r0, 24 movs r1, 0x64 muls r1, r0 - ldr r0, _080CA790 @ =gUnknown_2024284 + ldr r0, _080CA790 @ =gPlayerParty adds r4, r1, r0 adds r0, r4, 0 movs r1, 0x20 @@ -215,7 +215,7 @@ sub_80CA76C: @ 80CA76C movs r0, 0x6 b _080CA7E6 .align 2, 0 -_080CA790: .4byte gUnknown_2024284 +_080CA790: .4byte gPlayerParty _080CA794: adds r0, r4, 0 movs r1, 0x20 @@ -281,12 +281,12 @@ _080CA800: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music sub_80CA804: @ 80CA804 push {r4-r6,lr} movs r5, 0 - ldr r6, _080CA850 @ =gUnknown_8254784 + ldr r6, _080CA850 @ =gBaseStats _080CA80A: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _080CA854 @ =gUnknown_2024284 + ldr r0, _080CA854 @ =gPlayerParty adds r4, r1, r0 adds r0, r4, 0 movs r1, 0x5 @@ -317,8 +317,8 @@ _080CA84C: movs r0, 0x1 b _080CA864 .align 2, 0 -_080CA850: .4byte gUnknown_8254784 -_080CA854: .4byte gUnknown_2024284 +_080CA850: .4byte gBaseStats +_080CA854: .4byte gPlayerParty _080CA858: adds r0, r5, 0x1 lsls r0, 24 @@ -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 @@ -680,7 +680,7 @@ LeadMonHasEffortRibbon: @ 80CAAE0 lsrs r0, 24 movs r1, 0x64 muls r0, r1 - ldr r1, _080CAB04 @ =gUnknown_2024284 + ldr r1, _080CAB04 @ =gPlayerParty adds r0, r1 movs r1, 0x47 movs r2, 0 @@ -690,7 +690,7 @@ LeadMonHasEffortRibbon: @ 80CAAE0 pop {r1} bx r1 .align 2, 0 -_080CAB04: .4byte gUnknown_2024284 +_080CAB04: .4byte gPlayerParty thumb_func_end LeadMonHasEffortRibbon thumb_func_start GivLeadMonEffortRibbon @@ -709,7 +709,7 @@ GivLeadMonEffortRibbon: @ 80CAB08 lsrs r0, 24 movs r1, 0x64 muls r0, r1 - ldr r1, _080CAB40 @ =gUnknown_2024284 + ldr r1, _080CAB40 @ =gPlayerParty adds r0, r1 movs r1, 0x47 mov r2, sp @@ -719,7 +719,7 @@ GivLeadMonEffortRibbon: @ 80CAB08 bx r0 .align 2, 0 _080CAB3C: .4byte 0x0000083b -_080CAB40: .4byte gUnknown_2024284 +_080CAB40: .4byte gPlayerParty thumb_func_end GivLeadMonEffortRibbon thumb_func_start ScrSpecial_AreLeadMonEVsMaxedOut @@ -730,7 +730,7 @@ ScrSpecial_AreLeadMonEVsMaxedOut: @ 80CAB44 lsrs r0, 24 movs r1, 0x64 muls r0, r1 - ldr r1, _080CAB68 @ =gUnknown_2024284 + ldr r1, _080CAB68 @ =gPlayerParty adds r0, r1 bl GetMonEVCount lsls r0, 16 @@ -740,7 +740,7 @@ ScrSpecial_AreLeadMonEVsMaxedOut: @ 80CAB44 movs r0, 0 b _080CAB72 .align 2, 0 -_080CAB68: .4byte gUnknown_2024284 +_080CAB68: .4byte gPlayerParty _080CAB6C: .4byte 0x01fd0000 _080CAB70: movs r0, 0x1 @@ -768,7 +768,7 @@ sub_80CAB78: @ 80CAB78 _080CAB9A: movs r0, 0x64 muls r0, r4 - ldr r1, _080CABB8 @ =gUnknown_2024284 + ldr r1, _080CABB8 @ =gPlayerParty adds r0, r1 movs r1, 0x41 movs r2, 0 @@ -779,7 +779,7 @@ _080CAB9A: b _080CABC8 .align 2, 0 _080CABB4: .4byte 0x00004031 -_080CABB8: .4byte gUnknown_2024284 +_080CABB8: .4byte gPlayerParty _080CABBC: adds r0, r4, 0x1 lsls r0, 24 @@ -832,7 +832,7 @@ _080CAC02: thumb_func_start sub_80CAC08 sub_80CAC08: @ 80CAC08 push {lr} - ldr r0, _080CAC1C @ =gUnknown_2024284 + ldr r0, _080CAC1C @ =gPlayerParty movs r1, 0x3F bl CheckPartyPokerus lsls r0, 24 @@ -841,7 +841,7 @@ sub_80CAC08: @ 80CAC08 movs r0, 0x1 b _080CAC22 .align 2, 0 -_080CAC1C: .4byte gUnknown_2024284 +_080CAC1C: .4byte gPlayerParty _080CAC20: movs r0, 0 _080CAC22: @@ -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 @@ -965,7 +965,7 @@ _080CAD0C: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _080CAD3C @ =gUnknown_2024284 + ldr r0, _080CAD3C @ =gPlayerParty adds r4, r1, r0 adds r0, r4, 0 movs r1, 0x41 @@ -984,7 +984,7 @@ _080CAD0C: adds r0, r5, 0 b _080CAD4C .align 2, 0 -_080CAD3C: .4byte gUnknown_2024284 +_080CAD3C: .4byte gPlayerParty _080CAD40: adds r0, r5, 0x1 lsls r0, 24 @@ -1006,7 +1006,7 @@ sub_80CAD54: @ 80CAD54 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080CAD78 @ =gUnknown_2024284 + ldr r1, _080CAD78 @ =gPlayerParty adds r0, r1 movs r1, 0x41 movs r2, 0 @@ -1017,7 +1017,7 @@ sub_80CAD54: @ 80CAD54 bx r1 .align 2, 0 _080CAD74: .4byte gUnknown_20370C0 -_080CAD78: .4byte gUnknown_2024284 +_080CAD78: .4byte gPlayerParty thumb_func_end sub_80CAD54 thumb_func_start sub_80CAD7C @@ -1027,7 +1027,7 @@ sub_80CAD7C: @ 80CAD7C ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080CADAC @ =gUnknown_2024284 + ldr r1, _080CADAC @ =gPlayerParty adds r0, r1 ldr r4, _080CADB0 @ =gStringVar1 movs r1, 0x7 @@ -1043,7 +1043,7 @@ sub_80CAD7C: @ 80CAD7C b _080CADBA .align 2, 0 _080CADA8: .4byte gUnknown_20370C0 -_080CADAC: .4byte gUnknown_2024284 +_080CADAC: .4byte gPlayerParty _080CADB0: .4byte gStringVar1 _080CADB4: .4byte gSaveBlock2Ptr _080CADB8: @@ -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 @@ -3202,7 +3202,7 @@ sub_80CBE50: @ 80CBE50 lsrs r0, 24 movs r1, 0x64 muls r1, r0 - ldr r0, _080CBEA4 @ =gUnknown_2024284 + ldr r0, _080CBEA4 @ =gPlayerParty adds r5, r1, r0 ldr r6, _080CBEA8 @ =gStringVar1 adds r0, r5, 0 @@ -3234,7 +3234,7 @@ sub_80CBE50: @ 80CBE50 movs r0, 0 b _080CBEB2 .align 2, 0 -_080CBEA4: .4byte gUnknown_2024284 +_080CBEA4: .4byte gPlayerParty _080CBEA8: .4byte gStringVar1 _080CBEAC: .4byte gUnknown_8245EE0 _080CBEB0: @@ -3375,7 +3375,7 @@ sub_80CBFA0: @ 80CBFA0 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080CBFCC @ =gUnknown_2024284 + ldr r1, _080CBFCC @ =gPlayerParty adds r0, r1 ldr r4, _080CBFD0 @ =gStringVar1 movs r1, 0x2 @@ -3390,7 +3390,7 @@ sub_80CBFA0: @ 80CBFA0 b _080CBFDA .align 2, 0 _080CBFC8: .4byte gUnknown_20370C0 -_080CBFCC: .4byte gUnknown_2024284 +_080CBFCC: .4byte gPlayerParty _080CBFD0: .4byte gStringVar1 _080CBFD4: .4byte gStringVar3 _080CBFD8: @@ -3494,7 +3494,7 @@ ChangePokemonNickname: @ 80CC088 mov r1, r8 muls r1, r0 adds r0, r1, 0 - ldr r6, _080CC134 @ =gUnknown_2024284 + ldr r6, _080CC134 @ =gPlayerParty adds r0, r6 ldr r2, _080CC138 @ =gStringVar3 movs r1, 0x2 @@ -3559,7 +3559,7 @@ ChangePokemonNickname: @ 80CC088 bx r0 .align 2, 0 _080CC130: .4byte gUnknown_20370C0 -_080CC134: .4byte gUnknown_2024284 +_080CC134: .4byte gPlayerParty _080CC138: .4byte gStringVar3 _080CC13C: .4byte gStringVar2 _080CC140: .4byte ChangePokemonNickname_CB @@ -3572,7 +3572,7 @@ ChangePokemonNickname_CB: @ 80CC144 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080CC168 @ =gUnknown_2024284 + ldr r1, _080CC168 @ =gPlayerParty adds r0, r1 ldr r2, _080CC16C @ =gStringVar2 movs r1, 0x2 @@ -3582,7 +3582,7 @@ ChangePokemonNickname_CB: @ 80CC144 bx r0 .align 2, 0 _080CC164: .4byte gUnknown_20370C0 -_080CC168: .4byte gUnknown_2024284 +_080CC168: .4byte gPlayerParty _080CC16C: .4byte gStringVar2 thumb_func_end ChangePokemonNickname_CB @@ -3593,7 +3593,7 @@ TV_CopyNicknameToStringVar1AndEnsureTerminated: @ 80CC170 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080CC198 @ =gUnknown_2024284 + ldr r1, _080CC198 @ =gPlayerParty adds r0, r1 ldr r4, _080CC19C @ =gStringVar1 movs r1, 0x2 @@ -3606,7 +3606,7 @@ TV_CopyNicknameToStringVar1AndEnsureTerminated: @ 80CC170 bx r0 .align 2, 0 _080CC194: .4byte gUnknown_20370C0 -_080CC198: .4byte gUnknown_2024284 +_080CC198: .4byte gPlayerParty _080CC19C: .4byte gStringVar1 thumb_func_end TV_CopyNicknameToStringVar1AndEnsureTerminated @@ -3619,7 +3619,7 @@ TV_CheckMonOTIDEqualsPlayerID: @ 80CC1A0 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080CC1CC @ =gUnknown_2024284 + ldr r1, _080CC1CC @ =gPlayerParty adds r0, r1 movs r1, 0x1 movs r2, 0 @@ -3631,7 +3631,7 @@ TV_CheckMonOTIDEqualsPlayerID: @ 80CC1A0 b _080CC1D8 .align 2, 0 _080CC1C8: .4byte gUnknown_20370C0 -_080CC1CC: .4byte gUnknown_2024284 +_080CC1CC: .4byte gPlayerParty _080CC1D0: .4byte gUnknown_20370D0 _080CC1D4: ldr r1, _080CC1E0 @ =gUnknown_20370D0 @@ -3780,7 +3780,7 @@ _080CC2E4: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _080CC3BC @ =gUnknown_2024284 + ldr r0, _080CC3BC @ =gPlayerParty adds r4, r0 adds r0, r4, 0 movs r1, 0x41 @@ -3871,7 +3871,7 @@ _080CC318: pop {r0} bx r0 .align 2, 0 -_080CC3BC: .4byte gUnknown_2024284 +_080CC3BC: .4byte gPlayerParty _080CC3C0: .4byte 0x00004043 _080CC3C4: .4byte 0x00004042 _080CC3C8: .4byte gUnknown_20370C0 @@ -3994,7 +3994,7 @@ sub_80CC48C: @ 80CC48C _080CC49C: movs r0, 0x64 muls r0, r4 - ldr r1, _080CC4B8 @ =gUnknown_2024284 + ldr r1, _080CC4B8 @ =gPlayerParty adds r0, r1 movs r1, 0x41 movs r2, 0 @@ -4006,7 +4006,7 @@ _080CC49C: movs r0, 0x1 b _080CC4CC .align 2, 0 -_080CC4B8: .4byte gUnknown_2024284 +_080CC4B8: .4byte gPlayerParty _080CC4BC: .4byte gUnknown_20370C0 _080CC4C0: adds r0, r4, 0x1 @@ -4616,7 +4616,7 @@ sub_80CC948: @ 80CC948 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080CC96C @ =gUnknown_2024284 + ldr r1, _080CC96C @ =gPlayerParty adds r0, r1 movs r1, 0x6 bl sub_80436F8 @@ -4627,7 +4627,7 @@ sub_80CC948: @ 80CC948 bx r0 .align 2, 0 _080CC968: .4byte gUnknown_20370C0 -_080CC96C: .4byte gUnknown_2024284 +_080CC96C: .4byte gPlayerParty _080CC970: .4byte 0x00004025 thumb_func_end sub_80CC948 @@ -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 @@ -4911,12 +4911,12 @@ sub_80CCB94: @ 80CCB94 movs r0, 0x64 mov r5, r8 muls r5, r0 - ldr r0, _080CCBC4 @ =gUnknown_2024284 + ldr r0, _080CCBC4 @ =gPlayerParty mov r9, r0 b _080CCBCE .align 2, 0 _080CCBC0: .4byte gUnknown_20370C6 -_080CCBC4: .4byte gUnknown_2024284 +_080CCBC4: .4byte gPlayerParty _080CCBC8: adds r0, r4, 0x1 lsls r0, 24 @@ -4942,7 +4942,7 @@ _080CCBEA: mov r1, r8 muls r1, r0 adds r0, r1, 0 - ldr r1, _080CCC20 @ =gUnknown_2024284 + ldr r1, _080CCC20 @ =gPlayerParty adds r0, r1 movs r1, 0x20 bl GetMonData @@ -4960,7 +4960,7 @@ _080CCBEA: b _080CCC6E .align 2, 0 _080CCC1C: .4byte gUnknown_83F6203 -_080CCC20: .4byte gUnknown_2024284 +_080CCC20: .4byte gPlayerParty _080CCC24: .4byte gStringVar2 _080CCC28: .4byte gUnknown_82481BE _080CCC2C: .4byte gUnknown_20370C2 @@ -5007,7 +5007,7 @@ _080CCC8C: movs r0, 0x64 mov r1, r8 muls r1, r0 - ldr r0, _080CCCF0 @ =gUnknown_2024284 + ldr r0, _080CCCF0 @ =gPlayerParty adds r4, r1, r0 adds r0, r4, 0 movs r1, 0xD @@ -5056,7 +5056,7 @@ _080CCCE4: pop {r1} bx r1 .align 2, 0 -_080CCCF0: .4byte gUnknown_2024284 +_080CCCF0: .4byte gPlayerParty _080CCCF4: .4byte gUnknown_20370C4 thumb_func_end sub_80CCB94 @@ -5475,7 +5475,7 @@ sub_80CD034: @ 80CD034 _080CD044: movs r0, 0x64 muls r0, r4 - ldr r1, _080CD05C @ =gUnknown_2024284 + ldr r1, _080CD05C @ =gPlayerParty adds r0, r1 movs r1, 0x4 bl GetMonData @@ -5484,7 +5484,7 @@ _080CD044: movs r0, 0x1 b _080CD06C .align 2, 0 -_080CD05C: .4byte gUnknown_2024284 +_080CD05C: .4byte gPlayerParty _080CD060: adds r0, r4, 0x1 lsls r0, 24 @@ -5577,7 +5577,7 @@ _080CD104: movs r0, 0x64 adds r1, r6, 0 muls r1, r0 - ldr r0, _080CD138 @ =gUnknown_2024284 + ldr r0, _080CD138 @ =gPlayerParty adds r5, r1, r0 adds r0, r5, 0 movs r1, 0x41 @@ -5598,7 +5598,7 @@ _080CD104: movs r0, 0x1 b _080CD14C .align 2, 0 -_080CD138: .4byte gUnknown_2024284 +_080CD138: .4byte gPlayerParty _080CD13C: .4byte gUnknown_20370C0 _080CD140: adds r0, r6, 0x1 @@ -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 |