Fixed Fake Out flinch conditions in PvE, added support for .ogg files in the music manager, Added remaining PokemonForms (taken from C# port).

2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb

@@ -466,6 +466,9 @@
         End Sub
         'Checks if any pokemon is mega evolving, order based on speed
         Sub MegaEvolCheck(ByVal BattleScreen As BattleScreen)
+            If Not (BattleScreen.IsMegaEvolvingOwn OrElse BattleScreen.IsMegaEvolvingOpp) Then
+                Exit Sub
+            End If
             If BattleCalculation.MovesFirst(BattleScreen) Then
                 If BattleScreen.IsMegaEvolvingOwn Then
                     DoMegaEvolution(BattleScreen, True)
@@ -4428,6 +4431,9 @@
                                 End If
                             End If
                             SwitchOutOpp(BattleScreen, -1)
+                            If BattleScreen.IsTrainerBattle AndAlso Not BattleScreen.IsRemoteBattle Then
+                                HasSwitchedInOpp = False 'since opponents dont do after fainting switch rounds in PvE
+                            End If
                         End If
 
                         ChangeCameraAngel(0, True, BattleScreen)
@@ -6451,8 +6457,9 @@
         End Sub
 
         Public Sub SwitchInOpp(ByVal BattleScreen As BattleScreen, ByVal FirstTime As Boolean, ByVal index As Integer)
-            HasSwitchedInOpp = True
+
             If FirstTime = False Then
+                HasSwitchedInOpp = True
                 ChangeCameraAngel(1, False, BattleScreen)
                 BattleScreen.BattleQuery.Add(New TextQueryObject(BattleScreen.Trainer.Name & ": ""Come back, " & BattleScreen.OppPokemon.GetDisplayName() & "!"""))
 

2.5DHero/2.5DHero/Pokemon/Monster/Resource/PokemonForms.vb

@@ -9,7 +9,7 @@ Public Class PokemonForms
                                New Sceptile(), New Blaziken(), New Swampert(), New Gardevoir(), New Sableye(), New Mawile(), New Aggron(), New Medicham(), New Manectric(), New Sharpedo(), New Camerupt(), New Altaria(), New Banette(), New Absol(), New Glalie(), New Salamence(), New Metagross(), New Latias(), New Latios(), New Kyogre(), New Groudon(), New Rayquaza(), New Deoxys(),
                                New Burmy(), New Shellos(), New Gastrodon(), New Lopunny(), New Garchomp(), New Lucario(), New Abomasnow(), New Gallade(), New Rotom(), New Dialga(), New Arceus(),
                                New Audino(), New Basculin(), New Deerling(), New Sawsbuck(), New Frillish(), New Jellicent(), New Tornadus(), New Thundurus(), New Landorus(), New Kyurem(),
-                               New Vivillon(), New Pyroar(), New Aegislash(), New Diancie()})
+                               New Vivillon(), New Pyroar(), New Flabebe(), New Floette(), New Florges(), New Aegislash(), New Diancie(), New Hoopa()})
 
     End Sub
 
@@ -195,6 +195,8 @@ Public Class PokemonForms
 
     End Class
 
+#Region "Classes"
+
     Private Class Venusaur
         Inherits PokemonForm
         Public Sub New()
@@ -767,7 +769,7 @@ Public Class PokemonForms
             MyBase.New(172)
         End Sub
 
-        Public Overrides Function GetAnimationName(P As Pokemon) As String
+        Public Overrides Function GetAnimationName(ByVal P As Pokemon) As String
             If P.AdditionalData.ToLower() = "spiky-eared" Then
                 Return P.OriginalName & "_spiky-eared"
             Else
@@ -775,7 +777,7 @@ Public Class PokemonForms
             End If
         End Function
 
-        Public Overrides Function GetOverworldAddition(P As Pokemon) As String
+        Public Overrides Function GetOverworldAddition(ByVal P As Pokemon) As String
             If P.AdditionalData.ToLower() = "spiky-eared" Then
                 Return "_spiky-eared"
             Else
@@ -783,7 +785,7 @@ Public Class PokemonForms
             End If
         End Function
 
-        Public Overrides Function GetMenuImagePosition(P As Pokemon) As Vector2
+        Public Overrides Function GetMenuImagePosition(ByVal P As Pokemon) As Vector2
             If P.AdditionalData.ToLower() = "spiky-eared" Then
                 Return New Vector2(13, 26)
             Else
@@ -2415,7 +2417,7 @@ Public Class PokemonForms
             MyBase.New(483)
         End Sub
 
-        Public Overrides Function GetAnimationName(P As Pokemon) As String
+        Public Overrides Function GetAnimationName(ByVal P As Pokemon) As String
             If P.AdditionalData.ToLower() = "primal" Then
                 Return P.OriginalName & "_primal"
             Else
@@ -2423,7 +2425,7 @@ Public Class PokemonForms
             End If
         End Function
 
-        Public Overrides Function GetMenuImagePosition(P As Pokemon) As Vector2
+        Public Overrides Function GetMenuImagePosition(ByVal P As Pokemon) As Vector2
             If P.AdditionalData.ToLower() = "primal" Then
                 Return New Vector2(14, 26)
             Else
@@ -2431,7 +2433,7 @@ Public Class PokemonForms
             End If
         End Function
 
-        Public Overrides Function GetOverworldAddition(P As Pokemon) As String
+        Public Overrides Function GetOverworldAddition(ByVal P As Pokemon) As String
             If P.AdditionalData.ToLower() = "primal" Then
                 Return "_primal"
             Else
@@ -2456,12 +2458,12 @@ Public Class PokemonForms
             MyBase.New(493)
         End Sub
 
-        Private Function GetTypeAdditionFromPlate(ByVal p As Pokemon) As Tuple(Of String, Integer)
-            If Not p.Item Is Nothing Then
-                If p.Item.IsPlate = False Then
+        Private Function GetTypeAdditionFromPlate(ByVal P As Pokemon) As Tuple(Of String, Integer)
+            If Not P.Item Is Nothing Then
+                If P.Item.IsPlate = False Then
                     Return New Tuple(Of String, Integer)("", 0)
                 Else
-                    Select Case p.Item.ID
+                    Select Case P.Item.ID
                         Case 267
                             Return New Tuple(Of String, Integer)("dragon", 15)
                         Case 268
@@ -3094,6 +3096,178 @@ Public Class PokemonForms
         End Function
     End Class
 
+    Private Class Flabebe
+        Inherits PokemonForm
+        Public Sub New()
+            MyBase.New(669)
+        End Sub
+
+        Public Overrides Function GetMenuImagePosition(ByVal P As Pokemon) As Vector2
+            Select Case P.AdditionalData
+                Case "yellow"
+                    Return New Vector2(17, 27)
+                Case "blue"
+                    Return New Vector2(18, 27)
+                Case "orange"
+                    Return New Vector2(19, 27)
+                Case "white"
+                    Return New Vector2(20, 27)
+                Case Else
+                    Return MyBase.GetMenuImagePosition(P)
+            End Select
+        End Function
+
+        Public Overrides Function GetAnimationName(ByVal P As Pokemon) As String
+            Select Case P.AdditionalData
+                Case "yellow"
+                    Return "flabebe_yellow"
+                Case "blue"
+                    Return "flabebe_blue"
+                Case "orange"
+                    Return "flabebe_orange"
+                Case "white"
+                    Return "flabebe_white"
+                Case Else
+                    Return "flabebe"
+            End Select
+        End Function
+
+        Public Overrides Function GetOverworldAddition(ByVal P As Pokemon) As String
+            Select Case P.AdditionalData
+                Case "yellow"
+                    Return "_yellow"
+                Case "blue"
+                    Return "_blue"
+                Case "orange"
+                    Return "_orange"
+                Case "white"
+                    Return "_white"
+                Case Else
+                    Return "_red"
+            End Select
+        End Function
+
+    End Class
+    Private Class Floette
+        Inherits PokemonForm
+        Public Sub New()
+            MyBase.New(670)
+        End Sub
+
+        Public Overrides Function GetMenuImagePosition(ByVal P As Pokemon) As Vector2
+            Select Case P.AdditionalData
+                Case "yellow"
+                    Return New Vector2(21, 27)
+                Case "blue"
+                    Return New Vector2(22, 27)
+                Case "orange"
+                    Return New Vector2(23, 27)
+                Case "white"
+                    Return New Vector2(24, 27)
+                Case "eternal"
+                    Return New Vector2(28, 31)
+                Case Else
+                    Return MyBase.GetMenuImagePosition(P)
+            End Select
+        End Function
+
+        Public Overrides Function GetAnimationName(ByVal P As Pokemon) As String
+            Select Case P.AdditionalData
+                Case "yellow"
+                    Return P.OriginalName & "_yellow"
+                Case "blue"
+                    Return P.OriginalName & "_blue"
+                Case "orange"
+                    Return P.OriginalName & "_orange"
+                Case "white"
+                    Return P.OriginalName & "_white"
+                Case "eternal"
+                    Return P.OriginalName & "_eternal"
+                Case Else
+                    Return P.OriginalName
+            End Select
+        End Function
+
+        Public Overrides Function GetOverworldAddition(ByVal P As Pokemon) As String
+            Select Case P.AdditionalData
+                Case "yellow"
+                    Return "_yellow"
+                Case "blue"
+                    Return "_blue"
+                Case "orange"
+                    Return "_orange"
+                Case "white"
+                    Return "_white"
+                Case "eternal"
+                    Return "_eternal"
+                Case Else
+                    Return "_red"
+            End Select
+        End Function
+
+        Public Overrides Function GetDataFileAddition(ByVal AdditionalData As String) As String
+            Select Case AdditionalData
+                Case "eternal"
+                    Return "_eternal"
+                Case Else
+                    Return ""
+            End Select
+        End Function
+
+    End Class
+    Private Class Florges
+        Inherits PokemonForm
+        Public Sub New()
+            MyBase.New(671)
+        End Sub
+
+        Public Overrides Function GetMenuImagePosition(ByVal P As Pokemon) As Vector2
+            Select Case P.AdditionalData
+                Case "yellow"
+                    Return New Vector2(25, 27)
+                Case "blue"
+                    Return New Vector2(26, 27)
+                Case "orange"
+                    Return New Vector2(27, 27)
+                Case "white"
+                    Return New Vector2(28, 27)
+                Case Else
+                    Return MyBase.GetMenuImagePosition(P)
+            End Select
+        End Function
+
+        Public Overrides Function GetAnimationName(ByVal P As Pokemon) As String
+            Select Case P.AdditionalData
+                Case "yellow"
+                    Return P.OriginalName & "_yellow"
+                Case "blue"
+                    Return P.OriginalName & "_blue"
+                Case "orange"
+                    Return P.OriginalName & "_orange"
+                Case "white"
+                    Return P.OriginalName & "_white"
+                Case Else
+                    Return P.OriginalName
+            End Select
+        End Function
+
+        Public Overrides Function GetOverworldAddition(ByVal P As Pokemon) As String
+            Select Case P.AdditionalData
+                Case "yellow"
+                    Return "_yellow"
+                Case "blue"
+                    Return "_blue"
+                Case "orange"
+                    Return "_orange"
+                Case "white"
+                    Return "_white"
+                Case Else
+                    Return "_red"
+            End Select
+        End Function
+
+    End Class
+
     Private Class Aegislash
 
         Inherits PokemonForm
@@ -3189,6 +3363,55 @@ Public Class PokemonForms
         End Function
     End Class
 
+    Private Class Hoopa
+        Inherits PokemonForm
+        Public Sub New()
+            MyBase.New(720)
+        End Sub
+        Public Overrides Function GetMenuImagePosition(ByVal P As Pokemon) As Vector2
+            Select Case P.AdditionalData
+                Case "unbound"
+                    Return New Vector2(23, 25)
+                Case Else
+                    Return MyBase.GetMenuImagePosition(P)
+            End Select
+        End Function
+        Public Overrides Function GetMenuImageSize(ByVal P As Pokemon) As Size
+            Select Case P.AdditionalData
+                Case "unbound"
+                    Return New Size(38, 32)
+                Case Else
+                    Return New Size(32, 32)
+            End Select
+        End Function
+        Public Overrides Function GetDataFileAddition(ByVal AdditionalData As String) As String
+            Select Case AdditionalData.ToLower()
+                Case "unbound"
+                    Return "_unbound"
+                Case Else
+                    Return ""
+            End Select
+        End Function
+        Public Overrides Function GetAnimationName(ByVal P As Pokemon) As String
+            Select Case P.AdditionalData
+                Case "unbound"
+                    Return P.OriginalName & "_unbound"
+                Case Else
+                    Return P.OriginalName
+            End Select
+        End Function
+
+        Public Overrides Function GetOverworldAddition(ByVal P As Pokemon) As String
+            Select Case P.AdditionalData
+                Case "unbound"
+                    Return "_unbound"
+                Case Else
+                    Return ""
+            End Select
+        End Function
+    End Class
+#End Region
+
 #End Region
 
 End Class

2.5DHero/2.5DHero/Resources/Sound/MusicManager.vb

@@ -56,7 +56,7 @@
 
     Private Shared Function AddSong(ByVal Name As String, ByVal forceReplace As Boolean) As Boolean
         Try
-            Dim cContent As ContentManager = ContentPackManager.GetContentManager("Songs\" & Name, ".xnb,.mp3")
+            Dim cContent As ContentManager = ContentPackManager.GetContentManager("Songs\" & Name, ".xnb,.mp3,.ogg")
 
             Dim loadSong As Boolean = False
             Dim removeSong As Boolean = False
@@ -76,6 +76,10 @@
                         Dim ctor = GetType(Song).GetConstructor(System.Reflection.BindingFlags.NonPublic Or System.Reflection.BindingFlags.Instance, Nothing, {GetType(String), GetType(String), GetType(Integer)}, Nothing)
                         Dim filePath As String = GameController.GamePath & "\" & cContent.RootDirectory & "\Songs\" & Name & ".mp3"
                         song = CType(ctor.Invoke({Name, filePath, 0}), Song)
+                    ElseIf System.IO.File.Exists(GameController.GamePath & "\" & cContent.RootDirectory & "\Songs\" & Name & ".ogg") = True Then
+                        Dim ctor = GetType(Song).GetConstructor(System.Reflection.BindingFlags.NonPublic Or System.Reflection.BindingFlags.Instance, Nothing, {GetType(String), GetType(String), GetType(Integer)}, Nothing)
+                        Dim filePath As String = GameController.GamePath & "\" & cContent.RootDirectory & "\Songs\" & Name & ".ogg"
+                        song = CType(ctor.Invoke({Name, filePath, 0}), Song)
                     Else
                         Logger.Log(Logger.LogTypes.Warning, "MusicManager.vb: Song at """ & GameController.GamePath & "\" & cContent.RootDirectory & "\Songs\" & Name & """ was not found!")
                         Return False
@@ -137,7 +141,9 @@
     Private Shared Function TryAddGameModeMusic(ByVal Name As String) As Boolean
         Dim musicfileXNB As String = GameController.GamePath & GameModeManager.ActiveGameMode.ContentPath & "Songs\" & Name & ".xnb"
         Dim musicfileMP3 As String = GameController.GamePath & GameModeManager.ActiveGameMode.ContentPath & "Songs\" & Name & ".mp3"
-        If System.IO.File.Exists(musicfileXNB) = True Or System.IO.File.Exists(musicfileMP3) = True Then
+        Dim musicfileOGG As String = GameController.GamePath & GameModeManager.ActiveGameMode.ContentPath & "Songs\" & Name & ".ogg"
+
+        If System.IO.File.Exists(musicfileXNB) OrElse System.IO.File.Exists(musicfileMP3) OrElse System.IO.File.Exists(musicfileMP3) Then
             Return AddSong(Name, False)
         End If
         Return False

2.5DHero/2.5DHero/Security/FileValidation.vb

@@ -6,8 +6,8 @@
         Shared _valid As Boolean = False
 
         Const RUNVALIDATION As Boolean = False
-        Const EXPECTEDSIZE As Integer = 42417871
-        Const METAHASH As String = "NjFEMzUzMjgwNDcyMDk3Q0UxRDI2N0MzQUI2Q0M2MTE="
+        Const EXPECTEDSIZE As Integer = 42420203
+        Const METAHASH As String = "MjJEMDcyQ0IwRUFGNjU1MERGNjQ1QTI1RUQwQUY4Q0Y="
 
         Public Shared ReadOnly Property IsValid(ByVal ForceResult As Boolean) As Boolean
             Get

2.5DHero/2.5DHeroContent/Content.mgcb

@@ -3362,6 +3362,9 @@
 #begin Content/Pokemon/Data/670.dat
 /copy:Content/Pokemon/Data/670.dat
 
+#begin Content/Pokemon/Data/670_eternal.dat
+/copy:Content/Pokemon/Data/670_eternal.dat
+
 #begin Content/Pokemon/Data/671.dat
 /copy:Content/Pokemon/Data/671.dat
 
@@ -3563,6 +3566,9 @@
 #begin Content/Pokemon/Data/720.dat
 /copy:Content/Pokemon/Data/720.dat
 
+#begin Content/Pokemon/Data/720_unbound.dat
+/copy:Content/Pokemon/Data/720_unbound.dat
+
 #begin Content/Pokemon/Data/721.dat
 /copy:Content/Pokemon/Data/721.dat
 
@@ -13979,7 +13985,7 @@
 /processorParam:TextureFormat=Color
 /build:Content/Pokemon/Overworld/Normal/72.png
 
-#begin Content/Pokemon/Overworld/Normal/720_confined.png
+#begin Content/Pokemon/Overworld/Normal/720.png
 /importer:TextureImporter
 /processor:TextureProcessor
 /processorParam:ColorKeyColor=255,0,255,255
@@ -13989,7 +13995,7 @@
 /processorParam:ResizeToPowerOfTwo=False
 /processorParam:MakeSquare=False
 /processorParam:TextureFormat=Color
-/build:Content/Pokemon/Overworld/Normal/720_confined.png
+/build:Content/Pokemon/Overworld/Normal/720.png
 
 #begin Content/Pokemon/Overworld/Normal/720_unbound.png
 /importer:TextureImporter
@@ -24623,7 +24629,7 @@
 /processorParam:TextureFormat=Color
 /build:Content/Pokemon/Overworld/Shiny/72.png
 
-#begin Content/Pokemon/Overworld/Shiny/720_confined.png
+#begin Content/Pokemon/Overworld/Shiny/720.png
 /importer:TextureImporter
 /processor:TextureProcessor
 /processorParam:ColorKeyColor=255,0,255,255
@@ -24633,7 +24639,7 @@
 /processorParam:ResizeToPowerOfTwo=False
 /processorParam:MakeSquare=False
 /processorParam:TextureFormat=Color
-/build:Content/Pokemon/Overworld/Shiny/720_confined.png
+/build:Content/Pokemon/Overworld/Shiny/720.png
 
 #begin Content/Pokemon/Overworld/Shiny/720_unbound.png
 /importer:TextureImporter
@@ -29231,6 +29237,18 @@
 /processorParam:TextureFormat=Color
 /build:Content/Pokemon/Sprites/hoopa.png
 
+#begin Content/Pokemon/Sprites/Hoopa_unbound.png
+/importer:TextureImporter
+/processor:TextureProcessor
+/processorParam:ColorKeyColor=255,0,255,255
+/processorParam:ColorKeyEnabled=True
+/processorParam:GenerateMipmaps=False
+/processorParam:PremultiplyAlpha=True
+/processorParam:ResizeToPowerOfTwo=False
+/processorParam:MakeSquare=False
+/processorParam:TextureFormat=Color
+/build:Content/Pokemon/Sprites/Hoopa_unbound.png
+
 #begin Content/Pokemon/Sprites/Hoothoot.png
 /importer:TextureImporter
 /processor:TextureProcessor

2.5DHero/2.5DHeroContent/Content/Pokemon/Data/670_eternal.dat

@@ -0,0 +1,54 @@
+Name|Floette
+Number|670
+ExperienceType|1
+BaseExperience|130
+Type1|Fairy
+Type2|
+CatchRate|120
+BaseFriendship|70
+EggGroup1|Fairy
+EggGroup2|None
+BaseEggSteps|5355
+EggPokemon|669
+IsGenderLess|0
+CanBreed|1
+Devolution|669
+IsMale|0
+Ability1|166
+Ability2|Nothing
+HiddenAbility|180
+EggMoves|293,445,383
+Machines|174,92,237,241,230,173,63,182,240,202,203,218,76,216,94,104,207,214,197,156,213,171,99,72,102,117,118,164,347,219,263,290,412,416,445,363,447,496,497,267,605,590,148
+BaseHP|74
+BaseAttack|65
+BaseDefense|67
+BaseSpAttack|125
+BaseSpDefense|128
+BaseSpeed|92
+FPHP|0
+FPAttack|0
+FPDefense|0
+FPSpAttack|0
+FPSpDefense|2
+FPSpeed|0
+CanFly|0
+CanSwim|0
+Pokedex|It flutters around fields of flowers and cares for flowers that are starting to wilt. It draws out the power of flowers to battle.\Single Bloom Pokémon\0.9\0.2\0,148,0
+Scale|0.2
+Move|1,33
+Move|1,22
+Move|6,584
+Move|10,381
+Move|15,75
+Move|20,273
+Move|25,345
+Move|27,580
+Move|33,572
+Move|38,312
+Move|43,581
+Move|46,585
+Move|50,617
+Move|51,80
+Move|58,76
+TradeValue|40
+EvolutionCondition|671,item,135,item

2.5DHero/2.5DHeroContent/Content/Pokemon/Data/720.dat

@@ -1,4 +1,4 @@
-Name|Hoopa
+Name|Hoopa
 Number|720
 ExperienceType|3
 BaseExperience|270
@@ -27,7 +27,7 @@ BaseSpeed|70
 FPHP|0
 FPAttack|0
 FPDefense|0
-FPSpAttack|0
+FPSpAttack|3
 FPSpDefense|0
 FPSpeed|0
 CanFly|0
@@ -41,15 +41,17 @@ Move|1,593
 Move|1,93
 Move|6,310
 Move|10,277
-Move|15,60
-Move|19,113
+Move|15,113
+Move|19,60
 Move|25,285
 Move|29,471
-Move|35,470
-Move|46,566
+Move|29,470
+Move|35,566
+Move|46,428
 Move|50,472
-Move|55,433
-Move|68,247
+Move|50,433
+Move|55,247
+Move|68,417
 Move|75,94
 Move|85,593
 TradeValue|120

2.5DHero/2.5DHeroContent/Content/Pokemon/Data/720_unbound.dat

@@ -0,0 +1,56 @@
+Name|Hoopa
+Number|720
+ExperienceType|3
+BaseExperience|270
+Type1|Psychic
+Type2|Dark
+CatchRate|3
+BaseFriendship|70
+EggGroup1|None
+EggGroup2|None
+BaseEggSteps|6630
+EggPokemon|720
+IsGenderLess|1
+CanBreed|0
+Devolution|0
+IsMale|0
+Ability1|170
+Ability2|Nothing
+HiddenAbility|Nothing
+Machines|174,92,192,244,237,241,173,63,182,240,203,218,87,216,94,247,104,207,214,188,201,126,129,138,197,156,213,168,171,58,99,85,100,102,115,117,118,86,149,161,164,347,258,339,269,351,53,259,263,290,285,289,411,412,451,261,318,373,421,371,416,432,445,399,363,430,433,473,474,477,482,496,521,526,555,267,590,148
+BaseHP|80
+BaseAttack|160
+BaseDefense|60
+BaseSpAttack|170
+BaseSpDefense|130
+BaseSpeed|80
+FPHP|0
+FPAttack|0
+FPDefense|0
+FPSpAttack|3
+FPSpDefense|0
+FPSpeed|0
+CanFly|0
+CanSwim|0
+Pokedex|It gathers things it likes and pushes them through its loop to teleport them to a secret place.\Mischief Pokémon\490.0\6.5\0,148,0
+Scale|1.0
+Move|1,271
+Move|1,194
+Move|1,502
+Move|1,618
+Move|1,93
+Move|6,310
+Move|10,277
+Move|15,113
+Move|19,60
+Move|25,285
+Move|29,471
+Move|29,470
+Move|46,282
+Move|50,472
+Move|50,433
+Move|55,399
+Move|75,94
+Move|85,618
+TradeValue|120
+