From 707d49242e8f733f5bc797b219364cdc9d73b394 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada D'Ottone Date: Wed, 22 Sep 2021 12:31:23 -0300 Subject: [PATCH] Revert "Scald thaw flag config for Gen 5" --- src/data/battle_moves.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index 0fc3b3e429..657341b5ef 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -7935,11 +7935,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = [MOVE_SCALD] = { - #if B_UPDATED_MOVE_DATA >= GEN_6 - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_SHEER_FORCE_BOOST | FLAG_THAW_USER, - #else - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_SHEER_FORCE_BOOST, - #endif .effect = EFFECT_SCALD, .power = 80, .type = TYPE_WATER, @@ -7948,6 +7943,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_SHEER_FORCE_BOOST | FLAG_THAW_USER, .split = SPLIT_SPECIAL, },