From a28aa5b4adc35d4466f13305e8fca1a3922dcd89 Mon Sep 17 00:00:00 2001
From: Maruno17 <serialcolour@hotmail.com>
Date: Wed, 28 Oct 2020 21:04:37 +0000
Subject: [PATCH] Fixed triggering a battle upon turning causing the player to
 take a step after it

---
 Data/Scripts/003_Game classes/005_Game_Character.rb             | 1 +
 Data/Scripts/012_Battle/003_Battle/008_Battle_Action_Running.rb | 2 +-
 Data/Scripts/013_Overworld/006_PField_Battles.rb                | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Data/Scripts/003_Game classes/005_Game_Character.rb b/Data/Scripts/003_Game classes/005_Game_Character.rb
index 029d260ee..703687951 100644
--- a/Data/Scripts/003_Game classes/005_Game_Character.rb	
+++ b/Data/Scripts/003_Game classes/005_Game_Character.rb	
@@ -265,6 +265,7 @@ class Game_Character
     @pattern = 0 if @walk_anime or @step_anime
     @anime_count = 0
     @prelock_direction = 0
+    @moved_last_frame = false
   end
 
   def force_move_route(move_route)
diff --git a/Data/Scripts/012_Battle/003_Battle/008_Battle_Action_Running.rb b/Data/Scripts/012_Battle/003_Battle/008_Battle_Action_Running.rb
index 709b820f7..14ecd896d 100644
--- a/Data/Scripts/012_Battle/003_Battle/008_Battle_Action_Running.rb
+++ b/Data/Scripts/012_Battle/003_Battle/008_Battle_Action_Running.rb
@@ -140,7 +140,7 @@ class PokeBattle_Battle
       rate += @runCommand*30
     end
     if rate>=256 || @battleAI.pbAIRandom(256)<rate
-	  pbSEPlay("Battle flee")
+      pbSEPlay("Battle flee")
       pbDisplayPaused(_INTL("You got away safely!"))
       @decision = 3
       return 1
diff --git a/Data/Scripts/013_Overworld/006_PField_Battles.rb b/Data/Scripts/013_Overworld/006_PField_Battles.rb
index 424da21ac..dee5f92d0 100644
--- a/Data/Scripts/013_Overworld/006_PField_Battles.rb
+++ b/Data/Scripts/013_Overworld/006_PField_Battles.rb
@@ -563,6 +563,7 @@ def pbAfterBattle(decision,canLose)
     end
   end
   Events.onEndBattle.trigger(nil,decision,canLose)
+  $game_player.straighten
 end
 
 Events.onEndBattle += proc { |_sender,e|