From 5b40b2fa9d46dbf45747776848b76cb765d7e8f1 Mon Sep 17 00:00:00 2001 From: CaptainSegis Date: Tue, 25 Apr 2017 14:22:08 -0500 Subject: [PATCH] Miscellaneous fixes --- 2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleScreen.vb | 6 +++--- 2.5DHero/2.5DHero/Overworld/BackdropRenderer.vb | 2 +- 2.5DHero/2.5DHero/Screens/MapScreen.vb | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleScreen.vb b/2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleScreen.vb index a374f5b25..a806b6a16 100644 --- a/2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleScreen.vb +++ b/2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleScreen.vb @@ -781,11 +781,11 @@ If File.Exists(GameController.GamePath & "\maps\battle\" & levelfile) = False And File.Exists(GameController.GamePath & GameModeManager.ActiveGameMode.MapPath & "battle\" & levelfile) = False Then Select Case Me.defaultMapType Case 0 - levelfile = "battle0.dat" + levelfile = "main.dat" Case 2 - levelfile = "battle1.dat" + levelfile = "surf.dat" Case Else - levelfile = "battle0.dat" + levelfile = "main.dat" End Select BattleMapOffset = New Vector3(0) End If diff --git a/2.5DHero/2.5DHero/Overworld/BackdropRenderer.vb b/2.5DHero/2.5DHero/Overworld/BackdropRenderer.vb index e2099ec15..71da1de73 100644 --- a/2.5DHero/2.5DHero/Overworld/BackdropRenderer.vb +++ b/2.5DHero/2.5DHero/Overworld/BackdropRenderer.vb @@ -89,7 +89,7 @@ End Sub Public Sub New(ByVal BackdropType As String, ByVal Position As Vector3, ByVal Rotation As Vector3, ByVal Width As Integer, ByVal Height As Integer, ByVal BackdropTexture As Texture2D) - _shader = Content.Load(Of Effect)("Effects\BackdropShader") + _shader = Content.Load(Of Effect)("SharedResources\Effects\BackdropShader") _vertices.Add(New VertexPositionNormalTangentTexture(New Vector3(0, 0, 0), New Vector3(-1, 0, 0), New Vector3(0, 1, 0), New Vector2(0, 0))) _vertices.Add(New VertexPositionNormalTangentTexture(New Vector3(Width, 0, 0), New Vector3(-1, 0, 0), New Vector3(0, 1, 0), New Vector2(0, 1))) diff --git a/2.5DHero/2.5DHero/Screens/MapScreen.vb b/2.5DHero/2.5DHero/Screens/MapScreen.vb index ecba8f525..c5f9f04ab 100644 --- a/2.5DHero/2.5DHero/Screens/MapScreen.vb +++ b/2.5DHero/2.5DHero/Screens/MapScreen.vb @@ -90,7 +90,7 @@ Dim TempPoke As New List(Of Roaming) Dim RoamingPokeName As New List(Of String) - Dim path As String = GameModeManager.GetScriptPath("worldmap\" & Me.currentRegion & ".dat") + Dim path As String = GameModeManager.GetDataFilePath("worldmap\" & Me.currentRegion & ".dat") Security.FileValidation.CheckFileValid(path, False, "MapScreen.vb") Dim InputData() As String = System.IO.File.ReadAllLines(path)