fix rebase conflicts

5 files changed, 27 insertions, 27 deletions

diff --git a/src/quest_log.c b/src/quest_log.c
index b6707a681..ec864ff02 100644
--- a/src/quest_log.c
+++ b/src/quest_log.c
@@ -571,30 +571,30 @@ static void sub_8110BE8(u8 a0)
 
     sub_815A008(questLog);
 
-    for (i = 0; i < NELEMS(gSaveBlock1Ptr->mapObjectTemplates); i++)
+    for (i = 0; i < NELEMS(gSaveBlock1Ptr->objectEventTemplates); i++)
     {
-        if (gSaveBlock1Ptr->mapObjectTemplates[i].x < 0)
+        if (gSaveBlock1Ptr->objectEventTemplates[i].x < 0)
         {
-            questLog->npcData[i].x = -1 * gSaveBlock1Ptr->mapObjectTemplates[i].x;
+            questLog->npcData[i].x = -1 * gSaveBlock1Ptr->objectEventTemplates[i].x;
             questLog->npcData[i].negx = TRUE;
         }
         else
         {
-            questLog->npcData[i].x = (u8)gSaveBlock1Ptr->mapObjectTemplates[i].x;
+            questLog->npcData[i].x = (u8)gSaveBlock1Ptr->objectEventTemplates[i].x;
             questLog->npcData[i].negx = FALSE;
         }
-        if (gSaveBlock1Ptr->mapObjectTemplates[i].y < 0)
+        if (gSaveBlock1Ptr->objectEventTemplates[i].y < 0)
         {
-            questLog->npcData[i].y = (-gSaveBlock1Ptr->mapObjectTemplates[i].y << 24) >> 24;
+            questLog->npcData[i].y = (-gSaveBlock1Ptr->objectEventTemplates[i].y << 24) >> 24;
             questLog->npcData[i].negy = TRUE;
         }
         else
         {
-            questLog->npcData[i].y = (u8)gSaveBlock1Ptr->mapObjectTemplates[i].y;
+            questLog->npcData[i].y = (u8)gSaveBlock1Ptr->objectEventTemplates[i].y;
             questLog->npcData[i].negy = FALSE;
         }
-        questLog->npcData[i].elevation = gSaveBlock1Ptr->mapObjectTemplates[i].elevation;
-        questLog->npcData[i].movementType = gSaveBlock1Ptr->mapObjectTemplates[i].movementType;
+        questLog->npcData[i].elevation = gSaveBlock1Ptr->objectEventTemplates[i].elevation;
+        questLog->npcData[i].movementType = gSaveBlock1Ptr->objectEventTemplates[i].movementType;
     }
 }
 
@@ -776,18 +776,18 @@ static void sub_8111150(u8 a0)
     for (i = 0; i < 64; i++)
     {
         if (questLog->npcData[i].negx)
-            gSaveBlock1Ptr->mapObjectTemplates[i].x = -questLog->npcData[i].x;
+            gSaveBlock1Ptr->objectEventTemplates[i].x = -questLog->npcData[i].x;
         else
-            gSaveBlock1Ptr->mapObjectTemplates[i].x = questLog->npcData[i].x;
+            gSaveBlock1Ptr->objectEventTemplates[i].x = questLog->npcData[i].x;
         if (questLog->npcData[i].negy)
-            gSaveBlock1Ptr->mapObjectTemplates[i].y = -(u8)questLog->npcData[i].y;
+            gSaveBlock1Ptr->objectEventTemplates[i].y = -(u8)questLog->npcData[i].y;
         else
-            gSaveBlock1Ptr->mapObjectTemplates[i].y = questLog->npcData[i].y;
-        gSaveBlock1Ptr->mapObjectTemplates[i].elevation = questLog->npcData[i].elevation;
-        gSaveBlock1Ptr->mapObjectTemplates[i].movementType = questLog->npcData[i].movementType;
+            gSaveBlock1Ptr->objectEventTemplates[i].y = questLog->npcData[i].y;
+        gSaveBlock1Ptr->objectEventTemplates[i].elevation = questLog->npcData[i].elevation;
+        gSaveBlock1Ptr->objectEventTemplates[i].movementType = questLog->npcData[i].movementType;
     }
 
-    sub_815A1F8(questLog, gSaveBlock1Ptr->mapObjectTemplates);
+    sub_815A1F8(questLog, gSaveBlock1Ptr->objectEventTemplates);
 }
 
 void sub_8111274(u8 a0, u8 a1)
diff --git a/src/quest_log_815A008.c b/src/quest_log_815A008.c
index 234d5ad9c..3aa7ea3d2 100644
--- a/src/quest_log_815A008.c
+++ b/src/quest_log_815A008.c
@@ -51,7 +51,7 @@ void sub_815A008(struct QuestLog * questLog)
 void sub_815A1F8(const struct QuestLog * questLog, const struct ObjectEventTemplate * templates)
 {
     u32 i, j;
-    const struct QuestLogMapObject * questLogObjectEvents = questLog->unk_008;
+    const struct QuestLogObjectEvent * questLogObjectEvents = questLog->unk_008;
 
     CpuFill16(0, gObjectEvents, sizeof(gObjectEvents));
 
@@ -129,7 +129,7 @@ void sub_815A1F8(const struct QuestLog * questLog, const struct ObjectEventTempl
         }
     }
 
-    CpuCopy16(gObjectEvents, gSaveBlock1Ptr->mapObjects, sizeof(gObjectEvents));
+    CpuCopy16(gObjectEvents, gSaveBlock1Ptr->objectEvents, sizeof(gObjectEvents));
 }
 
 void sub_815A540(void)
diff --git a/src/sea_cottage_special_anim.c b/src/sea_cottage_special_anim.c
index 18a8da234..56d01ca29 100644
--- a/src/sea_cottage_special_anim.c
+++ b/src/sea_cottage_special_anim.c
@@ -4,7 +4,7 @@
 #include "menu.h"
 #include "field_player_avatar.h"
 #include "fieldmap.h"
-#include "field_map_obj.h"
+#include "event_object_movement.h"
 #include "field_camera.h"
 
 static EWRAM_DATA u8 gUnknown_2039984 = 0;
diff --git a/src/shop.c b/src/shop.c
index 3df41133d..f4f45eb52 100644
--- a/src/shop.c
+++ b/src/shop.c
@@ -31,7 +31,7 @@
 #include "menu_indicators.h"
 #include "field_player_avatar.h"
 #include "fieldmap.h"
-#include "field_map_obj.h"
+#include "event_object_movement.h"
 #include "money.h"
 #include "quest_log.h"
 #include "script.h"
@@ -743,11 +743,11 @@ static void sub_809B764(void)
 static void BuyMenuDrawMapBg(void)
 {    
     s16 i, j, x, y;
-    const struct MapData *mapData;
+    const struct MapLayout *mapLayout;
     u16 metatile;
     u8 metatileLayerType;
 
-    mapData = gMapHeader.mapData;
+    mapLayout = gMapHeader.mapLayout;
     GetXYCoordsOneStepInFrontOfPlayer(&x, &y);
     x -= 2;
     y -= 3;
@@ -761,11 +761,11 @@ static void BuyMenuDrawMapBg(void)
 
             if (metatile < NUM_METATILES_IN_PRIMARY)
             {
-                BuyMenuDrawMapMetatile(i, j, (u16*)mapData->primaryTileset->metatiles + metatile * 8, metatileLayerType);
+                BuyMenuDrawMapMetatile(i, j, (u16*)mapLayout->primaryTileset->metatiles + metatile * 8, metatileLayerType);
             }
             else
             {
-                BuyMenuDrawMapMetatile(i, j, (u16*)mapData->secondaryTileset->metatiles + ((metatile - NUM_METATILES_IN_PRIMARY) * 8), metatileLayerType);
+                BuyMenuDrawMapMetatile(i, j, (u16*)mapLayout->secondaryTileset->metatiles + ((metatile - NUM_METATILES_IN_PRIMARY) * 8), metatileLayerType);
             }
         }
     }
diff --git a/src/vs_seeker.c b/src/vs_seeker.c
index ca74edcba..209b1623e 100644
--- a/src/vs_seeker.c
+++ b/src/vs_seeker.c
@@ -613,7 +613,7 @@ static void sub_810C3B8(u8 taskId)
 
 void sub_810C444(void)
 {
-    struct ObjectEventTemplate * templates = gSaveBlock1Ptr->mapObjectTemplates;
+    struct ObjectEventTemplate * templates = gSaveBlock1Ptr->objectEventTemplates;
     u8 i;
     u8 r6;
     u8 sp0;
@@ -857,7 +857,7 @@ static void Task_VsSeeker_2(u8 taskId)
 
 static void GatherNearbyTrainerInfo(void)
 {
-    struct ObjectEventTemplate *templates = gSaveBlock1Ptr->mapObjectTemplates;
+    struct ObjectEventTemplate *templates = gSaveBlock1Ptr->objectEventTemplates;
     u8 fieldObjectId = 0;
     u8 vsSeekerObjectIdx = 0;
     s32 mapObjectIdx;
@@ -1223,7 +1223,7 @@ static u8 GetVsSeekerResponseInArea(const VsSeekerData * a0)
 void sub_810CB90(void)
 {
     u8 sp0 = 0;
-    struct ObjectEventTemplate *r4 = gSaveBlock1Ptr->mapObjectTemplates;
+    struct ObjectEventTemplate *r4 = gSaveBlock1Ptr->objectEventTemplates;
     s32 r9 = sub_810CE10(sVsSeekerData, gTrainerBattleOpponent_A);
 
     if (r9 != -1)