diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/cereader_tool.h | 4 | ||||
-rw-r--r-- | include/constants/trainer_tower.h | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/cereader_tool.h b/include/cereader_tool.h index dd1866fb3..c7d1fcca9 100644 --- a/include/cereader_tool.h +++ b/include/cereader_tool.h @@ -8,7 +8,7 @@ struct TrainerTowerTrainer { /* 0x000 */ u8 name[11]; /* 0x00B */ u8 facilityClass; - /* 0x00C */ u8 gender; + /* 0x00C */ u8 textColor; /* 0x00E */ u16 speechBefore[6]; /* 0x01A */ u16 speechWin[6]; /* 0x026 */ u16 speechLose[6]; @@ -18,7 +18,7 @@ struct TrainerTowerTrainer struct TrainerTowerFloor { - /* 0x000 */ u8 unk_000; + /* 0x000 */ u8 flags; /* 0x001 */ u8 floorIdx; /* 0x002 */ u8 challengeType; /* 0x003 */ u8 prize; diff --git a/include/constants/trainer_tower.h b/include/constants/trainer_tower.h index 6372a30e8..823adcf3e 100644 --- a/include/constants/trainer_tower.h +++ b/include/constants/trainer_tower.h @@ -4,6 +4,7 @@ #define CHALLENGE_TYPE_SINGLE 0 #define CHALLENGE_TYPE_DOUBLE 1 #define CHALLENGE_TYPE_KNOCKOUT 2 +#define CHALLENGE_TYPE_MIXED 3 // Mixed challenges use one of the above 3 for each floor #define CHALLENGE_STATUS_LOST 0 |