From 8ae07a6d150ed422c3a4bdd65bedbfd12451378c Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Fri, 8 Jul 2022 13:44:04 +0100 Subject: [PATCH] Fixed some Vs animations not playing for double battles against 1 trainer, fixed typo in Grassy Glide's effect --- .../011_Battle/003_Move/013_MoveEffects_SwitchingActing.rb | 2 +- .../002_Battle triggering/002_Overworld_BattleIntroAnim.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Data/Scripts/011_Battle/003_Move/013_MoveEffects_SwitchingActing.rb b/Data/Scripts/011_Battle/003_Move/013_MoveEffects_SwitchingActing.rb index ecf627294..497eec351 100644 --- a/Data/Scripts/011_Battle/003_Move/013_MoveEffects_SwitchingActing.rb +++ b/Data/Scripts/011_Battle/003_Move/013_MoveEffects_SwitchingActing.rb @@ -649,7 +649,7 @@ end class Battle::Move::HigherPriorityInGrassyTerrain < Battle::Move def pbPriority(user) ret = super - ret += 1 if @battle.field.terrain == :Grass && user.affectedByTerrain? + ret += 1 if @battle.field.terrain == :Grassy && user.affectedByTerrain? return ret end 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 4d68ad541..e32e76f9b 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 @@ -195,7 +195,7 @@ end #=============================================================================== SpecialBattleIntroAnimations.register("vs_trainer_animation", 60, # Priority 60 proc { |battle_type, foe, location| # Condition - next false if battle_type != 1 # Single trainer battle + next false if battle_type.even? || foe.length != 1 # Trainer battle against 1 trainer tr_type = foe[0].trainer_type next pbResolveBitmap("Graphics/Transitions/hgss_vs_#{tr_type}") && pbResolveBitmap("Graphics/Transitions/hgss_vsBar_#{tr_type}") @@ -218,7 +218,7 @@ SpecialBattleIntroAnimations.register("vs_trainer_animation", 60, # Priority 6 #=============================================================================== SpecialBattleIntroAnimations.register("vs_elite_four_animation", 60, # Priority 60 proc { |battle_type, foe, location| # Condition - next false if battle_type != 1 # Single trainer battle + next false if battle_type.even? || foe.length != 1 # Trainer battle against 1 trainer tr_type = foe[0].trainer_type next pbResolveBitmap("Graphics/Transitions/vsE4_#{tr_type}") && pbResolveBitmap("Graphics/Transitions/vsE4Bar_#{tr_type}") @@ -274,7 +274,7 @@ SpecialBattleIntroAnimations.register("vs_admin_animation", 60, # Priority 60 ##### Tweaked by Maruno ##### SpecialBattleIntroAnimations.register("alternate_vs_trainer_animation", 50, # Priority 50 proc { |battle_type, foe, location| # Condition - next false if battle_type != 1 # Single trainer battle + next false if battle_type.even? || foe.length != 1 # Trainer battle against 1 trainer tr_type = foe[0].trainer_type next pbResolveBitmap("Graphics/Transitions/vsTrainer_#{tr_type}") && pbResolveBitmap("Graphics/Transitions/vsBar_#{tr_type}")