Fixed Fury Cutter not resetting its counter properly

This commit is contained in:
CaptainSegis 2017-01-19 16:45:38 -05:00
parent f6480fd9be
commit 591a698515
4 changed files with 24 additions and 4 deletions

View File

@ -1039,7 +1039,11 @@
'op: the target pokemon 'op: the target pokemon
Dim p As Pokemon = BattleScreen.OwnPokemon Dim p As Pokemon = BattleScreen.OwnPokemon
Dim op As Pokemon = BattleScreen.OppPokemon Dim op As Pokemon = BattleScreen.OppPokemon
If own Then
BattleScreen.FieldEffects.OwnLastMove = moveUsed
Else
BattleScreen.FieldEffects.OppLastMove = moveUsed
End If
If Not own Then If Not own Then
p = BattleScreen.OppPokemon p = BattleScreen.OppPokemon
op = BattleScreen.OwnPokemon op = BattleScreen.OwnPokemon

View File

@ -117,6 +117,22 @@
ResetCounter(own, BattleScreen) ResetCounter(own, BattleScreen)
End Sub End Sub
Public Overrides Sub InflictedFlinch(own As Boolean, BattleScreen As BattleScreen)
ResetCounter(own, BattleScreen)
End Sub
Public Overrides Sub IsSleeping(own As Boolean, BattleScreen As BattleScreen)
ResetCounter(own, BattleScreen)
End Sub
Public Overrides Sub HurtItselfInConfusion(own As Boolean, BattleScreen As BattleScreen)
ResetCounter(own, BattleScreen)
End Sub
Public Overrides Sub IsAttracted(own As Boolean, BattleScreen As BattleScreen)
ResetCounter(own, BattleScreen)
End Sub
End Class End Class
End Namespace End Namespace

View File

@ -6,8 +6,8 @@
Shared _valid As Boolean = False Shared _valid As Boolean = False
Const RUNVALIDATION As Boolean = False Const RUNVALIDATION As Boolean = False
Const EXPECTEDSIZE As Integer = 42308847 Const EXPECTEDSIZE As Integer = 42308840
Const METAHASH As String = "ODU1QkIwNDI1Q0U0Q0QwNkRCNUU4MzM2QTQ2Q0M3QTc=" Const METAHASH As String = "MzJEODhGNkEwNzY0MzJCMTNERTlFMDM4REE3MDA5RjI="
Public Shared ReadOnly Property IsValid(ByVal ForceResult As Boolean) As Boolean Public Shared ReadOnly Property IsValid(ByVal ForceResult As Boolean) As Boolean
Get Get

File diff suppressed because one or more lines are too long