diff --git a/P3D/Content/Songs/intro/johto_wild_night.ogg b/P3D/Content/Songs/intro/johto_wild_night.ogg
index a73b7a517..7d4b001e4 100644
Binary files a/P3D/Content/Songs/intro/johto_wild_night.ogg and b/P3D/Content/Songs/intro/johto_wild_night.ogg differ
diff --git a/P3D/Content/Songs/johto_wild_intro_night.ogg b/P3D/Content/Songs/johto_wild_intro_night.ogg
new file mode 100644
index 000000000..403153550
Binary files /dev/null and b/P3D/Content/Songs/johto_wild_intro_night.ogg differ
diff --git a/P3D/Content/Songs/johto_wild_night.ogg b/P3D/Content/Songs/johto_wild_night.ogg
index 5279f8b7b..0494c72aa 100644
Binary files a/P3D/Content/Songs/johto_wild_night.ogg and b/P3D/Content/Songs/johto_wild_night.ogg differ
diff --git a/P3D/Content/Songs/johto_wild_night_intro.ogg b/P3D/Content/Songs/johto_wild_night_intro.ogg
deleted file mode 100644
index 0e156e68e..000000000
Binary files a/P3D/Content/Songs/johto_wild_night_intro.ogg and /dev/null differ
diff --git a/P3D/P3D.vbproj b/P3D/P3D.vbproj
index 68fd940a8..48ee393fe 100644
--- a/P3D/P3D.vbproj
+++ b/P3D/P3D.vbproj
@@ -17885,6 +17885,9 @@
     <Content Include="Content\Songs\intro\johto_wild.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Content\Songs\intro\johto_wild_night.ogg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Content\Songs\intro\kanto_leader.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -18071,6 +18074,12 @@
     <Content Include="Content\Songs\johto_wild_intro.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Content\Songs\johto_wild_intro_night.ogg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Songs\johto_wild_night.ogg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Content\Songs\kanto_leader.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
diff --git a/P3D/Screens/BattleIntroScreen.vb b/P3D/Screens/BattleIntroScreen.vb
index 0b44a66ec..11265d62f 100644
--- a/P3D/Screens/BattleIntroScreen.vb
+++ b/P3D/Screens/BattleIntroScreen.vb
@@ -42,8 +42,8 @@
             End If
         End If
 
-        If ShouldPlayNightTheme() Then
-            musicLoop = Screen.Level.CurrentRegion.Split(CChar(","))(0) & "_wild_night_intro"
+        If ShouldPlayNightTheme(musicLoop) Then
+            musicLoop = musicLoop & "_night"
             'musicLoop = "kanto_wild_intro"
         End If
 
@@ -65,8 +65,8 @@
                 End If
             End If
 
-            If ShouldPlayNightTheme() Then
-                MusicLoop = Screen.Level.CurrentRegion.Split(CChar(","))(0) & "_wild_night_intro"
+            If ShouldPlayNightTheme(MusicLoop) Then
+                MusicLoop = MusicLoop & "_night"
             End If
 
             If MusicManager.SongExists(MusicLoop) = False Then
@@ -297,7 +297,7 @@
         Dim t1 As Texture2D = TextureManager.GetTexture("GUI\Intro\VSIntro", New Rectangle(CInt(barPosition.X), CInt(barPosition.Y), 128, 64), "")
         Dim t2 As Texture2D = TextureManager.GetTexture("GUI\Intro\VSIntro", New Rectangle(CInt(VSPosition.X), CInt(VSPosition.Y), 64, 64), "")
         Dim t3 As Texture2D = TextureManager.GetTexture(TrainerTexture1, New Rectangle(0, Trainer1FrameSize.Height * 2, Trainer1FrameSize.Width, Trainer1FrameSize.Height))
-       
+
 
         If Trainer.GameJoltID <> "" Then
             If GameJolt.Emblem.HasDownloadedSprite(Trainer.GameJoltID) = True Then
@@ -615,6 +615,7 @@
         'bug catching contest
         'roaming battle
         'wild pokemon
+
         Dim fallbackLoopSong = "johto_wild"
         Dim loopSong = Screen.Level.CurrentRegion.Split(CChar(","))(0) & "_wild"
         If battleType = BattleIntroScreen.BattleType.PVP Then
@@ -625,17 +626,9 @@
         ElseIf battleType = BattleIntroScreen.BattleType.SAFARI Then
             fallbackLoopSong = "johto_wild"
             loopSong = Screen.Level.CurrentRegion.Split(CChar(","))(0) & "_wild"
-            If ShouldPlayNightTheme() Then
-                loopSong = Screen.Level.CurrentRegion.Split(CChar(","))(0) & "_wild_night"
-                fallbackLoopSong = "johto_wild_night"
-            End If
         ElseIf battleType = BattleIntroScreen.BattleType.BUG_CATCHING Then
             fallbackLoopSong = "johto_wild"
             loopSong = Screen.Level.CurrentRegion.Split(CChar(","))(0) & "_wild"
-            If ShouldPlayNightTheme() Then
-                loopSong = Screen.Level.CurrentRegion.Split(CChar(","))(0) & "_wild_night"
-                fallbackLoopSong = "johto_wild_night"
-            End If
         ElseIf battleType = BattleIntroScreen.BattleType.ROAMING Then
             If BattleSystem.BattleScreen.RoamingPokemonStorage.MusicLoop <> "" Then
                 loopSong = BattleSystem.BattleScreen.RoamingPokemonStorage.MusicLoop
@@ -643,14 +636,15 @@
         ElseIf battleType = BattleIntroScreen.BattleType.WILD Then
             fallbackLoopSong = "johto_wild"
             loopSong = Screen.Level.CurrentRegion.Split(CChar(","))(0) & "_wild"
-            If ShouldPlayNightTheme() Then
-                loopSong = Screen.Level.CurrentRegion.Split(CChar(","))(0) & "_wild_night"
-                fallbackLoopSong = "johto_wild_night"
-            End If
         Else
             Console.WriteLine("Unknown Battle Type: " & battleType)
         End If
 
+        If ShouldPlayNightTheme(loopSong) Then
+            loopSong = loopSong & "_night"
+            fallbackLoopSong = "johto_wild_night"
+        End If
+
         If MusicManager.SongExists(loopSong) = True Then
             Return loopSong
         End If
@@ -661,8 +655,8 @@
         Return startTime + duration < Date.Now
     End Function
 
-    Private Function ShouldPlayNightTheme() As Boolean
-        Return World.IsNight() And Screen.Level.CurrentRegion = "Johto"
+    Private Function ShouldPlayNightTheme(dayThemeName As String) As Boolean
+        Return World.IsNight() And MusicManager.SongExists(dayThemeName & "_night")
     End Function
 
     'Protected Overrides Sub Finalize()