diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-11-13 16:31:01 -0500 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-11-16 13:02:35 -0600 |
| commit | 3bbdee61b823d7a6c54792062b7fd27e8c574f00 (patch) | |
| tree | 1c97f296a9b7abe635c495274142a9b497699760 /include | |
| parent | 5e01871f8b00d6b0ef4921a35e0b2bf18c7b4183 (diff) | |
Clean up Trainer Hill doc
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/trainer_hill.h | 7 | ||||
| -rw-r--r-- | include/trainer_hill.h | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/include/constants/trainer_hill.h b/include/constants/trainer_hill.h index 09dad5212..f7a270428 100644 --- a/include/constants/trainer_hill.h +++ b/include/constants/trainer_hill.h @@ -8,7 +8,8 @@ #define TRAINER_HILL_ROOF 5 #define TRAINER_HILL_ENTRANCE 6 -#define NUM_TRAINER_HILL_FLOORS 4 +#define NUM_TRAINER_HILL_FLOORS 4 +#define NUM_TRAINER_HILL_FLOORS_JP 2 #define NUM_TRAINER_HILL_PRIZE_LISTS 10 @@ -36,8 +37,8 @@ #define TRAINER_HILL_TEXT_PLAYER_WON 4 #define TRAINER_HILL_TEXT_AFTER 5 -#define HILL_TRAINER_TYPE_EREADER 4 -#define HILL_TRAINER_TYPE_NPC 8 +#define NUM_TRAINER_HILL_TRAINERS (NUM_TRAINER_HILL_FLOORS * 2) +#define NUM_TRAINER_HILL_TRAINERS_JP (NUM_TRAINER_HILL_FLOORS_JP * 2) // Values returned by TrainerHillGetChallengeStatus #define TRAINER_HILL_PLAYER_STATUS_LOST 0 diff --git a/include/trainer_hill.h b/include/trainer_hill.h index dec38b2f3..c07aeb6d7 100644 --- a/include/trainer_hill.h +++ b/include/trainer_hill.h @@ -40,7 +40,7 @@ struct TrHillFloor struct TrHillTag { - u8 trainerType; + u8 numTrainers; u8 unused1; u8 numFloors; u32 checksum; |