merge with battle tent update

1 files changed, 2 insertions, 2 deletions

diff --git a/include/overworld.h b/include/overworld.h
index a81f10b0d..6869d7084 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -41,7 +41,7 @@ void LoadEventObjTemplatesFromHeader(void);
 void LoadSaveblockEventObjScripts(void);
 void Overworld_SetEventObjTemplateCoords(u8 localId, s16 x, s16 y);
 void Overworld_SetEventObjTemplateMovementType(u8 localId, u8 movementType);
-const struct MapData *get_mapdata_header(void);
+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);
@@ -82,7 +82,7 @@ bool32 Overworld_IsBikingAllowed(void);
 void SetDefaultFlashLevel(void);
 void Overworld_SetFlashLevel(s32 flashLevel);
 u8 Overworld_GetFlashLevel(void);
-void sub_8085524(u16 mapDataId);
+void sub_8085524(u16 mapLayoutId);
 void sub_8085540(u8 var);
 u8 sub_808554C(void);
 u16 GetLocationMusic(struct WarpData *warp);