diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-02-16 17:54:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-16 17:54:44 -0500 |
| commit | 0ea1e7620cc5fea1e651974442052ba9c52cdd13 (patch) | |
| tree | 63a6a57d8bc1e4dc2e40322385da1742f5766203 /include/constants | |
| parent | c7bbd485c3103c6a51d15f6e0081922d3c14d42d (diff) | |
| parent | a1138223e9a88d68666cf361a1adfa7cb3776929 (diff) | |
Merge pull request #820 from Deokishisu/master
Mirror pokeemerald PR#1329 & PR#1335 to pokeruby
Diffstat (limited to 'include/constants')
| -rw-r--r-- | include/constants/pokemon.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index 5d1539179..f5a9f4a6e 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -73,14 +73,14 @@ #define MON_DATA_VICTORY_RIBBON 69 #define MON_DATA_ARTIST_RIBBON 70 #define MON_DATA_EFFORT_RIBBON 71 -#define MON_DATA_GIFT_RIBBON_1 72 -#define MON_DATA_GIFT_RIBBON_2 73 -#define MON_DATA_GIFT_RIBBON_3 74 -#define MON_DATA_GIFT_RIBBON_4 75 -#define MON_DATA_GIFT_RIBBON_5 76 -#define MON_DATA_GIFT_RIBBON_6 77 -#define MON_DATA_GIFT_RIBBON_7 78 -#define MON_DATA_FATEFUL_ENCOUNTER 79 +#define MON_DATA_MARINE_RIBBON 72 +#define MON_DATA_LAND_RIBBON 73 +#define MON_DATA_SKY_RIBBON 74 +#define MON_DATA_COUNTRY_RIBBON 75 +#define MON_DATA_NATIONAL_RIBBON 76 +#define MON_DATA_EARTH_RIBBON 77 +#define MON_DATA_WORLD_RIBBON 78 +#define MON_DATA_EVENT_LEGAL 79 #define MON_DATA_KNOWN_MOVES 80 #define MON_DATA_RIBBON_COUNT 81 #define MON_DATA_RIBBONS 82 |