atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update battle_moves.h

Browse source
This commit is contained in:
amiosi 2021-01-29 18:07:36 -05:00
parent 00085d9d90
commit ae2b8be147
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/data/battle_moves.h
View file

@ -7296,9 +7296,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
[MOVE_SHADOW_FORCE] = [MOVE_SHADOW_FORCE] =
{ {
#if B_UPDATED_MOVE_DATA == GEN_6 #if B_UPDATED_MOVE_DATA == GEN_6
.flags = FLAG_MAKES_CONTACT | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED | FLAG_DMG_MINIMIZE, .flags = FLAG_MAKES_CONTACT | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_DMG_MINIMIZE,
#else #else
.flags = FLAG_MAKES_CONTACT | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, .flags = FLAG_MAKES_CONTACT | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED,
#endif #endif
.effect = EFFECT_SEMI_INVULNERABLE, .effect = EFFECT_SEMI_INVULNERABLE,
.power = 120, .power = 120,
@ -7555,9 +7555,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
[MOVE_HEAVY_SLAM] = [MOVE_HEAVY_SLAM] =
{ {
#if B_UPDATED_MOVE_DATA >= GEN_7 #if B_UPDATED_MOVE_DATA >= GEN_7
.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED | FLAG_DMG_MINIMIZE, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_DMG_MINIMIZE,
#else #else
.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED,
#endif #endif
.effect = EFFECT_HEAT_CRASH, .effect = EFFECT_HEAT_CRASH,
.power = 1, .power = 1,
@ -8323,9 +8323,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
[MOVE_HEAT_CRASH] = [MOVE_HEAT_CRASH] =
{ {
#if B_UPDATED_MOVE_DATA >= GEN_6 #if B_UPDATED_MOVE_DATA >= GEN_6
.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED | FLAG_DMG_MINIMIZE, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_DMG_MINIMIZE,
#else #else
.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED,
#endif #endif
.effect = EFFECT_HEAT_CRASH, .effect = EFFECT_HEAT_CRASH,
.power = 1, .power = 1,
@ -8782,9 +8782,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
[MOVE_PHANTOM_FORCE] = [MOVE_PHANTOM_FORCE] =
{ {
#if B_UPDATED_MOVE_DATA == GEN_6 #if B_UPDATED_MOVE_DATA == GEN_6
.flags = FLAG_MAKES_CONTACT | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED | FLAG_DMG_MINIMIZE, .flags = FLAG_MAKES_CONTACT | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_DMG_MINIMIZE,
#else #else
.flags = FLAG_MAKES_CONTACT | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, .flags = FLAG_MAKES_CONTACT | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED,
#endif #endif
.effect = EFFECT_SEMI_INVULNERABLE, .effect = EFFECT_SEMI_INVULNERABLE,
.power = 90, .power = 90,