diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-01-06 16:19:18 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-06 16:19:18 -0500 |
| commit | e70a084aa964a0df94c609ebfa9717089dd67639 (patch) | |
| tree | 996dc1a413c8818d6efb746ecf15c3fae28b983e /include/overworld.h | |
| parent | 103789770b635610ee1c04ed923fdcc7298f878e (diff) | |
| parent | 1581631e6286e0ec8178630433e8c15cd7076ead (diff) | |
Merge pull request #38 from PikalaxALT/scrcmd
scrcmd
Diffstat (limited to 'include/overworld.h')
| -rw-r--r-- | include/overworld.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/include/overworld.h b/include/overworld.h index 50ac09d9e..fbea3a4d9 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -35,7 +35,10 @@ 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 SetDynamicWarpWithCoords(int unused, s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); +void SetFixedDiveWarp(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); +void SetFixedHoleWarp(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); +void SetEscapeWarp(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); void sub_8084E2C(s8, s8, s8, s8, s8); @@ -81,11 +84,17 @@ void sub_8055DC4(void); u8 sav1_map_get_name(void); +void SetCurrentMapLayout(u16 mapDataId); +void SetWarpDestinationToFixedHoleWarp(s16 x, s16 y); + +void ResetInitialPlayerAvatarState(void); void sub_8055D40(u16 mapDataId); +void sub_80563F0(void); extern u8 gUnknown_2031DD8; extern u8 gUnknown_2036E28; extern bool8 (* gUnknown_3005024)(void); +void SetLastHealLocationWarp(u8 healLocaionId); #endif //GUARD_ROM4_H |