diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-08 05:43:06 -0500 |
---|---|---|
committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-08 05:43:06 -0500 |
commit | ef67f2d33b45348d76d722f250cdbcc8485be264 (patch) | |
tree | 2fb5d08a962dea3329bcd876ea2d237cf8c6d3c1 /include/constants/apprentice.h | |
parent | 68cdd7b1cb5a293b3de42185fe17d85b4067b3ad (diff) |
Merge master into ObjEvent rename and prune accidental inclusions
Diffstat (limited to 'include/constants/apprentice.h')
-rw-r--r-- | include/constants/apprentice.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/constants/apprentice.h b/include/constants/apprentice.h index 63434a4fc..f1bea5e8c 100644 --- a/include/constants/apprentice.h +++ b/include/constants/apprentice.h @@ -6,6 +6,8 @@ #define NUM_WHICH_MON_QUESTIONS MULTI_PARTY_SIZE #define NUM_WHICH_MOVE_QUESTIONS 5 +// + 2 below is 1 each for the lead mon question and the win speech question +#define MAX_APPRENTICE_QUESTIONS NUM_WHICH_MON_QUESTIONS + NUM_WHICH_MOVE_QUESTIONS + 2 #define APPRENTICE_LVL_MODE_50 (FRONTIER_LVL_50 + 1) #define APPRENTICE_LVL_MODE_OPEN (FRONTIER_LVL_OPEN + 1) |