Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Neutraling gas electric surge visual glitch #3746

Merged
merged 4 commits into from
Dec 16, 2023
Merged

Fix Neutraling gas electric surge visual glitch #3746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d0f8f93
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-…
DizzyEggg Dec 16, 2023
b07794e
fix neutralising gas visual glitch
DizzyEggg Dec 16, 2023
b0a1a8b
Merge branch 'upcoming' into neutralgaselsurge
AlexOn1ine Dec 16, 2023
75dd444
Merge branch 'upcoming' into neutralgaselsurge
AlexOn1ine Dec 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions data/battle_anim_scripts.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 1 addition & 4 deletions data/battle_scripts_1.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10440,9 +10440,6 @@ BattleScript_PastelVeilLoopIncrement:
BattleScript_PastelVeilEnd:
end3

sByteFour:
.byte MAX_BATTLERS_COUNT

BattleScript_NeutralizingGasExits::
savetarget
pause B_WAIT_TIME_SHORT
Expand All @@ -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

Expand Down
1 change: 0 additions & 1 deletion src/battle_util.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9446,7 +9446,6 @@ static bool32 CanEvolve(u32 species)
&& SanitizeSpeciesId(evolutions[i].targetSpecies) != SPECIES_NONE)
return TRUE;
}

}
return FALSE;
}
Expand Down
Loading