diff options
author | Marcus Huderle <huderlem@gmail.com> | 2017-11-18 22:15:38 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-18 22:15:38 -0800 |
commit | 4a365e9230962daf875a0444d51d76639c07c827 (patch) | |
tree | be7332caa25d9711fd12921e347332993e5b0ff1 /src/engine/main_menu.c | |
parent | 8edb453c9de6459f4da78522b248a2e507ba1f08 (diff) | |
parent | 79650185e2af1748a9728f6e9209d64f93cdb050 (diff) |
Merge pull request #462 from ProjectRevoTPP/sprite_struct
change Sprite struct to use a data array instead of manual declares.
Diffstat (limited to 'src/engine/main_menu.c')
-rw-r--r-- | src/engine/main_menu.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/engine/main_menu.c b/src/engine/main_menu.c index 031dc49d1..a8375c6dd 100644 --- a/src/engine/main_menu.c +++ b/src/engine/main_menu.c @@ -844,7 +844,7 @@ static void Task_NewGameSpeech6(u8 taskId) gSprites[spriteId].pos1.x = 104; gSprites[spriteId].pos1.y = 72; gSprites[spriteId].invisible = 0; - gSprites[spriteId].data0 = 0; + gSprites[spriteId].data[0] = 0; CreatePokeballSprite(spriteId, gSprites[spriteId].oam.paletteNum, 0x70, 0x3A, 0, 0, 0x20, 0x0000FFFF); gTasks[taskId].func = Task_NewGameSpeech7; gTasks[taskId].tFrameCounter = 0; @@ -1423,9 +1423,9 @@ void nullsub_34(struct Sprite *sprite) void ShrinkPlayerSprite(struct Sprite *sprite) { - u32 y = (sprite->pos1.y << 16) + sprite->data0 + 0xC000; + u32 y = (sprite->pos1.y << 16) + sprite->data[0] + 0xC000; sprite->pos1.y = y >> 16; - sprite->data0 = y; + sprite->data[0] = y; } u8 CreateAzurillSprite(u8 x, u8 y) |