Merge branch 'master' of https://github.com/P3D-Legacy/P3D-Legacy

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)
+{0|588|5|-1|17,19}
+{0|616|5|-1|17,19}

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>

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
 

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