Added NewOptionScreen

2.5DHero/2.5DHero/2.5DHero.vbproj

@@ -1694,7 +1694,7 @@
     <Compile Include="Screens\MapScreen.vb" />
     <Compile Include="Screens\NewMenuScreen.vb" />
     <Compile Include="Screens\NewTrainerScreen.vb" />
-    <Compile Include="Screens\OptionScreen.vb" />
+    <Compile Include="Screens\NewOptionScreen.vb" />
     <Compile Include="Screens\PC\HallOfFameScreen.vb" />
     <Compile Include="Screens\PC\MailSystemScreen.vb" />
     <Compile Include="Screens\PC\StorageSystemScreen.vb" />

2.5DHero/2.5DHero/Player/Player.vb

@@ -360,7 +360,7 @@
     Public BoxAmount As Integer = 10
     Public DiagonalMovement As Boolean = False
     Public DifficultyMode As Integer = 0
-    Public BattleStyle As Integer = 0
+    Public BattleStyle As Integer = 1
     Public ShowModelsInBattle As Boolean = True
     Public TempSurfSkin As String = "Hilbert"
     Public TempRideSkin As String = ""
@@ -2029,7 +2029,7 @@
             DiagonalMovement = False
             RepelSteps = 0
             DifficultyMode = 0
-            BattleStyle = 0
+            BattleStyle = 1
             ShowModelsInBattle = True
             SaveCreated = "Pre 0.21"
             LastPokemonPosition = New Vector3(999)

2.5DHero/2.5DHero/Screens/NewMenuScreen.vb

@@ -275,7 +275,7 @@
             Case "Save"
                 Core.SetScreen(New SaveScreen(Me))
             Case "Options"
-                Core.SetScreen(New OptionScreen(Me))
+                Core.SetScreen(New NewOptionScreen(Me))
             Case "Exit"
                 Core.SetScreen(PreScreen)
             Case Screen.Level.BugCatchingContestData.GetSplit(2) & " x" & Core.Player.Inventory.GetItemAmount(177)

2.5DHero/2.5DHeroContent/Content/Content.mgcb

@@ -46447,3 +46447,15 @@
 /processorParam:TextureFormat=Color
 /build:GUI/unknownSprite.png
 
+#begin GUI/Menus/Options.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:GUI/Menus/Options.png
+