Merge branch 'master' into pokenav-decomp-again

1 files changed, 14 insertions, 15 deletions

diff --git a/include/global.h b/include/global.h
index cc308c3c9..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
 };
@@ -870,13 +870,12 @@ struct SaveBlock1
     /*0x2BA1*/ u8 outbreakPokemonProbability;
     /*0x2BA2*/ u16 outbreakDaysLeft;
     /*0x2BA4*/ struct GabbyAndTyData gabbyAndTyData;
-    /*0x2BB0*/ u16 unk2BB0[6];
-    /*0x2BBC*/ u16 unk2BBC[6];
-    /*0x2BC8*/ u16 unk2BC8[6];
-    /*0x2BD4*/ u16 unk2BD4[6];
+    /*0x2BB0*/ u16 easyChatProfile[6];
+    /*0x2BBC*/ u16 easyChatBattleStart[6];
+    /*0x2BC8*/ u16 easyChatBattleWon[6];
+    /*0x2BD4*/ u16 easyChatBattleLost[6];
     /*0x2BE0*/ struct MailStruct mail[MAIL_COUNT];
-    /*0x2E20*/ u8 additionalPhrases[5]; // bitfield for 33 additional phrases in easy chat system
-    /*0x2E25*/ u8 unk2E25[3]; // possibly padding?
+    /*0x2E20*/ u8 additionalPhrases[8]; // bitfield for 33 additional phrases in easy chat system
     /*0x2E28*/ OldMan oldMan;
     /*0x2e64*/ struct EasyChatPair easyChatPairs[5]; //Dewford trend [0] and some other stuff
     /*0x2e90*/ struct ContestWinner contestWinners[13]; // 0 - 5 used in contest hall, 6 - 7 unused?, 8 - 12 museum
@@ -907,13 +906,13 @@ struct MapPosition
     s8 height;
 };
 
-struct UnkStruct_8054FF8
+struct TradeRoomPlayer
 {
-    u8 a;
-    u8 b;
+    u8 playerId;
+    u8 isLocalPlayer;
     u8 c;
-    u8 d;
-    struct MapPosition sub;
+    u8 facing;
+    struct MapPosition pos;
     u16 field_C;
 };