typing on fusion preview window overlay

Data/Scripts/050_AddOns/New Items effects.rb

@@ -666,7 +666,31 @@ def calculateUnfuseLevelOldMethod(pokemon, supersplicers)
   return lev.floor
 end
 
+def drawPokemonType(pokemon_id, x_pos = 192, y_pos = 264)
+  width = 66
+
+  viewport = Viewport.new(0, 0, Graphics.width, Graphics.height)
+  viewport.z = 1000001
+
+  overlay = BitmapSprite.new(Graphics.width, Graphics.height, viewport).bitmap
+
+  pokemon = GameData::Species.get(pokemon_id)
+  typebitmap = AnimatedBitmap.new(_INTL("Graphics/Pictures/types"))
+  type1_number = GameData::Type.get(pokemon.type1).id_number
+  type2_number = GameData::Type.get(pokemon.type2).id_number
+  type1rect = Rect.new(0, type1_number * 28, 64, 28)
+  type2rect = Rect.new(0, type2_number * 28, 64, 28)
+  if pokemon.type1 == pokemon.type2
+    overlay.blt(x_pos + (width / 2), y_pos, typebitmap.bitmap, type1rect)
+  else
+    overlay.blt(x_pos, y_pos, typebitmap.bitmap, type1rect)
+    overlay.blt(x_pos + width, y_pos, typebitmap.bitmap, type2rect)
+  end
+  return viewport
+end
+
 def pbFuse(pokemon, poke2, supersplicers = false)
+
   newid = (pokemon.species) * NB_POKEMON + poke2.species
   playingBGM = $game_system.getPlayingBGM
 
@@ -1291,7 +1315,9 @@ def pbDNASplicing(pokemon, scene, supersplicers = false, superSplicer = false)
 
           previewwindow = PictureWindow.new(picturePath)
 
-          if hasCustom
+          typeWindow = drawPokemonType(newid)
+
+          if hasCustom§
             previewwindow.picture.pbSetColor(220, 255, 220, 200)
           else
             previewwindow.picture.pbSetColor(255, 255, 255, 200)
@@ -1302,6 +1328,7 @@ def pbDNASplicing(pokemon, scene, supersplicers = false, superSplicer = false)
 
           if (Kernel.pbConfirmMessage(_INTL("Fuse the two Pokémon?", newid)))
             previewwindow.dispose
+            typeWindow.dispose
             fus = PokemonFusionScene.new
             if (fus.pbStartScreen(pokemon, poke2, newid))
               returnItemsToBag(pokemon, poke2)
@@ -1316,6 +1343,7 @@ def pbDNASplicing(pokemon, scene, supersplicers = false, superSplicer = false)
             end
           else
             previewwindow.dispose
+            typeWindow.dispose
             return false
           end
 
@@ -1377,8 +1405,8 @@ def pbDNASplicing(pokemon, scene, supersplicers = false, superSplicer = false)
           poke1.exp = exp_body
           poke2.exp = exp_head
         end
-        body_level=poke1.level
+        body_level = poke1.level
-        head_level=poke2.level
+        head_level = poke2.level
         if $Trainer.party.length >= 6
           if (keepInParty == 0)
             $PokemonStorage.pbStoreCaught(poke2)

PBS/trainers.txt

@@ -4642,3 +4642,25 @@ Pokemon = GIRATINA,25
 
 [COOLTRAINER_F,lounge_member_single]
 Pokemon = DIALGA,25 
+########################MT SILVER##########################
+[RIVAL1,Blue,24]
+Pokemon = B248H59,69 #Arcaitar
+	Moves = THRASH,FIREFANG,CRUNCH,ROAR
+	AbilityIndex = 0
+	Item = SMOOTHROCK
+Pokemon = B142H329,69 #Aegidactyl,
+	Moves = STEELWING,DRAGONDANCE,TAILWIND,KINGSSHIELD
+	AbilityIndex = 1
+	Item = METALCOAT
+Pokemon = B65H255,69 #Mismakazam,
+	Moves = CALMMIND,MYSTICALFIRE,TRICKROOM,PSYCHIC
+	AbilityIndex = 0
+	Item = WISEGLASSES
+Pokemon = B18H169,68 #Crogeot
+	Moves = WHIRLWIND,CROSSPOISON,UTURN,AIRSLASH
+	AbilityIndex = 10	Item = WISEGLASSES
+	Item=RAZORFANG
+Pokemon = MEW,72 #Starter
+	Item = LEFTOVERS
+#######################
+#[CHAMPION_Sinnoh,Cynthia]

PBS/trainertypes.txt

@@ -115,3 +115,4 @@
 112,LEADER_Jasmine,Gym Leader,100,gymleader,,,Female,,
 113,POLICE,Officer,32,,,,Male,,
 114,SKIER_F,Skier,16,,,,Female,32,
+115,CHAMPION_Sinnoh,Champion,16,,,,Female,100,

changelog.txt

@@ -4,11 +4,14 @@ Many, many bugfixes
 ## Re-added features ##
 In-game clock
 Speed-up button
+Reverse mode
+Easy and Hard difficulties
 
 #Removals
 Removed Trainer House
 Removed the Convert Pokemon option from the update menu
 Oak no longer gives a Johto starter after beating the league
+Removed Pokedex key item
 
 ##New Stuff
 Added Quick Surf option
@@ -23,6 +26,11 @@ Added egg move tutor in Battle Factory
 Battle Factory now gives Factory Points instead of Rare Candies
 Updated critical hits to gen 6 mechanics
 Added gen 6 status move immunity from certain types
+Implemented Multitype ability for fusions
+
+
+
+
 
 5.0
 ##########################