Merge pull request #1649 from GriffinRichards/clean-trainer

Trainer hill clean up

include/constants/trainer_hill.h

@@ -8,6 +8,12 @@
 #define TRAINER_HILL_ROOF      5
 #define TRAINER_HILL_ENTRANCE  6
 
+#define HILL_MODE_NORMAL  0
+#define HILL_MODE_VARIETY 1
+#define HILL_MODE_UNIQUE  2
+#define HILL_MODE_EXPERT  3
+#define NUM_TRAINER_HILL_MODES 4
+
 #define NUM_TRAINER_HILL_FLOORS    4
 #define NUM_TRAINER_HILL_FLOORS_JP 2
 
@@ -30,20 +36,33 @@
 #define TRAINER_HILL_FUNC_SET_GAME_SAVED        14
 #define TRAINER_HILL_FUNC_CLEAR_GAME_SAVED      15
 #define TRAINER_HILL_FUNC_GET_WON               16
-#define TRAINER_HILL_FUNC_SET_TAG               17
+#define TRAINER_HILL_FUNC_SET_MODE              17
 
 #define TRAINER_HILL_TEXT_INTRO        2
 #define TRAINER_HILL_TEXT_PLAYER_LOST  3
 #define TRAINER_HILL_TEXT_PLAYER_WON   4
 #define TRAINER_HILL_TEXT_AFTER        5
 
-#define TRAINER_HILL_TRAINERS_PER_FLOOR 2
-#define NUM_TRAINER_HILL_TRAINERS     (NUM_TRAINER_HILL_FLOORS * TRAINER_HILL_TRAINERS_PER_FLOOR)
-#define NUM_TRAINER_HILL_TRAINERS_JP  (NUM_TRAINER_HILL_FLOORS_JP * TRAINER_HILL_TRAINERS_PER_FLOOR)
+#define HILL_TRAINERS_PER_FLOOR 2
+#define NUM_TRAINER_HILL_TRAINERS     (NUM_TRAINER_HILL_FLOORS * HILL_TRAINERS_PER_FLOOR)
+#define NUM_TRAINER_HILL_TRAINERS_JP  (NUM_TRAINER_HILL_FLOORS_JP * HILL_TRAINERS_PER_FLOOR)
 
 // Values returned by TrainerHillGetChallengeStatus
 #define TRAINER_HILL_PLAYER_STATUS_LOST 0
 #define TRAINER_HILL_PLAYER_STATUS_ECARD_SCANNED 1
 #define TRAINER_HILL_PLAYER_STATUS_NORMAL 2
 
+#define HILL_TRAINER_NAME_LENGTH 11
+
+#define TRAINER_HILL_OTID 0x10000000
+
+// The full map of each Trainer Hill floor is 16x21.
+// The first 5x21 at the top is the entrance/exit area,
+// and the remaining 16x16 is the randomized portion of
+// the room where the trainers are.
+#define HILL_FLOOR_WIDTH         16
+#define HILL_FLOOR_HEIGHT_MAIN   16
+#define HILL_FLOOR_HEIGHT_MARGIN  5
+#define HILL_FLOOR_HEIGHT        (HILL_FLOOR_HEIGHT_MAIN + HILL_FLOOR_HEIGHT_MARGIN)
+
 #endif