a64e1c63c1
* Made gBattleMoves handle the InGame name and description of battle moves No more multiple arrays in separate, individual files. Note: -Keep an eye on Task_LearnedMove. * Reintroduced move names Misc: -Fixed Trick-or-Treat and Light of Ruin's expanded names. -Introduced a new field for Z-Move names, and a constant for their name length. -Added a few TODOs to GetBattleMoveName. -Updated GetMaxMoveName and GetZMoveName. There's no reason not to let GetBattleMoveName handle everything on its own. * Updated GetBattleMoveName to handle Z-Move Names Misc: -Removed pointless TODO about MOVE_NAME_LENGTH. -The compiler doesn't allow to have a move name with a value higher than MOVE_NAME_LENGTH, therefore it's pointless to worry about it. * Fixed a couple of expanded move names * Removed zMoveName variable of struct BattleMove and extended the name variable's size * Ditched no longer used MOVE_NAME_LENGTH constant * Corrected the names of the max moves I should have done this after updating the size of the name variable of the struct BattleMove, but I didn't think about it at all until Cancer Fairy indirectly gave me the idea. * Fixed U-turn's name * Brought back MOVE_NAME_LENGTH I think it doesn't make sense to have a Z_MOVE_NAME_LENGTH because the length in question is used for all battle moves, not just the Z-Moves. * Introduced a union for Move/Z-Move names in the struct BattleMove * Fixed the union for gBattleMoves move names Also updated GetBattleMoveName to properly handle Max Move names. Also also renamed the "zMoveName" variable to "bigMoveName" which better reflects its purpose. Z-Move names weren't the only thing it covered, since it also handles Max Move names. * Removed deprecated GetZMoveName and GetMaxMoveName * Reintroduced mention to gMoveNames in sGFRomHeader * Fixed move names and ported move descriptions * Fused the struct ContestMove into the struct BattleMove * Removed no longer used Z_MOVE_NAME_LENGTH constant * Renamed the struct BattleMove's bigMoveName variable and introduced macros to prettify move names * Reintroduced the contest parameters for Pokémon moves * Renamed gBattleMoves to gMovesInfo This is consistent with gSpeciesInfo, the array that contains most of the species data. * Renamed the BattleMove struct to MovesInfo This is consistent with the struct SpeciesInfo, which contains the variables used by the gSpeciesInfo array. * Removed empty lines separating battle params from contest params in gMovesInfo * Renamed MovesInfo to MoveInfo * Added Cancer Fairy's HANDLE_EXPANDED_MOVE_NAME macro Used to handle moves with expanded names in a more comfortable manner. Also fixed Trick-or-Treat's expanded name. * Renamed GetBattleMoveName to GetMoveName * Added a comment pointing out that the shared move descriptions are shared move descriptions * Re-aligned one of the escape characters of CHECK_MOVE_FLAG * Renamed the battle_moves.h file to moves_info.h instead for consistency's sake * Applied Eduardo's adjustments * Using compound string for regular move names as well, saving 1180 bytes and making their use consistent * Move description formatting * Updated Pursuit test after merge * Renamed the BATTLE_CATEGORY constants to DAMAGE_CATEGORY --------- Co-authored-by: Nephrite <thechurchofcage@gmail.com> Co-authored-by: Bassoonian <iasperbassoonian@gmail.com> Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
222 lines
8.2 KiB
C
222 lines
8.2 KiB
C
#include "global.h"
|
|
#include "test/battle.h"
|
|
|
|
ASSUMPTIONS
|
|
{
|
|
ASSUME(gSpeciesInfo[SPECIES_UMBREON].types[0] == TYPE_DARK);
|
|
ASSUME(gMovesInfo[MOVE_CONFUSE_RAY].category == DAMAGE_CATEGORY_STATUS);
|
|
}
|
|
|
|
SINGLE_BATTLE_TEST("Prankster-affected moves don't affect Dark-type Pokémon")
|
|
{
|
|
GIVEN {
|
|
PLAYER(SPECIES_UMBREON);
|
|
OPPONENT(SPECIES_VOLBEAT) { Ability(ABILITY_PRANKSTER); }
|
|
} WHEN {
|
|
TURN { MOVE(opponent, MOVE_CONFUSE_RAY); }
|
|
} SCENE {
|
|
NOT ANIMATION(ANIM_TYPE_MOVE, MOVE_CONFUSE_RAY, opponent);
|
|
MESSAGE("It doesn't affect Umbreon…");
|
|
}
|
|
}
|
|
|
|
SINGLE_BATTLE_TEST("Prankster-affected moves don't affect Dark-type Pokémon after they switch-in")
|
|
{
|
|
GIVEN {
|
|
PLAYER(SPECIES_WOBBUFFET);
|
|
PLAYER(SPECIES_UMBREON);
|
|
OPPONENT(SPECIES_VOLBEAT) { Ability(ABILITY_PRANKSTER); }
|
|
} WHEN {
|
|
TURN { SWITCH(player, 1); MOVE(opponent, MOVE_CONFUSE_RAY); }
|
|
} SCENE {
|
|
NOT ANIMATION(ANIM_TYPE_MOVE, MOVE_CONFUSE_RAY, opponent);
|
|
MESSAGE("It doesn't affect Umbreon…");
|
|
}
|
|
}
|
|
|
|
DOUBLE_BATTLE_TEST("Prankster-affected moves affect Ally Dark-type Pokémon")
|
|
{
|
|
GIVEN {
|
|
PLAYER(SPECIES_VOLBEAT) { Ability(ABILITY_PRANKSTER); }
|
|
PLAYER(SPECIES_UMBREON);
|
|
OPPONENT(SPECIES_WOBBUFFET);
|
|
OPPONENT(SPECIES_WOBBUFFET);
|
|
} WHEN {
|
|
TURN { MOVE(playerLeft, MOVE_CONFUSE_RAY, target: playerRight); }
|
|
} SCENE {
|
|
ANIMATION(ANIM_TYPE_MOVE, MOVE_CONFUSE_RAY, playerLeft);
|
|
NOT MESSAGE("It doesn't affect Umbreon…");
|
|
}
|
|
}
|
|
|
|
SINGLE_BATTLE_TEST("Prankster-affected moves called via Assist don't affect Dark-type Pokémon")
|
|
{
|
|
GIVEN {
|
|
PLAYER(SPECIES_UMBREON);
|
|
OPPONENT(SPECIES_VOLBEAT) { Ability(ABILITY_PRANKSTER); }
|
|
OPPONENT(SPECIES_WOBBUFFET) { Moves(MOVE_CONFUSE_RAY); };
|
|
} WHEN {
|
|
TURN { MOVE(opponent, MOVE_ASSIST); }
|
|
} SCENE {
|
|
NOT ANIMATION(ANIM_TYPE_MOVE, MOVE_CONFUSE_RAY, opponent);
|
|
MESSAGE("It doesn't affect Umbreon…");
|
|
}
|
|
}
|
|
|
|
// Tested on Showdown, even though Bulbapedia says otherwise.
|
|
DOUBLE_BATTLE_TEST("Prankster-affected moves called via Instruct do not affect Dark-type Pokémon")
|
|
{
|
|
GIVEN {
|
|
PLAYER(SPECIES_VOLBEAT) { Speed(20); Ability(ABILITY_PRANKSTER); }
|
|
PLAYER(SPECIES_WOBBUFFET) { Speed(10);}
|
|
OPPONENT(SPECIES_UMBREON) { Speed(1); }
|
|
OPPONENT(SPECIES_WOBBUFFET) { Speed(1); }
|
|
} WHEN {
|
|
TURN { MOVE(playerLeft, MOVE_CONFUSE_RAY, target: opponentLeft);
|
|
MOVE(playerRight, MOVE_INSTRUCT, target: playerLeft);
|
|
}
|
|
} SCENE {
|
|
NOT ANIMATION(ANIM_TYPE_MOVE, MOVE_CONFUSE_RAY, playerLeft);
|
|
MESSAGE("It doesn't affect Foe Umbreon…");
|
|
MESSAGE("Wobbuffet used Instruct!");
|
|
MESSAGE("Volbeat used Confuse Ray!");
|
|
NOT ANIMATION(ANIM_TYPE_MOVE, MOVE_CONFUSE_RAY, playerLeft);
|
|
MESSAGE("It doesn't affect Foe Umbreon…");
|
|
}
|
|
}
|
|
|
|
SINGLE_BATTLE_TEST("Prankster increases the priority of moves by 1")
|
|
{
|
|
GIVEN {
|
|
PLAYER(SPECIES_WOBBUFFET) { Speed(10); }
|
|
OPPONENT(SPECIES_VOLBEAT) { Speed(5); Ability(ABILITY_PRANKSTER); }
|
|
} WHEN {
|
|
TURN { MOVE(opponent, MOVE_CONFUSE_RAY); MOVE(player, MOVE_CELEBRATE, WITH_RNG(RNG_CONFUSION, FALSE)); } // RNG_CONFUSION so that Wobb doesn't hit itself.
|
|
} SCENE {
|
|
ANIMATION(ANIM_TYPE_MOVE, MOVE_CONFUSE_RAY, opponent);
|
|
ANIMATION(ANIM_TYPE_MOVE, MOVE_CELEBRATE, player);
|
|
}
|
|
}
|
|
|
|
DOUBLE_BATTLE_TEST("Moves called via Prankster-affected After you affect Dark-type Pokémon")
|
|
{
|
|
GIVEN {
|
|
PLAYER(SPECIES_VOLBEAT) { Speed(1); Ability(ABILITY_PRANKSTER); }
|
|
PLAYER(SPECIES_WOBBUFFET) { Speed(1);}
|
|
OPPONENT(SPECIES_UMBREON) { Speed(10); }
|
|
OPPONENT(SPECIES_WOBBUFFET) { Speed(10); }
|
|
} WHEN {
|
|
TURN { MOVE(playerLeft, MOVE_AFTER_YOU, target: playerRight);
|
|
MOVE(playerRight, MOVE_CONFUSE_RAY, target: opponentLeft);
|
|
}
|
|
} SCENE {
|
|
MESSAGE("Volbeat used After You!");
|
|
ANIMATION(ANIM_TYPE_MOVE, MOVE_AFTER_YOU, playerLeft);
|
|
MESSAGE("Wobbuffet used Confuse Ray!");
|
|
ANIMATION(ANIM_TYPE_MOVE, MOVE_CONFUSE_RAY, playerRight);
|
|
MESSAGE("Foe Umbreon became confused!");
|
|
}
|
|
}
|
|
|
|
SINGLE_BATTLE_TEST("Prankster is blocked by Quick Guard in Gen5+")
|
|
{
|
|
GIVEN {
|
|
PLAYER(SPECIES_WOBBUFFET);
|
|
OPPONENT(SPECIES_VOLBEAT) { Ability(ABILITY_PRANKSTER); }
|
|
} WHEN {
|
|
TURN { MOVE(player, MOVE_QUICK_GUARD); MOVE(opponent, MOVE_CONFUSE_RAY); }
|
|
} SCENE {
|
|
ANIMATION(ANIM_TYPE_MOVE, MOVE_QUICK_GUARD, player);
|
|
NOT ANIMATION(ANIM_TYPE_MOVE, MOVE_CONFUSE_RAY, opponent);
|
|
MESSAGE("Wobbuffet protected itself!");
|
|
}
|
|
}
|
|
|
|
DOUBLE_BATTLE_TEST("Prankster-affected moves that target all Pokémon are successful regardless of the presence of Dark-type Pokémon")
|
|
{
|
|
GIVEN {
|
|
ASSUME(gMovesInfo[MOVE_CAPTIVATE].target == MOVE_TARGET_BOTH);
|
|
PLAYER(SPECIES_VOLBEAT) { Ability(ABILITY_PRANKSTER); }
|
|
PLAYER(SPECIES_WOBBUFFET);
|
|
OPPONENT(SPECIES_UMBREON);
|
|
OPPONENT(SPECIES_WOBBUFFET);
|
|
} WHEN {
|
|
TURN { MOVE(playerLeft, MOVE_CAPTIVATE); }
|
|
} SCENE {
|
|
ANIMATION(ANIM_TYPE_MOVE, MOVE_CAPTIVATE, playerLeft);
|
|
}
|
|
}
|
|
|
|
SINGLE_BATTLE_TEST("Prankster-affected moves can still be bounced back by Dark-types using Magic Coat")
|
|
{
|
|
GIVEN {
|
|
PLAYER(SPECIES_UMBREON);
|
|
OPPONENT(SPECIES_VOLBEAT) { Ability(ABILITY_PRANKSTER); }
|
|
} WHEN {
|
|
TURN { MOVE(player, MOVE_MAGIC_COAT); MOVE(opponent, MOVE_CONFUSE_RAY); }
|
|
} SCENE {
|
|
ANIMATION(ANIM_TYPE_MOVE, MOVE_MAGIC_COAT, player);
|
|
MESSAGE("Foe Volbeat used Confuse Ray!");
|
|
MESSAGE("Foe Volbeat's Confuse Ray was bounced back by MAGIC COAT!");
|
|
ANIMATION(ANIM_TYPE_MOVE, MOVE_CONFUSE_RAY, player);
|
|
MESSAGE("Foe Volbeat became confused!");
|
|
}
|
|
}
|
|
|
|
SINGLE_BATTLE_TEST("Prankster-affected moves which are reflected by Magic Coat can affect Dark-type Pokémon, unless the Pokémon that bounced the move also has Prankster")
|
|
{
|
|
u16 sableyeAbility;
|
|
|
|
PARAMETRIZE { sableyeAbility = ABILITY_PRANKSTER; }
|
|
PARAMETRIZE { sableyeAbility = ABILITY_KEEN_EYE; }
|
|
|
|
GIVEN {
|
|
PLAYER(SPECIES_SABLEYE) { Ability(sableyeAbility); }
|
|
OPPONENT(SPECIES_MURKROW) { Ability(ABILITY_PRANKSTER); }
|
|
} WHEN {
|
|
TURN { MOVE(player, MOVE_MAGIC_COAT); MOVE(opponent, MOVE_CONFUSE_RAY); }
|
|
} SCENE {
|
|
MESSAGE("Sableye used Magic Coat!");
|
|
ANIMATION(ANIM_TYPE_MOVE, MOVE_MAGIC_COAT, player);
|
|
MESSAGE("Foe Murkrow used Confuse Ray!");
|
|
MESSAGE("Foe Murkrow's Confuse Ray was bounced back by MAGIC COAT!");
|
|
if (sableyeAbility == ABILITY_PRANKSTER) {
|
|
NOT ANIMATION(ANIM_TYPE_MOVE, MOVE_CONFUSE_RAY, player);
|
|
MESSAGE("It doesn't affect Foe Murkrow…");
|
|
} else {
|
|
ANIMATION(ANIM_TYPE_MOVE, MOVE_CONFUSE_RAY, player);
|
|
MESSAGE("Foe Murkrow became confused!");
|
|
}
|
|
}
|
|
}
|
|
|
|
SINGLE_BATTLE_TEST("Prankster-affected moves can still be bounced back by a Dark-type with Magic Bounce")
|
|
{
|
|
GIVEN {
|
|
PLAYER(SPECIES_ABSOL) { Item(ITEM_ABSOLITE); }
|
|
OPPONENT(SPECIES_VOLBEAT) { Ability(ABILITY_PRANKSTER); }
|
|
} WHEN {
|
|
TURN { MOVE(player, MOVE_CELEBRATE, megaEvolve: TRUE); MOVE(opponent, MOVE_CONFUSE_RAY); }
|
|
} SCENE {
|
|
MESSAGE("Foe Volbeat's Confuse Ray was bounced back by Absol's Magic Bounce!");
|
|
ANIMATION(ANIM_TYPE_MOVE, MOVE_CONFUSE_RAY, player);
|
|
}
|
|
}
|
|
|
|
SINGLE_BATTLE_TEST("Prankster-affected moves that are bounced back by Magic Bounce can affect Dark-type Pokémon")
|
|
{
|
|
GIVEN {
|
|
PLAYER(SPECIES_ABSOL) { Item(ITEM_ABSOLITE); }
|
|
OPPONENT(SPECIES_MURKROW) { Ability(ABILITY_PRANKSTER); }
|
|
} WHEN {
|
|
TURN { MOVE(player, MOVE_CELEBRATE, megaEvolve: TRUE); MOVE(opponent, MOVE_CONFUSE_RAY); }
|
|
} SCENE {
|
|
MESSAGE("Foe Murkrow's Confuse Ray was bounced back by Absol's Magic Bounce!");
|
|
ANIMATION(ANIM_TYPE_MOVE, MOVE_CONFUSE_RAY, player);
|
|
MESSAGE("Foe Murkrow became confused!");
|
|
}
|
|
}
|
|
|
|
TO_DO_BATTLE_TEST("Prankster-affected moves called via Nature Power don't affect Dark-type Pokémon");
|
|
TO_DO_BATTLE_TEST("Prankster increases the priority of status Z-Moves by 1");
|
|
TO_DO_BATTLE_TEST("Prankster increases the priority of Extreme Evoboost by 1");
|