From 7a0edab5732b816536a35b0556d8fa1db13afa30 Mon Sep 17 00:00:00 2001
From: garak <garakmon@gmail.com>
Date: Thu, 12 Dec 2019 16:10:45 -0500
Subject: fix rebase conflicts

---
 include/global.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/global.h b/include/global.h
index ea94512f7..abc41a9de 100644
--- a/include/global.h
+++ b/include/global.h
@@ -745,7 +745,7 @@ struct SaveBlock1
     /*0x0638*/ u16 trainerRematchStepCounter;
     /*0x063A*/ u8 ALIGNED(2) trainerRematches[100];
     /*0x06A0*/ struct ObjectEvent objectEvents[MAP_OBJECTS_COUNT];
-    /*0x08E0*/ struct ObjectEventTemplate mapObjectTemplates[64];
+    /*0x08E0*/ struct ObjectEventTemplate objectEventTemplates[64];
     /*0x0EE0*/ u8 flags[FLAGS_COUNT];
     /*0x1000*/ u16 vars[VARS_COUNT];
     /*0x1200*/ u32 gameStats[NUM_GAME_STATS];
-- 
cgit v1.2.3