diff options
| author | Deokishisu <6993375+Deokishisu@users.noreply.github.com> | 2021-02-16 16:43:31 -0500 |
|---|---|---|
| committer | Deokishisu <6993375+Deokishisu@users.noreply.github.com> | 2021-02-16 16:43:31 -0500 |
| commit | a1138223e9a88d68666cf361a1adfa7cb3776929 (patch) | |
| tree | 63a6a57d8bc1e4dc2e40322385da1742f5766203 /include/constants | |
| parent | c7bbd485c3103c6a51d15f6e0081922d3c14d42d (diff) | |
Mirror pokeemerald PR#1329 & PR#1335 to pokeruby
The `externalReservedData` field has been split up into `externalEventData` and `externalEventFlags`, which have their own structs. The new structs deal with interconnectivity between external games/peripherals and RS. US & JP Colosseum Bonus Discs', Colosseum and XD's, Pokémon Channel's, and PokémonBox: Ruby & Sapphire's interactions with these fields has been documented.
The `giftRibbon#` fields in `PokemonSubstruct3` have also been renamed to their appropriate ribbons, and commented with distribution info if applicable. All relevant constants and functions dealing with the Pokémon data structure were renamed with these changes in mind.
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 |