diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-01-06 13:59:20 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-01-06 13:59:20 -0500 |
| commit | ccb5c0f324e2b9002a687c9111b2675bc6bd101d (patch) | |
| tree | 84d587d63154d9a8da3e9983aae2042f09767737 /include/overworld.h | |
| parent | 498ad1e6af6b219aa54b827e59325b6fbcb54343 (diff) | |
| parent | 26f7ba482384ad4f63063797a527b7fb33572aa1 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into region_map
Diffstat (limited to 'include/overworld.h')
| -rw-r--r-- | include/overworld.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/overworld.h b/include/overworld.h index 845550a17..04d28701c 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -122,7 +122,7 @@ void Overworld_ResetStateAfterTeleport(void); void Overworld_FadeOutMapMusic(void); void CB2_LoadMap(void); -bool8 sub_8055FC4(void); +bool8 BGMusicStopped(void); bool8 is_light_level_8_or_9(u8 mapType); bool32 sub_8055C9C(void); void Overworld_ResetStateAfterDigEscRope(void); @@ -148,4 +148,6 @@ void sub_8055778(int); void sub_8055738(u8 loc); +void sub_8056078(void *, void *); + #endif //GUARD_OVERWORLD_H |