diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-02-16 13:53:31 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-16 13:53:31 -0500 |
| commit | 058d30fe806f4fd512ec6708bc68f54d6d98e356 (patch) | |
| tree | bf9d1569a453a085493a8cbb2efad390562cba63 /include/overworld.h | |
| parent | a1ea8cc82958679baee1c65acc30069d051463c6 (diff) | |
| parent | 13357596b7ed70246a00d438ee37dc1c84b78415 (diff) | |
Merge branch 'master' into doc-routes1
Diffstat (limited to 'include/overworld.h')
| -rw-r--r-- | include/overworld.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/overworld.h b/include/overworld.h index a7031e56d..8242615c7 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -147,7 +147,7 @@ void Overworld_ResetStateAfterTeleport(void); void Overworld_FadeOutMapMusic(void); void CB2_LoadMap(void); bool8 BGMusicStopped(void); -bool8 is_light_level_8_or_9(u8 mapType); +bool8 IsMapTypeIndoors(u8 mapType); bool32 sub_8055C9C(void); void Overworld_ResetStateAfterDigEscRope(void); bool32 sub_8058244(void); @@ -156,7 +156,7 @@ u8 GetCurrentMapType(void); u8 get_map_light_from_warp0(void); const struct MapHeader *warp1_get_mapheader(void); void sub_8055F88(void); -void sub_8056788(void); +void CB2_ReturnToFieldCableClub(void); void ResetGameStats(void); void Overworld_CreditsMainCB(void); |