ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-18 09:24:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Scald thaw flag config for Gen 5"

Browse Source
This commit is contained in:
Eduardo Quezada D'Ottone 2021-09-22 12:31:23 -03:00 committed by GitHub
parent fb17176a26
commit 707d49242e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/data/battle_moves.h
View File

@ -7935,11 +7935,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
[MOVE_SCALD] = [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, .effect = EFFECT_SCALD,
.power = 80, .power = 80,
.type = TYPE_WATER, .type = TYPE_WATER,
@ -7948,6 +7943,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.secondaryEffectChance = 30, .secondaryEffectChance = 30,
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
.priority = 0, .priority = 0,
.flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_SHEER_FORCE_BOOST | FLAG_THAW_USER,
.split = SPLIT_SPECIAL, .split = SPLIT_SPECIAL,
}, },