diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2019-03-23 09:39:46 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2019-03-23 09:39:46 -0500 |
| commit | 65391a1eb2979dc050dd4a98afea02bb0ef310ea (patch) | |
| tree | e31a90d0966cec7e8713ead9ca8083d439c8d9b5 /include/intro.h | |
| parent | eb48cc2f7eefc1e56c2dcec21c38381b4534b897 (diff) | |
| parent | abe56579c107af58e6f3a43968ba2257ff358189 (diff) | |
Merge remote-tracking branch 'upstream/master' into use_pokeblock
# Conflicts:
# src/use_pokeblock.c
Diffstat (limited to 'include/intro.h')
| -rw-r--r-- | include/intro.h | 2 |
1 files changed, 1 insertions, 1 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 |