diff --git a/P3D/Content/Sounds/Battle/Attacks/Water/WaterGun_Hit.wav b/P3D/Content/Sounds/Battle/Attacks/Water/WaterGun_Hit.wav
new file mode 100644
index 000000000..e8c496dd5
Binary files /dev/null and b/P3D/Content/Sounds/Battle/Attacks/Water/WaterGun_Hit.wav differ
diff --git a/P3D/Content/Sounds/Battle/Attacks/Water/WaterGun_Start.wav b/P3D/Content/Sounds/Battle/Attacks/Water/WaterGun_Start.wav
new file mode 100644
index 000000000..08371c841
Binary files /dev/null and b/P3D/Content/Sounds/Battle/Attacks/Water/WaterGun_Start.wav differ
diff --git a/P3D/P3D.vbproj b/P3D/P3D.vbproj
index 3e4cc334b..21d4745de 100644
--- a/P3D/P3D.vbproj
+++ b/P3D/P3D.vbproj
@@ -14765,6 +14765,12 @@
     <Content Include="Content\Sounds\Battle\Attacks\Water\Clamp.wav">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Content\Sounds\Battle\Attacks\Water\WaterGun_Hit.wav">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Sounds\Battle\Attacks\Water\WaterGun_Start.wav">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Content\Sounds\Battle\Attacks\Water\Whirlpool.wav">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -15554,6 +15560,9 @@
     <Content Include="Content\Textures\Battle\Water\Clamp_Right.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Content\Textures\Battle\Water\WaterGun.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Content\Textures\Battle\Water\Whirlpool.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
diff --git a/P3D/Pokemon/Attacks/Water/WaterGun.vb b/P3D/Pokemon/Attacks/Water/WaterGun.vb
index c8a364f20..fa48cb108 100644
--- a/P3D/Pokemon/Attacks/Water/WaterGun.vb
+++ b/P3D/Pokemon/Attacks/Water/WaterGun.vb
@@ -52,6 +52,40 @@
             '#End
         End Sub
 
+        Public Overrides Sub InternalUserPokemonMoveAnimation(ByVal BattleScreen As BattleScreen, ByVal BattleFlip As Boolean, ByVal CurrentPokemon As Pokemon, ByVal CurrentEntity As NPC, ByVal CurrentModel As Entity)
+            Dim MoveAnimation = New AnimationQueryObject(CurrentEntity, BattleFlip)
+            Dim WaterEntity = MoveAnimation.SpawnEntity(New Vector3(0), TextureManager.GetTexture("Textures\Battle\Water\WaterGun", New Rectangle(0, 0, 16, 16), ""), New Vector3(0.5F), 0.75F)
+            MoveAnimation.AnimationMove(WaterEntity, True, 2, 0.5, 0, 0.075, False, False, 0, 0,,,, 0.05)
+            MoveAnimation.AnimationPlaySound("Battle\Attacks\Water\Watergun_Start", 0, 0)
+            BattleScreen.BattleQuery.Add(MoveAnimation)
+        End Sub
+        Public Overrides Sub InternalOpponentPokemonMoveAnimation(ByVal BattleScreen As BattleScreen, ByVal BattleFlip As Boolean, ByVal CurrentPokemon As Pokemon, ByVal CurrentEntity As NPC, ByVal CurrentModel As Entity)
+            Dim MoveAnimation = New AnimationQueryObject(CurrentEntity, BattleFlip)
+            Dim WaterEntity = MoveAnimation.SpawnEntity(New Vector3(-2, 1, 0), TextureManager.GetTexture("Textures\Battle\Water\WaterGun", New Rectangle(0, 0, 16, 16), ""), New Vector3(0.5F), 0.75F)
+            MoveAnimation.AnimationMove(WaterEntity, True, 0, 0, 0, 0.075, False, False, 0, 0,,,, 0.035)
+
+            MoveAnimation.AnimationPlaySound("Battle\Attacks\Water\Watergun_Hit", 3, 0)
+            Dim HitEntity = MoveAnimation.SpawnEntity(New Vector3(0, -0.2, 0), TextureManager.GetTexture("Textures\Battle\Water\WaterGun", New Rectangle(0, 16, 16, 16), ""), New Vector3(0.5F), 0.75F, 3, 1)
+            MoveAnimation.AnimationFade(HitEntity, True, 1.0F, False, 0.0F, 5, 0)
+
+            Dim WaterDrop1Position As Vector3 = New Vector3(-0.25, 0.25, -0.25)
+            Dim WaterDrop2Position As Vector3 = New Vector3(0, 0.25, 0)
+            Dim WaterDrop3Position As Vector3 = New Vector3(0.25, 0.25, 0.25)
+            If BattleFlip = True Then
+                WaterDrop1Position = New Vector3(-0.25, 0.25, 0.25)
+                WaterDrop3Position = New Vector3(0.25, 0.25, -0.25)
+            End If
+
+            Dim WaterDropEntity1 As Entity = MoveAnimation.SpawnEntity(WaterDrop1Position, TextureManager.GetTexture("Textures\Battle\Water\WaterGun", New Rectangle(0, 32, 16, 16), ""), New Vector3(0.5F), 0.75F, 5, 0)
+            Dim WaterDropEntity2 As Entity = MoveAnimation.SpawnEntity(WaterDrop2Position, TextureManager.GetTexture("Textures\Battle\Water\WaterGun", New Rectangle(0, 32, 16, 16), ""), New Vector3(0.5F), 0.75F, 5, 0)
+            Dim WaterDropEntity3 As Entity = MoveAnimation.SpawnEntity(WaterDrop3Position, TextureManager.GetTexture("Textures\Battle\Water\WaterGun", New Rectangle(0, 32, 16, 16), ""), New Vector3(0.5F), 0.75F, 5, 0)
+
+            MoveAnimation.AnimationMove(WaterDropEntity1, True, WaterDrop1Position.X, -0.25, WaterDrop1Position.Z, 0.05F, False, False, 5, 0)
+            MoveAnimation.AnimationMove(WaterDropEntity2, True, WaterDrop2Position.X, -0.25, WaterDrop2Position.Z, 0.05F, False, False, 5, 0)
+            MoveAnimation.AnimationMove(WaterDropEntity3, True, WaterDrop3Position.X, -0.25, WaterDrop3Position.Z, 0.05F, False, False, 5, 0)
+
+            BattleScreen.BattleQuery.Add(MoveAnimation)
+        End Sub
     End Class
 
 End Namespace
\ No newline at end of file