Extractor now gets ribbons

2 files changed, 27 insertions, 7 deletions

@@ -342,13 +342,13 @@ 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;
+ /* 0x0A */ u32 marineRibbon:1;
+ /* 0x0A */ u32 landRibbon:1;
+ /* 0x0A */ u32 skyRibbon:1;
+ /* 0x0A */ u32 countryRibbon:1;
+ /* 0x0B */ u32 nationalRibbon:1;
+ /* 0x0B */ u32 earthRibbon:1;
+ /* 0x0B */ u32 worldRibbon: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
 };
 
@@ -101,6 +101,26 @@ void PokemonIntermediateInit(
   pki->language = bpkm->language & 7;
   pki->orre = (sub3->metGame == 15);
 
+  pki->coolRibbons = sub3->coolRibbon;
+  pki->beautyRibbons = sub3->beautyRibbon;
+  pki->cuteRibbons = sub3->cuteRibbon;
+  pki->smartRibbons = sub3->smartRibbon;
+  pki->toughRibbons = sub3->toughRibbon;
+
+  pki->miscRibbons =
+      (CHAMPION_RIBBON * sub3->championRibbon)
+    | (WINNING_RIBBON * sub3->winningRibbon)
+    | (VICTORY_RIBBON * sub3->victoryRibbon)
+    | (ARTIST_RIBBON * sub3->artistRibbon)
+    | (EFFORT_RIBBON * sub3->effortRibbon)
+    | (MARINE_RIBBON * sub3->marineRibbon)
+    | (LAND_RIBBON * sub3->landRibbon)
+    | (SKY_RIBBON * sub3->skyRibbon)
+    | (COUNTRY_RIBBON * sub3->countryRibbon)
+    | (NATIONAL_RIBBON * sub3->nationalRibbon)
+    | (EARTH_RIBBON * sub3->earthRibbon)
+    | (WORLD_RIBBON * sub3->worldRibbon);
+
   // Derive nature from the personality value.
   pki->nature = (bpkm->personality % 25);