diff options
| author | Deokishisu <6993375+Deokishisu@users.noreply.github.com> | 2021-02-15 11:40:16 -0500 |
|---|---|---|
| committer | Deokishisu <6993375+Deokishisu@users.noreply.github.com> | 2021-02-15 11:40:16 -0500 |
| commit | b89c3e901e1de2f3513d74fa548373d82d3f26d0 (patch) | |
| tree | 8e6fa5b51b3f71c1cf7928af02d22bc745b5fb77 /src/pokemon_size_record.c | |
| parent | 5f58ea02c66a7e1a7d0164ba497bfa2d7527328b (diff) | |
Fix giftRibbons Field in SaveBlock1 & Relabel Gift Ribbons in pokemon.h
The giftRibbons field has been split out into proper subfields. The new ExternalEvent structs deal with interconnectivity between external games/peripherals and Emerald, such as PokéCoupon storage and the flag for receiving Wishmaker Jirachi.
The giftRibbon fields in `PokemonSubstruct3` have also been renamed to their appropriate ribbons, and commented with distribution info if applicable. The previous `fatefulEncounter` field was actually filler, and relabeled as such, while the obedient bit was renamed `fatefulEncounter`. All relevant constants and functions dealing with the Pokémon data structure were renamed with these changes in mind.
Diffstat (limited to 'src/pokemon_size_record.c')
| -rw-r--r-- | src/pokemon_size_record.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/pokemon_size_record.c b/src/pokemon_size_record.c index f8b361912..5b80fd428 100644 --- a/src/pokemon_size_record.c +++ b/src/pokemon_size_record.c @@ -38,9 +38,9 @@ static const struct UnknownStruct sBigMonSizeTable[] = static const u8 sGiftRibbonsMonDataIds[] = { - MON_DATA_GIFT_RIBBON_1, MON_DATA_GIFT_RIBBON_2, MON_DATA_GIFT_RIBBON_3, - MON_DATA_GIFT_RIBBON_4, MON_DATA_GIFT_RIBBON_5, MON_DATA_GIFT_RIBBON_6, - MON_DATA_GIFT_RIBBON_7 + MON_DATA_MARINE_RIBBON, MON_DATA_LAND_RIBBON, MON_DATA_SKY_RIBBON, + MON_DATA_COUNTRY_RIBBON, MON_DATA_NATIONAL_RIBBON, MON_DATA_EARTH_RIBBON, + MON_DATA_WORLD_RIBBON }; extern const u8 gText_DecimalPoint[]; |