diff --git a/Data/Scripts/011_Battle/001_Battle/002_Battle_StartAndEnd.rb b/Data/Scripts/011_Battle/001_Battle/002_Battle_StartAndEnd.rb
index 0cfcc6652..73d285044 100644
--- a/Data/Scripts/011_Battle/001_Battle/002_Battle_StartAndEnd.rb
+++ b/Data/Scripts/011_Battle/001_Battle/002_Battle_StartAndEnd.rb
@@ -143,6 +143,8 @@ class Battle
       # For each trainer in turn, find the needed number of Pokémon for them to
       # send out, and initialize them
       battlerNumber = 0
+      partyOrder = pbPartyOrder(side)
+      starts = pbPartyStarts(side)
       trainer.each_with_index do |_t, idxTrainer|
         ret[side][idxTrainer] = []
         eachInTeam(side, idxTrainer) do |pkmn, idxPkmn|
@@ -150,6 +152,10 @@ class Battle
           idxBattler = (2 * battlerNumber) + side
           pbCreateBattler(idxBattler, pkmn, idxPkmn)
           ret[side][idxTrainer].push(idxBattler)
+          if idxPkmn != starts[idxTrainer] + battlerNumber
+            idxOther = starts[idxTrainer] + battlerNumber
+            partyOrder[idxPkmn], partyOrder[idxOther] = partyOrder[idxOther], partyOrder[idxPkmn]
+          end
           battlerNumber += 1
           break if ret[side][idxTrainer].length >= requireds[idxTrainer]
         end
diff --git a/Data/Scripts/011_Battle/001_Battle/006_Battle_ActionUseItem.rb b/Data/Scripts/011_Battle/001_Battle/006_Battle_ActionUseItem.rb
index 575917e87..0731e4915 100644
--- a/Data/Scripts/011_Battle/001_Battle/006_Battle_ActionUseItem.rb
+++ b/Data/Scripts/011_Battle/001_Battle/006_Battle_ActionUseItem.rb
@@ -8,7 +8,7 @@ class Battle
       return false
     end
     # Embargo
-    if battler&.effects[PBEffects::Embargo] > 0
+    if battler && battler.effects[PBEffects::Embargo] > 0
       if showMessages
         scene.pbDisplay(_INTL("Embargo's effect prevents the item's use on {1}!",
                               battler.pbThis(true)))