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

2019-01-29 17:35:00 -06:00 · 2019-01-29 17:35:00 -06:00 · 3a7efc4e7d
parent 6070f2db9d 8b6ae4935d
commit 3a7efc4e7d
4 changed files with 2 additions and 0 deletions
--- a/P3D/Content/GUI/Map/johto_map.png
+++ b/P3D/Content/GUI/Map/johto_map.png
--- a/P3D/Content/GUI/Map/kanto_map.png
+++ b/P3D/Content/GUI/Map/kanto_map.png
--- a/P3D/Content/GUI/Map/sevii
+++ b/P3D/Content/GUI/Map/sevii
--- a/P3D/Pokemon/Attacks/Normal/Judgement.vb
+++ b/P3D/Pokemon/Attacks/Normal/Judgement.vb
@ -61,6 +61,8 @@
            Dim itemID As Integer = 0
            If Not p.Item Is Nothing Then
                itemID = p.Item.ID
+            Else
+                Return New Element(Element.Types.Normal)
            End If

            Select Case p.Item.ID