fix merge conflicts

1 files changed, 1 insertions, 21 deletions

diff --git a/include/global.h b/include/global.h
index 744d23eb3..8e5d90964 100644
--- a/include/global.h
+++ b/include/global.h
@@ -206,26 +206,6 @@ struct LinkBattleRecords
 #include "global.berry.h"
 #include "pokemon.h"
 
-struct UnknownSaveBlock2Struct
-{
-    u8 field_0;
-    u8 field_1;
-    u8 field_2[2];
-    u8 field_4[8];
-    u8 field_C[16];
-    u16 field_1C[6];
-    u16 field_28[6];
-    u8 field_34[176];
-    u8 field_E4;
-    u8 field_E5;
-    u8 field_E6;
-    u8 field_E7;
-    u8 field_E8;
-    u8 field_E9;
-    u8 field_EA;
-    u8 field_EB;
-}; // sizeof = 0xEC
-
 struct BattleTowerRecord // record mixing
 {
     /*0x00*/ u8 battleTowerLevelType; // 0 = level 50, 1 = level 100
@@ -742,7 +722,7 @@ struct SaveBlock1
     /*0x000C*/ struct WarpData warp1;
     /*0x0014*/ struct WarpData warp2;
     /*0x001C*/ struct WarpData lastHealLocation;
-    /*0x0024*/ struct WarpData warp4;
+    /*0x0024*/ struct WarpData escapeWarp;
     /*0x002C*/ u16 savedMusic;
     /*0x002E*/ u8 weather;
     /*0x002F*/ u8 filler_2F;