Merge branch 'master' into trailingSpaces

2021-09-23 21:39:21 -04:00
parent 554210c5e3 0c2e9a5b4c
commit a6ab2eb883
11 changed files with 136 additions and 183 deletions
--- a/include/constants/global.h
+++ b/include/constants/global.h
@@ -86,6 +86,7 @@
 #define EASY_CHAT_BATTLE_WORDS_COUNT 6
 #define MOVE_NAME_LENGTH 12
 #define NUM_QUESTIONNAIRE_WORDS 4
+#define QUIZ_QUESTION_LEN 9

 #define MALE 0
 #define FEMALE 1
--- a/include/constants/lilycove_lady.h
+++ b/include/constants/lilycove_lady.h
@@ -21,8 +21,6 @@
 #define QUIZ_AUTHOR_NAME_PLAYER          1
 #define QUIZ_AUTHOR_NAME_OTHER_PLAYER    2

-#define QUIZ_QUESTION_LEN 9
-
 // Constants for how many good Pokéblocks the Contest Lady was given
 // This determines how her performance is described when her TV show comes on
 #define CONTEST_LADY_NORMAL 0