diff options
Diffstat (limited to 'src/battle')
| -rw-r--r-- | src/battle/battle_2.c | 134 | ||||
| -rw-r--r-- | src/battle/battle_7.c | 10 | ||||
| -rw-r--r-- | src/battle/battle_anim_807B69C.c | 36 | ||||
| -rw-r--r-- | src/battle/battle_anim_80A7E7C.c | 124 | ||||
| -rw-r--r-- | src/battle/battle_controller_linkopponent.c | 46 | ||||
| -rw-r--r-- | src/battle/battle_controller_linkpartner.c | 46 | ||||
| -rw-r--r-- | src/battle/battle_controller_opponent.c | 52 | ||||
| -rw-r--r-- | src/battle/battle_controller_player.c | 48 | ||||
| -rw-r--r-- | src/battle/battle_controller_safari.c | 2 | ||||
| -rw-r--r-- | src/battle/battle_controller_wally.c | 34 | ||||
| -rw-r--r-- | src/battle/battle_interface.c | 146 | ||||
| -rw-r--r-- | src/battle/battle_transition.c | 86 | ||||
| -rw-r--r-- | src/battle/pokeball.c | 356 | ||||
| -rw-r--r-- | src/battle/reshow_battle_screen.c | 12 | ||||
| -rw-r--r-- | src/battle/smokescreen.c | 24 |
15 files changed, 578 insertions, 578 deletions
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); } } |