Merge branch 'master' into battle

1 files changed, 18 insertions, 18 deletions

diff --git a/include/cereader_tool.h b/include/cereader_tool.h
index f223bdaa5..5ae797ac0 100644
--- a/include/cereader_tool.h
+++ b/include/cereader_tool.h
@@ -3,25 +3,25 @@
 
 #include "global.h"
 
-struct TrainerTowerTrainer_004
+struct TrainerTowerTrainer
 {
-    /* 0x000 */ u8 unk_000[11];
-    /* 0x00B */ u8 unk_00B;
-    /* 0x00C */ u8 unk_00C;
-    /* 0x00E */ u16 unk_00E[6];
-    /* 0x01A */ u16 unk_01A[6];
-    /* 0x026 */ u16 unk_026[6];
-    /* 0x032 */ u16 unk_032[6];
-    /* 0x040 */ struct BattleTowerPokemon unk_040[PARTY_SIZE];
+    /* 0x000 */ u8 name[11];
+    /* 0x00B */ u8 facilityClass;
+    /* 0x00C */ u8 gender;
+    /* 0x00E */ u16 speechBefore[6];
+    /* 0x01A */ u16 speechWin[6];
+    /* 0x026 */ u16 speechLose[6];
+    /* 0x032 */ u16 speechAfter[6];
+    /* 0x040 */ struct BattleTowerPokemon mons[PARTY_SIZE];
 }; // size: 328
 
-struct TrainerTowerTrainer
+struct TrainerTowerFloor
 {
     /* 0x000 */ u8 unk_000;
-    /* 0x000 */ u8 unk_001;
-    /* 0x002 */ u8 unk_002;
-    /* 0x003 */ u8 unk_003;
-    /* 0x004 */ struct TrainerTowerTrainer_004 unk_004[3];
+    /* 0x001 */ u8 floorIdx;
+    /* 0x002 */ u8 challengeType;
+    /* 0x003 */ u8 prize;
+    /* 0x004 */ struct TrainerTowerTrainer trainers[3];
     /* 0x3DC */ u32 checksum;
 };
 
@@ -32,16 +32,16 @@ struct Unk_203F458_Header
     u32 unk4;
 };
 
-struct TrainerTowerData
+struct EReaderTrainerHillSet
 {
     u8 count;
     u8 id;
     u16 dummy;
     u32 checksum;
-    struct TrainerTowerTrainer trainers[8];
+    struct TrainerTowerFloor floors[8];
 };
 
-bool32 ValidateTrainerTowerData(struct TrainerTowerData * a0);
-bool32 CEReaderTool_SaveTrainerTower(struct TrainerTowerData * a0);
+bool32 ValidateTrainerTowerData(struct EReaderTrainerHillSet * a0);
+bool32 CEReaderTool_SaveTrainerTower(struct EReaderTrainerHillSet * a0);
 
 #endif //GUARD_CEREADER_TOOL_H