diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 6abaeff265..8868f83f7d 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -2364,26 +2364,26 @@ .4byte \minutes .endm - @ When OW_USE_FAKE_RTC is true, adds a specified number of days to the time. + @ When OW_USE_FAKE_RTC is true, adds a specified number of days to the time. .macro adddays days:req callnative ScrCmd_adddays, requests_effects=1 .4byte \days .endm - @ When OW_USE_FAKE_RTC is true, adds a specified number of days, hours, and minutes to the time. + @ When OW_USE_FAKE_RTC is true, adds a specified number of days, hours, and minutes to the time. .macro addhours hours:req callnative ScrCmd_addhours, requests_effects=1 .4byte \hours .endm - @ When OW_USE_FAKE_RTC is true, adds a specified number of days, hours, and minutes to the time. + @ When OW_USE_FAKE_RTC is true, adds a specified number of days, hours, and minutes to the time. .macro addminutes minutes:req callnative ScrCmd_addminutes, requests_effects=1 .4byte \minutes .endm - @ Forwards the time to a specified hour and minute. - @ This causes the time to go to the next day if the time has already been past. + @ Forwards the time to a specified hour and minute. + @ This causes the time to go to the next day if the time has already been past. .macro fwdtime hours:req, minutes:req callnative ScrCmd_fwdtime, requests_effects=1 .4byte \hours diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s index ce71a102fd..41bf18da94 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -399,4 +399,4 @@ gFieldEffectScript_RockClimbDust:: @ 82DBB28 gFieldEffectScript_ORASDowse:: field_eff_callnative FldEff_ORASDowsing field_eff_end - + diff --git a/include/battle.h b/include/battle.h index b95da58aa2..49d7cbb0ab 100755 --- a/include/battle.h +++ b/include/battle.h @@ -616,7 +616,7 @@ struct EventStates u32 arenaTurn:8; enum BattleSide battlerSide:4; enum BattlerId moveEndBattler:4; - enum FirstTurnEventsStates beforeFristTurn:8; + enum FirstTurnEventsStates beforeFirstTurn:8; enum FaintedActions faintedAction:8; enum BattlerId faintedActionBattler:4; enum MoveSuccessOrder atkCanceler:8; diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c index a2d40bc5e1..37d801c5b7 100644 --- a/src/battle_controller_opponent.c +++ b/src/battle_controller_opponent.c @@ -370,7 +370,7 @@ static void OpponentHandleDrawTrainerPic(u32 battler) { s16 xPos; u32 trainerPicId; - + // Sets Multibattle test opponent sprites to not be Hiker if (IsMultibattleTest()) { @@ -391,7 +391,7 @@ static void OpponentHandleDrawTrainerPic(u32 battler) else { trainerPicId = OpponentGetTrainerPicId(battler); - + if (gBattleTypeFlags & (BATTLE_TYPE_MULTI | BATTLE_TYPE_TWO_OPPONENTS) && !BATTLE_TWO_VS_ONE_OPPONENT) { if ((GetBattlerPosition(battler) & BIT_FLANK) != 0) // second mon diff --git a/src/battle_main.c b/src/battle_main.c index 242ad60588..a51caa2d5f 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -3735,7 +3735,7 @@ static void DoBattleIntro(void) case BATTLE_INTRO_STATE_SET_DEX_AND_BATTLE_VARS: if (!gBattleControllerExecFlags) { - gBattleStruct->eventState.beforeFristTurn = 0; + gBattleStruct->eventState.beforeFirstTurn = 0; gBattleStruct->switchInBattlerCounter = 0; Ai_InitPartyStruct(); // Save mons party counts, and first 2/4 mons on the battlefield. @@ -3773,7 +3773,7 @@ static void TryDoEventsBeforeFirstTurn(void) if (gBattleControllerExecFlags) return; - switch (gBattleStruct->eventState.beforeFristTurn) + switch (gBattleStruct->eventState.beforeFirstTurn) { case FIRST_TURN_EVENTS_START: // Set invalid mons as absent(for example when starting a double battle with only one pokemon). @@ -3823,20 +3823,20 @@ static void TryDoEventsBeforeFirstTurn(void) SwapTurnOrder(i, j); } } - gBattleStruct->eventState.beforeFristTurn++; + gBattleStruct->eventState.beforeFirstTurn++; break; case FIRST_TURN_EVENTS_OVERWORLD_WEATHER: - gBattleStruct->eventState.beforeFristTurn++; + gBattleStruct->eventState.beforeFirstTurn++; if (TryFieldEffects(FIELD_EFFECT_OVERWORLD_WEATHER)) return; break; case FIRST_TURN_EVENTS_TERRAIN: - gBattleStruct->eventState.beforeFristTurn++; + gBattleStruct->eventState.beforeFirstTurn++; if (TryFieldEffects(FIELD_EFFECT_OVERWORLD_TERRAIN)) return; break; case FIRST_TURN_EVENTS_STARTING_STATUS: - gBattleStruct->eventState.beforeFristTurn++; + gBattleStruct->eventState.beforeFirstTurn++; if (TryFieldEffects(FIELD_EFFECT_TRAINER_STATUSES)) return; break; @@ -3851,7 +3851,7 @@ static void TryDoEventsBeforeFirstTurn(void) } } memset(gQueuedStatBoosts, 0, sizeof(gQueuedStatBoosts)); // erase all totem boosts for Mirror Herb and Opportunist - gBattleStruct->eventState.beforeFristTurn++; + gBattleStruct->eventState.beforeFirstTurn++; break; case FIRST_TURN_EVENTS_NEUTRALIZING_GAS: while (gBattleStruct->switchInBattlerCounter < gBattlersCount) // From fastest to slowest @@ -3861,7 +3861,7 @@ static void TryDoEventsBeforeFirstTurn(void) return; } gBattleStruct->switchInBattlerCounter = 0; - gBattleStruct->eventState.beforeFristTurn++; + gBattleStruct->eventState.beforeFirstTurn++; break; case FIRST_TURN_EVENTS_SWITCH_IN_ABILITIES: while (gBattleStruct->switchInBattlerCounter < gBattlersCount) // From fastest to slowest @@ -3878,7 +3878,7 @@ static void TryDoEventsBeforeFirstTurn(void) return; } gBattleStruct->switchInBattlerCounter = 0; - gBattleStruct->eventState.beforeFristTurn++; + gBattleStruct->eventState.beforeFirstTurn++; break; case FIRST_TURN_EVENTS_ITEM_EFFECTS: while (gBattleStruct->switchInBattlerCounter < gBattlersCount) // From fastest to slowest @@ -3888,7 +3888,7 @@ static void TryDoEventsBeforeFirstTurn(void) return; } gBattleStruct->switchInBattlerCounter = 0; - gBattleStruct->eventState.beforeFristTurn++; + gBattleStruct->eventState.beforeFirstTurn++; break; case FIRST_TURN_EVENTS_WHITE_HERB: while (gBattleStruct->switchInBattlerCounter < gBattlersCount) // From fastest to slowest @@ -3898,7 +3898,7 @@ static void TryDoEventsBeforeFirstTurn(void) return; } gBattleStruct->switchInBattlerCounter = 0; - gBattleStruct->eventState.beforeFristTurn++; + gBattleStruct->eventState.beforeFirstTurn++; break; case FIRST_TURN_EVENTS_OPPORTUNIST: while (gBattleStruct->switchInBattlerCounter < gBattlersCount) // From fastest to slowest @@ -3908,7 +3908,7 @@ static void TryDoEventsBeforeFirstTurn(void) return; } gBattleStruct->switchInBattlerCounter = 0; - gBattleStruct->eventState.beforeFristTurn++; + gBattleStruct->eventState.beforeFirstTurn++; break; case FIRST_TURN_EVENTS_MIRROR_HERB: while (gBattleStruct->switchInBattlerCounter < gBattlersCount) // From fastest to slowest @@ -3918,10 +3918,10 @@ static void TryDoEventsBeforeFirstTurn(void) return; } gBattleStruct->switchInBattlerCounter = 0; - gBattleStruct->eventState.beforeFristTurn++; + gBattleStruct->eventState.beforeFirstTurn++; break; case FIRST_TURN_EVENTS_EJECT_PACK: - gBattleStruct->eventState.beforeFristTurn++; + gBattleStruct->eventState.beforeFirstTurn++; if (TrySwitchInEjectPack(FIRST_TURN)) return; break; @@ -3960,7 +3960,7 @@ static void TryDoEventsBeforeFirstTurn(void) if ((i = ShouldDoTrainerSlide(GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT), TRAINER_SLIDE_BEFORE_FIRST_TURN))) BattleScriptExecute(i == 1 ? BattleScript_TrainerASlideMsgEnd2 : BattleScript_TrainerBSlideMsgEnd2); - gBattleStruct->eventState.beforeFristTurn = 0; + gBattleStruct->eventState.beforeFirstTurn = 0; break; } } diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 2b3afcd5d7..126bb76d4c 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -4702,7 +4702,7 @@ static void Cmd_getexp(void) if ((holdEffect == HOLD_EFFECT_EXP_SHARE || IsGen6ExpShareEnabled()) && (B_SPLIT_EXP < GEN_6 || gBattleStruct->battlerExpReward == 0)) // only give exp share bonus in later gens if the mon wasn't sent out { - gBattleStruct->battlerExpReward += GetSoftLevelCapExpValue(gPlayerParty[*expMonId].level, gBattleStruct->expShareExpValue);; + gBattleStruct->battlerExpReward += GetSoftLevelCapExpValue(gPlayerParty[*expMonId].level, gBattleStruct->expShareExpValue); } ApplyExperienceMultipliers(&gBattleStruct->battlerExpReward, *expMonId, gBattlerFainted); diff --git a/src/battle_transition.c b/src/battle_transition.c index 2b28bf7dc7..ffb826664d 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -2446,7 +2446,7 @@ static bool8 Mugshot_WaitPlayerSlide(struct Task *task) else { return FALSE; - } + } } else { @@ -2468,7 +2468,7 @@ static bool8 Mugshot_WaitPlayerSlide(struct Task *task) else { return FALSE; - } + } } return FALSE; } @@ -2634,7 +2634,7 @@ static void Mugshots_CreateTrainerPics(struct Task *task) task->tPlayerSpriteId = CreateTrainerSprite(PlayerGenderToFrontTrainerPicId(gSaveBlock2Ptr->playerGender), DISPLAY_WIDTH + 32, 106, - 0, NULL); + 0, NULL); opponentSpriteA = &gSprites[task->tOpponentSpriteAId]; playerSprite = &gSprites[task->tPlayerSpriteId]; diff --git a/src/debug.c b/src/debug.c index 4d3e5cd39f..718ec46c5e 100644 --- a/src/debug.c +++ b/src/debug.c @@ -2086,7 +2086,7 @@ static void Debug_Display_ItemInfo(u32 itemId, u32 digit, u8 windowId) else if (CheckIfItemIsTMHMOrEvolutionStone(itemId) == 1) { end = StringCopy(end, COMPOUND_STRING(" None")); - } + } WrapFontIdToFit(gStringVar1, end, DEBUG_MENU_FONT, WindowWidthPx(windowId)); StringCopyPadded(gStringVar1, gStringVar1, CHAR_SPACE, 15); diff --git a/src/decompress_asm.s b/src/decompress_asm.s index 9704d83a6a..4ab6060a0c 100644 --- a/src/decompress_asm.s +++ b/src/decompress_asm.s @@ -6,7 +6,7 @@ .global FastUnsafeCopy32 .type FastUnsafeCopy32, %function - + @ Word aligned, 32-byte copy @ This function WILL overwrite your buffer, so make sure it is at least 32 bytes larger than the desired size. FastUnsafeCopy32: @@ -18,10 +18,10 @@ FastUnsafeCopy32: bgt .Lloop_32 pop {r4-r10} bx lr - - + + @ Credit to: luckytyphlosion as it's his implementation - + .section .text @Copied to stack on run-time .align 2 @@ -126,6 +126,6 @@ LZ77_EightBlockLoop_HandleLoop: LZ77_Done: pop {r4, r5, r6, lr} bx lr - + .global LZ77UnCompWRAMOptimized_end LZ77UnCompWRAMOptimized_end: diff --git a/src/follower_npc.c b/src/follower_npc.c index 2cca3186b3..3675a99bd3 100644 --- a/src/follower_npc.c +++ b/src/follower_npc.c @@ -226,7 +226,7 @@ static void TurnNPCIntoFollower(u32 localId, u32 followerFlags, u32 setScript, c SetFollowerNPCData(FNPC_DATA_COME_OUT_DOOR, FNPC_DOOR_NONE); if (FollowerNPCHasRunningFrames()) followerFlags |= FOLLOWER_NPC_FLAG_HAS_RUNNING_FRAMES; - + SetFollowerNPCData(FNPC_DATA_FOLLOWER_FLAGS, followerFlags); // If the player is biking and the follower flags prohibit biking, force the player to dismount the bike. @@ -810,7 +810,7 @@ void CreateFollowerNPC(u32 gfx, u32 followerFlags, const u8 *scriptPtr) { if (PlayerHasFollowerNPC()) return; - + struct ObjectEvent *player = &gObjectEvents[gPlayerAvatar.objectEventId]; struct ObjectEvent *follower; struct ObjectEventTemplate npc = @@ -827,7 +827,7 @@ void CreateFollowerNPC(u32 gfx, u32 followerFlags, const u8 *scriptPtr) follower = &gObjectEvents[GetFollowerNPCData(FNPC_DATA_OBJ_ID)]; follower->movementType = MOVEMENT_TYPE_NONE; gSprites[follower->spriteId].callback = MovementType_None; - + SetFollowerNPCData(FNPC_DATA_IN_PROGRESS, TRUE); SetFollowerNPCData(FNPC_DATA_GFX_ID, follower->graphicsId); SetFollowerNPCData(FNPC_DATA_SURF_BLOB, FNPC_SURF_BLOB_NONE); @@ -835,7 +835,7 @@ void CreateFollowerNPC(u32 gfx, u32 followerFlags, const u8 *scriptPtr) SetFollowerNPCScriptPointer(scriptPtr); if (FollowerNPCHasRunningFrames()) followerFlags |= FOLLOWER_NPC_FLAG_HAS_RUNNING_FRAMES; - + SetFollowerNPCData(FNPC_DATA_FOLLOWER_FLAGS, followerFlags); // If the player is biking and the follower flags prohibit biking, force the player to dismount the bike. @@ -887,7 +887,7 @@ u32 DetermineFollowerNPCState(struct ObjectEvent *follower, u32 state, u32 direc // Follower won't move if player is forced back onto the same tile. if (GetFollowerNPCData(FNPC_DATA_FORCED_MOVEMENT) == FNPC_FORCED_STAY) return MOVEMENT_ACTION_NONE; - + GetXYCoordsPlayerMovementDest(playerMoveDirection, &playerDestX, &playerDestY); newPlayerMB = MapGridGetMetatileBehaviorAt(playerDestX, playerDestY); @@ -1863,7 +1863,7 @@ void ScriptHideNPCFollower(struct ScriptContext *ctx) { if (!FNPC_ENABLE_NPC_FOLLOWERS || !PlayerHasFollowerNPC()) return; - + u32 walkSpeed = ScriptReadByte(ctx); struct ObjectEvent *npc = &gObjectEvents[GetFollowerNPCObjectId()]; @@ -1893,7 +1893,7 @@ void ScriptChangeFollowerNPCBattlePartner(struct ScriptContext *ctx) { if (!FNPC_ENABLE_NPC_FOLLOWERS || !PlayerHasFollowerNPC()) return; - + u32 newBattlePartner = ScriptReadHalfword(ctx); SetFollowerNPCData(FNPC_DATA_BATTLE_PARTNER, newBattlePartner); diff --git a/src/mirage_tower.c b/src/mirage_tower.c index bf73692a36..94e3027ef5 100644 --- a/src/mirage_tower.c +++ b/src/mirage_tower.c @@ -713,7 +713,7 @@ static void Task_FossilFallAndSink(u8 taskId) FieldEffectFreePaletteIfUnused(gSprites[sFallingFossil->spriteId].oam.paletteNum); gSprites[sFallingFossil->spriteId].inUse = TRUE; DestroySprite(&gSprites[sFallingFossil->spriteId]); - FREE_AND_SET_NULL(sFallingFossil->disintegrateRand);; + FREE_AND_SET_NULL(sFallingFossil->disintegrateRand); FREE_AND_SET_NULL(sFallingFossil->frameImage); FREE_AND_SET_NULL(sFallingFossil->frameImageTiles); FREE_AND_SET_NULL(sFallingFossil); diff --git a/src/oras_dowse.c b/src/oras_dowse.c index 237c456187..d3dab1253d 100644 --- a/src/oras_dowse.c +++ b/src/oras_dowse.c @@ -531,7 +531,7 @@ void UpdateDowsingAnimDirection(struct Sprite *sprite, struct ObjectEvent *playe anim += 16; break; } - + // Don't completely restart anim if wiggling didn't stop. if (sprite->sPrevDowseState != ORASD_WIGGLE_NONE && sprite->sDowseState != ORASD_WIGGLE_NONE) SetAndStartSpriteAnim(sprite, anim, sprite->animCmdIndex); diff --git a/src/pokemon_animation.c b/src/pokemon_animation.c index 346536c8aa..33d9af2caa 100644 --- a/src/pokemon_animation.c +++ b/src/pokemon_animation.c @@ -1945,7 +1945,7 @@ static void FrontFlip_2(struct Sprite *sprite) { TryFlipX(sprite); sprite->x2++; - sprite->y2--;; + sprite->y2--; if (sprite->x2 >= 0) { diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 26bec63015..4c0b5bdaca 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -2027,7 +2027,7 @@ void TryUpdateRelearnType(enum IncrDecrUpdateValues delta) return; } zeroCounter++; - + } while (zeroCounter <= MOVE_RELEARNER_COUNT && !hasRelearnableMoves); } diff --git a/src/trainer_see.c b/src/trainer_see.c index bf66f66e2e..ea2869a97a 100644 --- a/src/trainer_see.c +++ b/src/trainer_see.c @@ -372,7 +372,7 @@ bool8 CheckForTrainersWantingBattle(void) // Adds trainers wanting to battle to array for (i = 0; i < OBJECT_EVENTS_COUNT; i++) - { + { if (!gObjectEvents[i].active) continue; if (gObjectEvents[i].trainerType != TRAINER_TYPE_NORMAL && gObjectEvents[i].trainerType != TRAINER_TYPE_SEE_ALL_DIRECTIONS && gObjectEvents[i].trainerType != TRAINER_TYPE_BURIED) diff --git a/test/battle/ability/aftermath.c b/test/battle/ability/aftermath.c index 16ffad7adb..88c50a5562 100644 --- a/test/battle/ability/aftermath.c +++ b/test/battle/ability/aftermath.c @@ -6,10 +6,10 @@ SINGLE_BATTLE_TEST("Aftermath damages the attacker by 1/4th of its max HP if fai s16 aftermathDamage; GIVEN { - PLAYER(SPECIES_VOLTORB) { HP(1); Ability(ABILITY_AFTERMATH); }; + PLAYER(SPECIES_VOLTORB) { HP(1); Ability(ABILITY_AFTERMATH); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { - TURN {MOVE(opponent, MOVE_SCRATCH);} + TURN { MOVE(opponent, MOVE_SCRATCH); } } SCENE { MESSAGE("The opposing Wobbuffet used Scratch!"); ANIMATION(ANIM_TYPE_MOVE, MOVE_SCRATCH, opponent); @@ -24,10 +24,10 @@ SINGLE_BATTLE_TEST("Aftermath damages the attacker by 1/4th of its max HP if fai SINGLE_BATTLE_TEST("Aftermath ability pop-up will be displayed correctly: player point of view") { GIVEN { - PLAYER(SPECIES_SHROOMISH) { Ability(ABILITY_POISON_HEAL); }; - OPPONENT(SPECIES_VOLTORB) { HP(1); Ability(ABILITY_AFTERMATH); }; + PLAYER(SPECIES_SHROOMISH) { Ability(ABILITY_POISON_HEAL); } + OPPONENT(SPECIES_VOLTORB) { HP(1); Ability(ABILITY_AFTERMATH); } } WHEN { - TURN {MOVE(player, MOVE_HEADBUTT);} + TURN { MOVE(player, MOVE_HEADBUTT); } } SCENE { ANIMATION(ANIM_TYPE_MOVE, MOVE_HEADBUTT, player); MESSAGE("The opposing Voltorb fainted!"); @@ -38,10 +38,10 @@ SINGLE_BATTLE_TEST("Aftermath ability pop-up will be displayed correctly: player SINGLE_BATTLE_TEST("Aftermath ability pop-up will be displayed correctly: opponent point of view") { GIVEN { - PLAYER(SPECIES_VOLTORB) { HP(1); Ability(ABILITY_AFTERMATH); }; - OPPONENT(SPECIES_SHROOMISH) { Ability(ABILITY_POISON_HEAL); }; + PLAYER(SPECIES_VOLTORB) { HP(1); Ability(ABILITY_AFTERMATH); } + OPPONENT(SPECIES_SHROOMISH) { Ability(ABILITY_POISON_HEAL); } } WHEN { - TURN {MOVE(opponent, MOVE_HEADBUTT);} + TURN { MOVE(opponent, MOVE_HEADBUTT); } } SCENE { ANIMATION(ANIM_TYPE_MOVE, MOVE_HEADBUTT, opponent); MESSAGE("Voltorb fainted!"); diff --git a/test/battle/ability/anticipation.c b/test/battle/ability/anticipation.c index ee5b602a13..d23cb0c6a5 100644 --- a/test/battle/ability/anticipation.c +++ b/test/battle/ability/anticipation.c @@ -10,7 +10,7 @@ SINGLE_BATTLE_TEST("Anticipation causes notifies if an opponent has a super-effe PLAYER(SPECIES_EEVEE) { Ability(ABILITY_ANTICIPATION); } OPPONENT(SPECIES_WOBBUFFET) { Moves(MOVE_CLOSE_COMBAT, MOVE_SCRATCH, MOVE_POUND, MOVE_CELEBRATE); } } WHEN { - TURN { } + TURN {} } SCENE { ABILITY_POPUP(player, ABILITY_ANTICIPATION); } @@ -22,7 +22,7 @@ SINGLE_BATTLE_TEST("Anticipation does not trigger even when a move is super effe PLAYER(SPECIES_WHISCASH) { Ability(ABILITY_ANTICIPATION); } OPPONENT(SPECIES_PIKACHU) { Moves(MOVE_CELEBRATE, MOVE_THUNDERBOLT); } } WHEN { - TURN { } + TURN {} } SCENE { NOT ABILITY_POPUP(player, ABILITY_ANTICIPATION); } @@ -35,7 +35,7 @@ SINGLE_BATTLE_TEST("Anticipation causes notifies if an opponent has a One-hit KO PLAYER(SPECIES_EEVEE) { Ability(ABILITY_ANTICIPATION); } OPPONENT(SPECIES_WOBBUFFET) { Moves(MOVE_FISSURE, MOVE_SCRATCH, MOVE_POUND, MOVE_CELEBRATE); } } WHEN { - TURN { } + TURN {} } SCENE { ABILITY_POPUP(player, ABILITY_ANTICIPATION); } @@ -48,7 +48,7 @@ SINGLE_BATTLE_TEST("Anticipation treats Self-Destruct and Explosion like all oth PLAYER(SPECIES_EEVEE) { Ability(ABILITY_ANTICIPATION); } OPPONENT(SPECIES_WOBBUFFET) { Moves(MOVE_EXPLOSION, MOVE_SCRATCH, MOVE_POUND, MOVE_CELEBRATE); } } WHEN { - TURN { } + TURN {} } SCENE { NOT ABILITY_POPUP(player, ABILITY_ANTICIPATION); } @@ -63,7 +63,7 @@ SINGLE_BATTLE_TEST("Anticipation doesn't consider Normalize into their effective PLAYER(SPECIES_EEVEE) { Ability(ABILITY_ANTICIPATION); } OPPONENT(SPECIES_DELCATTY) { Ability(ABILITY_NORMALIZE); Moves(MOVE_CLOSE_COMBAT, MOVE_SCRATCH, MOVE_POUND, MOVE_CELEBRATE); } } WHEN { - TURN { } + TURN {} } SCENE { ABILITY_POPUP(player, ABILITY_ANTICIPATION); } @@ -78,7 +78,7 @@ SINGLE_BATTLE_TEST("Anticipation doesn't consider Scrappy into their effectivene PLAYER(SPECIES_DOUBLADE) { Ability(ABILITY_ANTICIPATION); } OPPONENT(SPECIES_KANGASKHAN) { Ability(ABILITY_SCRAPPY); Moves(MOVE_CLOSE_COMBAT, MOVE_CELEBRATE); } } WHEN { - TURN { } + TURN {} } SCENE { NOT ABILITY_POPUP(player, ABILITY_ANTICIPATION); } @@ -197,7 +197,7 @@ SINGLE_BATTLE_TEST("Anticipation treats dynamic move types as their base type (N PLAYER(SPECIES_EEVEE) { Ability(ABILITY_ANTICIPATION); } OPPONENT(SPECIES_ARCEUS) { Item(ITEM_FIST_PLATE); Moves(MOVE_JUDGMENT, MOVE_SCRATCH, MOVE_POUND, MOVE_CELEBRATE); } } WHEN { - TURN { } + TURN {} } SCENE { NOT ABILITY_POPUP(player, ABILITY_ANTICIPATION); } @@ -230,7 +230,7 @@ SINGLE_BATTLE_TEST("Anticipation treats dynamic move types as their base type (N PLAYER(SPECIES_EEVEE) { Ability(ABILITY_ANTICIPATION); } OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_LEPPA_BERRY); Moves(MOVE_NATURAL_GIFT, MOVE_SCRATCH, MOVE_POUND, MOVE_CELEBRATE); } } WHEN { - TURN { } + TURN {} } SCENE { NOT ABILITY_POPUP(player, ABILITY_ANTICIPATION); } @@ -245,7 +245,7 @@ SINGLE_BATTLE_TEST("Anticipation treats dynamic move types as their base type (N PLAYER(SPECIES_FERROTHORN) { Ability(ABILITY_ANTICIPATION); } OPPONENT(SPECIES_GENESECT) { Item(ITEM_BURN_DRIVE); Moves(MOVE_TECHNO_BLAST, MOVE_SCRATCH, MOVE_POUND, MOVE_CELEBRATE); } } WHEN { - TURN { } + TURN {} } SCENE { NOT ABILITY_POPUP(player, ABILITY_ANTICIPATION); } @@ -261,7 +261,7 @@ SINGLE_BATTLE_TEST("Anticipation treats dynamic move types as their base type (N PLAYER(SPECIES_FERROTHORN) { Ability(ABILITY_ANTICIPATION); } OPPONENT(SPECIES_ORICORIO_BAILE) { Moves(MOVE_REVELATION_DANCE, MOVE_SCRATCH, MOVE_POUND, MOVE_CELEBRATE); } } WHEN { - TURN { } + TURN {} } SCENE { NOT ABILITY_POPUP(player, ABILITY_ANTICIPATION); } @@ -276,7 +276,7 @@ SINGLE_BATTLE_TEST("Anticipation treats dynamic move types as their base type (N PLAYER(SPECIES_EEVEE) { Ability(ABILITY_ANTICIPATION); } OPPONENT(SPECIES_SILVALLY) { Item(ITEM_FIGHTING_MEMORY); Moves(MOVE_MULTI_ATTACK, MOVE_SCRATCH, MOVE_POUND, MOVE_CELEBRATE); } } WHEN { - TURN { } + TURN {} } SCENE { NOT ABILITY_POPUP(player, ABILITY_ANTICIPATION); } @@ -308,7 +308,7 @@ SINGLE_BATTLE_TEST("Anticipation does not consider ate-abilities") PLAYER(SPECIES_WORMADAM_PLANT) { Ability(ABILITY_ANTICIPATION); } OPPONENT(SPECIES_AURORUS) { Ability(ABILITY_REFRIGERATE); Moves(MOVE_GROWL, MOVE_SCRATCH, MOVE_POUND, MOVE_CELEBRATE); } } WHEN { - TURN { } + TURN {} } SCENE { NOT ABILITY_POPUP(player, ABILITY_ANTICIPATION); } @@ -343,7 +343,7 @@ SINGLE_BATTLE_TEST("Anticipation considers Inverse Battle types") PLAYER(SPECIES_FERROTHORN) { Ability(ABILITY_ANTICIPATION); } OPPONENT(SPECIES_WOBBUFFET) { Moves(MOVE_GROWL, MOVE_SCRATCH, MOVE_POUND, MOVE_CELEBRATE); } } WHEN { - TURN { } + TURN {} } SCENE { ABILITY_POPUP(player, ABILITY_ANTICIPATION); } diff --git a/test/battle/ability/aroma_veil.c b/test/battle/ability/aroma_veil.c index 08dedfae6e..9a911f5d21 100644 --- a/test/battle/ability/aroma_veil.c +++ b/test/battle/ability/aroma_veil.c @@ -159,7 +159,7 @@ DOUBLE_BATTLE_TEST("Aroma Veil does not protect the Pokémon's side from Impriso ASSUME(GetMoveEffect(MOVE_IMPRISON) == EFFECT_IMPRISON); PLAYER(SPECIES_AROMATISSE) { Ability(ABILITY_AROMA_VEIL); } PLAYER(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_WOBBUFFET) {Moves(MOVE_IMPRISON, MOVE_CELEBRATE); } + OPPONENT(SPECIES_WOBBUFFET) { Moves(MOVE_IMPRISON, MOVE_CELEBRATE); } OPPONENT(SPECIES_WYNAUT); } WHEN { TURN { MOVE(opponentLeft, MOVE_IMPRISON); MOVE(playerLeft, MOVE_CELEBRATE); MOVE(playerRight, MOVE_CELEBRATE); MOVE(opponentRight, MOVE_SPLASH); } diff --git a/test/battle/ability/bad_dreams.c b/test/battle/ability/bad_dreams.c index cb724e2411..0fa9f6ef61 100644 --- a/test/battle/ability/bad_dreams.c +++ b/test/battle/ability/bad_dreams.c @@ -9,9 +9,9 @@ SINGLE_BATTLE_TEST("Bad Dreams causes the sleeping enemy Pokemon to lose 1/8 of PARAMETRIZE { status = STATUS1_SLEEP; } GIVEN { PLAYER(SPECIES_DARKRAI); - OPPONENT(SPECIES_WOBBUFFET) {Status1(status);} + OPPONENT(SPECIES_WOBBUFFET) { Status1(status); } } WHEN { - TURN {;} + TURN {} } SCENE { if (status == STATUS1_SLEEP) { ABILITY_POPUP(player, ABILITY_BAD_DREAMS); @@ -41,7 +41,7 @@ SINGLE_BATTLE_TEST("Bad Dreams causes Pokémon with Comatose to lose 1/8 of HP") PLAYER(SPECIES_DARKRAI); OPPONENT(SPECIES_KOMALA) { Ability(ABILITY_COMATOSE); } } WHEN { - TURN {;} + TURN {} } SCENE { ABILITY_POPUP(player, ABILITY_BAD_DREAMS); MESSAGE("The opposing Komala is tormented!"); @@ -55,11 +55,11 @@ DOUBLE_BATTLE_TEST("Bad Dreams does not activate if only the partner Pokemon is { GIVEN { PLAYER(SPECIES_DARKRAI); - PLAYER(SPECIES_WOBBUFFET) {Status1(STATUS1_SLEEP);} + PLAYER(SPECIES_WOBBUFFET) { Status1(STATUS1_SLEEP); } OPPONENT(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { - TURN {;} + TURN {} } SCENE { NONE_OF { ABILITY_POPUP(playerLeft, ABILITY_BAD_DREAMS); @@ -76,12 +76,12 @@ DOUBLE_BATTLE_TEST("Bad Dreams does not activate if only the partner Pokemon is DOUBLE_BATTLE_TEST("Bad Dreams activates for both sleeping Pokémon on the player side") { GIVEN { - PLAYER(SPECIES_WOBBUFFET) {Status1(STATUS1_SLEEP);} - PLAYER(SPECIES_WOBBUFFET) {Status1(STATUS1_SLEEP);} + PLAYER(SPECIES_WOBBUFFET) { Status1(STATUS1_SLEEP); } + PLAYER(SPECIES_WOBBUFFET) { Status1(STATUS1_SLEEP); } OPPONENT(SPECIES_DARKRAI); OPPONENT(SPECIES_WOBBUFFET); } WHEN { - TURN {;} + TURN {} } SCENE { ABILITY_POPUP(opponentLeft, ABILITY_BAD_DREAMS); MESSAGE("Wobbuffet is tormented!"); @@ -99,14 +99,14 @@ DOUBLE_BATTLE_TEST("Bad Dreams activates for both sleeping Pokémon on the playe DOUBLE_BATTLE_TEST("Bad Dreams faints both sleeping Pokemon on player side") { GIVEN { - PLAYER(SPECIES_WOBBUFFET) {Status1(STATUS1_SLEEP); HP(1);} - PLAYER(SPECIES_WOBBUFFET) {Status1(STATUS1_SLEEP); HP(1);} - PLAYER(SPECIES_WOBBUFFET) {Status1(STATUS1_SLEEP);} - PLAYER(SPECIES_WOBBUFFET) {Status1(STATUS1_SLEEP);} + PLAYER(SPECIES_WOBBUFFET) { Status1(STATUS1_SLEEP); HP(1); } + PLAYER(SPECIES_WOBBUFFET) { Status1(STATUS1_SLEEP); HP(1); } + PLAYER(SPECIES_WOBBUFFET) { Status1(STATUS1_SLEEP); } + PLAYER(SPECIES_WOBBUFFET) { Status1(STATUS1_SLEEP); } OPPONENT(SPECIES_DARKRAI); OPPONENT(SPECIES_WOBBUFFET); } WHEN { - TURN {SEND_OUT(playerLeft, 2); SEND_OUT(playerRight, 3);} + TURN { SEND_OUT(playerLeft, 2); SEND_OUT(playerRight, 3); } } SCENE { ABILITY_POPUP(opponentLeft, ABILITY_BAD_DREAMS); MESSAGE("Wobbuffet is tormented!"); @@ -123,12 +123,12 @@ DOUBLE_BATTLE_TEST("Bad Dreams faints both sleeping Pokemon on opponent side") GIVEN { PLAYER(SPECIES_DARKRAI); PLAYER(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_WOBBUFFET) {Status1(STATUS1_SLEEP); HP(1);} - OPPONENT(SPECIES_WOBBUFFET) {Status1(STATUS1_SLEEP); HP(1);} - OPPONENT(SPECIES_WOBBUFFET) {Status1(STATUS1_SLEEP);} - OPPONENT(SPECIES_WOBBUFFET) {Status1(STATUS1_SLEEP);} + OPPONENT(SPECIES_WOBBUFFET) { Status1(STATUS1_SLEEP); HP(1); } + OPPONENT(SPECIES_WOBBUFFET) { Status1(STATUS1_SLEEP); HP(1); } + OPPONENT(SPECIES_WOBBUFFET) { Status1(STATUS1_SLEEP); } + OPPONENT(SPECIES_WOBBUFFET) { Status1(STATUS1_SLEEP); } } WHEN { - TURN {SEND_OUT(opponentLeft, 2); SEND_OUT(opponentRight, 3);} + TURN { SEND_OUT(opponentLeft, 2); SEND_OUT(opponentRight, 3); } } SCENE { ABILITY_POPUP(playerLeft, ABILITY_BAD_DREAMS); MESSAGE("The opposing Wobbuffet is tormented!"); diff --git a/test/battle/ability/ball_fetch.c b/test/battle/ability/ball_fetch.c index 762225c0f0..5a8b4d9530 100644 --- a/test/battle/ability/ball_fetch.c +++ b/test/battle/ability/ball_fetch.c @@ -15,7 +15,7 @@ WILD_BATTLE_TEST("Ball Fetch causes the Pokémon to pick up the last failed Ball PLAYER(SPECIES_YAMPER) { Ability(ABILITY_BALL_FETCH); } OPPONENT(SPECIES_METAGROSS); } WHEN { - TURN { USE_ITEM(player, item, WITH_RNG(RNG_BALLTHROW_SHAKE, MAX_u16) );} + TURN { USE_ITEM(player, item, WITH_RNG(RNG_BALLTHROW_SHAKE, MAX_u16)); } TURN {} } SCENE { if (item != ITEM_X_ACCURACY) @@ -51,8 +51,7 @@ WILD_BATTLE_TEST("Ball Fetch doesn't trigger if the Pokémon is already holding } else { - NONE_OF - { + NONE_OF { ABILITY_POPUP(player, ABILITY_BALL_FETCH); MESSAGE("Yamper found a Great Ball!"); } @@ -74,7 +73,7 @@ WILD_BATTLE_TEST("Ball Fetch only picks up the first failed ball, once per battl PARAMETRIZE { item = ITEM_GREAT_BALL; item2 = ITEM_ULTRA_BALL; } PARAMETRIZE { item = ITEM_GREAT_BALL; item2 = ITEM_FAST_BALL; } PARAMETRIZE { item = ITEM_GREAT_BALL; item2 = ITEM_STRANGE_BALL; } - + GIVEN { PLAYER(SPECIES_YAMPER) { Ability(ABILITY_BALL_FETCH); } diff --git a/test/battle/ability/battle_bond.c b/test/battle/ability/battle_bond.c index 95787429b1..9d8bb1b3cd 100644 --- a/test/battle/ability/battle_bond.c +++ b/test/battle/ability/battle_bond.c @@ -11,10 +11,10 @@ SINGLE_BATTLE_TEST("Battle Bond transforms player's Greninja - Singles") { u32 monsCountPlayer, monsCountOpponent; - PARAMETRIZE {monsCountPlayer = 1; monsCountOpponent = 1; } - PARAMETRIZE {monsCountPlayer = 1; monsCountOpponent = 2; } - PARAMETRIZE {monsCountPlayer = 2; monsCountOpponent = 1; } - PARAMETRIZE {monsCountPlayer = 2; monsCountOpponent = 2; } + PARAMETRIZE { monsCountPlayer = 1; monsCountOpponent = 1; } + PARAMETRIZE { monsCountPlayer = 1; monsCountOpponent = 2; } + PARAMETRIZE { monsCountPlayer = 2; monsCountOpponent = 1; } + PARAMETRIZE { monsCountPlayer = 2; monsCountOpponent = 2; } GIVEN { WITH_CONFIG(CONFIG_BATTLE_BOND, GEN_8); @@ -59,10 +59,10 @@ SINGLE_BATTLE_TEST("Battle Bond transforms opponent's Greninja - Singles") { u32 monsCountPlayer, monsCountOpponent; - PARAMETRIZE {monsCountPlayer = 1; monsCountOpponent = 1; } - PARAMETRIZE {monsCountPlayer = 1; monsCountOpponent = 2; } - PARAMETRIZE {monsCountPlayer = 2; monsCountOpponent = 1; } - PARAMETRIZE {monsCountPlayer = 2; monsCountOpponent = 2; } + PARAMETRIZE { monsCountPlayer = 1; monsCountOpponent = 1; } + PARAMETRIZE { monsCountPlayer = 1; monsCountOpponent = 2; } + PARAMETRIZE { monsCountPlayer = 2; monsCountOpponent = 1; } + PARAMETRIZE { monsCountPlayer = 2; monsCountOpponent = 2; } GIVEN { WITH_CONFIG(CONFIG_BATTLE_BOND, GEN_8); @@ -70,7 +70,7 @@ SINGLE_BATTLE_TEST("Battle Bond transforms opponent's Greninja - Singles") if (monsCountOpponent == 2) { OPPONENT(SPECIES_WOBBUFFET); } - PLAYER(SPECIES_WOBBUFFET) {HP(1); } + PLAYER(SPECIES_WOBBUFFET) { HP(1); } if (monsCountPlayer == 2) { PLAYER(SPECIES_WOBBUFFET); } @@ -107,10 +107,10 @@ DOUBLE_BATTLE_TEST("Battle Bond transforms player's Greninja when fainting its A { u32 monsCountPlayer, monsCountOpponent; - PARAMETRIZE {monsCountPlayer = 2; monsCountOpponent = 2; } - PARAMETRIZE {monsCountPlayer = 2; monsCountOpponent = 3; } - PARAMETRIZE {monsCountPlayer = 3; monsCountOpponent = 2; } - PARAMETRIZE {monsCountPlayer = 3; monsCountOpponent = 3; } + PARAMETRIZE { monsCountPlayer = 2; monsCountOpponent = 2; } + PARAMETRIZE { monsCountPlayer = 2; monsCountOpponent = 3; } + PARAMETRIZE { monsCountPlayer = 3; monsCountOpponent = 2; } + PARAMETRIZE { monsCountPlayer = 3; monsCountOpponent = 3; } GIVEN { WITH_CONFIG(CONFIG_BATTLE_BOND, GEN_8); diff --git a/test/battle/ability/beads_of_ruin.c b/test/battle/ability/beads_of_ruin.c index 86172459ab..037a56386c 100644 --- a/test/battle/ability/beads_of_ruin.c +++ b/test/battle/ability/beads_of_ruin.c @@ -35,7 +35,7 @@ SINGLE_BATTLE_TEST("Beads of Ruin's message displays correctly after all battler { GIVEN { ASSUME(GetMoveEffect(MOVE_EXPLOSION) == EFFECT_EXPLOSION); - PLAYER(SPECIES_WOBBUFFET) { HP(1);} + PLAYER(SPECIES_WOBBUFFET) { HP(1); } PLAYER(SPECIES_CHI_YU); OPPONENT(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); @@ -59,7 +59,7 @@ SINGLE_BATTLE_TEST("Beads of Ruin's message displays correctly after all battler ASSUME(GetMoveEffect(MOVE_EXPLOSION) == EFFECT_EXPLOSION); PLAYER(SPECIES_WOBBUFFET); PLAYER(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_WOBBUFFET) { HP(1);} + OPPONENT(SPECIES_WOBBUFFET) { HP(1); } OPPONENT(SPECIES_CHI_YU); } WHEN { TURN { MOVE(player, MOVE_EXPLOSION); SEND_OUT(player, 1); SEND_OUT(opponent, 1); } diff --git a/test/battle/ability/clear_body.c b/test/battle/ability/clear_body.c index f5b9573fe0..d1cd9f8d5e 100644 --- a/test/battle/ability/clear_body.c +++ b/test/battle/ability/clear_body.c @@ -12,9 +12,9 @@ SINGLE_BATTLE_TEST("Clear Body, Full Metal Body, and White Smoke prevent intimid PARAMETRIZE{ species = SPECIES_SOLGALEO; ability = ABILITY_FULL_METAL_BODY; } PARAMETRIZE{ species = SPECIES_TORKOAL; ability = ABILITY_WHITE_SMOKE; } GIVEN { - PLAYER(SPECIES_EKANS) { Ability(ABILITY_SHED_SKIN); }; - PLAYER(SPECIES_EKANS) { Ability(ABILITY_INTIMIDATE); }; - OPPONENT(species) { Ability(ability); }; + PLAYER(SPECIES_EKANS) { Ability(ABILITY_SHED_SKIN); } + PLAYER(SPECIES_EKANS) { Ability(ABILITY_INTIMIDATE); } + OPPONENT(species) { Ability(ability); } } WHEN { TURN { MOVE(opponent, MOVE_SCRATCH); } TURN { SWITCH(player, 1); MOVE(opponent, MOVE_SCRATCH); } @@ -220,7 +220,7 @@ SINGLE_BATTLE_TEST("Clear Body, Full Metal Body, and White Smoke don't prevent S PLAYER(SPECIES_WOBBUFFET) { Speed(4); } OPPONENT(species) { Speed(6); Ability(ability); Item(heldItem); } } WHEN { - TURN { } + TURN {} } SCENE { NOT ABILITY_POPUP(opponent, ability); if (heldItem == ITEM_IRON_BALL) { @@ -393,9 +393,9 @@ SINGLE_BATTLE_TEST("Clear Body, Full Metal Body, and White Smoke don't prevent S PLAYER(SPECIES_WOBBUFFET) { Speed(4); } OPPONENT(species) { Speed(5); Ability(ability); } } WHEN { - TURN{ MOVE(opponent, MOVE_AGILITY); } - TURN{ MOVE(player, MOVE_SPECTRAL_THIEF); } - TURN{ } + TURN { MOVE(opponent, MOVE_AGILITY); } + TURN { MOVE(player, MOVE_SPECTRAL_THIEF); } + TURN {} } SCENE { if (ability == ABILITY_FULL_METAL_BODY) MESSAGE("The opposing Solgaleo used Agility!"); diff --git a/test/battle/ability/color_change.c b/test/battle/ability/color_change.c index 49eaa3e916..9c5176e3ac 100644 --- a/test/battle/ability/color_change.c +++ b/test/battle/ability/color_change.c @@ -90,8 +90,8 @@ SINGLE_BATTLE_TEST("Color Change changes the type when a Pokemon is hit by Futur OPPONENT(SPECIES_KECLEON) { Ability(ABILITY_COLOR_CHANGE); } } WHEN { TURN { MOVE(player, MOVE_FUTURE_SIGHT); } - TURN { } - TURN { } + TURN {} + TURN {} } SCENE { ANIMATION(ANIM_TYPE_MOVE, MOVE_FUTURE_SIGHT, player); MESSAGE("The opposing Kecleon took the Future Sight attack!"); @@ -107,8 +107,8 @@ SINGLE_BATTLE_TEST("Color Change changes the type when a Pokemon is hit by Doom OPPONENT(SPECIES_KECLEON) { Ability(ABILITY_COLOR_CHANGE); } } WHEN { TURN { MOVE(player, MOVE_DOOM_DESIRE); } - TURN { } - TURN { } + TURN {} + TURN {} } SCENE { ANIMATION(ANIM_TYPE_MOVE, MOVE_DOOM_DESIRE, player); MESSAGE("The opposing Kecleon took the Doom Desire attack!"); @@ -124,7 +124,7 @@ SINGLE_BATTLE_TEST("Color Change changes the type to Electric when a Pokemon is OPPONENT(SPECIES_KECLEON) { Ability(ABILITY_COLOR_CHANGE); } } WHEN { TURN { MOVE(opponent, MOVE_CELEBRATE); MOVE(player, MOVE_FUTURE_SIGHT); } - TURN { } + TURN {} TURN { MOVE(opponent, MOVE_ELECTRIFY); } } SCENE { ANIMATION(ANIM_TYPE_MOVE, MOVE_FUTURE_SIGHT, player); @@ -142,7 +142,7 @@ SINGLE_BATTLE_TEST("Color Change changes the type to Normal when a Pokemon is hi } WHEN { TURN { MOVE(opponent, MOVE_CELEBRATE); MOVE(player, MOVE_FUTURE_SIGHT); } TURN { MOVE(player, MOVE_SOAK); } - TURN { } + TURN {} } SCENE { ANIMATION(ANIM_TYPE_MOVE, MOVE_FUTURE_SIGHT, player); MESSAGE("Wobbuffet used Soak!"); @@ -162,7 +162,7 @@ SINGLE_BATTLE_TEST("Color Change does not change the type to Normal when a Pokem } WHEN { TURN { MOVE(player, MOVE_SOAK); } TURN { MOVE(player, MOVE_STRUGGLE); } - TURN { } + TURN {} } SCENE { ANIMATION(ANIM_TYPE_MOVE, MOVE_SOAK, player); MESSAGE("The opposing Kecleon transformed into the Water type!"); diff --git a/test/battle/ability/commander.c b/test/battle/ability/commander.c index c64590a3a3..5a075a8ebf 100644 --- a/test/battle/ability/commander.c +++ b/test/battle/ability/commander.c @@ -64,7 +64,7 @@ DOUBLE_BATTLE_TEST("Commander Tatsugiri will still take residual damage from a f OPPONENT(SPECIES_TYRANITAR) { Ability(ABILITY_SAND_STREAM); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { - TURN { } + TURN {} } SCENE { ABILITY_POPUP(playerLeft, ABILITY_COMMANDER); MESSAGE("Tatsugiri was swallowed by Dondozo and became Dondozo's commander!"); @@ -83,7 +83,7 @@ DOUBLE_BATTLE_TEST("Commander Tatsugiri will still take poison damage if while i OPPONENT(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { - TURN { } + TURN {} } SCENE { ABILITY_POPUP(playerLeft, ABILITY_COMMANDER); MESSAGE("Tatsugiri was swallowed by Dondozo and became Dondozo's commander!"); @@ -176,7 +176,7 @@ DOUBLE_BATTLE_TEST("Commander Tatsugiri is not damaged by a double target move i { GIVEN { ASSUME(GetMoveTarget(MOVE_SURF) == MOVE_TARGET_FOES_AND_ALLY); - PLAYER(SPECIES_DONDOZO) { HP(1); }; + PLAYER(SPECIES_DONDOZO) { HP(1); } PLAYER(SPECIES_TATSUGIRI) { Ability(ABILITY_COMMANDER); } PLAYER(SPECIES_WYNAUT); OPPONENT(SPECIES_WOBBUFFET); @@ -244,7 +244,7 @@ DOUBLE_BATTLE_TEST("Commander doesn't prevent Imposter from working on a Command OPPONENT(SPECIES_WOBBUFFET); OPPONENT(SPECIES_DITTO) { Ability(ABILITY_IMPOSTER); } } WHEN { - TURN { } + TURN {} TURN { SWITCH(opponentLeft, 2); } } SCENE { ABILITY_POPUP(playerRight, ABILITY_COMMANDER); diff --git a/test/battle/ability/competitive.c b/test/battle/ability/competitive.c index 28cd0198ab..b7d938ae8d 100644 --- a/test/battle/ability/competitive.c +++ b/test/battle/ability/competitive.c @@ -174,7 +174,7 @@ SINGLE_BATTLE_TEST("Competitive correctly activates after Sticky Web lowers Spee } WHEN { TURN { MOVE(player, MOVE_STICKY_WEB); MOVE(opponent, MOVE_COURT_CHANGE); } TURN { SWITCH(player, 1); } - TURN { MOVE(opponent, MOVE_GROWL);} + TURN { MOVE(opponent, MOVE_GROWL); } } SCENE { ANIMATION(ANIM_TYPE_MOVE, MOVE_STICKY_WEB, player); ANIMATION(ANIM_TYPE_MOVE, MOVE_COURT_CHANGE, opponent); diff --git a/test/battle/ability/contrary.c b/test/battle/ability/contrary.c index ef5b4c6c7d..577affeecb 100644 --- a/test/battle/ability/contrary.c +++ b/test/battle/ability/contrary.c @@ -246,7 +246,7 @@ AI_SINGLE_BATTLE_TEST("AI sees Contrary-effected moves correctly in MoveEffectIn { GIVEN{ AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY | AI_FLAG_SMART_SWITCHING | AI_FLAG_SMART_MON_CHOICES | AI_FLAG_OMNISCIENT); - PLAYER(SPECIES_HERACROSS){ + PLAYER(SPECIES_HERACROSS) { Level(44); HP(1); Speed(5); @@ -254,7 +254,7 @@ AI_SINGLE_BATTLE_TEST("AI sees Contrary-effected moves correctly in MoveEffectIn Item(ITEM_LOADED_DICE); Moves(MOVE_PIN_MISSILE); } - OPPONENT(SPECIES_SERPERIOR){ + OPPONENT(SPECIES_SERPERIOR) { Level(44); Speed(10); Nature(NATURE_TIMID); @@ -262,7 +262,7 @@ AI_SINGLE_BATTLE_TEST("AI sees Contrary-effected moves correctly in MoveEffectIn Moves(MOVE_DRAGON_PULSE, MOVE_SPIN_OUT, MOVE_HIDDEN_POWER, MOVE_GLARE); } } WHEN { - TURN{ + TURN { MOVE(player, MOVE_PIN_MISSILE); EXPECT_MOVE(opponent, MOVE_SPIN_OUT); // previously all 107, now sees speed can rise w/ Contrary } diff --git a/test/battle/ability/corrosion.c b/test/battle/ability/corrosion.c index f46ad72a72..75ac0fc4bb 100644 --- a/test/battle/ability/corrosion.c +++ b/test/battle/ability/corrosion.c @@ -100,7 +100,7 @@ SINGLE_BATTLE_TEST("If a Poison- or Steel-type Pokémon with Corrosion holds a T PLAYER(SPECIES_SALANDIT) { Ability(ABILITY_CORROSION); Item(ITEM_TOXIC_ORB); } OPPONENT(SPECIES_ODDISH); } WHEN { - TURN { } + TURN {} } SCENE { ANIMATION(ANIM_TYPE_STATUS, B_ANIM_STATUS_PSN, player); STATUS_ICON(player, badPoison: TRUE); diff --git a/test/battle/ability/cud_chew.c b/test/battle/ability/cud_chew.c index aca9e79447..809d9f1d7c 100644 --- a/test/battle/ability/cud_chew.c +++ b/test/battle/ability/cud_chew.c @@ -10,7 +10,7 @@ SINGLE_BATTLE_TEST("Cud Chew will activate Kee Berry effect again on the next tu OPPONENT(SPECIES_TAUROS_PALDEA_COMBAT) { Ability(ABILITY_CUD_CHEW); Item(ITEM_KEE_BERRY); } } WHEN { TURN { MOVE(player, MOVE_SCRATCH); } - TURN { MOVE(player, MOVE_CELEBRATE);} + TURN { MOVE(player, MOVE_CELEBRATE); } } SCENE { ANIMATION(ANIM_TYPE_MOVE, MOVE_SCRATCH, player); HP_BAR(opponent); @@ -34,7 +34,7 @@ SINGLE_BATTLE_TEST("Cud Chew will activate Oran Berry effect again on the next t OPPONENT(SPECIES_TAUROS_PALDEA_COMBAT) { MaxHP(60); HP(60); Ability(ABILITY_CUD_CHEW); Item(ITEM_ORAN_BERRY); } } WHEN { TURN { MOVE(player, MOVE_DRAGON_RAGE); } - TURN { MOVE(player, MOVE_CELEBRATE);} + TURN { MOVE(player, MOVE_CELEBRATE); } TURN {} } SCENE { ANIMATION(ANIM_TYPE_MOVE, MOVE_DRAGON_RAGE, player); diff --git a/test/battle/ability/dauntless_shield.c b/test/battle/ability/dauntless_shield.c index 91d5ceb4fc..9a8871d5d7 100644 --- a/test/battle/ability/dauntless_shield.c +++ b/test/battle/ability/dauntless_shield.c @@ -7,7 +7,7 @@ SINGLE_BATTLE_TEST("Dauntless Shield raises Defense by one stage") PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_ZAMAZENTA) { Ability(ABILITY_DAUNTLESS_SHIELD); } } WHEN { - TURN { } + TURN {} } SCENE { ABILITY_POPUP(opponent, ABILITY_DAUNTLESS_SHIELD); ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponent); diff --git a/test/battle/ability/defeatist.c b/test/battle/ability/defeatist.c index 16f7c406ee..93d84e8a9d 100644 --- a/test/battle/ability/defeatist.c +++ b/test/battle/ability/defeatist.c @@ -13,7 +13,7 @@ SINGLE_BATTLE_TEST("Defeatist halves Attack when HP <= 50%", s16 damage) PARAMETRIZE { hp = 400; } PARAMETRIZE { hp = 200; } GIVEN { - PLAYER(SPECIES_ARCHEN) { Ability(ABILITY_DEFEATIST); HP(hp), MaxHP(400);} + PLAYER(SPECIES_ARCHEN) { Ability(ABILITY_DEFEATIST); HP(hp), MaxHP(400); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(player, MOVE_SCRATCH); MOVE(opponent, MOVE_CELEBRATE); } @@ -32,7 +32,7 @@ SINGLE_BATTLE_TEST("Defeatist halves Special Attack when HP <= 50%", s16 damage) PARAMETRIZE { hp = 400; } PARAMETRIZE { hp = 200; } GIVEN { - PLAYER(SPECIES_ARCHEN) { Ability(ABILITY_DEFEATIST); HP(hp), MaxHP(400);} + PLAYER(SPECIES_ARCHEN) { Ability(ABILITY_DEFEATIST); HP(hp), MaxHP(400); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(player, MOVE_ECHOED_VOICE); MOVE(opponent, MOVE_CELEBRATE); } diff --git a/test/battle/ability/defiant.c b/test/battle/ability/defiant.c index 21c1e40a43..2c5c529717 100644 --- a/test/battle/ability/defiant.c +++ b/test/battle/ability/defiant.c @@ -151,7 +151,7 @@ SINGLE_BATTLE_TEST("Defiant doesn't activate after Sticky Web lowers Speed if Co OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(player, MOVE_STICKY_WEB); MOVE(opponent, MOVE_COURT_CHANGE); } - TURN { SWITCH(player, 1); MOVE(opponent, MOVE_GROWL);} + TURN { SWITCH(player, 1); MOVE(opponent, MOVE_GROWL); } } SCENE { ANIMATION(ANIM_TYPE_MOVE, MOVE_STICKY_WEB, player); ANIMATION(ANIM_TYPE_MOVE, MOVE_COURT_CHANGE, opponent); @@ -188,7 +188,7 @@ SINGLE_BATTLE_TEST("Defiant activates after Sticky Web lowers Speed if Court Cha OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(player, MOVE_STICKY_WEB); MOVE(opponent, MOVE_COURT_CHANGE); } - TURN { SWITCH(player, 1); MOVE(opponent, MOVE_GROWL);} + TURN { SWITCH(player, 1); MOVE(opponent, MOVE_GROWL); } } SCENE { ANIMATION(ANIM_TYPE_MOVE, MOVE_STICKY_WEB, player); ANIMATION(ANIM_TYPE_MOVE, MOVE_COURT_CHANGE, opponent); diff --git a/test/battle/ability/desolate_land.c b/test/battle/ability/desolate_land.c index 3d19f4490d..918ea720a2 100644 --- a/test/battle/ability/desolate_land.c +++ b/test/battle/ability/desolate_land.c @@ -10,7 +10,7 @@ ASSUMPTIONS SINGLE_BATTLE_TEST("Desolate Land blocks damaging Water-type moves") { GIVEN { - PLAYER(SPECIES_GROUDON) {Item(ITEM_RED_ORB);} + PLAYER(SPECIES_GROUDON) { Item(ITEM_RED_ORB); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(opponent, MOVE_WATER_GUN); } @@ -35,10 +35,10 @@ DOUBLE_BATTLE_TEST("Desolate Land blocks damaging Water-type moves and prints th ASSUME(!IsBattleMoveStatus(MOVE_SURF)); ASSUME(GetMoveType(MOVE_SURF) == TYPE_WATER); ASSUME(GetMoveTarget(MOVE_SURF) == MOVE_TARGET_FOES_AND_ALLY); - PLAYER(SPECIES_GROUDON) {Item(ITEM_RED_ORB); {Speed(5);}} - PLAYER(SPECIES_WOBBUFFET) {Speed(5);} - OPPONENT(SPECIES_WOBBUFFET) {Speed(10);} - OPPONENT(SPECIES_WOBBUFFET) {Speed(8);} + PLAYER(SPECIES_GROUDON) { Item(ITEM_RED_ORB); Speed(5); } + PLAYER(SPECIES_WOBBUFFET) { Speed(5); } + OPPONENT(SPECIES_WOBBUFFET) { Speed(10); } + OPPONENT(SPECIES_WOBBUFFET) { Speed(8); } } WHEN { TURN { MOVE(opponentLeft, MOVE_SURF); } } SCENE { @@ -56,8 +56,8 @@ DOUBLE_BATTLE_TEST("Desolate Land blocks damaging Water-type moves and prints th SINGLE_BATTLE_TEST("Desolate Land does not block a move if Pokémon is asleep and uses a Water-type move") // Sleep/confusion/paralysis all happen before the check for primal weather { GIVEN { - PLAYER(SPECIES_GROUDON) {Item(ITEM_RED_ORB);} - OPPONENT(SPECIES_WOBBUFFET) {Status1(STATUS1_SLEEP);} + PLAYER(SPECIES_GROUDON) { Item(ITEM_RED_ORB); } + OPPONENT(SPECIES_WOBBUFFET) { Status1(STATUS1_SLEEP); } } WHEN { TURN { MOVE(opponent, MOVE_WATER_GUN); } } SCENE { diff --git a/test/battle/ability/disguise.c b/test/battle/ability/disguise.c index d77f94c1db..24a6a2d5ce 100644 --- a/test/battle/ability/disguise.c +++ b/test/battle/ability/disguise.c @@ -52,7 +52,7 @@ SINGLE_BATTLE_TEST("Disguised Mimikyu takes no damage from a confusion hit and c OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(opponent, MOVE_CONFUSE_RAY); } - TURN { } + TURN {} } SCENE { ANIMATION(ANIM_TYPE_MOVE, MOVE_CONFUSE_RAY, opponent); ANIMATION(ANIM_TYPE_STATUS, B_ANIM_STATUS_CONFUSION, player); diff --git a/test/battle/ability/electromorphosis.c b/test/battle/ability/electromorphosis.c index 92fe09358e..5291a7d973 100644 --- a/test/battle/ability/electromorphosis.c +++ b/test/battle/ability/electromorphosis.c @@ -6,8 +6,8 @@ SINGLE_BATTLE_TEST("Electromorphosis sets up Charge when hit by any move") s16 dmgBefore, dmgAfter; u16 move; - PARAMETRIZE {move = MOVE_SCRATCH; } - PARAMETRIZE {move = MOVE_GUST; } + PARAMETRIZE { move = MOVE_SCRATCH; } + PARAMETRIZE { move = MOVE_GUST; } GIVEN { ASSUME(!IsBattleMoveStatus(MOVE_SCRATCH)); @@ -18,7 +18,7 @@ SINGLE_BATTLE_TEST("Electromorphosis sets up Charge when hit by any move") ASSUME(GetMoveType(MOVE_THUNDER_SHOCK) == TYPE_ELECTRIC); PLAYER(SPECIES_BELLIBOLT) { Ability(ABILITY_ELECTROMORPHOSIS); Speed(10); } - OPPONENT(SPECIES_WOBBUFFET) {Ability(ABILITY_LIMBER); Speed(5) ;} // Limber, so it doesn't get paralyzed. + OPPONENT(SPECIES_WOBBUFFET) { Ability(ABILITY_LIMBER); Speed(5); } // Limber, so it doesn't get paralyzed. } WHEN { TURN { MOVE(player, MOVE_THUNDER_SHOCK), MOVE(opponent, move); } diff --git a/test/battle/ability/embody_aspect.c b/test/battle/ability/embody_aspect.c index e7ac53a9e8..326981125f 100644 --- a/test/battle/ability/embody_aspect.c +++ b/test/battle/ability/embody_aspect.c @@ -16,7 +16,7 @@ SINGLE_BATTLE_TEST("Embody Aspect raises a stat depending on the users form by o PLAYER(SPECIES_WOBBUFFET); OPPONENT(species) { Ability(ability); } } WHEN { - TURN { } + TURN {} } SCENE { ABILITY_POPUP(opponent, ability); ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponent); diff --git a/test/battle/ability/emergency_exit.c b/test/battle/ability/emergency_exit.c index 3592b91b01..a03a4853cb 100644 --- a/test/battle/ability/emergency_exit.c +++ b/test/battle/ability/emergency_exit.c @@ -5,7 +5,7 @@ SINGLE_BATTLE_TEST("Emergency Exit switches out when taking 50% max-hp damage") { GIVEN { PLAYER(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_GOLISOPOD) { Ability(ABILITY_EMERGENCY_EXIT); MaxHP(263); HP(262); }; + OPPONENT(SPECIES_GOLISOPOD) { Ability(ABILITY_EMERGENCY_EXIT); MaxHP(263); HP(262); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(player, MOVE_SUPER_FANG); SEND_OUT(opponent, 1); } @@ -20,7 +20,7 @@ SINGLE_BATTLE_TEST("Emergency Exit does not switch out when going below 50% max- { GIVEN { PLAYER(SPECIES_WOBBUFFET) - OPPONENT(SPECIES_GOLISOPOD) { Ability(ABILITY_EMERGENCY_EXIT); MaxHP(263); HP(262); Item(ITEM_SITRUS_BERRY); }; + OPPONENT(SPECIES_GOLISOPOD) { Ability(ABILITY_EMERGENCY_EXIT); MaxHP(263); HP(262); Item(ITEM_SITRUS_BERRY); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(player, MOVE_SUPER_FANG); } @@ -36,7 +36,7 @@ SINGLE_BATTLE_TEST("Emergency Exit switches out when going below 50% max-HP but { GIVEN { PLAYER(SPECIES_WOBBUFFET) - OPPONENT(SPECIES_GOLISOPOD) { Ability(ABILITY_EMERGENCY_EXIT); MaxHP(263); HP(133); Item(ITEM_ORAN_BERRY); }; + OPPONENT(SPECIES_GOLISOPOD) { Ability(ABILITY_EMERGENCY_EXIT); MaxHP(263); HP(133); Item(ITEM_ORAN_BERRY); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(player, MOVE_SUPER_FANG); SEND_OUT(opponent, 1); } @@ -53,8 +53,8 @@ DOUBLE_BATTLE_TEST("Only the fastest Wimp Out (Emergency Exit) user switches out GIVEN { PLAYER(SPECIES_ZAPDOS) { Speed(10); } PLAYER(SPECIES_WOBBUFFET) { Speed(10); } - OPPONENT(SPECIES_WIMPOD) { Speed(1); Ability(ABILITY_WIMP_OUT); Item(ITEM_FOCUS_SASH); }; - OPPONENT(SPECIES_WIMPOD) { Speed(2); Ability(ABILITY_WIMP_OUT); Item(ITEM_FOCUS_SASH); }; + OPPONENT(SPECIES_WIMPOD) { Speed(1); Ability(ABILITY_WIMP_OUT); Item(ITEM_FOCUS_SASH); } + OPPONENT(SPECIES_WIMPOD) { Speed(2); Ability(ABILITY_WIMP_OUT); Item(ITEM_FOCUS_SASH); } OPPONENT(SPECIES_WOBBUFFET) { Speed(10); } OPPONENT(SPECIES_WOBBUFFET) { Speed(10); } } WHEN { @@ -71,7 +71,7 @@ SINGLE_BATTLE_TEST("Emergency Exit activates when taking residual damage and fal { GIVEN { PLAYER(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_GOLISOPOD) { Ability(ABILITY_EMERGENCY_EXIT); MaxHP(263); HP(134); Status1(STATUS1_BURN); }; + OPPONENT(SPECIES_GOLISOPOD) { Ability(ABILITY_EMERGENCY_EXIT); MaxHP(263); HP(134); Status1(STATUS1_BURN); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { SEND_OUT(opponent, 1); } @@ -87,7 +87,7 @@ SINGLE_BATTLE_TEST("Emergency Exit activates when healing from under 50% max-hp GIVEN { ASSUME(GetMoveEffect(MOVE_AQUA_RING) == EFFECT_AQUA_RING); PLAYER(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_GOLISOPOD) { Ability(ABILITY_EMERGENCY_EXIT); MaxHP(263); HP(130); Status1(STATUS1_BURN); }; + OPPONENT(SPECIES_GOLISOPOD) { Ability(ABILITY_EMERGENCY_EXIT); MaxHP(263); HP(130); Status1(STATUS1_BURN); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(opponent, MOVE_AQUA_RING); SEND_OUT(opponent, 1); } @@ -102,7 +102,7 @@ SINGLE_BATTLE_TEST("Emergency Exit activates when taking residual damage and fal { GIVEN { PLAYER(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_GOLISOPOD) { Ability(ABILITY_EMERGENCY_EXIT); MaxHP(263); HP(134); }; + OPPONENT(SPECIES_GOLISOPOD) { Ability(ABILITY_EMERGENCY_EXIT); MaxHP(263); HP(134); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(player, MOVE_SANDSTORM); SEND_OUT(opponent, 1); } @@ -119,7 +119,7 @@ SINGLE_BATTLE_TEST("Emergency Exit activates when healing from under 50% max-hp ASSUME(GetMoveEffect(MOVE_AQUA_RING) == EFFECT_AQUA_RING); ASSUME(GetItemHoldEffect(ITEM_STICKY_BARB) == HOLD_EFFECT_STICKY_BARB); PLAYER(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_GOLISOPOD) { Ability(ABILITY_EMERGENCY_EXIT); MaxHP(263); HP(130); Item(ITEM_STICKY_BARB); }; + OPPONENT(SPECIES_GOLISOPOD) { Ability(ABILITY_EMERGENCY_EXIT); MaxHP(263); HP(130); Item(ITEM_STICKY_BARB); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(opponent, MOVE_AQUA_RING); SEND_OUT(opponent, 1); } @@ -134,7 +134,7 @@ SINGLE_BATTLE_TEST("Emergency Exit activates when taking residual damage and fal { GIVEN { PLAYER(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_GOLISOPOD) { Ability(ABILITY_EMERGENCY_EXIT); MaxHP(263); HP(160); }; + OPPONENT(SPECIES_GOLISOPOD) { Ability(ABILITY_EMERGENCY_EXIT); MaxHP(263); HP(160); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(player, MOVE_SALT_CURE); SEND_OUT(opponent, 1); } @@ -149,9 +149,9 @@ WILD_BATTLE_TEST("Emergency Exit makes the pokemon flee during wild battle") GIVEN { PLAYER(SPECIES_WOBBUFFET); PLAYER(SPECIES_WYNAUT); - OPPONENT(SPECIES_GOLISOPOD) { Ability(ABILITY_EMERGENCY_EXIT); MaxHP(263); HP(262); }; + OPPONENT(SPECIES_GOLISOPOD) { Ability(ABILITY_EMERGENCY_EXIT); MaxHP(263); HP(262); } } WHEN { - TURN { MOVE(player, MOVE_SUPER_FANG);} + TURN { MOVE(player, MOVE_SUPER_FANG); } } SCENE { ANIMATION(ANIM_TYPE_MOVE, MOVE_SUPER_FANG, player); HP_BAR(opponent); @@ -166,9 +166,9 @@ WILD_BATTLE_TEST("Emergency Exit activates when taking residual damage and falli GIVEN { PLAYER(SPECIES_WOBBUFFET); PLAYER(SPECIES_WYNAUT); - OPPONENT(SPECIES_GOLISOPOD) { Ability(ABILITY_EMERGENCY_EXIT); MaxHP(263); HP(134); Status1(STATUS1_BURN); }; + OPPONENT(SPECIES_GOLISOPOD) { Ability(ABILITY_EMERGENCY_EXIT); MaxHP(263); HP(134); Status1(STATUS1_BURN); } } WHEN { - TURN { } + TURN {} } SCENE { HP_BAR(opponent); ABILITY_POPUP(opponent, ABILITY_EMERGENCY_EXIT); @@ -180,11 +180,11 @@ WILD_BATTLE_TEST("Emergency Exit activates when taking residual damage and falli WILD_BATTLE_TEST("Emergency Exit makes the player ran during wild battle") { GIVEN { - PLAYER(SPECIES_GOLISOPOD) { Ability(ABILITY_EMERGENCY_EXIT); MaxHP(263); HP(262); }; + PLAYER(SPECIES_GOLISOPOD) { Ability(ABILITY_EMERGENCY_EXIT); MaxHP(263); HP(262); } PLAYER(SPECIES_WYNAUT); OPPONENT(SPECIES_WOBBUFFET); } WHEN { - TURN { MOVE(opponent, MOVE_SUPER_FANG);} + TURN { MOVE(opponent, MOVE_SUPER_FANG); } } SCENE { ANIMATION(ANIM_TYPE_MOVE, MOVE_SUPER_FANG, opponent); HP_BAR(player); @@ -197,11 +197,11 @@ WILD_BATTLE_TEST("Emergency Exit makes the player ran during wild battle") WILD_BATTLE_TEST("Emergency Exit activates when taking residual damage and falling under 50% max-hp (wild battle player side)") { GIVEN { - PLAYER(SPECIES_GOLISOPOD) { Ability(ABILITY_EMERGENCY_EXIT); MaxHP(263); HP(134); }; + PLAYER(SPECIES_GOLISOPOD) { Ability(ABILITY_EMERGENCY_EXIT); MaxHP(263); HP(134); } PLAYER(SPECIES_WYNAUT); OPPONENT(SPECIES_WOBBUFFET); } WHEN { - TURN { MOVE(opponent, MOVE_SANDSTORM);} + TURN { MOVE(opponent, MOVE_SANDSTORM); } } SCENE { HP_BAR(player); ABILITY_POPUP(player, ABILITY_EMERGENCY_EXIT); diff --git a/test/battle/ability/frisk.c b/test/battle/ability/frisk.c index e20d2f5205..b39f53c481 100644 --- a/test/battle/ability/frisk.c +++ b/test/battle/ability/frisk.c @@ -4,12 +4,12 @@ DOUBLE_BATTLE_TEST("Frisk does not trigger when Pokémon hold no items") { GIVEN { - PLAYER(SPECIES_FURRET) { Ability(ABILITY_FRISK); }; - PLAYER(SPECIES_FURRET) { Ability(ABILITY_FRISK); }; - OPPONENT(SPECIES_SENTRET) { Ability(ABILITY_FRISK); }; - OPPONENT(SPECIES_SENTRET) { Ability(ABILITY_FRISK); }; + PLAYER(SPECIES_FURRET) { Ability(ABILITY_FRISK); } + PLAYER(SPECIES_FURRET) { Ability(ABILITY_FRISK); } + OPPONENT(SPECIES_SENTRET) { Ability(ABILITY_FRISK); } + OPPONENT(SPECIES_SENTRET) { Ability(ABILITY_FRISK); } } WHEN { - TURN { ; } + TURN {} } SCENE { NONE_OF { ABILITY_POPUP(playerLeft, ABILITY_FRISK); @@ -23,10 +23,10 @@ DOUBLE_BATTLE_TEST("Frisk does not trigger when Pokémon hold no items") SINGLE_BATTLE_TEST("Frisk triggers in a Single Battle") { GIVEN { - PLAYER(SPECIES_FURRET) { Ability(ABILITY_FRISK); Item(ITEM_POTION); }; - OPPONENT(SPECIES_SENTRET) { Ability(ABILITY_FRISK); Item(ITEM_POTION); }; + PLAYER(SPECIES_FURRET) { Ability(ABILITY_FRISK); Item(ITEM_POTION); } + OPPONENT(SPECIES_SENTRET) { Ability(ABILITY_FRISK); Item(ITEM_POTION); } } WHEN { - TURN { ; } + TURN {} } SCENE { ABILITY_POPUP(player, ABILITY_FRISK); MESSAGE("Furret frisked the opposing Sentret and found its Potion!"); @@ -45,7 +45,7 @@ DOUBLE_BATTLE_TEST("Frisk triggers for player in a Double Battle after switching ASSUME(!IsBattleMoveStatus(MOVE_POUND)); PLAYER(SPECIES_WOBBUFFET) { HP(1); } PLAYER(SPECIES_WOBBUFFET) { HP(1); } - PLAYER(SPECIES_FURRET) { Ability(ABILITY_FRISK); }; + PLAYER(SPECIES_FURRET) { Ability(ABILITY_FRISK); } OPPONENT(SPECIES_WYNAUT) { Item(ITEM_POTION); } OPPONENT(SPECIES_WYNAUT); } WHEN { @@ -70,7 +70,7 @@ DOUBLE_BATTLE_TEST("Frisk triggers for opponent in a Double Battle after switchi PLAYER(SPECIES_WYNAUT); OPPONENT(SPECIES_WOBBUFFET) { HP(1); } OPPONENT(SPECIES_WOBBUFFET) { HP(1); } - OPPONENT(SPECIES_FURRET) { Ability(ABILITY_FRISK); }; + OPPONENT(SPECIES_FURRET) { Ability(ABILITY_FRISK); } } WHEN { TURN { MOVE(playerLeft, MOVE_POUND, target: target); SEND_OUT(target, 2); } } SCENE { diff --git a/test/battle/ability/gale_wings.c b/test/battle/ability/gale_wings.c index be82da81d4..cc40d98b87 100644 --- a/test/battle/ability/gale_wings.c +++ b/test/battle/ability/gale_wings.c @@ -11,8 +11,8 @@ SINGLE_BATTLE_TEST("Gale Wings only grants priority at full HP (Gen 7+)") GIVEN { WITH_CONFIG(CONFIG_GALE_WINGS, config); ASSUME(GetMoveType(MOVE_AERIAL_ACE) == TYPE_FLYING); - PLAYER(SPECIES_TALONFLAME) { Ability(ABILITY_GALE_WINGS); HP(hp); MaxHP(100); Speed(1);} - OPPONENT(SPECIES_WOBBUFFET) { Speed(100);}; + PLAYER(SPECIES_TALONFLAME) { Ability(ABILITY_GALE_WINGS); HP(hp); MaxHP(100); Speed(1); } + OPPONENT(SPECIES_WOBBUFFET) { Speed(100); } } WHEN { TURN { MOVE(player, MOVE_AERIAL_ACE); } } SCENE { @@ -35,8 +35,8 @@ SINGLE_BATTLE_TEST("Gale Wings only grants priority to Flying-type moves") GIVEN { ASSUME(GetMoveType(MOVE_AERIAL_ACE) == TYPE_FLYING); ASSUME(GetMoveType(MOVE_FLARE_BLITZ) == TYPE_FIRE); - PLAYER(SPECIES_TALONFLAME) { Ability(ABILITY_GALE_WINGS); HP(100); MaxHP(100); Speed(1);} - OPPONENT(SPECIES_WOBBUFFET) { Speed(100);}; + PLAYER(SPECIES_TALONFLAME) { Ability(ABILITY_GALE_WINGS); HP(100); MaxHP(100); Speed(1); } + OPPONENT(SPECIES_WOBBUFFET) { Speed(100); } } WHEN { TURN { MOVE(player, move); } } SCENE { @@ -68,7 +68,7 @@ SINGLE_BATTLE_TEST("Gale Wings doesn't increase priority of Flying-type Natural ASSUME(gItemsInfo[ITEM_SKY_PLATE].secondaryId == TYPE_FLYING); ASSUME(gNaturalGiftTable[ITEM_TO_BERRY(ITEM_LUM_BERRY)].type == TYPE_FLYING); OPPONENT(SPECIES_TALONFLAME) { Ability(ABILITY_GALE_WINGS); Speed(1); Item(heldItem); HPIV(31); AttackIV(3); DefenseIV(31); SpAttackIV(30); SpDefenseIV(30); SpeedIV(30); TeraType(TYPE_FLYING); } - PLAYER(SPECIES_WOBBUFFET) { Speed(100); }; + PLAYER(SPECIES_WOBBUFFET) { Speed(100); } } WHEN { TURN { MOVE(opponent, move); } } SCENE { diff --git a/test/battle/ability/grim_neigh.c b/test/battle/ability/grim_neigh.c index bb212e589b..2fe20473df 100644 --- a/test/battle/ability/grim_neigh.c +++ b/test/battle/ability/grim_neigh.c @@ -15,7 +15,7 @@ DOUBLE_BATTLE_TEST("Grim Neigh raises Sp. Attack by one stage after directly cau OPPONENT(SPECIES_ABRA) { HP(1); } OPPONENT(SPECIES_ABRA); } WHEN { - TURN { MOVE(playerLeft, MOVE_DISCHARGE); SEND_OUT(opponentLeft, 2); } + TURN { MOVE(playerLeft, MOVE_DISCHARGE); SEND_OUT(opponentLeft, 2); } } SCENE { ANIMATION(ANIM_TYPE_MOVE, MOVE_DISCHARGE, playerLeft); MESSAGE("The opposing Glalie fainted!"); @@ -45,7 +45,7 @@ DOUBLE_BATTLE_TEST("Grim Neigh does not trigger if Pokemon faint to indirect dam OPPONENT(SPECIES_ABRA) { HP(1); } OPPONENT(SPECIES_ABRA); } WHEN { - TURN { MOVE(playerRight, MOVE_QUICK_ATTACK, target: opponentRight); SEND_OUT(opponentLeft, 2); } + TURN { MOVE(playerRight, MOVE_QUICK_ATTACK, target: opponentRight); SEND_OUT(opponentLeft, 2); } } SCENE { int i; diff --git a/test/battle/ability/healer.c b/test/battle/ability/healer.c index 6a113f407b..93422ed8a0 100644 --- a/test/battle/ability/healer.c +++ b/test/battle/ability/healer.c @@ -18,7 +18,7 @@ DOUBLE_BATTLE_TEST("Healer cures adjacent ally's status condition 30% of the tim OPPONENT(SPECIES_WOBBUFFET) { Status1(status); } OPPONENT(SPECIES_CHANSEY) { Ability(ABILITY_HEALER); } } WHEN { - TURN { } + TURN {} } SCENE { MESSAGE("The opposing Chansey's Healer cured the opposing Wobbuffet's problem!"); } diff --git a/test/battle/ability/hospitality.c b/test/battle/ability/hospitality.c index 2c89c3eb97..925c7b6ce1 100644 --- a/test/battle/ability/hospitality.c +++ b/test/battle/ability/hospitality.c @@ -14,7 +14,7 @@ DOUBLE_BATTLE_TEST("Hospitality user restores 25% of ally's health") OPPONENT(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { - TURN { } + TURN {} } SCENE { if (health == 75) { ABILITY_POPUP(playerLeft, ABILITY_HOSPITALITY); @@ -72,8 +72,8 @@ DOUBLE_BATTLE_TEST("Hospitality ignores Substitute") DOUBLE_BATTLE_TEST("Hospitality does not trigger if there is no ally on the field") { GIVEN { - PLAYER(SPECIES_WOBBUFFET) { HP(1); } - PLAYER(SPECIES_WOBBUFFET) { HP(1); } + PLAYER(SPECIES_WOBBUFFET) { HP(1); } + PLAYER(SPECIES_WOBBUFFET) { HP(1); } PLAYER(SPECIES_POLTCHAGEIST) { Ability(ABILITY_HOSPITALITY); } OPPONENT(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); diff --git a/test/battle/ability/hunger_switch.c b/test/battle/ability/hunger_switch.c index 469cf02d3c..0c2dc8a533 100644 --- a/test/battle/ability/hunger_switch.c +++ b/test/battle/ability/hunger_switch.c @@ -42,7 +42,7 @@ SINGLE_BATTLE_TEST("Hunger Switch does not switch Morpeko's form when Terastalli PLAYER(SPECIES_MORPEKO) { Ability(ABILITY_HUNGER_SWITCH); TeraType(TYPE_NORMAL); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { - TURN { } + TURN {} TURN { MOVE(player, MOVE_SCRATCH, gimmick: GIMMICK_TERA); } } SCENE { ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_FORM_CHANGE, player); @@ -59,7 +59,7 @@ SINGLE_BATTLE_TEST("Hunger Switch does not switch Morpeko's form after switching PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { - TURN { } + TURN {} TURN { MOVE(player, MOVE_SCRATCH, gimmick: GIMMICK_TERA); MOVE(opponent, MOVE_ROAR); } TURN { SWITCH(player, 0); } } SCENE { diff --git a/test/battle/ability/illusion.c b/test/battle/ability/illusion.c index efa80cdafe..46d99c7741 100644 --- a/test/battle/ability/illusion.c +++ b/test/battle/ability/illusion.c @@ -13,7 +13,7 @@ SINGLE_BATTLE_TEST("Illusion can only imitate Normal Form terapagos") // Switch to Terapagos which enters Terastal Form TURN { SWITCH(player, 1); } // Switch back to Zoroark, should not be Terastal Terapagos - TURN { SWITCH(player, 0); MOVE(opponent, MOVE_SCRATCH);} + TURN { SWITCH(player, 0); MOVE(opponent, MOVE_SCRATCH); } // Switch back to Terapagos TURN { SWITCH(player, 1); } // Terapagos Stellar, Zoroark gets Roared in, should not be Stellar Terapagos @@ -77,7 +77,7 @@ SINGLE_BATTLE_TEST("Illusion breaks in Neutralizing Gas") PLAYER(SPECIES_WYNAUT); OPPONENT(SPECIES_WEEZING) { Ability(ABILITY_NEUTRALIZING_GAS); } } WHEN { - TURN { } + TURN {} } SCENE { ABILITY_POPUP(opponent, ABILITY_NEUTRALIZING_GAS); ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_ILLUSION_OFF, player); @@ -117,12 +117,12 @@ SINGLE_BATTLE_TEST("Illusion breaks if user loses Illusion due to Worry Seed") SINGLE_BATTLE_TEST("Illusion breaks when attacked behind a substitute") { GIVEN { - PLAYER(SPECIES_DRAGAPULT) {Ability(ABILITY_INFILTRATOR); Speed(1);}; - OPPONENT(SPECIES_WOBBUFFET) {Speed(2);}; - OPPONENT(SPECIES_ZOROARK) {Speed(2);}; - OPPONENT(SPECIES_WYNAUT) {Speed(2);}; + PLAYER(SPECIES_DRAGAPULT) { Ability(ABILITY_INFILTRATOR); Speed(1); } + OPPONENT(SPECIES_WOBBUFFET) { Speed(2); } + OPPONENT(SPECIES_ZOROARK) { Speed(2); } + OPPONENT(SPECIES_WYNAUT) { Speed(2); } } WHEN { - TURN { MOVE(player, MOVE_TACKLE); MOVE(opponent, MOVE_SHED_TAIL); SEND_OUT(opponent, 1);} + TURN { MOVE(player, MOVE_TACKLE); MOVE(opponent, MOVE_SHED_TAIL); SEND_OUT(opponent, 1); } } SCENE { ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_SWAP_FROM_SUBSTITUTE, opponent); ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_ILLUSION_OFF, opponent); diff --git a/test/battle/ability/innards_out.c b/test/battle/ability/innards_out.c index 516bde342e..87f730c1bb 100644 --- a/test/battle/ability/innards_out.c +++ b/test/battle/ability/innards_out.c @@ -75,7 +75,7 @@ SINGLE_BATTLE_TEST("Innards Out uses correct damage amount for Future Sight") OPPONENT(SPECIES_WYNAUT); } WHEN { TURN { MOVE(opponent, MOVE_FUTURE_SIGHT); } - TURN { } + TURN {} TURN { SEND_OUT(player, 1); } } SCENE { ANIMATION(ANIM_TYPE_MOVE, MOVE_FUTURE_SIGHT, opponent); diff --git a/test/battle/ability/inner_focus.c b/test/battle/ability/inner_focus.c index 7280725e88..ef0d8ea8a0 100644 --- a/test/battle/ability/inner_focus.c +++ b/test/battle/ability/inner_focus.c @@ -8,9 +8,9 @@ SINGLE_BATTLE_TEST("Inner Focus doesn't prevent intimidate (Gen3-7)") GIVEN { WITH_CONFIG(CONFIG_UPDATED_INTIMIDATE, GEN_7); - PLAYER(SPECIES_EKANS) { Ability(ABILITY_SHED_SKIN); }; - PLAYER(SPECIES_EKANS) { Ability(ABILITY_INTIMIDATE); }; - OPPONENT(SPECIES_ZUBAT) { Ability(ABILITY_INNER_FOCUS); }; + PLAYER(SPECIES_EKANS) { Ability(ABILITY_SHED_SKIN); } + PLAYER(SPECIES_EKANS) { Ability(ABILITY_INTIMIDATE); } + OPPONENT(SPECIES_ZUBAT) { Ability(ABILITY_INNER_FOCUS); } } WHEN { TURN { MOVE(opponent, MOVE_SCRATCH); } TURN { SWITCH(player, 1); MOVE(opponent, MOVE_SCRATCH); } @@ -35,9 +35,9 @@ SINGLE_BATTLE_TEST("Inner Focus prevents intimidate (Gen8+)") GIVEN { WITH_CONFIG(CONFIG_UPDATED_INTIMIDATE, GEN_8); - PLAYER(SPECIES_EKANS) { Ability(ABILITY_SHED_SKIN); }; - PLAYER(SPECIES_EKANS) { Ability(ABILITY_INTIMIDATE); }; - OPPONENT(SPECIES_ZUBAT) { Ability(ABILITY_INNER_FOCUS); }; + PLAYER(SPECIES_EKANS) { Ability(ABILITY_SHED_SKIN); } + PLAYER(SPECIES_EKANS) { Ability(ABILITY_INTIMIDATE); } + OPPONENT(SPECIES_ZUBAT) { Ability(ABILITY_INNER_FOCUS); } } WHEN { TURN { MOVE(opponent, MOVE_SCRATCH); } TURN { SWITCH(player, 1); MOVE(opponent, MOVE_SCRATCH); } @@ -58,7 +58,7 @@ SINGLE_BATTLE_TEST("Inner Focus prevents flinching") { GIVEN { PLAYER(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_ZUBAT) { Ability(ABILITY_INNER_FOCUS); }; + OPPONENT(SPECIES_ZUBAT) { Ability(ABILITY_INNER_FOCUS); } } WHEN { TURN { MOVE(player, MOVE_FAKE_OUT); MOVE(opponent, MOVE_SCRATCH); @@ -73,8 +73,8 @@ SINGLE_BATTLE_TEST("Inner Focus prevents flinching") SINGLE_BATTLE_TEST("Mold Breaker ignores Inner Focus") { GIVEN { - PLAYER(SPECIES_PINSIR) { Ability(ABILITY_MOLD_BREAKER); }; - OPPONENT(SPECIES_ZUBAT) { Ability(ABILITY_INNER_FOCUS); }; + PLAYER(SPECIES_PINSIR) { Ability(ABILITY_MOLD_BREAKER); } + OPPONENT(SPECIES_ZUBAT) { Ability(ABILITY_INNER_FOCUS); } } WHEN { TURN { MOVE(player, MOVE_FAKE_OUT); } } SCENE { diff --git a/test/battle/ability/intimidate.c b/test/battle/ability/intimidate.c index 0606938d45..443566cb76 100644 --- a/test/battle/ability/intimidate.c +++ b/test/battle/ability/intimidate.c @@ -171,7 +171,7 @@ DOUBLE_BATTLE_TEST("Intimidate activates on an empty slot") DOUBLE_BATTLE_TEST("Intimidate activates immediately after the mon was switched in as long as one opposing mon is alive") { GIVEN { - PLAYER(SPECIES_TAPU_KOKO) { Ability(ABILITY_ELECTRIC_SURGE); }; + PLAYER(SPECIES_TAPU_KOKO) { Ability(ABILITY_ELECTRIC_SURGE); } PLAYER(SPECIES_WOBBUFFET); PLAYER(SPECIES_EKANS) { Ability(ABILITY_INTIMIDATE); Item(ITEM_ELECTRIC_SEED); } OPPONENT(SPECIES_WYNAUT) { HP(1); } diff --git a/test/battle/ability/intrepid_sword.c b/test/battle/ability/intrepid_sword.c index f7c3705d44..2ea924fc26 100644 --- a/test/battle/ability/intrepid_sword.c +++ b/test/battle/ability/intrepid_sword.c @@ -7,7 +7,7 @@ SINGLE_BATTLE_TEST("Intrepid Sword raises Attack by one stage") PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_ZACIAN) { Ability(ABILITY_INTREPID_SWORD); } } WHEN { - TURN { } + TURN {} } SCENE { ABILITY_POPUP(opponent, ABILITY_INTREPID_SWORD); ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponent); @@ -122,9 +122,9 @@ SINGLE_BATTLE_TEST("Intrepid Sword and Dauntless Shield do not proc at max stage PLAYER(SPECIES_ZACIAN) { Ability(ABILITY_INTREPID_SWORD); } OPPONENT(SPECIES_ZAMAZENTA) { Ability(ABILITY_DAUNTLESS_SHIELD); } } WHEN { - TURN { MOVE(player, MOVE_IRON_DEFENSE); MOVE(opponent, MOVE_SWORDS_DANCE);} - TURN { MOVE(player, MOVE_IRON_DEFENSE); MOVE(opponent, MOVE_SWORDS_DANCE);} - TURN { MOVE(player, MOVE_IRON_DEFENSE); MOVE(opponent, MOVE_SWORDS_DANCE);} + TURN { MOVE(player, MOVE_IRON_DEFENSE); MOVE(opponent, MOVE_SWORDS_DANCE); } + TURN { MOVE(player, MOVE_IRON_DEFENSE); MOVE(opponent, MOVE_SWORDS_DANCE); } + TURN { MOVE(player, MOVE_IRON_DEFENSE); MOVE(opponent, MOVE_SWORDS_DANCE); } TURN { MOVE(player, MOVE_SKILL_SWAP); } } SCENE { NONE_OF { @@ -145,10 +145,10 @@ SINGLE_BATTLE_TEST("Intrepid Sword and Dauntless Shield do not proc at max stage OPPONENT(SPECIES_WOBBUFFET); OPPONENT(SPECIES_ZACIAN) { Ability(ABILITY_INTREPID_SWORD); } } WHEN { - TURN { MOVE(player, MOVE_IRON_DEFENSE); MOVE(opponent, MOVE_SWORDS_DANCE);} - TURN { MOVE(player, MOVE_IRON_DEFENSE); MOVE(opponent, MOVE_SWORDS_DANCE);} - TURN { MOVE(player, MOVE_IRON_DEFENSE); MOVE(opponent, MOVE_SWORDS_DANCE);} - TURN { MOVE(player, MOVE_BATON_PASS); MOVE(opponent, MOVE_BATON_PASS); SEND_OUT(player, 1); SEND_OUT(opponent, 1);} + TURN { MOVE(player, MOVE_IRON_DEFENSE); MOVE(opponent, MOVE_SWORDS_DANCE); } + TURN { MOVE(player, MOVE_IRON_DEFENSE); MOVE(opponent, MOVE_SWORDS_DANCE); } + TURN { MOVE(player, MOVE_IRON_DEFENSE); MOVE(opponent, MOVE_SWORDS_DANCE); } + TURN { MOVE(player, MOVE_BATON_PASS); MOVE(opponent, MOVE_BATON_PASS); SEND_OUT(player, 1); SEND_OUT(opponent, 1); } } SCENE { NONE_OF { ABILITY_POPUP(player, ABILITY_DAUNTLESS_SHIELD); diff --git a/test/battle/ability/magic_guard.c b/test/battle/ability/magic_guard.c index adcfdfc5ac..7c080c1fa5 100644 --- a/test/battle/ability/magic_guard.c +++ b/test/battle/ability/magic_guard.c @@ -23,7 +23,7 @@ SINGLE_BATTLE_TEST("Magic Guard ignores immobilization that can be caused by par else PASSES_RANDOMLY(75, 100, RNG_PARALYSIS); GIVEN { - PLAYER(SPECIES_CLEFABLE) { Ability(ABILITY_MAGIC_GUARD); Status1(STATUS1_PARALYSIS);} + PLAYER(SPECIES_CLEFABLE) { Ability(ABILITY_MAGIC_GUARD); Status1(STATUS1_PARALYSIS); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(player, MOVE_CELEBRATE); } @@ -35,10 +35,10 @@ SINGLE_BATTLE_TEST("Magic Guard ignores immobilization that can be caused by par SINGLE_BATTLE_TEST("Magic Guard does not ignore speed stat changes caused by paralysis") { GIVEN { - PLAYER(SPECIES_CLEFABLE) { Speed(100); Ability(ABILITY_MAGIC_GUARD); Status1(STATUS1_PARALYSIS);} + PLAYER(SPECIES_CLEFABLE) { Speed(100); Ability(ABILITY_MAGIC_GUARD); Status1(STATUS1_PARALYSIS); } OPPONENT(SPECIES_WOBBUFFET) { Speed(99); } } WHEN { - TURN { } + TURN {} } SCENE { ANIMATION(ANIM_TYPE_MOVE, MOVE_CELEBRATE, opponent); ANIMATION(ANIM_TYPE_MOVE, MOVE_CELEBRATE, player); diff --git a/test/battle/ability/mimicry.c b/test/battle/ability/mimicry.c index 5cdea7276f..ff65ebaa12 100644 --- a/test/battle/ability/mimicry.c +++ b/test/battle/ability/mimicry.c @@ -53,7 +53,7 @@ SINGLE_BATTLE_TEST("Mimicry restores the battler's types when terrain is removed GIVEN { ASSUME(GetSpeciesType(SPECIES_STUNFISK_GALAR, 0) == TYPE_GROUND); ASSUME(GetSpeciesType(SPECIES_STUNFISK_GALAR, 1) == TYPE_STEEL); - PLAYER(SPECIES_WOBBUFFET); + PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_STUNFISK_GALAR) { Ability(ABILITY_MIMICRY); } } WHEN { TURN { MOVE(opponent, terrainMove); MOVE(player, removeTerrainMove); } diff --git a/test/battle/ability/minds_eye.c b/test/battle/ability/minds_eye.c index 4ac339d899..2bc17b93d1 100644 --- a/test/battle/ability/minds_eye.c +++ b/test/battle/ability/minds_eye.c @@ -8,7 +8,7 @@ SINGLE_BATTLE_TEST("Mind's Eye allows to hit Ghost-type Pokémon with Normal- an PARAMETRIZE { move = MOVE_KARATE_CHOP; } GIVEN { - PLAYER(SPECIES_WOBBUFFET) { Ability(ABILITY_MINDS_EYE); }; + PLAYER(SPECIES_WOBBUFFET) { Ability(ABILITY_MINDS_EYE); } OPPONENT(SPECIES_GASTLY); } WHEN { TURN { MOVE(player, move); } @@ -26,8 +26,8 @@ SINGLE_BATTLE_TEST("Mind's Eye doesn't bypass a Ghost-type's Wonder Guard") PARAMETRIZE { move = MOVE_KARATE_CHOP; } GIVEN { - PLAYER(SPECIES_WOBBUFFET) { Ability(ABILITY_SCRAPPY); }; - OPPONENT(SPECIES_SHEDINJA) { Ability(ABILITY_WONDER_GUARD); }; + PLAYER(SPECIES_WOBBUFFET) { Ability(ABILITY_SCRAPPY); } + OPPONENT(SPECIES_SHEDINJA) { Ability(ABILITY_WONDER_GUARD); } } WHEN { TURN { MOVE(player, move); } } SCENE { diff --git a/test/battle/ability/mirror_armor.c b/test/battle/ability/mirror_armor.c index 771df02699..786ac6eaa8 100644 --- a/test/battle/ability/mirror_armor.c +++ b/test/battle/ability/mirror_armor.c @@ -13,7 +13,7 @@ SINGLE_BATTLE_TEST("Mirror Armor lowers a stat of the attacking Pokémon") PARAMETRIZE { move = MOVE_FAKE_TEARS; statId = STAT_SPDEF; } GIVEN { - PLAYER(SPECIES_CORVIKNIGHT) {Ability(ABILITY_MIRROR_ARMOR);} + PLAYER(SPECIES_CORVIKNIGHT) { Ability(ABILITY_MIRROR_ARMOR); } OPPONENT(SPECIES_WYNAUT); } WHEN { TURN { MOVE(opponent, move); } @@ -129,8 +129,8 @@ SINGLE_BATTLE_TEST("Mirror Armor doesn't lower the stats of an attacking Pokemon SINGLE_BATTLE_TEST("Mirror Armor raises the stat of an attacking Pokemon with Contrary") { GIVEN { - PLAYER(SPECIES_CORVIKNIGHT) {Ability(ABILITY_MIRROR_ARMOR);} - OPPONENT(SPECIES_SHUCKLE) {Ability(ABILITY_CONTRARY);} + PLAYER(SPECIES_CORVIKNIGHT) { Ability(ABILITY_MIRROR_ARMOR); } + OPPONENT(SPECIES_SHUCKLE) { Ability(ABILITY_CONTRARY); } } WHEN { TURN { MOVE(opponent, MOVE_LEER); } } SCENE { @@ -147,7 +147,7 @@ SINGLE_BATTLE_TEST("Mirror Armor raises the stat of an attacking Pokemon with Co SINGLE_BATTLE_TEST("Mirror Armor doesn't lower the stat of the attacking Pokemon if it is already at -6") { GIVEN { - PLAYER(SPECIES_CORVIKNIGHT) {Ability(ABILITY_MIRROR_ARMOR);} + PLAYER(SPECIES_CORVIKNIGHT) { Ability(ABILITY_MIRROR_ARMOR); } OPPONENT(SPECIES_WYNAUT); } WHEN { TURN { MOVE(player, MOVE_SCREECH); } @@ -177,15 +177,15 @@ DOUBLE_BATTLE_TEST("Mirror Armor lowers Speed of the partner Pokemon after Court ASSUME(GetMoveEffect(MOVE_COURT_CHANGE) == EFFECT_COURT_CHANGE); PLAYER(SPECIES_WOBBUFFET); PLAYER(SPECIES_WOBBUFFET); - PLAYER(SPECIES_CORVIKNIGHT) {Ability(ABILITY_MIRROR_ARMOR); Item(ITEM_IRON_BALL); } + PLAYER(SPECIES_CORVIKNIGHT) { Ability(ABILITY_MIRROR_ARMOR); Item(ITEM_IRON_BALL); } OPPONENT(SPECIES_WYNAUT); OPPONENT(SPECIES_WYNAUT); OPPONENT(SPECIES_WYNAUT); } WHEN { TURN { MOVE(playerLeft, MOVE_STICKY_WEB); } TURN { MOVE(opponentLeft, MOVE_COURT_CHANGE); } - TURN { SWITCH(playerRight, 2);} - TURN { } + TURN { SWITCH(playerRight, 2); } + TURN {} } SCENE { MESSAGE("Wobbuffet used Sticky Web!"); MESSAGE("The opposing Wynaut used Court Change!"); diff --git a/test/battle/ability/moody.c b/test/battle/ability/moody.c index 739bee6d01..ca04ec1f70 100644 --- a/test/battle/ability/moody.c +++ b/test/battle/ability/moody.c @@ -15,7 +15,7 @@ SINGLE_BATTLE_TEST("Moody randomly raises the user's Attack, Defense, Sp. Atk, S PLAYER(SPECIES_OCTILLERY) { Ability(ABILITY_MOODY); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { - TURN { } + TURN {} } SCENE { ABILITY_POPUP(player, ABILITY_MOODY); ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, player); @@ -40,7 +40,7 @@ SINGLE_BATTLE_TEST("Moody randomly lowers the user's Attack, Defense, Sp. Atk, S PLAYER(SPECIES_OCTILLERY) { Ability(ABILITY_MOODY); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { - TURN { } + TURN {} } SCENE { ABILITY_POPUP(player, ABILITY_MOODY); ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, player); @@ -64,7 +64,7 @@ SINGLE_BATTLE_TEST("Moody randomly raises the holder's Attack, Defense, Sp. Atk, PLAYER(SPECIES_OCTILLERY) { Ability(ABILITY_MOODY); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { - TURN { } + TURN {} } SCENE { ABILITY_POPUP(player, ABILITY_MOODY); ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, player); diff --git a/test/battle/ability/moxie.c b/test/battle/ability/moxie.c index 01eb51b9e7..0903c24db0 100644 --- a/test/battle/ability/moxie.c +++ b/test/battle/ability/moxie.c @@ -16,7 +16,7 @@ DOUBLE_BATTLE_TEST("Moxie/Chilling Neigh raises Attack by one stage after direct OPPONENT(SPECIES_ABRA) { HP(1); } OPPONENT(SPECIES_ABRA); } WHEN { - TURN { MOVE(playerLeft, MOVE_EARTHQUAKE); SEND_OUT(opponentLeft, 2); } + TURN { MOVE(playerLeft, MOVE_EARTHQUAKE); SEND_OUT(opponentLeft, 2); } } SCENE { ANIMATION(ANIM_TYPE_MOVE, MOVE_EARTHQUAKE, playerLeft); MESSAGE("The opposing Glalie fainted!"); @@ -49,7 +49,7 @@ DOUBLE_BATTLE_TEST("Moxie/Chilling Neigh does not trigger if Pokemon faint to in OPPONENT(SPECIES_ABRA) { HP(1); } OPPONENT(SPECIES_ABRA); } WHEN { - TURN { MOVE(playerRight, MOVE_QUICK_ATTACK, target: opponentRight); SEND_OUT(opponentLeft, 2); } + TURN { MOVE(playerRight, MOVE_QUICK_ATTACK, target: opponentRight); SEND_OUT(opponentLeft, 2); } } SCENE { int i; diff --git a/test/battle/ability/mummy.c b/test/battle/ability/mummy.c index 990fba7a0d..ea1b0363da 100644 --- a/test/battle/ability/mummy.c +++ b/test/battle/ability/mummy.c @@ -7,7 +7,7 @@ SINGLE_BATTLE_TEST("Mummy/Lingering Aroma replace the attacker's ability on cont enum Ability ability; PARAMETRIZE { move = MOVE_AQUA_JET; ability = ABILITY_MUMMY; species = SPECIES_YAMASK; } - PARAMETRIZE { move = MOVE_WATER_GUN; ability = ABILITY_MUMMY; species = SPECIES_YAMASK;} + PARAMETRIZE { move = MOVE_WATER_GUN; ability = ABILITY_MUMMY; species = SPECIES_YAMASK; } PARAMETRIZE { move = MOVE_AQUA_JET; ability = ABILITY_LINGERING_AROMA; species = SPECIES_OINKOLOGNE; } PARAMETRIZE { move = MOVE_WATER_GUN; ability = ABILITY_LINGERING_AROMA; species = SPECIES_OINKOLOGNE; } GIVEN { diff --git a/test/battle/ability/mycelium_might.c b/test/battle/ability/mycelium_might.c index 7ffac1c641..e5a8b569e1 100644 --- a/test/battle/ability/mycelium_might.c +++ b/test/battle/ability/mycelium_might.c @@ -34,7 +34,7 @@ SINGLE_BATTLE_TEST("Mycelium Might ignores opposing abilities") { GIVEN { PLAYER(SPECIES_TOEDSCOOL) { Speed(100); Ability(ABILITY_MYCELIUM_MIGHT); } - OPPONENT(SPECIES_BELDUM) { Speed(1); Ability(ABILITY_CLEAR_BODY);} + OPPONENT(SPECIES_BELDUM) { Speed(1); Ability(ABILITY_CLEAR_BODY); } } WHEN { TURN { MOVE(opponent, MOVE_CELEBRATE); MOVE(player, MOVE_SCREECH); } } SCENE { @@ -51,7 +51,7 @@ SINGLE_BATTLE_TEST("Mycelium Might vs Stall action order depends on speed") PARAMETRIZE { speed = 101; } GIVEN { PLAYER(SPECIES_TOEDSCOOL) { Speed(100); Ability(ABILITY_MYCELIUM_MIGHT); } - OPPONENT(SPECIES_SABLEYE) { Speed(speed); Ability(ABILITY_STALL);} + OPPONENT(SPECIES_SABLEYE) { Speed(speed); Ability(ABILITY_STALL); } } WHEN { TURN { MOVE(opponent, MOVE_CELEBRATE); MOVE(player, MOVE_CELEBRATE); } } SCENE { diff --git a/test/battle/ability/neutralizing_gas.c b/test/battle/ability/neutralizing_gas.c index 02f7323af2..9a28bff8f2 100644 --- a/test/battle/ability/neutralizing_gas.c +++ b/test/battle/ability/neutralizing_gas.c @@ -7,7 +7,7 @@ SINGLE_BATTLE_TEST("Neutralizing Gas activates on switch-in") PLAYER(SPECIES_WEEZING) { Ability(ABILITY_NEUTRALIZING_GAS); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { - TURN { } + TURN {} } SCENE { ABILITY_POPUP(player, ABILITY_NEUTRALIZING_GAS); MESSAGE("Neutralizing gas filled the area!"); @@ -20,7 +20,7 @@ SINGLE_BATTLE_TEST("Neutralizing Gas prevents opponent's switch-in ability from PLAYER(SPECIES_WEEZING) { Ability(ABILITY_NEUTRALIZING_GAS); } OPPONENT(SPECIES_ZEKROM) { Ability(ABILITY_TERAVOLT); } } WHEN { - TURN { } + TURN {} } SCENE { ABILITY_POPUP(player, ABILITY_NEUTRALIZING_GAS); NONE_OF { @@ -38,7 +38,7 @@ DOUBLE_BATTLE_TEST("Neutralizing Gas prevents ally's switch-in ability from acti OPPONENT(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { - TURN { } + TURN {} } SCENE { ABILITY_POPUP(playerLeft, ABILITY_NEUTRALIZING_GAS); NONE_OF { @@ -243,7 +243,7 @@ SINGLE_BATTLE_TEST("Neutralizing Gas prevents Trace from copying it") PLAYER(SPECIES_RALTS) { Ability(ABILITY_TRACE); } OPPONENT(SPECIES_WEEZING) { Ability(ABILITY_NEUTRALIZING_GAS); } } WHEN { - TURN { } + TURN {} } SCENE { ABILITY_POPUP(opponent, ABILITY_NEUTRALIZING_GAS); NONE_OF { diff --git a/test/battle/ability/normalize.c b/test/battle/ability/normalize.c index b50c46be09..24401c8e7f 100644 --- a/test/battle/ability/normalize.c +++ b/test/battle/ability/normalize.c @@ -17,7 +17,7 @@ SINGLE_BATTLE_TEST("Normalize turns a move into a Normal-type move") GIVEN { ASSUME(GetSpeciesType(SPECIES_GASTLY, 0) == TYPE_GHOST); PLAYER(SPECIES_GASTLY); - OPPONENT(SPECIES_SKITTY) { Ability(ability); Moves(MOVE_WATER_GUN);} + OPPONENT(SPECIES_SKITTY) { Ability(ability); Moves(MOVE_WATER_GUN); } } WHEN { TURN { MOVE(opponent, MOVE_WATER_GUN); } } SCENE { @@ -43,7 +43,7 @@ SINGLE_BATTLE_TEST("Normalize affects status moves") ASSUME(GetMoveType(MOVE_THUNDER_WAVE) == TYPE_ELECTRIC); ASSUME(GetSpeciesType(SPECIES_DRILBUR, 0) == TYPE_GROUND); PLAYER(SPECIES_DRILBUR); - OPPONENT(SPECIES_SKITTY) { Ability(ability); Moves(MOVE_THUNDER_WAVE);} + OPPONENT(SPECIES_SKITTY) { Ability(ability); Moves(MOVE_THUNDER_WAVE); } } WHEN { TURN { MOVE(opponent, MOVE_THUNDER_WAVE); } } SCENE { @@ -70,7 +70,7 @@ SINGLE_BATTLE_TEST("Normalize still makes Freeze-Dry do super effective damage t ASSUME(GetMoveEffect(MOVE_FREEZE_DRY) == EFFECT_SUPER_EFFECTIVE_ON_ARG); ASSUME(GetSpeciesType(SPECIES_MUDKIP, 0) == TYPE_WATER); PLAYER(SPECIES_MUDKIP); - OPPONENT(SPECIES_SKITTY) { Ability(ability); Moves(MOVE_FREEZE_DRY);} + OPPONENT(SPECIES_SKITTY) { Ability(ability); Moves(MOVE_FREEZE_DRY); } } WHEN { TURN { MOVE(opponent, MOVE_FREEZE_DRY); } } SCENE { diff --git a/test/battle/ability/opportunist.c b/test/battle/ability/opportunist.c index 6e5b13dd31..b78ebc96a0 100644 --- a/test/battle/ability/opportunist.c +++ b/test/battle/ability/opportunist.c @@ -218,7 +218,7 @@ DOUBLE_BATTLE_TEST("Opportunist copies the stat of each Pokémon that were raise OPPONENT(SPECIES_ZACIAN) { Ability(ABILITY_INTREPID_SWORD); } OPPONENT(SPECIES_ZACIAN) { Ability(ABILITY_INTREPID_SWORD); } } WHEN { - TURN { } + TURN {} } SCENE { ABILITY_POPUP(opponentLeft, ABILITY_INTREPID_SWORD); ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponentLeft); @@ -281,7 +281,7 @@ SINGLE_BATTLE_TEST("Opportunist and Mirror Herb stack stat increases") PLAYER(SPECIES_ZACIAN) { Ability(ABILITY_INTREPID_SWORD); } OPPONENT(SPECIES_ESPATHRA) { Ability(ABILITY_OPPORTUNIST); Item(ITEM_MIRROR_HERB); } } WHEN { - TURN { } + TURN {} } SCENE { ABILITY_POPUP(player, ABILITY_INTREPID_SWORD); ABILITY_POPUP(opponent, ABILITY_OPPORTUNIST); @@ -303,7 +303,7 @@ DOUBLE_BATTLE_TEST("Opportunist and Mirror Herb resolve correctly") OPPONENT(SPECIES_MEOWSCARADA) { Item(ITEM_MIRROR_HERB); } OPPONENT(SPECIES_ESPATHRA) { Ability(ABILITY_OPPORTUNIST); Item(ITEM_MIRROR_HERB); } } WHEN { - TURN { } + TURN {} } SCENE { ABILITY_POPUP(playerLeft, ABILITY_INTREPID_SWORD); ABILITY_POPUP(opponentRight, ABILITY_OPPORTUNIST); diff --git a/test/battle/ability/overcoat.c b/test/battle/ability/overcoat.c index b0e8984bec..7346691c46 100644 --- a/test/battle/ability/overcoat.c +++ b/test/battle/ability/overcoat.c @@ -78,8 +78,8 @@ SINGLE_BATTLE_TEST("Overcoat blocks Effect Spore's effect (Gen6+)") PARAMETRIZE { config = GEN_6; } GIVEN { WITH_CONFIG(CONFIG_POWDER_OVERCOAT, config); - PLAYER(SPECIES_PINECO) {Ability(ABILITY_OVERCOAT);} - OPPONENT(SPECIES_SHROOMISH) {Ability(ABILITY_EFFECT_SPORE);} + PLAYER(SPECIES_PINECO) { Ability(ABILITY_OVERCOAT); } + OPPONENT(SPECIES_SHROOMISH) { Ability(ABILITY_EFFECT_SPORE); } } WHEN { TURN { MOVE(player, MOVE_TACKLE, WITH_RNG(RNG_EFFECT_SPORE, 1)); } } SCENE { diff --git a/test/battle/ability/own_tempo.c b/test/battle/ability/own_tempo.c index c2b9f4d6d9..06b6f366ff 100644 --- a/test/battle/ability/own_tempo.c +++ b/test/battle/ability/own_tempo.c @@ -6,10 +6,10 @@ SINGLE_BATTLE_TEST("Own Tempo doesn't prevent Intimidate (Gen3-7)") GIVEN { WITH_CONFIG(CONFIG_UPDATED_INTIMIDATE, GEN_7); ASSUME(GetMoveEffect(MOVE_CONFUSE_RAY) == EFFECT_CONFUSE); - PLAYER(SPECIES_EKANS) { Ability(ABILITY_INTIMIDATE); }; - OPPONENT(SPECIES_SLOWPOKE) { Ability(ABILITY_OWN_TEMPO); }; + PLAYER(SPECIES_EKANS) { Ability(ABILITY_INTIMIDATE); } + OPPONENT(SPECIES_SLOWPOKE) { Ability(ABILITY_OWN_TEMPO); } } WHEN { - TURN { } + TURN {} } SCENE { ABILITY_POPUP(player, ABILITY_INTIMIDATE); NONE_OF { @@ -24,8 +24,8 @@ SINGLE_BATTLE_TEST("Own Tempo prevents Intimidate but no other stat down changes GIVEN { WITH_CONFIG(CONFIG_UPDATED_INTIMIDATE, GEN_8); ASSUME(GetMoveEffect(MOVE_CONFUSE_RAY) == EFFECT_CONFUSE); - PLAYER(SPECIES_EKANS) { Ability(ABILITY_INTIMIDATE); }; - OPPONENT(SPECIES_SLOWPOKE) { Ability(ABILITY_OWN_TEMPO); }; + PLAYER(SPECIES_EKANS) { Ability(ABILITY_INTIMIDATE); } + OPPONENT(SPECIES_SLOWPOKE) { Ability(ABILITY_OWN_TEMPO); } } WHEN { TURN { MOVE(player, MOVE_SCARY_FACE); } } SCENE { @@ -45,7 +45,7 @@ SINGLE_BATTLE_TEST("Own Tempo prevents confusion from moves by the opponent") GIVEN { ASSUME(GetMoveEffect(MOVE_CONFUSE_RAY) == EFFECT_CONFUSE); PLAYER(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_SLOWPOKE) { Ability(ABILITY_OWN_TEMPO); }; + OPPONENT(SPECIES_SLOWPOKE) { Ability(ABILITY_OWN_TEMPO); } } WHEN { TURN { MOVE(player, MOVE_CONFUSE_RAY); } } SCENE { @@ -59,7 +59,7 @@ SINGLE_BATTLE_TEST("Own Tempo prevents confusion from moves by the user") GIVEN { ASSUME(MoveHasAdditionalEffectSelf(MOVE_PETAL_DANCE, MOVE_EFFECT_THRASH)); PLAYER(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_SLOWPOKE) { Ability(ABILITY_OWN_TEMPO); }; + OPPONENT(SPECIES_SLOWPOKE) { Ability(ABILITY_OWN_TEMPO); } } WHEN { TURN { MOVE(opponent, MOVE_PETAL_DANCE); } TURN { MOVE(opponent, MOVE_PETAL_DANCE); } @@ -79,7 +79,7 @@ SINGLE_BATTLE_TEST("Mold Breaker ignores Own Tempo") GIVEN { ASSUME(GetMoveEffect(MOVE_CONFUSE_RAY) == EFFECT_CONFUSE); PLAYER(SPECIES_PINSIR) { Ability(ABILITY_MOLD_BREAKER); } - OPPONENT(SPECIES_SLOWPOKE) { Ability(ABILITY_OWN_TEMPO); }; + OPPONENT(SPECIES_SLOWPOKE) { Ability(ABILITY_OWN_TEMPO); } } WHEN { TURN { MOVE(player, MOVE_CONFUSE_RAY); } } SCENE { @@ -92,8 +92,8 @@ SINGLE_BATTLE_TEST("Mold Breaker does not prevent Own Tempo from curing confusio { GIVEN { ASSUME(GetMoveEffect(MOVE_CONFUSE_RAY) == EFFECT_CONFUSE); - PLAYER(SPECIES_PINSIR) { Ability(ABILITY_MOLD_BREAKER); }; - OPPONENT(SPECIES_SLOWPOKE) { Ability(ABILITY_OWN_TEMPO); }; + PLAYER(SPECIES_PINSIR) { Ability(ABILITY_MOLD_BREAKER); } + OPPONENT(SPECIES_SLOWPOKE) { Ability(ABILITY_OWN_TEMPO); } } WHEN { TURN { MOVE(player, MOVE_CONFUSE_RAY); } } SCENE { @@ -112,7 +112,7 @@ SINGLE_BATTLE_TEST("Own Tempo cures confusion if it's obtained via Skill Swap") GIVEN { ASSUME(GetMoveEffect(MOVE_CONFUSE_RAY) == EFFECT_CONFUSE); ASSUME(GetMoveEffect(MOVE_SKILL_SWAP) == EFFECT_SKILL_SWAP); - PLAYER(SPECIES_SLOWPOKE) { Ability(ABILITY_OWN_TEMPO); }; + PLAYER(SPECIES_SLOWPOKE) { Ability(ABILITY_OWN_TEMPO); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(player, MOVE_CONFUSE_RAY); } @@ -134,7 +134,7 @@ SINGLE_BATTLE_TEST("Own Tempo prevents confusion from items") GIVEN { ASSUME(gItemsInfo[ITEM_BERSERK_GENE].holdEffect == HOLD_EFFECT_BERSERK_GENE); PLAYER(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_SLOWPOKE) { Ability(ABILITY_OWN_TEMPO); Item(ITEM_BERSERK_GENE); }; + OPPONENT(SPECIES_SLOWPOKE) { Ability(ABILITY_OWN_TEMPO); Item(ITEM_BERSERK_GENE); } } WHEN { TURN { MOVE(opponent, MOVE_SCRATCH); } } SCENE { diff --git a/test/battle/ability/poison_heal.c b/test/battle/ability/poison_heal.c index 2ee7620c62..9d7acc38a8 100644 --- a/test/battle/ability/poison_heal.c +++ b/test/battle/ability/poison_heal.c @@ -28,8 +28,8 @@ SINGLE_BATTLE_TEST("Poison Heal heals from Toxic Poison damage are constant") PLAYER(SPECIES_SHROOMISH) { Ability(ABILITY_POISON_HEAL); Status1(STATUS1_TOXIC_POISON); HP(1), MaxHP(400); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { - TURN { } - TURN { } + TURN {} + TURN {} } SCENE { ABILITY_POPUP(player, ABILITY_POISON_HEAL); MESSAGE("The poisoning healed Shroomish a little bit!"); diff --git a/test/battle/ability/poison_puppeteer.c b/test/battle/ability/poison_puppeteer.c index db27691415..6956271236 100644 --- a/test/battle/ability/poison_puppeteer.c +++ b/test/battle/ability/poison_puppeteer.c @@ -54,7 +54,7 @@ SINGLE_BATTLE_TEST("Poison Puppeteer does not trigger if poison is Toxic Spikes OPPONENT(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { - TURN { MOVE(player, MOVE_TOXIC_SPIKES);} + TURN { MOVE(player, MOVE_TOXIC_SPIKES); } TURN { SWITCH(opponent, 1); } } SCENE { ANIMATION(ANIM_TYPE_MOVE, MOVE_TOXIC_SPIKES, player); diff --git a/test/battle/ability/poison_touch.c b/test/battle/ability/poison_touch.c index 6678394e6f..e3775d7427 100644 --- a/test/battle/ability/poison_touch.c +++ b/test/battle/ability/poison_touch.c @@ -58,7 +58,7 @@ SINGLE_BATTLE_TEST("Poison Touch applies between multi-hit move hits") ASSUME(MoveMakesContact(MOVE_ARM_THRUST)); ASSUME(gItemsInfo[ITEM_PECHA_BERRY].holdEffect == HOLD_EFFECT_CURE_PSN); PLAYER(SPECIES_GRIMER) { Ability(ABILITY_POISON_TOUCH); } - OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_PECHA_BERRY); }; + OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_PECHA_BERRY); } } WHEN { TURN { MOVE(player, MOVE_ARM_THRUST); } } SCENE { diff --git a/test/battle/ability/prankster.c b/test/battle/ability/prankster.c index 7e170570cf..0f1fcd0930 100644 --- a/test/battle/ability/prankster.c +++ b/test/battle/ability/prankster.c @@ -67,7 +67,7 @@ SINGLE_BATTLE_TEST("Prankster-affected moves called via Assist don't affect Dark WITH_CONFIG(CONFIG_PRANKSTER_DARK_TYPES, gen); PLAYER(SPECIES_UMBREON); OPPONENT(SPECIES_VOLBEAT) { Ability(ABILITY_PRANKSTER); } - OPPONENT(SPECIES_WOBBUFFET) { Moves(MOVE_CONFUSE_RAY); }; + OPPONENT(SPECIES_WOBBUFFET) { Moves(MOVE_CONFUSE_RAY); } } WHEN { TURN { MOVE(opponent, MOVE_ASSIST); } } SCENE { @@ -89,7 +89,7 @@ DOUBLE_BATTLE_TEST("Prankster-affected moves called via Instruct do not affect D GIVEN { WITH_CONFIG(CONFIG_PRANKSTER_DARK_TYPES, gen); PLAYER(SPECIES_VOLBEAT) { Speed(20); Ability(ABILITY_PRANKSTER); } - PLAYER(SPECIES_WOBBUFFET) { Speed(10);} + PLAYER(SPECIES_WOBBUFFET) { Speed(10); } OPPONENT(SPECIES_UMBREON) { Speed(15); } OPPONENT(SPECIES_WOBBUFFET) { Speed(1); } OPPONENT(SPECIES_UMBREON) { Speed(1); } @@ -134,7 +134,7 @@ DOUBLE_BATTLE_TEST("Moves called via Prankster-affected After you affect Dark-ty { GIVEN { PLAYER(SPECIES_VOLBEAT) { Speed(1); Ability(ABILITY_PRANKSTER); } - PLAYER(SPECIES_WOBBUFFET) { Speed(1);} + PLAYER(SPECIES_WOBBUFFET) { Speed(1); } OPPONENT(SPECIES_UMBREON) { Speed(10); } OPPONENT(SPECIES_WOBBUFFET) { Speed(10); } } WHEN { diff --git a/test/battle/ability/primordial_sea.c b/test/battle/ability/primordial_sea.c index a34eb97b5c..7cf8dee531 100644 --- a/test/battle/ability/primordial_sea.c +++ b/test/battle/ability/primordial_sea.c @@ -10,7 +10,7 @@ ASSUMPTIONS SINGLE_BATTLE_TEST("Primordial Sea blocks damaging Fire-type moves") { GIVEN { - PLAYER(SPECIES_KYOGRE) {Item(ITEM_BLUE_ORB);} + PLAYER(SPECIES_KYOGRE) { Item(ITEM_BLUE_ORB); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(opponent, MOVE_EMBER); } @@ -35,10 +35,10 @@ DOUBLE_BATTLE_TEST("Primordial Sea blocks damaging Fire-type moves and prints th ASSUME(!IsBattleMoveStatus(MOVE_ERUPTION)); ASSUME(GetMoveType(MOVE_ERUPTION) == TYPE_FIRE); ASSUME(GetMoveTarget(MOVE_ERUPTION) == MOVE_TARGET_BOTH); - PLAYER(SPECIES_KYOGRE) {Item(ITEM_BLUE_ORB); {Speed(5);}} - PLAYER(SPECIES_WOBBUFFET) {Speed(5);} - OPPONENT(SPECIES_WOBBUFFET) {Speed(10);} - OPPONENT(SPECIES_WOBBUFFET) {Speed(8);} + PLAYER(SPECIES_KYOGRE) { Item(ITEM_BLUE_ORB); Speed(5); } + PLAYER(SPECIES_WOBBUFFET) { Speed(5); } + OPPONENT(SPECIES_WOBBUFFET) { Speed(10); } + OPPONENT(SPECIES_WOBBUFFET) { Speed(8); } } WHEN { TURN { MOVE(opponentLeft, MOVE_ERUPTION); } } SCENE { @@ -55,8 +55,8 @@ DOUBLE_BATTLE_TEST("Primordial Sea blocks damaging Fire-type moves and prints th SINGLE_BATTLE_TEST("Primordial Sea does not block a move if Pokémon is asleep and uses a Fire-type move") // Sleep/confusion/paralysis all happen before the check for primal weather { GIVEN { - PLAYER(SPECIES_KYOGRE) {Item(ITEM_BLUE_ORB);} - OPPONENT(SPECIES_WOBBUFFET) {Status1(STATUS1_SLEEP);} + PLAYER(SPECIES_KYOGRE) { Item(ITEM_BLUE_ORB); } + OPPONENT(SPECIES_WOBBUFFET) { Status1(STATUS1_SLEEP); } } WHEN { TURN { MOVE(opponent, MOVE_EMBER); } } SCENE { diff --git a/test/battle/ability/protosynthesis.c b/test/battle/ability/protosynthesis.c index a080e90a11..aca8e6fbf9 100644 --- a/test/battle/ability/protosynthesis.c +++ b/test/battle/ability/protosynthesis.c @@ -61,7 +61,7 @@ SINGLE_BATTLE_TEST("Protosynthesis ability pop up activates only once during the GIVEN { WITH_CONFIG(CONFIG_ABILITY_WEATHER, GEN_6); PLAYER(SPECIES_WALKING_WAKE) { Ability(ABILITY_PROTOSYNTHESIS); } - OPPONENT(SPECIES_NINETALES) { Ability(ABILITY_DROUGHT); }; + OPPONENT(SPECIES_NINETALES) { Ability(ABILITY_DROUGHT); } } WHEN { for (turns = 0; turns < 5; turns++) TURN {} @@ -90,7 +90,7 @@ SINGLE_BATTLE_TEST("Protosynthesis activates on switch-in") GIVEN { PLAYER(SPECIES_WOBBUFFET); PLAYER(SPECIES_ROARING_MOON) { Ability(ABILITY_PROTOSYNTHESIS); } - OPPONENT(SPECIES_NINETALES) { Ability(ABILITY_DROUGHT); }; + OPPONENT(SPECIES_NINETALES) { Ability(ABILITY_DROUGHT); } } WHEN { TURN { SWITCH(player, 1); } } SCENE { @@ -113,7 +113,7 @@ SINGLE_BATTLE_TEST("Protosynthesis prioritizes stats in the case of a tie in the PLAYER(SPECIES_GREAT_TUSK) { Ability(ABILITY_PROTOSYNTHESIS); Attack(stats[0]); Defense(stats[1]); SpAttack(stats[2]); SpDefense(stats[3]); Speed(stats[4]); } OPPONENT(SPECIES_GROUDON) { Ability(ABILITY_DROUGHT); Speed(5); } } WHEN { - TURN { } + TURN {} } SCENE { ABILITY_POPUP(opponent, ABILITY_DROUGHT); ABILITY_POPUP(player, ABILITY_PROTOSYNTHESIS); @@ -176,7 +176,7 @@ SINGLE_BATTLE_TEST("Protosynthesis activates even if the Pokémon is holding an PLAYER(SPECIES_GREAT_TUSK) { Ability(ABILITY_PROTOSYNTHESIS); Item(ITEM_UTILITY_UMBRELLA); } OPPONENT(SPECIES_NINETALES) { Ability(ABILITY_DROUGHT); } } WHEN { - TURN { } + TURN {} } SCENE { ABILITY_POPUP(opponent, ABILITY_DROUGHT); ABILITY_POPUP(player, ABILITY_PROTOSYNTHESIS); diff --git a/test/battle/ability/purifying_salt.c b/test/battle/ability/purifying_salt.c index 80dc786117..df348752fb 100644 --- a/test/battle/ability/purifying_salt.c +++ b/test/battle/ability/purifying_salt.c @@ -40,7 +40,7 @@ SINGLE_BATTLE_TEST("Purifying Salt halves damage from dynamic Ghost-type moves", SINGLE_BATTLE_TEST("Purifying Salt makes Rest fail") { GIVEN { - PLAYER(SPECIES_GARGANACL) { Ability(ABILITY_PURIFYING_SALT); HP(1); MaxHP(100);} + PLAYER(SPECIES_GARGANACL) { Ability(ABILITY_PURIFYING_SALT); HP(1); MaxHP(100); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(player, MOVE_REST); } diff --git a/test/battle/ability/quark_drive.c b/test/battle/ability/quark_drive.c index 3523f7dca4..bdb8a26201 100644 --- a/test/battle/ability/quark_drive.c +++ b/test/battle/ability/quark_drive.c @@ -143,7 +143,7 @@ SINGLE_BATTLE_TEST("Quark Drive activates on switch-in") GIVEN { PLAYER(SPECIES_WOBBUFFET); PLAYER(SPECIES_IRON_MOTH) { Ability(ABILITY_QUARK_DRIVE); } - OPPONENT(SPECIES_TAPU_KOKO) { Ability(ABILITY_ELECTRIC_SURGE); }; + OPPONENT(SPECIES_TAPU_KOKO) { Ability(ABILITY_ELECTRIC_SURGE); } } WHEN { TURN { SWITCH(player, 1); } } SCENE { @@ -159,9 +159,9 @@ SINGLE_BATTLE_TEST("Quark Drive activates on Electric Terrain even if not ground GIVEN { ASSUME(GetSpeciesType(SPECIES_IRON_JUGULIS, 0) == TYPE_FLYING || GetSpeciesType(SPECIES_IRON_JUGULIS, 1) == TYPE_FLYING); PLAYER(SPECIES_IRON_JUGULIS) { Ability(ABILITY_QUARK_DRIVE); } - OPPONENT(SPECIES_TAPU_KOKO) { Ability(ABILITY_ELECTRIC_SURGE); }; + OPPONENT(SPECIES_TAPU_KOKO) { Ability(ABILITY_ELECTRIC_SURGE); } } WHEN { - TURN { } + TURN {} } SCENE { ABILITY_POPUP(opponent, ABILITY_ELECTRIC_SURGE); ABILITY_POPUP(player, ABILITY_QUARK_DRIVE); @@ -180,7 +180,7 @@ SINGLE_BATTLE_TEST("Quark Drive prioritizes stats in the case of a tie in the fo PLAYER(SPECIES_IRON_TREADS) { Ability(ABILITY_QUARK_DRIVE); Attack(stats[0]); Defense(stats[1]); SpAttack(stats[2]); SpDefense(stats[3]); Speed(stats[4]); } OPPONENT(SPECIES_TAPU_KOKO) { Ability(ABILITY_ELECTRIC_SURGE); Speed(5); } } WHEN { - TURN { } + TURN {} } SCENE { ABILITY_POPUP(opponent, ABILITY_ELECTRIC_SURGE); ABILITY_POPUP(player, ABILITY_QUARK_DRIVE); diff --git a/test/battle/ability/rattled.c b/test/battle/ability/rattled.c index e5e7b3b03e..485ce9daf0 100644 --- a/test/battle/ability/rattled.c +++ b/test/battle/ability/rattled.c @@ -21,8 +21,8 @@ SINGLE_BATTLE_TEST("Rattled boosts speed by 1 when hit by Bug, Dark or Ghost typ PARAMETRIZE { move = MOVE_SHADOW_PUNCH; } PARAMETRIZE { move = MOVE_SCRATCH; } GIVEN { - PLAYER(SPECIES_WOBBUFFET) {Speed(42) ;} - OPPONENT(SPECIES_SUDOWOODO) {Speed(40); Ability(ABILITY_RATTLED);} + PLAYER(SPECIES_WOBBUFFET) { Speed(42) ; } + OPPONENT(SPECIES_SUDOWOODO) { Speed(40); Ability(ABILITY_RATTLED); } } WHEN { TURN { MOVE(player, move); } TURN { MOVE(player, move); } @@ -56,8 +56,8 @@ SINGLE_BATTLE_TEST("Rattled does not boost speed by 1 when affected by Intimidat { GIVEN { WITH_CONFIG(CONFIG_UPDATED_INTIMIDATE, GEN_7); - PLAYER(SPECIES_GYARADOS) {Ability(ABILITY_INTIMIDATE); } - OPPONENT(SPECIES_SUDOWOODO) {Ability(ABILITY_RATTLED); } + PLAYER(SPECIES_GYARADOS) { Ability(ABILITY_INTIMIDATE); } + OPPONENT(SPECIES_SUDOWOODO) { Ability(ABILITY_RATTLED); } } WHEN { TURN {} } SCENE { @@ -76,8 +76,8 @@ SINGLE_BATTLE_TEST("Rattled boosts speed by 1 when affected by Intimidate (Gen8+ { GIVEN { WITH_CONFIG(CONFIG_UPDATED_INTIMIDATE, GEN_8); - PLAYER(SPECIES_GYARADOS) {Ability(ABILITY_INTIMIDATE); } - OPPONENT(SPECIES_SUDOWOODO) {Ability(ABILITY_RATTLED); } + PLAYER(SPECIES_GYARADOS) { Ability(ABILITY_INTIMIDATE); } + OPPONENT(SPECIES_SUDOWOODO) { Ability(ABILITY_RATTLED); } } WHEN { TURN {} } SCENE { @@ -97,7 +97,7 @@ SINGLE_BATTLE_TEST("Rattled triggers correctly when hit by U-Turn") // Specific ASSUME(GetMoveType(MOVE_U_TURN) == TYPE_BUG); PLAYER(SPECIES_WOBBUFFET); PLAYER(SPECIES_WYNAUT); - OPPONENT(SPECIES_SUDOWOODO) {Ability(ABILITY_RATTLED); } + OPPONENT(SPECIES_SUDOWOODO) { Ability(ABILITY_RATTLED); } OPPONENT(SPECIES_SUDOWOODO); } WHEN { TURN { MOVE(player, MOVE_U_TURN); SEND_OUT(player, 1); } diff --git a/test/battle/ability/rivalry.c b/test/battle/ability/rivalry.c index fbb4ba4530..7db0fc1c91 100644 --- a/test/battle/ability/rivalry.c +++ b/test/battle/ability/rivalry.c @@ -66,7 +66,7 @@ SINGLE_BATTLE_TEST("Rivalry doesn't modify power if the attacker is genderless", GIVEN { ASSUME(GetSpeciesAbility(SPECIES_PORYGON, 0) == ABILITY_TRACE); PLAYER(SPECIES_PORYGON) { Ability(ABILITY_TRACE); } // No genderless mon naturally gets Rivalry - OPPONENT(species) { Ability(ability); }; + OPPONENT(species) { Ability(ability); } } WHEN { TURN { MOVE(player, MOVE_SCRATCH); } } SCENE { @@ -89,7 +89,7 @@ SINGLE_BATTLE_TEST("Rivalry doesn't modify power if the target is genderless", s PARAMETRIZE { species = SPECIES_NIDOQUEEN; ability = ABILITY_RIVALRY; } GIVEN { - PLAYER(species) { Ability(ability); }; + PLAYER(species) { Ability(ability); } OPPONENT(SPECIES_PORYGON); } WHEN { TURN { MOVE(player, MOVE_SCRATCH); } diff --git a/test/battle/ability/scrappy.c b/test/battle/ability/scrappy.c index 045f7dbde9..58543911f8 100644 --- a/test/battle/ability/scrappy.c +++ b/test/battle/ability/scrappy.c @@ -8,9 +8,9 @@ SINGLE_BATTLE_TEST("Scrappy doesn't prevent Intimidate (Gen4-7)") GIVEN { WITH_CONFIG(CONFIG_UPDATED_INTIMIDATE, GEN_7); - PLAYER(SPECIES_EKANS) { Ability(ABILITY_SHED_SKIN); }; - PLAYER(SPECIES_EKANS) { Ability(ABILITY_INTIMIDATE); }; - OPPONENT(SPECIES_KANGASKHAN) { Ability(ABILITY_SCRAPPY); }; + PLAYER(SPECIES_EKANS) { Ability(ABILITY_SHED_SKIN); } + PLAYER(SPECIES_EKANS) { Ability(ABILITY_INTIMIDATE); } + OPPONENT(SPECIES_KANGASKHAN) { Ability(ABILITY_SCRAPPY); } } WHEN { TURN { MOVE(opponent, MOVE_SCRATCH); } TURN { SWITCH(player, 1); MOVE(opponent, MOVE_SCRATCH); } @@ -36,9 +36,9 @@ SINGLE_BATTLE_TEST("Scrappy prevents Intimidate (Gen8+)") GIVEN { WITH_CONFIG(CONFIG_UPDATED_INTIMIDATE, GEN_8); - PLAYER(SPECIES_EKANS) { Ability(ABILITY_SHED_SKIN); }; - PLAYER(SPECIES_EKANS) { Ability(ABILITY_INTIMIDATE); }; - OPPONENT(SPECIES_KANGASKHAN) { Ability(ABILITY_SCRAPPY); }; + PLAYER(SPECIES_EKANS) { Ability(ABILITY_SHED_SKIN); } + PLAYER(SPECIES_EKANS) { Ability(ABILITY_INTIMIDATE); } + OPPONENT(SPECIES_KANGASKHAN) { Ability(ABILITY_SCRAPPY); } } WHEN { TURN { MOVE(opponent, MOVE_SCRATCH); } TURN { SWITCH(player, 1); MOVE(opponent, MOVE_SCRATCH); } @@ -62,7 +62,7 @@ SINGLE_BATTLE_TEST("Scrappy allows to hit Ghost-type Pokémon with Normal- and F PARAMETRIZE { move = MOVE_KARATE_CHOP; } GIVEN { - PLAYER(SPECIES_KANGASKHAN) { Ability(ABILITY_SCRAPPY); }; + PLAYER(SPECIES_KANGASKHAN) { Ability(ABILITY_SCRAPPY); } OPPONENT(SPECIES_GASTLY); } WHEN { TURN { MOVE(player, move); } @@ -79,8 +79,8 @@ SINGLE_BATTLE_TEST("Scrappy doesn't bypass a Ghost-type's Wonder Guard") PARAMETRIZE { move = MOVE_KARATE_CHOP; } GIVEN { - PLAYER(SPECIES_KANGASKHAN) { Ability(ABILITY_SCRAPPY); }; - OPPONENT(SPECIES_SHEDINJA) { Ability(ABILITY_WONDER_GUARD); }; + PLAYER(SPECIES_KANGASKHAN) { Ability(ABILITY_SCRAPPY); } + OPPONENT(SPECIES_SHEDINJA) { Ability(ABILITY_WONDER_GUARD); } } WHEN { TURN { MOVE(player, move); } } SCENE { diff --git a/test/battle/ability/sheer_force.c b/test/battle/ability/sheer_force.c index 0f64fbf904..701c96360e 100644 --- a/test/battle/ability/sheer_force.c +++ b/test/battle/ability/sheer_force.c @@ -68,7 +68,7 @@ SINGLE_BATTLE_TEST("Sheer Force doesn't boost Present", s16 damage) } WHEN { //Test will fail if present heals because the hp change would be 0 //so we want a damaging version of present - TURN { MOVE(player, MOVE_PRESENT, WITH_RNG(RNG_PRESENT, 1)); } + TURN { MOVE(player, MOVE_PRESENT, WITH_RNG(RNG_PRESENT, 1)); } } SCENE { HP_BAR(opponent, captureDamage: &results[i].damage); } FINALLY { @@ -219,7 +219,7 @@ SINGLE_BATTLE_TEST("Sheer Force doesn't boost Double Shock", s16 damage) PARAMETRIZE { move = MOVE_CELEBRATE; } GIVEN { PLAYER(SPECIES_PIKACHU); - OPPONENT(SPECIES_TAUROS) { Ability(ABILITY_SHEER_FORCE); }; + OPPONENT(SPECIES_TAUROS) { Ability(ABILITY_SHEER_FORCE); } } WHEN { TURN { MOVE(opponent, move); MOVE(player, MOVE_DOUBLE_SHOCK); } } SCENE { @@ -270,7 +270,7 @@ SINGLE_BATTLE_TEST("Sheer Force doesn't boost Aura Wheel", s16 damage) PARAMETRIZE { move = MOVE_CELEBRATE; } GIVEN { PLAYER(SPECIES_MORPEKO); - OPPONENT(SPECIES_TAUROS) { Ability(ABILITY_SHEER_FORCE); }; + OPPONENT(SPECIES_TAUROS) { Ability(ABILITY_SHEER_FORCE); } } WHEN { TURN { MOVE(opponent, move); MOVE(player, MOVE_AURA_WHEEL); } } SCENE { @@ -287,7 +287,7 @@ SINGLE_BATTLE_TEST("Sheer Force doesn't boost Hyperspace Fury", s16 damage) PARAMETRIZE { move = MOVE_CELEBRATE; } GIVEN { PLAYER(SPECIES_HOOPA_UNBOUND); - OPPONENT(SPECIES_TAUROS) { Ability(ABILITY_SHEER_FORCE); }; + OPPONENT(SPECIES_TAUROS) { Ability(ABILITY_SHEER_FORCE); } } WHEN { TURN { MOVE(opponent, move); MOVE(player, MOVE_HYPERSPACE_FURY); } } SCENE { @@ -664,11 +664,11 @@ DOUBLE_BATTLE_TEST("Sheer Force only boosts the damage of moves it's supposed to case EFFECT_SOLAR_BEAM: case EFFECT_SKY_DROP: TURN { SKIP_TURN(playerLeft); SKIP_TURN(opponentLeft); } - TURN { ; } + TURN {} break; case EFFECT_FUTURE_SIGHT: - TURN { ; } - TURN { ; } + TURN {} + TURN {} break; case EFFECT_BIDE: TURN { MOVE(opponentRight, MOVE_WATER_GUN, target: playerLeft); MOVE(playerRight, MOVE_WATER_GUN, target: opponentLeft); SKIP_TURN(playerLeft); SKIP_TURN(opponentLeft); } @@ -752,11 +752,11 @@ DOUBLE_BATTLE_TEST("Sheer Force only boosts the damage of moves it's supposed to case EFFECT_SOLAR_BEAM: case EFFECT_SKY_DROP: TURN { SKIP_TURN(playerLeft); SKIP_TURN(opponentLeft); } - TURN { ; } + TURN {} break; case EFFECT_FUTURE_SIGHT: - TURN { ; } - TURN { ; } + TURN {} + TURN {} break; case EFFECT_BIDE: TURN { MOVE(opponentRight, MOVE_WATER_GUN, target: playerLeft); MOVE(playerRight, MOVE_WATER_GUN, target: opponentLeft); SKIP_TURN(playerLeft); SKIP_TURN(opponentLeft); } @@ -840,11 +840,11 @@ DOUBLE_BATTLE_TEST("Sheer Force only boosts the damage of moves it's supposed to case EFFECT_SOLAR_BEAM: case EFFECT_SKY_DROP: TURN { SKIP_TURN(playerLeft); SKIP_TURN(opponentLeft); } - TURN { ; } + TURN {} break; case EFFECT_FUTURE_SIGHT: - TURN { ; } - TURN { ; } + TURN {} + TURN {} break; case EFFECT_BIDE: TURN { MOVE(opponentRight, MOVE_WATER_GUN, target: playerLeft); MOVE(playerRight, MOVE_WATER_GUN, target: opponentLeft); SKIP_TURN(playerLeft); SKIP_TURN(opponentLeft); } @@ -928,11 +928,11 @@ DOUBLE_BATTLE_TEST("Sheer Force only boosts the damage of moves it's supposed to case EFFECT_SOLAR_BEAM: case EFFECT_SKY_DROP: TURN { SKIP_TURN(playerLeft); SKIP_TURN(opponentLeft); } - TURN { ; } + TURN {} break; case EFFECT_FUTURE_SIGHT: - TURN { ; } - TURN { ; } + TURN {} + TURN {} break; case EFFECT_BIDE: TURN { MOVE(opponentRight, MOVE_WATER_GUN, target: playerLeft); MOVE(playerRight, MOVE_WATER_GUN, target: opponentLeft); SKIP_TURN(playerLeft); SKIP_TURN(opponentLeft); } @@ -1016,11 +1016,11 @@ DOUBLE_BATTLE_TEST("Sheer Force only boosts the damage of moves it's supposed to case EFFECT_SOLAR_BEAM: case EFFECT_SKY_DROP: TURN { SKIP_TURN(playerLeft); SKIP_TURN(opponentLeft); } - TURN { ; } + TURN {} break; case EFFECT_FUTURE_SIGHT: - TURN { ; } - TURN { ; } + TURN {} + TURN {} break; case EFFECT_BIDE: TURN { MOVE(opponentRight, MOVE_WATER_GUN, target: playerLeft); MOVE(playerRight, MOVE_WATER_GUN, target: opponentLeft); SKIP_TURN(playerLeft); SKIP_TURN(opponentLeft); } @@ -1104,11 +1104,11 @@ DOUBLE_BATTLE_TEST("Sheer Force only boosts the damage of moves it's supposed to case EFFECT_SOLAR_BEAM: case EFFECT_SKY_DROP: TURN { SKIP_TURN(playerLeft); SKIP_TURN(opponentLeft); } - TURN { ; } + TURN {} break; case EFFECT_FUTURE_SIGHT: - TURN { ; } - TURN { ; } + TURN {} + TURN {} break; case EFFECT_BIDE: TURN { MOVE(opponentRight, MOVE_WATER_GUN, target: playerLeft); MOVE(playerRight, MOVE_WATER_GUN, target: opponentLeft); SKIP_TURN(playerLeft); SKIP_TURN(opponentLeft); } @@ -1192,11 +1192,11 @@ DOUBLE_BATTLE_TEST("Sheer Force only boosts the damage of moves it's supposed to case EFFECT_SOLAR_BEAM: case EFFECT_SKY_DROP: TURN { SKIP_TURN(playerLeft); SKIP_TURN(opponentLeft); } - TURN { ; } + TURN {} break; case EFFECT_FUTURE_SIGHT: - TURN { ; } - TURN { ; } + TURN {} + TURN {} break; case EFFECT_BIDE: TURN { MOVE(opponentRight, MOVE_WATER_GUN, target: playerLeft); MOVE(playerRight, MOVE_WATER_GUN, target: opponentLeft); SKIP_TURN(playerLeft); SKIP_TURN(opponentLeft); } @@ -1280,11 +1280,11 @@ DOUBLE_BATTLE_TEST("Sheer Force only boosts the damage of moves it's supposed to case EFFECT_SOLAR_BEAM: case EFFECT_SKY_DROP: TURN { SKIP_TURN(playerLeft); SKIP_TURN(opponentLeft); } - TURN { ; } + TURN {} break; case EFFECT_FUTURE_SIGHT: - TURN { ; } - TURN { ; } + TURN {} + TURN {} break; case EFFECT_BIDE: TURN { MOVE(opponentRight, MOVE_WATER_GUN, target: playerLeft); MOVE(playerRight, MOVE_WATER_GUN, target: opponentLeft); SKIP_TURN(playerLeft); SKIP_TURN(opponentLeft); } @@ -1369,11 +1369,11 @@ DOUBLE_BATTLE_TEST("Sheer Force only boosts the damage of moves it's supposed to case EFFECT_SOLAR_BEAM: case EFFECT_SKY_DROP: TURN { SKIP_TURN(playerLeft); SKIP_TURN(opponentLeft); } - TURN { ; } + TURN {} break; case EFFECT_FUTURE_SIGHT: - TURN { ; } - TURN { ; } + TURN {} + TURN {} break; case EFFECT_BIDE: TURN { MOVE(opponentRight, MOVE_WATER_GUN, target: playerLeft); MOVE(playerRight, MOVE_WATER_GUN, target: opponentLeft); SKIP_TURN(playerLeft); SKIP_TURN(opponentLeft); } diff --git a/test/battle/ability/shields_down.c b/test/battle/ability/shields_down.c index 554e67b0d8..d16aa240da 100644 --- a/test/battle/ability/shields_down.c +++ b/test/battle/ability/shields_down.c @@ -41,7 +41,7 @@ SINGLE_BATTLE_TEST("Minior Core transforms into Minior Meteor on battle start if PLAYER(SPECIES_WYNAUT); OPPONENT(SPECIES_MINIOR_CORE) { Ability(ABILITY_SHIELDS_DOWN); HP(51); MaxHP(101); } } WHEN { - TURN { } + TURN {} } SCENE { ABILITY_POPUP(opponent, ABILITY_SHIELDS_DOWN); ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_FORM_CHANGE, opponent); diff --git a/test/battle/ability/stamina.c b/test/battle/ability/stamina.c index 39113fd15a..0d377f276f 100644 --- a/test/battle/ability/stamina.c +++ b/test/battle/ability/stamina.c @@ -20,8 +20,8 @@ SINGLE_BATTLE_TEST("Stamina raises Defense by 1 when hit by a move") s16 turnOneHit, turnTwoHit; u16 move; - PARAMETRIZE {move = MOVE_SCRATCH; } - PARAMETRIZE {move = MOVE_GUST; } + PARAMETRIZE { move = MOVE_SCRATCH; } + PARAMETRIZE { move = MOVE_GUST; } GIVEN { ASSUME(!IsBattleMoveStatus(MOVE_SCRATCH)); @@ -51,18 +51,18 @@ DOUBLE_BATTLE_TEST("Stamina activates correctly for every battler with the abili { enum Ability abilityLeft, abilityRight; - PARAMETRIZE {abilityLeft = ABILITY_NONE, abilityRight = ABILITY_STAMINA; } - PARAMETRIZE {abilityLeft = ABILITY_STAMINA, abilityRight = ABILITY_NONE; } - PARAMETRIZE {abilityLeft = ABILITY_STAMINA, abilityRight = ABILITY_STAMINA; } + PARAMETRIZE { abilityLeft = ABILITY_NONE, abilityRight = ABILITY_STAMINA; } + PARAMETRIZE { abilityLeft = ABILITY_STAMINA, abilityRight = ABILITY_NONE; } + PARAMETRIZE { abilityLeft = ABILITY_STAMINA, abilityRight = ABILITY_STAMINA; } GIVEN { ASSUME(GetMoveTarget(MOVE_EARTHQUAKE) == MOVE_TARGET_FOES_AND_ALLY); PLAYER(SPECIES_WOBBUFFET) { Ability(abilityLeft); Speed(10); } PLAYER(SPECIES_WOBBUFFET) { Ability(abilityRight); Speed(5); } - OPPONENT(SPECIES_WOBBUFFET) {Speed(20); } - OPPONENT(SPECIES_WOBBUFFET) {Speed(15); } + OPPONENT(SPECIES_WOBBUFFET) { Speed(20); } + OPPONENT(SPECIES_WOBBUFFET) { Speed(15); } } WHEN { - TURN { MOVE(opponentLeft, MOVE_EARTHQUAKE);} + TURN { MOVE(opponentLeft, MOVE_EARTHQUAKE); } } SCENE { ANIMATION(ANIM_TYPE_MOVE, MOVE_EARTHQUAKE, opponentLeft); diff --git a/test/battle/ability/stench.c b/test/battle/ability/stench.c index 84cbf20f64..e6a5c9cdcc 100644 --- a/test/battle/ability/stench.c +++ b/test/battle/ability/stench.c @@ -63,7 +63,7 @@ DOUBLE_BATTLE_TEST("Stench doesn't trigger if partner uses a move") PLAYER(SPECIES_WOBBUFFET) { Speed(20); } PLAYER(SPECIES_WYNAUT) { Speed(10); } OPPONENT(SPECIES_GRIMER) { Speed(100); Ability(ABILITY_STENCH); } - OPPONENT(SPECIES_WOBBUFFET) {Speed(50); } + OPPONENT(SPECIES_WOBBUFFET) { Speed(50); } } WHEN { TURN { MOVE(playerLeft, MOVE_FAKE_OUT, target: opponentLeft); diff --git a/test/battle/ability/super_luck.c b/test/battle/ability/super_luck.c index 16dfc081a9..d271c6ff69 100644 --- a/test/battle/ability/super_luck.c +++ b/test/battle/ability/super_luck.c @@ -12,7 +12,7 @@ SINGLE_BATTLE_TEST("Super Luck increases the critical hit ratio by 1 stage") GIVEN { ASSUME(GetSpeciesBaseSpeed(SPECIES_TOGEPI) == 20); WITH_CONFIG(CONFIG_CRIT_CHANCE, genConfig); - PLAYER(SPECIES_TOGEPI) { Ability(ABILITY_SUPER_LUCK); }; + PLAYER(SPECIES_TOGEPI) { Ability(ABILITY_SUPER_LUCK); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(player, MOVE_SCRATCH); } diff --git a/test/battle/ability/supersweet_syrup.c b/test/battle/ability/supersweet_syrup.c index cd819eda72..572f697757 100644 --- a/test/battle/ability/supersweet_syrup.c +++ b/test/battle/ability/supersweet_syrup.c @@ -34,7 +34,7 @@ DOUBLE_BATTLE_TEST("Supersweet Syrup lowers evasion of both opposing mon's in ba OPPONENT(SPECIES_DIPPLIN) { Ability(ABILITY_SUPERSWEET_SYRUP); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { - TURN { } + TURN {} } SCENE { ABILITY_POPUP(opponentLeft, ABILITY_SUPERSWEET_SYRUP); MESSAGE("A supersweet aroma is wafting from the syrup covering the opposing Dipplin!"); diff --git a/test/battle/ability/supreme_overlord.c b/test/battle/ability/supreme_overlord.c index 759202cc1b..17f9abe7b7 100644 --- a/test/battle/ability/supreme_overlord.c +++ b/test/battle/ability/supreme_overlord.c @@ -96,7 +96,7 @@ SINGLE_BATTLE_TEST("Supreme Overlord's message displays correctly after all batt { GIVEN { ASSUME(GetMoveEffect(MOVE_EXPLOSION) == EFFECT_EXPLOSION); - PLAYER(SPECIES_WOBBUFFET) { HP(1);} + PLAYER(SPECIES_WOBBUFFET) { HP(1); } PLAYER(SPECIES_KINGAMBIT) { Ability(ABILITY_SUPREME_OVERLORD); } OPPONENT(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); @@ -119,7 +119,7 @@ SINGLE_BATTLE_TEST("Supreme Overlord's message displays correctly after all batt ASSUME(GetMoveEffect(MOVE_EXPLOSION) == EFFECT_EXPLOSION); PLAYER(SPECIES_WOBBUFFET); PLAYER(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_WOBBUFFET) { HP(1);} + OPPONENT(SPECIES_WOBBUFFET) { HP(1); } OPPONENT(SPECIES_KINGAMBIT) { Ability(ABILITY_SUPREME_OVERLORD); } } WHEN { TURN { MOVE(player, MOVE_EXPLOSION); SEND_OUT(player, 1); SEND_OUT(opponent, 1); } diff --git a/test/battle/ability/sword_of_ruin.c b/test/battle/ability/sword_of_ruin.c index a891f7d5a7..40c84b213f 100644 --- a/test/battle/ability/sword_of_ruin.c +++ b/test/battle/ability/sword_of_ruin.c @@ -34,7 +34,7 @@ SINGLE_BATTLE_TEST("Sword of Ruin's message displays correctly after all battler { GIVEN { ASSUME(GetMoveEffect(MOVE_EXPLOSION) == EFFECT_EXPLOSION); - PLAYER(SPECIES_WOBBUFFET) { HP(1);} + PLAYER(SPECIES_WOBBUFFET) { HP(1); } PLAYER(SPECIES_CHIEN_PAO); OPPONENT(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); @@ -58,7 +58,7 @@ SINGLE_BATTLE_TEST("Sword of Ruin's message displays correctly after all battler ASSUME(GetMoveEffect(MOVE_EXPLOSION) == EFFECT_EXPLOSION); PLAYER(SPECIES_WOBBUFFET); PLAYER(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_WOBBUFFET) { HP(1);} + OPPONENT(SPECIES_WOBBUFFET) { HP(1); } OPPONENT(SPECIES_CHIEN_PAO); } WHEN { TURN { MOVE(player, MOVE_EXPLOSION); SEND_OUT(player, 1); SEND_OUT(opponent, 1); } diff --git a/test/battle/ability/tablets_of_ruin.c b/test/battle/ability/tablets_of_ruin.c index 0b58edc793..74ac8c252e 100644 --- a/test/battle/ability/tablets_of_ruin.c +++ b/test/battle/ability/tablets_of_ruin.c @@ -34,7 +34,7 @@ SINGLE_BATTLE_TEST("Tablets of Ruin's message displays correctly after all battl { GIVEN { ASSUME(GetMoveEffect(MOVE_EXPLOSION) == EFFECT_EXPLOSION); - PLAYER(SPECIES_WOBBUFFET) { HP(1);} + PLAYER(SPECIES_WOBBUFFET) { HP(1); } PLAYER(SPECIES_WO_CHIEN); OPPONENT(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); @@ -58,7 +58,7 @@ SINGLE_BATTLE_TEST("Tablets of Ruin's message displays correctly after all battl ASSUME(GetMoveEffect(MOVE_EXPLOSION) == EFFECT_EXPLOSION); PLAYER(SPECIES_WOBBUFFET); PLAYER(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_WOBBUFFET) { HP(1);} + OPPONENT(SPECIES_WOBBUFFET) { HP(1); } OPPONENT(SPECIES_WO_CHIEN); } WHEN { TURN { MOVE(player, MOVE_EXPLOSION); SEND_OUT(player, 1); SEND_OUT(opponent, 1); } diff --git a/test/battle/ability/tangling_hair.c b/test/battle/ability/tangling_hair.c index fdae4de06d..ec0798f180 100644 --- a/test/battle/ability/tangling_hair.c +++ b/test/battle/ability/tangling_hair.c @@ -89,7 +89,7 @@ SINGLE_BATTLE_TEST("Tangling Hair does not trigger on Clear Body") { GIVEN { PLAYER(SPECIES_DUGTRIO) { Ability(ABILITY_TANGLING_HAIR); } - OPPONENT(SPECIES_BELDUM) { Ability(ABILITY_CLEAR_BODY); }; + OPPONENT(SPECIES_BELDUM) { Ability(ABILITY_CLEAR_BODY); } } WHEN { TURN { MOVE(opponent, MOVE_SCRATCH); } } SCENE { @@ -103,7 +103,7 @@ SINGLE_BATTLE_TEST("Tangling Hair will trigger if move is boosted by Sheer Force ASSUME(MoveIsAffectedBySheerForce(MOVE_POISON_JAB)); GIVEN { PLAYER(SPECIES_DUGTRIO) { Ability(ABILITY_TANGLING_HAIR); } - OPPONENT(SPECIES_NIDOKING) { Ability(ABILITY_SHEER_FORCE); }; + OPPONENT(SPECIES_NIDOKING) { Ability(ABILITY_SHEER_FORCE); } } WHEN { TURN { MOVE(opponent, MOVE_POISON_JAB); } } SCENE { diff --git a/test/battle/ability/tera_shell.c b/test/battle/ability/tera_shell.c index 55a6c3d626..11a77ca711 100644 --- a/test/battle/ability/tera_shell.c +++ b/test/battle/ability/tera_shell.c @@ -7,7 +7,7 @@ SINGLE_BATTLE_TEST("Tera Shell makes all moves against Terapagos not very effect PARAMETRIZE { hp = 100; } PARAMETRIZE { hp = 99; } GIVEN { - PLAYER(SPECIES_TERAPAGOS_TERASTAL) { Ability(ABILITY_TERA_SHELL); HP(hp); MaxHP(100);} + PLAYER(SPECIES_TERAPAGOS_TERASTAL) { Ability(ABILITY_TERA_SHELL); HP(hp); MaxHP(100); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(opponent, MOVE_SCRATCH); } diff --git a/test/battle/ability/tera_shift.c b/test/battle/ability/tera_shift.c index 9149160cd1..9213bf3b1b 100644 --- a/test/battle/ability/tera_shift.c +++ b/test/battle/ability/tera_shift.c @@ -7,7 +7,7 @@ SINGLE_BATTLE_TEST("Tera Shift transforms Terapagos into its Terastal form on sw PLAYER(SPECIES_TERAPAGOS_NORMAL) { Ability(ABILITY_TERA_SHIFT); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { - TURN { ; } + TURN {} } SCENE { ABILITY_POPUP(player, ABILITY_TERA_SHIFT); ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_FORM_CHANGE, player); @@ -23,7 +23,7 @@ SINGLE_BATTLE_TEST("Tera Shift can't be suppressed by Neutralizing Gas") PLAYER(SPECIES_TERAPAGOS_NORMAL) { Ability(ABILITY_TERA_SHIFT); } OPPONENT(SPECIES_KOFFING) { Ability(ABILITY_NEUTRALIZING_GAS); } } WHEN { - TURN { ; } + TURN {} } SCENE { ABILITY_POPUP(opponent, ABILITY_NEUTRALIZING_GAS); ABILITY_POPUP(player, ABILITY_TERA_SHIFT); diff --git a/test/battle/ability/teraform_zero.c b/test/battle/ability/teraform_zero.c index f6620d6625..17f086bf08 100644 --- a/test/battle/ability/teraform_zero.c +++ b/test/battle/ability/teraform_zero.c @@ -6,8 +6,8 @@ DOUBLE_BATTLE_TEST("Teraform Zero clears weather and terrain upon activation") GIVEN { PLAYER(SPECIES_TERAPAGOS_TERASTAL); PLAYER(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_KYOGRE) {Ability(ABILITY_DRIZZLE); } - OPPONENT(SPECIES_TAPU_KOKO) {Ability(ABILITY_ELECTRIC_SURGE); } + OPPONENT(SPECIES_KYOGRE) { Ability(ABILITY_DRIZZLE); } + OPPONENT(SPECIES_TAPU_KOKO) { Ability(ABILITY_ELECTRIC_SURGE); } } WHEN { TURN { MOVE(playerLeft, MOVE_CELEBRATE, gimmick: GIMMICK_TERA); } } SCENE { @@ -22,9 +22,9 @@ DOUBLE_BATTLE_TEST("Teraform Zero can be supressed") GIVEN { PLAYER(SPECIES_TERAPAGOS_TERASTAL); PLAYER(SPECIES_WOBBUFFET); - PLAYER(SPECIES_WEEZING) {Ability(ABILITY_NEUTRALIZING_GAS); } - OPPONENT(SPECIES_KYOGRE) {Ability(ABILITY_DRIZZLE); } - OPPONENT(SPECIES_TAPU_KOKO) {Ability(ABILITY_ELECTRIC_SURGE); } + PLAYER(SPECIES_WEEZING) { Ability(ABILITY_NEUTRALIZING_GAS); } + OPPONENT(SPECIES_KYOGRE) { Ability(ABILITY_DRIZZLE); } + OPPONENT(SPECIES_TAPU_KOKO) { Ability(ABILITY_ELECTRIC_SURGE); } } WHEN { TURN { SWITCH(playerRight, 2); MOVE(playerLeft, MOVE_CELEBRATE, gimmick: GIMMICK_TERA); } } SCENE { @@ -87,10 +87,10 @@ DOUBLE_BATTLE_TEST("Teraform Zero shouldn't cause Neutralizing Gas to show it's { GIVEN { PLAYER(SPECIES_TERAPAGOS_TERASTAL); - PLAYER(SPECIES_ABSOL) {Ability(ABILITY_PRESSURE); } - PLAYER(SPECIES_WEEZING) {Ability(ABILITY_NEUTRALIZING_GAS); } - OPPONENT(SPECIES_KYOGRE) {Ability(ABILITY_DRIZZLE); } - OPPONENT(SPECIES_TAPU_KOKO) {Ability(ABILITY_ELECTRIC_SURGE); } + PLAYER(SPECIES_ABSOL) { Ability(ABILITY_PRESSURE); } + PLAYER(SPECIES_WEEZING) { Ability(ABILITY_NEUTRALIZING_GAS); } + OPPONENT(SPECIES_KYOGRE) { Ability(ABILITY_DRIZZLE); } + OPPONENT(SPECIES_TAPU_KOKO) { Ability(ABILITY_ELECTRIC_SURGE); } } WHEN { TURN { SWITCH(playerRight, 2); MOVE(playerLeft, MOVE_CELEBRATE, gimmick: GIMMICK_TERA); } } SCENE { diff --git a/test/battle/ability/toxic_debris.c b/test/battle/ability/toxic_debris.c index 4661849905..587cb846ed 100644 --- a/test/battle/ability/toxic_debris.c +++ b/test/battle/ability/toxic_debris.c @@ -11,8 +11,8 @@ SINGLE_BATTLE_TEST("Toxic Debris sets Toxic Spikes on the opposing side if hit b { u32 move; - PARAMETRIZE { move = MOVE_SCRATCH;} - PARAMETRIZE { move = MOVE_SWIFT;} + PARAMETRIZE { move = MOVE_SCRATCH; } + PARAMETRIZE { move = MOVE_SWIFT; } GIVEN { PLAYER(SPECIES_GLIMMORA) { Ability(ABILITY_TOXIC_DEBRIS); } diff --git a/test/battle/ability/trace.c b/test/battle/ability/trace.c index 71d5035084..d52da66468 100644 --- a/test/battle/ability/trace.c +++ b/test/battle/ability/trace.c @@ -7,7 +7,7 @@ SINGLE_BATTLE_TEST("Trace copies opponents ability") PLAYER(SPECIES_RALTS) { Ability(ABILITY_TRACE); } OPPONENT(SPECIES_TORCHIC) { Ability(ABILITY_BLAZE); } } WHEN { - TURN { } + TURN {} } SCENE { ABILITY_POPUP(player, ABILITY_TRACE); MESSAGE("It traced the opposing Torchic's Blaze!"); @@ -48,7 +48,7 @@ DOUBLE_BATTLE_TEST("Trace copies opponents ability randomly") { enum Ability ability1, ability2; - PARAMETRIZE { ability1 = ABILITY_SPEED_BOOST; ability2 = ABILITY_BLAZE;} + PARAMETRIZE { ability1 = ABILITY_SPEED_BOOST; ability2 = ABILITY_BLAZE; } PARAMETRIZE { ability1 = ABILITY_BLAZE; ability2 = ABILITY_SPEED_BOOST; } PASSES_RANDOMLY(1, 2, RNG_TRACE); @@ -58,7 +58,7 @@ DOUBLE_BATTLE_TEST("Trace copies opponents ability randomly") OPPONENT(SPECIES_TORCHIC) { Ability(ability1); } OPPONENT(SPECIES_TORCHIC) { Ability(ability2); } } WHEN { - TURN { } + TURN {} } SCENE { ABILITY_POPUP(playerLeft, ABILITY_TRACE); MESSAGE("It traced the opposing Torchic's Blaze!"); @@ -87,7 +87,7 @@ SINGLE_BATTLE_TEST("Trace copies opponent's Intimidate and triggers it immediate PLAYER(SPECIES_RALTS) { Ability(ABILITY_TRACE); } OPPONENT(SPECIES_MASQUERAIN) { Ability(ABILITY_INTIMIDATE); } } WHEN { - TURN { } + TURN {} } SCENE { ABILITY_POPUP(player, ABILITY_TRACE); ABILITY_POPUP(player, ABILITY_INTIMIDATE); @@ -103,7 +103,7 @@ DOUBLE_BATTLE_TEST("Trace respects the turn order") OPPONENT(SPECIES_HIPPOWDON) { Speed(10); Ability(ABILITY_SAND_STREAM); } OPPONENT(SPECIES_DEOXYS_SPEED) { Speed(30); Ability(ABILITY_PRESSURE); } } WHEN { - TURN { } + TURN {} } SCENE { ABILITY_POPUP(playerLeft, ABILITY_PRESSURE); ABILITY_POPUP(opponentRight, ABILITY_PRESSURE); diff --git a/test/battle/ability/unburden.c b/test/battle/ability/unburden.c index 4498bb4922..5f13692935 100644 --- a/test/battle/ability/unburden.c +++ b/test/battle/ability/unburden.c @@ -11,7 +11,7 @@ SINGLE_BATTLE_TEST("Unburden doubles speed once user uses item") OPPONENT(SPECIES_RILLABOOM) { Speed(7); Ability(ABILITY_GRASSY_SURGE); } } WHEN { TURN { MOVE(opponent, MOVE_U_TURN); SEND_OUT(opponent, 1); } - TURN { } + TURN {} } SCENE { ANIMATION(ANIM_TYPE_MOVE, MOVE_U_TURN, opponent); ABILITY_POPUP(opponent, ABILITY_GRASSY_SURGE); @@ -31,7 +31,7 @@ SINGLE_BATTLE_TEST("Unburden doubles speed once user gets their item knocked off OPPONENT(SPECIES_WOBBUFFET) { Speed(7); } } WHEN { TURN { MOVE(opponent, MOVE_KNOCK_OFF); } - TURN { } + TURN {} } SCENE { ANIMATION(ANIM_TYPE_MOVE, MOVE_KNOCK_OFF, opponent); ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_ITEM_KNOCKOFF, player); @@ -53,7 +53,7 @@ SINGLE_BATTLE_TEST("Unburden doesn't activate when item is consumed in Neutraliz } WHEN { TURN { MOVE(opponent, MOVE_KNOCK_OFF); } TURN { MOVE(opponent, MOVE_U_TURN); SEND_OUT(opponent, 1); } - TURN { } + TURN {} } SCENE { ABILITY_POPUP(opponent, ABILITY_NEUTRALIZING_GAS); ANIMATION(ANIM_TYPE_MOVE, MOVE_KNOCK_OFF, opponent); @@ -81,7 +81,7 @@ SINGLE_BATTLE_TEST("Unburden doubling speed effect is ignored by Neutralizing Ga TURN { MOVE(opponent, MOVE_KNOCK_OFF); } TURN { MOVE(opponent, MOVE_U_TURN); SEND_OUT(opponent, 1); } TURN { MOVE(opponent, MOVE_U_TURN); SEND_OUT(opponent, 0); } - TURN { } + TURN {} } SCENE { ANIMATION(ANIM_TYPE_MOVE, MOVE_KNOCK_OFF, opponent); ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_ITEM_KNOCKOFF, player); diff --git a/test/battle/ability/unnerve.c b/test/battle/ability/unnerve.c index a1eabbcf5a..048b951964 100644 --- a/test/battle/ability/unnerve.c +++ b/test/battle/ability/unnerve.c @@ -13,7 +13,7 @@ SINGLE_BATTLE_TEST("Unnerve prevents opposing Pokémon from eating their own ber PLAYER(mon) { Ability(ability); } OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_RAWST_BERRY); Status1(STATUS1_BURN); } } WHEN { - TURN { } + TURN {} } SCENE { ABILITY_POPUP(player, ability); NOT ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, opponent); @@ -104,7 +104,7 @@ DOUBLE_BATTLE_TEST("Unnerve stops applying on death but applies on revive") { u16 mon; u16 ability; - PARAMETRIZE { mon = SPECIES_JOLTIK, ability = ABILITY_UNNERVE;} + PARAMETRIZE { mon = SPECIES_JOLTIK, ability = ABILITY_UNNERVE; } PARAMETRIZE { mon = SPECIES_CALYREX_ICE, ability = ABILITY_AS_ONE_ICE_RIDER; } GIVEN { ASSUME(gItemsInfo[ITEM_RAWST_BERRY].holdEffect == HOLD_EFFECT_CURE_BRN); diff --git a/test/battle/ability/vessel_of_ruin.c b/test/battle/ability/vessel_of_ruin.c index 1a075db8cf..18ac502c08 100644 --- a/test/battle/ability/vessel_of_ruin.c +++ b/test/battle/ability/vessel_of_ruin.c @@ -34,7 +34,7 @@ SINGLE_BATTLE_TEST("Vessel of Ruin's message displays correctly after all battle { GIVEN { ASSUME(GetMoveEffect(MOVE_EXPLOSION) == EFFECT_EXPLOSION); - PLAYER(SPECIES_WOBBUFFET) { HP(1);} + PLAYER(SPECIES_WOBBUFFET) { HP(1); } PLAYER(SPECIES_TING_LU); OPPONENT(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); @@ -58,7 +58,7 @@ SINGLE_BATTLE_TEST("Vessel of Ruin's message displays correctly after all battle ASSUME(GetMoveEffect(MOVE_EXPLOSION) == EFFECT_EXPLOSION); PLAYER(SPECIES_WOBBUFFET); PLAYER(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_WOBBUFFET) { HP(1);} + OPPONENT(SPECIES_WOBBUFFET) { HP(1); } OPPONENT(SPECIES_TING_LU); } WHEN { TURN { MOVE(player, MOVE_EXPLOSION); SEND_OUT(player, 1); SEND_OUT(opponent, 1); } diff --git a/test/battle/ability/wind_power.c b/test/battle/ability/wind_power.c index c78df34190..aacf1811ae 100644 --- a/test/battle/ability/wind_power.c +++ b/test/battle/ability/wind_power.c @@ -21,12 +21,12 @@ SINGLE_BATTLE_TEST("Wind Power sets up Charge for player when hit by a wind move s16 dmgBefore, dmgAfter; u16 move; - PARAMETRIZE {move = MOVE_SCRATCH; } - PARAMETRIZE {move = MOVE_AIR_CUTTER; } + PARAMETRIZE { move = MOVE_SCRATCH; } + PARAMETRIZE { move = MOVE_AIR_CUTTER; } GIVEN { PLAYER(SPECIES_WATTREL) { Ability(ABILITY_WIND_POWER); Speed(10); } - OPPONENT(SPECIES_PERSIAN) {Ability(ABILITY_LIMBER); Speed(5) ;} // Limber, so it doesn't get paralyzed. + OPPONENT(SPECIES_PERSIAN) { Ability(ABILITY_LIMBER); Speed(5); } // Limber, so it doesn't get paralyzed. } WHEN { TURN { MOVE(player, MOVE_NUZZLE), MOVE(opponent, move); } TURN { MOVE(player, MOVE_NUZZLE), MOVE(opponent, move); } @@ -66,11 +66,11 @@ SINGLE_BATTLE_TEST("Wind Power sets up Charge for opponent when hit by a wind mo s16 dmgBefore, dmgAfter; u16 move; - PARAMETRIZE {move = MOVE_SCRATCH; } - PARAMETRIZE {move = MOVE_AIR_CUTTER; } + PARAMETRIZE { move = MOVE_SCRATCH; } + PARAMETRIZE { move = MOVE_AIR_CUTTER; } GIVEN { - PLAYER(SPECIES_PERSIAN) {Ability(ABILITY_LIMBER); Speed(5) ;} // Limber, so it doesn't get paralyzed. + PLAYER(SPECIES_PERSIAN) { Ability(ABILITY_LIMBER); Speed(5); } // Limber, so it doesn't get paralyzed. OPPONENT(SPECIES_WATTREL) { Ability(ABILITY_WIND_POWER); Speed(10); } } WHEN { TURN { MOVE(opponent, MOVE_NUZZLE), MOVE(player, move); } @@ -111,12 +111,12 @@ SINGLE_BATTLE_TEST("Wind Power sets up Charge for only one attack when hit by a s16 dmgCharged, dmgAfter; u16 move; - PARAMETRIZE {move = MOVE_SCRATCH; } - PARAMETRIZE {move = MOVE_AIR_CUTTER; } + PARAMETRIZE { move = MOVE_SCRATCH; } + PARAMETRIZE { move = MOVE_AIR_CUTTER; } GIVEN { PLAYER(SPECIES_WATTREL) { Ability(ABILITY_WIND_POWER); Speed(5); } - OPPONENT(SPECIES_PERSIAN) {Ability(ABILITY_LIMBER); Speed(10) ;} // Limber, so it doesn't get paralyzed. + OPPONENT(SPECIES_PERSIAN) { Ability(ABILITY_LIMBER); Speed(10); } // Limber, so it doesn't get paralyzed. } WHEN { TURN { MOVE(opponent, move); MOVE(player, MOVE_NUZZLE); } TURN { MOVE(player, MOVE_NUZZLE); } @@ -148,9 +148,9 @@ DOUBLE_BATTLE_TEST("Wind Power activates correctly for every battler with the ab { enum Ability abilityLeft, abilityRight; - PARAMETRIZE {abilityLeft = ABILITY_NONE, abilityRight = ABILITY_WIND_POWER;} - PARAMETRIZE {abilityLeft = ABILITY_WIND_POWER, abilityRight = ABILITY_NONE; } - PARAMETRIZE {abilityLeft = ABILITY_WIND_POWER, abilityRight = ABILITY_WIND_POWER; } + PARAMETRIZE { abilityLeft = ABILITY_NONE, abilityRight = ABILITY_WIND_POWER; } + PARAMETRIZE { abilityLeft = ABILITY_WIND_POWER, abilityRight = ABILITY_NONE; } + PARAMETRIZE { abilityLeft = ABILITY_WIND_POWER, abilityRight = ABILITY_WIND_POWER; } GIVEN { PLAYER(SPECIES_WATTREL) { Ability(abilityLeft); Speed(10); } @@ -158,7 +158,7 @@ DOUBLE_BATTLE_TEST("Wind Power activates correctly for every battler with the ab OPPONENT(SPECIES_PERSIAN) { Ability(ABILITY_LIMBER); Speed(20); } OPPONENT(SPECIES_PERSIAN) { Ability(ABILITY_LIMBER); Speed(15); } } WHEN { - TURN { MOVE(opponentLeft, MOVE_AIR_CUTTER); MOVE(opponentRight, MOVE_AIR_CUTTER);} + TURN { MOVE(opponentLeft, MOVE_AIR_CUTTER); MOVE(opponentRight, MOVE_AIR_CUTTER); } } SCENE { ANIMATION(ANIM_TYPE_MOVE, MOVE_AIR_CUTTER, opponentLeft); @@ -189,9 +189,9 @@ DOUBLE_BATTLE_TEST("Wind Power activates correctly for every battler with the ab { enum Ability abilityLeft, abilityRight; - PARAMETRIZE {abilityLeft = ABILITY_NONE, abilityRight = ABILITY_WIND_POWER; } - PARAMETRIZE {abilityLeft = ABILITY_WIND_POWER, abilityRight = ABILITY_NONE; } - PARAMETRIZE {abilityLeft = ABILITY_WIND_POWER, abilityRight = ABILITY_WIND_POWER; } + PARAMETRIZE { abilityLeft = ABILITY_NONE, abilityRight = ABILITY_WIND_POWER; } + PARAMETRIZE { abilityLeft = ABILITY_WIND_POWER, abilityRight = ABILITY_NONE; } + PARAMETRIZE { abilityLeft = ABILITY_WIND_POWER, abilityRight = ABILITY_WIND_POWER; } GIVEN { PLAYER(SPECIES_WATTREL) { Ability(abilityLeft); Speed(10); } @@ -199,7 +199,7 @@ DOUBLE_BATTLE_TEST("Wind Power activates correctly for every battler with the ab OPPONENT(SPECIES_PERSIAN) { Ability(ABILITY_LIMBER); Speed(20); } OPPONENT(SPECIES_PERSIAN) { Ability(ABILITY_LIMBER); Speed(15); } } WHEN { - TURN { MOVE(opponentLeft, MOVE_PETAL_BLIZZARD);} + TURN { MOVE(opponentLeft, MOVE_PETAL_BLIZZARD); } } SCENE { ANIMATION(ANIM_TYPE_MOVE, MOVE_PETAL_BLIZZARD, opponentLeft); @@ -228,8 +228,8 @@ DOUBLE_BATTLE_TEST("Wind Power activates correctly when Tailwind is used") { bool8 opponentSide; - PARAMETRIZE {opponentSide = TRUE;} - PARAMETRIZE {opponentSide = FALSE;} + PARAMETRIZE { opponentSide = TRUE; } + PARAMETRIZE { opponentSide = FALSE; } GIVEN { ASSUME(GetMoveEffect(MOVE_TAILWIND) == EFFECT_TAILWIND); @@ -238,7 +238,7 @@ DOUBLE_BATTLE_TEST("Wind Power activates correctly when Tailwind is used") OPPONENT(SPECIES_WATTREL) { Ability(ABILITY_WIND_POWER); Speed(20); } OPPONENT(SPECIES_WATTREL) { Ability(ABILITY_WIND_POWER); Speed(15); } } WHEN { - TURN { MOVE((opponentSide == TRUE) ? opponentLeft : playerLeft, MOVE_TAILWIND);} + TURN { MOVE((opponentSide == TRUE) ? opponentLeft : playerLeft, MOVE_TAILWIND); } } SCENE { if (opponentSide) { ANIMATION(ANIM_TYPE_MOVE, MOVE_TAILWIND, opponentLeft); diff --git a/test/battle/ability/zero_to_hero.c b/test/battle/ability/zero_to_hero.c index 7df3f07702..9b4b362d75 100644 --- a/test/battle/ability/zero_to_hero.c +++ b/test/battle/ability/zero_to_hero.c @@ -141,7 +141,7 @@ SINGLE_BATTLE_TEST("Zero to Hero's message displays correctly after all battlers GIVEN { ASSUME(GetMoveEffect(MOVE_EXPLOSION) == EFFECT_EXPLOSION); PLAYER(SPECIES_PALAFIN_ZERO); - PLAYER(SPECIES_WOBBUFFET) { HP(1);} + PLAYER(SPECIES_WOBBUFFET) { HP(1); } OPPONENT(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -166,7 +166,7 @@ SINGLE_BATTLE_TEST("Zero to Hero's message displays correctly after all battlers PLAYER(SPECIES_WOBBUFFET); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_PALAFIN_ZERO); - OPPONENT(SPECIES_WOBBUFFET) { HP(1);} + OPPONENT(SPECIES_WOBBUFFET) { HP(1); } } WHEN { TURN { MOVE(opponent, MOVE_FLIP_TURN); SEND_OUT(opponent, 1); } TURN { MOVE(opponent, MOVE_CELEBRATE); MOVE(player, MOVE_EXPLOSION); SEND_OUT(player, 1); SEND_OUT(opponent, 0); } diff --git a/test/battle/ai/ai.c b/test/battle/ai/ai.c index 0cb4a97375..43c6740f48 100644 --- a/test/battle/ai/ai.c +++ b/test/battle/ai/ai.c @@ -236,7 +236,7 @@ AI_SINGLE_BATTLE_TEST("AI prefers moves with the best possible score, chosen ran { GIVEN { AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT); - PLAYER(SPECIES_WOBBUFFET) { HP(5); }; + PLAYER(SPECIES_WOBBUFFET) { HP(5); } PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET) { Moves(MOVE_THUNDERBOLT, MOVE_SLUDGE_BOMB, MOVE_TAKE_DOWN); } } WHEN { @@ -253,7 +253,7 @@ AI_SINGLE_BATTLE_TEST("AI can choose a status move that boosts the attack by two ASSUME(GetMoveCategory(MOVE_STRENGTH) == DAMAGE_CATEGORY_PHYSICAL); ASSUME(GetMoveCategory(MOVE_HORN_ATTACK) == DAMAGE_CATEGORY_PHYSICAL); AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT); - PLAYER(SPECIES_WOBBUFFET) { HP(277); }; + PLAYER(SPECIES_WOBBUFFET) { HP(277); } PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_KANGASKHAN) { Moves(MOVE_STRENGTH, MOVE_HORN_ATTACK, MOVE_SWORDS_DANCE); } } WHEN { @@ -292,7 +292,7 @@ AI_SINGLE_BATTLE_TEST("AI chooses the safest option to faint the target, taking OPPONENT(SPECIES_GEODUDE) { Moves(move1, move2, move3, move4); Ability(abilityAtk); Item(holdItemAtk); } } WHEN { TURN { if (expectedMove2 == MOVE_NONE) { EXPECT_MOVE(opponent, expectedMove); SEND_OUT(player, 1); } - else {EXPECT_MOVES(opponent, expectedMove, expectedMove2); SCORE_EQ(opponent, expectedMove, expectedMove2); SEND_OUT(player, 1);} + else { EXPECT_MOVES(opponent, expectedMove, expectedMove2); SCORE_EQ(opponent, expectedMove, expectedMove2); SEND_OUT(player, 1); } } } SCENE { @@ -322,7 +322,7 @@ AI_SINGLE_BATTLE_TEST("AI chooses the safest option to faint the target, taking OPPONENT(SPECIES_GEODUDE) { Moves(move1, move2, move3, move4); Ability(abilityAtk); Item(holdItemAtk); } } WHEN { TURN { if (expectedMove2 == MOVE_NONE) { EXPECT_MOVE(opponent, expectedMove); SEND_OUT(player, 1); } - else {EXPECT_MOVES(opponent, expectedMove, expectedMove2); SCORE_EQ(opponent, expectedMove, expectedMove2); SEND_OUT(player, 1);} + else { EXPECT_MOVES(opponent, expectedMove, expectedMove2); SCORE_EQ(opponent, expectedMove, expectedMove2); SEND_OUT(player, 1); } } } SCENE { @@ -490,7 +490,7 @@ AI_SINGLE_BATTLE_TEST("AI will only choose Surf 1/3 times if the opposing mon ha GIVEN { ASSUME(GetMoveType(MOVE_THUNDERBOLT) == TYPE_ELECTRIC); AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT); - PLAYER(SPECIES_LANTURN) { Ability(ABILITY_VOLT_ABSORB); }; + PLAYER(SPECIES_LANTURN) { Ability(ABILITY_VOLT_ABSORB); } OPPONENT(SPECIES_LANTURN) { Moves(MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_SURF); } } WHEN { TURN { EXPECT_MOVE(opponent, MOVE_SURF); } @@ -507,7 +507,7 @@ AI_SINGLE_BATTLE_TEST("AI will choose Thunderbolt then Surf 2/3 times if the opp GIVEN { ASSUME(GetMoveType(MOVE_THUNDERBOLT) == TYPE_ELECTRIC); AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT); - PLAYER(SPECIES_LANTURN) { Ability(ABILITY_VOLT_ABSORB); }; + PLAYER(SPECIES_LANTURN) { Ability(ABILITY_VOLT_ABSORB); } OPPONENT(SPECIES_LANTURN) { Moves(MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_SURF); } } WHEN { TURN { EXPECT_MOVE(opponent, MOVE_THUNDERBOLT); } @@ -522,8 +522,8 @@ AI_SINGLE_BATTLE_TEST("AI will choose Scratch over Power-up Punch with Contrary" { enum Ability ability; - PARAMETRIZE {ability = ABILITY_SUCTION_CUPS; } - PARAMETRIZE {ability = ABILITY_CONTRARY; } + PARAMETRIZE { ability = ABILITY_SUCTION_CUPS; } + PARAMETRIZE { ability = ABILITY_CONTRARY; } GIVEN { ASSUME(GetMovePower(MOVE_SCRATCH) == 40); ASSUME(GetMoveType(MOVE_SCRATCH) == TYPE_NORMAL); @@ -548,8 +548,8 @@ AI_SINGLE_BATTLE_TEST("AI will choose Superpower over Outrage with Contrary") { enum Ability ability; - PARAMETRIZE {ability = ABILITY_SUCTION_CUPS; } - PARAMETRIZE {ability = ABILITY_CONTRARY; } + PARAMETRIZE { ability = ABILITY_SUCTION_CUPS; } + PARAMETRIZE { ability = ABILITY_CONTRARY; } GIVEN { ASSUME(GetMovePower(MOVE_SUPERPOWER) == 120); ASSUME(GetMoveType(MOVE_SUPERPOWER) == TYPE_FIGHTING); @@ -944,10 +944,10 @@ AI_SINGLE_BATTLE_TEST("AI will prefer resisted move over failing move") GIVEN { WITH_CONFIG(CONFIG_POWDER_GRASS, GEN_6); AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY); - PLAYER(SPECIES_ROSELIA) { Moves(MOVE_ABSORB); }; + PLAYER(SPECIES_ROSELIA) { Moves(MOVE_ABSORB); } OPPONENT(SPECIES_GLOOM) { Moves(MOVE_MEGA_DRAIN, MOVE_STUN_SPORE, MOVE_LEECH_SEED, MOVE_SYNTHESIS); } } WHEN { - TURN { MOVE(player, MOVE_ABSORB); EXPECT_MOVE(opponent, MOVE_MEGA_DRAIN);} + TURN { MOVE(player, MOVE_ABSORB); EXPECT_MOVE(opponent, MOVE_MEGA_DRAIN); } } } diff --git a/test/battle/ai/ai_calc_best_move_score.c b/test/battle/ai/ai_calc_best_move_score.c index 7fcf0ced24..715d30c1f5 100644 --- a/test/battle/ai/ai_calc_best_move_score.c +++ b/test/battle/ai/ai_calc_best_move_score.c @@ -15,7 +15,7 @@ AI_SINGLE_BATTLE_TEST("AI will not further increase Attack / Sp. Atk stat if it || GetMoveEffect(MOVE_HOWL) == EFFECT_ATTACK_UP_USER_ALLY); ASSUME(GetMoveEffect(MOVE_CALM_MIND) == EFFECT_CALM_MIND); AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT); - PLAYER(SPECIES_COMBUSKEN) { Speed(15); Moves(MOVE_SKY_UPPERCUT, MOVE_CELEBRATE); }; + PLAYER(SPECIES_COMBUSKEN) { Speed(15); Moves(MOVE_SKY_UPPERCUT, MOVE_CELEBRATE); } OPPONENT(SPECIES_KANGASKHAN) { Speed(20); Moves(MOVE_CHIP_AWAY, MOVE_SWIFT, move); } } WHEN { TURN { MOVE(player, MOVE_SKY_UPPERCUT); EXPECT_MOVE(opponent, move); } @@ -36,7 +36,7 @@ AI_SINGLE_BATTLE_TEST("AI will not further increase Attack / Sp. Atk stat if it || GetMoveEffect(MOVE_HOWL) == EFFECT_ATTACK_UP_USER_ALLY); ASSUME(GetMoveEffect(MOVE_CALM_MIND) == EFFECT_CALM_MIND); AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT); - PLAYER(SPECIES_COMBUSKEN) { Speed(20); Moves(MOVE_DOUBLE_KICK, MOVE_CELEBRATE); }; + PLAYER(SPECIES_COMBUSKEN) { Speed(20); Moves(MOVE_DOUBLE_KICK, MOVE_CELEBRATE); } OPPONENT(SPECIES_KANGASKHAN) { Speed(15); Moves(MOVE_CHIP_AWAY, MOVE_SWIFT, move); } } WHEN { TURN { MOVE(player, MOVE_DOUBLE_KICK); EXPECT_MOVE(opponent, move); } @@ -48,7 +48,7 @@ AI_SINGLE_BATTLE_TEST("AI will increase speed if it is slower") { GIVEN { AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT); - PLAYER(SPECIES_COMBUSKEN) { Speed(20); Moves(MOVE_DOUBLE_KICK, MOVE_CELEBRATE); }; + PLAYER(SPECIES_COMBUSKEN) { Speed(20); Moves(MOVE_DOUBLE_KICK, MOVE_CELEBRATE); } OPPONENT(SPECIES_KANGASKHAN) { Speed(15); Moves(MOVE_CHIP_AWAY, MOVE_AGILITY); } } WHEN { TURN { MOVE(player, MOVE_DOUBLE_KICK); EXPECT_MOVE(opponent, MOVE_AGILITY); } @@ -69,7 +69,7 @@ AI_SINGLE_BATTLE_TEST("AI will not waste a turn setting up if it knows target ca || GetMoveEffect(MOVE_HOWL) == EFFECT_ATTACK_UP_USER_ALLY); ASSUME(GetMoveEffect(MOVE_CALM_MIND) == EFFECT_CALM_MIND); AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT | AI_FLAG_OMNISCIENT); - PLAYER(SPECIES_COMBUSKEN) { Speed(15); Moves(MOVE_SKY_UPPERCUT, MOVE_DOUBLE_KICK, MOVE_FLAME_WHEEL, MOVE_CELEBRATE); }; + PLAYER(SPECIES_COMBUSKEN) { Speed(15); Moves(MOVE_SKY_UPPERCUT, MOVE_DOUBLE_KICK, MOVE_FLAME_WHEEL, MOVE_CELEBRATE); } OPPONENT(SPECIES_KANGASKHAN) { Speed(20); Moves(MOVE_CHIP_AWAY, MOVE_SWIFT, move); } } WHEN { TURN { MOVE(player, MOVE_DOUBLE_KICK); EXPECT_MOVE(opponent, move); } @@ -86,12 +86,12 @@ AI_SINGLE_BATTLE_TEST("AI will not use Throat Chop if opposing mon has a better ASSUME(GetMovePower(MOVE_FLAME_BURST) == 70); ASSUME(MoveHasAdditionalEffect(MOVE_THROAT_CHOP, MOVE_EFFECT_THROAT_CHOP) == TRUE); AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT); - PLAYER(SPECIES_REGIROCK) { Speed(15); Moves(MOVE_DISARMING_VOICE, MOVE_FLAME_BURST); }; + PLAYER(SPECIES_REGIROCK) { Speed(15); Moves(MOVE_DISARMING_VOICE, MOVE_FLAME_BURST); } OPPONENT(SPECIES_WOBBUFFET) { Speed(20); Moves(MOVE_THROAT_CHOP, MOVE_PSYCHIC_FANGS); } } WHEN { TURN { EXPECT_MOVE(opponent, MOVE_PSYCHIC_FANGS); MOVE(player, MOVE_FLAME_BURST); } TURN { EXPECT_MOVE(opponent, MOVE_PSYCHIC_FANGS); MOVE(player, MOVE_DISARMING_VOICE); } - TURN { EXPECT_MOVE(opponent, MOVE_PSYCHIC_FANGS); MOVE(player, MOVE_FLAME_BURST);} + TURN { EXPECT_MOVE(opponent, MOVE_PSYCHIC_FANGS); MOVE(player, MOVE_FLAME_BURST); } } } @@ -104,12 +104,12 @@ AI_SINGLE_BATTLE_TEST("AI will select Throat Chop if the sound move is the best ASSUME(GetMovePower(MOVE_FLAME_BURST) == 70); ASSUME(GetMovePower(MOVE_HYPER_VOICE) == 90); AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT); - PLAYER(SPECIES_REGIROCK) { Speed(15); Moves(MOVE_HYPER_VOICE, MOVE_FLAME_BURST); }; + PLAYER(SPECIES_REGIROCK) { Speed(15); Moves(MOVE_HYPER_VOICE, MOVE_FLAME_BURST); } OPPONENT(SPECIES_WOBBUFFET) { Speed(20); Moves(MOVE_THROAT_CHOP, MOVE_PSYCHIC_FANGS); } } WHEN { TURN { EXPECT_MOVE(opponent, MOVE_PSYCHIC_FANGS); MOVE(player, MOVE_FLAME_BURST); } TURN { EXPECT_MOVE(opponent, MOVE_PSYCHIC_FANGS); MOVE(player, MOVE_HYPER_VOICE); } - TURN { EXPECT_MOVE(opponent, MOVE_THROAT_CHOP); MOVE(player, MOVE_HYPER_VOICE);} + TURN { EXPECT_MOVE(opponent, MOVE_THROAT_CHOP); MOVE(player, MOVE_HYPER_VOICE); } } } diff --git a/test/battle/ai/ai_check_viability.c b/test/battle/ai/ai_check_viability.c index 5ec4161a17..0e6170b5fa 100644 --- a/test/battle/ai/ai_check_viability.c +++ b/test/battle/ai/ai_check_viability.c @@ -456,7 +456,7 @@ AI_DOUBLE_BATTLE_TEST("AI sees type-changing moves as the correct type") PLAYER(SPECIES_WOBBUFFET); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET) { Moves(fieldStatus, MOVE_RETURN, MOVE_TAUNT); } - OPPONENT(species) { Ability(ability); Moves(MOVE_HYPER_VOICE); } + OPPONENT(species) { Ability(ability); Moves(MOVE_HYPER_VOICE); } } WHEN { if (ability != ABILITY_NONE) TURN { EXPECT_MOVE(opponentLeft, fieldStatus); } diff --git a/test/battle/ai/ai_doubles.c b/test/battle/ai/ai_doubles.c index 746789cf5e..f1edc31fbb 100644 --- a/test/battle/ai/ai_doubles.c +++ b/test/battle/ai/ai_doubles.c @@ -23,11 +23,12 @@ AI_DOUBLE_BATTLE_TEST("AI won't use a Weather changing move if partner already c OPPONENT(SPECIES_WOBBUFFET) { Moves(weatherMoveLeft); } OPPONENT(SPECIES_WOBBUFFET) { Moves(MOVE_SCRATCH, weatherMoveRight); } } WHEN { - TURN { NOT_EXPECT_MOVE(opponentRight, weatherMoveRight); - SCORE_LT_VAL(opponentRight, weatherMoveRight, AI_SCORE_DEFAULT, target:playerLeft); - SCORE_LT_VAL(opponentRight, weatherMoveRight, AI_SCORE_DEFAULT, target:playerRight); - SCORE_LT_VAL(opponentRight, weatherMoveRight, AI_SCORE_DEFAULT, target:opponentLeft); - } + TURN { + NOT_EXPECT_MOVE(opponentRight, weatherMoveRight); + SCORE_LT_VAL(opponentRight, weatherMoveRight, AI_SCORE_DEFAULT, target:playerLeft); + SCORE_LT_VAL(opponentRight, weatherMoveRight, AI_SCORE_DEFAULT, target:playerRight); + SCORE_LT_VAL(opponentRight, weatherMoveRight, AI_SCORE_DEFAULT, target:opponentLeft); + } } } @@ -46,11 +47,12 @@ AI_DOUBLE_BATTLE_TEST("AI will not use Helping Hand if partner does not have any OPPONENT(SPECIES_WOBBUFFET) { Moves(MOVE_HELPING_HAND, MOVE_SCRATCH); } OPPONENT(SPECIES_WOBBUFFET) { Moves(move1, move2, move3, move4); } } WHEN { - TURN { NOT_EXPECT_MOVE(opponentLeft, MOVE_HELPING_HAND); - SCORE_LT_VAL(opponentLeft, MOVE_HELPING_HAND, AI_SCORE_DEFAULT, target:playerLeft); - SCORE_LT_VAL(opponentLeft, MOVE_HELPING_HAND, AI_SCORE_DEFAULT, target:playerRight); - SCORE_LT_VAL(opponentLeft, MOVE_HELPING_HAND, AI_SCORE_DEFAULT, target:opponentLeft); - } + TURN { + NOT_EXPECT_MOVE(opponentLeft, MOVE_HELPING_HAND); + SCORE_LT_VAL(opponentLeft, MOVE_HELPING_HAND, AI_SCORE_DEFAULT, target:playerLeft); + SCORE_LT_VAL(opponentLeft, MOVE_HELPING_HAND, AI_SCORE_DEFAULT, target:playerRight); + SCORE_LT_VAL(opponentLeft, MOVE_HELPING_HAND, AI_SCORE_DEFAULT, target:opponentLeft); + } } SCENE { NOT MESSAGE("The opposing Wobbuffet used Helping Hand!"); } @@ -157,12 +159,13 @@ AI_DOUBLE_BATTLE_TEST("AI will not use a status move if partner already chose He OPPONENT(SPECIES_WOBBUFFET) { Moves(MOVE_HELPING_HAND, MOVE_EXPLOSION); } OPPONENT(SPECIES_WOBBUFFET) { Moves(MOVE_SCRATCH, statusMove, MOVE_WATER_GUN); } } WHEN { - TURN { EXPECT_MOVE(opponentLeft, MOVE_HELPING_HAND); - NOT_EXPECT_MOVE(opponentRight, statusMove); - SCORE_LT_VAL(opponentRight, statusMove, AI_SCORE_DEFAULT, target:playerLeft); - SCORE_LT_VAL(opponentRight, statusMove, AI_SCORE_DEFAULT, target:playerRight); - SCORE_LT_VAL(opponentRight, statusMove, AI_SCORE_DEFAULT, target:opponentLeft); - } + TURN { + EXPECT_MOVE(opponentLeft, MOVE_HELPING_HAND); + NOT_EXPECT_MOVE(opponentRight, statusMove); + SCORE_LT_VAL(opponentRight, statusMove, AI_SCORE_DEFAULT, target:playerLeft); + SCORE_LT_VAL(opponentRight, statusMove, AI_SCORE_DEFAULT, target:playerRight); + SCORE_LT_VAL(opponentRight, statusMove, AI_SCORE_DEFAULT, target:opponentLeft); + } } SCENE { MESSAGE("The opposing Wobbuffet used Helping Hand!"); } @@ -415,7 +418,7 @@ AI_DOUBLE_BATTLE_TEST("AI will choose Earthquake if it kills both opposing mons" PLAYER(SPECIES_WOBBUFFET) { HP(1); } PLAYER(SPECIES_WOBBUFFET) { HP(1); } OPPONENT(SPECIES_WOBBUFFET) { Moves(MOVE_EARTHQUAKE, MOVE_SCRATCH); } - OPPONENT(SPECIES_PARAS) { Moves(MOVE_CELEBRATE); HP(1); } + OPPONENT(SPECIES_PARAS) { Moves(MOVE_CELEBRATE); HP(1); } } WHEN { TURN { EXPECT_MOVE(opponentLeft, MOVE_EARTHQUAKE); } } @@ -437,7 +440,7 @@ AI_DOUBLE_BATTLE_TEST("AI will trigger its ally's Weakness Policy") PLAYER(SPECIES_WOBBUFFET); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET) { Moves(MOVE_EARTHQUAKE, MOVE_STOMPING_TANTRUM); } - OPPONENT(species) { Moves(MOVE_CELEBRATE); Item(ITEM_WEAKNESS_POLICY); } + OPPONENT(species) { Moves(MOVE_CELEBRATE); Item(ITEM_WEAKNESS_POLICY); } } WHEN { if (species == SPECIES_INCINEROAR) TURN { EXPECT_MOVE(opponentLeft, MOVE_EARTHQUAKE); } @@ -655,7 +658,7 @@ AI_DOUBLE_BATTLE_TEST("AI sets up terrain for its ally") PLAYER(SPECIES_WOBBUFFET); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET) { Moves(goodTerrain, badTerrain, MOVE_RETURN, MOVE_TAUNT); } - OPPONENT(SPECIES_WOBBUFFET) { Moves(terrainTrigger, MOVE_EARTH_POWER); } + OPPONENT(SPECIES_WOBBUFFET) { Moves(terrainTrigger, MOVE_EARTH_POWER); } } WHEN { TURN { EXPECT_MOVE(opponentLeft, goodTerrain); } } @@ -724,12 +727,12 @@ AI_DOUBLE_BATTLE_TEST("AI uses Trick Room with both battlers on the turn it expi OPPONENT(SPECIES_WYNAUT) { Moves(MOVE_TRICK_ROOM, MOVE_PSYCHIC); Speed(2); } OPPONENT(SPECIES_WOBBUFFET) { Moves(MOVE_TRICK_ROOM, MOVE_PSYCHIC); Speed(1); } } WHEN { - TURN { EXPECT_MOVE(opponentLeft, MOVE_TRICK_ROOM); NOT_EXPECT_MOVE(opponentRight, MOVE_TRICK_ROOM); } - TURN { NOT_EXPECT_MOVE(opponentLeft, MOVE_TRICK_ROOM); NOT_EXPECT_MOVE(opponentRight, MOVE_TRICK_ROOM); } - TURN { NOT_EXPECT_MOVE(opponentLeft, MOVE_TRICK_ROOM); NOT_EXPECT_MOVE(opponentRight, MOVE_TRICK_ROOM); } - TURN { NOT_EXPECT_MOVE(opponentLeft, MOVE_TRICK_ROOM); NOT_EXPECT_MOVE(opponentRight, MOVE_TRICK_ROOM); } - TURN { EXPECT_MOVE(opponentLeft, MOVE_TRICK_ROOM); EXPECT_MOVE(opponentRight, MOVE_TRICK_ROOM); } - } + TURN { EXPECT_MOVE(opponentLeft, MOVE_TRICK_ROOM); NOT_EXPECT_MOVE(opponentRight, MOVE_TRICK_ROOM); } + TURN { NOT_EXPECT_MOVE(opponentLeft, MOVE_TRICK_ROOM); NOT_EXPECT_MOVE(opponentRight, MOVE_TRICK_ROOM); } + TURN { NOT_EXPECT_MOVE(opponentLeft, MOVE_TRICK_ROOM); NOT_EXPECT_MOVE(opponentRight, MOVE_TRICK_ROOM); } + TURN { NOT_EXPECT_MOVE(opponentLeft, MOVE_TRICK_ROOM); NOT_EXPECT_MOVE(opponentRight, MOVE_TRICK_ROOM); } + TURN { EXPECT_MOVE(opponentLeft, MOVE_TRICK_ROOM); EXPECT_MOVE(opponentRight, MOVE_TRICK_ROOM); } + } } AI_DOUBLE_BATTLE_TEST("AI uses Helping Hand if it's about to die") @@ -747,10 +750,10 @@ AI_DOUBLE_BATTLE_TEST("AI uses Helping Hand if it's about to die") OPPONENT(SPECIES_WOBBUFFET) { HP(hp); Moves(MOVE_HELPING_HAND, MOVE_MUDDY_WATER); } OPPONENT(SPECIES_WOBBUFFET) { Moves(MOVE_MUDDY_WATER); } } WHEN { - if (hp == 1) - TURN { EXPECT_MOVE(opponentLeft, MOVE_HELPING_HAND); } - else - TURN { NOT_EXPECT_MOVE(opponentLeft, MOVE_HELPING_HAND); } + if (hp == 1) + TURN { EXPECT_MOVE(opponentLeft, MOVE_HELPING_HAND); } + else + TURN { NOT_EXPECT_MOVE(opponentLeft, MOVE_HELPING_HAND); } } } diff --git a/test/battle/ai/ai_flag_attacks_partner.c b/test/battle/ai/ai_flag_attacks_partner.c index 4f2533fa5b..ddc4ced5fd 100644 --- a/test/battle/ai/ai_flag_attacks_partner.c +++ b/test/battle/ai/ai_flag_attacks_partner.c @@ -26,12 +26,11 @@ AI_DOUBLE_BATTLE_TEST("AI_FLAG_ATTACKS_PARTNER is willing to kill either the par ASSUME(gSpeciesInfo[SPECIES_ZIGZAGOON].baseDefense == 41); AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT | AI_FLAG_ATTACKS_PARTNER); PLAYER(SPECIES_ZIGZAGOON) { Level(50); } - PLAYER(SPECIES_ZIGZAGOON) { Level(16); } + PLAYER(SPECIES_ZIGZAGOON) { Level(16); } OPPONENT(SPECIES_ZIGZAGOON) { Level(50); Moves(move, MOVE_OVERDRIVE, MOVE_TACKLE); } OPPONENT(SPECIES_ZIGZAGOON) { Level(level); Moves(MOVE_CELEBRATE); } } WHEN { - TURN - { + TURN { if (move == MOVE_MIGHTY_CLEAVE) { if (level == 1) @@ -46,7 +45,7 @@ AI_DOUBLE_BATTLE_TEST("AI_FLAG_ATTACKS_PARTNER is willing to kill either the par else EXPECT_MOVE(opponentLeft, MOVE_OVERDRIVE); } - } + } } } @@ -59,18 +58,16 @@ AI_DOUBLE_BATTLE_TEST("AI_FLAG_ATTACKS_PARTNER steps on its ally's weather") GIVEN { AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT | AI_FLAG_ATTACKS_PARTNER); - PLAYER(SPECIES_WOBBUFFET) { Speed(50); } - PLAYER(SPECIES_WOBBUFFET) { Speed(50); } + PLAYER(SPECIES_WOBBUFFET) { Speed(50); } + PLAYER(SPECIES_WOBBUFFET) { Speed(50); } OPPONENT(SPECIES_WOBBUFFET) { Speed(75); Moves(weather1, move1, MOVE_HEADBUTT); } OPPONENT(SPECIES_WOBBUFFET) { Speed(100); Moves(weather2, move2, MOVE_HEADBUTT); } } WHEN { - TURN - { + TURN { EXPECT_MOVE(opponentLeft, weather1); EXPECT_MOVE(opponentRight, weather2); } - TURN - { + TURN { EXPECT_MOVE(opponentLeft, move1); EXPECT_MOVE(opponentRight, weather2); } diff --git a/test/battle/ai/ai_flag_predict_ability.c b/test/battle/ai/ai_flag_predict_ability.c index 9d85773e3e..46ffb53ca0 100644 --- a/test/battle/ai/ai_flag_predict_ability.c +++ b/test/battle/ai/ai_flag_predict_ability.c @@ -8,7 +8,7 @@ AI_SINGLE_BATTLE_TEST("AI_FLAG_WEIGH_ABILITY_PREDICTION: AI will predict opposin GIVEN { ASSUME(GetMoveType(MOVE_THUNDERBOLT) == TYPE_ELECTRIC); AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT | AI_FLAG_WEIGH_ABILITY_PREDICTION); - PLAYER(SPECIES_LANTURN) { Ability(ABILITY_VOLT_ABSORB); }; + PLAYER(SPECIES_LANTURN) { Ability(ABILITY_VOLT_ABSORB); } OPPONENT(SPECIES_LANTURN) { Moves(MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_SURF); } } WHEN { TURN { EXPECT_MOVE(opponent, MOVE_THUNDERBOLT); } diff --git a/test/battle/ai/ai_flag_sequence_switching.c b/test/battle/ai/ai_flag_sequence_switching.c index 56d7eb881f..3c9136bdb8 100644 --- a/test/battle/ai/ai_flag_sequence_switching.c +++ b/test/battle/ai/ai_flag_sequence_switching.c @@ -44,7 +44,7 @@ AI_SINGLE_BATTLE_TEST("AI_FLAG_SEQUENCE_SWITCHING: Roar and Dragon Tail still fo u32 move; PARAMETRIZE { move = MOVE_ROAR; } - PARAMETRIZE {move = MOVE_DRAGON_TAIL; } + PARAMETRIZE { move = MOVE_DRAGON_TAIL; } PASSES_RANDOMLY(1, 2, RNG_FORCE_RANDOM_SWITCH); GIVEN { diff --git a/test/battle/ai/ai_multi.c b/test/battle/ai/ai_multi.c index 408a37f276..3fcc02d4c3 100644 --- a/test/battle/ai/ai_multi.c +++ b/test/battle/ai/ai_multi.c @@ -73,10 +73,10 @@ AI_MULTI_BATTLE_TEST("AI partner makes sensible move selections in battle (multi MULTI_PARTNER(SPECIES_GENGAR) { Moves(MOVE_SHADOW_BALL, MOVE_AURA_SPHERE); } MULTI_OPPONENT_A(SPECIES_RATTATA) { Moves(MOVE_CELEBRATE); HP(1); } MULTI_OPPONENT_B(SPECIES_KANGASKHAN) { Moves(MOVE_CELEBRATE); } - + } WHEN { - TURN { MOVE(playerLeft, MOVE_AURA_SPHERE, target:opponentRight); EXPECT_MOVE(playerRight, MOVE_AURA_SPHERE, target:opponentLeft); }; - } + TURN { MOVE(playerLeft, MOVE_AURA_SPHERE, target:opponentRight); EXPECT_MOVE(playerRight, MOVE_AURA_SPHERE, target:opponentLeft); } + } } // Used to test EXPECT_MOVE only on partner @@ -90,10 +90,10 @@ AI_TWO_VS_ONE_BATTLE_TEST("AI partner makes sensible move selections in battle ( MULTI_PARTNER(SPECIES_GENGAR) { Moves(MOVE_SHADOW_BALL, MOVE_AURA_SPHERE); } MULTI_OPPONENT_A(SPECIES_RATTATA) { Moves(MOVE_CELEBRATE); HP(1); } MULTI_OPPONENT_A(SPECIES_KANGASKHAN) { Moves(MOVE_CELEBRATE); } - + } WHEN { - TURN { MOVE(playerLeft, MOVE_AURA_SPHERE, target:opponentRight); EXPECT_MOVE(playerRight, MOVE_AURA_SPHERE, target:opponentLeft); }; - } + TURN { MOVE(playerLeft, MOVE_AURA_SPHERE, target:opponentRight); EXPECT_MOVE(playerRight, MOVE_AURA_SPHERE, target:opponentLeft); } + } } AI_TWO_VS_ONE_BATTLE_TEST("Battler 3 has Battler 1 AI flags set correctly (2v1)") @@ -138,7 +138,7 @@ AI_MULTI_BATTLE_TEST("Partner will not steal your pokemon when running out") MULTI_OPPONENT_A(SPECIES_WOBBUFFET) { Moves(MOVE_CELEBRATE); } MULTI_OPPONENT_B(SPECIES_WOBBUFFET) { Moves(MOVE_CELEBRATE); } } WHEN { - TURN {EXPECT_MOVE(playerRight, MOVE_MEMENTO, target:opponentLeft);} + TURN { EXPECT_MOVE(playerRight, MOVE_MEMENTO, target:opponentLeft); } TURN {} } THEN { EXPECT_EQ(gAbsentBattlerFlags, (1u << GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT))); @@ -159,7 +159,7 @@ AI_MULTI_BATTLE_TEST("Partner will not steal your pokemon to delay using their a MULTI_OPPONENT_A(SPECIES_WOBBUFFET) { Moves(MOVE_CELEBRATE); } MULTI_OPPONENT_B(SPECIES_WOBBUFFET) { Moves(MOVE_CELEBRATE); } } WHEN { - TURN {EXPECT_MOVE(playerRight, MOVE_MEMENTO, target:opponentLeft);} + TURN { EXPECT_MOVE(playerRight, MOVE_MEMENTO, target:opponentLeft); } TURN {} } THEN { EXPECT_EQ(SPECIES_METAGROSS, playerRight->species); @@ -174,12 +174,12 @@ AI_MULTI_BATTLE_TEST("AI opponents do not steal their partner pokemon in multi b BATTLER_AI_FLAGS(B_POSITION_OPPONENT_LEFT, AI_FLAG_ACE_POKEMON); MULTI_PLAYER(SPECIES_WOBBUFFET) { } MULTI_PARTNER(SPECIES_WOBBUFFET) { } - MULTI_OPPONENT_A(SPECIES_WOBBUFFET) { Moves(MOVE_CELEBRATE); HP(1);} + MULTI_OPPONENT_A(SPECIES_WOBBUFFET) { Moves(MOVE_CELEBRATE); HP(1); } MULTI_OPPONENT_A(SPECIES_VENUSAUR) { Moves(MOVE_GIGA_DRAIN); } MULTI_OPPONENT_B(SPECIES_WYNAUT) { Moves(MOVE_CELEBRATE); } } WHEN { - TURN {MOVE(playerLeft, MOVE_TACKLE, target: opponentLeft); } - TURN {MOVE(playerLeft, MOVE_TACKLE, target: opponentLeft); } + TURN { MOVE(playerLeft, MOVE_TACKLE, target: opponentLeft); } + TURN { MOVE(playerLeft, MOVE_TACKLE, target: opponentLeft); } } THEN { EXPECT_EQ(SPECIES_VENUSAUR, opponentLeft->species); } @@ -188,19 +188,19 @@ AI_MULTI_BATTLE_TEST("AI opponents do not steal their partner pokemon in multi b AI_MULTI_BATTLE_TEST("AI opponents do not steal their partner pokemon in multi battle when forced out") { u32 item, move; - PARAMETRIZE {item = ITEM_EJECT_BUTTON; move = MOVE_TACKLE;} - PARAMETRIZE {item = ITEM_EJECT_PACK; move = MOVE_TAIL_WHIP;} - PARAMETRIZE {item = ITEM_NONE; move = MOVE_ROAR;} + PARAMETRIZE { item = ITEM_EJECT_BUTTON; move = MOVE_TACKLE; } + PARAMETRIZE { item = ITEM_EJECT_PACK; move = MOVE_TAIL_WHIP; } + PARAMETRIZE { item = ITEM_NONE; move = MOVE_ROAR; } GIVEN { AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT); BATTLER_AI_FLAGS(B_POSITION_OPPONENT_LEFT, AI_FLAG_ACE_POKEMON); MULTI_PLAYER(SPECIES_WOBBUFFET) { } MULTI_PARTNER(SPECIES_WOBBUFFET) { } - MULTI_OPPONENT_A(SPECIES_WOBBUFFET) { Moves(MOVE_CELEBRATE); Item(item);} + MULTI_OPPONENT_A(SPECIES_WOBBUFFET) { Moves(MOVE_CELEBRATE); Item(item); } MULTI_OPPONENT_A(SPECIES_VENUSAUR) { Moves(MOVE_GIGA_DRAIN); } MULTI_OPPONENT_B(SPECIES_WYNAUT) { Moves(MOVE_CELEBRATE); } } WHEN { - TURN {MOVE(playerLeft, move, target: opponentLeft); } + TURN { MOVE(playerLeft, move, target: opponentLeft); } } THEN { EXPECT_EQ(SPECIES_VENUSAUR, opponentLeft->species); } @@ -213,11 +213,11 @@ AI_MULTI_BATTLE_TEST("AI opponents do not steal their partner pokemon in multi b BATTLER_AI_FLAGS(B_POSITION_OPPONENT_LEFT, AI_FLAG_ACE_POKEMON); MULTI_PLAYER(SPECIES_WOBBUFFET) { } MULTI_PARTNER(SPECIES_WOBBUFFET) { } - MULTI_OPPONENT_A(SPECIES_GOLISOPOD) { Moves(MOVE_CELEBRATE); HP(101); MaxHP(200); Ability(ABILITY_EMERGENCY_EXIT);} + MULTI_OPPONENT_A(SPECIES_GOLISOPOD) { Moves(MOVE_CELEBRATE); HP(101); MaxHP(200); Ability(ABILITY_EMERGENCY_EXIT); } MULTI_OPPONENT_A(SPECIES_VENUSAUR) { Moves(MOVE_GIGA_DRAIN); } MULTI_OPPONENT_B(SPECIES_WYNAUT) { Moves(MOVE_CELEBRATE); } } WHEN { - TURN {MOVE(playerLeft, MOVE_TACKLE, target: opponentLeft); } + TURN { MOVE(playerLeft, MOVE_TACKLE, target: opponentLeft); } } THEN { EXPECT_EQ(SPECIES_VENUSAUR, opponentLeft->species); } diff --git a/test/battle/ai/ai_smart_tera.c b/test/battle/ai/ai_smart_tera.c index 7bed476b43..c2127a5787 100644 --- a/test/battle/ai/ai_smart_tera.c +++ b/test/battle/ai/ai_smart_tera.c @@ -31,7 +31,7 @@ AI_SINGLE_BATTLE_TEST("AI_FLAG_SMART_TERA: AI will not tera if it gets outsped a OPPONENT(SPECIES_WOBBUFFET) { HP(60); Speed(1); Moves(MOVE_SEED_BOMB); TeraType(TYPE_GRASS); } OPPONENT(SPECIES_WOBBUFFET) { HP(1); Speed(100); TeraType(TYPE_FIRE); } } WHEN { - TURN { } + TURN {} } SCENE { NOT MESSAGE("The opposing Wobbuffet terastallized into the Grass type!"); } diff --git a/test/battle/ai/ai_switching.c b/test/battle/ai/ai_switching.c index f0eee3ac90..82c3c6d42a 100644 --- a/test/battle/ai/ai_switching.c +++ b/test/battle/ai/ai_switching.c @@ -28,12 +28,12 @@ AI_SINGLE_BATTLE_TEST("AI switches if Perish Song is about to kill") GIVEN { AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT); PLAYER(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_WOBBUFFET) {Moves(MOVE_SCRATCH); } - OPPONENT(SPECIES_CROBAT) {Moves(MOVE_SCRATCH); } + OPPONENT(SPECIES_WOBBUFFET) { Moves(MOVE_SCRATCH); } + OPPONENT(SPECIES_CROBAT) { Moves(MOVE_SCRATCH); } } WHEN { TURN { MOVE(player, MOVE_PERISH_SONG); } - TURN { ; } - TURN { ; } + TURN {} + TURN {} TURN { EXPECT_SWITCH(opponent, 1); } } SCENE { MESSAGE(AI_TRAINER_NAME " sent out Crobat!"); @@ -47,11 +47,11 @@ AI_SINGLE_BATTLE_TEST("AI sees on-field player ability correctly and does not se PARAMETRIZE { testAbility = ABILITY_VOLT_ABSORB; } GIVEN { AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY | AI_FLAG_SMART_SWITCHING | AI_FLAG_SMART_MON_CHOICES | AI_FLAG_OMNISCIENT); - PLAYER(SPECIES_PIKACHU) {Level(100); Moves(MOVE_VOLT_SWITCH, MOVE_SPARKLY_SWIRL); Ability(ABILITY_LIGHTNING_ROD); }; - PLAYER(SPECIES_LANTURN) {Level(44); Moves(MOVE_SCALD); Ability(testAbility); }; - OPPONENT(SPECIES_SOBBLE) {Level(44); Moves(MOVE_SCRATCH); } - OPPONENT(SPECIES_BOMBIRDIER) {Level(42); Moves(MOVE_ROCK_SLIDE); } - OPPONENT(SPECIES_IRON_THORNS) {Level(43); Moves(MOVE_SUPERCELL_SLAM, MOVE_ICE_PUNCH); } + PLAYER(SPECIES_PIKACHU) { Level(100); Moves(MOVE_VOLT_SWITCH, MOVE_SPARKLY_SWIRL); Ability(ABILITY_LIGHTNING_ROD); } + PLAYER(SPECIES_LANTURN) { Level(44); Moves(MOVE_SCALD); Ability(testAbility); } + OPPONENT(SPECIES_SOBBLE) { Level(44); Moves(MOVE_SCRATCH); } + OPPONENT(SPECIES_BOMBIRDIER) { Level(42); Moves(MOVE_ROCK_SLIDE); } + OPPONENT(SPECIES_IRON_THORNS) { Level(43); Moves(MOVE_SUPERCELL_SLAM, MOVE_ICE_PUNCH); } } WHEN { TURN { MOVE(player, MOVE_VOLT_SWITCH); @@ -66,8 +66,8 @@ AI_DOUBLE_BATTLE_TEST("AI will not try to switch for the same Pokémon for 2 spo { u32 flags; - PARAMETRIZE {flags = AI_FLAG_SMART_SWITCHING; } - PARAMETRIZE {flags = 0; } + PARAMETRIZE { flags = AI_FLAG_SMART_SWITCHING; } + PARAMETRIZE { flags = 0; } PASSES_RANDOMLY(SHOULD_SWITCH_ALL_MOVES_BAD_PERCENTAGE, 100, RNG_AI_SWITCH_ALL_MOVES_BAD); GIVEN { @@ -80,7 +80,7 @@ AI_DOUBLE_BATTLE_TEST("AI will not try to switch for the same Pokémon for 2 spo OPPONENT(SPECIES_GENGAR) { Moves(MOVE_SHADOW_BALL); } OPPONENT(SPECIES_RATICATE) { Moves(MOVE_HEADBUTT); } } WHEN { - TURN { EXPECT_SWITCH(opponentLeft, 3); }; + TURN { EXPECT_SWITCH(opponentLeft, 3); } } SCENE { MESSAGE(AI_TRAINER_NAME " withdrew Gengar!"); MESSAGE(AI_TRAINER_NAME " sent out Raticate!"); @@ -96,8 +96,8 @@ AI_MULTI_BATTLE_TEST("AI partner will not switch mid-turn into a player Pokémon { u32 flags; - PARAMETRIZE {flags = AI_FLAG_SMART_SWITCHING; } - PARAMETRIZE {flags = 0; } + PARAMETRIZE { flags = AI_FLAG_SMART_SWITCHING; } + PARAMETRIZE { flags = 0; } PASSES_RANDOMLY(SHOULD_SWITCH_ALL_MOVES_BAD_PERCENTAGE, 100, RNG_AI_SWITCH_ALL_MOVES_BAD); GIVEN { @@ -112,7 +112,7 @@ AI_MULTI_BATTLE_TEST("AI partner will not switch mid-turn into a player Pokémon MULTI_OPPONENT_B(SPECIES_KANGASKHAN) { Moves(MOVE_CELEBRATE); } } WHEN { - TURN { EXPECT_SWITCH(playerRight, 5); }; + TURN { EXPECT_SWITCH(playerRight, 5); } } SCENE { MESSAGE(AI_PARTNER_NAME " withdrew Gengar!"); MESSAGE(AI_PARTNER_NAME " sent out Raticate!"); @@ -128,8 +128,8 @@ AI_TWO_VS_ONE_BATTLE_TEST("AI partner will not switch mid-turn into a player Pok { u32 flags; - PARAMETRIZE {flags = AI_FLAG_SMART_SWITCHING; } - PARAMETRIZE {flags = 0; } + PARAMETRIZE { flags = AI_FLAG_SMART_SWITCHING; } + PARAMETRIZE { flags = 0; } PASSES_RANDOMLY(SHOULD_SWITCH_ALL_MOVES_BAD_PERCENTAGE, 100, RNG_AI_SWITCH_ALL_MOVES_BAD); GIVEN { @@ -144,7 +144,7 @@ AI_TWO_VS_ONE_BATTLE_TEST("AI partner will not switch mid-turn into a player Pok MULTI_OPPONENT_A(SPECIES_KANGASKHAN) { Moves(MOVE_CELEBRATE); } } WHEN { - TURN { EXPECT_SWITCH(playerRight, 5); }; + TURN { EXPECT_SWITCH(playerRight, 5); } } SCENE { MESSAGE(AI_PARTNER_NAME " withdrew Gengar!"); MESSAGE(AI_PARTNER_NAME " sent out Raticate!"); @@ -160,8 +160,8 @@ AI_MULTI_BATTLE_TEST("AI partner will not switch into a player Pokémon after fa { u32 flags; - PARAMETRIZE {flags = AI_FLAG_SMART_SWITCHING; } - PARAMETRIZE {flags = 0; } + PARAMETRIZE { flags = AI_FLAG_SMART_SWITCHING; } + PARAMETRIZE { flags = 0; } PASSES_RANDOMLY(SHOULD_SWITCH_ALL_MOVES_BAD_PERCENTAGE, 100, RNG_AI_SWITCH_ALL_MOVES_BAD); GIVEN { @@ -176,7 +176,7 @@ AI_MULTI_BATTLE_TEST("AI partner will not switch into a player Pokémon after fa MULTI_OPPONENT_B(SPECIES_VIBRAVA) { Moves(MOVE_CELEBRATE); } } WHEN { - TURN { EXPECT_MOVE(playerRight, MOVE_CELEBRATE); EXPECT_SEND_OUT(playerRight, 5); }; + TURN { EXPECT_MOVE(playerRight, MOVE_CELEBRATE); EXPECT_SEND_OUT(playerRight, 5); } } SCENE { MESSAGE(AI_PARTNER_NAME " sent out Haunter!"); NONE_OF { @@ -190,8 +190,8 @@ AI_TWO_VS_ONE_BATTLE_TEST("AI partner will not switch into a player Pokémon aft { u32 flags; - PARAMETRIZE {flags = AI_FLAG_SMART_SWITCHING; } - PARAMETRIZE {flags = 0; } + PARAMETRIZE { flags = AI_FLAG_SMART_SWITCHING; } + PARAMETRIZE { flags = 0; } PASSES_RANDOMLY(SHOULD_SWITCH_ALL_MOVES_BAD_PERCENTAGE, 100, RNG_AI_SWITCH_ALL_MOVES_BAD); GIVEN { @@ -206,7 +206,7 @@ AI_TWO_VS_ONE_BATTLE_TEST("AI partner will not switch into a player Pokémon aft MULTI_OPPONENT_A(SPECIES_VIBRAVA) { Moves(MOVE_CELEBRATE); } } WHEN { - TURN { EXPECT_MOVE(playerRight, MOVE_CELEBRATE); EXPECT_SEND_OUT(playerRight, 5); }; + TURN { EXPECT_MOVE(playerRight, MOVE_CELEBRATE); EXPECT_SEND_OUT(playerRight, 5); } } SCENE { MESSAGE(AI_PARTNER_NAME " sent out Haunter!"); NONE_OF { @@ -220,8 +220,8 @@ AI_MULTI_BATTLE_TEST("AI partner will not switch into a player Pokémon (multi)" { u32 flags; - PARAMETRIZE {flags = AI_FLAG_SMART_SWITCHING; } - PARAMETRIZE {flags = 0; } + PARAMETRIZE { flags = AI_FLAG_SMART_SWITCHING; } + PARAMETRIZE { flags = 0; } PASSES_RANDOMLY(SHOULD_SWITCH_ALL_MOVES_BAD_PERCENTAGE, 100, RNG_AI_SWITCH_ALL_MOVES_BAD); GIVEN { @@ -235,8 +235,8 @@ AI_MULTI_BATTLE_TEST("AI partner will not switch into a player Pokémon (multi)" MULTI_OPPONENT_B(SPECIES_KANGASKHAN) { Moves(MOVE_CELEBRATE); } } WHEN { - TURN { MOVE(playerLeft, MOVE_AURA_SPHERE, target:playerRight); EXPECT_SWITCH(playerRight, 4); EXPECT_SEND_OUT(playerRight, 3); }; - TURN { EXPECT_MOVE(playerRight, MOVE_SHADOW_BALL, target:opponentLeft); }; + TURN { MOVE(playerLeft, MOVE_AURA_SPHERE, target:playerRight); EXPECT_SWITCH(playerRight, 4); EXPECT_SEND_OUT(playerRight, 3); } + TURN { EXPECT_MOVE(playerRight, MOVE_SHADOW_BALL, target:opponentLeft); } } SCENE { MESSAGE(AI_PARTNER_NAME " sent out Raticate!"); NONE_OF { @@ -250,8 +250,8 @@ AI_TWO_VS_ONE_BATTLE_TEST("AI partner will not switch into a player Pokémon (2v { u32 flags; - PARAMETRIZE {flags = AI_FLAG_SMART_SWITCHING; } - PARAMETRIZE {flags = 0; } + PARAMETRIZE { flags = AI_FLAG_SMART_SWITCHING; } + PARAMETRIZE { flags = 0; } PASSES_RANDOMLY(SHOULD_SWITCH_ALL_MOVES_BAD_PERCENTAGE, 100, RNG_AI_SWITCH_ALL_MOVES_BAD); GIVEN { @@ -265,8 +265,8 @@ AI_TWO_VS_ONE_BATTLE_TEST("AI partner will not switch into a player Pokémon (2v MULTI_OPPONENT_A(SPECIES_KANGASKHAN) { Moves(MOVE_CELEBRATE); } } WHEN { - TURN { MOVE(playerLeft, MOVE_AURA_SPHERE, target:playerRight); EXPECT_SWITCH(playerRight, 4); EXPECT_SEND_OUT(playerRight, 3); }; - TURN { EXPECT_MOVE(playerRight, MOVE_SHADOW_BALL, target:opponentLeft); }; + TURN { MOVE(playerLeft, MOVE_AURA_SPHERE, target:playerRight); EXPECT_SWITCH(playerRight, 4); EXPECT_SEND_OUT(playerRight, 3); } + TURN { EXPECT_MOVE(playerRight, MOVE_SHADOW_BALL, target:opponentLeft); } } SCENE { MESSAGE(AI_PARTNER_NAME " sent out Raticate!"); NONE_OF { @@ -279,8 +279,8 @@ AI_TWO_VS_ONE_BATTLE_TEST("AI will not try to switch for the same pokemon for 2 { u32 flags; - PARAMETRIZE {flags = AI_FLAG_SMART_SWITCHING; } - PARAMETRIZE {flags = 0; } + PARAMETRIZE { flags = AI_FLAG_SMART_SWITCHING; } + PARAMETRIZE { flags = 0; } PASSES_RANDOMLY(SHOULD_SWITCH_ALL_MOVES_BAD_PERCENTAGE, 100, RNG_AI_SWITCH_ALL_MOVES_BAD); GIVEN { @@ -294,7 +294,7 @@ AI_TWO_VS_ONE_BATTLE_TEST("AI will not try to switch for the same pokemon for 2 MULTI_OPPONENT_A(SPECIES_GASTLY) { Moves(MOVE_LICK); } MULTI_OPPONENT_A(SPECIES_RATICATE) { Moves(MOVE_HEADBUTT); } } WHEN { - TURN { EXPECT_SWITCH(opponentLeft, 3); }; + TURN { EXPECT_SWITCH(opponentLeft, 3); } } SCENE { MESSAGE(AI_TRAINER_NAME " withdrew Gengar!"); MESSAGE(AI_TRAINER_NAME " sent out Raticate!"); @@ -309,8 +309,8 @@ AI_ONE_VS_TWO_BATTLE_TEST("AI will not switch into a partner Pokémon in a 1v2 b { u32 flags; - PARAMETRIZE {flags = AI_FLAG_SMART_SWITCHING; } - PARAMETRIZE {flags = 0; } + PARAMETRIZE { flags = AI_FLAG_SMART_SWITCHING; } + PARAMETRIZE { flags = 0; } PASSES_RANDOMLY(SHOULD_SWITCH_ALL_MOVES_BAD_PERCENTAGE, 100, RNG_AI_SWITCH_ALL_MOVES_BAD); GIVEN { @@ -324,7 +324,7 @@ AI_ONE_VS_TWO_BATTLE_TEST("AI will not switch into a partner Pokémon in a 1v2 b MULTI_OPPONENT_B(SPECIES_RATICATE) { Moves(MOVE_HEADBUTT); } } WHEN { - TURN { EXPECT_SWITCH(opponentRight, 5); }; + TURN { EXPECT_SWITCH(opponentRight, 5); } } SCENE { MESSAGE(AI_TRAINER_2_NAME " withdrew Gengar!"); MESSAGE(AI_TRAINER_2_NAME " sent out Raticate!"); @@ -359,7 +359,7 @@ AI_SINGLE_BATTLE_TEST("When AI switches out due to having no move that affects t OPPONENT(SPECIES_ABRA) { Moves(MOVE_TACKLE); } OPPONENT(SPECIES_ABRA) { Moves(MOVE_TACKLE); } } WHEN { - TURN { MOVE(player, MOVE_SHADOW_BALL); EXPECT_SWITCH(opponent, 2); EXPECT_SEND_OUT(opponent, 0);} + TURN { MOVE(player, MOVE_SHADOW_BALL); EXPECT_SWITCH(opponent, 2); EXPECT_SEND_OUT(opponent, 0); } TURN { MOVE(player, MOVE_SHADOW_BALL); EXPECT_MOVE(opponent, MOVE_TACKLE); } } } @@ -377,7 +377,7 @@ AI_DOUBLE_BATTLE_TEST("AI will not try to switch for the same Pokémon for 2 spo OPPONENT(SPECIES_LINOONE) { Moves(MOVE_SCRATCH); } OPPONENT(SPECIES_GENGAR) { Moves(MOVE_SHADOW_BALL); } } WHEN { - TURN { EXPECT_SWITCH(opponentLeft, 3); }; + TURN { EXPECT_SWITCH(opponentLeft, 3); } } SCENE { MESSAGE(AI_TRAINER_NAME " withdrew Linoone!"); MESSAGE(AI_TRAINER_NAME " sent out Gengar!"); @@ -423,7 +423,7 @@ AI_SINGLE_BATTLE_TEST("AI_FLAG_SMART_MON_CHOICES: Eject Button will send out Ace GIVEN { AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT | aiSmartMonChoicesFlag | AI_FLAG_ACE_POKEMON); PLAYER(SPECIES_ZIGZAGOON) { Moves(MOVE_SCRATCH); } - OPPONENT(SPECIES_ZIGZAGOON) { Item(ITEM_EJECT_BUTTON); }; + OPPONENT(SPECIES_ZIGZAGOON) { Item(ITEM_EJECT_BUTTON); } OPPONENT(SPECIES_LINOONE); } WHEN { TURN { MOVE(player, MOVE_SCRATCH); EXPECT_MOVE(opponent, MOVE_SCRATCH); EXPECT_SEND_OUT(opponent, 1); } @@ -548,7 +548,7 @@ AI_SINGLE_BATTLE_TEST("AI_FLAG_SMART_MON_CHOICES: AI considers hazard damage whe OPPONENT(SPECIES_CHARIZARD) { Speed(200); Moves(MOVE_FLAMETHROWER); SpAttack(317); SpDefense(207); MaxHP(297); } // Outspeends and 2HKOs Meganium OPPONENT(SPECIES_TYPHLOSION) { Speed(200); Moves(MOVE_FLAMETHROWER); SpAttack(317); SpDefense(207); MaxHP(297); } // Outspeends and 2HKOs Meganium } WHEN { - TURN { MOVE(player, MOVE_STEALTH_ROCK) ;} + TURN { MOVE(player, MOVE_STEALTH_ROCK) ; } TURN { MOVE(player, MOVE_SURF); EXPECT_SEND_OUT(opponent, aiIsSmart ? 2 : 1); } // AI sends out Typhlosion to get the KO with the flag rather than Charizard } } @@ -584,7 +584,7 @@ AI_SINGLE_BATTLE_TEST("AI_FLAG_SMART_MON_CHOICES: Mid-battle switches prioritize PLAYER(SPECIES_SWELLOW) { Level(30); Moves(MOVE_WING_ATTACK, MOVE_BOOMBURST); Speed(5); SpAttack(50); } OPPONENT(SPECIES_PONYTA) { Level(1); Moves(MOVE_NONE); Speed(4); } // Forces switchout OPPONENT(SPECIES_ARON) { Level(30); Moves(MOVE_IRON_HEAD); Speed(4); SpDefense(50); } // Mid battle, AI sends out Aron - OPPONENT(SPECIES_ELECTRODE) { Level(30); Ability(ABILITY_STATIC); Moves(MOVE_CHARGE_BEAM); Speed(6); SpDefense(53);} + OPPONENT(SPECIES_ELECTRODE) { Level(30); Ability(ABILITY_STATIC); Moves(MOVE_CHARGE_BEAM); Speed(6); SpDefense(53); } } WHEN { TURN { MOVE(player, MOVE_WING_ATTACK); EXPECT_SWITCH(opponent, 1); } } @@ -748,7 +748,7 @@ AI_SINGLE_BATTLE_TEST("AI_FLAG_SMART_SWITCHING: AI will switch in trapping mon m ASSUME(GetSpeciesType(SPECIES_GOLURK, 1) == TYPE_GHOST); AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT | aiSmartSwitchingFlag); PLAYER(SPECIES_ELECTRODE) { Speed(4); Moves(MOVE_THUNDERBOLT, MOVE_AURA_SPHERE, MOVE_PROTECT); } - PLAYER(SPECIES_WOBBUFFET) { Speed(1); }; + PLAYER(SPECIES_WOBBUFFET) { Speed(1); } OPPONENT(SPECIES_SNORLAX) { Speed(1); Moves(MOVE_HEADBUTT); } OPPONENT(SPECIES_DUGTRIO) { Speed(3); Ability(ABILITY_ARENA_TRAP); Moves(MOVE_EARTHQUAKE); } OPPONENT(SPECIES_GOLURK) { Speed(5); Moves(MOVE_EARTHQUAKE); } @@ -775,9 +775,9 @@ AI_SINGLE_BATTLE_TEST("AI_FLAG_SMART_MON_CHOICES: AI will switch in trapping mon OPPONENT(SPECIES_MEGANIUM) { Speed(3); Moves(MOVE_EARTH_POWER); } } WHEN { if (aiSmartMonChoicesFlag == AI_FLAG_SMART_MON_CHOICES) - TURN{ MOVE(player, MOVE_PROTECT); EXPECT_MOVE(opponent, MOVE_SELF_DESTRUCT); EXPECT_SEND_OUT(opponent, 1); } + TURN { MOVE(player, MOVE_PROTECT); EXPECT_MOVE(opponent, MOVE_SELF_DESTRUCT); EXPECT_SEND_OUT(opponent, 1); } else - TURN{ MOVE(player, MOVE_PROTECT); EXPECT_MOVE(opponent, MOVE_SELF_DESTRUCT); EXPECT_SEND_OUT(opponent, 2); } + TURN { MOVE(player, MOVE_PROTECT); EXPECT_MOVE(opponent, MOVE_SELF_DESTRUCT); EXPECT_SEND_OUT(opponent, 2); } } } @@ -794,7 +794,7 @@ AI_SINGLE_BATTLE_TEST("AI won't use trapping behaviour if player only has 1 mon OPPONENT(SPECIES_MAGNEZONE) { Speed(1); Ability(ABILITY_MAGNET_PULL); Moves(MOVE_SHOCK_WAVE); } OPPONENT(SPECIES_MEGANIUM) { Speed(3); Moves(MOVE_EARTH_POWER); } } WHEN { - TURN{ MOVE(player, MOVE_PROTECT); EXPECT_MOVE(opponent, MOVE_SELF_DESTRUCT); EXPECT_SEND_OUT(opponent, 2); } + TURN { MOVE(player, MOVE_PROTECT); EXPECT_MOVE(opponent, MOVE_SELF_DESTRUCT); EXPECT_SEND_OUT(opponent, 2); } } } @@ -824,7 +824,7 @@ AI_SINGLE_BATTLE_TEST("AI_FLAG_SMART_SWITCHING: AI will switch out if mon would AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT | AI_FLAG_SMART_SWITCHING | AI_FLAG_SMART_MON_CHOICES | AI_FLAG_OMNISCIENT); PLAYER(SPECIES_ELECTRODE) { Moves(MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_THUNDER_SHOCK); } - OPPONENT(SPECIES_PELIPPER) { Moves(MOVE_EARTHQUAKE); }; + OPPONENT(SPECIES_PELIPPER) { Moves(MOVE_EARTHQUAKE); } OPPONENT(SPECIES_RHYDON) { Moves(MOVE_EARTHQUAKE); Ability(ABILITY_ROCK_HEAD); } } WHEN { TURN { MOVE(player, MOVE_THUNDERBOLT) ; EXPECT_SWITCH(opponent, 1); } @@ -1094,20 +1094,20 @@ AI_SINGLE_BATTLE_TEST("AI_FLAG_SMART_SWITCHING: AI will switch out if it has an { u32 aiMon; u32 move; enum Ability absorbingAbility; - PARAMETRIZE { aiMon = SPECIES_NINETALES; absorbingAbility = ABILITY_FLASH_FIRE; move = MOVE_FLAMETHROWER;} - PARAMETRIZE { aiMon = SPECIES_MANTINE; absorbingAbility = ABILITY_WATER_ABSORB; move = MOVE_SURF;} - PARAMETRIZE { aiMon = SPECIES_TOXICROAK; absorbingAbility = ABILITY_DRY_SKIN; move = MOVE_SURF;} - PARAMETRIZE { aiMon = SPECIES_GASTRODON; absorbingAbility = ABILITY_STORM_DRAIN; move = MOVE_SURF;} - PARAMETRIZE { aiMon = SPECIES_JOLTEON; absorbingAbility = ABILITY_VOLT_ABSORB; move = MOVE_THUNDERBOLT;} - PARAMETRIZE { aiMon = SPECIES_ELECTIVIRE; absorbingAbility = ABILITY_MOTOR_DRIVE; move = MOVE_THUNDERBOLT;} - PARAMETRIZE { aiMon = SPECIES_MANECTRIC; absorbingAbility = ABILITY_LIGHTNING_ROD; move = MOVE_THUNDERBOLT;} - PARAMETRIZE { aiMon = SPECIES_ELECTIVIRE; absorbingAbility = ABILITY_MOTOR_DRIVE; move = MOVE_THUNDERBOLT;} - PARAMETRIZE { aiMon = SPECIES_AZUMARILL; absorbingAbility = ABILITY_SAP_SIPPER; move = MOVE_GIGA_DRAIN;} - PARAMETRIZE { aiMon = SPECIES_ORTHWORM; absorbingAbility = ABILITY_EARTH_EATER; move = MOVE_EARTHQUAKE;} - PARAMETRIZE { aiMon = SPECIES_BRONZONG; absorbingAbility = ABILITY_LEVITATE; move = MOVE_EARTHQUAKE;} - PARAMETRIZE { aiMon = SPECIES_ELECTRODE; absorbingAbility = ABILITY_SOUNDPROOF; move = MOVE_HYPER_VOICE;} - PARAMETRIZE { aiMon = SPECIES_CHESNAUGHT; absorbingAbility = ABILITY_BULLETPROOF; move = MOVE_SLUDGE_BOMB;} - PARAMETRIZE { aiMon = SPECIES_BRAMBLEGHAST; absorbingAbility = ABILITY_WIND_RIDER; move = MOVE_HURRICANE;} + PARAMETRIZE { aiMon = SPECIES_NINETALES; absorbingAbility = ABILITY_FLASH_FIRE; move = MOVE_FLAMETHROWER; } + PARAMETRIZE { aiMon = SPECIES_MANTINE; absorbingAbility = ABILITY_WATER_ABSORB; move = MOVE_SURF; } + PARAMETRIZE { aiMon = SPECIES_TOXICROAK; absorbingAbility = ABILITY_DRY_SKIN; move = MOVE_SURF; } + PARAMETRIZE { aiMon = SPECIES_GASTRODON; absorbingAbility = ABILITY_STORM_DRAIN; move = MOVE_SURF; } + PARAMETRIZE { aiMon = SPECIES_JOLTEON; absorbingAbility = ABILITY_VOLT_ABSORB; move = MOVE_THUNDERBOLT; } + PARAMETRIZE { aiMon = SPECIES_ELECTIVIRE; absorbingAbility = ABILITY_MOTOR_DRIVE; move = MOVE_THUNDERBOLT; } + PARAMETRIZE { aiMon = SPECIES_MANECTRIC; absorbingAbility = ABILITY_LIGHTNING_ROD; move = MOVE_THUNDERBOLT; } + PARAMETRIZE { aiMon = SPECIES_ELECTIVIRE; absorbingAbility = ABILITY_MOTOR_DRIVE; move = MOVE_THUNDERBOLT; } + PARAMETRIZE { aiMon = SPECIES_AZUMARILL; absorbingAbility = ABILITY_SAP_SIPPER; move = MOVE_GIGA_DRAIN; } + PARAMETRIZE { aiMon = SPECIES_ORTHWORM; absorbingAbility = ABILITY_EARTH_EATER; move = MOVE_EARTHQUAKE; } + PARAMETRIZE { aiMon = SPECIES_BRONZONG; absorbingAbility = ABILITY_LEVITATE; move = MOVE_EARTHQUAKE; } + PARAMETRIZE { aiMon = SPECIES_ELECTRODE; absorbingAbility = ABILITY_SOUNDPROOF; move = MOVE_HYPER_VOICE; } + PARAMETRIZE { aiMon = SPECIES_CHESNAUGHT; absorbingAbility = ABILITY_BULLETPROOF; move = MOVE_SLUDGE_BOMB; } + PARAMETRIZE { aiMon = SPECIES_BRAMBLEGHAST; absorbingAbility = ABILITY_WIND_RIDER; move = MOVE_HURRICANE; } GIVEN { WITH_CONFIG(CONFIG_REDIRECT_ABILITY_IMMUNITY, GEN_5); AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT | AI_FLAG_SMART_SWITCHING); @@ -1261,8 +1261,8 @@ AI_SINGLE_BATTLE_TEST("AI_FLAG_SMART_SWITCHING: AI will switch out if main attac u32 aiSpecies = SPECIES_NONE, aiMove = MOVE_NONE, move = MOVE_NONE; PASSES_RANDOMLY(SHOULD_SWITCH_ATTACKING_STAT_MINUS_TWO_PERCENTAGE, 100, RNG_AI_SWITCH_STATS_LOWERED); - PARAMETRIZE {move = MOVE_CHARM; aiSpecies = SPECIES_FLAREON; aiMove = MOVE_FIRE_FANG; }; - PARAMETRIZE {move = MOVE_EERIE_IMPULSE; aiSpecies = SPECIES_ESPEON; aiMove = MOVE_CONFUSION; }; + PARAMETRIZE { move = MOVE_CHARM; aiSpecies = SPECIES_FLAREON; aiMove = MOVE_FIRE_FANG; } + PARAMETRIZE { move = MOVE_EERIE_IMPULSE; aiSpecies = SPECIES_ESPEON; aiMove = MOVE_CONFUSION; } GIVEN { ASSUME(GetMoveEffect(MOVE_CHARM) == EFFECT_ATTACK_DOWN_2); @@ -1282,8 +1282,8 @@ AI_SINGLE_BATTLE_TEST("AI_FLAG_SMART_SWITCHING: AI will switch out if main attac u32 aiSpecies = SPECIES_NONE, aiMove = MOVE_NONE, move = MOVE_NONE, move2 = MOVE_NONE; PASSES_RANDOMLY(SHOULD_SWITCH_ATTACKING_STAT_MINUS_THREE_PLUS_PERCENTAGE, 100, RNG_AI_SWITCH_STATS_LOWERED); - PARAMETRIZE {move = MOVE_GROWL; move2 = MOVE_CHARM; aiSpecies = SPECIES_FLAREON; aiMove = MOVE_FIRE_FANG; }; - PARAMETRIZE {move = MOVE_CONFIDE; move2 = MOVE_EERIE_IMPULSE; aiSpecies = SPECIES_ESPEON; aiMove = MOVE_STORED_POWER; }; + PARAMETRIZE { move = MOVE_GROWL; move2 = MOVE_CHARM; aiSpecies = SPECIES_FLAREON; aiMove = MOVE_FIRE_FANG; } + PARAMETRIZE { move = MOVE_CONFIDE; move2 = MOVE_EERIE_IMPULSE; aiSpecies = SPECIES_ESPEON; aiMove = MOVE_STORED_POWER; } GIVEN { ASSUME(GetMoveEffect(MOVE_CHARM) == EFFECT_ATTACK_DOWN_2); diff --git a/test/battle/ai/ai_trytofaint.c b/test/battle/ai/ai_trytofaint.c index 50ab376503..f8bdded933 100644 --- a/test/battle/ai/ai_trytofaint.c +++ b/test/battle/ai/ai_trytofaint.c @@ -64,11 +64,12 @@ AI_SINGLE_BATTLE_TEST("AI sees Parental Bond killing through sturdy") { GIVEN { AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY); - PLAYER(SPECIES_MAGNEZONE){Level(64); Ability(ABILITY_STURDY); Moves(MOVE_TACKLE, MOVE_LIGHT_SCREEN); } - OPPONENT(SPECIES_KANGASKHAN_MEGA){Level(64); Moves(MOVE_DRAIN_PUNCH, MOVE_TAUNT); } - } WHEN { - TURN{ MOVE(player, MOVE_TACKLE); - EXPECT_MOVE(opponent, MOVE_DRAIN_PUNCH); // AI should see drain punch as a kill due to multi hit, outscoring taunt + PLAYER(SPECIES_MAGNEZONE){ Level(64); Ability(ABILITY_STURDY); Moves(MOVE_TACKLE, MOVE_LIGHT_SCREEN); } + OPPONENT(SPECIES_KANGASKHAN_MEGA){ Level(64); Moves(MOVE_DRAIN_PUNCH, MOVE_TAUNT); } + } WHEN { + TURN { + MOVE(player, MOVE_TACKLE); + EXPECT_MOVE(opponent, MOVE_DRAIN_PUNCH); // AI should see drain punch as a kill due to multi hit, outscoring taunt } } } diff --git a/test/battle/ai/can_use_all_moves.c b/test/battle/ai/can_use_all_moves.c index d7ea827f39..b9333978cf 100644 --- a/test/battle/ai/can_use_all_moves.c +++ b/test/battle/ai/can_use_all_moves.c @@ -19,7 +19,7 @@ AI_DOUBLE_BATTLE_TEST("AI uses Final Gambit") OPPONENT(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { - TURN { EXPECT_MOVE(opponentLeft, MOVE_FINAL_GAMBIT); SEND_OUT(playerLeft, 2); } + TURN { EXPECT_MOVE(opponentLeft, MOVE_FINAL_GAMBIT); SEND_OUT(playerLeft, 2); } } } @@ -35,7 +35,7 @@ AI_DOUBLE_BATTLE_TEST("AI uses Guillotine") OPPONENT(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { - TURN { EXPECT_MOVE(opponentLeft, MOVE_GUILLOTINE); SEND_OUT(playerLeft, 2); } + TURN { EXPECT_MOVE(opponentLeft, MOVE_GUILLOTINE); SEND_OUT(playerLeft, 2); } } } @@ -51,7 +51,7 @@ AI_DOUBLE_BATTLE_TEST("AI uses Sheer Cold") OPPONENT(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { - TURN { EXPECT_MOVE(opponentLeft, MOVE_SHEER_COLD); SEND_OUT(playerLeft, 2); } + TURN { EXPECT_MOVE(opponentLeft, MOVE_SHEER_COLD); SEND_OUT(playerLeft, 2); } } } @@ -113,7 +113,7 @@ AI_DOUBLE_BATTLE_TEST("AI can use all moves, 1-100") OPPONENT(SPECIES_WOBBUFFET) { Status1(STATUS1_BURN); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { - TURN { EXPECT_MOVE(opponentLeft, move); } + TURN { EXPECT_MOVE(opponentLeft, move); } } } @@ -189,7 +189,7 @@ AI_DOUBLE_BATTLE_TEST("AI can use all moves, 101-200") OPPONENT(SPECIES_WOBBUFFET) { Status1(STATUS1_BURN); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { - TURN { EXPECT_MOVE(opponentLeft, move); } + TURN { EXPECT_MOVE(opponentLeft, move); } } } @@ -278,7 +278,7 @@ AI_DOUBLE_BATTLE_TEST("AI can use all moves, 201-300") OPPONENT(SPECIES_WOBBUFFET) { Status1(STATUS1_BURN); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { - TURN { EXPECT_MOVE(opponentLeft, move); } + TURN { EXPECT_MOVE(opponentLeft, move); } } } @@ -355,7 +355,7 @@ AI_DOUBLE_BATTLE_TEST("AI can use all moves, 301-400") OPPONENT(SPECIES_WOBBUFFET) { Status1(STATUS1_BURN); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { - TURN { EXPECT_MOVE(opponentLeft, move); } + TURN { EXPECT_MOVE(opponentLeft, move); } } } @@ -423,7 +423,7 @@ AI_DOUBLE_BATTLE_TEST("AI can use all moves, 401-500") OPPONENT(SPECIES_WOBBUFFET) { Status1(STATUS1_BURN); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { - TURN { EXPECT_MOVE(opponentLeft, move); } + TURN { EXPECT_MOVE(opponentLeft, move); } } } @@ -498,7 +498,7 @@ AI_DOUBLE_BATTLE_TEST("AI can use all moves, 501-600") OPPONENT(SPECIES_WOBBUFFET) { Status1(STATUS1_BURN); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { - TURN { EXPECT_MOVE(opponentLeft, move); } + TURN { EXPECT_MOVE(opponentLeft, move); } } } @@ -570,7 +570,7 @@ AI_DOUBLE_BATTLE_TEST("AI can use all moves, 601-700") OPPONENT(SPECIES_WOBBUFFET) { Status1(STATUS1_BURN); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { - TURN { EXPECT_MOVE(opponentLeft, move); } + TURN { EXPECT_MOVE(opponentLeft, move); } } } @@ -639,7 +639,7 @@ AI_DOUBLE_BATTLE_TEST("AI can use all moves, 701-800") OPPONENT(SPECIES_WOBBUFFET) { Status1(STATUS1_BURN); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { - TURN { EXPECT_MOVE(opponentLeft, move); } + TURN { EXPECT_MOVE(opponentLeft, move); } } } @@ -701,6 +701,6 @@ AI_DOUBLE_BATTLE_TEST("AI can use all moves, 801-900") OPPONENT(SPECIES_WOBBUFFET) { Status1(STATUS1_BURN); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { - TURN { EXPECT_MOVE(opponentLeft, move); } + TURN { EXPECT_MOVE(opponentLeft, move); } } } diff --git a/test/battle/badge_boost.c b/test/battle/badge_boost.c index b03168d476..bc60778cb1 100644 --- a/test/battle/badge_boost.c +++ b/test/battle/badge_boost.c @@ -8,8 +8,8 @@ WILD_BATTLE_TEST("Badge boost: B_FLAG_BADGE_BOOST_ATTACK boost Attack", s16 dmg) u32 genConfig = 0; for (u32 gen = GEN_1; gen <= GEN_LATEST; gen++) { - PARAMETRIZE{badge = FALSE; genConfig = gen;} - PARAMETRIZE{badge = TRUE; genConfig = gen;} + PARAMETRIZE { badge = FALSE; genConfig = gen; } + PARAMETRIZE { badge = TRUE; genConfig = gen; } } GIVEN { if (badge) @@ -17,8 +17,8 @@ WILD_BATTLE_TEST("Badge boost: B_FLAG_BADGE_BOOST_ATTACK boost Attack", s16 dmg) else FlagClear(B_FLAG_BADGE_BOOST_ATTACK); WITH_CONFIG(CONFIG_BADGE_BOOST, genConfig); - PLAYER(SPECIES_WOBBUFFET) {} - OPPONENT(SPECIES_WOBBUFFET) {} + PLAYER(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(player, MOVE_SCRATCH); } } SCENE { @@ -40,8 +40,8 @@ WILD_BATTLE_TEST("Badge boost: B_FLAG_BADGE_BOOST_SPATK boost Special Attack", s u32 genConfig = 0; for (u32 gen = GEN_1; gen <= GEN_LATEST; gen++) { - PARAMETRIZE{badge = FALSE; genConfig = gen;} - PARAMETRIZE{badge = TRUE; genConfig = gen;} + PARAMETRIZE { badge = FALSE; genConfig = gen; } + PARAMETRIZE { badge = TRUE; genConfig = gen; } } GIVEN { if (badge) @@ -49,8 +49,8 @@ WILD_BATTLE_TEST("Badge boost: B_FLAG_BADGE_BOOST_SPATK boost Special Attack", s else FlagClear(B_FLAG_BADGE_BOOST_SPATK); WITH_CONFIG(CONFIG_BADGE_BOOST, genConfig); - PLAYER(SPECIES_WOBBUFFET) {} - OPPONENT(SPECIES_WOBBUFFET) {} + PLAYER(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(player, MOVE_THUNDER_SHOCK); } } SCENE { @@ -72,8 +72,8 @@ WILD_BATTLE_TEST("Badge boost: B_FLAG_BADGE_BOOST_DEFENSE boost Defense", s16 dm u32 genConfig = 0; for (u32 gen = GEN_1; gen <= GEN_LATEST; gen++) { - PARAMETRIZE{badge = FALSE; genConfig = gen;} - PARAMETRIZE{badge = TRUE; genConfig = gen;} + PARAMETRIZE { badge = FALSE; genConfig = gen; } + PARAMETRIZE { badge = TRUE; genConfig = gen; } } GIVEN { @@ -82,8 +82,8 @@ WILD_BATTLE_TEST("Badge boost: B_FLAG_BADGE_BOOST_DEFENSE boost Defense", s16 dm else FlagClear(B_FLAG_BADGE_BOOST_DEFENSE); WITH_CONFIG(CONFIG_BADGE_BOOST, genConfig); - PLAYER(SPECIES_WOBBUFFET) {} - OPPONENT(SPECIES_WOBBUFFET) {} + PLAYER(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(opponent, MOVE_SCRATCH); } } SCENE { @@ -105,8 +105,8 @@ WILD_BATTLE_TEST("Badge boost: B_FLAG_BADGE_BOOST_SPDEF boost Special Defense", u32 genConfig = 0; for (u32 gen = GEN_1; gen <= GEN_LATEST; gen++) { - PARAMETRIZE{badge = FALSE; genConfig = gen;} - PARAMETRIZE{badge = TRUE; genConfig = gen;} + PARAMETRIZE { badge = FALSE; genConfig = gen; } + PARAMETRIZE { badge = TRUE; genConfig = gen; } } GIVEN { @@ -115,8 +115,8 @@ WILD_BATTLE_TEST("Badge boost: B_FLAG_BADGE_BOOST_SPDEF boost Special Defense", else FlagClear(B_FLAG_BADGE_BOOST_SPDEF); WITH_CONFIG(CONFIG_BADGE_BOOST, genConfig); - PLAYER(SPECIES_WOBBUFFET) {} - OPPONENT(SPECIES_WOBBUFFET) {} + PLAYER(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(opponent, MOVE_THUNDER_SHOCK); } } SCENE { @@ -138,8 +138,8 @@ WILD_BATTLE_TEST("Badge boost: B_FLAG_BADGE_BOOST_SPEED boost Speed", s16 dmg) u32 genConfig = 0; for (u32 gen = GEN_1; gen <= GEN_LATEST; gen++) { - PARAMETRIZE{badge = FALSE; genConfig = gen;} - PARAMETRIZE{badge = TRUE; genConfig = gen;} + PARAMETRIZE { badge = FALSE; genConfig = gen; } + PARAMETRIZE { badge = TRUE; genConfig = gen; } } GIVEN { if (badge) @@ -150,7 +150,7 @@ WILD_BATTLE_TEST("Badge boost: B_FLAG_BADGE_BOOST_SPEED boost Speed", s16 dmg) PLAYER(SPECIES_WOBBUFFET) { Speed(100); HP(1); } OPPONENT(SPECIES_WOBBUFFET) { Speed(101); HP(1); } } WHEN { - TURN { MOVE(player, MOVE_SCRATCH); MOVE(opponent, MOVE_SCRATCH);} + TURN { MOVE(player, MOVE_SCRATCH); MOVE(opponent, MOVE_SCRATCH); } } THEN { if (badge && genConfig <= GEN_3) { diff --git a/test/battle/battle_message.c b/test/battle/battle_message.c index 423da7cf05..ac8917a156 100644 --- a/test/battle/battle_message.c +++ b/test/battle/battle_message.c @@ -14,7 +14,7 @@ SINGLE_BATTLE_TEST("Battle Message: Send-in message depends on foe HP") PLAYER(SPECIES_WYNAUT); OPPONENT(SPECIES_WOBBUFFET) { HP(hp); MaxHP(100); } } WHEN { - TURN { SWITCH(player, 1); } + TURN { SWITCH(player, 1); } } SCENE { if (hp > 69) MESSAGE("Go! Wynaut!"); @@ -34,7 +34,7 @@ TO_DO_BATTLE_TEST("Battle Message: Switch-out message changes based on condition PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { - TURN { SWITCH(player, 1); } + TURN { SWITCH(player, 1); } } SCENE { if (???) MESSAGE("Wynaut, that's enough! Come back!"); diff --git a/test/battle/crit_chance.c b/test/battle/crit_chance.c index 8e1c9cf682..58650f7f5d 100644 --- a/test/battle/crit_chance.c +++ b/test/battle/crit_chance.c @@ -38,7 +38,7 @@ SINGLE_BATTLE_TEST("Crit Chance: Raising critical hit rate to 3 guarantees a cri WITH_CONFIG(CONFIG_CRIT_CHANCE, genConfig); ASSUME(GetMoveCriticalHitStage(MOVE_SLASH) == 1); ASSUME(gItemsInfo[ITEM_SCOPE_LENS].holdEffect == HOLD_EFFECT_SCOPE_LENS); - PLAYER(SPECIES_TOGEKISS) { Ability(ABILITY_SUPER_LUCK); Item(ITEM_SCOPE_LENS); }; + PLAYER(SPECIES_TOGEKISS) { Ability(ABILITY_SUPER_LUCK); Item(ITEM_SCOPE_LENS); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(player, MOVE_SLASH); } diff --git a/test/battle/end_turn_effects.c b/test/battle/end_turn_effects.c index 931f792efe..cf65a50c6b 100644 --- a/test/battle/end_turn_effects.c +++ b/test/battle/end_turn_effects.c @@ -89,7 +89,7 @@ TWO_VS_ONE_BATTLE_TEST("End Turn Effects: First Event Block is executed correctl s16 damage; GIVEN { - MULTI_PLAYER(SPECIES_WYNAUT) { HP(100); Speed(1);} + MULTI_PLAYER(SPECIES_WYNAUT) { HP(100); Speed(1); } MULTI_PARTNER(SPECIES_EKANS) { HP(100); Ability(ABILITY_SHED_SKIN); Status1(STATUS1_BURN); Speed(2); } MULTI_OPPONENT_A(SPECIES_WYNAUT) { HP(100); Item(ITEM_LEFTOVERS); Speed(3); } MULTI_OPPONENT_A(SPECIES_WOBBUFFET) { HP(100); Item(ITEM_BLACK_SLUDGE); Speed(4); } @@ -118,7 +118,7 @@ ONE_VS_TWO_BATTLE_TEST("End Turn Effects: First Event Block is executed correctl s16 damage; GIVEN { - MULTI_PLAYER(SPECIES_WYNAUT) { HP(100); Speed(1);} + MULTI_PLAYER(SPECIES_WYNAUT) { HP(100); Speed(1); } MULTI_PLAYER(SPECIES_EKANS) { HP(100); Ability(ABILITY_SHED_SKIN); Status1(STATUS1_BURN); Speed(2); } MULTI_OPPONENT_A(SPECIES_WYNAUT) { HP(100); Item(ITEM_LEFTOVERS); Speed(3); } MULTI_OPPONENT_B(SPECIES_WOBBUFFET) { HP(100); Item(ITEM_BLACK_SLUDGE); Speed(4); } diff --git a/test/battle/form_change/mega_evolution.c b/test/battle/form_change/mega_evolution.c index af16b779b5..7cb3d2b783 100644 --- a/test/battle/form_change/mega_evolution.c +++ b/test/battle/form_change/mega_evolution.c @@ -76,7 +76,7 @@ SINGLE_BATTLE_TEST("Mega Evolution doesn't affect turn order (Gen6)") GIVEN { WITH_CONFIG(CONFIG_MEGA_EVO_TURN_ORDER, GEN_6); PLAYER(SPECIES_GARDEVOIR) { Item(ITEM_GARDEVOIRITE); } - OPPONENT(SPECIES_WOBBUFFET) {} + OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(opponent, MOVE_CELEBRATE); MOVE(player, MOVE_CELEBRATE, gimmick: GIMMICK_MEGA); } } SCENE { @@ -91,8 +91,8 @@ SINGLE_BATTLE_TEST("Mega Evolution affects turn order (Gen7+)") { GIVEN { WITH_CONFIG(CONFIG_MEGA_EVO_TURN_ORDER, GEN_7); - PLAYER(SPECIES_GARDEVOIR) { Item(ITEM_GARDEVOIRITE);} - OPPONENT(SPECIES_WOBBUFFET) {} + PLAYER(SPECIES_GARDEVOIR) { Item(ITEM_GARDEVOIRITE); } + OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(opponent, MOVE_CELEBRATE); MOVE(player, MOVE_CELEBRATE, gimmick: GIMMICK_MEGA); } } SCENE { diff --git a/test/battle/form_change/primal_reversion.c b/test/battle/form_change/primal_reversion.c index 7ae591f27b..3addb2afdb 100644 --- a/test/battle/form_change/primal_reversion.c +++ b/test/battle/form_change/primal_reversion.c @@ -4,9 +4,9 @@ SINGLE_BATTLE_TEST("Primal reversion happens for Groudon only when holding Red Orb") { u16 heldItem; - PARAMETRIZE { heldItem = ITEM_NONE;} - PARAMETRIZE { heldItem = ITEM_RED_ORB;} - PARAMETRIZE { heldItem = ITEM_BLUE_ORB;} + PARAMETRIZE { heldItem = ITEM_NONE; } + PARAMETRIZE { heldItem = ITEM_RED_ORB; } + PARAMETRIZE { heldItem = ITEM_BLUE_ORB; } GIVEN { PLAYER(SPECIES_GROUDON) { Item(heldItem); } OPPONENT(SPECIES_WOBBUFFET); @@ -36,9 +36,9 @@ SINGLE_BATTLE_TEST("Primal reversion happens for Groudon only when holding Red O SINGLE_BATTLE_TEST("Primal reversion happens for Kyogre only when holding Blue Orb") { u16 heldItem; - PARAMETRIZE { heldItem = ITEM_NONE;} - PARAMETRIZE { heldItem = ITEM_RED_ORB;} - PARAMETRIZE { heldItem = ITEM_BLUE_ORB;} + PARAMETRIZE { heldItem = ITEM_NONE; } + PARAMETRIZE { heldItem = ITEM_RED_ORB; } + PARAMETRIZE { heldItem = ITEM_BLUE_ORB; } GIVEN { PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_KYOGRE) { Item(heldItem); } @@ -68,8 +68,8 @@ SINGLE_BATTLE_TEST("Primal reversion happens for Kyogre only when holding Blue O DOUBLE_BATTLE_TEST("Primal reversion's order is determined by Speed - opponent faster") { GIVEN { - PLAYER(SPECIES_KYOGRE) { Item(ITEM_BLUE_ORB); Speed(5); }; - PLAYER(SPECIES_GROUDON) { Item(ITEM_RED_ORB); Speed(15); }; + PLAYER(SPECIES_KYOGRE) { Item(ITEM_BLUE_ORB); Speed(5); } + PLAYER(SPECIES_GROUDON) { Item(ITEM_RED_ORB); Speed(15); } OPPONENT(SPECIES_GROUDON) { Item(ITEM_RED_ORB); Speed(10); } OPPONENT(SPECIES_KYOGRE) { Item(ITEM_BLUE_ORB); Speed(20); } } WHEN { @@ -94,8 +94,8 @@ DOUBLE_BATTLE_TEST("Primal reversion's order is determined by Speed - opponent f DOUBLE_BATTLE_TEST("Primal reversion's order is determined by Speed - player faster") { GIVEN { - PLAYER(SPECIES_KYOGRE) { Item(ITEM_BLUE_ORB); Speed(20); }; - PLAYER(SPECIES_GROUDON) { Item(ITEM_RED_ORB); Speed(30); }; + PLAYER(SPECIES_KYOGRE) { Item(ITEM_BLUE_ORB); Speed(20); } + PLAYER(SPECIES_GROUDON) { Item(ITEM_RED_ORB); Speed(30); } OPPONENT(SPECIES_GROUDON) { Item(ITEM_RED_ORB); Speed(10); } OPPONENT(SPECIES_KYOGRE) { Item(ITEM_BLUE_ORB); Speed(2); } } WHEN { @@ -121,7 +121,7 @@ SINGLE_BATTLE_TEST("Primal reversion happens after a mon is sent out after a mon { GIVEN { ASSUME(!IsBattleMoveStatus(MOVE_SCRATCH)); - PLAYER(SPECIES_WOBBUFFET) {HP(1); } + PLAYER(SPECIES_WOBBUFFET) { HP(1); } PLAYER(SPECIES_GROUDON) { Item(ITEM_RED_ORB); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -158,7 +158,7 @@ SINGLE_BATTLE_TEST("Primal reversion happens after a switch-in caused by Eject B GIVEN { ASSUME(!IsBattleMoveStatus(MOVE_SCRATCH)); ASSUME(gItemsInfo[ITEM_EJECT_BUTTON].holdEffect == HOLD_EFFECT_EJECT_BUTTON); - PLAYER(SPECIES_WOBBUFFET) {Item(ITEM_EJECT_BUTTON); } + PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_EJECT_BUTTON); } PLAYER(SPECIES_GROUDON) { Item(ITEM_RED_ORB); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -181,7 +181,7 @@ SINGLE_BATTLE_TEST("Primal reversion happens after a switch-in caused by Red Car ASSUME(gItemsInfo[ITEM_RED_CARD].holdEffect == HOLD_EFFECT_RED_CARD); PLAYER(SPECIES_WOBBUFFET); PLAYER(SPECIES_GROUDON) { Item(ITEM_RED_ORB); } - OPPONENT(SPECIES_WOBBUFFET) {Item(ITEM_RED_CARD); } + OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_RED_CARD); } } WHEN { TURN { MOVE(player, MOVE_SCRATCH); } } SCENE { @@ -203,7 +203,7 @@ SINGLE_BATTLE_TEST("Primal reversion happens after the entry hazards damage") OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(opponent, MOVE_SPIKES); } - TURN { MOVE(opponent, MOVE_SPIKES); SWITCH(player, 1);} + TURN { MOVE(opponent, MOVE_SPIKES); SWITCH(player, 1); } } SCENE { SEND_IN_MESSAGE("Groudon"); HP_BAR(player); diff --git a/test/battle/form_change/ultra_burst.c b/test/battle/form_change/ultra_burst.c index 183f61ec87..edaf391d43 100644 --- a/test/battle/form_change/ultra_burst.c +++ b/test/battle/form_change/ultra_burst.c @@ -59,8 +59,8 @@ SINGLE_BATTLE_TEST("Ultra Burst affects turn order") { GIVEN { WITH_CONFIG(CONFIG_MEGA_EVO_TURN_ORDER, GEN_7); - PLAYER(SPECIES_NECROZMA_DUSK_MANE) { Item(ITEM_ULTRANECROZIUM_Z);} - OPPONENT(SPECIES_WOBBUFFET) {} + PLAYER(SPECIES_NECROZMA_DUSK_MANE) { Item(ITEM_ULTRANECROZIUM_Z); } + OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(opponent, MOVE_CELEBRATE); MOVE(player, MOVE_CELEBRATE, gimmick: GIMMICK_ULTRA_BURST); } } SCENE { diff --git a/test/battle/gimmick/dynamax.c b/test/battle/gimmick/dynamax.c index 25a0d5d08e..f1683df156 100644 --- a/test/battle/gimmick/dynamax.c +++ b/test/battle/gimmick/dynamax.c @@ -144,7 +144,7 @@ SINGLE_BATTLE_TEST("Dynamax: Dynamax expires after three turns and correctly con } WHEN { TURN { MOVE(player, MOVE_CELEBRATE, gimmick: dynamax); } TURN { MOVE(player, MOVE_SCRATCH); MOVE(opponent, MOVE_SCRATCH, WITH_RNG(RNG_DAMAGE_MODIFIER, 24)); } - TURN { } + TURN {} } SCENE { if (dynamax) ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_DYNAMAX_GROWTH, player); @@ -232,7 +232,7 @@ SINGLE_BATTLE_TEST("Dynamax: Dynamaxed Pokemon cannot be hit by OHKO moves") SINGLE_BATTLE_TEST("Dynamax: Dynamaxed Pokemon are affected by Grudge") { GIVEN { - PLAYER(SPECIES_WOBBUFFET) { Speed(50); }; + PLAYER(SPECIES_WOBBUFFET) { Speed(50); } OPPONENT(SPECIES_WOBBUFFET) { HP(1); Speed(100); } } WHEN { TURN { MOVE(opponent, MOVE_GRUDGE); MOVE(player, MOVE_SCRATCH, gimmick: GIMMICK_DYNAMAX); } @@ -270,7 +270,7 @@ SINGLE_BATTLE_TEST("Dynamax: Dynamaxed Pokemon are not affected by phazing moves { GIVEN { ASSUME(GetMoveEffect(MOVE_DRAGON_TAIL) == EFFECT_HIT_SWITCH_TARGET); - PLAYER(SPECIES_WOBBUFFET) { HP(1); }; + PLAYER(SPECIES_WOBBUFFET) { HP(1); } PLAYER(SPECIES_WYNAUT); OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -354,8 +354,8 @@ SINGLE_BATTLE_TEST("Dynamax: Dynamaxed Pokemon can have base moves disabled on t { GIVEN { ASSUME(B_DISABLE_TURNS >= GEN_5); - PLAYER(SPECIES_WOBBUFFET) { Speed(50); }; - OPPONENT(SPECIES_WOBBUFFET) { Speed(100); }; + PLAYER(SPECIES_WOBBUFFET) { Speed(50); } + OPPONENT(SPECIES_WOBBUFFET) { Speed(100); } } WHEN { TURN { MOVE(opponent, MOVE_CELEBRATE); MOVE(player, MOVE_SCRATCH); } TURN { MOVE(opponent, MOVE_DISABLE); MOVE(player, MOVE_SCRATCH, gimmick: GIMMICK_DYNAMAX); } @@ -570,7 +570,7 @@ SINGLE_BATTLE_TEST("Dynamax: Dynamaxed Pokemon are not affected by Choice items" PARAMETRIZE { item = ITEM_NONE; } GIVEN { ASSUME(gItemsInfo[ITEM_CHOICE_BAND].holdEffect == HOLD_EFFECT_CHOICE_BAND); - PLAYER(SPECIES_WOBBUFFET) { Item(item); }; + PLAYER(SPECIES_WOBBUFFET) { Item(item); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(player, MOVE_SCRATCH, gimmick: GIMMICK_DYNAMAX); } @@ -588,7 +588,7 @@ SINGLE_BATTLE_TEST("Dynamax: Dynamaxed Pokemon cannot use Max Guard while holdin { GIVEN { ASSUME(gItemsInfo[ITEM_ASSAULT_VEST].holdEffect == HOLD_EFFECT_ASSAULT_VEST); - PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_ASSAULT_VEST); }; + PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_ASSAULT_VEST); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(player, MOVE_SCRATCH, gimmick: GIMMICK_DYNAMAX); } @@ -733,7 +733,7 @@ DOUBLE_BATTLE_TEST("Dynamax: Max Strike lowers both opponents' speed") ASSUME(MoveHasAdditionalEffect(MOVE_MAX_STRIKE, MOVE_EFFECT_LOWER_SPEED_SIDE)); PLAYER(SPECIES_WOBBUFFET) { Speed(80); } PLAYER(SPECIES_WOBBUFFET) { Speed(79); } - OPPONENT(SPECIES_WOBBUFFET) {Speed(100); } + OPPONENT(SPECIES_WOBBUFFET) { Speed(100); } OPPONENT(SPECIES_WOBBUFFET) { Speed(99); } } WHEN { TURN { MOVE(playerLeft, MOVE_SCRATCH, target: opponentLeft, gimmick: GIMMICK_DYNAMAX); \ @@ -886,8 +886,8 @@ SINGLE_BATTLE_TEST("Dynamax: Max Overgrowth sets up Grassy Terrain") GIVEN { ASSUME(MoveHasAdditionalEffect(MOVE_MAX_OVERGROWTH, MOVE_EFFECT_GRASSY_TERRAIN)); ASSUME(GetSpeciesBaseHP(SPECIES_WOBBUFFET) == 190); - OPPONENT(SPECIES_WOBBUFFET) { MaxHP(maxHP); HP(maxHP / 2); }; - PLAYER(SPECIES_WOBBUFFET) { MaxHP(maxHP); HP(maxHP / 2); }; + OPPONENT(SPECIES_WOBBUFFET) { MaxHP(maxHP); HP(maxHP / 2); } + PLAYER(SPECIES_WOBBUFFET) { MaxHP(maxHP); HP(maxHP / 2); } } WHEN { TURN { MOVE(player, MOVE_VINE_WHIP, gimmick: GIMMICK_DYNAMAX); MOVE(opponent, MOVE_CELEBRATE); } TURN { MOVE(player, MOVE_VINE_WHIP); MOVE(opponent, MOVE_CELEBRATE); } @@ -979,7 +979,7 @@ SINGLE_BATTLE_TEST("Dynamax: G-Max Steelsurge sets up sharp steel") } WHEN { TURN { MOVE(player, MOVE_IRON_HEAD, gimmick: GIMMICK_DYNAMAX); } TURN { SWITCH(opponent, 1); } - TURN { } // wait out Dynamax + TURN {} // wait out Dynamax TURN { MOVE(opponent, MOVE_DEFOG); } } SCENE { // turn 1 @@ -1301,10 +1301,10 @@ DOUBLE_BATTLE_TEST("Dynamax: G-Max Wildfire sets a field effect that damages non OPPONENT(SPECIES_ARCANINE); } WHEN { TURN { MOVE(playerLeft, MOVE_EMBER, target: opponentLeft, gimmick: GIMMICK_DYNAMAX); } - TURN { } + TURN {} TURN { SWITCH(opponentLeft, 2); } - TURN { } - TURN { } + TURN {} + TURN {} } SCENE { // turn 1 MESSAGE("Charizard used G-Max Wildfire!"); @@ -1375,7 +1375,7 @@ DOUBLE_BATTLE_TEST("Dynamax: G-Max Snooze makes only the target drowsy") OPPONENT(SPECIES_CHANSEY); } WHEN { TURN { MOVE(playerLeft, MOVE_DARK_PULSE, target: opponentLeft, gimmick: GIMMICK_DYNAMAX); } - TURN { } + TURN {} } SCENE { // turn 1 MESSAGE("Grimmsnarl used G-Max Snooze!"); @@ -1551,7 +1551,7 @@ DOUBLE_BATTLE_TEST("Dynamax: Max Flare doesn't softlock the game when fainting p { GIVEN { PLAYER(SPECIES_WOBBUFFET); - PLAYER(SPECIES_WOBBUFFET) { HP(1); }; + PLAYER(SPECIES_WOBBUFFET) { HP(1); } PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); @@ -1559,7 +1559,7 @@ DOUBLE_BATTLE_TEST("Dynamax: Max Flare doesn't softlock the game when fainting p TURN { MOVE(playerLeft, MOVE_PROTECT, gimmick: GIMMICK_DYNAMAX); MOVE(opponentLeft, MOVE_V_CREATE, target: playerRight, gimmick: GIMMICK_DYNAMAX); SEND_OUT(playerRight, 2); } - TURN { } + TURN {} } } @@ -1567,7 +1567,7 @@ SINGLE_BATTLE_TEST("Dynamax: Max Moves don't execute effects on fainted battlers { GIVEN { PLAYER(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_WOBBUFFET) { HP(1); }; + OPPONENT(SPECIES_WOBBUFFET) { HP(1); } } WHEN { TURN { MOVE(player, MOVE_SCRATCH, gimmick: GIMMICK_DYNAMAX); } } SCENE { @@ -1664,8 +1664,8 @@ SINGLE_BATTLE_TEST("Dynamax: Dynamax is reverted before switch out") SINGLE_BATTLE_TEST("Dynamax: max move against semi-invulnerable target prints the correct message") { GIVEN { - PLAYER(SPECIES_WOBBUFFET) {Speed(1);}; - OPPONENT(SPECIES_WOBBUFFET) {Speed(2);}; + PLAYER(SPECIES_WOBBUFFET) { Speed(1); } + OPPONENT(SPECIES_WOBBUFFET) { Speed(2); } } WHEN { TURN { MOVE(player, MOVE_SCRATCH, gimmick: GIMMICK_DYNAMAX); MOVE(opponent, MOVE_FLY); } } SCENE { @@ -1679,12 +1679,12 @@ DOUBLE_BATTLE_TEST("Dynamax stat lowering moves don't make stat-changing abiliti { u32 move, stat, ability; move = 0; stat = 0; ability = 0; - u32 abilityList[] = {ABILITY_COMPETITIVE, ABILITY_DEFIANT, ABILITY_CONTRARY, ABILITY_SIMPLE}; + u32 abilityList[] = { ABILITY_COMPETITIVE, ABILITY_DEFIANT, ABILITY_CONTRARY, ABILITY_SIMPLE}; for (u32 j = 0; j < 4; j++) { PARAMETRIZE { move = MOVE_SCRATCH; stat = STAT_SPEED; ability = abilityList[j]; } PARAMETRIZE { move = MOVE_FURY_CUTTER; stat = STAT_SPATK; ability = abilityList[j]; } - PARAMETRIZE { move = MOVE_LICK; stat = STAT_DEF; ability = abilityList[j]; ;} + PARAMETRIZE { move = MOVE_LICK; stat = STAT_DEF; ability = abilityList[j]; } PARAMETRIZE { move = MOVE_DRAGON_CLAW; stat = STAT_ATK; ability = abilityList[j]; } PARAMETRIZE { move = MOVE_CRUNCH; stat = STAT_SPDEF; ability = abilityList[j]; } } @@ -1699,7 +1699,7 @@ DOUBLE_BATTLE_TEST("Dynamax stat lowering moves don't make stat-changing abiliti OPPONENT(SPECIES_WOBBUFFET) { Ability(ability); } OPPONENT(SPECIES_WOBBUFFET) { Ability(ABILITY_SHADOW_TAG); } } WHEN { - TURN { MOVE(playerLeft, move, target: opponentLeft, gimmick: GIMMICK_DYNAMAX);} + TURN { MOVE(playerLeft, move, target: opponentLeft, gimmick: GIMMICK_DYNAMAX); } } SCENE { ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponentLeft); ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponentRight); @@ -1712,12 +1712,12 @@ DOUBLE_BATTLE_TEST("Dynamax stat raising moves don't make stat-changing abilitie { u32 move, stat, ability; move = 0; stat = 0; ability = 0; - u32 abilityList[] = {ABILITY_CONTRARY, ABILITY_SIMPLE}; + u32 abilityList[] = { ABILITY_CONTRARY, ABILITY_SIMPLE}; for (u32 j = 0; j < 2; j++) { PARAMETRIZE { move = MOVE_PECK; stat = STAT_SPEED; ability = abilityList[j]; } PARAMETRIZE { move = MOVE_POISON_JAB; stat = STAT_SPATK; ability = abilityList[j]; } - PARAMETRIZE { move = MOVE_BULLET_PUNCH; stat = STAT_DEF; ability = abilityList[j]; ;} + PARAMETRIZE { move = MOVE_BULLET_PUNCH; stat = STAT_DEF; ability = abilityList[j]; } PARAMETRIZE { move = MOVE_DOUBLE_KICK; stat = STAT_ATK; ability = abilityList[j]; } PARAMETRIZE { move = MOVE_MUD_SLAP; stat = STAT_SPDEF; ability = abilityList[j]; } } @@ -1729,10 +1729,10 @@ DOUBLE_BATTLE_TEST("Dynamax stat raising moves don't make stat-changing abilitie ASSUME(MoveHasAdditionalEffect(MOVE_MAX_DARKNESS, MOVE_EFFECT_LOWER_SP_DEF_SIDE)); PLAYER(SPECIES_WOBBUFFET) { Ability(ability); } PLAYER(SPECIES_WOBBUFFET) { Ability(ABILITY_SHADOW_TAG); } - OPPONENT(SPECIES_WOBBUFFET) {} - OPPONENT(SPECIES_WOBBUFFET) {} + OPPONENT(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_WOBBUFFET); } WHEN { - TURN { MOVE(playerLeft, move, target: opponentLeft, gimmick: GIMMICK_DYNAMAX);} + TURN { MOVE(playerLeft, move, target: opponentLeft, gimmick: GIMMICK_DYNAMAX); } } SCENE { ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, playerLeft); ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, playerRight); diff --git a/test/battle/hold_effect/ability_shield.c b/test/battle/hold_effect/ability_shield.c index 9f98ea98ef..6e5a9884b8 100644 --- a/test/battle/hold_effect/ability_shield.c +++ b/test/battle/hold_effect/ability_shield.c @@ -17,7 +17,7 @@ SINGLE_BATTLE_TEST("Ability Shield protects against Neutralizing Gas") PLAYER(SPECIES_TORKOAL) { Ability(ABILITY_DROUGHT); Item(item); } OPPONENT(SPECIES_KOFFING) { Ability(ABILITY_NEUTRALIZING_GAS); } } WHEN { - TURN { } + TURN {} } SCENE { ABILITY_POPUP(opponent, ABILITY_NEUTRALIZING_GAS); MESSAGE("Neutralizing gas filled the area!"); diff --git a/test/battle/hold_effect/air_balloon.c b/test/battle/hold_effect/air_balloon.c index ad0fb457a8..3493012e9c 100644 --- a/test/battle/hold_effect/air_balloon.c +++ b/test/battle/hold_effect/air_balloon.c @@ -12,7 +12,7 @@ ASSUMPTIONS SINGLE_BATTLE_TEST("Air Balloon prevents the holder from taking damage from ground type moves") { GIVEN { - PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_AIR_BALLOON); }; + PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_AIR_BALLOON); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(opponent, MOVE_EARTHQUAKE); } @@ -27,7 +27,7 @@ SINGLE_BATTLE_TEST("Air Balloon prevents the holder from taking damage from grou SINGLE_BATTLE_TEST("Air Balloon pops when the holder is hit by a move that is not ground type") { GIVEN { - PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_AIR_BALLOON); }; + PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_AIR_BALLOON); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(opponent, MOVE_SCRATCH); } @@ -41,7 +41,7 @@ SINGLE_BATTLE_TEST("Air Balloon pops when the holder is hit by a move that is no SINGLE_BATTLE_TEST("Air Balloon no longer prevents the holder from taking damage from ground type moves once it has been popped") { GIVEN { - PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_AIR_BALLOON); }; + PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_AIR_BALLOON); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(opponent, MOVE_SCRATCH); } @@ -59,7 +59,7 @@ SINGLE_BATTLE_TEST("Air Balloon no longer prevents the holder from taking damage SINGLE_BATTLE_TEST("Air Balloon can not be restored with Recycle after it has been popped") { GIVEN { - PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_AIR_BALLOON); }; + PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_AIR_BALLOON); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { @@ -78,7 +78,7 @@ SINGLE_BATTLE_TEST("Air Balloon can not be restored with Recycle after it has be SINGLE_BATTLE_TEST("Air Balloon prevents the user from being healed by Grassy Terrain") { GIVEN { - PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_AIR_BALLOON); MaxHP(100); HP(1); }; + PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_AIR_BALLOON); MaxHP(100); HP(1); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(player, MOVE_GRASSY_TERRAIN); } @@ -91,8 +91,8 @@ SINGLE_BATTLE_TEST("Air Balloon prevents the user from being healed by Grassy Te SINGLE_BATTLE_TEST("Air Balloon pops before it can be stolen with Magician") { GIVEN { - PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_AIR_BALLOON); }; - OPPONENT(SPECIES_DELPHOX) { Ability(ABILITY_MAGICIAN); }; + PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_AIR_BALLOON); } + OPPONENT(SPECIES_DELPHOX) { Ability(ABILITY_MAGICIAN); } } WHEN { TURN { MOVE(opponent, MOVE_SCRATCH); } } SCENE { @@ -106,7 +106,7 @@ SINGLE_BATTLE_TEST("Air Balloon pops before it can be stolen by Thief") { GIVEN { ASSUME(GetMoveEffect(MOVE_THIEF) == EFFECT_STEAL_ITEM); - PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_AIR_BALLOON); }; + PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_AIR_BALLOON); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(opponent, MOVE_THIEF); } diff --git a/test/battle/hold_effect/berserk_gene.c b/test/battle/hold_effect/berserk_gene.c index c7b9ba0933..002d164d1e 100644 --- a/test/battle/hold_effect/berserk_gene.c +++ b/test/battle/hold_effect/berserk_gene.c @@ -269,7 +269,7 @@ SINGLE_BATTLE_TEST("Berserker Gene confusion can be healed with bag items") PARAMETRIZE { item = ITEM_JUBILIFE_MUFFIN; } GIVEN { ASSUME(gItemsInfo[item].battleUsage == EFFECT_ITEM_CURE_STATUS); - PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_BERSERK_GENE);}; + PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_BERSERK_GENE); } OPPONENT(SPECIES_GENGAR); } WHEN { TURN { USE_ITEM(player, item, partyIndex: 0); } @@ -290,8 +290,8 @@ SINGLE_BATTLE_TEST("Berserker Gene confusion can be healed with used held items" GIVEN { ASSUME(gItemsInfo[ITEM_PERSIM_BERRY].holdEffect == HOLD_EFFECT_CURE_CONFUSION); - PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_BERSERK_GENE);}; - OPPONENT(SPECIES_WOBBUFFET) { Item(item);}; + PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_BERSERK_GENE); } + OPPONENT(SPECIES_WOBBUFFET) { Item(item); } } WHEN { TURN { MOVE(player, MOVE_COVET, WITH_RNG(RNG_CONFUSION, FALSE)); } TURN {} diff --git a/test/battle/hold_effect/booster_energy.c b/test/battle/hold_effect/booster_energy.c index f98675a1e9..d59c17ef68 100644 --- a/test/battle/hold_effect/booster_energy.c +++ b/test/battle/hold_effect/booster_energy.c @@ -10,7 +10,7 @@ SINGLE_BATTLE_TEST("Booster Energy will activate Quark Drive after Electric Terr { GIVEN { PLAYER(SPECIES_IRON_MOTH) { Attack(100); Defense(100); Speed(100); SpAttack(110); SpDefense(100); Ability(ABILITY_QUARK_DRIVE); Item(ITEM_BOOSTER_ENERGY); } - OPPONENT(SPECIES_TAPU_KOKO) { Speed(100); Ability(ABILITY_ELECTRIC_SURGE); }; + OPPONENT(SPECIES_TAPU_KOKO) { Speed(100); Ability(ABILITY_ELECTRIC_SURGE); } } WHEN { TURN {} TURN {} @@ -40,7 +40,7 @@ SINGLE_BATTLE_TEST("Booster Energy will activate Protosynthesis after harsh sunl GIVEN { WITH_CONFIG(CONFIG_ABILITY_WEATHER, GEN_6); PLAYER(SPECIES_RAGING_BOLT) { Attack(100); Defense(100); Speed(100); SpAttack(110); SpDefense(100); Ability(ABILITY_PROTOSYNTHESIS); Item(ITEM_BOOSTER_ENERGY); } - OPPONENT(SPECIES_TORKOAL) { Speed(100); Ability(ABILITY_DROUGHT); }; + OPPONENT(SPECIES_TORKOAL) { Speed(100); Ability(ABILITY_DROUGHT); } } WHEN { TURN {} TURN {} @@ -72,11 +72,11 @@ SINGLE_BATTLE_TEST("Booster Energy's Protosynthesis boost is preserved when weat OPPONENT(SPECIES_WOBBUFFET) { Speed(50); Moves(MOVE_SUNNY_DAY, MOVE_CELEBRATE); } } WHEN { TURN { MOVE(opponent, MOVE_SUNNY_DAY); } - TURN { } - TURN { } - TURN { } - TURN { } - TURN { } + TURN {} + TURN {} + TURN {} + TURN {} + TURN {} } SCENE { ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, player); MESSAGE("Raging Bolt used its Booster Energy to activate Protosynthesis!"); @@ -100,9 +100,9 @@ SINGLE_BATTLE_TEST("Booster Energy activates Protosynthesis and increases highes GIVEN { PLAYER(SPECIES_RAGING_BOLT) { Attack(attack); Defense(defense); Speed(speed); SpAttack(spAttack); SpDefense(spDefense); Ability(ABILITY_PROTOSYNTHESIS); Item(ITEM_BOOSTER_ENERGY); } - OPPONENT(SPECIES_WOBBUFFET) { Speed(50); }; + OPPONENT(SPECIES_WOBBUFFET) { Speed(50); } } WHEN { - TURN { } + TURN {} } SCENE { ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, player); ABILITY_POPUP(player, ABILITY_PROTOSYNTHESIS); @@ -134,9 +134,9 @@ SINGLE_BATTLE_TEST("Booster Energy activates Quark Drive and increases highest s GIVEN { PLAYER(SPECIES_IRON_MOTH) { Attack(attack); Defense(defense); Speed(speed); SpAttack(spAttack); SpDefense(spDefense); Ability(ABILITY_QUARK_DRIVE); Item(ITEM_BOOSTER_ENERGY); } - OPPONENT(SPECIES_WOBBUFFET) { Speed(50); }; + OPPONENT(SPECIES_WOBBUFFET) { Speed(50); } } WHEN { - TURN { } + TURN {} } SCENE { ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, player); if (attack == 110) @@ -161,11 +161,11 @@ SINGLE_BATTLE_TEST("Booster Energy's Quark Drive boost is preserved when terrain OPPONENT(SPECIES_WOBBUFFET) { Speed(50); Moves(MOVE_GRASSY_TERRAIN, MOVE_CELEBRATE); } } WHEN { TURN { MOVE(opponent, MOVE_GRASSY_TERRAIN); } - TURN { } - TURN { } - TURN { } - TURN { } - TURN { } + TURN {} + TURN {} + TURN {} + TURN {} + TURN {} } SCENE { ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, player); MESSAGE("Iron Moth used its Booster Energy to activate Quark Drive!"); @@ -192,7 +192,7 @@ SINGLE_BATTLE_TEST("Booster Energy increases special attack by 30% if it is the GIVEN { ASSUME(GetMoveCategory(MOVE_ROUND) == DAMAGE_CATEGORY_SPECIAL); PLAYER(species) { Attack(100); Defense(100); Speed(100); SpAttack(110); SpDefense(100); Ability(ability); Item(item); } - OPPONENT(SPECIES_WOBBUFFET) { Speed(100); }; + OPPONENT(SPECIES_WOBBUFFET) { Speed(100); } } WHEN { TURN { MOVE(player, MOVE_ROUND); } } SCENE { @@ -218,7 +218,7 @@ SINGLE_BATTLE_TEST("Booster Energy increases special defense by 30% if it is the GIVEN { ASSUME(GetMoveCategory(MOVE_ROUND) == DAMAGE_CATEGORY_SPECIAL); PLAYER(species) { Attack(100); Defense(100); Speed(100); SpAttack(100); SpDefense(110); Ability(ability); Item(item); } - OPPONENT(SPECIES_WOBBUFFET) { Speed(100); }; + OPPONENT(SPECIES_WOBBUFFET) { Speed(100); } } WHEN { TURN { MOVE(opponent, MOVE_ROUND); } } SCENE { @@ -288,9 +288,9 @@ DOUBLE_BATTLE_TEST("Booster Energy activates on any terrain") PLAYER(SPECIES_IRON_MOTH) { Speed(110); Ability(ABILITY_QUARK_DRIVE); Item(ITEM_BOOSTER_ENERGY); } PLAYER(SPECIES_WOBBUFFET) { Speed(80); } OPPONENT(SPECIES_TAPU_BULU) { Speed(100); Ability(ABILITY_GRASSY_SURGE); } - OPPONENT(SPECIES_TAPU_KOKO) { Speed(10); Ability(ABILITY_ELECTRIC_SURGE); }; + OPPONENT(SPECIES_TAPU_KOKO) { Speed(10); Ability(ABILITY_ELECTRIC_SURGE); } } WHEN { - TURN { } + TURN {} } SCENE { ABILITY_POPUP(opponentLeft, ABILITY_GRASSY_SURGE); ABILITY_POPUP(playerLeft, ABILITY_QUARK_DRIVE); @@ -305,7 +305,7 @@ DOUBLE_BATTLE_TEST("Booster Energy activates on air locked sun") PLAYER(SPECIES_WOBBUFFET); PLAYER(SPECIES_RAGING_BOLT) { Ability(ABILITY_PROTOSYNTHESIS); Item(ITEM_BOOSTER_ENERGY); } OPPONENT(SPECIES_PSYDUCK) { Ability(ABILITY_CLOUD_NINE); } - OPPONENT(SPECIES_TORKOAL) { Ability(ABILITY_DROUGHT); }; + OPPONENT(SPECIES_TORKOAL) { Ability(ABILITY_DROUGHT); } } WHEN { TURN { SWITCH(playerLeft, 2); } } SCENE { @@ -321,9 +321,9 @@ DOUBLE_BATTLE_TEST("Booster Energy will not activate on terrain if user has Prot PLAYER(SPECIES_RAGING_BOLT) { Speed(110); Ability(ABILITY_PROTOSYNTHESIS); Item(ITEM_BOOSTER_ENERGY); } PLAYER(SPECIES_WOBBUFFET) { Speed(80); } OPPONENT(SPECIES_TAPU_BULU) { Speed(100); Ability(ABILITY_GRASSY_SURGE); } - OPPONENT(SPECIES_TAPU_KOKO) { Speed(10); Ability(ABILITY_ELECTRIC_SURGE); }; + OPPONENT(SPECIES_TAPU_KOKO) { Speed(10); Ability(ABILITY_ELECTRIC_SURGE); } } WHEN { - TURN { } + TURN {} } SCENE { ABILITY_POPUP(opponentLeft, ABILITY_GRASSY_SURGE); NOT ABILITY_POPUP(playerLeft, ABILITY_PROTOSYNTHESIS); diff --git a/test/battle/hold_effect/clear_amulet.c b/test/battle/hold_effect/clear_amulet.c index 5c69655dc1..f073fe3a00 100644 --- a/test/battle/hold_effect/clear_amulet.c +++ b/test/battle/hold_effect/clear_amulet.c @@ -12,9 +12,9 @@ SINGLE_BATTLE_TEST("Clear Amulet prevents Intimidate") s16 turnTwoHit; GIVEN { - PLAYER(SPECIES_EKANS) { Ability(ABILITY_SHED_SKIN); }; - PLAYER(SPECIES_EKANS) { Ability(ABILITY_INTIMIDATE); }; - OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_CLEAR_AMULET); }; + PLAYER(SPECIES_EKANS) { Ability(ABILITY_SHED_SKIN); } + PLAYER(SPECIES_EKANS) { Ability(ABILITY_INTIMIDATE); } + OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_CLEAR_AMULET); } } WHEN { TURN { MOVE(opponent, MOVE_SCRATCH); } TURN { SWITCH(player, 1); MOVE(opponent, MOVE_SCRATCH); } @@ -50,7 +50,7 @@ SINGLE_BATTLE_TEST("Clear Amulet prevents stat reducing effects") ASSUME(GetMoveEffect(MOVE_SWEET_SCENT) == (B_UPDATED_MOVE_DATA >= GEN_6 ? EFFECT_EVASION_DOWN_2 : EFFECT_EVASION_DOWN)); ASSUME(GetMoveEffect(MOVE_SAND_ATTACK) == EFFECT_ACCURACY_DOWN); PLAYER(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_CLEAR_AMULET); }; + OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_CLEAR_AMULET); } } WHEN { TURN { MOVE(player, move); } } SCENE { @@ -78,7 +78,7 @@ SINGLE_BATTLE_TEST("Clear Amulet prevents secondary effects that reduce stats") ASSUME(MoveHasAdditionalEffect(MOVE_PSYCHIC, MOVE_EFFECT_SP_DEF_MINUS_1) == TRUE); ASSUME(MoveHasAdditionalEffect(MOVE_MUD_SLAP, MOVE_EFFECT_ACC_MINUS_1) == TRUE); PLAYER(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_CLEAR_AMULET); }; + OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_CLEAR_AMULET); } } WHEN { TURN { MOVE(player, move); } } SCENE { diff --git a/test/battle/hold_effect/cure_status.c b/test/battle/hold_effect/cure_status.c index 4a5d354a10..0f389af4d5 100644 --- a/test/battle/hold_effect/cure_status.c +++ b/test/battle/hold_effect/cure_status.c @@ -181,7 +181,7 @@ SINGLE_BATTLE_TEST("Berry hold effect cures status if a Pokémon enters a battle PLAYER(SPECIES_WOBBUFFET) { Status1(status); Item(ITEM_LUM_BERRY); } OPPONENT(SPECIES_WOBBUFFET) { Status1(status); Item(item); } } WHEN { - TURN { } + TURN {} } SCENE { ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, player); ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, opponent); @@ -239,7 +239,7 @@ SINGLE_BATTLE_TEST("Player Pokemon can be further poisoned with Toxic spikes aft ASSUME(gItemsInfo[ITEM_PECHA_BERRY].holdEffect == HOLD_EFFECT_CURE_PSN); ASSUME(gItemsInfo[ITEM_LUM_BERRY].holdEffect == HOLD_EFFECT_CURE_STATUS); PLAYER(SPECIES_WOBBUFFET); - PLAYER(SPECIES_WOBBUFFET) {Item(item); } + PLAYER(SPECIES_WOBBUFFET) { Item(item); } PLAYER(SPECIES_WYNAUT); OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -297,20 +297,20 @@ DOUBLE_BATTLE_TEST("Lum Berry correctly cures all battlers if multiple fainted t SINGLE_BATTLE_TEST("Lum Berry properly cures a battler affected by a non-volatiles status and confusion") { u32 status; - PARAMETRIZE { status = STATUS1_BURN;} - PARAMETRIZE { status = STATUS1_FREEZE;} - PARAMETRIZE { status = STATUS1_PARALYSIS;} - PARAMETRIZE { status = STATUS1_POISON;} - PARAMETRIZE { status = STATUS1_TOXIC_POISON;} - PARAMETRIZE { status = STATUS1_SLEEP;} + PARAMETRIZE { status = STATUS1_BURN; } + PARAMETRIZE { status = STATUS1_FREEZE; } + PARAMETRIZE { status = STATUS1_PARALYSIS; } + PARAMETRIZE { status = STATUS1_POISON; } + PARAMETRIZE { status = STATUS1_TOXIC_POISON; } + PARAMETRIZE { status = STATUS1_SLEEP; } GIVEN { ASSUME(GetMoveEffect(MOVE_CONFUSE_RAY) == EFFECT_CONFUSE); - PLAYER(SPECIES_WOBBUFFET) { Status1(status); Speed(1);}; - OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_LUM_BERRY); Speed(2);}; + PLAYER(SPECIES_WOBBUFFET) { Status1(status); Speed(1); } + OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_LUM_BERRY); Speed(2); } } WHEN { - TURN { MOVE(opponent, MOVE_CONFUSE_RAY); MOVE(player, MOVE_CELEBRATE, WITH_RNG(RNG_FROZEN, 0));} - TURN { MOVE(opponent, MOVE_SWITCHEROO);} + TURN { MOVE(opponent, MOVE_CONFUSE_RAY); MOVE(player, MOVE_CELEBRATE, WITH_RNG(RNG_FROZEN, 0)); } + TURN { MOVE(opponent, MOVE_SWITCHEROO); } } SCENE { ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, player); MESSAGE("Wobbuffet's Lum Berry normalized its status!"); diff --git a/test/battle/hold_effect/destiny_knot.c b/test/battle/hold_effect/destiny_knot.c index 7c0fabff5d..566ded5735 100644 --- a/test/battle/hold_effect/destiny_knot.c +++ b/test/battle/hold_effect/destiny_knot.c @@ -9,10 +9,10 @@ ASSUMPTIONS SINGLE_BATTLE_TEST("Destiny Knot infatuates back when holder is targeted") { GIVEN { - PLAYER(SPECIES_WOBBUFFET) { Gender(MON_MALE); } + PLAYER(SPECIES_WOBBUFFET) { Gender(MON_MALE); } OPPONENT(SPECIES_WOBBUFFET) { Gender(MON_FEMALE); Item(ITEM_DESTINY_KNOT); } } WHEN { - TURN { MOVE(player, MOVE_ATTRACT); } + TURN { MOVE(player, MOVE_ATTRACT); } } SCENE { ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, opponent); MESSAGE("Wobbuffet fell in love because of the Destiny Knot!"); @@ -24,10 +24,10 @@ SINGLE_BATTLE_TEST("Destiny Knot infatuates back when holder is targeted") SINGLE_BATTLE_TEST("Destiny Knot infatuates back when holder is attacking") { GIVEN { - PLAYER(SPECIES_WOBBUFFET) { Gender(MON_MALE); Item(ITEM_DESTINY_KNOT);} - OPPONENT(SPECIES_CLEFAIRY) { Gender(MON_FEMALE); Ability(ABILITY_CUTE_CHARM);} + PLAYER(SPECIES_WOBBUFFET) { Gender(MON_MALE); Item(ITEM_DESTINY_KNOT); } + OPPONENT(SPECIES_CLEFAIRY) { Gender(MON_FEMALE); Ability(ABILITY_CUTE_CHARM); } } WHEN { - TURN { MOVE(player, MOVE_TACKLE); } + TURN { MOVE(player, MOVE_TACKLE); } } SCENE { ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, player); MESSAGE("The opposing Clefairy fell in love because of the Destiny Knot!"); @@ -40,7 +40,7 @@ SINGLE_BATTLE_TEST("Destiny Knot infatuates back when holder is attacking") SINGLE_BATTLE_TEST("Destiny Knot procs but fails if the target is already infatuated") { GIVEN { - PLAYER(SPECIES_WOBBUFFET) { Gender(MON_MALE); } + PLAYER(SPECIES_WOBBUFFET) { Gender(MON_MALE); } OPPONENT(SPECIES_WOBBUFFET) { Gender(MON_FEMALE); Item(ITEM_DESTINY_KNOT); } } WHEN { TURN { MOVE(opponent, MOVE_ATTRACT); MOVE(player, MOVE_ATTRACT, WITH_RNG(RNG_INFATUATION, FALSE)); } @@ -68,11 +68,11 @@ SINGLE_BATTLE_TEST("Destiny Knot procs but fails if the target is oblivious") SINGLE_BATTLE_TEST("Destiny Knot procs but fails if the target is already infatuated (cute charm)") { GIVEN { - PLAYER(SPECIES_CLEFAIRY) { Gender(MON_MALE); Ability(ABILITY_CUTE_CHARM);} + PLAYER(SPECIES_CLEFAIRY) { Gender(MON_MALE); Ability(ABILITY_CUTE_CHARM); } OPPONENT(SPECIES_WOBBUFFET) { Gender(MON_FEMALE); Item(ITEM_DESTINY_KNOT); } } WHEN { - TURN { MOVE(opponent, MOVE_ATTRACT);} - TURN { MOVE(opponent, MOVE_TACKLE);} + TURN { MOVE(opponent, MOVE_ATTRACT); } + TURN { MOVE(opponent, MOVE_TACKLE); } } SCENE { ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, opponent); MESSAGE("But it failed!"); diff --git a/test/battle/hold_effect/eject_pack.c b/test/battle/hold_effect/eject_pack.c index 836f3d0fd1..7e854055dd 100644 --- a/test/battle/hold_effect/eject_pack.c +++ b/test/battle/hold_effect/eject_pack.c @@ -33,7 +33,7 @@ SINGLE_BATTLE_TEST("Eject Pack does not activate if there are no Pokémon left t PLAYER(SPECIES_WOBBUFFET) { HP(0); } OPPONENT(SPECIES_EKANS) { Ability(ABILITY_INTIMIDATE); } } WHEN { - TURN { } + TURN {} } SCENE { ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, player); NONE_OF { @@ -69,7 +69,7 @@ SINGLE_BATTLE_TEST("Eject Pack will miss timing to switch out user if Emergency GIVEN { PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_EJECT_PACK); } PLAYER(SPECIES_WYNAUT); - OPPONENT(SPECIES_GOLISOPOD) { Ability(ABILITY_EMERGENCY_EXIT); MaxHP(263); HP(133); }; + OPPONENT(SPECIES_GOLISOPOD) { Ability(ABILITY_EMERGENCY_EXIT); MaxHP(263); HP(133); } OPPONENT(SPECIES_WYNAUT); } WHEN { TURN { MOVE(player, MOVE_OVERHEAT); SEND_OUT(opponent, 1); } @@ -125,7 +125,7 @@ DOUBLE_BATTLE_TEST("Eject Pack will not trigger if the conditions are not met") { GIVEN { PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_EJECT_PACK); } - PLAYER(SPECIES_BELDUM) { Ability(ABILITY_CLEAR_BODY); }; + PLAYER(SPECIES_BELDUM) { Ability(ABILITY_CLEAR_BODY); } PLAYER(SPECIES_RALTS) { Ability(ABILITY_TRACE); Item(ITEM_EJECT_PACK); } PLAYER(SPECIES_WYNAUT); OPPONENT(SPECIES_WYNAUT); @@ -323,7 +323,7 @@ SINGLE_BATTLE_TEST("Eject Pack does not activate if mon is switched in due to Ej GIVEN { PLAYER(SPECIES_DUGTRIO) { Ability(ABILITY_ARENA_TRAP); } OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_EJECT_BUTTON); } - OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_EJECT_PACK); }; + OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_EJECT_PACK); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { diff --git a/test/battle/hold_effect/gems.c b/test/battle/hold_effect/gems.c index b597beeab7..8455fe09da 100644 --- a/test/battle/hold_effect/gems.c +++ b/test/battle/hold_effect/gems.c @@ -9,7 +9,7 @@ ASSUMPTIONS SINGLE_BATTLE_TEST("Gem is consumed when it corresponds to the type of a move") { GIVEN { - PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_NORMAL_GEM); }; + PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_NORMAL_GEM); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(player, MOVE_EMBER); } @@ -60,7 +60,7 @@ SINGLE_BATTLE_TEST("Gem boost is only applied once") s16 normalHit; GIVEN { - PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_NORMAL_GEM); }; + PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_NORMAL_GEM); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(player, MOVE_SCRATCH); } @@ -86,7 +86,7 @@ SINGLE_BATTLE_TEST("Gem modifier is used for all hits of Multi Hit Moves") s16 secondHit; GIVEN { - PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_NORMAL_GEM); }; + PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_NORMAL_GEM); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { @@ -105,7 +105,7 @@ SINGLE_BATTLE_TEST("Gem modifier is used for all hits of Multi Hit Moves") SINGLE_BATTLE_TEST("Gem is consumed if the move type is changed") { GIVEN { - PLAYER(SPECIES_DELCATTY) { Ability(ABILITY_NORMALIZE); Item(ITEM_NORMAL_GEM); }; + PLAYER(SPECIES_DELCATTY) { Ability(ABILITY_NORMALIZE); Item(ITEM_NORMAL_GEM); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { diff --git a/test/battle/hold_effect/iron_ball.c b/test/battle/hold_effect/iron_ball.c index 90c370e8f3..48c87dbccb 100644 --- a/test/battle/hold_effect/iron_ball.c +++ b/test/battle/hold_effect/iron_ball.c @@ -13,9 +13,9 @@ SINGLE_BATTLE_TEST("Ground-type moves do neutral damage to non-grounded Flying t GIVEN { WITH_CONFIG(CONFIG_IRON_BALL, config); PLAYER(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_SKARMORY) { Item(ITEM_IRON_BALL); }; + OPPONENT(SPECIES_SKARMORY) { Item(ITEM_IRON_BALL); } } WHEN { - TURN { MOVE(player, MOVE_EARTHQUAKE); }; + TURN { MOVE(player, MOVE_EARTHQUAKE); } } SCENE { ANIMATION(ANIM_TYPE_MOVE, MOVE_EARTHQUAKE, player); if (config >= GEN_5) { diff --git a/test/battle/hold_effect/metronome.c b/test/battle/hold_effect/metronome.c index e7037db8d0..8e9e07d9ff 100644 --- a/test/battle/hold_effect/metronome.c +++ b/test/battle/hold_effect/metronome.c @@ -109,8 +109,8 @@ SINGLE_BATTLE_TEST("Metronome Item counts charging turn of moves for its attacki { u32 item; - PARAMETRIZE {item = ITEM_NONE; } - PARAMETRIZE {item = ITEM_METRONOME; } + PARAMETRIZE { item = ITEM_NONE; } + PARAMETRIZE { item = ITEM_METRONOME; } GIVEN { ASSUME(GetMoveEffect(MOVE_SOLAR_BEAM) == EFFECT_SOLAR_BEAM); PLAYER(SPECIES_WOBBUFFET) { Item(item); } diff --git a/test/battle/hold_effect/mirror_herb.c b/test/battle/hold_effect/mirror_herb.c index 6618d41950..def6cdd429 100644 --- a/test/battle/hold_effect/mirror_herb.c +++ b/test/battle/hold_effect/mirror_herb.c @@ -80,7 +80,7 @@ SINGLE_BATTLE_TEST("Mirror Herb copies the boost gained by an ability") PLAYER(SPECIES_ZACIAN) { Ability(ABILITY_INTREPID_SWORD); } OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_MIRROR_HERB); } } WHEN { - TURN { } + TURN {} } SCENE { ABILITY_POPUP(player, ABILITY_INTREPID_SWORD); ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, opponent); diff --git a/test/battle/hold_effect/random_stat_up.c b/test/battle/hold_effect/random_stat_up.c index ff6b03e035..53a11c6f9f 100644 --- a/test/battle/hold_effect/random_stat_up.c +++ b/test/battle/hold_effect/random_stat_up.c @@ -13,7 +13,7 @@ SINGLE_BATTLE_TEST("Starf Berry randomly raises the holder's Attack, Defense, Sp PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_STARF_BERRY); HP(100); MaxHP(400); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { - TURN { } + TURN {} } SCENE { ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_HELD_ITEM_EFFECT, player); ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, player); diff --git a/test/battle/hold_effect/red_card.c b/test/battle/hold_effect/red_card.c index 6b5e08c450..e020b43f59 100644 --- a/test/battle/hold_effect/red_card.c +++ b/test/battle/hold_effect/red_card.c @@ -485,7 +485,7 @@ SINGLE_BATTLE_TEST("Red Card prevents Emergency Exit activation when triggered") GIVEN { PLAYER(SPECIES_WOBBUFFET); PLAYER(SPECIES_WYNAUT); - OPPONENT(SPECIES_GOLISOPOD) { Item(ITEM_RED_CARD); Ability(ABILITY_EMERGENCY_EXIT); MaxHP(263); HP(262); }; + OPPONENT(SPECIES_GOLISOPOD) { Item(ITEM_RED_CARD); Ability(ABILITY_EMERGENCY_EXIT); MaxHP(263); HP(262); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(player, MOVE_SUPER_FANG); MOVE(opponent, MOVE_CELEBRATE); } diff --git a/test/battle/hold_effect/rocky_helmet.c b/test/battle/hold_effect/rocky_helmet.c index bc52f44b87..f49d26c1eb 100644 --- a/test/battle/hold_effect/rocky_helmet.c +++ b/test/battle/hold_effect/rocky_helmet.c @@ -11,7 +11,7 @@ ASSUMPTIONS SINGLE_BATTLE_TEST("Rocky Helmet damages attacker even if damage is blocked by Disguise") { GIVEN { - PLAYER(SPECIES_MIMIKYU) { Item(ITEM_ROCKY_HELMET); Ability(ABILITY_DISGUISE); }; + PLAYER(SPECIES_MIMIKYU) { Item(ITEM_ROCKY_HELMET); Ability(ABILITY_DISGUISE); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(opponent, MOVE_SHADOW_SNEAK); } diff --git a/test/battle/hold_effect/safety_goggles.c b/test/battle/hold_effect/safety_goggles.c index ec90b251b3..a5cfca0769 100644 --- a/test/battle/hold_effect/safety_goggles.c +++ b/test/battle/hold_effect/safety_goggles.c @@ -24,7 +24,7 @@ SINGLE_BATTLE_TEST("Safety Goggles blocks damage from Hail") { GIVEN { PLAYER(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_SAFETY_GOGGLES); }; + OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_SAFETY_GOGGLES); } } WHEN { TURN { MOVE(player, MOVE_HAIL); } } SCENE { @@ -36,7 +36,7 @@ SINGLE_BATTLE_TEST("Safety Goggles blocks damage from Sandstorm") { GIVEN { PLAYER(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_SAFETY_GOGGLES); }; + OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_SAFETY_GOGGLES); } } WHEN { TURN { MOVE(player, MOVE_SANDSTORM); } } SCENE { diff --git a/test/battle/hold_effect/scope_lens.c b/test/battle/hold_effect/scope_lens.c index 2a073900a7..f74a06a1c5 100644 --- a/test/battle/hold_effect/scope_lens.c +++ b/test/battle/hold_effect/scope_lens.c @@ -12,7 +12,7 @@ SINGLE_BATTLE_TEST("Scope Lens increases the critical hit ratio by 1 stage") WITH_CONFIG(CONFIG_CRIT_CHANCE, genConfig); ASSUME(gItemsInfo[ITEM_SCOPE_LENS].holdEffect == HOLD_EFFECT_SCOPE_LENS); ASSUME(GetSpeciesBaseSpeed(SPECIES_WOBBUFFET) == 33); - PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_SCOPE_LENS); }; + PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_SCOPE_LENS); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(player, MOVE_SCRATCH); } diff --git a/test/battle/hold_effect/shed_shell.c b/test/battle/hold_effect/shed_shell.c index 93c3fb0e53..f8f6277ff2 100644 --- a/test/battle/hold_effect/shed_shell.c +++ b/test/battle/hold_effect/shed_shell.c @@ -62,6 +62,6 @@ SINGLE_BATTLE_TEST("Shed Shell does not allow Teleport when trapped") } SCENE { ANIMATION(ANIM_TYPE_MOVE, MOVE_MEAN_LOOK, opponent); MESSAGE("Wobbuffet used Teleport!"); - MESSAGE("But it failed!"); + MESSAGE("But it failed!"); } } diff --git a/test/battle/hold_effect/shell_bell.c b/test/battle/hold_effect/shell_bell.c index 82f1b0b184..7473f6db59 100644 --- a/test/battle/hold_effect/shell_bell.c +++ b/test/battle/hold_effect/shell_bell.c @@ -35,7 +35,7 @@ SINGLE_BATTLE_TEST("Shell Bell recovers no HP if the move did no damage") { GIVEN { PLAYER(SPECIES_WOBBUFFET) { HP(1); Item(ITEM_SHELL_BELL); } - OPPONENT(SPECIES_WOBBUFFET) { HP(1); }; + OPPONENT(SPECIES_WOBBUFFET) { HP(1); } } WHEN { TURN { MOVE(player, MOVE_FALSE_SWIPE); } } SCENE { @@ -120,7 +120,7 @@ SINGLE_BATTLE_TEST("Shell Bell restores 1/8 HP of damage dealt") { GIVEN { PLAYER(SPECIES_WOBBUFFET) { Level(16); Item(ITEM_SHELL_BELL); HP(10); } - OPPONENT(SPECIES_WOBBUFFET) { Level(16); }; + OPPONENT(SPECIES_WOBBUFFET) { Level(16); } } WHEN { TURN { MOVE(player, MOVE_SEISMIC_TOSS); } } SCENE { @@ -135,11 +135,11 @@ SINGLE_BATTLE_TEST("Shell Bell doesn't restore HP for damage dealt by a foreseen GIVEN { ASSUME(GetMoveEffect(MOVE_FUTURE_SIGHT) == EFFECT_FUTURE_SIGHT); PLAYER(SPECIES_WOBBUFFET) { Level(16); Item(ITEM_SHELL_BELL); HP(10); } - OPPONENT(SPECIES_WOBBUFFET) { Level(16); }; + OPPONENT(SPECIES_WOBBUFFET) { Level(16); } } WHEN { TURN { MOVE(player, MOVE_FUTURE_SIGHT); } - TURN { } - TURN { } + TURN {} + TURN {} } SCENE { ANIMATION(ANIM_TYPE_MOVE, MOVE_FUTURE_SIGHT, player); MESSAGE("The opposing Wobbuffet took the Future Sight attack!"); @@ -210,9 +210,9 @@ DOUBLE_BATTLE_TEST("Shell Bell heals accumulated damage for spread moves") GIVEN { ASSUME(GetMoveTarget(MOVE_DISCHARGE) == MOVE_TARGET_FOES_AND_ALLY); PLAYER(SPECIES_ARIADOS) { MaxHP(maxHp); HP(initHp); Item(ITEM_SHELL_BELL); } - PLAYER(SPECIES_WOBBUFFET) {} - OPPONENT(SPECIES_GYARADOS) {} - OPPONENT(SPECIES_CHANSEY) {} + PLAYER(SPECIES_WOBBUFFET); + OPPONENT(SPECIES_GYARADOS); + OPPONENT(SPECIES_CHANSEY); } WHEN { TURN { MOVE(playerLeft, MOVE_DISCHARGE); @@ -275,7 +275,7 @@ SINGLE_BATTLE_TEST("Shell Bell recovers only 1 damage if the move only did 1 dam { GIVEN { PLAYER(SPECIES_WOBBUFFET) { HP(1); Item(ITEM_SHELL_BELL); } - OPPONENT(SPECIES_WOBBUFFET) { HP(1); }; + OPPONENT(SPECIES_WOBBUFFET) { HP(1); } } WHEN { TURN { MOVE(player, MOVE_DRAGON_RAGE); } } SCENE { diff --git a/test/battle/hold_effect/sticky_barb.c b/test/battle/hold_effect/sticky_barb.c index 59c1e12270..b13f2a5987 100644 --- a/test/battle/hold_effect/sticky_barb.c +++ b/test/battle/hold_effect/sticky_barb.c @@ -13,7 +13,7 @@ SINGLE_BATTLE_TEST("Sticky Barb hurts its holder at the end of the turn") PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_STICKY_BARB); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { - TURN { } + TURN {} } SCENE { HP_BAR(player, captureDamage: &damage); } THEN { diff --git a/test/battle/hold_effect/terrain_seed.c b/test/battle/hold_effect/terrain_seed.c index b54dd54f5b..1ff1c252bf 100644 --- a/test/battle/hold_effect/terrain_seed.c +++ b/test/battle/hold_effect/terrain_seed.c @@ -155,7 +155,7 @@ SINGLE_BATTLE_TEST("Seeds get consumed in Terrain even if holder is not affected PLAYER(SPECIES_PIDGEY) { Item(item); } OPPONENT(species) { Ability(ability); } } WHEN { - TURN { } + TURN {} } SCENE { ABILITY_POPUP(opponent, ability); ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, player); @@ -170,7 +170,7 @@ SINGLE_BATTLE_TEST("Electric Seed is consumed on Electric Terrain before other a PLAYER(SPECIES_TAPU_BULU) { Ability(ABILITY_GRASSY_SURGE); Item(ITEM_ELECTRIC_SEED); Speed(5); } OPPONENT(SPECIES_TAPU_KOKO) { Ability(ABILITY_ELECTRIC_SURGE); Item(ITEM_ELECTRIC_SEED); Speed(10); } } WHEN { - TURN { } + TURN {} } SCENE { ABILITY_POPUP(opponent, ABILITY_ELECTRIC_SURGE); ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponent); diff --git a/test/battle/hold_effect/utility_umbrella.c b/test/battle/hold_effect/utility_umbrella.c index 67a3be4c7a..83bb0539f4 100644 --- a/test/battle/hold_effect/utility_umbrella.c +++ b/test/battle/hold_effect/utility_umbrella.c @@ -18,7 +18,7 @@ SINGLE_BATTLE_TEST("Utility Umbrella blocks Sun damage modifiers", s16 damage) PARAMETRIZE { setupMove = MOVE_SUNNY_DAY; attackingMove = MOVE_WATER_GUN; heldItem = ITEM_NONE; } GIVEN { PLAYER(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_WOBBUFFET) { Item(heldItem); }; + OPPONENT(SPECIES_WOBBUFFET) { Item(heldItem); } } WHEN { TURN { MOVE(opponent, setupMove); } TURN { MOVE(player, attackingMove); } @@ -40,7 +40,7 @@ SINGLE_BATTLE_TEST("Utility Umbrella blocks Rain damage modifiers", s16 damage) PARAMETRIZE { setupMove = MOVE_RAIN_DANCE; attackingMove = MOVE_WATER_GUN; heldItem = ITEM_NONE; } GIVEN { PLAYER(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_WOBBUFFET) { Item(heldItem); }; + OPPONENT(SPECIES_WOBBUFFET) { Item(heldItem); } } WHEN { TURN { MOVE(opponent, setupMove); } TURN { MOVE(player, attackingMove); } diff --git a/test/battle/hold_effect/white_herb.c b/test/battle/hold_effect/white_herb.c index 8423c29fdb..fe4a34ad97 100644 --- a/test/battle/hold_effect/white_herb.c +++ b/test/battle/hold_effect/white_herb.c @@ -30,7 +30,7 @@ SINGLE_BATTLE_TEST("White Herb restores stats after Attack was lowered by Intimi PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_WHITE_HERB); } OPPONENT(SPECIES_ARBOK) { Ability(ABILITY_INTIMIDATE); } } WHEN { - TURN { ; } + TURN {} } SCENE { ABILITY_POPUP(opponent, ABILITY_INTIMIDATE); ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, player); @@ -50,7 +50,7 @@ DOUBLE_BATTLE_TEST("White Herb restores stats after Attack was lowered by Intimi PLAYER(SPECIES_ARBOK) { Ability(ABILITY_INTIMIDATE); } PLAYER(SPECIES_WOBBUFFET); } WHEN { - TURN { ; } + TURN {} } SCENE { ABILITY_POPUP(playerLeft, ABILITY_INTIMIDATE); @@ -134,7 +134,7 @@ SINGLE_BATTLE_TEST("White Herb wont have time to activate if it is knocked off o GIVEN { ASSUME(GetMoveEffect(MOVE_KNOCK_OFF) == EFFECT_KNOCK_OFF); ASSUME(GetMoveEffect(MOVE_THIEF) == EFFECT_STEAL_ITEM); - PLAYER(SPECIES_SLUGMA) { Ability(ABILITY_WEAK_ARMOR); Item(ITEM_WHITE_HERB); } + PLAYER(SPECIES_SLUGMA) { Ability(ABILITY_WEAK_ARMOR); Item(ITEM_WHITE_HERB); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(opponent, move); } @@ -162,7 +162,7 @@ SINGLE_BATTLE_TEST("White Herb wont have time to activate if it is knocked off o SINGLE_BATTLE_TEST("White Herb wont have time to activate if Magician steals it") { GIVEN { - PLAYER(SPECIES_SLUGMA) { Ability(ABILITY_WEAK_ARMOR); Item(ITEM_WHITE_HERB); } + PLAYER(SPECIES_SLUGMA) { Ability(ABILITY_WEAK_ARMOR); Item(ITEM_WHITE_HERB); } OPPONENT(SPECIES_FENNEKIN) { Ability(ABILITY_MAGICIAN); } } WHEN { TURN { MOVE(opponent, MOVE_SCRATCH); } @@ -196,7 +196,7 @@ SINGLE_BATTLE_TEST("White Herb has correct interactions with Intimidate triggere PLAYER(species) { Ability(ability); Item(ITEM_WHITE_HERB); } OPPONENT(SPECIES_ARBOK) { Ability(ABILITY_INTIMIDATE); } } WHEN { - TURN { ; } + TURN {} } SCENE { ABILITY_POPUP(opponent, ABILITY_INTIMIDATE); ABILITY_POPUP(player, ability); diff --git a/test/battle/item_effect/cure_status.c b/test/battle/item_effect/cure_status.c index 79490b48dc..915196691b 100644 --- a/test/battle/item_effect/cure_status.c +++ b/test/battle/item_effect/cure_status.c @@ -36,9 +36,9 @@ DOUBLE_BATTLE_TEST("Antidote heals a battler from being poisoned (doubles)") u32 index; struct BattlePokemon *user = NULL; struct BattlePokemon *target = NULL; - PARAMETRIZE { index = 0; user = playerRight; target = playerLeft;} - PARAMETRIZE { index = 1; user = playerLeft; target = playerRight;} - PARAMETRIZE { index = 0; user = playerLeft; target = playerLeft;} + PARAMETRIZE { index = 0; user = playerRight; target = playerLeft; } + PARAMETRIZE { index = 1; user = playerLeft; target = playerRight; } + PARAMETRIZE { index = 0; user = playerLeft; target = playerLeft; } PARAMETRIZE { index = 1; user = playerRight; target = playerRight; } GIVEN { @@ -77,7 +77,7 @@ SINGLE_BATTLE_TEST("Antidote resets Toxic Counter") OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(opponent, MOVE_TOXIC); } - TURN { ; } + TURN {} TURN { USE_ITEM(player, ITEM_ANTIDOTE, partyIndex: 0); } } SCENE { MESSAGE("The opposing Wobbuffet used Toxic!"); @@ -177,10 +177,10 @@ DOUBLE_BATTLE_TEST("Full Heal heals a battler from any primary status (doubles)" struct BattlePokemon *target = NULL; for (u32 j = 0; j < 7; j++) { - PARAMETRIZE {status = statusParameters[j]; user = playerRight; target = playerLeft; index = 0;} - PARAMETRIZE {status = statusParameters[j]; user = playerLeft; target = playerRight; index = 1;} - PARAMETRIZE {status = statusParameters[j]; user = playerLeft; target = playerLeft; index = 0;} - PARAMETRIZE {status = statusParameters[j]; user = playerRight; target = playerRight; index = 1;} + PARAMETRIZE { status = statusParameters[j]; user = playerRight; target = playerLeft; index = 0; } + PARAMETRIZE { status = statusParameters[j]; user = playerLeft; target = playerRight; index = 1; } + PARAMETRIZE { status = statusParameters[j]; user = playerLeft; target = playerLeft; index = 0; } + PARAMETRIZE { status = statusParameters[j]; user = playerRight; target = playerRight; index = 1; } } GIVEN { ASSUME(gItemsInfo[ITEM_FULL_HEAL].battleUsage == EFFECT_ITEM_CURE_STATUS); @@ -237,10 +237,10 @@ DOUBLE_BATTLE_TEST("Heal Powder heals a battler from any primary status (doubles struct BattlePokemon *target = NULL; for (u32 j = 0; j < 7; j++) { - PARAMETRIZE {status = statusParameters[j]; user = playerRight; target = playerLeft; index = 0;} - PARAMETRIZE {status = statusParameters[j]; user = playerLeft; target = playerRight; index = 1;} - PARAMETRIZE {status = statusParameters[j]; user = playerLeft; target = playerLeft; index = 0;} - PARAMETRIZE {status = statusParameters[j]; user = playerRight; target = playerRight; index = 1;} + PARAMETRIZE { status = statusParameters[j]; user = playerRight; target = playerLeft; index = 0; } + PARAMETRIZE { status = statusParameters[j]; user = playerLeft; target = playerRight; index = 1; } + PARAMETRIZE { status = statusParameters[j]; user = playerLeft; target = playerLeft; index = 0; } + PARAMETRIZE { status = statusParameters[j]; user = playerRight; target = playerRight; index = 1; } } GIVEN { ASSUME(gItemsInfo[ITEM_HEAL_POWDER].battleUsage == EFFECT_ITEM_CURE_STATUS); @@ -387,7 +387,7 @@ SINGLE_BATTLE_TEST("Lumiose Galette heals a battler from any primary status") } WHEN { TURN { USE_ITEM(player, ITEM_LUMIOSE_GALETTE, partyIndex: 0); } } SCENE { - MESSAGE("Wobbuffet had its status healed!");; + MESSAGE("Wobbuffet had its status healed!"); } THEN { EXPECT_EQ(player->status1, STATUS1_NONE); } diff --git a/test/battle/item_effect/heal_and_cure_status.c b/test/battle/item_effect/heal_and_cure_status.c index d85f11b33d..bb75625371 100644 --- a/test/battle/item_effect/heal_and_cure_status.c +++ b/test/battle/item_effect/heal_and_cure_status.c @@ -114,9 +114,9 @@ SINGLE_BATTLE_TEST("Full Restore restores a battler's HP and cures confusion") PLAYER(SPECIES_WOBBUFFET) { HP(1); MaxHP(300); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { - TURN{ MOVE(opponent, MOVE_CONFUSE_RAY); } - TURN{ USE_ITEM(player, ITEM_FULL_RESTORE, partyIndex: 0); } - TURN{ MOVE(player, MOVE_SCRATCH); } + TURN { MOVE(opponent, MOVE_CONFUSE_RAY); } + TURN { USE_ITEM(player, ITEM_FULL_RESTORE, partyIndex: 0); } + TURN { MOVE(player, MOVE_SCRATCH); } } SCENE { MESSAGE("Wobbuffet had its HP restored."); NONE_OF { MESSAGE("Wobbuffet is confused!"); } @@ -132,7 +132,7 @@ SINGLE_BATTLE_TEST("Full Restore resets Toxic Counter") OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(opponent, MOVE_TOXIC); } - TURN { ; } + TURN {} TURN { USE_ITEM(player, ITEM_FULL_RESTORE, partyIndex: 0); } } SCENE { MESSAGE("The opposing Wobbuffet used Toxic!"); diff --git a/test/battle/item_effect/increase_stat.c b/test/battle/item_effect/increase_stat.c index 227a638c6a..37b8501c4b 100644 --- a/test/battle/item_effect/increase_stat.c +++ b/test/battle/item_effect/increase_stat.c @@ -268,7 +268,7 @@ SINGLE_BATTLE_TEST("Using X items in battle raises Friendship", s16 damage) PARAMETRIZE { startingFriendship = 0; } PARAMETRIZE { startingFriendship = X_ITEM_MAX_FRIENDSHIP; } GIVEN { - PLAYER(SPECIES_WOBBUFFET) { Friendship(startingFriendship); }; + PLAYER(SPECIES_WOBBUFFET) { Friendship(startingFriendship); } // Set met location to currentMapSec + 1 to avoid getting the friendship boost // from being met in the current map section SetMonData(&PLAYER_PARTY[0], MON_DATA_MET_LOCATION, &metLocation); @@ -291,7 +291,7 @@ SINGLE_BATTLE_TEST("Using X items in battle where Pokemon was met raises Friends PARAMETRIZE { startingFriendship = 0; } PARAMETRIZE { startingFriendship = X_ITEM_MAX_FRIENDSHIP; } GIVEN { - PLAYER(SPECIES_WOBBUFFET) { Friendship(startingFriendship); }; + PLAYER(SPECIES_WOBBUFFET) { Friendship(startingFriendship); } // Set met location to currentMapSec to get the friendship boost SetMonData(&PLAYER_PARTY[0], MON_DATA_MET_LOCATION, &metLocation); OPPONENT(SPECIES_WOBBUFFET); diff --git a/test/battle/item_effect/revive.c b/test/battle/item_effect/revive.c index df866edf0e..f12c208fb0 100644 --- a/test/battle/item_effect/revive.c +++ b/test/battle/item_effect/revive.c @@ -130,8 +130,8 @@ DOUBLE_BATTLE_TEST("Revive does reset abilities") OPPONENT(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WYNAUT); } WHEN { - TURN { MOVE(opponentRight, MOVE_WORRY_SEED, target: playerLeft); MOVE(opponentLeft, MOVE_SCRATCH, target: playerLeft); } - TURN { USE_ITEM(playerRight, ITEM_REVIVE, partyIndex: 0); SKIP_TURN(playerLeft); MOVE(opponentRight, MOVE_SPORE, target: playerLeft);} + TURN { MOVE(opponentRight, MOVE_WORRY_SEED, target: playerLeft); MOVE(opponentLeft, MOVE_SCRATCH, target: playerLeft); } + TURN { USE_ITEM(playerRight, ITEM_REVIVE, partyIndex: 0); SKIP_TURN(playerLeft); MOVE(opponentRight, MOVE_SPORE, target: playerLeft); } } SCENE { ABILITY_POPUP(playerLeft, ABILITY_INTIMIDATE); ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponentLeft); @@ -184,7 +184,7 @@ DOUBLE_BATTLE_TEST("Revive does not grant a mon its pre-death types") OPPONENT(SPECIES_POOCHYENA); } WHEN { TURN { MOVE(playerRight, MOVE_REFLECT_TYPE, target: opponentRight); MOVE(opponentLeft, MOVE_PSYSHOCK, target: playerRight); MOVE(opponentRight, MOVE_SCRATCH, target: playerRight); } - TURN { USE_ITEM(playerLeft, ITEM_MAX_REVIVE, partyIndex: 1); SKIP_TURN(playerRight); MOVE(opponentLeft, MOVE_PSYCHIC, target: playerRight);} + TURN { USE_ITEM(playerLeft, ITEM_MAX_REVIVE, partyIndex: 1); SKIP_TURN(playerRight); MOVE(opponentLeft, MOVE_PSYCHIC, target: playerRight); } } SCENE { ANIMATION(ANIM_TYPE_MOVE, MOVE_REFLECT_TYPE, playerRight); NOT ANIMATION(ANIM_TYPE_MOVE, MOVE_PSYSHOCK, opponentLeft); @@ -203,12 +203,12 @@ DOUBLE_BATTLE_TEST("Revive force revived pokemon to replace absent battler immed GIVEN { PLAYER(SPECIES_WYNAUT) { HP(1); } - PLAYER(SPECIES_WOBBUFFET) { }; - PLAYER(SPECIES_ARBOK) { Ability(ability); HP(0) ;} ; + PLAYER(SPECIES_WOBBUFFET); + PLAYER(SPECIES_ARBOK) { Ability(ability); HP(0); } OPPONENT(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WYNAUT); } WHEN { - TURN { MOVE(opponentLeft, MOVE_SCRATCH, target: playerLeft);} + TURN { MOVE(opponentLeft, MOVE_SCRATCH, target: playerLeft); } TURN { USE_ITEM(playerRight, ITEM_REVIVE, partyIndex: 2); SKIP_TURN(playerLeft); MOVE(opponentRight, MOVE_SCRATCH, target: playerRight); } } SCENE { if (ability == ABILITY_INTIMIDATE) diff --git a/test/battle/move_animations/all_anims.c b/test/battle/move_animations/all_anims.c index c30f1c3a13..d77cb5ec4c 100644 --- a/test/battle/move_animations/all_anims.c +++ b/test/battle/move_animations/all_anims.c @@ -382,11 +382,11 @@ static void WhenSingles(u32 move, struct BattlePokemon *attacker, struct BattleP } else if (gMovesInfo[move].effect == EFFECT_ROLLOUT) { - TURN {MOVE(attacker, move);}; - TURN {MOVE(attacker, move);}; - TURN {MOVE(attacker, move);}; - TURN {MOVE(attacker, move);}; - TURN {MOVE(attacker, MOVE_HELPING_HAND);}; + TURN { MOVE(attacker, move); } + TURN { MOVE(attacker, move); } + TURN { MOVE(attacker, move); } + TURN { MOVE(attacker, move); } + TURN { MOVE(attacker, MOVE_HELPING_HAND); } } } @@ -601,11 +601,11 @@ static void DoublesWhen(u32 move, struct BattlePokemon *attacker, struct BattleP } else if (gMovesInfo[move].effect == EFFECT_ROLLOUT) { - TURN {MOVE(attacker, move, target: target);}; - TURN {MOVE(attacker, move, target: target);}; - TURN {MOVE(attacker, move, target: target);}; - TURN {MOVE(attacker, move, target: target);}; - TURN {MOVE(attacker, MOVE_LAST_RESORT, target: attacker);}; + TURN { MOVE(attacker, move, target: target); } + TURN { MOVE(attacker, move, target: target); } + TURN { MOVE(attacker, move, target: target); } + TURN { MOVE(attacker, move, target: target); } + TURN { MOVE(attacker, MOVE_LAST_RESORT, target: attacker); } } } @@ -647,7 +647,7 @@ SINGLE_BATTLE_TEST("Move Animations don't leak when used - Singles (player to op for (k = 0; k < variationsNumber; k++) { ParametrizeMovesAndSpecies(j, &tempMove, &tempSpecies, k); tempFriendship = ParametrizeFriendship(j, k); - PARAMETRIZE { move = tempMove; species = tempSpecies; variation = k; friendship = tempFriendship;} + PARAMETRIZE { move = tempMove; species = tempSpecies; variation = k; friendship = tempFriendship; } } } GIVEN { @@ -695,7 +695,7 @@ SINGLE_BATTLE_TEST("Move Animations don't leak when used - Singles (opponent to for (k = 0; k < variationsNumber; k++) { ParametrizeMovesAndSpecies(j, &tempMove, &tempSpecies, k); tempFriendship = ParametrizeFriendship(j, k); - PARAMETRIZE { move = tempMove; species = tempSpecies; variation = k; friendship = tempFriendship;} + PARAMETRIZE { move = tempMove; species = tempSpecies; variation = k; friendship = tempFriendship; } } } GIVEN { @@ -747,7 +747,7 @@ DOUBLE_BATTLE_TEST("Move Animations don't leak when used - Doubles (playerLeft t for (k = 0; k < variationsNumber; k++) { ParametrizeMovesAndSpecies(j, &tempMove, &tempSpecies, k); tempFriendship = ParametrizeFriendship(j, k); - PARAMETRIZE { move = tempMove; species = tempSpecies; variation = k; friendship = tempFriendship;} + PARAMETRIZE { move = tempMove; species = tempSpecies; variation = k; friendship = tempFriendship; } } } GIVEN { @@ -818,7 +818,7 @@ DOUBLE_BATTLE_TEST("Move Animations don't leak when used - Doubles (opponentLeft for (k = 0; k < variationsNumber; k++) { ParametrizeMovesAndSpecies(j, &tempMove, &tempSpecies, k); tempFriendship = ParametrizeFriendship(j, k); - PARAMETRIZE { move = tempMove; species = tempSpecies; variation = k; friendship = tempFriendship;} + PARAMETRIZE { move = tempMove; species = tempSpecies; variation = k; friendship = tempFriendship; } } } GIVEN { @@ -890,7 +890,7 @@ DOUBLE_BATTLE_TEST("Move Animations don't leak when used - Doubles (playerLeft t for (k = 0; k < variationsNumber; k++) { ParametrizeMovesAndSpecies(j, &tempMove, &tempSpecies, k); tempFriendship = ParametrizeFriendship(j, k); - PARAMETRIZE { move = tempMove; species = tempSpecies; variation = k; friendship = tempFriendship;} + PARAMETRIZE { move = tempMove; species = tempSpecies; variation = k; friendship = tempFriendship; } } } GIVEN { @@ -962,7 +962,7 @@ DOUBLE_BATTLE_TEST("Move Animations don't leak when used - Doubles (opponentRigh for (k = 0; k < variationsNumber; k++) { ParametrizeMovesAndSpecies(j, &tempMove, &tempSpecies, k); tempFriendship = ParametrizeFriendship(j, k); - PARAMETRIZE { move = tempMove; species = tempSpecies; variation = k; friendship = tempFriendship;} + PARAMETRIZE { move = tempMove; species = tempSpecies; variation = k; friendship = tempFriendship; } } } GIVEN { @@ -1034,7 +1034,7 @@ DOUBLE_BATTLE_TEST("Move Animations don't leak when used - Doubles (playerRight for (k = 0; k < variationsNumber; k++) { ParametrizeMovesAndSpecies(j, &tempMove, &tempSpecies, k); tempFriendship = ParametrizeFriendship(j, k); - PARAMETRIZE { move = tempMove; species = tempSpecies; variation = k; friendship = tempFriendship;} + PARAMETRIZE { move = tempMove; species = tempSpecies; variation = k; friendship = tempFriendship; } } } GIVEN { @@ -1106,7 +1106,7 @@ DOUBLE_BATTLE_TEST("Move Animations don't leak when used - Doubles (opponentLeft for (k = 0; k < variationsNumber; k++) { ParametrizeMovesAndSpecies(j, &tempMove, &tempSpecies, k); tempFriendship = ParametrizeFriendship(j, k); - PARAMETRIZE { move = tempMove; species = tempSpecies; variation = k; friendship = tempFriendship;} + PARAMETRIZE { move = tempMove; species = tempSpecies; variation = k; friendship = tempFriendship; } } } GIVEN { @@ -1178,7 +1178,7 @@ DOUBLE_BATTLE_TEST("Move Animations don't leak when used - Doubles (playerRight for (k = 0; k < variationsNumber; k++) { ParametrizeMovesAndSpecies(j, &tempMove, &tempSpecies, k); tempFriendship = ParametrizeFriendship(j, k); - PARAMETRIZE { move = tempMove; species = tempSpecies; variation = k; friendship = tempFriendship;} + PARAMETRIZE { move = tempMove; species = tempSpecies; variation = k; friendship = tempFriendship; } } } GIVEN { @@ -1250,7 +1250,7 @@ DOUBLE_BATTLE_TEST("Move Animations don't leak when used - Doubles (opponentRigh for (k = 0; k < variationsNumber; k++) { ParametrizeMovesAndSpecies(j, &tempMove, &tempSpecies, k); tempFriendship = ParametrizeFriendship(j, k); - PARAMETRIZE { move = tempMove; species = tempSpecies; variation = k; friendship = tempFriendship;} + PARAMETRIZE { move = tempMove; species = tempSpecies; variation = k; friendship = tempFriendship; } } } GIVEN { @@ -1556,7 +1556,7 @@ SINGLE_BATTLE_TEST("Move Animations occur before their stat change animations - for (k = 0; k < variationsNumber; k++) { ParametrizeMovesAndSpecies(j, &tempMove, &tempSpecies, k); tempFriendship = ParametrizeFriendship(j, k); - PARAMETRIZE { move = tempMove; species = tempSpecies; variation = k; friendship = tempFriendship;} + PARAMETRIZE { move = tempMove; species = tempSpecies; variation = k; friendship = tempFriendship; } } } GIVEN { diff --git a/test/battle/move_effect/ally_switch.c b/test/battle/move_effect/ally_switch.c index 9b0117afe1..af4e1810fc 100644 --- a/test/battle/move_effect/ally_switch.c +++ b/test/battle/move_effect/ally_switch.c @@ -358,7 +358,7 @@ DOUBLE_BATTLE_TEST("Ally Switch does not update leech seed battler") } WHEN { TURN { MOVE(opponentLeft, MOVE_LEECH_SEED, target: playerLeft); } TURN { MOVE(opponentRight, MOVE_ALLY_SWITCH); } - TURN { ; } + TURN {} } SCENE { // turn 1 MESSAGE("The opposing Bulbasaur used Leech Seed!"); @@ -389,7 +389,7 @@ DOUBLE_BATTLE_TEST("Ally Switch updates attract battler") } WHEN { TURN { MOVE(playerLeft, MOVE_TACKLE, target: opponentLeft); } TURN { MOVE(opponentRight, MOVE_ALLY_SWITCH); } - TURN { ; } + TURN {} } SCENE { // turn 1 MESSAGE("Wobbuffet used Tackle!"); diff --git a/test/battle/move_effect/aura_wheel.c b/test/battle/move_effect/aura_wheel.c index 3e26176eee..55af998c63 100644 --- a/test/battle/move_effect/aura_wheel.c +++ b/test/battle/move_effect/aura_wheel.c @@ -75,7 +75,7 @@ SINGLE_BATTLE_TEST("Aura Wheel can be turned into a Normal-type move after Morpe OPPONENT(SPECIES_DUSKULL); } WHEN { if (hangryMode) - TURN { } + TURN {} TURN { MOVE(opponent, MOVE_ENTRAINMENT); } TURN { MOVE(player, MOVE_AURA_WHEEL); SWITCH(opponent, 1); } } SCENE { diff --git a/test/battle/move_effect/belch.c b/test/battle/move_effect/belch.c index 38a41ae2c7..01bb244002 100644 --- a/test/battle/move_effect/belch.c +++ b/test/battle/move_effect/belch.c @@ -19,7 +19,7 @@ AI_SINGLE_BATTLE_TEST("AI: Belch has nonzero score after eating a berry") OPPONENT(SPECIES_PIKACHU) { Level(15); Item(ITEM_SHUCA_BERRY); Moves(MOVE_BELCH, MOVE_SCRATCH); } } WHEN { TURN { MOVE(player, MOVE_MUD_SHOT); EXPECT_MOVE(opponent, MOVE_SCRATCH); } - TURN { MOVE(player, MOVE_SCRATCH); EXPECT_MOVE(opponent, MOVE_BELCH);} + TURN { MOVE(player, MOVE_SCRATCH); EXPECT_MOVE(opponent, MOVE_BELCH); } } SCENE { ANIMATION(ANIM_TYPE_MOVE, MOVE_BELCH, opponent); } diff --git a/test/battle/move_effect/belly_drum.c b/test/battle/move_effect/belly_drum.c index 194ee5b9d0..8b2cdf1d18 100644 --- a/test/battle/move_effect/belly_drum.c +++ b/test/battle/move_effect/belly_drum.c @@ -47,7 +47,7 @@ SINGLE_BATTLE_TEST("Belly Drum maximizes the user's Attack stat", s16 damage) SINGLE_BATTLE_TEST("Belly Drum fails if user's current HP is half or less than half its maximum") { GIVEN { - PLAYER(SPECIES_WOBBUFFET) { MaxHP(100); HP(50);} + PLAYER(SPECIES_WOBBUFFET) { MaxHP(100); HP(50); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(player, MOVE_BELLY_DRUM); } diff --git a/test/battle/move_effect/charge.c b/test/battle/move_effect/charge.c index 48b77d8bdc..610230de11 100644 --- a/test/battle/move_effect/charge.c +++ b/test/battle/move_effect/charge.c @@ -84,7 +84,7 @@ SINGLE_BATTLE_TEST("Charge's effect does not stack with Electromorphosis or Wind GIVEN { ASSUME(IsWindMove(MOVE_AIR_CUTTER)); - PLAYER(species) { Ability(ability); } + PLAYER(species) { Ability(ability); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(player, MOVE_THUNDERBOLT); } diff --git a/test/battle/move_effect/clangorous_soul.c b/test/battle/move_effect/clangorous_soul.c index a1a7ffa42a..b2914c18aa 100644 --- a/test/battle/move_effect/clangorous_soul.c +++ b/test/battle/move_effect/clangorous_soul.c @@ -5,7 +5,7 @@ SINGLE_BATTLE_TEST("Clangorous Soul cuts the user's HP by 1/3") { s16 dmg; GIVEN { - PLAYER(SPECIES_WOBBUFFET) { HP(300); MaxHP(300); }; + PLAYER(SPECIES_WOBBUFFET) { HP(300); MaxHP(300); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(player, MOVE_CLANGOROUS_SOUL); } @@ -21,7 +21,7 @@ SINGLE_BATTLE_TEST("Clangorous Soul cuts the user's HP by 1/3") SINGLE_BATTLE_TEST("Clangorous Soul raises the user's Atk, Def, Sp. Atk. Sp. Def and Speed by 1 stage") { GIVEN { - PLAYER(SPECIES_WOBBUFFET) { HP(300); MaxHP(300); }; + PLAYER(SPECIES_WOBBUFFET) { HP(300); MaxHP(300); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(player, MOVE_CLANGOROUS_SOUL); } @@ -40,7 +40,7 @@ SINGLE_BATTLE_TEST("Clangorous Soul raises the user's Atk, Def, Sp. Atk. Sp. Def SINGLE_BATTLE_TEST("Clangorous Soul fails if the user's HP is less or equal than 1/3") { GIVEN { - PLAYER(SPECIES_WOBBUFFET) { HP(100); MaxHP(300); }; + PLAYER(SPECIES_WOBBUFFET) { HP(100); MaxHP(300); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(player, MOVE_CLANGOROUS_SOUL); } diff --git a/test/battle/move_effect/coaching.c b/test/battle/move_effect/coaching.c index 642727de51..76030f1811 100644 --- a/test/battle/move_effect/coaching.c +++ b/test/battle/move_effect/coaching.c @@ -99,7 +99,7 @@ DOUBLE_BATTLE_TEST("Coaching fails if there's no ally") { GIVEN { PLAYER(SPECIES_WOBBUFFET); - PLAYER(SPECIES_WYNAUT) { HP(1); }; + PLAYER(SPECIES_WYNAUT) { HP(1); } OPPONENT(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -132,7 +132,7 @@ AI_DOUBLE_BATTLE_TEST("AI uses Coaching") OPPONENT(SPECIES_WOBBUFFET) { Moves(move); } } WHEN { if (move == MOVE_HEADBUTT) - TURN { EXPECT_MOVE(opponentLeft, MOVE_COACHING); } + TURN { EXPECT_MOVE(opponentLeft, MOVE_COACHING); } else TURN { NOT_EXPECT_MOVE(opponentLeft, MOVE_COACHING); } } diff --git a/test/battle/move_effect/corrosive_gas.c b/test/battle/move_effect/corrosive_gas.c index 84b7c1c70b..2d3678eaca 100644 --- a/test/battle/move_effect/corrosive_gas.c +++ b/test/battle/move_effect/corrosive_gas.c @@ -10,12 +10,12 @@ SINGLE_BATTLE_TEST("Corrosive Gas destroys the target's item or fails if the tar { u16 item; - PARAMETRIZE {item = ITEM_NONE; } - PARAMETRIZE {item = ITEM_POTION; } + PARAMETRIZE { item = ITEM_NONE; } + PARAMETRIZE { item = ITEM_POTION; } GIVEN { PLAYER(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_WOBBUFFET) {Item(item); } + OPPONENT(SPECIES_WOBBUFFET) { Item(item); } } WHEN { TURN { MOVE(player, MOVE_CORROSIVE_GAS); } } SCENE { @@ -36,7 +36,7 @@ SINGLE_BATTLE_TEST("Corrosive Gas doesn't destroy the item of a Pokemon with the { GIVEN { PLAYER(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_MUK) {Item(ITEM_POISON_BARB); Ability(ABILITY_STICKY_HOLD); } + OPPONENT(SPECIES_MUK) { Item(ITEM_POISON_BARB); Ability(ABILITY_STICKY_HOLD); } } WHEN { TURN { MOVE(player, MOVE_CORROSIVE_GAS); } } SCENE { @@ -54,8 +54,8 @@ SINGLE_BATTLE_TEST("Items lost to Corrosive Gas cannot be restored by Recycle") { GIVEN { ASSUME(GetMoveEffect(MOVE_RECYCLE) == EFFECT_RECYCLE); - PLAYER(SPECIES_WOBBUFFET) {Speed(15); } - OPPONENT(SPECIES_WOBBUFFET) {Item(ITEM_ORAN_BERRY); Speed(10); } + PLAYER(SPECIES_WOBBUFFET) { Speed(15); } + OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_ORAN_BERRY); Speed(10); } } WHEN { TURN { MOVE(player, MOVE_CORROSIVE_GAS); MOVE(opponent, MOVE_RECYCLE); } } SCENE { @@ -78,7 +78,7 @@ DOUBLE_BATTLE_TEST("Corrosive Gas destroys foes and ally's items if they have on for (j = 0; j < 2; j++) { for (k = 0; k < 2; k++) { for (l = 0; l < 2; l++) { - PARAMETRIZE {itemOpponentLeft = (j & 1) ? ITEM_ORAN_BERRY : ITEM_NONE; + PARAMETRIZE { itemOpponentLeft = (j & 1) ? ITEM_ORAN_BERRY : ITEM_NONE; itemOpponentRight = (k & 1) ? ITEM_CHESTO_BERRY : ITEM_NONE; itemPlayerLeft = (l & 1) ? ITEM_CHERI_BERRY : ITEM_NONE; } } @@ -86,10 +86,10 @@ DOUBLE_BATTLE_TEST("Corrosive Gas destroys foes and ally's items if they have on } GIVEN { - PLAYER(SPECIES_WOBBUFFET) {Item(itemPlayerLeft);} - PLAYER(SPECIES_WYNAUT) {Item(ITEM_SITRUS_BERRY);} - OPPONENT(SPECIES_ABRA) {Item(itemOpponentLeft);} - OPPONENT(SPECIES_KADABRA) {Item(itemOpponentRight);} + PLAYER(SPECIES_WOBBUFFET) { Item(itemPlayerLeft); } + PLAYER(SPECIES_WYNAUT) { Item(ITEM_SITRUS_BERRY); } + OPPONENT(SPECIES_ABRA) { Item(itemOpponentLeft); } + OPPONENT(SPECIES_KADABRA) { Item(itemOpponentRight); } } WHEN { TURN { MOVE(playerRight, MOVE_CORROSIVE_GAS); } } SCENE { diff --git a/test/battle/move_effect/counter.c b/test/battle/move_effect/counter.c index 7fc9fb4b9f..7001d61451 100644 --- a/test/battle/move_effect/counter.c +++ b/test/battle/move_effect/counter.c @@ -134,7 +134,7 @@ DOUBLE_BATTLE_TEST("Counter fails if mon that damaged Counter user is no longer GIVEN { PLAYER(SPECIES_WOBBUFFET); PLAYER(SPECIES_WYNAUT); - OPPONENT(SPECIES_WOBBUFFET) { HP(1); }; + OPPONENT(SPECIES_WOBBUFFET) { HP(1); } OPPONENT(SPECIES_WYNAUT); } WHEN { TURN { diff --git a/test/battle/move_effect/court_change.c b/test/battle/move_effect/court_change.c index 5ebe4c70f6..7b2946f40a 100644 --- a/test/battle/move_effect/court_change.c +++ b/test/battle/move_effect/court_change.c @@ -93,10 +93,10 @@ DOUBLE_BATTLE_TEST("Court Change used by the player swaps Mist, Safeguard, Auror TURN { MOVE(opponentLeft, MOVE_AURORA_VEIL); MOVE(opponentRight, MOVE_REFLECT); } TURN { MOVE(opponentLeft, MOVE_LIGHT_SCREEN); MOVE(opponentRight, MOVE_TAILWIND); } TURN { MOVE(playerLeft, MOVE_COURT_CHANGE); } - TURN { } - TURN { } - TURN { } - TURN { } + TURN {} + TURN {} + TURN {} + TURN {} } SCENE { MESSAGE("Wynaut used Snowscape!"); MESSAGE("The opposing Wobbuffet used Mist!"); @@ -132,10 +132,10 @@ DOUBLE_BATTLE_TEST("Court Change used by the opponent swaps Mist, Safeguard, Aur TURN { MOVE(playerLeft, MOVE_AURORA_VEIL); MOVE(playerRight, MOVE_REFLECT); } TURN { MOVE(playerLeft, MOVE_LIGHT_SCREEN); MOVE(playerRight, MOVE_TAILWIND); } TURN { MOVE(opponentLeft, MOVE_COURT_CHANGE); } - TURN { } - TURN { } - TURN { } - TURN { } + TURN {} + TURN {} + TURN {} + TURN {} } SCENE { MESSAGE("Wobbuffet used Mist!"); MESSAGE("Wobbuffet used Safeguard!"); diff --git a/test/battle/move_effect/defog.c b/test/battle/move_effect/defog.c index f2fa558e13..4ff5eb8b0e 100644 --- a/test/battle/move_effect/defog.c +++ b/test/battle/move_effect/defog.c @@ -40,7 +40,7 @@ SINGLE_BATTLE_TEST("Defog fails if target has minimum evasion stat change") { GIVEN { PLAYER(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_WOBBUFFET) {Ability(ABILITY_SIMPLE);}; + OPPONENT(SPECIES_WOBBUFFET) { Ability(ABILITY_SIMPLE); } } WHEN { TURN { MOVE(player, MOVE_DEFOG); } TURN { MOVE(player, MOVE_DEFOG); } @@ -80,7 +80,7 @@ SINGLE_BATTLE_TEST("Defog fails if target has minimum evasion stat change behind GIVEN { WITH_CONFIG(CONFIG_DEFOG_EFFECT_CLEARING, GEN_4); PLAYER(SPECIES_WOBBUFFET) { Speed(4); } - OPPONENT(SPECIES_WOBBUFFET) { Speed(5); Ability(ABILITY_SIMPLE);} + OPPONENT(SPECIES_WOBBUFFET) { Speed(5); Ability(ABILITY_SIMPLE); } } WHEN { TURN { MOVE(opponent, MOVE_SUBSTITUTE); MOVE(player, MOVE_DEFOG); } TURN { MOVE(player, MOVE_DEFOG); } diff --git a/test/battle/move_effect/destiny_bond.c b/test/battle/move_effect/destiny_bond.c index ff532fa0d7..3be2384003 100644 --- a/test/battle/move_effect/destiny_bond.c +++ b/test/battle/move_effect/destiny_bond.c @@ -106,7 +106,7 @@ SINGLE_BATTLE_TEST("Destiny Bond does not fail if used after failing (Gen7+)") SINGLE_BATTLE_TEST("(DYNAMAX) Dynamaxed Pokemon are not affected by Destiny Bond") { GIVEN { - PLAYER(SPECIES_WOBBUFFET) { Speed(50); }; + PLAYER(SPECIES_WOBBUFFET) { Speed(50); } OPPONENT(SPECIES_WOBBUFFET) { HP(1); Speed(100); } } WHEN { TURN { MOVE(opponent, MOVE_DESTINY_BOND); MOVE(player, MOVE_SCRATCH, gimmick: GIMMICK_DYNAMAX); } diff --git a/test/battle/move_effect/doodle.c b/test/battle/move_effect/doodle.c index 3484dac6a0..b8db08bb84 100644 --- a/test/battle/move_effect/doodle.c +++ b/test/battle/move_effect/doodle.c @@ -14,7 +14,7 @@ DOUBLE_BATTLE_TEST("Doodle gives the target's ability to user and ally") OPPONENT(SPECIES_TORCHIC) { Ability(ABILITY_BLAZE); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { - TURN { MOVE(playerLeft, MOVE_DOODLE, target: opponentLeft); } + TURN { MOVE(playerLeft, MOVE_DOODLE, target: opponentLeft); } } SCENE { ANIMATION(ANIM_TYPE_MOVE, MOVE_DOODLE, playerLeft); MESSAGE("Wynaut copied the opposing Torchic's Ability!"); @@ -33,7 +33,7 @@ DOUBLE_BATTLE_TEST("Doodle can't copy a banned ability") OPPONENT(SPECIES_GREAT_TUSK) { Ability(ABILITY_PROTOSYNTHESIS); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { - TURN { MOVE(playerLeft, MOVE_DOODLE, target: opponentLeft); } + TURN { MOVE(playerLeft, MOVE_DOODLE, target: opponentLeft); } } SCENE { NONE_OF { ANIMATION(ANIM_TYPE_MOVE, MOVE_DOODLE, playerLeft); @@ -54,7 +54,7 @@ DOUBLE_BATTLE_TEST("Doodle fails if user has a banned Ability") OPPONENT(SPECIES_TORCHIC) { Ability(ABILITY_BLAZE); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { - TURN { MOVE(playerLeft, MOVE_DOODLE, target: opponentLeft); } + TURN { MOVE(playerLeft, MOVE_DOODLE, target: opponentLeft); } } SCENE { NOT ANIMATION(ANIM_TYPE_MOVE, MOVE_DOODLE, playerLeft); MESSAGE("But it failed!"); @@ -72,7 +72,7 @@ DOUBLE_BATTLE_TEST("Doodle fails if partner has a banned Ability") OPPONENT(SPECIES_TORCHIC) { Ability(ABILITY_BLAZE); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { - TURN { MOVE(playerLeft, MOVE_DOODLE, target: opponentLeft); } + TURN { MOVE(playerLeft, MOVE_DOODLE, target: opponentLeft); } } SCENE { NOT ANIMATION(ANIM_TYPE_MOVE, MOVE_DOODLE, playerLeft); MESSAGE("But it failed!"); diff --git a/test/battle/move_effect/dragon_cheer.c b/test/battle/move_effect/dragon_cheer.c index 01458bdc11..e7b24f3495 100644 --- a/test/battle/move_effect/dragon_cheer.c +++ b/test/battle/move_effect/dragon_cheer.c @@ -121,7 +121,7 @@ AI_DOUBLE_BATTLE_TEST("AI uses Dragon Cheer") OPPONENT(species) { Moves(MOVE_DRAGON_CHEER, MOVE_POUND); } } WHEN { if (species == SPECIES_DRATINI) - TURN { EXPECT_MOVE(opponentLeft, MOVE_DRAGON_CHEER); } + TURN { EXPECT_MOVE(opponentLeft, MOVE_DRAGON_CHEER); } else TURN { NOT_EXPECT_MOVE(opponentLeft, MOVE_DRAGON_CHEER); } } diff --git a/test/battle/move_effect/dragon_darts.c b/test/battle/move_effect/dragon_darts.c index 97694909fe..73df37e654 100644 --- a/test/battle/move_effect/dragon_darts.c +++ b/test/battle/move_effect/dragon_darts.c @@ -106,8 +106,8 @@ DOUBLE_BATTLE_TEST("Dragon Darts strikes an opponent twice if electrified and th ASSUME(GetMoveEffect(MOVE_ELECTRIFY) == EFFECT_ELECTRIFY); PLAYER(SPECIES_WOBBUFFET); PLAYER(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_LANTURN) { Ability(abilityLeft); }; - OPPONENT(SPECIES_LANTURN) { Ability(abilityRight); }; + OPPONENT(SPECIES_LANTURN) { Ability(abilityLeft); } + OPPONENT(SPECIES_LANTURN) { Ability(abilityRight); } } WHEN { TURN { MOVE(opponentRight, MOVE_ELECTRIFY, target: playerLeft); MOVE(playerLeft, MOVE_DRAGON_DARTS, target: chosenTarget); } } SCENE { @@ -132,8 +132,8 @@ DOUBLE_BATTLE_TEST("Dragon Darts strikes an opponent twice if electrified and th ASSUME(GetMoveEffect(MOVE_ELECTRIFY) == EFFECT_ELECTRIFY); PLAYER(SPECIES_WOBBUFFET); PLAYER(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_ELECTIVIRE) { Ability(abilityLeft); }; - OPPONENT(SPECIES_ELECTIVIRE) { Ability(abilityRight); }; + OPPONENT(SPECIES_ELECTIVIRE) { Ability(abilityLeft); } + OPPONENT(SPECIES_ELECTIVIRE) { Ability(abilityRight); } } WHEN { TURN { MOVE(opponentRight, MOVE_ELECTRIFY, target: playerLeft); MOVE(playerLeft, MOVE_DRAGON_DARTS, target: chosenTarget); } } SCENE { @@ -222,8 +222,8 @@ DOUBLE_BATTLE_TEST("Dragon Darts strikes left ally twice if one strike misses") GIVEN { PLAYER(SPECIES_WOBBUFFET); PLAYER(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_WOBBUFFET) { Item(itemLeft); }; - OPPONENT(SPECIES_WOBBUFFET) { Item(itemRight); }; + OPPONENT(SPECIES_WOBBUFFET) { Item(itemLeft); } + OPPONENT(SPECIES_WOBBUFFET) { Item(itemRight); } } WHEN { TURN { MOVE(playerLeft, MOVE_DRAGON_DARTS, target: chosenTarget, hit: FALSE); } } SCENE { @@ -240,7 +240,7 @@ DOUBLE_BATTLE_TEST("Dragon Darts strikes right ally twice if one strike misses") GIVEN { PLAYER(SPECIES_WOBBUFFET); PLAYER(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_BRIGHT_POWDER); }; + OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_BRIGHT_POWDER); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(playerLeft, MOVE_DRAGON_DARTS, target: opponentLeft, hit: FALSE); } diff --git a/test/battle/move_effect/dream_eater.c b/test/battle/move_effect/dream_eater.c index 183a513b79..0460f594ef 100644 --- a/test/battle/move_effect/dream_eater.c +++ b/test/battle/move_effect/dream_eater.c @@ -84,7 +84,7 @@ SINGLE_BATTLE_TEST("Dream Eater fails if the target is behind a Substitute (Gen OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(opponent, MOVE_YAWN); MOVE(player, MOVE_SUBSTITUTE); } - TURN { } + TURN {} TURN { MOVE(opponent, MOVE_DREAM_EATER); } } SCENE { MESSAGE("The opposing Wobbuffet used Dream Eater!"); @@ -104,7 +104,7 @@ SINGLE_BATTLE_TEST("Dream Eater works if the target is behind a Substitute (Gen OPPONENT(SPECIES_WOBBUFFET) { HP(1); } } WHEN { TURN { MOVE(opponent, MOVE_YAWN); MOVE(player, MOVE_SUBSTITUTE); } - TURN { } + TURN {} TURN { MOVE(opponent, MOVE_DREAM_EATER); } } SCENE { ANIMATION(ANIM_TYPE_MOVE, MOVE_DREAM_EATER, opponent); diff --git a/test/battle/move_effect/embargo.c b/test/battle/move_effect/embargo.c index 41c456d9ac..ef577fef61 100644 --- a/test/battle/move_effect/embargo.c +++ b/test/battle/move_effect/embargo.c @@ -11,7 +11,7 @@ SINGLE_BATTLE_TEST("Embargo blocks the effect of an affected Pokémon's held ite GIVEN { ASSUME(gItemsInfo[ITEM_FOCUS_SASH].holdEffect == HOLD_EFFECT_FOCUS_SASH); PLAYER(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_FOCUS_SASH); }; + OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_FOCUS_SASH); } } WHEN { TURN { MOVE(player, MOVE_EMBARGO); } TURN { MOVE(player, MOVE_FISSURE); } @@ -126,7 +126,7 @@ SINGLE_BATTLE_TEST("Embargo negates a held item's Speed reduction") // KNOWN_FAILING; // Pokémon are currently not obtaining Friendship for using items in battle. // GIVEN { // ASSUME(gItemsInfo[ITEM_X_ACCURACY].battleUsage == EFFECT_ITEM_INCREASE_STAT); -// PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_SOOTHE_BELL); }; +// PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_SOOTHE_BELL); } // OPPONENT(SPECIES_WOBBUFFET); // } WHEN { // TURN { USE_ITEM(player, ITEM_X_ACCURACY); } @@ -149,7 +149,7 @@ SINGLE_BATTLE_TEST("Embargo doesn't block a held item's form-changing effect, bu PARAMETRIZE { heldItem = ITEM_MEADOW_PLATE; } GIVEN { PLAYER(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_ARCEUS_GRASS) { Item(heldItem); }; + OPPONENT(SPECIES_ARCEUS_GRASS) { Item(heldItem); } ASSUME(gItemsInfo[ITEM_MEADOW_PLATE].holdEffect == HOLD_EFFECT_PLATE); ASSUME(gItemsInfo[ITEM_MEADOW_PLATE].holdEffectParam == 20); ASSUME(gItemsInfo[ITEM_MEADOW_PLATE].secondaryId == TYPE_GRASS); @@ -169,7 +169,7 @@ SINGLE_BATTLE_TEST("Embargo makes Fling and Natural Gift fail") PARAMETRIZE { heldItem = ITEM_LIGHT_BALL; moveId = MOVE_FLING; } PARAMETRIZE { heldItem = ITEM_CHERI_BERRY; moveId = MOVE_NATURAL_GIFT; } GIVEN { - PLAYER(SPECIES_WOBBUFFET) { Item(heldItem); }; + PLAYER(SPECIES_WOBBUFFET) { Item(heldItem); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(opponent, MOVE_EMBARGO); } @@ -190,7 +190,7 @@ SINGLE_BATTLE_TEST("Embargo makes Fling and Natural Gift fail") SINGLE_BATTLE_TEST("Embargo doesn't stop an item flung at an affected target from activating") { GIVEN { - PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_LIGHT_BALL); }; + PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_LIGHT_BALL); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(player, MOVE_EMBARGO); } @@ -211,7 +211,7 @@ SINGLE_BATTLE_TEST("Baton Pass passes Embargo's effect") { GIVEN { PLAYER(SPECIES_WOBBUFFET); - PLAYER(SPECIES_WYNAUT) { Item(ITEM_LIGHT_BALL); }; + PLAYER(SPECIES_WYNAUT) { Item(ITEM_LIGHT_BALL); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(opponent, MOVE_EMBARGO); } @@ -236,8 +236,8 @@ SINGLE_BATTLE_TEST("Embargo doesn't block the effects of berries obtained throug u32 hp = 10; GIVEN { - PLAYER(SPECIES_WOBBUFFET) { HP(1); }; - OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_ORAN_BERRY); }; + PLAYER(SPECIES_WOBBUFFET) { HP(1); } + OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_ORAN_BERRY); } } WHEN { TURN { MOVE(opponent, MOVE_EMBARGO); } TURN { MOVE(player, MOVE_PLUCK); } @@ -260,7 +260,7 @@ SINGLE_BATTLE_TEST("Embargo disables the effect of the Plate items on the move J PARAMETRIZE { heldItem = ITEM_NONE; } PARAMETRIZE { heldItem = ITEM_PIXIE_PLATE; } GIVEN { - PLAYER(SPECIES_ARCEUS) { Item(heldItem); }; + PLAYER(SPECIES_ARCEUS) { Item(heldItem); } OPPONENT(SPECIES_DRAGONITE); } WHEN { TURN { MOVE(opponent, MOVE_EMBARGO); MOVE(player, MOVE_JUDGMENT); } @@ -281,7 +281,7 @@ SINGLE_BATTLE_TEST("Embargo disables the effect of the Drive items on the move T PARAMETRIZE { heldItem = ITEM_NONE; } PARAMETRIZE { heldItem = ITEM_SHOCK_DRIVE; } GIVEN { - PLAYER(SPECIES_GENESECT) { Item(heldItem); }; + PLAYER(SPECIES_GENESECT) { Item(heldItem); } OPPONENT(SPECIES_GYARADOS); } WHEN { TURN { MOVE(opponent, MOVE_EMBARGO); MOVE(player, MOVE_TECHNO_BLAST); } @@ -302,7 +302,7 @@ SINGLE_BATTLE_TEST("Embargo disables the effect of the Memory items on the move PARAMETRIZE { heldItem = ITEM_NONE; } PARAMETRIZE { heldItem = ITEM_FIRE_MEMORY; } GIVEN { - PLAYER(SPECIES_SILVALLY) { Item(heldItem); }; + PLAYER(SPECIES_SILVALLY) { Item(heldItem); } OPPONENT(SPECIES_VENUSAUR); } WHEN { TURN { MOVE(opponent, MOVE_EMBARGO); MOVE(player, MOVE_MULTI_ATTACK); } @@ -320,7 +320,7 @@ SINGLE_BATTLE_TEST("Embargo can be reflected by Magic Coat") { GIVEN { PLAYER(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_LIGHT_BALL); }; + OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_LIGHT_BALL); } } WHEN { TURN { MOVE(player, MOVE_MAGIC_COAT); MOVE(opponent, MOVE_EMBARGO); } TURN { MOVE(opponent, MOVE_FLING); } @@ -342,7 +342,7 @@ SINGLE_BATTLE_TEST("Embargo doesn't prevent Mega Evolution") GIVEN { PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_CHARIZARD) { Item(ITEM_CHARIZARDITE_Y); }; + OPPONENT(SPECIES_CHARIZARD) { Item(ITEM_CHARIZARDITE_Y); } } WHEN { TURN { MOVE(player, MOVE_EMBARGO); } TURN { MOVE(opponent, MOVE_BATON_PASS); SEND_OUT(opponent, 1); } @@ -367,7 +367,7 @@ SINGLE_BATTLE_TEST("Embargo doesn't prevent Primal Reversion") GIVEN { PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_GROUDON) { Item(ITEM_RED_ORB); }; + OPPONENT(SPECIES_GROUDON) { Item(ITEM_RED_ORB); } } WHEN { TURN { MOVE(player, MOVE_EMBARGO); } TURN { MOVE(opponent, MOVE_BATON_PASS); SEND_OUT(opponent, 1); } diff --git a/test/battle/move_effect/encore.c b/test/battle/move_effect/encore.c index 094191f665..6e169c6b43 100644 --- a/test/battle/move_effect/encore.c +++ b/test/battle/move_effect/encore.c @@ -109,7 +109,7 @@ SINGLE_BATTLE_TEST("(DYNAMAX) Dynamaxed Pokemon can be encored immediately after { GIVEN { PLAYER(SPECIES_WOBBUFFET) { Speed(50); }; // yes, this speed is necessary - OPPONENT(SPECIES_WOBBUFFET) { Speed(100); }; + OPPONENT(SPECIES_WOBBUFFET) { Speed(100); } } WHEN { TURN { MOVE(player, MOVE_ARM_THRUST, gimmick: GIMMICK_DYNAMAX); } TURN { MOVE(player, MOVE_ARM_THRUST); } diff --git a/test/battle/move_effect/entrainment.c b/test/battle/move_effect/entrainment.c index ac6050bbe0..ead4ff3b60 100644 --- a/test/battle/move_effect/entrainment.c +++ b/test/battle/move_effect/entrainment.c @@ -5,8 +5,8 @@ AI_DOUBLE_BATTLE_TEST("AI prefers Entrainment'ing good abilities onto partner wi { GIVEN { AI_FLAGS(AI_FLAG_SMART_TRAINER); - PLAYER(SPECIES_QUAXWELL) { Level(18); Ability(ABILITY_TORRENT); Moves(MOVE_WATER_GUN); }; - PLAYER(SPECIES_CORPHISH) { Level(18); Moves(MOVE_WATER_GUN); }; + PLAYER(SPECIES_QUAXWELL) { Level(18); Ability(ABILITY_TORRENT); Moves(MOVE_WATER_GUN); } + PLAYER(SPECIES_CORPHISH) { Level(18); Moves(MOVE_WATER_GUN); } OPPONENT(SPECIES_SMEARGLE) { Level(17); Ability(ABILITY_TECHNICIAN); Moves(MOVE_AERIAL_ACE, MOVE_ENTRAINMENT, MOVE_FLAME_WHEEL, MOVE_MAGICAL_LEAF); } OPPONENT(SPECIES_ARCHEN) { Level(17); Ability(ABILITY_DEFEATIST); Moves(MOVE_DUAL_WINGBEAT, MOVE_ROCK_TOMB); } } WHEN { diff --git a/test/battle/move_effect/explosion.c b/test/battle/move_effect/explosion.c index 8185171796..d54648e13a 100644 --- a/test/battle/move_effect/explosion.c +++ b/test/battle/move_effect/explosion.c @@ -111,10 +111,10 @@ SINGLE_BATTLE_TEST("Explosion is blocked by Ability Damp") SINGLE_BATTLE_TEST("Explosion does not trigger Destiny Bond") { GIVEN { - PLAYER(SPECIES_WOBBUFFET) { HP(1); }; + PLAYER(SPECIES_WOBBUFFET) { HP(1); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { - TURN { MOVE(player, MOVE_DESTINY_BOND); MOVE(opponent, MOVE_EXPLOSION);} + TURN { MOVE(player, MOVE_DESTINY_BOND); MOVE(opponent, MOVE_EXPLOSION); } } SCENE { ANIMATION(ANIM_TYPE_MOVE, MOVE_DESTINY_BOND, player); HP_BAR(opponent); diff --git a/test/battle/move_effect/fillet_away.c b/test/battle/move_effect/fillet_away.c index 70f180a700..0cd53e6848 100644 --- a/test/battle/move_effect/fillet_away.c +++ b/test/battle/move_effect/fillet_away.c @@ -43,7 +43,7 @@ SINGLE_BATTLE_TEST("Fillet Away sharply raises Attack, Sp. Atk, and Speed") SINGLE_BATTLE_TEST("Fillet Away fails if user's current HP is half or less than half its maximum") { GIVEN { - PLAYER(SPECIES_WOBBUFFET) { MaxHP(100); HP(50);} + PLAYER(SPECIES_WOBBUFFET) { MaxHP(100); HP(50); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(player, MOVE_FILLET_AWAY); } diff --git a/test/battle/move_effect/fling.c b/test/battle/move_effect/fling.c index 012485abe8..595938bef5 100644 --- a/test/battle/move_effect/fling.c +++ b/test/battle/move_effect/fling.c @@ -10,14 +10,14 @@ SINGLE_BATTLE_TEST("Fling fails if Pokémon holds no item") { u16 item; - PARAMETRIZE {item = ITEM_NONE; } - PARAMETRIZE {item = ITEM_RAZOR_CLAW; } + PARAMETRIZE { item = ITEM_NONE; } + PARAMETRIZE { item = ITEM_RAZOR_CLAW; } GIVEN { PLAYER(SPECIES_WOBBUFFET) { Item(item); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { - TURN { MOVE(player, MOVE_FLING);} + TURN { MOVE(player, MOVE_FLING); } } SCENE { MESSAGE("Wobbuffet used Fling!"); if (item != ITEM_NONE) { @@ -33,9 +33,9 @@ SINGLE_BATTLE_TEST("Fling fails if Pokémon is under the effects of Embargo or M { u16 move; - PARAMETRIZE {move = MOVE_CELEBRATE; } - PARAMETRIZE {move = MOVE_EMBARGO; } - PARAMETRIZE {move = MOVE_MAGIC_ROOM; } + PARAMETRIZE { move = MOVE_CELEBRATE; } + PARAMETRIZE { move = MOVE_EMBARGO; } + PARAMETRIZE { move = MOVE_MAGIC_ROOM; } GIVEN { ASSUME(GetMoveEffect(MOVE_EMBARGO) == EFFECT_EMBARGO); @@ -116,12 +116,12 @@ SINGLE_BATTLE_TEST("Fling's thrown item can be regained with Recycle") { GIVEN { ASSUME(GetMoveEffect(MOVE_RECYCLE) == EFFECT_RECYCLE); - PLAYER(SPECIES_WOBBUFFET) {Item(ITEM_RAZOR_CLAW); } + PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_RAZOR_CLAW); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { - TURN { MOVE(player, MOVE_FLING);} - TURN { MOVE(player, MOVE_RECYCLE);} - TURN { MOVE(player, MOVE_FLING);} + TURN { MOVE(player, MOVE_FLING); } + TURN { MOVE(player, MOVE_RECYCLE); } + TURN { MOVE(player, MOVE_FLING); } } SCENE { MESSAGE("Wobbuffet used Fling!"); ANIMATION(ANIM_TYPE_MOVE, MOVE_FLING, player); @@ -139,9 +139,9 @@ SINGLE_BATTLE_TEST("Fling - Item is lost even when there is no target") { GIVEN { ASSUME(GetMoveEffect(MOVE_SELF_DESTRUCT) == EFFECT_EXPLOSION); - PLAYER(SPECIES_WOBBUFFET) {Item(ITEM_RAZOR_CLAW); Speed(2); } - OPPONENT(SPECIES_WOBBUFFET) {Speed(5); } - OPPONENT(SPECIES_WOBBUFFET) {Speed(5); } + PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_RAZOR_CLAW); Speed(2); } + OPPONENT(SPECIES_WOBBUFFET) { Speed(5); } + OPPONENT(SPECIES_WOBBUFFET) { Speed(5); } } WHEN { TURN { MOVE(opponent, MOVE_SELF_DESTRUCT); MOVE(player, MOVE_FLING); SEND_OUT(opponent, 1); } TURN { MOVE(player, MOVE_FLING); } @@ -164,10 +164,10 @@ SINGLE_BATTLE_TEST("Fling - Item is lost when target protects itself") { GIVEN { ASSUME(GetMoveEffect(MOVE_PROTECT) == EFFECT_PROTECT); - PLAYER(SPECIES_WOBBUFFET) {Item(ITEM_RAZOR_CLAW); } + PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_RAZOR_CLAW); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { - TURN { MOVE(opponent, MOVE_PROTECT); MOVE(player, MOVE_FLING);} + TURN { MOVE(opponent, MOVE_PROTECT); MOVE(player, MOVE_FLING); } TURN { MOVE(player, MOVE_FLING); } } SCENE { MESSAGE("The opposing Wobbuffet used Protect!"); @@ -204,15 +204,15 @@ SINGLE_BATTLE_TEST("Fling doesn't consume the item if Pokémon is asleep/frozen/ u32 status; u16 item; - PARAMETRIZE {status = STATUS1_SLEEP_TURN(2); item = ITEM_RAZOR_CLAW; } - PARAMETRIZE {status = STATUS1_PARALYSIS; item = ITEM_RAZOR_CLAW; } - PARAMETRIZE {status = STATUS1_FREEZE; item = ITEM_RAZOR_CLAW; } - PARAMETRIZE {status = STATUS1_SLEEP_TURN(2); item = ITEM_NONE; } - PARAMETRIZE {status = STATUS1_PARALYSIS; item = ITEM_NONE; } - PARAMETRIZE {status = STATUS1_FREEZE; item = ITEM_NONE; } + PARAMETRIZE { status = STATUS1_SLEEP_TURN(2); item = ITEM_RAZOR_CLAW; } + PARAMETRIZE { status = STATUS1_PARALYSIS; item = ITEM_RAZOR_CLAW; } + PARAMETRIZE { status = STATUS1_FREEZE; item = ITEM_RAZOR_CLAW; } + PARAMETRIZE { status = STATUS1_SLEEP_TURN(2); item = ITEM_NONE; } + PARAMETRIZE { status = STATUS1_PARALYSIS; item = ITEM_NONE; } + PARAMETRIZE { status = STATUS1_FREEZE; item = ITEM_NONE; } GIVEN { - PLAYER(SPECIES_WOBBUFFET) {Item(item); Status1(status); } + PLAYER(SPECIES_WOBBUFFET) { Item(item); Status1(status); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { if (status == STATUS1_FREEZE) { @@ -254,12 +254,12 @@ SINGLE_BATTLE_TEST("Fling applies special effects when throwing specific Items") { u16 item; - PARAMETRIZE {item = ITEM_FLAME_ORB; } - PARAMETRIZE {item = ITEM_LIGHT_BALL; } - PARAMETRIZE {item = ITEM_POISON_BARB; } - PARAMETRIZE {item = ITEM_TOXIC_ORB; } - PARAMETRIZE {item = ITEM_RAZOR_FANG; } - PARAMETRIZE {item = ITEM_KINGS_ROCK; } + PARAMETRIZE { item = ITEM_FLAME_ORB; } + PARAMETRIZE { item = ITEM_LIGHT_BALL; } + PARAMETRIZE { item = ITEM_POISON_BARB; } + PARAMETRIZE { item = ITEM_TOXIC_ORB; } + PARAMETRIZE { item = ITEM_RAZOR_FANG; } + PARAMETRIZE { item = ITEM_KINGS_ROCK; } GIVEN { PLAYER(SPECIES_WOBBUFFET) { Item(item); } @@ -310,12 +310,12 @@ SINGLE_BATTLE_TEST("Fling's secondary effects are blocked by Shield Dust") { u16 item; - PARAMETRIZE {item = ITEM_FLAME_ORB; } - PARAMETRIZE {item = ITEM_LIGHT_BALL; } - PARAMETRIZE {item = ITEM_POISON_BARB; } - PARAMETRIZE {item = ITEM_TOXIC_ORB; } - PARAMETRIZE {item = ITEM_RAZOR_FANG; } - PARAMETRIZE {item = ITEM_KINGS_ROCK; } + PARAMETRIZE { item = ITEM_FLAME_ORB; } + PARAMETRIZE { item = ITEM_LIGHT_BALL; } + PARAMETRIZE { item = ITEM_POISON_BARB; } + PARAMETRIZE { item = ITEM_TOXIC_ORB; } + PARAMETRIZE { item = ITEM_RAZOR_FANG; } + PARAMETRIZE { item = ITEM_KINGS_ROCK; } GIVEN { PLAYER(SPECIES_WOBBUFFET) { Item(item); } diff --git a/test/battle/move_effect/flower_shield.c b/test/battle/move_effect/flower_shield.c index 4a72163855..b582f495ec 100644 --- a/test/battle/move_effect/flower_shield.c +++ b/test/battle/move_effect/flower_shield.c @@ -84,6 +84,6 @@ AI_DOUBLE_BATTLE_TEST("AI uses Flower Shield") OPPONENT(SPECIES_TANGELA) { Moves(MOVE_FLOWER_SHIELD, MOVE_POUND); } OPPONENT(SPECIES_TANGELA); } WHEN { - TURN { EXPECT_MOVE(opponentLeft, MOVE_FLOWER_SHIELD); } + TURN { EXPECT_MOVE(opponentLeft, MOVE_FLOWER_SHIELD); } } } diff --git a/test/battle/move_effect/focus_energy.c b/test/battle/move_effect/focus_energy.c index 363e6bd563..ffc9370572 100644 --- a/test/battle/move_effect/focus_energy.c +++ b/test/battle/move_effect/focus_energy.c @@ -45,8 +45,8 @@ SINGLE_BATTLE_TEST("Focus Energy multiplies crit chance by 4 with gen 1 crit cha bool32 useFocusEnergy = 0; u32 genConfig = 0, chance = 0; for (u32 j = GEN_1; j <= GEN_9; j++) { - PARAMETRIZE { genConfig = j; useFocusEnergy = FALSE; chance = 16;} - PARAMETRIZE { genConfig = j; useFocusEnergy = TRUE; chance = 4;} + PARAMETRIZE { genConfig = j; useFocusEnergy = FALSE; chance = 16; } + PARAMETRIZE { genConfig = j; useFocusEnergy = TRUE; chance = 4; } } PASSES_RANDOMLY(1, chance, RNG_CRITICAL_HIT); GIVEN { diff --git a/test/battle/move_effect/focus_punch.c b/test/battle/move_effect/focus_punch.c index 35f26ae9ee..e29e27f94a 100644 --- a/test/battle/move_effect/focus_punch.c +++ b/test/battle/move_effect/focus_punch.c @@ -123,7 +123,7 @@ AI_SINGLE_BATTLE_TEST("AI won't use status moves if the player's best attacking ASSUME(GetSpeciesType(SPECIES_CLEFABLE, 1) == TYPE_FAIRY); AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT | AI_FLAG_OMNISCIENT); PLAYER(SPECIES_SNORLAX) { Moves(MOVE_FOCUS_PUNCH, MOVE_POUND); } - OPPONENT(SPECIES_CLEFABLE) { Moves(MOVE_PLAY_ROUGH, MOVE_SWORDS_DANCE); } + OPPONENT(SPECIES_CLEFABLE) { Moves(MOVE_PLAY_ROUGH, MOVE_SWORDS_DANCE); } } WHEN { TURN { MOVE(player, MOVE_FOCUS_PUNCH); EXPECT_MOVE(opponent, MOVE_PLAY_ROUGH); } } diff --git a/test/battle/move_effect/future_sight.c b/test/battle/move_effect/future_sight.c index ee424c9bd9..01a5bed349 100644 --- a/test/battle/move_effect/future_sight.c +++ b/test/battle/move_effect/future_sight.c @@ -34,8 +34,8 @@ SINGLE_BATTLE_TEST("Future Sight uses Sp. Atk stat of the original user without TURN { MOVE(player, FUTURE_SIGHT_EQUIVALENT, WITH_RNG(RNG_SECONDARY_EFFECT, FALSE)); } TURN { MOVE(player, MOVE_FUTURE_SIGHT); } TURN { SWITCH(player, 1); } - TURN { } - TURN { } + TURN {} + TURN {} } SCENE { ANIMATION(ANIM_TYPE_MOVE, FUTURE_SIGHT_EQUIVALENT, player); HP_BAR(opponent, captureDamage: &seedFlareDmg); @@ -60,8 +60,8 @@ SINGLE_BATTLE_TEST("Future Sight is not boosted by Life Orb is original user if TURN { MOVE(player, FUTURE_SIGHT_EQUIVALENT, WITH_RNG(RNG_SECONDARY_EFFECT, FALSE)); } TURN { MOVE(player, MOVE_FUTURE_SIGHT); } TURN { SWITCH(player, 1); } - TURN { } - TURN { } + TURN {} + TURN {} } SCENE { ANIMATION(ANIM_TYPE_MOVE, FUTURE_SIGHT_EQUIVALENT, player); HP_BAR(opponent, captureDamage: &seedFlareDmg); @@ -88,8 +88,8 @@ SINGLE_BATTLE_TEST("Future Sight receives STAB from party mon (Gen 5+)") TURN { MOVE(player, FUTURE_SIGHT_EQUIVALENT, WITH_RNG(RNG_SECONDARY_EFFECT, FALSE)); } TURN { MOVE(player, MOVE_FUTURE_SIGHT); } TURN { SWITCH(player, 1); } - TURN { } - TURN { } + TURN {} + TURN {} } SCENE { ANIMATION(ANIM_TYPE_MOVE, FUTURE_SIGHT_EQUIVALENT, player); HP_BAR(opponent, captureDamage: &seedFlareDmg); @@ -111,8 +111,8 @@ SINGLE_BATTLE_TEST("Future Sight is affected by type effectiveness (Gen 5+)") TURN { MOVE(player, FUTURE_SIGHT_EQUIVALENT, WITH_RNG(RNG_SECONDARY_EFFECT, FALSE)); } TURN { MOVE(player, MOVE_FUTURE_SIGHT); } TURN { SWITCH(player, 1); } - TURN { } - TURN { } + TURN {} + TURN {} } SCENE { ANIMATION(ANIM_TYPE_MOVE, FUTURE_SIGHT_EQUIVALENT, player); HP_BAR(opponent); @@ -136,7 +136,7 @@ SINGLE_BATTLE_TEST("Future Sight will miss timing if target faints before it is TURN { MOVE(player, MOVE_FUTURE_SIGHT); } TURN { MOVE(player, MOVE_CELEBRATE); } TURN { MOVE(player, MOVE_CELEBRATE); MOVE(opponent, MOVE_MEMENTO); SEND_OUT(opponent, 1); } - TURN { } + TURN {} } SCENE { ANIMATION(ANIM_TYPE_MOVE, MOVE_FUTURE_SIGHT, player); ANIMATION(ANIM_TYPE_MOVE, MOVE_CELEBRATE, player); @@ -158,7 +158,7 @@ SINGLE_BATTLE_TEST("Future Sight will miss timing if target faints by residual d TURN { MOVE(player, MOVE_FUTURE_SIGHT); } TURN { MOVE(player, MOVE_CELEBRATE); } TURN { MOVE(player, MOVE_WRAP); SEND_OUT(opponent, 1); } - TURN { } + TURN {} } SCENE { ANIMATION(ANIM_TYPE_MOVE, MOVE_FUTURE_SIGHT, player); ANIMATION(ANIM_TYPE_MOVE, MOVE_CELEBRATE, player); @@ -178,8 +178,8 @@ SINGLE_BATTLE_TEST("Future Sight breaks Focus Sash and doesn't make the holder e OPPONENT(SPECIES_PIDGEY) { Level(1); Item(ITEM_FOCUS_SASH); } } WHEN { TURN { MOVE(player, MOVE_FUTURE_SIGHT); } - TURN { } - TURN { } + TURN {} + TURN {} TURN { MOVE(player, MOVE_PSYCHIC); } } SCENE { MESSAGE("The opposing Pidgey hung on using its Focus Sash!"); diff --git a/test/battle/move_effect/gear_up.c b/test/battle/move_effect/gear_up.c index 8689d6d268..9a9bdab79c 100644 --- a/test/battle/move_effect/gear_up.c +++ b/test/battle/move_effect/gear_up.c @@ -12,6 +12,6 @@ AI_DOUBLE_BATTLE_TEST("AI uses Gear Up") OPPONENT(SPECIES_KLINKLANG) { Ability(ABILITY_PLUS); Moves(MOVE_GEAR_UP, MOVE_WATER_GUN, MOVE_POUND); } OPPONENT(SPECIES_KLINKLANG) { Ability(ABILITY_PLUS); Moves(MOVE_GEAR_UP, MOVE_WATER_GUN, MOVE_POUND); } } WHEN { - TURN { EXPECT_MOVE(opponentLeft, MOVE_GEAR_UP); } + TURN { EXPECT_MOVE(opponentLeft, MOVE_GEAR_UP); } } } diff --git a/test/battle/move_effect/glaive_rush.c b/test/battle/move_effect/glaive_rush.c index ff949a57cd..31e923443b 100644 --- a/test/battle/move_effect/glaive_rush.c +++ b/test/battle/move_effect/glaive_rush.c @@ -55,7 +55,7 @@ SINGLE_BATTLE_TEST("If Glaive Rush is successful, moves targeted at the user dea OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(opponent, MOVE_SCRATCH); MOVE(player, MOVE_GLAIVE_RUSH); } - TURN { MOVE(opponent, MOVE_SCRATCH); MOVE(player, MOVE_CELEBRATE); } + TURN { MOVE(opponent, MOVE_SCRATCH); MOVE(player, MOVE_CELEBRATE); } } SCENE { ANIMATION(ANIM_TYPE_MOVE, MOVE_SCRATCH, opponent); HP_BAR(player, captureDamage: &normalDmg); @@ -118,7 +118,7 @@ SINGLE_BATTLE_TEST("Glaive Rush doesn't affect the user if the effect is blocked SINGLE_BATTLE_TEST("Glaive Rush status last until the the user's next turn") { - s16 normalDmgFristHit; + s16 normalDmgFirstHit; s16 normalDmgSecondHit; GIVEN { @@ -133,11 +133,11 @@ SINGLE_BATTLE_TEST("Glaive Rush status last until the the user's next turn") ANIMATION(ANIM_TYPE_MOVE, MOVE_SCRATCH, opponent); ANIMATION(ANIM_TYPE_MOVE, MOVE_CELEBRATE, player); ANIMATION(ANIM_TYPE_MOVE, MOVE_SCRATCH, opponent); - HP_BAR(player, captureDamage: &normalDmgFristHit); + HP_BAR(player, captureDamage: &normalDmgFirstHit); ANIMATION(ANIM_TYPE_MOVE, MOVE_CELEBRATE, player); ANIMATION(ANIM_TYPE_MOVE, MOVE_SCRATCH, opponent); HP_BAR(player, captureDamage: &normalDmgSecondHit); } THEN { - EXPECT_EQ(normalDmgFristHit, normalDmgSecondHit); + EXPECT_EQ(normalDmgFirstHit, normalDmgSecondHit); } } diff --git a/test/battle/move_effect/grassy_terrain.c b/test/battle/move_effect/grassy_terrain.c index 2b5e166bfd..063d5ae981 100644 --- a/test/battle/move_effect/grassy_terrain.c +++ b/test/battle/move_effect/grassy_terrain.c @@ -5,7 +5,7 @@ SINGLE_BATTLE_TEST("Grassy Terrain recovers 1/16th HP at end of turn") { GIVEN { PLAYER(SPECIES_WOBBUFFET) { MaxHP(100); HP(1); } - OPPONENT(SPECIES_WOBBUFFET) { MaxHP(100); HP(1); }; + OPPONENT(SPECIES_WOBBUFFET) { MaxHP(100); HP(1); } } WHEN { TURN { MOVE(player, MOVE_GRASSY_TERRAIN); } TURN {} @@ -85,7 +85,7 @@ SINGLE_BATTLE_TEST("Grassy Terrain heals the Pokémon on the field for the durat { GIVEN { PLAYER(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_WOBBUFFET) { HP(1); }; + OPPONENT(SPECIES_WOBBUFFET) { HP(1); } } WHEN { TURN { MOVE(opponent, MOVE_CELEBRATE); MOVE(player, MOVE_GRASSY_TERRAIN); } TURN {} diff --git a/test/battle/move_effect/gravity.c b/test/battle/move_effect/gravity.c index 001505bae0..7175f085f7 100644 --- a/test/battle/move_effect/gravity.c +++ b/test/battle/move_effect/gravity.c @@ -73,7 +73,7 @@ AI_DOUBLE_BATTLE_TEST("AI uses Gravity") PLAYER(SPECIES_WOBBUFFET) { Item(foeItem); } PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET) { Moves(MOVE_GRAVITY, MOVE_HEADBUTT, MOVE_TAUNT); } - OPPONENT(SPECIES_WOBBUFFET) { Moves(move, MOVE_EARTH_POWER); Item(friendItem); } + OPPONENT(SPECIES_WOBBUFFET) { Moves(move, MOVE_EARTH_POWER); Item(friendItem); } } WHEN { if (move == MOVE_THUNDER || (foeItem == ITEM_AIR_BALLOON && friendItem != ITEM_AIR_BALLOON)) TURN { EXPECT_MOVE(opponentLeft, MOVE_GRAVITY); } diff --git a/test/battle/move_effect/grudge.c b/test/battle/move_effect/grudge.c index 9d381ad833..8da8b33fb8 100644 --- a/test/battle/move_effect/grudge.c +++ b/test/battle/move_effect/grudge.c @@ -6,7 +6,7 @@ SINGLE_BATTLE_TEST("Grudge depletes all PP of the move that fainted the target") GIVEN { PLAYER(SPECIES_WOBBUFFET) { HP(1); } PLAYER(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_WOBBUFFET) { Moves(MOVE_CELEBRATE, MOVE_SCRATCH, MOVE_POUND, MOVE_SURF); }; + OPPONENT(SPECIES_WOBBUFFET) { Moves(MOVE_CELEBRATE, MOVE_SCRATCH, MOVE_POUND, MOVE_SURF); } } WHEN { TURN { MOVE(player, MOVE_GRUDGE); @@ -30,7 +30,7 @@ SINGLE_BATTLE_TEST("Grudge does not deplete PP of a Z-Move") GIVEN { PLAYER(SPECIES_WOBBUFFET) { HP(1); } PLAYER(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_NORMALIUM_Z); Moves(MOVE_CELEBRATE, MOVE_SCRATCH, MOVE_POUND, MOVE_SURF); }; + OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_NORMALIUM_Z); Moves(MOVE_CELEBRATE, MOVE_SCRATCH, MOVE_POUND, MOVE_SURF); } } WHEN { TURN { MOVE(player, MOVE_GRUDGE); diff --git a/test/battle/move_effect/heal_bell.c b/test/battle/move_effect/heal_bell.c index e2ca05206a..66a754df5c 100644 --- a/test/battle/move_effect/heal_bell.c +++ b/test/battle/move_effect/heal_bell.c @@ -179,7 +179,7 @@ DOUBLE_BATTLE_TEST("Aromatherapy cure Soundproof battlers regardless of config") GIVEN { ASSUME(!IsSoundMove(MOVE_AROMATHERAPY)); WITH_CONFIG(CONFIG_HEAL_BELL_SOUNDPROOF, config); - PLAYER(SPECIES_WOBBUFFET) { Ability(ability); Status1(STATUS1_POISON); }; + PLAYER(SPECIES_WOBBUFFET) { Ability(ability); Status1(STATUS1_POISON); } PLAYER(SPECIES_EXPLOUD) { Ability(ability); Status1(STATUS1_POISON); } OPPONENT(SPECIES_WYNAUT); OPPONENT(SPECIES_WYNAUT); diff --git a/test/battle/move_effect/hit_escape.c b/test/battle/move_effect/hit_escape.c index f587d078a0..b4e3e2f4e5 100644 --- a/test/battle/move_effect/hit_escape.c +++ b/test/battle/move_effect/hit_escape.c @@ -116,7 +116,7 @@ SINGLE_BATTLE_TEST("Hit Escape: U-turn switches the user out after Ice Face acti SINGLE_BATTLE_TEST("Hit Escape: Held items are consumed immediately after a mon switched in by U-turn: player side") { GIVEN { - PLAYER(SPECIES_TAPU_KOKO) { Ability(ABILITY_ELECTRIC_SURGE); }; + PLAYER(SPECIES_TAPU_KOKO) { Ability(ABILITY_ELECTRIC_SURGE); } PLAYER(SPECIES_EKANS) { Ability(ABILITY_INTIMIDATE); Item(ITEM_ELECTRIC_SEED); } OPPONENT(SPECIES_WYNAUT) { HP(1); } OPPONENT(SPECIES_WYNAUT); @@ -138,8 +138,8 @@ SINGLE_BATTLE_TEST("Hit Escape: Held items are consumed immediately after a mon SINGLE_BATTLE_TEST("Hit Escape: Held items are consumed immediately after a mon switched in by U-turn: opposing side") { GIVEN { - PLAYER(SPECIES_TAPU_KOKO) { Ability(ABILITY_ELECTRIC_SURGE); }; - PLAYER(SPECIES_EKANS) { Ability(ABILITY_INTIMIDATE); } + PLAYER(SPECIES_TAPU_KOKO) { Ability(ABILITY_ELECTRIC_SURGE); } + PLAYER(SPECIES_EKANS) { Ability(ABILITY_INTIMIDATE); } OPPONENT(SPECIES_WYNAUT) { HP(1); } OPPONENT(SPECIES_WYNAUT) { Item(ITEM_ELECTRIC_SEED); } } WHEN { @@ -160,7 +160,7 @@ SINGLE_BATTLE_TEST("Hit Escape: Held items are consumed immediately after a mon SINGLE_BATTLE_TEST("Hit Escape: Electric Seed boost is received by the right Pokémon after U-turn and Intimidate") { GIVEN { - PLAYER(SPECIES_TAPU_KOKO) { Ability(ABILITY_ELECTRIC_SURGE); }; + PLAYER(SPECIES_TAPU_KOKO) { Ability(ABILITY_ELECTRIC_SURGE); } PLAYER(SPECIES_EKANS) { Ability(ABILITY_INTIMIDATE); Item(ITEM_ELECTRIC_SEED); } OPPONENT(SPECIES_WYNAUT); OPPONENT(SPECIES_WYNAUT); @@ -181,9 +181,9 @@ SINGLE_BATTLE_TEST("Hit Escape: Electric Seed boost is received by the right Pok SINGLE_BATTLE_TEST("Hit Escape: U-turn triggers before Eject Pack") { GIVEN { - PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_EJECT_PACK); }; + PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_EJECT_PACK); } PLAYER(SPECIES_WYNAUT); - OPPONENT(SPECIES_GOODRA_HISUI) { Ability(ABILITY_GOOEY); }; + OPPONENT(SPECIES_GOODRA_HISUI) { Ability(ABILITY_GOOEY); } } WHEN { TURN { MOVE(player, MOVE_U_TURN); SEND_OUT(player, 1); } } SCENE { diff --git a/test/battle/move_effect/hydro_steam.c b/test/battle/move_effect/hydro_steam.c index cb19cc6ec1..781e083af4 100644 --- a/test/battle/move_effect/hydro_steam.c +++ b/test/battle/move_effect/hydro_steam.c @@ -35,8 +35,8 @@ SINGLE_BATTLE_TEST("Hydro Steam is affected by Utility Umbrella", s16 damage) PARAMETRIZE { itemPlayer = ITEM_NONE; itemOpponent = ITEM_UTILITY_UMBRELLA; } PARAMETRIZE { itemPlayer = ITEM_UTILITY_UMBRELLA; itemOpponent = ITEM_UTILITY_UMBRELLA; } GIVEN { - PLAYER(SPECIES_WOBBUFFET) { Item(itemPlayer); }; - OPPONENT(SPECIES_WOBBUFFET) {Item(itemOpponent); }; + PLAYER(SPECIES_WOBBUFFET) { Item(itemPlayer); } + OPPONENT(SPECIES_WOBBUFFET) { Item(itemOpponent); } } WHEN { TURN { MOVE(player, MOVE_SUNNY_DAY); } TURN { MOVE(player, MOVE_HYDRO_STEAM); } diff --git a/test/battle/move_effect/knock_off.c b/test/battle/move_effect/knock_off.c index eb0874d7bf..fd7a9a8824 100644 --- a/test/battle/move_effect/knock_off.c +++ b/test/battle/move_effect/knock_off.c @@ -92,7 +92,7 @@ SINGLE_BATTLE_TEST("Knock Off deals additional damage to opponents holding an it GIVEN { PLAYER(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_WOBBUFFET) { Item(item); }; + OPPONENT(SPECIES_WOBBUFFET) { Item(item); } } WHEN { TURN { MOVE(player, MOVE_KNOCK_OFF); } } SCENE { @@ -115,7 +115,7 @@ SINGLE_BATTLE_TEST("Knock Off does not remove items through Substitute") { GIVEN { PLAYER(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_LEFTOVERS); }; + OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_LEFTOVERS); } } WHEN { TURN { MOVE(opponent, MOVE_SUBSTITUTE); MOVE(player, MOVE_KNOCK_OFF); } } SCENE { @@ -130,7 +130,7 @@ SINGLE_BATTLE_TEST("Knock Off does not remove items through Substitute even if i { GIVEN { PLAYER(SPECIES_WYNAUT); - OPPONENT(SPECIES_WOBBUFFET) { MaxHP(4); HP(4); Item(ITEM_LEFTOVERS); }; + OPPONENT(SPECIES_WOBBUFFET) { MaxHP(4); HP(4); Item(ITEM_LEFTOVERS); } } WHEN { TURN { MOVE(opponent, MOVE_SUBSTITUTE); MOVE(player, MOVE_KNOCK_OFF); } } SCENE { @@ -146,7 +146,7 @@ SINGLE_BATTLE_TEST("Knock Off does not remove items through Protect") { GIVEN { PLAYER(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_LEFTOVERS); }; + OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_LEFTOVERS); } } WHEN { TURN { MOVE(opponent, MOVE_PROTECT); MOVE(player, MOVE_KNOCK_OFF); } } SCENE { @@ -165,7 +165,7 @@ SINGLE_BATTLE_TEST("Knock Off does not remove items if target is immune") ASSUME(GetMoveEffect(MOVE_ELECTRIFY) == EFFECT_ELECTRIFY); ASSUME(GetSpeciesType(SPECIES_DONPHAN, 0) == TYPE_GROUND || GetSpeciesType(SPECIES_DONPHAN, 1) == TYPE_GROUND); PLAYER(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_DONPHAN) { Item(ITEM_LEFTOVERS); }; + OPPONENT(SPECIES_DONPHAN) { Item(ITEM_LEFTOVERS); } } WHEN { TURN { MOVE(opponent, MOVE_ELECTRIFY); MOVE(player, MOVE_KNOCK_OFF); } } SCENE { diff --git a/test/battle/move_effect/lash_out.c b/test/battle/move_effect/lash_out.c index ed9465e915..52fca85758 100644 --- a/test/battle/move_effect/lash_out.c +++ b/test/battle/move_effect/lash_out.c @@ -161,7 +161,7 @@ DOUBLE_BATTLE_TEST("Lash Out damage is not boosted by Treasure of Ruin ability a GIVEN { PLAYER(SPECIES_GRIMMSNARL) { Moves(MOVE_LASH_OUT); } - PLAYER(SPECIES_RATTATA); + PLAYER(SPECIES_RATTATA); OPPONENT(SPECIES_WOBBUFFET); OPPONENT(SPECIES_GOLEM); OPPONENT(species) { Ability(ability); } diff --git a/test/battle/move_effect/magnetic_flux.c b/test/battle/move_effect/magnetic_flux.c index 6a23d2082f..7bbcd52754 100644 --- a/test/battle/move_effect/magnetic_flux.c +++ b/test/battle/move_effect/magnetic_flux.c @@ -12,6 +12,6 @@ AI_DOUBLE_BATTLE_TEST("AI uses Magnetic Flux") OPPONENT(SPECIES_KLINK) { Ability(ABILITY_PLUS); Moves(MOVE_MAGNETIC_FLUX, MOVE_POUND); } OPPONENT(SPECIES_KLINK) { Ability(ABILITY_PLUS); Moves(MOVE_MAGNETIC_FLUX, MOVE_POUND); } } WHEN { - TURN { EXPECT_MOVE(opponentLeft, MOVE_MAGNETIC_FLUX); } + TURN { EXPECT_MOVE(opponentLeft, MOVE_MAGNETIC_FLUX); } } } diff --git a/test/battle/move_effect/max_move.c b/test/battle/move_effect/max_move.c deleted file mode 100644 index 38924f1d33..0000000000 --- a/test/battle/move_effect/max_move.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "global.h" -#include "test/battle.h" - -// Tested in the dynamax.c test file diff --git a/test/battle/move_effect/me_first.c b/test/battle/move_effect/me_first.c index 51f673ae5f..8ccaa324ef 100644 --- a/test/battle/move_effect/me_first.c +++ b/test/battle/move_effect/me_first.c @@ -82,7 +82,7 @@ SINGLE_BATTLE_TEST("Me First can be selected if users holds Assault Vest") } } -SINGLE_BATTLE_TEST("Me Frist deducts power points from itself, not the copied move") +SINGLE_BATTLE_TEST("Me First deducts power points from itself, not the copied move") { ASSUME(GetMovePP(MOVE_ME_FIRST) == 20); ASSUME(GetMovePP(MOVE_POUND) == 35); diff --git a/test/battle/move_effect/mirror_coat.c b/test/battle/move_effect/mirror_coat.c index 6de1c03c29..301ba1ef26 100644 --- a/test/battle/move_effect/mirror_coat.c +++ b/test/battle/move_effect/mirror_coat.c @@ -97,7 +97,7 @@ DOUBLE_BATTLE_TEST("Mirror Coat fails if mon that damaged Mirror Coat user is no GIVEN { PLAYER(SPECIES_WOBBUFFET); PLAYER(SPECIES_WYNAUT); - OPPONENT(SPECIES_WOBBUFFET) { HP(1); }; + OPPONENT(SPECIES_WOBBUFFET) { HP(1); } OPPONENT(SPECIES_WYNAUT); } WHEN { TURN { diff --git a/test/battle/move_effect/misty_explosion.c b/test/battle/move_effect/misty_explosion.c index b7e0ede902..edd0906ff6 100644 --- a/test/battle/move_effect/misty_explosion.c +++ b/test/battle/move_effect/misty_explosion.c @@ -79,10 +79,10 @@ DOUBLE_BATTLE_TEST("Misty Explosion causes everyone to faint in a double battle" SINGLE_BATTLE_TEST("Misty Explosion does not trigger Destiny Bond") { GIVEN { - PLAYER(SPECIES_WOBBUFFET) { HP(1); }; + PLAYER(SPECIES_WOBBUFFET) { HP(1); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { - TURN { MOVE(player, MOVE_DESTINY_BOND); MOVE(opponent, MOVE_MISTY_EXPLOSION);} + TURN { MOVE(player, MOVE_DESTINY_BOND); MOVE(opponent, MOVE_MISTY_EXPLOSION); } } SCENE { ANIMATION(ANIM_TYPE_MOVE, MOVE_DESTINY_BOND, player); HP_BAR(opponent); diff --git a/test/battle/move_effect/multi_hit.c b/test/battle/move_effect/multi_hit.c index 594094385b..62f9556879 100644 --- a/test/battle/move_effect/multi_hit.c +++ b/test/battle/move_effect/multi_hit.c @@ -11,7 +11,7 @@ SINGLE_BATTLE_TEST("Multi hit Moves hit the maximum amount with Skill Link") PASSES_RANDOMLY(100, 100, RNG_HITS); GIVEN { - PLAYER(SPECIES_WOBBUFFET) { Ability(ABILITY_SKILL_LINK); }; + PLAYER(SPECIES_WOBBUFFET) { Ability(ABILITY_SKILL_LINK); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(player, MOVE_BULLET_SEED); } diff --git a/test/battle/move_effect/nature_power.c b/test/battle/move_effect/nature_power.c index 53aa68442d..dc50c3bff8 100644 --- a/test/battle/move_effect/nature_power.c +++ b/test/battle/move_effect/nature_power.c @@ -10,7 +10,7 @@ SINGLE_BATTLE_TEST("Nature power plays a move correctly in any background") u32 move = MOVE_TRI_ATTACK; for (u32 j = 0; j < BATTLE_ENVIRONMENT_COUNT; j++) { - PARAMETRIZE {environment = i;} + PARAMETRIZE { environment = i; } } GIVEN { PLAYER(SPECIES_WOBBUFFET); diff --git a/test/battle/move_effect/pledge.c b/test/battle/move_effect/pledge.c index f2607b4ff7..3c6b04b17a 100644 --- a/test/battle/move_effect/pledge.c +++ b/test/battle/move_effect/pledge.c @@ -217,7 +217,7 @@ DOUBLE_BATTLE_TEST("Pledge moves can not be redirected by absorbing abilities") OPPONENT(SPECIES_LILEEP) { Ability(ABILITY_STORM_DRAIN); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { - TURN { MOVE(playerLeft, MOVE_WATER_PLEDGE, target: opponentRight);} + TURN { MOVE(playerLeft, MOVE_WATER_PLEDGE, target: opponentRight); } } SCENE { ANIMATION(ANIM_TYPE_MOVE, MOVE_WATER_PLEDGE, playerLeft); HP_BAR(opponentRight); diff --git a/test/battle/move_effect/powder.c b/test/battle/move_effect/powder.c index 2bcfc58da8..3f0a3135d9 100644 --- a/test/battle/move_effect/powder.c +++ b/test/battle/move_effect/powder.c @@ -287,7 +287,7 @@ DOUBLE_BATTLE_TEST("Powder damages a target using Shell Trap even if it wasn't h u32 move; PARAMETRIZE { move = MOVE_SCRATCH; } PARAMETRIZE { move = MOVE_EMBER; } - PARAMETRIZE { move = MOVE_TICKLE;} + PARAMETRIZE { move = MOVE_TICKLE; } GIVEN { ASSUME(GetMoveEffect(MOVE_SHELL_TRAP) == EFFECT_SHELL_TRAP); ASSUME(GetMoveType(MOVE_SHELL_TRAP) == TYPE_FIRE); diff --git a/test/battle/move_effect/protect.c b/test/battle/move_effect/protect.c index 05b238fe0e..85546f2064 100644 --- a/test/battle/move_effect/protect.c +++ b/test/battle/move_effect/protect.c @@ -166,9 +166,9 @@ SINGLE_BATTLE_TEST("Protect: Baneful Bunker poisons Pokémon for moves making co { u16 usedMove = MOVE_NONE; - PARAMETRIZE {usedMove = MOVE_SCRATCH; } - PARAMETRIZE {usedMove = MOVE_LEER; } - PARAMETRIZE {usedMove = MOVE_WATER_GUN; } + PARAMETRIZE { usedMove = MOVE_SCRATCH; } + PARAMETRIZE { usedMove = MOVE_LEER; } + PARAMETRIZE { usedMove = MOVE_WATER_GUN; } GIVEN { PLAYER(SPECIES_WOBBUFFET); @@ -218,9 +218,9 @@ SINGLE_BATTLE_TEST("Protect: Burning Bulwark burns Pokémon for moves making con { u16 usedMove = MOVE_NONE; - PARAMETRIZE {usedMove = MOVE_SCRATCH; } - PARAMETRIZE {usedMove = MOVE_LEER; } - PARAMETRIZE {usedMove = MOVE_WATER_GUN; } + PARAMETRIZE { usedMove = MOVE_SCRATCH; } + PARAMETRIZE { usedMove = MOVE_LEER; } + PARAMETRIZE { usedMove = MOVE_WATER_GUN; } GIVEN { PLAYER(SPECIES_WOBBUFFET); @@ -269,8 +269,8 @@ SINGLE_BATTLE_TEST("Protect: Burning Bulwark can't burn Pokémon if they are alr SINGLE_BATTLE_TEST("Protect: Recoil damage is not applied if target was protected") { u32 j, k; - static const u16 protectMoves[] = { MOVE_PROTECT, MOVE_DETECT, MOVE_KINGS_SHIELD, MOVE_BANEFUL_BUNKER, MOVE_SILK_TRAP, MOVE_OBSTRUCT, MOVE_SPIKY_SHIELD }; - static const u16 recoilMoves[] = { MOVE_VOLT_TACKLE, MOVE_HEAD_SMASH, MOVE_TAKE_DOWN, MOVE_DOUBLE_EDGE }; + static const u16 protectMoves[] = {MOVE_PROTECT, MOVE_DETECT, MOVE_KINGS_SHIELD, MOVE_BANEFUL_BUNKER, MOVE_SILK_TRAP, MOVE_OBSTRUCT, MOVE_SPIKY_SHIELD}; + static const u16 recoilMoves[] = {MOVE_VOLT_TACKLE, MOVE_HEAD_SMASH, MOVE_TAKE_DOWN, MOVE_DOUBLE_EDGE}; u16 protectMove = MOVE_NONE; u16 recoilMove = MOVE_NONE; @@ -721,7 +721,7 @@ SINGLE_BATTLE_TEST("Protect: Protective Pads protects from secondary effects") DOUBLE_BATTLE_TEST("Protect is not transferred to a mon that is switched in due to Eject Button") { GIVEN { - PLAYER(SPECIES_URSHIFU) { Ability(ABILITY_UNSEEN_FIST); }; + PLAYER(SPECIES_URSHIFU) { Ability(ABILITY_UNSEEN_FIST); } PLAYER(SPECIES_WYNAUT); OPPONENT(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WYNAUT) { Item(ITEM_EJECT_BUTTON); } diff --git a/test/battle/move_effect/psychic_terrain.c b/test/battle/move_effect/psychic_terrain.c index 36f4841ef1..c8fb061d9c 100644 --- a/test/battle/move_effect/psychic_terrain.c +++ b/test/battle/move_effect/psychic_terrain.c @@ -117,16 +117,16 @@ SINGLE_BATTLE_TEST("Psychic Terrain doesn't block priority field moves") SINGLE_BATTLE_TEST("Psychic Terrain doesn't block priority moves against semi-invulnerable targets") { u32 move = 0, shouldWork = 0; - PARAMETRIZE { move = MOVE_SOLAR_BEAM; shouldWork = FALSE;} - PARAMETRIZE { move = MOVE_FLY; shouldWork = TRUE;} + PARAMETRIZE { move = MOVE_SOLAR_BEAM; shouldWork = FALSE; } + PARAMETRIZE { move = MOVE_FLY; shouldWork = TRUE; } GIVEN { WITH_CONFIG(CONFIG_TOXIC_NEVER_MISS, GEN_6); ASSUME(IsSpeciesOfType(SPECIES_SHROODLE, TYPE_POISON)); PLAYER(SPECIES_SHROODLE) { Ability(ABILITY_PRANKSTER); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { - TURN { MOVE(player, MOVE_PSYCHIC_TERRAIN); MOVE(opponent,move);} - TURN { MOVE(player, MOVE_TOXIC); SKIP_TURN(opponent);} + TURN { MOVE(player, MOVE_PSYCHIC_TERRAIN); MOVE(opponent,move); } + TURN { MOVE(player, MOVE_TOXIC); SKIP_TURN(opponent); } } SCENE { if (shouldWork) { diff --git a/test/battle/move_effect/recoil_if_miss.c b/test/battle/move_effect/recoil_if_miss.c index 7f62f2065e..335120a5e5 100644 --- a/test/battle/move_effect/recoil_if_miss.c +++ b/test/battle/move_effect/recoil_if_miss.c @@ -74,7 +74,7 @@ SINGLE_BATTLE_TEST("Recoil if miss: Jump Kick's recoil happens after Spiky Shiel } else { TURN { MOVE(opponent, MOVE_SPIKY_SHIELD); MOVE(player, MOVE_JUMP_KICK, hit: FALSE); SEND_OUT(player, 1); } } - TURN { ; } + TURN {} } SCENE { ANIMATION(ANIM_TYPE_MOVE, MOVE_SPIKY_SHIELD, opponent); MESSAGE("Wobbuffet used Jump Kick!"); @@ -139,7 +139,7 @@ SINGLE_BATTLE_TEST("Recoil if miss: Disguise doesn't prevent crash damage from J PARAMETRIZE { ability = ABILITY_SCRAPPY; } GIVEN { - PLAYER(SPECIES_KANGASKHAN) { Ability(ability); }; + PLAYER(SPECIES_KANGASKHAN) { Ability(ability); } OPPONENT(SPECIES_MIMIKYU_DISGUISED) { Ability(ABILITY_DISGUISE); } } WHEN { TURN { MOVE(player, MOVE_JUMP_KICK); } diff --git a/test/battle/move_effect/refresh.c b/test/battle/move_effect/refresh.c index f11a8dfca1..727bd7c862 100644 --- a/test/battle/move_effect/refresh.c +++ b/test/battle/move_effect/refresh.c @@ -15,7 +15,7 @@ SINGLE_BATTLE_TEST("Refresh cures the user of burn, frostbite, poison, and paral PARAMETRIZE { status1 = STATUS1_TOXIC_POISON; } PARAMETRIZE { status1 = STATUS1_FROSTBITE; } GIVEN { - PLAYER(SPECIES_WOBBUFFET) { Status1(status1); }; + PLAYER(SPECIES_WOBBUFFET) { Status1(status1); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(player, MOVE_REFRESH); } @@ -35,9 +35,10 @@ SINGLE_BATTLE_TEST("Refresh does not cure the user of Freeze") TURN { MOVE(player, MOVE_REFRESH); } } SCENE { MESSAGE("Wobbuffet used Refresh!"); - NONE_OF { + NONE_OF { ANIMATION(ANIM_TYPE_MOVE, MOVE_REFRESH, player); - STATUS_ICON(player, none: TRUE); } + STATUS_ICON(player, none: TRUE); + } MESSAGE("But it failed!"); } } @@ -61,9 +62,10 @@ SINGLE_BATTLE_TEST("Refresh does not cure sleep when used by Sleep Talk") MESSAGE("The opposing Wobbuffet used Sleep Talk!"); ANIMATION(ANIM_TYPE_MOVE, MOVE_SLEEP_TALK, opponent); MESSAGE("The opposing Wobbuffet used Refresh!"); - NONE_OF { + NONE_OF { ANIMATION(ANIM_TYPE_MOVE, MOVE_REFRESH, player); - STATUS_ICON(player, none: TRUE); } + STATUS_ICON(player, none: TRUE); + } MESSAGE("But it failed!"); } } diff --git a/test/battle/move_effect/revival_blessing.c b/test/battle/move_effect/revival_blessing.c index eeb90d202d..add15a7c3d 100644 --- a/test/battle/move_effect/revival_blessing.c +++ b/test/battle/move_effect/revival_blessing.c @@ -61,13 +61,13 @@ AI_MULTI_BATTLE_TEST("Revival Blessing cannot revive a partner's party member") MULTI_PLAYER(SPECIES_CLEFABLE); MULTI_PLAYER(SPECIES_CLEFABLE) { HP(0); } MULTI_PLAYER(SPECIES_CLEFABLE); - MULTI_PARTNER(SPECIES_CLEFAIRY) { Moves(move2); } + MULTI_PARTNER(SPECIES_CLEFAIRY) { Moves(move2); } MULTI_PARTNER(SPECIES_CLEFAIRY); MULTI_PARTNER(SPECIES_CLEFAIRY); - MULTI_OPPONENT_A(SPECIES_WOBBUFFET) { Moves(move1); } + MULTI_OPPONENT_A(SPECIES_WOBBUFFET) { Moves(move1); } MULTI_OPPONENT_A(SPECIES_WOBBUFFET); MULTI_OPPONENT_A(SPECIES_WOBBUFFET); - MULTI_OPPONENT_B(SPECIES_WYNAUT) { Moves(move3); } + MULTI_OPPONENT_B(SPECIES_WYNAUT) { Moves(move3); } MULTI_OPPONENT_B(SPECIES_WYNAUT) { HP(0); } MULTI_OPPONENT_B(SPECIES_WYNAUT); } WHEN { diff --git a/test/battle/move_effect/rototiller.c b/test/battle/move_effect/rototiller.c index b86228a3f1..c9c2cb7588 100644 --- a/test/battle/move_effect/rototiller.c +++ b/test/battle/move_effect/rototiller.c @@ -109,6 +109,6 @@ AI_DOUBLE_BATTLE_TEST("AI uses Rototiller") OPPONENT(SPECIES_TANGELA) { Moves(MOVE_ROTOTILLER, MOVE_POUND); } OPPONENT(SPECIES_TANGELA); } WHEN { - TURN { EXPECT_MOVE(opponentLeft, MOVE_ROTOTILLER); } + TURN { EXPECT_MOVE(opponentLeft, MOVE_ROTOTILLER); } } } diff --git a/test/battle/move_effect/spicy_extract.c b/test/battle/move_effect/spicy_extract.c index 6dc2a77427..ea78e08eeb 100644 --- a/test/battle/move_effect/spicy_extract.c +++ b/test/battle/move_effect/spicy_extract.c @@ -168,7 +168,7 @@ AI_DOUBLE_BATTLE_TEST("Spicy Extract user will use it if partner holds Clear Amu u32 move; PARAMETRIZE { move = MOVE_SCRATCH; } - PARAMETRIZE { move = MOVE_SWIFT;} + PARAMETRIZE { move = MOVE_SWIFT; } GIVEN { AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT); diff --git a/test/battle/move_effect/steal_item.c b/test/battle/move_effect/steal_item.c index 1259cf4599..dffc1ecd6a 100644 --- a/test/battle/move_effect/steal_item.c +++ b/test/battle/move_effect/steal_item.c @@ -134,7 +134,7 @@ SINGLE_BATTLE_TEST("Thief and Covet can't steal target's held item if user faint PARAMETRIZE { move = MOVE_THIEF; } PARAMETRIZE { move = MOVE_COVET; } GIVEN { - PLAYER(SPECIES_WOBBUFFET) { HP(1); }; + PLAYER(SPECIES_WOBBUFFET) { HP(1); } OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_ROCKY_HELMET); } } WHEN { TURN { MOVE(player, move); } diff --git a/test/battle/move_effect/sticky_web.c b/test/battle/move_effect/sticky_web.c index ed0f6e5d93..cbcf39ad7b 100644 --- a/test/battle/move_effect/sticky_web.c +++ b/test/battle/move_effect/sticky_web.c @@ -50,13 +50,13 @@ DOUBLE_BATTLE_TEST("Sticky Web lowers Speed by 1 in a double battle after Explos { GIVEN { ASSUME(GetMoveEffect(MOVE_EXPLOSION) == EFFECT_EXPLOSION); - PLAYER(SPECIES_WOBBUFFET) {Speed(5);} - PLAYER(SPECIES_WOBBUFFET) {HP(1500); Speed(10);} - PLAYER(SPECIES_WOBBUFFET) {Speed(10);} - OPPONENT(SPECIES_WOBBUFFET) {HP(1); Speed(1);} - OPPONENT(SPECIES_WOBBUFFET) {HP(1); Speed(1);} - OPPONENT(SPECIES_WYNAUT) {Speed(10);} - OPPONENT(SPECIES_ALAKAZAM) {Speed(100);} + PLAYER(SPECIES_WOBBUFFET) { Speed(5); } + PLAYER(SPECIES_WOBBUFFET) { HP(1500); Speed(10); } + PLAYER(SPECIES_WOBBUFFET) { Speed(10); } + OPPONENT(SPECIES_WOBBUFFET) { HP(1); Speed(1); } + OPPONENT(SPECIES_WOBBUFFET) { HP(1); Speed(1); } + OPPONENT(SPECIES_WYNAUT) { Speed(10); } + OPPONENT(SPECIES_ALAKAZAM) { Speed(100); } } WHEN { TURN { MOVE(playerRight, MOVE_STICKY_WEB); MOVE(playerLeft, MOVE_EXPLOSION); SEND_OUT(playerLeft, 2); SEND_OUT(opponentLeft, 2); SEND_OUT(opponentRight, 3); } TURN {} @@ -102,10 +102,10 @@ DOUBLE_BATTLE_TEST("Sticky Web has correct interactions with Mirror Armor - the { u8 playerSetUpper, opponentSetUpper; // 0 left, 1 right - PARAMETRIZE {playerSetUpper = 0; opponentSetUpper = 0; } - PARAMETRIZE {playerSetUpper = 0; opponentSetUpper = 1; } - PARAMETRIZE {playerSetUpper = 1; opponentSetUpper = 0; } - PARAMETRIZE {playerSetUpper = 1; opponentSetUpper = 1; } + PARAMETRIZE { playerSetUpper = 0; opponentSetUpper = 0; } + PARAMETRIZE { playerSetUpper = 0; opponentSetUpper = 1; } + PARAMETRIZE { playerSetUpper = 1; opponentSetUpper = 0; } + PARAMETRIZE { playerSetUpper = 1; opponentSetUpper = 1; } GIVEN { PLAYER(SPECIES_SQUIRTLE); @@ -193,18 +193,18 @@ DOUBLE_BATTLE_TEST("Sticky Web has correct interactions with Mirror Armor - no o bool8 hasReplacement; // We need to make sure Sticky Web user saves for both sides, so it doesn't matter who sets it first. - PARAMETRIZE {hasReplacement = TRUE;} - PARAMETRIZE {hasReplacement = FALSE;} + PARAMETRIZE { hasReplacement = TRUE; } + PARAMETRIZE { hasReplacement = FALSE; } GIVEN { ASSUME(GetMoveEffect(MOVE_MEMENTO) == EFFECT_MEMENTO); - PLAYER(SPECIES_SQUIRTLE) {Speed(5); } - PLAYER(SPECIES_CHARMANDER) {Speed(5); } - PLAYER(SPECIES_CORVIKNIGHT) {Ability(ABILITY_MIRROR_ARMOR); Item(ITEM_IRON_BALL); Speed(5); } // Iron Ball, so that flying type Corviknight is affected by Sticky Web. - OPPONENT(SPECIES_CATERPIE) {Speed(7); } - OPPONENT(SPECIES_WEEDLE) {Speed(7); } + PLAYER(SPECIES_SQUIRTLE) { Speed(5); } + PLAYER(SPECIES_CHARMANDER) { Speed(5); } + PLAYER(SPECIES_CORVIKNIGHT) { Ability(ABILITY_MIRROR_ARMOR); Item(ITEM_IRON_BALL); Speed(5); } // Iron Ball, so that flying type Corviknight is affected by Sticky Web. + OPPONENT(SPECIES_CATERPIE) { Speed(7); } + OPPONENT(SPECIES_WEEDLE) { Speed(7); } if (hasReplacement) { - OPPONENT(SPECIES_PIDGEY) {Speed(7); } + OPPONENT(SPECIES_PIDGEY) { Speed(7); } } } WHEN { @@ -212,7 +212,7 @@ DOUBLE_BATTLE_TEST("Sticky Web has correct interactions with Mirror Armor - no o if (hasReplacement) { TURN { MOVE(opponentLeft, MOVE_MEMENTO, target:playerLeft); SEND_OUT(opponentLeft, 2); } } else { - TURN { MOVE(opponentLeft, MOVE_MEMENTO, target:playerLeft);} + TURN { MOVE(opponentLeft, MOVE_MEMENTO, target:playerLeft); } } TURN { SWITCH(playerRight, 2); } } SCENE { @@ -245,7 +245,7 @@ SINGLE_BATTLE_TEST("Sticky Web is placed on the correct side after Explosion") PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { - TURN { MOVE(player, MOVE_EXPLOSION); MOVE(opponent, MOVE_STICKY_WEB); SEND_OUT(player, 1);} + TURN { MOVE(player, MOVE_EXPLOSION); MOVE(opponent, MOVE_STICKY_WEB); SEND_OUT(player, 1); } } SCENE { HP_BAR(player, hp: 0); ANIMATION(ANIM_TYPE_MOVE, MOVE_EXPLOSION, player); diff --git a/test/battle/move_effect/stomping_tantrum.c b/test/battle/move_effect/stomping_tantrum.c index 06b29334d7..43580f6851 100644 --- a/test/battle/move_effect/stomping_tantrum.c +++ b/test/battle/move_effect/stomping_tantrum.c @@ -41,11 +41,11 @@ SINGLE_BATTLE_TEST("Stomping Tantrum will deal double damage if user failed to a s16 damage[3]; PASSES_RANDOMLY(25, 100, RNG_PARALYSIS); GIVEN { - PLAYER(SPECIES_WOBBUFFET) { Speed(100); Item(ITEM_POTION); }; - OPPONENT(SPECIES_WOBBUFFET) { Speed(10); Item(ITEM_LUM_BERRY); }; + PLAYER(SPECIES_WOBBUFFET) { Speed(100); Item(ITEM_POTION); } + OPPONENT(SPECIES_WOBBUFFET) { Speed(10); Item(ITEM_LUM_BERRY); } } WHEN { TURN { MOVE(player, MOVE_STOMPING_TANTRUM); MOVE(opponent, MOVE_THUNDER_WAVE); } - TURN { MOVE(player, MOVE_CELEBRATE); MOVE(opponent, MOVE_TRICK); } + TURN { MOVE(player, MOVE_CELEBRATE); MOVE(opponent, MOVE_TRICK); } TURN { MOVE(player, MOVE_STOMPING_TANTRUM); } TURN { MOVE(player, MOVE_STOMPING_TANTRUM); } } SCENE { @@ -120,7 +120,7 @@ SINGLE_BATTLE_TEST("Stomping Tantrum will not deal double if it missed") s16 damage[2]; GIVEN { PLAYER(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_BRIGHTPOWDER); }; + OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_BRIGHTPOWDER); } } WHEN { TURN { MOVE(player, MOVE_STOMPING_TANTRUM); } TURN { MOVE(player, MOVE_STOMPING_TANTRUM, hit: FALSE); } diff --git a/test/battle/move_effect/take_heart.c b/test/battle/move_effect/take_heart.c index 69560de74d..2377624b7d 100644 --- a/test/battle/move_effect/take_heart.c +++ b/test/battle/move_effect/take_heart.c @@ -28,7 +28,7 @@ SINGLE_BATTLE_TEST("Take Heart cures the user of all status conditions") PARAMETRIZE { status1 = STATUS1_PARALYSIS; } PARAMETRIZE { status1 = STATUS1_TOXIC_POISON; } GIVEN { - PLAYER(SPECIES_WOBBUFFET) { Status1(status1); }; + PLAYER(SPECIES_WOBBUFFET) { Status1(status1); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(player, MOVE_TAKE_HEART); } diff --git a/test/battle/move_effect/telekinesis.c b/test/battle/move_effect/telekinesis.c index 31390d9733..da3ee611ff 100644 --- a/test/battle/move_effect/telekinesis.c +++ b/test/battle/move_effect/telekinesis.c @@ -33,8 +33,8 @@ SINGLE_BATTLE_TEST("Telekinesis ends after 3 turns") OPPONENT(SPECIES_WYNAUT); } WHEN { TURN { MOVE(player, MOVE_TELEKINESIS); } - TURN { } - TURN { } + TURN {} + TURN {} } SCENE { MESSAGE("Wobbuffet used Telekinesis!"); MESSAGE("The opposing Wynaut was hurled into the air!"); diff --git a/test/battle/move_effect/toxic_spikes.c b/test/battle/move_effect/toxic_spikes.c index 3d21c0693b..f74e1bddb4 100644 --- a/test/battle/move_effect/toxic_spikes.c +++ b/test/battle/move_effect/toxic_spikes.c @@ -208,10 +208,10 @@ SINGLE_BATTLE_TEST("Toxic Spikes inflicts poison on switch in after Primal Rever { GIVEN { ASSUME(GetMoveEffect(MOVE_MEMENTO) == EFFECT_MEMENTO); // Faints the user. - PLAYER(SPECIES_WOBBUFFET) {Speed(5); } + PLAYER(SPECIES_WOBBUFFET) { Speed(5); } PLAYER(SPECIES_GROUDON) { Item(ITEM_RED_ORB); Speed(1); } - PLAYER(SPECIES_WYNAUT) {Speed(5); } - OPPONENT(SPECIES_WOBBUFFET) {Speed(15); } + PLAYER(SPECIES_WYNAUT) { Speed(5); } + OPPONENT(SPECIES_WOBBUFFET) { Speed(15); } } WHEN { TURN { MOVE(opponent, MOVE_TOXIC_SPIKES); } TURN { SWITCH(player, 1); } diff --git a/test/battle/move_effect/two_turns_attack.c b/test/battle/move_effect/two_turns_attack.c index 661a45c110..94540f566e 100644 --- a/test/battle/move_effect/two_turns_attack.c +++ b/test/battle/move_effect/two_turns_attack.c @@ -305,7 +305,7 @@ SINGLE_BATTLE_TEST("Solar Beam's power is halved in a Sandstorm", s16 damage) PARAMETRIZE { move = MOVE_SANDSTORM; } GIVEN { PLAYER(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_SAFETY_GOGGLES); }; + OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_SAFETY_GOGGLES); } } WHEN { TURN { MOVE(opponent, move); MOVE(player, MOVE_SOLAR_BEAM); } TURN { SKIP_TURN(player); } @@ -323,7 +323,7 @@ SINGLE_BATTLE_TEST("Solar Blade's power is halved in a Sandstorm", s16 damage) PARAMETRIZE { move = MOVE_SANDSTORM; } GIVEN { PLAYER(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_SAFETY_GOGGLES); }; + OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_SAFETY_GOGGLES); } } WHEN { TURN { MOVE(opponent, move); MOVE(player, MOVE_SOLAR_BLADE); } TURN { SKIP_TURN(player); } @@ -341,7 +341,7 @@ SINGLE_BATTLE_TEST("Solar Beam's power is halved in Hail", s16 damage) PARAMETRIZE { move = MOVE_HAIL; } GIVEN { PLAYER(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_SAFETY_GOGGLES); }; + OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_SAFETY_GOGGLES); } } WHEN { TURN { MOVE(opponent, move); MOVE(player, MOVE_SOLAR_BEAM); } TURN { SKIP_TURN(player); } @@ -359,7 +359,7 @@ SINGLE_BATTLE_TEST("Solar Blade's power is halved in Hail", s16 damage) PARAMETRIZE { move = MOVE_HAIL; } GIVEN { PLAYER(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_SAFETY_GOGGLES); }; + OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_SAFETY_GOGGLES); } } WHEN { TURN { MOVE(opponent, move); MOVE(player, MOVE_SOLAR_BLADE); } TURN { SKIP_TURN(player); } diff --git a/test/battle/move_effect/upper_hand.c b/test/battle/move_effect/upper_hand.c index 59d6057521..49dc21bf49 100644 --- a/test/battle/move_effect/upper_hand.c +++ b/test/battle/move_effect/upper_hand.c @@ -127,7 +127,7 @@ AI_SINGLE_BATTLE_TEST("AI won't use Upper Hand unless it has seen a priority mov GIVEN { AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT); ASSUME(GetMovePriority(MOVE_QUICK_ATTACK) == 1); - PLAYER(SPECIES_WOBBUFFET) {Moves(move); } + PLAYER(SPECIES_WOBBUFFET) { Moves(move); } OPPONENT(SPECIES_WOBBUFFET) { Moves(MOVE_UPPER_HAND, MOVE_KARATE_CHOP); } } WHEN { TURN { MOVE(player, move); EXPECT_MOVE(opponent, MOVE_KARATE_CHOP); } diff --git a/test/battle/move_effect/weather_ball.c b/test/battle/move_effect/weather_ball.c index 0474383483..3586b71a32 100644 --- a/test/battle/move_effect/weather_ball.c +++ b/test/battle/move_effect/weather_ball.c @@ -49,7 +49,7 @@ SINGLE_BATTLE_TEST("Weather Ball doubles its power and turns to a Rock-type move PARAMETRIZE { move = MOVE_SANDSTORM; } GIVEN { PLAYER(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_MAGMAR) { Item(ITEM_SAFETY_GOGGLES); }; + OPPONENT(SPECIES_MAGMAR) { Item(ITEM_SAFETY_GOGGLES); } } WHEN { TURN { MOVE(player, move); } TURN { MOVE(player, MOVE_WEATHER_BALL); } @@ -68,7 +68,7 @@ SINGLE_BATTLE_TEST("Weather Ball doubles its power and turns to an Ice-type move PARAMETRIZE { move = MOVE_SNOWSCAPE; } GIVEN { PLAYER(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_DRAGONAIR) { Item(ITEM_SAFETY_GOGGLES); }; + OPPONENT(SPECIES_DRAGONAIR) { Item(ITEM_SAFETY_GOGGLES); } } WHEN { TURN { MOVE(player, move); } TURN { MOVE(player, MOVE_WEATHER_BALL); } diff --git a/test/battle/move_effect/wish.c b/test/battle/move_effect/wish.c index a901ce0bbf..6e9114bc09 100644 --- a/test/battle/move_effect/wish.c +++ b/test/battle/move_effect/wish.c @@ -17,7 +17,7 @@ SINGLE_BATTLE_TEST("Wish restores 50% of the user's HP when not switching") OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(player, MOVE_WISH); } - TURN { } + TURN {} } SCENE { ANIMATION(ANIM_TYPE_MOVE, MOVE_WISH, player); ANIMATION(ANIM_TYPE_MOVE, MOVE_CELEBRATE, player); @@ -74,7 +74,7 @@ SINGLE_BATTLE_TEST("Wish heals the user at the end of the next turn") OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(player, MOVE_WISH); MOVE(opponent, MOVE_POUND); } - TURN { } + TURN {} } SCENE { ANIMATION(ANIM_TYPE_MOVE, MOVE_WISH, player); ANIMATION(ANIM_TYPE_MOVE, MOVE_POUND, opponent); diff --git a/test/battle/move_effect_secondary/bug_bite.c b/test/battle/move_effect_secondary/bug_bite.c index e6df81dc70..c0b2bc2979 100644 --- a/test/battle/move_effect_secondary/bug_bite.c +++ b/test/battle/move_effect_secondary/bug_bite.c @@ -120,7 +120,7 @@ SINGLE_BATTLE_TEST("Tanga Berry activates before Bug Bite") ASSUME(gItemsInfo[ITEM_TANGA_BERRY].holdEffect == HOLD_EFFECT_RESIST_BERRY); ASSUME(gItemsInfo[ITEM_TANGA_BERRY].holdEffectParam == TYPE_BUG); PLAYER(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_WOBBUFFET) {Item(ITEM_TANGA_BERRY); } + OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_TANGA_BERRY); } } WHEN { TURN { MOVE(player, MOVE_BUG_BITE); } } SCENE { diff --git a/test/battle/move_effect_secondary/ion_deluge.c b/test/battle/move_effect_secondary/ion_deluge.c index 21d37de407..003bfc825f 100644 --- a/test/battle/move_effect_secondary/ion_deluge.c +++ b/test/battle/move_effect_secondary/ion_deluge.c @@ -70,7 +70,7 @@ SINGLE_BATTLE_TEST("Plasma Fists does not set up Ion Deluge if it does not conne SINGLE_BATTLE_TEST("Plasma Fists type-changing effect does not override Pixilate") { GIVEN { - PLAYER(SPECIES_KRABBY) { Speed(300); }; + PLAYER(SPECIES_KRABBY) { Speed(300); } OPPONENT(SPECIES_SYLVEON) { Speed(1); Ability(ABILITY_PIXILATE); } } WHEN { TURN { MOVE(player, MOVE_PLASMA_FISTS); MOVE(opponent, MOVE_SCRATCH); } diff --git a/test/battle/move_effect_secondary/order_up.c b/test/battle/move_effect_secondary/order_up.c index bfabd6e3e3..b24b366c56 100644 --- a/test/battle/move_effect_secondary/order_up.c +++ b/test/battle/move_effect_secondary/order_up.c @@ -17,7 +17,7 @@ DOUBLE_BATTLE_TEST("Order Up increases a stat based on Tatsugiri's form") PLAYER(species) { Ability(ABILITY_COMMANDER); } PLAYER(SPECIES_DONDOZO); OPPONENT(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_VOLBEAT) { Ability(ABILITY_PRANKSTER); }; + OPPONENT(SPECIES_VOLBEAT) { Ability(ABILITY_PRANKSTER); } } WHEN { TURN { MOVE(opponentRight, MOVE_HAZE); MOVE(playerRight, MOVE_ORDER_UP, target: opponentLeft); } } SCENE { @@ -65,9 +65,9 @@ DOUBLE_BATTLE_TEST("Order Up increases a stat based on Tatsugiri's form even if PLAYER(species) { HP(1); Status1(STATUS1_POISON); Ability(ABILITY_COMMANDER); } PLAYER(SPECIES_DONDOZO); OPPONENT(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_VOLBEAT) { Ability(ABILITY_PRANKSTER); }; + OPPONENT(SPECIES_VOLBEAT) { Ability(ABILITY_PRANKSTER); } } WHEN { - TURN { } + TURN {} TURN { MOVE(opponentRight, MOVE_HAZE); MOVE(playerRight, MOVE_ORDER_UP, target: opponentLeft); } } SCENE { ABILITY_POPUP(playerLeft, ABILITY_COMMANDER); diff --git a/test/battle/move_effect_secondary/recharge.c b/test/battle/move_effect_secondary/recharge.c index 9146083675..c4915f4b45 100644 --- a/test/battle/move_effect_secondary/recharge.c +++ b/test/battle/move_effect_secondary/recharge.c @@ -12,9 +12,9 @@ SINGLE_BATTLE_TEST("Recharge moves make the user unable to attack for exactly on PLAYER(SPECIES_WOBBUFFET) { } OPPONENT(SPECIES_WOBBUFFET) { } } WHEN { - TURN { MOVE(player, MOVE_METEOR_ASSAULT);} - TURN { SKIP_TURN(player);} - TURN { MOVE(player, MOVE_TACKLE);} + TURN { MOVE(player, MOVE_METEOR_ASSAULT); } + TURN { SKIP_TURN(player); } + TURN { MOVE(player, MOVE_TACKLE); } } SCENE { ANIMATION(ANIM_TYPE_MOVE, MOVE_METEOR_ASSAULT, player); MESSAGE("Wobbuffet must recharge!"); @@ -29,7 +29,7 @@ SINGLE_BATTLE_TEST("Recharge moves don't timeout when all battlers are rechargin PLAYER(SPECIES_WOBBUFFET) { } OPPONENT(SPECIES_WOBBUFFET) { } } WHEN { - TURN { MOVE(player, MOVE_METEOR_ASSAULT); MOVE(opponent, MOVE_METEOR_ASSAULT);} + TURN { MOVE(player, MOVE_METEOR_ASSAULT); MOVE(opponent, MOVE_METEOR_ASSAULT); } } } diff --git a/test/battle/move_effect_secondary/remove_status.c b/test/battle/move_effect_secondary/remove_status.c index f1219d7ed0..02389a50ed 100644 --- a/test/battle/move_effect_secondary/remove_status.c +++ b/test/battle/move_effect_secondary/remove_status.c @@ -19,8 +19,7 @@ SINGLE_BATTLE_TEST("Smelling Salts does not cure paralyzed pokemons behind subst if (ability == ABILITY_INNER_FOCUS) { MESSAGE("The substitute took damage for the opposing Seismitoad!"); - NONE_OF - { + NONE_OF { MESSAGE("The opposing Seismitoad's substitute faded!"); // Smelling Salts does 86 damage, the sub has 122 HP, if hitting a sub it shouldn't get boosted damage. MESSAGE("The opposing Seismitoad was cured of paralysis!"); STATUS_ICON(opponent, none: TRUE); @@ -75,15 +74,17 @@ SINGLE_BATTLE_TEST("Wake-Up Slap does not cure paralyzed pokemons behind substit TURN { MOVE(opponent, MOVE_CELEBRATE); MOVE(player, MOVE_WAKE_UP_SLAP); } } SCENE { ANIMATION(ANIM_TYPE_MOVE, MOVE_WAKE_UP_SLAP, player); - if (ability == ABILITY_INNER_FOCUS) { + if (ability == ABILITY_INNER_FOCUS) + { MESSAGE("The substitute took damage for the opposing Seismitoad!"); - NONE_OF - { + NONE_OF { MESSAGE("The opposing Seismitoad's substitute faded!"); // Smelling Salts does 86 damage, the sub has 122 HP, if hitting a sub it shouldn't get boosted damage. MESSAGE("The opposing Seismitoad woke up!"); STATUS_ICON(opponent, none: TRUE); } - } else { + } + else + { MESSAGE("The opposing Seismitoad woke up!"); STATUS_ICON(opponent, none: TRUE); } @@ -104,9 +105,12 @@ SINGLE_BATTLE_TEST("Wake-Up Slap gets increased power against sleeping targets") TURN { MOVE(player, MOVE_WAKE_UP_SLAP); } } SCENE { ANIMATION(ANIM_TYPE_MOVE, MOVE_WAKE_UP_SLAP, player); - if (status1 == STATUS1_SLEEP) { + if (status1 == STATUS1_SLEEP) + { MESSAGE("The opposing Lotad fainted!"); - } else { + } + else + { NOT MESSAGE("The opposing Lotad fainted!"); MESSAGE("The opposing Lotad used Celebrate!"); } diff --git a/test/battle/move_effect_secondary/salt_cure.c b/test/battle/move_effect_secondary/salt_cure.c index e304d2d447..70ba855b95 100644 --- a/test/battle/move_effect_secondary/salt_cure.c +++ b/test/battle/move_effect_secondary/salt_cure.c @@ -32,8 +32,8 @@ SINGLE_BATTLE_TEST("Salt Cure inflicts 1/4 to Water/Steel types of their maximum { u32 species; - PARAMETRIZE { species = SPECIES_LAPRAS; }; - PARAMETRIZE { species = SPECIES_JIRACHI; }; + PARAMETRIZE { species = SPECIES_LAPRAS; } + PARAMETRIZE { species = SPECIES_JIRACHI; } GIVEN { PLAYER(SPECIES_WOBBUFFET); @@ -104,7 +104,7 @@ SINGLE_BATTLE_TEST("Salt Cure residual damage does not inflict any damage agains { GIVEN { PLAYER(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_CLEFABLE) { Ability(ABILITY_MAGIC_GUARD); }; + OPPONENT(SPECIES_CLEFABLE) { Ability(ABILITY_MAGIC_GUARD); } } WHEN { TURN { MOVE(player, MOVE_SALT_CURE); } } SCENE { diff --git a/test/battle/move_effect_secondary/throat_chop.c b/test/battle/move_effect_secondary/throat_chop.c index c2724a0f38..3d6438a4ba 100644 --- a/test/battle/move_effect_secondary/throat_chop.c +++ b/test/battle/move_effect_secondary/throat_chop.c @@ -9,8 +9,8 @@ ASSUMPTIONS SINGLE_BATTLE_TEST("Throat Chop prevents the usage of sound moves") { GIVEN { - PLAYER(SPECIES_WOBBUFFET) { Speed(100); }; - OPPONENT(SPECIES_WOBBUFFET) { Speed(50); }; + PLAYER(SPECIES_WOBBUFFET) { Speed(100); } + OPPONENT(SPECIES_WOBBUFFET) { Speed(50); } } WHEN { TURN { MOVE(player, MOVE_THROAT_CHOP); MOVE(opponent, MOVE_HYPER_VOICE); } TURN {} diff --git a/test/battle/move_effects_combined/infernal_parade.c b/test/battle/move_effects_combined/infernal_parade.c index 266718d2e9..4310dc8876 100644 --- a/test/battle/move_effects_combined/infernal_parade.c +++ b/test/battle/move_effects_combined/infernal_parade.c @@ -35,7 +35,7 @@ SINGLE_BATTLE_TEST("Infernal Parade's power doubles if the target has a status c PARAMETRIZE { status1 = STATUS1_TOXIC_POISON; } GIVEN { PLAYER(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_WOBBUFFET) { Status1(status1); }; + OPPONENT(SPECIES_WOBBUFFET) { Status1(status1); } } WHEN { TURN { MOVE(player, MOVE_INFERNAL_PARADE); } } SCENE { diff --git a/test/battle/move_flags/recoil.c b/test/battle/move_flags/recoil.c index 7a71187c82..2593a0e1f6 100644 --- a/test/battle/move_flags/recoil.c +++ b/test/battle/move_flags/recoil.c @@ -89,7 +89,7 @@ SINGLE_BATTLE_TEST("Recoil: Flare Blitz is absorbed by Flash Fire and no recoil GIVEN { ASSUME(GetMoveRecoil(MOVE_FLARE_BLITZ) > 0); PLAYER(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_VULPIX) { Ability(ABILITY_FLASH_FIRE); }; + OPPONENT(SPECIES_VULPIX) { Ability(ABILITY_FLASH_FIRE); } } WHEN { TURN { MOVE(opponent, MOVE_SCRATCH); MOVE(player, MOVE_FLARE_BLITZ); } } SCENE { @@ -111,7 +111,7 @@ SINGLE_BATTLE_TEST("Recoil: The correct amount of recoil damage is dealt after t GIVEN { ASSUME(GetMoveRecoil(MOVE_TAKE_DOWN) == 25); PLAYER(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_WOBBUFFET) { MaxHP(100); HP(51); Item(ITEM_SITRUS_BERRY); }; + OPPONENT(SPECIES_WOBBUFFET) { MaxHP(100); HP(51); Item(ITEM_SITRUS_BERRY); } } WHEN { TURN { MOVE(player, MOVE_TAKE_DOWN); } } SCENE { diff --git a/test/battle/sleep_clause.c b/test/battle/sleep_clause.c index 085bd05fda..14ee7f052f 100644 --- a/test/battle/sleep_clause.c +++ b/test/battle/sleep_clause.c @@ -286,7 +286,7 @@ SINGLE_BATTLE_TEST("Sleep Clause: Yawn will fail when sleep clause is active") OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(opponent, MOVE_YAWN); } - TURN { } + TURN {} TURN { SWITCH(player, 1); MOVE(opponent, MOVE_YAWN); } } SCENE { ANIMATION(ANIM_TYPE_MOVE, MOVE_YAWN, opponent); @@ -318,7 +318,7 @@ SINGLE_BATTLE_TEST("Sleep Clause: Effect Spore causes sleep 11% of the time with TURN { MOVE(opponent, MOVE_SPORE); } TURN { SWITCH(player, 1); } TURN { MOVE(player, MOVE_SCRATCH); } - TURN { } + TURN {} } SCENE { ABILITY_POPUP(opponent, ABILITY_EFFECT_SPORE); ANIMATION(ANIM_TYPE_STATUS, B_ANIM_STATUS_SLP, player); @@ -341,7 +341,7 @@ DOUBLE_BATTLE_TEST("Sleep Clause: Effect Spore causes sleep 11% of the time with OPPONENT(SPECIES_BRELOOM) { Ability(ABILITY_EFFECT_SPORE); } OPPONENT(SPECIES_BRELOOM) { Ability(ABILITY_EFFECT_SPORE); } } WHEN { - TURN { MOVE(opponentLeft, MOVE_SPORE, target:playerRight); MOVE(playerLeft, MOVE_SCRATCH, target:opponentLeft);} + TURN { MOVE(opponentLeft, MOVE_SPORE, target:playerRight); MOVE(playerLeft, MOVE_SCRATCH, target:opponentLeft); } } SCENE { ANIMATION(ANIM_TYPE_MOVE, MOVE_SPORE, opponentLeft); ANIMATION(ANIM_TYPE_STATUS, B_ANIM_STATUS_SLP, playerRight); @@ -1019,7 +1019,7 @@ DOUBLE_BATTLE_TEST("Sleep Clause: Sleep clause is deactivated when a sleeping mo OPPONENT(SPECIES_ZIGZAGOON); } WHEN { TURN { MOVE(playerLeft, MOVE_SPORE, target: opponentLeft); MOVE(playerRight, MOVE_SCRATCH, target: opponentLeft); } - TURN { MOVE(playerLeft, MOVE_SPORE, target: opponentRight);} + TURN { MOVE(playerLeft, MOVE_SPORE, target: opponentRight); } } SCENE { MESSAGE("Zigzagoon used Spore!"); ANIMATION(ANIM_TYPE_MOVE, MOVE_SPORE, playerLeft); @@ -1533,7 +1533,7 @@ DOUBLE_BATTLE_TEST("Sleep Clause: If both Pokémon on one side are Yawn'd at the OPPONENT(SPECIES_ZIGZAGOON) { Speed(2); } } WHEN { TURN { MOVE(playerLeft, MOVE_YAWN, target: opponentLeft); MOVE(playerRight, MOVE_YAWN, target: opponentRight); } - TURN { } + TURN {} } SCENE { MESSAGE("The opposing Zigzagoon grew drowsy!"); MESSAGE("The opposing Zigzagoon grew drowsy!"); diff --git a/test/battle/spread_moves.c b/test/battle/spread_moves.c index 68b9f40273..477af564c8 100644 --- a/test/battle/spread_moves.c +++ b/test/battle/spread_moves.c @@ -6,7 +6,7 @@ DOUBLE_BATTLE_TEST("Spread Moves: Ability and Item effects activate correctly af GIVEN { PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_LUM_BERRY); } PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_COVERT_CLOAK); } - OPPONENT(SPECIES_GOLISOPOD) { Ability(ABILITY_EMERGENCY_EXIT); MaxHP(260); HP(131); }; + OPPONENT(SPECIES_GOLISOPOD) { Ability(ABILITY_EMERGENCY_EXIT); MaxHP(260); HP(131); } OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_EJECT_BUTTON); } OPPONENT(SPECIES_WYNAUT); OPPONENT(SPECIES_PIKACHU); diff --git a/test/battle/starting_status/terrain.c b/test/battle/starting_status/terrain.c index 3d84dba000..7c4fd6d29e 100644 --- a/test/battle/starting_status/terrain.c +++ b/test/battle/starting_status/terrain.c @@ -21,13 +21,13 @@ SINGLE_BATTLE_TEST("B_VAR_STARTING_STATUS starts a chosen terrain at the beginni OPPONENT(SPECIES_WOBBUFFET); } WHEN { // More than 5 turns - TURN { ; } - TURN { ; } - TURN { ; } - TURN { ; } - TURN { ; } - TURN { ; } - TURN { ; } + TURN {} + TURN {} + TURN {} + TURN {} + TURN {} + TURN {} + TURN {} } SCENE { switch (terrain) { @@ -73,12 +73,12 @@ SINGLE_BATTLE_TEST("Terrain started after the one which started the battle lasts } WHEN { // More than 5 turns TURN { MOVE(player, viaMove == TRUE ? MOVE_GRASSY_TERRAIN : MOVE_CELEBRATE); } - TURN { ; } - TURN { ; } - TURN { ; } - TURN { ; } - TURN { ; } - TURN { ; } + TURN {} + TURN {} + TURN {} + TURN {} + TURN {} + TURN {} } SCENE { // Electric Terrain at battle's start MESSAGE("An electric current is running across the battlefield!"); diff --git a/test/battle/status1/freeze.c b/test/battle/status1/freeze.c index 12104438ac..89f0b91100 100644 --- a/test/battle/status1/freeze.c +++ b/test/battle/status1/freeze.c @@ -50,7 +50,7 @@ SINGLE_BATTLE_TEST("Freeze isn't thawed if opponent is asleep during thawing att GIVEN { ASSUME(GetMoveType(MOVE_EMBER) == TYPE_FIRE); PLAYER(SPECIES_WOBBUFFET) { Status1(STATUS1_FREEZE); } - OPPONENT(SPECIES_WOBBUFFET) { Status1(STATUS1_SLEEP); }; + OPPONENT(SPECIES_WOBBUFFET) { Status1(STATUS1_SLEEP); } } WHEN { TURN { MOVE(opponent, MOVE_EMBER); MOVE(player, MOVE_CELEBRATE); } } SCENE { diff --git a/test/battle/switch_in_abilities.c b/test/battle/switch_in_abilities.c index 4d125ddce8..1fc5e8a935 100644 --- a/test/battle/switch_in_abilities.c +++ b/test/battle/switch_in_abilities.c @@ -12,7 +12,7 @@ SINGLE_BATTLE_TEST("Switch-in abilities trigger in Speed Order at the battle's s PLAYER(SPECIES_EKANS) { Speed(spdPlayer); Ability(ABILITY_INTIMIDATE); } OPPONENT(SPECIES_NINETALES) { Speed(spdOpponent); Ability(ABILITY_DROUGHT); } } WHEN { - TURN { ; } + TURN {} } SCENE { if (spdPlayer > spdOpponent) { ABILITY_POPUP(player, ABILITY_INTIMIDATE); @@ -38,7 +38,7 @@ DOUBLE_BATTLE_TEST("Switch-in abilities trigger in Speed Order at the battle's s OPPONENT(SPECIES_PORYGON2) { Speed(spdOpponent1); Ability(ABILITY_DOWNLOAD); } OPPONENT(SPECIES_PINSIR) { Speed(spdOpponent2); Ability(ABILITY_MOLD_BREAKER); } } WHEN { - TURN { ; } + TURN {} } SCENE { if (spdPlayer1 == 5) { ABILITY_POPUP(playerLeft, ABILITY_DRIZZLE); @@ -73,7 +73,7 @@ SINGLE_BATTLE_TEST("Switch-in abilities trigger in Speed Order after post-KO swi OPPONENT(SPECIES_PORYGON2) { Speed(spdOpponent); Ability(ABILITY_DOWNLOAD); } } WHEN { TURN { MOVE(player, MOVE_EXPLOSION); SEND_OUT(player, 1); SEND_OUT(opponent, 1); } - TURN { ; } + TURN {} } SCENE { MESSAGE("Wobbuffet used Explosion!"); if (spdPlayer > spdOpponent) { @@ -105,7 +105,7 @@ DOUBLE_BATTLE_TEST("Switch-in abilities trigger in Speed Order after post-KO swi OPPONENT(SPECIES_VULPIX_ALOLA) { Speed(spdOpponent2); Ability(ABILITY_SNOW_WARNING); } } WHEN { TURN { MOVE(playerLeft, MOVE_EXPLOSION); SEND_OUT(playerLeft, 2); SEND_OUT(opponentLeft, 2); SEND_OUT(playerRight, 3); SEND_OUT(opponentRight, 3); } - TURN { ; } + TURN {} } SCENE { MESSAGE("Wobbuffet used Explosion!"); if (spdPlayer1 == 5) { @@ -146,7 +146,7 @@ MULTI_BATTLE_TEST("Switch-in abilities trigger in Speed Order after post-KO swit MULTI_OPPONENT_B(SPECIES_VULPIX_ALOLA) { Speed(spdOpponent2); Ability(ABILITY_SNOW_WARNING); } } WHEN { TURN { MOVE(playerLeft, MOVE_EXPLOSION); SEND_OUT(playerLeft, 1); SEND_OUT(opponentLeft, 1); SEND_OUT(playerRight, 4); SEND_OUT(opponentRight, 4); } - TURN { ; } + TURN {} } SCENE { MESSAGE("Wobbuffet used Explosion!"); if (spdPlayer1 == 5) { diff --git a/test/battle/test_runner_features.c b/test/battle/test_runner_features.c index 25a75f9ce5..d76740a08e 100644 --- a/test/battle/test_runner_features.c +++ b/test/battle/test_runner_features.c @@ -13,11 +13,11 @@ SINGLE_BATTLE_TEST("Forced abilities activate on switch-in") { GIVEN { PLAYER(SPECIES_ALAKAZAM); - PLAYER(SPECIES_KADABRA) { Ability(ABILITY_QUARK_DRIVE); SpAttack(400);} + PLAYER(SPECIES_KADABRA) { Ability(ABILITY_QUARK_DRIVE); SpAttack(400); } OPPONENT(SPECIES_ARON); - OPPONENT(SPECIES_ALAKAZAM) { Ability(ABILITY_ELECTRIC_SURGE); }; + OPPONENT(SPECIES_ALAKAZAM) { Ability(ABILITY_ELECTRIC_SURGE); } } WHEN { - TURN { SWITCH(player, 1); SWITCH(opponent, 1);} + TURN { SWITCH(player, 1); SWITCH(opponent, 1); } } SCENE { ABILITY_POPUP(opponent, ABILITY_ELECTRIC_SURGE); ABILITY_POPUP(player, ABILITY_QUARK_DRIVE); @@ -30,15 +30,15 @@ SINGLE_BATTLE_TEST("Setting level doesn't overwrite set stats") { u32 level = 0; - PARAMETRIZE{level = 1;} - PARAMETRIZE{level = 10;} - PARAMETRIZE{level = 50;} - PARAMETRIZE{level = 99;} + PARAMETRIZE { level = 1; } + PARAMETRIZE { level = 10; } + PARAMETRIZE { level = 50; } + PARAMETRIZE { level = 99; } GIVEN { - PLAYER(SPECIES_WOBBUFFET) {HP(5); MaxHP(10); Attack(10); Defense(10); Speed(10); SpAttack(10); SpDefense(10); Level(level); }; - OPPONENT(SPECIES_WOBBUFFET) {Speed(1);} + PLAYER(SPECIES_WOBBUFFET) { HP(5); MaxHP(10); Attack(10); Defense(10); Speed(10); SpAttack(10); SpDefense(10); Level(level); } + OPPONENT(SPECIES_WOBBUFFET) { Speed(1); } } WHEN { - TURN { MOVE(player, MOVE_CELEBRATE); MOVE(opponent, MOVE_CELEBRATE);} + TURN { MOVE(player, MOVE_CELEBRATE); MOVE(opponent, MOVE_CELEBRATE); } } THEN { EXPECT_EQ(player->hp, 5); EXPECT_EQ(player->maxHP, 10); @@ -53,8 +53,8 @@ SINGLE_BATTLE_TEST("Setting level doesn't overwrite set stats") SINGLE_BATTLE_TEST("Changing forms doesn't overwrite set stats (not HP)") { GIVEN { - PLAYER(SPECIES_DIANCIE) {Attack(10); Defense(10); Speed(10); SpAttack(10); SpDefense(10); Item(ITEM_DIANCITE);} - OPPONENT(SPECIES_WOBBUFFET) {Speed(1);} + PLAYER(SPECIES_DIANCIE) { Attack(10); Defense(10); Speed(10); SpAttack(10); SpDefense(10); Item(ITEM_DIANCITE); } + OPPONENT(SPECIES_WOBBUFFET) { Speed(1); } } WHEN { TURN { MOVE(player, MOVE_CELEBRATE, gimmick: GIMMICK_MEGA); } } SCENE { @@ -71,10 +71,10 @@ SINGLE_BATTLE_TEST("Changing forms doesn't overwrite set stats (not HP)") SINGLE_BATTLE_TEST("Changing forms doesn't overwrite set stats (HP)") { GIVEN { - PLAYER(SPECIES_TERAPAGOS) {HP(5); MaxHP(10); TeraType(TYPE_STELLAR);} - OPPONENT(SPECIES_WOBBUFFET) {} + PLAYER(SPECIES_TERAPAGOS) { HP(5); MaxHP(10); TeraType(TYPE_STELLAR); } + OPPONENT(SPECIES_WOBBUFFET); } WHEN { - TURN { MOVE(player, MOVE_CELEBRATE, gimmick: GIMMICK_TERA); MOVE(opponent, MOVE_CELEBRATE);} + TURN { MOVE(player, MOVE_CELEBRATE, gimmick: GIMMICK_TERA); MOVE(opponent, MOVE_CELEBRATE); } } THEN { EXPECT_EQ(player->hp, 5); EXPECT_EQ(player->maxHP, 10); diff --git a/test/battle/trainer_slides.c b/test/battle/trainer_slides.c index 972e359f87..8f7bae9b09 100644 --- a/test/battle/trainer_slides.c +++ b/test/battle/trainer_slides.c @@ -10,7 +10,7 @@ SINGLE_BATTLE_TEST("Trainer Slide: Before First Turn") PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { - TURN { } + TURN {} } SCENE { MESSAGE("This message plays before the first turn.{PAUSE_UNTIL_PRESS}"); } @@ -157,8 +157,8 @@ SINGLE_BATTLE_TEST("Trainer Slide: Last Low Hp") gBattleTestRunnerState->data.recordedBattle.opponentA = TRAINER_SLIDE_LAST_LOW_HP; GIVEN { ASSUME(GetMoveEffect(MOVE_FALSE_SWIPE) == EFFECT_FALSE_SWIPE); - PLAYER(SPECIES_WOBBUFFET) { Attack(999);} - OPPONENT(SPECIES_WOBBUFFET) { Defense(1);} + PLAYER(SPECIES_WOBBUFFET) { Attack(999); } + OPPONENT(SPECIES_WOBBUFFET) { Defense(1); } } WHEN { TURN { MOVE(player, MOVE_FALSE_SWIPE); } } SCENE { @@ -172,7 +172,7 @@ SINGLE_BATTLE_TEST("Trainer Slide: Mega Evolution") GIVEN { PLAYER(SPECIES_WOBBUFFET); - OPPONENT(SPECIES_LOPUNNY) {Item(ITEM_LOPUNNITE); }; + OPPONENT(SPECIES_LOPUNNY) { Item(ITEM_LOPUNNITE); } } WHEN { TURN { MOVE(opponent, MOVE_CELEBRATE, gimmick: GIMMICK_MEGA); } } SCENE { diff --git a/test/battle/volatiles/confusion.c b/test/battle/volatiles/confusion.c index 540abbd5a6..b9a1237955 100644 --- a/test/battle/volatiles/confusion.c +++ b/test/battle/volatiles/confusion.c @@ -12,8 +12,8 @@ SINGLE_BATTLE_TEST("Confusion adds a 50/33% chance to hit self with 40 power") GIVEN { WITH_CONFIG(CONFIG_CONFUSION_SELF_DMG_CHANCE, genConfig); ASSUME(GetMovePower(MOVE_SCRATCH) == 40); - PLAYER(SPECIES_WOBBUFFET) { Speed(1); }; - OPPONENT(SPECIES_WOBBUFFET) { Speed(2); }; + PLAYER(SPECIES_WOBBUFFET) { Speed(1); } + OPPONENT(SPECIES_WOBBUFFET) { Speed(2); } } WHEN { TURN { MOVE(opponent, MOVE_SCRATCH, WITH_RNG(RNG_DAMAGE_MODIFIER, 0)); MOVE(player, MOVE_CONFUSE_RAY); } TURN; @@ -39,7 +39,7 @@ SINGLE_BATTLE_TEST("Confusion self hit does not consume Gems") PASSES_RANDOMLY(pctChance, 100, RNG_CONFUSION); GIVEN { WITH_CONFIG(CONFIG_CONFUSION_SELF_DMG_CHANCE, genConfig); - PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_NORMAL_GEM); }; + PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_NORMAL_GEM); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { TURN { MOVE(opponent, MOVE_CONFUSE_RAY); MOVE(player, MOVE_SCRATCH); } diff --git a/test/battle/weather/hail.c b/test/battle/weather/hail.c index 3a0dd53026..c38370a891 100644 --- a/test/battle/weather/hail.c +++ b/test/battle/weather/hail.c @@ -18,7 +18,7 @@ SINGLE_BATTLE_TEST("Hail deals 1/16 damage per turn") PLAYER(SPECIES_GLALIE); OPPONENT(SPECIES_WOBBUFFET); } WHEN { - TURN {MOVE(player, MOVE_HAIL);} + TURN { MOVE(player, MOVE_HAIL); } } SCENE { MESSAGE("The opposing Wobbuffet is buffeted by the hail!"); HP_BAR(opponent, captureDamage: &hailDamage); @@ -32,7 +32,7 @@ SINGLE_BATTLE_TEST("Hail damage does not affect Ice-type Pokémon") PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_GLALIE); } WHEN { - TURN {MOVE(player, MOVE_HAIL);} + TURN { MOVE(player, MOVE_HAIL); } } SCENE { NOT MESSAGE("The opposing Glalie is buffeted by the hail!"); } diff --git a/test/battle/weather/sandstorm.c b/test/battle/weather/sandstorm.c index 78dc0ecdce..55b5907ffb 100644 --- a/test/battle/weather/sandstorm.c +++ b/test/battle/weather/sandstorm.c @@ -10,7 +10,7 @@ SINGLE_BATTLE_TEST("Sandstorm deals 1/16 damage per turn") PLAYER(SPECIES_SANDSLASH); OPPONENT(SPECIES_WOBBUFFET); } WHEN { - TURN {MOVE(player, MOVE_SANDSTORM);} + TURN { MOVE(player, MOVE_SANDSTORM); } } SCENE { MESSAGE("The opposing Wobbuffet is buffeted by the sandstorm!"); HP_BAR(opponent, captureDamage: &sandstormDamage);