Merge branch 'master' into extern-cleanup

1 files changed, 4 insertions, 4 deletions

diff --git a/include/global.h b/include/global.h
index 8737c6388..1f9ac5185 100644
--- a/include/global.h
+++ b/include/global.h
@@ -795,15 +795,15 @@ struct TrainerNameRecord
 
 struct SaveTrainerHill
 {
-    /*0x3D64*/ u32 field_3D64;
-    /*0x3D68*/ u32 field_3D68;
+    /*0x3D64*/ u32 timer;
+    /*0x3D68*/ u32 bestTime;
     /*0x3D6C*/ u8 field_3D6C;
     /*0x3D6D*/ u8 unused;
     /*0x3D6E*/ u16 field_3D6E_0a:1; // 1
     /*0x3D6E*/ u16 field_3D6E_0b:1; // 2
     /*0x3D6E*/ u16 field_3D6E_0c:1; // 4
-    /*0x3D6E*/ u16 field_3D6E_0d:1; // 8
-    /*0x3D6E*/ u16 field_3D6E_0e:1; // x10
+    /*0x3D6E*/ u16 hasLost:1; // 8
+    /*0x3D6E*/ u16 maybeECardScanDuringChallenge:1; // x10
     /*0x3D6E*/ u16 field_3D6E_0f:1; // x20
     /*0x3D6E*/ u16 tag:2; // x40, x80 = xC0
 };