diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-02 18:34:41 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-02 18:34:41 -0400 |
| commit | ed7ded0748b38b5266cdc6092446c7b184f75778 (patch) | |
| tree | 0779eacd2dc6107e2dc47370abf82a1793cde6ed /include/overworld.h | |
| parent | 975e28c01e70c63587c8633ffc3c50b7d1759dec (diff) | |
| parent | af197ccd3bd62fab813154dc4311e65f9992a676 (diff) | |
Merge branch 'master' into easy_chat
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 5ac4cad29..19bcaaf01 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -32,6 +32,7 @@ void Overworld_SetMapObjTemplateMovementType(u8, u8); void Overworld_SetWarpDestination(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); +void saved_warp2_set(int unused, s8 mapGroup, s8 mapNum, s8 warpId); void saved_warp2_set_2(int unused, s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); void Overworld_SetHealLocationWarp(u8); void sub_8084DD4(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); @@ -59,5 +60,9 @@ void c2_exit_to_overworld_2_switch(void); bool32 sub_8087598(void); void c2_exit_to_overworld_1_continue_scripts_restart_music(void); void warp_in(void); +void warp1_set_2(s8 mapGroup, s8 mapNum, s8 warpNum); +void c2_load_new_map(void); +void copy_saved_warp2_bank_and_enter_x_to_warp1(u8 unused); +void mapldr_default(void); #endif //GUARD_ROM4_H |