Rename map attribute structs to MapLayout

1 files changed, 26 insertions, 26 deletions

diff --git a/src/overworld.c b/src/overworld.c
index 47e23ad35..6a44afb04 100644
--- a/src/overworld.c
+++ b/src/overworld.c
@@ -86,7 +86,7 @@ extern u8 TradeRoom_PromptToCancelLink[];
 extern u8 TradeRoom_TerminateLink[];
 extern u8 gUnknown_081A4508[];
 
-extern struct MapData * const gMapAttributes[];
+extern struct MapLayout * const gMapLayouts[];
 extern struct MapHeader * const * const gMapGroups[];
 extern s32 gMaxFlashLevel;
 
@@ -336,17 +336,17 @@ void Overworld_SetEventObjTemplateMovementType(u8 localId, u8 movementType)
 static void mapdata_load_assets_to_gpu_and_full_redraw(void)
 {
     move_tilemap_camera_to_upper_left_corner();
-    copy_map_tileset1_tileset2_to_vram(gMapHeader.mapData);
-    apply_map_tileset1_tileset2_palette(gMapHeader.mapData);
+    copy_map_tileset1_tileset2_to_vram(gMapHeader.mapLayout);
+    apply_map_tileset1_tileset2_palette(gMapHeader.mapLayout);
     DrawWholeMapView();
     cur_mapheader_run_tileset_funcs_after_some_cpuset();
 }
 
-static struct MapData *get_mapdata_header(void)
+static struct MapLayout *GetMapLayout(void)
 {
-    u16 mapDataId = gSaveBlock1.mapDataId;
-    if (mapDataId)
-        return gMapAttributes[mapDataId - 1];
+    u16 mapLayoutId = gSaveBlock1.mapLayoutId;
+    if (mapLayoutId)
+        return gMapLayouts[mapLayoutId - 1];
     return NULL;
 }
 
@@ -395,14 +395,14 @@ struct MapHeader *const warp1_get_mapheader(void)
 static void set_current_map_header_from_sav1_save_old_name(void)
 {
     gMapHeader = *Overworld_GetMapHeaderByGroupAndId(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum);
-    gSaveBlock1.mapDataId = gMapHeader.mapDataId;
-    gMapHeader.mapData = get_mapdata_header();
+    gSaveBlock1.mapLayoutId = gMapHeader.mapLayoutId;
+    gMapHeader.mapLayout = GetMapLayout();
 }
 
 static void LoadSaveblockMapHeader(void)
 {
     gMapHeader = *Overworld_GetMapHeaderByGroupAndId(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum);
-    gMapHeader.mapData = get_mapdata_header();
+    gMapHeader.mapLayout = GetMapLayout();
 }
 
 void sub_80533CC(void)
@@ -419,8 +419,8 @@ void sub_80533CC(void)
     }
     else
     {
-        gSaveBlock1.pos.x = gMapHeader.mapData->width / 2;
-        gSaveBlock1.pos.y = gMapHeader.mapData->height / 2;
+        gSaveBlock1.pos.x = gMapHeader.mapLayout->width / 2;
+        gSaveBlock1.pos.y = gMapHeader.mapLayout->height / 2;
     }
 }
 
@@ -608,8 +608,8 @@ void sub_80538F0(u8 mapGroup, u8 mapNum)
     Overworld_ClearSavedMusic();
     mapheader_run_script_with_tag_x3();
     not_trainer_hill_battle_pyramid();
-    sub_8056D38(gMapHeader.mapData);
-    apply_map_tileset2_palette(gMapHeader.mapData);
+    sub_8056D38(gMapHeader.mapLayout);
+    apply_map_tileset2_palette(gMapHeader.mapLayout);
 
     for (paletteIndex = 6; paletteIndex < 12; paletteIndex++)
         ApplyWeatherGammaShiftToPal(paletteIndex);
@@ -784,10 +784,10 @@ u8 Overworld_GetFlashLevel(void)
     return gSaveBlock1.flashLevel;
 }
 
-void sub_8053D14(u16 mapDataId)
+void sub_8053D14(u16 mapLayoutId)
 {
-    gSaveBlock1.mapDataId = mapDataId;
-    gMapHeader.mapData = get_mapdata_header();
+    gSaveBlock1.mapLayoutId = mapLayoutId;
+    gMapHeader.mapLayout = GetMapLayout();
 }
 
 static bool16 ShouldLegendaryMusicPlayAtLocation(struct WarpData *warp)
@@ -1558,15 +1558,15 @@ bool32 sub_805483C(u8 *a1)
         (*a1)++;
         break;
     case 6:
-        sub_8056D28(gMapHeader.mapData);
+        sub_8056D28(gMapHeader.mapLayout);
         (*a1)++;
         break;
     case 7:
-        sub_8056D38(gMapHeader.mapData);
+        sub_8056D38(gMapHeader.mapLayout);
         (*a1)++;
         break;
     case 8:
-        apply_map_tileset1_tileset2_palette(gMapHeader.mapData);
+        apply_map_tileset1_tileset2_palette(gMapHeader.mapLayout);
         (*a1)++;
         break;
     case 9:
@@ -1624,15 +1624,15 @@ bool32 sub_805493C(u8 *a1, u32 a2)
         (*a1)++;
         break;
     case 6:
-        sub_8056D28(gMapHeader.mapData);
+        sub_8056D28(gMapHeader.mapLayout);
         (*a1)++;
         break;
     case 7:
-        sub_8056D38(gMapHeader.mapData);
+        sub_8056D38(gMapHeader.mapLayout);
         (*a1)++;
         break;
     case 8:
-        apply_map_tileset1_tileset2_palette(gMapHeader.mapData);
+        apply_map_tileset1_tileset2_palette(gMapHeader.mapLayout);
         (*a1)++;
         break;
     case 9:
@@ -1714,15 +1714,15 @@ bool32 sub_8054A9C(u8 *a1)
         (*a1)++;
         break;
     case 5:
-        sub_8056D28(gMapHeader.mapData);
+        sub_8056D28(gMapHeader.mapLayout);
         (*a1)++;
         break;
     case 6:
-        sub_8056D38(gMapHeader.mapData);
+        sub_8056D38(gMapHeader.mapLayout);
         (*a1)++;
         break;
     case 7:
-        apply_map_tileset1_tileset2_palette(gMapHeader.mapData);
+        apply_map_tileset1_tileset2_palette(gMapHeader.mapLayout);
         (*a1)++;
         break;
     case 8: