diff options
| author | scnorton <scnorton@biociphers.org> | 2018-01-18 12:53:31 -0500 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2018-01-18 12:53:31 -0500 |
| commit | c6ff1a6ce39cb67c6de21f2e4938ea62c97ee7e5 (patch) | |
| tree | 47e2f5eaa84c3cc97b96bdf06170136abe446d81 /include/overworld.h | |
| parent | 3c2b1731eeb7037a1b681444b1c126fc239a904e (diff) | |
| parent | 24e0edee9f428a68715c47051ebba3cda5a3e5a7 (diff) | |
Merge branch 'master' into link
Diffstat (limited to 'include/overworld.h')
| -rw-r--r-- | include/overworld.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/overworld.h b/include/overworld.h index 242b45d19..5b9513031 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -40,6 +40,9 @@ void sub_8084EBC(s16, s16); void player_avatar_init_params_reset(void); +bool8 Overworld_MapTypeAllowsTeleportAndFly(u8 mapType); +void Overworld_ResetStateAfterTeleport(void); + void Overworld_SetFlashLevel(s32 a1); //u8 Overworld_GetFlashLevel(void); void sub_8085524(u16); @@ -73,4 +76,6 @@ bool32 sub_808766C(void); void IncrementGameStat(u8); u32 GetGameStat(u8); +void CB2_OverworldBasic(void); + #endif //GUARD_ROM4_H |