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

Fixes Zigzgoon battle being able to use a Gimmick #5129

Merged
merged 4 commits into from
Aug 10, 2024
Merged

Fixes Zigzgoon battle being able to use a Gimmick #5129

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
bbfa6f2
Fixes Zigzgoon battle being able to use a Gimmick
AlexOn1ine Aug 9, 2024
629dd9b
add commit
AlexOn1ine Aug 10, 2024
249c2b9
Update src/battle_terastal.c
AlexOn1ine Aug 10, 2024
72a3ae5
Update src/battle_dynamax.c
AlexOn1ine Aug 10, 2024
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
4 changes: 4 additions & 0 deletions src/battle_dynamax.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,10 @@ bool32 CanDynamax(u32 battler)
u16 species = gBattleMons[battler].species;
u16 holdEffect = GetBattlerHoldEffect(battler, FALSE);

// Prevents Zigzagoon from dynamaxing in vanilla.
if (gBattleTypeFlags & BATTLE_TYPE_FIRST_BATTLE && GetBattlerSide(battler) == B_SIDE_OPPONENT)
return FALSE;

// Check if Player has a Dynamax Band.
if (!TESTING && (GetBattlerPosition(battler) == B_POSITION_PLAYER_LEFT
|| (!(gBattleTypeFlags & BATTLE_TYPE_MULTI) && GetBattlerPosition(battler) == B_POSITION_PLAYER_RIGHT)))
Expand Down
4 changes: 4 additions & 0 deletions src/battle_terastal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@ bool32 CanTerastallize(u32 battler)
{
u32 holdEffect = GetBattlerHoldEffect(battler, FALSE);

// Prevents Zigzagoon from terastalizing in vanilla.
if (gBattleTypeFlags & BATTLE_TYPE_FIRST_BATTLE && GetBattlerSide(battler) == B_SIDE_OPPONENT)
return FALSE;

if (TESTING || GetBattlerSide(battler) == B_SIDE_OPPONENT)
{
// Skip all other checks in this block, go to HasTrainerUsedGimmick
Expand Down
Loading