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

Prepare FLAG_SLICING_MOVE for merger with abilities branch

Browse Source
This commit is contained in:
Bassoonian 2022-11-18 22:37:31 +01:00
parent 4034f18c0e
commit 4da9ecbcea
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/data/battle_moves.h
View File

@ -13863,12 +13863,11 @@ 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_SLICING_MOVE,
.split = SPLIT_PHYSICAL, .split = SPLIT_PHYSICAL,
.zMovePower = 40, .zMovePower = 40,
.zMoveEffect = Z_EFFECT_NONE, .zMoveEffect = Z_EFFECT_NONE,
//Supposedly uncallable by Metronome? (if so, needs implementation) //Supposedly uncallable by Metronome? (if so, needs implementation)
//The master sheet mentions a "slicing" flag but I'm not sure what it refers to
}, },
[MOVE_ICE_SPINNER] = [MOVE_ICE_SPINNER] =
@ -14014,11 +14013,10 @@ 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 | FLAG_KINGS_ROCK_AFFECTED, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, // | FLAG_SLICING_MOVE,
.split = SPLIT_PHYSICAL, .split = SPLIT_PHYSICAL,
.zMovePower = 160, .zMovePower = 160,
.zMoveEffect = Z_EFFECT_NONE, .zMoveEffect = Z_EFFECT_NONE,
// Needs a "slicing" flag (not sure what it refers to)
}, },
[MOVE_FLOWER_TRICK] = [MOVE_FLOWER_TRICK] =
@ -14346,11 +14344,10 @@ 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 | FLAG_KINGS_ROCK_AFFECTED, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, // | FLAG_SLICING_MOVE,
.split = SPLIT_PHYSICAL, .split = SPLIT_PHYSICAL,
.zMovePower = 160, .zMovePower = 160,
.zMoveEffect = Z_EFFECT_NONE, .zMoveEffect = Z_EFFECT_NONE,
// Needs the "slicing" flag
}, },
[MOVE_DOUBLE_SHOCK] = [MOVE_DOUBLE_SHOCK] =
@ -14410,11 +14407,10 @@ 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 | FLAG_KINGS_ROCK_AFFECTED | FLAG_HIGH_CRIT, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_HIGH_CRIT, // | FLAG_SLICING_MOVE,
.split = SPLIT_PHYSICAL, .split = SPLIT_PHYSICAL,
.zMovePower = 140, .zMovePower = 140,
.zMoveEffect = Z_EFFECT_NONE, .zMoveEffect = Z_EFFECT_NONE,
// Needs the "slicing" flag
}, },
[MOVE_BLAZING_TORQUE] = [MOVE_BLAZING_TORQUE] =