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

Fixes Dragon Tail and Pumpkaboo spelling (#3541)

Browse source
This commit is contained in:
Alex 2023-11-07 18:19:46 +01:00 committed by GitHub
parent 23e8937fc4
commit 954f67a29f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/battle_scripts_1.s
View file

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

10
src/data/pokemon/species_info.h
View file

@ -691,7 +691,7 @@
.noFlip = flip, \
}
#define PUMKPABOO_MISC_INFO \
#define PUMPKABOO_MISC_INFO \
.types = { TYPE_GHOST, TYPE_GRASS}, \
.catchRate = 120, \
.expYield = 67, \
@ -17359,7 +17359,7 @@ const struct SpeciesInfo gSpeciesInfo[] =
.baseSpeed = 51,
.baseSpAttack = 44,
.baseSpDefense = 55,
PUMKPABOO_MISC_INFO,
PUMPKABOO_MISC_INFO,
},
[SPECIES_GOURGEIST_AVERAGE] =
@ -24454,7 +24454,7 @@ const struct SpeciesInfo gSpeciesInfo[] =
.baseSpeed = 56,
.baseSpAttack = 44,
.baseSpDefense = 55,
PUMKPABOO_MISC_INFO,
PUMPKABOO_MISC_INFO,
},
[SPECIES_PUMPKABOO_LARGE] =
@ -24465,7 +24465,7 @@ const struct SpeciesInfo gSpeciesInfo[] =
.baseSpeed = 46,
.baseSpAttack = 44,
.baseSpDefense = 55,
PUMKPABOO_MISC_INFO,
PUMPKABOO_MISC_INFO,
},
[SPECIES_PUMPKABOO_SUPER] =
@ -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] =

18
test/dynamax.c
View file

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