Review feedback

This commit is contained in:
Pawkkie 2024-06-02 12:43:21 -04:00
parent 5fd3532e16
commit 22ee823bc1

View file

@ -97,32 +97,31 @@ SINGLE_BATTLE_TEST("Clear Body doesn't prevent stat stage reduction from moves u
SINGLE_BATTLE_TEST("Mold Breaker, Teravolt, and Turboblaze ignore Clear Body") SINGLE_BATTLE_TEST("Mold Breaker, Teravolt, and Turboblaze ignore Clear Body")
{ {
u16 move; u32 j, k;
u16 ability; u16 ability = ABILITY_NONE;
PARAMETRIZE{ move = MOVE_GROWL; ability = ABILITY_MOLD_BREAKER; } u16 move = ABILITY_NONE;
PARAMETRIZE{ move = MOVE_LEER; ability = ABILITY_MOLD_BREAKER; } static const u16 breakerAbilities[] = {
PARAMETRIZE{ move = MOVE_CONFIDE; ability = ABILITY_MOLD_BREAKER; } ABILITY_MOLD_BREAKER,
PARAMETRIZE{ move = MOVE_FAKE_TEARS; ability = ABILITY_MOLD_BREAKER; } ABILITY_TERAVOLT,
PARAMETRIZE{ move = MOVE_SCARY_FACE; ability = ABILITY_MOLD_BREAKER; } ABILITY_TURBOBLAZE,
PARAMETRIZE{ move = MOVE_SWEET_SCENT; ability = ABILITY_MOLD_BREAKER; } };
PARAMETRIZE{ move = MOVE_SAND_ATTACK; ability = ABILITY_MOLD_BREAKER; } static const u16 statReductionMoves[] = {
PARAMETRIZE{ move = MOVE_GROWL; ability = ABILITY_MOLD_BREAKER; } MOVE_GROWL,
MOVE_LEER,
MOVE_CONFIDE,
MOVE_FAKE_TEARS,
MOVE_SCARY_FACE,
MOVE_SWEET_SCENT,
MOVE_SAND_ATTACK,
};
PARAMETRIZE{ move = MOVE_LEER; ability = ABILITY_TERAVOLT; } for (j = 0; j < ARRAY_COUNT(statReductionMoves); j++)
PARAMETRIZE{ move = MOVE_CONFIDE; ability = ABILITY_TERAVOLT; } {
PARAMETRIZE{ move = MOVE_FAKE_TEARS; ability = ABILITY_TERAVOLT; } for (k = 0; k < ARRAY_COUNT(breakerAbilities); k++)
PARAMETRIZE{ move = MOVE_SCARY_FACE; ability = ABILITY_TERAVOLT; } {
PARAMETRIZE{ move = MOVE_SWEET_SCENT; ability = ABILITY_TERAVOLT; } PARAMETRIZE{ move = statReductionMoves[j]; ability = breakerAbilities[k]; }
PARAMETRIZE{ move = MOVE_SAND_ATTACK; ability = ABILITY_TERAVOLT; } }
PARAMETRIZE{ move = MOVE_GROWL; ability = ABILITY_TERAVOLT; } }
PARAMETRIZE{ move = MOVE_LEER; ability = ABILITY_TURBOBLAZE; }
PARAMETRIZE{ move = MOVE_CONFIDE; ability = ABILITY_TURBOBLAZE; }
PARAMETRIZE{ move = MOVE_FAKE_TEARS; ability = ABILITY_TURBOBLAZE; }
PARAMETRIZE{ move = MOVE_SCARY_FACE; ability = ABILITY_TURBOBLAZE; }
PARAMETRIZE{ move = MOVE_SWEET_SCENT; ability = ABILITY_TURBOBLAZE; }
PARAMETRIZE{ move = MOVE_SAND_ATTACK; ability = ABILITY_TURBOBLAZE; }
PARAMETRIZE{ move = MOVE_GROWL; ability = ABILITY_TURBOBLAZE; }
GIVEN { GIVEN {
ASSUME(gMovesInfo[MOVE_GROWL].effect == EFFECT_ATTACK_DOWN); ASSUME(gMovesInfo[MOVE_GROWL].effect == EFFECT_ATTACK_DOWN);
@ -159,8 +158,7 @@ SINGLE_BATTLE_TEST("Clear Body doesn't prevent Speed reduction from Iron Ball")
if (heldItem == ITEM_IRON_BALL) { if (heldItem == ITEM_IRON_BALL) {
MESSAGE("Wobbuffet used Celebrate!"); MESSAGE("Wobbuffet used Celebrate!");
MESSAGE("Foe Beldum used Celebrate!"); MESSAGE("Foe Beldum used Celebrate!");
} } else {
else {
MESSAGE("Foe Beldum used Celebrate!"); MESSAGE("Foe Beldum used Celebrate!");
MESSAGE("Wobbuffet used Celebrate!"); MESSAGE("Wobbuffet used Celebrate!");
} }