ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-21 11:43:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated to use internal Gen 8 move data.

Browse Source
This commit is contained in:
Eduardo Quezada D'Ottone 2020-11-09 13:34:38 -03:00
parent cb53c91b07
commit 9eea1cc296
1 changed files with 65 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
src/data/battle_moves.h
View File

@ -10318,6 +10318,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
[MOVE_ZIPPY_ZAP] =
{
#if B_UPDATED_MOVE_DATA >= GEN_8
.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED,
#else
.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED,
#endif
.effect = EFFECT_ALWAYS_CRIT,
.power = 50,
.type = TYPE_ELECTRIC,
@ -10326,12 +10331,16 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED,
.priority = 2,
.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED,
.split = SPLIT_PHYSICAL,
},
[MOVE_SPLISHY_SPLASH] =
{
#if B_UPDATED_MOVE_DATA >= GEN_8
.flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED,
#else
.flags = FLAG_PROTECT_AFFECTED,
#endif
.effect = EFFECT_PARALYZE_HIT,
.power = 90,
.type = TYPE_WATER,
@ -10340,12 +10349,16 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.secondaryEffectChance = 30,
.target = MOVE_TARGET_BOTH,
.priority = 0,
.flags = FLAG_PROTECT_AFFECTED,
.split = SPLIT_SPECIAL,
},
[MOVE_FLOATY_FALL] =
{
#if B_UPDATED_MOVE_DATA >= GEN_8
.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED,
#else
.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED,
#endif
.effect = EFFECT_FLINCH_HIT,
.power = 90,
.type = TYPE_FLYING,
@ -10354,12 +10367,16 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.secondaryEffectChance = 30,
.target = MOVE_TARGET_SELECTED,
.priority = 0,
.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED,
.split = SPLIT_PHYSICAL,
},
[MOVE_PIKA_PAPOW] =
{
#if B_UPDATED_MOVE_DATA >= GEN_8
.flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED,
#else
.flags = FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED,
#endif
.effect = EFFECT_RETURN,
.power = 1,
.type = TYPE_ELECTRIC,
@ -10368,12 +10385,16 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED,
.priority = 0,
.flags = FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED,
.split = SPLIT_SPECIAL,
},
[MOVE_BOUNCY_BUBBLE] =
{
#if B_UPDATED_MOVE_DATA >= GEN_8
.flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED,
#else
.flags = FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED,
#endif
.effect = EFFECT_ABSORB,
.power = 90,
.type = TYPE_WATER,
@ -10382,12 +10403,16 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.secondaryEffectChance = 0,
.target = MOVE_TARGET_BOTH,
.priority = 0,
.flags = FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED,
.split = SPLIT_SPECIAL,
},
[MOVE_BUZZY_BUZZ] =
{
#if B_UPDATED_MOVE_DATA >= GEN_8
.flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED,
#else
.flags = FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED,
#endif
.effect = EFFECT_PARALYZE_HIT,
.power = 90,
.type = TYPE_ELECTRIC,
@ -10396,12 +10421,16 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.secondaryEffectChance = 100,
.target = MOVE_TARGET_SELECTED,
.priority = 0,
.flags = FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED,
.split = SPLIT_SPECIAL,
},
[MOVE_SIZZLY_SLIDE] =
{
#if B_UPDATED_MOVE_DATA >= GEN_8
.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED,
#else
.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED,
#endif
.effect = EFFECT_BURN_HIT,
.power = 90,
.type = TYPE_FIRE,
@ -10410,12 +10439,16 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.secondaryEffectChance = 100,
.target = MOVE_TARGET_SELECTED,
.priority = 0,
.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED,
.split = SPLIT_PHYSICAL,
},
[MOVE_GLITZY_GLOW] =
{
#if B_UPDATED_MOVE_DATA >= GEN_8
.flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED,
#else
.flags = FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED,
#endif
.effect = EFFECT_PLACEHOLDER, //TODO (Light Screen + Hit)
.power = 90,
.type = TYPE_PSYCHIC,
@ -10424,12 +10457,16 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED,
.priority = 0,
.flags = FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED,
.split = SPLIT_SPECIAL,
},
[MOVE_BADDY_BAD] =
{
#if B_UPDATED_MOVE_DATA >= GEN_8
.flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED,
#else
.flags = FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED,
#endif
.effect = EFFECT_PLACEHOLDER, //TODO (Reflect + Hit)
.power = 90,
.type = TYPE_DARK,
@ -10438,12 +10475,16 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED,
.priority = 0,
.flags = FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED,
.split = SPLIT_SPECIAL,
},
[MOVE_SAPPY_SEED] =
{
#if B_UPDATED_MOVE_DATA >= GEN_8
.flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED,
#else
.flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED,
#endif
.effect = EFFECT_PLACEHOLDER, //TODO (Leech Seed + Hit)
.power = 90,
.type = TYPE_GRASS,
@ -10452,12 +10493,16 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED,
.priority = 0,
.flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED,
.split = SPLIT_PHYSICAL,
},
[MOVE_FREEZY_FROST] =
{
#if B_UPDATED_MOVE_DATA >= GEN_8
.flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED,
#else
.flags = FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED,
#endif
.effect = EFFECT_PLACEHOLDER, //TODO (Haze + Hit)
.power = 90,
.type = TYPE_ICE,
@ -10466,12 +10511,16 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED,
.priority = 0,
.flags = FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED,
.split = SPLIT_SPECIAL,
},
[MOVE_SPARKLY_SWIRL] =
{
#if B_UPDATED_MOVE_DATA >= GEN_8
.flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED,
#else
.flags = FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED,
#endif
.effect = EFFECT_PLACEHOLDER, //TODO (Heal Bell + Hit)
.power = 90,
.type = TYPE_FAIRY,
@ -10480,12 +10529,16 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED,
.priority = 0,
.flags = FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED,
.split = SPLIT_SPECIAL,
},
[MOVE_VEEVEE_VOLLEY] =
{
#if B_UPDATED_MOVE_DATA >= GEN_8
.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED,
#else
.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED,
#endif
.effect = EFFECT_RETURN,
.power = 1,
.type = TYPE_NORMAL,
@ -10494,7 +10547,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED,
.priority = 0,
.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED,
.split = SPLIT_PHYSICAL,
},