Clean up some trainer hill

include/trainer_hill.h

@@ -1,7 +1,7 @@
 #ifndef GUARD_TRAINER_HILL_H
 #define GUARD_TRAINER_HILL_H
 
-#define HILL_TRAINER_NAME_LENGTH 11
+#define DUMMY_HILL_MON { .nickname = __("$$$$$$$$$$$") }
 
 struct TrainerHillTrainer
 {
@@ -15,44 +15,30 @@ struct TrainerHillTrainer
     struct BattleTowerPokemon mons[PARTY_SIZE];
 };
 
-struct TrHillRoomTrainers
+struct TrainerHillFloorMap
 {
-    u8 name[2][HILL_TRAINER_NAME_LENGTH];
-    u8 facilityClass[2];
+    u8 metatileData[HILL_FLOOR_WIDTH * HILL_FLOOR_HEIGHT_MAIN]; // Add NUM_METATILES_IN_PRIMARY to the values in this array to get metatile ids.
+    u16 collisionData[HILL_FLOOR_WIDTH]; // One bit for each tile in column-major order, so every array entry is one row. 1 = impassable, 0 = passable
+    u8 trainerCoords[HILL_TRAINERS_PER_FLOOR]; // Starting at (0,6). Format is 0bYYYYXXXX.
+    u8 trainerDirections; // DIR_* - 1, 4 bits per trainer
+    u8 trainerRanges; // 4 bits per trainer
 };
 
-struct TrHillDisplay
-{
-    // Metatile data. Add 0x200 to the values in this array to get metatiles.
-    // This data then overwrites the metatiles in the map starting at (0,5)
-    u8 metatileData[0x100];
-    // Collision data. One bit for each tile in column-major order,
-    // so every array entry is one row. 1 = impassable, 0 = passable
-    u16 collisionData[16];
-    // Trainer coordinates, starting at (0,6). Format is 0bYYYYXXXX.
-    u8 coords[2];
-    // Trainer facing directions. Same as (DIR_* - 1).
-    // Effectively an array of nibbles, one for each trainer.
-    u8 direction;
-    // Trainer sight ranges. Effectively an array of nibbles, one for each trainer.
-    u8 range;
-};
-
-struct TrHillFloor
+struct TrainerHillFloor
 {
     u8 trainerNum1;
     u8 trainerNum2;
-    struct TrainerHillTrainer trainers[2];
-    struct TrHillDisplay display;
+    struct TrainerHillTrainer trainers[HILL_TRAINERS_PER_FLOOR];
+    struct TrainerHillFloorMap map;
 };
 
-struct TrHillTag
+struct TrainerHillChallenge
 {
     u8 numTrainers;
     u8 unused1;
     u8 numFloors;
-    u32 checksum;
-    struct TrHillFloor floors[0];
+    u32 checksum; // A byte array sum of the floor data
+    struct TrainerHillFloor floors[0]; // Floor data is assumed to follow, so this will be intentionally read out of bounds
 };
 
 extern u32 *gTrainerHillVBlankCounter;