diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-11-12 19:22:23 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-11-12 19:22:23 +0100 |
| commit | b5ea69cf74e24ab2b09572b3324ac4b3bbd8818a (patch) | |
| tree | cca355371fd2cdd9d9b6fd86c266a500837123a8 /include/overworld.h | |
| parent | 734403fdfafd1dc4b738f98158dcec45bb01f58b (diff) | |
| parent | 54ad6794bce3ee534aa78a8c6e7f32715cd8f6a9 (diff) | |
Fix conflicts
Diffstat (limited to 'include/overworld.h')
| -rw-r--r-- | include/overworld.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/overworld.h b/include/overworld.h index 3dce20ab2..6b38a8782 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -47,13 +47,13 @@ void Overworld_SetEventObjTemplateMovementType(u8 localId, u8 movementType); const struct MapLayout *GetMapLayout(void); void ApplyCurrentWarp(void); void set_warp2_warp3_to_neg_1(void); -void SetWarpData(struct WarpData *warp, s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); -bool32 IsDummyWarp(struct WarpData *warp); +static void SetWarpData(struct WarpData *warp, s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); +static bool32 IsDummyWarp(struct WarpData *warp); struct MapHeader const *const Overworld_GetMapHeaderByGroupAndId(u16 mapGroup, u16 mapNum); struct MapHeader const *const GetDestinationWarpMapHeader(void); -void LoadCurrentMapData(void); -void LoadSaveblockMapHeader(void); -void SetPlayerCoordsFromWarp(void); +static void LoadCurrentMapData(void); +static void LoadSaveblockMapHeader(void); +static void SetPlayerCoordsFromWarp(void); void WarpIntoMap(void); void Overworld_SetWarpDestination(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); void warp1_set_2(s8 mapGroup, s8 mapNum, s8 warpId); @@ -67,7 +67,7 @@ void sub_8084D5C(s16 a1, s16 a2); void sub_8084DD4(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); void sub_8084E14(void); void SetFixedDiveWarp(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); -void SetFixedDiveWarpAsDestination(void); +static void SetFixedDiveWarpAsDestination(void); void SetFixedHoleWarp(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); void SetFixedHoleWarpAsDestination(s16 x, s16 y); void warp1_set_to_sav1w(void); @@ -75,7 +75,7 @@ void sub_8084F2C(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); void sub_8084F6C(u8 a1); void sub_8084FAC(void); const struct MapConnection *GetMapConnection(u8 dir); -bool8 SetDiveWarp(u8 dir, u16 x, u16 y); +static bool8 SetDiveWarp(u8 dir, u16 x, u16 y); bool8 SetDiveWarpEmerge(u16 x, u16 y); bool8 SetDiveWarpDive(u16 x, u16 y); void mliX_load_map(u8 mapGroup, u8 mapNum); @@ -105,7 +105,7 @@ void UpdateAmbientCry(s16 *state, u16 *delayCounter); u8 GetMapTypeByGroupAndId(s8 mapGroup, s8 mapNum); u8 GetMapTypeByWarpData(struct WarpData *warp); u8 Overworld_GetMapTypeOfSaveblockLocation(void); -u8 get_map_light_from_warp0(void); +u8 GetLastUsedWarpMapType(void); bool8 is_map_type_1_2_3_5_or_6(u8 mapType); bool8 Overworld_MapTypeAllowsTeleportAndFly(u8 mapType); bool8 Overworld_MapTypeIsIndoors(u8 mapType); |