diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-02 07:59:29 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-02 07:59:29 -0400 |
| commit | ab3b8cd51a88f02dbdb72c276a1c35591e8331f4 (patch) | |
| tree | 29d5e0c8c1aa2ddd211b65c0160af98044d76678 /include/overworld.h | |
| parent | 6543d7f2d6e7e12e159588f494895ba02b7d5090 (diff) | |
| parent | af197ccd3bd62fab813154dc4311e65f9992a676 (diff) | |
Merge branch 'master' into heal_location
Diffstat (limited to 'include/overworld.h')
| -rw-r--r-- | include/overworld.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/overworld.h b/include/overworld.h index 0bcad8e8f..ea3d27319 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); @@ -62,6 +63,9 @@ void warp_in(void); u8 get_map_light_level_by_bank_and_number(s8 mapGroup, s8 mapNum); void sub_8086194(void); void sub_8084CCC(u8 spawn); -void warp1_set_2(s8 grp, s8 num, s8 wrp); +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 |