From a30201f185df88bfffce1e419d0b40d9aac6023d Mon Sep 17 00:00:00 2001 From: Mumble <171087428+frutescens@users.noreply.github.com> Date: Sun, 8 Sep 2024 19:12:37 -0700 Subject: [PATCH] [Hotfix] Retrieving the correct form index for correct cry keys (#4121) * [DOCS] adding JSDocs to `arena.ts` (#3590) * adding some docs * Update src/field/pokemon.ts Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com> * seems like battleStats changed to statStages * Apply suggestions from code review editing doc text Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com> * Update tsdocs, convert comment to tsdoc in `pokemon.ts` --------- Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com> Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com> * [Bug] Fix scrappy (+ some immunity move and ability) in inverse battle (#4067) * fix scrappy + etc. update inverse battle test code * update test code following request from swain * fix and optimize imports (#4061) - remove any `.js` extension imports - remove unncessary dynamic imports of `modifier.ts` file. The file was being imported statically & dynamically. Made it pure static - increase vite chunk-size warning limit Co-authored-by: Mumble <171087428+frutescens@users.noreply.github.com> * returned main * Fixed cry key * Revert "[DOCS] adding JSDocs to `arena.ts` (#3590)" This reverts commit 675e6a063590ad8b7f3c8c951cfeddc9a74db274. * Revert "[Bug] Fix scrappy (+ some immunity move and ability) in inverse battle (#4067)" This reverts commit 45af0dd170afd50e045bdbef4b05002b1f1e0fcf. * Revert "fix and optimize imports (#4061)" This reverts commit e12548cdb0d53f109c8c5d80b2e0dd2c22c2fc8b. --------- Co-authored-by: DustinLin <39450497+DustinLin@users.noreply.github.com> Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com> Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com> Co-authored-by: Leo Kim <47556641+KimJeongSun@users.noreply.github.com> Co-authored-by: frutescens --- src/battle-scene.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/battle-scene.ts b/src/battle-scene.ts index 12f424f63b3..8e6f9afb34c 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -2765,8 +2765,8 @@ export default class BattleScene extends SceneBase { playerParty.forEach(p => { keys.push(p.getSpriteKey(true)); keys.push(p.getBattleSpriteKey(true, true)); - keys.push("cry/" + p.species.getCryKey(p.species.formIndex)); - if (p.fusionSpecies && p.getSpeciesForm() !== p.getFusionSpeciesForm()) { + keys.push("cry/" + p.species.getCryKey(p.formIndex)); + if (p.fusionSpecies) { keys.push("cry/"+p.fusionSpecies.getCryKey(p.fusionFormIndex)); } }); @@ -2774,8 +2774,8 @@ export default class BattleScene extends SceneBase { const enemyParty = this.getEnemyParty(); enemyParty.forEach(p => { keys.push(p.getSpriteKey(true)); - keys.push("cry/" + p.species.getCryKey(p.species.formIndex)); - if (p.fusionSpecies && p.getSpeciesForm() !== p.getFusionSpeciesForm()) { + keys.push("cry/" + p.species.getCryKey(p.formIndex)); + if (p.fusionSpecies) { keys.push("cry/"+p.fusionSpecies.getCryKey(p.fusionFormIndex)); } });