diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-04 18:50:53 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-04 18:50:53 -0500 |
| commit | eff6795887cc27f2c5139df9a6da70f4f02338b4 (patch) | |
| tree | f91be2b0b7194b4ddff13f4935a0edafc4284a43 /src/scene/intro.c | |
| parent | 3ea9cff2c67b3db195c3326afc56fa0662c2327a (diff) | |
| parent | b1a7733c1cead8ed3d4a58c42d638afd0ead8ab0 (diff) | |
Merge branch 'master' into unk_text_8095904
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) |