4 files changed, 9 insertions, 10 deletions
diff --git a/include/fieldmap.h b/include/fieldmap.h
index a85f5b101..e77342b72 100644
--- a/include/fieldmap.h
+++ b/include/fieldmap.h
@@ -2,7 +2,7 @@
 #define GUARD_FIELDMAP2_H
 #include "event_object_movement.h"
 
-extern struct BackupMapData gUnknown_03004870;
+extern struct BackupMapLayout gUnknown_03004870;
 struct MapHeader *mapconnection_get_mapheader(struct MapConnection *connection);
 int GetMapBorderIdAt(int x, int y);
 int CanCameraMoveInDirection(int direction);
@@ -35,9 +35,9 @@ struct MapConnection *sub_8056BA0(s16 x, s16 y); // fieldmap.c
 void sub_8056C50(u16, u16);
 void sav1_camera_get_focus_coords(u16 *x, u16 *y);
 void GetCameraCoords(u16*, u16*);
-void sub_8056D28(struct MapData *pData);
-void sub_8056D38(struct MapData *pData);
-void apply_map_tileset2_palette(struct MapData *pData);
+void sub_8056D28(struct MapLayout *pData);
+void sub_8056D38(struct MapLayout *pData);
+void apply_map_tileset2_palette(struct MapLayout *pData);
 void copy_map_tileset1_tileset2_to_vram(/*TODO: arg types*/);
 void apply_map_tileset1_tileset2_palette(/*TODO: arg types*/);
 
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index dc8558146..799a12a19 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -53,7 +53,7 @@ struct Tileset
     /*0x14*/ TilesetCB callback;
 };
 
-struct MapData
+struct MapLayout
 {
     /*0x00*/ s32 width;
     /*0x04*/ s32 height;
@@ -63,7 +63,7 @@ struct MapData
     /*0x14*/ struct Tileset *secondaryTileset;
 };
 
-struct BackupMapData
+struct BackupMapLayout
 {
     s32 width;
     s32 height;
@@ -157,12 +157,12 @@ struct MapConnections
 
 struct MapHeader
 {
-    /* 0x00 */ struct MapData *mapData;
+    /* 0x00 */ struct MapLayout *mapLayout;
     /* 0x04 */ struct MapEvents *events;
     /* 0x08 */ u8 *mapScripts;
     /* 0x0C */ struct MapConnections *connections;
     /* 0x10 */ u16 music;
-    /* 0x12 */ u16 mapDataId;
+    /* 0x12 */ u16 mapLayoutId;
     /* 0x14 */ u8 regionMapSectionId;
     /* 0x15 */ u8 cave;
     /* 0x16 */ u8 weather;
diff --git a/include/global.h b/include/global.h
index 0f015745b..3c0169606 100644
--- a/include/global.h
+++ b/include/global.h
@@ -649,7 +649,7 @@ struct SaveBlock1 /* 0x02025734 */
     /*0x2E*/ u8 weather;
     /*0x2F*/ u8 weatherCycleStage;
     /*0x30*/ u8 flashLevel;  // flash level on current map, 0 being normal and 4 being the darkest
-    /*0x32*/ u16 mapDataId;
+    /*0x32*/ u16 mapLayoutId;
     /*0x34*/ u16 mapView[0x100];
     /*0x234*/ u8 playerPartyCount;
     /*0x238*/ struct Pokemon playerParty[6];
diff --git a/include/overworld.h b/include/overworld.h
index de817e8e0..b499f55aa 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -42,7 +42,6 @@ void SetGameStat(u8, u32);
 void Overworld_SetEventObjTemplateCoords(u8, s16, s16);
 void Overworld_SetEventObjTemplateMovementType(u8, u8);
 // mapdata_load_assets_to_gpu_and_full_redraw
-// get_mapdata_header
 // ApplyCurrentWarp
 // SetWarpData
 // warp_data_is_not_neg_1