diff options
Diffstat (limited to 'include')
-rwxr-xr-x | include/ereader_helpers.h | 6 | ||||
-rw-r--r-- | include/trainer_hill.h | 23 |
2 files changed, 12 insertions, 17 deletions
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 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); |