diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-11-18 20:24:39 -0500 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-11-18 20:24:39 -0500 |
| commit | be716ef9f841589c67f152a90ce5c7c29f7211d8 (patch) | |
| tree | af6b7422327908415f5aa9cbe64d97273076971a | |
| parent | 016b2d16bcc735053267b3b5e8cd597807db4055 (diff) | |
change Sprite struct to use a data array instead of manual declares.
64 files changed, 3832 insertions, 3846 deletions
diff --git a/asm/battle_anim_80CA710.s b/asm/battle_anim_80CA710.s index 01c45f81c..121cb076b 100644 --- a/asm/battle_anim_80CA710.s +++ b/asm/battle_anim_80CA710.s @@ -781,7 +781,7 @@ _080D3080: str r0, [r5, 0x1C] ldr r1, _080D30A8 @ =move_anim_8072740 adds r0, r5, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData pop {r4,r5} pop {r0} bx r0 @@ -1156,7 +1156,7 @@ sub_80D3370: @ 80D3370 ldr r1, _080D3390 @ =sub_8078600 str r1, [r0, 0x1C] ldr r1, _080D3394 @ =sub_80D3398 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData pop {r0} bx r0 .align 2, 0 @@ -1172,7 +1172,7 @@ sub_80D3398: @ 80D3398 ldr r1, _080D33AC @ =sub_80782D8 str r1, [r0, 0x1C] ldr r1, _080D33B0 @ =move_anim_8074EE0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData pop {r0} bx r0 .align 2, 0 @@ -1719,7 +1719,7 @@ _080D37AA: str r0, [r6, 0x1C] ldr r1, _080D37F8 @ =move_anim_8072740 adds r0, r6, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData pop {r4-r7} pop {r0} bx r0 @@ -1751,7 +1751,7 @@ sub_80D37FC: @ 80D37FC str r0, [r4, 0x1C] ldr r1, _080D3834 @ =move_anim_8072740 adds r0, r4, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData pop {r4} pop {r0} bx r0 @@ -4694,7 +4694,7 @@ sub_80D4ED8: @ 80D4ED8 strh r0, [r4, 0x36] ldr r1, _080D4F10 @ =move_anim_8072740 adds r0, r4, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData ldr r1, _080D4F14 @ =sub_8078174 str r1, [r4, 0x1C] adds r0, r4, 0 @@ -4731,7 +4731,7 @@ sub_80D4F18: @ 80D4F18 str r0, [r4, 0x1C] ldr r1, _080D4F58 @ =move_anim_8072740 adds r0, r4, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData pop {r4,r5} pop {r0} bx r0 @@ -5041,7 +5041,7 @@ sub_80D517C: @ 80D517C ldr r1, _080D51A0 @ =sub_8078B34 str r1, [r0, 0x1C] ldr r1, _080D51A4 @ =move_anim_8072740 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData pop {r0} bx r0 .align 2, 0 @@ -5304,7 +5304,7 @@ sub_80D5374: @ 80D5374 strh r0, [r4, 0x32] ldr r1, _080D53AC @ =move_anim_8072740 adds r0, r4, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData ldr r0, _080D53B0 @ =sub_8078364 str r0, [r4, 0x1C] pop {r4} @@ -5337,7 +5337,7 @@ sub_80D53B4: @ 80D53B4 str r0, [r4, 0x1C] ldr r1, _080D53F0 @ =sub_80D53F4 adds r0, r4, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData pop {r4} pop {r0} bx r0 @@ -7344,7 +7344,7 @@ _080D62F8: strh r0, [r5, 0x34] ldr r1, _080D6320 @ =move_anim_8074EE0 adds r0, r5, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData ldr r0, _080D6324 @ =sub_8078114 str r0, [r5, 0x1C] pop {r4,r5} @@ -7973,7 +7973,7 @@ _080D67F6: str r0, [r4, 0x1C] ldr r1, _080D6818 @ =move_anim_8072740 adds r0, r4, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData pop {r4,r5} pop {r0} bx r0 @@ -8528,7 +8528,7 @@ sub_80D6BB8: @ 80D6BB8 bl obj_translate_based_on_private_1_2_3_4 ldr r1, _080D6CB0 @ =sub_80D6D00 adds r0, r4, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData ldr r0, _080D6CB4 @ =sub_8078600 str r0, [r4, 0x1C] ldrh r0, [r5, 0x1A] @@ -8659,7 +8659,7 @@ _080D6D36: strh r0, [r5, 0x22] ldr r1, _080D6D68 @ =move_anim_8074EE0 adds r0, r5, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData ldr r0, _080D6D6C @ =sub_80785E4 str r0, [r5, 0x1C] pop {r4,r5} @@ -8707,7 +8707,7 @@ _080D6D8E: strh r0, [r5, 0x26] ldr r1, _080D6DD0 @ =move_anim_8072740 adds r0, r5, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData ldr r0, _080D6DD4 @ =sub_8078600 str r0, [r5, 0x1C] pop {r4,r5} @@ -10212,7 +10212,7 @@ sub_80D78EC: @ 80D78EC strh r0, [r4, 0x36] ldr r1, _080D7924 @ =move_anim_8072740 adds r0, r4, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData ldr r1, _080D7928 @ =sub_8078174 str r1, [r4, 0x1C] adds r0, r4, 0 @@ -10276,7 +10276,7 @@ _080D7976: strh r0, [r4, 0x2E] ldr r1, _080D79AC @ =move_anim_8072740 adds r0, r4, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData ldr r0, _080D79B0 @ =sub_8078B34 str r0, [r4, 0x1C] pop {r4} @@ -10334,7 +10334,7 @@ _080D79F6: _080D7A06: ldr r1, _080D7A20 @ =sub_80D7A28 adds r0, r4, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData ldr r0, _080D7A24 @ =sub_80785E4 str r0, [r4, 0x1C] pop {r4,r5} @@ -10525,7 +10525,7 @@ _080D7B76: bge _080D7B76 str r6, [r5, 0x1C] adds r0, r5, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData add sp, 0x10 pop {r4-r7} pop {r0} @@ -12995,7 +12995,7 @@ sub_80D8EE0: @ 80D8EE0 str r0, [r4, 0x1C] ldr r1, _080D8F0C @ =move_anim_8072740 adds r0, r4, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData _080D8F02: pop {r4} pop {r0} @@ -13143,7 +13143,7 @@ unc_080B08A0: @ 80D8FF0 str r0, [r4, 0x1C] ldr r1, _080D9028 @ =move_anim_8072740 adds r0, r4, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData pop {r4,r5} pop {r0} bx r0 @@ -13245,7 +13245,7 @@ _080D90D0: str r0, [r5, 0x1C] ldr r1, _080D90F0 @ =move_anim_8072740 adds r0, r5, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData pop {r4,r5} pop {r0} bx r0 @@ -13522,7 +13522,7 @@ _080D9306: str r0, [r4, 0x1C] ldr r1, _080D9324 @ =sub_80D9328 adds r0, r4, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData pop {r4} pop {r0} bx r0 @@ -13563,7 +13563,7 @@ sub_80D9328: @ 80D9328 str r0, [r5, 0x1C] ldr r1, _080D9374 @ =move_anim_8072740 adds r0, r5, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData _080D9368: pop {r4-r6} pop {r0} @@ -13689,7 +13689,7 @@ sub_80D943C: @ 80D943C str r0, [r4, 0x1C] ldr r1, _080D9470 @ =sub_80D9474 adds r0, r4, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData pop {r4,r5} pop {r0} bx r0 @@ -13717,7 +13717,7 @@ sub_80D9474: @ 80D9474 str r0, [r4, 0x1C] ldr r1, _080D94A4 @ =move_anim_8072740 adds r0, r4, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData pop {r4} pop {r0} bx r0 @@ -13777,7 +13777,7 @@ sub_80D94CC: @ 80D94CC str r0, [r5, 0x1C] ldr r1, _080D9520 @ =sub_80D9524 adds r0, r5, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData _080D9510: pop {r4,r5} pop {r0} @@ -13796,7 +13796,7 @@ sub_80D9524: @ 80D9524 ldr r1, _080D9538 @ =sub_80782D8 str r1, [r0, 0x1C] ldr r1, _080D953C @ =move_anim_8072740 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData pop {r0} bx r0 .align 2, 0 @@ -14262,7 +14262,7 @@ sub_80D986C: @ 80D986C bl obj_translate_based_on_private_1_2_3_4 ldr r1, _080D98D0 @ =move_anim_8074EE0 adds r0, r4, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData ldr r0, _080D98D4 @ =sub_8078BB8 str r0, [r4, 0x1C] _080D98C6: @@ -14554,7 +14554,7 @@ _080D9ADC: bl obj_translate_based_on_private_1_2_3_4 ldr r1, _080D9B1C @ =move_anim_8072740 adds r0, r5, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData ldr r0, _080D9B20 @ =sub_8078BB8 str r0, [r5, 0x1C] pop {r4,r5} @@ -14698,7 +14698,7 @@ _080D9C22: str r0, [r4, 0x1C] ldr r1, _080D9C3C @ =move_anim_8072740 adds r0, r4, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData pop {r4} pop {r0} bx r0 @@ -15115,7 +15115,7 @@ _080D9F40: str r0, [r4, 0x1C] ldr r1, _080D9F84 @ =move_anim_8072740 adds r0, r4, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData pop {r4} pop {r0} bx r0 @@ -15426,7 +15426,7 @@ _080DA18C: str r0, [r6, 0x1C] ldr r1, _080DA1E8 @ =sub_80DA1EC adds r0, r6, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData pop {r4-r6} pop {r0} bx r0 @@ -15556,7 +15556,7 @@ _080DA2C2: str r0, [r5, 0x1C] ldr r1, _080DA2FC @ =move_anim_8072740 adds r0, r5, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData ldrb r1, [r4, 0xA] adds r0, r5, 0 bl SeekSpriteAnim @@ -18781,7 +18781,7 @@ _080DBB52: strh r0, [r5, 0x30] ldr r1, _080DBB68 @ =move_anim_8072740 adds r0, r5, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData ldr r0, _080DBB6C @ =sub_8078600 str r0, [r5, 0x1C] pop {r4,r5} @@ -18850,7 +18850,7 @@ _080DBBB6: _080DBBE2: ldr r1, _080DBBF8 @ =sub_80DBC00 adds r0, r5, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData ldr r0, _080DBBFC @ =sub_8078600 str r0, [r5, 0x1C] pop {r4-r7} @@ -20522,7 +20522,7 @@ _080DC880: str r0, [r6, 0x1C] ldr r1, _080DC8F0 @ =move_anim_8072740 adds r0, r6, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData pop {r4-r6} pop {r0} bx r0 @@ -20602,7 +20602,7 @@ _080DC934: str r0, [r6, 0x1C] ldr r1, _080DC99C @ =move_anim_8072740 adds r0, r6, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData pop {r4-r6} pop {r0} bx r0 @@ -21033,7 +21033,7 @@ _080DCC5E: str r0, [r7, 0x1C] ldr r1, _080DCCF8 @ =move_anim_8072740 adds r0, r7, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData add sp, 0x4 pop {r4-r7} pop {r0} @@ -21240,7 +21240,7 @@ _080DCE5E: strh r0, [r5, 0x22] ldr r1, _080DCE94 @ =move_anim_8074EE0 adds r0, r5, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData ldr r0, _080DCE98 @ =sub_80785E4 str r0, [r5, 0x1C] pop {r4,r5} @@ -21295,7 +21295,7 @@ _080DCEBC: strh r0, [r5, 0x38] ldr r1, _080DCF14 @ =sub_80DCF1C adds r0, r5, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData ldr r1, _080DCF18 @ =sub_8078278 str r1, [r5, 0x1C] adds r0, r5, 0 @@ -21330,7 +21330,7 @@ sub_80DCF1C: @ 80DCF1C strh r0, [r4, 0x36] ldr r1, _080DCF58 @ =move_anim_8074EE0 adds r0, r4, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData ldr r1, _080DCF5C @ =sub_8078278 str r1, [r4, 0x1C] adds r0, r4, 0 @@ -21397,7 +21397,7 @@ _080DCF96: str r0, [r5, 0x1C] ldr r1, _080DCFE0 @ =move_anim_8074EE0 adds r0, r5, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData pop {r4,r5} pop {r0} bx r0 @@ -22016,7 +22016,7 @@ sub_80DD490: @ 80DD490 str r0, [r4, 0x1C] ldr r1, _080DD4D0 @ =move_anim_8072740 adds r0, r4, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData pop {r4,r5} pop {r0} bx r0 @@ -23833,7 +23833,7 @@ _080DE276: lsls r0, 2 adds r0, r4 ldr r1, _080DE2D0 @ =SpriteCallbackDummy - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData movs r0, 0x8 ldrsh r1, [r5, r0] lsls r0, r1, 4 @@ -25509,7 +25509,7 @@ _080DEFAA: str r0, [r3, 0x1C] ldr r1, _080DF008 @ =sub_80DF018 adds r0, r3, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData b _080DF010 .align 2, 0 _080DEFFC: .4byte 0x000003ff @@ -26323,7 +26323,7 @@ _080DF5FA: strb r0, [r2] ldr r1, _080DF634 @ =move_anim_8074EE0 adds r0, r5, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData ldr r0, _080DF638 @ =sub_8078504 str r0, [r5, 0x1C] pop {r4,r5} @@ -26409,7 +26409,7 @@ _080DF6CA: str r0, [r5, 0x1C] ldr r1, _080DF6EC @ =move_anim_8074EE0 adds r0, r5, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData pop {r4,r5} pop {r0} bx r0 @@ -26461,7 +26461,7 @@ _080DF70E: str r0, [r5, 0x1C] ldr r1, _080DF75C @ =move_anim_8074EE0 adds r0, r5, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData pop {r4,r5} pop {r0} bx r0 @@ -28879,7 +28879,7 @@ sub_80E0A10: @ 80E0A10 str r0, [r4, 0x1C] ldr r1, _080E0A48 @ =move_anim_8072740 adds r0, r4, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData pop {r4} pop {r0} bx r0 @@ -29619,7 +29619,7 @@ _080E1024: str r0, [r6, 0x1C] ldr r1, _080E1074 @ =move_anim_8072740 adds r0, r6, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData pop {r4-r6} pop {r0} bx r0 @@ -29686,7 +29686,7 @@ _080E10D0: str r0, [r6, 0x1C] ldr r1, _080E1104 @ =move_anim_8074EE0 adds r0, r6, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData pop {r3} mov r8, r3 pop {r4-r7} @@ -30643,7 +30643,7 @@ _080E17EA: strh r0, [r6, 0x4] ldr r1, _080E185C @ =move_anim_8072740 adds r0, r6, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData ldrh r0, [r4, 0x4] strh r0, [r6, 0x2E] ldr r0, _080E1860 @ =sub_80782D8 @@ -31610,7 +31610,7 @@ sub_80E1F3C: @ 80E1F3C strh r2, [r4, 0x38] ldr r1, _080E1F84 @ =move_anim_8074EE0 adds r0, r4, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData ldr r1, _080E1F88 @ =sub_8078174 str r1, [r4, 0x1C] adds r0, r4, 0 @@ -32353,14 +32353,14 @@ _080E2508: ldr r1, _080E2514 @ =gSpriteCoordOffsetX _080E250A: adds r0, r4, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData b _080E2520 .align 2, 0 _080E2514: .4byte gSpriteCoordOffsetX _080E2518: ldr r1, _080E2550 @ =gSpriteCoordOffsetY adds r0, r4, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData _080E2520: movs r0, 0x3A ldrsh r1, [r4, r0] @@ -32721,7 +32721,7 @@ _080E27CC: str r0, [r5, 0x1C] ldr r1, _080E27E4 @ =move_anim_8072740 adds r0, r5, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData pop {r4,r5} pop {r0} bx r0 @@ -32759,7 +32759,7 @@ _080E2814: str r0, [r5, 0x1C] ldr r1, _080E2834 @ =sub_80DA48C adds r0, r5, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData pop {r4,r5} pop {r0} bx r0 @@ -32854,7 +32854,7 @@ _080E28B4: strh r0, [r4, 0x26] ldr r1, _080E2900 @ =move_anim_8074EE0 adds r0, r4, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData ldr r0, _080E2904 @ =sub_80785E4 str r0, [r4, 0x1C] pop {r4,r5} @@ -32907,7 +32907,7 @@ sub_80E2908: @ 80E2908 bl StartSpriteAffineAnim ldr r1, _080E2970 @ =move_anim_8074EE0 adds r0, r4, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData ldr r0, _080E2974 @ =sub_80785E4 str r0, [r4, 0x1C] pop {r4,r5} @@ -32945,7 +32945,7 @@ _080E299C: strh r0, [r4, 0x2E] ldr r1, _080E29B8 @ =move_anim_8072740 adds r0, r4, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData ldr r0, _080E29BC @ =sub_80782D8 str r0, [r4, 0x1C] pop {r4} diff --git a/asm/battle_anim_812C144.s b/asm/battle_anim_812C144.s index cdf70f483..ff6aeaa64 100644 --- a/asm/battle_anim_812C144.s +++ b/asm/battle_anim_812C144.s @@ -135,7 +135,7 @@ sub_812C220: @ 812C220 strh r0, [r4, 0x30] ldr r1, _0812C25C @ =sub_812C268 adds r0, r4, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData ldr r1, _0812C260 @ =REG_BLDCNT movs r2, 0xFD lsls r2, 6 @@ -267,7 +267,7 @@ _0812C31A: str r0, [r5, 0x1C] ldr r1, _0812C354 @ =move_anim_8072740 adds r0, r5, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData add sp, 0x4 pop {r4-r7} pop {r0} @@ -862,7 +862,7 @@ sub_812C798: @ 812C798 str r0, [r4, 0x1C] ldr r1, _0812C7C4 @ =sub_812C7C8 adds r0, r4, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData _0812C7BA: pop {r4} pop {r0} @@ -929,7 +929,7 @@ sub_812C80C: @ 812C80C str r0, [r4, 0x1C] ldr r1, _0812C844 @ =move_anim_8072740 adds r0, r4, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData pop {r4,r5} pop {r0} bx r0 @@ -2350,7 +2350,7 @@ _0812D2F0: bne _0812D33C ldr r1, _0812D344 @ =move_anim_8072740 adds r0, r5, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData ldrh r0, [r5, 0x24] ldrh r2, [r5, 0x20] adds r0, r2 @@ -8810,7 +8810,7 @@ sub_813051C: @ 813051C strh r0, [r4, 0x2E] ldr r1, _0813054C @ =move_anim_8072740 adds r0, r4, 0 - bl StoreSpriteCallbackInData6 + bl StoreSpriteCallbackInData ldr r0, _08130550 @ =sub_8078CC0 str r0, [r4, 0x1C] pop {r4} diff --git a/include/field_map_obj.h b/include/field_map_obj.h index 8e1fdc8bd..22674406d 100644 --- a/include/field_map_obj.h +++ b/include/field_map_obj.h @@ -9,18 +9,18 @@ extern const u8 gUnknown_0830FD14[]; static u8 callback(struct MapObject *, struct Sprite *);\ void setup(struct Sprite *sprite)\ {\ - meta_step(&gMapObjects[sprite->data0], sprite, callback);\ + meta_step(&gMapObjects[sprite->data[0]], sprite, callback);\ }\ static u8 callback(struct MapObject *mapObject, struct Sprite *sprite)\ {\ - return table[sprite->data1](mapObject, sprite);\ + return table[sprite->data[1]](mapObject, sprite);\ } #define fieldmap_object_null_cb(setup, callback) \ static u8 callback(struct MapObject *, struct Sprite *);\ void setup(struct Sprite *sprite)\ {\ - meta_step(&gMapObjects[sprite->data0], sprite, callback);\ + meta_step(&gMapObjects[sprite->data[0]], sprite, callback);\ }\ static u8 callback(struct MapObject *mapObject, struct Sprite *sprite)\ {\ diff --git a/include/rom_8077ABC.h b/include/rom_8077ABC.h index 03882056d..cd89c92a2 100644 --- a/include/rom_8077ABC.h +++ b/include/rom_8077ABC.h @@ -15,7 +15,7 @@ enum u8 sub_8077ABC(u8, u8); u8 sub_8077E44(u8 slot, u16 species, u8 a3); u8 GetAnimBankSpriteId(u8 side); -void StoreSpriteCallbackInData6(struct Sprite *sprite, void(*callback)(struct Sprite *)); +void StoreSpriteCallbackInData(struct Sprite *sprite, void(*callback)(struct Sprite *)); void sub_8078314(struct Sprite *sprite); void sub_8078364(struct Sprite *sprite); void sub_8078458(struct Sprite *sprite); diff --git a/include/sprite.h b/include/sprite.h index 38687ebd8..a87260ec0 100644 --- a/include/sprite.h +++ b/include/sprite.h @@ -195,14 +195,7 @@ struct Sprite /*0x2D*/ u8 animLoopCounter; // general purpose data fields - /*0x2E*/ s16 data0; - /*0x30*/ s16 data1; - /*0x32*/ s16 data2; - /*0x34*/ s16 data3; - /*0x36*/ s16 data4; - /*0x38*/ s16 data5; - /*0x3A*/ s16 data6; - /*0x3C*/ s16 data7; + /*0x2E*/ s16 data[8]; /*0x3E*/ u16 inUse:1; //1 u16 coordOffsetEnabled:1; //2 diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c index 14afc1537..095482305 100644 --- a/src/battle/battle_2.c +++ b/src/battle/battle_2.c @@ -857,7 +857,7 @@ void sub_800F808(void) void sub_800F828(struct Sprite *sprite) { - sprite->data0 = 0; + sprite->data[0] = 0; sprite->callback = sub_800F838; } @@ -865,42 +865,42 @@ void sub_800F838(struct Sprite *sprite) { u16 *arr = (u16 *)gSharedMem; - switch (sprite->data0) + switch (sprite->data[0]) { case 0: - sprite->data0++; - sprite->data1 = 0; - sprite->data2 = 0x281; - sprite->data3 = 0; - sprite->data4 = 1; + sprite->data[0]++; + sprite->data[1] = 0; + sprite->data[2] = 0x281; + sprite->data[3] = 0; + sprite->data[4] = 1; // fall through case 1: - sprite->data4--; - if (sprite->data4 == 0) + sprite->data[4]--; + if (sprite->data[4] == 0) { s32 i; s32 r2; s32 r0; - sprite->data4 = 2; - r2 = sprite->data1 + sprite->data3 * 32; - r0 = sprite->data2 - sprite->data3 * 32; + sprite->data[4] = 2; + r2 = sprite->data[1] + sprite->data[3] * 32; + r0 = sprite->data[2] - sprite->data[3] * 32; for (i = 0; i < 29; i += 2) { arr[r2 + i] = 0x3D; arr[r0 + i] = 0x3D; } - sprite->data3++; - if (sprite->data3 == 21) + sprite->data[3]++; + if (sprite->data[3] == 21) { - sprite->data0++; - sprite->data1 = 32; + sprite->data[0]++; + sprite->data[1] = 32; } } break; case 2: - sprite->data1--; - if (sprite->data1 == 20) + sprite->data[1]--; + if (sprite->data[1] == 20) SetMainCallback2(sub_800E7C4); break; } @@ -1034,11 +1034,11 @@ void nullsub_36(struct Sprite *sprite) void sub_800FDB0(struct Sprite *sprite) { - if (sprite->data0 != 0) - sprite->pos1.x = sprite->data1 + ((sprite->data2 & 0xFF00) >> 8); + if (sprite->data[0] != 0) + sprite->pos1.x = sprite->data[1] + ((sprite->data[2] & 0xFF00) >> 8); else - sprite->pos1.x = sprite->data1 - ((sprite->data2 & 0xFF00) >> 8); - sprite->data2 += 0x180; + sprite->pos1.x = sprite->data[1] - ((sprite->data[2] & 0xFF00) >> 8); + sprite->data[2] += 0x180; if (sprite->affineAnimEnded) { FreeSpriteTilesByTag(0x2710); @@ -1242,7 +1242,7 @@ void sub_8010278(struct Sprite *sprite) if (sprite->pos2.x == 0) { sprite->callback = sub_80102AC; - PlayCry1(sprite->data2, 25); + PlayCry1(sprite->data[2], 25); } } } @@ -1251,8 +1251,8 @@ void sub_80102AC(struct Sprite *sprite) { if (sprite->animEnded) { - sub_804777C(sprite->data0); - sub_8043DFC(gHealthboxIDs[sprite->data0]); + sub_804777C(sprite->data[0]); + sub_8043DFC(gHealthboxIDs[sprite->data[0]]); sprite->callback = nullsub_37; StartSpriteAnimIfDifferent(sprite, 0); BeginNormalPaletteFade(0x00020000, 0, 10, 0, 0x3DEF); @@ -1265,20 +1265,20 @@ void nullsub_37(struct Sprite *sprite) void unref_sub_801030C(struct Sprite *sprite) { - sprite->data3 = 6; - sprite->data4 = 1; + sprite->data[3] = 6; + sprite->data[4] = 1; sprite->callback = sub_8010320; } void sub_8010320(struct Sprite *sprite) { - sprite->data4--; - if (sprite->data4 == 0) + sprite->data[4]--; + if (sprite->data[4] == 0) { - sprite->data4 = 8; + sprite->data[4] = 8; sprite->invisible ^= 1; - sprite->data3--; - if (sprite->data3 == 0) + sprite->data[3]--; + if (sprite->data[3] == 0) { sprite->invisible = FALSE; sprite->callback = nullsub_37; @@ -1289,14 +1289,14 @@ void sub_8010320(struct Sprite *sprite) void sub_8010384(struct Sprite *sprite) { - u8 r6 = sprite->data0; + u8 r6 = sprite->data[0]; u16 species; u8 yOffset; if (ewram17800[r6].transformedSpecies != 0) species = ewram17800[r6].transformedSpecies; else - species = sprite->data2; + species = sprite->data[2]; GetMonData(&gEnemyParty[gBattlePartyID[r6]], MON_DATA_PERSONALITY); // Unused return value @@ -1326,8 +1326,8 @@ void sub_8010384(struct Sprite *sprite) yOffset = gMonFrontPicCoords[species].y_offset; } - sprite->data3 = 8 - yOffset / 8; - sprite->data4 = 1; + sprite->data[3] = 8 - yOffset / 8; + sprite->data[4] = 1; sprite->callback = sub_8010494; } @@ -1336,13 +1336,13 @@ void sub_8010494(struct Sprite *sprite) s32 i; u8 *dst; - sprite->data4--; - if (sprite->data4 == 0) + sprite->data[4]--; + if (sprite->data[4] == 0) { - sprite->data4 = 2; + sprite->data[4] = 2; sprite->pos2.y += 8; - sprite->data3--; - if (sprite->data3 < 0) + sprite->data[3]--; + if (sprite->data[3] < 0) { FreeSpriteOamMatrix(sprite); DestroySprite(sprite); @@ -1350,35 +1350,35 @@ void sub_8010494(struct Sprite *sprite) else { // this should use a MEMSET_ALT, but *(dst++) wont match with it. - dst = (u8 *)gUnknown_081FAF4C[GetBankIdentity(sprite->data0)] + (gBattleMonForms[sprite->data0] << 11) + (sprite->data3 << 8); + dst = (u8 *)gUnknown_081FAF4C[GetBankIdentity(sprite->data[0])] + (gBattleMonForms[sprite->data[0]] << 11) + (sprite->data[3] << 8); for (i = 0; i < 0x100; i++) *(dst++) = 0; - StartSpriteAnim(sprite, gBattleMonForms[sprite->data0]); + StartSpriteAnim(sprite, gBattleMonForms[sprite->data[0]]); } } } void sub_8010520(struct Sprite *sprite) { - sprite->data3 = 8; - sprite->data4 = sprite->invisible; + sprite->data[3] = 8; + sprite->data[4] = sprite->invisible; sprite->callback = sub_801053C; } void sub_801053C(struct Sprite *sprite) { - sprite->data3--; - if (sprite->data3 == 0) + sprite->data[3]--; + if (sprite->data[3] == 0) { sprite->invisible ^= 1; - sprite->data3 = 8; + sprite->data[3] = 8; } } void sub_8010574(struct Sprite *sprite) { - sprite->invisible = sprite->data4; - sprite->data4 = FALSE; + sprite->invisible = sprite->data[4]; + sprite->data[4] = FALSE; sprite->callback = nullsub_37; } @@ -1395,7 +1395,7 @@ void oac_poke_ally_(struct Sprite *sprite) if (sprite->pos2.x == 0) { sprite->callback = nullsub_86; - sprite->data1 = 0; + sprite->data[1] = 0; } } } @@ -1413,8 +1413,8 @@ void sub_80105EC(struct Sprite *sprite) { if ((gUnknown_02024DE8 & 1) == 0) { - sprite->pos2.x += sprite->data1; - sprite->pos2.y += sprite->data2; + sprite->pos2.x += sprite->data[1]; + sprite->pos2.y += sprite->data[2]; } } @@ -1440,19 +1440,19 @@ void dp11b_obj_instanciate(u8 bank, u8 b, s8 c, s8 d) objectID = gHealthboxIDs[bank]; ewram17810[bank].unk2 = spriteId; ewram17810[bank].unk0_1 = 1; - gSprites[spriteId].data0 = 0x80; + gSprites[spriteId].data[0] = 0x80; } else { objectID = gObjectBankIDs[bank]; ewram17810[bank].unk3 = spriteId; ewram17810[bank].unk0_2 = 1; - gSprites[spriteId].data0 = 0xC0; + gSprites[spriteId].data[0] = 0xC0; } - gSprites[spriteId].data1 = c; - gSprites[spriteId].data2 = d; - gSprites[spriteId].data3 = objectID; - gSprites[spriteId].data4 = b; + gSprites[spriteId].data[1] = c; + gSprites[spriteId].data[2] = d; + gSprites[spriteId].data[3] = objectID; + gSprites[spriteId].data[4] = b; gSprites[objectID].pos2.x = 0; gSprites[objectID].pos2.y = 0; } @@ -1465,7 +1465,7 @@ void dp11b_obj_free(u8 a, u8 b) { if (!ewram17810[a].unk0_1) return; - r4 = gSprites[ewram17810[a].unk2].data3; + r4 = gSprites[ewram17810[a].unk2].data[3]; DestroySprite(&gSprites[ewram17810[a].unk2]); ewram17810[a].unk0_1 = 0; } @@ -1473,7 +1473,7 @@ void dp11b_obj_free(u8 a, u8 b) { if (!ewram17810[a].unk0_2) return; - r4 = gSprites[ewram17810[a].unk3].data3; + r4 = gSprites[ewram17810[a].unk3].data[3]; DestroySprite(&gSprites[ewram17810[a].unk3]); ewram17810[a].unk0_2 = 0; } @@ -1483,16 +1483,16 @@ void dp11b_obj_free(u8 a, u8 b) void objc_dp11b_pingpong(struct Sprite *sprite) { - u8 spriteId = sprite->data3; + u8 spriteId = sprite->data[3]; s32 var; - if (sprite->data4 == 1) - var = sprite->data0; + if (sprite->data[4] == 1) + var = sprite->data[0]; else - var = sprite->data0; + var = sprite->data[0]; - gSprites[spriteId].pos2.y = Sin(var, sprite->data2) + sprite->data2; - sprite->data0 = (sprite->data0 + sprite->data1) & 0xFF; + gSprites[spriteId].pos2.y = Sin(var, sprite->data[2]) + sprite->data[2]; + sprite->data[0] = (sprite->data[0] + sprite->data[1]) & 0xFF; } void nullsub_41(void) diff --git a/src/battle/battle_7.c b/src/battle/battle_7.c index fe1d0b159..8766b5b77 100644 --- a/src/battle/battle_7.c +++ b/src/battle/battle_7.c @@ -86,7 +86,7 @@ void sub_80328A4(struct Sprite *); void sub_80312F0(struct Sprite *sprite) { - u8 spriteId = sprite->data1; + u8 spriteId = sprite->data[1]; if (gSprites[spriteId].affineAnimEnded && !gSprites[spriteId].invisible) { @@ -116,7 +116,7 @@ void sub_80313A0(struct Sprite *sprite) { if (!(gUnknown_02024DE8 & 1)) { - sprite->pos2.x += sprite->data0; + sprite->pos2.x += sprite->data[0]; if (sprite->pos2.x == 0) sprite->callback = SpriteCallbackDummy; } @@ -858,19 +858,19 @@ void sub_80327CC(void) LoadCompressedObjectPic(&gUnknown_081FAF24); r5 = GetBankByPlayerAI(1); ewram17810[r5].unk7 = CreateSprite(&gSpriteTemplate_81FAF34, sub_8077ABC(r5, 0), sub_8077ABC(r5, 1) + 32, 0xC8); - gSprites[ewram17810[r5].unk7].data0 = r5; + gSprites[ewram17810[r5].unk7].data[0] = r5; if (IsDoubleBattle()) { r5 = GetBankByPlayerAI(3); ewram17810[r5].unk7 = CreateSprite(&gSpriteTemplate_81FAF34, sub_8077ABC(r5, 0), sub_8077ABC(r5, 1) + 32, 0xC8); - gSprites[ewram17810[r5].unk7].data0 = r5; + gSprites[ewram17810[r5].unk7].data[0] = r5; } } void sub_80328A4(struct Sprite *sprite) { bool8 invisible = FALSE; - u8 r4 = sprite->data0; + u8 r4 = sprite->data[0]; struct Sprite *r7 = &gSprites[gObjectBankIDs[r4]]; if (!r7->inUse || AnimBankSpriteExists(r4) == 0) diff --git a/src/battle/battle_anim_807B69C.c b/src/battle/battle_anim_807B69C.c index 7fcd1e23f..6c35a85c9 100644 --- a/src/battle/battle_anim_807B69C.c +++ b/src/battle/battle_anim_807B69C.c @@ -86,11 +86,11 @@ u8 unref_sub_807B69C(u8 a, u8 b) for (i = 0; i < 10; i++) { spriteId2 = CreateSprite(&gSpriteTemplate_83931F8, gSprites[spriteId1].pos1.x, gSprites[spriteId1].pos1.y + 32, 0); - gSprites[spriteId2].data0 = i * 51; - gSprites[spriteId2].data1 = -256; + gSprites[spriteId2].data[0] = i * 51; + gSprites[spriteId2].data[1] = -256; gSprites[spriteId2].invisible = TRUE; if (i > 4) - gSprites[spriteId2].data6 = 21; + gSprites[spriteId2].data[6] = 21; } } else @@ -99,14 +99,14 @@ u8 unref_sub_807B69C(u8 a, u8 b) for (i = 0; i < 10; i++) { spriteId2 = CreateSprite(&gSpriteTemplate_83931F8, gSprites[spriteId1].pos1.x, gSprites[spriteId1].pos1.y - 32, 0); - gSprites[spriteId2].data0 = i * 51; - gSprites[spriteId2].data1 = 256; + gSprites[spriteId2].data[0] = i * 51; + gSprites[spriteId2].data[1] = 256; gSprites[spriteId2].invisible = TRUE; if (i > 4) - gSprites[spriteId2].data6 = 21; + gSprites[spriteId2].data[6] = 21; } } - gSprites[spriteId2].data7 = 1; + gSprites[spriteId2].data[7] = 1; return taskId; } @@ -145,7 +145,7 @@ static void sub_807B7E0(u8 taskId) static void sub_807B870(struct Sprite *sprite) { - if (sprite->data6 == 0) + if (sprite->data[6] == 0) { sprite->invisible = FALSE; sprite->callback = sub_807B8A4; @@ -153,25 +153,25 @@ static void sub_807B870(struct Sprite *sprite) } else { - sprite->data6 --; + sprite->data[6] --; } } static void sub_807B8A4(struct Sprite *sprite) { - sprite->pos2.x = Cos(sprite->data0, 32); - sprite->pos2.y = Sin(sprite->data0, 8); - if (sprite->data0 < 128) + sprite->pos2.x = Cos(sprite->data[0], 32); + sprite->pos2.y = Sin(sprite->data[0], 8); + if (sprite->data[0] < 128) sprite->subpriority = 29; else sprite->subpriority = 31; - sprite->data0 = (sprite->data0 + 8) & 0xFF; - sprite->data5 += sprite->data1; - sprite->pos2.y += sprite->data5 >> 8; - sprite->data2++; - if (sprite->data2 == 52) + sprite->data[0] = (sprite->data[0] + 8) & 0xFF; + sprite->data[5] += sprite->data[1]; + sprite->pos2.y += sprite->data[5] >> 8; + sprite->data[2]++; + if (sprite->data[2] == 52) { - if (sprite->data7 != 0) + if (sprite->data[7] != 0) DestroySpriteAndFreeResources(sprite); else DestroySprite(sprite); diff --git a/src/battle/battle_anim_80A7E7C.c b/src/battle/battle_anim_80A7E7C.c index 19ac7143e..a1d916f0f 100644 --- a/src/battle/battle_anim_80A7E7C.c +++ b/src/battle/battle_anim_80A7E7C.c @@ -340,26 +340,26 @@ void sub_80A8530(struct Sprite *sprite) sprite->invisible = TRUE; if (GetBankSide(gBattleAnimBankAttacker)) { - sprite->data1 = -gBattleAnimArgs[1]; + sprite->data[1] = -gBattleAnimArgs[1]; } else { - sprite->data1 = gBattleAnimArgs[1]; + sprite->data[1] = gBattleAnimArgs[1]; } - sprite->data0 = gBattleAnimArgs[0]; - sprite->data2 = 0; - sprite->data3 = gObjectBankIDs[gBattleAnimBankAttacker]; - sprite->data4 = gBattleAnimArgs[0]; - StoreSpriteCallbackInData6(sprite, sub_80A85A4); + sprite->data[0] = gBattleAnimArgs[0]; + sprite->data[2] = 0; + sprite->data[3] = gObjectBankIDs[gBattleAnimBankAttacker]; + sprite->data[4] = gBattleAnimArgs[0]; + StoreSpriteCallbackInData(sprite, sub_80A85A4); sprite->callback = sub_8078458; } static void sub_80A85A4(struct Sprite *sprite) { - sprite->data0 = sprite->data4; - sprite->data1 = -sprite->data1; + sprite->data[0] = sprite->data[4]; + sprite->data[1] = -sprite->data[1]; sprite->callback = sub_8078458; - StoreSpriteCallbackInData6(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, move_anim_8072740); } void sub_80A85C8(struct Sprite *sprite) @@ -367,21 +367,21 @@ void sub_80A85C8(struct Sprite *sprite) u8 spriteId; sprite->invisible = TRUE; spriteId = GetAnimBankSpriteId(gBattleAnimArgs[2]); - sprite->data0 = gBattleAnimArgs[0]; - sprite->data1 = 0; - sprite->data2 = gBattleAnimArgs[1]; - sprite->data3 = spriteId; - sprite->data4 = gBattleAnimArgs[0]; - StoreSpriteCallbackInData6(sprite, sub_80A8614); + sprite->data[0] = gBattleAnimArgs[0]; + sprite->data[1] = 0; + sprite->data[2] = gBattleAnimArgs[1]; + sprite->data[3] = spriteId; + sprite->data[4] = gBattleAnimArgs[0]; + StoreSpriteCallbackInData(sprite, sub_80A8614); sprite->callback = sub_8078458; } void sub_80A8614(struct Sprite *sprite) { - sprite->data0 = sprite->data4; - sprite->data2 = -sprite->data2; + sprite->data[0] = sprite->data[4]; + sprite->data[2] = -sprite->data[2]; sprite->callback = sub_8078458; - StoreSpriteCallbackInData6(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, move_anim_8072740); } void sub_80A8638(struct Sprite *sprite) @@ -396,28 +396,28 @@ void sub_80A8638(struct Sprite *sprite) { spriteId = gObjectBankIDs[gBattleAnimBankTarget]; } - sprite->data0 = gBattleAnimArgs[2]; - sprite->data1 = gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x; - sprite->data2 = gSprites[spriteId].pos1.x; - sprite->data3 = gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y; - sprite->data4 = gSprites[spriteId].pos1.y; + sprite->data[0] = gBattleAnimArgs[2]; + sprite->data[1] = gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x; + sprite->data[2] = gSprites[spriteId].pos1.x; + sprite->data[3] = gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y; + sprite->data[4] = gSprites[spriteId].pos1.y; something = 0; sub_8078A5C(sprite); - sprite->data3 = something; - sprite->data4 = something; - sprite->data5 = gSprites[spriteId].pos2.x; - sprite->data6 = gSprites[spriteId].pos2.y; + sprite->data[3] = something; + sprite->data[4] = something; + sprite->data[5] = gSprites[spriteId].pos2.x; + sprite->data[6] = gSprites[spriteId].pos2.y; sprite->invisible = TRUE; if (gBattleAnimArgs[1] == 1) { - sprite->data2 = something; + sprite->data[2] = something; } else if (gBattleAnimArgs[1] == 2) { - sprite->data1 = something; + sprite->data[1] = something; } - sprite->data7 = gBattleAnimArgs[1]; - sprite->data7 |= spriteId << 8; + sprite->data[7] = gBattleAnimArgs[1]; + sprite->data[7] |= spriteId << 8; sprite->callback = sub_80A86F4; } @@ -426,10 +426,10 @@ static void sub_80A86F4(struct Sprite *sprite) s8 spriteId; u8 lo; struct Sprite *sprite2; - lo = sprite->data7 & 0xff; - spriteId = sprite->data7 >> 8; + lo = sprite->data[7] & 0xff; + spriteId = sprite->data[7] >> 8; sprite2 = &gSprites[spriteId]; - if (sprite->data0 == 0) + if (sprite->data[0] == 0) { if (lo < 2) { @@ -443,11 +443,11 @@ static void sub_80A86F4(struct Sprite *sprite) } else { - sprite->data0--; - sprite->data3 += sprite->data1; - sprite->data4 += sprite->data2; - sprite2->pos2.x = (s8)(sprite->data3 >> 8) + sprite->data5; - sprite2->pos2.y = (s8)(sprite->data4 >> 8) + sprite->data6; + sprite->data[0]--; + sprite->data[3] += sprite->data[1]; + sprite->data[4] += sprite->data[2]; + sprite2->pos2.x = (s8)(sprite->data[3] >> 8) + sprite->data[5]; + sprite2->pos2.y = (s8)(sprite->data[4] >> 8) + sprite->data[6]; } } @@ -472,17 +472,17 @@ void sub_80A8764(struct Sprite *sprite) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; } } - sprite->data0 = gBattleAnimArgs[4]; - sprite->data1 = gSprites[spriteId].pos1.x; - sprite->data2 = gSprites[spriteId].pos1.x + gBattleAnimArgs[1]; - sprite->data3 = gSprites[spriteId].pos1.y; - sprite->data4 = gSprites[spriteId].pos1.y + gBattleAnimArgs[2]; + sprite->data[0] = gBattleAnimArgs[4]; + sprite->data[1] = gSprites[spriteId].pos1.x; + sprite->data[2] = gSprites[spriteId].pos1.x + gBattleAnimArgs[1]; + sprite->data[3] = gSprites[spriteId].pos1.y; + sprite->data[4] = gSprites[spriteId].pos1.y + gBattleAnimArgs[2]; sub_8078A5C(sprite); - sprite->data3 = 0; - sprite->data4 = 0; - sprite->data5 = spriteId; + sprite->data[3] = 0; + sprite->data[4] = 0; + sprite->data[5] = spriteId; sprite->invisible = TRUE; - StoreSpriteCallbackInData6(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, move_anim_8072740); sprite->callback = sub_80784A8; } @@ -508,23 +508,23 @@ void sub_80A8818(struct Sprite *sprite) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; } } - sprite->data0 = gBattleAnimArgs[4]; - sprite->data1 = gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x; - sprite->data2 = sprite->data1 + gBattleAnimArgs[1]; - sprite->data3 = gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y; - sprite->data4 = sprite->data3 + gBattleAnimArgs[2]; + sprite->data[0] = gBattleAnimArgs[4]; + sprite->data[1] = gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x; + sprite->data[2] = sprite->data[1] + gBattleAnimArgs[1]; + sprite->data[3] = gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y; + sprite->data[4] = sprite->data[3] + gBattleAnimArgs[2]; sub_8078A5C(sprite); - sprite->data3 = gSprites[spriteId].pos2.x << 8; - sprite->data4 = gSprites[spriteId].pos2.y << 8; - sprite->data5 = spriteId; - sprite->data6 = gBattleAnimArgs[5]; + sprite->data[3] = gSprites[spriteId].pos2.x << 8; + sprite->data[4] = gSprites[spriteId].pos2.y << 8; + sprite->data[5] = spriteId; + sprite->data[6] = gBattleAnimArgs[5]; if (!gBattleAnimArgs[5]) { - StoreSpriteCallbackInData6(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, move_anim_8072740); } else { - StoreSpriteCallbackInData6(sprite, sub_80A88F0); + StoreSpriteCallbackInData(sprite, sub_80A88F0); } sprite->callback = sub_80784A8; } @@ -532,8 +532,8 @@ void sub_80A8818(struct Sprite *sprite) static void sub_80A88F0(struct Sprite *sprite) { - gSprites[sprite->data5].pos2.x = 0; - gSprites[sprite->data5].pos2.y = 0; + gSprites[sprite->data[5]].pos2.x = 0; + gSprites[sprite->data[5]].pos2.y = 0; move_anim_8072740(sprite); } diff --git a/src/battle/battle_controller_linkopponent.c b/src/battle/battle_controller_linkopponent.c index 107c374a0..88043c60d 100644 --- a/src/battle/battle_controller_linkopponent.c +++ b/src/battle/battle_controller_linkopponent.c @@ -72,7 +72,7 @@ extern void sub_8031A6C(u16, u8); extern void sub_80313A0(struct Sprite *); extern void sub_803757C(void); extern void oamt_add_pos2_onto_pos1(); -extern void StoreSpriteCallbackInData6(); +extern void StoreSpriteCallbackInData(); extern void sub_8078B34(struct Sprite *); extern void sub_80375B4(void); extern void sub_8010384(struct Sprite *); @@ -275,7 +275,7 @@ void sub_80375B4(void) if (gSprites[gObjectBankIDs[gActiveBank]].callback == SpriteCallbackDummy) { sub_8031B74(gSprites[gObjectBankIDs[gActiveBank]].oam.affineParam); - gSprites[gObjectBankIDs[gActiveBank]].oam.tileNum = gSprites[gObjectBankIDs[gActiveBank]].data5; + gSprites[gObjectBankIDs[gActiveBank]].oam.tileNum = gSprites[gObjectBankIDs[gActiveBank]].data[5]; FreeSpriteOamMatrix(&gSprites[gObjectBankIDs[gActiveBank]]); DestroySprite(&gSprites[gObjectBankIDs[gActiveBank]]); LinkOpponentBufferExecCompleted(); @@ -443,18 +443,18 @@ void dp01t_0F_4_move_anim(void) { u8 spriteId = gObjectBankIDs[gActiveBank]; - if (gSprites[spriteId].data1 == 32) + if (gSprites[spriteId].data[1] == 32) { - gSprites[spriteId].data1 = 0; + gSprites[spriteId].data[1] = 0; gSprites[spriteId].invisible = FALSE; gDoingBattleAnim = 0; LinkOpponentBufferExecCompleted(); } else { - if (((u16)gSprites[spriteId].data1 % 4) == 0) + if (((u16)gSprites[spriteId].data[1] % 4) == 0) gSprites[spriteId].invisible ^= 1; - gSprites[spriteId].data1++; + gSprites[spriteId].data[1]++; } } @@ -1161,7 +1161,7 @@ void LinkOpponentHandleLoadPokeSprite(void) sub_8077F68(gActiveBank), sub_8079E90(gActiveBank)); gSprites[gObjectBankIDs[gActiveBank]].pos2.x = -240; - gSprites[gObjectBankIDs[gActiveBank]].data0 = gActiveBank; + gSprites[gObjectBankIDs[gActiveBank]].data[0] = gActiveBank; gSprites[gObjectBankIDs[gActiveBank]].oam.paletteNum = gActiveBank; StartSpriteAnim(&gSprites[gObjectBankIDs[gActiveBank]], gBattleMonForms[gActiveBank]); sub_8032984(gActiveBank, GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES)); @@ -1190,14 +1190,14 @@ void sub_8039430(u8 a, u8 b) sub_8077ABC(a, 2), sub_8077F68(a), sub_8079E90(a)); - gSprites[gUnknown_0300434C[a]].data1 = gObjectBankIDs[a]; - gSprites[gObjectBankIDs[a]].data0 = a; - gSprites[gObjectBankIDs[a]].data2 = species; + gSprites[gUnknown_0300434C[a]].data[1] = gObjectBankIDs[a]; + gSprites[gObjectBankIDs[a]].data[0] = a; + gSprites[gObjectBankIDs[a]].data[2] = species; gSprites[gObjectBankIDs[a]].oam.paletteNum = a; StartSpriteAnim(&gSprites[gObjectBankIDs[a]], gBattleMonForms[a]); gSprites[gObjectBankIDs[a]].invisible = TRUE; gSprites[gObjectBankIDs[a]].callback = SpriteCallbackDummy; - gSprites[gUnknown_0300434C[a]].data0 = sub_8046400(0, 0xFE); + gSprites[gUnknown_0300434C[a]].data[0] = sub_8046400(0, 0xFE); } void LinkOpponentHandleReturnPokeToBall(void) @@ -1262,9 +1262,9 @@ void LinkOpponentHandleTrainerThrow(void) 176 + xOffset, 40 + 4 * (8 - gTrainerFrontPicCoords[gender].coords), sub_8079E90(gActiveBank)); gSprites[gObjectBankIDs[gActiveBank]].pos2.x = -240; - gSprites[gObjectBankIDs[gActiveBank]].data0 = 2; + gSprites[gObjectBankIDs[gActiveBank]].data[0] = 2; gSprites[gObjectBankIDs[gActiveBank]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[gender].tag); - gSprites[gObjectBankIDs[gActiveBank]].data5 = gSprites[gObjectBankIDs[gActiveBank]].oam.tileNum; + gSprites[gObjectBankIDs[gActiveBank]].data[5] = gSprites[gObjectBankIDs[gActiveBank]].oam.tileNum; gSprites[gObjectBankIDs[gActiveBank]].oam.tileNum = GetSpriteTileStartByTag(gTrainerFrontPicTable[gender].tag); gSprites[gObjectBankIDs[gActiveBank]].oam.affineParam = gender; gSprites[gObjectBankIDs[gActiveBank]].callback = sub_80313A0; @@ -1279,11 +1279,11 @@ void LinkOpponentHandleTrainerSlide(void) void LinkOpponentHandleTrainerSlideBack(void) { oamt_add_pos2_onto_pos1(&gSprites[gObjectBankIDs[gActiveBank]]); - gSprites[gObjectBankIDs[gActiveBank]].data0 = 35; - gSprites[gObjectBankIDs[gActiveBank]].data2 = 280; - gSprites[gObjectBankIDs[gActiveBank]].data4 = gSprites[gObjectBankIDs[gActiveBank]].pos1.y; + gSprites[gObjectBankIDs[gActiveBank]].data[0] = 35; + gSprites[gObjectBankIDs[gActiveBank]].data[2] = 280; + gSprites[gObjectBankIDs[gActiveBank]].data[4] = gSprites[gObjectBankIDs[gActiveBank]].pos1.y; gSprites[gObjectBankIDs[gActiveBank]].callback = sub_8078B34; - StoreSpriteCallbackInData6(&gSprites[gObjectBankIDs[gActiveBank]], SpriteCallbackDummy); + StoreSpriteCallbackInData(&gSprites[gObjectBankIDs[gActiveBank]], SpriteCallbackDummy); gBattleBankFunc[gActiveBank] = sub_80375B4; } @@ -1581,7 +1581,7 @@ void LinkOpponentHandleHitAnimation(void) else { gDoingBattleAnim = TRUE; - gSprites[gObjectBankIDs[gActiveBank]].data1 = 0; + gSprites[gObjectBankIDs[gActiveBank]].data[1] = 0; sub_8047858(gActiveBank); gBattleBankFunc[gActiveBank] = dp01t_0F_4_move_anim; } @@ -1630,11 +1630,11 @@ void LinkOpponentHandleTrainerBallThrow(void) u8 taskId; oamt_add_pos2_onto_pos1(&gSprites[gObjectBankIDs[gActiveBank]]); - gSprites[gObjectBankIDs[gActiveBank]].data0 = 35; - gSprites[gObjectBankIDs[gActiveBank]].data2 = 280; - gSprites[gObjectBankIDs[gActiveBank]].data4 = gSprites[gObjectBankIDs[gActiveBank]].pos1.y; + gSprites[gObjectBankIDs[gActiveBank]].data[0] = 35; + gSprites[gObjectBankIDs[gActiveBank]].data[2] = 280; + gSprites[gObjectBankIDs[gActiveBank]].data[4] = gSprites[gObjectBankIDs[gActiveBank]].pos1.y; gSprites[gObjectBankIDs[gActiveBank]].callback = sub_8078B34; - StoreSpriteCallbackInData6(&gSprites[gObjectBankIDs[gActiveBank]], sub_803A3A8); + StoreSpriteCallbackInData(&gSprites[gObjectBankIDs[gActiveBank]], sub_803A3A8); taskId = CreateTask(sub_803A2C4, 5); gTasks[taskId].data[0] = gActiveBank; if (ewram17810[gActiveBank].unk0_0) @@ -1671,7 +1671,7 @@ void sub_803A2C4(u8 taskId) void sub_803A3A8(struct Sprite *sprite) { sub_8031B74(sprite->oam.affineParam); - sprite->oam.tileNum = sprite->data5; + sprite->oam.tileNum = sprite->data[5]; FreeSpriteOamMatrix(sprite); DestroySprite(sprite); } diff --git a/src/battle/battle_controller_linkpartner.c b/src/battle/battle_controller_linkpartner.c index 25deebf78..3e6ea4add 100644 --- a/src/battle/battle_controller_linkpartner.c +++ b/src/battle/battle_controller_linkpartner.c @@ -83,7 +83,7 @@ extern void sub_80324BC(); extern u8 sub_8031720(); extern u8 mplay_80342A4(); extern void oamt_add_pos2_onto_pos1(); -extern void StoreSpriteCallbackInData6(); +extern void StoreSpriteCallbackInData(); extern void sub_8078B34(struct Sprite *); extern void sub_80105EC(struct Sprite *); extern s32 sub_803FC34(u16); @@ -400,20 +400,20 @@ void sub_811DFA0(void) void bx_blink_t3(void) { u8 spriteId = gObjectBankIDs[gActiveBank]; - if (gSprites[spriteId].data1 == 32) + if (gSprites[spriteId].data[1] == 32) { - gSprites[spriteId].data1 = 0; + gSprites[spriteId].data[1] = 0; gSprites[spriteId].invisible = FALSE; gDoingBattleAnim = 0; LinkPartnerBufferExecCompleted(); } else { - if ((gSprites[spriteId].data1 % 4) == 0) + if ((gSprites[spriteId].data[1] % 4) == 0) { gSprites[spriteId].invisible ^= 1; } - gSprites[spriteId].data1++; + gSprites[spriteId].data[1]++; } } @@ -1118,7 +1118,7 @@ void LinkPartnerHandleLoadPokeSprite(void) sub_8077F68(gActiveBank), sub_8079E90(gActiveBank)); gSprites[gObjectBankIDs[gActiveBank]].pos2.x = -240; - gSprites[gObjectBankIDs[gActiveBank]].data0 = gActiveBank; + gSprites[gObjectBankIDs[gActiveBank]].data[0] = gActiveBank; gSprites[gObjectBankIDs[gActiveBank]].oam.paletteNum = gActiveBank; StartSpriteAnim(&gSprites[gObjectBankIDs[gActiveBank]], gBattleMonForms[gActiveBank]); gBattleBankFunc[gActiveBank] = sub_811DDE8; @@ -1147,14 +1147,14 @@ void sub_811F864(u8 a, u8 b) sub_8077ABC(a, 2), sub_8077F68(a), sub_8079E90(a)); - gSprites[gUnknown_0300434C[a]].data1 = gObjectBankIDs[a]; - gSprites[gObjectBankIDs[a]].data0 = a; - gSprites[gObjectBankIDs[a]].data2 = species; + gSprites[gUnknown_0300434C[a]].data[1] = gObjectBankIDs[a]; + gSprites[gObjectBankIDs[a]].data[0] = a; + gSprites[gObjectBankIDs[a]].data[2] = species; gSprites[gObjectBankIDs[a]].oam.paletteNum = a; StartSpriteAnim(&gSprites[gObjectBankIDs[a]], gBattleMonForms[a]); gSprites[gObjectBankIDs[a]].invisible = TRUE; gSprites[gObjectBankIDs[a]].callback = SpriteCallbackDummy; - gSprites[gUnknown_0300434C[a]].data0 = sub_8046400(0, 0xFF); + gSprites[gUnknown_0300434C[a]].data[0] = sub_8046400(0, 0xFF); } void LinkPartnerHandleReturnPokeToBall(void) @@ -1219,7 +1219,7 @@ void LinkPartnerHandleTrainerThrow(void) sub_8079E90(gActiveBank)); gSprites[gObjectBankIDs[gActiveBank]].oam.paletteNum = gActiveBank; gSprites[gObjectBankIDs[gActiveBank]].pos2.x = 240; - gSprites[gObjectBankIDs[gActiveBank]].data0 = -2; + gSprites[gObjectBankIDs[gActiveBank]].data[0] = -2; gSprites[gObjectBankIDs[gActiveBank]].callback = sub_80313A0; gBattleBankFunc[gActiveBank] = sub_811DAE4; } @@ -1232,11 +1232,11 @@ void LinkPartnerHandleTrainerSlide(void) void LinkPartnerHandleTrainerSlideBack(void) { oamt_add_pos2_onto_pos1(&gSprites[gObjectBankIDs[gActiveBank]]); - gSprites[gObjectBankIDs[gActiveBank]].data0 = 35; - gSprites[gObjectBankIDs[gActiveBank]].data2 = -40; - gSprites[gObjectBankIDs[gActiveBank]].data4 = gSprites[gObjectBankIDs[gActiveBank]].pos1.y; + gSprites[gObjectBankIDs[gActiveBank]].data[0] = 35; + gSprites[gObjectBankIDs[gActiveBank]].data[2] = -40; + gSprites[gObjectBankIDs[gActiveBank]].data[4] = gSprites[gObjectBankIDs[gActiveBank]].pos1.y; gSprites[gObjectBankIDs[gActiveBank]].callback = sub_8078B34; - StoreSpriteCallbackInData6(&gSprites[gObjectBankIDs[gActiveBank]], SpriteCallbackDummy); + StoreSpriteCallbackInData(&gSprites[gObjectBankIDs[gActiveBank]], SpriteCallbackDummy); gBattleBankFunc[gActiveBank] = sub_811DB1C; } @@ -1253,8 +1253,8 @@ void LinkPartnerHandlecmd10(void) ewram17810[gActiveBank].unk4 = 0; sub_80324F8(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank); PlaySE12WithPanning(SE_POKE_DEAD, -64); - gSprites[gObjectBankIDs[gActiveBank]].data1 = 0; - gSprites[gObjectBankIDs[gActiveBank]].data2 = 5; + gSprites[gObjectBankIDs[gActiveBank]].data[1] = 0; + gSprites[gObjectBankIDs[gActiveBank]].data[2] = 5; gSprites[gObjectBankIDs[gActiveBank]].callback = sub_80105EC; gBattleBankFunc[gActiveBank] = sub_811DE98; } @@ -1534,7 +1534,7 @@ void LinkPartnerHandleHitAnimation(void) else { gDoingBattleAnim = TRUE; - gSprites[gObjectBankIDs[gActiveBank]].data1 = 0; + gSprites[gObjectBankIDs[gActiveBank]].data[1] = 0; sub_8047858(gActiveBank); gBattleBankFunc[gActiveBank] = bx_blink_t3; } @@ -1584,12 +1584,12 @@ void LinkPartnerHandleTrainerBallThrow(void) u8 taskId; oamt_add_pos2_onto_pos1(&gSprites[gObjectBankIDs[gActiveBank]]); - gSprites[gObjectBankIDs[gActiveBank]].data0 = 50; - gSprites[gObjectBankIDs[gActiveBank]].data2 = -40; - gSprites[gObjectBankIDs[gActiveBank]].data4 = gSprites[gObjectBankIDs[gActiveBank]].pos1.y; + gSprites[gObjectBankIDs[gActiveBank]].data[0] = 50; + gSprites[gObjectBankIDs[gActiveBank]].data[2] = -40; + gSprites[gObjectBankIDs[gActiveBank]].data[4] = gSprites[gObjectBankIDs[gActiveBank]].pos1.y; gSprites[gObjectBankIDs[gActiveBank]].callback = sub_8078B34; - gSprites[gObjectBankIDs[gActiveBank]].data5 = gActiveBank; - StoreSpriteCallbackInData6(&gSprites[gObjectBankIDs[gActiveBank]], sub_8030E38); + gSprites[gObjectBankIDs[gActiveBank]].data[5] = gActiveBank; + StoreSpriteCallbackInData(&gSprites[gObjectBankIDs[gActiveBank]], sub_8030E38); StartSpriteAnim(&gSprites[gObjectBankIDs[gActiveBank]], 1); r4 = AllocSpritePalette(0xD6F9); LoadCompressedPalette( diff --git a/src/battle/battle_controller_opponent.c b/src/battle/battle_controller_opponent.c index 823d6702a..4d4155419 100644 --- a/src/battle/battle_controller_opponent.c +++ b/src/battle/battle_controller_opponent.c @@ -86,7 +86,7 @@ extern void sub_8032B84(void); extern void sub_8078B34(struct Sprite *); extern void sub_8032BBC(void); extern void oamt_add_pos2_onto_pos1(); -extern void StoreSpriteCallbackInData6(); +extern void StoreSpriteCallbackInData(); extern void sub_803311C(void); extern void sub_8010384(struct Sprite *); extern bool8 mplay_80342A4(u8); @@ -295,7 +295,7 @@ void sub_8032BBC(void) if (gSprites[gObjectBankIDs[gActiveBank]].callback == SpriteCallbackDummy) { sub_8031B74(gSprites[gObjectBankIDs[gActiveBank]].oam.affineParam); - gSprites[gObjectBankIDs[gActiveBank]].oam.tileNum = gSprites[gObjectBankIDs[gActiveBank]].data5; + gSprites[gObjectBankIDs[gActiveBank]].oam.tileNum = gSprites[gObjectBankIDs[gActiveBank]].data[5]; FreeSpriteOamMatrix(&gSprites[gObjectBankIDs[gActiveBank]]); DestroySprite(&gSprites[gObjectBankIDs[gActiveBank]]); OpponentBufferExecCompleted(); @@ -447,18 +447,18 @@ void bx_blink_t7(void) { u8 spriteId = gObjectBankIDs[gActiveBank]; - if (gSprites[spriteId].data1 == 32) + if (gSprites[spriteId].data[1] == 32) { - gSprites[spriteId].data1 = 0; + gSprites[spriteId].data[1] = 0; gSprites[spriteId].invisible = FALSE; gDoingBattleAnim = 0; OpponentBufferExecCompleted(); } else { - if (((u16)gSprites[spriteId].data1 % 4) == 0) + if (((u16)gSprites[spriteId].data[1] % 4) == 0) gSprites[spriteId].invisible ^= 1; - gSprites[spriteId].data1++; + gSprites[spriteId].data[1]++; } } @@ -1131,8 +1131,8 @@ void OpponentHandleLoadPokeSprite(void) sub_8077F68(gActiveBank), sub_8079E90(gActiveBank)); gSprites[gObjectBankIDs[gActiveBank]].pos2.x = -240; - gSprites[gObjectBankIDs[gActiveBank]].data0 = gActiveBank; - gSprites[gObjectBankIDs[gActiveBank]].data2 = species; + gSprites[gObjectBankIDs[gActiveBank]].data[0] = gActiveBank; + gSprites[gObjectBankIDs[gActiveBank]].data[2] = species; gSprites[gObjectBankIDs[gActiveBank]].oam.paletteNum = gActiveBank; StartSpriteAnim(&gSprites[gObjectBankIDs[gActiveBank]], gBattleMonForms[gActiveBank]); sub_8032984(gActiveBank, GetMonData(&gEnemyParty[gBattlePartyID[gActiveBank]], MON_DATA_SPECIES)); @@ -1162,14 +1162,14 @@ void sub_803495C(u8 a, u8 b) sub_8077ABC(a, 2), sub_8077F68(a), sub_8079E90(a)); - gSprites[gObjectBankIDs[a]].data0 = a; - gSprites[gObjectBankIDs[a]].data2 = species; - gSprites[gUnknown_0300434C[a]].data1 = gObjectBankIDs[a]; + gSprites[gObjectBankIDs[a]].data[0] = a; + gSprites[gObjectBankIDs[a]].data[2] = species; + gSprites[gUnknown_0300434C[a]].data[1] = gObjectBankIDs[a]; gSprites[gObjectBankIDs[a]].oam.paletteNum = a; StartSpriteAnim(&gSprites[gObjectBankIDs[a]], gBattleMonForms[a]); gSprites[gObjectBankIDs[a]].invisible = TRUE; gSprites[gObjectBankIDs[a]].callback = SpriteCallbackDummy; - gSprites[gUnknown_0300434C[a]].data0 = sub_8046400(0, 0xFE); + gSprites[gUnknown_0300434C[a]].data[0] = sub_8046400(0, 0xFE); } void OpponentHandleReturnPokeToBall(void) @@ -1230,9 +1230,9 @@ void OpponentHandleTrainerThrow(void) 40 + 4 * (8 - gTrainerFrontPicCoords[trainerPicIndex].coords), sub_8079E90(gActiveBank)); gSprites[gObjectBankIDs[gActiveBank]].pos2.x = -240; - gSprites[gObjectBankIDs[gActiveBank]].data0 = 2; + gSprites[gObjectBankIDs[gActiveBank]].data[0] = 2; gSprites[gObjectBankIDs[gActiveBank]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicIndex].tag); - gSprites[gObjectBankIDs[gActiveBank]].data5 = gSprites[gObjectBankIDs[gActiveBank]].oam.tileNum; + gSprites[gObjectBankIDs[gActiveBank]].data[5] = gSprites[gObjectBankIDs[gActiveBank]].oam.tileNum; gSprites[gObjectBankIDs[gActiveBank]].oam.tileNum = GetSpriteTileStartByTag(gTrainerFrontPicTable[trainerPicIndex].tag); gSprites[gObjectBankIDs[gActiveBank]].oam.affineParam = trainerPicIndex; gSprites[gObjectBankIDs[gActiveBank]].callback = sub_80313A0; @@ -1261,9 +1261,9 @@ void OpponentHandleTrainerSlide(void) 0x1E); gSprites[gObjectBankIDs[gActiveBank]].pos2.x = 96; gSprites[gObjectBankIDs[gActiveBank]].pos1.x += 32; - gSprites[gObjectBankIDs[gActiveBank]].data0 = -2; + gSprites[gObjectBankIDs[gActiveBank]].data[0] = -2; gSprites[gObjectBankIDs[gActiveBank]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicIndex].tag); - gSprites[gObjectBankIDs[gActiveBank]].data5 = gSprites[gObjectBankIDs[gActiveBank]].oam.tileNum; + gSprites[gObjectBankIDs[gActiveBank]].data[5] = gSprites[gObjectBankIDs[gActiveBank]].oam.tileNum; gSprites[gObjectBankIDs[gActiveBank]].oam.tileNum = GetSpriteTileStartByTag(gTrainerFrontPicTable[trainerPicIndex].tag); gSprites[gObjectBankIDs[gActiveBank]].oam.affineParam = trainerPicIndex; gSprites[gObjectBankIDs[gActiveBank]].callback = sub_80313A0; @@ -1273,11 +1273,11 @@ void OpponentHandleTrainerSlide(void) void OpponentHandleTrainerSlideBack(void) { oamt_add_pos2_onto_pos1(&gSprites[gObjectBankIDs[gActiveBank]]); - gSprites[gObjectBankIDs[gActiveBank]].data0 = 35; - gSprites[gObjectBankIDs[gActiveBank]].data2 = 280; - gSprites[gObjectBankIDs[gActiveBank]].data4 = gSprites[gObjectBankIDs[gActiveBank]].pos1.y; + gSprites[gObjectBankIDs[gActiveBank]].data[0] = 35; + gSprites[gObjectBankIDs[gActiveBank]].data[2] = 280; + gSprites[gObjectBankIDs[gActiveBank]].data[4] = gSprites[gObjectBankIDs[gActiveBank]].pos1.y; gSprites[gObjectBankIDs[gActiveBank]].callback = sub_8078B34; - StoreSpriteCallbackInData6(&gSprites[gObjectBankIDs[gActiveBank]], SpriteCallbackDummy); + StoreSpriteCallbackInData(&gSprites[gObjectBankIDs[gActiveBank]], SpriteCallbackDummy); gBattleBankFunc[gActiveBank] = sub_8032BBC; } @@ -1853,7 +1853,7 @@ void OpponentHandleHitAnimation(void) else { gDoingBattleAnim = TRUE; - gSprites[gObjectBankIDs[gActiveBank]].data1 = 0; + gSprites[gObjectBankIDs[gActiveBank]].data[1] = 0; sub_8047858(gActiveBank); gBattleBankFunc[gActiveBank] = bx_blink_t7; } @@ -1902,11 +1902,11 @@ void OpponentHandleTrainerBallThrow(void) u8 taskId; oamt_add_pos2_onto_pos1(&gSprites[gObjectBankIDs[gActiveBank]]); - gSprites[gObjectBankIDs[gActiveBank]].data0 = 35; - gSprites[gObjectBankIDs[gActiveBank]].data2 = 280; - gSprites[gObjectBankIDs[gActiveBank]].data4 = gSprites[gObjectBankIDs[gActiveBank]].pos1.y; + gSprites[gObjectBankIDs[gActiveBank]].data[0] = 35; + gSprites[gObjectBankIDs[gActiveBank]].data[2] = 280; + gSprites[gObjectBankIDs[gActiveBank]].data[4] = gSprites[gObjectBankIDs[gActiveBank]].pos1.y; gSprites[gObjectBankIDs[gActiveBank]].callback = sub_8078B34; - StoreSpriteCallbackInData6(&gSprites[gObjectBankIDs[gActiveBank]], sub_8035C10); + StoreSpriteCallbackInData(&gSprites[gObjectBankIDs[gActiveBank]], sub_8035C10); taskId = CreateTask(sub_8035C44, 5); gTasks[taskId].data[0] = gActiveBank; if (ewram17810[gActiveBank].unk0_0) @@ -1918,7 +1918,7 @@ void OpponentHandleTrainerBallThrow(void) void sub_8035C10(struct Sprite *sprite) { sub_8031B74(sprite->oam.affineParam); - sprite->oam.tileNum = sprite->data5; + sprite->oam.tileNum = sprite->data[5]; FreeSpriteOamMatrix(sprite); DestroySprite(sprite); } diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c index f2004c9b7..55fc45f95 100644 --- a/src/battle/battle_controller_player.c +++ b/src/battle/battle_controller_player.c @@ -102,7 +102,7 @@ extern u8 GetBankSide(u8); extern void sub_80E43C0(); extern void oamt_add_pos2_onto_pos1(); extern void sub_8078B34(struct Sprite *); -extern void StoreSpriteCallbackInData6(); +extern void StoreSpriteCallbackInData(); extern void BattleLoadPlayerMonSprite(); extern bool8 IsDoubleBattle(void); extern void sub_802D500(void); @@ -1537,18 +1537,18 @@ void bx_blink_t1(void) { u8 spriteId = gObjectBankIDs[gActiveBank]; - if (gSprites[spriteId].data1 == 32) + if (gSprites[spriteId].data[1] == 32) { - gSprites[spriteId].data1 = 0; + gSprites[spriteId].data[1] = 0; gSprites[spriteId].invisible = FALSE; gDoingBattleAnim = 0; PlayerBufferExecCompleted(); } else { - if (((u16)gSprites[spriteId].data1 % 4) == 0) + if (((u16)gSprites[spriteId].data[1] % 4) == 0) gSprites[spriteId].invisible ^= 1; - gSprites[spriteId].data1++; + gSprites[spriteId].data[1]++; } } @@ -2324,14 +2324,14 @@ void sub_802F934(u8 bank, u8 b) sub_8077ABC(bank, 2), sub_8077F68(bank), sub_8079E90(bank)); - gSprites[gUnknown_0300434C[bank]].data1 = gObjectBankIDs[bank]; - gSprites[gObjectBankIDs[bank]].data0 = bank; - gSprites[gObjectBankIDs[bank]].data2 = species; + gSprites[gUnknown_0300434C[bank]].data[1] = gObjectBankIDs[bank]; + gSprites[gObjectBankIDs[bank]].data[0] = bank; + gSprites[gObjectBankIDs[bank]].data[2] = species; gSprites[gObjectBankIDs[bank]].oam.paletteNum = bank; StartSpriteAnim(&gSprites[gObjectBankIDs[bank]], gBattleMonForms[bank]); gSprites[gObjectBankIDs[bank]].invisible = TRUE; gSprites[gObjectBankIDs[bank]].callback = SpriteCallbackDummy; - gSprites[gUnknown_0300434C[bank]].data0 = sub_8046400(0, 0xFF); + gSprites[gUnknown_0300434C[bank]].data[0] = sub_8046400(0, 0xFF); } void PlayerHandleReturnPokeToBall(void) @@ -2393,7 +2393,7 @@ void PlayerHandleTrainerThrow(void) sub_8079E90(gActiveBank)); gSprites[gObjectBankIDs[gActiveBank]].oam.paletteNum = gActiveBank; gSprites[gObjectBankIDs[gActiveBank]].pos2.x = 240; - gSprites[gObjectBankIDs[gActiveBank]].data0 = -2; + gSprites[gObjectBankIDs[gActiveBank]].data[0] = -2; gSprites[gObjectBankIDs[gActiveBank]].callback = sub_80313A0; gBattleBankFunc[gActiveBank] = sub_802D204; } @@ -2409,7 +2409,7 @@ void PlayerHandleTrainerSlide(void) 30); gSprites[gObjectBankIDs[gActiveBank]].oam.paletteNum = gActiveBank; gSprites[gObjectBankIDs[gActiveBank]].pos2.x = -96; - gSprites[gObjectBankIDs[gActiveBank]].data0 = 2; + gSprites[gObjectBankIDs[gActiveBank]].data[0] = 2; gSprites[gObjectBankIDs[gActiveBank]].callback = sub_80313A0; gBattleBankFunc[gActiveBank] = sub_802D23C; } @@ -2417,11 +2417,11 @@ void PlayerHandleTrainerSlide(void) void PlayerHandleTrainerSlideBack(void) { oamt_add_pos2_onto_pos1(&gSprites[gObjectBankIDs[gActiveBank]]); - gSprites[gObjectBankIDs[gActiveBank]].data0 = 50; - gSprites[gObjectBankIDs[gActiveBank]].data2 = -40; - gSprites[gObjectBankIDs[gActiveBank]].data4 = gSprites[gObjectBankIDs[gActiveBank]].pos1.y; + gSprites[gObjectBankIDs[gActiveBank]].data[0] = 50; + gSprites[gObjectBankIDs[gActiveBank]].data[2] = -40; + gSprites[gObjectBankIDs[gActiveBank]].data[4] = gSprites[gObjectBankIDs[gActiveBank]].pos1.y; gSprites[gObjectBankIDs[gActiveBank]].callback = sub_8078B34; - StoreSpriteCallbackInData6(&gSprites[gObjectBankIDs[gActiveBank]], SpriteCallbackDummy); + StoreSpriteCallbackInData(&gSprites[gObjectBankIDs[gActiveBank]], SpriteCallbackDummy); StartSpriteAnim(&gSprites[gObjectBankIDs[gActiveBank]], 1); gBattleBankFunc[gActiveBank] = sub_802D274; } @@ -2441,8 +2441,8 @@ void PlayerHandlecmd10(void) ewram17810[gActiveBank].unk4 = 0; sub_80324F8(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank); PlaySE12WithPanning(SE_POKE_DEAD, -64); - gSprites[gObjectBankIDs[gActiveBank]].data1 = 0; - gSprites[gObjectBankIDs[gActiveBank]].data2 = 5; + gSprites[gObjectBankIDs[gActiveBank]].data[1] = 0; + gSprites[gObjectBankIDs[gActiveBank]].data[2] = 5; gSprites[gObjectBankIDs[gActiveBank]].callback = sub_80105EC; gBattleBankFunc[gActiveBank] = sub_802DE10; } @@ -2837,7 +2837,7 @@ void PlayerHandleHitAnimation(void) else { gDoingBattleAnim = 1; - gSprites[gObjectBankIDs[gActiveBank]].data1 = 0; + gSprites[gObjectBankIDs[gActiveBank]].data[1] = 0; sub_8047858(gActiveBank); gBattleBankFunc[gActiveBank] = bx_blink_t1; } @@ -2887,12 +2887,12 @@ void PlayerHandleTrainerBallThrow(void) u8 taskId; oamt_add_pos2_onto_pos1(&gSprites[gObjectBankIDs[gActiveBank]]); - gSprites[gObjectBankIDs[gActiveBank]].data0 = 50; - gSprites[gObjectBankIDs[gActiveBank]].data2 = -40; - gSprites[gObjectBankIDs[gActiveBank]].data4 = gSprites[gObjectBankIDs[gActiveBank]].pos1.y; + gSprites[gObjectBankIDs[gActiveBank]].data[0] = 50; + gSprites[gObjectBankIDs[gActiveBank]].data[2] = -40; + gSprites[gObjectBankIDs[gActiveBank]].data[4] = gSprites[gObjectBankIDs[gActiveBank]].pos1.y; gSprites[gObjectBankIDs[gActiveBank]].callback = sub_8078B34; - gSprites[gObjectBankIDs[gActiveBank]].data5 = gActiveBank; - StoreSpriteCallbackInData6(&gSprites[gObjectBankIDs[gActiveBank]], sub_8030E38); + gSprites[gObjectBankIDs[gActiveBank]].data[5] = gActiveBank; + StoreSpriteCallbackInData(&gSprites[gObjectBankIDs[gActiveBank]], sub_8030E38); StartSpriteAnim(&gSprites[gObjectBankIDs[gActiveBank]], 1); paletteNum = AllocSpritePalette(0xD6F8); LoadCompressedPalette(gTrainerBackPicPaletteTable[gSaveBlock2.playerGender].data, 0x100 + paletteNum * 16, 32); @@ -2907,7 +2907,7 @@ void PlayerHandleTrainerBallThrow(void) void sub_8030E38(struct Sprite *sprite) { - u8 r4 = sprite->data5; + u8 r4 = sprite->data[5]; FreeSpriteOamMatrix(sprite); FreeSpritePaletteByTag(GetSpritePaletteTagByPaletteNum(sprite->oam.paletteNum)); diff --git a/src/battle/battle_controller_safari.c b/src/battle/battle_controller_safari.c index 8a8515fc7..f83eddc9f 100644 --- a/src/battle/battle_controller_safari.c +++ b/src/battle/battle_controller_safari.c @@ -394,7 +394,7 @@ void SafariHandleTrainerThrow(void) 30); gSprites[gObjectBankIDs[gActiveBank]].oam.paletteNum = gActiveBank; gSprites[gObjectBankIDs[gActiveBank]].pos2.x = 240; - gSprites[gObjectBankIDs[gActiveBank]].data0 = -2; + gSprites[gObjectBankIDs[gActiveBank]].data[0] = -2; gSprites[gObjectBankIDs[gActiveBank]].callback = sub_80313A0; gBattleBankFunc[gActiveBank] = sub_812B65C; } diff --git a/src/battle/battle_controller_wally.c b/src/battle/battle_controller_wally.c index 05fd8e583..77aa54873 100644 --- a/src/battle/battle_controller_wally.c +++ b/src/battle/battle_controller_wally.c @@ -90,7 +90,7 @@ extern void sub_80E43C0(); extern void oamt_add_pos2_onto_pos1(); extern void sub_8078B34(struct Sprite *); extern void sub_8030E38(struct Sprite *); -extern void StoreSpriteCallbackInData6(); +extern void StoreSpriteCallbackInData(); extern u8 sub_8046400(); extern u8 sub_8077ABC(); extern u8 sub_8077F68(); @@ -439,18 +439,18 @@ void bx_blink_t5(void) { u8 spriteId = gObjectBankIDs[gActiveBank]; - if (gSprites[spriteId].data1 == 32) + if (gSprites[spriteId].data[1] == 32) { - gSprites[spriteId].data1 = 0; + gSprites[spriteId].data[1] = 0; gSprites[spriteId].invisible = FALSE; gDoingBattleAnim = FALSE; WallyBufferExecCompleted(); } else { - if (((u16)gSprites[spriteId].data1 % 4) == 0) + if (((u16)gSprites[spriteId].data[1] % 4) == 0) gSprites[spriteId].invisible ^= 1; - gSprites[spriteId].data1++; + gSprites[spriteId].data[1]++; } } @@ -1111,7 +1111,7 @@ void WallyHandleTrainerThrow(void) 30); gSprites[gObjectBankIDs[gActiveBank]].oam.paletteNum = gActiveBank; gSprites[gObjectBankIDs[gActiveBank]].pos2.x = 240; - gSprites[gObjectBankIDs[gActiveBank]].data0 = -2; + gSprites[gObjectBankIDs[gActiveBank]].data[0] = -2; gSprites[gObjectBankIDs[gActiveBank]].callback = sub_80313A0; gBattleBankFunc[gActiveBank] = sub_813741C; } @@ -1126,7 +1126,7 @@ void WallyHandleTrainerSlide(void) 30); gSprites[gObjectBankIDs[gActiveBank]].oam.paletteNum = gActiveBank; gSprites[gObjectBankIDs[gActiveBank]].pos2.x = -96; - gSprites[gObjectBankIDs[gActiveBank]].data0 = 2; + gSprites[gObjectBankIDs[gActiveBank]].data[0] = 2; gSprites[gObjectBankIDs[gActiveBank]].callback = sub_80313A0; gBattleBankFunc[gActiveBank] = sub_8137908; } @@ -1440,7 +1440,7 @@ void WallyHandleHitAnimation(void) else { gDoingBattleAnim = 1; - gSprites[gObjectBankIDs[gActiveBank]].data1 = 0; + gSprites[gObjectBankIDs[gActiveBank]].data[1] = 0; sub_8047858(gActiveBank); gBattleBankFunc[gActiveBank] = bx_blink_t5; } @@ -1482,12 +1482,12 @@ void WallyHandleTrainerBallThrow(void) u8 taskId; oamt_add_pos2_onto_pos1(&gSprites[gObjectBankIDs[gActiveBank]]); - gSprites[gObjectBankIDs[gActiveBank]].data0 = 50; - gSprites[gObjectBankIDs[gActiveBank]].data2 = -40; - gSprites[gObjectBankIDs[gActiveBank]].data4 = gSprites[gObjectBankIDs[gActiveBank]].pos1.y; + gSprites[gObjectBankIDs[gActiveBank]].data[0] = 50; + gSprites[gObjectBankIDs[gActiveBank]].data[2] = -40; + gSprites[gObjectBankIDs[gActiveBank]].data[4] = gSprites[gObjectBankIDs[gActiveBank]].pos1.y; gSprites[gObjectBankIDs[gActiveBank]].callback = sub_8078B34; - gSprites[gObjectBankIDs[gActiveBank]].data5 = gActiveBank; - StoreSpriteCallbackInData6(&gSprites[gObjectBankIDs[gActiveBank]], sub_8030E38); + gSprites[gObjectBankIDs[gActiveBank]].data[5] = gActiveBank; + StoreSpriteCallbackInData(&gSprites[gObjectBankIDs[gActiveBank]], sub_8030E38); StartSpriteAnim(&gSprites[gObjectBankIDs[gActiveBank]], 1); paletteNum = AllocSpritePalette(0xD6F8); LoadCompressedPalette(gTrainerBackPicPaletteTable[2].data, 0x100 + paletteNum * 16, 32); @@ -1514,14 +1514,14 @@ void sub_81398BC(u8 bank) sub_8077ABC(bank, 2), sub_8077F68(bank), sub_8079E90(bank)); - gSprites[gUnknown_0300434C[bank]].data1 = gObjectBankIDs[bank]; - gSprites[gObjectBankIDs[bank]].data0 = bank; - gSprites[gObjectBankIDs[bank]].data2 = species; + gSprites[gUnknown_0300434C[bank]].data[1] = gObjectBankIDs[bank]; + gSprites[gObjectBankIDs[bank]].data[0] = bank; + gSprites[gObjectBankIDs[bank]].data[2] = species; gSprites[gObjectBankIDs[bank]].oam.paletteNum = bank; StartSpriteAnim(&gSprites[gObjectBankIDs[bank]], gBattleMonForms[bank]); gSprites[gObjectBankIDs[bank]].invisible = TRUE; gSprites[gObjectBankIDs[bank]].callback = SpriteCallbackDummy; - gSprites[gUnknown_0300434C[bank]].data0 = sub_8046400(0, 0xFF); + gSprites[gUnknown_0300434C[bank]].data[0] = sub_8046400(0, 0xFF); } void sub_8139A2C(u8 taskId) diff --git a/src/battle/battle_interface.c b/src/battle/battle_interface.c index 0bd2e882f..d35440246 100644 --- a/src/battle/battle_interface.c +++ b/src/battle/battle_interface.c @@ -439,7 +439,7 @@ u8 battle_make_oam_normal_battle(u8 a) //_080439F2 gSprites[spriteId1].oam.affineParam = spriteId2; - gSprites[spriteId2].data5 = spriteId1; + gSprites[spriteId2].data[5] = spriteId1; gSprites[spriteId2].callback = sub_8043D5C; } //_08043A28 @@ -451,7 +451,7 @@ u8 battle_make_oam_normal_battle(u8 a) spriteId2 = CreateSpriteAtEnd(&gSpriteTemplate_820A4EC[GetBankIdentity(a) / 2], 240, 160, 1); gSprites[spriteId1].oam.affineParam = spriteId2; - gSprites[spriteId2].data5 = spriteId1; + gSprites[spriteId2].data[5] = spriteId1; gSprites[spriteId2].oam.tileNum += 32; gSprites[spriteId2].callback = sub_8043D5C; sp0 = 1; @@ -463,7 +463,7 @@ u8 battle_make_oam_normal_battle(u8 a) spriteId2 = CreateSpriteAtEnd(&gSpriteTemplate_820A51C[GetBankIdentity(a) / 2], 240, 160, 1); gSprites[spriteId1].oam.affineParam = spriteId2; - gSprites[spriteId2].data5 = spriteId1; + gSprites[spriteId2].data[5] = spriteId1; gSprites[spriteId2].oam.tileNum += 32; gSprites[spriteId2].callback = sub_8043D5C; sp0 = 2; @@ -479,12 +479,12 @@ u8 battle_make_oam_normal_battle(u8 a) sprite->oam.priority = 1; CpuCopy32(sub_8043CDC(1), OBJ_VRAM0 + sprite->oam.tileNum * 32, 64); - gSprites[spriteId1].data5 = spriteId3; - gSprites[spriteId1].data6 = a; + gSprites[spriteId1].data[5] = spriteId3; + gSprites[spriteId1].data[6] = a; gSprites[spriteId1].invisible = TRUE; gSprites[spriteId2].invisible = TRUE; - sprite->data5 = spriteId1; - sprite->data6 = sp0; + sprite->data[5] = spriteId1; + sprite->data[6] = sp0; sprite->invisible = TRUE; return spriteId1; @@ -499,7 +499,7 @@ u8 battle_make_oam_safari_battle(void) gSprites[spriteId2].oam.shape = 0; gSprites[spriteId2].oam.tileNum += 0x40; gSprites[spriteId1].oam.affineParam = spriteId2; - gSprites[spriteId2].data5 = spriteId1; + gSprites[spriteId2].data[5] = spriteId1; gSprites[spriteId2].callback = sub_8043D5C; return spriteId1; } @@ -511,9 +511,9 @@ static const void *sub_8043CDC(u8 a) void sub_8043CEC(struct Sprite *sprite) { - u8 r5 = sprite->data5; + u8 r5 = sprite->data[5]; - switch (sprite->data6) + switch (sprite->data[6]) { case 0: sprite->pos1.x = gSprites[r5].pos1.x + 16; @@ -535,7 +535,7 @@ void sub_8043CEC(struct Sprite *sprite) static void sub_8043D5C(struct Sprite *sprite) { - u8 data5 = sprite->data5; + u8 data5 = sprite->data[5]; sprite->pos1.x = gSprites[data5].pos1.x + 64; sprite->pos1.y = gSprites[data5].pos1.y; @@ -555,14 +555,14 @@ void sub_8043D84(u8 a, u8 b, u32 c, u32 d, u32 e) void sub_8043DB0(u8 a) { gSprites[a].invisible = TRUE; - gSprites[gSprites[a].data5].invisible = TRUE; + gSprites[gSprites[a].data[5]].invisible = TRUE; gSprites[gSprites[a].oam.affineParam].invisible = TRUE; } void sub_8043DFC(u8 a) { gSprites[a].invisible = FALSE; - gSprites[gSprites[a].data5].invisible = FALSE; + gSprites[gSprites[a].data[5]].invisible = FALSE; gSprites[gSprites[a].oam.affineParam].invisible = FALSE; } @@ -575,7 +575,7 @@ static void sub_8043E50(u8 spriteId, s16 x, s16 y) void unref_sub_8043E70(u8 a) { DestroySprite(&gSprites[gSprites[a].oam.affineParam]); - DestroySprite(&gSprites[gSprites[a].data5]); + DestroySprite(&gSprites[gSprites[a].data[5]]); DestroySprite(&gSprites[a]); } @@ -595,7 +595,7 @@ void sub_8043EB4(u8 priority) spriteId1 = gHealthboxIDs[i]; spriteId2 = gSprites[spriteId1].oam.affineParam; - spriteId3 = gSprites[spriteId1].data5; + spriteId3 = gSprites[spriteId1].data[5]; gSprites[spriteId1].oam.priority = priority; gSprites[spriteId2].oam.priority = priority; gSprites[spriteId3].oam.priority = priority; @@ -663,14 +663,14 @@ static void sub_8043FC0(u8 a, u8 b) memcpy(str, gUnknown_0820A81C, sizeof(str)); if (!IsDoubleBattle()) { - if (GetBankSide(gSprites[a].data6) == 0) + if (GetBankSide(gSprites[a].data[6]) == 0) r7 = gUnknown_0820A804; else r7 = gUnknown_0820A80C; } else { - if (GetBankSide(gSprites[a].data6) == 0) + if (GetBankSide(gSprites[a].data[6]) == 0) r7 = gUnknown_0820A814; else r7 = gUnknown_0820A80C; @@ -718,7 +718,7 @@ void sub_80440EC(u8 a, s16 b, u8 c) // TODO: make this a local variable memcpy(str, gUnknown_0820A864, sizeof(str)); - foo = gSprites[a].data6; + foo = gSprites[a].data[6]; if (IsDoubleBattle() == TRUE || GetBankSide(foo) == 1) { @@ -730,7 +730,7 @@ void sub_80440EC(u8 a, s16 b, u8 c) ptr = str + 6; if (c == 0) { - if (GetBankSide(gSprites[a].data6) == 0) + if (GetBankSide(gSprites[a].data[6]) == 0) r4 = gUnknown_0820A83C; else r4 = gUnknown_0820A848; @@ -742,7 +742,7 @@ void sub_80440EC(u8 a, s16 b, u8 c) } else { - if (GetBankSide(gSprites[a].data6) == 0) + if (GetBankSide(gSprites[a].data[6]) == 0) r4 = gUnknown_0820A854; else r4 = gUnknown_0820A85C; @@ -916,7 +916,7 @@ static void sub_8044210(u8 a, s16 b, u8 c) // TODO: make this a local variable memcpy(str, gUnknown_0820A89C, sizeof(str)); - r4 = gSprites[a].data6; + r4 = gSprites[a].data[6]; if ((ewram17800[r4].unk0_4) == 0) return; ptr = str + 6; @@ -938,7 +938,7 @@ static void sub_8044210(u8 a, s16 b, u8 c) CpuCopy32(sub_8043CDC(0x74), OBJ_VRAM0 + (gSprites[a].oam.tileNum + 0x34) * 32, 32); } } - r4 = gSprites[a].data5; + r4 = gSprites[a].data[5]; sub_80034D4(ewram0_9(0), str); for (i = 0; i < r10; i++) { @@ -959,7 +959,7 @@ void sub_8044338(u8 a, struct Pokemon *pkmn) // TODO: make this a local variable memcpy(str, gUnknown_0820A864, sizeof(str)); - r6 = ewram520[GetBankIdentity(gSprites[a].data6)].filler0; + r6 = ewram520[GetBankIdentity(gSprites[a].data[6])].filler0; r8 = 5; nature = GetNature(pkmn); StringCopy(str + 6, gNatureNames[nature]); @@ -994,7 +994,7 @@ void sub_8044338(u8 a, struct Pokemon *pkmn) r6 += 32; } //_08044486 - r5 = gSprites[a].data5; + r5 = gSprites[a].data[5]; ConvertIntToDecimalStringN(str + 6, ewram16089, 1, 2); ConvertIntToDecimalStringN(str + 9, ewram16088, 1, 2); str[5] = 0; @@ -1302,7 +1302,7 @@ void sub_804454C(void) if (r6 == 1) { - spriteId = gSprites[gHealthboxIDs[i]].data5; + spriteId = gSprites[gHealthboxIDs[i]].data[5]; CpuFill32(0, OBJ_VRAM0 + gSprites[spriteId].oam.tileNum * 32, 0x100); sub_8044210(gHealthboxIDs[i], GetMonData(&gPlayerParty[gBattlePartyID[i]], MON_DATA_HP), 0); @@ -1325,7 +1325,7 @@ void sub_804454C(void) } else { - spriteId = gSprites[gHealthboxIDs[i]].data5; + spriteId = gSprites[gHealthboxIDs[i]].data[5]; CpuFill32(0, OBJ_VRAM0 + gSprites[spriteId].oam.tileNum * 32, 0x100); sub_8044210(gHealthboxIDs[i], GetMonData(&gEnemyParty[gBattlePartyID[i]], MON_DATA_HP), 0); @@ -1340,7 +1340,7 @@ void sub_804454C(void) sub_8045A5C(gHealthboxIDs[i], &gEnemyParty[gBattlePartyID[i]], 4); } } - gSprites[gHealthboxIDs[i]].data7 ^= 1; + gSprites[gHealthboxIDs[i]].data[7] ^= 1; } } } @@ -1413,7 +1413,7 @@ u8 sub_8044804(u8 a, const struct BattleInterfaceStruct2 *b, u8 c, u8 d) sp18 = CreateSprite(&gSpriteTemplate_820A7A4[r7], x, y, 10); SetSubspriteTables(&gSprites[sp18], gSubspriteTables_820A6E4); gSprites[sp18].pos2.x = r8; - gSprites[sp18].data0 = r5; + gSprites[sp18].data[0] = r5; if (r7 != 0) { gSprites[sp18].pos1.x -= 96; @@ -1438,22 +1438,22 @@ u8 sub_8044804(u8 a, const struct BattleInterfaceStruct2 *b, u8 c, u8 d) gSprites[sp[i]].pos2.y = 0; } //_080449BE - gSprites[sp[i]].data0 = sp18; + gSprites[sp[i]].data[0] = sp18; if (r7 == 0) { gSprites[sp[i]].pos1.x += 10 * i + 24; - gSprites[sp[i]].data1 = i * 7 + 10; + gSprites[sp[i]].data[1] = i * 7 + 10; gSprites[sp[i]].pos2.x = 120; } //_08044A18 else { gSprites[sp[i]].pos1.x -= 10 * (5 - i) + 24; - gSprites[sp[i]].data1 = (6 - i) * 7 + 10; + gSprites[sp[i]].data[1] = (6 - i) * 7 + 10; gSprites[sp[i]].pos2.x = -120; } //_08044A56 - gSprites[sp[i]].data2 = r7; + gSprites[sp[i]].data[2] = r7; } //_08044A76 if (GetBankSide(a) == 0) @@ -1466,7 +1466,7 @@ u8 sub_8044804(u8 a, const struct BattleInterfaceStruct2 *b, u8 c, u8 d) { //_08044AE6 gSprites[sp[i]].oam.tileNum += 1; - gSprites[sp[i]].data7 = 1; + gSprites[sp[i]].data[7] = 1; // to _08044B52 } else if (b[i].unk0 == 0) @@ -1486,7 +1486,7 @@ u8 sub_8044804(u8 a, const struct BattleInterfaceStruct2 *b, u8 c, u8 d) { //_08044AE6 gSprites[sp[i]].oam.tileNum += 1; - gSprites[sp[i]].data7 = 1; + gSprites[sp[i]].data[7] = 1; // to _08044B52 } else if (b[i].unk0 == 0) @@ -1513,7 +1513,7 @@ u8 sub_8044804(u8 a, const struct BattleInterfaceStruct2 *b, u8 c, u8 d) if (b[i].unk0 == 0xFFFF) { gSprites[sp[5 - i]].oam.tileNum += 1; - gSprites[sp[5 - i]].data7 = 1; + gSprites[sp[5 - i]].data[7] = 1; } else if (b[i].unk0 == 0) { @@ -1529,7 +1529,7 @@ u8 sub_8044804(u8 a, const struct BattleInterfaceStruct2 *b, u8 c, u8 d) if (i >= sp14) { gSprites[sp[5 - i]].oam.tileNum += 1; - gSprites[sp[5 - i]].data7 = 1; + gSprites[sp[5 - i]].data[7] = 1; } else if (b[i].unk0 == 0) { @@ -2174,21 +2174,21 @@ void sub_8044CA0(u8 taskId) { if (GetBankSide(sp8) != 0) { - gSprites[sp[5 - i]].data1 = 7 * i; - gSprites[sp[5 - i]].data3 = 0; - gSprites[sp[5 - i]].data4 = 0; + gSprites[sp[5 - i]].data[1] = 7 * i; + gSprites[sp[5 - i]].data[3] = 0; + gSprites[sp[5 - i]].data[4] = 0; gSprites[sp[5 - i]].callback = sub_8045110; } else { - gSprites[sp[i]].data1 = 7 * i; - gSprites[sp[i]].data3 = 0; - gSprites[sp[i]].data4 = 0; + gSprites[sp[i]].data[1] = 7 * i; + gSprites[sp[i]].data[3] = 0; + gSprites[sp[i]].data[4] = 0; gSprites[sp[i]].callback = sub_8045110; } } - gSprites[r10].data0 /= 2; - gSprites[r10].data1 = 0; + gSprites[r10].data[0] /= 2; + gSprites[r10].data[1] = 0; gSprites[r10].callback = sub_8045048; SetSubspriteTables(&gSprites[r10], gSubspriteTables_820A6EC); gTasks[taskId].func = sub_8044E74; @@ -2272,17 +2272,17 @@ static void sub_8044F70(u8 taskId) void sub_8045030(struct Sprite *sprite) { if (sprite->pos2.x != 0) - sprite->pos2.x += sprite->data0; + sprite->pos2.x += sprite->data[0]; } static void sub_8045048(struct Sprite *sprite) { - sprite->data1 += 32; - if (sprite->data0 > 0) - sprite->pos2.x += sprite->data1 >> 4; + sprite->data[1] += 32; + if (sprite->data[0] > 0) + sprite->pos2.x += sprite->data[1] >> 4; else - sprite->pos2.x -= sprite->data1 >> 4; - sprite->data1 &= 0xF; + sprite->pos2.x -= sprite->data[1] >> 4; + sprite->data[1] &= 0xF; } void sub_804507C(struct Sprite *sprite) @@ -2291,15 +2291,15 @@ void sub_804507C(struct Sprite *sprite) u16 r2; s8 pan; - if (sprite->data1 > 0) + if (sprite->data[1] > 0) { - sprite->data1--; + sprite->data[1]--; return; } - r3 = sprite->data2; - r2 = sprite->data3; + r3 = sprite->data[2]; + r2 = sprite->data[3]; r2 += 56; - sprite->data3 = r2 & 0xFFF0; + sprite->data[3] = r2 & 0xFFF0; if (r3 != 0) { sprite->pos2.x += r2 >> 4; @@ -2317,7 +2317,7 @@ void sub_804507C(struct Sprite *sprite) pan = 63; if (r3 != 0) pan = -64; - if (sprite->data7 != 0) + if (sprite->data[7] != 0) PlaySE2WithPanning(SE_TB_KARA, pan); else PlaySE1WithPanning(SE_TB_KON, pan); @@ -2330,15 +2330,15 @@ static void sub_8045110(struct Sprite *sprite) u8 r0; u16 r2; - if (sprite->data1 > 0) + if (sprite->data[1] > 0) { - sprite->data1--; + sprite->data[1]--; return; } - r0 = sprite->data2; - r2 = sprite->data3; + r0 = sprite->data[2]; + r2 = sprite->data[3]; r2 += 56; - sprite->data3 = r2 & 0xFFF0; + sprite->data[3] = r2 & 0xFFF0; if (r0 != 0) sprite->pos2.x += r2 >> 4; else @@ -2353,7 +2353,7 @@ static void sub_8045110(struct Sprite *sprite) void sub_8045180(struct Sprite *sprite) { - u8 spriteId = sprite->data0; + u8 spriteId = sprite->data[0]; sprite->pos2.x = gSprites[spriteId].pos2.x; sprite->pos2.y = gSprites[spriteId].pos2.y; @@ -2409,7 +2409,7 @@ static void sub_80451A0(u8 a, struct Pokemon *pkmn) ptr[1] = 0x13; ptr[2] = 0x37; ptr[3] = EOS; - ptr = ewram520_2 + GetBankIdentity(gSprites[a].data6) * 0x180; + ptr = ewram520_2 + GetBankIdentity(gSprites[a].data[6]) * 0x180; sub_80034D4(ptr, gDisplayedStringBattle); i = 0; @@ -2446,7 +2446,7 @@ static void sub_80451A0(u8 a, struct Pokemon *pkmn) for (; i < _7; i++) CpuCopy32(sub_8043CDC(0x2B), ptr + 64 * i, 32); - if (GetBankSide(gSprites[a].data6) == 0 && !IsDoubleBattle()) + if (GetBankSide(gSprites[a].data[6]) == 0 && !IsDoubleBattle()) { r1 = (u8 *const *)gUnknown_0820A8B4; for (i = 0; i < _7; i++) @@ -2464,7 +2464,7 @@ static void sub_80451A0(u8 a, struct Pokemon *pkmn) } else { - if (GetBankSide(gSprites[a].data6) == 0) + if (GetBankSide(gSprites[a].data[6]) == 0) r1 = (u8 *const *)gUnknown_0820A904; else r1 = (u8 *const *)gUnknown_0820A8DC; @@ -2492,13 +2492,13 @@ static void sub_8045458(u8 a, u8 b) if (gBattleTypeFlags & 8) return; - r4 = gSprites[a].data6; + r4 = gSprites[a].data[6]; if (GetBankSide(r4) != 0) { u16 species = GetMonData(&gEnemyParty[gBattlePartyID[r4]], MON_DATA_SPECIES); if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(species), 1) != 0) { - r4 = gSprites[a].data5; + r4 = gSprites[a].data[5]; if (b != 0) CpuCopy32(sub_8043CDC(0x46), OBJ_VRAM0 + (gSprites[r4].oam.tileNum + 8) * 32, 32); else @@ -2518,8 +2518,8 @@ static void draw_status_ailment_maybe(u8 a) u8 r0; s32 i; - r7 = gSprites[a].data6; - r10 = gSprites[a].data5; + r7 = gSprites[a].data[6]; + r10 = gSprites[a].data[5]; if (GetBankSide(r7) == 0) { r4 = GetMonData(&gPlayerParty[gBattlePartyID[r7]], MON_DATA_STATUS); @@ -2657,7 +2657,7 @@ static void sub_80458B0(u8 a) s32 r7; u8 *addr; - r6 = ewram520_2 + GetBankIdentity(gSprites[a].data6) * 0x180; + r6 = ewram520_2 + GetBankIdentity(gSprites[a].data[6]) * 0x180; r8 = 7; sub_80034D4(r6, BattleText_SafariBalls); for (i = 0; i < r8; i++) @@ -2685,7 +2685,7 @@ static void sub_8045998(u8 a) r7 = StringCopy(gDisplayedStringBattle, BattleText_SafariBallsLeft); r7 = sub_8003504(r7, gNumSafariBalls, 10, 1); StringAppend(r7, BattleText_HighlightRed); - status = GetBankIdentity(gSprites[a].data6); + status = GetBankIdentity(gSprites[a].data[6]); r7 = ewram520_2 + status * 0x180; r6 = 5; sub_80034D4(r7, gDisplayedStringBattle); @@ -2703,7 +2703,7 @@ void sub_8045A5C(u8 a, struct Pokemon *pkmn, u8 c) u32 maxhp; u32 currhp; - r10 = gSprites[a].data6; + r10 = gSprites[a].data[6]; if (GetBankSide(r10) == 0) { if (c == 3 || c == 0) @@ -2814,7 +2814,7 @@ static void sub_8045D58(u8 a, u8 b) } for (i = 0; i < 6; i++) { - u8 r4 = gSprites[ewram17850[a].unk0].data5; + u8 r4 = gSprites[ewram17850[a].unk0].data[5]; if (i < 2) CpuCopy32(sub_8043CDC(r8) + sp8[i] * 32, OBJ_VRAM0 + (gSprites[r4].oam.tileNum + 2 + i) * 32, 32); else diff --git a/src/battle/battle_transition.c b/src/battle/battle_transition.c index d0a9bfb92..2bde7299b 100644 --- a/src/battle/battle_transition.c +++ b/src/battle/battle_transition.c @@ -1019,9 +1019,9 @@ bool8 FldEff_Pokeball(void) u8 spriteID = CreateSpriteAtEnd(&sSpriteTemplate_83FD98C, gFieldEffectArguments[0], gFieldEffectArguments[1], 0); gSprites[spriteID].oam.priority = 0; gSprites[spriteID].oam.affineMode = 1; - gSprites[spriteID].data0 = gFieldEffectArguments[2]; - gSprites[spriteID].data1 = gFieldEffectArguments[3]; - gSprites[spriteID].data2 = -1; + gSprites[spriteID].data[0] = gFieldEffectArguments[2]; + gSprites[spriteID].data[1] = gFieldEffectArguments[3]; + gSprites[spriteID].data[2] = -1; InitSpriteAffineAnim(&gSprites[spriteID]); StartSpriteAffineAnim(&gSprites[spriteID], gFieldEffectArguments[2]); return FALSE; @@ -1038,8 +1038,8 @@ static void sub_811B720(struct Sprite* sprite) s16 arr0[2]; memcpy(arr0, sUnknown_083FD7F2, sizeof(sUnknown_083FD7F2)); - if (sprite->data1 != 0) - sprite->data1--; + if (sprite->data[1] != 0) + sprite->data[1]--; else { if (sprite->pos1.x >= 0 && sprite->pos1.x <= 240) @@ -1047,12 +1047,12 @@ static void sub_811B720(struct Sprite* sprite) s16 posX = sprite->pos1.x >> 3; s16 posY = sprite->pos1.y >> 3; - if (posX != sprite->data2) + if (posX != sprite->data[2]) { u32 var; u16 *ptr; - sprite->data2 = posX; + sprite->data[2] = posX; var = (((REG_BG0CNT >> 8) & 0x1F) << 11); // r2 ptr = (u16 *)(VRAM + var); @@ -1062,7 +1062,7 @@ static void sub_811B720(struct Sprite* sprite) SOME_VRAM_STORE(ptr, posY + 1, posX, 0xF001); } } - sprite->pos1.x += arr0[sprite->data0]; + sprite->pos1.x += arr0[sprite->data[0]]; if (sprite->pos1.x < -15 || sprite->pos1.x > 255) FieldEffectStop(sprite, FLDEFF_POKEBALL); } @@ -1763,7 +1763,7 @@ static void Mugshots_CreateOpponentPlayerSprites(struct Task* task) static void sub_811C90C(struct Sprite* sprite) { - while (sUnknown_083FD880[sprite->data0](sprite)); + while (sUnknown_083FD880[sprite->data[0]](sprite)); } static bool8 sub_811C934(struct Sprite* sprite) @@ -1779,57 +1779,57 @@ static bool8 sub_811C938(struct Sprite* sprite) memcpy(arr0, sUnknown_083FD89C, sizeof(sUnknown_083FD89C)); memcpy(arr1, sUnknown_083FD8A0, sizeof(sUnknown_083FD8A0)); - sprite->data0++; - sprite->data1 = arr0[sprite->data7]; - sprite->data2 = arr1[sprite->data7]; + sprite->data[0]++; + sprite->data[1] = arr0[sprite->data[7]]; + sprite->data[2] = arr1[sprite->data[7]]; return TRUE; } static bool8 sub_811C984(struct Sprite* sprite) { - sprite->pos1.x += sprite->data1; - if (sprite->data7 && sprite->pos1.x < 133) - sprite->data0++; - else if (!sprite->data7 && sprite->pos1.x > 103) - sprite->data0++; + sprite->pos1.x += sprite->data[1]; + if (sprite->data[7] && sprite->pos1.x < 133) + sprite->data[0]++; + else if (!sprite->data[7] && sprite->pos1.x > 103) + sprite->data[0]++; return FALSE; } static bool8 sub_811C9B8(struct Sprite* sprite) { - sprite->data1 += sprite->data2; - sprite->pos1.x += sprite->data1; - if (sprite->data1 == 0) + sprite->data[1] += sprite->data[2]; + sprite->pos1.x += sprite->data[1]; + if (sprite->data[1] == 0) { - sprite->data0++; - sprite->data2 = -sprite->data2; - sprite->data6 = 1; + sprite->data[0]++; + sprite->data[2] = -sprite->data[2]; + sprite->data[6] = 1; } return FALSE; } static bool8 sub_811C9E4(struct Sprite* sprite) { - sprite->data1 += sprite->data2; - sprite->pos1.x += sprite->data1; + sprite->data[1] += sprite->data[2]; + sprite->pos1.x += sprite->data[1]; if (sprite->pos1.x < -31 || sprite->pos1.x > 271) - sprite->data0++; + sprite->data[0]++; return FALSE; } static void sub_811CA10(s16 spriteID, s16 value) { - gSprites[spriteID].data7 = value; + gSprites[spriteID].data[7] = value; } static void sub_811CA28(s16 spriteID) { - gSprites[spriteID].data0++; + gSprites[spriteID].data[0]++; } static s16 sub_811CA44(s16 spriteID) { - return gSprites[spriteID].data6; + return gSprites[spriteID].data[6]; } #undef tMugshotOpponentID @@ -1981,9 +1981,9 @@ static bool8 Phase2_Transition_WhiteFade_Func2(struct Task* task) sprite = &gSprites[CreateInvisibleSprite(sub_811CFD0)]; sprite->pos1.x = 0xF0; sprite->pos1.y = posY; - sprite->data5 = arr1[i]; + sprite->data[5] = arr1[i]; } - sprite->data6++; + sprite->data[6]++; task->tState++; return FALSE; @@ -2060,10 +2060,10 @@ static void HBlankCB_Phase2_Transition_WhiteFade(void) static void sub_811CFD0(struct Sprite* sprite) { - if (sprite->data5) + if (sprite->data[5]) { - sprite->data5--; - if (sprite->data6) + sprite->data[5]--; + if (sprite->data[6]) TRANSITION_STRUCT.VBlank_DMA = 1; } else @@ -2073,26 +2073,26 @@ static void sub_811CFD0(struct Sprite* sprite) u16* ptr2 = &gUnknown_03004DE0[0][sprite->pos1.y + 160]; for (i = 0; i < 20; i++) { - ptr1[i] = sprite->data0 >> 8; + ptr1[i] = sprite->data[0] >> 8; ptr2[i] = (u8)(sprite->pos1.x); } - if (sprite->pos1.x == 0 && sprite->data0 == 0x1000) - sprite->data1 = 1; + if (sprite->pos1.x == 0 && sprite->data[0] == 0x1000) + sprite->data[1] = 1; sprite->pos1.x -= 16; - sprite->data0 += 0x80; + sprite->data[0] += 0x80; if (sprite->pos1.x < 0) sprite->pos1.x = 0; - if (sprite->data0 > 0x1000) - sprite->data0 = 0x1000; + if (sprite->data[0] > 0x1000) + sprite->data[0] = 0x1000; - if (sprite->data6) + if (sprite->data[6]) TRANSITION_STRUCT.VBlank_DMA = 1; - if (sprite->data1) + if (sprite->data[1]) { - if (sprite->data6 == 0 || (TRANSITION_STRUCT.field_20 > 6 && sprite->data2++ > 7)) + if (sprite->data[6] == 0 || (TRANSITION_STRUCT.field_20 > 6 && sprite->data[2]++ > 7)) { TRANSITION_STRUCT.field_20++; DestroySprite(sprite); diff --git a/src/battle/pokeball.c b/src/battle/pokeball.c index afdf47979..8271e53ac 100644 --- a/src/battle/pokeball.c +++ b/src/battle/pokeball.c @@ -364,9 +364,9 @@ static void sub_8046464(u8 taskId) r4 = ball_number_to_ball_processing_index(ball); sub_80478DC(r4); spriteId = CreateSprite(&gBallSpriteTemplates[r4], 32, 80, 0x1D); - gSprites[spriteId].data0 = 0x80; - gSprites[spriteId].data1 = 0; - gSprites[spriteId].data7 = r8; + gSprites[spriteId].data[0] = 0x80; + gSprites[spriteId].data[1] = 0; + gSprites[spriteId].data[7] = r8; switch (r8) { case 0xFF: @@ -379,7 +379,7 @@ static void sub_8046464(u8 taskId) gSprites[spriteId].pos1.x = sub_8077ABC(r5, 0); gSprites[spriteId].pos1.y = sub_8077ABC(r5, 1) + 24; gBankTarget = r5; - gSprites[spriteId].data0 = 0; + gSprites[spriteId].data[0] = 0; gSprites[spriteId].callback = sub_8047254; break; default: @@ -387,16 +387,16 @@ static void sub_8046464(u8 taskId) sp0 = TRUE; break; } - gSprites[spriteId].data6 = gBankTarget; + gSprites[spriteId].data[6] = gBankTarget; if (!sp0) { DestroyTask(taskId); return; } - gSprites[spriteId].data0 = 0x22; - gSprites[spriteId].data2 = sub_8077ABC(gBankTarget, 0); - gSprites[spriteId].data4 = sub_8077ABC(gBankTarget, 1) - 16; - gSprites[spriteId].data5 = -40; + gSprites[spriteId].data[0] = 0x22; + gSprites[spriteId].data[2] = sub_8077ABC(gBankTarget, 0); + gSprites[spriteId].data[4] = sub_8077ABC(gBankTarget, 1) - 16; + gSprites[spriteId].data[5] = -40; sub_80786EC(&gSprites[spriteId]); gSprites[spriteId].oam.affineParam = taskId; gTasks[taskId].data[4] = gBankTarget; @@ -419,12 +419,12 @@ static void objc_0804ABD4(struct Sprite *sprite) sprite->pos1.y += sprite->pos2.y; sprite->pos2.x = 0; sprite->pos2.y = 0; - sprite->data5 = 0; + sprite->data[5] = 0; r4 = ball_number_to_ball_processing_index(sub_8047978(r5)); sub_814086C(sprite->pos1.x, sprite->pos1.y - 5, 1, 0x1C, r4); - sprite->data0 = sub_8141314(0, r5, 14, r4); - sprite->data6 = r5; - sprite->data7 = r8; + sprite->data[0] = sub_8141314(0, r5, 14, r4); + sprite->data[6] = r5; + sprite->data[7] = r8; DestroyTask(taskId); sprite->callback = sub_80466E8; } @@ -437,33 +437,33 @@ static void sub_80466E8(struct Sprite *sprite) static void sub_80466F4(struct Sprite *sprite) { - sprite->data5++; - if (sprite->data5 == 10) + sprite->data[5]++; + if (sprite->data[5] == 10) { - sprite->data5 = 0; + sprite->data[5] = 0; sprite->callback = sub_8046760; - StartSpriteAffineAnim(&gSprites[gObjectBankIDs[sprite->data6]], 2); - AnimateSprite(&gSprites[gObjectBankIDs[sprite->data6]]); - gSprites[gObjectBankIDs[sprite->data6]].data1 = 0; + StartSpriteAffineAnim(&gSprites[gObjectBankIDs[sprite->data[6]]], 2); + AnimateSprite(&gSprites[gObjectBankIDs[sprite->data[6]]]); + gSprites[gObjectBankIDs[sprite->data[6]]].data[1] = 0; } } static void sub_8046760(struct Sprite *sprite) { - sprite->data5++; - if (sprite->data5 == 11) + sprite->data[5]++; + if (sprite->data[5] == 11) PlaySE(SE_SUIKOMU); - if (gSprites[gObjectBankIDs[sprite->data6]].affineAnimEnded) + if (gSprites[gObjectBankIDs[sprite->data[6]]].affineAnimEnded) { StartSpriteAnim(sprite, 2); - gSprites[gObjectBankIDs[sprite->data6]].invisible = TRUE; - sprite->data5 = 0; + gSprites[gObjectBankIDs[sprite->data[6]]].invisible = TRUE; + sprite->data[5] = 0; sprite->callback = sub_80467F8; } else { - gSprites[gObjectBankIDs[sprite->data6]].data1 += 0x60; - gSprites[gObjectBankIDs[sprite->data6]].pos2.y = -gSprites[gObjectBankIDs[sprite->data6]].data1 >> 8; + gSprites[gObjectBankIDs[sprite->data[6]]].data[1] += 0x60; + gSprites[gObjectBankIDs[sprite->data[6]]].pos2.y = -gSprites[gObjectBankIDs[sprite->data[6]]].data[1] >> 8; } } @@ -471,14 +471,14 @@ static void sub_80467F8(struct Sprite *sprite) { if (sprite->animEnded) { - sprite->data5++; - if (sprite->data5 == 1) + sprite->data[5]++; + if (sprite->data[5] == 1) { - sprite->data3 = 0; - sprite->data4 = 32; - sprite->data5 = 0; + sprite->data[3] = 0; + sprite->data[4] = 32; + sprite->data[5] = 0; sprite->pos1.y += Cos(0, 32); - sprite->pos2.y = -Cos(0, sprite->data4); + sprite->pos2.y = -Cos(0, sprite->data[4]); sprite->callback = sub_804684C; } } @@ -488,18 +488,18 @@ static void sub_804684C(struct Sprite *sprite) { bool8 r5 = FALSE; - switch (sprite->data3 & 0xFF) + switch (sprite->data[3] & 0xFF) { case 0: - sprite->pos2.y = -Cos(sprite->data5, sprite->data4); - sprite->data5 += 4 + (sprite->data3 >> 8); - if (sprite->data5 >= 64) + sprite->pos2.y = -Cos(sprite->data[5], sprite->data[4]); + sprite->data[5] += 4 + (sprite->data[3] >> 8); + if (sprite->data[5] >= 64) { - sprite->data4 -= 10; - sprite->data3 += 0x101; - if (sprite->data3 >> 8 == 4) + sprite->data[4] -= 10; + sprite->data[3] += 0x101; + if (sprite->data[3] >> 8 == 4) r5 = TRUE; - switch (sprite->data3 >> 8) + switch (sprite->data[3] >> 8) { case 1: PlaySE(SE_KON); @@ -517,39 +517,39 @@ static void sub_804684C(struct Sprite *sprite) } break; case 1: - sprite->pos2.y = -Cos(sprite->data5, sprite->data4); - sprite->data5 -= 4 + (sprite->data3 >> 8); - if (sprite->data5 <= 0) + sprite->pos2.y = -Cos(sprite->data[5], sprite->data[4]); + sprite->data[5] -= 4 + (sprite->data[3] >> 8); + if (sprite->data[5] <= 0) { - sprite->data5 = 0; - sprite->data3 &= 0xFF00; + sprite->data[5] = 0; + sprite->data[3] &= 0xFF00; } break; } if (r5) { - sprite->data3 = 0; + sprite->data[3] = 0; sprite->pos1.y += Cos(64, 32); sprite->pos2.y = 0; - if (sprite->data7 == 0) + if (sprite->data[7] == 0) { sprite->callback = sub_8046C78; } else { sprite->callback = sub_8046944; - sprite->data4 = 1; - sprite->data5 = 0; + sprite->data[4] = 1; + sprite->data[5] = 0; } } } static void sub_8046944(struct Sprite *sprite) { - sprite->data3++; - if (sprite->data3 == 31) + sprite->data[3]++; + if (sprite->data[3] == 31) { - sprite->data3 = 0; + sprite->data[3] = 0; sprite->affineAnimPaused = TRUE; StartSpriteAffineAnim(sprite, 1); sprite->callback = sub_8046984; @@ -559,28 +559,28 @@ static void sub_8046944(struct Sprite *sprite) static void sub_8046984(struct Sprite *sprite) { - switch (sprite->data3 & 0xFF) + switch (sprite->data[3] & 0xFF) { case 0: case 2: - sprite->pos2.x += sprite->data4; - sprite->data5 += sprite->data4; + sprite->pos2.x += sprite->data[4]; + sprite->data[5] += sprite->data[4]; sprite->affineAnimPaused = FALSE; - if (sprite->data5 > 3 || sprite->data5 < -3) + if (sprite->data[5] > 3 || sprite->data[5] < -3) { - sprite->data3++; - sprite->data5 = 0; + sprite->data[3]++; + sprite->data[5] = 0; } break; case 1: - sprite->data5++; - if (sprite->data5 == 1) + sprite->data[5]++; + if (sprite->data[5] == 1) { - sprite->data5 = 0; - sprite->data4 = -sprite->data4; - sprite->data3++; + sprite->data[5] = 0; + sprite->data[4] = -sprite->data[4]; + sprite->data[3]++; sprite->affineAnimPaused = FALSE; - if (sprite->data4 < 0) + if (sprite->data[4] < 0) ChangeSpriteAffineAnim(sprite, 2); else ChangeSpriteAffineAnim(sprite, 1); @@ -591,34 +591,34 @@ static void sub_8046984(struct Sprite *sprite) } break; case 3: - sprite->data3 += 0x100; - if (sprite->data3 >> 8 == sprite->data7) + sprite->data[3] += 0x100; + if (sprite->data[3] >> 8 == sprite->data[7]) { sprite->callback = sub_8046C78; } else { - if (sprite->data7 == 4 && sprite->data3 >> 8 == 3) + if (sprite->data[7] == 4 && sprite->data[3] >> 8 == 3) { sprite->callback = sub_8046E7C; sprite->affineAnimPaused = TRUE; } else { - sprite->data3++; + sprite->data[3]++; sprite->affineAnimPaused = TRUE; } } break; case 4: default: - sprite->data5++; - if (sprite->data5 == 31) + sprite->data[5]++; + if (sprite->data[5] == 31) { - sprite->data5 = 0; - sprite->data3 &= 0xFF00; + sprite->data[5] = 0; + sprite->data[3] &= 0xFF00; StartSpriteAffineAnim(sprite, 3); - if (sprite->data4 < 0) + if (sprite->data[4] < 0) StartSpriteAffineAnim(sprite, 2); else StartSpriteAffineAnim(sprite, 1); @@ -695,13 +695,13 @@ static void sub_8046AD0(u8 taskId) static void sub_8046C78(struct Sprite *sprite) { - u8 r5 = sprite->data6; + u8 r5 = sprite->data[6]; u32 r4; // not sure of this type StartSpriteAnim(sprite, 1); r4 = ball_number_to_ball_processing_index(sub_8047978(r5)); sub_814086C(sprite->pos1.x, sprite->pos1.y - 5, 1, 0x1C, r4); - sprite->data0 = sub_8141314(1, sprite->data6, 14, r4); + sprite->data[0] = sub_8141314(1, sprite->data[6], 14, r4); sprite->callback = sub_8046E9C; if (gMain.inBattle) { @@ -747,24 +747,24 @@ static void sub_8046C78(struct Sprite *sprite) gTasks[taskId].data[2] = r4_2; gTasks[taskId].data[15] = 0; } - StartSpriteAffineAnim(&gSprites[gObjectBankIDs[sprite->data6]], 1); - AnimateSprite(&gSprites[gObjectBankIDs[sprite->data6]]); - gSprites[gObjectBankIDs[sprite->data6]].data1 = 0x1000; + StartSpriteAffineAnim(&gSprites[gObjectBankIDs[sprite->data[6]]], 1); + AnimateSprite(&gSprites[gObjectBankIDs[sprite->data[6]]]); + gSprites[gObjectBankIDs[sprite->data[6]]].data[1] = 0x1000; } static void sub_8046E7C(struct Sprite *sprite) { sprite->animPaused = TRUE; sprite->callback = sub_8046FBC; - sprite->data3 = 0; - sprite->data4 = 0; - sprite->data5 = 0; + sprite->data[3] = 0; + sprite->data[4] = 0; + sprite->data[5] = 0; } static void sub_8046E9C(struct Sprite *sprite) { bool8 r7 = FALSE; - u8 r4 = sprite->data6; + u8 r4 = sprite->data[6]; gSprites[gObjectBankIDs[r4]].invisible = FALSE; if (sprite->animEnded) @@ -776,8 +776,8 @@ static void sub_8046E9C(struct Sprite *sprite) } else { - gSprites[gObjectBankIDs[r4]].data1 -= 288; - gSprites[gObjectBankIDs[r4]].pos2.y = gSprites[gObjectBankIDs[r4]].data1 >> 8; + gSprites[gObjectBankIDs[r4]].data[1] -= 288; + gSprites[gObjectBankIDs[r4]].pos2.y = gSprites[gObjectBankIDs[r4]].data[1] >> 8; } if (sprite->animEnded && r7) { @@ -804,23 +804,23 @@ static void sub_8046E9C(struct Sprite *sprite) static void sub_8046FBC(struct Sprite *sprite) { - u8 r7 = sprite->data6; + u8 r7 = sprite->data[6]; - sprite->data4++; - if (sprite->data4 == 40) + sprite->data[4]++; + if (sprite->data[4] == 40) { return; } - else if (sprite->data4 == 95) + else if (sprite->data[4] == 95) { gDoingBattleAnim = 0; m4aMPlayAllStop(); PlaySE(BGM_FANFA5); } - else if (sprite->data4 == 315) + else if (sprite->data[4] == 315) { - FreeOamMatrix(gSprites[gObjectBankIDs[sprite->data6]].oam.matrixNum); - DestroySprite(&gSprites[gObjectBankIDs[sprite->data6]]); + FreeOamMatrix(gSprites[gObjectBankIDs[sprite->data[6]]].oam.matrixNum); + DestroySprite(&gSprites[gObjectBankIDs[sprite->data[6]]]); DestroySpriteAndFreeResources(sprite); if (gMain.inBattle) ewram17810[r7].unk0_3 = 0; @@ -829,11 +829,11 @@ static void sub_8046FBC(struct Sprite *sprite) static void sub_8047074(struct Sprite *sprite) { - sprite->data0 = 25; - sprite->data2 = sub_8077ABC(sprite->data6, 2); - sprite->data4 = sub_8077ABC(sprite->data6, 3) + 24; - sprite->data5 = -30; - sprite->oam.affineParam = sprite->data6; + sprite->data[0] = 25; + sprite->data[2] = sub_8077ABC(sprite->data[6], 2); + sprite->data[4] = sub_8077ABC(sprite->data[6], 3) + 24; + sprite->data[5] = -30; + sprite->oam.affineParam = sprite->data[6]; sub_80786EC(sprite); sprite->callback = sub_80470C4; } @@ -845,33 +845,33 @@ static void sub_80470C4(struct Sprite *sprite) u32 r6; u32 r7; - if (HIBYTE(sprite->data7) >= 35 && HIBYTE(sprite->data7) < 80) + if (HIBYTE(sprite->data[7]) >= 35 && HIBYTE(sprite->data[7]) < 80) { s16 r4; if ((sprite->oam.affineParam & 0xFF00) == 0) { - r6 = sprite->data1 & 1; - r7 = sprite->data2 & 1; - sprite->data1 = ((sprite->data1 / 3) & ~1) | r6; - sprite->data2 = ((sprite->data2 / 3) & ~1) | r7; + r6 = sprite->data[1] & 1; + r7 = sprite->data[2] & 1; + sprite->data[1] = ((sprite->data[1] / 3) & ~1) | r6; + sprite->data[2] = ((sprite->data[2] / 3) & ~1) | r7; StartSpriteAffineAnim(sprite, 4); } - r4 = sprite->data0; + r4 = sprite->data[0]; sub_8078B5C(sprite); - sprite->data7 += sprite->data6 / 3; - sprite->pos2.y += Sin(HIBYTE(sprite->data7), sprite->data5); + sprite->data[7] += sprite->data[6] / 3; + sprite->pos2.y += Sin(HIBYTE(sprite->data[7]), sprite->data[5]); sprite->oam.affineParam += 0x100; if ((sprite->oam.affineParam >> 8) % 3 != 0) - sprite->data0 = r4; + sprite->data[0] = r4; else - sprite->data0 = r4 - 1; - if (HIBYTE(sprite->data7) >= 80) + sprite->data[0] = r4 - 1; + if (HIBYTE(sprite->data[7]) >= 80) { - r6 = sprite->data1 & 1; - r7 = sprite->data2 & 1; - sprite->data1 = ((sprite->data1 * 3) & ~1) | r6; - sprite->data2 = ((sprite->data2 * 3) & ~1) | r7; + r6 = sprite->data[1] & 1; + r7 = sprite->data[2] & 1; + sprite->data[1] = ((sprite->data[1] * 3) & ~1) | r6; + sprite->data[2] = ((sprite->data[2] * 3) & ~1) | r7; } } else @@ -882,10 +882,10 @@ static void sub_80470C4(struct Sprite *sprite) sprite->pos1.y += sprite->pos2.y; sprite->pos2.y = 0; sprite->pos2.x = 0; - sprite->data6 = sprite->oam.affineParam & 0xFF; - sprite->data0 = 0; + sprite->data[6] = sprite->oam.affineParam & 0xFF; + sprite->data[0] = 0; if (IsDoubleBattle() && ewram17840.unk9_0 - && sprite->data6 == GetBankByPlayerAI(2)) + && sprite->data[6] == GetBankByPlayerAI(2)) sprite->callback = sub_8047230; else sprite->callback = sub_8046C78; @@ -896,21 +896,21 @@ static void sub_80470C4(struct Sprite *sprite) static void sub_8047230(struct Sprite *sprite) { - if (sprite->data0++ > 24) + if (sprite->data[0]++ > 24) { - sprite->data0 = 0; + sprite->data[0] = 0; sprite->callback = sub_8046C78; } } static void sub_8047254(struct Sprite *sprite) { - sprite->data0++; - if (sprite->data0 > 15) + sprite->data[0]++; + if (sprite->data[0] > 15) { - sprite->data0 = 0; + sprite->data[0] = 0; if (IsDoubleBattle() && ewram17840.unk9_0 - && sprite->data6 == GetBankByPlayerAI(3)) + && sprite->data[6] == GetBankByPlayerAI(3)) sprite->callback = sub_8047230; else sprite->callback = sub_8046C78; @@ -934,15 +934,15 @@ void CreatePokeballSprite(u8 a, u8 b, u8 x, u8 y, u8 e, u8 f, u8 g, u32 h) LoadCompressedObjectPic(&sBallSpriteSheets[0]); LoadCompressedObjectPalette(&sBallSpritePalettes[0]); spriteId = CreateSprite(&gBallSpriteTemplates[0], x, y, f); - gSprites[spriteId].data0 = a; - gSprites[spriteId].data5 = gSprites[a].pos1.x; - gSprites[spriteId].data6 = gSprites[a].pos1.y; + gSprites[spriteId].data[0] = a; + gSprites[spriteId].data[5] = gSprites[a].pos1.x; + gSprites[spriteId].data[6] = gSprites[a].pos1.y; gSprites[a].pos1.x = x; gSprites[a].pos1.y = y; - gSprites[spriteId].data1 = g; - gSprites[spriteId].data2 = b; - gSprites[spriteId].data3 = h; - gSprites[spriteId].data4 = h >> 16; + gSprites[spriteId].data[1] = g; + gSprites[spriteId].data[2] = b; + gSprites[spriteId].data[3] = h; + gSprites[spriteId].data[4] = h >> 16; gSprites[spriteId].oam.priority = e; gSprites[spriteId].callback = sub_80473D0; gSprites[a].invisible = TRUE; @@ -950,12 +950,12 @@ void CreatePokeballSprite(u8 a, u8 b, u8 x, u8 y, u8 e, u8 f, u8 g, u32 h) static void sub_80473D0(struct Sprite *sprite) { - if (sprite->data1 == 0) + if (sprite->data[1] == 0) { u8 r5; - u8 r7 = sprite->data0; - u8 r8 = sprite->data2; - u32 r4 = (u16)sprite->data3 | ((u16)sprite->data4 << 16); + u8 r7 = sprite->data[0]; + u8 r8 = sprite->data[2]; + u32 r4 = (u16)sprite->data[3] | ((u16)sprite->data[4] << 16); if (sprite->subpriority != 0) r5 = sprite->subpriority - 1; @@ -963,17 +963,17 @@ static void sub_80473D0(struct Sprite *sprite) r5 = 0; StartSpriteAnim(sprite, 1); sub_80472B0(sprite->pos1.x, sprite->pos1.y - 5, sprite->oam.priority, r5); - sprite->data1 = sub_80472D8(1, r8, r4); + sprite->data[1] = sub_80472D8(1, r8, r4); sprite->callback = sub_804748C; gSprites[r7].invisible = FALSE; StartSpriteAffineAnim(&gSprites[r7], 1); AnimateSprite(&gSprites[r7]); - gSprites[r7].data1 = 0x1000; - sprite->data7 = 0; + gSprites[r7].data[1] = 0x1000; + sprite->data[7] = 0; } else { - sprite->data1--; + sprite->data[1]--; } } @@ -981,7 +981,7 @@ static void sub_804748C(struct Sprite *sprite) { bool8 r12 = FALSE; bool8 r6 = FALSE; - u8 r3 = sprite->data0; + u8 r3 = sprite->data[0]; u16 var1; u16 var2; @@ -992,22 +992,22 @@ static void sub_804748C(struct Sprite *sprite) StartSpriteAffineAnim(&gSprites[r3], 0); r12 = TRUE; } - var1 = (sprite->data5 - sprite->pos1.x) * sprite->data7 / 128 + sprite->pos1.x; - var2 = (sprite->data6 - sprite->pos1.y) * sprite->data7 / 128 + sprite->pos1.y; + var1 = (sprite->data[5] - sprite->pos1.x) * sprite->data[7] / 128 + sprite->pos1.x; + var2 = (sprite->data[6] - sprite->pos1.y) * sprite->data[7] / 128 + sprite->pos1.y; gSprites[r3].pos1.x = var1; gSprites[r3].pos1.y = var2; - if (sprite->data7 < 128) + if (sprite->data[7] < 128) { - s16 sine = -(gSineTable[(u8)sprite->data7] / 8); + s16 sine = -(gSineTable[(u8)sprite->data[7]] / 8); - sprite->data7 += 4; + sprite->data[7] += 4; gSprites[r3].pos2.x = sine; gSprites[r3].pos2.y = sine; } else { - gSprites[r3].pos1.x = sprite->data5; - gSprites[r3].pos1.y = sprite->data6; + gSprites[r3].pos1.x = sprite->data[5]; + gSprites[r3].pos1.y = sprite->data[6]; gSprites[r3].pos2.x = 0; gSprites[r3].pos2.y = 0; r6 = TRUE; @@ -1023,11 +1023,11 @@ u8 sub_8047580(u8 a, u8 b, u8 x, u8 y, u8 e, u8 f, u8 g, u32 h) LoadCompressedObjectPic(&sBallSpriteSheets[0]); LoadCompressedObjectPalette(&sBallSpritePalettes[0]); spriteId = CreateSprite(&gBallSpriteTemplates[0], x, y, f); - gSprites[spriteId].data0 = a; - gSprites[spriteId].data1 = g; - gSprites[spriteId].data2 = b; - gSprites[spriteId].data3 = h; - gSprites[spriteId].data4 = h >> 16; + gSprites[spriteId].data[0] = a; + gSprites[spriteId].data[1] = g; + gSprites[spriteId].data[2] = b; + gSprites[spriteId].data[3] = h; + gSprites[spriteId].data[4] = h >> 16; gSprites[spriteId].oam.priority = e; gSprites[spriteId].callback = sub_8047638; return spriteId; @@ -1035,12 +1035,12 @@ u8 sub_8047580(u8 a, u8 b, u8 x, u8 y, u8 e, u8 f, u8 g, u32 h) static void sub_8047638(struct Sprite *sprite) { - if (sprite->data1 == 0) + if (sprite->data[1] == 0) { u8 r6; - u8 r7 = sprite->data0; - u8 r8 = sprite->data2; - u32 r5 = (u16)sprite->data3 | ((u16)sprite->data4 << 16); + u8 r7 = sprite->data[0]; + u8 r8 = sprite->data[2]; + u32 r5 = (u16)sprite->data[3] | ((u16)sprite->data[4] << 16); if (sprite->subpriority != 0) r6 = sprite->subpriority - 1; @@ -1048,15 +1048,15 @@ static void sub_8047638(struct Sprite *sprite) r6 = 0; StartSpriteAnim(sprite, 1); sub_80472B0(sprite->pos1.x, sprite->pos1.y - 5, sprite->oam.priority, r6); - sprite->data1 = sub_80472D8(1, r8, r5); + sprite->data[1] = sub_80472D8(1, r8, r5); sprite->callback = sub_80476E0; StartSpriteAffineAnim(&gSprites[r7], 2); AnimateSprite(&gSprites[r7]); - gSprites[r7].data1 = 0; + gSprites[r7].data[1] = 0; } else { - sprite->data1--; + sprite->data[1]--; } } @@ -1064,21 +1064,21 @@ static void sub_80476E0(struct Sprite *sprite) { u8 r1; - sprite->data5++; - if (sprite->data5 == 11) + sprite->data[5]++; + if (sprite->data[5] == 11) PlaySE(SE_SUIKOMU); - r1 = sprite->data0; + r1 = sprite->data[0]; if (gSprites[r1].affineAnimEnded) { StartSpriteAnim(sprite, 2); gSprites[r1].invisible = TRUE; - sprite->data5 = 0; + sprite->data[5] = 0; sprite->callback = sub_8047754; } else { - gSprites[r1].data1 += 96; - gSprites[r1].pos2.y = -gSprites[r1].data1 >> 8; + gSprites[r1].data[1] += 96; + gSprites[r1].pos2.y = -gSprites[r1].data[1] >> 8; } } @@ -1097,37 +1097,37 @@ void sub_804777C(u8 a) { struct Sprite *sprite = &gSprites[gHealthboxIDs[a]]; - sprite->data0 = 5; - sprite->data1 = 0; + sprite->data[0] = 5; + sprite->data[1] = 0; sprite->pos2.x = 0x73; sprite->pos2.y = 0; sprite->callback = sub_8047830; if (GetBankSide(a) != 0) { - sprite->data0 = -sprite->data0; - sprite->data1 = -sprite->data1; + sprite->data[0] = -sprite->data[0]; + sprite->data[1] = -sprite->data[1]; sprite->pos2.x = -sprite->pos2.x; sprite->pos2.y = -sprite->pos2.y; } - gSprites[sprite->data5].callback(&gSprites[sprite->data5]); + gSprites[sprite->data[5]].callback(&gSprites[sprite->data[5]]); if (GetBankIdentity(a) == 2) sprite->callback = sub_804780C; } static void sub_804780C(struct Sprite *sprite) { - sprite->data1++; - if (sprite->data1 == 20) + sprite->data[1]++; + if (sprite->data[1] == 20) { - sprite->data1 = 0; + sprite->data[1] = 0; sprite->callback = sub_8047830; } } static void sub_8047830(struct Sprite *sprite) { - sprite->pos2.x -= sprite->data0; - sprite->pos2.y -= sprite->data1; + sprite->pos2.x -= sprite->data[0]; + sprite->pos2.y -= sprite->data[1]; if (sprite->pos2.x == 0 && sprite->pos2.y == 0) sprite->callback = SpriteCallbackDummy; } @@ -1137,19 +1137,19 @@ void sub_8047858(u8 a) u8 spriteId; spriteId = CreateInvisibleSpriteWithCallback(oamc_804BEB4); - gSprites[spriteId].data0 = 1; - gSprites[spriteId].data1 = gHealthboxIDs[a]; + gSprites[spriteId].data[0] = 1; + gSprites[spriteId].data[1] = gHealthboxIDs[a]; gSprites[spriteId].callback = oamc_804BEB4; } static void oamc_804BEB4(struct Sprite *sprite) { - u8 r1 = sprite->data1; + u8 r1 = sprite->data[1]; - gSprites[r1].pos2.y = sprite->data0; - sprite->data0 = -sprite->data0; - sprite->data2++; - if (sprite->data2 == 21) + gSprites[r1].pos2.y = sprite->data[0]; + sprite->data[0] = -sprite->data[0]; + sprite->data[2]++; + if (sprite->data[2] == 21) { gSprites[r1].pos2.x = 0; gSprites[r1].pos2.y = 0; diff --git a/src/battle/reshow_battle_screen.c b/src/battle/reshow_battle_screen.c index 396c4435e..14f465352 100644 --- a/src/battle/reshow_battle_screen.c +++ b/src/battle/reshow_battle_screen.c @@ -252,8 +252,8 @@ static void sub_807B184(u8 bank) gObjectBankIDs[bank] = CreateSprite(&gUnknown_02024E8C, sub_8077ABC(bank, 2), posY, sub_8079E90(bank)); gSprites[gObjectBankIDs[bank]].oam.paletteNum = bank; gSprites[gObjectBankIDs[bank]].callback = SpriteCallbackDummy; - gSprites[gObjectBankIDs[bank]].data0 = bank; - gSprites[gObjectBankIDs[bank]].data2 = GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_SPECIES); + gSprites[gObjectBankIDs[bank]].data[0] = bank; + gSprites[gObjectBankIDs[bank]].data[2] = GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_SPECIES); StartSpriteAnim(&gSprites[gObjectBankIDs[bank]], gBattleMonForms[bank]); } else if (gBattleTypeFlags & BATTLE_TYPE_SAFARI && bank == 0) @@ -264,7 +264,7 @@ static void sub_807B184(u8 bank) sub_8079E90(0)); gSprites[gObjectBankIDs[bank]].oam.paletteNum = bank; gSprites[gObjectBankIDs[bank]].callback = SpriteCallbackDummy; - gSprites[gObjectBankIDs[bank]].data0 = bank; + gSprites[gObjectBankIDs[bank]].data[0] = bank; } else if (gBattleTypeFlags & BATTLE_TYPE_WALLY_TUTORIAL && bank == 0) { @@ -274,7 +274,7 @@ static void sub_807B184(u8 bank) sub_8079E90(0)); gSprites[gObjectBankIDs[bank]].oam.paletteNum = bank; gSprites[gObjectBankIDs[bank]].callback = SpriteCallbackDummy; - gSprites[gObjectBankIDs[bank]].data0 = bank; + gSprites[gObjectBankIDs[bank]].data[0] = bank; } else { @@ -284,8 +284,8 @@ static void sub_807B184(u8 bank) gObjectBankIDs[bank] = CreateSprite(&gUnknown_02024E8C, sub_8077ABC(bank, 2), posY, sub_8079E90(bank)); gSprites[gObjectBankIDs[bank]].oam.paletteNum = bank; gSprites[gObjectBankIDs[bank]].callback = SpriteCallbackDummy; - gSprites[gObjectBankIDs[bank]].data0 = bank; - gSprites[gObjectBankIDs[bank]].data2 = GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_SPECIES); + gSprites[gObjectBankIDs[bank]].data[0] = bank; + gSprites[gObjectBankIDs[bank]].data[2] = GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_SPECIES); StartSpriteAnim(&gSprites[gObjectBankIDs[bank]], gBattleMonForms[bank]); } gSprites[gObjectBankIDs[bank]].invisible = ewram17800[bank].invisible; diff --git a/src/battle/smokescreen.c b/src/battle/smokescreen.c index 8345cb6ad..dc2887007 100644 --- a/src/battle/smokescreen.c +++ b/src/battle/smokescreen.c @@ -22,28 +22,28 @@ u8 sub_8046234(s16 x, s16 y, u8 a3) mainSpriteId = CreateInvisibleSpriteWithCallback(sub_8046388); mainSprite = &gSprites[mainSpriteId]; - mainSprite->data1 = a3; + mainSprite->data[1] = a3; spriteId1 = CreateSprite(&gSpriteTemplate_81FAF0C, x - 16, y - 16, 2); - gSprites[spriteId1].data0 = mainSpriteId; - mainSprite->data0++; + gSprites[spriteId1].data[0] = mainSpriteId; + mainSprite->data[0]++; AnimateSprite(&gSprites[spriteId1]); spriteId2 = CreateSprite(&gSpriteTemplate_81FAF0C, x, y - 16, 2); - gSprites[spriteId2].data0 = mainSpriteId; - mainSprite->data0++; + gSprites[spriteId2].data[0] = mainSpriteId; + mainSprite->data[0]++; StartSpriteAnim(&gSprites[spriteId2], 1); AnimateSprite(&gSprites[spriteId2]); spriteId3 = CreateSprite(&gSpriteTemplate_81FAF0C, x - 16, y, 2); - gSprites[spriteId3].data0 = mainSpriteId; - mainSprite->data0++; + gSprites[spriteId3].data[0] = mainSpriteId; + mainSprite->data[0]++; StartSpriteAnim(&gSprites[spriteId3], 2); AnimateSprite(&gSprites[spriteId3]); spriteId4 = CreateSprite(&gSpriteTemplate_81FAF0C, x, y, 2); - gSprites[spriteId4].data0 = mainSpriteId; - mainSprite->data0++; + gSprites[spriteId4].data[0] = mainSpriteId; + mainSprite->data[0]++; StartSpriteAnim(&gSprites[spriteId4], 3); AnimateSprite(&gSprites[spriteId4]); @@ -52,11 +52,11 @@ u8 sub_8046234(s16 x, s16 y, u8 a3) static void sub_8046388(struct Sprite *sprite) { - if (!sprite->data0) + if (!sprite->data[0]) { FreeSpriteTilesByTag(gUnknown_081FAEA4.tag); FreeSpritePaletteByTag(gUnknown_081FAEAC.tag); - if (!sprite->data1) + if (!sprite->data[1]) DestroySprite(sprite); else sprite->callback = SpriteCallbackDummy; @@ -67,7 +67,7 @@ void sub_80463CC(struct Sprite *sprite) { if (sprite->animEnded) { - gSprites[sprite->data0].data0--; + gSprites[sprite->data[0]].data[0]--; DestroySprite(sprite); } } diff --git a/src/battle_anim_80CA710.c b/src/battle_anim_80CA710.c index 7a191e2d1..98f421a49 100755 --- a/src/battle_anim_80CA710.c +++ b/src/battle_anim_80CA710.c @@ -196,31 +196,31 @@ void sub_80CA710(struct Sprite* sprite) { sprite->pos1.x += gBattleAnimArgs[0]; sprite->pos1.y += gBattleAnimArgs[1]; - sprite->data0 = gBattleAnimArgs[2]; - sprite->data1 = gBattleAnimArgs[3]; + sprite->data[0] = gBattleAnimArgs[2]; + sprite->data[1] = gBattleAnimArgs[3]; if (GetBankSide(gBattleAnimBankAttacker)) { - sprite->data3 = -gBattleAnimArgs[4]; + sprite->data[3] = -gBattleAnimArgs[4]; } else { - sprite->data3 = gBattleAnimArgs[4]; + sprite->data[3] = gBattleAnimArgs[4]; } - sprite->data4 = gBattleAnimArgs[5]; + sprite->data[4] = gBattleAnimArgs[5]; sprite->callback = sub_80CA768; } void sub_80CA768(struct Sprite* sprite) { - if (sprite->data0 > 0) + if (sprite->data[0] > 0) { - sprite->data0--; - sprite->pos2.y = sprite->data2 >> 8; - sprite->data2 += sprite->data1; - sprite->pos2.x = Sin(sprite->data5, sprite->data3); - sprite->data5 = (sprite->data5 + sprite->data4) & 0xFF; + sprite->data[0]--; + sprite->pos2.y = sprite->data[2] >> 8; + sprite->data[2] += sprite->data[1]; + sprite->pos2.x = Sin(sprite->data[5], sprite->data[3]); + sprite->data[5] = (sprite->data[5] + sprite->data[4]) & 0xFF; } else { @@ -231,34 +231,34 @@ void sub_80CA768(struct Sprite* sprite) void sub_80CA7B0(struct Sprite* sprite) { sub_80787B0(sprite, 1); - sprite->data0 = gBattleAnimArgs[2]; - sprite->data2 = sub_8077ABC(gBattleAnimBankAttacker, 2); - sprite->data4 = sub_8077ABC(gBattleAnimBankAttacker, 3); + sprite->data[0] = gBattleAnimArgs[2]; + sprite->data[2] = sub_8077ABC(gBattleAnimBankAttacker, 2); + sprite->data[4] = sub_8077ABC(gBattleAnimBankAttacker, 3); sprite->callback = sub_8078B34; - StoreSpriteCallbackInData6(sprite, move_anim_8074EE0); + StoreSpriteCallbackInData(sprite, move_anim_8074EE0); } void sub_80CA800(struct Sprite* sprite) { sub_80787B0(sprite, 1); StartSpriteAnim(sprite, gBattleAnimArgs[3]); - sprite->data0 = gBattleAnimArgs[2]; - sprite->data2 = sub_8077ABC(gBattleAnimBankTarget, 2); - sprite->data4 = sub_8077ABC(gBattleAnimBankTarget, 3); + sprite->data[0] = gBattleAnimArgs[2]; + sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2); + sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3); sprite->callback = sub_8078B34; - StoreSpriteCallbackInData6(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, move_anim_8072740); } void sub_80CA858(struct Sprite* sprite) { sub_80787B0(sprite, 1); - sprite->data0 = gBattleAnimArgs[2]; - sprite->data1 = sprite->pos1.x; - sprite->data2 = sub_8077ABC(gBattleAnimBankTarget, 2); - sprite->data3 = sprite->pos1.y; - sprite->data4 = sub_8077ABC(gBattleAnimBankTarget, 3); + sprite->data[0] = gBattleAnimArgs[2]; + sprite->data[1] = sprite->pos1.x; + sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2); + sprite->data[3] = sprite->pos1.y; + sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3); obj_translate_based_on_private_1_2_3_4(sprite); - sprite->data5 = gBattleAnimArgs[3]; + sprite->data[5] = gBattleAnimArgs[3]; sprite->callback = sub_80CA8B4; sub_80CA8B4(sprite); } @@ -271,7 +271,7 @@ void sub_80CA8B4(struct Sprite* sprite) } else { - if (sprite->data5 > 0x7F) + if (sprite->data[5] > 0x7F) { sprite->subpriority = sub_8079E90(gBattleAnimBankTarget) + 1; } @@ -279,9 +279,9 @@ void sub_80CA8B4(struct Sprite* sprite) { sprite->subpriority = sub_8079E90(gBattleAnimBankTarget) + 6; } - sprite->pos2.x += Sin(sprite->data5, 5); - sprite->pos2.y += Cos(sprite->data5, 14); - sprite->data5 = (sprite->data5 + 15) & 0xFF; + sprite->pos2.x += Sin(sprite->data[5], 5); + sprite->pos2.y += Cos(sprite->data[5], 14); + sprite->data[5] = (sprite->data[5] + 15) & 0xFF; } } @@ -306,10 +306,10 @@ void sub_80CA928(u8 taskId) void sub_80CA9A8(struct Sprite* sprite) { sub_8078764(sprite, 1); - sprite->data0 = gBattleAnimArgs[3]; - sprite->data2 = sub_8077ABC(gBattleAnimBankAttacker, 2); - sprite->data4 = sub_8077ABC(gBattleAnimBankAttacker, 3); - sprite->data5 = gBattleAnimArgs[2]; + sprite->data[0] = gBattleAnimArgs[3]; + sprite->data[2] = sub_8077ABC(gBattleAnimBankAttacker, 2); + sprite->data[4] = sub_8077ABC(gBattleAnimBankAttacker, 3); + sprite->data[5] = gBattleAnimArgs[2]; sub_80786EC(sprite); sprite->callback = sub_80CA9F8; } @@ -338,14 +338,14 @@ void sub_80CAA14(struct Sprite* sprite) } b = Random(); - sprite->data0 = (b & 31) + 64; - sprite->data1 = sprite->pos1.x; - sprite->data2 = sub_8077ABC(gBattleAnimBankTarget, 2); - sprite->data3 = sprite->pos1.y; - sprite->data4 = sub_8077ABC(gBattleAnimBankTarget, 3); + sprite->data[0] = (b & 31) + 64; + sprite->data[1] = sprite->pos1.x; + sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2); + sprite->data[3] = sprite->pos1.y; + sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3); sub_8078D60(sprite); - sprite->data5 = Random() & 0xFF; - sprite->data6 = sprite->subpriority; + sprite->data[5] = Random() & 0xFF; + sprite->data[6] = sprite->subpriority; sprite->callback = sub_80CAACC; sub_80CAACC(sprite); } @@ -358,17 +358,17 @@ void sub_80CAACC(struct Sprite* sprite) } else { - sprite->pos2.y += Cos(sprite->data5, 12); - if (sprite->data5 <= 0x7E) + sprite->pos2.y += Cos(sprite->data[5], 12); + if (sprite->data[5] <= 0x7E) { - sprite->subpriority = sprite->data6; + sprite->subpriority = sprite->data[6]; } else { - sprite->subpriority = sprite->data6 + 1; + sprite->subpriority = sprite->data[6] + 1; } - sprite->data5 = (sprite->data5 + 24) & 0xFF; + sprite->data[5] = (sprite->data[5] + 24) & 0xFF; } } @@ -380,10 +380,10 @@ void sub_80CAB18(struct Sprite* sprite) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; } - sprite->data0 = gBattleAnimArgs[4]; - sprite->data2 = sub_8077ABC(gBattleAnimBankTarget, 0) + gBattleAnimArgs[2]; - sprite->data4 = sub_8077ABC(gBattleAnimBankTarget, 1) + gBattleAnimArgs[3]; - sprite->data5 = gBattleAnimArgs[5]; + sprite->data[0] = gBattleAnimArgs[4]; + sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 0) + gBattleAnimArgs[2]; + sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 1) + gBattleAnimArgs[3]; + sprite->data[5] = gBattleAnimArgs[5]; sub_80786EC(sprite); sprite->callback = sub_80CAB88; } @@ -393,9 +393,9 @@ void sub_80CAB88(struct Sprite* sprite) if (sub_8078718(sprite)) { sprite->invisible = 1; - sprite->data0 = 10; + sprite->data[0] = 10; sprite->callback = sub_80782D8; - StoreSpriteCallbackInData6(sprite, sub_80CABC0); + StoreSpriteCallbackInData(sprite, sub_80CABC0); } } @@ -403,9 +403,9 @@ void sub_80CABC0(struct Sprite* sprite) { sprite->invisible = 0; StartSpriteAnim(sprite, 1); - sprite->data0 = 60; + sprite->data[0] = 60; sprite->callback = sub_80782D8; - StoreSpriteCallbackInData6(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, move_anim_8072740); } void sub_80CABF8(struct Sprite* sprite) @@ -417,8 +417,8 @@ void sub_80CABF8(struct Sprite* sprite) sprite->oam.objMode = 1; } - sprite->data0 = gBattleAnimArgs[3]; - sprite->data1 = gBattleAnimArgs[2]; + sprite->data[0] = gBattleAnimArgs[3]; + sprite->data[1] = gBattleAnimArgs[2]; sprite->callback = sub_80CAC44; sub_80CAC44(sprite); } @@ -427,9 +427,9 @@ void sub_80CAC44(struct Sprite* sprite) { u8 var1; - sprite->pos2.x = Sin(sprite->data1, 32); - sprite->pos2.y = Cos(sprite->data1, -3) + ((sprite->data2 += 24) >> 8); - if ((u16)(sprite->data1 - 0x40) < 0x80) + sprite->pos2.x = Sin(sprite->data[1], 32); + sprite->pos2.y = Cos(sprite->data[1], -3) + ((sprite->data[2] += 24) >> 8); + if ((u16)(sprite->data[1] - 0x40) < 0x80) { sprite->oam.priority = (sub_8079ED4(gBattleAnimBankTarget) & 3); } @@ -444,9 +444,9 @@ void sub_80CAC44(struct Sprite* sprite) sprite->oam.priority = var1; } - sprite->data1 = (sprite->data1 + 2) & 0xFF; - sprite->data0--; - if (sprite->data0 == -1) + sprite->data[1] = (sprite->data[1] + 2) & 0xFF; + sprite->data[0]--; + if (sprite->data[0] == -1) move_anim_8072740(sprite); } @@ -474,13 +474,13 @@ void sub_80CACEC(u8 taskId) void sub_80CAD54(struct Sprite* sprite) { sub_80787B0(sprite, 0); - sprite->data0 = gBattleAnimArgs[3]; - sprite->data1 = sprite->pos1.x; - sprite->data2 = sprite->pos1.x; - sprite->data3 = sprite->pos1.y; - sprite->data4 = sub_8077ABC(gBattleAnimBankAttacker, 3) + gBattleAnimArgs[2]; + sprite->data[0] = gBattleAnimArgs[3]; + sprite->data[1] = sprite->pos1.x; + sprite->data[2] = sprite->pos1.x; + sprite->data[3] = sprite->pos1.y; + sprite->data[4] = sub_8077ABC(gBattleAnimBankAttacker, 3) + gBattleAnimArgs[2]; obj_translate_based_on_private_1_2_3_4(sprite); - sprite->data5 = 0x40; + sprite->data[5] = 0x40; sprite->callback = sub_80CADA8; sub_80CADA8(sprite); } @@ -489,9 +489,9 @@ void sub_80CADA8(struct Sprite* sprite) { if (!sub_8078B5C(sprite)) { - sprite->pos2.x += Sin(sprite->data5, 32); - sprite->pos2.y += Cos(sprite->data5, -5); - if ((u16)(sprite->data5 - 0x40) < 0x80) + sprite->pos2.x += Sin(sprite->data[5], 32); + sprite->pos2.y += Cos(sprite->data[5], -5); + if ((u16)(sprite->data[5] - 0x40) < 0x80) { sprite->subpriority = sub_8079E90(gBattleAnimBankAttacker) - 1; } @@ -500,7 +500,7 @@ void sub_80CADA8(struct Sprite* sprite) sprite->subpriority = sub_8079E90(gBattleAnimBankAttacker) + 1; } - sprite->data5 = (sprite->data5 + 5) & 0xFF; + sprite->data[5] = (sprite->data[5] + 5) & 0xFF; } else { @@ -511,13 +511,13 @@ void sub_80CADA8(struct Sprite* sprite) void sub_80CAE20(struct Sprite* sprite) { sub_80787B0(sprite, 1); - sprite->data0 = gBattleAnimArgs[3]; - sprite->data1 = sprite->pos1.x; - sprite->data2 = sprite->pos1.x; - sprite->data3 = sprite->pos1.y; - sprite->data4 = sub_8077ABC(gBattleAnimBankAttacker, 3) + gBattleAnimArgs[2]; + sprite->data[0] = gBattleAnimArgs[3]; + sprite->data[1] = sprite->pos1.x; + sprite->data[2] = sprite->pos1.x; + sprite->data[3] = sprite->pos1.y; + sprite->data[4] = sub_8077ABC(gBattleAnimBankAttacker, 3) + gBattleAnimArgs[2]; obj_translate_based_on_private_1_2_3_4(sprite); - sprite->data5 = 0x40; + sprite->data[5] = 0x40; sprite->callback = sub_80CAE74; sub_80CAE74(sprite); } @@ -526,13 +526,13 @@ void sub_80CAE74(struct Sprite* sprite) { if (!sub_8078B5C(sprite)) { - sprite->pos2.x += Sin(sprite->data5, 8); - if ((u16)(sprite->data5 - 0x3B) < 5 || (u16)(sprite->data5 - 0xBB) < 5) + sprite->pos2.x += Sin(sprite->data[5], 8); + if ((u16)(sprite->data[5] - 0x3B) < 5 || (u16)(sprite->data[5] - 0xBB) < 5) { sprite->oam.matrixNum ^= 8; } - sprite->data5 = (sprite->data5 + 5) & 0xFF; + sprite->data[5] = (sprite->data[5] + 5) & 0xFF; } else { @@ -544,35 +544,35 @@ void sub_80CAED8(struct Sprite* sprite) { sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2); sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3); - sprite->data0 = gBattleAnimArgs[0]; - sprite->data1 = gBattleAnimArgs[1]; - sprite->data2 = gBattleAnimArgs[2]; + sprite->data[0] = gBattleAnimArgs[0]; + sprite->data[1] = gBattleAnimArgs[1]; + sprite->data[2] = gBattleAnimArgs[2]; sprite->callback = sub_80CAF20; } void sub_80CAF20(struct Sprite* sprite) { - if (!sprite->data2) + if (!sprite->data[2]) { - if (sprite->data1 & 1) + if (sprite->data[1] & 1) { - sprite->data0 = 0x80; - sprite->data1 = 0; - sprite->data2 = 0; + sprite->data[0] = 0x80; + sprite->data[1] = 0; + sprite->data[2] = 0; } else { - sprite->data0 = sprite->data1 & 1; - sprite->data1 = sprite->data1 & 1; - sprite->data2 = sprite->data1 & 1; + sprite->data[0] = sprite->data[1] & 1; + sprite->data[1] = sprite->data[1] & 1; + sprite->data[2] = sprite->data[1] & 1; } sprite->callback = sub_80CAF6C; } else { - sprite->data2--; - sprite->pos1.x += sprite->data0; - sprite->pos1.y += sprite->data1; + sprite->data[2]--; + sprite->pos1.x += sprite->data[0]; + sprite->pos1.y += sprite->data[1]; } } @@ -580,21 +580,21 @@ void sub_80CAF6C(struct Sprite* sprite) { if (GetBankSide(gBattleAnimBankAttacker)) { - sprite->pos2.x = -Sin(sprite->data0, 0x19); + sprite->pos2.x = -Sin(sprite->data[0], 0x19); } else { - sprite->pos2.x = Sin(sprite->data0, 0x19); + sprite->pos2.x = Sin(sprite->data[0], 0x19); } - sprite->data0 = (sprite->data0 + 2) & 0xFF; - sprite->data1++; - if (!(sprite->data1 & 1)) + sprite->data[0] = (sprite->data[0] + 2) & 0xFF; + sprite->data[1]++; + if (!(sprite->data[1] & 1)) { sprite->pos2.y++; } - if (sprite->data1 > 0x50) + if (sprite->data[1] > 0x50) { move_anim_8072740(sprite); } @@ -608,28 +608,28 @@ void sub_80CAFD0(struct Sprite* sprite) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; } - sprite->data0 = gBattleAnimArgs[4]; + sprite->data[0] = gBattleAnimArgs[4]; if (!(gBattleAnimArgs[6])) { - sprite->data2 = sub_8077ABC(gBattleAnimBankTarget, 2) + gBattleAnimArgs[2]; - sprite->data4 = sub_8077ABC(gBattleAnimBankTarget, 3) + gBattleAnimArgs[3]; + sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2) + gBattleAnimArgs[2]; + sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3) + gBattleAnimArgs[3]; } else { - sub_807A3FC(gBattleAnimBankTarget, 1, &sprite->data2, &sprite->data4); - sprite->data2 += gBattleAnimArgs[2]; - sprite->data4 += gBattleAnimArgs[3]; + sub_807A3FC(gBattleAnimBankTarget, 1, &sprite->data[2], &sprite->data[4]); + sprite->data[2] += gBattleAnimArgs[2]; + sprite->data[4] += gBattleAnimArgs[3]; } - sprite->data5 = gBattleAnimArgs[5]; + sprite->data[5] = gBattleAnimArgs[5]; sub_80786EC(sprite); if (GetBankSide(gBattleAnimBankAttacker) == GetBankSide(gBattleAnimBankTarget)) { - sprite->data0 = 1; + sprite->data[0] = 1; } else { - sprite->data0 = 0; + sprite->data[0] = 0; } sprite->callback = sub_80CB09C; @@ -638,18 +638,18 @@ void sub_80CAFD0(struct Sprite* sprite) void sub_80CB09C(struct Sprite* sprite) { bool8 c = FALSE; - s16 a = sprite->data0; - s16 b = sprite->data7; + s16 a = sprite->data[0]; + s16 b = sprite->data[7]; s16 r0; - sprite->data0 = 1; + sprite->data[0] = 1; sub_8078718(sprite); - r0 = sprite->data7; - sprite->data0 = a; + r0 = sprite->data[7]; + sprite->data[0] = a; if (b > 0xC8 && r0 <= 0x37 && sprite->oam.affineParam == 0) sprite->oam.affineParam++; - if (sprite->oam.affineParam != 0 && sprite->data0 != 0) + if (sprite->oam.affineParam != 0 && sprite->data[0] != 0) { sprite->invisible ^= 1; sprite->oam.affineParam++; @@ -675,34 +675,34 @@ void sub_80CB144(struct Sprite* sprite) } sprite->pos1.y += 32; - sprite->data0 = gBattleAnimArgs[0]; - sprite->data1 = gBattleAnimArgs[1]; - sprite->data2 = gBattleAnimArgs[2]; - sprite->data3 = gBattleAnimArgs[3]; - sprite->data4 = gBattleAnimArgs[4]; + sprite->data[0] = gBattleAnimArgs[0]; + sprite->data[1] = gBattleAnimArgs[1]; + sprite->data[2] = gBattleAnimArgs[2]; + sprite->data[3] = gBattleAnimArgs[3]; + sprite->data[4] = gBattleAnimArgs[4]; sprite->callback = sub_80CB1A4; } void sub_80CB1A4(struct Sprite* sprite) { - if (sprite->data1 == 0xFF) + if (sprite->data[1] == 0xFF) { sprite->pos1.y -= 2; } - else if (sprite->data1 > 0) + else if (sprite->data[1] > 0) { sprite->pos1.y -= 2; - sprite->data1 -= 2; + sprite->data[1] -= 2; } - sprite->data5 += sprite->data2; - if (sprite->data0 < sprite->data4) - sprite->data5 += sprite->data2; + sprite->data[5] += sprite->data[2]; + if (sprite->data[0] < sprite->data[4]) + sprite->data[5] += sprite->data[2]; - sprite->data5 &= 0xFF; - sprite->pos2.x = Cos(sprite->data5, sprite->data3); - sprite->pos2.y = Sin(sprite->data5, 5); - if (sprite->data5 <= 0x7F) + sprite->data[5] &= 0xFF; + sprite->pos2.x = Cos(sprite->data[5], sprite->data[3]); + sprite->pos2.y = Sin(sprite->data[5], 5); + if (sprite->data[5] <= 0x7F) { sprite->oam.priority = sub_8079ED4(gBattleAnimBankTarget) - 1; } @@ -711,8 +711,8 @@ void sub_80CB1A4(struct Sprite* sprite) sprite->oam.priority = sub_8079ED4(gBattleAnimBankTarget) + 1; } - sprite->data0--; - if (!sprite->data0) + sprite->data[0]--; + if (!sprite->data[0]) move_anim_8072740(sprite); } @@ -721,8 +721,8 @@ void sub_80CB25C(struct Sprite* sprite) sub_8078764(sprite, 0); sprite->affineAnimPaused = 1; StartSpriteAffineAnim(sprite, gBattleAnimArgs[2]); - sprite->data6 = gBattleAnimArgs[2]; - sprite->data7 = gBattleAnimArgs[3]; + sprite->data[6] = gBattleAnimArgs[2]; + sprite->data[7] = gBattleAnimArgs[3]; sprite->callback = sub_80CB298; } @@ -732,7 +732,7 @@ void sub_80CB298(struct Sprite* sprite) { sprite->affineAnimPaused = 0; GetAnimBankSpriteId(1); - sprite->data0 = 0x100; + sprite->data[0] = 0x100; sprite->callback = sub_80CB2D4; } } @@ -740,27 +740,27 @@ void sub_80CB298(struct Sprite* sprite) void sub_80CB2D4(struct Sprite* sprite) { GetAnimBankSpriteId(1); - if (!sprite->data2) + if (!sprite->data[2]) { - sprite->data0 += 11; + sprite->data[0] += 11; } else { - sprite->data0 -= 11; + sprite->data[0] -= 11; } - sprite->data1++; - if (sprite->data1 == 6) + sprite->data[1]++; + if (sprite->data[1] == 6) { - sprite->data1 = 0; - sprite->data2 ^= 1; + sprite->data[1] = 0; + sprite->data[2] ^= 1; } if (sprite->affineAnimEnded) { - sprite->data7--; - if (sprite->data7 > 0) + sprite->data[7]--; + if (sprite->data[7] > 0) { - StartSpriteAffineAnim(sprite, sprite->data6); + StartSpriteAffineAnim(sprite, sprite->data[6]); } else { @@ -834,7 +834,7 @@ void sub_80CB438(u8 taskId) void sub_80CB4CC(struct Sprite* sprite) { - switch (sprite->data0) + switch (sprite->data[0]) { case 0: { @@ -847,7 +847,7 @@ void sub_80CB4CC(struct Sprite* sprite) sprite->pos1.x = sub_8077ABC(gBattleAnimBankTarget, 0) + gBattleAnimArgs[0]; sprite->pos1.y = sub_8077ABC(gBattleAnimBankTarget, 1) + gBattleAnimArgs[1]; sprite->invisible = 1; - sprite->data0++; + sprite->data[0]++; break; } case 1: @@ -856,11 +856,11 @@ void sub_80CB4CC(struct Sprite* sprite) if (sprite->affineAnimEnded) { ChangeSpriteAffineAnim(sprite, 1); - sprite->data0 = 25; - sprite->data2 = sub_8077ABC(gBattleAnimBankAttacker, 2); - sprite->data4 = sub_8077ABC(gBattleAnimBankAttacker, 3); + sprite->data[0] = 25; + sprite->data[2] = sub_8077ABC(gBattleAnimBankAttacker, 2); + sprite->data[4] = sub_8077ABC(gBattleAnimBankAttacker, 3); sprite->callback = sub_8078CC0; - StoreSpriteCallbackInData6(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, move_anim_8072740); break; } } @@ -869,7 +869,7 @@ void sub_80CB4CC(struct Sprite* sprite) void sub_80CB59C(struct Sprite* sprite) { - if (!sprite->data0) + if (!sprite->data[0]) { sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2); sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 1); @@ -877,8 +877,8 @@ void sub_80CB59C(struct Sprite* sprite) sprite->pos2.y = gBattleAnimArgs[1]; sprite->subpriority = gBattleAnimArgs[2] + 30; StartSpriteAnim(sprite, gBattleAnimArgs[3]); - sprite->data2 = gBattleAnimArgs[4]; - sprite->data0++; + sprite->data[2] = gBattleAnimArgs[4]; + sprite->data[0]++; if ((sprite->pos1.y + sprite->pos2.y) > 120) { sprite->pos1.y += -120 + (sprite->pos2.y + sprite->pos1.y); @@ -902,7 +902,7 @@ void sub_80CB620(struct Sprite *sprite) sprite->pos2.y = gBattleAnimArgs[2]; sprite->subpriority = gBattleAnimArgs[3] + 30; StartSpriteAnim(sprite, gBattleAnimArgs[4]); - sprite->data2 = gBattleAnimArgs[5]; + sprite->data[2] = gBattleAnimArgs[5]; sprite->callback = sub_80CB710; gUnknown_03000728[0] = sprite->pos1.x; gUnknown_03000728[1] = sprite->pos1.y; @@ -912,49 +912,49 @@ void sub_80CB620(struct Sprite *sprite) void sub_80CB710(struct Sprite* sprite) { - if (++sprite->data0 > (sprite->data2 - 10)) - sprite->invisible = sprite->data0 % 2; + if (++sprite->data[0] > (sprite->data[2] - 10)) + sprite->invisible = sprite->data[0] % 2; - if (sprite->data0 > sprite->data2) + if (sprite->data[0] > sprite->data[2]) move_anim_8072740(sprite); } void sub_80CB768(struct Sprite* sprite) { - if (!sprite->data0) + if (!sprite->data[0]) { sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2) + gBattleAnimArgs[0]; sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 1) + gBattleAnimArgs[1]; - sprite->data1 = gBattleAnimArgs[2]; - sprite->data2 = gBattleAnimArgs[3]; - sprite->data3 = gBattleAnimArgs[4]; + sprite->data[1] = gBattleAnimArgs[2]; + sprite->data[2] = gBattleAnimArgs[3]; + sprite->data[3] = gBattleAnimArgs[4]; } - sprite->data0++; - sprite->pos2.x = sprite->data1 * sprite->data0; - sprite->pos2.y = Sin((sprite->data0 * 20) & 0xFF, sprite->data2); - if (sprite->data0 > sprite->data3) + sprite->data[0]++; + sprite->pos2.x = sprite->data[1] * sprite->data[0]; + sprite->pos2.y = Sin((sprite->data[0] * 20) & 0xFF, sprite->data[2]); + if (sprite->data[0] > sprite->data[3]) move_anim_8072740(sprite); } void sub_80CB7EC(struct Sprite* sprite, s16 c) { s32 a = (sprite->pos1.x * 256) | sprite->pos1.y; - s32 b = (sprite->data6 * 256) | sprite->data7; + s32 b = (sprite->data[6] * 256) | sprite->data[7]; c *= 256; - sprite->data5 = a; - sprite->data6 = b; - sprite->data7 = c; + sprite->data[5] = a; + sprite->data[6] = b; + sprite->data[7] = c; } bool8 sub_80CB814(struct Sprite* sprite) { - u16 r10 = (u8)(sprite->data5 >> 8); - u16 r9 = (u8)sprite->data5; - s32 r2 = (u8)(sprite->data6 >> 8); - s32 r4 = (u8)sprite->data6; - s16 r6 = sprite->data7 >> 8; - s16 r3 = sprite->data7 & 0xFF; + u16 r10 = (u8)(sprite->data[5] >> 8); + u16 r9 = (u8)sprite->data[5]; + s32 r2 = (u8)(sprite->data[6] >> 8); + s32 r4 = (u8)sprite->data[6]; + s16 r6 = sprite->data[7] >> 8; + s16 r3 = sprite->data[7] & 0xFF; s16 r4_2; s16 r0; s32 var1; @@ -978,19 +978,19 @@ bool8 sub_80CB814(struct Sprite* sprite) if (++r3 == r6) return TRUE; - sprite->data7 = (r6 << 8) | r3; + sprite->data[7] = (r6 << 8) | r3; return FALSE; } void sub_80CB8B8(struct Sprite* sprite) { - if (sprite->data0 == 10) + if (sprite->data[0] == 10) { StartSpriteAffineAnim(sprite, 1); } - sprite->data0++; - if (sprite->data0 > 50) + sprite->data[0]++; + if (sprite->data[0] > 50) { move_anim_8072740(sprite); } @@ -998,18 +998,18 @@ void sub_80CB8B8(struct Sprite* sprite) void sub_80CB8E8(struct Sprite* sprite) { - sprite->data0 += sprite->data3 * 128 / sprite->data4; - if (sprite->data0 >= 128) + sprite->data[0] += sprite->data[3] * 128 / sprite->data[4]; + if (sprite->data[0] >= 128) { - sprite->data1++; - sprite->data0 = 0; + sprite->data[1]++; + sprite->data[0] = 0; } - sprite->pos2.y = Sin(sprite->data0 + 128, 30 - sprite->data1 * 8); + sprite->pos2.y = Sin(sprite->data[0] + 128, 30 - sprite->data[1] * 8); if (sub_80CB814(sprite)) { sprite->pos2.y = 0; - sprite->data0 = 0; + sprite->data[0] = 0; sprite->callback = sub_80CB8B8; } } @@ -1023,39 +1023,39 @@ void sub_80CB94C(struct Sprite* sprite) e2 = sub_8077ABC(gBattleAnimBankTarget, 1); if ((gBattleAnimBankAttacker ^ 2) == gBattleAnimBankTarget) { - sprite->data6 = e1; - sprite->data7 = e2 + 10; + sprite->data[6] = e1; + sprite->data[7] = e2 + 10; sub_80CB7EC(sprite, 0x3C); - sprite->data3 = 1; + sprite->data[3] = 1; } else { - sprite->data6 = e1; - sprite->data7 = e2 + 10; + sprite->data[6] = e1; + sprite->data[7] = e2 + 10; sub_80CB7EC(sprite, 0x3C); - sprite->data3 = 3; + sprite->data[3] = 3; } - sprite->data4 = 0x3C; + sprite->data[4] = 0x3C; sprite->callback = sub_80CB8E8; } void sub_80CB9C4(struct Sprite* sprite) { int zero; - sprite->data0 += ((sprite->data3 * 128) / sprite->data4); + sprite->data[0] += ((sprite->data[3] * 128) / sprite->data[4]); zero = 0; - if (sprite->data0 > 0x7F) + if (sprite->data[0] > 0x7F) { - sprite->data1++; - sprite->data0 = zero; + sprite->data[1]++; + sprite->data[0] = zero; } - sprite->pos2.y = Sin(sprite->data0 + 0x80, 30 - sprite->data1 * 8); + sprite->pos2.y = Sin(sprite->data[0] + 0x80, 30 - sprite->data[1] * 8); if (sub_80CB814(sprite)) { sprite->pos2.y = zero; - sprite->data0 = zero; + sprite->data[0] = zero; move_anim_8072740(sprite); } } @@ -1065,37 +1065,37 @@ void sub_80CBA28(struct Sprite* sprite) s16 e = sub_8077ABC(gBattleAnimBankTarget, 1); if (GetBankSide(gBattleAnimBankTarget) == 0) { - sprite->data6 = 0; - sprite->data7 = e + 10; + sprite->data[6] = 0; + sprite->data[7] = e + 10; sub_80CB7EC(sprite, 0x28); - sprite->data3 = 3; - sprite->data4 = 0x3C; + sprite->data[3] = 3; + sprite->data[4] = 0x3C; sprite->callback = sub_80CB8E8; } else { - sprite->data6 = 255; - sprite->data7 = e + 10; + sprite->data[6] = 255; + sprite->data[7] = e + 10; if (NotInBattle()) - sprite->data6 = 0; + sprite->data[6] = 0; sub_80CB7EC(sprite, 0x28); - sprite->data3 = 3; - sprite->data4 = 0x3C; + sprite->data[3] = 3; + sprite->data[4] = 0x3C; sprite->callback = sub_80CB9C4; } } void sub_80CBAA4(struct Sprite* sprite) { - if (sprite->data0 == 0) + if (sprite->data[0] == 0) { sub_8078764(sprite, 0); - sprite->data1 = gBattleAnimArgs[2]; + sprite->data[1] = gBattleAnimArgs[2]; } - sprite->data0++; - sprite->pos2.y = sprite->data1 * sprite->data0; + sprite->data[0]++; + sprite->pos2.y = sprite->data[1] * sprite->data[0]; if (sprite->animEnded) { move_anim_8072740(sprite); @@ -1111,35 +1111,35 @@ void sub_80CBAE8(struct Sprite* sprite) p2 = sub_8077ABC(gBattleAnimBankAttacker, 1); if ((gBattleAnimBankTarget ^ 2) == gBattleAnimBankAttacker) { - sprite->data6 = p1; - sprite->data7 = p2 + 10; + sprite->data[6] = p1; + sprite->data[7] = p2 + 10; sub_80CB7EC(sprite, 0x3c); - sprite->data3 = 1; + sprite->data[3] = 1; } else { - sprite->data6 = p1; - sprite->data7 = p2 + 10; + sprite->data[6] = p1; + sprite->data[7] = p2 + 10; sub_80CB7EC(sprite, 0x3c); - sprite->data3 = 3; + sprite->data[3] = 3; } - sprite->data4 = 0x3C; + sprite->data[4] = 0x3C; sprite->callback = sub_80CBB60; } void sub_80CBB60(struct Sprite* sprite) { int zero; - sprite->data0 += ((sprite->data3 * 128) / sprite->data4); + sprite->data[0] += ((sprite->data[3] * 128) / sprite->data[4]); zero = 0; - if (sprite->data0 > 0x7F) + if (sprite->data[0] > 0x7F) { - sprite->data1++; - sprite->data0 = zero; + sprite->data[1]++; + sprite->data[0] = zero; } - sprite->pos2.y = Sin(sprite->data0 + 0x80, 30 - sprite->data1 * 8); + sprite->pos2.y = Sin(sprite->data[0] + 0x80, 30 - sprite->data[1] * 8); if (sprite->pos2.y == 0) { PlaySE12WithPanning(0x7D, sub_8076F98(0x3F)); @@ -1148,7 +1148,7 @@ void sub_80CBB60(struct Sprite* sprite) if (sub_80CB814(sprite)) { sprite->pos2.y = 0; - sprite->data0 = 0; + sprite->data[0] = 0; sprite->callback = sub_80CB8B8; PlaySE12WithPanning(0x7D, sub_8076F98(-0x40)); } @@ -1159,11 +1159,11 @@ void sub_80CBBF0(struct Sprite* sprite) int a; int b; - if (sprite->data0 == 0) + if (sprite->data[0] == 0) { if (!NotInBattle()) { - sprite->data1 = gBattleAnimArgs[1]; + sprite->data[1] = gBattleAnimArgs[1]; sprite->pos1.x = 0x78; } else @@ -1174,17 +1174,17 @@ void sub_80CBBF0(struct Sprite* sprite) else b = a; - sprite->data1 = a - ((b >> 8) << 8); + sprite->data[1] = a - ((b >> 8) << 8); sprite->pos1.x = 0x46; } sprite->pos1.y = gBattleAnimArgs[0]; - sprite->data2 = gBattleAnimArgs[0]; - sprite->data4 = 20; - sprite->pos2.x = Cos(sprite->data1, 0x3C); - sprite->pos2.y = Sin(sprite->data1, 20); + sprite->data[2] = gBattleAnimArgs[0]; + sprite->data[4] = 20; + sprite->pos2.x = Cos(sprite->data[1], 0x3C); + sprite->pos2.y = Sin(sprite->data[1], 20); sprite->callback = sub_80CBC8C; - if (sprite->data1 > 0 && sprite->data1 < 0xC0) + if (sprite->data[1] > 0 && sprite->data[1] < 0xC0) sprite->subpriority = 31; else sprite->subpriority = 29; @@ -1193,28 +1193,28 @@ void sub_80CBBF0(struct Sprite* sprite) void sub_80CBC8C(struct Sprite* sprite) { - switch (sprite->data3) + switch (sprite->data[3]) { case 0: - if (sprite->data2 > 0x4E) + if (sprite->data[2] > 0x4E) { - sprite->data3 = 1; + sprite->data[3] = 1; StartSpriteAffineAnim(sprite, 1); break; } else { - sprite->data2 += sprite->data4 / 10; - sprite->data4 += 3; - sprite->pos1.y = sprite->data2; + sprite->data[2] += sprite->data[4] / 10; + sprite->data[4] += 3; + sprite->pos1.y = sprite->data[2]; break; } break; case 1: - if (sprite->data3 && sprite->affineAnimEnded) + if (sprite->data[3] && sprite->affineAnimEnded) { - sprite->data0 = 0; - sprite->data2 = 0; + sprite->data[0] = 0; + sprite->data[2] = 0; sprite->callback = sub_80CBCF8; } break; @@ -1225,24 +1225,24 @@ void sub_80CBC8C(struct Sprite* sprite) void sub_80CBCF8(struct Sprite* sprite) { - if (sprite->data2 == gUnknown_083D680C[sprite->data0][1]) + if (sprite->data[2] == gUnknown_083D680C[sprite->data[0]][1]) { - if (gUnknown_083D680C[sprite->data0][2] == 0x7F) + if (gUnknown_083D680C[sprite->data[0]][2] == 0x7F) { - sprite->data0 = 0; + sprite->data[0] = 0; sprite->callback = sub_80CBDB0; } - sprite->data2 = 0; - sprite->data0++; + sprite->data[2] = 0; + sprite->data[0]++; } else { - sprite->data2++; - sprite->data1 = (gUnknown_083D680C[sprite->data0][0] * gUnknown_083D680C[sprite->data0][2] + sprite->data1) & 0xFF; + sprite->data[2]++; + sprite->data[1] = (gUnknown_083D680C[sprite->data[0]][0] * gUnknown_083D680C[sprite->data[0]][2] + sprite->data[1]) & 0xFF; if (!NotInBattle()) { - if ((u16)(sprite->data1 - 1) <= 0xBE) + if ((u16)(sprite->data[1] - 1) <= 0xBE) { sprite->subpriority = 31; } @@ -1252,18 +1252,18 @@ void sub_80CBCF8(struct Sprite* sprite) } } - sprite->pos2.x = Cos(sprite->data1, 0x3C); - sprite->pos2.y = Sin(sprite->data1, 20); + sprite->pos2.x = Cos(sprite->data[1], 0x3C); + sprite->pos2.y = Sin(sprite->data[1], 20); } } void sub_80CBDB0(struct Sprite* sprite) { - if (sprite->data0 > 20) + if (sprite->data[0] > 20) move_anim_8072740(sprite); - sprite->invisible = sprite->data0 % 2; - sprite->data0++; + sprite->invisible = sprite->data[0] % 2; + sprite->data[0]++; } void sub_80CBDF4(u8 taskId) @@ -1282,12 +1282,12 @@ void sub_80CBDF4(u8 taskId) if (task->data[2] == 0x40) DestroyAnimVisualTask(taskId); - gSprites[task->data[2]].data0 = 10; - gSprites[task->data[2]].data1 = task->data[8]; - gSprites[task->data[2]].data2 = task->data[6] - (task->data[10] / 2 + 10) * task->data[5]; - gSprites[task->data[2]].data3 = task->data[9]; - gSprites[task->data[2]].data4 = task->data[7] + (task->data[11] / 2 + 10) * task->data[5]; - gSprites[task->data[2]].data5 = sub_80CC338(&gSprites[task->data[2]]); + gSprites[task->data[2]].data[0] = 10; + gSprites[task->data[2]].data[1] = task->data[8]; + gSprites[task->data[2]].data[2] = task->data[6] - (task->data[10] / 2 + 10) * task->data[5]; + gSprites[task->data[2]].data[3] = task->data[9]; + gSprites[task->data[2]].data[4] = task->data[7] + (task->data[11] / 2 + 10) * task->data[5]; + gSprites[task->data[2]].data[5] = sub_80CC338(&gSprites[task->data[2]]); sub_80786EC(&gSprites[task->data[2]]); task->func = sub_80CBF5C; } @@ -1336,12 +1336,12 @@ void sub_80CBF5C(u8 taskId) sprite->pos1.y += sprite->pos2.y; sprite->pos2.x = 0; sprite->pos2.y = 0; - sprite->data0 = 10; - sprite->data1 = sprite->pos1.x; - sprite->data2 = task->data[6]; - sprite->data3 = sprite->pos1.y; - sprite->data4 = task->data[7]; - sprite->data5 = sub_80CC338(sprite); + sprite->data[0] = 10; + sprite->data[1] = sprite->pos1.x; + sprite->data[2] = task->data[6]; + sprite->data[3] = sprite->pos1.y; + sprite->data[4] = task->data[7]; + sprite->data[5] = sub_80CC338(sprite); task->data[4] += 2; task->data[3] = a; sprite->subpriority = task->data[4]; @@ -1362,12 +1362,12 @@ void sub_80CBF5C(u8 taskId) sprite->pos1.y += sprite->pos2.y; sprite->pos2.x = 0; sprite->pos2.y = 0; - sprite->data0 = 10; - sprite->data1 = sprite->pos1.x; - sprite->data2 = task->data[6] - ((task->data[10] / 2) + 10) * task->data[5]; - sprite->data3 = sprite->pos1.y; - sprite->data4 = task->data[7] - ((task->data[11] / 2) + 10) * task->data[5]; - sprite->data5 = sub_80CC338(sprite); + sprite->data[0] = 10; + sprite->data[1] = sprite->pos1.x; + sprite->data[2] = task->data[6] - ((task->data[10] / 2) + 10) * task->data[5]; + sprite->data[3] = sprite->pos1.y; + sprite->data[4] = task->data[7] - ((task->data[11] / 2) + 10) * task->data[5]; + sprite->data[5] = sub_80CC338(sprite); task->data[3] = 2; sprite->subpriority = task->data[4]; StartSpriteAnim(sprite, task->data[3]); @@ -1379,12 +1379,12 @@ void sub_80CBF5C(u8 taskId) sprite->pos1.y += sprite->pos2.y; sprite->pos2.x = 0; sprite->pos2.y = 0; - sprite->data0 = 10; - sprite->data1 = sprite->pos1.x; - sprite->data2 = task->data[6] + ((task->data[10] / 2) + 10) * task->data[5]; - sprite->data3 = sprite->pos1.y; - sprite->data4 = task->data[7] + ((task->data[11] / 2) + 10) * task->data[5]; - sprite->data5 = sub_80CC338(sprite); + sprite->data[0] = 10; + sprite->data[1] = sprite->pos1.x; + sprite->data[2] = task->data[6] + ((task->data[10] / 2) + 10) * task->data[5]; + sprite->data[3] = sprite->pos1.y; + sprite->data[4] = task->data[7] + ((task->data[11] / 2) + 10) * task->data[5]; + sprite->data[5] = sub_80CC338(sprite); task->data[4] -= 2; task->data[3] = 3; sprite->subpriority = task->data[4]; @@ -1405,12 +1405,12 @@ void sub_80CBF5C(u8 taskId) sprite->pos1.y += sprite->pos2.y; sprite->pos2.x = 0; sprite->pos2.y = 0; - sprite->data0 = 10; - sprite->data1 = sprite->pos1.x; - sprite->data2 = task->data[6]; - sprite->data3 = sprite->pos1.y; - sprite->data4 = task->data[7]; - sprite->data5 = sub_80CC338(sprite); + sprite->data[0] = 10; + sprite->data[1] = sprite->pos1.x; + sprite->data[2] = task->data[6]; + sprite->data[3] = sprite->pos1.y; + sprite->data[4] = task->data[7]; + sprite->data[5] = sub_80CC338(sprite); task->data[4] += 2; task->data[3] = 4; sprite->subpriority = task->data[4]; @@ -1423,12 +1423,12 @@ void sub_80CBF5C(u8 taskId) sprite->pos1.y += sprite->pos2.y; sprite->pos2.x = 0; sprite->pos2.y = 0; - sprite->data0 = 10; - sprite->data1 = sprite->pos1.x; - sprite->data2 = task->data[6] - ((task->data[10] / 2) + 10) * task->data[5]; - sprite->data3 = sprite->pos1.y; - sprite->data4 = task->data[7] + ((task->data[11] / 2) + 10) * task->data[5]; - sprite->data5 = sub_80CC338(sprite); + sprite->data[0] = 10; + sprite->data[1] = sprite->pos1.x; + sprite->data[2] = task->data[6] - ((task->data[10] / 2) + 10) * task->data[5]; + sprite->data[3] = sprite->pos1.y; + sprite->data[4] = task->data[7] + ((task->data[11] / 2) + 10) * task->data[5]; + sprite->data[5] = sub_80CC338(sprite); task->data[3] = 5; sprite->subpriority = task->data[4]; StartSpriteAnim(sprite, task->data[3]); @@ -1453,12 +1453,12 @@ void sub_80CBF5C(u8 taskId) sprite->pos1.y += sprite->pos2.y; sprite->pos2.x = 0; sprite->pos2.y = 0; - sprite->data0 = 10; - sprite->data1 = sprite->pos1.x; - sprite->data2 = task->data[8]; - sprite->data3 = sprite->pos1.y; - sprite->data4 = task->data[9]; - sprite->data5 = sub_80CC338(sprite); + sprite->data[0] = 10; + sprite->data[1] = sprite->pos1.x; + sprite->data[2] = task->data[8]; + sprite->data[3] = sprite->pos1.y; + sprite->data[4] = task->data[9]; + sprite->data[5] = sub_80CC338(sprite); task->data[4] -= 2; task->data[3] = 6; sprite->subpriority = task->data[4]; @@ -1495,7 +1495,7 @@ void sub_80CBF5C(u8 taskId) s16 sub_80CC338(struct Sprite* sprite) { s16 var = 8; - if (sprite->data4 < sprite->pos1.y) + if (sprite->data[4] < sprite->pos1.y) var = -var; return var; @@ -1515,10 +1515,10 @@ void sub_80CC358(struct Task* task, u8 taskId) spriteId = CreateSprite(&gSpriteTemplate_83D6884, spriteX, spriteY, task->data[4]); if (spriteId != 0x40) { - gSprites[spriteId].data6 = taskId; - gSprites[spriteId].data7 = 12; + gSprites[spriteId].data[6] = taskId; + gSprites[spriteId].data[7] = 12; gTasks[taskId].data[12]++; - gSprites[spriteId].data0 = task->data[13] & 1; + gSprites[spriteId].data[0] = task->data[13] & 1; gTasks[taskId].data[13]++; StartSpriteAnim(&gSprites[spriteId], task->data[3]); gSprites[spriteId].subpriority = task->data[4]; @@ -1529,15 +1529,15 @@ void sub_80CC358(struct Task* task, u8 taskId) void sub_80CC408(struct Sprite* sprite) { - sprite->data0++; - if (sprite->data0 > 1) + sprite->data[0]++; + if (sprite->data[0] > 1) { - sprite->data0 = 0; + sprite->data[0] = 0; sprite->invisible ^= 1; - sprite->data1++; - if (sprite->data1 > 8) + sprite->data[1]++; + if (sprite->data[1] > 8) { - gTasks[sprite->data6].data[sprite->data7]--; + gTasks[sprite->data[6]].data[sprite->data[7]]--; DestroySprite(sprite); } } @@ -1553,20 +1553,20 @@ void sub_80CC474(struct Sprite* sprite) if (GetBankSide(bank) != 0) { - sprite->data4 = 0; - sprite->data2 = gBattleAnimArgs[3]; + sprite->data[4] = 0; + sprite->data[2] = gBattleAnimArgs[3]; sprite->pos1.x = 0xFFF0; } else { - sprite->data4 = 1; - sprite->data2 = -gBattleAnimArgs[3]; + sprite->data[4] = 1; + sprite->data[2] = -gBattleAnimArgs[3]; sprite->pos1.x = 0x100; } - sprite->data1 = gBattleAnimArgs[1]; - sprite->data0 = gBattleAnimArgs[2]; - sprite->data3 = gBattleAnimArgs[4]; + sprite->data[1] = gBattleAnimArgs[1]; + sprite->data[0] = gBattleAnimArgs[2]; + sprite->data[3] = gBattleAnimArgs[4]; switch (gBattleAnimArgs[5]) { case 0: @@ -1593,12 +1593,12 @@ void sub_80CC474(struct Sprite* sprite) void sub_80CC580(struct Sprite* sprite) { - int a = sprite->data7; - sprite->data7++; - sprite->pos2.y = (sprite->data1 * gSineTable[sprite->data0]) >> 8; - sprite->pos2.x = sprite->data2 * a; - sprite->data0 = (sprite->data3 * a) & 0xFF; - if (sprite->data4 == 0) + int a = sprite->data[7]; + sprite->data[7]++; + sprite->pos2.y = (sprite->data[1] * gSineTable[sprite->data[0]]) >> 8; + sprite->pos2.x = sprite->data[2] * a; + sprite->data[0] = (sprite->data[3] * a) & 0xFF; + if (sprite->data[4] == 0) { if (sprite->pos2.x + sprite->pos1.x <= 0xF7) return; @@ -1670,29 +1670,29 @@ void sub_80CC6CC(struct Sprite* sprite) b = sub_8077ABC(gBattleAnimBankTarget, 3); } - sprite->data0 = gBattleAnimArgs[4]; + sprite->data[0] = gBattleAnimArgs[4]; if (gBattleAnimArgs[1] == 0) { sprite->pos1.x = gBattleAnimArgs[2] + a; sprite->pos1.y = gBattleAnimArgs[3] + b; - sprite->data5 = a; - sprite->data6 = b; + sprite->data[5] = a; + sprite->data[6] = b; } else { sprite->pos1.x = a; sprite->pos1.y = b; - sprite->data5 = gBattleAnimArgs[2] + a; - sprite->data6 = gBattleAnimArgs[3] + b; + sprite->data[5] = gBattleAnimArgs[2] + a; + sprite->data[6] = gBattleAnimArgs[3] + b; } x = sprite->pos1.x; - sprite->data1 = x * 16; + sprite->data[1] = x * 16; y = sprite->pos1.y; - sprite->data2 = y * 16; - sprite->data3 = (sprite->data5 - sprite->pos1.x) * 16 / gBattleAnimArgs[4]; - sprite->data4 = (sprite->data6 - sprite->pos1.y) * 16 / gBattleAnimArgs[4]; - c = sub_80790F0(sprite->data5 - x, sprite->data6 - y); + sprite->data[2] = y * 16; + sprite->data[3] = (sprite->data[5] - sprite->pos1.x) * 16 / gBattleAnimArgs[4]; + sprite->data[4] = (sprite->data[6] - sprite->pos1.y) * 16 / gBattleAnimArgs[4]; + c = sub_80790F0(sprite->data[5] - x, sprite->data[6] - y); if (NotInBattle()) c -= 0x8000; @@ -1703,13 +1703,13 @@ void sub_80CC6CC(struct Sprite* sprite) void sub_80CC7D4(struct Sprite* sprite) { - if (sprite->data0) + if (sprite->data[0]) { - sprite->data1 += sprite->data3; - sprite->data2 += sprite->data4; - sprite->pos1.x = sprite->data1 >> 4 ; - sprite->pos1.y = sprite->data2 >> 4 ; - sprite->data0--; + sprite->data[1] += sprite->data[3]; + sprite->data[2] += sprite->data[4]; + sprite->pos1.x = sprite->data[1] >> 4 ; + sprite->pos1.y = sprite->data[2] >> 4 ; + sprite->data[0]--; } else { @@ -1737,7 +1737,7 @@ void sub_80CC82C(struct Sprite* sprite) } sprite->callback = sub_8078600; - StoreSpriteCallbackInData6(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, move_anim_8072740); } void sub_80CC884(struct Sprite* sprite) @@ -1754,12 +1754,12 @@ void sub_80CC8C8(struct Sprite* sprite) { sprite->pos1.x += gBattleAnimArgs[0]; sprite->pos1.y += gBattleAnimArgs[1]; - sprite->data0 = gBattleAnimArgs[2]; - sprite->data1 = gBattleAnimArgs[3]; - sprite->data3 = gBattleAnimArgs[4]; - sprite->data5 = gBattleAnimArgs[5]; + sprite->data[0] = gBattleAnimArgs[2]; + sprite->data[1] = gBattleAnimArgs[3]; + sprite->data[3] = gBattleAnimArgs[4]; + sprite->data[5] = gBattleAnimArgs[5]; StartSpriteAffineAnim(sprite, gBattleAnimArgs[6]); - StoreSpriteCallbackInData6(sprite, move_anim_8074EE0); + StoreSpriteCallbackInData(sprite, move_anim_8074EE0); sprite->callback = sub_8078504; } @@ -1782,11 +1782,11 @@ void sub_80CC914(struct Sprite* sprite) } sprite->pos1.y += gBattleAnimArgs[1]; - sprite->data1 -= 0x400; - sprite->data2 += 0x400; - sprite->data5 = gBattleAnimArgs[2]; - if (sprite->data5 == 1) - sprite->data1 = -sprite->data1; + sprite->data[1] -= 0x400; + sprite->data[2] += 0x400; + sprite->data[5] = gBattleAnimArgs[2]; + if (sprite->data[5] == 1) + sprite->data[1] = -sprite->data[1]; } void sub_80CC9BC(struct Sprite* sprite) @@ -1832,97 +1832,97 @@ void sub_80CC9BC(struct Sprite* sprite) } sprite->pos1.y += gBattleAnimArgs[1]; - sprite->data1 -= 0x400; - sprite->data2 += 0x400; - sprite->data5 = gBattleAnimArgs[2]; - if (sprite->data5 == 1) - sprite->data1 = -sprite->data1; + sprite->data[1] -= 0x400; + sprite->data[2] += 0x400; + sprite->data[5] = gBattleAnimArgs[2]; + if (sprite->data[5] == 1) + sprite->data[1] = -sprite->data[1]; } void sub_80CCB00(struct Sprite* sprite) { - sprite->data3 += sprite->data1; - sprite->data4 += sprite->data2; - if (sprite->data5 == 0) - sprite->data1 += 0x18; + sprite->data[3] += sprite->data[1]; + sprite->data[4] += sprite->data[2]; + if (sprite->data[5] == 0) + sprite->data[1] += 0x18; else - sprite->data1 -= 0x18; + sprite->data[1] -= 0x18; - sprite->data2 -= 0x18; - sprite->pos2.x = sprite->data3 >> 8; - sprite->pos2.y = sprite->data4 >> 8; - sprite->data0++; - if (sprite->data0 == 20) + sprite->data[2] -= 0x18; + sprite->pos2.x = sprite->data[3] >> 8; + sprite->pos2.y = sprite->data[4] >> 8; + sprite->data[0]++; + if (sprite->data[0] == 20) { - StoreSpriteCallbackInData6(sprite, move_anim_8072740); - sprite->data0 = 3; + StoreSpriteCallbackInData(sprite, move_anim_8072740); + sprite->data[0] = 3; sprite->callback = sub_80782D8; } } void unref_sub_80CCB6C(struct Sprite* sprite) { - if (sprite->data2 > 1) + if (sprite->data[2] > 1) { - if (sprite->data3 & 1) + if (sprite->data[3] & 1) { sprite->invisible = 0; - gSprites[sprite->data0].invisible = 0; - gSprites[sprite->data1].invisible = 0; + gSprites[sprite->data[0]].invisible = 0; + gSprites[sprite->data[1]].invisible = 0; } else { sprite->invisible = 1; - gSprites[sprite->data0].invisible = 1; - gSprites[sprite->data1].invisible = 1; + gSprites[sprite->data[0]].invisible = 1; + gSprites[sprite->data[1]].invisible = 1; } - sprite->data2 = 0; - sprite->data3++; + sprite->data[2] = 0; + sprite->data[3]++; } else { - sprite->data2++; + sprite->data[2]++; } - if (sprite->data3 == 10) + if (sprite->data[3] == 10) { - DestroySprite(&gSprites[sprite->data0]); - DestroySprite(&gSprites[sprite->data1]); + DestroySprite(&gSprites[sprite->data[0]]); + DestroySprite(&gSprites[sprite->data[1]]); move_anim_8072740(sprite); } } void sub_80CCC50(struct Sprite* sprite) { - sprite->data0 = gBattleAnimArgs[2]; + sprite->data[0] = gBattleAnimArgs[2]; if (GetBankSide(gBattleAnimBankAttacker) != 0) sprite->pos1.x -= gBattleAnimArgs[0]; else sprite->pos1.x += gBattleAnimArgs[0]; StartSpriteAnim(sprite, gBattleAnimArgs[5]); - sprite->data1 = -gBattleAnimArgs[3]; + sprite->data[1] = -gBattleAnimArgs[3]; sprite->pos1.y += gBattleAnimArgs[1]; - sprite->data3 = gBattleAnimArgs[4]; + sprite->data[3] = gBattleAnimArgs[4]; sprite->callback = sub_80CCCB4; sub_80CCCB4(sprite); } void sub_80CCCB4(struct Sprite* sprite) { - sprite->pos2.x = Cos(sprite->data0, 100); - sprite->pos2.y = Sin(sprite->data0, 20); - if (sprite->data0 <= 0x7F) + sprite->pos2.x = Cos(sprite->data[0], 100); + sprite->pos2.y = Sin(sprite->data[0], 20); + if (sprite->data[0] <= 0x7F) sprite->subpriority = 0; else sprite->subpriority = 14; - sprite->data0 = (sprite->data0 + sprite->data1) & 0xFF; - sprite->data5 += 0x82; - sprite->pos2.y += sprite->data5 >> 8; - sprite->data2++; - if (sprite->data2 == sprite->data3) + sprite->data[0] = (sprite->data[0] + sprite->data[1]) & 0xFF; + sprite->data[5] += 0x82; + sprite->pos2.y += sprite->data[5] >> 8; + sprite->data[2]++; + if (sprite->data[2] == sprite->data[3]) move_anim_8072740(sprite); } @@ -1940,11 +1940,11 @@ void sub_80CCD24(struct Sprite* sprite) else sprite->oam.priority = sub_8079ED4(gBattleAnimBankAttacker); - sprite->data0 = gBattleAnimArgs[2]; - sprite->data2 = (IndexOfSpritePaletteTag(0x2828) << 4) + 0x100; - sprite->data7 = 16; + sprite->data[0] = gBattleAnimArgs[2]; + sprite->data[2] = (IndexOfSpritePaletteTag(0x2828) << 4) + 0x100; + sprite->data[7] = 16; REG_BLDCNT = 0x3F40; - REG_BLDALPHA = (sprite->data7 << 8) | (16 - sprite->data7); + REG_BLDALPHA = (sprite->data[7] << 8) | (16 - sprite->data[7]); sprite->callback = sub_80CCE0C; } @@ -1952,39 +1952,39 @@ void sub_80CCE0C(struct Sprite* sprite) { int a; int i; - sprite->data5 += 0x60; - sprite->pos2.x = -(sprite->data5 >> 8); - sprite->data1++; - if (sprite->data1 > 1) + sprite->data[5] += 0x60; + sprite->pos2.x = -(sprite->data[5] >> 8); + sprite->data[1]++; + if (sprite->data[1] > 1) { - sprite->data1 = 0; - a = gPlttBufferFaded[sprite->data2 + 1]; + sprite->data[1] = 0; + a = gPlttBufferFaded[sprite->data[2] + 1]; i = 0; do { - gPlttBufferFaded[sprite->data2 + ++i] = gPlttBufferFaded[sprite->data2 + i + 1]; + gPlttBufferFaded[sprite->data[2] + ++i] = gPlttBufferFaded[sprite->data[2] + i + 1]; } while ( i <= 5 ); - gPlttBufferFaded[sprite->data2 + 7] = a; + gPlttBufferFaded[sprite->data[2] + 7] = a; } - if (sprite->data7 > 6 && sprite->data0 >0 && ++sprite->data6 > 1) + if (sprite->data[7] > 6 && sprite->data[0] >0 && ++sprite->data[6] > 1) { - sprite->data6 = 0; - sprite->data7 -= 1; - REG_BLDALPHA = (sprite->data7 << 8) | (16 - sprite->data7);; + sprite->data[6] = 0; + sprite->data[7] -= 1; + REG_BLDALPHA = (sprite->data[7] << 8) | (16 - sprite->data[7]);; } - if (sprite->data0 >0) + if (sprite->data[0] >0) { - sprite->data0 -= 1; + sprite->data[0] -= 1; } - else if (++sprite->data6 > 1) + else if (++sprite->data[6] > 1) { - sprite->data6 = 0; - sprite->data7++; - REG_BLDALPHA = (sprite->data7 << 8) | (16 - sprite->data7); - if (sprite->data7 == 16) + sprite->data[6] = 0; + sprite->data[7]++; + REG_BLDALPHA = (sprite->data[7] << 8) | (16 - sprite->data[7]); + if (sprite->data[7] == 16) { sprite->invisible = 1; sprite->callback = sub_807861C; @@ -1996,82 +1996,82 @@ void sub_80CCF04(struct Sprite* sprite) { sprite->pos1.x = sub_8077ABC(gBattleAnimBankTarget, 2); sprite->pos1.y = sub_8077ABC(gBattleAnimBankTarget, 3) + 0xFFE8; - sprite->data0 = 0; - sprite->data1 = 0; - sprite->data2 = 0; - sprite->data3 = 0; - sprite->data4 = 0; - sprite->data6 = 0; - sprite->data7 = 16; + sprite->data[0] = 0; + sprite->data[1] = 0; + sprite->data[2] = 0; + sprite->data[3] = 0; + sprite->data[4] = 0; + sprite->data[6] = 0; + sprite->data[7] = 16; REG_BLDCNT = 0x3F40; - REG_BLDALPHA = (sprite->data7 << 8) | sprite->data6; + REG_BLDALPHA = (sprite->data[7] << 8) | sprite->data[6]; sprite->callback = sub_80CCF70; } void sub_80CCF70(struct Sprite* sprite) { - switch (sprite->data0) + switch (sprite->data[0]) { case 0: - if (++sprite->data2 > 0) + if (++sprite->data[2] > 0) { - sprite->data2 = 0; - if (((++sprite->data1) & 1) != 0) + sprite->data[2] = 0; + if (((++sprite->data[1]) & 1) != 0) { - if (sprite->data6 <= 15) - sprite->data6++; + if (sprite->data[6] <= 15) + sprite->data[6]++; } - else if (sprite->data7 > 0) - sprite->data7--; + else if (sprite->data[7] > 0) + sprite->data[7]--; - REG_BLDALPHA = (sprite->data7 << 8) | sprite->data6; - if (sprite->data6 == 16 && sprite->data7 == 0) + REG_BLDALPHA = (sprite->data[7] << 8) | sprite->data[6]; + if (sprite->data[6] == 16 && sprite->data[7] == 0) { - sprite->data1 = 0; - sprite->data0++; + sprite->data[1] = 0; + sprite->data[0]++; } } break; case 1: - if (++sprite->data1 > 8) + if (++sprite->data[1] > 8) { - sprite->data1 = 0; + sprite->data[1] = 0; StartSpriteAffineAnim(sprite, 1); - sprite->data0++; + sprite->data[0]++; } break; case 2: sub_80CD0CC(sprite, 16, 4); - if (++sprite->data1 > 2) + if (++sprite->data[1] > 2) { - sprite->data1 = 0; + sprite->data[1] = 0; sprite->pos1.y++; } - if (++sprite->data2 <= 29) + if (++sprite->data[2] <= 29) break; - if (sprite->data2 & 1) + if (sprite->data[2] & 1) { - if (sprite->data6 > 0) - sprite->data6--; + if (sprite->data[6] > 0) + sprite->data[6]--; } - else if (sprite->data7 <= 15) + else if (sprite->data[7] <= 15) { - sprite->data7++; + sprite->data[7]++; } - REG_BLDALPHA = (sprite->data7 << 8) | sprite->data6; - if (sprite->data6 == 0 && sprite->data7 == 16) + REG_BLDALPHA = (sprite->data[7] << 8) | sprite->data[6]; + if (sprite->data[6] == 0 && sprite->data[7] == 16) { - sprite->data1 = 0; - sprite->data2 = 0; - sprite->data0++; + sprite->data[1] = 0; + sprite->data[2] = 0; + sprite->data[0]++; } break; case 3: sprite->invisible = 1; - sprite->data0++; + sprite->data[0]++; break; case 4: REG_BLDCNT = 0; @@ -2083,23 +2083,23 @@ void sub_80CCF70(struct Sprite* sprite) void sub_80CD0CC(struct Sprite* sprite, int unk1, int unk2) { - if (sprite->data3 <= 11) - sprite->data4 += 2; + if (sprite->data[3] <= 11) + sprite->data[4] += 2; - if ((u16)(sprite->data3 - 0x12) <= 0x17) - sprite->data4 -= 2; + if ((u16)(sprite->data[3] - 0x12) <= 0x17) + sprite->data[4] -= 2; - if ((sprite->data3) > 0x2F) - sprite->data4 += 2; + if ((sprite->data[3]) > 0x2F) + sprite->data[4] += 2; - sprite->pos2.x = sprite->data4 / 9; - sprite->pos2.y = sprite->data4 / 14; + sprite->pos2.x = sprite->data[4] / 9; + sprite->pos2.y = sprite->data[4] / 14; if (sprite->pos2.y < 0) sprite->pos2.y *= -1; - sprite->data3++; - if (sprite->data3 > 0x3B) - sprite->data3 = 0; + sprite->data[3]++; + if (sprite->data[3] > 0x3B) + sprite->data[3] = 0; } void sub_80CD140(struct Sprite* sprite) @@ -2109,10 +2109,10 @@ void sub_80CD140(struct Sprite* sprite) sub_807867C(sprite, gBattleAnimArgs[0]); sprite->pos1.y += gBattleAnimArgs[1]; - sprite->data0 = gBattleAnimArgs[5]; - sprite->data1 = gBattleAnimArgs[3]; - sprite->data2 = gBattleAnimArgs[4]; - StoreSpriteCallbackInData6(sprite, move_anim_8072740); + sprite->data[0] = gBattleAnimArgs[5]; + sprite->data[1] = gBattleAnimArgs[3]; + sprite->data[2] = gBattleAnimArgs[4]; + StoreSpriteCallbackInData(sprite, move_anim_8072740); sprite->callback = sub_8078394; } @@ -2146,10 +2146,10 @@ void sub_80CD190(struct Sprite* sprite) sub_807867C(sprite, gBattleAnimArgs[0]); } - sprite->data0 = gBattleAnimArgs[5]; - sprite->data1 = gBattleAnimArgs[3]; - sprite->data2 = gBattleAnimArgs[4]; - StoreSpriteCallbackInData6(sprite, move_anim_8072740); + sprite->data[0] = gBattleAnimArgs[5]; + sprite->data[1] = gBattleAnimArgs[3]; + sprite->data[2] = gBattleAnimArgs[4]; + StoreSpriteCallbackInData(sprite, move_anim_8072740); sprite->callback = sub_8078394; } @@ -2173,11 +2173,11 @@ void sub_80CD274(struct Sprite* sprite) void sub_80CD2D4(struct Sprite* sprite) { - if (++sprite->data0 > 30) + if (++sprite->data[0] > 30) { - sprite->pos2.y = (30 - sprite->data0) / 3; - sprite->pos2.x = Sin(sprite->data1 * 4, 3); - sprite->data1++; + sprite->pos2.y = (30 - sprite->data[0]) / 3; + sprite->pos2.x = Sin(sprite->data[1] * 4, 3); + sprite->data[1]++; } if (sprite->animEnded) @@ -2191,13 +2191,13 @@ void sub_80CD328(struct Sprite* sprite) { sprite->pos1.x += gBattleAnimArgs[0]; sprite->pos1.y += gBattleAnimArgs[1]; - sprite->data3 = 1; + sprite->data[3] = 1; } else { sprite->pos1.x -= gBattleAnimArgs[0]; sprite->pos1.y += gBattleAnimArgs[1]; - sprite->data3 = 0xFFFF; + sprite->data[3] = 0xFFFF; StartSpriteAffineAnim(sprite, 1); } @@ -2206,11 +2206,11 @@ void sub_80CD328(struct Sprite* sprite) void sub_80CD394(struct Sprite* sprite) { - sprite->pos2.y = -(sprite->data0 / 0x28); - sprite->pos2.x = sprite->data4 / 10; - sprite->data4 += sprite->data3 * 2; - sprite->data0 += sprite->data1; - if (++sprite->data1 > 0x3C) + sprite->pos2.y = -(sprite->data[0] / 0x28); + sprite->pos2.x = sprite->data[4] / 10; + sprite->data[4] += sprite->data[3] * 2; + sprite->data[0] += sprite->data[1]; + if (++sprite->data[1] > 0x3C) move_anim_8074EE0(sprite); } @@ -2218,45 +2218,45 @@ void sub_80CD3E0(struct Sprite* sprite) { sprite->pos1.x -= 32; sprite->pos1.y -= 32; - sprite->data0 = 20; + sprite->data[0] = 20; sprite->callback = sub_80782D8; - StoreSpriteCallbackInData6(sprite, sub_80CD408); + StoreSpriteCallbackInData(sprite, sub_80CD408); } void sub_80CD408(struct Sprite* sprite) { - switch (sprite->data5 & 1) + switch (sprite->data[5] & 1) { case 0: - sprite->data0 = 1; + sprite->data[0] = 1; sprite->callback = sub_80782D8; - StoreSpriteCallbackInData6(sprite, sub_80CD408); + StoreSpriteCallbackInData(sprite, sub_80CD408); break; case 1: sprite->pos1.x += sprite->pos2.x; sprite->pos1.y += sprite->pos2.y; sprite->pos2.y = 0; sprite->pos2.x = 0; - sprite->data0 = 8; - sprite->data2 = sprite->pos1.x + gUnknown_083D6DDC[sprite->data5 >> 8][0]; - sprite->data4 = sprite->pos1.y + gUnknown_083D6DDC[sprite->data5 >> 8][1]; + sprite->data[0] = 8; + sprite->data[2] = sprite->pos1.x + gUnknown_083D6DDC[sprite->data[5] >> 8][0]; + sprite->data[4] = sprite->pos1.y + gUnknown_083D6DDC[sprite->data[5] >> 8][1]; sprite->callback = sub_8078B34; - StoreSpriteCallbackInData6(sprite, sub_80CD4B8); - sprite->data5 += 0x100; + StoreSpriteCallbackInData(sprite, sub_80CD4B8); + sprite->data[5] += 0x100; PlaySE12WithPanning(0xD2, sub_8076F98(0x3F)); break; } - sprite->data5 ^= 1; + sprite->data[5] ^= 1; } void sub_80CD4B8(struct Sprite* sprite) { - if ((sprite->data5 >> 8) == 4) + if ((sprite->data[5] >> 8) == 4) { - sprite->data0 = 10; + sprite->data[0] = 10; sprite->callback = sub_80782D8; - StoreSpriteCallbackInData6(sprite, sub_80CD4EC); + StoreSpriteCallbackInData(sprite, sub_80CD4EC); } else { @@ -2270,11 +2270,11 @@ void sub_80CD4EC(struct Sprite* sprite) s16 b; if (sprite->oam.affineParam == 0) { - sprite->data0 = 3; - sprite->data1 = 0; - sprite->data2 = 0; + sprite->data[0] = 3; + sprite->data[1] = 0; + sprite->data[2] = 0; sprite->callback = sub_80782D8; - StoreSpriteCallbackInData6(sprite, sub_80CD5A8); + StoreSpriteCallbackInData(sprite, sub_80CD5A8); } else { @@ -2302,36 +2302,36 @@ void sub_80CD4EC(struct Sprite* sprite) sprite->pos1.y += sprite->pos2.y; sprite->pos2.y = 0; sprite->pos2.x = 0; - sprite->data0 = 6; - sprite->data2 = sub_8077ABC(gBattleAnimBankTarget, 2) + a; - sprite->data4 = sub_8077ABC(gBattleAnimBankTarget, 3) + b; + sprite->data[0] = 6; + sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2) + a; + sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3) + b; sprite->callback = sub_8078B34; - StoreSpriteCallbackInData6(sprite, sub_80CD654); + StoreSpriteCallbackInData(sprite, sub_80CD654); } } void sub_80CD5A8(struct Sprite* sprite) { - if (sprite->data2 == 0) + if (sprite->data[2] == 0) { - if ((sprite->data1 += 3) > 16) - sprite->data1 = 16; + if ((sprite->data[1] += 3) > 16) + sprite->data[1] = 16; } - else if ((sprite->data1 -= 3) < 0) + else if ((sprite->data[1] -= 3) < 0) { - sprite->data1 = 0; + sprite->data[1] = 0; } - BlendPalettes(sub_80791A8(1, 1, 1, 1, 1, 0, 0), sprite->data1, 0x7FFF); - if (sprite->data1 == 16) + BlendPalettes(sub_80791A8(1, 1, 1, 1, 1, 0, 0), sprite->data[1], 0x7FFF); + if (sprite->data[1] == 16) { int pal; - sprite->data2++; + sprite->data[2]++; pal = sprite->oam.paletteNum; LoadPalette(&gPlttBufferUnfaded[0x108 + pal * 16], pal * 16 | 0x101, 4); PlaySE12WithPanning(0xC0, sub_8076F98(0x3F)); } - else if (sprite->data1 == 0) + else if (sprite->data[1] == 0) { sprite->callback = sub_80CD654; } @@ -2341,22 +2341,22 @@ void sub_80CD654(struct Sprite* sprite) { if ((u16)gBattleAnimArgs[7] == 0xFFFF) { - sprite->data1 = 0; - sprite->data0 = 0; + sprite->data[1] = 0; + sprite->data[0] = 0; sprite->callback = sub_80CD67C; } } void sub_80CD67C(struct Sprite* sprite) { - if (sprite->data0 % 3 == 0) + if (sprite->data[0] % 3 == 0) { - sprite->data1++; + sprite->data[1]++; sprite->invisible ^= 1; } - sprite->data0++; - if (sprite->data1 == 8) + sprite->data[0]++; + if (sprite->data[1] == 8) move_anim_8072740(sprite); } @@ -2395,7 +2395,7 @@ void sub_80CD6CC(struct Sprite* sprite) void sub_80CD774(struct Sprite* sprite) { sprite->invisible = 1; - sprite->data0 = 0; + sprite->data[0] = 0; switch (gBattleAnimArgs[0]) { case 0: @@ -2415,77 +2415,77 @@ void sub_80CD774(struct Sprite* sprite) void sub_80CD7CC(struct Sprite* sprite) { - sprite->data0 = 6; - sprite->data1 = (GetBankSide(gBattleAnimBankAttacker)) ? 2 : -2; - sprite->data2 = 0; - sprite->data3 = gObjectBankIDs[gBattleAnimBankAttacker]; - StoreSpriteCallbackInData6(sprite, sub_80CD81C); + sprite->data[0] = 6; + sprite->data[1] = (GetBankSide(gBattleAnimBankAttacker)) ? 2 : -2; + sprite->data[2] = 0; + sprite->data[3] = gObjectBankIDs[gBattleAnimBankAttacker]; + StoreSpriteCallbackInData(sprite, sub_80CD81C); sprite->callback = sub_8078458; } void sub_80CD81C(struct Sprite* sprite) { - if (sprite->data0 == 0) + if (sprite->data[0] == 0) { - sprite->data3 = gObjectBankIDs[gBattleAnimBankAttacker]; - sub_8078E70(sprite->data3, 0); - sprite->data4 = (sprite->data6 = GetBankSide(gBattleAnimBankAttacker)) ? 0x300 : 0xFFFFFD00; - sprite->data5 = 0; + sprite->data[3] = gObjectBankIDs[gBattleAnimBankAttacker]; + sub_8078E70(sprite->data[3], 0); + sprite->data[4] = (sprite->data[6] = GetBankSide(gBattleAnimBankAttacker)) ? 0x300 : 0xFFFFFD00; + sprite->data[5] = 0; } - sprite->data5 += sprite->data4; - obj_id_set_rotscale(sprite->data3, 0x100, 0x100, sprite->data5); - sub_8078F9C(sprite->data3); - if (++sprite->data0 > 3) + sprite->data[5] += sprite->data[4]; + obj_id_set_rotscale(sprite->data[3], 0x100, 0x100, sprite->data[5]); + sub_8078F9C(sprite->data[3]); + if (++sprite->data[0] > 3) { - sprite->data0 = 0; + sprite->data[0] = 0; sprite->callback = sub_80CD9B8; } } void sub_80CD8A8(struct Sprite* sprite) { - sprite->data0 = 4; - sprite->data1 = (GetBankSide(gBattleAnimBankAttacker)) ? -3 : 3; - sprite->data2 = 0; - sprite->data3 = gObjectBankIDs[gBattleAnimBankAttacker]; - StoreSpriteCallbackInData6(sprite, sub_80CD9B8); + sprite->data[0] = 4; + sprite->data[1] = (GetBankSide(gBattleAnimBankAttacker)) ? -3 : 3; + sprite->data[2] = 0; + sprite->data[3] = gObjectBankIDs[gBattleAnimBankAttacker]; + StoreSpriteCallbackInData(sprite, sub_80CD9B8); sprite->callback = sub_8078458; } void sub_80CD8F8(struct Sprite* sprite) { - if (++sprite->data0 > 8) + if (++sprite->data[0] > 8) { - sprite->data0 = 0; + sprite->data[0] = 0; sprite->callback = sub_80CD91C; } } void sub_80CD91C(struct Sprite* sprite) { - if (sprite->data0 == 0) + if (sprite->data[0] == 0) { - sprite->data3 = gObjectBankIDs[gBattleAnimBankAttacker]; - sprite->data6 = GetBankSide(gBattleAnimBankAttacker); + sprite->data[3] = gObjectBankIDs[gBattleAnimBankAttacker]; + sprite->data[6] = GetBankSide(gBattleAnimBankAttacker); if (GetBankSide(gBattleAnimBankAttacker)) { - sprite->data4 = 0xFC00; - sprite->data5 = 0xC00; + sprite->data[4] = 0xFC00; + sprite->data[5] = 0xC00; } else { - sprite->data4 = 0x400; - sprite->data5 = 0xF400; + sprite->data[4] = 0x400; + sprite->data[5] = 0xF400; } } - sprite->data5 += sprite->data4; - obj_id_set_rotscale(sprite->data3, 0x100, 0x100, sprite->data5); - sub_8078F9C(sprite->data3); - if (++sprite->data0 > 2) + sprite->data[5] += sprite->data[4]; + obj_id_set_rotscale(sprite->data[3], 0x100, 0x100, sprite->data[5]); + sub_8078F9C(sprite->data[3]); + if (++sprite->data[0] > 2) { - sub_8078F40(sprite->data3); + sub_8078F40(sprite->data[3]); sprite->callback = sub_80CD9B8; } } @@ -2497,40 +2497,40 @@ void sub_80CD9B8(struct Sprite* sprite) void sub_80CD9C4(struct Sprite* sprite) { - sprite->data0 = 0; + sprite->data[0] = 0; sprite->callback = sub_80CD9D4; } void sub_80CD9D4(struct Sprite* sprite) { - switch (sprite->data0) + switch (sprite->data[0]) { case 0: - sprite->data1 = 0; - sprite->data2 = gObjectBankIDs[gBattleAnimBankAttacker]; - sprite->data3 = GetBankSide(gBattleAnimBankAttacker); - sprite->data4 = (sprite->data3 != 0) ? 0x200 : -0x200; - sprite->data5 = 0; - sub_8078E70(sprite->data2, 0); - sprite->data0++; + sprite->data[1] = 0; + sprite->data[2] = gObjectBankIDs[gBattleAnimBankAttacker]; + sprite->data[3] = GetBankSide(gBattleAnimBankAttacker); + sprite->data[4] = (sprite->data[3] != 0) ? 0x200 : -0x200; + sprite->data[5] = 0; + sub_8078E70(sprite->data[2], 0); + sprite->data[0]++; case 1: - sprite->data5 += sprite->data4; - obj_id_set_rotscale(sprite->data2, 0x100, 0x100, sprite->data5); - sub_8078F9C(sprite->data2); - if (++sprite->data1 > 3) + sprite->data[5] += sprite->data[4]; + obj_id_set_rotscale(sprite->data[2], 0x100, 0x100, sprite->data[5]); + sub_8078F9C(sprite->data[2]); + if (++sprite->data[1] > 3) { - sprite->data1 = 0; - sprite->data4 *= -1; - sprite->data0++; + sprite->data[1] = 0; + sprite->data[4] *= -1; + sprite->data[0]++; } break; case 2: - sprite->data5 += sprite->data4; - obj_id_set_rotscale(sprite->data2, 0x100, 0x100, sprite->data5); - sub_8078F9C(sprite->data2); - if (++sprite->data1 > 3) + sprite->data[5] += sprite->data[4]; + obj_id_set_rotscale(sprite->data[2], 0x100, 0x100, sprite->data[5]); + sub_8078F9C(sprite->data[2]); + if (++sprite->data[1] > 3) { - sub_8078F40(sprite->data2); + sub_8078F40(sprite->data[2]); move_anim_8072740(sprite); } break; @@ -2694,9 +2694,9 @@ void sub_80CDD74(struct Sprite* sprite) sprite->pos1.y = sub_8077ABC(gBattleAnimBankTarget, 3) + gBattleAnimArgs[2]; } - sprite->data0 = 0; - sprite->data1 = 0; - StoreSpriteCallbackInData6(sprite, sub_80CDEC0); + sprite->data[0] = 0; + sprite->data[1] = 0; + StoreSpriteCallbackInData(sprite, sub_80CDEC0); sprite->callback = sub_8078600; } @@ -2704,7 +2704,7 @@ void sub_80CDDDC(struct Sprite* sprite) { sprite->pos1.x = sub_8077ABC(gBattleAnimBankTarget, 2) + 0xFFD0; sprite->pos1.y = sub_8077ABC(gBattleAnimBankTarget, 3); - StoreSpriteCallbackInData6(sprite, sub_80CDE78); + StoreSpriteCallbackInData(sprite, sub_80CDE78); sprite->callback = sub_8078600; } @@ -2713,37 +2713,37 @@ void sub_80CDE24(struct Sprite* sprite) sprite->pos1.x = sprite->pos1.x = sub_8077ABC(gBattleAnimBankTarget, 2) + 0xFFD0 + gBattleAnimArgs[0]; sprite->pos1.y = sub_8077ABC(gBattleAnimBankTarget, 3); StartSpriteAnim(sprite, 1); - sprite->data0 = 0; - sprite->data1 = 0; + sprite->data[0] = 0; + sprite->data[1] = 0; sprite->callback = sub_80CDEC0; } void sub_80CDE78(struct Sprite* sprite) { - if (++sprite->data0 > 8) + if (++sprite->data[0] > 8) { - sprite->data0 = 12; - sprite->data1 = 8; - sprite->data2 = 0; - StoreSpriteCallbackInData6(sprite, sub_80CDEB0); + sprite->data[0] = 12; + sprite->data[1] = 8; + sprite->data[2] = 0; + StoreSpriteCallbackInData(sprite, sub_80CDEB0); sprite->callback = sub_8078364; } } void sub_80CDEB0(struct Sprite* sprite) { - sprite->data0 = 0; - sprite->data1 = 0; + sprite->data[0] = 0; + sprite->data[1] = 0; sprite->callback = sub_80CDEC0; } void sub_80CDEC0(struct Sprite* sprite) { - if (++sprite->data0 > 1) + if (++sprite->data[0] > 1) { - sprite->data0 = 0; + sprite->data[0] = 0; sprite->invisible = !sprite->invisible; - if (++sprite->data1 > 8) + if (++sprite->data[1] > 8) move_anim_8072740(sprite); } } @@ -2761,20 +2761,20 @@ void sub_80CDF0C(struct Sprite* sprite) sprite->pos1.y = sub_8077ABC(gBattleAnimBankTarget, 1) + gBattleAnimArgs[2]; } - sprite->data0 = 0; - sprite->data1 = gBattleAnimArgs[3]; + sprite->data[0] = 0; + sprite->data[1] = gBattleAnimArgs[3]; sprite->callback = sub_80CDF70; } void sub_80CDF70(struct Sprite* sprite) { - if (++sprite->data0 > sprite->data1) + if (++sprite->data[0] > sprite->data[1]) { - sprite->data0 = 0; + sprite->data[0] = 0; sprite->pos1.y--; } - sprite->pos1.y -= sprite->data0; + sprite->pos1.y -= sprite->data[0]; if (sprite->animEnded) move_anim_8072740(sprite); } @@ -2783,48 +2783,48 @@ void sub_80CDFB0(struct Sprite* sprite) { sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2); sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3) - 12; - sprite->data0 = 0; - sprite->data1 = 2; - sprite->data2 = 0; - sprite->data3 = 0; - sprite->data4 = 0; - sprite->data5 = sub_8076F98(-0x40); + sprite->data[0] = 0; + sprite->data[1] = 2; + sprite->data[2] = 0; + sprite->data[3] = 0; + sprite->data[4] = 0; + sprite->data[5] = sub_8076F98(-0x40); sprite->callback = sub_80CE000; } void sub_80CE000(struct Sprite* sprite) { - if (++sprite->data0 >= sprite->data1) + if (++sprite->data[0] >= sprite->data[1]) { sprite->invisible = !sprite->invisible; if (!sprite->invisible) { - sprite->data4++; - if (!(sprite->data4 & 1)) - PlaySE12WithPanning(SE_W207B, sprite->data5); + sprite->data[4]++; + if (!(sprite->data[4] & 1)) + PlaySE12WithPanning(SE_W207B, sprite->data[5]); } - sprite->data0 = 0; - if (++sprite->data2 > 1) + sprite->data[0] = 0; + if (++sprite->data[2] > 1) { - sprite->data2 = 0; - sprite->data1++; + sprite->data[2] = 0; + sprite->data[1]++; } } - if (sprite->animEnded && sprite->data1 > 16 && sprite->invisible) + if (sprite->animEnded && sprite->data[1] > 16 && sprite->invisible) move_anim_8072740(sprite); } void sub_80CE09C(struct Sprite* sprite) { - if (sprite->data0 == 0) + if (sprite->data[0] == 0) { sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 0) + gBattleAnimArgs[0]; sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 1) + gBattleAnimArgs[1]; if (NotInBattle()) sprite->pos1.y += 10; - sprite->data0++; + sprite->data[0]++; } if ((u16)gBattleAnimArgs[7] == 0xFFFF) @@ -2859,24 +2859,24 @@ void sub_80CE17C(struct Sprite* sprite) { sub_8078764(sprite, 0); sprite->animPaused = 1; - sprite->data0 = gBattleAnimArgs[2]; + sprite->data[0] = gBattleAnimArgs[2]; sprite->callback = sub_80CE1AC; } void sub_80CE1AC(struct Sprite* sprite) { - if (sprite->data0) + if (sprite->data[0]) { - sprite->data0--; + sprite->data[0]--; } else { sprite->animPaused = 0; - sprite->data0 = 30; - sprite->data2 = sub_8077ABC(gBattleAnimBankAttacker, 2); - sprite->data4 = sub_8077ABC(gBattleAnimBankAttacker, 3); + sprite->data[0] = 30; + sprite->data[2] = sub_8077ABC(gBattleAnimBankAttacker, 2); + sprite->data[4] = sub_8077ABC(gBattleAnimBankAttacker, 3); sprite->callback = sub_8078B34; - StoreSpriteCallbackInData6(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, move_anim_8072740); } } @@ -2933,13 +2933,13 @@ void sub_80CE30C(struct Sprite* sprite) sprite->oam.shape = 0; sprite->oam.size = 3; - sprite->data0 = 0; + sprite->data[0] = 0; sprite->callback = sub_80CE354; } void sub_80CE354(struct Sprite* sprite) { - if (sprite->data0) + if (sprite->data[0]) move_anim_8072740(sprite); } @@ -2947,27 +2947,27 @@ void sub_80CE36C(struct Sprite* sprite) { sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2) + gBattleAnimArgs[0]; sprite->pos1.y = gBattleAnimArgs[1]; - sprite->data0 = 0; - sprite->data1 = 0; - sprite->data2 = 0; - sprite->data3 = 0; - sprite->data4 = 1; + sprite->data[0] = 0; + sprite->data[1] = 0; + sprite->data[2] = 0; + sprite->data[3] = 0; + sprite->data[4] = 1; sprite->callback = sub_80CE3B0; } void sub_80CE3B0(struct Sprite* sprite) { - if (++sprite->data1 > 1) + if (++sprite->data[1] > 1) { - sprite->data1 = 0; - if (sprite->data2 <= 0x77) + sprite->data[1] = 0; + if (sprite->data[2] <= 0x77) { sprite->pos1.y++; - sprite->data2++; + sprite->data[2]++; } } - if (sprite->data0) + if (sprite->data[0]) move_anim_8072740(sprite); } @@ -3055,7 +3055,7 @@ void sub_80CE4D4(u8 taskId) for (spriteId = 0; spriteId < MAX_SPRITES; spriteId++) { if (gSprites[spriteId].template == &gBattleAnimSpriteTemplate_83D6FC8 || gSprites[spriteId].template == &gBattleAnimSpriteTemplate_83D6FF8) - gSprites[spriteId].data0 = 1; + gSprites[spriteId].data[0] = 1; } task->data[1] = 0; @@ -3084,39 +3084,39 @@ void sub_80CE670(struct Sprite* sprite) if (gBattleAnimArgs[2] > 0x7F) gBattleAnimArgs[2] = 0x7F; - sprite->data0 = 0; - sprite->data1 = gBattleAnimArgs[2]; + sprite->data[0] = 0; + sprite->data[1] = gBattleAnimArgs[2]; sprite->pos1.x = sub_8077ABC(gBattleAnimBankTarget, 2) + gBattleAnimArgs[0]; sprite->pos1.y = sub_8077ABC(gBattleAnimBankTarget, 3) + gBattleAnimArgs[1]; - sprite->data6 = sprite->pos1.x; - sprite->data7 = sprite->pos1.y; + sprite->data[6] = sprite->pos1.x; + sprite->data[7] = sprite->pos1.y; if (NotInBattle() != 0) { sprite->oam.matrixNum = 8; sprite->pos1.x += 40; sprite->pos1.y += 20; - sprite->data2 = sprite->pos1.x << 7; - sprite->data3 = -0x1400 / sprite->data1; - sprite->data4 = sprite->pos1.y << 7; - sprite->data5 = -0xA00 / sprite->data1; + sprite->data[2] = sprite->pos1.x << 7; + sprite->data[3] = -0x1400 / sprite->data[1]; + sprite->data[4] = sprite->pos1.y << 7; + sprite->data[5] = -0xA00 / sprite->data[1]; } else if (GetBankSide(gBattleAnimBankAttacker) == 0) { sprite->pos1.x -= 40; sprite->pos1.y += 20; - sprite->data2 = sprite->pos1.x << 7; - sprite->data3 = 0x1400 / sprite->data1; - sprite->data4 = sprite->pos1.y << 7; - sprite->data5 = -0xA00 / sprite->data1; + sprite->data[2] = sprite->pos1.x << 7; + sprite->data[3] = 0x1400 / sprite->data[1]; + sprite->data[4] = sprite->pos1.y << 7; + sprite->data[5] = -0xA00 / sprite->data[1]; } else { sprite->pos1.x += 40; sprite->pos1.y -= 20; - sprite->data2 = sprite->pos1.x << 7; - sprite->data3 = -0x1400 / sprite->data1; - sprite->data4 = sprite->pos1.y << 7; - sprite->data5 = 0xA00 / sprite->data1; + sprite->data[2] = sprite->pos1.x << 7; + sprite->data[3] = -0x1400 / sprite->data[1]; + sprite->data[4] = sprite->pos1.y << 7; + sprite->data[5] = 0xA00 / sprite->data[1]; sprite->oam.matrixNum = 24; } @@ -3125,17 +3125,17 @@ void sub_80CE670(struct Sprite* sprite) void sub_80CE798(struct Sprite* sprite) { - sprite->data2 += sprite->data3; - sprite->data4 += sprite->data5; - sprite->pos1.x = sprite->data2 >> 7; - sprite->pos1.y = sprite->data4 >> 7; - if (--sprite->data1 == 1) + sprite->data[2] += sprite->data[3]; + sprite->data[4] += sprite->data[5]; + sprite->pos1.x = sprite->data[2] >> 7; + sprite->pos1.y = sprite->data[4] >> 7; + if (--sprite->data[1] == 1) { - sprite->pos1.x = sprite->data6; - sprite->pos1.y = sprite->data7; + sprite->pos1.x = sprite->data[6]; + sprite->pos1.y = sprite->data[7]; } - if (sprite->data1 == 0) + if (sprite->data[1] == 0) move_anim_8072740(sprite); } @@ -3162,9 +3162,9 @@ void sub_80CE7E0(u8 taskId) while (i <= 1 && (obj = duplicate_obj_of_side_rel2move_in_transparent_mode(0)) >= 0) { gSprites[obj].oam.paletteNum = task->data[1]; - gSprites[obj].data0 = 0; - gSprites[obj].data1 = i << 7; - gSprites[obj].data2 = taskId; + gSprites[obj].data[0] = 0; + gSprites[obj].data[1] = i << 7; + gSprites[obj].data[2] = taskId; gSprites[obj].callback = sub_80CE974; task->data[3]++; i++; @@ -3198,29 +3198,29 @@ void sub_80CE910(u8 taskId) void sub_80CE974(struct Sprite* sprite) { - if (++sprite->data3 > 1) + if (++sprite->data[3] > 1) { - sprite->data3 = 0; - sprite->data0++; + sprite->data[3] = 0; + sprite->data[0]++; } - if (sprite->data0 > 0x40) + if (sprite->data[0] > 0x40) { - gTasks[sprite->data2].data[3]--; + gTasks[sprite->data[2]].data[3]--; obj_delete_but_dont_free_vram(sprite); } else { - sprite->data4 = gSineTable[sprite->data0] / 6; - sprite->data5 = gSineTable[sprite->data0] / 13; - sprite->data1 = (sprite->data1 + sprite->data5) & 0xFF; - sprite->pos2.x = Sin(sprite->data1, sprite->data4); + sprite->data[4] = gSineTable[sprite->data[0]] / 6; + sprite->data[5] = gSineTable[sprite->data[0]] / 13; + sprite->data[1] = (sprite->data[1] + sprite->data[5]) & 0xFF; + sprite->pos2.x = Sin(sprite->data[1], sprite->data[4]); } } void sub_80CEA04(struct Sprite* sprite) { - StoreSpriteCallbackInData6(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, move_anim_8072740); sprite->callback = sub_8078600; } @@ -3277,9 +3277,9 @@ void sub_80CEB0C(struct Sprite* sprite) if ((index = IndexOfSpritePaletteTag(gUnknown_083D712C[gBattleAnimArgs[1]][0])) != 0xFF) sprite->oam.paletteNum = index; - sprite->data1 = gBattleAnimArgs[1]; - sprite->data2 = 0; - sprite->data3 = gBattleAnimArgs[2]; + sprite->data[1] = gBattleAnimArgs[1]; + sprite->data[2] = 0; + sprite->data[3] = gBattleAnimArgs[2]; if (NotInBattle()) { a = 0x30; @@ -3291,9 +3291,9 @@ void sub_80CEB0C(struct Sprite* sprite) b = sub_8077ABC(gBattleAnimBankTarget, 3); } - sprite->data4 = sprite->pos1.x << 4; - sprite->data5 = sprite->pos1.y << 4; - sub_80CEBC4(a - sprite->pos1.x, b - sprite->pos1.y, &sprite->data6, &sprite->data7, 0x28); + sprite->data[4] = sprite->pos1.x << 4; + sprite->data[5] = sprite->pos1.y << 4; + sub_80CEBC4(a - sprite->pos1.x, b - sprite->pos1.y, &sprite->data[6], &sprite->data[7], 0x28); sprite->callback = sub_80CEC1C; } @@ -3320,12 +3320,12 @@ void sub_80CEC1C(struct Sprite* sprite) s16 a; int c; u8 index; - sprite->data0++; - b = sprite->data0 * 5 - ((sprite->data0 * 5 / 256) << 8); - sprite->data4 += sprite->data6; - sprite->data5 += sprite->data7; - sprite->pos1.x = sprite->data4 >> 4; - sprite->pos1.y = sprite->data5 >> 4; + sprite->data[0]++; + b = sprite->data[0] * 5 - ((sprite->data[0] * 5 / 256) << 8); + sprite->data[4] += sprite->data[6]; + sprite->data[5] += sprite->data[7]; + sprite->pos1.x = sprite->data[4] >> 4; + sprite->pos1.y = sprite->data[5] >> 4; sprite->pos2.y = Sin(b, 15); a = (u16)sprite->pos1.y; c = (u16)sprite->pos1.x; @@ -3336,13 +3336,13 @@ void sub_80CEC1C(struct Sprite* sprite) } else { - if (sprite->data3 && ++sprite->data2 > sprite->data3) + if (sprite->data[3] && ++sprite->data[2] > sprite->data[3]) { - sprite->data2 = 0; - if (++sprite->data1 > 3) - sprite->data1 = 0; + sprite->data[2] = 0; + if (++sprite->data[1] > 3) + sprite->data[1] = 0; - index = IndexOfSpritePaletteTag(gUnknown_083D712C[sprite->data1][0]); + index = IndexOfSpritePaletteTag(gUnknown_083D712C[sprite->data[1]][0]); if (index != 0xFF) sprite->oam.paletteNum = index; } @@ -3361,31 +3361,31 @@ void sub_80CECE8(struct Sprite* sprite) sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2) + gBattleAnimArgs[1]; sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3) + gBattleAnimArgs[2]; StartSpriteAnim(sprite, gBattleAnimArgs[0]); - sprite->data2 = 0; - sprite->data3 = 0; - sprite->data4 = sprite->pos1.x << 4; - sprite->data5 = sprite->pos1.y << 4; - sprite->data6 = (gBattleAnimArgs[1] << 4) / 5; - sprite->data7 = (gBattleAnimArgs[2] << 7) / 5; + sprite->data[2] = 0; + sprite->data[3] = 0; + sprite->data[4] = sprite->pos1.x << 4; + sprite->data[5] = sprite->pos1.y << 4; + sprite->data[6] = (gBattleAnimArgs[1] << 4) / 5; + sprite->data[7] = (gBattleAnimArgs[2] << 7) / 5; sprite->callback = sub_80CED78; } void sub_80CED78(struct Sprite* sprite) { - sprite->data4 += sprite->data6; - sprite->data5 += sprite->data7; - sprite->pos1.x = sprite->data4 >> 4; - sprite->pos1.y = sprite->data5 >> 4; - if (sprite->data0 > 5 && sprite->data3 == 0) + sprite->data[4] += sprite->data[6]; + sprite->data[5] += sprite->data[7]; + sprite->pos1.x = sprite->data[4] >> 4; + sprite->pos1.y = sprite->data[5] >> 4; + if (sprite->data[0] > 5 && sprite->data[3] == 0) { - sprite->data2 = (sprite->data2 + 16) & 0xFF; - sprite->pos2.x = Cos(sprite->data2, 18); - sprite->pos2.y = Sin(sprite->data2, 18); - if (sprite->data2 == 0) - sprite->data3 = 1; + sprite->data[2] = (sprite->data[2] + 16) & 0xFF; + sprite->pos2.x = Cos(sprite->data[2], 18); + sprite->pos2.y = Sin(sprite->data[2], 18); + if (sprite->data[2] == 0) + sprite->data[3] = 1; } - if (++sprite->data0 == 0x30) + if (++sprite->data[0] == 0x30) move_anim_8074EE0(sprite); } @@ -3404,9 +3404,9 @@ void sub_80CEDF0(struct Sprite* sprite) sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2) + a; sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3) + 8; - sprite->data0 = 8; + sprite->data[0] = 8; sprite->callback = sub_80782D8; - StoreSpriteCallbackInData6(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, move_anim_8072740); } void sub_80CEE60(struct Sprite* sprite) @@ -3421,13 +3421,13 @@ void sub_80CEE60(struct Sprite* sprite) sprite->oam.paletteNum = index; a = (gBattleAnimArgs[0] == 0) ? 0xFFE0 : 0x20; - sprite->data0 = 40; - sprite->data1 = sprite->pos1.x; - sprite->data2 = a + sprite->data1; - sprite->data3 = sprite->pos1.y; - sprite->data4 = sprite->data3 - 40; + sprite->data[0] = 40; + sprite->data[1] = sprite->pos1.x; + sprite->data[2] = a + sprite->data[1]; + sprite->data[3] = sprite->pos1.y; + sprite->data[4] = sprite->data[3] - 40; obj_translate_based_on_private_1_2_3_4(sprite); - sprite->data5 = gBattleAnimArgs[3]; + sprite->data[5] = gBattleAnimArgs[3]; sprite->callback = sub_80CEEE8; } @@ -3436,13 +3436,13 @@ void sub_80CEEE8(struct Sprite* sprite) if (sub_8078B5C(sprite) == 0) { s16 a; - a = Sin(sprite->data5, 8); + a = Sin(sprite->data[5], 8); if (sprite->pos2.x < 0) a = -a; sprite->pos2.x += a; - sprite->pos2.y += Sin(sprite->data5, 4); - sprite->data5 = (sprite->data5 + 8) & 0xFF; + sprite->pos2.y += Sin(sprite->data[5], 4); + sprite->data[5] = (sprite->data[5] + 8) & 0xFF; } else { @@ -3471,19 +3471,19 @@ void sub_80CEF9C(struct Sprite* sprite) sub_80CEF44(bank, sprite); a = (GetBankSide(bank) == 0) ? 0 : 1; - sprite->data0 = gBattleAnimArgs[1]; - sprite->data1 = a + 2; + sprite->data[0] = gBattleAnimArgs[1]; + sprite->data[1] = a + 2; StartSpriteAnim(sprite, a); - StoreSpriteCallbackInData6(sprite, sub_80CF008); + StoreSpriteCallbackInData(sprite, sub_80CF008); sprite->callback = sub_8078600; } void sub_80CF008(struct Sprite* sprite) { - if (--sprite->data0 == 0) + if (--sprite->data[0] == 0) { - StoreSpriteCallbackInData6(sprite, move_anim_8072740); - StartSpriteAnim(sprite, sprite->data1); + StoreSpriteCallbackInData(sprite, move_anim_8072740); + StartSpriteAnim(sprite, sprite->data[1]); sprite->callback = sub_8078600; } } @@ -3497,17 +3497,17 @@ void sub_80CF040(struct Sprite* sprite) bank = gBattleAnimBankTarget; sub_80CEF44(bank, sprite); - sprite->data0 = 0; - StoreSpriteCallbackInData6(sprite, sub_80CF088); + sprite->data[0] = 0; + StoreSpriteCallbackInData(sprite, sub_80CF088); sprite->callback = sub_80785E4; } void sub_80CF088(struct Sprite* sprite) { - if (++sprite->data0 > 16) + if (++sprite->data[0] > 16) { StartSpriteAffineAnim(sprite, 1); - StoreSpriteCallbackInData6(sprite, move_anim_8074EE0); + StoreSpriteCallbackInData(sprite, move_anim_8074EE0); sprite->callback = sub_80785E4; } } @@ -3525,18 +3525,18 @@ void sub_80CF0BC(struct Sprite* sprite) if (sprite->pos1.y <= 9) sprite->pos1.y = 10; - sprite->data0 = 1; - sprite->data1 = 0; - sprite->data2 = sprite->subpriority; - sprite->data3 = sprite->subpriority + 4; - sprite->data4 = 0; - StoreSpriteCallbackInData6(sprite, sub_80CF138); + sprite->data[0] = 1; + sprite->data[1] = 0; + sprite->data[2] = sprite->subpriority; + sprite->data[3] = sprite->subpriority + 4; + sprite->data[4] = 0; + StoreSpriteCallbackInData(sprite, sub_80CF138); sprite->callback = sub_80785E4; } void sub_80CF138(struct Sprite* sprite) { - if (++sprite->data4 > 12) + if (++sprite->data[4] > 12) sprite->callback = sub_80CF158; } @@ -3544,10 +3544,10 @@ void sub_80CF158(struct Sprite* sprite) { s16 temp; s16 temp2; - sprite->data1 += 4; - if (sprite->data1 > 0xFE) + sprite->data[1] += 4; + if (sprite->data[1] > 0xFE) { - if (--sprite->data0 == 0) + if (--sprite->data[0] == 0) { sprite->pos2.x = 0; sprite->callback = sub_80CF088; @@ -3555,17 +3555,17 @@ void sub_80CF158(struct Sprite* sprite) } else { - sprite->data1 &= 0xFF; + sprite->data[1] &= 0xFF; } } - if (sprite->data1 > 0x4F) - sprite->subpriority = sprite->data3; + if (sprite->data[1] > 0x4F) + sprite->subpriority = sprite->data[3]; - if (sprite->data1 > 0x9F) - sprite->subpriority = sprite->data2; + if (sprite->data[1] > 0x9F) + sprite->subpriority = sprite->data[2]; - temp = gSineTable[sprite->data1]; + temp = gSineTable[sprite->data[1]]; sprite->pos2.x = (temp2 = temp >> 3) + (temp2 >> 1); } @@ -3581,12 +3581,12 @@ void sub_80CF1C8(struct Sprite* sprite) if (GetBankSide(bank) == 0) { StartSpriteAnim(sprite, 0); - sprite->data0 = 2; + sprite->data[0] = 2; } else { StartSpriteAnim(sprite, 1); - sprite->data0 = 3; + sprite->data[0] = 3; } sprite->callback = sub_80CF228; @@ -3594,18 +3594,18 @@ void sub_80CF1C8(struct Sprite* sprite) void sub_80CF228(struct Sprite* sprite) { - if (++sprite->data1 > 10) + if (++sprite->data[1] > 10) { - sprite->data1 = 0; - StartSpriteAnim(sprite, sprite->data0); - StoreSpriteCallbackInData6(sprite, sub_80CF264); + sprite->data[1] = 0; + StartSpriteAnim(sprite, sprite->data[0]); + StoreSpriteCallbackInData(sprite, sub_80CF264); sprite->callback = sub_8078600; } } void sub_80CF264(struct Sprite* sprite) { - if (++sprite->data1 > 5) + if (++sprite->data[1] > 5) move_anim_8072740(sprite); } @@ -3614,11 +3614,11 @@ void sub_80CF280(struct Sprite* sprite) sub_8078650(sprite); sub_807867C(sprite, gBattleAnimArgs[0]); sprite->pos1.y += gBattleAnimArgs[1]; - sprite->data1 = gBattleAnimArgs[2]; - sprite->data2 = gBattleAnimArgs[4]; - sprite->data3 = gBattleAnimArgs[5]; - sprite->data4 = gBattleAnimArgs[3]; - StoreSpriteCallbackInData6(sprite, move_anim_8074EE0); + sprite->data[1] = gBattleAnimArgs[2]; + sprite->data[2] = gBattleAnimArgs[4]; + sprite->data[3] = gBattleAnimArgs[5]; + sprite->data[4] = gBattleAnimArgs[3]; + StoreSpriteCallbackInData(sprite, move_anim_8074EE0); sprite->callback = sub_8078278; sub_8078278(sprite); } @@ -3632,27 +3632,27 @@ void sub_80CF2D0(struct Sprite* sprite) bank = gBattleAnimBankTarget; sub_80CEF44(bank, sprite); - sprite->data0 = 0; - sprite->data1 = 0; + sprite->data[0] = 0; + sprite->data[1] = 0; sprite->callback = sub_80CF310; } void sub_80CF310(struct Sprite* sprite) { - switch (sprite->data0) + switch (sprite->data[0]) { case 0: sprite->pos2.y -= 3; - if (++sprite->data1 == 6) - sprite->data0++; + if (++sprite->data[1] == 6) + sprite->data[0]++; break; case 1: sprite->pos2.y += 3; - if (--sprite->data1 == 0) - sprite->data0++; + if (--sprite->data[1] == 0) + sprite->data[0]++; break; case 2: - if (++sprite->data1 == 0x40) + if (++sprite->data[1] == 0x40) move_anim_8072740(sprite); break; } @@ -3661,16 +3661,16 @@ void sub_80CF310(struct Sprite* sprite) void sub_80CF374(struct Sprite* sprite) { s16 temp; - gSprites[sprite->data2].pos2.x += sprite->data1; - temp = sprite->data1; - sprite->data1 = -temp; - if (sprite->data0 == 0) + gSprites[sprite->data[2]].pos2.x += sprite->data[1]; + temp = sprite->data[1]; + sprite->data[1] = -temp; + if (sprite->data[0] == 0) { - gSprites[sprite->data2].pos2.x = 0; + gSprites[sprite->data[2]].pos2.x = 0; move_anim_8074EE0(sprite); } - sprite->data0--; + sprite->data[0]--; } void sub_80CF3C4(struct Sprite* sprite) @@ -3689,9 +3689,9 @@ void sub_80CF3C4(struct Sprite* sprite) } sprite->pos1.y += gBattleAnimArgs[1]; - sprite->data0 = gBattleAnimArgs[2]; - sprite->data1 = gBattleAnimArgs[3]; - sprite->data2 = a; + sprite->data[0] = gBattleAnimArgs[2]; + sprite->data[1] = gBattleAnimArgs[3]; + sprite->data[2] = a; sprite->callback = sub_80CF374; sprite->invisible = 1; } @@ -3699,28 +3699,28 @@ void sub_80CF3C4(struct Sprite* sprite) void sub_80CF458(struct Sprite* sprite) { sub_80787B0(sprite, 1); - sprite->data0 = gBattleAnimArgs[2]; - sprite->data1 = gBattleAnimArgs[3]; - sprite->data5 = gBattleAnimArgs[4]; + sprite->data[0] = gBattleAnimArgs[2]; + sprite->data[1] = gBattleAnimArgs[3]; + sprite->data[5] = gBattleAnimArgs[4]; sprite->callback = sub_80782D8; - StoreSpriteCallbackInData6(sprite, sub_80CF490); + StoreSpriteCallbackInData(sprite, sub_80CF490); } void sub_80CF490(struct Sprite* sprite) { - sprite->data0 = sprite->data1; - sprite->data2 = sprite->pos1.x; - sprite->data4 = sprite->pos1.y + 15; + sprite->data[0] = sprite->data[1]; + sprite->data[2] = sprite->pos1.x; + sprite->data[4] = sprite->pos1.y + 15; sprite->callback = sub_8078B34; - StoreSpriteCallbackInData6(sprite, sub_80CF4B8); + StoreSpriteCallbackInData(sprite, sub_80CF4B8); } void sub_80CF4B8(struct Sprite* sprite) { - if (sprite->data5 == 0) + if (sprite->data[5] == 0) move_anim_8072740(sprite); else - sprite->data5--; + sprite->data[5]--; } void sub_80CF4D8(u8 taskId) @@ -3794,23 +3794,23 @@ void sub_80CF610(struct Sprite* sprite) } sprite->callback = sub_8078600; - StoreSpriteCallbackInData6(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, move_anim_8072740); } void sub_80CF690(struct Sprite* sprite) { sub_80787B0(sprite, 0); sprite->callback = sub_80785E4; - StoreSpriteCallbackInData6(sprite, sub_80CF6B4); + StoreSpriteCallbackInData(sprite, sub_80CF6B4); } void sub_80CF6B4(struct Sprite* sprite) { - sprite->data0 = 6; - sprite->data2 = sprite->pos1.x; - sprite->data4 = sprite->pos1.y - 32; + sprite->data[0] = 6; + sprite->data[2] = sprite->pos1.x; + sprite->data[4] = sprite->pos1.y - 32; sprite->callback = sub_8078B34; - StoreSpriteCallbackInData6(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, move_anim_8072740); } //sonic boom @@ -3840,51 +3840,51 @@ void sub_80CF6DC(struct Sprite* sprite) c -= 0x6000; sub_8078FDC(sprite, 0, 0x100, 0x100, c); - sprite->data0 = gBattleAnimArgs[4]; - sprite->data2 = a; - sprite->data4 = b; + sprite->data[0] = gBattleAnimArgs[4]; + sprite->data[2] = a; + sprite->data[4] = b; sprite->callback = sub_8078B34; - StoreSpriteCallbackInData6(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, move_anim_8072740); } void sub_80CF7E0(struct Sprite* sprite) { - if (sprite->data0-- <= 0) + if (sprite->data[0]-- <= 0) { - gTasks[sprite->data7].data[1]--; + gTasks[sprite->data[7]].data[1]--; DestroySprite(sprite); } } void sub_80CF814(struct Sprite* sprite) { - struct Task* task = &gTasks[sprite->data7]; - if (sprite->data0 > task->data[5]) + struct Task* task = &gTasks[sprite->data[7]]; + if (sprite->data[0] > task->data[5]) { - sprite->data5 += sprite->data3; - sprite->data6 += sprite->data4; + sprite->data[5] += sprite->data[3]; + sprite->data[6] += sprite->data[4]; } else { - sprite->data5 -= sprite->data3; - sprite->data6 -= sprite->data4; + sprite->data[5] -= sprite->data[3]; + sprite->data[6] -= sprite->data[4]; } - sprite->data1 += sprite->data5; - sprite->data2 += sprite->data6; + sprite->data[1] += sprite->data[5]; + sprite->data[2] += sprite->data[6]; if (1 & task->data[7]) - sprite->pos2.x = ((u16)sprite->data1 >> 8) * -1; + sprite->pos2.x = ((u16)sprite->data[1] >> 8) * -1; else - sprite->pos2.x = (u16)sprite->data1 >> 8; + sprite->pos2.x = (u16)sprite->data[1] >> 8; if (1 & task->data[8]) - sprite->pos2.y = ((u16)sprite->data2 / 256u) * -1; + sprite->pos2.y = ((u16)sprite->data[2] / 256u) * -1; else - sprite->pos2.y = (u16)sprite->data2 / 256u; + sprite->pos2.y = (u16)sprite->data[2] / 256u; - if (sprite->data0-- <= 0) + if (sprite->data[0]-- <= 0) { - sprite->data0 = 30; + sprite->data[0] = 30; sprite->callback = sub_80CF7E0; } } @@ -3896,22 +3896,22 @@ void sub_80CF8B8(struct Sprite* sprite) s16 b; s16 c; - struct Task* task = &gTasks[sprite->data7]; - sprite->data1 += (-2 & task->data[7]); - sprite->data2 += (-2 & task->data[8]); + struct Task* task = &gTasks[sprite->data[7]]; + sprite->data[1] += (-2 & task->data[7]); + sprite->data[2] += (-2 & task->data[8]); if (1 & task->data[7]) - sprite->pos2.x = ((u16)sprite->data1 >> 8) * -1; + sprite->pos2.x = ((u16)sprite->data[1] >> 8) * -1; else - sprite->pos2.x = (u16)sprite->data1 >> 8; + sprite->pos2.x = (u16)sprite->data[1] >> 8; if (1 & task->data[8]) - sprite->pos2.y = ((u16)sprite->data2 / 256u) * -1; + sprite->pos2.y = ((u16)sprite->data[2] / 256u) * -1; else - sprite->pos2.y = (u16)sprite->data2 / 256u; + sprite->pos2.y = (u16)sprite->data[2] / 256u; - if (sprite->data0-- <= 0) + if (sprite->data[0]-- <= 0) { - sprite->data0 = 8; + sprite->data[0] = 8; task->data[5] = 4; a = sub_81174E0(0x1000); sprite->pos1.x += sprite->pos2.x; @@ -3928,12 +3928,12 @@ void sub_80CF8B8(struct Sprite* sprite) else c = (sprite->pos1.y - task->data[12]) << 8; - sprite->data2 = 0; - sprite->data1 = 0; - sprite->data6 = 0; - sprite->data5 = 0; - sprite->data3 = sub_81174C4(sub_81174C4(b, a), sub_81174E0(0x1C0)); - sprite->data4 = sub_81174C4(sub_81174C4(c, a), sub_81174E0(0x1C0)); + sprite->data[2] = 0; + sprite->data[1] = 0; + sprite->data[6] = 0; + sprite->data[5] = 0; + sprite->data[3] = sub_81174C4(sub_81174C4(b, a), sub_81174E0(0x1C0)); + sprite->data[4] = sub_81174C4(sub_81174C4(c, a), sub_81174E0(0x1C0)); sprite->callback = sub_80CF814; } } @@ -3962,8 +3962,8 @@ void sub_80CFA20(u8 taskId) break; } - sprite->data0 = gTasks[taskId].data[5] - gTasks[taskId].data[6]; - sprite->data7 = taskId; + sprite->data[0] = gTasks[taskId].data[5] - gTasks[taskId].data[6]; + sprite->data[7] = taskId; gTasks[taskId].data[gTasks[taskId].data[1] + 13] = spriteId; gTasks[taskId].data[0] = gTasks[taskId].data[3]; gTasks[taskId].data[1]++; @@ -4075,7 +4075,7 @@ void sub_80CFB04(u8 taskId) void sub_80CFDFC(struct Sprite* sprite) { sub_80787B0(sprite, 0); - sprite->data0 = 0x100 + (IndexOfSpritePaletteTag(gSpriteTemplate_83D75AC.paletteTag) << 4); + sprite->data[0] = 0x100 + (IndexOfSpritePaletteTag(gSpriteTemplate_83D75AC.paletteTag) << 4); sprite->callback = sub_80CFE2C; } @@ -4086,12 +4086,12 @@ void sub_80CFE2C(struct Sprite* sprite) u16* r1; u16* r2; int i; - if (++sprite->data1 == 2) + if (++sprite->data[1] == 2) { - sprite->data1 = 0; - r7 = gPlttBufferFaded[sprite->data0 + 8]; + sprite->data[1] = 0; + r7 = gPlttBufferFaded[sprite->data[0] + 8]; r2 = &gPlttBufferFaded[0x10]; - r1 = &gPlttBufferFaded[sprite->data0 + 9]; + r1 = &gPlttBufferFaded[sprite->data[0] + 9]; for (i = 7; i >= 0; i--) { *r2 = *r1; @@ -4099,8 +4099,8 @@ void sub_80CFE2C(struct Sprite* sprite) r2++; } - gPlttBufferFaded[sprite->data0 + 15] = r7; - if (++sprite->data2 == 0x18) + gPlttBufferFaded[sprite->data[0] + 15] = r7; + if (++sprite->data[2] == 0x18) move_anim_8072740(sprite); } } @@ -4185,34 +4185,34 @@ void sub_80CFE9C(struct Sprite* sprite) var = sub_80790F0(r6 - sprite->pos1.x, r7 - sprite->pos1.y); var += 0xC000; sub_8078FDC(sprite, 0, 0x100, 0x100, var); - sprite->data0 = gBattleAnimArgs[4]; - sprite->data2 = r6; - sprite->data4 = r7; + sprite->data[0] = gBattleAnimArgs[4]; + sprite->data[2] = r6; + sprite->data[4] = r7; sprite->callback = sub_8078C00; - StoreSpriteCallbackInData6(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, move_anim_8072740); } void sub_80CFF50(struct Sprite* sprite) { - sprite->data2 = -16; + sprite->data[2] = -16; sprite->pos1.y += 8; sprite->callback = sub_80CFF68; } void sub_80CFF68(struct Sprite* sprite) { - sprite->data0 += 0x80; - sprite->pos2.x = sprite->data0 >> 8; + sprite->data[0] += 0x80; + sprite->pos2.x = sprite->data[0] >> 8; if (GetBankSide(gBattleAnimBankAttacker) == 0) sprite->pos2.x = -sprite->pos2.x; - sprite->pos2.y = Sin(sprite->data1, sprite->data2); - sprite->data1 += 5; - if (sprite->data1 > 0x7E) + sprite->pos2.y = Sin(sprite->data[1], sprite->data[2]); + sprite->data[1] += 5; + if (sprite->data[1] > 0x7E) { - sprite->data1 = 0; - sprite->data2 /= 2; - if (++sprite->data3 == 2) + sprite->data[1] = 0; + sprite->data[2] /= 2; + if (++sprite->data[3] == 2) move_anim_8072740(sprite); } } @@ -4220,12 +4220,12 @@ void sub_80CFF68(struct Sprite* sprite) void sub_80CFFD8(struct Sprite* sprite) { sub_80787B0(sprite, 1); - sprite->data0 = 20; - sprite->data2 = sub_8077ABC(gBattleAnimBankTarget, 2); - sprite->data4 = sub_8077ABC(gBattleAnimBankTarget, 3); + sprite->data[0] = 20; + sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2); + sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3); sprite->callback = sub_8078B34; sprite->affineAnimPaused = 1; - StoreSpriteCallbackInData6(sprite, sub_80D0030); + StoreSpriteCallbackInData(sprite, sub_80D0030); } void sub_80D0030(struct Sprite* sprite) @@ -4238,34 +4238,34 @@ void sub_80D0030(struct Sprite* sprite) sprite->pos1.y += sprite->pos2.y; sprite->pos2.y = 0; sprite->pos2.x = 0; - ptr = &sprite->data7; + ptr = &sprite->data[7]; for (i = 0; i < 8; i++) { ptr[i - 7] = 0; } rand = Random(); - sprite->data6 = 0xFFF4 - (rand & 7); + sprite->data[6] = 0xFFF4 - (rand & 7); rand = Random(); - sprite->data7 = (rand % 0xA0) + 0xA0; + sprite->data[7] = (rand % 0xA0) + 0xA0; sprite->callback = sub_80D00B4; sprite->affineAnimPaused = 0; } void sub_80D00B4(struct Sprite* sprite) { - sprite->data0 += sprite->data7; - sprite->pos2.x = sprite->data0 >> 8; - if (sprite->data7 & 1) + sprite->data[0] += sprite->data[7]; + sprite->pos2.x = sprite->data[0] >> 8; + if (sprite->data[7] & 1) sprite->pos2.x = -sprite->pos2.x; - sprite->pos2.y = Sin(sprite->data1, sprite->data6); - sprite->data1 += 8; - if (sprite->data1 > 0x7E) + sprite->pos2.y = Sin(sprite->data[1], sprite->data[6]); + sprite->data[1] += 8; + if (sprite->data[1] > 0x7E) { - sprite->data1 = 0; - sprite->data2 /= 2; - if (++sprite->data3 == 1) + sprite->data[1] = 0; + sprite->data[2] /= 2; + if (++sprite->data[3] == 1) move_anim_8072740(sprite); } } @@ -4276,13 +4276,13 @@ void sub_80D0118(struct Sprite* sprite) if (GetBankSide(gBattleAnimBankAttacker) == 0) sprite->pos1.y += 16; - sprite->data0 = gBattleAnimArgs[4]; - sprite->data1 = gBattleAnimArgs[2]; - sprite->data2 = gBattleAnimArgs[5]; - sprite->data3 = gBattleAnimArgs[6]; - sprite->data4 = gBattleAnimArgs[3]; + sprite->data[0] = gBattleAnimArgs[4]; + sprite->data[1] = gBattleAnimArgs[2]; + sprite->data[2] = gBattleAnimArgs[5]; + sprite->data[3] = gBattleAnimArgs[6]; + sprite->data[4] = gBattleAnimArgs[3]; sprite->callback = sub_8078114; - StoreSpriteCallbackInData6(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, move_anim_8072740); sprite->callback(sprite); } @@ -4303,11 +4303,11 @@ void sub_80D0178(struct Sprite* sprite) sprite->pos1.x += r7; sprite->pos1.y += r4; - sprite->data0 = 6; - sprite->data2 = sub_8077ABC(gBattleAnimBankTarget, 2) + r8; - sprite->data4 = sub_8077ABC(gBattleAnimBankTarget, 3) + r6; + sprite->data[0] = 6; + sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2) + r8; + sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3) + r6; sprite->callback = sub_8078B34; - StoreSpriteCallbackInData6(sprite, sub_80D020C); + StoreSpriteCallbackInData(sprite, sub_80D020C); } void sub_80D020C(struct Sprite* sprite) @@ -4333,14 +4333,14 @@ void sub_80D0228(struct Sprite* sprite) sprite->pos1.x += r8; sprite->pos1.y += r4; - sprite->data0 = 6; - sprite->data1 = sprite->pos1.x; - sprite->data2 = sub_8077ABC(gBattleAnimBankTarget, 2) + r9; - sprite->data3 = sprite->pos1.y; - sprite->data4 = sub_8077ABC(gBattleAnimBankTarget, 3) + r6; + sprite->data[0] = 6; + sprite->data[1] = sprite->pos1.x; + sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2) + r9; + sprite->data[3] = sprite->pos1.y; + sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3) + r6; obj_translate_based_on_private_1_2_3_4(sprite); - sprite->data5 = gBattleAnimArgs[0]; - sprite->data6 = sprite->data0; + sprite->data[5] = gBattleAnimArgs[0]; + sprite->data[6] = sprite->data[0]; sprite->callback = sub_80D02D0; } @@ -4354,32 +4354,32 @@ void sub_80D02D0(struct Sprite* sprite) sprite->pos1.y += sprite->pos2.y; sprite->pos2.x = 2; sprite->pos2.y = -2; - sprite->data0 = sprite->data6; - sprite->data1 ^= 1; - sprite->data2 ^= 1; - sprite->data4 = 0; - sprite->data3 = 0; + sprite->data[0] = sprite->data[6]; + sprite->data[1] ^= 1; + sprite->data[2] ^= 1; + sprite->data[4] = 0; + sprite->data[3] = 0; sprite->callback = sub_80D0344; } } void sub_80D0344(struct Sprite* sprite) { - if (sprite->data3) + if (sprite->data[3]) { sprite->pos2.x = -sprite->pos2.x; sprite->pos2.y = -sprite->pos2.y; } - sprite->data3 ^= 1; - if (++sprite->data4 == 0x33) + sprite->data[3] ^= 1; + if (++sprite->data[4] == 0x33) { sprite->pos2.y = 0; sprite->pos2.x = 0; - sprite->data4 = 0; - sprite->data3 = 0; + sprite->data[4] = 0; + sprite->data[3] = 0; sprite->animPaused = 0; - StartSpriteAnim(sprite, sprite->data5 ^ 1); + StartSpriteAnim(sprite, sprite->data[5] ^ 1); sprite->callback = sub_80D03A8; } } @@ -4513,9 +4513,9 @@ void sub_80D0614(struct Task* task, u8 taskId) gSprites[r8].subpriority = task->data[7] - task->data[3]; task->data[3]++; task->data[6]++; - gSprites[r8].data0 = 16; - gSprites[r8].data1 = taskId; - gSprites[r8].data2 = 6; + gSprites[r8].data[0] = 16; + gSprites[r8].data[1] = taskId; + gSprites[r8].data[2] = 6; gSprites[r8].callback = sub_80D0704; obj_id_set_rotscale(r8, task->data[4], task->data[4], 0); gSprites[r8].oam.affineMode = 1; @@ -4649,9 +4649,9 @@ _080D0700: .4byte sub_80D0704\n\ void sub_80D0704(struct Sprite* sprite) { - if (--sprite->data0 == 0) + if (--sprite->data[0] == 0) { - gTasks[sprite->data1].data[sprite->data2]--; + gTasks[sprite->data[1]].data[sprite->data[2]]--; FreeOamMatrix(sprite->oam.matrixNum); obj_delete_but_dont_free_vram(sprite); } @@ -4749,21 +4749,21 @@ void sub_80D0930(struct Sprite* sprite) { StartSpriteAnim(sprite, 0); sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2) + 32; - sprite->data1 = 0x40; + sprite->data[1] = 0x40; } else { StartSpriteAnim(sprite, 1); sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2) - 32; - sprite->data1 = -0x40; + sprite->data[1] = -0x40; } sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3); - sprite->data0 = 0x34; - sprite->data2 = 0; - sprite->data3 = 0; - sprite->data4 = 0; - StoreSpriteCallbackInData6(sprite, move_anim_8072740); + sprite->data[0] = 0x34; + sprite->data[2] = 0; + sprite->data[3] = 0; + sprite->data[4] = 0; + StoreSpriteCallbackInData(sprite, move_anim_8072740); sprite->callback = sub_8078394; } @@ -4785,7 +4785,7 @@ void sub_80D09C0(struct Sprite* sprite) if (sprite->pos1.y <= 7) sprite->pos1.y = 8; - StoreSpriteCallbackInData6(sprite, move_anim_8074EE0); + StoreSpriteCallbackInData(sprite, move_anim_8074EE0); sprite->callback = sub_80785E4; } @@ -5085,67 +5085,67 @@ void sub_80D0E30(struct Sprite* sprite) { sprite->pos1.x = sub_8077ABC(gBattleAnimBankTarget, 0) - 16; sprite->pos1.y = sub_8077FC0(gBattleAnimBankTarget) + 16; - sprite->data0 = 0; - sprite->data1 = 0; - sprite->data2 = 0; - sprite->data3 = 16; - sprite->data4 = 0; - sprite->data5 = sub_807A100(gBattleAnimBankTarget, 0) + 2; - sprite->data6 = sub_8076F98(0x3F); + sprite->data[0] = 0; + sprite->data[1] = 0; + sprite->data[2] = 0; + sprite->data[3] = 16; + sprite->data[4] = 0; + sprite->data[5] = sub_807A100(gBattleAnimBankTarget, 0) + 2; + sprite->data[6] = sub_8076F98(0x3F); sprite->callback = sub_80D0E8C; } void sub_80D0E8C(struct Sprite* sprite) { - switch (sprite->data0) + switch (sprite->data[0]) { case 0: - if (++sprite->data2 > 1) + if (++sprite->data[2] > 1) { - sprite->data2 = 0; + sprite->data[2] = 0; sprite->invisible = !sprite->invisible; } - if (++sprite->data1 > 16) + if (++sprite->data[1] > 16) { sprite->invisible = 0; - sprite->data0++; + sprite->data[0]++; } break; case 1: - if (++sprite->data1 > 3 && sprite->data2 < sprite->data5) + if (++sprite->data[1] > 3 && sprite->data[2] < sprite->data[5]) { - sprite->data1 = 0; + sprite->data[1] = 0; sprite->pos1.y -= 1; - sprite->data2++; - if (sprite->data2 % 10 == 0) - PlaySE12WithPanning(0xCD, sprite->data6); + sprite->data[2]++; + if (sprite->data[2] % 10 == 0) + PlaySE12WithPanning(0xCD, sprite->data[6]); } - sprite->data4 += sprite->data3; - if (sprite->data4 > 31) + sprite->data[4] += sprite->data[3]; + if (sprite->data[4] > 31) { - sprite->data4 = 0x40 - sprite->data4; - sprite->data3 *= -1; + sprite->data[4] = 0x40 - sprite->data[4]; + sprite->data[3] *= -1; } - else if (sprite->data4 <= -32) + else if (sprite->data[4] <= -32) { - sprite->data4 = -0x40 - sprite->data4; - sprite->data3 *= -1; + sprite->data[4] = -0x40 - sprite->data[4]; + sprite->data[3] *= -1; } - sprite->pos2.x = sprite->data4; - if (sprite->data5 == sprite->data2) + sprite->pos2.x = sprite->data[4]; + if (sprite->data[5] == sprite->data[2]) { - sprite->data1 = 0; - sprite->data2 = 0; - sprite->data0++; + sprite->data[1] = 0; + sprite->data[2] = 0; + sprite->data[0]++; } break; case 2: - if (++sprite->data2 > 1) + if (++sprite->data[2] > 1) { - sprite->data2 = 0; + sprite->data[2] = 0; sprite->invisible = !sprite->invisible; } - if (++sprite->data1 > 16) + if (++sprite->data[1] > 16) { sprite->invisible = 0; move_anim_8072740(sprite); @@ -5269,11 +5269,11 @@ void sub_80D10B8(struct Sprite* sprite) sp0 -= gBattleAnimArgs[3]; sp1 += gBattleAnimArgs[4]; - sprite->pos1.x = sprite->data1 = r9; - sprite->pos1.y = sprite->data3 = r6; - sprite->data2 = sp0; - sprite->data4 = sp1; - sprite->data0 = gBattleAnimArgs[0]; + sprite->pos1.x = sprite->data[1] = r9; + sprite->pos1.y = sprite->data[3] = r6; + sprite->data[2] = sp0; + sprite->data[4] = sp1; + sprite->data[0] = gBattleAnimArgs[0]; obj_translate_based_on_private_1_2_3_4(sprite); sprite->callback = sub_80D1098; sub_80D1098(sprite); @@ -5297,27 +5297,27 @@ void sub_80D1368(struct Sprite* sprite) s16 r1; sub_80787B0(sprite, 0); r1 = (GetBankSide(gBattleAnimBankAttacker)) ? -0xA0 : 0xA0; - sprite->data0 = 0x380; - sprite->data1 = r1; - sprite->data7 = gBattleAnimArgs[2]; + sprite->data[0] = 0x380; + sprite->data[1] = r1; + sprite->data[7] = gBattleAnimArgs[2]; sprite->callback = sub_80D13AC; } void sub_80D13AC(struct Sprite* sprite) { s16 add; - sprite->pos2.y -= (sprite->data0 >> 8); - sprite->pos2.x = sprite->data1 >> 8; - sprite->data0 -= 32; + sprite->pos2.y -= (sprite->data[0] >> 8); + sprite->pos2.x = sprite->data[1] >> 8; + sprite->data[0] -= 32; add = (GetBankSide(gBattleAnimBankAttacker)) ? -0xA0 : 0xA0; - sprite->data1 += add; + sprite->data[1] += add; if (sprite->pos2.y > 0) { sprite->pos1.y += sprite->pos2.y; sprite->pos1.x += sprite->pos2.x; sprite->pos2.y = 0; sprite->pos2.x = 0; - sprite->data0 = 0; + sprite->data[0] = 0; StartSpriteAffineAnim(sprite, 1); sprite->callback = sub_80D1424; } @@ -5325,7 +5325,7 @@ void sub_80D13AC(struct Sprite* sprite) void sub_80D1424(struct Sprite* sprite) { - if (sprite->data0++ > 19) + if (sprite->data[0]++ > 19) { StartSpriteAffineAnim(sprite, 2); sprite->callback = sub_80D144C; @@ -5337,8 +5337,8 @@ void sub_80D144C(struct Sprite* sprite) if (sprite->affineAnimEnded) { StartSpriteAffineAnim(sprite, 1); - sprite->data0 = 0; - if (sprite->data7 == 0) + sprite->data[0] = 0; + if (sprite->data[7] == 0) { sprite->oam.tileNum += 16; sprite->callback = sub_80D14C4; @@ -5354,23 +5354,23 @@ void sub_80D144C(struct Sprite* sprite) void sub_80D14C4(struct Sprite* sprite) { sprite->pos2.y -= 2; - if (++sprite->data0 == 9) + if (++sprite->data[0] == 9) { - sprite->data0 = 16; - sprite->data1 = 0; + sprite->data[0] = 16; + sprite->data[1] = 0; REG_BLDCNT = 0x3F40; - REG_BLDALPHA = sprite->data0; + REG_BLDALPHA = sprite->data[0]; sprite->callback = sub_80D1504; } } void sub_80D1504(struct Sprite* sprite) { - if (sprite->data1++ % 3 == 0) + if (sprite->data[1]++ % 3 == 0) { - sprite->data0--; - REG_BLDALPHA = sprite->data0 | ((16 - sprite->data0) << 8); - if (sprite->data0 == 0) + sprite->data[0]--; + REG_BLDALPHA = sprite->data[0] | ((16 - sprite->data[0]) << 8); + if (sprite->data[0] == 0) sprite->callback = sub_80D154C; } } @@ -5380,7 +5380,7 @@ void sub_80D154C(struct Sprite* sprite) if ((u16)gBattleAnimArgs[7] == 0xFFFF) { sprite->invisible = 1; - if (sprite->data7 == 0) + if (sprite->data[7] == 0) sprite->callback = sub_80D158C; else sprite->callback = move_anim_8072740; @@ -5588,8 +5588,8 @@ void sub_80D1930(u8 taskId) spriteId = CreateSprite(&gSpriteTemplate_83D79E8, task->data[14], task->data[15], 0); if (spriteId != MAX_SPRITES) { - gSprites[spriteId].data0 = taskId; - gSprites[spriteId].data1 = 13; + gSprites[spriteId].data[0] = taskId; + gSprites[spriteId].data[1] = 13; gSprites[spriteId].pos2.x = gUnknown_083D7A00[task->data[2]][0]; gSprites[spriteId].pos2.y = gUnknown_083D7A00[task->data[2]][1]; task->data[13]++; @@ -5611,10 +5611,10 @@ void sub_80D1930(u8 taskId) void sub_80D1A70(struct Sprite* sprite) { - sprite->invisible = gTasks[sprite->data0].data[5]; + sprite->invisible = gTasks[sprite->data[0]].data[5]; if (sprite->animEnded) { - gTasks[sprite->data0].data[sprite->data1]--; + gTasks[sprite->data[0]].data[sprite->data[1]]--; DestroySprite(sprite); } } @@ -5670,24 +5670,24 @@ void sub_80D1C08(struct Sprite* sprite) if (GetBankSide(gBattleAnimBankAttacker) != 0) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; - sprite->data0 = gBattleAnimArgs[4]; - sprite->data2 = sub_8077ABC(gBattleAnimBankAttacker, 0) + gBattleAnimArgs[2]; - sprite->data4 = sub_8077ABC(gBattleAnimBankAttacker, 1) + gBattleAnimArgs[3]; + sprite->data[0] = gBattleAnimArgs[4]; + sprite->data[2] = sub_8077ABC(gBattleAnimBankAttacker, 0) + gBattleAnimArgs[2]; + sprite->data[4] = sub_8077ABC(gBattleAnimBankAttacker, 1) + gBattleAnimArgs[3]; sprite->callback = sub_8078B34; - StoreSpriteCallbackInData6(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, move_anim_8072740); sub_80D1BA8(sprite, gBattleAnimArgs[5], gBattleAnimArgs[6]); } void sub_80D1C80(struct Sprite* sprite) { - if (++sprite->data0 == 1) + if (++sprite->data[0] == 1) sub_80787B0(sprite, 0); - sprite->pos2.x = Sin(sprite->data1, 8); - sprite->pos2.y = sprite->data2 >> 8; - sprite->data1 = (sprite->data1 + 7) & 0xFF; - sprite->data2 -= 0x80; - if (sprite->data0 == 0x3C) + sprite->pos2.x = Sin(sprite->data[1], 8); + sprite->pos2.y = sprite->data[2] >> 8; + sprite->data[1] = (sprite->data[1] + 7) & 0xFF; + sprite->data[2] -= 0x80; + if (sprite->data[0] == 0x3C) move_anim_8072740(sprite); } @@ -5797,11 +5797,11 @@ void sub_80D1EC8(u8 taskId) void sub_80D1F58(struct Sprite* sprite) { sub_80787B0(sprite, 1); - sprite->data0 = 0x5F; - sprite->data1 = sprite->pos1.x; - sprite->data2 = sub_8077ABC(gBattleAnimBankTarget, 2); - sprite->data3 = sprite->pos1.y; - sprite->data4 = sub_8077ABC(gBattleAnimBankTarget, 3); + sprite->data[0] = 0x5F; + sprite->data[1] = sprite->pos1.x; + sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2); + sprite->data[3] = sprite->pos1.y; + sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3); obj_translate_based_on_private_1_2_3_4(sprite); sprite->callback = sub_80D1FA4; } @@ -5810,8 +5810,8 @@ void sub_80D1FA4(struct Sprite* sprite) { if (sub_8078B5C(sprite) == 0) { - sprite->pos2.y += Sin(sprite->data5, 14); - sprite->data5 = (sprite->data5 + 4) & 0xFF; + sprite->pos2.y += Sin(sprite->data[5], 14); + sprite->data[5] = (sprite->data[5] + 4) & 0xFF; } else { @@ -5821,24 +5821,24 @@ void sub_80D1FA4(struct Sprite* sprite) void sub_80D1FDC(struct Sprite* sprite) { - if (sprite->data0 == 0) + if (sprite->data[0] == 0) { - sprite->data1 = gBattleAnimArgs[0]; - sprite->data2 = gBattleAnimArgs[1]; - sprite->data0++; + sprite->data[1] = gBattleAnimArgs[0]; + sprite->data[2] = gBattleAnimArgs[1]; + sprite->data[0]++; } else { - sprite->data4 += sprite->data1; - sprite->pos2.x = sprite->data4 >> 8; - sprite->pos2.y = Sin(sprite->data3, sprite->data2); - sprite->data3 = (sprite->data3 + 3) & 0xFF; - if (sprite->data3 > 0x64) + sprite->data[4] += sprite->data[1]; + sprite->pos2.x = sprite->data[4] >> 8; + sprite->pos2.y = Sin(sprite->data[3], sprite->data[2]); + sprite->data[3] = (sprite->data[3] + 3) & 0xFF; + if (sprite->data[3] > 0x64) { - sprite->invisible = sprite->data3 % 2; + sprite->invisible = sprite->data[3] % 2; } - if (sprite->data3 > 0x78) + if (sprite->data[3] > 0x78) { move_anim_8072740(sprite); } @@ -5849,23 +5849,23 @@ void sub_80D2064(struct Sprite* sprite) { sprite->pos1.x = gBattleAnimArgs[0]; sprite->pos1.y = 0xA0; - sprite->data0 = gBattleAnimArgs[2]; - sprite->data1 = gBattleAnimArgs[1]; + sprite->data[0] = gBattleAnimArgs[2]; + sprite->data[1] = gBattleAnimArgs[1]; sprite->callback = sub_80782D8; - StoreSpriteCallbackInData6(sprite, sub_80D2094); + StoreSpriteCallbackInData(sprite, sub_80D2094); } void sub_80D2094(struct Sprite* sprite) { s16 y; - sprite->data2 += sprite->data1; - sprite->pos2.y = -((u16)sprite->data2 >> 8); - sprite->pos2.x = Sin(sprite->data3, 4); - sprite->data3 = (sprite->data3 + 3) & 0xFF; + sprite->data[2] += sprite->data[1]; + sprite->pos2.y = -((u16)sprite->data[2] >> 8); + sprite->pos2.x = Sin(sprite->data[3], 4); + sprite->data[3] = (sprite->data[3] + 3) & 0xFF; y = sprite->pos1.y + sprite->pos2.y; if (y <= 0x48) { - sprite->invisible = sprite->data3 % 2; + sprite->invisible = sprite->data[3] % 2; if (y <= 0x40) move_anim_8072740(sprite); } @@ -6078,41 +6078,41 @@ void sub_80D26A4(struct Sprite* sprite) sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2); sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3); sprite->affineAnimPaused = 1; - sprite->data0 = gBattleAnimArgs[0]; - sprite->data1 = gBattleAnimArgs[1]; - sprite->data7 = sub_8079E90(gBattleAnimBankAttacker); + sprite->data[0] = gBattleAnimArgs[0]; + sprite->data[1] = gBattleAnimArgs[1]; + sprite->data[7] = sub_8079E90(gBattleAnimBankAttacker); sprite->callback = sub_80D2704; sub_80D2704(sprite); } void sub_80D2704(struct Sprite* sprite) { - if ((u16)(sprite->data1 - 0x40) <= 0x7F) - sprite->subpriority = sprite->data7 + 1; + if ((u16)(sprite->data[1] - 0x40) <= 0x7F) + sprite->subpriority = sprite->data[7] + 1; else - sprite->subpriority = sprite->data7 - 1; + sprite->subpriority = sprite->data[7] - 1; - sprite->pos2.x = Sin(sprite->data1, sprite->data2 >> 8); - sprite->pos2.y = Cos(sprite->data1, sprite->data3 >> 8); - sprite->data1 = (sprite->data1 + 9) & 0xFF; - switch (sprite->data5) + sprite->pos2.x = Sin(sprite->data[1], sprite->data[2] >> 8); + sprite->pos2.y = Cos(sprite->data[1], sprite->data[3] >> 8); + sprite->data[1] = (sprite->data[1] + 9) & 0xFF; + switch (sprite->data[5]) { case 1: - sprite->data2 -= 0x400; - sprite->data3 -= 0x100; - if (++sprite->data4 == sprite->data0) + sprite->data[2] -= 0x400; + sprite->data[3] -= 0x100; + if (++sprite->data[4] == sprite->data[0]) { - sprite->data5 = 2; + sprite->data[5] = 2; return; } break; case 0: - sprite->data2 += 0x400; - sprite->data3 += 0x100; - if (++sprite->data4 == sprite->data0) + sprite->data[2] += 0x400; + sprite->data[3] += 0x100; + if (++sprite->data[4] == sprite->data[0]) { - sprite->data4 = 0; - sprite->data5 = 1; + sprite->data[4] = 0; + sprite->data[5] = 1; } break; } @@ -6125,24 +6125,24 @@ void sub_80D27E0(struct Sprite* sprite) { sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2); sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3); - sprite->data0 = Sin(gBattleAnimArgs[0], 10); - sprite->data1 = Cos(gBattleAnimArgs[0], 7); + sprite->data[0] = Sin(gBattleAnimArgs[0], 10); + sprite->data[1] = Cos(gBattleAnimArgs[0], 7); sprite->callback = sub_80D2834; } void sub_80D2834(struct Sprite* sprite) { - sprite->pos2.x += sprite->data0; - sprite->pos2.y += sprite->data1; + sprite->pos2.x += sprite->data[0]; + sprite->pos2.y += sprite->data[1]; if (sprite->pos1.x + sprite->pos2.x + 16 > 0x110u || sprite->pos1.y + sprite->pos2.y > 0xA0 || sprite->pos1.y + sprite->pos2.y < -16) move_anim_8072740(sprite); } void sub_80D287C(struct Sprite* sprite) { - sprite->pos2.x += sprite->data0; - sprite->pos2.y += sprite->data1; - if (sprite->data3++ >= sprite->data2) + sprite->pos2.x += sprite->data[0]; + sprite->pos2.y += sprite->data[1]; + if (sprite->data[3]++ >= sprite->data[2]) move_anim_8072740(sprite); } @@ -6150,9 +6150,9 @@ void sub_80D28AC(struct Sprite* sprite) { sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2); sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3); - sprite->data0 = Sin(gBattleAnimArgs[0], 10); - sprite->data1 = Cos(gBattleAnimArgs[0], 7); - sprite->data2 = gBattleAnimArgs[1]; + sprite->data[0] = Sin(gBattleAnimArgs[0], 10); + sprite->data[1] = Cos(gBattleAnimArgs[0], 7); + sprite->data[2] = gBattleAnimArgs[1]; sprite->callback = sub_80D287C; } @@ -6171,63 +6171,63 @@ void sub_80D2920(struct Sprite* sprite) void sub_80D2938(struct Sprite* sprite) { s16 r5; - if (sprite->data0 == 0) + if (sprite->data[0] == 0) { sprite->pos1.x += gBattleAnimArgs[0]; sprite->pos1.y += gBattleAnimArgs[1]; } - sprite->data0++; - r5 = (sprite->data0 * 10) & 0xFF; + sprite->data[0]++; + r5 = (sprite->data[0] * 10) & 0xFF; sprite->pos2.x = Sin(r5, 0x50) >> 8; - if (sprite->data0 <= 0x4F) - sprite->pos2.y = (sprite->data0 / 2) + (Cos(r5, 0x50) >> 8); + if (sprite->data[0] <= 0x4F) + sprite->pos2.y = (sprite->data[0] / 2) + (Cos(r5, 0x50) >> 8); - if (sprite->data0 > 0x5A) + if (sprite->data[0] > 0x5A) { - sprite->data2++; - sprite->pos2.x -= sprite->data2 / 2; + sprite->data[2]++; + sprite->pos2.x -= sprite->data[2] / 2; } - if (sprite->data0 > 0x64) + if (sprite->data[0] > 0x64) move_anim_8072740(sprite); } void sub_80D29CC(struct Sprite* sprite) { - sprite->data5++; - sprite->pos2.x = Sin(sprite->data3, 5); - sprite->pos2.y = sprite->data5 / 2; - sprite->data3 = (sprite->data3 + 3) & 0xFF; - if (sprite->data5 > 20) - sprite->invisible = sprite->data5 % 2; + sprite->data[5]++; + sprite->pos2.x = Sin(sprite->data[3], 5); + sprite->pos2.y = sprite->data[5] / 2; + sprite->data[3] = (sprite->data[3] + 3) & 0xFF; + if (sprite->data[5] > 20) + sprite->invisible = sprite->data[5] % 2; - if (sprite->data5 > 30) + if (sprite->data[5] > 30) move_anim_8072740(sprite); } void sub_80D2A38(struct Sprite* sprite) { - if (sprite->data0 == 0) + if (sprite->data[0] == 0) { - sprite->data1 = gBattleAnimArgs[0]; - sprite->data2 = gBattleAnimArgs[1]; - sprite->data0++; + sprite->data[1] = gBattleAnimArgs[0]; + sprite->data[2] = gBattleAnimArgs[1]; + sprite->data[0]++; } else { - sprite->data4 += sprite->data1; - sprite->pos2.x = sprite->data4 >> 8; - sprite->pos2.y = Sin(sprite->data3, sprite->data2); - sprite->data3 = (sprite->data3 + 3) & 0xFF; - if (sprite->data3 > 0x46) + sprite->data[4] += sprite->data[1]; + sprite->pos2.x = sprite->data[4] >> 8; + sprite->pos2.y = Sin(sprite->data[3], sprite->data[2]); + sprite->data[3] = (sprite->data[3] + 3) & 0xFF; + if (sprite->data[3] > 0x46) { sprite->callback = sub_80D29CC; sprite->pos1.x += sprite->pos2.x; sprite->pos1.y += sprite->pos2.y; sprite->pos2.x = 0; sprite->pos2.y = 0; - sprite->data3 = Random() % 0xB4; + sprite->data[3] = Random() % 0xB4; } } } @@ -6237,31 +6237,31 @@ void sub_80D2A38(struct Sprite* sprite) int var; s16 var2; int var3; - if (sprite->data3 == 0) + if (sprite->data[3] == 0) { sprite->pos1.x += gBattleAnimArgs[0]; sprite->pos1.y += gBattleAnimArgs[1]; StartSpriteAnim(sprite, 0); sprite->subpriority = sub_8079E90(gBattleAnimBankTarget) - 1; - sprite->data2 = 1; + sprite->data[2] = 1; } - sprite->data0 += sprite->data2; - var = sprite->data0 * 4; + sprite->data[0] += sprite->data[2]; + var = sprite->data[0] * 4; if (var < 0) var += 0xFF; - sprite->data1 = (sprite->data0 * 4) -(((var) >> 8) << 8); - if (sprite->data1 < 0) - sprite->data1 = 0; + sprite->data[1] = (sprite->data[0] * 4) -(((var) >> 8) << 8); + if (sprite->data[1] < 0) + sprite->data[1] = 0; - var3 = sprite->data1; - var2 = sprite->data0; + var3 = sprite->data[1]; + var2 = sprite->data[0]; var2 /= 4; sprite->pos2.x = Cos(var3, 30 - var2); - var3 = sprite->data1; - var2 = sprite->data0 / 8; + var3 = sprite->data[1]; + var2 = sprite->data[0] / 8; sprite->pos2.x = Sin(var3, 10 - var2); - if (sprite->data1 > 0x80 && sprite->data2 > 0) - sprite->data2 = 0xFFFF; + if (sprite->data[1] > 0x80 && sprite->data[2] > 0) + sprite->data[2] = 0xFFFF; } */
\ No newline at end of file diff --git a/src/debug/matsuda_debug_menu.c b/src/debug/matsuda_debug_menu.c index dcb6fa2d8..0f77d2814 100644 --- a/src/debug/matsuda_debug_menu.c +++ b/src/debug/matsuda_debug_menu.c @@ -564,10 +564,10 @@ static void sub_80AA10C(void) sub_80AA658(3); sub_80AA614(3, zero); spriteId = CreateSprite(&gSpriteTemplate_83C92CC, gUnknown_083C9296[3], gUnknown_083C92A8[1], 5); - gSprites[spriteId].data0 = 1; - gSprites[spriteId].data1 = 1; - gSprites[spriteId].data2 = 3; - gSprites[spriteId].data3 = zero; // only this assignment of zero is necessary. other replacements of 0 with zero do not change the asm, compiler will treat it the same. + gSprites[spriteId].data[0] = 1; + gSprites[spriteId].data[1] = 1; + gSprites[spriteId].data[2] = 3; + gSprites[spriteId].data[3] = zero; // only this assignment of zero is necessary. other replacements of 0 with zero do not change the asm, compiler will treat it the same. } void sub_80AA280(u8 var) // no? @@ -689,51 +689,51 @@ void sub_80AA754(struct Sprite *sprite) { case DPAD_RIGHT: case DPAD_LEFT: - sprite->data0 ^= 1; + sprite->data[0] ^= 1; break; case DPAD_UP: - if (sprite->data1 == 0) - sprite->data1 = 8; + if (sprite->data[1] == 0) + sprite->data[1] = 8; else - sprite->data1--; + sprite->data[1]--; break; case DPAD_DOWN: - if (sprite->data1 == 8) - sprite->data1 = 0; + if (sprite->data[1] == 8) + sprite->data[1] = 0; else - sprite->data1++; + sprite->data[1]++; break; case A_BUTTON: - gUnknown_083C92E4[sprite->data1][sprite->data0](sprite, 1); - sub_80AA614(sprite->data2, sprite->data3); + gUnknown_083C92E4[sprite->data[1]][sprite->data[0]](sprite, 1); + sub_80AA614(sprite->data[2], sprite->data[3]); break; case B_BUTTON: - gUnknown_083C92E4[sprite->data1][sprite->data0](sprite, -1); - sub_80AA614(sprite->data2, sprite->data3); + gUnknown_083C92E4[sprite->data[1]][sprite->data[0]](sprite, -1); + sub_80AA614(sprite->data[2], sprite->data[3]); break; case R_BUTTON: - gUnknown_083C92E4[sprite->data1][sprite->data0](sprite, 10); - sub_80AA614(sprite->data2, sprite->data3); + gUnknown_083C92E4[sprite->data[1]][sprite->data[0]](sprite, 10); + sub_80AA614(sprite->data[2], sprite->data[3]); break; case L_BUTTON: - gUnknown_083C92E4[sprite->data1][sprite->data0](sprite, -10); - sub_80AA614(sprite->data2, sprite->data3); + gUnknown_083C92E4[sprite->data[1]][sprite->data[0]](sprite, -10); + sub_80AA614(sprite->data[2], sprite->data[3]); break; case START_BUTTON: sub_80AAD08(sprite, 1); break; } - sprite->pos1.x = gUnknown_083C9296[sprite->data0 + sprite->data1 * 2]; - sprite->pos1.y = gUnknown_083C92A8[sprite->data1]; + sprite->pos1.x = gUnknown_083C9296[sprite->data[0] + sprite->data[1] * 2]; + sprite->pos1.y = gUnknown_083C92A8[sprite->data[1]]; } static void sub_80AA8A0(struct Sprite *sprite, s8 var1, u8 var2) { if (var1 == 1) { - sprite->data2 = var2; + sprite->data[2] = var2; sub_80AA280(var2); - sub_80AA658(sprite->data2); + sub_80AA658(sprite->data[2]); } } @@ -771,50 +771,50 @@ static u8 sub_80AA908(u32 a1, u8 a2, s8 a3) // first param is unused. void sub_80AA930(struct Sprite *sprite, s8 var2) { - u8 val = sprite->data2; + u8 val = sprite->data[2]; - gContestMons[sprite->data2].cool = sub_80AA908(val, gContestMons[sprite->data2].cool, var2); - sub_80AA340(sprite->data2); + gContestMons[sprite->data[2]].cool = sub_80AA908(val, gContestMons[sprite->data[2]].cool, var2); + sub_80AA340(sprite->data[2]); } void sub_80AA974(struct Sprite *sprite, s8 var2) { - u8 val = sprite->data2; + u8 val = sprite->data[2]; - gContestMons[sprite->data2].cute = sub_80AA908(val, gContestMons[sprite->data2].cute, var2); - sub_80AA388(sprite->data2); + gContestMons[sprite->data[2]].cute = sub_80AA908(val, gContestMons[sprite->data[2]].cute, var2); + sub_80AA388(sprite->data[2]); } void sub_80AA9B8(struct Sprite *sprite, s8 var2) { - u8 val = sprite->data2; + u8 val = sprite->data[2]; - gContestMons[sprite->data2].beauty = sub_80AA908(val, gContestMons[sprite->data2].beauty, var2); - sub_80AA3D0(sprite->data2); + gContestMons[sprite->data[2]].beauty = sub_80AA908(val, gContestMons[sprite->data[2]].beauty, var2); + sub_80AA3D0(sprite->data[2]); } void sub_80AA9FC(struct Sprite *sprite, s8 var2) { - u8 val = sprite->data2; + u8 val = sprite->data[2]; - gContestMons[sprite->data2].smart = sub_80AA908(val, gContestMons[sprite->data2].smart, var2); - sub_80AA418(sprite->data2); + gContestMons[sprite->data[2]].smart = sub_80AA908(val, gContestMons[sprite->data[2]].smart, var2); + sub_80AA418(sprite->data[2]); } void sub_80AAA40(struct Sprite *sprite, s8 var2) { - u8 val = sprite->data2; + u8 val = sprite->data[2]; - gContestMons[sprite->data2].tough = sub_80AA908(val, gContestMons[sprite->data2].tough, var2); - sub_80AA460(sprite->data2); + gContestMons[sprite->data[2]].tough = sub_80AA908(val, gContestMons[sprite->data[2]].tough, var2); + sub_80AA460(sprite->data[2]); } void sub_80AAA84(struct Sprite *sprite, s8 var2) { - u8 val = sprite->data2; + u8 val = sprite->data[2]; - gContestMons[sprite->data2].sheen = sub_80AA908(val, gContestMons[sprite->data2].sheen, var2); - sub_80AA4A8(sprite->data2); + gContestMons[sprite->data[2]].sheen = sub_80AA908(val, gContestMons[sprite->data[2]].sheen, var2); + sub_80AA4A8(sprite->data[2]); } // a similar function is at 0x80AA908, however, it apparently returns the wrong type (u8 vs u16). @@ -832,51 +832,51 @@ static u16 sub_80AAAC8(u32 a1, u16 a2, s8 a3) // first param is unused. void sub_80AAAF0(struct Sprite *sprite, s8 var2) { - u8 val = sprite->data2; + u8 val = sprite->data[2]; - gContestMons[sprite->data2].moves[0] = sub_80AAAC8(val, gContestMons[sprite->data2].moves[0], var2); - sub_80AA4F0(sprite->data2, 0); + gContestMons[sprite->data[2]].moves[0] = sub_80AAAC8(val, gContestMons[sprite->data[2]].moves[0], var2); + sub_80AA4F0(sprite->data[2], 0); } void sub_80AAB30(struct Sprite *sprite, s8 var2) { - u8 val = sprite->data2; + u8 val = sprite->data[2]; - gContestMons[sprite->data2].moves[1] = sub_80AAAC8(val, gContestMons[sprite->data2].moves[1], var2); - sub_80AA4F0(sprite->data2, 1); + gContestMons[sprite->data[2]].moves[1] = sub_80AAAC8(val, gContestMons[sprite->data[2]].moves[1], var2); + sub_80AA4F0(sprite->data[2], 1); } void sub_80AAB70(struct Sprite *sprite, s8 var2) { - u8 val = sprite->data2; + u8 val = sprite->data[2]; - gContestMons[sprite->data2].moves[2] = sub_80AAAC8(val, gContestMons[sprite->data2].moves[2], var2); - sub_80AA4F0(sprite->data2, 2); + gContestMons[sprite->data[2]].moves[2] = sub_80AAAC8(val, gContestMons[sprite->data[2]].moves[2], var2); + sub_80AA4F0(sprite->data[2], 2); } void sub_80AABB0(struct Sprite *sprite, s8 var2) { - u8 val = sprite->data2; + u8 val = sprite->data[2]; - gContestMons[sprite->data2].moves[3] = sub_80AAAC8(val, gContestMons[sprite->data2].moves[3], var2); - sub_80AA4F0(sprite->data2, 3); + gContestMons[sprite->data[2]].moves[3] = sub_80AAAC8(val, gContestMons[sprite->data[2]].moves[3], var2); + sub_80AA4F0(sprite->data[2], 3); } void sub_80AABF0(struct Sprite *sprite, s8 var2) { s8 a = (var2 > 0) ? 1 : -1; - s8 r4 = sprite->data3 + a; + s8 r4 = sprite->data[3] + a; if (r4 < 0) r4 = 0; else if (r4 > 4) r4 = 4; sub_80AA5BC(r4); - sprite->data3 = r4; - gScriptContestCategory = sprite->data3; - sub_80AE398(sprite->data3, gScriptContestRank); - sub_80AA280(sprite->data2); - sub_80AA658(sprite->data2); + sprite->data[3] = r4; + gScriptContestCategory = sprite->data[3]; + sub_80AE398(sprite->data[3], gScriptContestRank); + sub_80AA280(sprite->data[2]); + sub_80AA658(sprite->data[2]); } void sub_80AAC5C(struct Sprite *sprite, s8 var2) @@ -889,8 +889,8 @@ void sub_80AAC5C(struct Sprite *sprite, s8 var2) gScriptContestRank = 3; sub_80AA5E8(gScriptContestRank); sub_80AE398(gScriptContestCategory, gScriptContestRank); - sub_80AA280(sprite->data2); - sub_80AA658(sprite->data2); + sub_80AA280(sprite->data[2]); + sub_80AA658(sprite->data[2]); } void sub_80AACC4(void) @@ -909,7 +909,7 @@ void sub_80AAD08(struct Sprite *sprite, s8 var2) { if (var2 == 1) { - eMatsudaDebugVar = sprite->data3; + eMatsudaDebugVar = sprite->data[3]; SetMainCallback2(sub_80AACC4); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); } diff --git a/src/engine/main_menu.c b/src/engine/main_menu.c index 031dc49d1..a8375c6dd 100644 --- a/src/engine/main_menu.c +++ b/src/engine/main_menu.c @@ -844,7 +844,7 @@ static void Task_NewGameSpeech6(u8 taskId) gSprites[spriteId].pos1.x = 104; gSprites[spriteId].pos1.y = 72; gSprites[spriteId].invisible = 0; - gSprites[spriteId].data0 = 0; + gSprites[spriteId].data[0] = 0; CreatePokeballSprite(spriteId, gSprites[spriteId].oam.paletteNum, 0x70, 0x3A, 0, 0, 0x20, 0x0000FFFF); gTasks[taskId].func = Task_NewGameSpeech7; gTasks[taskId].tFrameCounter = 0; @@ -1423,9 +1423,9 @@ void nullsub_34(struct Sprite *sprite) void ShrinkPlayerSprite(struct Sprite *sprite) { - u32 y = (sprite->pos1.y << 16) + sprite->data0 + 0xC000; + u32 y = (sprite->pos1.y << 16) + sprite->data[0] + 0xC000; sprite->pos1.y = y >> 16; - sprite->data0 = y; + sprite->data[0] = y; } u8 CreateAzurillSprite(u8 x, u8 y) diff --git a/src/engine/naming_screen.c b/src/engine/naming_screen.c index 92a61eb8f..667a42ac8 100644 --- a/src/engine/naming_screen.c +++ b/src/engine/naming_screen.c @@ -1012,8 +1012,8 @@ static void CursorInit(void) namingScreenData.cursorSpriteId = CreateSprite(&gSpriteTemplate_83CE640, 0, 0, 0); gSprites[namingScreenData.cursorSpriteId].oam.priority = 1; gSprites[namingScreenData.cursorSpriteId].oam.objMode = 1; - gSprites[namingScreenData.cursorSpriteId].data6 = 1; - gSprites[namingScreenData.cursorSpriteId].data6 = 2; + gSprites[namingScreenData.cursorSpriteId].data[6] = 1; + gSprites[namingScreenData.cursorSpriteId].data[6] = 2; SetCursorPos(0, 0); } @@ -1040,18 +1040,18 @@ static void SetCursorPos(s16 x, s16 y) cursorSprite->pos1.x = CursorColToKeyboardCol(x) * 8 + 27; cursorSprite->pos1.y = y * 16 + 80; - cursorSprite->data2 = cursorSprite->data0; - cursorSprite->data3 = cursorSprite->data1; - cursorSprite->data0 = x; - cursorSprite->data1 = y; + cursorSprite->data[2] = cursorSprite->data[0]; + cursorSprite->data[3] = cursorSprite->data[1]; + cursorSprite->data[0] = x; + cursorSprite->data[1] = y; } static void GetCursorPos(s16 *x, s16 *y) { struct Sprite *cursorSprite = &gSprites[namingScreenData.cursorSpriteId]; - *x = cursorSprite->data0; - *y = cursorSprite->data1; + *x = cursorSprite->data[0]; + *y = cursorSprite->data[1]; } static void MoveCursorToOKButton(void) @@ -1061,15 +1061,15 @@ static void MoveCursorToOKButton(void) static void sub_80B6888(u8 a) { - gSprites[namingScreenData.cursorSpriteId].data4 &= -256; - gSprites[namingScreenData.cursorSpriteId].data4 |= a; + gSprites[namingScreenData.cursorSpriteId].data[4] &= -256; + gSprites[namingScreenData.cursorSpriteId].data[4] |= a; StartSpriteAnim(&gSprites[namingScreenData.cursorSpriteId], 0); } static void sub_80B68D8(u8 a) { - gSprites[namingScreenData.cursorSpriteId].data4 &= 0xFF; - gSprites[namingScreenData.cursorSpriteId].data4 |= a << 8; + gSprites[namingScreenData.cursorSpriteId].data[4] &= 0xFF; + gSprites[namingScreenData.cursorSpriteId].data[4] |= a << 8; } static void sub_80B6914(void) @@ -1099,28 +1099,28 @@ void sub_80B6998(struct Sprite *sprite) { if (sprite->animEnded) StartSpriteAnim(sprite, 0); - sprite->invisible = (sprite->data4 & 0xFF); - if (sprite->data0 == COLUMN_COUNT - 1) + sprite->invisible = (sprite->data[4] & 0xFF); + if (sprite->data[0] == COLUMN_COUNT - 1) sprite->invisible = TRUE; - if (sprite->invisible || (sprite->data4 & 0xFF00) == 0 - || sprite->data0 != sprite->data2 || sprite->data1 != sprite->data3) + if (sprite->invisible || (sprite->data[4] & 0xFF00) == 0 + || sprite->data[0] != sprite->data[2] || sprite->data[1] != sprite->data[3]) { - sprite->data5 = 0; - sprite->data6 = 1; - sprite->data7 = 2; + sprite->data[5] = 0; + sprite->data[6] = 1; + sprite->data[7] = 2; } - sprite->data7--; - if (sprite->data7 == 0) + sprite->data[7]--; + if (sprite->data[7] == 0) { - sprite->data5 += sprite->data6; - if (sprite->data5 == 16 || sprite->data5 == 0) - sprite->data6 = -sprite->data6; - sprite->data7 = 2; + sprite->data[5] += sprite->data[6]; + if (sprite->data[5] == 16 || sprite->data[5] == 0) + sprite->data[6] = -sprite->data[6]; + sprite->data[7] = 2; } - if ((sprite->data4 & 0xFF00) != 0) + if ((sprite->data[4] & 0xFF00) != 0) { - s8 gb = sprite->data5; - s8 r = sprite->data5 >> 1; + s8 gb = sprite->data[5]; + s8 r = sprite->data[5] >> 1; u16 index = IndexOfSpritePaletteTag(5) * 16 + 0x0101; MultiplyInvertedPaletteRGBComponents(index, r, gb, gb); @@ -1138,20 +1138,20 @@ static void sub_80B6A80(void) SetSubspriteTables(&gSprites[spriteId1], gSubspriteTables_83CE558); spriteId2 = CreateSprite(&gSpriteTemplate_83CE5F8, 0xCC, 0x4C, 1); - gSprites[spriteId1].data6 = spriteId2; + gSprites[spriteId1].data[6] = spriteId2; SetSubspriteTables(&gSprites[spriteId2], gSubspriteTables_83CE560); spriteId3 = CreateSprite(&gSpriteTemplate_83CE5E0, 0xCC, 0x4B, 2); gSprites[spriteId3].oam.priority = 1; - gSprites[spriteId1].data7 = spriteId3; + gSprites[spriteId1].data[7] = spriteId3; } static void sub_80B6B14(void) { struct Sprite *sprite = &gSprites[namingScreenData.unk10]; - sprite->data0 = 2; - sprite->data1 = namingScreenData.currentPage; + sprite->data[0] = 2; + sprite->data[1] = namingScreenData.currentPage; } static u8 sub_80B6B5C(struct Sprite *); @@ -1169,17 +1169,17 @@ static u8 (*const gUnknown_083CE2B4[])(struct Sprite *) = void sub_80B6B34(struct Sprite *sprite) { - while (gUnknown_083CE2B4[sprite->data0](sprite) != 0) + while (gUnknown_083CE2B4[sprite->data[0]](sprite) != 0) ; } static u8 sub_80B6B5C(struct Sprite *sprite) { - struct Sprite *sprite1 = &gSprites[sprite->data6]; - struct Sprite *sprite2 = &gSprites[sprite->data7]; + struct Sprite *sprite1 = &gSprites[sprite->data[6]]; + struct Sprite *sprite2 = &gSprites[sprite->data[7]]; sub_80B6C48(namingScreenData.currentPage, sprite1, sprite2); - sprite->data0++; + sprite->data[0]++; return 0; } @@ -1190,30 +1190,30 @@ static u8 sub_80B6B98(struct Sprite *sprite) static u8 sub_80B6B9C(struct Sprite *sprite) { - struct Sprite *r4 = &gSprites[sprite->data6]; - struct Sprite *r5 = &gSprites[sprite->data7]; + struct Sprite *r4 = &gSprites[sprite->data[6]]; + struct Sprite *r5 = &gSprites[sprite->data[7]]; r4->pos2.y++; if (r4->pos2.y > 7) { - sprite->data0++; + sprite->data[0]++; r4->pos2.y = -4; r4->invisible = TRUE; - sub_80B6C48(((u8)sprite->data1 + 1) % 3, r4, r5); + sub_80B6C48(((u8)sprite->data[1] + 1) % 3, r4, r5); } return 0; } static u8 sub_80B6C08(struct Sprite *sprite) { - struct Sprite *r2 = &gSprites[sprite->data6]; + struct Sprite *r2 = &gSprites[sprite->data[6]]; r2->invisible = FALSE; r2->pos2.y++; if (r2->pos2.y >= 0) { r2->pos2.y = 0; - sprite->data0 = 1; + sprite->data[0] = 1; } return 0; } @@ -1255,7 +1255,7 @@ static void sub_80B6D04(void) { spriteId = CreateSprite(&gSpriteTemplate_83CE670, r1, 0x2C, 0); gSprites[spriteId].oam.priority = 3; - gSprites[spriteId].data0 = i; + gSprites[spriteId].data[0] = i; } } @@ -1263,12 +1263,12 @@ void sub_80B6D9C(struct Sprite *sprite) { const s16 arr[] = {0, -4, -2, -1}; - if (sprite->data0 == 0 || --sprite->data0 == 0) + if (sprite->data[0] == 0 || --sprite->data[0] == 0) { - sprite->data0 = 8; - sprite->data1 = (sprite->data1 + 1) & 3; + sprite->data[0] = 8; + sprite->data[1] = (sprite->data[1] + 1) & 3; } - sprite->pos2.x = arr[sprite->data1]; + sprite->pos2.x = arr[sprite->data[1]]; } void sub_80B6DE8(struct Sprite *sprite) @@ -1277,20 +1277,20 @@ void sub_80B6DE8(struct Sprite *sprite) u8 var; var = GetTextCaretPosition(); - if (var != (u8)sprite->data0) + if (var != (u8)sprite->data[0]) { sprite->pos2.y = 0; - sprite->data1 = 0; - sprite->data2 = 0; + sprite->data[1] = 0; + sprite->data[2] = 0; } else { - sprite->pos2.y = arr[sprite->data1]; - sprite->data2++; - if (sprite->data2 > 8) + sprite->pos2.y = arr[sprite->data[1]]; + sprite->data[2]++; + if (sprite->data[2] > 8) { - sprite->data1 = (sprite->data1 + 1) & 3; - sprite->data2 = 0; + sprite->data[1] = (sprite->data[1] + 1) & 3; + sprite->data[2] = 0; } } } diff --git a/src/engine/reset_rtc_screen.c b/src/engine/reset_rtc_screen.c index 198bffaa7..5701c1185 100644 --- a/src/engine/reset_rtc_screen.c +++ b/src/engine/reset_rtc_screen.c @@ -149,10 +149,10 @@ const u8 gUnknown_08376500[] = _(" : "); void SpriteCB_ResetRtcCusor0(struct Sprite *sprite) { - int state = gTasks[sprite->data0].data[2]; - if (state != sprite->data1) + int state = gTasks[sprite->data[0]].data[2]; + if (state != sprite->data[1]) { - sprite->data1 = state; + sprite->data[1] = state; switch (state) { case 1: @@ -199,10 +199,10 @@ void SpriteCB_ResetRtcCusor0(struct Sprite *sprite) void SpriteCB_ResetRtcCusor1(struct Sprite *sprite) { - int state = gTasks[sprite->data0].data[2]; - if (state != sprite->data1) + int state = gTasks[sprite->data[0]].data[2]; + if (state != sprite->data[1]) { - sprite->data1 = state; + sprite->data[1] = state; switch (state) { case 1: @@ -251,13 +251,13 @@ void ResetRtcScreen_CreateCursor(u8 taskId) spriteId = CreateSpriteAtEnd(&gSpriteTemplate_83764E8, 53, 68, 0); gSprites[spriteId].callback = SpriteCB_ResetRtcCusor0; - gSprites[spriteId].data0 = taskId; - gSprites[spriteId].data1 = -1; + gSprites[spriteId].data[0] = taskId; + gSprites[spriteId].data[1] = -1; spriteId = CreateSpriteAtEnd(&gSpriteTemplate_83764E8, 53, 68, 0); gSprites[spriteId].callback = SpriteCB_ResetRtcCusor1; - gSprites[spriteId].data0 = taskId; - gSprites[spriteId].data1 = -1; + gSprites[spriteId].data[0] = taskId; + gSprites[spriteId].data[1] = -1; } void ResetRtcScreen_FreeCursorPalette(void) diff --git a/src/engine/sprite.c b/src/engine/sprite.c index 34ca3802d..69fa860c1 100644 --- a/src/engine/sprite.c +++ b/src/engine/sprite.c @@ -187,14 +187,7 @@ static const struct Sprite sDummySprite = .animPaused = 0, .affineAnimPaused = 0, .animLoopCounter = 0, - .data0 = 0, - .data1 = 0, - .data2 = 0, - .data3 = 0, - .data4 = 0, - .data5 = 0, - .data6 = 0, - .data7 = 0, + .data = {0}, .inUse = 0, .coordOffsetEnabled = 0, .invisible = 0, diff --git a/src/engine/trade.c b/src/engine/trade.c index 41146a22c..729791aff 100644 --- a/src/engine/trade.c +++ b/src/engine/trade.c @@ -2458,10 +2458,10 @@ static void sub_8049ED4(u8 a0) gSprites[gUnknown_03004824->partyIcons[whichParty][i]].invisible = TRUE; } gSprites[gUnknown_03004824->partyIcons[whichParty][whichPokemon]].invisible = FALSE; - gSprites[gUnknown_03004824->partyIcons[whichParty][whichPokemon]].data0 = 20; - gSprites[gUnknown_03004824->partyIcons[whichParty][whichPokemon]].data2 = (gTradeMonSpriteCoords[6 * whichParty + whichPokemon][0] + gTradeMonSpriteCoords[6 * whichParty + whichPokemon + 1][0]) / 2 * 8 + 14; - gSprites[gUnknown_03004824->partyIcons[whichParty][whichPokemon]].data4 = gTradeMonSpriteCoords[6 * whichParty + whichPokemon][1] * 8 - 12; - StoreSpriteCallbackInData6(&gSprites[gUnknown_03004824->partyIcons[whichParty][whichPokemon]], sub_809D62C); + gSprites[gUnknown_03004824->partyIcons[whichParty][whichPokemon]].data[0] = 20; + gSprites[gUnknown_03004824->partyIcons[whichParty][whichPokemon]].data[2] = (gTradeMonSpriteCoords[6 * whichParty + whichPokemon][0] + gTradeMonSpriteCoords[6 * whichParty + whichPokemon + 1][0]) / 2 * 8 + 14; + gSprites[gUnknown_03004824->partyIcons[whichParty][whichPokemon]].data[4] = gTradeMonSpriteCoords[6 * whichParty + whichPokemon][1] * 8 - 12; + StoreSpriteCallbackInData(&gSprites[gUnknown_03004824->partyIcons[whichParty][whichPokemon]], sub_809D62C); gUnknown_03004824->unk_0080[a0] ++; sub_8078A34(&gSprites[gUnknown_03004824->partyIcons[whichParty][whichPokemon]]); HandleDestroyMenuCursors(); @@ -2675,7 +2675,7 @@ static void sub_8049ED4(u8 a0) "\tlsls r0, 2\n" "\tadds r0, r7\n" "\tldr r1, _0804A0A0 @ =sub_809D62C\n" - "\tbl StoreSpriteCallbackInData6\n" + "\tbl StoreSpriteCallbackInData\n" "\tldr r2, _0804A09C @ =gUnknown_03004824\n" "\tldr r1, [r2]\n" "\tadds r1, 0x80\n" @@ -3816,45 +3816,45 @@ static void sub_804AFB8(const struct WindowConfig *windowConfig, u8 *dest, const static void sub_804B058(struct Sprite *sprite) { - if (++ sprite->data0 == 10) + if (++ sprite->data[0] == 10) { PlaySE(SE_BOWA); - sprite->data0 = 0; + sprite->data[0] = 0; } } static void sub_804B07C(struct Sprite *sprite) { - if (sprite->data1 == 0) + if (sprite->data[1] == 0) { - if (++ sprite->data0 == 12) - sprite->data0 = 0; - LoadPalette(&gTradeGlow2PaletteAnimTable[sprite->data0], 16 * (sprite->oam.paletteNum + 16) + 4, 2); + if (++ sprite->data[0] == 12) + sprite->data[0] = 0; + LoadPalette(&gTradeGlow2PaletteAnimTable[sprite->data[0]], 16 * (sprite->oam.paletteNum + 16) + 4, 2); } } static void sub_804B0BC(struct Sprite *sprite) { - sprite->data0 ++; + sprite->data[0] ++; sprite->pos2.y ++; - if (sprite->data0 == 10) + if (sprite->data[0] == 10) DestroySprite(sprite); } static void sub_804B0E0(struct Sprite *sprite) { - sprite->data0 ++; + sprite->data[0] ++; sprite->pos2.y --; - if (sprite->data0 == 10) + if (sprite->data[0] == 10) DestroySprite(sprite); } static void sub_804B104(struct Sprite *sprite) { - if (++ sprite->data0 == 15) + if (++ sprite->data[0] == 15) { PlaySE(SE_W107); - sprite->data0 = 0; + sprite->data[0] = 0; } } @@ -4989,8 +4989,8 @@ static bool8 sub_804C29C(void) gSprites[gUnknown_03004828->unk_00bb].pos2.y += 3; if (gSprites[gUnknown_03004828->unk_00ba].pos2.y <= -0x5a) { - gSprites[gUnknown_03004828->unk_00ba].data1 = 1; - gSprites[gUnknown_03004828->unk_00bb].data1 = 1; + gSprites[gUnknown_03004828->unk_00ba].data[1] = 1; + gSprites[gUnknown_03004828->unk_00bb].data[1] = 1; gUnknown_03004828->unk_00c4 ++; } break; @@ -5036,8 +5036,8 @@ static bool8 sub_804C29C(void) } if (gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].pos2.y < -0xde) { - gSprites[gUnknown_03004828->unk_00ba].data1 = 0; - gSprites[gUnknown_03004828->unk_00bb].data1 = 0; + gSprites[gUnknown_03004828->unk_00ba].data[1] = 0; + gSprites[gUnknown_03004828->unk_00bb].data[1] = 0; gUnknown_03004828->unk_00c4 ++; gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].invisible = TRUE; gSprites[gUnknown_03004828->pokePicSpriteIdxs[1]].invisible = TRUE; @@ -5169,7 +5169,7 @@ static bool8 sub_804C29C(void) break; case 63: gUnknown_03004828->unk_0103 = CreateSprite(&gSpriteTemplate_821595C, 0x78, -0x8, 0); - gSprites[gUnknown_03004828->unk_0103].data3 = 0x4a; + gSprites[gUnknown_03004828->unk_0103].data[3] = 0x4a; gSprites[gUnknown_03004828->unk_0103].callback = sub_804D80C; StartSpriteAnim(&gSprites[gUnknown_03004828->unk_0103], 1); StartSpriteAffineAnim(&gSprites[gUnknown_03004828->unk_0103], 2); @@ -5318,47 +5318,47 @@ static void sub_804D63C(void) static void sub_804D6BC(struct Sprite *sprite) { - sprite->pos1.y += sprite->data0 / 10; - sprite->data5 += sprite->data1; - sprite->pos1.x = sprite->data5 / 10; + sprite->pos1.y += sprite->data[0] / 10; + sprite->data[5] += sprite->data[1]; + sprite->pos1.x = sprite->data[5] / 10; if (sprite->pos1.y > 0x4c) { sprite->pos1.y = 0x4c; - sprite->data0 = -(sprite->data0 * sprite->data2) / 100; - sprite->data3 ++; + sprite->data[0] = -(sprite->data[0] * sprite->data[2]) / 100; + sprite->data[3] ++; } if (sprite->pos1.x == 0x78) - sprite->data1 = 0; - sprite->data0 += sprite->data4; - if (sprite->data3 == 4) + sprite->data[1] = 0; + sprite->data[0] += sprite->data[4]; + if (sprite->data[3] == 4) { - sprite->data7 = 1; + sprite->data[7] = 1; sprite->callback = SpriteCallbackDummy; } } static void sub_804D738(struct Sprite *sprite) { - sprite->pos2.y += gTradeBallVerticalVelocityTable[sprite->data0]; - if (sprite->data0 == 22) + sprite->pos2.y += gTradeBallVerticalVelocityTable[sprite->data[0]]; + if (sprite->data[0] == 22) PlaySE(SE_KON); - if (++ sprite->data0 == 44) + if (++ sprite->data[0] == 44) { PlaySE(SE_W025); sprite->callback = sub_804D7AC; - sprite->data0 = 0; + sprite->data[0] = 0; BeginNormalPaletteFade(1 << (16 + sprite->oam.paletteNum), -1, 0, 16, -1); } } static void sub_804D7AC(struct Sprite *sprite) { - if (sprite->data1 == 20) + if (sprite->data[1] == 20) StartSpriteAffineAnim(sprite, 1); - if (++ sprite->data1 > 20) + if (++ sprite->data[1] > 20) { - sprite->pos2.y -= gTradeBallVerticalVelocityTable[sprite->data0]; - if (++ sprite->data0 == 23) + sprite->pos2.y -= gTradeBallVerticalVelocityTable[sprite->data[0]]; + if (++ sprite->data[0] == 23) { DestroySprite(sprite); gUnknown_03004828->unk_00c4 = 14; // Resume the master trade animation @@ -5368,25 +5368,25 @@ static void sub_804D7AC(struct Sprite *sprite) static void sub_804D80C(struct Sprite *sprite) { - if (sprite->data2 == 0) + if (sprite->data[2] == 0) { - if ((sprite->pos1.y += 4) > sprite->data3) + if ((sprite->pos1.y += 4) > sprite->data[3]) { - sprite->data2 ++; - sprite->data0 = 0x16; + sprite->data[2] ++; + sprite->data[0] = 0x16; PlaySE(SE_KON); } } else { - if (sprite->data0 == 0x42) + if (sprite->data[0] == 0x42) PlaySE(SE_KON2); - if (sprite->data0 == 0x5c) + if (sprite->data[0] == 0x5c) PlaySE(SE_KON3); - if (sprite->data0 == 0x6b) + if (sprite->data[0] == 0x6b) PlaySE(SE_KON4); - sprite->pos2.y += gTradeBallVerticalVelocityTable[sprite->data0]; - if (++sprite->data0 == 0x6c) + sprite->pos2.y += gTradeBallVerticalVelocityTable[sprite->data[0]]; + if (++sprite->data[0] == 0x6c) sprite->callback = SpriteCallbackDummy; } } diff --git a/src/field/choose_party.c b/src/field/choose_party.c index 891ee48b8..c3845e48b 100644 --- a/src/field/choose_party.c +++ b/src/field/choose_party.c @@ -430,7 +430,7 @@ static void sub_81225D4(u8 taskId) { if (!gPaletteFade.active) { - u8 r4 = gSprites[gTasks[taskId].data[3] >> 8].data0; + u8 r4 = gSprites[gTasks[taskId].data[3] >> 8].data[0]; DestroyTask(taskId); ewram1B000.unk262 = 1; @@ -880,7 +880,7 @@ static void sub_8123034(u8 taskId) { if (!gPaletteFade.active) { - u8 r4 = gSprites[gTasks[taskId].data[3] >> 8].data0; + u8 r4 = gSprites[gTasks[taskId].data[3] >> 8].data[0]; DestroyTask(taskId); ewram1B000.unk262 = 1; diff --git a/src/field/decoration.c b/src/field/decoration.c index bdeaaf91d..8e6276a2f 100644 --- a/src/field/decoration.c +++ b/src/field/decoration.c @@ -2439,11 +2439,11 @@ void AddDecorationIconObjectFromFieldObject(struct UnkStruct_02038900 * unk_0203 sub_8100874(unk_02038900); sub_810070C(unk_02038900->palette, ((u16 *)gMapHeader.mapData->secondaryTileset->metatiles + 8 * unk_02038900->decoration->tiles[0])[7] >> 12); LoadSpritePalette(&gUnknown_083EC954); - gUnknown_020391A8 = gSprites[gUnknown_03004880.unk4].data0; + gUnknown_020391A8 = gSprites[gUnknown_03004880.unk4].data[0]; gUnknown_03004880.unk4 = CreateSprite(&gSpriteTemplate_83EC93C, gUnknown_083EC900[unk_02038900->decoration->shape].x, gUnknown_083EC900[unk_02038900->decoration->shape].y, 0); } else { - gUnknown_020391A8 = gSprites[gUnknown_03004880.unk4].data0; + gUnknown_020391A8 = gSprites[gUnknown_03004880.unk4].data[0]; gUnknown_03004880.unk4 = AddPseudoFieldObject(unk_02038900->decoration->tiles[0], sub_81009A8, gUnknown_083EC900[unk_02038900->decoration->shape].x, gUnknown_083EC900[unk_02038900->decoration->shape].y, 1); gSprites[gUnknown_03004880.unk4].oam.priority = 1; } @@ -2520,8 +2520,8 @@ void sub_80FF960(u8 taskId) void sub_80FFAB0(u8 taskId) { gTasks[taskId].data[10] = 0; - gSprites[gUnknown_020391A8].data7 = 1; - gSprites[gUnknown_020391A9].data7 = 1; + gSprites[gUnknown_020391A8].data[7] = 1; + gSprites[gUnknown_020391A9].data[7] = 1; sub_810045C(); sub_8100038(taskId); } @@ -2529,8 +2529,8 @@ void sub_80FFAB0(u8 taskId) void sub_80FFB08(u8 taskId) { gTasks[taskId].data[10] = 0; - gSprites[gUnknown_020391A8].data7 = 1; - gSprites[gUnknown_020391A9].data7 = 1; + gSprites[gUnknown_020391A8].data[7] = 1; + gSprites[gUnknown_020391A9].data[7] = 1; sub_810045C(); DisplayItemMessageOnField(taskId, gSecretBaseText_CancelDecorating, sub_8100248, 0); } @@ -3400,13 +3400,13 @@ bool8 sub_8100430(void) void sub_810045C(void) { gUnknown_020391AA = 0; - gSprites[gUnknown_020391A8].data2 = 0; - gSprites[gUnknown_020391A8].data3 = 0; + gSprites[gUnknown_020391A8].data[2] = 0; + gSprites[gUnknown_020391A8].data[3] = 0; } void sub_8100494(u8 taskId) { - if (!gSprites[gUnknown_020391A8].data4) + if (!gSprites[gUnknown_020391A8].data[4]) { if (gTasks[taskId].data[10] == 1) { @@ -3420,29 +3420,29 @@ void sub_8100494(u8 taskId) if ((gMain.heldKeys & DPAD_ANY) == DPAD_UP) { gUnknown_020391AA = DIR_SOUTH; - gSprites[gUnknown_020391A8].data2 = 0; - gSprites[gUnknown_020391A8].data3 = -2; + gSprites[gUnknown_020391A8].data[2] = 0; + gSprites[gUnknown_020391A8].data[3] = -2; gTasks[taskId].data[1]--; } if ((gMain.heldKeys & DPAD_ANY) == DPAD_DOWN) { gUnknown_020391AA = DIR_NORTH; - gSprites[gUnknown_020391A8].data2 = 0; - gSprites[gUnknown_020391A8].data3 = 2; + gSprites[gUnknown_020391A8].data[2] = 0; + gSprites[gUnknown_020391A8].data[3] = 2; gTasks[taskId].data[1]++; } if ((gMain.heldKeys & DPAD_ANY) == DPAD_LEFT) { gUnknown_020391AA = DIR_WEST; - gSprites[gUnknown_020391A8].data2 = -2; - gSprites[gUnknown_020391A8].data3 = 0; + gSprites[gUnknown_020391A8].data[2] = -2; + gSprites[gUnknown_020391A8].data[3] = 0; gTasks[taskId].data[0]--; } if ((gMain.heldKeys & DPAD_ANY) == DPAD_RIGHT) { gUnknown_020391AA = DIR_EAST; - gSprites[gUnknown_020391A8].data2 = 2; - gSprites[gUnknown_020391A8].data3 = 0; + gSprites[gUnknown_020391A8].data[2] = 2; + gSprites[gUnknown_020391A8].data[3] = 0; gTasks[taskId].data[0]++; } if (!sub_8100430() || !sub_810038C(taskId)) @@ -3452,8 +3452,8 @@ void sub_8100494(u8 taskId) } if (gUnknown_020391AA) { - gSprites[gUnknown_020391A8].data4++; - gSprites[gUnknown_020391A8].data4 &= 7; + gSprites[gUnknown_020391A8].data[4]++; + gSprites[gUnknown_020391A8].data[4] &= 7; } if (!gTasks[taskId].data[10]) { @@ -3471,7 +3471,7 @@ void sub_8100494(u8 taskId) void sub_810065C(u8 taskId) { MenuZeroFillWindowRect(0, 0, 29, 19); - gSprites[gUnknown_020391A8].data7 = 0; + gSprites[gUnknown_020391A8].data[7] = 0; gTasks[taskId].data[10] = 0; gTasks[taskId].func = sub_8100494; } @@ -3596,27 +3596,27 @@ void sub_8100930(u8 decoShape) void sub_81009A8(struct Sprite *sprite) { - sprite->data2 = 0; - sprite->data3 = 0; - sprite->data4 = 0; - sprite->data5 = 0; - sprite->data6 = 0; - sprite->data7 = 0; + sprite->data[2] = 0; + sprite->data[3] = 0; + sprite->data[4] = 0; + sprite->data[5] = 0; + sprite->data[6] = 0; + sprite->data[7] = 0; sprite->callback = sub_81009C0; } void sub_81009C0(struct Sprite *sprite) { - if (sprite->data7 == 0) + if (sprite->data[7] == 0) { - if (sprite->data6 < 15) + if (sprite->data[6] < 15) { sprite->invisible = 0; } else { sprite->invisible = 1; } - sprite->data6 = (sprite->data6 + 1) & 0x1f; + sprite->data[6] = (sprite->data[6] + 1) & 0x1f; } else { sprite->invisible = 0; @@ -3760,7 +3760,7 @@ void SetUpPuttingAwayDecorationPlayerAvatar(void) { player_get_direction_lower_nybble(); MenuZeroFillWindowRect(0, 0, 29, 19); - gUnknown_020391A8 = gSprites[gUnknown_03004880.unk4].data0; + gUnknown_020391A8 = gSprites[gUnknown_03004880.unk4].data[0]; sub_81016C8(); gUnknown_03004880.unk4 = CreateSprite(&gSpriteTemplate_83ECA88, 0x78, 0x50, 0); if (gSaveBlock2.playerGender == MALE) @@ -3810,7 +3810,7 @@ void sub_8100E70(u8 taskId) void sub_8100EEC(u8 taskId) { MenuZeroFillWindowRect(0, 0, 29, 19); - gSprites[gUnknown_020391A8].data7 = 0; + gSprites[gUnknown_020391A8].data[7] = 0; gSprites[gUnknown_020391A8].invisible = 0; gSprites[gUnknown_020391A8].callback = sub_8101698; gSprites[gUnknown_020391A9].pos1.x = 0x88; @@ -4198,8 +4198,8 @@ void sub_8101678(void) void sub_8101698(struct Sprite *sprite) { - sprite->data0 = (sprite->data0 + 1) & 0x1f; - if (sprite->data0 >= 16) + sprite->data[0] = (sprite->data[0] + 1) & 0x1f; + if (sprite->data[0] >= 16) { sprite->invisible = TRUE; } else diff --git a/src/field/field_camera.c b/src/field/field_camera.c index a29f4c49f..8384ad8d1 100644 --- a/src/field/field_camera.c +++ b/src/field/field_camera.c @@ -322,8 +322,8 @@ static void CameraUpdateCallback(struct CameraSomething *a) { if (a->unk4 != 0) { - a->unk8 = gSprites[a->unk4].data2; - a->unkC = gSprites[a->unk4].data3; + a->unk8 = gSprites[a->unk4].data[2]; + a->unkC = gSprites[a->unk4].data[3]; } } diff --git a/src/field/field_effect.c b/src/field/field_effect.c index bd78fb632..e15dc906f 100644 --- a/src/field/field_effect.c +++ b/src/field/field_effect.c @@ -886,16 +886,16 @@ void PokecenterHealEffect_0(struct Task *task) void PokecenterHealEffect_1(struct Task *task) { - if (gSprites[task->data[6]].data0 > 1) + if (gSprites[task->data[6]].data[0] > 1) { - gSprites[task->data[7]].data0++; + gSprites[task->data[7]].data[0]++; task->data[0]++; } } void PokecenterHealEffect_2(struct Task *task) { - if (gSprites[task->data[6]].data0 > 4) + if (gSprites[task->data[6]].data[0] > 4) { task->data[0]++; } @@ -903,7 +903,7 @@ void PokecenterHealEffect_2(struct Task *task) void PokecenterHealEffect_3(struct Task *task) { - if (gSprites[task->data[6]].data0 > 6) + if (gSprites[task->data[6]].data[0] > 6) { DestroySprite(&gSprites[task->data[6]]); FieldEffectActiveListRemove(FLDEFF_POKECENTER_HEAL); @@ -949,7 +949,7 @@ void HallOfFameRecordEffect_0(struct Task *task) void HallOfFameRecordEffect_1(struct Task *task) { - if (gSprites[task->data[6]].data0 > 1) + if (gSprites[task->data[6]].data[0] > 1) { task->data[15]++; // was this ever initialized? is this ever used? task->data[0]++; @@ -958,7 +958,7 @@ void HallOfFameRecordEffect_1(struct Task *task) void HallOfFameRecordEffect_2(struct Task *task) { - if (gSprites[task->data[6]].data0 > 4) + if (gSprites[task->data[6]].data[0] > 4) { task->data[0]++; } @@ -966,7 +966,7 @@ void HallOfFameRecordEffect_2(struct Task *task) void HallOfFameRecordEffect_3(struct Task *task) { - if (gSprites[task->data[6]].data0 > 6) + if (gSprites[task->data[6]].data[0] > 6) { DestroySprite(&gSprites[task->data[6]]); FieldEffectActiveListRemove(FLDEFF_HALL_OF_FAME_RECORD); @@ -984,46 +984,46 @@ u8 CreatePokeballGlowSprite(s16 data6, s16 x, s16 y, u16 data5) sprite = &gSprites[spriteId]; sprite->pos2.x = x; sprite->pos2.y = y; - sprite->data5 = data5; - sprite->data6 = data6; - sprite->data7 = spriteId; + sprite->data[5] = data5; + sprite->data[6] = data6; + sprite->data[7] = spriteId; return spriteId; } void SpriteCB_PokeballGlowEffect(struct Sprite *sprite) { - gUnknown_0839F288[sprite->data0](sprite); + gUnknown_0839F288[sprite->data[0]](sprite); } void PokeballGlowEffect_0(struct Sprite *sprite) { u8 endSpriteId; - if (sprite->data1 == 0 || (--sprite->data1) == 0) + if (sprite->data[1] == 0 || (--sprite->data[1]) == 0) { - sprite->data1 = 25; - endSpriteId = CreateSpriteAtEnd(&gSpriteTemplate_839F208, gUnknown_0839F2A8[sprite->data2].x + sprite->pos2.x, gUnknown_0839F2A8[sprite->data2].y + sprite->pos2.y, 0); + sprite->data[1] = 25; + endSpriteId = CreateSpriteAtEnd(&gSpriteTemplate_839F208, gUnknown_0839F2A8[sprite->data[2]].x + sprite->pos2.x, gUnknown_0839F2A8[sprite->data[2]].y + sprite->pos2.y, 0); gSprites[endSpriteId].oam.priority = 2; - gSprites[endSpriteId].data0 = sprite->data7; - sprite->data2++; - sprite->data6--; + gSprites[endSpriteId].data[0] = sprite->data[7]; + sprite->data[2]++; + sprite->data[6]--; PlaySE(SE_BOWA); } - if (sprite->data6 == 0) + if (sprite->data[6] == 0) { - sprite->data1 = 32; - sprite->data0++; + sprite->data[1] = 32; + sprite->data[0]++; } } void PokeballGlowEffect_1(struct Sprite *sprite) { - if ((--sprite->data1) == 0) + if ((--sprite->data[1]) == 0) { - sprite->data0++; - sprite->data1 = 8; - sprite->data2 = 0; - sprite->data3 = 0; - if (sprite->data5) + sprite->data[0]++; + sprite->data[1] = 8; + sprite->data[2] = 0; + sprite->data[3] = 0; + if (sprite->data[5]) { PlayFanfare(BGM_ME_ASA); } @@ -1033,48 +1033,48 @@ void PokeballGlowEffect_1(struct Sprite *sprite) void PokeballGlowEffect_2(struct Sprite *sprite) { u8 phase; - if ((--sprite->data1) == 0) + if ((--sprite->data[1]) == 0) { - sprite->data1 = 8; - sprite->data2++; - sprite->data2 &= 3; - if (sprite->data2 == 0) + sprite->data[1] = 8; + sprite->data[2]++; + sprite->data[2] &= 3; + if (sprite->data[2] == 0) { - sprite->data3++; + sprite->data[3]++; } } - phase = (sprite->data2 + 3) & 3; + phase = (sprite->data[2] + 3) & 3; MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(0x1007) << 4) + 0x108, gUnknown_0839F2C0[phase], gUnknown_0839F2C4[phase], gUnknown_0839F2C8[phase]); - phase = (sprite->data2 + 2) & 3; + phase = (sprite->data[2] + 2) & 3; MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(0x1007) << 4) + 0x106, gUnknown_0839F2C0[phase], gUnknown_0839F2C4[phase], gUnknown_0839F2C8[phase]); - phase = (sprite->data2 + 1) & 3; + phase = (sprite->data[2] + 1) & 3; MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(0x1007) << 4) + 0x102, gUnknown_0839F2C0[phase], gUnknown_0839F2C4[phase], gUnknown_0839F2C8[phase]); - phase = sprite->data2; + phase = sprite->data[2]; MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(0x1007) << 4) + 0x105, gUnknown_0839F2C0[phase], gUnknown_0839F2C4[phase], gUnknown_0839F2C8[phase]); MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(0x1007) << 4) + 0x103, gUnknown_0839F2C0[phase], gUnknown_0839F2C4[phase], gUnknown_0839F2C8[phase]); - if (sprite->data3 > 2) + if (sprite->data[3] > 2) { - sprite->data0++; - sprite->data1 = 8; - sprite->data2 = 0; + sprite->data[0]++; + sprite->data[1] = 8; + sprite->data[2] = 0; } } void PokeballGlowEffect_3(struct Sprite *sprite) { u8 phase; - if ((--sprite->data1) == 0) + if ((--sprite->data[1]) == 0) { - sprite->data1 = 8; - sprite->data2++; - sprite->data2 &= 3; - if (sprite->data2 == 3) + sprite->data[1] = 8; + sprite->data[2]++; + sprite->data[2] &= 3; + if (sprite->data[2] == 3) { - sprite->data0++; - sprite->data1 = 30; + sprite->data[0]++; + sprite->data[1] = 30; } } - phase = sprite->data2; + phase = sprite->data[2]; MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(0x1007) << 4) + 0x108, gUnknown_0839F2C0[phase], gUnknown_0839F2C4[phase], gUnknown_0839F2C8[phase]); MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(0x1007) << 4) + 0x106, gUnknown_0839F2C0[phase], gUnknown_0839F2C4[phase], gUnknown_0839F2C8[phase]); MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(0x1007) << 4) + 0x102, gUnknown_0839F2C0[phase], gUnknown_0839F2C4[phase], gUnknown_0839F2C8[phase]); @@ -1084,22 +1084,22 @@ void PokeballGlowEffect_3(struct Sprite *sprite) void PokeballGlowEffect_4(struct Sprite *sprite) { - if ((--sprite->data1) == 0) + if ((--sprite->data[1]) == 0) { - sprite->data0++; + sprite->data[0]++; } } void PokeballGlowEffect_5(struct Sprite *sprite) { - sprite->data0++; + sprite->data[0]++; } void PokeballGlowEffect_6(struct Sprite *sprite) { - if (sprite->data5 == 0 || IsFanfareTaskInactive()) + if (sprite->data[5] == 0 || IsFanfareTaskInactive()) { - sprite->data0++; + sprite->data[0]++; } } @@ -1109,7 +1109,7 @@ void PokeballGlowEffect_7(struct Sprite *sprite) void SpriteCB_PokeballGlow(struct Sprite *sprite) { - if (gSprites[sprite->data0].data0 > 4) + if (gSprites[sprite->data[0]].data[0] > 4) { FieldEffectFreeGraphicsResources(sprite); } @@ -1129,9 +1129,9 @@ u8 PokecenterHealEffectHelper(s16 x, s16 y) void SpriteCB_PokecenterMonitor(struct Sprite *sprite) { - if (sprite->data0 != 0) + if (sprite->data[0] != 0) { - sprite->data0 = 0; + sprite->data[0] = 0; sprite->invisible = 0; StartSpriteAnim(sprite, 1); } @@ -1153,21 +1153,21 @@ void HallOfFameRecordEffectHelper(s16 a0, s16 a1, s16 a2, u8 a3) spriteIdAtEnd = CreateSpriteAtEnd(&gSpriteTemplate_839F250, a1, a2, 0); } gSprites[spriteIdAtEnd].invisible = 1; - gSprites[spriteIdAtEnd].data0 = a0; + gSprites[spriteIdAtEnd].data[0] = a0; } void SpriteCB_HallOfFameMonitor(struct Sprite *sprite) { - if (gTasks[sprite->data0].data[15]) + if (gTasks[sprite->data[0]].data[15]) { - if (sprite->data1 == 0 || (--sprite->data1) == 0) + if (sprite->data[1] == 0 || (--sprite->data[1]) == 0) { - sprite->data1 = 16; + sprite->data[1] = 16; sprite->invisible ^= 1; } - sprite->data2++; + sprite->data[2]++; } - if (sprite->data2 > 127) + if (sprite->data[2] > 127) { FieldEffectFreeGraphicsResources(sprite); } @@ -2480,7 +2480,7 @@ void sub_8088228(struct Task *task) void sub_80882B4(struct Task *task) { task->data[5] -= 16; - if (gSprites[task->data[15]].data7) + if (gSprites[task->data[15]].data[7]) { task->data[0]++; } @@ -2607,7 +2607,7 @@ void sub_8088554(struct Task *task) void sub_80885A8(struct Task *task) { sub_80886F8(task); - if (gSprites[task->data[15]].data7) + if (gSprites[task->data[15]].data[7]) { task->data[0]++; } @@ -2827,8 +2827,8 @@ u8 sub_8088830(u32 a0, u32 a1, u32 a2) sprite = &gSprites[monSprite]; sprite->callback = SpriteCallbackDummy; sprite->oam.priority = 0; - sprite->data0 = a0; - sprite->data6 = v0; + sprite->data[0] = a0; + sprite->data[6] = v0; return monSprite; } @@ -2839,14 +2839,14 @@ void sub_8088890(struct Sprite *sprite) if ((sprite->pos1.x -= 20) <= 0x78) { sprite->pos1.x = 0x78; - sprite->data1 = 30; + sprite->data[1] = 30; sprite->callback = sub_80888D4; - if (sprite->data6) + if (sprite->data[6]) { - PlayCry2(sprite->data0, 0, 0x7d, 0xa); + PlayCry2(sprite->data[0], 0, 0x7d, 0xa); } else { - PlayCry1(sprite->data0, 0); + PlayCry1(sprite->data[0], 0); } } } @@ -2855,7 +2855,7 @@ void sub_80888F0(struct Sprite *); void sub_80888D4(struct Sprite *sprite) { - if ((--sprite->data1) == 0) + if ((--sprite->data[1]) == 0) { sprite->callback = sub_80888F0; } @@ -2865,7 +2865,7 @@ void sub_80888F0(struct Sprite *sprite) { if (sprite->pos1.x < -0x40) { - sprite->data7 = 1; + sprite->data[7] = 1; } else { sprite->pos1.x -= 20; @@ -2969,7 +2969,7 @@ u8 FldEff_NPCFlyOut(void) sprite->oam.paletteNum = 0; sprite->oam.priority = 1; sprite->callback = sub_8088BC4; - sprite->data1 = gFieldEffectArguments[0]; + sprite->data[1] = gFieldEffectArguments[0]; PlaySE(SE_W019); return spriteId; } @@ -2977,19 +2977,19 @@ u8 FldEff_NPCFlyOut(void) void sub_8088BC4(struct Sprite *sprite) { struct Sprite *npcSprite; - sprite->pos2.x = Cos(sprite->data2, 0x8c); - sprite->pos2.y = Sin(sprite->data2, 0x48); - sprite->data2 = (sprite->data2 + 4) & 0xff; - if (sprite->data0) + sprite->pos2.x = Cos(sprite->data[2], 0x8c); + sprite->pos2.y = Sin(sprite->data[2], 0x48); + sprite->data[2] = (sprite->data[2] + 4) & 0xff; + if (sprite->data[0]) { - npcSprite = &gSprites[sprite->data1]; + npcSprite = &gSprites[sprite->data[1]]; npcSprite->coordOffsetEnabled = 0; npcSprite->pos1.x = sprite->pos1.x + sprite->pos2.x; npcSprite->pos1.y = sprite->pos1.y + sprite->pos2.y - 8; npcSprite->pos2.x = 0; npcSprite->pos2.y = 0; } - if (sprite->data2 >= 0x80) + if (sprite->data[2] >= 0x80) { FieldEffectStop(sprite, FLDEFF_NPCFLY_OUT); } @@ -3149,7 +3149,7 @@ u8 sub_8088F60(void) u8 sub_8088FA4(u8 spriteId) { - return gSprites[spriteId].data7; + return gSprites[spriteId].data[7]; } void sub_8088FC0(u8 spriteId) @@ -3161,20 +3161,20 @@ void sub_8088FC0(u8 spriteId) sprite->pos1.y = 0x00; sprite->pos2.x = 0; sprite->pos2.y = 0; - memset(&sprite->data0, 0, 8 * sizeof(u16) /* zero all data cells */); - sprite->data6 = 0x40; + memset(&sprite->data[0], 0, 8 * sizeof(u16) /* zero all data cells */); + sprite->data[6] = 0x40; } void sub_8088FFC(u8 a0, u8 a1) { - gSprites[a0].data6 = a1; + gSprites[a0].data[6] = a1; } void sub_8089018(struct Sprite *sprite) { - if (sprite->data7 == 0) + if (sprite->data[7] == 0) { - if (sprite->data0 == 0) + if (sprite->data[0] == 0) { sprite->oam.affineMode = 3; sprite->affineAnims = gSpriteAffineAnimTable_0839F44C; @@ -3182,20 +3182,20 @@ void sub_8089018(struct Sprite *sprite) StartSpriteAffineAnim(sprite, 0); sprite->pos1.x = 0x76; sprite->pos1.y = -0x30; - sprite->data0++; - sprite->data1 = 0x40; - sprite->data2 = 0x100; + sprite->data[0]++; + sprite->data[1] = 0x40; + sprite->data[2] = 0x100; } - sprite->data1 += (sprite->data2 >> 8); - sprite->pos2.x = Cos(sprite->data1, 0x78); - sprite->pos2.y = Sin(sprite->data1, 0x78); - if (sprite->data2 < 0x800) + sprite->data[1] += (sprite->data[2] >> 8); + sprite->pos2.x = Cos(sprite->data[1], 0x78); + sprite->pos2.y = Sin(sprite->data[1], 0x78); + if (sprite->data[2] < 0x800) { - sprite->data2 += 0x60; + sprite->data[2] += 0x60; } - if (sprite->data1 > 0x81) + if (sprite->data[1] > 0x81) { - sprite->data7++; + sprite->data[7]++; sprite->oam.affineMode = 0; FreeOamMatrix(sprite->oam.matrixNum); CalcCenterToCornerVec(sprite, sprite->oam.shape, sprite->oam.size, 0); @@ -3206,29 +3206,29 @@ void sub_8089018(struct Sprite *sprite) void sub_80890D8(struct Sprite *sprite) { struct Sprite *sprite1; - sprite->pos2.x = Cos(sprite->data2, 0x8c); - sprite->pos2.y = Sin(sprite->data2, 0x48); - sprite->data2 = (sprite->data2 + 4) & 0xff; - if (sprite->data6 != 0x40) + sprite->pos2.x = Cos(sprite->data[2], 0x8c); + sprite->pos2.y = Sin(sprite->data[2], 0x48); + sprite->data[2] = (sprite->data[2] + 4) & 0xff; + if (sprite->data[6] != 0x40) { - sprite1 = &gSprites[sprite->data6]; + sprite1 = &gSprites[sprite->data[6]]; sprite1->coordOffsetEnabled = 0; sprite1->pos1.x = sprite->pos1.x + sprite->pos2.x; sprite1->pos1.y = sprite->pos1.y + sprite->pos2.y - 8; sprite1->pos2.x = 0; sprite1->pos2.y = 0; } - if (sprite->data2 >= 0x80) + if (sprite->data[2] >= 0x80) { - sprite->data7 = 1; + sprite->data[7] = 1; } } void sub_808914C(struct Sprite *sprite) { - if (sprite->data7 == 0) + if (sprite->data[7] == 0) { - if (sprite->data0 == 0) + if (sprite->data[0] == 0) { sprite->oam.affineMode = 3; sprite->affineAnims = gSpriteAffineAnimTable_0839F44C; @@ -3236,31 +3236,31 @@ void sub_808914C(struct Sprite *sprite) StartSpriteAffineAnim(sprite, 1); sprite->pos1.x = 0x5e; sprite->pos1.y = -0x20; - sprite->data0++; - sprite->data1 = 0xf0; - sprite->data2 = 0x800; - sprite->data4 = 0x80; + sprite->data[0]++; + sprite->data[1] = 0xf0; + sprite->data[2] = 0x800; + sprite->data[4] = 0x80; } - sprite->data1 += sprite->data2 >> 8; - sprite->data3 += sprite->data2 >> 8; - sprite->data1 &= 0xff; - sprite->pos2.x = Cos(sprite->data1, 0x20); - sprite->pos2.y = Sin(sprite->data1, 0x78); - if (sprite->data2 > 0x100) + sprite->data[1] += sprite->data[2] >> 8; + sprite->data[3] += sprite->data[2] >> 8; + sprite->data[1] &= 0xff; + sprite->pos2.x = Cos(sprite->data[1], 0x20); + sprite->pos2.y = Sin(sprite->data[1], 0x78); + if (sprite->data[2] > 0x100) { - sprite->data2 -= sprite->data4; + sprite->data[2] -= sprite->data[4]; } - if (sprite->data4 < 0x100) + if (sprite->data[4] < 0x100) { - sprite->data4 += 24; + sprite->data[4] += 24; } - if (sprite->data2 < 0x100) + if (sprite->data[2] < 0x100) { - sprite->data2 = 0x100; + sprite->data[2] = 0x100; } - if (sprite->data3 >= 60) + if (sprite->data[3] >= 60) { - sprite->data7++; + sprite->data[7]++; sprite->oam.affineMode = 0; FreeOamMatrix(sprite->oam.matrixNum); sprite->invisible = 1; diff --git a/src/field/field_effect_helpers.c b/src/field/field_effect_helpers.c index 2ad8bdce3..c5b67fd9d 100644 --- a/src/field/field_effect_helpers.c +++ b/src/field/field_effect_helpers.c @@ -89,9 +89,9 @@ void SetUpReflection(struct MapObject *mapObject, struct Sprite *sprite, bool8 f newSprite->affineAnims = gDummySpriteAffineAnimTable; newSprite->affineAnimBeginning = TRUE; newSprite->subspriteMode = 0; - newSprite->data0 = sprite->data0; - newSprite->data1 = mapObject->localId; - newSprite->data7 = flag; + newSprite->data[0] = sprite->data[0]; + newSprite->data[1] = mapObject->localId; + newSprite->data[7] = flag; npc_pal_op(mapObject, newSprite); if (!flag) { @@ -110,10 +110,10 @@ static void npc_pal_op(struct MapObject *mapObject, struct Sprite *sprite) u16 unk_8041e2c[ARRAY_COUNT(gUnknown_08401E2C)]; memcpy(unk_8041e2c, gUnknown_08401E2C, sizeof gUnknown_08401E2C); - sprite->data2 = 0; + sprite->data[2] = 0; if (!GetFieldObjectGraphicsInfo(mapObject->graphicsId)->disableReflectionPaletteLoad && ((whichElement = sub_8057450(mapObject->mapobj_unk_1F)) || (whichElement = sub_8057450(mapObject->mapobj_unk_1E)))) { - sprite->data2 = unk_8041e2c[whichElement - 1]; + sprite->data[2] = unk_8041e2c[whichElement - 1]; npc_pal_op_A(mapObject, sprite->oam.paletteNum); } else @@ -162,9 +162,9 @@ static void sub_81269E0(struct Sprite *sprite) struct MapObject *mapObject; struct Sprite *oldSprite; - mapObject = &gMapObjects[sprite->data0]; + mapObject = &gMapObjects[sprite->data[0]]; oldSprite = &gSprites[mapObject->spriteId]; - if (!mapObject->active || !mapObject->mapobj_bit_17 || mapObject->localId != sprite->data1) + if (!mapObject->active || !mapObject->mapobj_bit_17 || mapObject->localId != sprite->data[1]) { sprite->inUse = FALSE; } @@ -179,13 +179,13 @@ static void sub_81269E0(struct Sprite *sprite) sprite->subspriteTableNum = oldSprite->subspriteTableNum; sprite->invisible = oldSprite->invisible; sprite->pos1.x = oldSprite->pos1.x; - sprite->pos1.y = oldSprite->pos1.y + sub_81268D0(mapObject) + sprite->data2; + sprite->pos1.y = oldSprite->pos1.y + sub_81268D0(mapObject) + sprite->data[2]; sprite->centerToCornerVecX = oldSprite->centerToCornerVecX; sprite->centerToCornerVecY = oldSprite->centerToCornerVecY; sprite->pos2.x = oldSprite->pos2.x; sprite->pos2.y = -oldSprite->pos2.y; sprite->coordOffsetEnabled = oldSprite->coordOffsetEnabled; - if (sprite->data7 == FALSE) + if (sprite->data[7] == FALSE) { sprite->oam.matrixNum = 0; if (oldSprite->oam.matrixNum & 0x8) @@ -224,15 +224,15 @@ void sub_8126BC4(u8 spriteId, u8 animNum, s16 x, s16 y) struct Sprite *sprite; sprite = &gSprites[spriteId]; - if (sprite->invisible || sprite->data0 != x || sprite->data1 != y) + if (sprite->invisible || sprite->data[0] != x || sprite->data[1] != y) { sub_80603CC(x, y, &x2, &y2); sprite = &gSprites[spriteId]; sprite->pos1.x = x2 + 8; sprite->pos1.y = y2 + 8; sprite->invisible = FALSE; - sprite->data0 = x; - sprite->data1 = y; + sprite->data[0] = x; + sprite->data[1] = y; StartSpriteAnim(sprite, animNum - 1); } } @@ -249,10 +249,10 @@ u32 FldEff_Shadow(void) if (spriteId != MAX_SPRITES) { gSprites[spriteId].coordOffsetEnabled = TRUE; - gSprites[spriteId].data0 = gFieldEffectArguments[0]; - gSprites[spriteId].data1 = gFieldEffectArguments[1]; - gSprites[spriteId].data2 = gFieldEffectArguments[2]; - gSprites[spriteId].data3 = (graphicsInfo->height >> 1) - gUnknown_08401E36[graphicsInfo->shadowSize]; + gSprites[spriteId].data[0] = gFieldEffectArguments[0]; + gSprites[spriteId].data[1] = gFieldEffectArguments[1]; + gSprites[spriteId].data[2] = gFieldEffectArguments[2]; + gSprites[spriteId].data[3] = (graphicsInfo->height >> 1) - gUnknown_08401E36[graphicsInfo->shadowSize]; } return 0; } @@ -263,7 +263,7 @@ void oamc_shadow(struct Sprite *sprite) struct MapObject *mapObject; struct Sprite *linkedSprite; - if (TryGetFieldObjectIdByLocalIdAndMap(sprite->data0, sprite->data1, sprite->data2, &mapObjectId)) + if (TryGetFieldObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &mapObjectId)) { FieldEffectStop(sprite, FLDEFF_SHADOW); } @@ -273,7 +273,7 @@ void oamc_shadow(struct Sprite *sprite) linkedSprite = &gSprites[mapObject->spriteId]; sprite->oam.priority = linkedSprite->oam.priority; sprite->pos1.x = linkedSprite->pos1.x; - sprite->pos1.y = linkedSprite->pos1.y + sprite->data3; + sprite->pos1.y = linkedSprite->pos1.y + sprite->data[3]; if (!mapObject->active || !mapObject->mapobj_bit_22 || MetatileBehavior_IsPokeGrass(mapObject->mapobj_unk_1E) || MetatileBehavior_IsSurfableWaterOrUnderwater(mapObject->mapobj_unk_1E) || MetatileBehavior_IsSurfableWaterOrUnderwater(mapObject->mapobj_unk_1F) || MetatileBehavior_IsReflective(mapObject->mapobj_unk_1E) || MetatileBehavior_IsReflective(mapObject->mapobj_unk_1F)) { FieldEffectStop(sprite, FLDEFF_SHADOW); @@ -297,12 +297,12 @@ u32 FldEff_TallGrass(void) sprite = &gSprites[spriteId]; sprite->coordOffsetEnabled = TRUE; sprite->oam.priority = gFieldEffectArguments[3]; - sprite->data0 = gFieldEffectArguments[2]; - sprite->data1 = gFieldEffectArguments[0]; - sprite->data2 = gFieldEffectArguments[1]; - sprite->data3 = gFieldEffectArguments[4]; - sprite->data4 = gFieldEffectArguments[5]; - sprite->data5 = gFieldEffectArguments[6]; + sprite->data[0] = gFieldEffectArguments[2]; + sprite->data[1] = gFieldEffectArguments[0]; + sprite->data[2] = gFieldEffectArguments[1]; + sprite->data[3] = gFieldEffectArguments[4]; + sprite->data[4] = gFieldEffectArguments[5]; + sprite->data[5] = gFieldEffectArguments[6]; if (gFieldEffectArguments[7]) { SeekSpriteAnim(sprite, 4); @@ -320,28 +320,28 @@ void unc_grass_normal(struct Sprite *sprite) u8 mapObjectId; struct MapObject *mapObject; - mapNum = sprite->data5 >> 8; - mapGroup = sprite->data5; + mapNum = sprite->data[5] >> 8; + mapGroup = sprite->data[5]; if (gCamera.field_0 && (gSaveBlock1.location.mapNum != mapNum || gSaveBlock1.location.mapGroup != mapGroup)) { - sprite->data1 -= gCamera.x; - sprite->data2 -= gCamera.y; - sprite->data5 = ((u8)gSaveBlock1.location.mapNum << 8) | (u8)gSaveBlock1.location.mapGroup; + sprite->data[1] -= gCamera.x; + sprite->data[2] -= gCamera.y; + sprite->data[5] = ((u8)gSaveBlock1.location.mapNum << 8) | (u8)gSaveBlock1.location.mapGroup; } - localId = sprite->data3 >> 8; - mapNum = sprite->data3; - mapGroup = sprite->data4; - metatileBehavior = MapGridGetMetatileBehaviorAt(sprite->data1, sprite->data2); - if (TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId) || !MetatileBehavior_IsTallGrass(metatileBehavior) || (sprite->data7 && sprite->animEnded)) + localId = sprite->data[3] >> 8; + mapNum = sprite->data[3]; + mapGroup = sprite->data[4]; + metatileBehavior = MapGridGetMetatileBehaviorAt(sprite->data[1], sprite->data[2]); + if (TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId) || !MetatileBehavior_IsTallGrass(metatileBehavior) || (sprite->data[7] && sprite->animEnded)) { FieldEffectStop(sprite, FLDEFF_TALL_GRASS); } else { mapObject = &gMapObjects[mapObjectId]; - if ((mapObject->coords2.x != sprite->data1 || mapObject->coords2.y != sprite->data2) && (mapObject->coords3.x != sprite->data1 || mapObject->coords3.y != sprite->data2)) + if ((mapObject->coords2.x != sprite->data[1] || mapObject->coords2.y != sprite->data[2]) && (mapObject->coords3.x != sprite->data[1] || mapObject->coords3.y != sprite->data[2])) { - sprite->data7 = TRUE; + sprite->data[7] = TRUE; } metatileBehavior = 0; if (sprite->animCmdIndex == 0) @@ -349,7 +349,7 @@ void unc_grass_normal(struct Sprite *sprite) metatileBehavior = 4; } sub_806487C(sprite, 0); - sub_812882C(sprite, sprite->data0, metatileBehavior); + sub_812882C(sprite, sprite->data[0], metatileBehavior); } } @@ -365,8 +365,8 @@ u32 FldEff_JumpTallGrass(void) sprite = &gSprites[spriteId]; sprite->coordOffsetEnabled = TRUE; sprite->oam.priority = gFieldEffectArguments[3]; - sprite->data0 = gFieldEffectArguments[2]; - sprite->data1 = 12; + sprite->data[0] = gFieldEffectArguments[2]; + sprite->data[1] = 12; } return 0; } @@ -381,7 +381,7 @@ u8 sub_8126FF0(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y) if (gSprites[i].inUse) { sprite = &gSprites[i]; - if (sprite->callback == unc_grass_normal && (x == sprite->data1 && y == sprite->data2) && (localId == (u8)(sprite->data3 >> 8) && mapNum == (sprite->data3 & 0xFF) && mapGroup == sprite->data4)) + if (sprite->callback == unc_grass_normal && (x == sprite->data[1] && y == sprite->data[2]) && (localId == (u8)(sprite->data[3] >> 8) && mapNum == (sprite->data[3] & 0xFF) && mapGroup == sprite->data[4])) { return i; } @@ -406,12 +406,12 @@ u32 FldEff_LongGrass(void) sprite = &gSprites[spriteId]; sprite->coordOffsetEnabled = TRUE; sprite->oam.priority = ZCoordToPriority(gFieldEffectArguments[2]); - sprite->data0 = gFieldEffectArguments[2]; - sprite->data1 = gFieldEffectArguments[0]; - sprite->data2 = gFieldEffectArguments[1]; - sprite->data3 = gFieldEffectArguments[4]; - sprite->data4 = gFieldEffectArguments[5]; - sprite->data5 = gFieldEffectArguments[6]; + sprite->data[0] = gFieldEffectArguments[2]; + sprite->data[1] = gFieldEffectArguments[0]; + sprite->data[2] = gFieldEffectArguments[1]; + sprite->data[3] = gFieldEffectArguments[4]; + sprite->data[4] = gFieldEffectArguments[5]; + sprite->data[5] = gFieldEffectArguments[6]; if (gFieldEffectArguments[7]) { SeekSpriteAnim(sprite, 6); @@ -429,31 +429,31 @@ void unc_grass_tall(struct Sprite *sprite) u8 mapObjectId; struct MapObject *mapObject; - mapNum = sprite->data5 >> 8; - mapGroup = sprite->data5; + mapNum = sprite->data[5] >> 8; + mapGroup = sprite->data[5]; if (gCamera.field_0 && (gSaveBlock1.location.mapNum != mapNum || gSaveBlock1.location.mapGroup != mapGroup)) { - sprite->data1 -= gCamera.x; - sprite->data2 -= gCamera.y; - sprite->data5 = ((u8)gSaveBlock1.location.mapNum << 8) | (u8)gSaveBlock1.location.mapGroup; + sprite->data[1] -= gCamera.x; + sprite->data[2] -= gCamera.y; + sprite->data[5] = ((u8)gSaveBlock1.location.mapNum << 8) | (u8)gSaveBlock1.location.mapGroup; } - localId = sprite->data3 >> 8; - mapNum = sprite->data3; - mapGroup = sprite->data4; - metatileBehavior = MapGridGetMetatileBehaviorAt(sprite->data1, sprite->data2); - if (TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId) || !MetatileBehavior_IsLongGrass(metatileBehavior) || (sprite->data7 && sprite->animEnded)) + localId = sprite->data[3] >> 8; + mapNum = sprite->data[3]; + mapGroup = sprite->data[4]; + metatileBehavior = MapGridGetMetatileBehaviorAt(sprite->data[1], sprite->data[2]); + if (TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId) || !MetatileBehavior_IsLongGrass(metatileBehavior) || (sprite->data[7] && sprite->animEnded)) { FieldEffectStop(sprite, FLDEFF_LONG_GRASS); } else { mapObject = &gMapObjects[mapObjectId]; - if ((mapObject->coords2.x != sprite->data1 || mapObject->coords2.y != sprite->data2) && (mapObject->coords3.x != sprite->data1 || mapObject->coords3.y != sprite->data2)) + if ((mapObject->coords2.x != sprite->data[1] || mapObject->coords2.y != sprite->data[2]) && (mapObject->coords3.x != sprite->data[1] || mapObject->coords3.y != sprite->data[2])) { - sprite->data7 = TRUE; + sprite->data[7] = TRUE; } sub_806487C(sprite, 0); - sub_812882C(sprite, sprite->data0, 0); + sub_812882C(sprite, sprite->data[0], 0); } } @@ -469,8 +469,8 @@ u32 FldEff_JumpLongGrass(void) sprite = &gSprites[spriteId]; sprite->coordOffsetEnabled = TRUE; sprite->oam.priority = gFieldEffectArguments[3]; - sprite->data0 = gFieldEffectArguments[2]; - sprite->data1 = 18; + sprite->data[0] = gFieldEffectArguments[2]; + sprite->data[1] = 18; } return 0; } @@ -490,11 +490,11 @@ u32 FldEff_ShortGrass(void) sprite = &(gSprites[spriteId]); sprite->coordOffsetEnabled = TRUE; sprite->oam.priority = gSprites[mapObject->spriteId].oam.priority; - sprite->data0 = gFieldEffectArguments[0]; - sprite->data1 = gFieldEffectArguments[1]; - sprite->data2 = gFieldEffectArguments[2]; - sprite->data3 = gSprites[mapObject->spriteId].pos1.x; - sprite->data4 = gSprites[mapObject->spriteId].pos1.y; + sprite->data[0] = gFieldEffectArguments[0]; + sprite->data[1] = gFieldEffectArguments[1]; + sprite->data[2] = gFieldEffectArguments[2]; + sprite->data[3] = gSprites[mapObject->spriteId].pos1.x; + sprite->data[4] = gSprites[mapObject->spriteId].pos1.y; } return 0; } @@ -507,7 +507,7 @@ void sub_8127334(struct Sprite *sprite) const struct MapObjectGraphicsInfo *graphicsInfo; struct Sprite *linkedSprite; - if (TryGetFieldObjectIdByLocalIdAndMap(sprite->data0, sprite->data1, sprite->data2, &mapObjectId) || !gMapObjects[mapObjectId].mapobj_bit_18) + if (TryGetFieldObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &mapObjectId) || !gMapObjects[mapObjectId].mapobj_bit_18) { FieldEffectStop(sprite, FLDEFF_SHORT_GRASS); } @@ -517,10 +517,10 @@ void sub_8127334(struct Sprite *sprite) linkedSprite = &gSprites[gMapObjects[mapObjectId].spriteId]; y = linkedSprite->pos1.y; x = linkedSprite->pos1.x; - if (x != sprite->data3 || y != sprite->data4) + if (x != sprite->data[3] || y != sprite->data[4]) { - sprite->data3 = x; - sprite->data4 = y; + sprite->data[3] = x; + sprite->data[4] = y; if (sprite->animEnded) { StartSpriteAnim(sprite, 0); @@ -547,7 +547,7 @@ u32 FldEff_SandFootprints(void) sprite = &gSprites[spriteId]; sprite->coordOffsetEnabled = TRUE; sprite->oam.priority = gFieldEffectArguments[3]; - sprite->data7 = FLDEFF_SAND_FOOTPRINTS; + sprite->data[7] = FLDEFF_SAND_FOOTPRINTS; StartSpriteAnim(sprite, gFieldEffectArguments[4]); } return 0; @@ -565,7 +565,7 @@ u32 FldEff_DeepSandFootprints(void) sprite = &gSprites[spriteId]; sprite->coordOffsetEnabled = TRUE; sprite->oam.priority = gFieldEffectArguments[3]; - sprite->data7 = FLDEFF_DEEP_SAND_FOOTPRINTS; + sprite->data[7] = FLDEFF_DEEP_SAND_FOOTPRINTS; StartSpriteAnim(sprite, gFieldEffectArguments[4]); } return spriteId; @@ -583,7 +583,7 @@ u32 FldEff_BikeTireTracks(void) sprite = &gSprites[spriteId]; sprite->coordOffsetEnabled = TRUE; sprite->oam.priority = gFieldEffectArguments[3]; - sprite->data7 = FLDEFF_BIKE_TIRE_TRACKS; + sprite->data[7] = FLDEFF_BIKE_TIRE_TRACKS; StartSpriteAnim(sprite, gFieldEffectArguments[4]); } return spriteId; @@ -591,14 +591,14 @@ u32 FldEff_BikeTireTracks(void) void sub_8127584(struct Sprite *sprite) { - gUnknown_08401E40[sprite->data0](sprite); + gUnknown_08401E40[sprite->data[0]](sprite); } static void sub_81275A0(struct Sprite *sprite) { - if (++sprite->data1 > 40) + if (++sprite->data[1] > 40) { - sprite->data0 = 1; + sprite->data[0] = 1; } sub_806487C(sprite, FALSE); } @@ -606,11 +606,11 @@ static void sub_81275A0(struct Sprite *sprite) static void sub_81275C4(struct Sprite *sprite) { sprite->invisible ^= 1; - sprite->data1 ++; + sprite->data[1] ++; sub_806487C(sprite, sprite->invisible); - if (sprite->data1 > 56) + if (sprite->data[1] > 56) { - FieldEffectStop(sprite, sprite->data7); + FieldEffectStop(sprite, sprite->data[7]); } } @@ -633,9 +633,9 @@ u32 FldEff_Splash(void) sprite->coordOffsetEnabled = TRUE; linkedSprite = &gSprites[mapObject->spriteId]; sprite->oam.priority = linkedSprite->oam.priority; - sprite->data0 = gFieldEffectArguments[0]; - sprite->data1 = gFieldEffectArguments[1]; - sprite->data2 = gFieldEffectArguments[2]; + sprite->data[0] = gFieldEffectArguments[0]; + sprite->data[1] = gFieldEffectArguments[1]; + sprite->data[2] = gFieldEffectArguments[2]; sprite->pos2.y = (graphicsInfo->height >> 1) - 4; PlaySE(SE_MIZU); } @@ -646,7 +646,7 @@ void sub_81276B4(struct Sprite *sprite) { u8 mapObjectId; - if (sprite->animEnded || TryGetFieldObjectIdByLocalIdAndMap(sprite->data0, sprite->data1, sprite->data2, &mapObjectId)) + if (sprite->animEnded || TryGetFieldObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &mapObjectId)) { FieldEffectStop(sprite, FLDEFF_SPLASH); } @@ -670,8 +670,8 @@ u32 FldEff_JumpSmallSplash(void) sprite = &gSprites[spriteId]; sprite->coordOffsetEnabled = TRUE; sprite->oam.priority = gFieldEffectArguments[3]; - sprite->data0 = gFieldEffectArguments[2]; - sprite->data1 = FLDEFF_JUMP_SMALL_SPLASH; + sprite->data[0] = gFieldEffectArguments[2]; + sprite->data[1] = FLDEFF_JUMP_SMALL_SPLASH; } return 0; } @@ -688,8 +688,8 @@ u32 FldEff_JumpBigSplash(void) sprite = &gSprites[spriteId]; sprite->coordOffsetEnabled = TRUE; sprite->oam.priority = gFieldEffectArguments[3]; - sprite->data0 = gFieldEffectArguments[2]; - sprite->data1 = FLDEFF_JUMP_BIG_SPLASH; + sprite->data[0] = gFieldEffectArguments[2]; + sprite->data[1] = FLDEFF_JUMP_BIG_SPLASH; } return 0; } @@ -712,11 +712,11 @@ u32 FldEff_FeetInFlowingWater(void) sprite->callback = sub_81278D8; sprite->coordOffsetEnabled = TRUE; sprite->oam.priority = gSprites[mapObject->spriteId].oam.priority; - sprite->data0 = gFieldEffectArguments[0]; - sprite->data1 = gFieldEffectArguments[1]; - sprite->data2 = gFieldEffectArguments[2]; - sprite->data3 = -1; - sprite->data4 = -1; + sprite->data[0] = gFieldEffectArguments[0]; + sprite->data[1] = gFieldEffectArguments[1]; + sprite->data[2] = gFieldEffectArguments[2]; + sprite->data[3] = -1; + sprite->data[4] = -1; sprite->pos2.y = (graphicsInfo->height >> 1) - 4; StartSpriteAnim(sprite, 1); } @@ -729,7 +729,7 @@ static void sub_81278D8(struct Sprite *sprite) struct Sprite *linkedSprite; struct MapObject *mapObject; - if (TryGetFieldObjectIdByLocalIdAndMap(sprite->data0, sprite->data1, sprite->data2, &mapObjectId) || !gMapObjects[mapObjectId].mapobj_bit_19) + if (TryGetFieldObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &mapObjectId) || !gMapObjects[mapObjectId].mapobj_bit_19) { FieldEffectStop(sprite, FLDEFF_FEET_IN_FLOWING_WATER); } @@ -741,10 +741,10 @@ static void sub_81278D8(struct Sprite *sprite) sprite->pos1.y = linkedSprite->pos1.y; sprite->subpriority = linkedSprite->subpriority; sub_806487C(sprite, FALSE); - if (mapObject->coords2.x != sprite->data3 || mapObject->coords2.y != sprite->data4) + if (mapObject->coords2.x != sprite->data[3] || mapObject->coords2.y != sprite->data[4]) { - sprite->data3 = mapObject->coords2.x; - sprite->data4 = mapObject->coords2.y; + sprite->data[3] = mapObject->coords2.x; + sprite->data[4] = mapObject->coords2.y; if (!sprite->invisible) { PlaySE(SE_MIZU); @@ -764,7 +764,7 @@ u32 FldEff_Ripple(void) sprite = &gSprites[spriteId]; sprite->coordOffsetEnabled = TRUE; sprite->oam.priority = gFieldEffectArguments[3]; - sprite->data0 = FLDEFF_RIPPLE; + sprite->data[0] = FLDEFF_RIPPLE; } return 0; } @@ -784,11 +784,11 @@ u32 FldEff_HotSpringsWater(void) sprite = &gSprites[spriteId]; sprite->coordOffsetEnabled = TRUE; sprite->oam.priority = gSprites[mapObject->spriteId].oam.priority; - sprite->data0 = gFieldEffectArguments[0]; - sprite->data1 = gFieldEffectArguments[1]; - sprite->data2 = gFieldEffectArguments[2]; - sprite->data3 = gSprites[mapObject->spriteId].pos1.x; - sprite->data4 = gSprites[mapObject->spriteId].pos1.y; + sprite->data[0] = gFieldEffectArguments[0]; + sprite->data[1] = gFieldEffectArguments[1]; + sprite->data[2] = gFieldEffectArguments[2]; + sprite->data[3] = gSprites[mapObject->spriteId].pos1.x; + sprite->data[4] = gSprites[mapObject->spriteId].pos1.y; } return 0; } @@ -799,7 +799,7 @@ void sub_8127A7C(struct Sprite *sprite) const struct MapObjectGraphicsInfo *graphicsInfo; struct Sprite *linkedSprite; - if (TryGetFieldObjectIdByLocalIdAndMap(sprite->data0, sprite->data1, sprite->data2, &mapObjectId) || !gMapObjects[mapObjectId].mapobj_bit_21) + if (TryGetFieldObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &mapObjectId) || !gMapObjects[mapObjectId].mapobj_bit_21) { FieldEffectStop(sprite, FLDEFF_HOT_SPRINGS_WATER); } @@ -826,7 +826,7 @@ u32 FldEff_Unknown19(void) sprite = &gSprites[spriteId]; sprite->coordOffsetEnabled = TRUE; sprite->oam.priority = gFieldEffectArguments[3]; - sprite->data0 = FLDEFF_UNKNOWN_19; + sprite->data[0] = FLDEFF_UNKNOWN_19; } return 0; } @@ -843,7 +843,7 @@ u32 FldEff_Unknown20(void) sprite = &gSprites[spriteId]; sprite->coordOffsetEnabled = TRUE; sprite->oam.priority = gFieldEffectArguments[3]; - sprite->data0 = FLDEFF_UNKNOWN_20; + sprite->data[0] = FLDEFF_UNKNOWN_20; } return 0; } @@ -860,7 +860,7 @@ u32 FldEff_Unknown21(void) sprite = &gSprites[spriteId]; sprite->coordOffsetEnabled = TRUE; sprite->oam.priority = gFieldEffectArguments[3]; - sprite->data0 = FLDEFF_UNKNOWN_21; + sprite->data[0] = FLDEFF_UNKNOWN_21; } return 0; } @@ -877,7 +877,7 @@ u32 FldEff_Unknown22(void) sprite = &gSprites[spriteId]; sprite->coordOffsetEnabled = TRUE; sprite->oam.priority = gFieldEffectArguments[3]; - sprite->data0 = FLDEFF_UNKNOWN_22; + sprite->data[0] = FLDEFF_UNKNOWN_22; } return 0; } @@ -909,26 +909,26 @@ u32 FldEff_Ash(void) sprite = &gSprites[spriteId]; sprite->coordOffsetEnabled = TRUE; sprite->oam.priority = gFieldEffectArguments[3]; - sprite->data1 = gFieldEffectArguments[0]; - sprite->data2 = gFieldEffectArguments[1]; - sprite->data3 = gFieldEffectArguments[4]; - sprite->data4 = gFieldEffectArguments[5]; + sprite->data[1] = gFieldEffectArguments[0]; + sprite->data[2] = gFieldEffectArguments[1]; + sprite->data[3] = gFieldEffectArguments[4]; + sprite->data[4] = gFieldEffectArguments[5]; } return 0; } void sub_8127D84(struct Sprite *sprite) { - gUnknown_08401E48[sprite->data0](sprite); + gUnknown_08401E48[sprite->data[0]](sprite); } static void sub_8127DA0(struct Sprite *sprite) { sprite->invisible = TRUE; sprite->animPaused = TRUE; - if (--sprite->data4 == 0) + if (--sprite->data[4] == 0) { - sprite->data0 = 1; + sprite->data[0] = 1; } } @@ -936,10 +936,10 @@ static void sub_8127DD0(struct Sprite *sprite) { sprite->invisible = FALSE; sprite->animPaused = FALSE; - MapGridSetMetatileIdAt(sprite->data1, sprite->data2, sprite->data3); - CurrentMapDrawMetatileAt(sprite->data1, sprite->data2); + MapGridSetMetatileIdAt(sprite->data[1], sprite->data[2], sprite->data[3]); + CurrentMapDrawMetatileAt(sprite->data[1], sprite->data[2]); gMapObjects[gPlayerAvatar.mapObjectId].mapobj_bit_2 = TRUE; - sprite->data0 = 2; + sprite->data[0] = 2; } static void sub_8127E30(struct Sprite *sprite) @@ -963,10 +963,10 @@ u32 FldEff_SurfBlob(void) sprite = &gSprites[spriteId]; sprite->coordOffsetEnabled = TRUE; sprite->oam.paletteNum = 0; - sprite->data2 = gFieldEffectArguments[2]; - sprite->data3 = -1; - sprite->data6 = -1; - sprite->data7 = -1; + sprite->data[2] = gFieldEffectArguments[2]; + sprite->data[3] = -1; + sprite->data[6] = -1; + sprite->data[7] = -1; } FieldEffectActiveListRemove(FLDEFF_SURF_BLOB); return spriteId; @@ -974,33 +974,33 @@ u32 FldEff_SurfBlob(void) void sub_8127ED0(u8 spriteId, u8 value) { - gSprites[spriteId].data0 = (gSprites[spriteId].data0 & ~0xF) | (value & 0xF); + gSprites[spriteId].data[0] = (gSprites[spriteId].data[0] & ~0xF) | (value & 0xF); } void sub_8127EFC(u8 spriteId, u8 value) { - gSprites[spriteId].data0 = (gSprites[spriteId].data0 & ~0xF0) | ((value & 0xF) << 4); + gSprites[spriteId].data[0] = (gSprites[spriteId].data[0] & ~0xF0) | ((value & 0xF) << 4); } void sub_8127F28(u8 spriteId, u8 value, s16 data1) { - gSprites[spriteId].data0 = (gSprites[spriteId].data0 & ~0xF00) | ((value & 0xF) << 8); - gSprites[spriteId].data1 = data1; + gSprites[spriteId].data[0] = (gSprites[spriteId].data[0] & ~0xF00) | ((value & 0xF) << 8); + gSprites[spriteId].data[1] = data1; } static u8 sub_8127F5C(struct Sprite *sprite) { - return sprite->data0 & 0xF; + return sprite->data[0] & 0xF; } static u8 sub_8127F64(struct Sprite *sprite) { - return (sprite->data0 & 0xF0) >> 4; + return (sprite->data[0] & 0xF0) >> 4; } static u8 sub_8127F70(struct Sprite *sprite) { - return (sprite->data0 & 0xF00) >> 8; + return (sprite->data[0] & 0xF00) >> 8; } void sub_8127F7C(struct Sprite *sprite) @@ -1008,7 +1008,7 @@ void sub_8127F7C(struct Sprite *sprite) struct MapObject *mapObject; struct Sprite *linkedSprite; - mapObject = &gMapObjects[sprite->data2]; + mapObject = &gMapObjects[sprite->data[2]]; linkedSprite = &gSprites[mapObject->spriteId]; sub_8127FD4(mapObject, sprite); sub_812800C(mapObject, sprite); @@ -1036,15 +1036,15 @@ static void sub_812800C(struct MapObject *mapObject, struct Sprite *sprite) x = mapObject->coords2.x; y = mapObject->coords2.y; - if (sprite->pos2.y == 0 && (x != sprite->data6 || y != sprite->data7)) + if (sprite->pos2.y == 0 && (x != sprite->data[6] || y != sprite->data[7])) { - sprite->data5 = sprite->pos2.y; - for (sprite->data6 = x, sprite->data7 = y, i = DIR_SOUTH; i <= DIR_EAST; i ++, x = sprite->data6, y = sprite->data7) + sprite->data[5] = sprite->pos2.y; + for (sprite->data[6] = x, sprite->data[7] = y, i = DIR_SOUTH; i <= DIR_EAST; i ++, x = sprite->data[6], y = sprite->data[7]) { MoveCoords(i, &x, &y); if (MapGridGetZCoordAt(x, y) == 3) { - sprite->data5 ++; + sprite->data[5] ++; break; } } @@ -1141,13 +1141,13 @@ static void sub_81280A0(struct MapObject *mapObject, struct Sprite *linkedSprite v0 = sub_8127F5C(sprite); if (v0 != 0) { - if (((u16)(++ sprite->data4) & unk_8401E5A[sprite->data5]) == 0) + if (((u16)(++ sprite->data[4]) & unk_8401E5A[sprite->data[5]]) == 0) { - sprite->pos2.y += sprite->data3; + sprite->pos2.y += sprite->data[3]; } - if ((sprite->data4 & 0x0F) == 0) + if ((sprite->data[4] & 0x0F) == 0) { - sprite->data3 = -sprite->data3; + sprite->data[3] = -sprite->data[3]; } if (v0 != 2) { @@ -1157,7 +1157,7 @@ static void sub_81280A0(struct MapObject *mapObject, struct Sprite *linkedSprite } else { - linkedSprite->pos2.y = sprite->data1 + sprite->pos2.y; + linkedSprite->pos2.y = sprite->data[1] + sprite->pos2.y; } sprite->pos1.x = linkedSprite->pos1.x; sprite->pos1.y = linkedSprite->pos1.y + 8; @@ -1174,8 +1174,8 @@ u8 sub_8128124(u8 oldSpriteId) sprite = &gSprites[spriteId]; sprite->callback = sub_8128174; sprite->invisible = TRUE; - sprite->data0 = oldSpriteId; - sprite->data1 = 1; + sprite->data[0] = oldSpriteId; + sprite->data[1] = 1; return spriteId; } @@ -1183,14 +1183,14 @@ static void sub_8128174(struct Sprite *sprite) { struct Sprite *oldSprite; - oldSprite = &gSprites[sprite->data0]; - if (((sprite->data2++) & 0x03) == 0) + oldSprite = &gSprites[sprite->data[0]]; + if (((sprite->data[2]++) & 0x03) == 0) { - oldSprite->pos2.y += sprite->data1; + oldSprite->pos2.y += sprite->data[1]; } - if ((sprite->data2 & 0x0F) == 0) + if ((sprite->data[2] & 0x0F) == 0) { - sprite->data1 = -sprite->data1; + sprite->data[1] = -sprite->data[1]; } } @@ -1206,8 +1206,8 @@ u32 FldEff_Dust(void) sprite = &gSprites[spriteId]; sprite->coordOffsetEnabled = TRUE; sprite->oam.priority = gFieldEffectArguments[3]; - sprite->data0 = gFieldEffectArguments[2]; - sprite->data1 = 10; + sprite->data[0] = gFieldEffectArguments[2]; + sprite->data[1] = 10; } return 0; } @@ -1229,11 +1229,11 @@ u32 FldEff_SandPile(void) sprite = &gSprites[spriteId]; sprite->coordOffsetEnabled = TRUE; sprite->oam.priority = gSprites[mapObject->spriteId].oam.priority; - sprite->data0 = gFieldEffectArguments[0]; - sprite->data1 = gFieldEffectArguments[1]; - sprite->data2 = gFieldEffectArguments[2]; - sprite->data3 = gSprites[mapObject->spriteId].pos1.x; - sprite->data4 = gSprites[mapObject->spriteId].pos1.y; + sprite->data[0] = gFieldEffectArguments[0]; + sprite->data[1] = gFieldEffectArguments[1]; + sprite->data[2] = gFieldEffectArguments[2]; + sprite->data[3] = gSprites[mapObject->spriteId].pos1.x; + sprite->data[4] = gSprites[mapObject->spriteId].pos1.y; sprite->pos2.y = (graphicsInfo->height >> 1) - 2; SeekSpriteAnim(sprite, 2); } @@ -1246,7 +1246,7 @@ void sub_81282E0(struct Sprite *sprite) s16 x; s16 y; - if (TryGetFieldObjectIdByLocalIdAndMap(sprite->data0, sprite->data1, sprite->data2, &mapObjectId) || !gMapObjects[mapObjectId].mapobj_bit_20) + if (TryGetFieldObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &mapObjectId) || !gMapObjects[mapObjectId].mapobj_bit_20) { FieldEffectStop(sprite, FLDEFF_SAND_PILE); } @@ -1254,10 +1254,10 @@ void sub_81282E0(struct Sprite *sprite) { y = gSprites[gMapObjects[mapObjectId].spriteId].pos1.y; x = gSprites[gMapObjects[mapObjectId].spriteId].pos1.x; - if (x != sprite->data3 || y != sprite->data4) + if (x != sprite->data[3] || y != sprite->data[4]) { - sprite->data3 = x; - sprite->data4 = y; + sprite->data[3] = x; + sprite->data[4] = y; if (sprite->animEnded) { StartSpriteAnim(sprite, 0); @@ -1288,9 +1288,9 @@ u32 FldEff_Bubbles(void) void sub_8128410(struct Sprite *sprite) { - sprite->data0 += 0x80; - sprite->data0 &= 0x100; - sprite->pos1.y -= sprite->data0 >> 8; + sprite->data[0] += 0x80; + sprite->data[0] &= 0x100; + sprite->pos1.y -= sprite->data[0] >> 8; sub_806487C(sprite, FALSE); if (sprite->invisible || sprite->animEnded) { @@ -1311,7 +1311,7 @@ u32 FldEff_BerryTreeGrowthSparkle(void) sprite->coordOffsetEnabled = TRUE; sprite->oam.priority = gFieldEffectArguments[3]; sprite->oam.paletteNum = 5; - sprite->data0 = FLDEFF_BERRY_TREE_GROWTH_SPARKLE; + sprite->data[0] = FLDEFF_BERRY_TREE_GROWTH_SPARKLE; } return 0; } @@ -1349,10 +1349,10 @@ static u32 ShowDisguiseFieldEffect(u8 fldEff, u8 templateIdx, u8 paletteNum) sprite = &gSprites[spriteId]; sprite->coordOffsetEnabled ++; sprite->oam.paletteNum = paletteNum; - sprite->data1 = fldEff; - sprite->data2 = gFieldEffectArguments[0]; - sprite->data3 = gFieldEffectArguments[1]; - sprite->data4 = gFieldEffectArguments[2]; + sprite->data[1] = fldEff; + sprite->data[2] = gFieldEffectArguments[0]; + sprite->data[3] = gFieldEffectArguments[1]; + sprite->data[4] = gFieldEffectArguments[2]; } return spriteId; } @@ -1363,9 +1363,9 @@ void sub_81285AC(struct Sprite *sprite) const struct MapObjectGraphicsInfo *graphicsInfo; struct Sprite *linkedSprite; - if (TryGetFieldObjectIdByLocalIdAndMap(sprite->data2, sprite->data3, sprite->data4, &mapObjectId)) + if (TryGetFieldObjectIdByLocalIdAndMap(sprite->data[2], sprite->data[3], sprite->data[4], &mapObjectId)) { - FieldEffectStop(sprite, sprite->data1); + FieldEffectStop(sprite, sprite->data[1]); } // else { graphicsInfo = GetFieldObjectGraphicsInfo(gMapObjects[mapObjectId].graphicsId); @@ -1374,18 +1374,18 @@ void sub_81285AC(struct Sprite *sprite) sprite->pos1.x = linkedSprite->pos1.x; sprite->pos1.y = (graphicsInfo->height >> 1) + linkedSprite->pos1.y - 16; sprite->subpriority = linkedSprite->subpriority - 1; - if (sprite->data0 == 1) + if (sprite->data[0] == 1) { - sprite->data0 ++; + sprite->data[0] ++; StartSpriteAnim(sprite, 1); } - if (sprite->data0 == 2 && sprite->animEnded) + if (sprite->data[0] == 2 && sprite->animEnded) { - sprite->data7 = 1; + sprite->data[7] = 1; } - if (sprite->data0 == 3) + if (sprite->data[0] == 3) { - FieldEffectStop(sprite, sprite->data1); + FieldEffectStop(sprite, sprite->data[1]); } // } } @@ -1394,7 +1394,7 @@ void sub_812869C(struct MapObject *mapObject) { if (mapObject->mapobj_unk_21 == 1) { - gSprites[mapObject->mapobj_unk_1A].data0 ++; + gSprites[mapObject->mapobj_unk_1A].data[0] ++; } } @@ -1411,10 +1411,10 @@ bool8 sub_81286C4(struct MapObject *mapObject) return TRUE; } sprite = &gSprites[mapObject->mapobj_unk_1A]; - if (sprite->data7) + if (sprite->data[7]) { mapObject->mapobj_unk_21 = 2; - sprite->data0 ++; + sprite->data[0] ++; return TRUE; } return FALSE; @@ -1438,19 +1438,19 @@ u32 FldEff_Sparkle(void) void sub_8128774(struct Sprite *sprite) { - if (sprite->data0 == 0) + if (sprite->data[0] == 0) { if (sprite->animEnded) { sprite->invisible = TRUE; - sprite->data0 ++; + sprite->data[0] ++; } - if (sprite->data0 == 0) + if (sprite->data[0] == 0) { return; } } - if (++ sprite->data1 >= 35) + if (++ sprite->data[1] >= 35) { FieldEffectStop(sprite, FLDEFF_SPARKLE); } @@ -1460,12 +1460,12 @@ void sub_81287C4(struct Sprite *sprite) { if (sprite->animEnded) { - FieldEffectStop(sprite, sprite->data1); + FieldEffectStop(sprite, sprite->data[1]); } else { sub_806487C(sprite, FALSE); - SetObjectSubpriorityByZCoord(sprite->data0, sprite, 0); + SetObjectSubpriorityByZCoord(sprite->data[0], sprite, 0); } } @@ -1473,7 +1473,7 @@ void sub_8128800(struct Sprite *sprite) { if (sprite->animEnded) { - FieldEffectStop(sprite, sprite->data0); + FieldEffectStop(sprite, sprite->data[0]); } else { diff --git a/src/field/field_map_obj.c b/src/field/field_map_obj.c index 74ef3b7fe..98f6fedab 100644 --- a/src/field/field_map_obj.c +++ b/src/field/field_map_obj.c @@ -2343,7 +2343,7 @@ u8 sub_805AFCC(struct MapObjectTemplate *mapObjTemplate, struct SpriteTemplate * sprite->pos1.y += 16 + sprite->centerToCornerVecY; sprite->oam.paletteNum = gfxInfo->paletteSlot; sprite->coordOffsetEnabled = TRUE; - sprite->data0 = mapObjectId; + sprite->data[0] = mapObjectId; mapObject->spriteId = spriteId; mapObject->mapobj_bit_12 = gfxInfo->inanimate; if (!mapObject->mapobj_bit_12) @@ -2489,8 +2489,8 @@ u8 sub_805B410(u8 graphicsId, u8 b, s16 x, s16 y, u8 elevation, u8 direction) sprite->pos1.y += sprite->centerToCornerVecY; sprite->oam.paletteNum = gfxInfo->paletteSlot; sprite->coordOffsetEnabled = TRUE; - sprite->data0 = b; - sprite->data1 = elevation; + sprite->data[0] = b; + sprite->data[1] = elevation; if (gfxInfo->paletteSlot == 10) npc_load_two_palettes__and_record(gfxInfo->paletteTag1, gfxInfo->paletteSlot); if (subspriteTables != NULL) @@ -2640,7 +2640,7 @@ void sub_805B75C(u8 a, s16 b, s16 c) SetSubspriteTables(sprite, subspriteTables); sprite->oam.paletteNum = gfxInfo->paletteSlot; sprite->coordOffsetEnabled = TRUE; - sprite->data0 = a; + sprite->data[0] = a; mapObject->spriteId = spriteId; if (!mapObject->mapobj_bit_12 && mapObject->animPattern != 11) StartSpriteAnim(sprite, FieldObjectDirectionToImageAnimId(mapObject->mapobj_unk_18)); @@ -3042,7 +3042,7 @@ u8 AddCameraObject(u8 a) u8 spriteId = CreateSprite(&gSpriteTemplate_830FD24, 0, 0, 4); gSprites[spriteId].invisible = TRUE; - gSprites[spriteId].data0 = a; + gSprites[spriteId].data[0] = a; return spriteId; } @@ -3050,35 +3050,35 @@ void ObjectCB_CameraObject(struct Sprite *sprite) { void (*cameraObjectFuncs[3])(struct Sprite *); memcpy(cameraObjectFuncs, gCameraObjectFuncs, sizeof gCameraObjectFuncs); - cameraObjectFuncs[sprite->data1](sprite); + cameraObjectFuncs[sprite->data[1]](sprite); } void CameraObject_0(struct Sprite *sprite) { - sprite->pos1.x = gSprites[sprite->data0].pos1.x; - sprite->pos1.y = gSprites[sprite->data0].pos1.y; + sprite->pos1.x = gSprites[sprite->data[0]].pos1.x; + sprite->pos1.y = gSprites[sprite->data[0]].pos1.y; sprite->invisible = TRUE; - sprite->data1 = 1; + sprite->data[1] = 1; CameraObject_1(sprite); } void CameraObject_1(struct Sprite *sprite) { - s16 x = gSprites[sprite->data0].pos1.x; - s16 y = gSprites[sprite->data0].pos1.y; + s16 x = gSprites[sprite->data[0]].pos1.x; + s16 y = gSprites[sprite->data[0]].pos1.y; - sprite->data2 = x - sprite->pos1.x; - sprite->data3 = y - sprite->pos1.y; + sprite->data[2] = x - sprite->pos1.x; + sprite->data[3] = y - sprite->pos1.y; sprite->pos1.x = x; sprite->pos1.y = y; } void CameraObject_2(struct Sprite *sprite) { - sprite->pos1.x = gSprites[sprite->data0].pos1.x; - sprite->pos1.y = gSprites[sprite->data0].pos1.y; - sprite->data2 = 0; - sprite->data3 = 0; + sprite->pos1.x = gSprites[sprite->data[0]].pos1.x; + sprite->pos1.y = gSprites[sprite->data[0]].pos1.y; + sprite->data[2] = 0; + sprite->data[3] = 0; } struct Sprite *FindCameraObject(void) @@ -3099,7 +3099,7 @@ void CameraObjectReset1(void) if (cameraSprite != NULL) { - cameraSprite->data1 = 0; + cameraSprite->data[1] = 0; cameraSprite->callback(cameraSprite); } } @@ -3110,7 +3110,7 @@ void CameraObjectSetFollowedObjectId(u8 spriteId) if (cameraSprite != NULL) { - cameraSprite->data0 = spriteId; + cameraSprite->data[0] = spriteId; CameraObjectReset1(); } } @@ -3122,14 +3122,14 @@ u8 CameraObjectGetFollowedObjectId(void) if (cameraSprite == NULL) return 64; else - return cameraSprite->data0; + return cameraSprite->data[0]; } void CameraObjectReset2(void) { struct Sprite *cameraSprite = FindCameraObject(); - cameraSprite->data1 = 2; + cameraSprite->data[1] = 2; } u8 unref_sub_805C43C(struct Sprite *src, s16 x, s16 y, u8 subpriority) @@ -3333,7 +3333,7 @@ fieldmap_object_cb(sub_805C8AC, sub_805C8D0, gUnknown_08375224); u8 sub_805C8F0(struct MapObject *mapObject, struct Sprite *sprite) { npc_reset(mapObject, sprite); - sprite->data1 = 1; + sprite->data[1] = 1; return 1; } @@ -3342,7 +3342,7 @@ extern void FieldObjectSetRegularAnim(struct MapObject *, struct Sprite *, u8); u8 sub_805C904(struct MapObject *mapObject, struct Sprite *sprite) { FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); - sprite->data1 = 2; + sprite->data[1] = 2; return 1; } @@ -3356,7 +3356,7 @@ u8 sub_805C930(struct MapObject *mapObject, struct Sprite *sprite) return 0; } sub_8064820(sprite, gUnknown_0837520C[Random() & 3]); - sprite->data1 = 3; + sprite->data[1] = 3; return 1; } @@ -3366,7 +3366,7 @@ u8 sub_805C96C(struct MapObject *mapObject, struct Sprite *sprite) { if (sub_8064824(sprite) != 0) { - sprite->data1 = 4; + sprite->data[1] = 4; return 1; } return 0; @@ -3381,10 +3381,10 @@ u8 sub_805C98C(struct MapObject *mapObject, struct Sprite *sprite) memcpy(directions, gUnknown_08375240, 4); direction = directions[Random() & 3]; FieldObjectSetDirection(mapObject, direction); - sprite->data1 = 5; + sprite->data[1] = 5; if (sub_805FF20(mapObject, direction) != 0) { - sprite->data1 = 1; + sprite->data[1] = 1; } return 1; } @@ -3393,7 +3393,7 @@ u8 sub_805C9D8(struct MapObject *mapObject, struct Sprite *sprite) { FieldObjectSetRegularAnim(mapObject, sprite, GetGoSpeed0AnimId(mapObject->placeholder18)); mapObject->mapobj_bit_1 = 1; - sprite->data1 = 6; + sprite->data[1] = 6; return 1; } @@ -3402,7 +3402,7 @@ u8 sub_805CA08(struct MapObject *mapObject, struct Sprite *sprite) if (FieldObjectExecRegularAnim(mapObject, sprite) != 0) { mapObject->mapobj_bit_1 = 0; - sprite->data1 = 1; + sprite->data[1] = 1; } return 0; } @@ -3649,14 +3649,14 @@ fieldmap_object_cb(sub_805CDE8, sub_805CE0c, gUnknown_08375270); u8 sub_805CE2C(struct MapObject *mapObject, struct Sprite *sprite) { npc_reset(mapObject, sprite); - sprite->data1 = 1; + sprite->data[1] = 1; return 1; } u8 sub_805CE40(struct MapObject *mapObject, struct Sprite *sprite) { FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); - sprite->data1 = 2; + sprite->data[1] = 2; return 1; } @@ -3666,7 +3666,7 @@ u8 sub_805CE6C(struct MapObject *mapObject, struct Sprite *sprite) { sub_8064820(sprite, gUnknown_0837520C[Random() & 3]); mapObject->mapobj_bit_1 = 0; - sprite->data1 = 3; + sprite->data[1] = 3; } return 0; } @@ -3675,7 +3675,7 @@ u8 sub_805CEB0(struct MapObject *mapObject, struct Sprite *sprite) { if (sub_8064824(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject)) { - sprite->data1 = 4; + sprite->data[1] = 4; return 1; } return 0; @@ -3692,7 +3692,7 @@ u8 sub_805CEE0(struct MapObject *mapObject, struct Sprite *sprite) direction = directions[Random() & 3]; } FieldObjectSetDirection(mapObject, direction); - sprite->data1 = 1; + sprite->data[1] = 1; return 1; } @@ -3701,14 +3701,14 @@ fieldmap_object_cb(sub_805CF28, sub_805CF4C, gUnknown_08375284); u8 sub_805CF6C(struct MapObject *mapObject, struct Sprite *sprite) { npc_reset(mapObject, sprite); - sprite->data1 = 1; + sprite->data[1] = 1; return 1; } u8 sub_805CF80(struct MapObject *mapObject, struct Sprite *sprite) { FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); - sprite->data1 = 2; + sprite->data[1] = 2; return 1; } @@ -3719,7 +3719,7 @@ u8 sub_805CFAC(struct MapObject *mapObject, struct Sprite *sprite) return 0; } sub_8064820(sprite, gUnknown_0837520C[Random() & 3]); - sprite->data1 = 3; + sprite->data[1] = 3; return 1; } @@ -3727,7 +3727,7 @@ u8 sub_805CFE8(struct MapObject *mapObject, struct Sprite *sprite) { if (sub_8064824(sprite) != 0) { - sprite->data1 = 4; + sprite->data[1] = 4; return 1; } return 0; @@ -3740,10 +3740,10 @@ u8 sub_805D008(struct MapObject *mapObject, struct Sprite *sprite) memcpy(directions, gUnknown_083752A0, 2); direction = directions[Random() & 1]; FieldObjectSetDirection(mapObject, direction); - sprite->data1 = 5; + sprite->data[1] = 5; if (sub_805FF20(mapObject, direction) != 0) { - sprite->data1 = 1; + sprite->data[1] = 1; } return 1; } @@ -3752,7 +3752,7 @@ u8 sub_805D054(struct MapObject *mapObject, struct Sprite *sprite) { FieldObjectSetRegularAnim(mapObject, sprite, GetGoSpeed0AnimId(mapObject->placeholder18)); mapObject->mapobj_bit_1 = 1; - sprite->data1 = 6; + sprite->data[1] = 6; return 1; } @@ -3761,7 +3761,7 @@ u8 sub_805D084(struct MapObject *mapObject, struct Sprite *sprite) if (FieldObjectExecRegularAnim(mapObject, sprite) != 0) { mapObject->mapobj_bit_1 = 0; - sprite->data1 = 1; + sprite->data[1] = 1; } return 0; } @@ -3771,14 +3771,14 @@ fieldmap_object_cb(sub_805D0AC, sub_805D0D0, gUnknown_083752A4); u8 sub_805D0F0(struct MapObject *mapObject, struct Sprite *sprite) { npc_reset(mapObject, sprite); - sprite->data1 = 1; + sprite->data[1] = 1; return 1; } u8 sub_805D104(struct MapObject *mapObject, struct Sprite *sprite) { FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); - sprite->data1 = 2; + sprite->data[1] = 2; return 1; } @@ -3789,7 +3789,7 @@ u8 sub_805D130(struct MapObject *mapObject, struct Sprite *sprite) return 0; } sub_8064820(sprite, gUnknown_0837520C[Random() & 3]); - sprite->data1 = 3; + sprite->data[1] = 3; return 1; } @@ -3797,7 +3797,7 @@ u8 sub_805D16C(struct MapObject *mapObject, struct Sprite *sprite) { if (sub_8064824(sprite) != 0) { - sprite->data1 = 4; + sprite->data[1] = 4; return 1; } return 0; @@ -3810,10 +3810,10 @@ u8 sub_805D18C(struct MapObject *mapObject, struct Sprite *sprite) memcpy(directions, gUnknown_083752C0, 2); direction = directions[Random() & 1]; FieldObjectSetDirection(mapObject, direction); - sprite->data1 = 5; + sprite->data[1] = 5; if (sub_805FF20(mapObject, direction) != 0) { - sprite->data1 = 1; + sprite->data[1] = 1; } return 1; } @@ -3822,7 +3822,7 @@ u8 sub_805D1D8(struct MapObject *mapObject, struct Sprite *sprite) { FieldObjectSetRegularAnim(mapObject, sprite, GetGoSpeed0AnimId(mapObject->placeholder18)); mapObject->mapobj_bit_1 = 1; - sprite->data1 = 6; + sprite->data[1] = 6; return 1; } @@ -3831,7 +3831,7 @@ u8 sub_805D208(struct MapObject *mapObject, struct Sprite *sprite) if (FieldObjectExecRegularAnim(mapObject, sprite) != 0) { mapObject->mapobj_bit_1 = 0; - sprite->data1 = 1; + sprite->data[1] = 1; } return 0; } @@ -3842,7 +3842,7 @@ u8 sub_805D274(struct MapObject *mapObject, struct Sprite *sprite) { npc_reset(mapObject, sprite); FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); - sprite->data1 = 1; + sprite->data[1] = 1; return 1; } @@ -3850,7 +3850,7 @@ u8 sub_805D2A0(struct MapObject *mapObject, struct Sprite *sprite) { if (FieldObjectExecRegularAnim(mapObject, sprite) != 0) { - sprite->data1 = 2; + sprite->data[1] = 2; return 1; } return 0; @@ -3867,18 +3867,18 @@ u8 sub_805D314(struct MapObject *mapObject, struct Sprite *sprite); void FieldObjectCB_BerryTree(struct Sprite *sprite) { struct MapObject *mapObject; - mapObject = &gMapObjects[sprite->data0]; - if (!(sprite->data7 & 1)) + mapObject = &gMapObjects[sprite->data[0]]; + if (!(sprite->data[7] & 1)) { get_berry_tree_graphics(mapObject, sprite); - sprite->data7 |= 1; + sprite->data[7] |= 1; } meta_step(mapObject, sprite, sub_805D314); } u8 sub_805D314(struct MapObject *mapObject, struct Sprite *sprite) { - return gUnknown_083752D0[sprite->data1](mapObject, sprite); + return gUnknown_083752D0[sprite->data[1]](mapObject, sprite); } u8 do_berry_tree_growth_sparkle_1(struct MapObject *mapObject, struct Sprite *sprite) @@ -3890,7 +3890,7 @@ u8 do_berry_tree_growth_sparkle_1(struct MapObject *mapObject, struct Sprite *sp berryTreeStage = GetStageByBerryTreeId(mapObject->trainerRange_berryTreeId); if (!berryTreeStage) { - if (!(sprite->data7 & 4) && sprite->animNum == 4) + if (!(sprite->data[7] & 4) && sprite->animNum == 4) { gFieldEffectArguments[0] = mapObject->coords2.x; gFieldEffectArguments[1] = mapObject->coords2.y; @@ -3906,12 +3906,12 @@ u8 do_berry_tree_growth_sparkle_1(struct MapObject *mapObject, struct Sprite *sp berryTreeStage--; if (sprite->animNum != berryTreeStage) { - sprite->data1 = 2; + sprite->data[1] = 2; return 1; } get_berry_tree_graphics(mapObject, sprite); FieldObjectSetRegularAnim(mapObject, sprite, 0x39); - sprite->data1 = 1; + sprite->data[1] = 1; return 1; } @@ -3919,7 +3919,7 @@ u8 sub_805D3EC(struct MapObject *mapObject, struct Sprite *sprite) { if (FieldObjectExecRegularAnim(mapObject, sprite)) { - sprite->data1 = 0; + sprite->data[1] = 0; return 1; } return 0; @@ -3928,9 +3928,9 @@ u8 sub_805D3EC(struct MapObject *mapObject, struct Sprite *sprite) u8 do_berry_tree_growth_sparkle_2(struct MapObject *mapObject, struct Sprite *sprite) { mapObject->mapobj_bit_1 = 1; - sprite->data1 = 3; - sprite->data2 = 0; - sprite->data7 |= 2; + sprite->data[1] = 3; + sprite->data[2] = 0; + sprite->data[7] |= 2; gFieldEffectArguments[0] = mapObject->coords2.x; gFieldEffectArguments[1] = mapObject->coords2.y; gFieldEffectArguments[2] = sprite->subpriority - 1; @@ -3941,14 +3941,14 @@ u8 do_berry_tree_growth_sparkle_2(struct MapObject *mapObject, struct Sprite *sp u8 sub_805D458(struct MapObject *mapObject, struct Sprite *sprite) { - sprite->data2++; - mapObject->mapobj_bit_13 = ((sprite->data2 & 0x2) >> 1); + sprite->data[2]++; + mapObject->mapobj_bit_13 = ((sprite->data[2] & 0x2) >> 1); sprite->animPaused = 1; - if (sprite->data2 > 64) + if (sprite->data[2] > 64) { get_berry_tree_graphics(mapObject, sprite); - sprite->data1 = 4; - sprite->data2 = 0; + sprite->data[1] = 4; + sprite->data[2] = 0; return 1; } return 0; @@ -3956,13 +3956,13 @@ u8 sub_805D458(struct MapObject *mapObject, struct Sprite *sprite) u8 sub_805D4A8(struct MapObject *mapObject, struct Sprite *sprite) { - sprite->data2++; - mapObject->mapobj_bit_13 = ((sprite->data2 & 0x2) >> 1); + sprite->data[2]++; + mapObject->mapobj_bit_13 = ((sprite->data[2] & 0x2) >> 1); sprite->animPaused = 1; - if (sprite->data2 > 64) + if (sprite->data[2] > 64) { - sprite->data1 = 0; - sprite->data7 &= (-3); + sprite->data[1] = 0; + sprite->data[7] &= (-3); return 1; } return 0; @@ -3973,14 +3973,14 @@ fieldmap_object_cb(sub_805D4F4, sub_805D518, gUnknown_083752E4); u8 sub_805D538(struct MapObject *mapObject, struct Sprite *sprite) { npc_reset(mapObject, sprite); - sprite->data1 = 1; + sprite->data[1] = 1; return 1; } u8 sub_805D54C(struct MapObject *mapObject, struct Sprite *sprite) { FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); - sprite->data1 = 2; + sprite->data[1] = 2; return 1; } @@ -3990,7 +3990,7 @@ u8 sub_805D578(struct MapObject *mapObject, struct Sprite *sprite) { sub_8064820(sprite, gUnknown_0837520C[Random() & 3]); mapObject->mapobj_bit_1 = 0; - sprite->data1 = 3; + sprite->data[1] = 3; } return 0; } @@ -3999,7 +3999,7 @@ u8 sub_805D5BC(struct MapObject *mapObject, struct Sprite *sprite) { if (sub_8064824(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject)) { - sprite->data1 = 4; + sprite->data[1] = 4; return 1; } return 0; @@ -4016,7 +4016,7 @@ u8 sub_805D5EC(struct MapObject *mapObject, struct Sprite *sprite) direction = directions[Random() & 1]; } FieldObjectSetDirection(mapObject, direction); - sprite->data1 = 1; + sprite->data[1] = 1; return 1; } @@ -4025,14 +4025,14 @@ fieldmap_object_cb(sub_805D634, sub_805D658, gUnknown_083752F8); u8 sub_805D678(struct MapObject *mapObject, struct Sprite *sprite) { npc_reset(mapObject, sprite); - sprite->data1 = 1; + sprite->data[1] = 1; return 1; } u8 sub_805D68C(struct MapObject *mapObject, struct Sprite *sprite) { FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); - sprite->data1 = 2; + sprite->data[1] = 2; return 1; } @@ -4042,7 +4042,7 @@ u8 sub_805D6B8(struct MapObject *mapObject, struct Sprite *sprite) { sub_8064820(sprite, gUnknown_0837520C[Random() & 3]); mapObject->mapobj_bit_1 = 0; - sprite->data1 = 3; + sprite->data[1] = 3; } return 0; } @@ -4051,7 +4051,7 @@ u8 sub_805D6FC(struct MapObject *mapObject, struct Sprite *sprite) { if (sub_8064824(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject)) { - sprite->data1 = 4; + sprite->data[1] = 4; return 1; } return 0; @@ -4068,7 +4068,7 @@ u8 sub_805D72C(struct MapObject *mapObject, struct Sprite *sprite) direction = directions[Random() & 1]; } FieldObjectSetDirection(mapObject, direction); - sprite->data1 = 1; + sprite->data[1] = 1; return 1; } @@ -4077,14 +4077,14 @@ fieldmap_object_cb(sub_805D774, sub_805D798, gUnknown_0837530C); u8 sub_805D7B8(struct MapObject *mapObject, struct Sprite *sprite) { npc_reset(mapObject, sprite); - sprite->data1 = 1; + sprite->data[1] = 1; return 1; } u8 sub_805D7CC(struct MapObject *mapObject, struct Sprite *sprite) { FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); - sprite->data1 = 2; + sprite->data[1] = 2; return 1; } @@ -4094,7 +4094,7 @@ u8 sub_805D7F8(struct MapObject *mapObject, struct Sprite *sprite) { sub_8064820(sprite, gUnknown_0837521C[Random() & 3]); mapObject->mapobj_bit_1 = 0; - sprite->data1 = 3; + sprite->data[1] = 3; } return 0; } @@ -4103,7 +4103,7 @@ u8 sub_805D83C(struct MapObject *mapObject, struct Sprite *sprite) { if (sub_8064824(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject)) { - sprite->data1 = 4; + sprite->data[1] = 4; return 1; } return 0; @@ -4120,7 +4120,7 @@ u8 sub_805D86C(struct MapObject *mapObject, struct Sprite *sprite) direction = directions[Random() & 1]; } FieldObjectSetDirection(mapObject, direction); - sprite->data1 = 1; + sprite->data[1] = 1; return 1; } @@ -4129,14 +4129,14 @@ fieldmap_object_cb(sub_805D8B4, sub_805D8D8, gUnknown_08375324); u8 sub_805D8F8(struct MapObject *mapObject, struct Sprite *sprite) { npc_reset(mapObject, sprite); - sprite->data1 = 1; + sprite->data[1] = 1; return 1; } u8 sub_805D90C(struct MapObject *mapObject, struct Sprite *sprite) { FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); - sprite->data1 = 2; + sprite->data[1] = 2; return 1; } @@ -4146,7 +4146,7 @@ u8 sub_805D938(struct MapObject *mapObject, struct Sprite *sprite) { sub_8064820(sprite, gUnknown_0837521C[Random() & 3]); mapObject->mapobj_bit_1 = 0; - sprite->data1 = 3; + sprite->data[1] = 3; } return 0; } @@ -4155,7 +4155,7 @@ u8 sub_805D97C(struct MapObject *mapObject, struct Sprite *sprite) { if (sub_8064824(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject)) { - sprite->data1 = 4; + sprite->data[1] = 4; return 1; } return 0; @@ -4172,7 +4172,7 @@ u8 sub_805D9AC(struct MapObject *mapObject, struct Sprite *sprite) direction = directions[Random() & 1]; } FieldObjectSetDirection(mapObject, direction); - sprite->data1 = 1; + sprite->data[1] = 1; return 1; } @@ -4181,14 +4181,14 @@ fieldmap_object_cb(sub_805D9F4, sub_805DA18, gUnknown_0837533C); u8 sub_805DA38(struct MapObject *mapObject, struct Sprite *sprite) { npc_reset(mapObject, sprite); - sprite->data1 = 1; + sprite->data[1] = 1; return 1; } u8 sub_805DA4C(struct MapObject *mapObject, struct Sprite *sprite) { FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); - sprite->data1 = 2; + sprite->data[1] = 2; return 1; } @@ -4198,7 +4198,7 @@ u8 sub_805DA78(struct MapObject *mapObject, struct Sprite *sprite) { sub_8064820(sprite, gUnknown_0837521C[Random() & 3]); mapObject->mapobj_bit_1 = 0; - sprite->data1 = 3; + sprite->data[1] = 3; } return 0; } @@ -4207,7 +4207,7 @@ u8 sub_805DABC(struct MapObject *mapObject, struct Sprite *sprite) { if (sub_8064824(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject)) { - sprite->data1 = 4; + sprite->data[1] = 4; return 1; } return 0; @@ -4224,7 +4224,7 @@ u8 sub_805DAEC(struct MapObject *mapObject, struct Sprite *sprite) direction = directions[Random() & 1]; } FieldObjectSetDirection(mapObject, direction); - sprite->data1 = 1; + sprite->data[1] = 1; return 1; } @@ -4233,14 +4233,14 @@ fieldmap_object_cb(sub_805DB34, sub_805DB58, gUnknown_08375354); u8 sub_805DB78(struct MapObject *mapObject, struct Sprite *sprite) { npc_reset(mapObject, sprite); - sprite->data1 = 1; + sprite->data[1] = 1; return 1; } u8 sub_805DB8C(struct MapObject *mapObject, struct Sprite *sprite) { FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); - sprite->data1 = 2; + sprite->data[1] = 2; return 1; } @@ -4250,7 +4250,7 @@ u8 sub_805DBB8(struct MapObject *mapObject, struct Sprite *sprite) { sub_8064820(sprite, gUnknown_0837521C[Random() & 3]); mapObject->mapobj_bit_1 = 0; - sprite->data1 = 3; + sprite->data[1] = 3; } return 0; } @@ -4259,7 +4259,7 @@ u8 sub_805DBFC(struct MapObject *mapObject, struct Sprite *sprite) { if (sub_8064824(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject)) { - sprite->data1 = 4; + sprite->data[1] = 4; return 1; } return 0; @@ -4276,7 +4276,7 @@ u8 sub_805DC2C(struct MapObject *mapObject, struct Sprite *sprite) direction = directions[Random() & 1]; } FieldObjectSetDirection(mapObject, direction); - sprite->data1 = 1; + sprite->data[1] = 1; return 1; } @@ -4285,14 +4285,14 @@ fieldmap_object_cb(sub_805DC74, sub_805DC98, gUnknown_0837536C); u8 sub_805DCB8(struct MapObject *mapObject, struct Sprite *sprite) { npc_reset(mapObject, sprite); - sprite->data1 = 1; + sprite->data[1] = 1; return 1; } u8 sub_805DCCC(struct MapObject *mapObject, struct Sprite *sprite) { FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); - sprite->data1 = 2; + sprite->data[1] = 2; return 1; } @@ -4302,7 +4302,7 @@ u8 sub_805DCF8(struct MapObject *mapObject, struct Sprite *sprite) { sub_8064820(sprite, gUnknown_0837521C[Random() & 3]); mapObject->mapobj_bit_1 = 0; - sprite->data1 = 3; + sprite->data[1] = 3; } return 0; } @@ -4311,7 +4311,7 @@ u8 sub_805DD3C(struct MapObject *mapObject, struct Sprite *sprite) { if (sub_8064824(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject)) { - sprite->data1 = 4; + sprite->data[1] = 4; return 1; } return 0; @@ -4328,7 +4328,7 @@ u8 sub_805DD6C(struct MapObject *mapObject, struct Sprite *sprite) direction = directions[Random() & 3]; } FieldObjectSetDirection(mapObject, direction); - sprite->data1 = 1; + sprite->data[1] = 1; return 1; } @@ -4337,14 +4337,14 @@ fieldmap_object_cb(sub_805DDB4, sub_805DDD8, gUnknown_08375384); u8 sub_805DDF8(struct MapObject *mapObject, struct Sprite *sprite) { npc_reset(mapObject, sprite); - sprite->data1 = 1; + sprite->data[1] = 1; return 1; } u8 sub_805DE0C(struct MapObject *mapObject, struct Sprite *sprite) { FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); - sprite->data1 = 2; + sprite->data[1] = 2; return 1; } @@ -4354,7 +4354,7 @@ u8 sub_805DE38(struct MapObject *mapObject, struct Sprite *sprite) { sub_8064820(sprite, gUnknown_0837521C[Random() & 3]); mapObject->mapobj_bit_1 = 0; - sprite->data1 = 3; + sprite->data[1] = 3; } return 0; } @@ -4363,7 +4363,7 @@ u8 sub_805DE7C(struct MapObject *mapObject, struct Sprite *sprite) { if (sub_8064824(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject)) { - sprite->data1 = 4; + sprite->data[1] = 4; return 1; } return 0; @@ -4380,7 +4380,7 @@ u8 sub_805DEAC(struct MapObject *mapObject, struct Sprite *sprite) direction = directions[Random() & 3]; } FieldObjectSetDirection(mapObject, direction); - sprite->data1 = 1; + sprite->data[1] = 1; return 1; } @@ -4389,14 +4389,14 @@ fieldmap_object_cb(sub_805DEF4, sub_805DF18, gUnknown_0837539C); u8 sub_805DF38(struct MapObject *mapObject, struct Sprite *sprite) { npc_reset(mapObject, sprite); - sprite->data1 = 1; + sprite->data[1] = 1; return 1; } u8 sub_805DF4C(struct MapObject *mapObject, struct Sprite *sprite) { FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); - sprite->data1 = 2; + sprite->data[1] = 2; return 1; } @@ -4406,7 +4406,7 @@ u8 sub_805DF78(struct MapObject *mapObject, struct Sprite *sprite) { sub_8064820(sprite, gUnknown_0837521C[Random() & 3]); mapObject->mapobj_bit_1 = 0; - sprite->data1 = 3; + sprite->data[1] = 3; } return 0; } @@ -4415,7 +4415,7 @@ u8 sub_805DFBC(struct MapObject *mapObject, struct Sprite *sprite) { if (sub_8064824(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject)) { - sprite->data1 = 4; + sprite->data[1] = 4; return 1; } return 0; @@ -4432,7 +4432,7 @@ u8 sub_805DFEC(struct MapObject *mapObject, struct Sprite *sprite) direction = directions[Random() & 3]; } FieldObjectSetDirection(mapObject, direction); - sprite->data1 = 1; + sprite->data[1] = 1; return 1; } @@ -4441,14 +4441,14 @@ fieldmap_object_cb(sub_805E034, sub_805E058, gUnknown_083753B4); u8 sub_805E078(struct MapObject *mapObject, struct Sprite *sprite) { npc_reset(mapObject, sprite); - sprite->data1 = 1; + sprite->data[1] = 1; return 1; } u8 sub_805E08C(struct MapObject *mapObject, struct Sprite *sprite) { FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); - sprite->data1 = 2; + sprite->data[1] = 2; return 1; } @@ -4458,7 +4458,7 @@ u8 sub_805E0B8(struct MapObject *mapObject, struct Sprite *sprite) { sub_8064820(sprite, gUnknown_0837521C[Random() & 3]); mapObject->mapobj_bit_1 = 0; - sprite->data1 = 3; + sprite->data[1] = 3; } return 0; } @@ -4467,7 +4467,7 @@ u8 sub_805E0FC(struct MapObject *mapObject, struct Sprite *sprite) { if (sub_8064824(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject)) { - sprite->data1 = 4; + sprite->data[1] = 4; return 1; } return 0; @@ -4484,7 +4484,7 @@ u8 sub_805E12C(struct MapObject *mapObject, struct Sprite *sprite) direction = directions[Random() & 3]; } FieldObjectSetDirection(mapObject, direction); - sprite->data1 = 1; + sprite->data[1] = 1; return 1; } @@ -4494,7 +4494,7 @@ u8 sub_805E1B8(struct MapObject *mapObject, struct Sprite *sprite) { npc_reset(mapObject, sprite); FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); - sprite->data1 = 1; + sprite->data[1] = 1; return 1; } @@ -4503,7 +4503,7 @@ u8 sub_805E1E4(struct MapObject *mapObject, struct Sprite *sprite) if (FieldObjectExecRegularAnim(mapObject, sprite)) { sub_8064820(sprite, 0x30); - sprite->data1 = 2; + sprite->data[1] = 2; } return 0; } @@ -4512,7 +4512,7 @@ u8 sub_805E208(struct MapObject *mapObject, struct Sprite *sprite) { if (sub_8064824(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject)) { - sprite->data1 = 3; + sprite->data[1] = 3; } return 0; } @@ -4528,7 +4528,7 @@ u8 sub_805E234(struct MapObject *mapObject, struct Sprite *sprite) direction = directions[mapObject->mapobj_unk_18]; } FieldObjectSetDirection(mapObject, direction); - sprite->data1 = 0; + sprite->data[1] = 0; return 1; } @@ -4538,7 +4538,7 @@ u8 sub_805E2BC(struct MapObject *mapObject, struct Sprite *sprite) { npc_reset(mapObject, sprite); FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); - sprite->data1 = 1; + sprite->data[1] = 1; return 1; } @@ -4547,7 +4547,7 @@ u8 sub_805E2E8(struct MapObject *mapObject, struct Sprite *sprite) if (FieldObjectExecRegularAnim(mapObject, sprite)) { sub_8064820(sprite, 0x30); - sprite->data1 = 2; + sprite->data[1] = 2; } return 0; } @@ -4556,7 +4556,7 @@ u8 sub_805E30C(struct MapObject *mapObject, struct Sprite *sprite) { if (sub_8064824(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject)) { - sprite->data1 = 3; + sprite->data[1] = 3; } return 0; } @@ -4572,7 +4572,7 @@ u8 sub_805E338(struct MapObject *mapObject, struct Sprite *sprite) direction = directions[mapObject->mapobj_unk_18]; } FieldObjectSetDirection(mapObject, direction); - sprite->data1 = 0; + sprite->data[1] = 0; return 1; } @@ -4581,7 +4581,7 @@ fieldmap_object_cb(sub_805E37C, sub_805E3A0, gUnknown_083753FC); u8 sub_805E3C0(struct MapObject *mapObject, struct Sprite *sprite) { npc_reset(mapObject, sprite); - sprite->data1 = 1; + sprite->data[1] = 1; return 1; } @@ -4594,7 +4594,7 @@ u8 sub_805E3D4(struct MapObject *mapObject, struct Sprite *sprite) direction = GetOppositeDirection(direction); } FieldObjectSetDirection(mapObject, direction); - sprite->data1 = 2; + sprite->data[1] = 2; return 1; } @@ -4622,7 +4622,7 @@ u8 sub_805E40C(struct MapObject *mapObject, struct Sprite *sprite) } FieldObjectSetRegularAnim(mapObject, sprite, goSpeed0AnimId); mapObject->mapobj_bit_1 = 1; - sprite->data1 = 3; + sprite->data[1] = 3; return 1; } @@ -4631,7 +4631,7 @@ u8 sub_805E4C4(struct MapObject *mapObject, struct Sprite *sprite) if (FieldObjectExecRegularAnim(mapObject, sprite)) { mapObject->mapobj_bit_1 = 0; - sprite->data1 = 1; + sprite->data[1] = 1; } return 0; } @@ -4639,7 +4639,7 @@ u8 sub_805E4C4(struct MapObject *mapObject, struct Sprite *sprite) u8 sub_805E4EC(struct MapObject *mapObject, struct Sprite *sprite) { npc_reset(mapObject, sprite); - sprite->data1 = 1; + sprite->data[1] = 1; return 1; } @@ -4667,7 +4667,7 @@ u8 MoveFieldObjectInNextDirectionInSequence(struct MapObject *mapObject, struct } FieldObjectSetRegularAnim(mapObject, sprite, goSpeed0AnimId); mapObject->mapobj_bit_1 = 1; - sprite->data1 = 2; + sprite->data[1] = 2; return 1; } @@ -4676,7 +4676,7 @@ u8 sub_805E5B4(struct MapObject *mapObject, struct Sprite *sprite) if (FieldObjectExecRegularAnim(mapObject, sprite)) { mapObject->mapobj_bit_1 = 0; - sprite->data1 = 1; + sprite->data[1] = 1; } return 0; } @@ -5004,7 +5004,7 @@ u8 mss_npc_reset_oampriv3_1_unk2_unk3(struct MapObject *mapObject, struct Sprite { mapObject->mapobj_unk_21 = player_get_direction_lower_nybble(); } - sprite->data1 = 1; + sprite->data[1] = 1; return 1; } @@ -5022,7 +5022,7 @@ u8 sub_805F3C4(struct MapObject *mapObject, struct Sprite *sprite) if (FieldObjectExecRegularAnim(mapObject, sprite)) { mapObject->mapobj_bit_1 = 0; - sprite->data1 = 1; + sprite->data[1] = 1; } return 0; } @@ -5036,7 +5036,7 @@ bool8 sub_805F3F0(struct MapObject *mapObject, struct Sprite *sprite, u8 a2, boo { FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(state_to_direction(gUnknown_0836DC09[mapObject->animPattern], mapObject->mapobj_unk_21, a2))); mapObject->mapobj_bit_1 = 1; - sprite->data1 = 2; + sprite->data[1] = 2; return 1; } @@ -5055,7 +5055,7 @@ bool8 sub_805F438(struct MapObject *mapObject, struct Sprite *sprite, u8 a2, boo FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction)); } mapObject->mapobj_bit_1 = 1; - sprite->data1 = 2; + sprite->data[1] = 2; return 1; } @@ -5074,7 +5074,7 @@ bool8 sub_805F4F0(struct MapObject *mapObject, struct Sprite *sprite, u8 playerD FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction)); } mapObject->mapobj_bit_1 = TRUE; - sprite->data1 = 2; + sprite->data[1] = 2; return TRUE; } @@ -5093,7 +5093,7 @@ bool8 sub_805F5A8(struct MapObject *mapObject, struct Sprite *sprite, u8 playerD FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction)); } mapObject->mapobj_bit_1 = TRUE; - sprite->data1 = 2; + sprite->data[1] = 2; return TRUE; } @@ -5112,7 +5112,7 @@ bool8 sub_805F660(struct MapObject *mapObject, struct Sprite *sprite, u8 playerD FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction)); } mapObject->mapobj_bit_1 = TRUE; - sprite->data1 = 2; + sprite->data[1] = 2; return TRUE; } @@ -5124,7 +5124,7 @@ bool8 cph_IM_DIFFERENT(struct MapObject *mapObject, struct Sprite *sprite, u8 pl direction = state_to_direction(gUnknown_0836DC09[mapObject->animPattern], mapObject->mapobj_unk_21, direction); FieldObjectSetRegularAnim(mapObject, sprite, sub_806084C(direction)); mapObject->mapobj_bit_1 = TRUE; - sprite->data1 = 2; + sprite->data[1] = 2; return TRUE; } @@ -5143,7 +5143,7 @@ bool8 sub_805F760(struct MapObject *mapObject, struct Sprite *sprite, u8 playerD FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction)); } mapObject->mapobj_bit_1 = TRUE; - sprite->data1 = 2; + sprite->data[1] = 2; return TRUE; } @@ -5164,7 +5164,7 @@ bool8 oac_hopping(struct MapObject *mapObject, struct Sprite *sprite, u8 playerD FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction)); } mapObject->mapobj_bit_1 = TRUE; - sprite->data1 = 2; + sprite->data[1] = 2; return TRUE; } @@ -5184,15 +5184,15 @@ u8 sub_805F9F8(struct MapObject *, struct Sprite *); void FieldObjectCB_TreeDisguise(struct Sprite *sprite) { struct MapObject *mapObject; - mapObject = &gMapObjects[sprite->data0]; - if (mapObject->mapobj_unk_21 == 0 || (mapObject->mapobj_unk_21 == 1 && sprite->data7 == 0)) + mapObject = &gMapObjects[sprite->data[0]]; + if (mapObject->mapobj_unk_21 == 0 || (mapObject->mapobj_unk_21 == 1 && sprite->data[7] == 0)) { FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); mapObject->mapobj_unk_1A = FieldEffectStart(FLDEFF_TREE_DISGUISE); mapObject->mapobj_unk_21 = 1; - sprite->data7 ++; + sprite->data[7] ++; } - meta_step(&gMapObjects[sprite->data0], sprite, sub_805F9F8); + meta_step(&gMapObjects[sprite->data[0]], sprite, sub_805F9F8); } u8 sub_805F9F8(struct MapObject *mapObject, struct Sprite *sprite) @@ -5204,34 +5204,34 @@ u8 sub_805F9F8(struct MapObject *mapObject, struct Sprite *sprite) void FieldObjectCB_MountainDisguise(struct Sprite *sprite) { struct MapObject *mapObject; - mapObject = &gMapObjects[sprite->data0]; - if (mapObject->mapobj_unk_21 == 0 || (mapObject->mapobj_unk_21 == 1 && sprite->data7 == 0)) + mapObject = &gMapObjects[sprite->data[0]]; + if (mapObject->mapobj_unk_21 == 0 || (mapObject->mapobj_unk_21 == 1 && sprite->data[7] == 0)) { FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); mapObject->mapobj_unk_1A = FieldEffectStart(FLDEFF_MOUNTAIN_DISGUISE); mapObject->mapobj_unk_21 = 1; - sprite->data7 ++; + sprite->data[7] ++; } - meta_step(&gMapObjects[sprite->data0], sprite, sub_805F9F8); + meta_step(&gMapObjects[sprite->data[0]], sprite, sub_805F9F8); } u8 sub_805FAD8(struct MapObject *mapObject, struct Sprite *sprite); void FieldObjectCB_Hidden1(struct Sprite *sprite) { - if (sprite->data7 == 0) + if (sprite->data[7] == 0) { - gMapObjects[sprite->data0].mapobj_bit_26 = 1; + gMapObjects[sprite->data[0]].mapobj_bit_26 = 1; sprite->subspriteMode = 2; sprite->oam.priority = 3; - sprite->data7 ++; + sprite->data[7] ++; } - meta_step(&gMapObjects[sprite->data0], sprite, sub_805FAD8); + meta_step(&gMapObjects[sprite->data[0]], sprite, sub_805FAD8); } u8 sub_805FAD8(struct MapObject *mapObject, struct Sprite *sprite) { - return gUnknown_083755CC[sprite->data1](mapObject, sprite); + return gUnknown_083755CC[sprite->data[1]](mapObject, sprite); } u8 sub_805FAF8(struct MapObject *mapObject, struct Sprite *sprite) @@ -5244,7 +5244,7 @@ u8 sub_805FB04(struct MapObject *mapObject, struct Sprite *sprite) { if (FieldObjectExecRegularAnim(mapObject, sprite)) { - sprite->data1 = 0; + sprite->data[1] = 0; } return 0; } @@ -5255,7 +5255,7 @@ u8 sub_805FB64(struct MapObject *mapObject, struct Sprite *sprite) { npc_reset(mapObject, sprite); FieldObjectSetRegularAnim(mapObject, sprite, GetStepInPlaceDelay16AnimId(mapObject->mapobj_unk_18)); - sprite->data1 = 1; + sprite->data[1] = 1; return 1; } @@ -5265,7 +5265,7 @@ u8 sub_805FBD4(struct MapObject *mapObject, struct Sprite *sprite) { npc_reset(mapObject, sprite); FieldObjectSetRegularAnim(mapObject, sprite, GetStepInPlaceDelay8AnimId(mapObject->mapobj_unk_18)); - sprite->data1 = 1; + sprite->data[1] = 1; return 1; } @@ -5275,7 +5275,7 @@ u8 sub_805FC44(struct MapObject *mapObject, struct Sprite *sprite) { npc_reset(mapObject, sprite); FieldObjectSetRegularAnim(mapObject, sprite, GetStepInPlaceDelay4AnimId(mapObject->mapobj_unk_18)); - sprite->data1 = 1; + sprite->data[1] = 1; return 1; } @@ -5286,7 +5286,7 @@ u8 sub_805FCB4(struct MapObject *mapObject, struct Sprite *sprite) npc_reset(mapObject, sprite); FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); mapObject->mapobj_bit_13 = 1; - sprite->data1 = 1; + sprite->data[1] = 1; return 1; } @@ -5294,7 +5294,7 @@ u8 sub_805FCE8(struct MapObject *mapObject, struct Sprite *sprite) { if (FieldObjectExecRegularAnim(mapObject, sprite)) { - sprite->data1 = 2; + sprite->data[1] = 2; return 1; } return 0; @@ -5314,7 +5314,7 @@ void npc_reset(struct MapObject *mapObject, struct Sprite *sprite) mapObject->mapobj_bit_6 = 0; mapObject->mapobj_bit_7 = 0; mapObject->mapobj_unk_1C = 0xff; - sprite->data1 = 0; + sprite->data[1] = 0; } u8 FieldObjectDirectionToImageAnimId(u8 direction) @@ -5446,7 +5446,7 @@ void npc_set_running_behaviour_etc(struct MapObject *mapObject, u8 animPattern) mapObject->mapobj_unk_21 = 0; mapObject->animId = 0; gSprites[mapObject->spriteId].callback = gUnknown_0836DA88[animPattern]; - gSprites[mapObject->spriteId].data1 = 0; + gSprites[mapObject->spriteId].data[1] = 0; } u8 npc_running_behaviour_by_direction(u8 direction) @@ -5555,7 +5555,7 @@ bool8 IsBerryTreeSparkling(u8 localId, u8 mapNum, u8 mapGroup) u8 mapObjectId; if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) - if (gSprites[gMapObjects[mapObjectId].spriteId].data7 & 2) + if (gSprites[gMapObjects[mapObjectId].spriteId].data[7] & 2) return TRUE; return FALSE; @@ -5566,7 +5566,7 @@ void sub_8060288(u8 localId, u8 mapNum, u8 mapGroup) u8 mapObjectId; if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) { - gSprites[gMapObjects[mapObjectId].spriteId].data7 |= 4; + gSprites[gMapObjects[mapObjectId].spriteId].data[7] |= 4; } } @@ -5704,7 +5704,7 @@ bool8 FieldObjectSetSpecialAnim(struct MapObject *mapObject, u8 specialAnimId) mapObject->mapobj_unk_1C = specialAnimId; mapObject->mapobj_bit_6 = 1; mapObject->mapobj_bit_7 = 0; - gSprites[mapObject->spriteId].data2 = 0; + gSprites[mapObject->spriteId].data[2] = 0; return FALSE; } @@ -5727,8 +5727,8 @@ void FieldObjectClearAnim(struct MapObject *mapObject) mapObject->mapobj_unk_1C = 0xFF; mapObject->mapobj_bit_6 = 0; mapObject->mapobj_bit_7 = 0; - gSprites[mapObject->spriteId].data1 = 0; - gSprites[mapObject->spriteId].data2 = 0; + gSprites[mapObject->spriteId].data[1] = 0; + gSprites[mapObject->spriteId].data[2] = 0; } bool8 FieldObjectCheckIfSpecialAnimFinishedOrInactive(struct MapObject *mapObject) @@ -5962,7 +5962,7 @@ u32 state_to_direction(u8 a0, u32 a1, u32 a2) void FieldObjectExecSpecialAnim(struct MapObject *mapObject, struct Sprite *sprite) { - if (gUnknown_08375778[mapObject->mapobj_unk_1C][sprite->data2](mapObject, sprite)) + if (gUnknown_08375778[mapObject->mapobj_unk_1C][sprite->data[2]](mapObject, sprite)) { mapObject->mapobj_bit_7 = 1; } @@ -5970,10 +5970,10 @@ void FieldObjectExecSpecialAnim(struct MapObject *mapObject, struct Sprite *spri bool8 FieldObjectExecRegularAnim(struct MapObject *mapObject, struct Sprite *sprite) { - if (gUnknown_08375778[mapObject->mapobj_unk_1C][sprite->data2](mapObject, sprite)) + if (gUnknown_08375778[mapObject->mapobj_unk_1C][sprite->data[2]](mapObject, sprite)) { mapObject->mapobj_unk_1C = 0xFF; - sprite->data2 = 0; + sprite->data[2] = 0; return 1; } return 0; @@ -5982,7 +5982,7 @@ bool8 FieldObjectExecRegularAnim(struct MapObject *mapObject, struct Sprite *spr void FieldObjectSetRegularAnim(struct MapObject *mapObject, struct Sprite *sprite, u8 animId) { mapObject->mapobj_unk_1C = animId; - sprite->data2 = 0; + sprite->data[2] = 0; } void an_look_any(struct MapObject *mapObject, struct Sprite *sprite, u8 direction) @@ -5991,7 +5991,7 @@ void an_look_any(struct MapObject *mapObject, struct Sprite *sprite, u8 directio npc_coords_shift_still(mapObject); sub_805FE64(mapObject, sprite, get_go_image_anim_num(mapObject->mapobj_unk_18)); sprite->animPaused = 1; - sprite->data2 = 1; + sprite->data[2] = 1; } u8 sub_8060CE0(struct MapObject *mapObject, struct Sprite *sprite) @@ -6030,7 +6030,7 @@ void sub_8060D20(struct MapObject *mapObject, struct Sprite *sprite, u8 directio oamt_npc_ministep_reset(sprite, direction, a3); sprite->animPaused = 0; mapObject->mapobj_bit_2 = 1; - sprite->data2 = 1; + sprite->data[2] = 1; } extern u8 (*const gUnknown_083759C0[5])(u8); @@ -6075,7 +6075,7 @@ void sub_8060E68(struct MapObject *mapObject, struct Sprite *sprite, u8 directio sub_806467C(sprite, direction); sprite->animPaused = 0; mapObject->mapobj_bit_2 = 1; - sprite->data2 = 1; + sprite->data[2] = 1; } void sub_8060ED8(struct MapObject *mapObject, struct Sprite *sprite, u8 direction) @@ -6108,7 +6108,7 @@ bool8 sub_8060F5C(struct MapObject *mapObject, struct Sprite *sprite) { if (an_walk_any_2(mapObject, sprite)) { - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -6126,7 +6126,7 @@ bool8 sub_8060F9C(struct MapObject *mapObject, struct Sprite *sprite) { if (an_walk_any_2(mapObject, sprite)) { - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -6144,7 +6144,7 @@ bool8 sub_8060FDC(struct MapObject *mapObject, struct Sprite *sprite) { if (an_walk_any_2(mapObject, sprite)) { - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -6162,7 +6162,7 @@ bool8 sub_806101C(struct MapObject *mapObject, struct Sprite *sprite) { if (an_walk_any_2(mapObject, sprite)) { - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -6180,7 +6180,7 @@ bool8 sub_806105C(struct MapObject *mapObject, struct Sprite *sprite) { if (npc_obj_ministep_stop_on_arrival(mapObject, sprite)) { - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -6198,7 +6198,7 @@ bool8 sub_806109C(struct MapObject *mapObject, struct Sprite *sprite) { if (npc_obj_ministep_stop_on_arrival(mapObject, sprite)) { - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -6216,7 +6216,7 @@ bool8 sub_80610DC(struct MapObject *mapObject, struct Sprite *sprite) { if (npc_obj_ministep_stop_on_arrival(mapObject, sprite)) { - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -6234,7 +6234,7 @@ bool8 sub_806111C(struct MapObject *mapObject, struct Sprite *sprite) { if (npc_obj_ministep_stop_on_arrival(mapObject, sprite)) { - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -6252,7 +6252,7 @@ void sub_806113C(struct MapObject *mapObject, struct Sprite *sprite, u8 directio sub_8060320(direction, &x, &y, vSPp4[a4], vSPp4[a4]); npc_coords_shift(mapObject, mapObject->coords2.x + x, mapObject->coords2.y + y); sub_80646E4(sprite, direction, a4, a5); - sprite->data2 = 1; + sprite->data[2] = 1; sprite->animPaused = 0; mapObject->mapobj_bit_2 = 1; mapObject->mapobj_bit_4 = 1; @@ -6273,11 +6273,11 @@ u8 sub_806123C(struct MapObject *mapObject, struct Sprite *sprite, u8 (*const ca u8 retval; memcpy(vSPp4, gUnknown_08375A3A, sizeof gUnknown_08375A3A); retval = callback(sprite); - if (retval == 1 && vSPp4[sprite->data4] != 0) + if (retval == 1 && vSPp4[sprite->data[4]] != 0) { x = 0; y = 0; - sub_8060320(mapObject->placeholder18, &x, &y, vSPp4[sprite->data4], vSPp4[sprite->data4]); + sub_8060320(mapObject->placeholder18, &x, &y, vSPp4[sprite->data[4]], vSPp4[sprite->data[4]]); npc_coords_shift(mapObject, mapObject->coords2.x + x, mapObject->coords2.y + y); mapObject->mapobj_bit_2 = 1; mapObject->mapobj_bit_4 = 1; @@ -6353,7 +6353,7 @@ bool8 sub_80613D4(struct MapObject *mapObject, struct Sprite *sprite) if (sub_8061328(mapObject, sprite)) { mapObject->mapobj_bit_22 = 0; - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -6370,7 +6370,7 @@ bool8 sub_806142C(struct MapObject *mapObject, struct Sprite *sprite) if (sub_8061328(mapObject, sprite)) { mapObject->mapobj_bit_22 = 0; - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -6387,7 +6387,7 @@ bool8 sub_8061484(struct MapObject *mapObject, struct Sprite *sprite) if (sub_8061328(mapObject, sprite)) { mapObject->mapobj_bit_22 = 0; - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -6404,7 +6404,7 @@ bool8 sub_80614DC(struct MapObject *mapObject, struct Sprite *sprite) if (sub_8061328(mapObject, sprite)) { mapObject->mapobj_bit_22 = 0; - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -6412,16 +6412,16 @@ bool8 sub_80614DC(struct MapObject *mapObject, struct Sprite *sprite) void sub_8061508(struct Sprite *sprite, u16 duration) { - sprite->data2 = 1; - sprite->data3 = duration; + sprite->data[2] = 1; + sprite->data[3] = duration; } bool8 sub_8061510(struct MapObject *mapObject, struct Sprite *sprite) { - sprite->data3--; - if (!sprite->data3) + sprite->data[3]--; + if (!sprite->data[3]) { - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -6472,7 +6472,7 @@ bool8 sub_80615EC(struct MapObject *mapObject, struct Sprite *sprite) { if (npc_obj_ministep_stop_on_arrival(mapObject, sprite)) { - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -6487,7 +6487,7 @@ bool8 sub_806162C(struct MapObject *mapObject, struct Sprite *sprite) { if (npc_obj_ministep_stop_on_arrival(mapObject, sprite)) { - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -6502,7 +6502,7 @@ bool8 sub_806166C(struct MapObject *mapObject, struct Sprite *sprite) { if (npc_obj_ministep_stop_on_arrival(mapObject, sprite)) { - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -6517,7 +6517,7 @@ bool8 sub_80616AC(struct MapObject *mapObject, struct Sprite *sprite) { if (npc_obj_ministep_stop_on_arrival(mapObject, sprite)) { - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -6528,16 +6528,16 @@ void sub_80616CC(struct MapObject *mapObject, struct Sprite *sprite, u8 directio FieldObjectSetDirection(mapObject, direction); sub_805FE28(mapObject, sprite, animId); sprite->animPaused = 0; - sprite->data2 = 1; - sprite->data3 = duration; + sprite->data[2] = 1; + sprite->data[3] = duration; } bool8 sub_8061714(struct MapObject *mapObject, struct Sprite *sprite) { - sprite->data3--; - if (sprite->data3 == 0) + sprite->data[3]--; + if (sprite->data[3] == 0) { - sprite->data2 = 2; + sprite->data[2] = 2; sprite->animPaused = 1; return TRUE; } @@ -6546,7 +6546,7 @@ bool8 sub_8061714(struct MapObject *mapObject, struct Sprite *sprite) bool8 sub_806173C(struct MapObject *mapObject, struct Sprite *sprite) { - if (sprite->data3 & 1) + if (sprite->data[3] & 1) { sprite->animDelayCounter++; } @@ -6661,7 +6661,7 @@ bool8 sub_8061B18(struct MapObject *mapObject, struct Sprite *sprite) { if (npc_obj_ministep_stop_on_arrival(mapObject, sprite)) { - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -6680,7 +6680,7 @@ bool8 sub_8061B58(struct MapObject *mapObject, struct Sprite *sprite) { if (npc_obj_ministep_stop_on_arrival(mapObject, sprite)) { - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -6699,7 +6699,7 @@ bool8 sub_8061B98(struct MapObject *mapObject, struct Sprite *sprite) { if (npc_obj_ministep_stop_on_arrival(mapObject, sprite)) { - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -6718,7 +6718,7 @@ bool8 sub_8061BD8(struct MapObject *mapObject, struct Sprite *sprite) { if (npc_obj_ministep_stop_on_arrival(mapObject, sprite)) { - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -6736,7 +6736,7 @@ bool8 sub_8061C18(struct MapObject *mapObject, struct Sprite *sprite) { if (npc_obj_ministep_stop_on_arrival(mapObject, sprite)) { - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -6754,7 +6754,7 @@ bool8 sub_8061C58(struct MapObject *mapObject, struct Sprite *sprite) { if (npc_obj_ministep_stop_on_arrival(mapObject, sprite)) { - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -6773,7 +6773,7 @@ bool8 sub_8061C98(struct MapObject *mapObject, struct Sprite *sprite) { if (npc_obj_ministep_stop_on_arrival(mapObject, sprite)) { - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -6792,7 +6792,7 @@ bool8 sub_8061CD8(struct MapObject *mapObject, struct Sprite *sprite) { if (npc_obj_ministep_stop_on_arrival(mapObject, sprite)) { - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -6810,7 +6810,7 @@ bool8 sub_8061D18(struct MapObject *mapObject, struct Sprite *sprite) { if (npc_obj_ministep_stop_on_arrival(mapObject, sprite)) { - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -6828,7 +6828,7 @@ bool8 sub_8061D58(struct MapObject *mapObject, struct Sprite *sprite) { if (npc_obj_ministep_stop_on_arrival(mapObject, sprite)) { - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -6847,7 +6847,7 @@ bool8 sub_8061D98(struct MapObject *mapObject, struct Sprite *sprite) { if (npc_obj_ministep_stop_on_arrival(mapObject, sprite)) { - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -6866,7 +6866,7 @@ bool8 sub_8061DD8(struct MapObject *mapObject, struct Sprite *sprite) { if (npc_obj_ministep_stop_on_arrival(mapObject, sprite)) { - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -6884,7 +6884,7 @@ bool8 sub_8061E18(struct MapObject *mapObject, struct Sprite *sprite) { if (npc_obj_ministep_stop_on_arrival(mapObject, sprite)) { - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -6902,7 +6902,7 @@ bool8 sub_8061E58(struct MapObject *mapObject, struct Sprite *sprite) { if (npc_obj_ministep_stop_on_arrival(mapObject, sprite)) { - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -6920,7 +6920,7 @@ bool8 sub_8061E98(struct MapObject *mapObject, struct Sprite *sprite) { if (npc_obj_ministep_stop_on_arrival(mapObject, sprite)) { - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -6938,7 +6938,7 @@ bool8 sub_8061ED8(struct MapObject *mapObject, struct Sprite *sprite) { if (npc_obj_ministep_stop_on_arrival(mapObject, sprite)) { - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -6948,7 +6948,7 @@ void npc_set_direction_and_anim__an_proceed(struct MapObject *mapObject, struct { obj_anim_image_set_and_seek(sprite, animNum, 0); FieldObjectSetDirection(mapObject, direction); - sprite->data2 = 1; + sprite->data[2] = 1; } bool8 sub_8061F24(struct MapObject *mapObject, struct Sprite *sprite) @@ -6963,7 +6963,7 @@ bool8 sub_8061F3C(struct MapObject *mapObject, struct Sprite *sprite) { if (sub_8064864(sprite)) { - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -6987,7 +6987,7 @@ bool8 sub_8061FB0(struct MapObject *mapObject, struct Sprite *sprite) { if (sub_8061340(mapObject, sprite)) { - sprite->data2 = 2; + sprite->data[2] = 2; mapObject->mapobj_bit_5 = 0; return TRUE; } @@ -7006,7 +7006,7 @@ bool8 sub_8061FF8(struct MapObject *mapObject, struct Sprite *sprite) { if (sub_8061340(mapObject, sprite)) { - sprite->data2 = 2; + sprite->data[2] = 2; mapObject->mapobj_bit_5 = 0; return TRUE; } @@ -7025,7 +7025,7 @@ bool8 sub_8062040(struct MapObject *mapObject, struct Sprite *sprite) { if (sub_8061340(mapObject, sprite)) { - sprite->data2 = 2; + sprite->data[2] = 2; mapObject->mapobj_bit_5 = 0; return TRUE; } @@ -7044,7 +7044,7 @@ bool8 sub_8062088(struct MapObject *mapObject, struct Sprite *sprite) { if (sub_8061340(mapObject, sprite)) { - sprite->data2 = 2; + sprite->data[2] = 2; mapObject->mapobj_bit_5 = 0; return TRUE; } @@ -7058,7 +7058,7 @@ bool8 sub_80620B0(struct MapObject *mapObject, struct Sprite *sprite) { an_look_any(mapObject, sprite, sub_805FE90(mapObject->coords2.x, mapObject->coords2.y, gMapObjects[objectId].coords2.x, gMapObjects[objectId].coords2.y)); } - sprite->data2 = 1; + sprite->data[2] = 1; return TRUE; } @@ -7069,21 +7069,21 @@ bool8 sub_806210C(struct MapObject *mapObject, struct Sprite *sprite) { an_look_any(mapObject, sprite, GetOppositeDirection(sub_805FE90(mapObject->coords2.x, mapObject->coords2.y, gMapObjects[objectId].coords2.x, gMapObjects[objectId].coords2.y))); } - sprite->data2 = 1; + sprite->data[2] = 1; return TRUE; } bool8 sub_8062170(struct MapObject *mapObject, struct Sprite *sprite) { mapObject->mapobj_bit_9 = 1; - sprite->data2 = 1; + sprite->data[2] = 1; return TRUE; } bool8 sub_8062180(struct MapObject *mapObject, struct Sprite *sprite) { mapObject->mapobj_bit_9 = 0; - sprite->data2 = 1; + sprite->data[2] = 1; return TRUE; } @@ -7100,7 +7100,7 @@ bool8 sub_80621BC(struct MapObject *mapObject, struct Sprite *sprite) if (sub_8061328(mapObject, sprite)) { mapObject->mapobj_bit_22 = 0; - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -7119,7 +7119,7 @@ bool8 sub_8062214(struct MapObject *mapObject, struct Sprite *sprite) if (sub_8061328(mapObject, sprite)) { mapObject->mapobj_bit_22 = 0; - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -7138,7 +7138,7 @@ bool8 sub_806226C(struct MapObject *mapObject, struct Sprite *sprite) if (sub_8061328(mapObject, sprite)) { mapObject->mapobj_bit_22 = 0; - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -7157,7 +7157,7 @@ bool8 sub_80622C4(struct MapObject *mapObject, struct Sprite *sprite) if (sub_8061328(mapObject, sprite)) { mapObject->mapobj_bit_22 = 0; - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -7176,7 +7176,7 @@ bool8 sub_806231C(struct MapObject *mapObject, struct Sprite *sprite) if (sub_8061328(mapObject, sprite)) { mapObject->mapobj_bit_22 = 0; - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -7195,7 +7195,7 @@ bool8 sub_8062374(struct MapObject *mapObject, struct Sprite *sprite) if (sub_8061328(mapObject, sprite)) { mapObject->mapobj_bit_22 = 0; - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -7214,7 +7214,7 @@ bool8 sub_80623CC(struct MapObject *mapObject, struct Sprite *sprite) if (sub_8061328(mapObject, sprite)) { mapObject->mapobj_bit_22 = 0; - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -7233,7 +7233,7 @@ bool8 sub_8062424(struct MapObject *mapObject, struct Sprite *sprite) if (sub_8061328(mapObject, sprite)) { mapObject->mapobj_bit_22 = 0; - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -7252,7 +7252,7 @@ bool8 sub_806247C(struct MapObject *mapObject, struct Sprite *sprite) if (sub_8061358(mapObject, sprite)) { mapObject->mapobj_bit_22 = 0; - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -7271,7 +7271,7 @@ bool8 sub_80624D4(struct MapObject *mapObject, struct Sprite *sprite) if (sub_8061358(mapObject, sprite)) { mapObject->mapobj_bit_22 = 0; - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -7290,7 +7290,7 @@ bool8 sub_806252C(struct MapObject *mapObject, struct Sprite *sprite) if (sub_8061358(mapObject, sprite)) { mapObject->mapobj_bit_22 = 0; - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -7309,7 +7309,7 @@ bool8 sub_8062584(struct MapObject *mapObject, struct Sprite *sprite) if (sub_8061358(mapObject, sprite)) { mapObject->mapobj_bit_22 = 0; - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -7330,42 +7330,42 @@ bool8 sub_80625C8(struct MapObject *mapObject, struct Sprite *sprite) bool8 sub_80625D8(struct MapObject *mapObject, struct Sprite *sprite) { mapObject->mapobj_bit_25 = 0; - sprite->data2 = 1; + sprite->data[2] = 1; return TRUE; } bool8 sub_80625E8(struct MapObject *mapObject, struct Sprite *sprite) { mapObject->mapobj_bit_25 = 1; - sprite->data2 = 1; + sprite->data[2] = 1; return TRUE; } bool8 sub_80625F8(struct MapObject *mapObject, struct Sprite *sprite) { mapObject->mapobj_bit_12 = 1; - sprite->data2 = 1; + sprite->data[2] = 1; return TRUE; } bool8 sub_8062608(struct MapObject *mapObject, struct Sprite *sprite) { mapObject->mapobj_bit_12 = GetFieldObjectGraphicsInfo(mapObject->graphicsId)->inanimate; - sprite->data2 = 1; + sprite->data[2] = 1; return TRUE; } bool8 sub_8062634(struct MapObject *mapObject, struct Sprite *sprite) { mapObject->mapobj_bit_13 = 1; - sprite->data2 = 1; + sprite->data[2] = 1; return TRUE; } bool8 sub_8062644(struct MapObject *mapObject, struct Sprite *sprite) { mapObject->mapobj_bit_13 = 0; - sprite->data2 = 1; + sprite->data[2] = 1; return TRUE; } @@ -7373,7 +7373,7 @@ bool8 do_exclamation_mark_bubble_1(struct MapObject *mapObject, struct Sprite *s { FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON_1); - sprite->data2 = 1; + sprite->data[2] = 1; return TRUE; } @@ -7381,7 +7381,7 @@ bool8 do_exclamation_mark_bubble_2(struct MapObject *mapObject, struct Sprite *s { FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON_2); - sprite->data2 = 1; + sprite->data[2] = 1; return TRUE; } @@ -7389,7 +7389,7 @@ bool8 do_heart_bubble(struct MapObject *mapObject, struct Sprite *sprite) { FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); FieldEffectStart(FLDEFF_HEART_ICON); - sprite->data2 = 1; + sprite->data[2] = 1; return TRUE; } @@ -7404,13 +7404,13 @@ bool8 sub_80626C0(struct MapObject *mapObject, struct Sprite *sprite) } else if (mapObject->animPattern != 0x39 && mapObject->animPattern != 0x3A) { - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } else { sub_812869C(mapObject); - sprite->data2 = 1; + sprite->data[2] = 1; return sub_8062704(mapObject, sprite); } } @@ -7419,7 +7419,7 @@ bool8 sub_8062704(struct MapObject *mapObject, struct Sprite *sprite) { if (sub_81286C4(mapObject)) { - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -7428,7 +7428,7 @@ bool8 sub_8062704(struct MapObject *mapObject, struct Sprite *sprite) bool8 sub_8062724(struct MapObject *mapObject, struct Sprite *sprite) { obj_anim_image_set_and_seek(sprite, 1, 0); - sprite->data2 = 1; + sprite->data[2] = 1; return FALSE; } @@ -7437,7 +7437,7 @@ bool8 sub_8062740(struct MapObject *mapObject, struct Sprite *sprite) if (sub_8064864(sprite)) { sub_8064820(sprite, 0x20); - sprite->data2 = 2; + sprite->data[2] = 2; } return FALSE; } @@ -7448,7 +7448,7 @@ bool8 sub_8062764(struct MapObject *mapObject, struct Sprite *sprite) if (sub_8064824(sprite)) { mapObject->mapobj_bit_13 = 1; - sprite->data2 = 3; + sprite->data[2] = 3; } return FALSE; } @@ -7456,7 +7456,7 @@ bool8 sub_8062764(struct MapObject *mapObject, struct Sprite *sprite) bool8 sub_80627A0(struct MapObject *mapObject, struct Sprite *sprite) { obj_anim_image_set_and_seek(sprite, 1, 0); - sprite->data2 = 1; + sprite->data[2] = 1; return FALSE; } @@ -7465,7 +7465,7 @@ bool8 sub_80627BC(struct MapObject *mapObject, struct Sprite *sprite) if (sub_8064864(sprite)) { sub_8064820(sprite, 0x20); - sprite->data2 = 2; + sprite->data[2] = 2; } return FALSE; } @@ -7476,7 +7476,7 @@ bool8 sub_80627E0(struct MapObject *mapObject, struct Sprite *sprite) if (sub_8064824(sprite)) { mapObject->mapobj_bit_13 = 1; - sprite->data2 = 3; + sprite->data[2] = 3; } return FALSE; } @@ -7484,14 +7484,14 @@ bool8 sub_80627E0(struct MapObject *mapObject, struct Sprite *sprite) bool8 sub_806281C(struct MapObject *mapObject, struct Sprite *sprite) { mapObject->mapobj_bit_26 = 1; - sprite->data2 = 1; + sprite->data[2] = 1; return TRUE; } bool8 sub_806282C(struct MapObject *mapObject, struct Sprite *sprite) { mapObject->mapobj_bit_26 = 0; - sprite->data2 = 1; + sprite->data[2] = 1; return TRUE; } @@ -7527,7 +7527,7 @@ bool8 sub_80628D0(struct MapObject *mapObject, struct Sprite *sprite) if (an_walk_any_2(mapObject, sprite)) { sprite->affineAnimPaused = 1; - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -7548,7 +7548,7 @@ bool8 sub_8062930(struct MapObject *mapObject, struct Sprite *sprite) if (an_walk_any_2(mapObject, sprite)) { sprite->affineAnimPaused = 1; - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -7560,7 +7560,7 @@ void sub_806295C(struct MapObject *mapObject, struct Sprite *sprite, u8 directio npc_coords_shift_still(mapObject); sub_805FE64(mapObject, sprite, sub_805FDD8(direction)); sprite->animPaused = 1; - sprite->data2 = 1; + sprite->data[2] = 1; } bool8 sub_806299C(struct MapObject *mapObject, struct Sprite *sprite) @@ -7679,7 +7679,7 @@ bool8 sub_8062BFC(struct MapObject *mapObject, struct Sprite *sprite) if (sub_8061328(mapObject, sprite)) { mapObject->mapobj_bit_22 = 0; - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -7698,7 +7698,7 @@ bool8 sub_8062C54(struct MapObject *mapObject, struct Sprite *sprite) if (sub_8061328(mapObject, sprite)) { mapObject->mapobj_bit_22 = 0; - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -7717,7 +7717,7 @@ bool8 sub_8062CAC(struct MapObject *mapObject, struct Sprite *sprite) if (sub_8061328(mapObject, sprite)) { mapObject->mapobj_bit_22 = 0; - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -7736,7 +7736,7 @@ bool8 sub_8062D04(struct MapObject *mapObject, struct Sprite *sprite) if (sub_8061328(mapObject, sprite)) { mapObject->mapobj_bit_22 = 0; - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -7755,7 +7755,7 @@ bool8 sub_8062D5C(struct MapObject *mapObject, struct Sprite *sprite) if (sub_8061328(mapObject, sprite)) { mapObject->mapobj_bit_22 = 0; - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -7774,7 +7774,7 @@ bool8 sub_8062DB4(struct MapObject *mapObject, struct Sprite *sprite) if (sub_8061328(mapObject, sprite)) { mapObject->mapobj_bit_22 = 0; - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -7793,7 +7793,7 @@ bool8 sub_8062E0C(struct MapObject *mapObject, struct Sprite *sprite) if (sub_8061328(mapObject, sprite)) { mapObject->mapobj_bit_22 = 0; - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -7812,7 +7812,7 @@ bool8 sub_8062E64(struct MapObject *mapObject, struct Sprite *sprite) if (sub_8061328(mapObject, sprite)) { mapObject->mapobj_bit_22 = 0; - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -7831,7 +7831,7 @@ bool8 sub_8062EBC(struct MapObject *mapObject, struct Sprite *sprite) if (sub_8061328(mapObject, sprite)) { mapObject->mapobj_bit_22 = 0; - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -7850,7 +7850,7 @@ bool8 sub_8062F14(struct MapObject *mapObject, struct Sprite *sprite) if (sub_8061328(mapObject, sprite)) { mapObject->mapobj_bit_22 = 0; - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -7869,7 +7869,7 @@ bool8 sub_8062F6C(struct MapObject *mapObject, struct Sprite *sprite) if (sub_8061328(mapObject, sprite)) { mapObject->mapobj_bit_22 = 0; - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -7888,7 +7888,7 @@ bool8 sub_8062FC4(struct MapObject *mapObject, struct Sprite *sprite) if (sub_8061328(mapObject, sprite)) { mapObject->mapobj_bit_22 = 0; - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -7937,7 +7937,7 @@ bool8 sub_8063128(struct MapObject *mapObject, struct Sprite *sprite) { if (npc_obj_ministep_stop_on_arrival(mapObject, sprite)) { - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -7955,7 +7955,7 @@ bool8 sub_8063168(struct MapObject *mapObject, struct Sprite *sprite) { if (npc_obj_ministep_stop_on_arrival(mapObject, sprite)) { - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -7973,7 +7973,7 @@ bool8 sub_80631A8(struct MapObject *mapObject, struct Sprite *sprite) { if (npc_obj_ministep_stop_on_arrival(mapObject, sprite)) { - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -7991,7 +7991,7 @@ bool8 sub_80631E8(struct MapObject *mapObject, struct Sprite *sprite) { if (npc_obj_ministep_stop_on_arrival(mapObject, sprite)) { - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -8015,7 +8015,7 @@ bool8 sub_8063258(struct MapObject *mapObject, struct Sprite *sprite) { if (npc_obj_ministep_stop_on_arrival(mapObject, sprite)) { - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -8033,7 +8033,7 @@ bool8 sub_8063298(struct MapObject *mapObject, struct Sprite *sprite) { if (npc_obj_ministep_stop_on_arrival(mapObject, sprite)) { - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -8051,7 +8051,7 @@ bool8 sub_80632D8(struct MapObject *mapObject, struct Sprite *sprite) { if (npc_obj_ministep_stop_on_arrival(mapObject, sprite)) { - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -8069,7 +8069,7 @@ bool8 sub_8063318(struct MapObject *mapObject, struct Sprite *sprite) { if (npc_obj_ministep_stop_on_arrival(mapObject, sprite)) { - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -8094,7 +8094,7 @@ bool8 sub_8063390(struct MapObject *mapObject, struct Sprite *sprite) { if (npc_obj_ministep_stop_on_arrival(mapObject, sprite)) { - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -8112,7 +8112,7 @@ bool8 sub_80633D0(struct MapObject *mapObject, struct Sprite *sprite) { if (npc_obj_ministep_stop_on_arrival(mapObject, sprite)) { - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -8130,7 +8130,7 @@ bool8 sub_8063410(struct MapObject *mapObject, struct Sprite *sprite) { if (npc_obj_ministep_stop_on_arrival(mapObject, sprite)) { - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; @@ -8148,7 +8148,7 @@ bool8 sub_8063450(struct MapObject *mapObject, struct Sprite *sprite) { if (npc_obj_ministep_stop_on_arrival(mapObject, sprite)) { - sprite->data2 = 2; + sprite->data[2] = 2; return TRUE; } return FALSE; diff --git a/src/field/field_map_obj_helpers.c b/src/field/field_map_obj_helpers.c index 59e857aae..f1a113d44 100644 --- a/src/field/field_map_obj_helpers.c +++ b/src/field/field_map_obj_helpers.c @@ -98,21 +98,21 @@ void Step8(struct Sprite *sprite, u8 dir) void oamt_npc_ministep_reset(struct Sprite *sprite, u8 a2, u8 a3) { - sprite->data3 = a2; - sprite->data4 = a3; - sprite->data5 = 0; + sprite->data[3] = a2; + sprite->data[4] = a3; + sprite->data[5] = 0; } bool8 obj_npc_ministep(struct Sprite *sprite) { - if (sprite->data5 >= gUnknown_08376194[sprite->data4]) + if (sprite->data[5] >= gUnknown_08376194[sprite->data[4]]) return FALSE; - gUnknown_08376180[sprite->data4][sprite->data5](sprite, sprite->data3); + gUnknown_08376180[sprite->data[4]][sprite->data[5]](sprite, sprite->data[3]); - sprite->data5++; + sprite->data[5]++; - if (sprite->data5 < gUnknown_08376194[sprite->data4]) + if (sprite->data[5] < gUnknown_08376194[sprite->data[4]]) return FALSE; return TRUE; @@ -120,22 +120,22 @@ bool8 obj_npc_ministep(struct Sprite *sprite) void sub_806467C(struct Sprite *sprite, u8 a2) { - sprite->data3 = a2; - sprite->data4 = 0; - sprite->data5 = 0; + sprite->data[3] = a2; + sprite->data[4] = 0; + sprite->data[5] = 0; } bool8 sub_806468C(struct Sprite *sprite) { - if (!(sprite->data4 & 1)) + if (!(sprite->data[4] & 1)) { - Step1(sprite, sprite->data3); - sprite->data5++; + Step1(sprite, sprite->data[3]); + sprite->data[5]++; } - sprite->data4++; + sprite->data[4]++; - if (sprite->data5 > 15) + if (sprite->data[5] > 15) return TRUE; else return FALSE; @@ -148,10 +148,10 @@ s16 sub_80646C8(s16 a1, u8 a2) void sub_80646E4(struct Sprite *sprite, u8 a2, u8 a3, u8 a4) { - sprite->data3 = a2; - sprite->data4 = a3; - sprite->data5 = a4; - sprite->data6 = 0; + sprite->data[3] = a2; + sprite->data[4] = a3; + sprite->data[5] = a4; + sprite->data[6] = 0; } u8 sub_8064704(struct Sprite *sprite) @@ -165,17 +165,17 @@ u8 sub_8064704(struct Sprite *sprite) v2 = 0; - if (sprite->data4) - Step1(sprite, sprite->data3); + if (sprite->data[4]) + Step1(sprite, sprite->data[3]); - sprite->pos2.y = sub_80646C8(sprite->data6 >> v6[sprite->data4], sprite->data5); + sprite->pos2.y = sub_80646C8(sprite->data[6] >> v6[sprite->data[4]], sprite->data[5]); - sprite->data6++; + sprite->data[6]++; - if (sprite->data6 == (v5[sprite->data4] >> 1)) + if (sprite->data[6] == (v5[sprite->data[4]] >> 1)) v2 = 1; - if (sprite->data6 >= v5[sprite->data4]) + if (sprite->data[6] >= v5[sprite->data[4]]) { sprite->pos2.y = 0; v2 = -1; @@ -195,17 +195,17 @@ u8 sub_806478C(struct Sprite *sprite) v2 = 0; - if (sprite->data4 && !(sprite->data6 & 1)) - Step1(sprite, sprite->data3); + if (sprite->data[4] && !(sprite->data[6] & 1)) + Step1(sprite, sprite->data[3]); - sprite->pos2.y = sub_80646C8(sprite->data6 >> v6[sprite->data4], sprite->data5); + sprite->pos2.y = sub_80646C8(sprite->data[6] >> v6[sprite->data[4]], sprite->data[5]); - sprite->data6++; + sprite->data[6]++; - if (sprite->data6 == (v5[sprite->data4] >> 1)) + if (sprite->data[6] == (v5[sprite->data[4]] >> 1)) v2 = 1; - if (sprite->data6 >= v5[sprite->data4]) + if (sprite->data[6] >= v5[sprite->data[4]]) { sprite->pos2.y = 0; v2 = -1; @@ -216,14 +216,14 @@ u8 sub_806478C(struct Sprite *sprite) void sub_8064820(struct Sprite *sprite, u16 a2) { - sprite->data3 = a2; + sprite->data[3] = a2; } bool8 sub_8064824(struct Sprite *sprite) { - sprite->data3--; + sprite->data[3]--; - if (sprite->data3 == 0) + if (sprite->data[3] == 0) return TRUE; else return FALSE; @@ -273,7 +273,7 @@ void sub_806487C(struct Sprite *sprite, bool8 invisible) void sub_8064970(struct Sprite *sprite) { - SetObjectSubpriorityByZCoord(sprite->data1, sprite, 1); + SetObjectSubpriorityByZCoord(sprite->data[1], sprite, 1); sub_806487C(sprite, 0); } @@ -283,7 +283,7 @@ void sub_8064990(u8 a1, u8 dir) for (i = 0; i < MAX_SPRITES; i++) { struct Sprite *sprite = &gSprites[i]; - if (sprite->inUse && sprite->callback == sub_8064970 && (u8)sprite->data0 == a1) + if (sprite->inUse && sprite->callback == sub_8064970 && (u8)sprite->data[0] == a1) { u8 animNum = FieldObjectDirectionToImageAnimId(dir); StartSpriteAnim(sprite, animNum); diff --git a/src/field/field_tasks.c b/src/field/field_tasks.c index 767753da2..95b8b749b 100644 --- a/src/field/field_tasks.c +++ b/src/field/field_tasks.c @@ -197,7 +197,7 @@ const struct MetatileOffset *sub_80695E0(const struct MetatileOffset a0[][2], s8 void sub_8069638(const struct MetatileOffset offsets[][2], s16 x, s16 y, bool32 flag) { const struct MetatileOffset *offsetData = sub_80695E0(offsets, MapGridGetMetatileBehaviorAt(x, y)); - const struct MetatileOffset *offsetData2 = offsetData; + const struct MetatileOffset *offsetdata[2] = offsetData; if (offsetData != NULL) { MapGridSetMetatileIdAt(x + offsetData[0].x, y + offsetData[0].y, offsetData[0].tileId); @@ -205,10 +205,10 @@ void sub_8069638(const struct MetatileOffset offsets[][2], s16 x, s16 y, bool32 { CurrentMapDrawMetatileAt(x + offsetData[0].x, y + offsetData[0].y); } - MapGridSetMetatileIdAt(x + offsetData2[1].x, y + offsetData2[1].y, offsetData2[1].tileId); + MapGridSetMetatileIdAt(x + offsetdata[2][1].x, y + offsetdata[2][1].y, offsetdata[2][1].tileId); if (flag) { - CurrentMapDrawMetatileAt(x + offsetData2[1].x, y + offsetData2[1].y); + CurrentMapDrawMetatileAt(x + offsetdata[2][1].x, y + offsetdata[2][1].y); } } } diff --git a/src/field/field_weather.c b/src/field/field_weather.c index 042655644..acd8b81ff 100644 --- a/src/field/field_weather.c +++ b/src/field/field_weather.c @@ -1248,8 +1248,8 @@ void sub_807E0A0(void) void sub_807E0F4(struct Sprite *sprite) { - sprite->data0 = (sprite->data0 + 1) & 1; - if (sprite->data0 != 0) + sprite->data[0] = (sprite->data[0] + 1) & 1; + if (sprite->data[0] != 0) sprite->pos1.x--; } @@ -1468,55 +1468,55 @@ void sub_807E4EC(struct Sprite *sprite) s32 r4; s32 r0; - if (sprite->data1 == 0) - sprite->data1 = 361; - randVal = sprite->data1 * 1103515245 + 12345; - sprite->data1 = ((randVal & 0x7FFF0000) >> 16) % 600; + if (sprite->data[1] == 0) + sprite->data[1] = 361; + randVal = sprite->data[1] * 1103515245 + 12345; + sprite->data[1] = ((randVal & 0x7FFF0000) >> 16) % 600; r6 = gUnknown_0839AAC4[gUnknown_08396FC4->unknown_6DC][0]; - r4 = sprite->data1 % 30; - sprite->data2 = r4 * 8; // useless assignment + r4 = sprite->data[1] % 30; + sprite->data[2] = r4 * 8; // useless assignment - r0 = sprite->data1 / 30; - sprite->data3 = r0 * 8; // useless assignment + r0 = sprite->data[1] / 30; + sprite->data[3] = r0 * 8; // useless assignment - sprite->data2 = r4; - sprite->data2 <<= 7; + sprite->data[2] = r4; + sprite->data[2] <<= 7; - sprite->data3 = r0; - sprite->data3 <<= 7; + sprite->data[3] = r0; + sprite->data[3] <<= 7; - sprite->data2 -= gUnknown_0839AABC[gUnknown_08396FC4->unknown_6DC][0] * r6; - sprite->data3 -= gUnknown_0839AABC[gUnknown_08396FC4->unknown_6DC][1] * r6; + sprite->data[2] -= gUnknown_0839AABC[gUnknown_08396FC4->unknown_6DC][0] * r6; + sprite->data[3] -= gUnknown_0839AABC[gUnknown_08396FC4->unknown_6DC][1] * r6; StartSpriteAnim(sprite, 0); - sprite->data4 = 0; + sprite->data[4] = 0; sprite->coordOffsetEnabled = FALSE; - sprite->data0 = r6; + sprite->data[0] = r6; } void sub_807E5C0(struct Sprite *sprite) { - if (sprite->data4 == 0) + if (sprite->data[4] == 0) { - sprite->data2 += gUnknown_0839AABC[gUnknown_08396FC4->unknown_6DC][0]; - sprite->data3 += gUnknown_0839AABC[gUnknown_08396FC4->unknown_6DC][1]; - sprite->pos1.x = sprite->data2 >> 4; - sprite->pos1.y = sprite->data3 >> 4; + sprite->data[2] += gUnknown_0839AABC[gUnknown_08396FC4->unknown_6DC][0]; + sprite->data[3] += gUnknown_0839AABC[gUnknown_08396FC4->unknown_6DC][1]; + sprite->pos1.x = sprite->data[2] >> 4; + sprite->pos1.y = sprite->data[3] >> 4; - if (sprite->data5 != 0 + if (sprite->data[5] != 0 && (sprite->pos1.x >= -8 && sprite->pos1.x <= 248) && sprite->pos1.y >= -16 && sprite->pos1.y <= 176) sprite->invisible = FALSE; else sprite->invisible = TRUE; - sprite->data0--; - if (sprite->data0 == 0) + sprite->data[0]--; + if (sprite->data[0] == 0) { StartSpriteAnim(sprite, gUnknown_08396FC4->unknown_6DC + 1); - sprite->data4 = 1; + sprite->data[4] = 1; sprite->pos1.x -= gSpriteCoordOffsetX; sprite->pos1.y -= gSpriteCoordOffsetY; sprite->coordOffsetEnabled = TRUE; @@ -1531,14 +1531,14 @@ void sub_807E5C0(struct Sprite *sprite) void sub_807E6C4(struct Sprite *sprite) { - if (sprite->data0 == 0) + if (sprite->data[0] == 0) { sub_807E4EC(sprite); sprite->callback = sub_807E5C0; } else { - sprite->data0--; + sprite->data[0]--; } } @@ -1554,13 +1554,13 @@ void sub_807E6F0(struct Sprite *sprite, u16 b) { while (--r4 != 0xFFFF) sub_807E5C0(sprite); - sprite->data6 = 0; + sprite->data[6] = 0; } else { - sprite->data0 = r4 - r8; + sprite->data[0] = r4 - r8; sprite->invisible = TRUE; - sprite->data6 = 1; + sprite->data[6] = 1; } } @@ -1584,10 +1584,10 @@ bool8 sub_807E7B4(void) gUnknown_0839AA08[r7].x, gUnknown_0839AA08[r7].y, 78); if (spriteId != 64) { - gSprites[spriteId].data5 = 0; - gSprites[spriteId].data1 = r7 * 145; - while (gSprites[spriteId].data1 >= 600) - gSprites[spriteId].data1 -= 600; + gSprites[spriteId].data[5] = 0; + gSprites[spriteId].data[1] = r7 * 145; + while (gSprites[spriteId].data[1] >= 600) + gSprites[spriteId].data[1] -= 600; sub_807E4EC(&gSprites[spriteId]); sub_807E6F0(&gSprites[spriteId], r7 * 9); gSprites[spriteId].invisible = TRUE; @@ -1606,7 +1606,7 @@ bool8 sub_807E7B4(void) { if (gUnknown_08396FC4->unknown_0[i] != NULL) { - if (gUnknown_08396FC4->unknown_0[i]->data6 == 0) + if (gUnknown_08396FC4->unknown_0[i]->data[6] == 0) gUnknown_08396FC4->unknown_0[i]->callback = sub_807E5C0; else gUnknown_08396FC4->unknown_0[i]->callback = sub_807E6C4; @@ -1627,12 +1627,12 @@ bool8 sub_807E8E8(void) gUnknown_08396FC4->unknown_6D6 = 0; if (gUnknown_08396FC4->unknown_6D8 < gUnknown_08396FC4->unknown_6D9) { - gUnknown_08396FC4->unknown_0[gUnknown_08396FC4->unknown_6D8++]->data5 = 1; + gUnknown_08396FC4->unknown_0[gUnknown_08396FC4->unknown_6D8++]->data[5] = 1; } else { gUnknown_08396FC4->unknown_6D8--; - gUnknown_08396FC4->unknown_0[gUnknown_08396FC4->unknown_6D8]->data5 = 0; + gUnknown_08396FC4->unknown_0[gUnknown_08396FC4->unknown_6D8]->data[5] = 0; gUnknown_08396FC4->unknown_0[gUnknown_08396FC4->unknown_6D8]->invisible = TRUE; } } @@ -1739,7 +1739,7 @@ bool8 snowflake_add(void) if (spriteId == 64) return FALSE; - gSprites[spriteId].data4 = gUnknown_08396FC4->unknown_6E4; + gSprites[spriteId].data[4] = gUnknown_08396FC4->unknown_6E4; sub_807EC40(&gSprites[spriteId]); gSprites[spriteId].coordOffsetEnabled = TRUE; gUnknown_08396FC4->unknown_60[gUnknown_08396FC4->unknown_6E4++] = &gSprites[spriteId]; @@ -1758,21 +1758,21 @@ bool8 snowflake_remove(void) void sub_807EC40(struct Sprite *sprite) { - u16 r4 = ((sprite->data4 * 5) & 7) * 30 + (Random() % 30); + u16 r4 = ((sprite->data[4] * 5) & 7) * 30 + (Random() % 30); u16 r6; sprite->pos1.y = -3 - (gSpriteCoordOffsetY + sprite->centerToCornerVecY); sprite->pos1.x = r4 - (gSpriteCoordOffsetX + sprite->centerToCornerVecX); - sprite->data0 = sprite->pos1.y * 128; + sprite->data[0] = sprite->pos1.y * 128; sprite->pos2.x = 0; r6 = Random(); - sprite->data1 = (r6 & 3) * 5 + 64; - sprite->data7 = (r6 & 3) * 5 + 64; + sprite->data[1] = (r6 & 3) * 5 + 64; + sprite->data[7] = (r6 & 3) * 5 + 64; StartSpriteAnim(sprite, (r6 & 1) ? 0 : 1); - sprite->data3 = 0; - sprite->data2 = ((r6 & 3) == 0) ? 2 : 1; - sprite->data6 = (r6 & 0x1F) + 210; - sprite->data5 = 0; + sprite->data[3] = 0; + sprite->data[2] = ((r6 & 3) == 0) ? 2 : 1; + sprite->data[6] = (r6 & 0x1F) + 210; + sprite->data[5] = 0; } void sub_807ECEC(struct Sprite *sprite) @@ -1782,7 +1782,7 @@ void sub_807ECEC(struct Sprite *sprite) sprite->invisible = FALSE; sprite->callback = sub_807ED48; sprite->pos1.y = 0xFA - (gSpriteCoordOffsetY + sprite->centerToCornerVecY); - sprite->data0 = sprite->pos1.y * 128; + sprite->data[0] = sprite->pos1.y * 128; gUnknown_08396FC4->unknown_6E2 = 0; } } @@ -1792,10 +1792,10 @@ void sub_807ED48(struct Sprite *sprite) s16 r3; s16 r2; - sprite->data0 += sprite->data1; - sprite->pos1.y = sprite->data0 >> 7; - sprite->data3 = (sprite->data3 + sprite->data2) & 0xFF; - sprite->pos2.x = gSineTable[sprite->data3] / 64; + sprite->data[0] += sprite->data[1]; + sprite->pos1.y = sprite->data[0] >> 7; + sprite->data[3] = (sprite->data[3] + sprite->data[2]) & 0xFF; + sprite->pos2.x = gSineTable[sprite->data[3]] / 64; r3 = (sprite->pos1.x + sprite->centerToCornerVecX + gSpriteCoordOffsetX) & 0x1FF; if (r3 & 0x100) @@ -1809,22 +1809,22 @@ void sub_807ED48(struct Sprite *sprite) if (r2 > 163 && r2 < 171) { sprite->pos1.y = 250 - (gSpriteCoordOffsetY + sprite->centerToCornerVecY); - sprite->data0 = sprite->pos1.y * 128; - sprite->data5 = 0; - sprite->data6 = 220; + sprite->data[0] = sprite->pos1.y * 128; + sprite->data[5] = 0; + sprite->data[6] = 220; } else if (r2 > 242 && r2 < 250) { sprite->pos1.y = 163; - sprite->data0 = sprite->pos1.y * 128; - sprite->data5 = 0; - sprite->data6 = 220; + sprite->data[0] = sprite->pos1.y * 128; + sprite->data[5] = 0; + sprite->data[6] = 220; sprite->invisible = TRUE; sprite->callback = sub_807ECEC; } - sprite->data5++; - if (sprite->data5 == sprite->data6) + sprite->data[5]++; + if (sprite->data[5] == sprite->data[6]) { sub_807EC40(sprite); sprite->pos1.y = 250; @@ -2135,10 +2135,10 @@ bool8 sub_807F5EC(void) void sub_807F688(struct Sprite *sprite) { sprite->pos2.y = (u8)gSpriteCoordOffsetY; - sprite->pos1.x = gUnknown_08396FC4->unknown_6EE + 32 + sprite->data0 * 64; + sprite->pos1.x = gUnknown_08396FC4->unknown_6EE + 32 + sprite->data[0] * 64; if (sprite->pos1.x > 0x10F) { - sprite->pos1.x = 480 + gUnknown_08396FC4->unknown_6EE - (4 - sprite->data0) * 64; + sprite->pos1.x = 480 + gUnknown_08396FC4->unknown_6EE - (4 - sprite->data[0]) * 64; sprite->pos1.x &= 0x1FF; } } diff --git a/src/field/fldeff_cut.c b/src/field/fldeff_cut.c index 00cabe5c0..6e7f14a8c 100644 --- a/src/field/fldeff_cut.c +++ b/src/field/fldeff_cut.c @@ -136,7 +136,7 @@ bool8 FldEff_CutGrass(void) { eCutGrassSpriteArray[i] = CreateSprite((struct SpriteTemplate *)&gSpriteTemplate_CutGrass, gSprites[gPlayerAvatar.spriteId].oam.x + 8, gSprites[gPlayerAvatar.spriteId].oam.y + 20, 0); - gSprites[eCutGrassSpriteArray[i]].data2 = 32 * i; + gSprites[eCutGrassSpriteArray[i]].data[2] = 32 * i; } return 0; } @@ -242,9 +242,9 @@ void sub_80A28F4(s16 x, s16 y) void sub_80A2A48(struct Sprite *sprite) { - sprite->data0 = 8; - sprite->data1 = 0; - sprite->data3 = 0; + sprite->data[0] = 8; + sprite->data[1] = 0; + sprite->data[3] = 0; sprite->callback = (void *)objc_8097BBC; } @@ -253,16 +253,16 @@ void objc_8097BBC(struct Sprite *sprite) u16 tempdata; u16 tempdata2; - sprite->pos2.x = Sin(sprite->data2, sprite->data0); - sprite->pos2.y = Cos(sprite->data2, sprite->data0); + sprite->pos2.x = Sin(sprite->data[2], sprite->data[0]); + sprite->pos2.y = Cos(sprite->data[2], sprite->data[0]); - sprite->data2 = (sprite->data2 + 8) & 0xFF; - sprite->data0 += ((tempdata2 = sprite->data3) << 16 >> 18) + 1; // what? - sprite->data3 = tempdata2 + 1; + sprite->data[2] = (sprite->data[2] + 8) & 0xFF; + sprite->data[0] += ((tempdata2 = sprite->data[3]) << 16 >> 18) + 1; // what? + sprite->data[3] = tempdata2 + 1; - tempdata = sprite->data1; + tempdata = sprite->data[1]; if((s16)tempdata != 28) // done rotating the grass, execute clean up function - sprite->data1++; + sprite->data[1]++; else sprite->callback = (void *)sub_80A2AB8; } diff --git a/src/field/fldeff_softboiled.c b/src/field/fldeff_softboiled.c index b2c3d9bd1..c2a315233 100644 --- a/src/field/fldeff_softboiled.c +++ b/src/field/fldeff_softboiled.c @@ -82,8 +82,8 @@ static void sub_8133D50(u8 taskId) { struct Sprite *sprites = gSprites; - unk1 = sprites[EWRAM_1000.unk1].data0; - unk2 = sprites[EWRAM_1000.unk2].data0; + unk1 = sprites[EWRAM_1000.unk1].data[0]; + unk2 = sprites[EWRAM_1000.unk2].data[0]; if (unk1 > 5 || unk2 > 5) { @@ -91,7 +91,7 @@ static void sub_8133D50(u8 taskId) { return; } - EWRAM_1C000.unk0 = &gPlayerParty[sprites[EWRAM_1000.unk2].data0]; + EWRAM_1C000.unk0 = &gPlayerParty[sprites[EWRAM_1000.unk2].data[0]]; hp = GetMonData(EWRAM_1C000.unk0, MON_DATA_HP); if (hp == 0 || unk1 == unk2 || GetMonData(EWRAM_1C000.unk0, MON_DATA_MAX_HP) == hp) @@ -102,7 +102,7 @@ static void sub_8133D50(u8 taskId) { PlaySE(SE_KAIFUKU); - EWRAM_1C000.unk5 = gSprites[EWRAM_1000.unk1].data0; + EWRAM_1C000.unk5 = gSprites[EWRAM_1000.unk1].data[0]; pokemon = &gPlayerParty[EWRAM_1C000.unk5]; EWRAM_1C000.unk0 = pokemon; diff --git a/src/field/item_menu.c b/src/field/item_menu.c index 09542cc6d..67362d5f3 100644 --- a/src/field/item_menu.c +++ b/src/field/item_menu.c @@ -4080,11 +4080,11 @@ static const struct CompressedSpritePalette sBagSpritePalette = {gBagPalette, 30 static void sub_80A7998(struct Sprite *sprite) { sprite->animNum = 0; - sprite->data0 = 0; - sprite->data1 = 0; - sprite->data2 = 0; - sprite->data3 = 0; - sprite->data4 = 0; + sprite->data[0] = 0; + sprite->data[1] = 0; + sprite->data[2] = 0; + sprite->data[3] = 0; + sprite->data[4] = 0; sprite->callback = sub_80A79B4; } @@ -4098,7 +4098,7 @@ static void sub_80A79B4(struct Sprite *sprite) static void sub_80A79EC(struct Sprite *sprite) { - switch (sprite->data3) + switch (sprite->data[3]) { case 0: if (gUnknown_0203855B != 6) @@ -4112,26 +4112,26 @@ static void sub_80A79EC(struct Sprite *sprite) sprite->animBeginning = TRUE; sprite->animNum = 0; sprite->pos1.y -= 4; - sprite->data0 = 4; - sprite->data3 = 1; + sprite->data[0] = 4; + sprite->data[3] = 1; sub_80A7AE4(sprite); } break; case 1: - if (sprite->data0 != 0) + if (sprite->data[0] != 0) { - if (sprite->data1 != 0) + if (sprite->data[1] != 0) { sprite->pos1.y++; - sprite->data0--; + sprite->data[0]--; } - sprite->data1 = (sprite->data1 + 1) & 1; + sprite->data[1] = (sprite->data[1] + 1) & 1; } else { gUnknown_0203855B = -1; - sprite->data1 = 0; - sprite->data3 = 0; + sprite->data[1] = 0; + sprite->data[3] = 0; } break; } @@ -4139,17 +4139,17 @@ static void sub_80A79EC(struct Sprite *sprite) static void sub_80A7A94(struct Sprite *sprite) { - switch (sprite->data4) + switch (sprite->data[4]) { case 0: sprite->oam.affineMode = 1; sprite->affineAnims = sBagSpriteAffineAnimTable; InitSpriteAffineAnim(sprite); - sprite->data4 = 1; + sprite->data[4] = 1; break; case 1: - sprite->data2++; - if (sprite->data2 == 12) + sprite->data[2]++; + if (sprite->data[2] == 12) sub_80A7AE4(sprite); break; } @@ -4159,8 +4159,8 @@ static void sub_80A7AE4(struct Sprite *sprite) { gUnknown_0203855C = 0; sprite->oam.affineMode = 0; - sprite->data2 = 0; - sprite->data4 = 0; + sprite->data[2] = 0; + sprite->data[4] = 0; FreeOamMatrix(sprite->oam.matrixNum); } @@ -4228,45 +4228,45 @@ static const struct SpritePalette sPokeballSpritePalette = {gPalette_83C170C, 8} static void sub_80A7B28(struct Sprite *sprite) { - sprite->data3 = 0; - sprite->data0 = 0; + sprite->data[3] = 0; + sprite->data[0] = 0; sub_80A7B6C(sprite); sprite->callback = sub_80A7B6C; } static void sub_80A7B48(struct Sprite *sprite) { - sprite->centerToCornerVecX = sprite->data5 - ((sprite->data0 + 1) & 1); - sprite->centerToCornerVecY = sprite->data6 - ((sprite->data0 + 1) & 1); + sprite->centerToCornerVecX = sprite->data[5] - ((sprite->data[0] + 1) & 1); + sprite->centerToCornerVecY = sprite->data[6] - ((sprite->data[0] + 1) & 1); } static void sub_80A7B6C(struct Sprite *sprite) { - if (sprite->data7 != 0) + if (sprite->data[7] != 0) { - switch (sprite->data3) + switch (sprite->data[3]) { case 0: sprite->oam.affineMode = 1; - if (sprite->data7 == 1) + if (sprite->data[7] == 1) sprite->affineAnims = gSpriteAffineAnimTable_83C1D20; else sprite->affineAnims = gSpriteAffineAnimTable_83C1D20 + 1; InitSpriteAffineAnim(sprite); - sprite->data3 = 1; - sprite->data5 = sprite->centerToCornerVecX; - sprite->data6 = sprite->centerToCornerVecY; + sprite->data[3] = 1; + sprite->data[5] = sprite->centerToCornerVecX; + sprite->data[6] = sprite->centerToCornerVecY; sub_80A7B48(sprite); break; case 1: - sprite->data0++; + sprite->data[0]++; sub_80A7B48(sprite); - if (sprite->data0 == 32) + if (sprite->data[0] == 32) { - sprite->data0 = 0; - sprite->data3 = 0; - sprite->centerToCornerVecX = sprite->data5; - sprite->centerToCornerVecY = sprite->data6; + sprite->data[0] = 0; + sprite->data[3] = 0; + sprite->centerToCornerVecX = sprite->data[5]; + sprite->centerToCornerVecY = sprite->data[6]; FreeOamMatrix(sprite->oam.matrixNum); sprite->oam.affineMode = 0; sprite->callback = SpriteCallbackDummy; @@ -4291,7 +4291,7 @@ static void CreateBagPokeballSprite(u8 a) { LoadSpritePalette(&sPokeballSpritePalette); sPokeballSpriteId = CreateSprite(&sPokeballSpriteTemplate, 16, 88, 0); - gSprites[sPokeballSpriteId].data7 = a; + gSprites[sPokeballSpriteId].data[7] = a; } static void sub_80A7C64(void) diff --git a/src/field/menu_helpers.c b/src/field/menu_helpers.c index 14e823355..8e13e5546 100644 --- a/src/field/menu_helpers.c +++ b/src/field/menu_helpers.c @@ -405,15 +405,15 @@ void CreateVerticalScrollIndicators(u8 id, u16 x, u16 y) if (gUnknown_020388C0[0] == 0xFF) { gUnknown_020388C0[0] = CreateSprite(&gSpriteTemplate_83E59D0, x, y, 0); - gSprites[gUnknown_020388C0[0]].data2 = -1; + gSprites[gUnknown_020388C0[0]].data[2] = -1; if (gUnknown_020388C0[1] != 0xFF) { gSprites[gUnknown_020388C0[0]].pos2.y = gSprites[gUnknown_020388C0[1]].pos2.y * -1; - gSprites[gUnknown_020388C0[0]].data3 = gSprites[gUnknown_020388C0[1]].data3; + gSprites[gUnknown_020388C0[0]].data[3] = gSprites[gUnknown_020388C0[1]].data[3]; } else { - gSprites[gUnknown_020388C0[0]].data3 = 0; + gSprites[gUnknown_020388C0[0]].data[3] = 0; } } break; @@ -422,15 +422,15 @@ void CreateVerticalScrollIndicators(u8 id, u16 x, u16 y) if (gUnknown_020388C0[1] == 0xFF) { gUnknown_020388C0[1] = CreateSprite(&gSpriteTemplate_83E59D0, x, y, 0); - gSprites[gUnknown_020388C0[1]].data2 = 1; + gSprites[gUnknown_020388C0[1]].data[2] = 1; if (gUnknown_020388C0[0] != 0xFF) { gSprites[gUnknown_020388C0[1]].pos2.y = gSprites[gUnknown_020388C0[0]].pos2.y * -1; - gSprites[gUnknown_020388C0[1]].data3 = gSprites[gUnknown_020388C0[0]].data3; + gSprites[gUnknown_020388C0[1]].data[3] = gSprites[gUnknown_020388C0[0]].data[3]; } else { - gSprites[gUnknown_020388C0[1]].data3 = 0; + gSprites[gUnknown_020388C0[1]].data[3] = 0; } } break; @@ -439,15 +439,15 @@ void CreateVerticalScrollIndicators(u8 id, u16 x, u16 y) if (gUnknown_020388C0[2] == 0xFF) { gUnknown_020388C0[2] = CreateSprite(&gSpriteTemplate_83E59E8, x, y, 0); - gSprites[gUnknown_020388C0[2]].data0 = -1; + gSprites[gUnknown_020388C0[2]].data[0] = -1; if (gUnknown_020388C0[3] != 0xFF) { gSprites[gUnknown_020388C0[2]].pos2.x = gSprites[gUnknown_020388C0[3]].pos2.x * -1; - gSprites[gUnknown_020388C0[2]].data1 = gSprites[gUnknown_020388C0[3]].data1; + gSprites[gUnknown_020388C0[2]].data[1] = gSprites[gUnknown_020388C0[3]].data[1]; } else { - gSprites[gUnknown_020388C0[2]].data1 = 0; + gSprites[gUnknown_020388C0[2]].data[1] = 0; } } break; @@ -456,15 +456,15 @@ void CreateVerticalScrollIndicators(u8 id, u16 x, u16 y) if (gUnknown_020388C0[3] == 0xFF) { gUnknown_020388C0[3] = CreateSprite(&gSpriteTemplate_83E59E8, x, y, 0); - gSprites[gUnknown_020388C0[3]].data0 = 1; + gSprites[gUnknown_020388C0[3]].data[0] = 1; if (gUnknown_020388C0[2] != 0xFF) { gSprites[gUnknown_020388C0[3]].pos2.x = gSprites[gUnknown_020388C0[2]].pos2.x * -1; - gSprites[gUnknown_020388C0[3]].data1 = gSprites[gUnknown_020388C0[2]].data1; + gSprites[gUnknown_020388C0[3]].data[1] = gSprites[gUnknown_020388C0[2]].data[1]; } else { - gSprites[gUnknown_020388C0[3]].data1 = 0; + gSprites[gUnknown_020388C0[3]].data[1] = 0; } } break; @@ -502,23 +502,23 @@ void BuyMenuFreeMemory(void) static void sub_80F9834(struct Sprite *sprite) { - if (sprite->data1 == 0) + if (sprite->data[1] == 0) { - sprite->pos2.x += sprite->data0; + sprite->pos2.x += sprite->data[0]; } - if (sprite->data3 == 0) + if (sprite->data[3] == 0) { - sprite->pos2.y += sprite->data2; + sprite->pos2.y += sprite->data[2]; } - sprite->data1++; - sprite->data3++; - if (sprite->data1 > 2) + sprite->data[1]++; + sprite->data[3]++; + if (sprite->data[1] > 2) { - sprite->data1 = 0; + sprite->data[1] = 0; } - if (sprite->data3 > 2) + if (sprite->data[3] > 2) { - sprite->data3 = 0; + sprite->data[3] = 0; } if (sprite->pos2.x == 8 || sprite->pos2.x == -8) { @@ -552,8 +552,8 @@ static void sub_80F9914(u8 id) { gSprites[gUnknown_020388C0[id]].pos2.x = 0; gSprites[gUnknown_020388C0[id]].pos2.y = 0; - gSprites[gUnknown_020388C0[id]].data1 = 0; - gSprites[gUnknown_020388C0[id]].data3 = 0; + gSprites[gUnknown_020388C0[id]].data[1] = 0; + gSprites[gUnknown_020388C0[id]].data[3] = 0; } } diff --git a/src/field/overworld.c b/src/field/overworld.c index d6f255409..59aac5c33 100644 --- a/src/field/overworld.c +++ b/src/field/overworld.c @@ -2648,14 +2648,14 @@ void CreateLinkPlayerSprite(u8 linkPlayerId) mapObj->spriteId = AddPseudoFieldObject(val, SpriteCB_LinkPlayer, 0, 0, 0); sprite = &gSprites[mapObj->spriteId]; sprite->coordOffsetEnabled = TRUE; - sprite->data0 = linkPlayerId; + sprite->data[0] = linkPlayerId; mapObj->mapobj_bit_2 = 0; } } void SpriteCB_LinkPlayer(struct Sprite *sprite) { - struct LinkPlayerMapObject *linkPlayerMapObj = &gLinkPlayerMapObjects[sprite->data0]; + struct LinkPlayerMapObject *linkPlayerMapObj = &gLinkPlayerMapObjects[sprite->data[0]]; struct MapObject *mapObj = &gMapObjects[linkPlayerMapObj->mapObjId]; sprite->pos1.x = mapObj->coords1.x; sprite->pos1.y = mapObj->coords1.y; @@ -2668,7 +2668,7 @@ void SpriteCB_LinkPlayer(struct Sprite *sprite) sub_806487C(sprite, 0); if (mapObj->mapobj_bit_2) { - sprite->invisible = ((sprite->data7 & 4) >> 2); - sprite->data7++; + sprite->invisible = ((sprite->data[7] & 4) >> 2); + sprite->data[7]++; } } diff --git a/src/field/party_menu.c b/src/field/party_menu.c index 42bb66f6f..a8620570b 100644 --- a/src/field/party_menu.c +++ b/src/field/party_menu.c @@ -1422,7 +1422,7 @@ u16 HandleDefaultPartyMenuInput(u8 taskId) if (menuDirectionPressed == 0) { - if ((gMain.newKeys & A_BUTTON) && gSprites[sub_806CA00(taskId)].data0 == 7) + if ((gMain.newKeys & A_BUTTON) && gSprites[sub_806CA00(taskId)].data[0] == 7) { // Selected "CANCEL" return B_BUTTON; @@ -1595,7 +1595,7 @@ u16 HandleBattleTowerPartyMenuInput(u8 taskId) { if (gMain.newKeys & A_BUTTON) { - if (gSprites[sub_806CA00(taskId)].data0 == 7) + if (gSprites[sub_806CA00(taskId)].data[0] == 7) { return B_BUTTON; } @@ -1629,7 +1629,7 @@ void ChangePartyMenuSelection(u8 taskId, s8 directionPressed) { bool8 isLinkDoubleBattle; u8 spriteId = sub_806CA00(taskId); - u8 menuIndex = gSprites[spriteId].data0; + u8 menuIndex = gSprites[spriteId].data[0]; UpdateMonIconFrame_806DA44(taskId, menuIndex, 0); @@ -1645,17 +1645,17 @@ void ChangePartyMenuSelection(u8 taskId, s8 directionPressed) ChangeLinkDoubleBattlePartyMenuSelection(spriteId, menuIndex, directionPressed); - if (gSprites[spriteId].data0 == 0 || gSprites[spriteId].data0 == 2 || gSprites[spriteId].data0 == 3) - sub_806BF24(&gUnknown_083769C0[gSprites[spriteId].data0 * 2], gSprites[spriteId].data0, 3, 1); - if (gSprites[spriteId].data0 == 1 || gSprites[spriteId].data0 == 4 || gSprites[spriteId].data0 == 5) - sub_806BF24(&gUnknown_083769C0[gSprites[spriteId].data0 * 2], gSprites[spriteId].data0, 4, 1); - if (gSprites[spriteId].data0 == 7) + if (gSprites[spriteId].data[0] == 0 || gSprites[spriteId].data[0] == 2 || gSprites[spriteId].data[0] == 3) + sub_806BF24(&gUnknown_083769C0[gSprites[spriteId].data[0] * 2], gSprites[spriteId].data[0], 3, 1); + if (gSprites[spriteId].data[0] == 1 || gSprites[spriteId].data[0] == 4 || gSprites[spriteId].data[0] == 5) + sub_806BF24(&gUnknown_083769C0[gSprites[spriteId].data[0] * 2], gSprites[spriteId].data[0], 4, 1); + if (gSprites[spriteId].data[0] == 7) sub_806BBEC(2); ewram1B000.unk261 = 2; - gSprites[spriteId].pos1.x = gUnknown_083768B8[PARTY_MENU_LAYOUT_LINK_DOUBLE_BATTLE][gSprites[spriteId].data0].x; - gSprites[spriteId].pos1.y = gUnknown_083768B8[PARTY_MENU_LAYOUT_LINK_DOUBLE_BATTLE][gSprites[spriteId].data0].y; + gSprites[spriteId].pos1.x = gUnknown_083768B8[PARTY_MENU_LAYOUT_LINK_DOUBLE_BATTLE][gSprites[spriteId].data[0]].x; + gSprites[spriteId].pos1.y = gUnknown_083768B8[PARTY_MENU_LAYOUT_LINK_DOUBLE_BATTLE][gSprites[spriteId].data[0]].y; } else { @@ -1679,9 +1679,9 @@ void ChangePartyMenuSelection(u8 taskId, s8 directionPressed) ChangeDoubleBattlePartyMenuSelection(spriteId, menuIndex, directionPressed); } - if (gSprites[spriteId].data0 < PARTY_SIZE) + if (gSprites[spriteId].data[0] < PARTY_SIZE) { - sub_806BF24(&gUnknown_083769A8[isDoubleBattle * 12 + gSprites[spriteId].data0 * 2], gSprites[spriteId].data0, 3, 1); + sub_806BF24(&gUnknown_083769A8[isDoubleBattle * 12 + gSprites[spriteId].data[0] * 2], gSprites[spriteId].data[0], 3, 1); } else { @@ -1690,13 +1690,13 @@ void ChangePartyMenuSelection(u8 taskId, s8 directionPressed) ewram1B000.unk261 = 2; - gSprites[spriteId].pos1.x = gUnknown_083768B8[isDoubleBattle][gSprites[spriteId].data0].x; - gSprites[spriteId].pos1.y = gUnknown_083768B8[isDoubleBattle][gSprites[spriteId].data0].y; + gSprites[spriteId].pos1.x = gUnknown_083768B8[isDoubleBattle][gSprites[spriteId].data[0]].x; + gSprites[spriteId].pos1.y = gUnknown_083768B8[isDoubleBattle][gSprites[spriteId].data[0]].y; } - UpdateMonIconFrame_806DA44(taskId, gSprites[spriteId].data0, 1); + UpdateMonIconFrame_806DA44(taskId, gSprites[spriteId].data[0], 1); - if (menuIndex != gSprites[spriteId].data0) + if (menuIndex != gSprites[spriteId].data[0]) { PlaySE(5); } @@ -1710,47 +1710,47 @@ void ChangeDefaultPartyMenuSelection(u8 spriteId, u8 menuIndex, s8 directionPres switch (menuMovement) { case 2: // no movement - gSprites[spriteId].data1 = 0; + gSprites[spriteId].data[1] = 0; break; case 1: // moving up if (menuIndex == 0) { - gSprites[spriteId].data0 = 7; + gSprites[spriteId].data[0] = 7; } else if (menuIndex == 7) { - gSprites[spriteId].data0 = gPlayerPartyCount - 1; + gSprites[spriteId].data[0] = gPlayerPartyCount - 1; } else { s8 diff = directionPressed; - gSprites[spriteId].data0 += diff; + gSprites[spriteId].data[0] += diff; } - gSprites[spriteId].data1 = 0; + gSprites[spriteId].data[1] = 0; break; case 3: // moving down if (menuIndex == gPlayerPartyCount - 1) { - gSprites[spriteId].data0 = 7; + gSprites[spriteId].data[0] = 7; } else if (menuIndex == 7) { - gSprites[spriteId].data0 = 0; + gSprites[spriteId].data[0] = 0; } else { s8 diff = directionPressed; - gSprites[spriteId].data0 += diff; + gSprites[spriteId].data[0] += diff; } - gSprites[spriteId].data1 = 0; + gSprites[spriteId].data[1] = 0; break; case 4: // moving right if (gPlayerPartyCount > 1 && menuIndex == 0) { - if (gSprites[spriteId].data1 == 0) - gSprites[spriteId].data1 = 1; + if (gSprites[spriteId].data[1] == 0) + gSprites[spriteId].data[1] = 1; - gSprites[spriteId].data0 = gSprites[spriteId].data1; + gSprites[spriteId].data[0] = gSprites[spriteId].data[1]; } break; case 0: // moving left // Only move the selection to the left side if one of the mons in the right-hand column are currently selected nextIndex = menuIndex - 1; if (nextIndex <= 4) { - gSprites[spriteId].data0 = 0; - gSprites[spriteId].data1 = menuIndex; + gSprites[spriteId].data[0] = 0; + gSprites[spriteId].data[1] = menuIndex; } break; } @@ -1764,62 +1764,62 @@ void ChangeDoubleBattlePartyMenuSelection(u8 spriteId, u8 menuIndex, s8 directio switch(menuMovement) { case 2: // no movement - gSprites[spriteId].data1 = 0; + gSprites[spriteId].data[1] = 0; break; case 3: // moving down if (menuIndex == 7) { - gSprites[spriteId].data0 = 0; + gSprites[spriteId].data[0] = 0; } else if (menuIndex == gPlayerPartyCount - 1) { - gSprites[spriteId].data0 = 7; + gSprites[spriteId].data[0] = 7; } else { s8 diff = directionPressed; - gSprites[spriteId].data0 += diff; + gSprites[spriteId].data[0] += diff; } - gSprites[spriteId].data1 = 0; + gSprites[spriteId].data[1] = 0; break; case 1: // moving up if (menuIndex == 0) { - gSprites[spriteId].data0 = 7; + gSprites[spriteId].data[0] = 7; } else if (menuIndex == 7) { - gSprites[spriteId].data0 = gPlayerPartyCount - 1; + gSprites[spriteId].data[0] = gPlayerPartyCount - 1; } else { s8 diff = directionPressed; - gSprites[spriteId].data0 += diff; + gSprites[spriteId].data[0] += diff; } - gSprites[spriteId].data1 = 0; + gSprites[spriteId].data[1] = 0; break; case 4: // moving right if (menuIndex == 0) { if (gPlayerPartyCount > 2) { - u16 var1 = gSprites[spriteId].data1 - 2; + u16 var1 = gSprites[spriteId].data[1] - 2; if (var1 > 1) - gSprites[spriteId].data0 = 2; + gSprites[spriteId].data[0] = 2; else - gSprites[spriteId].data0 = gSprites[spriteId].data1; + gSprites[spriteId].data[0] = gSprites[spriteId].data[1]; } } else if (menuIndex == 1) { if (gPlayerPartyCount > 4) { - u16 var1 = gSprites[spriteId].data1 - 4; + u16 var1 = gSprites[spriteId].data[1] - 4; if (var1 <= 1) - gSprites[spriteId].data0 = gSprites[spriteId].data1; + gSprites[spriteId].data[0] = gSprites[spriteId].data[1]; else - gSprites[spriteId].data0 = 4; + gSprites[spriteId].data[0] = 4; } } break; case 0: // moving left var1 = menuIndex - 2; if (var1 <= 1) { - gSprites[spriteId].data0 = 0; - gSprites[spriteId].data1 = menuIndex; + gSprites[spriteId].data[0] = 0; + gSprites[spriteId].data[1] = menuIndex; } else { u8 var2 = menuIndex - 4; if (var2 <= 1) { - gSprites[spriteId].data0 = 1; - gSprites[spriteId].data1 = menuIndex; + gSprites[spriteId].data[0] = 1; + gSprites[spriteId].data[1] = menuIndex; } } break; @@ -1837,62 +1837,62 @@ void ChangeLinkDoubleBattlePartyMenuSelection(u8 spriteId, u8 menuIndex, s8 dire switch (menuMovement) { case 2: // no movement - gSprites[spriteId].data1 = 0; + gSprites[spriteId].data[1] = 0; break; case 3: // moving down if (menuIndex == 7) { - gSprites[spriteId].data0 = 0; + gSprites[spriteId].data[0] = 0; } else { while (menuIndex != PARTY_SIZE - 1) { menuIndex++; if (GetMonData(&gPlayerParty[menuIndex], MON_DATA_SPECIES)) { - gSprites[spriteId].data0 = menuIndex; - gSprites[spriteId].data1 = 0; + gSprites[spriteId].data[0] = menuIndex; + gSprites[spriteId].data[1] = 0; return; } } - gSprites[spriteId].data0 = 7; + gSprites[spriteId].data[0] = 7; } - gSprites[spriteId].data1 = 0; + gSprites[spriteId].data[1] = 0; break; case 1: // moving up while (menuIndex != 0) { menuIndex--; if (menuIndex != PARTY_SIZE && GetMonData(gPlayerParty[menuIndex], MON_DATA_SPECIES)) { - gSprites[spriteId].data0 = menuIndex; - gSprites[spriteId].data1 = 0; + gSprites[spriteId].data[0] = menuIndex; + gSprites[spriteId].data[1] = 0; return; } } - gSprites[spriteId].data0 = 7; - gSprites[spriteId].data1 = 0; + gSprites[spriteId].data[0] = 7; + gSprites[spriteId].data[1] = 0; break; case 4: // moving right if (menuIndex == 0) { - var1 = gSprites[spriteId].data1 - 2; + var1 = gSprites[spriteId].data[1] - 2; if (var1 > 1) { if (GetMonData(&gPlayerParty[2], MON_DATA_SPECIES)) { - gSprites[spriteId].data0 = 2; + gSprites[spriteId].data[0] = 2; } else if (GetMonData(&gPlayerParty[3], MON_DATA_SPECIES)) { - gSprites[spriteId].data0 = 3; + gSprites[spriteId].data[0] = 3; } } else { - gSprites[spriteId].data0 = 1; + gSprites[spriteId].data[0] = 1; } } else if (menuIndex == 1) { - var1 = gSprites[spriteId].data1 - 4; + var1 = gSprites[spriteId].data[1] - 4; if (var1 <= 1) { - gSprites[spriteId].data0 = gSprites[spriteId].data1; + gSprites[spriteId].data[0] = gSprites[spriteId].data[1]; } else { if (GetMonData(&gPlayerParty[4], MON_DATA_SPECIES)) { - gSprites[spriteId].data0 = 4; + gSprites[spriteId].data[0] = 4; } else if (GetMonData(&gPlayerParty[5], MON_DATA_SPECIES)) { - gSprites[spriteId].data0 = 5; + gSprites[spriteId].data[0] = 5; } } } @@ -1900,13 +1900,13 @@ void ChangeLinkDoubleBattlePartyMenuSelection(u8 spriteId, u8 menuIndex, s8 dire case 0: // moving left var2 = menuIndex - 2; if (var2 <= 1) { - gSprites[spriteId].data0 = 0; - gSprites[spriteId].data1 = menuIndex; + gSprites[spriteId].data[0] = 0; + gSprites[spriteId].data[1] = menuIndex; } else { var2 = menuIndex - 4; if (var2 <= 1) { - gSprites[spriteId].data0 = 1; - gSprites[spriteId].data1 = menuIndex; + gSprites[spriteId].data[0] = 1; + gSprites[spriteId].data[1] = menuIndex; } } @@ -2165,7 +2165,7 @@ void ChangeBattleTowerPartyMenuSelection(u8 taskId, s8 directionPressed) u8 newMenuIndex3; s8 menuMovement; u8 spriteId = sub_806CA00(taskId); - u8 menuIndex = gSprites[spriteId].data0; + u8 menuIndex = gSprites[spriteId].data[0]; UpdateMonIconFrame_806DA44(taskId, menuIndex, 0); @@ -2187,60 +2187,60 @@ void ChangeBattleTowerPartyMenuSelection(u8 taskId, s8 directionPressed) switch (menuMovement) { case 2: // no movement - gSprites[spriteId].data1 = 0; + gSprites[spriteId].data[1] = 0; break; case 1: // moving up if (menuIndex == 0) { - gSprites[spriteId].data0 = 7; + gSprites[spriteId].data[0] = 7; } else if (menuIndex == PARTY_SIZE) { - gSprites[spriteId].data0 = gPlayerPartyCount - 1; + gSprites[spriteId].data[0] = gPlayerPartyCount - 1; } else { - gSprites[spriteId].data0 += directionPressed; + gSprites[spriteId].data[0] += directionPressed; } - gSprites[spriteId].data1 = 0; + gSprites[spriteId].data[1] = 0; break; case 3: // moving down if (menuIndex == gPlayerPartyCount - 1) { - gSprites[spriteId].data0 = 6; + gSprites[spriteId].data[0] = 6; } else if (menuIndex == 7) { - gSprites[spriteId].data0 = 0; + gSprites[spriteId].data[0] = 0; } else { - gSprites[spriteId].data0 += directionPressed; + gSprites[spriteId].data[0] += directionPressed; } - gSprites[spriteId].data1 = 0; + gSprites[spriteId].data[1] = 0; break; case 4: // moving right if (gPlayerPartyCount > 1 && menuIndex == 0) { - if (gSprites[spriteId].data1 == 0) { - gSprites[spriteId].data1 = 1; + if (gSprites[spriteId].data[1] == 0) { + gSprites[spriteId].data[1] = 1; } - gSprites[spriteId].data0 = gSprites[spriteId].data1; + gSprites[spriteId].data[0] = gSprites[spriteId].data[1]; } break; case 0: // moving left newMenuIndex3 = menuIndex - 1; if (newMenuIndex3 <= 4) { - gSprites[spriteId].data0 = 0; - gSprites[spriteId].data1 = menuIndex; + gSprites[spriteId].data[0] = 0; + gSprites[spriteId].data[1] = menuIndex; } break; } - gSprites[spriteId].pos1.x = gUnknown_083768B8[PARTY_MENU_LAYOUT_STANDARD][gSprites[spriteId].data0].x; - gSprites[spriteId].pos1.y = gUnknown_083768B8[PARTY_MENU_LAYOUT_STANDARD][gSprites[spriteId].data0].y; + gSprites[spriteId].pos1.x = gUnknown_083768B8[PARTY_MENU_LAYOUT_STANDARD][gSprites[spriteId].data[0]].x; + gSprites[spriteId].pos1.y = gUnknown_083768B8[PARTY_MENU_LAYOUT_STANDARD][gSprites[spriteId].data[0]].y; - newMenuIndex = gSprites[spriteId].data0; - if (gSprites[spriteId].data0 < PARTY_SIZE) + newMenuIndex = gSprites[spriteId].data[0]; + if (gSprites[spriteId].data[0] < PARTY_SIZE) { - sub_806BF24(&gUnknown_083769A8[gSprites[spriteId].data0 * 2], newMenuIndex, 3, 1); + sub_806BF24(&gUnknown_083769A8[gSprites[spriteId].data[0] * 2], newMenuIndex, 3, 1); } - else if (gSprites[spriteId].data0 == PARTY_SIZE) + else if (gSprites[spriteId].data[0] == PARTY_SIZE) { sub_806BB9C(2); } @@ -2251,10 +2251,10 @@ void ChangeBattleTowerPartyMenuSelection(u8 taskId, s8 directionPressed) ewram1B000.unk261 = 2; - newMenuIndex2 = gSprites[spriteId].data0; + newMenuIndex2 = gSprites[spriteId].data[0]; UpdateMonIconFrame_806DA44(taskId, newMenuIndex2, 1); - if (menuIndex != gSprites[spriteId].data0) + if (menuIndex != gSprites[spriteId].data[0]) { PlaySE(5); } @@ -2265,7 +2265,7 @@ void SelectBattleTowerOKButton(u8 taskId) { u8 spriteId = sub_806CA00(taskId); - u8 menuIndex = gSprites[spriteId].data0; + u8 menuIndex = gSprites[spriteId].data[0]; if (menuIndex != 6) { UpdateMonIconFrame_806DA44(taskId, menuIndex, 0); @@ -2279,8 +2279,8 @@ void SelectBattleTowerOKButton(u8 taskId) sub_806BBEC(1); } - gSprites[spriteId].data1 = 0; - gSprites[spriteId].data0 = 6; + gSprites[spriteId].data[1] = 0; + gSprites[spriteId].data[0] = 6; gSprites[spriteId].pos1.x = gUnknown_083768B8[PARTY_MENU_LAYOUT_STANDARD][6].x; gSprites[spriteId].pos1.y = gUnknown_083768B8[PARTY_MENU_LAYOUT_STANDARD][6].y; @@ -2293,8 +2293,8 @@ void SelectBattleTowerOKButton(u8 taskId) void sub_806C92C(u8 spriteId) { - u8 menuIndex1 = gSprites[spriteId].data0; - u8 menuIndex2 = gSprites[spriteId].data1; + u8 menuIndex1 = gSprites[spriteId].data[0]; + u8 menuIndex2 = gSprites[spriteId].data[1]; if (!IsDoubleBattle()) { @@ -2319,14 +2319,14 @@ void sub_806C92C(u8 spriteId) } } - gSprites[spriteId].data1 = menuIndex2; + gSprites[spriteId].data[1] = menuIndex2; } void sub_806C994(u8 taskId, u8 b) { u8 spriteId = sub_806CA00(taskId); - gSprites[spriteId].data0 = b; + gSprites[spriteId].data[0] = b; sub_806C92C(spriteId); } @@ -2336,7 +2336,7 @@ void sub_806C9C4(u8 taskId, u8 spriteId) gSprites[spriteId].pos1.x = gSprites[spriteId2].pos1.x; gSprites[spriteId].pos1.y = gSprites[spriteId2].pos1.y; - gSprites[spriteId].data0 = gSprites[spriteId2].data0; + gSprites[spriteId].data[0] = gSprites[spriteId2].data[0]; } u8 sub_806CA00(u8 taskId) @@ -2353,7 +2353,7 @@ void sub_806CA18(u8 taskId, u8 b) u8 sub_806CA38(u8 taskId) { u8 spriteId = sub_806CA00(taskId); - return gSprites[spriteId].data0; + return gSprites[spriteId].data[0]; } void SetupDefaultPartyMenuSwitchPokemon(u8 taskId) @@ -2369,7 +2369,7 @@ void SetupDefaultPartyMenuSwitchPokemon(u8 taskId) PrintPartyMenuPromptText(ewram1B000_alt.unk272, 0); - sub_806BF24(&gUnknown_083769A8[gSprites[ewram01000.unk1].data0 * 2], gSprites[ewram01000.unk1].data0, 6, 0); + sub_806BF24(&gUnknown_083769A8[gSprites[ewram01000.unk1].data[0] * 2], gSprites[ewram01000.unk1].data[0], 6, 0); ewram1B000.unk261 = 2; } @@ -2381,13 +2381,13 @@ void ChangePartyMenuSwitchPokemonSelection(u8 taskId, s16 menuDirectionPressed) ChangePartyMenuSelection(taskId, menuDirectionPressed); - if (sprite1->data0 != sprite2->data0) + if (sprite1->data[0] != sprite2->data[0]) { - sub_806BF24(&gUnknown_083769A8[sprite1->data0 * 2], sprite1->data0, 6, 1); + sub_806BF24(&gUnknown_083769A8[sprite1->data[0] * 2], sprite1->data[0], 6, 1); } else { - sub_806BF24(&gUnknown_083769A8[sprite1->data0 * 2], sprite1->data0, 6, 0); + sub_806BF24(&gUnknown_083769A8[sprite1->data[0] * 2], sprite1->data[0], 6, 0); } } @@ -2434,15 +2434,15 @@ void sub_806CC2C(u8 taskId) void sub_806CC74(u8 taskId) { - sub_806BF24(&gUnknown_083769A8[gSprites[ewram01000.unk2].data0 * 2], gSprites[ewram01000.unk2].data0, 3, 1); - sub_806BF24(&gUnknown_083769A8[gSprites[ewram01000.unk1].data0 * 2], gSprites[ewram01000.unk1].data0, 3, 0); + sub_806BF24(&gUnknown_083769A8[gSprites[ewram01000.unk2].data[0] * 2], gSprites[ewram01000.unk2].data[0], 3, 1); + sub_806BF24(&gUnknown_083769A8[gSprites[ewram01000.unk1].data[0] * 2], gSprites[ewram01000.unk1].data[0], 3, 0); sub_806CC2C(taskId); } void sub_806CCE4() { - u8 monIndex1 = gSprites[ewram01000.unk1].data0; - u8 monIndex2 = gSprites[ewram01000.unk2].data0; + u8 monIndex1 = gSprites[ewram01000.unk1].data[0]; + u8 monIndex2 = gSprites[ewram01000.unk2].data[0]; if (monIndex1 <= 5) { @@ -2463,8 +2463,8 @@ void sub_806CD44(u8 taskId) void sub_806CD5C(u8 taskId) { - u8 monIndex1 = gSprites[ewram01000.unk1].data0; - u8 monIndex2 = gSprites[ewram01000.unk2].data0; + u8 monIndex1 = gSprites[ewram01000.unk1].data[0]; + u8 monIndex2 = gSprites[ewram01000.unk2].data[0]; if (monIndex1 == monIndex2 || monIndex1 == 7 || monIndex2 == 7) { @@ -2494,8 +2494,8 @@ void sub_806CD5C(u8 taskId) var1 = ewram01000.unk5; if (!var1) { - gSprites[ewram01000.unk3].data0 = -8; - gSprites[ewram01000.unk3].data2 = -0xA8; + gSprites[ewram01000.unk3].data[0] = -8; + gSprites[ewram01000.unk3].data[2] = -0xA8; ewram01000.unk8 = var1; ewram01000.unkA = 11; @@ -2504,8 +2504,8 @@ void sub_806CD5C(u8 taskId) } else { - gSprites[ewram01000.unk3].data0 = 8; - gSprites[ewram01000.unk3].data2 = 0xA8; + gSprites[ewram01000.unk3].data[0] = 8; + gSprites[ewram01000.unk3].data[2] = 0xA8; ewram01000.unk8 = 11; ewram01000.unkA = 11; @@ -2515,8 +2515,8 @@ void sub_806CD5C(u8 taskId) gSprites[ewram01000.unk3].callback = SpriteCB_sub_806D37C; - gSprites[ewram01000.unk4].data0 = 8; - gSprites[ewram01000.unk4].data2 = 0xA8; + gSprites[ewram01000.unk4].data[0] = 8; + gSprites[ewram01000.unk4].data[2] = 0xA8; gSprites[ewram01000.unk4].callback = SpriteCB_sub_806D37C; gSprites[ewram01000.unk3].callback(&gSprites[ewram01000.unk3]); @@ -2537,7 +2537,7 @@ void sub_806CF04(void) SwapValues_s16(&gSprites[ewram01000.unk3].pos1.x, &gSprites[ewram01000.unk4].pos1.x); SwapValues_s16(&gSprites[ewram01000.unk3].pos1.y, &gSprites[ewram01000.unk4].pos1.y); SwapValues_s16(&gSprites[ewram01000.unk3].pos2.x, &gSprites[ewram01000.unk4].pos2.x); - SwapValues_s16(&gSprites[ewram01000.unk3].data0, &gSprites[ewram01000.unk4].data0); + SwapValues_s16(&gSprites[ewram01000.unk3].data[0], &gSprites[ewram01000.unk4].data[0]); gSprites[ewram01000.unk3].callback = SpriteCB_sub_806D37C; gSprites[ewram01000.unk4].callback = SpriteCB_sub_806D37C; @@ -2729,7 +2729,7 @@ void sub_806D198(u8 taskId) gSprites[ewram01000.unk4].pos2.y = 0; gSprites[ewram01000.unk4].callback = UpdateMonIconFrame_806DA38; - spriteId = GetMonIconSpriteId(ewram01000.unk0, gSprites[ewram01000.unk2].data0); + spriteId = GetMonIconSpriteId(ewram01000.unk0, gSprites[ewram01000.unk2].data[0]); gSprites[spriteId].callback = UpdateMonIconFrame_806DA0C; SwapPokemon(&gPlayerParty[ewram01000.unk5], &gPlayerParty[ewram01000.unk6]); @@ -2752,15 +2752,15 @@ void SpriteCB_sub_806D37C(struct Sprite *sprite) { UpdateMonIconFrame(sprite); - if (sprite->pos2.x == sprite->data2) + if (sprite->pos2.x == sprite->data[2]) { - sprite->data0 *= -1; - sprite->data2 = 0; + sprite->data[0] *= -1; + sprite->data[2] = 0; sprite->callback = UpdateMonIconFrame_806DA38; } else { - sprite->pos2.x += sprite->data0; + sprite->pos2.x += sprite->data[0]; } } @@ -2802,8 +2802,8 @@ void sub_806D4AC(u8 taskId, u16 species, u8 c) u8 monIndex = c + 3; u8 spriteId = GetMonIconSpriteId(taskId, monIndex); - gSprites[spriteId].data0 = -8; - gSprites[spriteId].data2 = gTasks[taskId].data[0] * -8; + gSprites[spriteId].data[0] = -8; + gSprites[spriteId].data[2] = gTasks[taskId].data[0] * -8; gSprites[spriteId].callback = SpriteCB_sub_806D37C; } } @@ -3035,7 +3035,7 @@ void UpdateMonIconFrame_806DA44(u8 taskId, u8 monIndex, u8 c) { spriteId = GetMonIconSpriteId(taskId, monIndex); gSprites[spriteId].pos2.y = 0; - gSprites[spriteId].data0 = 0; + gSprites[spriteId].data[0] = 0; if (!c) { @@ -3057,7 +3057,7 @@ void LoadHeldItemIconGraphics(void) void SpriteCB_HeldItemIcon(struct Sprite *sprite) { - u8 data7 = sprite->data7; + u8 data7 = sprite->data[7]; if (gSprites[data7].invisible) { sprite->invisible = 1; @@ -3081,7 +3081,7 @@ void CreateHeldItemIcon(u8 a, u8 b) gSprites[spriteId].pos2.x = 4; gSprites[spriteId].pos2.y = 10; gSprites[spriteId].callback = SpriteCB_HeldItemIcon; - gSprites[spriteId].data7 = a; + gSprites[spriteId].data[7] = a; StartSpriteAnim(&gSprites[spriteId], b); gSprites[spriteId].callback(&gSprites[spriteId]); @@ -3138,8 +3138,8 @@ void CreateHeldItemIcons_806DC34(u8 taskId) gSprites[heldItemSpriteId].pos2.x = 4; gSprites[heldItemSpriteId].pos2.y = 10; - gSprites[heldItemSpriteId].data7 = monIconSpriteId; - gSprites[monIconSpriteId].data7 = heldItemSpriteId; + gSprites[heldItemSpriteId].data[7] = monIconSpriteId; + gSprites[monIconSpriteId].data[7] = heldItemSpriteId; SetHeldItemIconVisibility(taskId, i); gSprites[heldItemSpriteId].callback(&gSprites[heldItemSpriteId]); @@ -3158,8 +3158,8 @@ void CreateHeldItemIcon_806DCD4(u8 taskId, u8 monIndex, u16 item) gSprites[heldItemSpriteId].pos2.x = 4; gSprites[heldItemSpriteId].pos2.y = 10; - gSprites[heldItemSpriteId].data7 = monIconSpriteId; - gSprites[monIconSpriteId].data7 = heldItemSpriteId; + gSprites[heldItemSpriteId].data[7] = monIconSpriteId; + gSprites[monIconSpriteId].data[7] = heldItemSpriteId; if (!item) { @@ -3274,7 +3274,7 @@ _0806DD78: .4byte gSprites\n\ void SpriteCB_UpdateHeldItemIconPosition(struct Sprite *sprite) { - u8 spriteId = sprite->data7; + u8 spriteId = sprite->data[7]; sprite->pos1.x = gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x; sprite->pos1.y = gSprites[spriteId].pos1.y; @@ -3334,7 +3334,7 @@ void SetMonIconSpriteId(u8 taskId, u8 monIndex, u8 spriteId) u16 GetMonHeldItemIconSpriteId(u8 taskId, u8 monIndex) { u8 spriteId = GetMonIconSpriteId(taskId, monIndex); - u8 retVal = gSprites[spriteId].data7; + u8 retVal = gSprites[spriteId].data[7]; return retVal; } @@ -4478,7 +4478,7 @@ void sub_806FA18(u8 taskId) gTasks[taskId].data[11] -= gTasks[taskId].data[12]; SetMonData(ewram1C000.pokemon, MON_DATA_HP, &gTasks[taskId].data[11]); SetMonIconAnim(GetMonIconSpriteId(ewram1C000.unk4, ewram01000.unk1), ewram1C000.pokemon); - ewram1C000.unk5 = gSprites[ewram01000.unk2].data0; + ewram1C000.unk5 = gSprites[ewram01000.unk2].data[0]; ewram1C000.pokemon = &gPlayerParty[ewram1C000.unk5]; gTasks[taskId].data[10] = GetMonData(ewram1C000.pokemon, MON_DATA_MAX_HP); gTasks[taskId].data[11] = GetMonData(ewram1C000.pokemon, MON_DATA_HP); diff --git a/src/field/pokeblock.c b/src/field/pokeblock.c index a4497295f..5aa03ff7a 100644 --- a/src/field/pokeblock.c +++ b/src/field/pokeblock.c @@ -971,25 +971,25 @@ static void sub_810C854(u8 taskId) static void sub_810C8D4(struct Sprite *sprite) { - if (sprite->data0 > 1) + if (sprite->data[0] > 1) { - sprite->data0 = 0; + sprite->data[0] = 0; } - switch (sprite->data0) + switch (sprite->data[0]) { case 0: sprite->oam.affineMode = 1; sprite->affineAnims = gSpriteAffineAnimTable_83F7F70; InitSpriteAffineAnim(sprite); - sprite->data0 = 1; - sprite->data1 = 0; + sprite->data[0] = 1; + sprite->data[1] = 0; break; case 1: - if (++sprite->data1 > 11) + if (++sprite->data[1] > 11) { sprite->oam.affineMode = 0; - sprite->data0 = 0; - sprite->data1 = 0; + sprite->data[0] = 0; + sprite->data[1] = 0; FreeOamMatrix(sprite->oam.matrixNum); sprite->callback = SpriteCallbackDummy; } diff --git a/src/field/region_map.c b/src/field/region_map.c index 973e7decc..241b38bf6 100644 --- a/src/field/region_map.c +++ b/src/field/region_map.c @@ -1121,9 +1121,9 @@ void CreateRegionMapCursor(u16 tileTag, u16 paletteTag) gRegionMap->cursorSprite->pos1.x = gRegionMap->cursorPosX * 8 + 4; gRegionMap->cursorSprite->pos1.y = gRegionMap->cursorPosY * 8 + 4; } - gRegionMap->cursorSprite->data1 = 2; - gRegionMap->cursorSprite->data2 = IndexOfSpritePaletteTag(paletteTag) * 16 + 0x0101; - gRegionMap->cursorSprite->data3 = 1; + gRegionMap->cursorSprite->data[1] = 2; + gRegionMap->cursorSprite->data[2] = IndexOfSpritePaletteTag(paletteTag) * 16 + 0x0101; + gRegionMap->cursorSprite->data[3] = 1; } } @@ -1139,12 +1139,12 @@ static void sub_80FBCA0(void) void unref_sub_80FBCD0(void) { - gRegionMap->cursorSprite->data3 = 1; + gRegionMap->cursorSprite->data[3] = 1; } void unref_sub_80FBCE0(void) { - gRegionMap->cursorSprite->data3 = 0; + gRegionMap->cursorSprite->data[3] = 0; } static const struct OamData sPlayerIconOamData = @@ -1259,16 +1259,16 @@ static void SpriteCB_PlayerIconZoomedIn(struct Sprite *sprite) { sprite->pos2.x = -(gRegionMap->scrollX * 2); sprite->pos2.y = -(gRegionMap->scrollY * 2); - sprite->data0 = sprite->pos1.y + sprite->pos2.y + sprite->centerToCornerVecY; - sprite->data1 = sprite->pos1.x + sprite->pos2.x + sprite->centerToCornerVecX; + sprite->data[0] = sprite->pos1.y + sprite->pos2.y + sprite->centerToCornerVecY; + sprite->data[1] = sprite->pos1.x + sprite->pos2.x + sprite->centerToCornerVecX; // Determine if sprite is on screen - if (sprite->data0 < -8 || sprite->data0 > 0xA8 || sprite->data1 < -8 || sprite->data1 > 0xF8) - sprite->data2 = FALSE; + if (sprite->data[0] < -8 || sprite->data[0] > 0xA8 || sprite->data[1] < -8 || sprite->data[1] > 0xF8) + sprite->data[2] = FALSE; else - sprite->data2 = TRUE; + sprite->data[2] = TRUE; - if (sprite->data2 == TRUE) + if (sprite->data[2] == TRUE) UpdateIconBlink(sprite); else sprite->invisible = TRUE; @@ -1284,10 +1284,10 @@ static void UpdateIconBlink(struct Sprite *sprite) if (gRegionMap->blinkPlayerIcon) { // Toggle visibility every 16 frames - sprite->data7++; - if (sprite->data7 > 16) + sprite->data[7]++; + if (sprite->data[7] > 16) { - sprite->data7 = 0; + sprite->data[7] = 0; sprite->invisible = !sprite->invisible; } } @@ -1691,7 +1691,7 @@ static void CreateCityTownFlyTargetIcons(void) else r7 += 3; StartSpriteAnim(&gSprites[spriteId], r7); - gSprites[spriteId].data0 = i; + gSprites[spriteId].data[0] = i; } canFlyFlag++; } @@ -1724,7 +1724,7 @@ static void CreateSpecialAreaFlyTargetIcons(void) gSprites[spriteId].oam.size = 1; gSprites[spriteId].callback = SpriteCB_FlyTargetIcons; StartSpriteAnim(&gSprites[spriteId], 6); - gSprites[spriteId].data0 = mapSectionId; + gSprites[spriteId].data[0] = mapSectionId; } } } @@ -1733,19 +1733,19 @@ static void CreateSpecialAreaFlyTargetIcons(void) static void SpriteCB_FlyTargetIcons(struct Sprite *sprite) { // Blink if our mapSectionId is the one selected on the map - if (ewram0_3.regionMap.mapSectionId == sprite->data0) + if (ewram0_3.regionMap.mapSectionId == sprite->data[0]) { // Toggle visibility every 16 frames - sprite->data1++; - if (sprite->data1 > 16) + sprite->data[1]++; + if (sprite->data[1] > 16) { - sprite->data1 = 0; + sprite->data[1] = 0; sprite->invisible = !sprite->invisible; } } else { - sprite->data1 = 16; + sprite->data[1] = 16; sprite->invisible = FALSE; } } diff --git a/src/field/rotating_gate.c b/src/field/rotating_gate.c index e8ab7e1bf..a672f3489 100644 --- a/src/field/rotating_gate.c +++ b/src/field/rotating_gate.c @@ -762,7 +762,7 @@ static u8 RotatingGate_CreateGate(u8 gateId, s16 deltaX, s16 deltaY) y = gate->y + 7; sprite = &gSprites[spriteId]; - sprite->data0 = gateId; + sprite->data[0] = gateId; sprite->coordOffsetEnabled = 1; sub_8060388(x + deltaX, y + deltaY, &sprite->pos1.x, &sprite->pos1.y); @@ -778,8 +778,8 @@ static void SpriteCallback_RotatingGate(struct Sprite *sprite) u8 orientation; u8 affineAnimation; - rotationDirection = sprite->data1; - orientation = sprite->data2; + rotationDirection = sprite->data[1]; + orientation = sprite->data[2]; RotatingGate_HideGatesOutsideViewport(sprite); @@ -804,7 +804,7 @@ static void SpriteCallback_RotatingGate(struct Sprite *sprite) StartSpriteAffineAnim(sprite, affineAnimation); } - sprite->data1 = ROTATE_NONE; + sprite->data[1] = ROTATE_NONE; } static void RotatingGate_HideGatesOutsideViewport(struct Sprite *sprite) @@ -1065,8 +1065,8 @@ static void RotatingGate_TriggerRotationAnimation(u8 gateId, int rotationDirecti if (gRotatingGate_GateSpriteIds[gateId] != MAX_SPRITES) { sprite = &gSprites[gRotatingGate_GateSpriteIds[gateId]]; - sprite->data1 = rotationDirection; - sprite->data2 = RotatingGate_GetGateOrientation(gateId); + sprite->data[1] = rotationDirection; + sprite->data[2] = RotatingGate_GetGateOrientation(gateId); } } diff --git a/src/field/starter_choose.c b/src/field/starter_choose.c index 2b28df4f0..49590f83a 100644 --- a/src/field/starter_choose.c +++ b/src/field/starter_choose.c @@ -324,24 +324,24 @@ void CB2_ChooseStarter(void) //Create hand sprite spriteId = CreateSprite(&gSpriteTemplate_83F77CC, 120, 56, 2); - gSprites[spriteId].data0 = taskId; + gSprites[spriteId].data[0] = taskId; //Create three Pokeball sprites spriteId = CreateSprite( &gSpriteTemplate_83F77E4, gStarterChoose_PokeballCoords[0][0], gStarterChoose_PokeballCoords[0][1], 2); - gSprites[spriteId].data0 = taskId; - gSprites[spriteId].data1 = 0; + gSprites[spriteId].data[0] = taskId; + gSprites[spriteId].data[1] = 0; spriteId = CreateSprite( &gSpriteTemplate_83F77E4, gStarterChoose_PokeballCoords[1][0], gStarterChoose_PokeballCoords[1][1], 2); - gSprites[spriteId].data0 = taskId; - gSprites[spriteId].data1 = 1; + gSprites[spriteId].data[0] = taskId; + gSprites[spriteId].data[1] = 1; spriteId = CreateSprite( &gSpriteTemplate_83F77E4, gStarterChoose_PokeballCoords[2][0], gStarterChoose_PokeballCoords[2][1], 2); - gSprites[spriteId].data0 = taskId; - gSprites[spriteId].data1 = 2; + gSprites[spriteId].data[0] = taskId; + gSprites[spriteId].data[1] = 2; } static void MainCallback2(void) @@ -727,16 +727,16 @@ static u8 CreatePokemonFrontSprite(u16 species, u8 x, u8 y) //Sprite callback static void sub_810A62C(struct Sprite *sprite) { - sprite->pos1.x = gUnknown_083F76E4[gTasks[sprite->data0].tStarterSelection][0]; - sprite->pos1.y = gUnknown_083F76E4[gTasks[sprite->data0].tStarterSelection][1]; - sprite->pos2.y = Sin(sprite->data1, 8); - sprite->data1 = (u8)sprite->data1 + 4; + sprite->pos1.x = gUnknown_083F76E4[gTasks[sprite->data[0]].tStarterSelection][0]; + sprite->pos1.y = gUnknown_083F76E4[gTasks[sprite->data[0]].tStarterSelection][1]; + sprite->pos2.y = Sin(sprite->data[1], 8); + sprite->data[1] = (u8)sprite->data[1] + 4; } //Sprite callback static void sub_810A68C(struct Sprite *sprite) { - if (gTasks[sprite->data0].tStarterSelection == sprite->data1) + if (gTasks[sprite->data[0]].tStarterSelection == sprite->data[1]) StartSpriteAnimIfDifferent(sprite, 1); else StartSpriteAnimIfDifferent(sprite, 0); diff --git a/src/field/trainer_see.c b/src/field/trainer_see.c index 85bd7ad0b..38bc6971c 100644 --- a/src/field/trainer_see.c +++ b/src/field/trainer_see.c @@ -485,11 +485,11 @@ void sub_8084894(struct Sprite *sprite, u16 a2, u8 a3) sprite->oam.priority = 1; sprite->coordOffsetEnabled = 1; - sprite->data0 = gFieldEffectArguments[0]; - sprite->data1 = gFieldEffectArguments[1]; - sprite->data2 = gFieldEffectArguments[2]; - sprite->data3 = -5; - sprite->data7 = a2; + sprite->data[0] = gFieldEffectArguments[0]; + sprite->data[1] = gFieldEffectArguments[1]; + sprite->data[2] = gFieldEffectArguments[2]; + sprite->data[3] = -5; + sprite->data[7] = a2; StartSpriteAnim(sprite, a3); } @@ -498,22 +498,22 @@ void objc_exclamation_mark_probably(struct Sprite *sprite) { u8 mapObjId; - if (TryGetFieldObjectIdByLocalIdAndMap(sprite->data0, sprite->data1, sprite->data2, &mapObjId) + if (TryGetFieldObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &mapObjId) || sprite->animEnded) { - FieldEffectStop(sprite, (u8)sprite->data7); + FieldEffectStop(sprite, (u8)sprite->data[7]); } else { struct Sprite *mapObjSprite = &gSprites[gMapObjects[mapObjId].spriteId]; - sprite->data4 += sprite->data3; + sprite->data[4] += sprite->data[3]; sprite->pos1.x = mapObjSprite->pos1.x; sprite->pos1.y = mapObjSprite->pos1.y - 16; sprite->pos2.x = mapObjSprite->pos2.x; - sprite->pos2.y = mapObjSprite->pos2.y + sprite->data4; - if (sprite->data4) - sprite->data3++; + sprite->pos2.y = mapObjSprite->pos2.y + sprite->data[4]; + if (sprite->data[4]) + sprite->data[3]++; else - sprite->data3 = 0; + sprite->data[3] = 0; } } diff --git a/src/field/use_pokeblock.c b/src/field/use_pokeblock.c index 54ed89ef2..d301d93d6 100644 --- a/src/field/use_pokeblock.c +++ b/src/field/use_pokeblock.c @@ -893,11 +893,11 @@ static void sub_8137138(void) static void sub_81371DC(struct Sprite *sprite) { - if (sprite->data0 <= 5) + if (sprite->data[0] <= 5) sprite->pos2.y -= 2; - else if (sprite->data0 <= 11) + else if (sprite->data[0] <= 11) sprite->pos2.y += 2; - if ((++sprite->data0) > 60) + if ((++sprite->data[0]) > 60) { DestroySprite(sprite); gUnknown_02039304->unk54--; diff --git a/src/field/wallclock.c b/src/field/wallclock.c index 8db13dc2d..d86b1bc95 100644 --- a/src/field/wallclock.c +++ b/src/field/wallclock.c @@ -288,22 +288,22 @@ void CB2_StartWallClock(void) gTasks[taskId].tHourHandAngle = 300; spriteId = CreateSprite(&gSpriteTemplate_83F7AD8, DISPLAY_WIDTH / 2, DISPLAY_HEIGHT / 2, 1); - gSprites[spriteId].data0 = taskId; + gSprites[spriteId].data[0] = taskId; gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL; gSprites[spriteId].oam.matrixNum = 0; spriteId = CreateSprite(&gSpriteTemplate_83F7AF0, DISPLAY_WIDTH / 2, DISPLAY_HEIGHT / 2, 0); - gSprites[spriteId].data0 = taskId; + gSprites[spriteId].data[0] = taskId; gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL; gSprites[spriteId].oam.matrixNum = 1; spriteId = CreateSprite(&gSpriteTemplate_83F7B28, DISPLAY_WIDTH / 2, DISPLAY_HEIGHT / 2, 2); - gSprites[spriteId].data0 = taskId; - gSprites[spriteId].data1 = 45; + gSprites[spriteId].data[0] = taskId; + gSprites[spriteId].data[1] = 45; spriteId = CreateSprite(&gSpriteTemplate_83F7B40, DISPLAY_WIDTH / 2, DISPLAY_HEIGHT / 2, 2); - gSprites[spriteId].data0 = taskId; - gSprites[spriteId].data1 = 90; + gSprites[spriteId].data[0] = taskId; + gSprites[spriteId].data[1] = 90; WallClockInit(); } @@ -333,22 +333,22 @@ void CB2_ViewWallClock(void) } spriteId = CreateSprite(&gSpriteTemplate_83F7AD8, 120, 80, 1); - gSprites[spriteId].data0 = taskId; + gSprites[spriteId].data[0] = taskId; gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL; gSprites[spriteId].oam.matrixNum = 0; spriteId = CreateSprite(&gSpriteTemplate_83F7AF0, 120, 80, 0); - gSprites[spriteId].data0 = taskId; + gSprites[spriteId].data[0] = taskId; gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL; gSprites[spriteId].oam.matrixNum = 1; spriteId = CreateSprite(&gSpriteTemplate_83F7B28, 120, 80, 2); - gSprites[spriteId].data0 = taskId; - gSprites[spriteId].data1 = angle1; + gSprites[spriteId].data[0] = taskId; + gSprites[spriteId].data[1] = angle1; spriteId = CreateSprite(&gSpriteTemplate_83F7B40, 120, 80, 2); - gSprites[spriteId].data0 = taskId; - gSprites[spriteId].data1 = angle2; + gSprites[spriteId].data[0] = taskId; + gSprites[spriteId].data[1] = angle2; WallClockInit(); } @@ -968,7 +968,7 @@ static void sub_810B05C(struct Sprite *sprite) u16 x; u16 y; - angle = gTasks[sprite->data0].tMinuteHandAngle; + angle = gTasks[sprite->data[0]].tMinuteHandAngle; sin = Sin2(angle) / 16; cos = Cos2(angle) / 16; SetOamMatrix(0, cos, sin, -sin, cos); @@ -993,7 +993,7 @@ static void sub_810B0F4(struct Sprite *sprite) u16 x; u16 y; - angle = gTasks[sprite->data0].tHourHandAngle; + angle = gTasks[sprite->data[0]].tHourHandAngle; sin = Sin2(angle) / 16; cos = Cos2(angle) / 16; SetOamMatrix(1, cos, sin, -sin, cos); @@ -1015,23 +1015,23 @@ static void sub_810B18C(struct Sprite *sprite) s16 sin; s16 cos; - if (gTasks[sprite->data0].tPeriod != PERIOD_AM) + if (gTasks[sprite->data[0]].tPeriod != PERIOD_AM) { - if (sprite->data1 >= 60 && sprite->data1 < 90) - sprite->data1 += 5; - if (sprite->data1 < 60) - sprite->data1++; + if (sprite->data[1] >= 60 && sprite->data[1] < 90) + sprite->data[1] += 5; + if (sprite->data[1] < 60) + sprite->data[1]++; } else { - if (sprite->data1 > 45 && sprite->data1 <= 75) - sprite->data1 -= 5; - if (sprite->data1 > 75) - sprite->data1--; + if (sprite->data[1] > 45 && sprite->data[1] <= 75) + sprite->data[1] -= 5; + if (sprite->data[1] > 75) + sprite->data[1]--; } - cos = Cos2((u16)sprite->data1); + cos = Cos2((u16)sprite->data[1]); sprite->pos2.x = cos * 30 / 4096; - sin = Sin2((u16)sprite->data1); + sin = Sin2((u16)sprite->data[1]); sprite->pos2.y = sin * 30 / 4096; } @@ -1040,22 +1040,22 @@ static void sub_810B230(struct Sprite *sprite) s16 sin; s16 cos; - if (gTasks[sprite->data0].tPeriod != PERIOD_AM) + if (gTasks[sprite->data[0]].tPeriod != PERIOD_AM) { - if (sprite->data1 >= 105 && sprite->data1 < 135) - sprite->data1 += 5; - if (sprite->data1 < 105) - sprite->data1++; + if (sprite->data[1] >= 105 && sprite->data[1] < 135) + sprite->data[1] += 5; + if (sprite->data[1] < 105) + sprite->data[1]++; } else { - if (sprite->data1 > 90 && sprite->data1 <= 120) - sprite->data1 -= 5; - if (sprite->data1 > 120) - sprite->data1--; + if (sprite->data[1] > 90 && sprite->data[1] <= 120) + sprite->data[1] -= 5; + if (sprite->data[1] > 120) + sprite->data[1]--; } - cos = Cos2((u16)sprite->data1); + cos = Cos2((u16)sprite->data[1]); sprite->pos2.x = cos * 30 / 4096; - sin = Sin2((u16)sprite->data1); + sin = Sin2((u16)sprite->data[1]); sprite->pos2.y = sin * 30 / 4096; } diff --git a/src/pokemon/learn_move.c b/src/pokemon/learn_move.c index a47896ea5..55aac840f 100644 --- a/src/pokemon/learn_move.c +++ b/src/pokemon/learn_move.c @@ -765,20 +765,20 @@ void ClearLearnMoveVars(void) void sub_8133300(struct Sprite *sprite) { - s16 var = (sprite->data1 * 10) & 0xFF; + s16 var = (sprite->data[1] * 10) & 0xFF; - switch (sprite->data0) + switch (sprite->data[0]) { case 0: break; case 1: - sprite->pos2.x = Sin(var, 3) * sprite->data2; + sprite->pos2.x = Sin(var, 3) * sprite->data[2]; break; case 2: - sprite->pos2.y = Sin(var, 1) * sprite->data2; + sprite->pos2.y = Sin(var, 1) * sprite->data[2]; break; } - sprite->data1++; + sprite->data[1]++; } void sub_8133358(void) @@ -786,22 +786,22 @@ void sub_8133358(void) s32 i; sLearnMoveStruct->spriteIDs[0] = CreateSprite(&gSpriteTemplate_8402D90, 8, 16, 0); - gSprites[sLearnMoveStruct->spriteIDs[0]].data0 = 1; - gSprites[sLearnMoveStruct->spriteIDs[0]].data2 = -1; + gSprites[sLearnMoveStruct->spriteIDs[0]].data[0] = 1; + gSprites[sLearnMoveStruct->spriteIDs[0]].data[2] = -1; sLearnMoveStruct->spriteIDs[1] = CreateSprite(&gSpriteTemplate_8402D90, 72, 16, 0); StartSpriteAnim(&gSprites[sLearnMoveStruct->spriteIDs[1]], 1); - gSprites[sLearnMoveStruct->spriteIDs[1]].data0 = 1; - gSprites[sLearnMoveStruct->spriteIDs[1]].data2 = 1; + gSprites[sLearnMoveStruct->spriteIDs[1]].data[0] = 1; + gSprites[sLearnMoveStruct->spriteIDs[1]].data[2] = 1; sLearnMoveStruct->spriteIDs[2] = CreateSprite(&gSpriteTemplate_8402DC0, 160, 4, 0); StartSpriteAnim(&gSprites[sLearnMoveStruct->spriteIDs[2]], 1); - gSprites[sLearnMoveStruct->spriteIDs[2]].data0 = 2; - gSprites[sLearnMoveStruct->spriteIDs[2]].data2 = -1; + gSprites[sLearnMoveStruct->spriteIDs[2]].data[0] = 2; + gSprites[sLearnMoveStruct->spriteIDs[2]].data[2] = -1; sLearnMoveStruct->spriteIDs[3] = CreateSprite(&gSpriteTemplate_8402DC0, 160, 60, 0); - gSprites[sLearnMoveStruct->spriteIDs[3]].data0 = 2; - gSprites[sLearnMoveStruct->spriteIDs[3]].data2 = 1; + gSprites[sLearnMoveStruct->spriteIDs[3]].data[0] = 2; + gSprites[sLearnMoveStruct->spriteIDs[3]].data[2] = 1; for (i = 0; i < 8; i++) { diff --git a/src/pokemon/mon_markings.c b/src/pokemon/mon_markings.c index 9ea738c7b..29e8c5127 100644 --- a/src/pokemon/mon_markings.c +++ b/src/pokemon/mon_markings.c @@ -284,7 +284,7 @@ void sub_80F761C(s16 x, s16 y, u16 baseTileTag, u16 basePaletteTag) if (spriteId != 64) { sMenu->menuMarkingSprites[i] = &gSprites[spriteId]; - gSprites[spriteId].data0 = i; + gSprites[spriteId].data[0] = i; } else { @@ -324,10 +324,10 @@ void nullsub_65(struct Sprite *sprite) void sub_80F78CC(struct Sprite *sprite) { - if (sMenu->markingsArray[sprite->data0]) - StartSpriteAnim(sprite, 2 * sprite->data0 + 1); + if (sMenu->markingsArray[sprite->data[0]]) + StartSpriteAnim(sprite, 2 * sprite->data[0] + 1); else - StartSpriteAnim(sprite, 2 * sprite->data0); + StartSpriteAnim(sprite, 2 * sprite->data[0]); } void sub_80F7908(struct Sprite *sprite) diff --git a/src/pokemon/pokeblock_feed.c b/src/pokemon/pokeblock_feed.c index 5f218a6f6..389c4bb25 100644 --- a/src/pokemon/pokeblock_feed.c +++ b/src/pokemon/pokeblock_feed.c @@ -763,7 +763,7 @@ static u8 PokeblockFeed_CreatePokeSprite(struct Pokemon* mon) gPokeblockFeedMonSpecies = species; gPokeblockFeedMonSpriteID = spriteID; gPokeblockFeedMonNature = GetNature(mon); - gSprites[spriteID].data2 = species; + gSprites[spriteID].data[2] = species; gSprites[spriteID].callback = SpriteCallbackDummy; gPokeblockMonNotFlipped = 1; if (!IsPokeSpriteNotFlipped(species)) @@ -780,19 +780,19 @@ static void sub_8148044(u8 spriteID) { gSprites[spriteID].pos1.x = 48; gSprites[spriteID].pos1.y = 80; - gSprites[spriteID].data0 = -8; - gSprites[spriteID].data1 = 1; + gSprites[spriteID].data[0] = -8; + gSprites[spriteID].data[1] = 1; gSprites[spriteID].callback = sub_8148078; } static void sub_8148078(struct Sprite* sprite) { sprite->pos1.x += 4; - sprite->pos1.y += sprite->data0; - sprite->data0 += sprite->data1; - if (sprite->data0 == 0) - PlayCry1(sprite->data2, 0); - if (sprite->data0 == 9) + sprite->pos1.y += sprite->data[0]; + sprite->data[0] += sprite->data[1]; + if (sprite->data[0] == 0) + PlayCry1(sprite->data[2], 0); + if (sprite->data[0] == 9) sprite->callback = SpriteCallbackDummy; } @@ -820,17 +820,17 @@ static void sub_8148108(u8 spriteID, bool8 a1) static u8 CreatePokeblockSprite(void) { u8 spriteID = CreateSprite(&sThrownPokeblockSpriteTemplate, 174, 84, 1); - gSprites[spriteID].data0 = -12; - gSprites[spriteID].data1 = 1; + gSprites[spriteID].data[0] = -12; + gSprites[spriteID].data[1] = 1; return spriteID; } static void SpriteCB_ThrownPokeblock(struct Sprite* sprite) { sprite->pos1.x -= 4; - sprite->pos1.y += sprite->data0; - sprite->data0 += sprite->data1; - if (sprite->data0 == 10) + sprite->pos1.y += sprite->data[0]; + sprite->data[0] += sprite->data[1]; + if (sprite->data[0] == 10) DestroySprite(sprite); } diff --git a/src/pokemon/pokedex.c b/src/pokemon/pokedex.c index 18e98ca5f..cd37c3a93 100644 --- a/src/pokemon/pokedex.c +++ b/src/pokemon/pokedex.c @@ -2315,7 +2315,7 @@ static void sub_808E0CC(u16 a, u16 b) { spriteId = sub_808E8C8(unk, 0x60, 0x50); gSprites[spriteId].callback = sub_808EE28; - gSprites[spriteId].data5 = -32; + gSprites[spriteId].data[5] = -32; } unk = sub_808E888(a); @@ -2323,7 +2323,7 @@ static void sub_808E0CC(u16 a, u16 b) { spriteId = sub_808E8C8(unk, 0x60, 0x50); gSprites[spriteId].callback = sub_808EE28; - gSprites[spriteId].data5 = 0; + gSprites[spriteId].data[5] = 0; } unk = sub_808E888(a + 1); @@ -2331,7 +2331,7 @@ static void sub_808E0CC(u16 a, u16 b) { spriteId = sub_808E8C8(unk, 0x60, 0x50); gSprites[spriteId].callback = sub_808EE28; - gSprites[spriteId].data5 = 32; + gSprites[spriteId].data[5] = 32; } gPokedexView->unk630 = 0; @@ -2352,7 +2352,7 @@ static bool8 sub_808E208(u8 a, u8 b, u8 c) for (i = 0; i < 4; i++) { if (gPokedexView->unk61E[i] != 0xFFFF) - gSprites[gPokedexView->unk61E[i]].data5 += b; + gSprites[gPokedexView->unk61E[i]].data[5] += b; } foo = 16 * (c - gPokedexView->unk62E) / c; REG_BG2VOFS = gPokedexView->unk62D + gPokedexView->unk632 * 16 - foo; @@ -2362,7 +2362,7 @@ static bool8 sub_808E208(u8 a, u8 b, u8 c) for (i = 0; i < 4; i++) { if (gPokedexView->unk61E[i] != 0xFFFF) - gSprites[gPokedexView->unk61E[i]].data5 -= b; + gSprites[gPokedexView->unk61E[i]].data[5] -= b; } foo = 16 * (c - gPokedexView->unk62E) / c; REG_BG2VOFS = gPokedexView->unk62D + gPokedexView->unk632 * 16 + foo; @@ -2392,7 +2392,7 @@ static void sub_808E398(u8 a, u16 b) { spriteId = sub_808E8C8(unk, 0x60, 0x50); gSprites[spriteId].callback = sub_808EE28; - gSprites[spriteId].data5 = -64; + gSprites[spriteId].data[5] = -64; } if (gPokedexView->unk630 > 0) gPokedexView->unk630--; @@ -2405,7 +2405,7 @@ static void sub_808E398(u8 a, u16 b) { spriteId = sub_808E8C8(unk, 0x60, 0x50); gSprites[spriteId].callback = sub_808EE28; - gSprites[spriteId].data5 = 0x40; + gSprites[spriteId].data[5] = 0x40; } if (gPokedexView->unk630 <= 0xE) gPokedexView->unk630++; @@ -2600,9 +2600,9 @@ static u32 sub_808E8C8(u16 a, s16 b, s16 c) gSprites[spriteId].oam.affineMode = 1; gSprites[spriteId].oam.priority = 3; - gSprites[spriteId].data0 = 0; - gSprites[spriteId].data1 = i; - gSprites[spriteId].data2 = NationalPokedexNumToSpecies(a); + gSprites[spriteId].data[0] = 0; + gSprites[spriteId].data[1] = i; + gSprites[spriteId].data[2] = NationalPokedexNumToSpecies(a); gPokedexView->unk61E[i] = spriteId; return spriteId; } @@ -2616,10 +2616,10 @@ static void sub_808E978(u8 a) u16 r5; spriteId = CreateSprite(&gSpriteTemplate_83A053C, 184, 4, 0); - gSprites[spriteId].data1 = 0; + gSprites[spriteId].data[1] = 0; spriteId = CreateSprite(&gSpriteTemplate_83A053C, 184, 156, 0); - gSprites[spriteId].data1 = 1; + gSprites[spriteId].data[1] = 1; gSprites[spriteId].vFlip = TRUE; CreateSprite(&gSpriteTemplate_83A0524, 234, 20, 0); @@ -2630,7 +2630,7 @@ static void sub_808E978(u8 a) spriteId = CreateSprite(&gSpriteTemplate_83A0554, 16, 158, 0); StartSpriteAnim(&gSprites[spriteId], 2); - gSprites[spriteId].data2 = 0x80; + gSprites[spriteId].data[2] = 0x80; spriteId = CreateSprite(&gSpriteTemplate_83A0554, 48, 158, 0); StartSpriteAnim(&gSprites[spriteId], 1); @@ -2638,14 +2638,14 @@ static void sub_808E978(u8 a) spriteId = CreateSprite(&gSpriteTemplate_83A056C, 0, 80, 2); gSprites[spriteId].oam.affineMode = 1; gSprites[spriteId].oam.matrixNum = 30; - gSprites[spriteId].data0 = 0x1E; - gSprites[spriteId].data1 = 0; + gSprites[spriteId].data[0] = 0x1E; + gSprites[spriteId].data[1] = 0; spriteId = CreateSprite(&gSpriteTemplate_83A056C, 0, 80, 2); gSprites[spriteId].oam.affineMode = 1; gSprites[spriteId].oam.matrixNum = 31; - gSprites[spriteId].data0 = 0x1F; - gSprites[spriteId].data1 = 0x80; + gSprites[spriteId].data[0] = 0x1F; + gSprites[spriteId].data[1] = 0x80; if (a == 0) { @@ -2743,7 +2743,7 @@ static void sub_808EDB8(struct Sprite *sprite) static void sub_808EE28(struct Sprite *sprite) { - u8 data1 = sprite->data1; + u8 data1 = sprite->data[1]; if (gPokedexView->unk64A != 0 && gPokedexView->unk64A != 3) { @@ -2754,24 +2754,24 @@ static void sub_808EE28(struct Sprite *sprite) { u32 var; - sprite->pos2.y = gSineTable[(u8)sprite->data5] * 76 / 256; - var = 0x10000 / gSineTable[sprite->data5 + 0x40]; + sprite->pos2.y = gSineTable[(u8)sprite->data[5]] * 76 / 256; + var = 0x10000 / gSineTable[sprite->data[5] + 0x40]; if (var > 0xFFFF) var = 0xFFFF; - SetOamMatrix(sprite->data1 + 1, 0x100, 0, 0, var); + SetOamMatrix(sprite->data[1] + 1, 0x100, 0, 0, var); sprite->oam.matrixNum = data1 + 1; - if (sprite->data5 > -64 && sprite->data5 < 64) + if (sprite->data[5] > -64 && sprite->data[5] < 64) { sprite->invisible = FALSE; - sprite->data0 = 1; + sprite->data[0] = 1; } else { sprite->invisible = TRUE; } - if ((sprite->data5 <= -64 || sprite->data5 >= 64) && sprite->data0 != 0) + if ((sprite->data[5] <= -64 || sprite->data[5] >= 64) && sprite->data[0] != 0) { DestroySprite(sprite); gPokedexView->unk61E[data1] = 0xFFFF; @@ -2797,13 +2797,13 @@ static void sub_808EF8C(struct Sprite *sprite) { u8 r0; - if (sprite->data1 != 0) + if (sprite->data[1] != 0) { if (gPokedexView->selectedPokemon == gPokedexView->pokemonListCount - 1) sprite->invisible = TRUE; else sprite->invisible = FALSE; - r0 = sprite->data2; + r0 = sprite->data[2]; } else { @@ -2811,10 +2811,10 @@ static void sub_808EF8C(struct Sprite *sprite) sprite->invisible = TRUE; else sprite->invisible = FALSE; - r0 = sprite->data2 - 128; + r0 = sprite->data[2] - 128; } sprite->pos2.y = gSineTable[r0] / 64; - sprite->data2 = sprite->data2 + 8; + sprite->data[2] = sprite->data[2] + 8; if (gPokedexView->menuIsOpen == 0 && gPokedexView->menuY == 0 && sprite->invisible == 0) sprite->invisible = FALSE; else @@ -2840,12 +2840,12 @@ static void sub_808F0B4(struct Sprite *sprite) s16 r3; s16 r0; - val = gPokedexView->unk62C + sprite->data1; + val = gPokedexView->unk62C + sprite->data[1]; r3 = gSineTable[val]; r0 = gSineTable[val + 0x40]; - SetOamMatrix(sprite->data0, r0, r3, -r3, r0); + SetOamMatrix(sprite->data[0], r0, r3, -r3, r0); - val = gPokedexView->unk62C + (sprite->data1 + 0x40); + val = gPokedexView->unk62C + (sprite->data[1] + 0x40); r3 = gSineTable[val]; r0 = gSineTable[val + 0x40]; sprite->pos2.x = r0 * 40 / 256; @@ -2867,8 +2867,8 @@ static void sub_808F168(struct Sprite *sprite) { sprite->invisible = FALSE; sprite->pos2.y = gPokedexView->menuCursorPos * 16; - sprite->pos2.x = gSineTable[(u8)sprite->data2] / 64; - sprite->data2 += 8; + sprite->pos2.x = gSineTable[(u8)sprite->data[2]] / 64; + sprite->data[2] += 8; } else { @@ -5482,27 +5482,27 @@ static bool8 sub_8092F8C(u8 taskId) static void sub_8092FD8(struct Sprite *sprite) { - if (gTasks[sprite->data0].func == sub_8092644) + if (gTasks[sprite->data[0]].func == sub_8092644) { u8 val; - if (sprite->data1 != 0) + if (sprite->data[1] != 0) { - if (sub_8092F8C(sprite->data0)) + if (sub_8092F8C(sprite->data[0])) sprite->invisible = TRUE; else sprite->invisible = FALSE; } else { - if (sub_8092F44(sprite->data0)) + if (sub_8092F44(sprite->data[0])) sprite->invisible = TRUE; else sprite->invisible = FALSE; } - val = sprite->data2 + sprite->data1 * 128; + val = sprite->data[2] + sprite->data[1] * 128; sprite->pos2.y = gSineTable[val] / 128; - sprite->data2 += 8; + sprite->data[2] += 8; } else { @@ -5515,13 +5515,13 @@ static void sub_809308C(u8 taskId) u8 spriteId; spriteId = CreateSprite(&gSpriteTemplate_83A053C, 184, 4, 0); - gSprites[spriteId].data0 = taskId; - gSprites[spriteId].data1 = 0; + gSprites[spriteId].data[0] = taskId; + gSprites[spriteId].data[1] = 0; gSprites[spriteId].callback = sub_8092FD8; spriteId = CreateSprite(&gSpriteTemplate_83A053C, 184, 108, 0); - gSprites[spriteId].data0 = taskId; - gSprites[spriteId].data1 = 1; + gSprites[spriteId].data[0] = taskId; + gSprites[spriteId].data[1] = 1; gSprites[spriteId].vFlip = TRUE; gSprites[spriteId].callback = sub_8092FD8; } diff --git a/src/pokemon/pokemon_menu.c b/src/pokemon/pokemon_menu.c index 3a2c12db5..07d7e5322 100644 --- a/src/pokemon/pokemon_menu.c +++ b/src/pokemon/pokemon_menu.c @@ -347,7 +347,7 @@ static void sub_8089F44(u8 taskID) { if (!gPaletteFade.active) { - u8 spriteID = gSprites[gTasks[taskID].data[3] >> 8].data0; + u8 spriteID = gSprites[gTasks[taskID].data[3] >> 8].data[0]; DestroyTask(taskID); ewram1B000_alt.unk262 = 1; ShowPokemonSummaryScreen(gPlayerParty, spriteID, gPlayerPartyCount - 1, sub_8089F14, 0); diff --git a/src/rom_8077ABC.c b/src/rom_8077ABC.c index 10d58dcb5..e4801a194 100644 --- a/src/rom_8077ABC.c +++ b/src/rom_8077ABC.c @@ -434,92 +434,92 @@ u8 GetAnimBankSpriteId(u8 whichBank) { } } -void StoreSpriteCallbackInData6(struct Sprite *sprite, void (*callback)(struct Sprite*)) { - sprite->data6 = (u32)(callback) & 0xffff; - sprite->data7 = (u32)(callback) >> 16; +void StoreSpriteCallbackInData(struct Sprite *sprite, void (*callback)(struct Sprite*)) { + sprite->data[6] = (u32)(callback) & 0xffff; + sprite->data[7] = (u32)(callback) >> 16; } -void SetCallbackToStoredInData6(struct Sprite *sprite) { - u32 callback = (u16)sprite->data6 | (sprite->data7 << 16); +void SetCallbackToStoredInData(struct Sprite *sprite) { + u32 callback = (u16)sprite->data[6] | (sprite->data[7] << 16); sprite->callback = (void (*)(struct Sprite *))callback; } void sub_8078114(struct Sprite *sprite) { - if (sprite->data3) { - sprite->pos2.x = Sin(sprite->data0, sprite->data1); - sprite->pos2.y = Cos(sprite->data0, sprite->data1); - sprite->data0 += sprite->data2; - if (sprite->data0 >= 0x100) { - sprite->data0 -= 0x100; - } else if (sprite->data0 < 0) { - sprite->data0 += 0x100; + if (sprite->data[3]) { + sprite->pos2.x = Sin(sprite->data[0], sprite->data[1]); + sprite->pos2.y = Cos(sprite->data[0], sprite->data[1]); + sprite->data[0] += sprite->data[2]; + if (sprite->data[0] >= 0x100) { + sprite->data[0] -= 0x100; + } else if (sprite->data[0] < 0) { + sprite->data[0] += 0x100; } - sprite->data3--; + sprite->data[3]--; } else { - SetCallbackToStoredInData6(sprite); + SetCallbackToStoredInData(sprite); } } void sub_8078174(struct Sprite *sprite) { - if (sprite->data3) { - sprite->pos2.x = Sin(sprite->data0, (sprite->data5 >> 8) + sprite->data1); - sprite->pos2.y = Cos(sprite->data0, (sprite->data5 >> 8) + sprite->data1); - sprite->data0 += sprite->data2; - sprite->data5 += sprite->data4; - if (sprite->data0 >= 0x100) { - sprite->data0 -= 0x100; - } else if (sprite->data0 < 0) { - sprite->data0 += 0x100; + if (sprite->data[3]) { + sprite->pos2.x = Sin(sprite->data[0], (sprite->data[5] >> 8) + sprite->data[1]); + sprite->pos2.y = Cos(sprite->data[0], (sprite->data[5] >> 8) + sprite->data[1]); + sprite->data[0] += sprite->data[2]; + sprite->data[5] += sprite->data[4]; + if (sprite->data[0] >= 0x100) { + sprite->data[0] -= 0x100; + } else if (sprite->data[0] < 0) { + sprite->data[0] += 0x100; } - sprite->data3--; + sprite->data[3]--; } else { - SetCallbackToStoredInData6(sprite); + SetCallbackToStoredInData(sprite); } } void unref_sub_80781F0(struct Sprite *sprite) { - if (sprite->data3) { - sprite->pos2.x = Sin(sprite->data0, sprite->data1); - sprite->pos2.y = Cos(sprite->data4, sprite->data1); - sprite->data0 += sprite->data2; - sprite->data4 += sprite->data5; - if (sprite->data0 >= 0x100) { - sprite->data0 -= 0x100; - } else if (sprite->data0 < 0) { - sprite->data0 += 0x100; + if (sprite->data[3]) { + sprite->pos2.x = Sin(sprite->data[0], sprite->data[1]); + sprite->pos2.y = Cos(sprite->data[4], sprite->data[1]); + sprite->data[0] += sprite->data[2]; + sprite->data[4] += sprite->data[5]; + if (sprite->data[0] >= 0x100) { + sprite->data[0] -= 0x100; + } else if (sprite->data[0] < 0) { + sprite->data[0] += 0x100; } - if (sprite->data4 >= 0x100) { - sprite->data4 -= 0x100; - } else if (sprite->data4 < 0) { - sprite->data4 += 0x100; + if (sprite->data[4] >= 0x100) { + sprite->data[4] -= 0x100; + } else if (sprite->data[4] < 0) { + sprite->data[4] += 0x100; } - sprite->data3--; + sprite->data[3]--; } else { - SetCallbackToStoredInData6(sprite); + SetCallbackToStoredInData(sprite); } } void sub_8078278(struct Sprite *sprite) { - if (sprite->data3) { - sprite->pos2.x = Sin(sprite->data0, sprite->data1); - sprite->pos2.y = Cos(sprite->data0, sprite->data4); - sprite->data0 += sprite->data2; - if (sprite->data0 >= 0x100) { - sprite->data0 -= 0x100; - } else if (sprite->data0 < 0) { - sprite->data0 += 0x100; + if (sprite->data[3]) { + sprite->pos2.x = Sin(sprite->data[0], sprite->data[1]); + sprite->pos2.y = Cos(sprite->data[0], sprite->data[4]); + sprite->data[0] += sprite->data[2]; + if (sprite->data[0] >= 0x100) { + sprite->data[0] -= 0x100; + } else if (sprite->data[0] < 0) { + sprite->data[0] += 0x100; } - sprite->data3--; + sprite->data[3]--; } else { - SetCallbackToStoredInData6(sprite); + SetCallbackToStoredInData(sprite); } } void sub_80782D8(struct Sprite *sprite) { - if (sprite->data0 > 0) { - sprite->data0--; + if (sprite->data[0] > 0) { + sprite->data[0]--; } else { - SetCallbackToStoredInData6(sprite); + SetCallbackToStoredInData(sprite); } } @@ -532,95 +532,95 @@ void sub_80782F8(struct Sprite *sprite) { void sub_8078314(struct Sprite *sprite) { s16 old; int v1; - if (sprite->data1 > sprite->data2) { - sprite->data0 = -sprite->data0; + if (sprite->data[1] > sprite->data[2]) { + sprite->data[0] = -sprite->data[0]; } - v1 = sprite->data2 - sprite->data1; - old = sprite->data0; - sprite->data0 = abs(v1 / sprite->data0); - sprite->data2 = (sprite->data4 - sprite->data3) / sprite->data0; - sprite->data1 = old; + v1 = sprite->data[2] - sprite->data[1]; + old = sprite->data[0]; + sprite->data[0] = abs(v1 / sprite->data[0]); + sprite->data[2] = (sprite->data[4] - sprite->data[3]) / sprite->data[0]; + sprite->data[1] = old; } void sub_8078364(struct Sprite *sprite) { - if (sprite->data0 > 0) { - sprite->data0--; - sprite->pos2.x += sprite->data1; - sprite->pos2.y += sprite->data2; + if (sprite->data[0] > 0) { + sprite->data[0]--; + sprite->pos2.x += sprite->data[1]; + sprite->pos2.y += sprite->data[2]; } else { - SetCallbackToStoredInData6(sprite); + SetCallbackToStoredInData(sprite); } } void sub_8078394(struct Sprite *sprite) { - if (sprite->data0 > 0) { - sprite->data0--; - sprite->data3 += sprite->data1; - sprite->data4 += sprite->data2; - sprite->pos2.x = sprite->data3 >> 8; - sprite->pos2.y = sprite->data4 >> 8; + if (sprite->data[0] > 0) { + sprite->data[0]--; + sprite->data[3] += sprite->data[1]; + sprite->data[4] += sprite->data[2]; + sprite->pos2.x = sprite->data[3] >> 8; + sprite->pos2.y = sprite->data[4] >> 8; } else { - SetCallbackToStoredInData6(sprite); + SetCallbackToStoredInData(sprite); } } void sub_80783D0(struct Sprite *sprite) { - if (sprite->data0 > 0) { - sprite->data0--; - sprite->data3 += sprite->data1; - sprite->data4 += sprite->data2; - sprite->pos2.x = sprite->data3 >> 8; - sprite->pos2.y = sprite->data4 >> 8; + if (sprite->data[0] > 0) { + sprite->data[0]--; + sprite->data[3] += sprite->data[1]; + sprite->data[4] += sprite->data[2]; + sprite->pos2.x = sprite->data[3] >> 8; + sprite->pos2.y = sprite->data[4] >> 8; } else { - SetCallbackToStoredInData6(sprite); + SetCallbackToStoredInData(sprite); } UpdateMonIconFrame(sprite); } void unref_sub_8078414(struct Sprite *sprite) { - sprite->data1 = sprite->pos1.x + sprite->pos2.x; - sprite->data3 = sprite->pos1.y + sprite->pos2.y; - sprite->data2 = sub_8077ABC(gBattleAnimBankTarget, 2); - sprite->data4 = sub_8077ABC(gBattleAnimBankTarget, 3); + sprite->data[1] = sprite->pos1.x + sprite->pos2.x; + sprite->data[3] = sprite->pos1.y + sprite->pos2.y; + sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2); + sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3); sprite->callback = sub_80782F8; } void sub_8078458(struct Sprite *sprite) { - if (sprite->data0 > 0) { - sprite->data0--; - gSprites[sprite->data3].pos2.x += sprite->data1; - gSprites[sprite->data3].pos2.y += sprite->data2; + if (sprite->data[0] > 0) { + sprite->data[0]--; + gSprites[sprite->data[3]].pos2.x += sprite->data[1]; + gSprites[sprite->data[3]].pos2.y += sprite->data[2]; } else { - SetCallbackToStoredInData6(sprite); + SetCallbackToStoredInData(sprite); } } void sub_80784A8(struct Sprite *sprite) { - if (sprite->data0 > 0) { - sprite->data0--; - sprite->data3 += sprite->data1; - sprite->data4 += sprite->data2; - gSprites[sprite->data5].pos2.x = sprite->data3 >> 8; - gSprites[sprite->data5].pos2.y = sprite->data4 >> 8; + if (sprite->data[0] > 0) { + sprite->data[0]--; + sprite->data[3] += sprite->data[1]; + sprite->data[4] += sprite->data[2]; + gSprites[sprite->data[5]].pos2.x = sprite->data[3] >> 8; + gSprites[sprite->data[5]].pos2.y = sprite->data[4] >> 8; } else { - SetCallbackToStoredInData6(sprite); + SetCallbackToStoredInData(sprite); } } void sub_8078504(struct Sprite *sprite) { - if (sprite->data0 > 0) { - sprite->data0--; - sprite->pos2.x = sprite->data2 >> 8; - sprite->data2 += sprite->data1; - sprite->pos2.y = sprite->data4 >> 8; - sprite->data4 += sprite->data3; - if (sprite->data0 % sprite->data5 == 0) { - if (sprite->data5) { + if (sprite->data[0] > 0) { + sprite->data[0]--; + sprite->pos2.x = sprite->data[2] >> 8; + sprite->data[2] += sprite->data[1]; + sprite->pos2.y = sprite->data[4] >> 8; + sprite->data[4] += sprite->data[3]; + if (sprite->data[0] % sprite->data[5] == 0) { + if (sprite->data[5]) { sprite->invisible ^= 1; } } } else { - SetCallbackToStoredInData6(sprite); + SetCallbackToStoredInData(sprite); } } @@ -630,27 +630,27 @@ void move_anim_8074EE0(struct Sprite *sprite) { } void unref_sub_8078588(struct Sprite *sprite) { - sprite->data1 = sprite->pos1.x + sprite->pos2.x; - sprite->data3 = sprite->pos1.y + sprite->pos2.y; - sprite->data2 = sub_8077ABC(gBattleAnimBankAttacker, 2); - sprite->data4 = sub_8077ABC(gBattleAnimBankAttacker, 3); + sprite->data[1] = sprite->pos1.x + sprite->pos2.x; + sprite->data[3] = sprite->pos1.y + sprite->pos2.y; + sprite->data[2] = sub_8077ABC(gBattleAnimBankAttacker, 2); + sprite->data[4] = sub_8077ABC(gBattleAnimBankAttacker, 3); sprite->callback = sub_80782F8; } void unref_sub_80785CC(struct Sprite *sprite) { - ResetPaletteStructByUid(sprite->data5); + ResetPaletteStructByUid(sprite->data[5]); move_anim_8074EE0(sprite); } void sub_80785E4(struct Sprite *sprite) { if (sprite->affineAnimEnded) { - SetCallbackToStoredInData6(sprite); + SetCallbackToStoredInData(sprite); } } void sub_8078600(struct Sprite *sprite) { if (sprite->animEnded) { - SetCallbackToStoredInData6(sprite); + SetCallbackToStoredInData(sprite); } } @@ -688,19 +688,19 @@ void sub_807867C(struct Sprite *sprite, s16 a2) { } void sub_80786EC(struct Sprite *sprite) { - sprite->data1 = sprite->pos1.x; - sprite->data3 = sprite->pos1.y; + sprite->data[1] = sprite->pos1.x; + sprite->data[3] = sprite->pos1.y; obj_translate_based_on_private_1_2_3_4(sprite); - sprite->data6 = 0x8000 / sprite->data0; - sprite->data7 = 0; + sprite->data[6] = 0x8000 / sprite->data[0]; + sprite->data[7] = 0; } bool8 sub_8078718(struct Sprite *sprite) { if (sub_8078B5C(sprite)) { return TRUE; } - sprite->data7 += sprite->data6; - sprite->pos2.y += Sin((u8)(sprite->data7 >> 8), sprite->data5); + sprite->data[7] += sprite->data[6]; + sprite->pos2.y += Sin((u8)(sprite->data[7] >> 8), sprite->data[5]); return FALSE; } @@ -829,31 +829,31 @@ void sub_80789D4(bool8 a1) { } void sub_8078A34(struct Sprite *sprite) { - sprite->data1 = sprite->pos1.x; - sprite->data3 = sprite->pos1.y; + sprite->data[1] = sprite->pos1.x; + sprite->data[3] = sprite->pos1.y; sub_8078A5C(sprite); sprite->callback = sub_80783D0; sprite->callback(sprite); } void sub_8078A5C(struct Sprite *sprite) { - s16 x = (sprite->data2 - sprite->data1) << 8; - s16 y = (sprite->data4 - sprite->data3) << 8; - sprite->data1 = x / sprite->data0; - sprite->data2 = y / sprite->data0; - sprite->data4 = 0; - sprite->data3 = 0; + s16 x = (sprite->data[2] - sprite->data[1]) << 8; + s16 y = (sprite->data[4] - sprite->data[3]) << 8; + sprite->data[1] = x / sprite->data[0]; + sprite->data[2] = y / sprite->data[0]; + sprite->data[4] = 0; + sprite->data[3] = 0; } void obj_translate_based_on_private_1_2_3_4(struct Sprite *sprite) { - int x = sprite->data2 - sprite->data1; - int y = sprite->data4 - sprite->data3; + int x = sprite->data[2] - sprite->data[1]; + int y = sprite->data[4] - sprite->data[3]; bool8 r8 = x < 0; bool8 r9 = y < 0; u16 x2 = abs(x) << 8; u16 y2 = abs(y) << 8; - x2 = x2 / sprite->data0; - y2 = y2 / sprite->data0; + x2 = x2 / sprite->data[0]; + y2 = y2 / sprite->data[0]; if (r8) { x2 |= 1; } else { @@ -864,15 +864,15 @@ void obj_translate_based_on_private_1_2_3_4(struct Sprite *sprite) { } else { y2 &= ~1; } - sprite->data1 = x2; - sprite->data2 = y2; - sprite->data4 = 0; - sprite->data3 = 0; + sprite->data[1] = x2; + sprite->data[2] = y2; + sprite->data[4] = 0; + sprite->data[3] = 0; } void sub_8078B34(struct Sprite *sprite) { - sprite->data1 = sprite->pos1.x; - sprite->data3 = sprite->pos1.y; + sprite->data[1] = sprite->pos1.x; + sprite->data[3] = sprite->pos1.y; obj_translate_based_on_private_1_2_3_4(sprite); sprite->callback = sub_8078BB8; sprite->callback(sprite); @@ -880,13 +880,13 @@ void sub_8078B34(struct Sprite *sprite) { bool8 sub_8078B5C(struct Sprite *sprite) { u16 v1, v2, x, y; - if (!sprite->data0) { + if (!sprite->data[0]) { return TRUE; } - v1 = sprite->data1; - v2 = sprite->data2; - x = sprite->data3; - y = sprite->data4; + v1 = sprite->data[1]; + v2 = sprite->data[2]; + x = sprite->data[3]; + y = sprite->data[4]; x += v1; y += v2; if (v1 & 1) { @@ -899,41 +899,41 @@ bool8 sub_8078B5C(struct Sprite *sprite) { } else { sprite->pos2.y = y >> 8; } - sprite->data3 = x; - sprite->data4 = y; - sprite->data0--; + sprite->data[3] = x; + sprite->data[4] = y; + sprite->data[0]--; return FALSE; } void sub_8078BB8(struct Sprite *sprite) { if (sub_8078B5C(sprite)) { - SetCallbackToStoredInData6(sprite); + SetCallbackToStoredInData(sprite); } } void sub_8078BD4(struct Sprite *sprite) { - int v1 = abs(sprite->data2 - sprite->data1) << 8; - sprite->data0 = v1 / sprite->data0; + int v1 = abs(sprite->data[2] - sprite->data[1]) << 8; + sprite->data[0] = v1 / sprite->data[0]; obj_translate_based_on_private_1_2_3_4(sprite); } void sub_8078C00(struct Sprite *sprite) { - sprite->data1 = sprite->pos1.x; - sprite->data3 = sprite->pos1.y; + sprite->data[1] = sprite->pos1.x; + sprite->data[3] = sprite->pos1.y; sub_8078BD4(sprite); sprite->callback = sub_8078BB8; sprite->callback(sprite); } void sub_8078C28(struct Sprite *sprite) { - int x = sprite->data2 - sprite->data1; - int y = sprite->data4 - sprite->data3; + int x = sprite->data[2] - sprite->data[1]; + int y = sprite->data[4] - sprite->data[3]; bool8 x_sign = x < 0; bool8 y_sign = y < 0; u16 x2 = abs(x) << 4; u16 y2 = abs(y) << 4; - x2 /= sprite->data0; - y2 /= sprite->data0; + x2 /= sprite->data[0]; + y2 /= sprite->data[0]; if (x_sign) { x2 |= 1; } else { @@ -944,15 +944,15 @@ void sub_8078C28(struct Sprite *sprite) { } else { y2 &= ~1; } - sprite->data1 = x2; - sprite->data2 = y2; - sprite->data4 = 0; - sprite->data3 = 0; + sprite->data[1] = x2; + sprite->data[2] = y2; + sprite->data[4] = 0; + sprite->data[3] = 0; } void sub_8078CC0(struct Sprite *sprite) { - sprite->data1 = sprite->pos1.x; - sprite->data3 = sprite->pos1.y; + sprite->data[1] = sprite->pos1.x; + sprite->data[3] = sprite->pos1.y; sub_8078C28(sprite); sprite->callback = sub_8078D44; sprite->callback(sprite); @@ -960,13 +960,13 @@ void sub_8078CC0(struct Sprite *sprite) { bool8 sub_8078CE8(struct Sprite *sprite) { u16 v1, v2, x, y; - if (!sprite->data0) { + if (!sprite->data[0]) { return TRUE; } - v1 = sprite->data1; - v2 = sprite->data2; - x = sprite->data3; - y = sprite->data4; + v1 = sprite->data[1]; + v2 = sprite->data[2]; + x = sprite->data[3]; + y = sprite->data[4]; x += v1; y += v2; if (v1 & 1) { @@ -979,27 +979,27 @@ bool8 sub_8078CE8(struct Sprite *sprite) { } else { sprite->pos2.y = y >> 4; } - sprite->data3 = x; - sprite->data4 = y; - sprite->data0--; + sprite->data[3] = x; + sprite->data[4] = y; + sprite->data[0]--; return FALSE; } void sub_8078D44(struct Sprite *sprite) { if (sub_8078CE8(sprite)) { - SetCallbackToStoredInData6(sprite); + SetCallbackToStoredInData(sprite); } } void sub_8078D60(struct Sprite *sprite) { - int v1 = abs(sprite->data2 - sprite->data1) << 4; - sprite->data0 = v1 / sprite->data0; + int v1 = abs(sprite->data[2] - sprite->data[1]) << 4; + sprite->data[0] = v1 / sprite->data[0]; sub_8078C28(sprite); } void sub_8078D8C(struct Sprite *sprite) { - sprite->data1 = sprite->pos1.x; - sprite->data3 = sprite->pos1.y; + sprite->data[1] = sprite->pos1.x; + sprite->data[3] = sprite->pos1.y; sub_8078D60(sprite); sprite->callback = sub_8078D44; sprite->callback(sprite); @@ -1025,7 +1025,7 @@ void obj_id_set_rotscale(u8 sprite, s16 xScale, s16 yScale, u16 rotation) { bool8 sub_8078E38() { if (NotInBattle()) { - if (gSprites[GetAnimBankSpriteId(0)].data2 == 0xc9 /* XXX SPECIES_UNOWN? */) { + if (gSprites[GetAnimBankSpriteId(0)].data[2] == 0xc9 /* XXX SPECIES_UNOWN? */) { return FALSE; } return TRUE; @@ -1034,7 +1034,7 @@ bool8 sub_8078E38() { } void sub_8078E70(u8 sprite, u8 a2) { - u8 r7 = gSprites[sprite].data0; + u8 r7 = gSprites[sprite].data[0]; if (NotInBattle() || IsAnimBankSpriteVisible(r7)) { gSprites[sprite].invisible = FALSE; } @@ -1219,7 +1219,7 @@ u8 unref_sub_80793B0(u8 a1) { void sub_80793C4(struct Sprite *sprite) { bool8 var; - if (!sprite->data0) { + if (!sprite->data[0]) { if (!gBattleAnimArgs[3]) { var = TRUE; } else { @@ -1230,7 +1230,7 @@ void sub_80793C4(struct Sprite *sprite) { } else { sub_8078764(sprite, var); } - sprite->data0++; + sprite->data[0]++; } else if (sprite->animEnded || sprite->affineAnimEnded) { move_anim_8074EE0(sprite); @@ -1254,11 +1254,11 @@ void sub_807941C(struct Sprite *sprite) { if (GetBankSide(gBattleAnimBankAttacker)) { gBattleAnimArgs[2] = -gBattleAnimArgs[2]; } - sprite->data0 = gBattleAnimArgs[4]; - sprite->data2 = sub_8077ABC(gBattleAnimBankTarget, 2) + gBattleAnimArgs[2]; - sprite->data4 = sub_8077ABC(gBattleAnimBankTarget, v2) + gBattleAnimArgs[3]; + sprite->data[0] = gBattleAnimArgs[4]; + sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2) + gBattleAnimArgs[2]; + sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, v2) + gBattleAnimArgs[3]; sprite->callback = sub_8078B34; - StoreSpriteCallbackInData6(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, move_anim_8072740); } void sub_80794A8(struct Sprite *sprite) { @@ -1266,10 +1266,10 @@ void sub_80794A8(struct Sprite *sprite) { if (GetBankSide(gBattleAnimBankAttacker)) { gBattleAnimArgs[2] = -gBattleAnimArgs[2]; } - sprite->data0 = gBattleAnimArgs[4]; - sprite->data2 = sub_8077ABC(gBattleAnimBankTarget, 2) + gBattleAnimArgs[2]; - sprite->data4 = sub_8077ABC(gBattleAnimBankTarget, 3) + gBattleAnimArgs[3]; - sprite->data5 = gBattleAnimArgs[5]; + sprite->data[0] = gBattleAnimArgs[4]; + sprite->data[2] = sub_8077ABC(gBattleAnimBankTarget, 2) + gBattleAnimArgs[2]; + sprite->data[4] = sub_8077ABC(gBattleAnimBankTarget, 3) + gBattleAnimArgs[3]; + sprite->data[5] = gBattleAnimArgs[5]; sub_80786EC(sprite); sprite->callback = sub_8079518; } @@ -1300,11 +1300,11 @@ void sub_8079534(struct Sprite *sprite) { gBattleAnimArgs[2] = -gBattleAnimArgs[2]; } sub_8078764(sprite, r4); - sprite->data0 = gBattleAnimArgs[4]; - sprite->data2 = sub_8077ABC(slot, 2) + gBattleAnimArgs[2]; - sprite->data4 = sub_8077ABC(slot, r7) + gBattleAnimArgs[3]; + sprite->data[0] = gBattleAnimArgs[4]; + sprite->data[2] = sub_8077ABC(slot, 2) + gBattleAnimArgs[2]; + sprite->data[4] = sub_8077ABC(slot, r7) + gBattleAnimArgs[3]; sprite->callback = sub_8078B34; - StoreSpriteCallbackInData6(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, move_anim_8072740); } s16 duplicate_obj_of_side_rel2move_in_transparent_mode(u8 a1) { @@ -1532,7 +1532,7 @@ void sub_8079AB8(u8 sprite, u8 sprite2) { u16 sub_8079B10(u8 sprite) { struct TransformStatus *transform; - u8 slot = gSprites[sprite].data0; + u8 slot = gSprites[sprite].data[0]; u16 species; u16 i; for (i = 0; i < (sizeof(gBattleMonSprites) / sizeof(u8)); i++) { @@ -1899,11 +1899,11 @@ void sub_807A544(struct Sprite *sprite) { sprite->pos1.x += gBattleAnimArgs[0]; } sprite->pos1.y += gBattleAnimArgs[1]; - sprite->data0 = gBattleAnimArgs[2]; - sprite->data1 = gBattleAnimArgs[3]; - sprite->data3 = gBattleAnimArgs[4]; - sprite->data5 = gBattleAnimArgs[5]; - StoreSpriteCallbackInData6(sprite, move_anim_8074EE0); + sprite->data[0] = gBattleAnimArgs[2]; + sprite->data[1] = gBattleAnimArgs[3]; + sprite->data[3] = gBattleAnimArgs[4]; + sprite->data[5] = gBattleAnimArgs[5]; + StoreSpriteCallbackInData(sprite, move_anim_8074EE0); sprite->callback = sub_8078504; } @@ -1915,12 +1915,12 @@ void sub_807A5C4(struct Sprite *sprite) { sprite->pos1.x += gBattleAnimArgs[0]; } sprite->pos1.y += gBattleAnimArgs[1]; - sprite->data0 = gBattleAnimArgs[2]; - sprite->data1 = gBattleAnimArgs[3]; - sprite->data3 = gBattleAnimArgs[4]; - sprite->data5 = gBattleAnimArgs[5]; + sprite->data[0] = gBattleAnimArgs[2]; + sprite->data[1] = gBattleAnimArgs[3]; + sprite->data[3] = gBattleAnimArgs[4]; + sprite->data[5] = gBattleAnimArgs[5]; StartSpriteAnim(sprite, gBattleAnimArgs[6]); - StoreSpriteCallbackInData6(sprite, move_anim_8074EE0); + StoreSpriteCallbackInData(sprite, move_anim_8074EE0); sprite->callback = sub_8078504; } @@ -1933,7 +1933,7 @@ void sub_807A63C(struct Sprite *sprite) { } sprite->pos1.y += gBattleAnimArgs[1]; sprite->callback = sub_8078600; - StoreSpriteCallbackInData6(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, move_anim_8072740); } void sub_807A69C(u8 taskId) { @@ -1994,9 +1994,9 @@ void sub_807A850(struct Task *task, u8 taskId) { if (sprite >= 0) { gSprites[sprite].oam.priority = task->data[6]; gSprites[sprite].oam.paletteNum = task->data[4]; - gSprites[sprite].data0 = 8; - gSprites[sprite].data1 = taskId; - gSprites[sprite].data2 = sprite; + gSprites[sprite].data[0] = 8; + gSprites[sprite].data[1] = taskId; + gSprites[sprite].data[2] = sprite; gSprites[sprite].pos2.x = gSprites[task->data[0]].pos2.x; gSprites[sprite].callback = sub_807A8D4; task->data[5]++; @@ -2004,8 +2004,8 @@ void sub_807A850(struct Task *task, u8 taskId) { } void sub_807A8D4(struct Sprite *sprite) { - if (--sprite->data0 == 0) { - gTasks[sprite->data1].data[5]--; + if (--sprite->data[0] == 0) { + gTasks[sprite->data[1]].data[5]--; obj_delete_but_dont_free_vram(sprite); } } @@ -2014,21 +2014,21 @@ void sub_807A908(struct Sprite *sprite) { sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2); sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3); if (!GetBankSide(gBattleAnimBankAttacker)) { - sprite->data0 = 5; + sprite->data[0] = 5; } else { - sprite->data0 = -10; + sprite->data[0] = -10; } - sprite->data1 = -40; + sprite->data[1] = -40; sprite->callback = sub_807A960; } void sub_807A960(struct Sprite *sprite) { - sprite->data2 += sprite->data0; - sprite->data3 += sprite->data1; - sprite->pos2.x = sprite->data2 / 10; - sprite->pos2.y = sprite->data3 / 10; - if (sprite->data1 < -20) { - sprite->data1++; + sprite->data[2] += sprite->data[0]; + sprite->data[3] += sprite->data[1]; + sprite->pos2.x = sprite->data[2] / 10; + sprite->pos2.y = sprite->data[3] / 10; + if (sprite->data[1] < -20) { + sprite->data[1]++; } if ((sprite->pos1.y + sprite->pos2.y) < -32) { move_anim_8072740(sprite); @@ -2037,9 +2037,9 @@ void sub_807A960(struct Sprite *sprite) { void sub_807A9BC(struct Sprite *sprite) { int x; - sprite->data0 = gBattleAnimArgs[2]; - sprite->data2 = sprite->pos1.x + gBattleAnimArgs[4]; - sprite->data4 = sprite->pos1.y + gBattleAnimArgs[5]; + sprite->data[0] = gBattleAnimArgs[2]; + sprite->data[2] = sprite->pos1.x + gBattleAnimArgs[4]; + sprite->data[4] = sprite->pos1.y + gBattleAnimArgs[5]; if (!GetBankSide(gBattleAnimBankTarget)) { x = (u16)gBattleAnimArgs[4] + 30; sprite->pos1.x += x; @@ -2050,5 +2050,5 @@ void sub_807A9BC(struct Sprite *sprite) { sprite->pos1.y = gBattleAnimArgs[5] - 80; } sprite->callback = sub_8078B34; - StoreSpriteCallbackInData6(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, move_anim_8072740); } diff --git a/src/scene/berry_blender.c b/src/scene/berry_blender.c index 398f62833..42c79bc99 100644 --- a/src/scene/berry_blender.c +++ b/src/scene/berry_blender.c @@ -1019,34 +1019,34 @@ static void sub_804E56C(void) void sub_804E738(struct Sprite* sprite) { - sprite->data1 += sprite->data6; - sprite->data2 -= sprite->data4; - sprite->data2 += sprite->data7; - sprite->data0 += sprite->data7; - sprite->data4--; + sprite->data[1] += sprite->data[6]; + sprite->data[2] -= sprite->data[4]; + sprite->data[2] += sprite->data[7]; + sprite->data[0] += sprite->data[7]; + sprite->data[4]--; - if (sprite->data0 < sprite->data2) + if (sprite->data[0] < sprite->data[2]) { - sprite->data3 = sprite->data4 = sprite->data3 - 1; - if (++sprite->data5 > 3) + sprite->data[3] = sprite->data[4] = sprite->data[3] - 1; + if (++sprite->data[5] > 3) DestroySprite(sprite); else PlaySE(SE_TB_KARA); } - sprite->pos1.x = sprite->data1; - sprite->pos1.y = sprite->data2; + sprite->pos1.x = sprite->data[1]; + sprite->pos1.y = sprite->data[2]; } void sub_804E794(struct Sprite* sprite, s16 a2, s16 a3, s16 a4, s16 a5, s16 a6) { - sprite->data0 = a3; - sprite->data1 = a2; - sprite->data2 = a3; - sprite->data3 = a4; - sprite->data4 = 10; - sprite->data5 = 0; - sprite->data6 = a5; - sprite->data7 = a6; + sprite->data[0] = a3; + sprite->data[1] = a2; + sprite->data[2] = a3; + sprite->data[3] = a4; + sprite->data[4] = 10; + sprite->data[5] = 0; + sprite->data[6] = a5; + sprite->data[7] = a6; sprite->callback = sub_804E738; } @@ -3012,10 +3012,10 @@ static void sub_80514F0(void) void sub_8051524(struct Sprite* sprite) { - sprite->data2 += sprite->data0; - sprite->data3 += sprite->data1; - sprite->pos2.x = sprite->data2 / 8; - sprite->pos2.y = sprite->data3 / 8; + sprite->data[2] += sprite->data[0]; + sprite->data[3] += sprite->data[1]; + sprite->pos2.x = sprite->data[2] / 8; + sprite->pos2.y = sprite->data[3] / 8; if (sprite->animEnded) DestroySprite(sprite); } @@ -3037,8 +3037,8 @@ static void sub_805156C(void) y = gSineTable[(rand & 0xFF)] / 4; spriteID = CreateSprite(&sSpriteTemplate_82164FC, x + 120, y + 80, 1); - gSprites[spriteID].data0 = 16 - (Random() % 32); - gSprites[spriteID].data1 = 16 - (Random() % 32); + gSprites[spriteID].data[0] = 16 - (Random() % 32); + gSprites[spriteID].data[1] = 16 - (Random() % 32); gSprites[spriteID].callback = sub_8051524; } @@ -3046,16 +3046,16 @@ static void sub_805156C(void) static void sub_8051650(struct Sprite* sprite) { - sprite->data0++; - sprite->pos2.y = -(sprite->data0 / 3); + sprite->data[0]++; + sprite->pos2.y = -(sprite->data[0] / 3); if (sprite->animEnded) DestroySprite(sprite); } void sub_8051684(struct Sprite* sprite) { - sprite->data0++; - sprite->pos2.y = -(sprite->data0 * 2); + sprite->data[0]++; + sprite->pos2.y = -(sprite->data[0] * 2); if (sprite->pos2.y < -12) sprite->pos2.y = -12; if (sprite->animEnded) @@ -3110,74 +3110,74 @@ void unref_sub_80516F8(u8 taskID) static void sub_805181C(struct Sprite* sprite) { - switch (sprite->data0) + switch (sprite->data[0]) { case 0: - sprite->data1 += 8; - if (sprite->data1 > 88) + sprite->data[1] += 8; + if (sprite->data[1] > 88) { - sprite->data1 = 88; - sprite->data0++; + sprite->data[1] = 88; + sprite->data[0]++; PlaySE(SE_KON); } break; case 1: - sprite->data2 += 1; - if (sprite->data2 > 20) + sprite->data[2] += 1; + if (sprite->data[2] > 20) { - sprite->data0++; - sprite->data2 = 0; + sprite->data[0]++; + sprite->data[2] = 0; } break; case 2: - sprite->data1 += 4; - if (sprite->data1 > 176) + sprite->data[1] += 4; + if (sprite->data[1] > 176) { - if (++sprite->data3 == 3) + if (++sprite->data[3] == 3) { DestroySprite(sprite); CreateSprite(&sSpriteTemplate_821657C, 120, -20, 2); } else { - sprite->data0 = 0; - sprite->data1 = -16; - StartSpriteAnim(sprite, sprite->data3); + sprite->data[0] = 0; + sprite->data[1] = -16; + StartSpriteAnim(sprite, sprite->data[3]); } } break; } - sprite->pos2.y = sprite->data1; + sprite->pos2.y = sprite->data[1]; } static void sub_80518CC(struct Sprite* sprite) { - switch (sprite->data0) + switch (sprite->data[0]) { case 0: - sprite->data1 += 8; - if (sprite->data1 > 92) + sprite->data[1] += 8; + if (sprite->data[1] > 92) { - sprite->data1 = 92; - sprite->data0++; + sprite->data[1] = 92; + sprite->data[0]++; PlaySE(SE_PIN); } break; case 1: - sprite->data2 += 1; - if (sprite->data2 > 20) - sprite->data0++; + sprite->data[2] += 1; + if (sprite->data[2] > 20) + sprite->data[0]++; break; case 2: - sprite->data1 += 4; - if (sprite->data1 > 176) + sprite->data[1] += 4; + if (sprite->data[1] > 176) { gBerryBlenderData->field_0++; DestroySprite(sprite); } break; } - sprite->pos2.y = sprite->data1; + sprite->pos2.y = sprite->data[1]; } static void sub_805194C(u16 a0, u16 a1) diff --git a/src/scene/credits.c b/src/scene/credits.c index 077fc5e0d..ccd4cebc6 100644 --- a/src/scene/credits.c +++ b/src/scene/credits.c @@ -520,7 +520,7 @@ static void task_a_8143B38(u8 taskIdA) static void task_a_8143B68(u8 taskIdA) { - u16 data11; + u16 data1; if (gTasks[taskIdA].data[TDA_4]) { @@ -535,18 +535,18 @@ static void task_a_8143B68(u8 taskIdA) } gUnknown_02039320 = 0; - data11 = gTasks[taskIdA].data[TDA_11]; + data1 = gTasks[taskIdA].data[TDA_11]; if (gTasks[taskIdA].data[TDA_11] == 1) { - gTasks[taskIdA].data[TDA_13] = data11; + gTasks[taskIdA].data[TDA_13] = data1; gTasks[taskIdA].data[TDA_11] = 0; BeginNormalPaletteFade(-1, 0, 0, 16, 0); gTasks[taskIdA].func = task_a_8143BFC; } else if (gTasks[taskIdA].data[TDA_11] == 2) { - gTasks[taskIdA].data[TDA_13] = data11; + gTasks[taskIdA].data[TDA_13] = data1; gTasks[taskIdA].data[TDA_11] = 0; BeginNormalPaletteFade(-1, 0, 0, 16, 0); gTasks[taskIdA].func = task_a_8143CC0; @@ -956,12 +956,12 @@ static void task_d_8144514(u8 taskIdD) if (r6->unk8C < r6->unk8E - 1) { r6->unk8C++; - gSprites[r2].data3 = 50; + gSprites[r2].data[3] = 50; } else { r6->unk8C = 0; - gSprites[r2].data3 = 512; + gSprites[r2].data[3] = 512; } r6->unk88++; if (r6->unk8A == 2) @@ -996,7 +996,7 @@ void task_c_8144664(u8 taskIdC) } else { - gSprites[gTasks[taskIdC].data[TDC_2]].data0 = 2; + gSprites[gTasks[taskIdC].data[TDC_2]].data[0] = 2; gTasks[taskIdC].data[TDC_5] = 0; gTasks[taskIdC].data[TDC_0]++; } @@ -1013,8 +1013,8 @@ void task_c_8144664(u8 taskIdC) } break; case 3: - gSprites[gTasks[taskIdC].data[TDC_2]].data0 = 3; - gSprites[gTasks[taskIdC].data[TDC_3]].data0 = 1; + gSprites[gTasks[taskIdC].data[TDC_2]].data[0] = 3; + gSprites[gTasks[taskIdC].data[TDC_3]].data[0] = 1; gTasks[taskIdC].data[TDC_4] = 120; gTasks[taskIdC].data[TDC_0]++; break; @@ -1037,7 +1037,7 @@ void task_c_8144664(u8 taskIdC) } else { - gSprites[gTasks[taskIdC].data[TDC_2]].data0 = 1; + gSprites[gTasks[taskIdC].data[TDC_2]].data[0] = 1; gTasks[taskIdC].data[TDC_0]++; } break; @@ -1045,16 +1045,16 @@ void task_c_8144664(u8 taskIdC) gTasks[taskIdC].data[TDC_0] = 50; break; case 10: - gSprites[gTasks[taskIdC].data[TDC_3]].data0 = 2; + gSprites[gTasks[taskIdC].data[TDC_3]].data[0] = 2; gTasks[taskIdC].data[TDC_0] = 50; break; case 20: - gSprites[gTasks[taskIdC].data[TDC_2]].data0 = 4; + gSprites[gTasks[taskIdC].data[TDC_2]].data[0] = 4; gTasks[taskIdC].data[TDC_0] = 50; break; case 30: - gSprites[gTasks[taskIdC].data[TDC_2]].data0 = 5; - gSprites[gTasks[taskIdC].data[TDC_3]].data0 = 3; + gSprites[gTasks[taskIdC].data[TDC_2]].data[0] = 5; + gSprites[gTasks[taskIdC].data[TDC_3]].data[0] = 3; gTasks[taskIdC].data[TDC_0] = 50; break; case 50: @@ -1132,8 +1132,8 @@ static void sub_8144A68(u8 data, u8 taskIdA) gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].pos1.x = 272; gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].pos1.y = 46; gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].pos1.y = 46; - gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].data0 = 0; - gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].data0 = 0; + gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].data[0] = 0; + gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].data[0] = 0; gTasks[taskIdA].data[TDA_0] = sub_8148EC0(0, 0x2000, 0x20, 8); break; case 1: @@ -1143,8 +1143,8 @@ static void sub_8144A68(u8 data, u8 taskIdA) gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].pos1.x = 272; gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].pos1.y = 46; gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].pos1.y = 46; - gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].data0 = 0; - gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].data0 = 0; + gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].data[0] = 0; + gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].data[0] = 0; gTasks[taskIdA].data[TDA_0] = sub_8148EC0(0, 0x2000, 0x20, 8); break; case 2: @@ -1154,8 +1154,8 @@ static void sub_8144A68(u8 data, u8 taskIdA) gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].pos1.x = 272; gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].pos1.y = 46; gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].pos1.y = 46; - gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].data0 = 0; - gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].data0 = 0; + gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].data[0] = 0; + gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].data[0] = 0; gTasks[taskIdA].data[TDA_0] = sub_8148EC0(1, 0x2000, 0x200, 8); break; case 3: @@ -1165,8 +1165,8 @@ static void sub_8144A68(u8 data, u8 taskIdA) gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].pos1.x = -32; gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].pos1.y = 46; gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].pos1.y = 46; - gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].data0 = 0; - gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].data0 = 0; + gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].data[0] = 0; + gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].data[0] = 0; gTasks[taskIdA].data[TDA_0] = sub_8148EC0(1, 0x2000, 0x200, 8); break; case 4: @@ -1176,8 +1176,8 @@ static void sub_8144A68(u8 data, u8 taskIdA) gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].pos1.x = 152; gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].pos1.y = 46; gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].pos1.y = 46; - gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].data0 = 0; - gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].data0 = 0; + gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].data[0] = 0; + gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].data[0] = 0; gTasks[taskIdA].data[TDA_0] = sub_8148EC0(2, 0x2000, 0x200, 8); break; } @@ -1384,7 +1384,7 @@ static void spritecb_player_8145378(struct Sprite *sprite) return; } - switch (sprite->data0) + switch (sprite->data[0]) { case 0: StartSpriteAnimIfDifferent(sprite, 0); @@ -1421,7 +1421,7 @@ static void spritecb_rival_8145420(struct Sprite *sprite) return; } - switch (sprite->data0) + switch (sprite->data[0]) { case 0: sprite->pos2.y = 0; @@ -1437,9 +1437,9 @@ static void spritecb_rival_8145420(struct Sprite *sprite) sprite->pos2.y = -gUnknown_0203935A; break; case 2: - sprite->data7 += 1; + sprite->data[7] += 1; StartSpriteAnimIfDifferent(sprite, 0); - if ((sprite->data7 & 3) == 0) + if ((sprite->data[7] & 3) == 0) sprite->pos1.x += 1; break; case 3: @@ -1458,74 +1458,74 @@ void spritecb_81454E0(struct Sprite *sprite) return; } - sprite->data7 += 1; - switch (sprite->data0) + sprite->data[7] += 1; + switch (sprite->data[0]) { case 0: default: sprite->oam.affineMode = 1; - sprite->oam.matrixNum = sprite->data1; - sprite->data2 = 16; - SetOamMatrix(sprite->data1, 0x10000 / sprite->data2, 0, 0, 0x10000 / sprite->data2); + sprite->oam.matrixNum = sprite->data[1]; + sprite->data[2] = 16; + SetOamMatrix(sprite->data[1], 0x10000 / sprite->data[2], 0, 0, 0x10000 / sprite->data[2]); sprite->invisible = FALSE; - sprite->data0 = 1; + sprite->data[0] = 1; break; case 1: - if (sprite->data2 < 256) + if (sprite->data[2] < 256) { - sprite->data2 += 8; - SetOamMatrix(sprite->data1, 0x10000 / sprite->data2, 0, 0, 0x10000 / sprite->data2); + sprite->data[2] += 8; + SetOamMatrix(sprite->data[1], 0x10000 / sprite->data[2], 0, 0, 0x10000 / sprite->data[2]); } else { - sprite->data0 += 1; + sprite->data[0] += 1; } - switch (sprite->data1) + switch (sprite->data[1]) { case 1: - if ((sprite->data7 & 3) == 0) + if ((sprite->data[7] & 3) == 0) sprite->pos1.y += 1; sprite->pos1.x -= 2; break; case 2: break; case 3: - if ((sprite->data7 & 3) == 0) + if ((sprite->data[7] & 3) == 0) sprite->pos1.y += 1; sprite->pos1.x += 2; break; } break; case 2: - if (sprite->data3 != 0) + if (sprite->data[3] != 0) { - sprite->data3 -= 1; + sprite->data[3] -= 1; } else { REG_BLDCNT = 0xF40; REG_BLDALPHA = 0x10; sprite->oam.objMode = 1; - sprite->data3 = 16; - sprite->data0 += 1; + sprite->data[3] = 16; + sprite->data[0] += 1; } break; case 3: - if (sprite->data3 != 0) + if (sprite->data[3] != 0) { int data3; vu16 *reg; - sprite->data3 -= 1; + sprite->data[3] -= 1; reg = ®_BLDALPHA; - data3 = 16 - sprite->data3; - *reg = (data3 << 8) + sprite->data3; + data3 = 16 - sprite->data[3]; + *reg = (data3 << 8) + sprite->data[3]; } else { sprite->invisible = TRUE; - sprite->data0 = 10; + sprite->data[0] = 10; } break; case 10: @@ -1575,12 +1575,12 @@ static u8 sub_81456B4(u16 species, u16 x, u16 y, u16 position) spriteId = CreateSprite(&gUnknown_02024E8C, x, y, 0); gSprites[spriteId].oam.paletteNum = position; gSprites[spriteId].oam.priority = 1; - gSprites[spriteId].data1 = position + 1; + gSprites[spriteId].data[1] = position + 1; gSprites[spriteId].invisible = TRUE; gSprites[spriteId].callback = spritecb_81454E0; spriteId2 = CreateSprite(&gSpriteTemplate_840CAEC, gSprites[spriteId].pos1.x, gSprites[spriteId].pos1.y, 1); - gSprites[spriteId2].data0 = spriteId; + gSprites[spriteId2].data[0] = spriteId; StartSpriteAnimIfDifferent(&gSprites[spriteId2], position); @@ -1589,18 +1589,18 @@ static u8 sub_81456B4(u16 species, u16 x, u16 y, u16 position) void spritecb_814580C(struct Sprite *sprite) { - if (gSprites[sprite->data0].data0 == 10 || gUnknown_0203935C) + if (gSprites[sprite->data[0]].data[0] == 10 || gUnknown_0203935C) { DestroySprite(sprite); return; } - sprite->invisible = gSprites[sprite->data0].invisible; - sprite->oam.objMode = gSprites[sprite->data0].oam.objMode; - sprite->oam.affineMode = gSprites[sprite->data0].oam.affineMode; - sprite->oam.matrixNum = gSprites[sprite->data0].oam.matrixNum; - sprite->pos1.x = gSprites[sprite->data0].pos1.x; - sprite->pos1.y = gSprites[sprite->data0].pos1.y; + sprite->invisible = gSprites[sprite->data[0]].invisible; + sprite->oam.objMode = gSprites[sprite->data[0]].oam.objMode; + sprite->oam.affineMode = gSprites[sprite->data[0]].oam.affineMode; + sprite->oam.matrixNum = gSprites[sprite->data[0]].oam.matrixNum; + sprite->pos1.x = gSprites[sprite->data[0]].pos1.x; + sprite->pos1.y = gSprites[sprite->data[0]].pos1.y; } static void sub_81458DC(void) diff --git a/src/scene/egg_hatch.c b/src/scene/egg_hatch.c index 6ea26e546..49cced46a 100644 --- a/src/scene/egg_hatch.c +++ b/src/scene/egg_hatch.c @@ -669,16 +669,16 @@ static void CB2_EggHatch_1(void) static void SpriteCB_Egg_0(struct Sprite* sprite) { - if (++sprite->data0 > 20) + if (++sprite->data[0] > 20) { sprite->callback = SpriteCB_Egg_1; - sprite->data0 = 0; + sprite->data[0] = 0; } else { - sprite->data1 = (sprite->data1 + 20) & 0xFF; - sprite->pos2.x = Sin(sprite->data1, 1); - if (sprite->data0 == 15) + sprite->data[1] = (sprite->data[1] + 20) & 0xFF; + sprite->pos2.x = Sin(sprite->data[1], 1); + if (sprite->data[0] == 15) { PlaySE(SE_BOWA); StartSpriteAnim(sprite, 1); @@ -689,19 +689,19 @@ static void SpriteCB_Egg_0(struct Sprite* sprite) static void SpriteCB_Egg_1(struct Sprite* sprite) { - if (++sprite->data2 > 30) + if (++sprite->data[2] > 30) { - if (++sprite->data0 > 20) + if (++sprite->data[0] > 20) { sprite->callback = SpriteCB_Egg_2; - sprite->data0 = 0; - sprite->data2 = 0; + sprite->data[0] = 0; + sprite->data[2] = 0; } else { - sprite->data1 = (sprite->data1 + 20) & 0xFF; - sprite->pos2.x = Sin(sprite->data1, 2); - if (sprite->data0 == 15) + sprite->data[1] = (sprite->data[1] + 20) & 0xFF; + sprite->pos2.x = Sin(sprite->data[1], 2); + if (sprite->data[0] == 15) { PlaySE(SE_BOWA); StartSpriteAnim(sprite, 2); @@ -712,30 +712,30 @@ static void SpriteCB_Egg_1(struct Sprite* sprite) static void SpriteCB_Egg_2(struct Sprite* sprite) { - if (++sprite->data2 > 30) + if (++sprite->data[2] > 30) { - if (++sprite->data0 > 38) + if (++sprite->data[0] > 38) { u16 species; sprite->callback = SpriteCB_Egg_3; - sprite->data0 = 0; + sprite->data[0] = 0; species = GetMonData(&gPlayerParty[gEggHatchData->eggPartyID], MON_DATA_SPECIES); gSprites[gEggHatchData->pokeSpriteID].pos2.x = 0; gSprites[gEggHatchData->pokeSpriteID].pos2.y = gMonFrontPicCoords[species].y_offset; } else { - sprite->data1 = (sprite->data1 + 20) & 0xFF; - sprite->pos2.x = Sin(sprite->data1, 2); - if (sprite->data0 == 15) + sprite->data[1] = (sprite->data[1] + 20) & 0xFF; + sprite->pos2.x = Sin(sprite->data[1], 2); + if (sprite->data[0] == 15) { PlaySE(SE_BOWA); StartSpriteAnim(sprite, 2); CreateRandomEggShardSprite(); CreateRandomEggShardSprite(); } - if (sprite->data0 == 30) + if (sprite->data[0] == 30) PlaySE(SE_BOWA); } } @@ -743,60 +743,60 @@ static void SpriteCB_Egg_2(struct Sprite* sprite) static void SpriteCB_Egg_3(struct Sprite* sprite) { - if (++sprite->data0 > 50) + if (++sprite->data[0] > 50) { sprite->callback = SpriteCB_Egg_4; - sprite->data0 = 0; + sprite->data[0] = 0; } } static void SpriteCB_Egg_4(struct Sprite* sprite) { s16 i; - if (sprite->data0 == 0) + if (sprite->data[0] == 0) BeginNormalPaletteFade(-1, -1, 0, 0x10, 0xFFFF); - if (sprite->data0 < 4u) + if (sprite->data[0] < 4u) { for (i = 0; i <= 3; i++) CreateRandomEggShardSprite(); } - sprite->data0++; + sprite->data[0]++; if (!gPaletteFade.active) { PlaySE(SE_TAMAGO); sprite->invisible = 1; sprite->callback = SpriteCB_Egg_5; - sprite->data0 = 0; + sprite->data[0] = 0; } } static void SpriteCB_Egg_5(struct Sprite* sprite) { - if (sprite->data0 == 0) + if (sprite->data[0] == 0) { gSprites[gEggHatchData->pokeSpriteID].invisible = 0; StartSpriteAffineAnim(&gSprites[gEggHatchData->pokeSpriteID], 1); } - if (sprite->data0 == 8) + if (sprite->data[0] == 8) BeginNormalPaletteFade(-1, -1, 0x10, 0, 0xFFFF); - if (sprite->data0 <= 9) + if (sprite->data[0] <= 9) gSprites[gEggHatchData->pokeSpriteID].pos1.y -= 1; - if (sprite->data0 > 40) + if (sprite->data[0] > 40) sprite->callback = SpriteCallbackDummy; - sprite->data0++; + sprite->data[0]++; } static void SpriteCB_EggShard(struct Sprite* sprite) { - sprite->data4 += sprite->data1; - sprite->data5 += sprite->data2; + sprite->data[4] += sprite->data[1]; + sprite->data[5] += sprite->data[2]; - sprite->pos2.x = sprite->data4 / 256; - sprite->pos2.y = sprite->data5 / 256; + sprite->pos2.x = sprite->data[4] / 256; + sprite->pos2.y = sprite->data[5] / 256; - sprite->data2 += sprite->data3; + sprite->data[2] += sprite->data[3]; - if (sprite->pos1.y + sprite->pos2.y > sprite->pos1.y + 20 && sprite->data2 > 0) + if (sprite->pos1.y + sprite->pos2.y > sprite->pos1.y + 20 && sprite->data[2] > 0) DestroySprite(sprite); } @@ -840,9 +840,9 @@ static void CreateRandomEggShardSprite(void) static void CreateEggShardSprite(u8 x, u8 y, s16 data1, s16 data2, s16 data3, u8 spriteAnimIndex) { u8 spriteID = CreateSprite(&sSpriteTemplate_820A418, x, y, 4); - gSprites[spriteID].data1 = data1; - gSprites[spriteID].data2 = data2; - gSprites[spriteID].data3 = data3; + gSprites[spriteID].data[1] = data1; + gSprites[spriteID].data[2] = data2; + gSprites[spriteID].data[3] = data3; StartSpriteAnim(&gSprites[spriteID], spriteAnimIndex); } diff --git a/src/scene/evolution_graphics.c b/src/scene/evolution_graphics.c index 1fd5bf8fa..66b506fb5 100644 --- a/src/scene/evolution_graphics.c +++ b/src/scene/evolution_graphics.c @@ -115,18 +115,18 @@ static void SpriteCB_PreEvoSparkleSet1(struct Sprite* sprite) { u8 matrixNum; - sprite->pos1.y = 88 - (sprite->data7 * sprite->data7) / 80; - sprite->pos2.y = Sin((u8)(sprite->data6), sprite->data5) / 4; - sprite->pos2.x = Cos((u8)(sprite->data6), sprite->data5); - sprite->data6 += 4; - if (sprite->data7 & 1) - sprite->data5--; - sprite->data7++; + sprite->pos1.y = 88 - (sprite->data[7] * sprite->data[7]) / 80; + sprite->pos2.y = Sin((u8)(sprite->data[6]), sprite->data[5]) / 4; + sprite->pos2.x = Cos((u8)(sprite->data[6]), sprite->data[5]); + sprite->data[6] += 4; + if (sprite->data[7] & 1) + sprite->data[5]--; + sprite->data[7]++; if (sprite->pos2.y > 0) sprite->subpriority = 1; else sprite->subpriority = 20; - matrixNum = sprite->data5 / 4 + 20; + matrixNum = sprite->data[5] / 4 + 20; if (matrixNum > 31) matrixNum = 31; sprite->oam.matrixNum = matrixNum; @@ -140,9 +140,9 @@ static void CreatePreEvoSparkleSet1(u8 arg0) u8 spriteID = CreateSprite(&sEvoSparkleSpriteTemplate, 120, 88, 0); if (spriteID != MAX_SPRITES) { - gSprites[spriteID].data5 = 48; - gSprites[spriteID].data6 = arg0; - gSprites[spriteID].data7 = 0; + gSprites[spriteID].data[5] = 48; + gSprites[spriteID].data[6] = arg0; + gSprites[spriteID].data[7] = 0; gSprites[spriteID].oam.affineMode = 1; gSprites[spriteID].oam.matrixNum = 31; gSprites[spriteID].callback = SpriteCB_PreEvoSparkleSet1; @@ -153,11 +153,11 @@ static void SpriteCB_PreEvoSparkleSet2(struct Sprite* sprite) { if (sprite->pos1.y < 88) { - sprite->pos1.y = 8 + (sprite->data7 * sprite->data7) / 5; - sprite->pos2.y = Sin((u8)(sprite->data6), sprite->data5) / 4; - sprite->pos2.x = Cos((u8)(sprite->data6), sprite->data5); - sprite->data5 = 8 + Sin((u8)(sprite->data7 * 4), 40); - sprite->data7++; + sprite->pos1.y = 8 + (sprite->data[7] * sprite->data[7]) / 5; + sprite->pos2.y = Sin((u8)(sprite->data[6]), sprite->data[5]) / 4; + sprite->pos2.x = Cos((u8)(sprite->data[6]), sprite->data[5]); + sprite->data[5] = 8 + Sin((u8)(sprite->data[7] * 4), 40); + sprite->data[7]++; } else DestroySprite(sprite); @@ -168,9 +168,9 @@ static void CreatePreEvoSparkleSet2(u8 arg0) u8 spriteID = CreateSprite(&sEvoSparkleSpriteTemplate, 120, 8, 0); if (spriteID != MAX_SPRITES) { - gSprites[spriteID].data5 = 8; - gSprites[spriteID].data6 = arg0; - gSprites[spriteID].data7 = 0; + gSprites[spriteID].data[5] = 8; + gSprites[spriteID].data[6] = arg0; + gSprites[spriteID].data[7] = 0; gSprites[spriteID].oam.affineMode = 1; gSprites[spriteID].oam.matrixNum = 25; gSprites[spriteID].subpriority = 1; @@ -180,12 +180,12 @@ static void CreatePreEvoSparkleSet2(u8 arg0) static void SpriteCB_PostEvoSparkleSet1(struct Sprite* sprite) { - if (sprite->data5 > 8) + if (sprite->data[5] > 8) { - sprite->pos2.y = Sin((u8)(sprite->data6), sprite->data5); - sprite->pos2.x = Cos((u8)(sprite->data6), sprite->data5); - sprite->data5 -= sprite->data3; - sprite->data6 += 4; + sprite->pos2.y = Sin((u8)(sprite->data[6]), sprite->data[5]); + sprite->pos2.x = Cos((u8)(sprite->data[6]), sprite->data[5]); + sprite->data[5] -= sprite->data[3]; + sprite->data[6] += 4; } else DestroySprite(sprite); @@ -196,10 +196,10 @@ static void CreatePostEvoSparkleSet1(u8 arg0, u8 arg1) u8 spriteID = CreateSprite(&sEvoSparkleSpriteTemplate, 120, 56, 0); if (spriteID != MAX_SPRITES) { - gSprites[spriteID].data3 = arg1; - gSprites[spriteID].data5 = 120; - gSprites[spriteID].data6 = arg0; - gSprites[spriteID].data7 = 0; + gSprites[spriteID].data[3] = arg1; + gSprites[spriteID].data[5] = 120; + gSprites[spriteID].data[6] = arg0; + gSprites[spriteID].data[7] = 0; gSprites[spriteID].oam.affineMode = 1; gSprites[spriteID].oam.matrixNum = 31; gSprites[spriteID].subpriority = 1; @@ -209,29 +209,29 @@ static void CreatePostEvoSparkleSet1(u8 arg0, u8 arg1) static void SpriteCB_PostEvoSparkleSet2(struct Sprite* sprite) { - if (!(sprite->data7 & 3)) + if (!(sprite->data[7] & 3)) sprite->pos1.y++; - if (sprite->data6 < 128) + if (sprite->data[6] < 128) { u8 matrixNum; - sprite->pos2.y = -Sin((u8)(sprite->data6), sprite->data5); - sprite->pos1.x = 120 + (sprite->data3 * sprite->data7) / 3; - sprite->data6++; - matrixNum = 31 - (sprite->data6 * 12 / 128); - if (sprite->data6 > 64) + sprite->pos2.y = -Sin((u8)(sprite->data[6]), sprite->data[5]); + sprite->pos1.x = 120 + (sprite->data[3] * sprite->data[7]) / 3; + sprite->data[6]++; + matrixNum = 31 - (sprite->data[6] * 12 / 128); + if (sprite->data[6] > 64) sprite->subpriority = 1; else { sprite->invisible = 0; sprite->subpriority = 20; - if (sprite->data6 > 112 && sprite->data6 & 1) + if (sprite->data[6] > 112 && sprite->data[6] & 1) sprite->invisible = 1; } if (matrixNum < 20) matrixNum = 20; sprite->oam.matrixNum = matrixNum; - sprite->data7++; + sprite->data[7]++; } else DestroySprite(sprite); @@ -242,9 +242,9 @@ static void CreatePostEvoSparkleSet2(u8 arg0) u8 spriteID = CreateSprite(&sEvoSparkleSpriteTemplate, 120, 56, 0); if (spriteID != MAX_SPRITES) { - gSprites[spriteID].data3 = 3 - (Random() % 7); - gSprites[spriteID].data5 = 48 + (Random() & 0x3F); - gSprites[spriteID].data7 = 0; + gSprites[spriteID].data[3] = 3 - (Random() % 7); + gSprites[spriteID].data[5] = 48 + (Random() & 0x3F); + gSprites[spriteID].data[7] = 0; gSprites[spriteID].oam.affineMode = 1; gSprites[spriteID].oam.matrixNum = 31; gSprites[spriteID].subpriority = 20; diff --git a/src/scene/evolution_scene.c b/src/scene/evolution_scene.c index 4b73ab5b2..1bbb8d485 100644 --- a/src/scene/evolution_scene.c +++ b/src/scene/evolution_scene.c @@ -131,7 +131,7 @@ static void CB2_BeginEvolutionScene(void) #define tLearnsFirstMove data[6] #define tLearnMoveState data[8] #define tData9 data[9] -#define tData10 data[10] +#define tdata10 data[10] #define tEvoWasStopped data[11] #define tPartyID data[12] @@ -763,7 +763,7 @@ static void Task_EvolutionScene(u8 taskID) StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[6]); sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15); gTasks[taskID].tData9 = 5; - gTasks[taskID].tData10 = 9; + gTasks[taskID].tdata10 = 9; gTasks[taskID].tLearnMoveState++; } case 3: @@ -797,7 +797,7 @@ static void Task_EvolutionScene(u8 taskID) sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15); PlaySE(SE_SELECT); if (sEvoCursorPos != 0) - gTasks[taskID].tLearnMoveState = gTasks[taskID].tData10; + gTasks[taskID].tLearnMoveState = gTasks[taskID].tdata10; else { gTasks[taskID].tLearnMoveState = gTasks[taskID].tData9; @@ -811,7 +811,7 @@ static void Task_EvolutionScene(u8 taskID) StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[292]); sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15); PlaySE(SE_SELECT); - gTasks[taskID].tLearnMoveState = gTasks[taskID].tData10; + gTasks[taskID].tLearnMoveState = gTasks[taskID].tdata10; } break; case 5: @@ -874,7 +874,7 @@ static void Task_EvolutionScene(u8 taskID) StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[8]); sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15); gTasks[taskID].tData9 = 10; - gTasks[taskID].tData10 = 0; + gTasks[taskID].tdata10 = 0; gTasks[taskID].tLearnMoveState = 3; break; case 10: @@ -1077,7 +1077,7 @@ static void Task_TradeEvolutionScene(u8 taskID) StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[6]); sub_8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15); gTasks[taskID].tData9 = 5; - gTasks[taskID].tData10 = 9; + gTasks[taskID].tdata10 = 9; gTasks[taskID].tLearnMoveState++; } case 3: @@ -1116,7 +1116,7 @@ static void Task_TradeEvolutionScene(u8 taskID) sub_8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15); PlaySE(SE_SELECT); if (sEvoCursorPos != 0) - gTasks[taskID].tLearnMoveState = gTasks[taskID].tData10; + gTasks[taskID].tLearnMoveState = gTasks[taskID].tdata10; else { gTasks[taskID].tLearnMoveState = gTasks[taskID].tData9; @@ -1131,7 +1131,7 @@ static void Task_TradeEvolutionScene(u8 taskID) StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[292]); sub_8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15); PlaySE(SE_SELECT); - gTasks[taskID].tLearnMoveState = gTasks[taskID].tData10; + gTasks[taskID].tLearnMoveState = gTasks[taskID].tdata10; } break; case 5: @@ -1194,7 +1194,7 @@ static void Task_TradeEvolutionScene(u8 taskID) StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[8]); sub_8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15); gTasks[taskID].tData9 = 10; - gTasks[taskID].tData10 = 0; + gTasks[taskID].tdata10 = 0; gTasks[taskID].tLearnMoveState = 3; break; case 10: diff --git a/src/scene/hall_of_fame.c b/src/scene/hall_of_fame.c index 72bd051da..a1de26c32 100644 --- a/src/scene/hall_of_fame.c +++ b/src/scene/hall_of_fame.c @@ -612,9 +612,9 @@ static void sub_8142320(u8 taskID) } spriteID = HallOfFame_LoadPokemonPic(currMon->species, xPos, yPos, currPokeID, currMon->tid, currMon->personality); - gSprites[spriteID].data1 = field4; - gSprites[spriteID].data2 = field6; - gSprites[spriteID].data0 = 0; + gSprites[spriteID].data[1] = field4; + gSprites[spriteID].data[2] = field6; + gSprites[spriteID].data[0] = 0; gSprites[spriteID].callback = sub_81435DC; gTasks[taskID].tMonSpriteID(currPokeID) = spriteID; MenuZeroFillWindowRect(0, 14, 29, 19); @@ -627,7 +627,7 @@ static void sub_8142404(u8 taskID) u16 currPokeID = gTasks[taskID].tDisplayedPoke; struct HallofFameMon* currMon = &fameMons->mons[currPokeID]; - if (gSprites[gTasks[taskID].tMonSpriteID(currPokeID)].data0 != 0) + if (gSprites[gTasks[taskID].tMonSpriteID(currPokeID)].data[0] != 0) { if (currMon->species != SPECIES_EGG) PlayCry1(currMon->species, 0); @@ -1299,22 +1299,22 @@ static void sub_81435B8(void) static void sub_81435DC(struct Sprite* sprite) { u32 spritePos = *(u32*)(&sprite->pos1); - u32 dataPos = *(u32*)(&sprite->data1); + u32 dataPos = *(u32*)(&sprite->data[1]); if (spritePos != dataPos) { - if (sprite->pos1.x < sprite->data1) + if (sprite->pos1.x < sprite->data[1]) sprite->pos1.x += 15; - if (sprite->pos1.x > sprite->data1) + if (sprite->pos1.x > sprite->data[1]) sprite->pos1.x -= 15; - if (sprite->pos1.y < sprite->data2) + if (sprite->pos1.y < sprite->data[2]) sprite->pos1.y += 10; - if (sprite->pos1.y > sprite->data2) + if (sprite->pos1.y > sprite->data[2]) sprite->pos1.y -= 10; } else { - sprite->data0 = 1; + sprite->data[0] = 1; sprite->callback = SpriteCB_HallOfFame_Dummy; } } @@ -1381,13 +1381,13 @@ static void sub_814386C(struct Sprite* sprite) u8 tableID; sprite->pos2.y++; - sprite->pos2.y += sprite->data1; + sprite->pos2.y += sprite->data[1]; - tableID = sprite->data0; + tableID = sprite->data[0]; rand = (Random() % 4) + 8; sprite->pos2.x = rand * gSineTable[tableID] / 256; - sprite->data0 += 4; + sprite->data[0] += 4; } } @@ -1405,9 +1405,9 @@ static bool8 sub_81438C4(void) StartSpriteAnim(sprite, Random() % 17); if (Random() & 3) - sprite->data1 = 0; + sprite->data[1] = 0; else - sprite->data1 = 1; + sprite->data[1] = 1; return 0; } diff --git a/src/scene/intro.c b/src/scene/intro.c index 03a573c90..b52fbb3a9 100644 --- a/src/scene/intro.c +++ b/src/scene/intro.c @@ -995,11 +995,11 @@ static void Task_IntroWaterDrops(u8 taskId) { //start moving rock if (gIntroFrameCounter == 76) - gSprites[gTasks[taskId].data[0]].data0 = 1; + gSprites[gTasks[taskId].data[0]].data[0] = 1; //drop rock if (gIntroFrameCounter == 251) - gSprites[gTasks[taskId].data[0]].data0 = 2; + gSprites[gTasks[taskId].data[0]].data[0] = 2; if (gIntroFrameCounter == 368) CreateWaterDrop(48, 0, 0x400, 5, 0x70, TRUE); @@ -1134,17 +1134,17 @@ static void Task_IntroHandleBikeAndEonMovement(u8 taskId) gTasks[taskId].func = Task_IntroWaitToSetupPart3; } if (gIntroFrameCounter == 1109) - gSprites[gTasks[taskId].data[1]].data0 = 1; + gSprites[gTasks[taskId].data[1]].data[0] = 1; if (gIntroFrameCounter == 1214) - gSprites[gTasks[taskId].data[1]].data0 = 0; + gSprites[gTasks[taskId].data[1]].data[0] = 0; if (gIntroFrameCounter == 1394) - gSprites[gTasks[taskId].data[2]].data0 = 1; + gSprites[gTasks[taskId].data[2]].data[0] = 1; if (gIntroFrameCounter == 1398) - gSprites[gTasks[taskId].data[1]].data0 = 2; + gSprites[gTasks[taskId].data[1]].data[0] = 2; if (gIntroFrameCounter == 1586) - gSprites[gTasks[taskId].data[1]].data0 = 3; + gSprites[gTasks[taskId].data[1]].data[0] = 3; if (gIntroFrameCounter == 1727) - gSprites[gTasks[taskId].data[1]].data0 = 4; + gSprites[gTasks[taskId].data[1]].data[0] = 4; //TODO: Clean this up a = (((u16)gTasks[taskId].data[3] << 16) >> 18) & 0x7F; @@ -1314,15 +1314,15 @@ static void Task_IntroPokemonBattle(u8 taskId) { spriteId = sub_813CE88(SPECIES_SHARPEDO, 0xF0, 0xA0, 5, 1); gSprites[spriteId].callback = sub_813DB9C; - gSprites[spriteId].data1 = 1; - gSprites[spriteId].data2 = 0; + gSprites[spriteId].data[1] = 1; + gSprites[spriteId].data[2] = 0; } if (gIntroFrameCounter == 152) { spriteId = sub_813CE88(SPECIES_DUSKULL, 0, 0xA0, 4, 1); gSprites[spriteId].callback = sub_813DB9C; - gSprites[spriteId].data1 = 2; - gSprites[spriteId].data2 = 1; + gSprites[spriteId].data[1] = 2; + gSprites[spriteId].data[2] = 1; } if (gIntroFrameCounter == 219) { @@ -1334,12 +1334,12 @@ static void Task_IntroPokemonBattle(u8 taskId) if (gIntroFrameCounter == 304) { gTasks[gTasks[taskId].data[15]].data[0] = 4; - gSprites[gTasks[taskId].data[1]].data0 = 2; + gSprites[gTasks[taskId].data[1]].data[0] = 2; } if (gIntroFrameCounter == 384) { gTasks[gTasks[taskId].data[15]].data[0] = 0; - gSprites[gTasks[taskId].data[1]].data0 = 4; + gSprites[gTasks[taskId].data[1]].data[0] = 4; } if (gIntroFrameCounter == 400) { @@ -1347,11 +1347,11 @@ static void Task_IntroPokemonBattle(u8 taskId) } if (gIntroFrameCounter == 432) { - gSprites[gTasks[taskId].data[1]].data0 = 5; + gSprites[gTasks[taskId].data[1]].data[0] = 5; } if (gIntroFrameCounter == 462) { - gSprites[gTasks[taskId].data[1]].data0 = 6; + gSprites[gTasks[taskId].data[1]].data[0] = 6; gTasks[gTasks[taskId].data[15]].data[0] = 2; } if (gIntroFrameCounter == 463) @@ -1371,8 +1371,8 @@ static void Task_IntroPokemonBattle(u8 taskId) } if (gIntroFrameCounter == 623) { - gSprites[gTasks[taskId].data[2]].data0 = 2; - gSprites[gTasks[taskId].data[3]].data0 = 2; + gSprites[gTasks[taskId].data[2]].data[0] = 2; + gSprites[gTasks[taskId].data[3]].data[0] = 2; gTasks[gTasks[taskId].data[15]].data[0] = 3; } if (gIntroFrameCounter == 624) @@ -1393,17 +1393,17 @@ static void Task_IntroPokemonBattle(u8 taskId) if (gIntroFrameCounter == 776) { gUnknown_0203931A = 1; - gSprites[gTasks[taskId].data[4]].data0 = 2; - gSprites[gTasks[taskId].data[5]].data0 = 2; + gSprites[gTasks[taskId].data[4]].data[0] = 2; + gSprites[gTasks[taskId].data[5]].data[0] = 2; gTasks[gTasks[taskId].data[15]].data[0] = 0; } if (gIntroFrameCounter == 781) { sub_813D084(2); - gSprites[gTasks[taskId].data[2]].data0 = 3; - gSprites[gTasks[taskId].data[3]].data0 = 3; - gSprites[gTasks[taskId].data[4]].data0 = 3; - gSprites[gTasks[taskId].data[5]].data0 = 3; + gSprites[gTasks[taskId].data[2]].data[0] = 3; + gSprites[gTasks[taskId].data[3]].data[0] = 3; + gSprites[gTasks[taskId].data[4]].data[0] = 3; + gSprites[gTasks[taskId].data[5]].data[0] = 3; spriteId = CreateSprite(&gSpriteTemplate_840B1F4, 0x78, 0x50, 15); gSprites[spriteId].invisible = 1; } @@ -1838,18 +1838,18 @@ static void sub_813D0CC(struct Sprite *sprite) { u8 r0; - if (sprite->data2 >= 192) + if (sprite->data[2] >= 192) { - if (sprite->data3 != 0) + if (sprite->data[3] != 0) { - sprite->data3--; + sprite->data[3]--; } else { sprite->invisible = FALSE; - SetOamMatrix(sprite->data1, sprite->data2, 0, 0, sprite->data2); - sprite->data2 = (sprite->data2 * 95) / 100; - r0 = (sprite->data2 - 192) / 128 + 9; + SetOamMatrix(sprite->data[1], sprite->data[2], 0, 0, sprite->data[2]); + sprite->data[2] = (sprite->data[2] * 95) / 100; + r0 = (sprite->data[2] - 192) / 128 + 9; if (r0 > 15) r0 = 15; sprite->oam.paletteNum = r0; @@ -1863,14 +1863,14 @@ static void sub_813D0CC(struct Sprite *sprite) static void sub_813D158(struct Sprite *sprite) { - if (gSprites[sprite->data7].data7 != 0) + if (gSprites[sprite->data[7]].data[7] != 0) { sprite->invisible = TRUE; sprite->pos1.x += sprite->pos2.x; sprite->pos1.y += sprite->pos2.y; StartSpriteAnim(sprite, 3); - sprite->data2 = 1024; - sprite->data3 = 8 * (sprite->data1 & 3); + sprite->data[2] = 1024; + sprite->data[3] = 8 * (sprite->data[1] & 3); sprite->callback = sub_813D0CC; sprite->oam.shape = 1; sprite->oam.size = 3; @@ -1878,16 +1878,16 @@ static void sub_813D158(struct Sprite *sprite) } else { - sprite->pos2.x = gSprites[sprite->data7].pos2.x; - sprite->pos2.y = gSprites[sprite->data7].pos2.y; - sprite->pos1.x = gSprites[sprite->data7].pos1.x; - sprite->pos1.y = gSprites[sprite->data7].pos1.y; + sprite->pos2.x = gSprites[sprite->data[7]].pos2.x; + sprite->pos2.y = gSprites[sprite->data[7]].pos2.y; + sprite->pos1.x = gSprites[sprite->data[7]].pos1.x; + sprite->pos1.y = gSprites[sprite->data[7]].pos1.y; } } static void sub_813D208(struct Sprite *sprite) { - if (sprite->data0 != 0) + if (sprite->data[0] != 0) sprite->callback = sub_813D220; } @@ -1899,7 +1899,7 @@ static void sub_813D220(struct Sprite *sprite) sprite->pos2.y = 0; sprite->pos1.x += 4; sprite->pos2.x = -4; - sprite->data4 = 128; + sprite->data[4] = 128; sprite->callback = sub_813D368; } else @@ -1917,58 +1917,58 @@ static void sub_813D220(struct Sprite *sprite) s16 var4; s16 temp; - data4 = sprite->data4; + data4 = sprite->data[4]; sin1 = gSineTable[(u8)data4]; sin2 = gSineTable[(u8)(data4 + 64)]; - sprite->data4 += 2; + sprite->data[4] += 2; sprite->pos2.y = sin1 / 32; sprite->pos1.x--; if (sprite->pos1.x & 1) sprite->pos1.y++; temp = -sin2 / 16; - data2 = sprite->data2; - data3 = sprite->data3; + data2 = sprite->data[2]; + data3 = sprite->data[3]; sin3 = gSineTable[(u8)(temp - 16)]; sin4 = gSineTable[(u8)(temp + 48)]; var1 = sin4 * data2 / 256; var2 = -sin3 * data3 / 256; var3 = sin3 * data2 / 256; var4 = sin4 * data3 / 256; - SetOamMatrix(sprite->data1, data2, 0, 0, data3); - SetOamMatrix(sprite->data1 + 1, var1, var3, var2, var4); - SetOamMatrix(sprite->data1 + 2, var1, var3, var2 * 2, var4 * 2); + SetOamMatrix(sprite->data[1], data2, 0, 0, data3); + SetOamMatrix(sprite->data[1] + 1, var1, var3, var2, var4); + SetOamMatrix(sprite->data[1] + 2, var1, var3, var2 * 2, var4 * 2); } } static void sub_813D368(struct Sprite *sprite) { - SetOamMatrix(sprite->data1, sprite->data6 + 64, 0, 0, sprite->data6 + 64); - SetOamMatrix(sprite->data1 + 1, sprite->data6 + 64, 0, 0, sprite->data6 + 64); - SetOamMatrix(sprite->data1 + 2, sprite->data6 + 64, 0, 0, sprite->data6 + 64); - if (sprite->data4 != 64) + SetOamMatrix(sprite->data[1], sprite->data[6] + 64, 0, 0, sprite->data[6] + 64); + SetOamMatrix(sprite->data[1] + 1, sprite->data[6] + 64, 0, 0, sprite->data[6] + 64); + SetOamMatrix(sprite->data[1] + 2, sprite->data[6] + 64, 0, 0, sprite->data[6] + 64); + if (sprite->data[4] != 64) { u16 data4; - sprite->data4 -= 8; - data4 = sprite->data4; + sprite->data[4] -= 8; + data4 = sprite->data[4]; sprite->pos2.x = gSineTable[(u8)(data4 + 64)] / 64; sprite->pos2.y = gSineTable[(u8)data4] / 64; } else { - sprite->data4 = 0; + sprite->data[4] = 0; sprite->callback = sub_813D414; } } static void sub_813D414(struct Sprite *sprite) { - if (sprite->data0 != 2) + if (sprite->data[0] != 2) { s16 r2; - sprite->data4 += 8; - r2 = gSineTable[(u8)sprite->data4] / 16 + 64; + sprite->data[4] += 8; + r2 = gSineTable[(u8)sprite->data[4]] / 16 + 64; sprite->pos2.x = gSineTable[(u8)(r2 + 64)] / 64; sprite->pos2.y = gSineTable[(u8)r2] / 64; } @@ -1980,19 +1980,19 @@ static void sub_813D414(struct Sprite *sprite) static void SpriteCB_WaterDropFall(struct Sprite *sprite) { - if (sprite->pos1.y < sprite->data5) + if (sprite->pos1.y < sprite->data[5]) { sprite->pos1.y += 4; } else { - sprite->data7 = 1; + sprite->data[7] = 1; sprite->invisible = TRUE; sprite->pos1.x += sprite->pos2.x; sprite->pos1.y += sprite->pos2.y; StartSpriteAnim(sprite, 3); - sprite->data2 = 1024; - sprite->data3 = 8 * (sprite->data1 & 3); + sprite->data[2] = 1024; + sprite->data[3] = 8 * (sprite->data[1] & 3); sprite->callback = sub_813D0CC; sprite->oam.shape = 1; sprite->oam.size = 3; @@ -2003,19 +2003,19 @@ static void SpriteCB_WaterDropFall(struct Sprite *sprite) //Duplicate function static void SpriteCB_WaterDropFall_2(struct Sprite *sprite) { - if (sprite->pos1.y < sprite->data5) + if (sprite->pos1.y < sprite->data[5]) { sprite->pos1.y += 4; } else { - sprite->data7 = 1; + sprite->data[7] = 1; sprite->invisible = TRUE; sprite->pos1.x += sprite->pos2.x; sprite->pos1.y += sprite->pos2.y; StartSpriteAnim(sprite, 3); - sprite->data2 = 1024; - sprite->data3 = 8 * (sprite->data1 & 3); + sprite->data[2] = 1024; + sprite->data[3] = 8 * (sprite->data[1] & 3); sprite->callback = sub_813D0CC; sprite->oam.shape = 1; sprite->oam.size = 3; @@ -2029,13 +2029,13 @@ static u8 CreateWaterDrop(s16 x, s16 y, u16 c, u16 d, u16 e, u8 fallImmediately) u8 oldSpriteId; spriteId = CreateSprite(&gSpriteTemplate_840AE20, x, y, 0); - gSprites[spriteId].data0 = 0; - gSprites[spriteId].data7 = 0; - gSprites[spriteId].data1 = d; - gSprites[spriteId].data2 = c; - gSprites[spriteId].data3 = c; - gSprites[spriteId].data5 = e; - gSprites[spriteId].data6 = c; + gSprites[spriteId].data[0] = 0; + gSprites[spriteId].data[7] = 0; + gSprites[spriteId].data[1] = d; + gSprites[spriteId].data[2] = c; + gSprites[spriteId].data[3] = c; + gSprites[spriteId].data[5] = e; + gSprites[spriteId].data[6] = c; gSprites[spriteId].oam.affineMode = 3; gSprites[spriteId].oam.matrixNum = d; CalcCenterToCornerVec(&gSprites[spriteId], 0, 2, 2); @@ -2047,16 +2047,16 @@ static u8 CreateWaterDrop(s16 x, s16 y, u16 c, u16 d, u16 e, u8 fallImmediately) oldSpriteId = spriteId; spriteId = CreateSprite(&gSpriteTemplate_840AE20, x, y, 0); - gSprites[spriteId].data7 = oldSpriteId; - gSprites[spriteId].data1 = d + 1; + gSprites[spriteId].data[7] = oldSpriteId; + gSprites[spriteId].data[1] = d + 1; gSprites[spriteId].oam.affineMode = 3; gSprites[spriteId].oam.matrixNum = d + 1; CalcCenterToCornerVec(&gSprites[spriteId], 0, 2, 2); gSprites[spriteId].callback = sub_813D158; spriteId = CreateSprite(&gSpriteTemplate_840AE20, x, y, 0); - gSprites[spriteId].data7 = oldSpriteId; - gSprites[spriteId].data1 = d + 2; + gSprites[spriteId].data[7] = oldSpriteId; + gSprites[spriteId].data[1] = d + 2; StartSpriteAnim(&gSprites[spriteId], 1); gSprites[spriteId].oam.affineMode = 3; gSprites[spriteId].oam.matrixNum = d + 2; @@ -2072,7 +2072,7 @@ static u8 CreateWaterDrop(s16 x, s16 y, u16 c, u16 d, u16 e, u8 fallImmediately) static void sub_813D788(struct Sprite *sprite) { - switch (sprite->data0) + switch (sprite->data[0]) { case 0: StartSpriteAnimIfDifferent(sprite, 0); @@ -2124,7 +2124,7 @@ static void sub_813D788(struct Sprite *sprite) static void sub_813D880(struct Sprite *sprite) { - switch (sprite->data0) + switch (sprite->data[0]) { case 0: break; @@ -2132,30 +2132,30 @@ static void sub_813D880(struct Sprite *sprite) if (sprite->pos2.x + sprite->pos1.x < 304) sprite->pos2.x += 8; else - sprite->data0 = 2; + sprite->data[0] = 2; break; case 2: if (sprite->pos2.x + sprite->pos1.x > 120) sprite->pos2.x -= 1; else - sprite->data0 = 3; + sprite->data[0] = 3; break; case 3: if (sprite->pos2.x > 0) sprite->pos2.x -= 2; break; } - sprite->pos2.y = Sin((u8)sprite->data1, 8) - gUnknown_0203935A; - sprite->data1 += 4; + sprite->pos2.y = Sin((u8)sprite->data[1], 8) - gUnknown_0203935A; + sprite->data[1] += 4; } static void sub_813D908(struct Sprite *sprite) { - if (gTasks[sprite->data0].data[0] == 0) + if (gTasks[sprite->data[0]].data[0] == 0) { sprite->invisible = TRUE; } - else if (gTasks[sprite->data0].data[0] != 4) + else if (gTasks[sprite->data[0]].data[0] != 4) { sprite->invisible = FALSE; } @@ -2173,17 +2173,17 @@ static u8 CreateGameFreakLogo(s16 a, s16 b, u8 c) for (i = 0; i < 9; i++) { spriteId = CreateSprite(&gSpriteTemplate_840AF94, gUnknown_0840AF50[i][1] + a, b - 4, 0); - gSprites[spriteId].data0 = c; + gSprites[spriteId].data[0] = c; StartSpriteAnim(&gSprites[spriteId], gUnknown_0840AF50[i][0]); } for (i = 0; i < 8; i++) { spriteId = CreateSprite(&gSpriteTemplate_840AFAC, gUnknown_0840AF74[i][1] + a, b + 12, 0); - gSprites[spriteId].data0 = c; + gSprites[spriteId].data[0] = c; StartSpriteAnim(&gSprites[spriteId], gUnknown_0840AF74[i][0]); } spriteId = CreateSprite(&gSpriteTemplate_840AFC4, 120, b - 4, 0); - gSprites[spriteId].data0 = c; + gSprites[spriteId].data[0] = c; return spriteId; } @@ -2191,9 +2191,9 @@ static u8 CreateGameFreakLogo(s16 a, s16 b, u8 c) #ifdef NONMATCHING static void sub_813DA64(struct Sprite *sprite) { - sprite->data7++; + sprite->data[7]++; - switch (sprite->data0) + switch (sprite->data[0]) { case 0: default: @@ -2201,10 +2201,10 @@ static void sub_813DA64(struct Sprite *sprite) sprite->oam.matrixNum = 1; CalcCenterToCornerVec(sprite, 1, 3, 3); sprite->invisible = FALSE; - sprite->data0 = 1; - sprite->data1 = 128; - sprite->data2 = -24; - sprite->data3 = 0; + sprite->data[0] = 1; + sprite->data[1] = 128; + sprite->data[2] = -24; + sprite->data[3] = 0; break; case 1: { @@ -2216,33 +2216,33 @@ static void sub_813DA64(struct Sprite *sprite) s16 r2; //_0813DAC0 - if (sprite->data3 < 0x50) + if (sprite->data[3] < 0x50) { - sprite->pos2.y = -Sin((u8)sprite->data3, 0x78); - sprite->pos2.x = -Sin((u8)sprite->data3, 0x8C); - if (sprite->data3 > 64) + sprite->pos2.y = -Sin((u8)sprite->data[3], 0x78); + sprite->pos2.x = -Sin((u8)sprite->data[3], 0x8C); + if (sprite->data[3] > 64) sprite->oam.priority = 3; } //_0813DAF8 - r3 = gSineTable[(u8)sprite->data2]; - sin1 = gSineTable[(u8)(sprite->data2 + 64)]; - r6 = sin1 * sprite->data1 / 256; - foo = sin1 * sprite->data1 / 256; - r5 = -r3 * sprite->data1 / 256; - r2 = r3 * sprite->data1 / 256; + r3 = gSineTable[(u8)sprite->data[2]]; + sin1 = gSineTable[(u8)(sprite->data[2] + 64)]; + r6 = sin1 * sprite->data[1] / 256; + foo = sin1 * sprite->data[1] / 256; + r5 = -r3 * sprite->data[1] / 256; + r2 = r3 * sprite->data[1] / 256; SetOamMatrix(1, r6, r2, r5, foo); - if (sprite->data1 < 0x100) - sprite->data1 += 8; + if (sprite->data[1] < 0x100) + sprite->data[1] += 8; else - sprite->data1 += 32; - if (sprite->data2 < 0x18) - sprite->data2 += 1; - if (sprite->data3 < 64) - sprite->data3 += 2; - else if (!(sprite->data7 & 3)) - sprite->data3 += 1; + sprite->data[1] += 32; + if (sprite->data[2] < 0x18) + sprite->data[2] += 1; + if (sprite->data[3] < 64) + sprite->data[3] += 2; + else if (!(sprite->data[7] & 3)) + sprite->data[3] += 1; break; } } @@ -2423,72 +2423,72 @@ _0813DB94:\n\ static void sub_813DB9C(struct Sprite *sprite) { - switch (sprite->data0) + switch (sprite->data[0]) { case 0: default: - if (sprite->data2 != 0) + if (sprite->data[2] != 0) sprite->hFlip = TRUE; else sprite->hFlip = FALSE; - sprite->data0 = 1; + sprite->data[0] = 1; //fall through case 1: if (sprite->pos1.y > 96) { sprite->pos1.y -= 4; - if (sprite->data2 != 0) + if (sprite->data[2] != 0) sprite->pos1.x += 2; else sprite->pos1.x -= 2; } else { - sprite->data0++; - sprite->data3 = 8; + sprite->data[0]++; + sprite->data[3] = 8; } break; case 2: - if (sprite->data3 != 0) + if (sprite->data[3] != 0) { - sprite->data3--; + sprite->data[3]--; } else { - sprite->data0++; - sprite->data3 = 0; //redundant? + sprite->data[0]++; + sprite->data[3] = 0; //redundant? } break; case 3: sprite->oam.affineMode = 3; - sprite->oam.matrixNum = sprite->data1; + sprite->oam.matrixNum = sprite->data[1]; CalcCenterToCornerVec(sprite, 0, 3, 3); - if (sprite->data2 != 0) - SetOamMatrix(sprite->data1, -256, 0, 0, 256); + if (sprite->data[2] != 0) + SetOamMatrix(sprite->data[1], -256, 0, 0, 256); else - SetOamMatrix(sprite->data1, 256, 0, 0, 256); - sprite->data0++; - sprite->data4 = 0; + SetOamMatrix(sprite->data[1], 256, 0, 0, 256); + sprite->data[0]++; + sprite->data[4] = 0; break; case 4: - sprite->data4++; + sprite->data[4]++; if (sprite->pos1.y + sprite->pos2.y > -32 && sprite->pos1.x + sprite->pos2.x > -64) { u16 r2; - sprite->pos2.y = -(sprite->data4 * sprite->data4) / 8; - if (sprite->data2 != 0) - sprite->pos2.x += sprite->data4; + sprite->pos2.y = -(sprite->data[4] * sprite->data[4]) / 8; + if (sprite->data[2] != 0) + sprite->pos2.x += sprite->data[4]; else - sprite->pos2.x -= sprite->data4; - if (sprite->data3 < 128) - sprite->data3 += 8; - r2 = 256 - sprite->data3; - if (sprite->data2 != 0) - SetOamMatrix(sprite->data1, -r2, 0, 0, r2); + sprite->pos2.x -= sprite->data[4]; + if (sprite->data[3] < 128) + sprite->data[3] += 8; + r2 = 256 - sprite->data[3]; + if (sprite->data[2] != 0) + SetOamMatrix(sprite->data[1], -r2, 0, 0, r2); else - SetOamMatrix(sprite->data1, r2, 0, 0, r2); + SetOamMatrix(sprite->data[1], r2, 0, 0, r2); } else { @@ -2499,50 +2499,50 @@ static void sub_813DB9C(struct Sprite *sprite) static void sub_813DD58(struct Sprite *sprite) { - switch (sprite->data0) + switch (sprite->data[0]) { case 0: default: sprite->invisible = FALSE; sprite->oam.affineMode = 1; - sprite->oam.matrixNum = sprite->data1; - sprite->data3 = 2048; - sprite->data0 = 1; + sprite->oam.matrixNum = sprite->data[1]; + sprite->data[3] = 2048; + sprite->data[0] = 1; //fall through case 1: - if (sprite->data3 > 256) + if (sprite->data[3] > 256) { - sprite->data3 -= 128; - if (sprite->data2 != 0) - SetOamMatrix(sprite->data1, -sprite->data3, 0, 0, sprite->data3); + sprite->data[3] -= 128; + if (sprite->data[2] != 0) + SetOamMatrix(sprite->data[1], -sprite->data[3], 0, 0, sprite->data[3]); else - SetOamMatrix(sprite->data1, sprite->data3, 0, 0, sprite->data3); + SetOamMatrix(sprite->data[1], sprite->data[3], 0, 0, sprite->data[3]); } else { - if (sprite->data2 != 0) - SetOamMatrix(sprite->data1, -256, 0, 0, 256); + if (sprite->data[2] != 0) + SetOamMatrix(sprite->data[1], -256, 0, 0, 256); else - SetOamMatrix(sprite->data1, 256, 0, 0, 256); - sprite->data0++; + SetOamMatrix(sprite->data[1], 256, 0, 0, 256); + sprite->data[0]++; } break; case 2: break; case 3: - sprite->data4++; - sprite->pos2.y = sprite->data4 * sprite->data4 / 32; - if (sprite->data2 != 0) - sprite->pos2.x = sprite->data4 / 4; + sprite->data[4]++; + sprite->pos2.y = sprite->data[4] * sprite->data[4] / 32; + if (sprite->data[2] != 0) + sprite->pos2.x = sprite->data[4] / 4; else - sprite->pos2.x = -(sprite->data4 / 4); + sprite->pos2.x = -(sprite->data[4] / 4); break; } } static void sub_813DE70(struct Sprite *sprite) { - switch (sprite->data0) + switch (sprite->data[0]) { case 0: default: @@ -2553,24 +2553,24 @@ static void sub_813DE70(struct Sprite *sprite) else { StartSpriteAnim(sprite, 1); - sprite->data6 = CreateSprite(&gSpriteTemplate_840B084, 16, 104, 100); - sprite->data7 = CreateSprite(&gSpriteTemplate_840B084, 12, 106, 101); - sprite->data0 = 1; + sprite->data[6] = CreateSprite(&gSpriteTemplate_840B084, 16, 104, 100); + sprite->data[7] = CreateSprite(&gSpriteTemplate_840B084, 12, 106, 101); + sprite->data[0] = 1; } break; case 1: break; case 2: StartSpriteAnim(sprite, 2); - gSprites[sprite->data6].data0 = 1; - gSprites[sprite->data7].data0 = 2; - sprite->data0++; + gSprites[sprite->data[6]].data[0] = 1; + gSprites[sprite->data[7]].data[0] = 2; + sprite->data[0]++; break; case 3: if (sprite->pos1.y > 160) { sprite->invisible = 1; - sprite->data0 = 1; + sprite->data[0] = 1; } else { @@ -2582,37 +2582,37 @@ static void sub_813DE70(struct Sprite *sprite) { s16 r4, r5; - r5 = gSprites[sprite->data6].pos1.x + gSprites[sprite->data6].pos2.x; - r4 = gSprites[sprite->data6].pos1.y + gSprites[sprite->data6].pos2.y; - DestroySprite(&gSprites[sprite->data6]); - sprite->data6 = sub_813CE88(SPECIES_TORCHIC, r5, r4, 2, 1); - gSprites[sprite->data6].callback = sub_813DD58; - gSprites[sprite->data6].invisible = TRUE; - gSprites[sprite->data6].data1 = 1; - gSprites[sprite->data6].data2 = 1; + r5 = gSprites[sprite->data[6]].pos1.x + gSprites[sprite->data[6]].pos2.x; + r4 = gSprites[sprite->data[6]].pos1.y + gSprites[sprite->data[6]].pos2.y; + DestroySprite(&gSprites[sprite->data[6]]); + sprite->data[6] = sub_813CE88(SPECIES_TORCHIC, r5, r4, 2, 1); + gSprites[sprite->data[6]].callback = sub_813DD58; + gSprites[sprite->data[6]].invisible = TRUE; + gSprites[sprite->data[6]].data[1] = 1; + gSprites[sprite->data[6]].data[2] = 1; sub_813E580(r5, r4); - r5 = gSprites[sprite->data7].pos1.x + gSprites[sprite->data7].pos2.x; - r4 = gSprites[sprite->data7].pos1.y + gSprites[sprite->data7].pos2.y; - DestroySprite(&gSprites[sprite->data7]); - sprite->data7 = sub_813CE88(SPECIES_MUDKIP, r5, r4, 3, 1); - gSprites[sprite->data7].callback = sub_813DD58; - gSprites[sprite->data7].invisible = TRUE; - gSprites[sprite->data7].data1 = 2; - gSprites[sprite->data7].data2 = 0; + r5 = gSprites[sprite->data[7]].pos1.x + gSprites[sprite->data[7]].pos2.x; + r4 = gSprites[sprite->data[7]].pos1.y + gSprites[sprite->data[7]].pos2.y; + DestroySprite(&gSprites[sprite->data[7]]); + sprite->data[7] = sub_813CE88(SPECIES_MUDKIP, r5, r4, 3, 1); + gSprites[sprite->data[7]].callback = sub_813DD58; + gSprites[sprite->data[7]].invisible = TRUE; + gSprites[sprite->data[7]].data[1] = 2; + gSprites[sprite->data[7]].data[2] = 0; sub_813E580(r5, r4); BeginNormalPaletteFade(0xFF0000, 0, 16, 16, RGB(31, 23, 31)); - sprite->data0 = 1; + sprite->data[0] = 1; break; } case 5: - gSprites[sprite->data6].data0 = 3; - gSprites[sprite->data7].data0 = 3; + gSprites[sprite->data[6]].data[0] = 3; + gSprites[sprite->data[7]].data[0] = 3; break; case 6: - DestroySprite(&gSprites[sprite->data6]); - DestroySprite(&gSprites[sprite->data7]); + DestroySprite(&gSprites[sprite->data[6]]); + DestroySprite(&gSprites[sprite->data[7]]); DestroySprite(sprite); break; } @@ -2620,7 +2620,7 @@ static void sub_813DE70(struct Sprite *sprite) static void sub_813E10C(struct Sprite *sprite) { - switch (sprite->data0) + switch (sprite->data[0]) { case 0: default: @@ -2631,20 +2631,20 @@ static void sub_813E10C(struct Sprite *sprite) } else { - sprite->data6 = sprite->pos1.x; - sprite->data7 = sprite->pos1.y; + sprite->data[6] = sprite->pos1.x; + sprite->data[7] = sprite->pos1.y; sprite->pos1.x += sprite->pos2.x; sprite->pos1.y += sprite->pos2.y; sprite->pos2.x = 0; sprite->pos2.y = 0; - sprite->data0 = 1; - sprite->data1 = 0; + sprite->data[0] = 1; + sprite->data[1] = 0; } break; case 1: - if (!(sprite->data1 & 1)) + if (!(sprite->data[1] & 1)) { - if (sprite->data1 & 2) + if (sprite->data[1] & 2) { sprite->pos2.x = -1; sprite->pos2.y = 1; @@ -2655,18 +2655,18 @@ static void sub_813E10C(struct Sprite *sprite) sprite->pos2.y = 0; } } - sprite->data1++; + sprite->data[1]++; break; case 2: sprite->invisible = TRUE; - sprite->pos1.x = sprite->data6; - sprite->pos1.y = sprite->data7; + sprite->pos1.x = sprite->data[6]; + sprite->pos1.y = sprite->data[7]; sprite->pos2.x = 0; sprite->pos2.y = 0; break; case 3: sprite->invisible = FALSE; - sprite->data1++; + sprite->data[1]++; //fall through case 4: if (sprite->pos2.x > -56) @@ -2680,7 +2680,7 @@ static void sub_813E10C(struct Sprite *sprite) sprite->pos1.y += sprite->pos2.y; sprite->pos2.x = 0; sprite->pos2.y = 0; - sprite->data0 = 1; + sprite->data[0] = 1; } break; } @@ -2688,7 +2688,7 @@ static void sub_813E10C(struct Sprite *sprite) static void sub_813E210(struct Sprite *sprite) { - switch (sprite->data0) + switch (sprite->data[0]) { case 0: default: @@ -2699,20 +2699,20 @@ static void sub_813E210(struct Sprite *sprite) } else { - sprite->data6 = sprite->pos1.x; - sprite->data7 = sprite->pos1.y; + sprite->data[6] = sprite->pos1.x; + sprite->data[7] = sprite->pos1.y; sprite->pos1.x += sprite->pos2.x; sprite->pos1.y += sprite->pos2.y; sprite->pos2.x = 0; sprite->pos2.y = 0; - sprite->data0 = 1; - sprite->data1 = 0; + sprite->data[0] = 1; + sprite->data[1] = 0; } break; case 1: - if (!(sprite->data1 & 1)) + if (!(sprite->data[1] & 1)) { - if (sprite->data1 & 2) + if (sprite->data[1] & 2) { sprite->pos2.x = 1; sprite->pos2.y = -1; @@ -2723,18 +2723,18 @@ static void sub_813E210(struct Sprite *sprite) sprite->pos2.y = 0; } } - sprite->data1++; + sprite->data[1]++; break; case 2: sprite->invisible = TRUE; - sprite->pos1.x = sprite->data6; - sprite->pos1.y = sprite->data7; + sprite->pos1.x = sprite->data[6]; + sprite->pos1.y = sprite->data[7]; sprite->pos2.x = 0; sprite->pos2.y = 0; break; case 3: sprite->invisible = FALSE; - sprite->data1++; + sprite->data[1]++; //fall through case 4: if (sprite->pos2.x < 56) @@ -2748,7 +2748,7 @@ static void sub_813E210(struct Sprite *sprite) sprite->pos1.y += sprite->pos2.y; sprite->pos2.x = 0; sprite->pos2.y = 0; - sprite->data0 = 1; + sprite->data[0] = 1; } break; } @@ -2758,8 +2758,8 @@ static void sub_813E30C(struct Sprite *sprite) { u16 r4, r1; - sprite->data7++; - switch (sprite->data0) + sprite->data[7]++; + switch (sprite->data[0]) { case 0: default: @@ -2767,43 +2767,43 @@ static void sub_813E30C(struct Sprite *sprite) case 1: sprite->oam.affineMode = 1; sprite->oam.matrixNum = 1; - sprite->data0 = 10; - sprite->data4 = 36; + sprite->data[0] = 10; + sprite->data[4] = 36; //fall through case 10: if (sprite->pos1.x <= 144) { sprite->pos1.x += 4; sprite->pos1.y -= 1; - sprite->pos2.y = -Sin((u8)sprite->data2, 24); - sprite->data2 += 4; + sprite->pos2.y = -Sin((u8)sprite->data[2], 24); + sprite->data[2] += 4; } - sprite->data3 -= sprite->data4; - if ((sprite->data7 & 1) && sprite->data4 != 0) - sprite->data4--; - r4 = gSineTable[(u8)sprite->data3]; - r1 = gSineTable[(u8)(sprite->data3 + 64)]; + sprite->data[3] -= sprite->data[4]; + if ((sprite->data[7] & 1) && sprite->data[4] != 0) + sprite->data[4]--; + r4 = gSineTable[(u8)sprite->data[3]]; + r1 = gSineTable[(u8)(sprite->data[3] + 64)]; SetOamMatrix(1, r1, r4, -r4, r1); break; case 2: sprite->oam.affineMode = 1; sprite->oam.matrixNum = 2; - sprite->data0 = 20; - sprite->data4 = 36; + sprite->data[0] = 20; + sprite->data[4] = 36; //fall through case 20: if (sprite->pos1.x <= 96) { sprite->pos1.x += 3; sprite->pos1.y -= 1; - sprite->pos2.y = -Sin((u8)sprite->data2, 24); - sprite->data2 += 4; + sprite->pos2.y = -Sin((u8)sprite->data[2], 24); + sprite->data[2] += 4; } - sprite->data3 -= sprite->data4; - if ((sprite->data7 & 1) && sprite->data4 != 0) - sprite->data4--; - r4 = gSineTable[(u8)sprite->data3]; - r1 = gSineTable[(u8)(sprite->data3 + 64)]; + sprite->data[3] -= sprite->data[4]; + if ((sprite->data[7] & 1) && sprite->data[4] != 0) + sprite->data[4]--; + r4 = gSineTable[(u8)sprite->data[3]]; + r1 = gSineTable[(u8)(sprite->data[3] + 64)]; SetOamMatrix(2, r1, r4, -r4, r1); break; } @@ -2815,27 +2815,27 @@ static void sub_813E4B8(struct Sprite *sprite) u16 r2; u16 r1; - sprite->data7++; - if (sprite->data7 & 1) + sprite->data[7]++; + if (sprite->data[7] & 1) sprite->invisible = FALSE; else sprite->invisible = TRUE; - if (sprite->data2 >= 64) + if (sprite->data[2] >= 64) { DestroySprite(sprite); return; } - sprite->data2 += 2; - r4 = Sin((u8)sprite->data2, 40); - sprite->pos2.x = Cos((u8)(sprite->data0 * 32), r4); - sprite->pos2.y = Sin((u8)(sprite->data0 * 32), r4); - if (sprite->data0 == 0) - { - sprite->data3 -= sprite->data1; - if ((sprite->data7 & 1) && sprite->data1 != 0) - sprite->data1--; - r2 = gSineTable[(u8)sprite->data3]; - r1 = gSineTable[(u8)(sprite->data3 + 64)]; + sprite->data[2] += 2; + r4 = Sin((u8)sprite->data[2], 40); + sprite->pos2.x = Cos((u8)(sprite->data[0] * 32), r4); + sprite->pos2.y = Sin((u8)(sprite->data[0] * 32), r4); + if (sprite->data[0] == 0) + { + sprite->data[3] -= sprite->data[1]; + if ((sprite->data[7] & 1) && sprite->data[1] != 0) + sprite->data[1]--; + r2 = gSineTable[(u8)sprite->data[3]]; + r1 = gSineTable[(u8)(sprite->data[3] + 64)]; SetOamMatrix(16, r1, r2, -r2, r1); } } @@ -2850,8 +2850,8 @@ static void sub_813E580(u16 x, u16 y) spriteId = CreateSprite(&gSpriteTemplate_840B0B0, x, y, 0); gSprites[spriteId].oam.affineMode = 1; gSprites[spriteId].oam.matrixNum = 16; - gSprites[spriteId].data0 = i; - gSprites[spriteId].data1 = 32; + gSprites[spriteId].data[0] = i; + gSprites[spriteId].data[1] = 32; } } @@ -2863,16 +2863,16 @@ static void sub_813E5E0(struct Sprite *sprite) } else { - sprite->invisible = gSprites[sprite->data0].invisible; - if (sprite->data7 < 12) - sprite->data7++; - sprite->data6 += 4; - sprite->pos1.x = sprite->data4 + gSineTable[(u8)(sprite->data3 + 64)] * sprite->data6 / 256; + sprite->invisible = gSprites[sprite->data[0]].invisible; + if (sprite->data[7] < 12) + sprite->data[7]++; + sprite->data[6] += 4; + sprite->pos1.x = sprite->data[4] + gSineTable[(u8)(sprite->data[3] + 64)] * sprite->data[6] / 256; //This useless '+ 0' is needed to make the asm match - sprite->pos1.y = sprite->data5 + gSineTable[(u8)(sprite->data3 + 0)] * sprite->data6 / 256; - sprite->pos2.y = gSineTable[(u8)(sprite->data1 + 0)] * sprite->data7 / 256; - sprite->data1 += 16; - if (sprite->pos1.y > sprite->data2) + sprite->pos1.y = sprite->data[5] + gSineTable[(u8)(sprite->data[3] + 0)] * sprite->data[6] / 256; + sprite->pos2.y = gSineTable[(u8)(sprite->data[1] + 0)] * sprite->data[7] / 256; + sprite->data[1] += 16; + if (sprite->pos1.y > sprite->data[2]) DestroySprite(sprite); } } @@ -2890,15 +2890,15 @@ static void sub_813E6C0(struct Sprite *sprite) } else { - sprite->data7++; + sprite->data[7]++; sprite->invisible = TRUE; - if (gSprites[sprite->data0].data0 == 1 && !(sprite->data7 & 3)) + if (gSprites[sprite->data[0]].data[0] == 1 && !(sprite->data[7] & 3)) { - var1 = sprite->data1 + gSprites[sprite->data0].pos1.x; - var2 = sprite->data2 + gSprites[sprite->data0].pos1.y; + var1 = sprite->data[1] + gSprites[sprite->data[0]].pos1.x; + var2 = sprite->data[2] + gSprites[sprite->data[0]].pos1.y; for (i = 0; i < 3; i++) { - u8 r3 = gSprites[sprite->data0].subpriority - 1; + u8 r3 = gSprites[sprite->data[0]].subpriority - 1; //Make redundant copies of these variables to get the asm to match s16 _var1 = var1; s16 _var2 = var2; @@ -2906,13 +2906,13 @@ static void sub_813E6C0(struct Sprite *sprite) spriteId = CreateSprite(&gSpriteTemplate_840B0DC, _var1, _var2, r3); if (spriteId != 64) { - gSprites[spriteId].data0 = sprite->data0; - gSprites[spriteId].data1 = (((sprite->data7 >> 2) & 7) << 5) + i * 85; - gSprites[spriteId].data2 = sprite->data3; - gSprites[spriteId].data3 = 104; - gSprites[spriteId].data4 = var1; - gSprites[spriteId].data5 = var2; - gSprites[spriteId].data6 = 0; + gSprites[spriteId].data[0] = sprite->data[0]; + gSprites[spriteId].data[1] = (((sprite->data[7] >> 2) & 7) << 5) + i * 85; + gSprites[spriteId].data[2] = sprite->data[3]; + gSprites[spriteId].data[3] = 104; + gSprites[spriteId].data[4] = var1; + gSprites[spriteId].data[5] = var2; + gSprites[spriteId].data[6] = 0; } } } @@ -2926,10 +2926,10 @@ static void sub_813E7C0(u8 a) spriteId = CreateSprite(&gSpriteTemplate_840B0F4, 0, 0, 0); if (spriteId != 64) { - gSprites[spriteId].data0 = a; - gSprites[spriteId].data1 = -12; - gSprites[spriteId].data2 = 0; - gSprites[spriteId].data3 = 136; + gSprites[spriteId].data[0] = a; + gSprites[spriteId].data[1] = -12; + gSprites[spriteId].data[2] = 0; + gSprites[spriteId].data[3] = 136; } } @@ -2941,20 +2941,20 @@ static void sub_813E804(struct Sprite *sprite) } else { - sprite->invisible = gSprites[sprite->data0].invisible; - sprite->data7++; - if (sprite->data3 < 40) - sprite->data3 += 2; + sprite->invisible = gSprites[sprite->data[0]].invisible; + sprite->data[7]++; + if (sprite->data[3] < 40) + sprite->data[3] += 2; //This useless '+ 0' is needed to make the asm match - sprite->pos1.x = gSprites[sprite->data0].pos1.x + gSprites[sprite->data0].pos2.x + gSineTable[(u8)(sprite->data1 + 64)] * sprite->data3 / 256; - sprite->pos1.y = gSprites[sprite->data0].pos1.y + gSprites[sprite->data0].pos2.y + gSineTable[(u8)(sprite->data1 + 0)] * sprite->data3 / 512; - sprite->data1 += 2; - sprite->pos2.y = gSineTable[(u8)(sprite->data2 + 0)] / 32; - sprite->data2 += 8; - if ((sprite->data1 & 0xFF) < 128) - sprite->subpriority = gSprites[sprite->data0].subpriority - 1; + sprite->pos1.x = gSprites[sprite->data[0]].pos1.x + gSprites[sprite->data[0]].pos2.x + gSineTable[(u8)(sprite->data[1] + 64)] * sprite->data[3] / 256; + sprite->pos1.y = gSprites[sprite->data[0]].pos1.y + gSprites[sprite->data[0]].pos2.y + gSineTable[(u8)(sprite->data[1] + 0)] * sprite->data[3] / 512; + sprite->data[1] += 2; + sprite->pos2.y = gSineTable[(u8)(sprite->data[2] + 0)] / 32; + sprite->data[2] += 8; + if ((sprite->data[1] & 0xFF) < 128) + sprite->subpriority = gSprites[sprite->data[0]].subpriority - 1; else - sprite->subpriority = gSprites[sprite->data0].subpriority + 1; + sprite->subpriority = gSprites[sprite->data[0]].subpriority + 1; } } @@ -2968,8 +2968,8 @@ static void sub_813E930(u8 a) spriteId = CreateSprite(&gSpriteTemplate_840B124, gSprites[a].pos1.x, gSprites[a].pos1.y, 0); if (spriteId != 64) { - gSprites[spriteId].data0 = a; - gSprites[spriteId].data1 = i * 32; + gSprites[spriteId].data[0] = a; + gSprites[spriteId].data[1] = i * 32; } } } @@ -2985,17 +2985,17 @@ static void sub_813E980(struct Sprite *sprite) u8 r0; u16 matrixNum; - sprite->invisible = gSprites[sprite->data0].invisible; - sprite->data7++; - sprite->data6 += 8; - sprite->pos1.x = sprite->data4 + gSineTable[(u8)(sprite->data3 + 64)] * sprite->data6 / 256; - sprite->pos1.y = sprite->data5 + gSineTable[(u8)(sprite->data3 + 0)] * sprite->data6 / 256; - r0 = sprite->data6 / 16; + sprite->invisible = gSprites[sprite->data[0]].invisible; + sprite->data[7]++; + sprite->data[6] += 8; + sprite->pos1.x = sprite->data[4] + gSineTable[(u8)(sprite->data[3] + 64)] * sprite->data[6] / 256; + sprite->pos1.y = sprite->data[5] + gSineTable[(u8)(sprite->data[3] + 0)] * sprite->data[6] / 256; + r0 = sprite->data[6] / 16; if (r0 > 9) r0 = 9; matrixNum = (r0 + 18) & 31; sprite->oam.matrixNum = matrixNum; - if (sprite->data6 > 160) + if (sprite->data[6] > 160) DestroySprite(sprite); } } @@ -3012,26 +3012,26 @@ static void sub_813EA60(struct Sprite *sprite) } else { - sprite->data7++; + sprite->data[7]++; sprite->invisible = TRUE; - if (gSprites[sprite->data0].data0 == 1) + if (gSprites[sprite->data[0]].data[0] == 1) { - r6 = (sprite->data7 & 1); + r6 = (sprite->data[7] & 1); if (!r6) { - r1 = sprite->data1 + gSprites[sprite->data0].pos1.x; - r2 = sprite->data2 + gSprites[sprite->data0].pos1.y; - spriteId = CreateSprite(&gSpriteTemplate_840B150, r1, r2, gSprites[sprite->data0].subpriority + 1); + r1 = sprite->data[1] + gSprites[sprite->data[0]].pos1.x; + r2 = sprite->data[2] + gSprites[sprite->data[0]].pos1.y; + spriteId = CreateSprite(&gSpriteTemplate_840B150, r1, r2, gSprites[sprite->data[0]].subpriority + 1); if (spriteId != 64) { gSprites[spriteId].oam.affineMode = 3; gSprites[spriteId].oam.matrixNum = 18; CalcCenterToCornerVec(&gSprites[spriteId], 0, 1, 3); - gSprites[spriteId].data0 = sprite->data0; - gSprites[spriteId].data3 = gUnknown_0840B168[(sprite->data7 >> 1) & 7]; - gSprites[spriteId].data4 = r1; - gSprites[spriteId].data5 = r2; - gSprites[spriteId].data6 = r6; + gSprites[spriteId].data[0] = sprite->data[0]; + gSprites[spriteId].data[3] = gUnknown_0840B168[(sprite->data[7] >> 1) & 7]; + gSprites[spriteId].data[4] = r1; + gSprites[spriteId].data[5] = r2; + gSprites[spriteId].data[6] = r6; } } } @@ -3046,10 +3046,10 @@ static void InitIntroTorchicAttackAnim(u8 a) spriteId = CreateSprite(&gSpriteTemplate_840B170, 0, 0, 0); if (spriteId != 64) { - gSprites[spriteId].data0 = a; - gSprites[spriteId].data1 = 0; - gSprites[spriteId].data2 = 8; - gSprites[spriteId].data3 = 24; + gSprites[spriteId].data[0] = a; + gSprites[spriteId].data[1] = 0; + gSprites[spriteId].data[2] = 8; + gSprites[spriteId].data[3] = 24; } for (i = 0; i < 10; i++) { @@ -3065,14 +3065,14 @@ static void sub_813EBBC(struct Sprite *sprite) } else { - sprite->invisible = gSprites[sprite->data0].invisible; - sprite->data7 += 1; - sprite->data6 += 8; - sprite->pos1.x = sprite->data4 + gSineTable[(u8)(sprite->data3 + 64)] * sprite->data6 / 256; - sprite->pos1.y = sprite->data5 + gSineTable[(u8)(sprite->data3 + 0)] * sprite->data6 / 256; - sprite->pos2.y = gSineTable[(u8)(sprite->data1 + 0)] / 64; - sprite->data1 += 16; - if (sprite->pos1.y < sprite->data2) + sprite->invisible = gSprites[sprite->data[0]].invisible; + sprite->data[7] += 1; + sprite->data[6] += 8; + sprite->pos1.x = sprite->data[4] + gSineTable[(u8)(sprite->data[3] + 64)] * sprite->data[6] / 256; + sprite->pos1.y = sprite->data[5] + gSineTable[(u8)(sprite->data[3] + 0)] * sprite->data[6] / 256; + sprite->pos2.y = gSineTable[(u8)(sprite->data[1] + 0)] / 64; + sprite->data[1] += 16; + if (sprite->pos1.y < sprite->data[2]) DestroySprite(sprite); } } @@ -3090,34 +3090,34 @@ static void sub_813EC90(struct Sprite *sprite) } else { - sprite->data7++; + sprite->data[7]++; sprite->invisible = TRUE; - if (gSprites[sprite->data0].data0 == 1) + if (gSprites[sprite->data[0]].data[0] == 1) { - r6 = sprite->data7 & 1; + r6 = sprite->data[7] & 1; if (!r6) { - r1 = sprite->data1 + gSprites[sprite->data0].pos1.x; - r2 = sprite->data2 + gSprites[sprite->data0].pos1.y; - spriteId = CreateSprite(&gSpriteTemplate_840B1B0, r1, r2, gSprites[sprite->data0].subpriority + 1); + r1 = sprite->data[1] + gSprites[sprite->data[0]].pos1.x; + r2 = sprite->data[2] + gSprites[sprite->data[0]].pos1.y; + spriteId = CreateSprite(&gSpriteTemplate_840B1B0, r1, r2, gSprites[sprite->data[0]].subpriority + 1); if (spriteId != 64) { gSprites[spriteId].oam.affineMode = 3; gSprites[spriteId].oam.matrixNum = 17; CalcCenterToCornerVec(&gSprites[spriteId], 0, 1, 3); - gSprites[spriteId].data0 = sprite->data0; - gSprites[spriteId].data1 = ((sprite->data7 >> 2) & 7) << 5; - gSprites[spriteId].data2 = sprite->data3; - gSprites[spriteId].data3 = 232; - gSprites[spriteId].data4 = r1; - gSprites[spriteId].data5 = r2; - gSprites[spriteId].data6 = r6; + gSprites[spriteId].data[0] = sprite->data[0]; + gSprites[spriteId].data[1] = ((sprite->data[7] >> 2) & 7) << 5; + gSprites[spriteId].data[2] = sprite->data[3]; + gSprites[spriteId].data[3] = 232; + gSprites[spriteId].data[4] = r1; + gSprites[spriteId].data[5] = r2; + gSprites[spriteId].data[6] = r6; } } - if (sprite->data6 < 112) - sprite->data6 += 4; + if (sprite->data[6] < 112) + sprite->data[6] += 4; } - foo = 256 - gSineTable[(u8)sprite->data6] / 2; + foo = 256 - gSineTable[(u8)sprite->data[6]] / 2; SetOamMatrix(17, foo, 0, 0, foo); } } @@ -3129,10 +3129,10 @@ static void InitIntroMudkipAttackAnim(u8 a) spriteId = CreateSprite(&gSpriteTemplate_840B1C8, 0, 0, 0); if (spriteId != 64) { - gSprites[spriteId].data0 = a; - gSprites[spriteId].data1 = 0; - gSprites[spriteId].data2 = 12; - gSprites[spriteId].data3 = 24; + gSprites[spriteId].data[0] = a; + gSprites[spriteId].data[1] = 0; + gSprites[spriteId].data[2] = 12; + gSprites[spriteId].data[3] = 24; } } @@ -3141,8 +3141,8 @@ static void sub_813EDFC(struct Sprite *sprite) u16 foo; //I'm not sure why a switch statement was used here. - //if (sprite->data0 != 1) would have been more appropriate. - switch (sprite->data0) + //if (sprite->data[0] != 1) would have been more appropriate. + switch (sprite->data[0]) { case 0: default: @@ -3150,23 +3150,23 @@ static void sub_813EDFC(struct Sprite *sprite) sprite->oam.affineMode = 3; sprite->oam.matrixNum = 18; CalcCenterToCornerVec(sprite, 0, 3, 3); - sprite->data1 = 0; - sprite->data0 = 1; + sprite->data[1] = 0; + sprite->data[0] = 1; //fall through case 1: break; } - sprite->data7++; - if (sprite->data7 & 1) + sprite->data[7]++; + if (sprite->data[7] & 1) { sprite->invisible = TRUE; } else { sprite->invisible = FALSE; - if (sprite->data1 < 64) - sprite->data1++; + if (sprite->data[1] < 64) + sprite->data[1]++; } - foo = 256 - gSineTable[(u8)sprite->data1] / 2; + foo = 256 - gSineTable[(u8)sprite->data[1]] / 2; SetOamMatrix(18, foo, 0, 0, foo); } diff --git a/src/scene/intro_credits_graphics.c b/src/scene/intro_credits_graphics.c index cd0589af8..a150e8dc9 100755 --- a/src/scene/intro_credits_graphics.c +++ b/src/scene/intro_credits_graphics.c @@ -418,11 +418,11 @@ void sub_814910C(struct Sprite *sprite) } else { - s32 var = ((sprite->pos1.x << 16) | (u16)sprite->data2) + (u16)sprite->data1; + s32 var = ((sprite->pos1.x << 16) | (u16)sprite->data[2]) + (u16)sprite->data[1]; sprite->pos1.x = var >> 16; - sprite->data2 = var; + sprite->data[2] = var; if (sprite->pos1.x > 255) sprite->pos1.x = 0xFFE0; - if (sprite->data0) + if (sprite->data[0]) { sprite->pos2.y = -(gUnknown_02039358 + gUnknown_0203935A); } @@ -447,9 +447,9 @@ void sub_8149174(u8 a, struct UnknownStruct1 *b, const union AnimCmd *const *c, gSprites[sprite].oam.paletteNum = 0; gSprites[sprite].anims = c; StartSpriteAnim(&gSprites[sprite], b[i].var0_0); - gSprites[sprite].data0 = a; - gSprites[sprite].data1 = b[i].var4; - gSprites[sprite].data2 = 0; + gSprites[sprite].data[0] = a; + gSprites[sprite].data[1] = b[i].var4; + gSprites[sprite].data[2] = 0; } } @@ -474,11 +474,11 @@ void nullsub_82() void sub_81492A0(struct Sprite* sprite) { - sprite->invisible = gSprites[sprite->data0].invisible; - sprite->pos1.x = gSprites[sprite->data0].pos1.x; - sprite->pos1.y = gSprites[sprite->data0].pos1.y + 8; - sprite->pos2.x = gSprites[sprite->data0].pos2.x; - sprite->pos2.y = gSprites[sprite->data0].pos2.y; + sprite->invisible = gSprites[sprite->data[0]].invisible; + sprite->pos1.x = gSprites[sprite->data[0]].pos1.x; + sprite->pos1.y = gSprites[sprite->data[0]].pos1.y + 8; + sprite->pos2.x = gSprites[sprite->data[0]].pos2.x; + sprite->pos2.y = gSprites[sprite->data[0]].pos2.y; } @@ -487,7 +487,7 @@ u8 intro_create_brendan_sprite(s16 a, s16 b) { u8 sprite = CreateSprite(&gSpriteTemplate_8416CDC, a, b, 0); u8 brendan = CreateSprite(&gSpriteTemplate_Brendan, a, b + 8, 1); - gSprites[brendan].data0 = sprite; + gSprites[brendan].data[0] = sprite; return sprite; } @@ -495,7 +495,7 @@ u8 intro_create_may_sprite(s16 a, s16 b) { u8 sprite = CreateSprite(&gSpriteTemplate_8416CF4, a, b, 0); u8 may = CreateSprite(&gSpriteTemplate_May, a, b + 8, 1); - gSprites[may].data0 = sprite; + gSprites[may].data[0] = sprite; return sprite; } @@ -505,17 +505,17 @@ void nullsub_83() void sub_81493C4(struct Sprite* sprite) { - sprite->invisible = gSprites[sprite->data0].invisible; - sprite->pos1.y = gSprites[sprite->data0].pos1.y; - sprite->pos2.x = gSprites[sprite->data0].pos2.x; - sprite->pos2.y = gSprites[sprite->data0].pos2.y; + sprite->invisible = gSprites[sprite->data[0]].invisible; + sprite->pos1.y = gSprites[sprite->data[0]].pos1.y; + sprite->pos2.x = gSprites[sprite->data[0]].pos2.x; + sprite->pos2.y = gSprites[sprite->data[0]].pos2.y; } u8 intro_create_latios_sprite(s16 a, s16 b) { u8 sprite = CreateSprite(&gSpriteTemplate_8416D7C, a - 32, b, 2); u8 latios = CreateSprite(&gSpriteTemplate_8416D7C, a + 32, b, 2); - gSprites[latios].data0 = sprite; + gSprites[latios].data[0] = sprite; StartSpriteAnim(&gSprites[latios], 1); gSprites[latios].callback = &sub_81493C4; return sprite; @@ -525,7 +525,7 @@ u8 intro_create_latias_sprite(s16 a, s16 b) { u8 sprite = CreateSprite(&gSpriteTemplate_8416D94, a - 32, b, 2); u8 latios = CreateSprite(&gSpriteTemplate_8416D94, a + 32, b, 2); - gSprites[latios].data0 = sprite; + gSprites[latios].data[0] = sprite; StartSpriteAnim(&gSprites[latios], 1); gSprites[latios].callback = &sub_81493C4; return sprite; diff --git a/src/scene/title_screen.c b/src/scene/title_screen.c index 2503b0654..f158500fe 100644 --- a/src/scene/title_screen.c +++ b/src/scene/title_screen.c @@ -360,7 +360,7 @@ static void UpdateLegendaryMarkingColor(u8); void SpriteCallback_VersionBannerLeft(struct Sprite *sprite) { - struct Task *task = &gTasks[sprite->data1]; + struct Task *task = &gTasks[sprite->data[1]]; if (task->data[1] != 0) { @@ -384,7 +384,7 @@ void SpriteCallback_VersionBannerLeft(struct Sprite *sprite) void SpriteCallback_VersionBannerRight(struct Sprite *sprite) { - struct Task *task = &gTasks[sprite->data1]; + struct Task *task = &gTasks[sprite->data[1]]; if (task->data[1] != 0) { @@ -405,11 +405,11 @@ void SpriteCallback_VersionBannerRight(struct Sprite *sprite) void SpriteCallback_PressStartCopyrightBanner(struct Sprite *sprite) { - if (sprite->data0 == 1) + if (sprite->data[0] == 1) { - sprite->data1++; + sprite->data[1]++; //Alternate between hidden and shown every 16th frame - if (sprite->data1 & 16) + if (sprite->data[1] & 16) sprite->invisible = FALSE; else sprite->invisible = TRUE; @@ -429,7 +429,7 @@ static void CreatePressStartBanner(s16 x, s16 y) { spriteId = CreateSprite(&sStartCopyrightBannerSpriteTemplate, x, y, 0); StartSpriteAnim(&gSprites[spriteId], i); - gSprites[spriteId].data0 = 1; + gSprites[spriteId].data[0] = 1; } } #elif GERMAN @@ -554,27 +554,27 @@ void SpriteCallback_PokemonLogoShine(struct Sprite *sprite) { if (gTasks[gUnknown_0202F7E4].data[1] == 0 && sprite->pos1.x < 272) { - if (sprite->data0) //Flash background + if (sprite->data[0]) //Flash background { u16 backgroundColor; if (sprite->pos1.x < DISPLAY_WIDTH / 2) { //Brighten background color - if (sprite->data1 < 31) - sprite->data1++; - if (sprite->data1 < 31) - sprite->data1++; + if (sprite->data[1] < 31) + sprite->data[1]++; + if (sprite->data[1] < 31) + sprite->data[1]++; } else { //Darken background color - if (sprite->data1 != 0) - sprite->data1--; - if (sprite->data1 != 0) - sprite->data1--; + if (sprite->data[1] != 0) + sprite->data[1]--; + if (sprite->data[1] != 0) + sprite->data[1]--; } - backgroundColor = _RGB(sprite->data1, sprite->data1, sprite->data1); + backgroundColor = _RGB(sprite->data[1], sprite->data[1], sprite->data[1]); gPlttBufferFaded[0] = backgroundColor; gPlttBufferFaded[PLTT_BUFFER_INDEX] = backgroundColor; } @@ -593,7 +593,7 @@ static void StartPokemonLogoShine(bool8 flashBackground) u8 spriteId = CreateSprite(&sPokemonLogoShineSpriteTemplate, 0, 68, 0); gSprites[spriteId].oam.objMode = 2; - gSprites[spriteId].data0 = flashBackground; + gSprites[spriteId].data[0] = flashBackground; } static void VBlankCB(void) @@ -758,12 +758,12 @@ static void Task_TitleScreenPhase1(u8 taskId) //Create left side of version banner spriteId = CreateSprite(&sVersionBannerLeftSpriteTemplate, VERSION_BANNER_LEFT_X, VERSION_BANNER_Y, 0); gSprites[spriteId].invisible = TRUE; - gSprites[spriteId].data1 = taskId; + gSprites[spriteId].data[1] = taskId; //Create right side of version banner spriteId = CreateSprite(&sVersionBannerRightSpriteTemplate, VERSION_BANNER_RIGHT_X, VERSION_BANNER_Y, 0); gSprites[spriteId].invisible = TRUE; - gSprites[spriteId].data1 = taskId; + gSprites[spriteId].data[1] = taskId; gTasks[taskId].data[5] = 88; gTasks[taskId].tCounter = 144; |