Merge branch 'master' into rename-tablecmds

1 files changed, 16 insertions, 33 deletions

diff --git a/include/ereader_helpers.h b/include/ereader_helpers.h
index bcbb68d4f..8dc3b907a 100755
--- a/include/ereader_helpers.h
+++ b/include/ereader_helpers.h
@@ -1,51 +1,34 @@
 #ifndef GUARD_EREADER_HELPERS_H
 #define GUARD_EREADER_HELPERS_H
 
-struct Unk81D38FC
+#include "trainer_hill.h"
+
+struct EReaderTrainerHillTrainer
 {
     u8 unk0;
-    u8 filler_1[3];
-    u8 unk4[0x148];
-    u8 unk14C[0x124];
-    int checksum;
-};
+    struct TrainerHillTrainer unk4;
+    struct TrHillDisplay unk14C;
+    u32 checksum;
+}; // size=0x274
 
 struct EReaderTrainerHillSet
 {
-    u8 unk_0;
-    u8 unk_1;
-    u8 unk_2;
-    u8 unk_3;
-    int checksum;
-    struct Unk81D38FC unk_8[6];
+    u8 count;
+    u8 id;
+    u16 dummy;
+    u32 checksum;
+    struct EReaderTrainerHillTrainer unk_8[6];
     u8 unk_ec0[40];
-};
-
-struct Unk81D3998Sub
-{
-    u8 unk_000[4];
-    u8 unk_004[0x148];
-    u8 unk_14C[0x148];
-    u8 unk_294[0x124];
-};
-
-struct Unk81D3998
-{
-    u8 unk_000;
-    u8 unk_001;
-    u8 unk_002;
-    int checksum;
-    struct Unk81D3998Sub unk_008[4];
-};
+}; // size = 0xf00
 
 bool8 EReader_IsReceivedDataValid(struct EReaderTrainerHillSet *buffer);
 bool32 TryWriteTrainerHill(struct EReaderTrainerHillSet *arg0);
 bool32 ReadTrainerHillAndValidate(void);
-int sub_81D3D70(u8, u32, u32*, u32*);
+int EReaderHandleTransfer(u8, u32, u32*, u32*);
 void sub_81D3F9C(void);
 void sub_81D3FAC(void);
-void sub_81D41A0(void);
-void sub_81D41F4(void);
+void EReaderHelper_SaveRegsState(void);
+void EReaderHelper_RestoreRegsState(void);
 void sub_81D4238(void);
 
 #endif // GUARD_EREADER_HELPERS_H