From b7fd719de86aec11e9f28918d939ef65af62061a Mon Sep 17 00:00:00 2001
From: frutescens <info@laptop>
Date: Tue, 12 Nov 2024 13:45:20 -0800
Subject: [PATCH] Moved code preventing MBH's transfer to after enemy modifiers
 were generated.

---
 src/phases/encounter-phase.ts | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/phases/encounter-phase.ts b/src/phases/encounter-phase.ts
index fc022ab9647..42a172ae00e 100644
--- a/src/phases/encounter-phase.ts
+++ b/src/phases/encounter-phase.ts
@@ -141,10 +141,6 @@ export class EncounterPhase extends BattlePhase {
         } else if (!(battle.waveIndex % 1000)) {
           enemyPokemon.formIndex = 1;
           enemyPokemon.updateScale();
-          const bossMBH = this.scene.findModifier(m => m instanceof TurnHeldItemTransferModifier && m.pokemonId === enemyPokemon.id, false) as TurnHeldItemTransferModifier;
-          this.scene.removeModifier(bossMBH!);
-          bossMBH?.setTransferrableFalse();
-          this.scene.addEnemyModifier(bossMBH!);
         }
       }
 
@@ -220,6 +216,18 @@ export class EncounterPhase extends BattlePhase {
       if (!this.loaded && battle.battleType !== BattleType.MYSTERY_ENCOUNTER) {
         regenerateModifierPoolThresholds(this.scene.getEnemyField(), battle.battleType === BattleType.TRAINER ? ModifierPoolType.TRAINER : ModifierPoolType.WILD);
         this.scene.generateEnemyModifiers();
+        // This checks if the current battle is an Endless E-Max battle/Classic final boss and sets the MBH held by the boss to untransferrable
+        if (this.scene.currentBattle.waveIndex % 1000 || battle.battleSpec === BattleSpec.FINAL_BOSS) {
+          const enemyPokemon = this.scene.getEnemyPokemon();
+          if (enemyPokemon) {
+            const bossMBH = this.scene.findModifier(m => m instanceof TurnHeldItemTransferModifier && m.pokemonId === enemyPokemon.id, false) as TurnHeldItemTransferModifier;
+            if (bossMBH) {
+              this.scene.removeModifier(bossMBH!);
+              bossMBH?.setTransferrableFalse();
+              this.scene.addEnemyModifier(bossMBH!);
+            }
+          }
+        }
       }
 
       this.scene.ui.setMode(Mode.MESSAGE).then(() => {