diff options
| author | KDSKardabox <bollygame94@gmail.com> | 2018-02-13 10:02:27 +0530 |
|---|---|---|
| committer | KDSKardabox <bollygame94@gmail.com> | 2018-02-13 10:02:27 +0530 |
| commit | aaea65c37bb6dbe04de602492f6e175cabc87f22 (patch) | |
| tree | dca7115e05ed132733c1e5ea0b4a3322a2d41e9a /include/overworld.h | |
| parent | ae321d6e7c99b557cafd594eb945e7ca1a566ba8 (diff) | |
| parent | 398e775d906ff4f1e5aaad3d8a9eee530c7b122d (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald
# Conflicts:
# include/strings.h
Diffstat (limited to 'include/overworld.h')
| -rw-r--r-- | include/overworld.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/overworld.h b/include/overworld.h index 630b0a617..e42c2fed3 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -71,6 +71,8 @@ void copy_saved_warp2_bank_and_enter_x_to_warp1(u8 unused); void mapldr_default(void); u8 get_map_light_from_warp0(void); bool8 is_light_level_1_2_3_5_or_6(u8 a1); +void sub_8086194(void); +void sub_80861B0(void); bool32 sub_80875C8(void); bool32 sub_8087634(void); |