diff options
Diffstat (limited to 'include/constants')
| -rw-r--r-- | include/constants/contest.h | 8 | ||||
| -rw-r--r-- | include/constants/global.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/include/constants/contest.h b/include/constants/contest.h index 2de2866a3..5eabb5f46 100644 --- a/include/constants/contest.h +++ b/include/constants/contest.h @@ -1,7 +1,6 @@ #ifndef GUARD_CONSTANTS_CONTEST_H #define GUARD_CONSTANTS_CONTEST_H -#define CONTESTANT_COUNT 4 #define APPLAUSE_METER_SIZE 5 #define CONTEST_TURN_COUNT 5 @@ -22,13 +21,6 @@ #define CONTEST_TYPE_NPC_MASTER (CONTEST_RANK_MASTER + 1) #define CONTEST_TYPE_LINK (CONTEST_RANK_LINK + 1) -#define CONTEST_CATEGORY_COOL 0 -#define CONTEST_CATEGORY_BEAUTY 1 -#define CONTEST_CATEGORY_CUTE 2 -#define CONTEST_CATEGORY_SMART 3 -#define CONTEST_CATEGORY_TOUGH 4 -#define CONTEST_CATEGORIES_COUNT 5 - #define CONTEST_WINNER_ARTIST 0 // Winner shown by the artist, painting not necessarily saved #define CONTEST_WINNER_HALL_1 1 #define CONTEST_WINNER_HALL_2 2 diff --git a/include/constants/global.h b/include/constants/global.h index 956f86a05..7a7009fd5 100644 --- a/include/constants/global.h +++ b/include/constants/global.h @@ -62,6 +62,14 @@ #define MAX_MON_MOVES 4 #define NUM_STATS 6 +#define CONTESTANT_COUNT 4 +#define CONTEST_CATEGORY_COOL 0 +#define CONTEST_CATEGORY_BEAUTY 1 +#define CONTEST_CATEGORY_CUTE 2 +#define CONTEST_CATEGORY_SMART 3 +#define CONTEST_CATEGORY_TOUGH 4 +#define CONTEST_CATEGORIES_COUNT 5 + // party sizes #define PARTY_SIZE 6 #define MULTI_PARTY_SIZE PARTY_SIZE / 2 |