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

Fixes Dragon Tail and Pumpkaboo spelling #3541

Merged
merged 1 commit into from
Nov 7, 2023
Merged

Fixes Dragon Tail and Pumpkaboo spelling #3541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 1 deletion data/battle_scripts_1.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2113,7 +2113,7 @@ BattleScript_EffectFinalGambit:
BattleScript_EffectHitSwitchTarget:
call BattleScript_EffectHit_Ret
tryfaintmon BS_TARGET
moveendall
jumpiffainted BS_TARGET, TRUE, BattleScript_MoveEnd
jumpifability BS_TARGET, ABILITY_SUCTION_CUPS, BattleScript_AbilityPreventsPhasingOut
jumpifstatus3 BS_TARGET, STATUS3_ROOTED, BattleScript_PrintMonIsRooted
jumpiftargetdynamaxed BattleScript_HitSwitchTargetDynamaxed
Expand Down
10 changes: 5 additions & 5 deletions src/data/pokemon/species_info.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -691,7 +691,7 @@
.noFlip = flip, \
}

#define PUMKPABOO_MISC_INFO \
#define PUMPKABOO_MISC_INFO \
.types = { TYPE_GHOST, TYPE_GRASS}, \
.catchRate = 120, \
.expYield = 67, \
Expand Down Expand Up @@ -17359,7 +17359,7 @@ const struct SpeciesInfo gSpeciesInfo[] =
.baseSpeed = 51,
.baseSpAttack = 44,
.baseSpDefense = 55,
PUMKPABOO_MISC_INFO,
PUMPKABOO_MISC_INFO,
},

[SPECIES_GOURGEIST_AVERAGE] =
Expand Down Expand Up @@ -24454,7 +24454,7 @@ const struct SpeciesInfo gSpeciesInfo[] =
.baseSpeed = 56,
.baseSpAttack = 44,
.baseSpDefense = 55,
PUMKPABOO_MISC_INFO,
PUMPKABOO_MISC_INFO,
},

[SPECIES_PUMPKABOO_LARGE] =
Expand All @@ -24465,7 +24465,7 @@ const struct SpeciesInfo gSpeciesInfo[] =
.baseSpeed = 46,
.baseSpAttack = 44,
.baseSpDefense = 55,
PUMKPABOO_MISC_INFO,
PUMPKABOO_MISC_INFO,
},

[SPECIES_PUMPKABOO_SUPER] =
Expand All @@ -24478,7 +24478,7 @@ const struct SpeciesInfo gSpeciesInfo[] =
.baseSpDefense = 55,
.itemCommon = ITEM_MIRACLE_SEED,
.itemRare = ITEM_MIRACLE_SEED,
PUMKPABOO_MISC_INFO,
PUMPKABOO_MISC_INFO,
},

[SPECIES_GOURGEIST_SMALL] =
Expand Down
18 changes: 18 additions & 0 deletions test/dynamax.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,24 @@ SINGLE_BATTLE_TEST("(DYNAMAX) Dynamaxed Pokemon are not affected by phazing move
}
}

SINGLE_BATTLE_TEST("(DYNAMAX) Dynamaxed Pokemon are not affected by phazing moves but no block message is printed if they faint")
{
GIVEN {
ASSUME(gBattleMoves[MOVE_DRAGON_TAIL].effect == EFFECT_HIT_SWITCH_TARGET);
PLAYER(SPECIES_WOBBUFFET) { HP(1); };
PLAYER(SPECIES_WYNAUT);
OPPONENT(SPECIES_WOBBUFFET);
} WHEN {
TURN { MOVE(opponent, MOVE_DRAGON_TAIL); MOVE(player, MOVE_TACKLE, dynamax: TRUE); SEND_OUT(player, 1); }
} SCENE {
MESSAGE("Wobbuffet used Max Strike!");
MESSAGE("Foe Wobbuffet used Dragon Tail!");
HP_BAR(player);
MESSAGE("Wobbuffet fainted!");
NOT MESSAGE("The move was blocked by the power of Dynamax!");
}
}

SINGLE_BATTLE_TEST("(DYNAMAX) Dynamaxed Pokemon are not affected by Red Card")
{
GIVEN {
Expand Down
Loading