Merge branch 'master' of https://github.com/pret/pokeemerald

1 files changed, 12 insertions, 12 deletions

diff --git a/include/ereader_helpers.h b/include/ereader_helpers.h
index 8dc3b907a..064b61ed7 100755
--- a/include/ereader_helpers.h
+++ b/include/ereader_helpers.h
@@ -5,30 +5,30 @@
 
 struct EReaderTrainerHillTrainer
 {
-    u8 unk0;
-    struct TrainerHillTrainer unk4;
-    struct TrHillDisplay unk14C;
+    u8 trainerNum;
+    struct TrainerHillTrainer trainer;
+    struct TrHillDisplay display;
     u32 checksum;
 }; // size=0x274
 
 struct EReaderTrainerHillSet
 {
-    u8 count;
+    u8 numTrainers;
     u8 id;
-    u16 dummy;
+    u16 dummy; // Only read in an assert.
     u32 checksum;
-    struct EReaderTrainerHillTrainer unk_8[6];
+    struct EReaderTrainerHillTrainer trainers[6];
     u8 unk_ec0[40];
 }; // size = 0xf00
 
-bool8 EReader_IsReceivedDataValid(struct EReaderTrainerHillSet *buffer);
-bool32 TryWriteTrainerHill(struct EReaderTrainerHillSet *arg0);
+bool8 ValidateTrainerHillData(struct EReaderTrainerHillSet *);
+bool32 TryWriteTrainerHill(struct EReaderTrainerHillSet *);
 bool32 ReadTrainerHillAndValidate(void);
-int EReaderHandleTransfer(u8, u32, u32*, u32*);
-void sub_81D3F9C(void);
-void sub_81D3FAC(void);
+int EReaderHandleTransfer(u8, size_t, const void *, void *);
+void EReaderHelper_Timer3Callback(void);
+void EReaderHelper_SerialCallback(void);
 void EReaderHelper_SaveRegsState(void);
 void EReaderHelper_RestoreRegsState(void);
-void sub_81D4238(void);
+void EReaderHelper_ClearSendRecvMgr(void);
 
 #endif // GUARD_EREADER_HELPERS_H