From 8d910465f8597299e6017a9831ba4576595cb748 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 2 Sep 2019 21:37:52 -0400
Subject: Minor refactor of ereader_helpers.c

---
 include/ereader_helpers.h | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'include/ereader_helpers.h')

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
-- 
cgit v1.2.3


From a9918c3b898bd181cdb6db6d382b78d8122dfadb Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Tue, 3 Sep 2019 14:35:01 -0400
Subject: Partial refactor of TryWriteTrainerHill_r

---
 include/ereader_helpers.h | 34 ++++++++++------------------------
 1 file changed, 10 insertions(+), 24 deletions(-)

(limited to 'include/ereader_helpers.h')

diff --git a/include/ereader_helpers.h b/include/ereader_helpers.h
index 2e77767aa..b0571e5c1 100755
--- a/include/ereader_helpers.h
+++ b/include/ereader_helpers.h
@@ -3,14 +3,17 @@
 
 #include "trainer_hill.h"
 
-struct Unk81D38FC
+struct EReaderTrainerHillTrainer
 {
     u8 unk0;
-    u8 filler_1[3];
-    u8 unk4[0x148];
-    u8 unk14C[0x124];
+    struct TrainerHillTrainer unk4;
+    u8 unk14C[0x100];
+    u16 unk24C[16];
+    u8 coords[2];
+    u8 direction;
+    u8 range;
     u32 checksum;
-};
+}; // size=0x274
 
 struct EReaderTrainerHillSet
 {
@@ -18,26 +21,9 @@ struct EReaderTrainerHillSet
     u8 id;
     u16 dummy;
     u32 checksum;
-    struct Unk81D38FC unk_8[6];
+    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);
-- 
cgit v1.2.3


From e87f4f4cc7fb872507db4fb1c48afb7d8e3f2d79 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Wed, 4 Sep 2019 15:42:53 -0400
Subject: Unify TrHillTag struct definitions (variable floors)

---
 include/ereader_helpers.h | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'include/ereader_helpers.h')

diff --git a/include/ereader_helpers.h b/include/ereader_helpers.h
index b0571e5c1..8dc3b907a 100755
--- a/include/ereader_helpers.h
+++ b/include/ereader_helpers.h
@@ -7,11 +7,7 @@ struct EReaderTrainerHillTrainer
 {
     u8 unk0;
     struct TrainerHillTrainer unk4;
-    u8 unk14C[0x100];
-    u16 unk24C[16];
-    u8 coords[2];
-    u8 direction;
-    u8 range;
+    struct TrHillDisplay unk14C;
     u32 checksum;
 }; // size=0x274
 
-- 
cgit v1.2.3