diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2019-02-13 21:24:20 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-13 21:24:20 -0600 |
| commit | 047c282763fc41eefa712b2244b478816036cd1a (patch) | |
| tree | b1f161e3f11360dee7aa6ff98202d0164b376cbd /include | |
| parent | aa5d5fa34acd9a58bee01a75d0188e1c14e28742 (diff) | |
| parent | e7d02681436900d901d4667e525d5d5a99ad2ba1 (diff) | |
Merge pull request #548 from Phlosioneer/intro-movie-state-machine
Document the intro movie state machine
Diffstat (limited to 'include')
| -rw-r--r-- | include/intro.h | 2 | ||||
| -rw-r--r-- | include/intro_credits_graphics.h | 4 | ||||
| -rw-r--r-- | include/new_game.h | 2 | ||||
| -rw-r--r-- | include/title_screen.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/include/intro.h b/include/intro.h index b1bfe20a4..198ae2669 100644 --- a/include/intro.h +++ b/include/intro.h @@ -9,6 +9,6 @@ void CB2_InitCopyrightScreenAfterBootup(void); void CB2_InitCopyrightScreenAfterBootup(void); void CB2_InitCopyrightScreenAfterTitleScreen(void); -void sub_816F2A8(u16, u16, u16, u16); +void PanFadeAndZoomScreen(u16, u16, u16, u16); #endif // GUARD_INTRO_H 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); diff --git a/include/new_game.h b/include/new_game.h index f4d69cbce..8fab05483 100644 --- a/include/new_game.h +++ b/include/new_game.h @@ -8,7 +8,7 @@ void SetTrainerId(u32 trainerId, u8 *dst); u32 GetTrainerId(u8 *trainerId); void CopyTrainerId(u8 *dst, u8 *src); void NewGameInitData(void); -void sub_808447C(void); +void ResetMenuAndMonGlobals(void); void Sav2_ClearSetDefault(void); #endif // GUARD_NEW_GAME_H diff --git a/include/title_screen.h b/include/title_screen.h index b660792fc..ad0809ed2 100644 --- a/include/title_screen.h +++ b/include/title_screen.h @@ -1,7 +1,7 @@ #ifndef GUARD_TITLE_SCREEN_H #define GUARD_TITLE_SCREEN_H -extern const u16 gUnknown_0853FF70[]; +extern const u16 gIntroWaterDropData[]; void CB2_InitTitleScreen(void); |