Merge branch 'master' into trailingSpaces

This commit is contained in:
GriffinR
2021-09-23 21:39:21 -04:00
committed by GitHub
11 changed files with 136 additions and 183 deletions
-2
View File
@@ -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