From 2bc4ef9ee47f6b93039f2f7608fa7cdab4db1852 Mon Sep 17 00:00:00 2001
From: darkfire006 <blazer257@live.com>
Date: Thu, 31 Jan 2019 00:11:36 -0600
Subject: [PATCH 1/3] fix adds

---
 P3D/P3D.vbproj | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/P3D/P3D.vbproj b/P3D/P3D.vbproj
index 1c96b0aba..9634414c9 100644
--- a/P3D/P3D.vbproj
+++ b/P3D/P3D.vbproj
@@ -25702,6 +25702,7 @@
     <Compile Include="Pokemon\Items\KeyItems\LibertySeaMap.vb" />
     <Compile Include="Pokemon\Items\Standard\DouseDrive.vb" />
     <Compile Include="Pokemon\Items\Standard\ChillDrive.vb" />
+    <Compile Include="Pokemon\Items\Standard\FlameOrb.vb" />
     <Compile Include="Pokemon\Items\Standard\ShockDrive.vb" />
     <Compile Include="Pokemon\Items\Standard\BurnDrive.vb" />
     <Compile Include="Pokemon\Items\Standard\ExpertBelt.vb" />
@@ -25799,6 +25800,9 @@
     <None Include="Content\Data\Scripts\cerulean\novenu.dat">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="Content\Data\Scripts\dragonsden\dracotutor.dat">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="Content\Data\Scripts\faraway\ancestoremblemcheck.dat">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

From a24f5ff637103be55c8615c640ade6ecf69c87d2 Mon Sep 17 00:00:00 2001
From: CaptainSegis <F20121237@outlook.com>
Date: Thu, 31 Jan 2019 01:35:14 -0500
Subject: [PATCH 2/3] Hopefully fixed a couple of crashes

---
 P3D/Player/Player.vb                | 8 +++++---
 P3D/Screens/MainMenu/PauseScreen.vb | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/P3D/Player/Player.vb b/P3D/Player/Player.vb
index 9822ef353..c907b227c 100644
--- a/P3D/Player/Player.vb
+++ b/P3D/Player/Player.vb
@@ -1756,9 +1756,11 @@
         If CanFireStepEvent() = True Then
             Dim addEggSteps As Integer = stepAmount
             For Each p As Pokemon In Pokemons
-                If p.Ability.Name.ToLower() = "magma armor" Or p.Ability.Name.ToLower() = "flame body" Then
-                    addEggSteps *= Random.Next(1, 4)
-                    Exit For
+                If p.Ability IsNot Nothing Then
+                    If p.Ability.Name.ToLower() = "magma armor" OrElse p.Ability.Name.ToLower() = "flame body" Then
+                        addEggSteps *= Random.Next(1, 4)
+                        Exit For
+                    End If
                 End If
             Next
 
diff --git a/P3D/Screens/MainMenu/PauseScreen.vb b/P3D/Screens/MainMenu/PauseScreen.vb
index 1e7b42640..c3fed6768 100644
--- a/P3D/Screens/MainMenu/PauseScreen.vb
+++ b/P3D/Screens/MainMenu/PauseScreen.vb
@@ -25,7 +25,7 @@
         If Core.Player.IsGameJoltSave = True Then
             Me.canCreateAutosave = False
         Else
-            If Not Me.PreScreen Is Nothing Then
+            If Me.PreScreen IsNot Nothing AndAlso Camera.Name IsNot Nothing Then
                 If Camera.Name <> "Overworld" Then
                     Me.canCreateAutosave = False
                 Else

From 5e7742237bb3e27c3994e6e5e94269b2a5bade36 Mon Sep 17 00:00:00 2001
From: darkfire006 <blazer257@live.com>
Date: Thu, 31 Jan 2019 00:36:08 -0600
Subject: [PATCH 3/3] why am I so wrong sometimes

---
 P3D/Content/Data/maps/poke/fortune/patternbush/main.poke | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/P3D/Content/Data/maps/poke/fortune/patternbush/main.poke b/P3D/Content/Data/maps/poke/fortune/patternbush/main.poke
index cd90c6257..b8cee20fe 100644
--- a/P3D/Content/Data/maps/poke/fortune/patternbush/main.poke
+++ b/P3D/Content/Data/maps/poke/fortune/patternbush/main.poke
@@ -7,5 +7,5 @@ type=Grassland
 {0|165|30|1,2,3|15,18}
 {0|167|30|0|15,18}
 {0|214|20|-1|22,25}
-(0|588|5|-1|17,19)
-(0|616|5|-1|17,19)
\ No newline at end of file
+{0|588|5|-1|17,19}
+{0|616|5|-1|17,19}
\ No newline at end of file