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/pokemon.h | |
| 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/pokemon.h')
| -rw-r--r-- | include/pokemon.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/pokemon.h b/include/pokemon.h index c8e7ce719..d2ab1335c 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -111,14 +111,14 @@ struct PokemonSubstruct3 /*0x0A*/ u32 victoryRibbon:1; /*0x0A*/ u32 artistRibbon:1; /*0x0A*/ u32 effortRibbon:1; - /*0x0A*/ u32 giftRibbon1:1; - /*0x0A*/ u32 giftRibbon2:1; - /*0x0A*/ u32 giftRibbon3:1; - /*0x0A*/ u32 giftRibbon4:1; - /*0x0B*/ u32 giftRibbon5:1; - /*0x0B*/ u32 giftRibbon6:1; - /*0x0B*/ u32 giftRibbon7:1; - /*0x0B*/ u32 fatefulEncounter:5; // unused in Ruby/Sapphire, but the high bit must be set for Mew/Deoxys to obey in FR/LG/Emerald + /*0x0A*/ u32 marineRibbon:1; // never distributed + /*0x0A*/ u32 landRibbon:1; // never distributed + /*0x0A*/ u32 skyRibbon:1; // never distributed + /*0x0A*/ u32 countryRibbon:1; // distributed during Pokémon Festa '04 and '05 to tournament winners + /*0x0B*/ u32 nationalRibbon:1; + /*0x0B*/ u32 earthRibbon:1; + /*0x0B*/ u32 worldRibbon:1; // distributed during Pokémon Festa '04 and '05 to tournament winners + /*0x0B*/ u32 eventLegal:5; // high bit controls Mew & Deoxys obedience in FRLGE; if set, Pokémon is a fateful encounter in FRLG & Gen 4+ summary screens; set for in-game event island legendaries, some distributed events, and Pokémon from XD: Gale of Darkness. }; union PokemonSubstruct |