Merge branch 'battle_engine_v2' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2

This commit is contained in:
DizzyEggg 2019-05-20 09:14:32 +02:00
commit 88bbdc494b

View File

@ -1061,7 +1061,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.target = MOVE_TARGET_BOTH,
.priority = 0,
.flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED | FLAG_HIGH_CRIT,
.split = SPLIT_SPECIAL,
.split = SPLIT_PHYSICAL,
},
[MOVE_SOLAR_BEAM] =