![LOuroboros](/assets/img/avatar_default.png)
* 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>
245 lines
9.4 KiB
C
245 lines
9.4 KiB
C
#include "global.h"
|
|
#include "test/battle.h"
|
|
|
|
ASSUMPTIONS
|
|
{
|
|
ASSUME(gItemsInfo[ITEM_WHITE_HERB].holdEffect == HOLD_EFFECT_RESTORE_STATS);
|
|
}
|
|
|
|
SINGLE_BATTLE_TEST("White Herb restores stats when they're lowered")
|
|
{
|
|
GIVEN {
|
|
ASSUME(gMovesInfo[MOVE_LEER].effect == EFFECT_DEFENSE_DOWN);
|
|
PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_WHITE_HERB); }
|
|
OPPONENT(SPECIES_WOBBUFFET);
|
|
} WHEN {
|
|
TURN { MOVE(opponent, MOVE_LEER); }
|
|
} SCENE {
|
|
ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, player);
|
|
ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, player);
|
|
MESSAGE("Wobbuffet's White Herb restored its status!");
|
|
} THEN {
|
|
EXPECT(player->item == ITEM_NONE);
|
|
EXPECT(player->statStages[STAT_DEF] = DEFAULT_STAT_STAGE);
|
|
}
|
|
}
|
|
|
|
SINGLE_BATTLE_TEST("White Herb restores stats after Attack was lowered by Intimidate in singles")
|
|
{
|
|
GIVEN {
|
|
PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_WHITE_HERB); }
|
|
OPPONENT(SPECIES_ARBOK) { Ability(ABILITY_INTIMIDATE); }
|
|
} WHEN {
|
|
TURN { ; }
|
|
} SCENE {
|
|
ABILITY_POPUP(opponent, ABILITY_INTIMIDATE);
|
|
ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, player);
|
|
ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, player);
|
|
MESSAGE("Wobbuffet's White Herb restored its status!");
|
|
} THEN {
|
|
EXPECT(player->item == ITEM_NONE);
|
|
EXPECT(player->statStages[STAT_DEF] = DEFAULT_STAT_STAGE);
|
|
}
|
|
}
|
|
|
|
DOUBLE_BATTLE_TEST("White Herb restores stats after Attack was lowered by Intimidate in doubles")
|
|
{
|
|
GIVEN {
|
|
OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_WHITE_HERB); }
|
|
OPPONENT(SPECIES_WYNAUT) { Item(ITEM_WHITE_HERB); }
|
|
PLAYER(SPECIES_ARBOK) { Ability(ABILITY_INTIMIDATE); }
|
|
PLAYER(SPECIES_WOBBUFFET);
|
|
} WHEN {
|
|
TURN { ; }
|
|
} SCENE {
|
|
ABILITY_POPUP(playerLeft, ABILITY_INTIMIDATE);
|
|
|
|
ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponentLeft);
|
|
ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponentRight);
|
|
|
|
ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, opponentLeft);
|
|
MESSAGE("Foe Wobbuffet's White Herb restored its status!");
|
|
ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, opponentRight);
|
|
MESSAGE("Foe Wynaut's White Herb restored its status!");
|
|
} THEN {
|
|
EXPECT(opponentLeft->item == ITEM_NONE);
|
|
EXPECT(opponentLeft->statStages[STAT_DEF] = DEFAULT_STAT_STAGE);
|
|
EXPECT(opponentRight->item == ITEM_NONE);
|
|
EXPECT(opponentRight->statStages[STAT_DEF] = DEFAULT_STAT_STAGE);
|
|
}
|
|
}
|
|
|
|
SINGLE_BATTLE_TEST("White Herb restores stats after Attack was lowered by Intimidate while switching in")
|
|
{
|
|
KNOWN_FAILING;
|
|
GIVEN {
|
|
PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_WHITE_HERB); }
|
|
OPPONENT(SPECIES_WOBBUFFET);
|
|
OPPONENT(SPECIES_ARBOK) { Ability(ABILITY_INTIMIDATE); }
|
|
} WHEN {
|
|
TURN { SWITCH(opponent, 1); MOVE(player, MOVE_CLOSE_COMBAT); }
|
|
} SCENE {
|
|
ABILITY_POPUP(opponent, ABILITY_INTIMIDATE);
|
|
ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, player);
|
|
ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, player);
|
|
MESSAGE("Wobbuffet's White Herb restored its status!");
|
|
ANIMATION(ANIM_TYPE_MOVE, MOVE_CLOSE_COMBAT, player);
|
|
NONE_OF {
|
|
ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, player);
|
|
MESSAGE("Wobbuffet's White Herb restored its status!");
|
|
}
|
|
} THEN {
|
|
EXPECT(player->item == ITEM_NONE);
|
|
EXPECT(player->statStages[STAT_DEF] = DEFAULT_STAT_STAGE - 1);
|
|
EXPECT(player->statStages[STAT_SPDEF] = DEFAULT_STAT_STAGE - 1);
|
|
}
|
|
}
|
|
|
|
|
|
SINGLE_BATTLE_TEST("White Herb restores stats after all hits of a multi hit move happened")
|
|
{
|
|
u16 species;
|
|
u16 ability;
|
|
|
|
PARAMETRIZE { species = SPECIES_SLIGGOO_HISUIAN; ability = ABILITY_GOOEY; }
|
|
PARAMETRIZE { species = SPECIES_DUGTRIO_ALOLAN; ability = ABILITY_TANGLING_HAIR; }
|
|
|
|
KNOWN_FAILING;
|
|
GIVEN {
|
|
ASSUME(gMovesInfo[MOVE_DUAL_WINGBEAT].strikeCount == 2);
|
|
PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_WHITE_HERB); }
|
|
OPPONENT(species) { Ability(ability); }
|
|
} WHEN {
|
|
TURN { MOVE(player, MOVE_DUAL_WINGBEAT); }
|
|
} SCENE {
|
|
ANIMATION(ANIM_TYPE_MOVE, MOVE_DUAL_WINGBEAT, player);
|
|
ABILITY_POPUP(opponent, ability);
|
|
MESSAGE("Wobbuffet's Speed fell!");
|
|
ABILITY_POPUP(opponent, ability);
|
|
MESSAGE("Wobbuffet's Speed fell!");
|
|
ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, player);
|
|
ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, player);
|
|
MESSAGE("Wobbuffet's White Herb restored its status!");
|
|
} THEN {
|
|
EXPECT(player->item == ITEM_NONE);
|
|
EXPECT(player->statStages[STAT_SPEED] = DEFAULT_STAT_STAGE);
|
|
}
|
|
}
|
|
|
|
SINGLE_BATTLE_TEST("White Herb wont have time to activate if it is knocked off or stolen by Thief")
|
|
{
|
|
u16 move;
|
|
|
|
PARAMETRIZE { move = MOVE_THIEF; }
|
|
PARAMETRIZE { move = MOVE_KNOCK_OFF; }
|
|
|
|
KNOWN_FAILING; // Knock off fails, Thief is fine
|
|
GIVEN {
|
|
ASSUME(MoveHasMoveEffect(MOVE_THIEF, MOVE_EFFECT_STEAL_ITEM) == TRUE);
|
|
ASSUME(gMovesInfo[MOVE_KNOCK_OFF].effect == EFFECT_KNOCK_OFF);
|
|
PLAYER(SPECIES_SLUGMA) { Ability(ABILITY_WEAK_ARMOR); Item(ITEM_WHITE_HERB); }
|
|
OPPONENT(SPECIES_WOBBUFFET);
|
|
} WHEN {
|
|
TURN { MOVE(opponent, move); }
|
|
} SCENE {
|
|
ANIMATION(ANIM_TYPE_MOVE, move, opponent);
|
|
if (move == MOVE_THIEF)
|
|
MESSAGE("Foe Wobbuffet stole Slugma's White Herb!");
|
|
else
|
|
MESSAGE("Foe Wobbuffet knocked off Slugma's White Herb!");
|
|
ABILITY_POPUP(player, ABILITY_WEAK_ARMOR);
|
|
ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, player);
|
|
MESSAGE("Slugma's Weak Armor lowered its Defense!");
|
|
MESSAGE("Slugma's Weak Armor raised its Speed!");
|
|
NONE_OF {
|
|
ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, player);
|
|
MESSAGE("Wobbuffet's White Herb restored its status!");
|
|
}
|
|
} THEN {
|
|
EXPECT(player->statStages[STAT_DEF] = DEFAULT_STAT_STAGE - 1);
|
|
EXPECT(player->statStages[STAT_SPEED] = DEFAULT_STAT_STAGE + 1);
|
|
}
|
|
}
|
|
|
|
SINGLE_BATTLE_TEST("White Herb wont have time to activate if Magician steals it")
|
|
{
|
|
KNOWN_FAILING; // White Herb is activated
|
|
GIVEN {
|
|
PLAYER(SPECIES_SLUGMA) { Ability(ABILITY_WEAK_ARMOR); Item(ITEM_WHITE_HERB); }
|
|
OPPONENT(SPECIES_FENNEKIN) { Ability(ABILITY_MAGICIAN); }
|
|
} WHEN {
|
|
TURN { MOVE(opponent, MOVE_TACKLE); }
|
|
} SCENE {
|
|
ANIMATION(ANIM_TYPE_MOVE, MOVE_TACKLE, opponent);
|
|
ABILITY_POPUP(opponent, ABILITY_MAGICIAN);
|
|
ABILITY_POPUP(player, ABILITY_WEAK_ARMOR);
|
|
ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, player);
|
|
MESSAGE("Slugma's Weak Armor lowered its Defense!");
|
|
MESSAGE("Slugma's Weak Armor raised its Speed!");
|
|
NONE_OF {
|
|
ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, player);
|
|
MESSAGE("Wobbuffet's White Herb restored its status!");
|
|
}
|
|
} THEN {
|
|
EXPECT(player->statStages[STAT_DEF] = DEFAULT_STAT_STAGE - 1);
|
|
EXPECT(player->statStages[STAT_SPEED] = DEFAULT_STAT_STAGE + 1);
|
|
}
|
|
}
|
|
|
|
SINGLE_BATTLE_TEST("White Herb wont have time to activate if Pickpocket steals it")
|
|
{
|
|
KNOWN_FAILING; // White Herb is activated
|
|
GIVEN {
|
|
ASSUME(MoveHasMoveEffectSelf(MOVE_LEAF_STORM, MOVE_EFFECT_SP_ATK_TWO_DOWN));
|
|
PLAYER(SPECIES_SLUGMA) { Ability(ABILITY_WEAK_ARMOR); Item(ITEM_WHITE_HERB); }
|
|
OPPONENT(SPECIES_SNEASEL) { Ability(ABILITY_PICKPOCKET); }
|
|
} WHEN {
|
|
TURN { MOVE(player, MOVE_LEAF_STORM); }
|
|
} SCENE {
|
|
ANIMATION(ANIM_TYPE_MOVE, MOVE_LEAF_STORM, player);
|
|
ABILITY_POPUP(player, ABILITY_PICKPOCKET);
|
|
ABILITY_POPUP(player, ABILITY_WEAK_ARMOR);
|
|
ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, player);
|
|
MESSAGE("Slugma's Weak Armor lowered its Defense!");
|
|
MESSAGE("Slugma's Weak Armor raised its Speed!");
|
|
NONE_OF {
|
|
ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, player);
|
|
MESSAGE("Wobbuffet's White Herb restored its status!");
|
|
}
|
|
} THEN {
|
|
EXPECT(player->statStages[STAT_DEF] = DEFAULT_STAT_STAGE - 1);
|
|
EXPECT(player->statStages[STAT_SPEED] = DEFAULT_STAT_STAGE + 1);
|
|
}
|
|
}
|
|
|
|
SINGLE_BATTLE_TEST("White Herb restores stats after Defiant or Competitive were triggered")
|
|
{
|
|
u16 species;
|
|
u16 ability;
|
|
|
|
PARAMETRIZE { species = SPECIES_IGGLYBUFF; ability = ABILITY_COMPETITIVE; }
|
|
PARAMETRIZE { species = SPECIES_MANKEY; ability = ABILITY_DEFIANT; }
|
|
|
|
KNOWN_FAILING;
|
|
GIVEN {
|
|
PLAYER(species) { Ability(ability); Item(ITEM_WHITE_HERB); }
|
|
OPPONENT(SPECIES_ARBOK) { Ability(ABILITY_INTIMIDATE); }
|
|
} WHEN {
|
|
TURN { ; }
|
|
} SCENE {
|
|
ABILITY_POPUP(opponent, ABILITY_INTIMIDATE);
|
|
ABILITY_POPUP(player, ability);
|
|
ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, player);
|
|
ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, player);
|
|
MESSAGE("Wobbuffet's White Herb restored its status!");
|
|
} THEN {
|
|
EXPECT(player->item == ITEM_NONE);
|
|
if (species == SPECIES_IGGLYBUFF)
|
|
{
|
|
EXPECT(player->statStages[STAT_ATK] = DEFAULT_STAT_STAGE);
|
|
EXPECT(player->statStages[STAT_SPATK] = DEFAULT_STAT_STAGE + 2);
|
|
}
|
|
else
|
|
EXPECT(player->statStages[STAT_ATK] = DEFAULT_STAT_STAGE + 3);
|
|
}
|
|
}
|