From 19fe83f932f161b5da0fb410cd06e17b7a2d3dc9 Mon Sep 17 00:00:00 2001
From: Maruno17 <serialcolour@hotmail.com>
Date: Sat, 27 Feb 2021 21:11:24 +0000
Subject: [PATCH] Fixed battle BGM fading in/being offset

---
 Data/Scripts/003_Game classes/002_Game_System.rb | 3 +++
 Data/Scripts/013_Overworld/003_PField_Visuals.rb | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Data/Scripts/003_Game classes/002_Game_System.rb b/Data/Scripts/003_Game classes/002_Game_System.rb
index 34f35b797..44f2919b4 100644
--- a/Data/Scripts/003_Game classes/002_Game_System.rb	
+++ b/Data/Scripts/003_Game classes/002_Game_System.rb	
@@ -42,7 +42,10 @@ class Game_System
 ################################################################################
 
   def bgm_play(bgm)
+    old_pos = @bgm_position
+    @bgm_position = 0
     bgm_play_internal(bgm,0)
+    @bgm_position = old_pos
   end
 
   def bgm_play_internal2(name,volume,pitch,position) # :nodoc:
diff --git a/Data/Scripts/013_Overworld/003_PField_Visuals.rb b/Data/Scripts/013_Overworld/003_PField_Visuals.rb
index 80a9ebc55..43edc63a6 100644
--- a/Data/Scripts/013_Overworld/003_PField_Visuals.rb
+++ b/Data/Scripts/013_Overworld/003_PField_Visuals.rb
@@ -26,7 +26,7 @@ def pbBattleAnimation(bgm=nil,battletype=0,foe=nil)
   pbWait(Graphics.frame_rate/4)
   pbMEStop
   # Play battle music
-  bgm = pbGetWildBattleBGM([0]) if !bgm
+  bgm = pbGetWildBattleBGM([]) if !bgm
   pbBGMPlay(bgm)
   # Take screenshot of game, for use in some animations
   $game_temp.background_bitmap.dispose if $game_temp.background_bitmap