fix rebase conflicts

2019-12-12 16:10:45 -05:00
parent fc13e1ef6f
commit 7a0edab573
6 changed files with 28 additions and 28 deletions
@@ -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];