diff options
author | paul <nintendo6496@googlemail.com> | 2018-11-24 19:57:36 +0100 |
---|---|---|
committer | paul <nintendo6496@googlemail.com> | 2018-11-24 19:57:36 +0100 |
commit | 4744a7d96ec21fc9480165061990ba98a774a469 (patch) | |
tree | 0c24d7e392d5cc4302e6ed6381b2a2dc047a2b3a /include/overworld.h | |
parent | 284bbf91af43b0c9928865894cbc1d3001e57c16 (diff) | |
parent | fecda40501d39c633435fe2777ebc93d92233ca1 (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/overworld.h')
-rw-r--r-- | include/overworld.h | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/include/overworld.h b/include/overworld.h index a5fba0c10..8cae07bdc 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -1,6 +1,8 @@ #ifndef GUARD_ROM4_H #define GUARD_ROM4_H +#include "global.h" + #include "main.h" struct UnkPlayerStruct @@ -68,7 +70,20 @@ void c2_load_new_map(void); void copy_saved_warp2_bank_and_enter_x_to_warp1(u8 unused); void mapldr_default(void); -void IncrementGameStat(u8); u32 GetGameStat(u8); +void sub_8056938(void); +void sub_8055D5C(struct WarpData *); +void sub_80572A8(void); +void sub_805726C(void); +void sub_8057430(void); +void sub_8055DC4(void); + +u8 sav1_map_get_name(void); + +extern u8 gUnknown_2031DD8; +extern u8 gUnknown_2036E28; + +extern bool8 (* gUnknown_3005024)(void); + #endif //GUARD_ROM4_H |