Minor refactor of ereader_helpers.c

2 files changed, 24 insertions, 9 deletions

diff --git a/include/ereader_helpers.h b/include/ereader_helpers.h
index bcbb68d4f..2e77767aa 100755
--- a/include/ereader_helpers.h
+++ b/include/ereader_helpers.h
@@ -1,22 +1,23 @@
 #ifndef GUARD_EREADER_HELPERS_H
 #define GUARD_EREADER_HELPERS_H
 
+#include "trainer_hill.h"
+
 struct Unk81D38FC
 {
     u8 unk0;
     u8 filler_1[3];
     u8 unk4[0x148];
     u8 unk14C[0x124];
-    int checksum;
+    u32 checksum;
 };
 
 struct EReaderTrainerHillSet
 {
-    u8 unk_0;
-    u8 unk_1;
-    u8 unk_2;
-    u8 unk_3;
-    int checksum;
+    u8 count;
+    u8 id;
+    u16 dummy;
+    u32 checksum;
     struct Unk81D38FC unk_8[6];
     u8 unk_ec0[40];
 };
@@ -41,11 +42,11 @@ struct Unk81D3998
 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
diff --git a/include/trainer_hill.h b/include/trainer_hill.h
index e605ac654..1d1d2d5da 100644
--- a/include/trainer_hill.h
+++ b/include/trainer_hill.h
@@ -1,6 +1,20 @@
 #ifndef GUARD_TRAINER_HILL_H
 #define GUARD_TRAINER_HILL_H
 
+#define HILL_TRAINER_NAME_LENGTH 11
+
+struct TrainerHillTrainer
+{
+    u8 name[HILL_TRAINER_NAME_LENGTH];
+    u8 facilityClass;
+    u32 unused;
+    u16 speechBefore[6];
+    u16 speechWin[6];
+    u16 speechLose[6];
+    u16 speechAfter[6];
+    struct BattleTowerPokemon mons[PARTY_SIZE];
+};
+
 extern u32 *gTrainerHillVBlankCounter;
 
 void CallTrainerHillFunction(void);