diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-03-19 11:00:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-19 11:00:32 -0400 |
| commit | 33b65b547000387fcdce9fe497da9b217544ece6 (patch) | |
| tree | 0c1754c67d188776ee1942fcca503ad8e1e19f05 /include/overworld.h | |
| parent | 715c2ff3ad3a7842a97a2b221f4c02135a813139 (diff) | |
| parent | a8403c07790b1031c96ff35a1701e1684919ed95 (diff) | |
Merge pull request #307 from PikalaxALT/field_control_avatar
Field control avatar
Diffstat (limited to 'include/overworld.h')
| -rw-r--r-- | include/overworld.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/include/overworld.h b/include/overworld.h index 37274dfb4..bd4dda9b6 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -72,7 +72,7 @@ void Overworld_SetMapObjTemplateMovementType(u8, u8); void SetWarpDestination(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); -void saved_warp2_set(int unused, s8 mapGroup, s8 mapNum, s8 warpId); +void SetDynamicWarp(int unused, s8 mapGroup, s8 mapNum, s8 warpId); 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); @@ -110,9 +110,9 @@ void WarpIntoMap(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 mapGroup, s8 mapNum, s8 warpNum); +void SetWarpDestinationToMapWarp(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 SetWarpDestinationToDynamicWarp(u8 unused); void mapldr_default(void); u32 GetGameStat(u8 statId); @@ -194,6 +194,10 @@ void SetMainCallback1(MainCallback cb); void CB1_Overworld(void); void sub_80568C4(void); u8 GetLastUsedWarpMapSectionId(void); +void StoreInitialPlayerAvatarState(void); +void UpdateEscapeWarp(s16 x, s16 y); +bool8 SetDiveWarpEmerge(u16 x, u16 y); +bool8 SetDiveWarpDive(u16 x, u16 y); extern u16 *gBGTilemapBuffers1; extern u16 *gBGTilemapBuffers2; |