diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2019-09-03 22:22:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-03 22:22:14 -0400 |
| commit | 6b04ea0727973e66227b31caa2ccdcb6f2b4891f (patch) | |
| tree | 4d5e4e5d1b6e480bd195d8a9a29703e6475cc2e9 /include/contest.h | |
| parent | ecf2097abb1481109578b7b8260fd40606f27abe (diff) | |
| parent | 1f4c88c95243e8d75f25d5b7868c837c47aa578d (diff) | |
Merge branch 'master' into document-eventscripts
Diffstat (limited to 'include/contest.h')
| -rw-r--r-- | include/contest.h | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/include/contest.h b/include/contest.h index a4e209bcb..8ef208aea 100644 --- a/include/contest.h +++ b/include/contest.h @@ -2,10 +2,7 @@ #define GUARD_CONTEST_H #include "palette.h" - -#define CONTESTANT_COUNT 4 -#define APPLAUSE_METER_SIZE 5 -#define CONTEST_TURN_COUNT 5 +#include "constants/contest.h" enum { @@ -18,20 +15,6 @@ enum CONTEST_DEBUG_MODE_PRINT_UNK_D }; -#define LINK_CONTEST_FLAG_IS_LINK (1 << 0) -#define LINK_CONTEST_FLAG_IS_WIRELESS (1 << 1) -#define LINK_CONTEST_FLAG_HAS_RS_PLAYER (1 << 2) - -enum -{ - CONTEST_CATEGORY_COOL, - CONTEST_CATEGORY_BEAUTY, - CONTEST_CATEGORY_CUTE, - CONTEST_CATEGORY_SMART, - CONTEST_CATEGORY_TOUGH, - CONTEST_CATEGORIES_COUNT, -}; - enum { CONTEST_EFFECT_HIGHLY_APPEALING, |