battle items

Data/Scripts/011_Battle/001_Battler/001_PokeBattle_Battler.rb

@@ -296,6 +296,19 @@ class PokeBattle_Battler
     return @pokemon && @pokemon.isSpecies?(species)
   end
 
+  def hasBodyOf?(check_species)
+    return @pokemon.hasBodyOf?(check_species)
+  end
+
+  def hasHeadOf?(check_species)
+    return @pokemon.hasHeadOf?(check_species)
+  end
+
+
+  def isFusionOf(check_species)
+    return @pokemon.isFusionOf(check_species)
+  end
+
   # Returns the active types of this Pokémon. The array should not include the
   # same type more than once, and should not include any invalid type numbers
   # (e.g. -1).

Data/Scripts/011_Battle/004_BattleHandlers_Items.rb

@@ -20,7 +20,7 @@ BattleHandlers::SpeedCalcItem.copy(:MACHOBRACE,:POWERANKLET,:POWERBAND,
 
 BattleHandlers::SpeedCalcItem.add(:QUICKPOWDER,
   proc { |item,battler,mult|
-    next mult*2 if battler.isSpecies?(:DITTO) &&
+    next mult*2 if battler.isFusionOf(:DITTO) &&
                    !battler.effects[PBEffects::Transform]
   }
 )
@@ -444,7 +444,7 @@ BattleHandlers::AccuracyCalcTargetItem.copy(:BRIGHTPOWDER,:LAXINCENSE)
 
 BattleHandlers::DamageCalcUserItem.add(:ADAMANTORB,
   proc { |item,user,target,move,mults,baseDmg,type|
-    if user.isSpecies?(:DIALGA) && (type == :DRAGON || type == :STEEL)
+    if user.isFusionOf(:DIALGA) && (type == :DRAGON || type == :STEEL)
       mults[:base_damage_multiplier] *= 1.2
     end
   }
@@ -572,7 +572,7 @@ BattleHandlers::DamageCalcUserItem.add(:GRASSGEM,
 
 BattleHandlers::DamageCalcUserItem.add(:GRISEOUSORB,
   proc { |item,user,target,move,mults,baseDmg,type|
-    if user.isSpecies?(:GIRATINA) && (type == :DRAGON || type == :GHOST)
+    if user.isFusionOf(:GIRATINA) && (type == :DRAGON || type == :GHOST)
       mults[:base_damage_multiplier] *= 1.2
     end
   }
@@ -608,7 +608,7 @@ BattleHandlers::DamageCalcUserItem.add(:LIFEORB,
 
 BattleHandlers::DamageCalcUserItem.add(:LIGHTBALL,
   proc { |item,user,target,move,mults,baseDmg,type|
-    if user.isSpecies?(:PIKACHU)
+    if user.isFusionOf(:PIKACHU)
       mults[:attack_multiplier] *= 2
     end
   }
@@ -616,7 +616,7 @@ BattleHandlers::DamageCalcUserItem.add(:LIGHTBALL,
 
 BattleHandlers::DamageCalcUserItem.add(:LUSTROUSORB,
   proc { |item,user,target,move,mults,baseDmg,type|
-    if user.isSpecies?(:PALKIA) && (type == :DRAGON || type == :WATER)
+    if user.isFusionOf(:PALKIA) && (type == :DRAGON || type == :WATER)
       mults[:base_damage_multiplier] *= 1.2
     end
   }
@@ -745,7 +745,7 @@ BattleHandlers::DamageCalcUserItem.copy(:SOFTSAND,:EARTHPLATE)
 
 BattleHandlers::DamageCalcUserItem.add(:SOULDEW,
   proc { |item,user,target,move,mults,baseDmg,type|
-    next if !user.isSpecies?(:LATIAS) && !user.isSpecies?(:LATIOS)
+    next if !user.isFusionOf(:LATIAS) && !user.isFusionOf?(:LATIOS)
     if Settings::SOUL_DEW_POWERS_UP_TYPES
       mults[:final_damage_multiplier] *= 1.2 if type == :PSYCHIC || type == :DRAGON
     else
@@ -770,9 +770,12 @@ BattleHandlers::DamageCalcUserItem.add(:STEELGEM,
   }
 )
 
+
+
+
 BattleHandlers::DamageCalcUserItem.add(:THICKCLUB,
      proc { |item,user,target,move,mults,baseDmg,type|
-    if (user.isSpecies?(:CUBONE) || user.isSpecies?(:MAROWAK)) && move.physicalMove?
+       if (user.isFusionOf(:CUBONE) || user.isFusionOf(:MAROWAK)) && move.physicalMove?
          mults[:attack_multiplier] *= 2
        end
      }
@@ -887,7 +890,7 @@ BattleHandlers::DamageCalcTargetItem.add(:KEBIABERRY,
 
 BattleHandlers::DamageCalcTargetItem.add(:METALPOWDER,
   proc { |item,user,target,move,mults,baseDmg,type|
-    if target.isSpecies?(:DITTO) && !target.effects[PBEffects::Transform]
+    if target.isFusionOf(:DITTO) && !target.effects[PBEffects::Transform]
       mults[:defense_multiplier] *= 1.5
     end
   }
@@ -932,7 +935,7 @@ BattleHandlers::DamageCalcTargetItem.add(:SHUCABERRY,
 BattleHandlers::DamageCalcTargetItem.add(:SOULDEW,
   proc { |item,user,target,move,mults,baseDmg,type|
     next if Settings::SOUL_DEW_POWERS_UP_TYPES
-    next if !target.isSpecies?(:LATIAS) && !target.isSpecies?(:LATIOS)
+    next if !target.isFusionOf(:LATIAS) && !target.isFusionOf?(:LATIOS)
     if move.specialMove? && !user.battle.rules["souldewclause"]
       mults[:defense_multiplier] *= 1.5
     end
@@ -963,7 +966,7 @@ BattleHandlers::DamageCalcTargetItem.add(:YACHEBERRY,
 
 BattleHandlers::CriticalCalcUserItem.add(:LUCKYPUNCH,
   proc { |item,user,target,c|
-    next c+2 if user.isSpecies?(:CHANSEY)
+    next c+2 if user.isFusionOf(:CHANSEY)
   }
 )
 
@@ -977,7 +980,7 @@ BattleHandlers::CriticalCalcUserItem.copy(:RAZORCLAW,:SCOPELENS)
 
 BattleHandlers::CriticalCalcUserItem.add(:STICK,
   proc { |item,user,target,c|
-    next c+2 if user.isSpecies?(:FARFETCHD)
+    next c+2 if user.isFusionOf(:FARFETCHD)
   }
 )
 

Data/Scripts/014_Pokemon/001_Pokemon.rb

@@ -144,6 +144,29 @@ class Pokemon
       @species == GameData::Species.get(check_species).species)
   end
 
+  def hasBodyOf?(check_species)
+    if !self.isFusion?
+      return isSpecies(check_species)
+    end
+    bodySpecies = getBodyID(species)
+    checkSpeciesId = getID(nil,check_species)
+    return bodySpecies == checkSpeciesId
+  end
+
+  def hasHeadOf?(check_species)
+    if !self.isFusion?
+      return isSpecies(check_species)
+    end
+    headSpecies = getHeadID(species)
+    checkSpeciesId = getID(nil,check_species)
+    return headSpecies == checkSpeciesId
+  end
+
+
+  def isFusionOf(check_species)
+    return hasBodyOf?(check_species) || hasHeadOf?(check_species)
+  end
+
   def dexNum
     return species_data.id_number
   end

Data/Scripts/016_UI/005_UI_Party.rb

@@ -151,12 +151,30 @@ class PokemonPartyBlankPanel < SpriteWrapper
     super
   end
 
-  def selected; return false; end
-  def selected=(value); end
-  def preselected; return false; end
-  def preselected=(value); end
-  def switching; return false; end
-  def switching=(value); end
+  def selected
+    return false;
+  end
+
+  def selected=(value)
+    ;
+  end
+
+  def preselected
+    return false;
+  end
+
+  def preselected=(value)
+    ;
+  end
+
+  def switching
+    return false;
+  end
+
+  def switching=(value)
+    ;
+  end
+
   def refresh; end
 end
 
@@ -188,7 +206,8 @@ class PokemonPartyPanel < SpriteWrapper
       @panelbgsprite.addBitmap("swap", "Graphics/Pictures/Party/panel_round_swap")
       @panelbgsprite.addBitmap("swapsel", "Graphics/Pictures/Party/panel_round_swap_sel")
       @panelbgsprite.addBitmap("swapsel2", "Graphics/Pictures/Party/panel_round_swap_sel2")
-    else   # Rectangular panel
+    else
+      # Rectangular panel
       @panelbgsprite.addBitmap("able", "Graphics/Pictures/Party/panel_rect")
       @panelbgsprite.addBitmap("ablesel", "Graphics/Pictures/Party/panel_rect_sel")
       @panelbgsprite.addBitmap("fainted", "Graphics/Pictures/Party/panel_rect_faint")
@@ -290,7 +309,9 @@ class PokemonPartyPanel < SpriteWrapper
     end
   end
 
-  def hp; return @pokemon.hp; end
+  def hp
+    return @pokemon.hp;
+  end
 
   def refresh
     return if disposed?
@@ -298,15 +319,22 @@ class PokemonPartyPanel < SpriteWrapper
     @refreshing = true
     if @panelbgsprite && !@panelbgsprite.disposed?
       if self.selected
-        if self.preselected;     @panelbgsprite.changeBitmap("swapsel2")
-        elsif @switching;        @panelbgsprite.changeBitmap("swapsel")
-        elsif @pokemon.fainted?; @panelbgsprite.changeBitmap("faintedsel")
-        else;                    @panelbgsprite.changeBitmap("ablesel")
+        if self.preselected;
+          @panelbgsprite.changeBitmap("swapsel2")
+        elsif @switching;
+          @panelbgsprite.changeBitmap("swapsel")
+        elsif @pokemon.fainted?;
+          @panelbgsprite.changeBitmap("faintedsel")
+        else
+          ; @panelbgsprite.changeBitmap("ablesel")
         end
       else
-        if self.preselected;     @panelbgsprite.changeBitmap("swap")
-        elsif @pokemon.fainted?; @panelbgsprite.changeBitmap("fainted")
-        else;                    @panelbgsprite.changeBitmap("able")
+        if self.preselected;
+          @panelbgsprite.changeBitmap("swap")
+        elsif @pokemon.fainted?;
+          @panelbgsprite.changeBitmap("fainted")
+        else
+          ; @panelbgsprite.changeBitmap("able")
         end
       end
       @panelbgsprite.x = self.x
@@ -316,9 +344,12 @@ class PokemonPartyPanel < SpriteWrapper
     if @hpbgsprite && !@hpbgsprite.disposed?
       @hpbgsprite.visible = (!@pokemon.egg? && !(@text && @text.length > 0))
       if @hpbgsprite.visible
-        if self.preselected || (self.selected && @switching); @hpbgsprite.changeBitmap("swap")
-        elsif @pokemon.fainted?;                              @hpbgsprite.changeBitmap("fainted")
-        else;                                                 @hpbgsprite.changeBitmap("able")
+        if self.preselected || (self.selected && @switching);
+          @hpbgsprite.changeBitmap("swap")
+        elsif @pokemon.fainted?;
+          @hpbgsprite.changeBitmap("fainted")
+        else
+          ; @hpbgsprite.changeBitmap("able")
         end
         @hpbgsprite.x = self.x + 96
         @hpbgsprite.y = self.y + 50
@@ -913,7 +944,8 @@ class PokemonPartyScreen
   end
 
   # Checks for identical species
-  def pbCheckSpecies(array)   # Unused
+  def pbCheckSpecies(array)
+    # Unused
     for i in 0...array.length
       for j in i + 1...array.length
         return false if array[i].species == array[j].species
@@ -923,7 +955,8 @@ class PokemonPartyScreen
   end
 
   # Checks for identical held items
-  def pbCheckItems(array)   # Unused
+  def pbCheckItems(array)
+    # Unused
     for i in 0...array.length
       next if !array[i].hasItem?
       for j in i + 1...array.length
@@ -956,7 +989,8 @@ class PokemonPartyScreen
     return @scene.pbShowCommands(helptext, movenames, index)
   end
 
-  def pbRefreshAnnotations(ableProc)   # For after using an evolution stone
+  def pbRefreshAnnotations(ableProc)
+    # For after using an evolution stone
     return if !@scene.pbHasAnnotations?
     annot = []
     for pkmn in @party
@@ -1019,7 +1053,9 @@ class PokemonPartyScreen
       addedEntry = false
       if pkmnid == Settings::MAX_PARTY_SIZE # Confirm was chosen
         ret = []
-        for i in realorder; ret.push(@party[i]); end
+        for i in realorder;
+          ret.push(@party[i]);
+        end
         error = []
         break if ruleset.isValid?(ret, error)
         pbDisplay(error[0])
@@ -1115,6 +1151,30 @@ class PokemonPartyScreen
     return ret
   end
 
+  def pbPokemonRename(pkmn, pkmnid)
+    cmd = 0
+    loop do
+      speciesname = PBSpecies.getName(pkmn.species)
+      msg = [_INTL("{1} has the nickname {2}.", speciesname, pkmn.name),
+             _INTL("{1} has no nickname.", speciesname)][pkmn.name == speciesname ? 1 : 0]
+      cmd = @scene.pbShowCommands(msg, [
+        _INTL("Rename"),
+        _INTL("Quit")], cmd)
+      # Break
+      if cmd == -1
+        break
+        # Rename
+      elsif cmd == 0
+        newname = pbEnterPokemonName(_INTL("{1}'s nickname?", speciesname), 0, 16, "", pkmn)
+        pkmn.name = (newname == "") ? speciesname : newname
+        pbRefreshSingle(pkmnid)
+        # Erase name
+      elsif cmd == 1
+        break
+      end
+    end
+  end
+
   def pbPokemonScreen
     @scene.pbStartScene(@party,
                         (@party.length > 1) ? _INTL("Choose a Pokémon.") : _INTL("Choose Pokémon or cancel."), nil)
@@ -1134,6 +1194,7 @@ class PokemonPartyScreen
       pkmn = @party[pkmnid]
       commands = []
       cmdSummary = -1
+      cmdNickname = -1
       cmdDebug = -1
       cmdMoves = [-1] * pkmn.numMoves
       cmdSwitch = -1
@@ -1141,6 +1202,7 @@ class PokemonPartyScreen
       cmdItem = -1
       # Build the commands
       commands[cmdSummary = commands.length] = _INTL("Summary")
+      commands[cmdNickname = commands.length] = _INTL("Nickname") if !pkmn.egg?
       commands[cmdDebug = commands.length] = _INTL("Debug") if $DEBUG
       if !pkmn.egg?
         # Check for hidden moves and add any that were found
@@ -1218,6 +1280,8 @@ class PokemonPartyScreen
         @scene.pbSummary(pkmnid) {
           @scene.pbSetHelpText((@party.length > 1) ? _INTL("Choose a Pokémon.") : _INTL("Choose Pokémon or cancel."))
         }
+      elsif cmdNickname >= 0 && command == cmdNickname
+        pbPokemonRename(pkmn,pkmnid)
       elsif cmdDebug >= 0 && command == cmdDebug
         pbPokemonDebug(pkmn, pkmnid)
       elsif cmdSwitch >= 0 && command == cmdSwitch

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

@@ -254,31 +254,6 @@ ItemHandlers::UseOnPokemon.add(:TRANSGENDERSTONE, proc { |item, pokemon, scene|
   end
 })
 
-ItemHandlers::UseOnPokemon.add(:ABILITYCAPSULE, proc { |item, poke, scene|
-  abilityList = poke.getAbilityList
-  abil1 = 0; abil2 = 0
-  for i in abilityList
-    abil1 = i[0] if i[1] == 0
-    abil2 = i[1] if i[1] == 1
-  end
-  if poke.abilityIndex() >= 2 || abil1 == abil2
-    scene.pbDisplay(_INTL("It won't have any effect."))
-    next false
-  end
-  if Kernel.pbConfirmMessage(_INTL("Do you want to change {1}'s ability?",
-                                   poke.name))
-
-    if poke.abilityIndex() == 0
-      poke.setAbility(1)
-    else
-      poke.setAbility(0)
-    end
-    scene.pbDisplay(_INTL("{1}'s ability was changed!", poke.name))
-    next true
-  end
-  next false
-
-})
 
 #NOT FULLY IMPLEMENTED
 ItemHandlers::UseOnPokemon.add(:SECRETCAPSULE, proc { |item, poke, scene|
@@ -1078,31 +1053,31 @@ ItemHandlers::UseOnPokemon.add(:TRANSGENDERSTONE, proc { |item, pokemon, scene|
   end
 })
 
-ItemHandlers::UseOnPokemon.add(:ABILITYCAPSULE, proc { |item, poke, scene|
-  abilityList = poke.getAbilityList
-  abil1 = 0; abil2 = 0
-  for i in abilityList
-    abil1 = i[0] if i[1] == 0
-    abil2 = i[1] if i[1] == 1
-  end
-  if poke.abilityIndex() >= 2 || abil1 == abil2
-    scene.pbDisplay(_INTL("It won't have any effect."))
-    next false
-  end
-  if Kernel.pbConfirmMessage(_INTL("Do you want to change {1}'s ability?",
-                                   poke.name))
-
-    if poke.abilityIndex() == 0
-      poke.setAbility(1)
-    else
-      poke.setAbility(0)
-    end
-    scene.pbDisplay(_INTL("{1}'s ability was changed!", poke.name))
-    next true
-  end
-  next false
-
-})
+# ItemHandlers::UseOnPokemon.add(:ABILITYCAPSULE, proc { |item, poke, scene|
+#   abilityList = poke.getAbilityList
+#   abil1 = 0; abil2 = 0
+#   for i in abilityList
+#     abil1 = i[0] if i[1] == 0
+#     abil2 = i[1] if i[1] == 1
+#   end
+#   if poke.abilityIndex() >= 2 || abil1 == abil2
+#     scene.pbDisplay(_INTL("It won't have any effect."))
+#     next false
+#   end
+#   if Kernel.pbConfirmMessage(_INTL("Do you want to change {1}'s ability?",
+#                                    poke.name))
+#
+#     if poke.abilityIndex() == 0
+#       poke.setAbility(1)
+#     else
+#       poke.setAbility(0)
+#     end
+#     scene.pbDisplay(_INTL("{1}'s ability was changed!", poke.name))
+#     next true
+#   end
+#   next false
+#
+# })
 
 #NOT FULLY IMPLEMENTED
 ItemHandlers::UseOnPokemon.add(:SECRETCAPSULE, proc { |item, poke, scene|

PBS/items.txt

@@ -592,7 +592,7 @@
 584,INCUBATOR,Super Incubator,Super Incubators,1,12000,"A portable incubator that is used to instantly hatch an egg.",1,0,0,
 585,FIRECRACKER,Firecracker,Firecrackers,3,100,"A small explosive that hurts a wild Pokémon when thrown.",0,2,4,
 586,MANSIONKEY,Seagallop Pass,Seagallop Passes,8,0,"A pass that allows you to take the Seagallop Ferry from Cinnabar Island to the Sevii Islands.",0,0,6,
-587,POISONMUSHROOM,PoisonMushroom,PoisonMushrooms,1,50,A common unedible mushroom. It can be sold for a small price.,0,0,0,
+587,POISONMUSHROOM,PoisonMushroom,PoisonMushrooms,1,50,A common poisonous mushroom. It can be sold for a small price.,1,1,0,
 588,EXPALLOFF,Exp. All,Exp. Alls,8,0,"An item that can be used to share experience gained with every party member.",2,0,6,
 589,GASMASK,Gas Mask,Gas Masks,8,0,"A mask that lets you breathe in areas filled with poisonous gas.",0,0,6,
 590,MANKEYPAW,Mankey Paw,Mankey Paws,1,19600,"Guarantees Critical-Hits, but halves accuracy.",0,0,0,

PBS/trainers.txt

@@ -860,39 +860,39 @@ Pokemon = B55H101,46 #electrduck
 ##########################
 
 [BURGLAR,Quinn]
-Pokemon = VULPIX,42 #GROWKEY
-Pokemon = VULPIX,42 #GROWKEY
-Pokemon = B38H57,42 #PRIMETALES
+Pokemon = VULPIX,39 #GROWKEY
+Pokemon = VULPIX,39 #GROWKEY
+Pokemon = B38H57,41 #PRIMETALES
 ##########################
 
 [SUPERNERD,Erik]
-Pokemon = B37H47,42 #PARAPIX
-Pokemon = B37H47,42 #PARAPIX
-Pokemon = B38H47,42 #PARATALES
+Pokemon = B37H47,39 #PARAPIX
+Pokemon = B37H47,39 #PARAPIX
+Pokemon = B38H47,41 #PARATALES
 ###########################
 
 [SUPERNERD,Avery]
-Pokemon = B4H25,41 #PIKAMANDER
-Pokemon = B5H25,41 #PIKAMELEON
-Pokemon = B6H25,45 #PIKAIZARD
+Pokemon = B4H25,36 #PIKAMANDER
+Pokemon = B5H25,40 #PIKAMELEON
+Pokemon = B6H25,43 #PIKAIZARD
 ###########################
 
 [BURGLAR,Ramon]
-Pokemon = B5H2,49 #IVYMELEON
+Pokemon = B5H2,45 #IVYMELEON
 ###########################
 
 [SUPERNERD,Derek]
-Pokemon = B51H51,49 #DDUGTRIO
+Pokemon = B51H51,45 #DDUGTRIO
 ###########################
 
 [BURGLAR,Dusty]
-Pokemon = B58H37,44 #VULITHE
-Pokemon = B37H4,44 #CHARPIX
+Pokemon = B58H37,43 #VULITHE
+Pokemon = B37H4,43 #CHARPIX
 ###########################
 
 [SUPERNERD,Zac]
-Pokemon = B37H58,44 #GROWPIX
-Pokemon = B58H4,44 #CHARLITHE
+Pokemon = B37H58,43 #GROWPIX
+Pokemon = B58H4,43 #CHARLITHE
 
 ##############################
 #####VIRIDIAN FOREST########
@@ -1458,7 +1458,7 @@ Pokemon = B60H43,18 #Oddwag,
 #------------------------------
 
 [ENGINEER,Bernie]
-Pokemon = B109H81,21	 #Magnefing,
+Pokemon = B27H81,21	 #SANDSHEW + MAGNEMITE,
 #----------------------------
 
 [YOUNGSTER,Dave]
@@ -1553,35 +1553,32 @@ Pokemon = B25H81,23 #Magnechu,
 ######################
 
 [JUGGLER,Kayden]
-Pokemon = B97H94,39 #Geno,
+Pokemon = B96H20,36 #drowzee + raticate
 #-------------------------------------
 
 [JUGGLER,Nate]
-Pokemon = B96H42,36 #Golzee,
-Pokemon = B64H73,36 #Tentabra,
+Pokemon = B41H23,34 #zubat + ekans,
+Pokemon = B24H88,36 #arbok + grimer,
 #--------------------------------------
 
 [JUGGLER,Kirk]
-Pokemon = B96H15,32 #Beezee,
-Pokemon = B109H96,32 #Drowfing,
-Pokemon = B64H24,32 #Arbra,
-Pokemon = B93H64,32	 #Kadater,
+Pokemon = B48H41,32 #venonat + zubat
+Pokemon = B108H48,35 #lickitung + venonat,
+
 #-----------------------------------------
 
 [TAMER,Edgar]
-Pokemon = B24H113,34 #Chanbok,
-Pokemon = B24H82,34 #Magnebok,
-Pokemon = B28H48,34 #Venoslash,
+Pokemon = B27H30,32 #sandshrew + nidorina
+Pokemon = B111H33,34 #Rhyhorn + nidorino,
 #----------------------------------------
 
 [TAMER,Phil]
-Pokemon = B28H33,35 #Nidoslash,
-Pokemon = B24H110,35 #Weebok,
+Pokemon = B46H48,35 #paras + venonat,
+Pokemon = B42H47,35 #golbart + parasect ,
 #---------------------------------------
 
 [JUGGLER,Shawn]
-Pokemon = B96H45,35 #Vilezee,
-Pokemon = B12H97,35 #Hypfree,
+Pokemon = B40H109,36 #wigglytuff + koffing
 #------------------------------------------------
 
 #################
@@ -1589,47 +1586,47 @@ Pokemon = B12H97,35 #Hypfree,
 ##################
 
 [ENGINEER,Cole]
-Pokemon = B24H28,46 #SANDBOK
-Pokemon = B128H111,46 #RHYROS
+Pokemon = B24H28,44 #SANDBOK
+Pokemon = B128H111,44 #RHYROS
 ###################
 
 [BLACKBELT,Kiyo]
-Pokemon = B67H105,50 #MAROCHOKE
+Pokemon = B67H105,48 #MAROCHOKE
 	Item = BLACKBELT		
 ####################
 
 [ENGINEER,Jason]
-Pokemon = B111H53,50 #PERHORN
+Pokemon = B111H53,48 #PERHORN
 #####################
 
 [BLACKBELT,Atsushi]
-Pokemon = B66H104,47 #CUCHOP
-Pokemon = B221H121,47 
+Pokemon = B66H104,46 #CUCHOP
+Pokemon = B221H121,46 
 #####################
 
 [COOLTRAINER_M,Samuel]
-Pokemon = B28H33,45 #NIDOSLASH
-Pokemon = B111H28,45 #SANDHORN
-Pokemon = B34H104,45 #CUKING
+Pokemon = B28H33,44 #NIDOSLASH
+Pokemon = B111H28,44 #SANDHORN
+Pokemon = B34H104,44 #CUKING
 #####################
 
 [BLACKBELT,Takashi]
-Pokemon = MACHOP,45 
-Pokemon = B67H55,45 #ONCHOKE
-Pokemon = B34H67,45 #MAKING
+Pokemon = MACHOP,44 
+Pokemon = B67H55,44 #ONCHOKE
+Pokemon = B34H67,44 #MAKING
 ####################
 
 [COOLTRAINER_M,Yuji]
-Pokemon = B28H55,44 #GOLSLASH
-Pokemon = B95H135,44 #JOLTIX
-Pokemon = B105H108,44 #LICKIWAK
+Pokemon = B28H55,42 #GOLSLASH
+Pokemon = B95H135,42 #JOLTIX
+Pokemon = B105H108,42 #LICKIWAK
 Pokemon = B75H127,44 #PINELER
 #####################
 
 [COOLTRAINER_F,Justine]
-Pokemon = B111H70,45 #WEEPINHORN
-Pokemon = B105H105,45 #DMAROWAK
-Pokemon = B31H20,45 #RATQUEEN
+Pokemon = B111H70,43 #WEEPINHORN
+Pokemon = B105H105,43 #DMAROWAK
+Pokemon = B31H20,43 #RATQUEEN
 
 #################
 ###Cerulean Gym###
@@ -2079,21 +2076,22 @@ Pokemon = IVYSAUR,30
 
 [LEADER_Koga,Koga]
 Items = HYPERPOTION,HYPERPOTION
-Pokemon = B109H88,37 #koffmer
-	Moves = SELFDESTRUCT,SLUDGEBOMB,DESTINYBOND,FLING
+
+Pokemon = B88H49,35 #Grimer + Venomoth,
+	Moves = SIGNALBEAM,SLUDGEBOMB,FLING,DISABLE
+	AbilityIndex = 1
+	Item = POISONBARB
+Pokemon = B109H81,36 #magnemite + koffing
+	Moves = SLUDGEBOMB,SELFDESTRUCT,SONICBOOM,SUPERSONIC
 	AbilityIndex = 0
 	Item = 	POISONBARB	
-Pokemon = B42H113,35 #chanbat,
-	Moves = EGGBOMB,LIGHTSCREEN,TOXIC,POISONFANG
-	AbilityIndex = 0
-	Item = BLACKGLASSES
-Pokemon = B119H110,39 # Weeking,
-	Moves = AQUARING,WATERFALL,SLUDGE,HORNATTACK
+Pokemon = B123H15,36 # scyther + beedrill,
+	Moves = AGILITY,PINMISSILE,POISONJAB,TOXICSPIKES
 	AbilityIndex = 0		
 	Item = POISONBARB
-Pokemon = B47H89,40 #Musect,
-	Moves = POISONPOWDER,SPORE,SLUDGEBOMB,DISABLE
-	AbilityIndex = 0 		
+Pokemon = B89H113,38 #muk + chansey,
+	Moves = TOXIC,DOUBLETEAM,TAKEDOWN,ACIDARMOR
+	AbilityIndex = 1 		
 	Item = BLACKSLUDGE
 
 [LEADER_Koga,Koga,1]
@@ -2114,15 +2112,15 @@ Pokemon = B24H195,68 #ESPBOK
 
 [LEADER_Sabrina,Sabrina]
 Items = MAXPOTION,MAXPOTION
-Pokemon = B122H97,43 #HYPMIME		psych/fairy
+Pokemon = B122H97,41 #HYPMIME		psych/fairy
 	Moves = NASTYPLOT,BATONPASS,HYPNOSIS,PSYCHIC
 	AbilityIndex = 0
 	Item = TWISTEDSPOON
-Pokemon = B197H196,43 #ESREON		psych/DARK
+Pokemon = B197H196,41 #ESREON		psych/DARK
 	Moves = MOONLIGHT,FUTURESIGHT,DARKPULSE,LIGHTSCREEN
 	AbilityIndex = 0	
 	Item = TWISTEDSPOON
-Pokemon = B80H65,45 #AlaBRO,			psych/water
+Pokemon = B80H65,42 #AlaBRO,			psych/water
 	Moves = PSYCHOCUT,SURF,RECOVER,AMNESIA
 	AbilityIndex = 0			
 	Item = TWISTEDSPOON
@@ -2150,19 +2148,19 @@ Pokemon = B296H196,70 #ESPRIO
 
 [LEADER_Blaine,Blaine]
 Items = FULLRESTORE
-Pokemon = B78H44,49 #Gloodash,
+Pokemon = B78H44,47 #Gloodash,
 	Moves = SUNNYDAY,SOLARBEAM,FLAMETHROWER,TOXIC
 	AbilityIndex = 1
 	Item = CHARCOAL
-Pokemon = B59H38,49 #NINENINE
+Pokemon = B59H38,47 #NINENINE
 	Moves = ROAR,FIREFANG,CONFUSERAY,THUNDERFANG
 	AbilityIndex = 0			
 	Item = CHARCOAL
-Pokemon = B126H112,51 #Rhymar,
+Pokemon = B126H112,49 #Rhymar,
 	Moves = FIREPUNCH,DRILLRUN,CONFUSERAY,HAMMERARM
 	AbilityIndex = 0	
 	Item = PASSHOBERRY
-Pokemon = B142H6,53 #Chardactyl,
+Pokemon = B142H6,51 #Chardactyl,
 	Moves = CRUNCH,SKYDROP,FIREBLAST,HYPERBEAM
 	AbilityIndex = 0
 	Item = CHARCOAL
@@ -2185,23 +2183,23 @@ Pokemon = B268H302,71 #CRAMORTAR
 
 [LEADER_Giovanni,Giovanni,0]
 Items = FULLRESTORE,FULLRESTORE,FULLRESTORE
-Pokemon = B131H265,52 #Rhyras,
+Pokemon = B131H265,50 #Rhyras,
 	Moves = SURF,BULLDOZE,SANDSTORM,SING
 	AbilityIndex = 1
 	Item = 	SOFTSAND
-Pokemon = B51H125,52 #Electatrio,
+Pokemon = B51H125,50 #Electatrio,
 	Moves = BULLDOZE,LIGHTSCREEN,THUNDERWAVE,DISCHARGE
 	AbilityIndex = 0
 	Item = 	SOFTSAND
-Pokemon = B68H76,54 #GOLCHAMP,
+Pokemon = B68H76,52 #GOLCHAMP,
 	Moves = EARTHQUAKE,DYNAMICPUNCH,COUNTER,SCARYFACE
 	AbilityIndex = 0
 	Item = 	SOFTSAND
-Pokemon = B248H273,56 #DNIDOKING,
+Pokemon = B248H273,54 #DNIDOKING,
 	Moves = EARTHQUAKE,THRASH,MEGAHORN,POISONJAB
 	AbilityIndex = 1
 	Item = 	SOFTSAND
-Pokemon = B143H112,56 #snordon,
+Pokemon = B143H112,54 #snordon,
 	Moves = EARTHQUAKE,REST,SNORE,HORNDRILL
 	AbilityIndex = 0
 	Item = 	SOFTSAND
@@ -3932,7 +3930,9 @@ Pokemon = B128H5,44 #CHARROS
 Pokemon = B131H186,44 #POLIRAS
 Pokemon = B108H51,44 #DUGTUNG
 ###################
-
+[COOLTRAINER_M,Josh]
+Pokemon = B143H97,46 #snorlax + hypno
+###################
 [COOLTRAINER_F,Alexa]
 Pokemon = B25H106,42 #HITMONFABLE
 Pokemon = B40H107,42 #HITMONTUFF