From a1138223e9a88d68666cf361a1adfa7cb3776929 Mon Sep 17 00:00:00 2001
From: Deokishisu <6993375+Deokishisu@users.noreply.github.com>
Date: Tue, 16 Feb 2021 16:43:31 -0500
Subject: Mirror pokeemerald PR#1329 & PR#1335 to pokeruby
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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.
---
 src/evolution_scene.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/evolution_scene.c')

diff --git a/src/evolution_scene.c b/src/evolution_scene.c
index ea7fde015..47a453693 100644
--- a/src/evolution_scene.c
+++ b/src/evolution_scene.c
@@ -507,7 +507,7 @@ static void CreateShedinja(u16 preEvoSpecies, struct Pokemon* mon)
         SetMonData(Shedinja, MON_DATA_10, (void*)&data);
         for (i = MON_DATA_COOL_RIBBON; i < MON_DATA_COOL_RIBBON + 5; i++)
             SetMonData(Shedinja, i, (void*)&data);
-        for (i = MON_DATA_CHAMPION_RIBBON; i <= MON_DATA_FATEFUL_ENCOUNTER; i++)
+        for (i = MON_DATA_CHAMPION_RIBBON; i <= MON_DATA_EVENT_LEGAL; i++)
             SetMonData(Shedinja, i, (void*)&data);
         SetMonData(Shedinja, MON_DATA_STATUS, (void*)&data);
         data = 0xFF;
-- 
cgit v1.2.3