Fix Overworld music bugs

P3D/Screens/Inventory/PokegearScreen.vb

@@ -2084,6 +2084,9 @@
             End If
 
             If Controls.Dismiss(True, True, True) = True Then
+                If CurrentStation Is Nothing Then
+                    MusicManager.Play(Screen.Level.MusicLoop)
+                End If
                 SoundManager.PlaySound("select")
                 Me.menuIndex = MenuScreens.Main
             End If

P3D/Screens/TransitionScreen.vb

@@ -71,11 +71,8 @@
 
     Public Overrides Sub Update()
         If reduce = False Then
-            Dim s As Screen = NewScreen
-            While s.Identification <> Identifications.OverworldScreen AndAlso s.PreScreen IsNot Nothing
-                s = s.PreScreen
-            End While
-            If s.Identification = Identifications.OverworldScreen Then
+            Dim screens() As Screen.Identifications = {Screen.Identifications.PokegearScreen, Screen.Identifications.OverworldScreen}
+            If screens.Contains(NewScreen.Identification) Then
                 MusicManager.Play(Screen.Level.MusicLoop, True, 0.01F)
             End If