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

kings rock Gen_X configs

Browse Source
This commit is contained in:
amiosi 2021-02-08 17:04:33 -05:00
parent eb56488b81
commit 038bf42b51
1 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/data/battle_moves.h
View File

@ -420,6 +420,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
[MOVE_ROLLING_KICK] = [MOVE_ROLLING_KICK] =
{ {
#if B_UPDATED_MOVE_DATA >= GEN_5
.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST,
#else
.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_SHEER_FORCE_BOOST,
#endif
.effect = EFFECT_FLINCH_HIT, .effect = EFFECT_FLINCH_HIT,
.power = 60, .power = 60,
.type = TYPE_FIGHTING, .type = TYPE_FIGHTING,
@ -428,7 +433,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.secondaryEffectChance = 30, .secondaryEffectChance = 30,
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
.priority = 0, .priority = 0,
.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST,
.split = SPLIT_PHYSICAL, .split = SPLIT_PHYSICAL,
}, },
@ -2242,6 +2246,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
[MOVE_SKY_ATTACK] = [MOVE_SKY_ATTACK] =
{ {
#if B_UPDATED_MOVE_DATA >= GEN_5
.flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST,
#else
.flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_SHEER_FORCE_BOOST,
#endif
.effect = EFFECT_TWO_TURNS_ATTACK, .effect = EFFECT_TWO_TURNS_ATTACK,
.power = 140, .power = 140,
.type = TYPE_FLYING, .type = TYPE_FLYING,
@ -2250,7 +2259,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.secondaryEffectChance = 30, .secondaryEffectChance = 30,
.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_PHYSICAL, .split = SPLIT_PHYSICAL,
.argument = MOVE_EFFECT_FLINCH, .argument = MOVE_EFFECT_FLINCH,
}, },
@ -6622,6 +6631,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
[MOVE_THUNDER_FANG] = [MOVE_THUNDER_FANG] =
{ {
#if B_UPDATED_MOVE_DATA >= GEN_5
.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST | FLAG_STRONG_JAW_BOOST,
#else
.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_SHEER_FORCE_BOOST | FLAG_STRONG_JAW_BOOST,
#endif
.effect = EFFECT_FLINCH_STATUS, .effect = EFFECT_FLINCH_STATUS,
.power = 65, .power = 65,
.type = TYPE_ELECTRIC, .type = TYPE_ELECTRIC,
@ -6630,13 +6644,17 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.secondaryEffectChance = 10, .secondaryEffectChance = 10,
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
.priority = 0, .priority = 0,
.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST | FLAG_STRONG_JAW_BOOST,
.split = SPLIT_PHYSICAL, .split = SPLIT_PHYSICAL,
.argument = STATUS1_PARALYSIS, .argument = STATUS1_PARALYSIS,
}, },
[MOVE_ICE_FANG] = [MOVE_ICE_FANG] =
{ {
#if B_UPDATED_MOVE_DATA >= GEN_5
.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST | FLAG_STRONG_JAW_BOOST,
#else
.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_SHEER_FORCE_BOOST | FLAG_STRONG_JAW_BOOST,
#endif
.effect = EFFECT_FLINCH_STATUS, .effect = EFFECT_FLINCH_STATUS,
.power = 65, .power = 65,
.type = TYPE_ICE, .type = TYPE_ICE,
@ -6645,13 +6663,17 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.secondaryEffectChance = 10, .secondaryEffectChance = 10,
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
.priority = 0, .priority = 0,
.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST | FLAG_STRONG_JAW_BOOST,
.split = SPLIT_PHYSICAL, .split = SPLIT_PHYSICAL,
.argument = STATUS1_FREEZE, .argument = STATUS1_FREEZE,
}, },
[MOVE_FIRE_FANG] = [MOVE_FIRE_FANG] =
{ {
#if B_UPDATED_MOVE_DATA >= GEN_5
.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST | FLAG_STRONG_JAW_BOOST,
#else
.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_SHEER_FORCE_BOOST | FLAG_STRONG_JAW_BOOST,
#endif
.effect = EFFECT_FLINCH_STATUS, .effect = EFFECT_FLINCH_STATUS,
.power = 65, .power = 65,
.type = TYPE_FIRE, .type = TYPE_FIRE,
@ -6660,7 +6682,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.secondaryEffectChance = 10, .secondaryEffectChance = 10,
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
.priority = 0, .priority = 0,
.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST | FLAG_STRONG_JAW_BOOST,
.split = SPLIT_PHYSICAL, .split = SPLIT_PHYSICAL,
.argument = STATUS1_BURN, .argument = STATUS1_BURN,
}, },