Merge branch 'dev' into ai

2025-12-10 22:54:59 +00:00 · 2023-02-05 19:10:25 +00:00
parent d0c39a3e89 4749bd5201
commit 3f5c1f0974
208 changed files with 3123 additions and 3331 deletions
--- a/Data/Scripts/011_Battle/001_Battle/010_Battle_AttackPhase.rb
+++ b/Data/Scripts/011_Battle/001_Battle/010_Battle_AttackPhase.rb
@@ -57,9 +57,9 @@ class Battle
      pbPursuit(b.index)
      return if @decision > 0
      # Switch Pokémon
-      allBattlers.each do |b|
-        b.droppedBelowHalfHP = false
-        b.statsDropped = false
+      allBattlers.each do |b2|
+        b2.droppedBelowHalfHP = false
+        b2.statsDropped = false
      end
      pbRecallAndReplace(b.index, idxNewPkmn)
      pbOnBattlerEnteringBattle(b.index, true)