diff options
| author | camthesaxman <cameronghall@cox.net> | 2018-01-02 11:16:06 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2018-01-02 11:16:06 -0600 |
| commit | 0f5b0005676cd3db623eb557f86cf92b1e020827 (patch) | |
| tree | 257857a4bed89a1d9410a9945efd63a76ea16582 /src/scene/intro.c | |
| parent | 28e98d9df7db41f9dcc813ad4e0b37c568833aee (diff) | |
| parent | 397f32f29dbcd8fb6ad47afe5ba1ee354ca2b5c7 (diff) | |
Merge branch 'master' into decompile_easy_chat
Diffstat (limited to 'src/scene/intro.c')
| -rw-r--r-- | src/scene/intro.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/scene/intro.c b/src/scene/intro.c index 9e334d06b..4dc6cc91c 100644 --- a/src/scene/intro.c +++ b/src/scene/intro.c @@ -1087,14 +1087,14 @@ static void Task_IntroStartBikeRide(u8 taskId) u8 spriteId; if (gUnknown_02039318 == 0) - LoadCompressedObjectPic(&gIntro2BrendanSpriteSheet); + LoadCompressedObjectPic(gIntro2BrendanSpriteSheet); else - LoadCompressedObjectPic(&gIntro2MaySpriteSheet); - LoadCompressedObjectPic(&gIntro2BicycleSpriteSheet); + LoadCompressedObjectPic(gIntro2MaySpriteSheet); + LoadCompressedObjectPic(gIntro2BicycleSpriteSheet); #ifdef SAPPHIRE - LoadCompressedObjectPic(&gIntro2LatiasSpriteSheet); + LoadCompressedObjectPic(gIntro2LatiasSpriteSheet); #else - LoadCompressedObjectPic(&gIntro2LatiosSpriteSheet); + LoadCompressedObjectPic(gIntro2LatiosSpriteSheet); #endif LoadSpritePalettes(gIntro2SpritePalettes); if (gUnknown_02039318 == 0) |