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

fix battle move data

Browse source
This commit is contained in:
ghoulslash 2021-04-02 09:08:08 -06:00
parent d89e2c1775
commit 5636706386
1 changed files with 30 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
src/data/battle_moves.h
View file

@ -946,6 +946,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] =
.secondaryEffectChance = 10, .secondaryEffectChance = 10,
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
.priority = 0, .priority = 0,
.flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST,
.split = SPLIT_SPECIAL,
.zMovePower = 175, .zMovePower = 175,
.zMoveEffect = Z_EFFECT_NONE, .zMoveEffect = Z_EFFECT_NONE,
}, },
@ -1769,7 +1771,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] =
.pp = 20, .pp = 20,
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
.target = MOVE_TARGET_USER, .target = MOVE_TARGET_USER,
.priority = 0, .priority = -6,
.flags = 0, .flags = 0,
.split = SPLIT_STATUS, .split = SPLIT_STATUS,
.zMovePower = 0, .zMovePower = 0,
@ -1797,7 +1799,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] =
.effect = EFFECT_MIMIC, .effect = EFFECT_MIMIC,
.power = 0, .power = 0,
.type = TYPE_NORMAL, .type = TYPE_NORMAL,
.accuracy = 100, .accuracy = 0,
.pp = 10, .pp = 10,
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
@ -2361,6 +2363,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] =
.pp = 15, .pp = 15,
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
.priority = 0,
.split = SPLIT_STATUS,
.zMovePower = 0, .zMovePower = 0,
.zMoveEffect = Z_EFFECT_EVSN_UP_1, .zMoveEffect = Z_EFFECT_EVSN_UP_1,
}, },
@ -3228,7 +3232,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] =
.pp = 10, .pp = 10,
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
.target = MOVE_TARGET_USER, .target = MOVE_TARGET_USER,
.priority = 3, .priority = 4,
.flags = FLAG_PROTECTION_MOVE, .flags = FLAG_PROTECTION_MOVE,
.split = SPLIT_STATUS, .split = SPLIT_STATUS,
.zMovePower = 0, .zMovePower = 0,
@ -3496,7 +3500,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] =
.pp = 5, .pp = 5,
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
.target = MOVE_TARGET_USER, .target = MOVE_TARGET_USER,
.priority = 3, .priority = 4,
.flags = FLAG_PROTECTION_MOVE, .flags = FLAG_PROTECTION_MOVE,
.split = SPLIT_STATUS, .split = SPLIT_STATUS,
.zMovePower = 0, .zMovePower = 0,
@ -3616,7 +3620,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] =
.pp = 10, .pp = 10,
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
.target = MOVE_TARGET_USER, .target = MOVE_TARGET_USER,
.priority = 3, .priority = 4,
.flags = FLAG_PROTECTION_MOVE, .flags = FLAG_PROTECTION_MOVE,
.split = SPLIT_STATUS, .split = SPLIT_STATUS,
.zMovePower = 0, .zMovePower = 0,
@ -3924,7 +3928,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] =
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
.priority = 0, .priority = 0,
.flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST,
.split = SPLIT_SPECIAL, .split = SPLIT_PHYSICAL,
.zMovePower = 180, .zMovePower = 180,
.zMoveEffect = Z_EFFECT_NONE, .zMoveEffect = Z_EFFECT_NONE,
}, },
@ -4118,7 +4122,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] =
.effect = EFFECT_VITAL_THROW, .effect = EFFECT_VITAL_THROW,
.power = 70, .power = 70,
.type = TYPE_FIGHTING, .type = TYPE_FIGHTING,
.accuracy = 100, .accuracy = 0,
.pp = 10, .pp = 10,
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
@ -4239,7 +4243,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] =
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
.target = MOVE_TARGET_USER, .target = MOVE_TARGET_USER,
.priority = 0, .priority = 0,
.flags = FLAG_DANCE, .flags = 0,
.split = SPLIT_STATUS, .split = SPLIT_STATUS,
.zMovePower = 0, .zMovePower = 0,
.zMoveEffect = Z_EFFECT_SPD_UP_1, .zMoveEffect = Z_EFFECT_SPD_UP_1,
@ -4730,7 +4734,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] =
.pp = 20, .pp = 20,
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
.target = MOVE_TARGET_USER, .target = MOVE_TARGET_USER,
.priority = 3, .priority = 2,
.flags = 0, .flags = 0,
.split = SPLIT_STATUS, .split = SPLIT_STATUS,
.zMovePower = 0, .zMovePower = 0,
@ -4783,6 +4787,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] =
.pp = 20, .pp = 20,
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
.priority = 0,
.split = SPLIT_STATUS,
.zMovePower = 0, .zMovePower = 0,
.zMoveEffect = Z_EFFECT_ATK_UP_1, .zMoveEffect = Z_EFFECT_ATK_UP_1,
}, },
@ -4828,7 +4834,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] =
.effect = EFFECT_ROLE_PLAY, .effect = EFFECT_ROLE_PLAY,
.power = 0, .power = 0,
.type = TYPE_PSYCHIC, .type = TYPE_PSYCHIC,
.accuracy = 100, .accuracy = 0,
.pp = 10, .pp = 10,
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
@ -4853,6 +4859,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] =
.pp = 10, .pp = 10,
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
.target = MOVE_TARGET_USER, .target = MOVE_TARGET_USER,
.priority = 0,
.split = SPLIT_STATUS,
.zMovePower = 0, .zMovePower = 0,
.zMoveEffect = Z_EFFECT_SPDEF_UP_1, .zMoveEffect = Z_EFFECT_SPDEF_UP_1,
}, },
@ -4978,7 +4986,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] =
.effect = EFFECT_YAWN, .effect = EFFECT_YAWN,
.power = 0, .power = 0,
.type = TYPE_NORMAL, .type = TYPE_NORMAL,
.accuracy = 100, .accuracy = 0,
.pp = 10, .pp = 10,
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
@ -5046,7 +5054,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] =
.effect = EFFECT_SKILL_SWAP, .effect = EFFECT_SKILL_SWAP,
.power = 0, .power = 0,
.type = TYPE_PSYCHIC, .type = TYPE_PSYCHIC,
.accuracy = 100, .accuracy = 0,
.pp = 10, .pp = 10,
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
@ -5948,7 +5956,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] =
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
.target = MOVE_TARGET_USER, .target = MOVE_TARGET_USER,
.priority = 0, .priority = 0,
.flags = FLAG_SNATCH_AFFECTED, .flags = FLAG_SNATCH_AFFECTED | FLAG_SOUND,
.split = SPLIT_STATUS, .split = SPLIT_STATUS,
.zMovePower = 0, .zMovePower = 0,
.zMoveEffect = Z_EFFECT_ATK_UP_1, .zMoveEffect = Z_EFFECT_ATK_UP_1,
@ -7910,7 +7918,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] =
[MOVE_JUDGMENT] = [MOVE_JUDGMENT] =
{ {
.effect = EFFECT_HIT, .effect = EFFECT_CHANGE_TYPE_ON_ITEM,
.power = 100, .power = 100,
.type = TYPE_NORMAL, .type = TYPE_NORMAL,
.accuracy = 100, .accuracy = 100,
@ -7920,6 +7928,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] =
.priority = 0, .priority = 0,
.flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED,
.split = SPLIT_SPECIAL, .split = SPLIT_SPECIAL,
.argument = HOLD_EFFECT_PLATE,
.zMovePower = 180, .zMovePower = 180,
.zMoveEffect = Z_EFFECT_NONE, .zMoveEffect = Z_EFFECT_NONE,
}, },
@ -8351,7 +8360,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] =
[MOVE_AUTOTOMIZE] = [MOVE_AUTOTOMIZE] =
{ {
.effect = EFFECT_HIT, .effect = EFFECT_AUTOTOMIZE,
.power = 0, .power = 0,
.type = TYPE_STEEL, .type = TYPE_STEEL,
.accuracy = 0, .accuracy = 0,
@ -10812,7 +10821,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] =
{ {
.effect = EFFECT_PLACEHOLDER, .effect = EFFECT_PLACEHOLDER,
.power = 0, .power = 0,
.type = TYPE_MYSTERY, .type = TYPE_DARK,
.accuracy = 0, .accuracy = 0,
.pp = 0, .pp = 0,
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
@ -10929,7 +10938,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] =
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
.priority = 0, .priority = 0,
.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_IRON_FIST_BOOST,
.split = SPLIT_PHYSICAL, .split = SPLIT_PHYSICAL,
.zMovePower = 180, .zMovePower = 180,
.zMoveEffect = Z_EFFECT_NONE, .zMoveEffect = Z_EFFECT_NONE,
@ -11034,10 +11043,10 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] =
[MOVE_TOXIC_THREAD] = [MOVE_TOXIC_THREAD] =
{ {
.effect = EFFECT_TOXIC_THREAD, .effect = EFFECT_TOXIC_THREAD,
.power = 20, .power = 0,
.type = TYPE_POISON, .type = TYPE_POISON,
.accuracy = 100, .accuracy = 100,
.pp = 0, .pp = 20,
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
.priority = 0, .priority = 0,
@ -11329,7 +11338,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] =
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
.priority = -3, .priority = -3,
.flags = FLAG_PROTECT_AFFECTED, .flags = FLAG_PROTECT_AFFECTED | FLAG_BALLISTIC,
.split = SPLIT_PHYSICAL, .split = SPLIT_PHYSICAL,
.zMovePower = 180, .zMovePower = 180,
.zMoveEffect = Z_EFFECT_NONE, .zMoveEffect = Z_EFFECT_NONE,
@ -11961,7 +11970,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] =
.accuracy = 100, .accuracy = 100,
.pp = 5, .pp = 5,
.secondaryEffectChance = 30, .secondaryEffectChance = 30,
.target = MOVE_TARGET_FOES_AND_ALLY, .target = MOVE_TARGET_SELECTED,
.priority = 0, .priority = 0,
.split = SPLIT_PHYSICAL, .split = SPLIT_PHYSICAL,
.zMovePower = 120, .zMovePower = 120,