diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-05-09 15:30:21 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-05-09 15:30:21 -0400 |
| commit | 4470f77b3d3cc7bcd646f8ef6511680da1887214 (patch) | |
| tree | 32011d5fcf74dfb47aab7ea8ecbb87731200bbf3 /include/overworld.h | |
| parent | 1b525ba7f944055462442e37ff4a91c3d11b21b9 (diff) | |
| parent | e01253ebe1b527cd2df555e43427c8e54ed32196 (diff) | |
Merge branch 'master' into mauville_old_man
Diffstat (limited to 'include/overworld.h')
| -rw-r--r-- | include/overworld.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/overworld.h b/include/overworld.h index cd0f4e60f..59d4d6a30 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -44,8 +44,8 @@ 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 warp_data_is_not_neg_1(struct WarpData *warp); -const struct MapHeader *Overworld_GetMapHeaderByGroupAndId(u16 mapGroup, u16 mapNum); -const struct MapHeader *warp1_get_mapheader(void); +struct MapHeader const *const Overworld_GetMapHeaderByGroupAndId(u16 mapGroup, u16 mapNum); +struct MapHeader const *const warp1_get_mapheader(void); void set_current_map_header_from_sav1_save_old_name(void); void LoadSaveblockMapHeader(void); void update_camera_pos_from_warpid(void); |