summaryrefslogtreecommitdiff
path: root/src/pokemon/pokeblock_feed.c
diff options
context:
space:
mode:
authorProjectRevoTPP <projectrevotpp@hotmail.com>2017-11-18 20:24:39 -0500
committerProjectRevoTPP <projectrevotpp@hotmail.com>2017-11-18 20:24:39 -0500
commitbe716ef9f841589c67f152a90ce5c7c29f7211d8 (patch)
treeaf6b7422327908415f5aa9cbe64d97273076971a /src/pokemon/pokeblock_feed.c
parent016b2d16bcc735053267b3b5e8cd597807db4055 (diff)
change Sprite struct to use a data array instead of manual declares.
Diffstat (limited to 'src/pokemon/pokeblock_feed.c')
-rw-r--r--src/pokemon/pokeblock_feed.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/pokemon/pokeblock_feed.c b/src/pokemon/pokeblock_feed.c
index 5f218a6f6..389c4bb25 100644
--- a/src/pokemon/pokeblock_feed.c
+++ b/src/pokemon/pokeblock_feed.c
@@ -763,7 +763,7 @@ static u8 PokeblockFeed_CreatePokeSprite(struct Pokemon* mon)
gPokeblockFeedMonSpecies = species;
gPokeblockFeedMonSpriteID = spriteID;
gPokeblockFeedMonNature = GetNature(mon);
- gSprites[spriteID].data2 = species;
+ gSprites[spriteID].data[2] = species;
gSprites[spriteID].callback = SpriteCallbackDummy;
gPokeblockMonNotFlipped = 1;
if (!IsPokeSpriteNotFlipped(species))
@@ -780,19 +780,19 @@ static void sub_8148044(u8 spriteID)
{
gSprites[spriteID].pos1.x = 48;
gSprites[spriteID].pos1.y = 80;
- gSprites[spriteID].data0 = -8;
- gSprites[spriteID].data1 = 1;
+ gSprites[spriteID].data[0] = -8;
+ gSprites[spriteID].data[1] = 1;
gSprites[spriteID].callback = sub_8148078;
}
static void sub_8148078(struct Sprite* sprite)
{
sprite->pos1.x += 4;
- sprite->pos1.y += sprite->data0;
- sprite->data0 += sprite->data1;
- if (sprite->data0 == 0)
- PlayCry1(sprite->data2, 0);
- if (sprite->data0 == 9)
+ sprite->pos1.y += sprite->data[0];
+ sprite->data[0] += sprite->data[1];
+ if (sprite->data[0] == 0)
+ PlayCry1(sprite->data[2], 0);
+ if (sprite->data[0] == 9)
sprite->callback = SpriteCallbackDummy;
}
@@ -820,17 +820,17 @@ static void sub_8148108(u8 spriteID, bool8 a1)
static u8 CreatePokeblockSprite(void)
{
u8 spriteID = CreateSprite(&sThrownPokeblockSpriteTemplate, 174, 84, 1);
- gSprites[spriteID].data0 = -12;
- gSprites[spriteID].data1 = 1;
+ gSprites[spriteID].data[0] = -12;
+ gSprites[spriteID].data[1] = 1;
return spriteID;
}
static void SpriteCB_ThrownPokeblock(struct Sprite* sprite)
{
sprite->pos1.x -= 4;
- sprite->pos1.y += sprite->data0;
- sprite->data0 += sprite->data1;
- if (sprite->data0 == 10)
+ sprite->pos1.y += sprite->data[0];
+ sprite->data[0] += sprite->data[1];
+ if (sprite->data[0] == 10)
DestroySprite(sprite);
}