From b07794e265d6af06222e8bd5b82e6a576af78c20 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 16 Dec 2023 23:41:46 +0100 Subject: [PATCH] fix neutralising gas visual glitch --- data/battle_anim_scripts.s | 2 -- data/battle_scripts_1.s | 5 +---- src/battle_util.c | 1 - 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 7c4f2fb924da..ce841e4a24af 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -27383,8 +27383,6 @@ General_RestoreBg: waitbgfadein end -end - General_ZMoveActivate: loadspritegfx ANIM_TAG_FOCUS_ENERGY @focus energy loadspritegfx ANIM_TAG_Z_MOVE_SYMBOL @Z-Move Symbol diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 4f8d7c34d94f..8fd0b5391a23 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -10440,9 +10440,6 @@ BattleScript_PastelVeilLoopIncrement: BattleScript_PastelVeilEnd: end3 -sByteFour: -.byte MAX_BATTLERS_COUNT - BattleScript_NeutralizingGasExits:: savetarget pause B_WAIT_TIME_SHORT @@ -10452,7 +10449,7 @@ BattleScript_NeutralizingGasExits:: BattleScript_NeutralizingGasExitsLoop: switchinabilities BS_TARGET addbyte gBattlerTarget, 1 - jumpifbytenotequal gBattlerTarget, sByteFour, BattleScript_NeutralizingGasExitsLoop @ SOMEHOW, comparing to gBattlersCount is problematic. + jumpifbytenotequal gBattlerTarget, gBattlersCount, BattleScript_NeutralizingGasExitsLoop restoretarget return diff --git a/src/battle_util.c b/src/battle_util.c index 4c29d20c7200..ffca7feed7f0 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -9446,7 +9446,6 @@ static bool32 CanEvolve(u32 species) && SanitizeSpeciesId(evolutions[i].targetSpecies) != SPECIES_NONE) return TRUE; } - } return FALSE; }