diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-10-26 06:45:00 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-26 06:45:00 -0400 |
| commit | eafb77fbb912d22294f168c1e6e89575b35f0d6c (patch) | |
| tree | 286f735ca16bd576926197f4f6a80ab6f0c24dc4 /include/overworld.h | |
| parent | 7579fc65c12bd46c045d10eb8cd9a2320fd1f3f0 (diff) | |
| parent | 0ae4d58e985dcc3d265ea30505f439c34eab21ab (diff) | |
Merge pull request #125 from jiangzhengwenjz/battle
battle (3rd take)
Diffstat (limited to 'include/overworld.h')
| -rw-r--r-- | include/overworld.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/overworld.h b/include/overworld.h index a5e975d1d..805ddc8a0 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -62,7 +62,7 @@ void sub_8084EBC(s16, s16); void player_avatar_init_params_reset(void); void Overworld_SetFlashLevel(s32 a1); -//u8 Overworld_GetFlashLevel(void); +u8 Overworld_GetFlashLevel(void); void sub_8085524(u16); void Overworld_SetSavedMusic(u16); @@ -141,5 +141,6 @@ bool32 Overworld_DoScrollSceneForCredits(u8 *, const struct CreditsOverworldCmd bool32 sub_8058318(void); void CB2_ReturnToStartMenu(void); +void CB2_WhiteOut(void); #endif //GUARD_OVERWORLD_H |