diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-09-23 21:39:21 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-23 21:39:21 -0400 |
| commit | a6ab2eb883b4cef727a6caee993745cfeff1274b (patch) | |
| tree | c3bf2f4b0b3183de111bfcc89fac3316f562c937 /include | |
| parent | 554210c5e315e786ddc6eef888e9ff6065ad73f8 (diff) | |
| parent | 0c2e9a5b4c1c0c0f2a62be6165e826760dd572cb (diff) | |
Merge branch 'master' into trailingSpaces
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/global.h | 1 | ||||
| -rw-r--r-- | include/constants/lilycove_lady.h | 2 | ||||
| -rw-r--r-- | include/global.h | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/include/constants/global.h b/include/constants/global.h index 9b0c46ce4..1cece7975 100644 --- 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 diff --git a/include/constants/lilycove_lady.h b/include/constants/lilycove_lady.h index 9c494823e..5b1e7d7b4 100644 --- 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 diff --git a/include/global.h b/include/global.h index 4719df40b..d14aa60f4 100644 --- a/include/global.h +++ b/include/global.h @@ -761,7 +761,7 @@ struct LilycoveLadyQuiz { /*0x000*/ u8 id; /*0x001*/ u8 state; - /*0x002*/ u16 question[9]; + /*0x002*/ u16 question[QUIZ_QUESTION_LEN]; /*0x014*/ u16 correctAnswer; /*0x016*/ u16 playerAnswer; /*0x018*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; |