atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix neutralising gas visual glitch (#3746)

Browse source 
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
This commit is contained in:
DizzyEggg 2023-12-17 00:41:50 +01:00 committed by GitHub
parent 3df101a6a0
commit acec68fdb8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/battle_anim_scripts.s
View file

@ -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

5
data/battle_scripts_1.s
View file

@ -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

1
src/battle_util.c
View file

@ -9446,7 +9446,6 @@ static bool32 CanEvolve(u32 species)
&& SanitizeSpeciesId(evolutions[i].targetSpecies) != SPECIES_NONE)
return TRUE;
}
}
return FALSE;
}