From 6551697b4fc6acf881cef895603c0c599378d606 Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Tue, 24 Aug 2021 13:36:52 +0100 Subject: [PATCH] Fixed incorrect layering of sprites in battle, unfixed RMXP transitions --- .../Scripts/011_Battle/005_Battle scene/007_Scene_Initialize.rb | 2 +- .../002_Battle triggering/002_Overworld_BattleIntroAnim.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Data/Scripts/011_Battle/005_Battle scene/007_Scene_Initialize.rb b/Data/Scripts/011_Battle/005_Battle scene/007_Scene_Initialize.rb index 1a20e7ea3..d99b0ef35 100644 --- a/Data/Scripts/011_Battle/005_Battle scene/007_Scene_Initialize.rb +++ b/Data/Scripts/011_Battle/005_Battle scene/007_Scene_Initialize.rb @@ -160,7 +160,7 @@ class PokeBattle_Scene trainer = pbAddSprite("player_#{idxTrainer+1}",spriteX,spriteY,trainerFile,@viewport) return if !trainer.bitmap # Alter position of sprite - trainer.z = 30+idxTrainer + trainer.z = 80+idxTrainer if trainer.bitmap.width>trainer.bitmap.height*2 trainer.src_rect.x = 0 trainer.src_rect.width = trainer.bitmap.width/5 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 58218dfd0..f56cf002e 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 @@ -88,8 +88,8 @@ def pbBattleAnimation(bgm=nil,battletype=0,foe=nil) end # Play main animation Graphics.freeze - viewport.color = Color.new(0,0,0,255) # Ensure screen is black Graphics.transition(Graphics.frame_rate*1.25,sprintf("Graphics/Transitions/%s",anim)) + viewport.color = Color.new(0,0,0,255) # Ensure screen is black # Slight pause after animation before starting up the battle scene (Graphics.frame_rate/10).times do Graphics.update