diff --git a/Data/Scripts/012_Battle/001_Battler/010_Battler_UseMove_TriggerEffects.rb b/Data/Scripts/012_Battle/001_Battler/010_Battler_UseMove_TriggerEffects.rb
index d9c211ba0..62203ad90 100644
--- a/Data/Scripts/012_Battle/001_Battler/010_Battler_UseMove_TriggerEffects.rb
+++ b/Data/Scripts/012_Battle/001_Battler/010_Battler_UseMove_TriggerEffects.rb
@@ -102,12 +102,12 @@ class PokeBattle_Battler
          !@battle.battleBond[user.index&1][user.pokemonIndex]
         numFainted = 0
         targets.each { |b| numFainted += 1 if b.damageState.fainted }
-        if numFainted>0 && user.form!=1
+        if numFainted>0 && user.form==1
           @battle.battleBond[user.index&1][user.pokemonIndex] = true
           @battle.pbDisplay(_INTL("{1} became fully charged due to its bond with its Trainer!",user.pbThis))
           @battle.pbShowAbilitySplash(user,true)
           @battle.pbHideAbilitySplash(user)
-          user.pbChangeForm(1,_INTL("{1} became Ash-Greninja!",user.pbThis))
+          user.pbChangeForm(2,_INTL("{1} became Ash-Greninja!",user.pbThis))
         end
       end
     end
diff --git a/Data/Scripts/012_Battle/002_Move/006_Move_Effects_080-0FF.rb b/Data/Scripts/012_Battle/002_Move/006_Move_Effects_080-0FF.rb
index c995d79d9..9cfc2a071 100644
--- a/Data/Scripts/012_Battle/002_Move/006_Move_Effects_080-0FF.rb
+++ b/Data/Scripts/012_Battle/002_Move/006_Move_Effects_080-0FF.rb
@@ -1967,7 +1967,7 @@ class PokeBattle_Move_0C0 < PokeBattle_Move
 
   def pbNumHits(user,targets)
     if isConst?(@id,PBMoves,:WATERSHURIKEN) &&
-       user.isSpecies?(:GRENINJA) && user.form==1
+       user.isSpecies?(:GRENINJA) && user.form==2
       return 3
     end
     hitChances = [2,2,3,3,4,5]
@@ -1978,7 +1978,7 @@ class PokeBattle_Move_0C0 < PokeBattle_Move
 
   def pbBaseDamage(baseDmg,user,target)
     if isConst?(@id,PBMoves,:WATERSHURIKEN) &&
-       user.isSpecies?(:GRENINJA) && user.form==1
+       user.isSpecies?(:GRENINJA) && user.form==2
       return 20
     end
     return super
diff --git a/Data/Scripts/016_Pokemon/002_Pokemon_Forms.rb b/Data/Scripts/016_Pokemon/002_Pokemon_Forms.rb
index 110808260..ecada1c63 100644
--- a/Data/Scripts/016_Pokemon/002_Pokemon_Forms.rb
+++ b/Data/Scripts/016_Pokemon/002_Pokemon_Forms.rb
@@ -468,7 +468,7 @@ MultipleForms.register(:GENESECT,{
 
 MultipleForms.register(:GRENINJA,{
   "getFormOnLeavingBattle" => proc { |pkmn,battle,usedInBattle,endBattle|
-    next 0 if pkmn.fainted? || endBattle
+    next 1 if pkmn.form == 2 && (pkmn.fainted? || endBattle)
   }
 })
 
diff --git a/PBS/Gen 7/pokemonforms.txt b/PBS/Gen 7/pokemonforms.txt
index 8bbbe607b..c2a447c58 100644
--- a/PBS/Gen 7/pokemonforms.txt	
+++ b/PBS/Gen 7/pokemonforms.txt	
@@ -1170,6 +1170,11 @@ FormName = Chill Drive
 FormName = Douse Drive
 #-------------------------------
 [GRENINJA,1]
+Abilities = BATTLEBOND
+HiddenAbility = BATTLEBOND
+Compatibility = Undiscovered
+#-------------------------------
+[GRENINJA,2]
 FormName = Ash-Greninja
 BaseStats = 72,145,67,132,153,71
 Abilities = BATTLEBOND
diff --git a/PBS/pokemonforms.txt b/PBS/pokemonforms.txt
index 8bbbe607b..c2a447c58 100644
--- a/PBS/pokemonforms.txt
+++ b/PBS/pokemonforms.txt
@@ -1170,6 +1170,11 @@ FormName = Chill Drive
 FormName = Douse Drive
 #-------------------------------
 [GRENINJA,1]
+Abilities = BATTLEBOND
+HiddenAbility = BATTLEBOND
+Compatibility = Undiscovered
+#-------------------------------
+[GRENINJA,2]
 FormName = Ash-Greninja
 BaseStats = 72,145,67,132,153,71
 Abilities = BATTLEBOND