diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2017-12-28 22:14:47 -0500 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-12-28 22:14:47 -0500 |
commit | 9d2ee97519aa8ee3c5e5c0d11f49f5a77e4f870e (patch) | |
tree | 763431b9969206b11c5c42c7154c19ad5d21f421 /src/scene/intro.c | |
parent | 857b166086756ccc92e58981493513a7f00920ff (diff) | |
parent | 86a36767dba19e84297047addf1d1d776e2efdec (diff) |
Merge branch 'master' into slot_machine
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) |