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/trainer_hill.h | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'include/trainer_hill.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);
-- 
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/trainer_hill.h | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

(limited to 'include/trainer_hill.h')

diff --git a/include/trainer_hill.h b/include/trainer_hill.h
index 1d1d2d5da..3086b2f8d 100644
--- a/include/trainer_hill.h
+++ b/include/trainer_hill.h
@@ -15,6 +15,39 @@ struct TrainerHillTrainer
     struct BattleTowerPokemon mons[PARTY_SIZE];
 };
 
+struct TrHillRoomTrainers
+{
+    u8 name[2][HILL_TRAINER_NAME_LENGTH];
+    u8 facilityClass[2];
+};
+
+struct TrHillFloor
+{
+    u8 unk0;
+    u8 unk1;
+    struct TrainerHillTrainer trainers[2];
+    u8 data[0x100];
+    u16 unk3A0[16];
+    u8 coords[2]; // x first 4 bits, y last 4 bits
+    u8 direction; // array of 4 bits for each trainer
+    u8 range; // array of 4 bits for each trainer
+};
+
+struct TrHillTag
+{
+    u8 unkField_0;
+    u8 unused1;
+    u8 unkField_2;
+    u32 checksum;
+    struct TrHillFloor floors[4];
+};
+
+struct TrHillStruct2
+{
+    u8 floorId;
+    struct TrHillTag tag;
+};
+
 extern u32 *gTrainerHillVBlankCounter;
 
 void CallTrainerHillFunction(void);
-- 
cgit v1.2.3


From f3bed6045e57fad4b930aae7fe97e1cf0dc28305 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Tue, 3 Sep 2019 15:11:50 -0400
Subject: Disassemble data/ereader_screen.s

---
 include/trainer_hill.h | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'include/trainer_hill.h')

diff --git a/include/trainer_hill.h b/include/trainer_hill.h
index 3086b2f8d..81d9a5aff 100644
--- a/include/trainer_hill.h
+++ b/include/trainer_hill.h
@@ -42,6 +42,15 @@ struct TrHillTag
     struct TrHillFloor floors[4];
 };
 
+struct TrHillTag_Half
+{
+    u8 unkField_0;
+    u8 unused1;
+    u8 unkField_2;
+    u32 checksum;
+    struct TrHillFloor floors[2];
+};
+
 struct TrHillStruct2
 {
     u8 floorId;
-- 
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/trainer_hill.h | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

(limited to 'include/trainer_hill.h')

diff --git a/include/trainer_hill.h b/include/trainer_hill.h
index 81d9a5aff..60af0909a 100644
--- a/include/trainer_hill.h
+++ b/include/trainer_hill.h
@@ -21,11 +21,8 @@ struct TrHillRoomTrainers
     u8 facilityClass[2];
 };
 
-struct TrHillFloor
+struct TrHillDisplay
 {
-    u8 unk0;
-    u8 unk1;
-    struct TrainerHillTrainer trainers[2];
     u8 data[0x100];
     u16 unk3A0[16];
     u8 coords[2]; // x first 4 bits, y last 4 bits
@@ -33,13 +30,21 @@ struct TrHillFloor
     u8 range; // array of 4 bits for each trainer
 };
 
+struct TrHillFloor
+{
+    u8 unk0;
+    u8 unk1;
+    struct TrainerHillTrainer trainers[2];
+    struct TrHillDisplay display;
+};
+
 struct TrHillTag
 {
     u8 unkField_0;
     u8 unused1;
-    u8 unkField_2;
+    u8 numFloors;
     u32 checksum;
-    struct TrHillFloor floors[4];
+    struct TrHillFloor floors[0];
 };
 
 struct TrHillTag_Half
@@ -51,12 +56,6 @@ struct TrHillTag_Half
     struct TrHillFloor floors[2];
 };
 
-struct TrHillStruct2
-{
-    u8 floorId;
-    struct TrHillTag tag;
-};
-
 extern u32 *gTrainerHillVBlankCounter;
 
 void CallTrainerHillFunction(void);
-- 
cgit v1.2.3


From 95b805a425844175663f7f10b1b92df690a8b2c0 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Wed, 4 Sep 2019 15:46:44 -0400
Subject: Nuke definition of struct TrHillTag_Half

---
 include/trainer_hill.h | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'include/trainer_hill.h')

diff --git a/include/trainer_hill.h b/include/trainer_hill.h
index 60af0909a..31480287a 100644
--- a/include/trainer_hill.h
+++ b/include/trainer_hill.h
@@ -47,15 +47,6 @@ struct TrHillTag
     struct TrHillFloor floors[0];
 };
 
-struct TrHillTag_Half
-{
-    u8 unkField_0;
-    u8 unused1;
-    u8 unkField_2;
-    u32 checksum;
-    struct TrHillFloor floors[2];
-};
-
 extern u32 *gTrainerHillVBlankCounter;
 
 void CallTrainerHillFunction(void);
-- 
cgit v1.2.3