Skip to content

Commit

Permalink
Apply suggestions from code review
Browse files Browse the repository at this point in the history
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
  • Loading branch information
cfmnephrite and Bassoonian authored Jan 24, 2024
1 parent 55daffe commit 399881e
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 21 deletions.
24 changes: 7 additions & 17 deletions test/battle/move_effect/solar_beam.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,37 +21,27 @@ SINGLE_BATTLE_TEST("Solar Beam and Solar Blade can be used instantly in Sunlight
TURN { MOVE(opponent, move1); MOVE(player, move2); }
TURN { SKIP_TURN(player); }
} SCENE {
if (move1 == MOVE_SUNNY_DAY)
{
if (move1 == MOVE_SUNNY_DAY) {
NOT MESSAGE("Wobbuffet took in sunlight!");
}
else {
if (move2 == MOVE_SOLAR_BEAM)
{
} else {
if (move2 == MOVE_SOLAR_BEAM) {
if (B_UPDATED_MOVE_DATA >= GEN_5)
{
MESSAGE("Wobbuffet used Solar Beam!");
MESSAGE("Wobbuffet took in sunlight!");
ANIMATION(ANIM_TYPE_MOVE, move2, player);
}
else
{
} else {
NOT MESSAGE("Wobbuffet used Solar Beam!");
ANIMATION(ANIM_TYPE_MOVE, move2, player);
MESSAGE("Wobbuffet took in sunlight!");
}
MESSAGE("Wobbuffet used Solar Beam!");
}
else
{
if (B_UPDATED_MOVE_DATA >= GEN_5)
{
} else {
if (B_UPDATED_MOVE_DATA >= GEN_5) {
MESSAGE("Wobbuffet used Solar Blade!");
MESSAGE("Wobbuffet took in sunlight!");
ANIMATION(ANIM_TYPE_MOVE, move2, player);
}
else
{
} else {
NOT MESSAGE("Wobbuffet used Solar Blade!");
ANIMATION(ANIM_TYPE_MOVE, move2, player);
MESSAGE("Wobbuffet took in sunlight!");
Expand Down
7 changes: 3 additions & 4 deletions test/battle/move_effect/two_turn_moves.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,12 @@ SINGLE_BATTLE_TEST("Razor Wind needs a charging turn")
TURN { SKIP_TURN(player); }
} SCENE {
// Charging turn
if (B_UPDATED_MOVE_DATA >= GEN_5)
{
if (B_UPDATED_MOVE_DATA >= GEN_5) {
NOT MESSAGE("Wobbuffet whipped up a whirlwind!");
MESSAGE("Wobbuffet used Razor Wind!");
}
else
} else {
ANIMATION(ANIM_TYPE_MOVE, MOVE_RAZOR_WIND, player);
}
if (B_UPDATED_MOVE_DATA < GEN_5)
MESSAGE("Wobbuffet whipped up a whirlwind!");
else
Expand Down

0 comments on commit 399881e

Please sign in to comment.