fix neutralising gas visual glitch (#3746)

Co-authored-by: Alex <[email protected]>
rh-hideout · Dec 16, 2023 · acec68f · acec68f
1 parent 3df101a
commit acec68f
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 7 deletions.
diff --git 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
@@ -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
@@ -9446,7 +9446,6 @@ static bool32 CanEvolve(u32 species)
              && SanitizeSpeciesId(evolutions[i].targetSpecies) != SPECIES_NONE)
                 return TRUE;
         }
-
     }
     return FALSE;
 }