Skip to content

Commit

Permalink
[Refactor] Clean up commented safari zone code from #4661 (#4671)
Browse files Browse the repository at this point in the history
  • Loading branch information
PigeonBar authored Oct 16, 2024
1 parent 2caa09f commit 72c08e5
Showing 1 changed file with 1 addition and 12 deletions.
13 changes: 1 addition & 12 deletions src/data/mystery-encounters/encounters/safari-zone-encounter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -303,18 +303,7 @@ async function summonSafariPokemon(scene: BattleScene) {
scene.unshiftPhase(new SummonPhase(scene, 0, false));

encounter.setDialogueToken("pokemonName", getPokemonNameWithAffix(pokemon));
// TODO: If we await this showEncounterText, then the text will display without
// the wild Pokemon on screen, but if we don't await it, then the text never
// shows up and the IV scanner breaks. For now, we place the IV scanner code
// separately so that at least the IV scanner works.
//
// showEncounterText(scene, getEncounterText(scene, "battle:singleWildAppeared") ?? "", null, 0, false)
// .then(() => {
// const ivScannerModifier = scene.findModifier(m => m instanceof IvScannerModifier);
// if (ivScannerModifier) {
// scene.pushPhase(new ScanIvsPhase(scene, pokemon.getBattlerIndex(), Math.min(ivScannerModifier.getStackCount() * 2, 6)));
// }
// });

const ivScannerModifier = scene.findModifier(m => m instanceof IvScannerModifier);
if (ivScannerModifier) {
scene.pushPhase(new ScanIvsPhase(scene, pokemon.getBattlerIndex(), Math.min(ivScannerModifier.getStackCount() * 2, 6)));
Expand Down

0 comments on commit 72c08e5

Please sign in to comment.