summaryrefslogtreecommitdiff
path: root/include/intro_credits_graphics.h
diff options
context:
space:
mode:
authorPhlosioneer <mattmdrr2@gmail.com>2019-02-18 01:12:47 -0500
committerPhlosioneer <mattmdrr2@gmail.com>2019-02-18 01:12:47 -0500
commit5695617d64335474ead8a7e25c539daebcc55fa5 (patch)
tree0e9791a86b6aff83ab99aa9dd9878558f89fb824 /include/intro_credits_graphics.h
parent08579edbcd596c9659fe25490480c6f96e2b4288 (diff)
parente95140270be790b03e693f539770abfd6473916e (diff)
Merge branch 'master' into multiplayer-stuff
Diffstat (limited to 'include/intro_credits_graphics.h')
-rw-r--r--include/intro_credits_graphics.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/intro_credits_graphics.h b/include/intro_credits_graphics.h
index 354d62e05..2c7ceaf57 100644
--- a/include/intro_credits_graphics.h
+++ b/include/intro_credits_graphics.h
@@ -9,7 +9,7 @@ extern const struct CompressedSpriteSheet gIntro2BrendanSpriteSheet[];
extern const struct CompressedSpriteSheet gIntro2MaySpriteSheet[];
extern const struct CompressedSpriteSheet gIntro2BicycleSpriteSheet[];
extern const struct CompressedSpriteSheet gIntro2FlygonSpriteSheet[];
-extern const struct SpritePalette gUnknown_085F530C[];
+extern const struct SpritePalette gIntroBikeAndFlygonPalette[];
extern const struct CompressedSpriteSheet gUnknown_085F5334[];
extern const struct CompressedSpriteSheet gUnknown_085F5344[];
extern const struct CompressedSpriteSheet gUnknown_085F5354[];
@@ -21,7 +21,7 @@ void load_intro_part2_graphics(u8 a);
void sub_817B150(u8 a);
void sub_817B1C8(u8);
void sub_817B3A8(u8);
-u8 sub_817B3DC(u8 a, u16 b, u16 c, u16 d);
+u8 CreateBicycleAnimationTask(u8 a, u16 b, u16 c, u16 d);
void sub_817B540(u8);
u8 intro_create_brendan_sprite(s16 a, s16 b);
u8 intro_create_may_sprite(s16 a, s16 b);