From 78974b5ffa1a7a592c85b9858ef3ed1d0c5bdb67 Mon Sep 17 00:00:00 2001
From: infinitefusion <pkmninfinitefusion@gmail.com>
Date: Sun, 3 Jul 2022 11:10:16 -0400
Subject: [PATCH] improves battles loading time

---
 Data/Scripts/003_Game processing/002_Scene_Map.rb         | 1 -
 .../002_Overworld_BattleIntroAnim.rb                      | 8 +++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Data/Scripts/003_Game processing/002_Scene_Map.rb b/Data/Scripts/003_Game processing/002_Scene_Map.rb
index 78d167d95..32a0291a8 100644
--- a/Data/Scripts/003_Game processing/002_Scene_Map.rb	
+++ b/Data/Scripts/003_Game processing/002_Scene_Map.rb	
@@ -64,7 +64,6 @@ class Scene_Map
 
   #todo
   def cacheNeedsClearing
-    p RPG::Cache.size
     return RPG::Cache.size >= 100
   end
 
diff --git a/Data/Scripts/012_Overworld/002_Battle triggering/002_Overworld_BattleIntroAnim.rb b/Data/Scripts/012_Overworld/002_Battle triggering/002_Overworld_BattleIntroAnim.rb
index dccf79f1c..9a114d5fc 100644
--- a/Data/Scripts/012_Overworld/002_Battle triggering/002_Overworld_BattleIntroAnim.rb	
+++ b/Data/Scripts/012_Overworld/002_Battle triggering/002_Overworld_BattleIntroAnim.rb	
@@ -3,7 +3,9 @@
 #===============================================================================
 def pbSceneStandby
   $scene.disposeSpritesets if $scene.is_a?(Scene_Map)
-  RPG::Cache.clear
+  if RPG::Cache.need_clearing
+    RPG::Cache.clear
+  end
   Graphics.frame_reset
   yield
   $scene.createSpritesets if $scene.is_a?(Scene_Map)
@@ -23,7 +25,7 @@ def pbBattleAnimation(bgm=nil,battletype=0,foe=nil)
     $game_system.bgs_pause
   end
   pbMEFade(0.25)
-  pbWait(Graphics.frame_rate/4)
+  #pbWait(Graphics.frame_rate/4)
   pbMEStop
   # Play battle music
   bgm = pbGetWildBattleBGM([]) if !bgm
@@ -113,7 +115,7 @@ def pbBattleAnimation(bgm=nil,battletype=0,foe=nil)
   $PokemonEncounters.reset_step_count
   # Fade back to the overworld
   viewport.color = Color.new(0,0,0,255)
-  numFrames = Graphics.frame_rate*4/10   # 0.4 seconds, 16 frames
+  numFrames = Graphics.frame_rate*1/10   #4/10 0.4 seconds, 16 frames
   alphaDiff = (255.0/numFrames).ceil
   numFrames.times do
     viewport.color.alpha -= alphaDiff