Merge branch 'master' into decompile_battle_tent

6 files changed, 20 insertions, 20 deletions

diff --git a/include/constants/maps.h b/include/constants/maps.h
index f6096e1c5..bcb778422 100644
--- a/include/constants/maps.h
+++ b/include/constants/maps.h
@@ -250,11 +250,11 @@
 #define MAP_EVER_GRANDE_CITY_GLACIAS_ROOM      (2 | (16 << 8))
 #define MAP_EVER_GRANDE_CITY_DRAKES_ROOM       (3 | (16 << 8))
 #define MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM    (4 | (16 << 8))
-#define MAP_EVER_GRANDE_CITY_CORRIDOR1         (5 | (16 << 8))
-#define MAP_EVER_GRANDE_CITY_CORRIDOR2         (6 | (16 << 8))
-#define MAP_EVER_GRANDE_CITY_CORRIDOR3         (7 | (16 << 8))
-#define MAP_EVER_GRANDE_CITY_CORRIDOR4         (8 | (16 << 8))
-#define MAP_EVER_GRANDE_CITY_CORRIDOR5         (9 | (16 << 8))
+#define MAP_EVER_GRANDE_CITY_HALL1         (5 | (16 << 8))
+#define MAP_EVER_GRANDE_CITY_HALL2         (6 | (16 << 8))
+#define MAP_EVER_GRANDE_CITY_HALL3         (7 | (16 << 8))
+#define MAP_EVER_GRANDE_CITY_HALL4         (8 | (16 << 8))
+#define MAP_EVER_GRANDE_CITY_HALL5         (9 | (16 << 8))
 #define MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F (10 | (16 << 8))
 #define MAP_EVER_GRANDE_CITY_HALL_OF_FAME      (11 | (16 << 8))
 #define MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F (12 | (16 << 8))
@@ -327,9 +327,9 @@
 #define MAP_SEAFLOOR_CAVERN_ROOM9                 (36 | (24 << 8))
 #define MAP_CAVE_OF_ORIGIN_ENTRANCE               (37 | (24 << 8))
 #define MAP_CAVE_OF_ORIGIN_1F                     (38 | (24 << 8))
-#define MAP_CAVE_OF_ORIGIN_UNUSED_RS_B1F          (39 | (24 << 8))  //
-#define MAP_CAVE_OF_ORIGIN_UNUSED_RS_B2F          (40 | (24 << 8))  // Ruby/Sapphire leftovers
-#define MAP_CAVE_OF_ORIGIN_UNUSED_RS_B3F          (41 | (24 << 8))  //
+#define MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1          (39 | (24 << 8))  //
+#define MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2          (40 | (24 << 8))  // Ruby/Sapphire leftovers
+#define MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3          (41 | (24 << 8))  //
 #define MAP_CAVE_OF_ORIGIN_B1F                    (42 | (24 << 8))
 #define MAP_VICTORY_ROAD_1F                       (43 | (24 << 8))
 #define MAP_VICTORY_ROAD_B1F                      (44 | (24 << 8))
@@ -570,8 +570,8 @@
 #define MAP_ROUTE110_TRICK_HOUSE_PUZZLE6                 (8 | (29 << 8))
 #define MAP_ROUTE110_TRICK_HOUSE_PUZZLE7                 (9 | (29 << 8))
 #define MAP_ROUTE110_TRICK_HOUSE_PUZZLE8                 (10 | (29 << 8))
-#define MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE (11 | (29 << 8))
-#define MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE (12 | (29 << 8))
+#define MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE (11 | (29 << 8))
+#define MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE (12 | (29 << 8))
 
 // Map Group 30
 #define MAP_ROUTE113_GLASS_WORKSHOP (0 | (30 << 8))
diff --git a/include/fieldmap.h b/include/fieldmap.h
index 01218493a..05ffb2edc 100644
--- a/include/fieldmap.h
+++ b/include/fieldmap.h
@@ -1,7 +1,7 @@
 #ifndef GUARD_FIELDMAP_H
 #define GUARD_FIELDMAP_H
 
-extern struct BackupMapData gUnknown_03005DC0;
+extern struct BackupMapLayout gUnknown_03005DC0;
 
 u32 MapGridGetMetatileIdAt(int, int);
 u32 MapGridGetMetatileBehaviorAt(int, int);
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index 7b38f9ddc..5b2944a2b 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -55,7 +55,7 @@ struct Tileset
     /*0x14*/ TilesetCB callback;
 };
 
-struct MapData
+struct MapLayout
 {
     /*0x00*/ s32 width;
     /*0x04*/ s32 height;
@@ -65,7 +65,7 @@ struct MapData
     /*0x14*/ struct Tileset *secondaryTileset;
 };
 
-struct BackupMapData
+struct BackupMapLayout
 {
     s32 width;
     s32 height;
@@ -160,12 +160,12 @@ struct MapConnections
 
 struct MapHeader
 {
-    /* 0x00 */ const struct MapData *mapData;
+    /* 0x00 */ const struct MapLayout *mapLayout;
     /* 0x04 */ const struct MapEvents *events;
     /* 0x08 */ const u8 *mapScripts;
     /* 0x0C */ const 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 b877592bd..49d0370f1 100644
--- a/include/global.h
+++ b/include/global.h
@@ -785,7 +785,7 @@ struct SaveBlock1
     /*0x2E*/ u8 weather;
     /*0x2F*/ u8 filler_2F;
     /*0x30*/ u8 flashLevel;
-    /*0x32*/ u16 mapDataId;
+    /*0x32*/ u16 mapLayoutId;
     /*0x34*/ u16 mapView[0x100];
     /*0x234*/ u8 playerPartyCount;
     /*0x238*/ struct Pokemon playerParty[PARTY_SIZE];
diff --git a/include/global.tv.h b/include/global.tv.h
index 81f181cf3..805922d5c 100644
--- a/include/global.tv.h
+++ b/include/global.tv.h
@@ -301,7 +301,7 @@ typedef union // size = 0x24
         /*0x06*/ u8 nGoldSymbols;
         /*0x07*/ u8 location;
         /*0x08*/ u16 battlePoints;
-        /*0x0a*/ u16 mapDataId;
+        /*0x0a*/ u16 mapLayoutId;
         /*0x0c*/ u8 language;
         /*0x0d*/ u8 filler_0d[6];
         /*0x13*/ u8 playerName[8];
@@ -326,7 +326,7 @@ typedef union // size = 0x24
         /*0x02*/ u16 item;
         /*0x04*/ u8 location;
         /*0x05*/ u8 language;
-        /*0x06*/ u16 mapDataId;
+        /*0x06*/ u16 mapLayoutId;
         /*0x08*/ u8 filler_08[11];
         /*0x13*/ u8 playerName[8];
     } treasureInvestigators;
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);