diff options
| author | Phlosioneer <mattmdrr2@gmail.com> | 2019-02-13 23:04:56 -0500 |
|---|---|---|
| committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-02-13 23:04:56 -0500 |
| commit | 9e8a841bfa0271a603b5e4895be3067cfa26f8ab (patch) | |
| tree | 52279a2b052583ccfc4a0d6a592cf8a384227a93 /src/intro_credits_graphics.c | |
| parent | d979ac3bf3924051de8bb4154e8398083535eabb (diff) | |
| parent | efc54948345235bdc7d2961d547498612ea8426c (diff) | |
Merge branch 'master' of github.com:pret/pokeemerald into main-menu-state-machine
Diffstat (limited to 'src/intro_credits_graphics.c')
| -rw-r--r-- | src/intro_credits_graphics.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/intro_credits_graphics.c b/src/intro_credits_graphics.c index d85e58938..ba1f56158 100644 --- a/src/intro_credits_graphics.c +++ b/src/intro_credits_graphics.c @@ -269,7 +269,7 @@ const struct CompressedSpriteSheet gIntro2FlygonSpriteSheet[] = { { NULL } }; -const struct SpritePalette gUnknown_085F530C[] = { +const struct SpritePalette gIntroBikeAndFlygonPalette[] = { { gIntro2BrendanNoTurnPal, 1002 }, { gIntro2BrendanNoTurnPal, 1003 }, { gIntro2FlygonPal, 1004 }, @@ -358,6 +358,7 @@ void load_intro_part2_graphics(u8 a) gReservedSpritePaletteCount = 8; } +// Note: This is only called with a=1. void sub_817B150(u8 a) { switch (a) @@ -509,7 +510,7 @@ void sub_817B3A8(u8 a) | DISPCNT_OBJ_ON); } -u8 sub_817B3DC(u8 a, u16 b, u16 c, u16 d) +u8 CreateBicycleAnimationTask(u8 a, u16 b, u16 c, u16 d) { u8 taskId = CreateTask(&sub_817B458, 0); |