fix merge conflicts

1 files changed, 30 insertions, 23 deletions

diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index 0b72bbec5..b8bab45d8 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -44,23 +44,30 @@ typedef void (*TilesetCB)(void);
 
 struct Tileset
 {
-    bool8 isCompressed;
-    bool8 isSecondary;
-    void *tiles;
-    void *palettes;
-    void *metatiles;
-    void *metatileAttributes;
-    TilesetCB callback;
+    /*0x00*/ bool8 isCompressed;
+    /*0x01*/ bool8 isSecondary;
+    /*0x04*/ void *tiles;
+    /*0x08*/ void *palettes;
+    /*0x0c*/ void *metatiles;
+    /*0x10*/ void *metatileAttributes;
+    /*0x14*/ TilesetCB callback;
 };
 
 struct MapData
 {
+    /*0x00*/ s32 width;
+    /*0x04*/ s32 height;
+    /*0x08*/ u16 *border;
+    /*0x0c*/ u16 *map;
+    /*0x10*/ struct Tileset *primaryTileset;
+    /*0x14*/ struct Tileset *secondaryTileset;
+};
+
+struct BackupMapData
+{
     s32 width;
     s32 height;
-    u16 *border;
     u16 *map;
-    struct Tileset *primaryTileset;
-    struct Tileset *secondaryTileset;
 };
 
 struct MapObjectTemplate
@@ -153,20 +160,20 @@ struct MapConnections
 
 struct MapHeader
 {
-    struct MapData *mapData;
-    struct MapEvents *events;
-    u8 *mapScripts;
-    struct MapConnections *connections;
-    u16 music;
-    u16 mapDataId;
-    u8 name;
-    u8 cave;
-    u8 weather;
+    /* 0x00 */ struct MapData *mapData;
+    /* 0x04 */ struct MapEvents *events;
+    /* 0x08 */ u8 *mapScripts;
+    /* 0x0C */ struct MapConnections *connections;
+    /* 0x10 */ u16 music;
+    /* 0x12 */ u16 mapDataId;
+    /* 0x14 */ u8 name;
+    /* 0x15 */ u8 cave;
+    /* 0x16 */ u8 weather;
     /* 0x17 */ u8 mapType;
-    u8 filler_18;
-    u8 escapeRope;
-    u8 flags;
-    u8 battleType;
+    /* 0x18 */ u8 filler_18;
+    /* 0x19 */ u8 escapeRope;
+    /* 0x1A */ u8 flags;
+    /* 0x1B */ u8 battleType;
 };
 
 struct MapObject