diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-02-17 14:11:45 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2021-02-17 14:11:45 -0500 |
| commit | e059c4fdfa0fe36aceac4b283176825ad759fe5d (patch) | |
| tree | 5265b05124912374f10291241248b08a5eee5660 /include/constants | |
| parent | 549ddb8c9518c4409adfbbf9c536d2b14327a246 (diff) | |
Use new gift ribbons size, label unused ribbons
Diffstat (limited to 'include/constants')
| -rw-r--r-- | include/constants/global.h | 1 | ||||
| -rw-r--r-- | include/constants/pokemon.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/constants/global.h b/include/constants/global.h index ee2fd3abc..d8dad0f45 100644 --- a/include/constants/global.h +++ b/include/constants/global.h @@ -51,6 +51,7 @@ #define MAX_REMATCH_ENTRIES 100 // only REMATCH_TABLE_ENTRIES (78) are used #define NUM_CONTEST_WINNERS 13 #define UNION_ROOM_KB_ROW_COUNT 10 +#define GIFT_RIBBONS_COUNT 11 #define PYRAMID_BAG_ITEMS_COUNT 10 #define HALL_FACILITIES_COUNT 9 // 7 facilities for single mode + tower double mode + tower multi mode. diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index e32ddf496..3d757bed1 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -171,7 +171,7 @@ #define MON_DATA_NATIONAL_RIBBON 76 #define MON_DATA_EARTH_RIBBON 77 #define MON_DATA_WORLD_RIBBON 78 -#define MON_DATA_FILLER 79 +#define MON_DATA_UNUSED_RIBBONS 79 #define MON_DATA_EVENT_LEGAL 80 #define MON_DATA_KNOWN_MOVES 81 #define MON_DATA_RIBBON_COUNT 82 |