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>
118 lines
3.9 KiB
C
118 lines
3.9 KiB
C
#include "global.h"
|
|
#include "test/battle.h"
|
|
|
|
// From https://bulbapedia.bulbagarden.net/wiki/Damage#Example
|
|
|
|
SINGLE_BATTLE_TEST("Damage calculation matches Gen5+")
|
|
{
|
|
s16 dmg;
|
|
s16 expectedDamage;
|
|
PARAMETRIZE { expectedDamage = 196; }
|
|
PARAMETRIZE { expectedDamage = 192; }
|
|
PARAMETRIZE { expectedDamage = 192; }
|
|
PARAMETRIZE { expectedDamage = 192; }
|
|
PARAMETRIZE { expectedDamage = 184; }
|
|
PARAMETRIZE { expectedDamage = 184; }
|
|
PARAMETRIZE { expectedDamage = 184; }
|
|
PARAMETRIZE { expectedDamage = 180; }
|
|
PARAMETRIZE { expectedDamage = 180; }
|
|
PARAMETRIZE { expectedDamage = 180; }
|
|
PARAMETRIZE { expectedDamage = 172; }
|
|
PARAMETRIZE { expectedDamage = 172; }
|
|
PARAMETRIZE { expectedDamage = 172; }
|
|
PARAMETRIZE { expectedDamage = 168; }
|
|
PARAMETRIZE { expectedDamage = 168; }
|
|
PARAMETRIZE { expectedDamage = 168; }
|
|
GIVEN {
|
|
ASSUME(gMovesInfo[MOVE_ICE_FANG].category == DAMAGE_CATEGORY_PHYSICAL);
|
|
PLAYER(SPECIES_GLACEON) { Level(75); Attack(123); }
|
|
OPPONENT(SPECIES_GARCHOMP) { Defense(163); }
|
|
} WHEN {
|
|
TURN {
|
|
MOVE(player, MOVE_ICE_FANG, WITH_RNG(RNG_DAMAGE_MODIFIER, i));
|
|
}
|
|
}
|
|
SCENE {
|
|
MESSAGE("Glaceon used Ice Fang!");
|
|
HP_BAR(opponent, captureDamage: &dmg);
|
|
}
|
|
THEN {
|
|
EXPECT_EQ(expectedDamage, dmg);
|
|
}
|
|
}
|
|
|
|
SINGLE_BATTLE_TEST("Damage calculation matches Gen5+ (Muscle Band, crit)")
|
|
{
|
|
s16 dmg;
|
|
s16 expectedDamage;
|
|
PARAMETRIZE { expectedDamage = 324; }
|
|
PARAMETRIZE { expectedDamage = 316; }
|
|
PARAMETRIZE { expectedDamage = 312; }
|
|
PARAMETRIZE { expectedDamage = 312; }
|
|
PARAMETRIZE { expectedDamage = 304; }
|
|
PARAMETRIZE { expectedDamage = 304; }
|
|
PARAMETRIZE { expectedDamage = 300; }
|
|
PARAMETRIZE { expectedDamage = 300; }
|
|
PARAMETRIZE { expectedDamage = 292; }
|
|
PARAMETRIZE { expectedDamage = 292; }
|
|
PARAMETRIZE { expectedDamage = 288; }
|
|
PARAMETRIZE { expectedDamage = 288; }
|
|
PARAMETRIZE { expectedDamage = 280; }
|
|
PARAMETRIZE { expectedDamage = 276; }
|
|
PARAMETRIZE { expectedDamage = 276; }
|
|
PARAMETRIZE { expectedDamage = 268; }
|
|
GIVEN {
|
|
ASSUME(gMovesInfo[MOVE_ICE_FANG].category == DAMAGE_CATEGORY_PHYSICAL);
|
|
PLAYER(SPECIES_GLACEON) { Level(75); Attack(123); Item(ITEM_MUSCLE_BAND); }
|
|
OPPONENT(SPECIES_GARCHOMP) { Defense(163); }
|
|
} WHEN {
|
|
TURN {
|
|
MOVE(player, MOVE_ICE_FANG, WITH_RNG(RNG_DAMAGE_MODIFIER, i), criticalHit: TRUE);
|
|
}
|
|
}
|
|
SCENE {
|
|
MESSAGE("Glaceon used Ice Fang!");
|
|
HP_BAR(opponent, captureDamage: &dmg);
|
|
}
|
|
THEN {
|
|
EXPECT_EQ(expectedDamage, dmg);
|
|
}
|
|
}
|
|
|
|
SINGLE_BATTLE_TEST("Damage calculation matches Gen5+ (Marshadow vs Mawile)")
|
|
{
|
|
s16 dmg;
|
|
s16 expectedDamage;
|
|
PARAMETRIZE { expectedDamage = 145; }
|
|
PARAMETRIZE { expectedDamage = 144; }
|
|
PARAMETRIZE { expectedDamage = 142; }
|
|
PARAMETRIZE { expectedDamage = 141; }
|
|
PARAMETRIZE { expectedDamage = 139; }
|
|
PARAMETRIZE { expectedDamage = 138; }
|
|
PARAMETRIZE { expectedDamage = 136; }
|
|
PARAMETRIZE { expectedDamage = 135; }
|
|
PARAMETRIZE { expectedDamage = 133; }
|
|
PARAMETRIZE { expectedDamage = 132; }
|
|
PARAMETRIZE { expectedDamage = 130; }
|
|
PARAMETRIZE { expectedDamage = 129; }
|
|
PARAMETRIZE { expectedDamage = 127; }
|
|
PARAMETRIZE { expectedDamage = 126; }
|
|
PARAMETRIZE { expectedDamage = 124; }
|
|
PARAMETRIZE { expectedDamage = 123; }
|
|
GIVEN {
|
|
ASSUME(gMovesInfo[MOVE_SPECTRAL_THIEF].category == DAMAGE_CATEGORY_PHYSICAL);
|
|
PLAYER(SPECIES_MARSHADOW) { Level(100); Attack(286); }
|
|
OPPONENT(SPECIES_MAWILE) { Level(100); Defense(226); HP(241); }
|
|
} WHEN {
|
|
TURN {
|
|
MOVE(player, MOVE_SPECTRAL_THIEF, WITH_RNG(RNG_DAMAGE_MODIFIER, i), criticalHit: FALSE);
|
|
}
|
|
}
|
|
SCENE{
|
|
MESSAGE("Marshadow used SpectrlThief!");
|
|
HP_BAR(opponent, captureDamage: &dmg);
|
|
}
|
|
THEN{
|
|
EXPECT_EQ(expectedDamage, dmg);
|
|
}
|
|
}
|