Added data for Plasma Fists, Photon Geyser and Double Iron Bash (#348)

This commit is contained in:
LOuroboros 2020-04-21 15:09:28 -03:00 committed by GitHub
parent b1afb96a02
commit f8f61c10ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 64 additions and 1 deletions

View File

@ -691,8 +691,11 @@
#define MOVE_NATURES_MADNESS 671
#define MOVE_MULTI_ATTACK 672
#define MOVE_MIND_BLOWN 673
#define MOVE_PLASMA_FISTS 674
#define MOVE_PHOTON_GEYSER 675
#define MOVE_DOUBLE_IRON_BASH 676
#define MOVES_COUNT_GEN7 674
#define MOVES_COUNT_GEN7 677
#define MOVES_COUNT MOVES_COUNT_GEN7

View File

@ -9457,4 +9457,46 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED,
.split = SPLIT_PHYSICAL,
},
[MOVE_PLASMA_FISTS] =
{
.effect = EFFECT_PLACEHOLDER, // Needs a custom move effect
.power = 100,
.type = TYPE_ELECTRIC,
.accuracy = 100,
.pp = 15,
.secondaryEffectChance = 0,
.target = MOVE_TARGET_FOES_AND_ALLY,
.priority = 0,
.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED,
.split = SPLIT_PHYSICAL,
},
[MOVE_PHOTON_GEYSER] =
{
.effect = EFFECT_PLACEHOLDER, // Needs a custom move effect
.power = 100,
.type = TYPE_PSYCHIC,
.accuracy = 100,
.pp = 5,
.secondaryEffectChance = 0,
.target = MOVE_TARGET_FOES_AND_ALLY,
.priority = 0,
.flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED,
.split = SPLIT_SPECIAL,
},
[MOVE_DOUBLE_IRON_BASH] =
{
.effect = EFFECT_FLINCH_HIT,
.power = 60,
.type = TYPE_STEEL,
.accuracy = 100,
.pp = 5,
.secondaryEffectChance = 30,
.target = MOVE_TARGET_FOES_AND_ALLY,
.priority = 0,
.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED,
.split = SPLIT_PHYSICAL,
},
};

View File

@ -2613,6 +2613,18 @@ static const u8 sMIND_BLOWNDescription[] = _(
"It explodes the user's head\n"
"to damage everything around.");
static const u8 sPLASMA_FISTSDescription[] = _(
"Hits with electrical fists.\n"
"Normal moves become Electric.");
static const u8 sPHOTON_GEYSERDescription[] = _(
"The foe's highest offensive\n"
"determines its category.");
static const u8 sDOUBLE_IRON_BASHDescription[] = _(
"The user spins and hits with\n"
"its arms. May cause flinch.");
static const u8 sNotDoneYetDescription[] = _(
"Not done yet.");
@ -3293,4 +3305,7 @@ const u8 *const gMoveDescriptionPointers[MOVES_COUNT - 1] =
[MOVE_NATURES_MADNESS - 1] = sNATURES_MADNESSDescription,
[MOVE_MULTI_ATTACK - 1] = sMULTI_ATTACKDescription,
[MOVE_MIND_BLOWN - 1] = sMIND_BLOWNDescription,
[MOVE_PLASMA_FISTS - 1] = sPLASMA_FISTSDescription,
[MOVE_PHOTON_GEYSER - 1] = sPHOTON_GEYSERDescription,
[MOVE_DOUBLE_IRON_BASH - 1] = sDOUBLE_IRON_BASHDescription,
};

View File

@ -674,4 +674,7 @@ const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1] =
[MOVE_NATURES_MADNESS] = _("Nature's Mad"),
[MOVE_MULTI_ATTACK] = _("Multi-Attack"),
[MOVE_MIND_BLOWN] = _("Mind Blown"),
[MOVE_PLASMA_FISTS] = _("Plasma Fists"),
[MOVE_PHOTON_GEYSER] = _("PhotonGeyser"),
[MOVE_DOUBLE_IRON_BASH] = _("D. Iron Bash"),
};