Merged from official repos

MikeyTheA · Aug 19, 2024 · 56da00e · 56da00e
2 parents 1d7ddd0 + a46e35b
commit 56da00e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/src/battle-scene.ts b/src/battle-scene.ts
@@ -2419,13 +2419,7 @@ export default class BattleScene extends SceneBase {
           count = Math.max(count, Math.floor(chances / 2));
         }
         getEnemyModifierTypesForWave(difficultyWaveIndex, count, [ enemyPokemon ], this.currentBattle.battleType === BattleType.TRAINER ? ModifierPoolType.TRAINER : ModifierPoolType.WILD, upgradeChance)
-          .map(mt => {
-            const enemyModifier = mt.newModifier(enemyPokemon);
-            if (enemyModifier instanceof TurnHeldItemTransferModifier) {
-              enemyModifier.setTransferrableFalse();
-            }
-            enemyModifier.add(this.enemyModifiers, false, this);
-          });
+          .map(mt => mt.newModifier(enemyPokemon).add(this.enemyModifiers, false, this));
       });
       this.updateModifiers(false).then(() => resolve());
     });

diff --git a/src/data/move.ts b/src/data/move.ts
@@ -4441,7 +4441,7 @@ export class CurseAttr extends MoveEffectAttr {
       const curseRecoilDamage = Math.max(1, Math.floor(user.getMaxHp() / 2));
       user.damageAndUpdate(curseRecoilDamage, HitResult.OTHER, false, true, true);
       user.scene.queueMessage(
-        i18next.t("battle:cursedOnAdd", {
+        i18next.t("battlerTags:cursedOnAdd", {
           pokemonNameWithAffix: getPokemonNameWithAffix(user),
           pokemonName: getPokemonNameWithAffix(target)
         })

diff --git a/src/phases.ts b/src/phases.ts
@@ -878,6 +878,10 @@ 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!);
         }
       }