diff --git a/P3D/Content/Sounds/Battle/Attacks/Normal/Scratch.wav b/P3D/Content/Sounds/Battle/Attacks/Normal/Scratch.wav
new file mode 100644
index 000000000..7e42ed1da
Binary files /dev/null and b/P3D/Content/Sounds/Battle/Attacks/Normal/Scratch.wav differ
diff --git a/P3D/Content/Textures/Battle/Fire/FireBall.png b/P3D/Content/Textures/Battle/Fire/FireBall.png
index 3348c1ad1..016508a24 100644
Binary files a/P3D/Content/Textures/Battle/Fire/FireBall.png and b/P3D/Content/Textures/Battle/Fire/FireBall.png differ
diff --git a/P3D/Content/Textures/Battle/Normal/Scratch.png b/P3D/Content/Textures/Battle/Normal/Scratch.png
new file mode 100644
index 000000000..ad5a83635
Binary files /dev/null and b/P3D/Content/Textures/Battle/Normal/Scratch.png differ
diff --git a/P3D/P3D.vbproj b/P3D/P3D.vbproj
index d43d418e3..c931798b8 100644
--- a/P3D/P3D.vbproj
+++ b/P3D/P3D.vbproj
@@ -14729,6 +14729,9 @@
PreserveNewest
+
+ PreserveNewest
+
PreserveNewest
@@ -14795,6 +14798,9 @@
PreserveNewest
+
+ PreserveNewest
+
PreserveNewest
diff --git a/P3D/Pokemon/Attacks/Fire/Ember.vb b/P3D/Pokemon/Attacks/Fire/Ember.vb
index 2060549af..720eee0e3 100644
--- a/P3D/Pokemon/Attacks/Fire/Ember.vb
+++ b/P3D/Pokemon/Attacks/Fire/Ember.vb
@@ -65,24 +65,44 @@
Public Overrides Sub InternalUserPokemonMoveAnimation(ByVal BattleScreen As BattleScreen, ByVal BattleFlip As Boolean, ByVal CurrentPokemon As Pokemon, ByVal CurrentEntity As NPC, ByVal CurrentModel As ModelEntity)
Dim MoveAnimation = New AnimationQueryObject(CurrentEntity, BattleFlip)
- Dim FireballEntity = MoveAnimation.SpawnEntity(New Vector3(0), TextureManager.GetTexture("Textures\Battle\Fire\FireBall"), New Vector3(0.5F), 1.0F)
+ Dim TextureYOffset As Integer = 0
+ If BattleFlip = True Then
+ TextureYOffset = 32
+ End If
+ Dim FireballEntity = MoveAnimation.SpawnEntity(New Vector3(0), TextureManager.GetTexture("Textures\Battle\Fire\FireBall", New Rectangle(0, TextureYOffset, 32, 32), ""), New Vector3(0.5F), 1.0F)
- MoveAnimation.AnimationMove(FireballEntity, True, 2.0, 0.0, 0.0, 0.05, False, True, 0.0, 0.0,, -0.5)
+ If BattleFlip = False Then
+ MoveAnimation.AnimationMove(FireballEntity, True, 2.0, 0.0, 0.0, 0.05, False, True, 0.0, 0.0,, -0.5)
+ Else
+ MoveAnimation.AnimationMove(FireballEntity, True, 2.0, 0.0, 0.0, 0.05, False, True, 0.0, 0.0,, 0.5)
+ End If
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 ModelEntity)
Dim MoveAnimation = New AnimationQueryObject(CurrentEntity, BattleFlip)
- Dim FireballEntity = MoveAnimation.SpawnEntity(New Vector3(-2.0, 0.0, 0.0), TextureManager.GetTexture("Textures\Battle\Fire\FireBall"), New Vector3(0.5F), 1.0F)
-
- MoveAnimation.AnimationMove(FireballEntity, True, -0.05, 0.0, 0.0, 0.05, False, True, 0.0, 1.0,, -0.5)
+ Dim TextureYOffset As Integer = 0
+ If BattleFlip = True Then
+ TextureYOffset = 32
+ End If
+ Dim FireballEntity = MoveAnimation.SpawnEntity(New Vector3(-2.0, 0.0, 0.0), TextureManager.GetTexture("Textures\Battle\Fire\FireBall", New Rectangle(0, TextureYOffset, 32, 32), ""), New Vector3(0.5F), 1.0F)
+ If BattleFlip = True Then
+ MoveAnimation.AnimationMove(FireballEntity, True, -0.05, 0.0, 0.0, 0.05, False, True, 0.0, 1.0,, 0.5)
+ Else
+ MoveAnimation.AnimationMove(FireballEntity, True, -0.05, 0.0, 0.0, 0.05, False, True, 0.0, 1.0,, -0.5)
+ End If
MoveAnimation.AnimationPlaySound("Battle\Attacks\Fire\Ember_Hit", 4, 0)
-
- Dim FireEntity1 As Entity = MoveAnimation.SpawnEntity(New Vector3(-0.25, -0.25, -0.25), TextureManager.GetTexture("Textures\Battle\Fire\Ember", New Rectangle(0, 0, 32, 32), ""), New Vector3(0.5F), 1, 3, 0)
+ Dim Fire1Position As Vector3 = New Vector3(-0.25, -0.25, -0.25)
+ Dim Fire3Position As Vector3 = New Vector3(0.25, -0.25, 0.25)
+ If BattleFlip = True Then
+ Fire1Position = New Vector3(-0.25, -0.25, 0.25)
+ Fire3Position = New Vector3(0.25, -0.25, -0.25)
+ End If
+ Dim FireEntity1 As Entity = MoveAnimation.SpawnEntity(Fire1Position, TextureManager.GetTexture("Textures\Battle\Fire\Ember", New Rectangle(0, 0, 32, 32), ""), New Vector3(0.5F), 1, 3, 0)
Dim FireEntity2 As Entity = MoveAnimation.SpawnEntity(New Vector3(0, -0.25, 0), TextureManager.GetTexture("Textures\Battle\Fire\Ember", New Rectangle(0, 0, 32, 32), ""), New Vector3(0.5F), 1, 3, 0)
- Dim FireEntity3 As Entity = MoveAnimation.SpawnEntity(New Vector3(0.25, -0.25, 0.25), TextureManager.GetTexture("Textures\Battle\Fire\Ember", New Rectangle(0, 0, 32, 32), ""), New Vector3(0.5F), 1, 3, 0)
+ Dim FireEntity3 As Entity = MoveAnimation.SpawnEntity(Fire3Position, TextureManager.GetTexture("Textures\Battle\Fire\Ember", New Rectangle(0, 0, 32, 32), ""), New Vector3(0.5F), 1, 3, 0)
MoveAnimation.AnimationChangeTexture(FireEntity1, False, TextureManager.GetTexture("Textures\Battle\Fire\Ember", New Rectangle(0, 32, 32, 32), ""), 3.75, 0)
MoveAnimation.AnimationChangeTexture(FireEntity2, False, TextureManager.GetTexture("Textures\Battle\Fire\Ember", New Rectangle(0, 32, 32, 32), ""), 3.75, 0)
diff --git a/P3D/Pokemon/Attacks/Normal/Scratch.vb b/P3D/Pokemon/Attacks/Normal/Scratch.vb
index a2385f3bc..23c4eb4b5 100644
--- a/P3D/Pokemon/Attacks/Normal/Scratch.vb
+++ b/P3D/Pokemon/Attacks/Normal/Scratch.vb
@@ -52,6 +52,19 @@
'#End
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 ModelEntity)
+ Dim MoveAnimation As AnimationQueryObject = New AnimationQueryObject(CurrentEntity, BattleFlip)
+ MoveAnimation.AnimationPlaySound("Battle\Attacks\Normal\Scratch", 0.5, 2.5)
+ Dim TextureXOffset As Integer = 0
+ If BattleFlip = True Then
+ TextureXOffset = 32
+ End If
+ Dim ScratchEntity = MoveAnimation.SpawnEntity(New Vector3(0, -0.2, 0), TextureManager.GetTexture("Textures\Battle\Normal\Scratch", New Rectangle(TextureXOffset, 0, 32, 32), ""), New Vector3(0.5F), 1, 0, 1)
+ MoveAnimation.AnimationChangeTexture(ScratchEntity, False, TextureManager.GetTexture("Textures\Battle\Normal\Scratch", New Rectangle(TextureXOffset, 32, 32, 32), ""), 1, 1)
+ MoveAnimation.AnimationChangeTexture(ScratchEntity, True, TextureManager.GetTexture("Textures\Battle\Normal\Scratch", New Rectangle(TextureXOffset, 64, 32, 32), ""), 1, 1)
+ BattleScreen.BattleQuery.Add(MoveAnimation)
+ End Sub
+
End Class
End Namespace
\ No newline at end of file