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 /src/overworld.c | |
| parent | 1b525ba7f944055462442e37ff4a91c3d11b21b9 (diff) | |
| parent | e01253ebe1b527cd2df555e43427c8e54ed32196 (diff) | |
Merge branch 'master' into mauville_old_man
Diffstat (limited to 'src/overworld.c')
| -rw-r--r-- | src/overworld.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/overworld.c b/src/overworld.c index 532615f27..f42f0db7f 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -137,7 +137,6 @@ extern void trainer_hill_map_load_related(void); extern void sub_8087D74(void); extern void battle_pyramid_map_load_related(u8); extern void sub_80B00E8(u8); -extern void UpdateTVScreensOnMap(u32, u32); extern void sub_80E9238(u8); extern void sub_81A3908(void); extern void sub_81AA2F8(void); @@ -614,12 +613,12 @@ bool32 warp_data_is_not_neg_1(struct WarpData *warp) return TRUE; } -const struct MapHeader *Overworld_GetMapHeaderByGroupAndId(u16 mapGroup, u16 mapNum) +struct MapHeader const *const Overworld_GetMapHeaderByGroupAndId(u16 mapGroup, u16 mapNum) { return gMapGroups[mapGroup][mapNum]; } -const struct MapHeader *warp1_get_mapheader(void) +struct MapHeader const *const warp1_get_mapheader(void) { return Overworld_GetMapHeaderByGroupAndId(sWarpDestination.mapGroup, sWarpDestination.mapNum); } |