ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-03-06 07:27:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1671 from AsparagusEduardo/scaldThawConfig

Browse Source 
Scald thaw flag config for Gen 5
This commit is contained in:
ghoulslash 2021-09-22 09:01:11 -06:00 committed by GitHub
commit c5eeab88dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/data/battle_moves.h
View File

@ -7935,6 +7935,11 @@ 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,
@ -7943,7 +7948,6 @@ 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,
},