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

Merge pull request #30 from Kurausukun/battle_engine_v2

Browse Source 
Fix Aurora Veil's name, update Gen 1-3 moves to be consistent with Gen 7
This commit is contained in:
DizzyEggg 2018-11-18 20:51:16 +01:00 committed by GitHub
commit b0c78065e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 101 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

200
src/data/battle_moves.h
View File

@ -233,7 +233,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
}, },
{ // MOVE_FLY { // MOVE_FLY
.effect = EFFECT_SEMI_INVULNERABLE, .effect = EFFECT_SEMI_INVULNERABLE,
.power = 70, .power = 90,
.type = TYPE_FLYING, .type = TYPE_FLYING,
.accuracy = 95, .accuracy = 95,
.pp = 15, .pp = 15,
@ -269,10 +269,10 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
}, },
{ // MOVE_VINE_WHIP { // MOVE_VINE_WHIP
.effect = EFFECT_HIT, .effect = EFFECT_HIT,
.power = 35, .power = 45,
.type = TYPE_GRASS, .type = TYPE_GRASS,
.accuracy = 100, .accuracy = 100,
.pp = 10, .pp = 25,
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
.priority = 0, .priority = 0,
@ -401,9 +401,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
}, },
{ // MOVE_TACKLE { // MOVE_TACKLE
.effect = EFFECT_HIT, .effect = EFFECT_HIT,
.power = 35, .power = 40,
.type = TYPE_NORMAL, .type = TYPE_NORMAL,
.accuracy = 95, .accuracy = 100,
.pp = 35, .pp = 35,
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
@ -449,10 +449,10 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
}, },
{ // MOVE_THRASH { // MOVE_THRASH
.effect = EFFECT_RAMPAGE, .effect = EFFECT_RAMPAGE,
.power = 90, .power = 120,
.type = TYPE_NORMAL, .type = TYPE_NORMAL,
.accuracy = 100, .accuracy = 100,
.pp = 20, .pp = 10,
.secondaryEffectChance = 100, .secondaryEffectChance = 100,
.target = MOVE_TARGET_RANDOM, .target = MOVE_TARGET_RANDOM,
.priority = 0, .priority = 0,
@ -509,9 +509,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
}, },
{ // MOVE_PIN_MISSILE { // MOVE_PIN_MISSILE
.effect = EFFECT_MULTI_HIT, .effect = EFFECT_MULTI_HIT,
.power = 14, .power = 25,
.type = TYPE_BUG, .type = TYPE_BUG,
.accuracy = 85, .accuracy = 95,
.pp = 20, .pp = 20,
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
@ -616,7 +616,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.split = SPLIT_STATUS, .split = SPLIT_STATUS,
}, },
{ // MOVE_ACID { // MOVE_ACID
.effect = EFFECT_DEFENSE_DOWN_HIT, .effect = EFFECT_SPECIAL_DEFENSE_DOWN_HIT,
.power = 40, .power = 40,
.type = TYPE_POISON, .type = TYPE_POISON,
.accuracy = 100, .accuracy = 100,
@ -641,7 +641,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
}, },
{ // MOVE_FLAMETHROWER { // MOVE_FLAMETHROWER
.effect = EFFECT_BURN_HIT, .effect = EFFECT_BURN_HIT,
.power = 95, .power = 90,
.type = TYPE_FIRE, .type = TYPE_FIRE,
.accuracy = 100, .accuracy = 100,
.pp = 15, .pp = 15,
@ -677,7 +677,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
}, },
{ // MOVE_HYDRO_PUMP { // MOVE_HYDRO_PUMP
.effect = EFFECT_HIT, .effect = EFFECT_HIT,
.power = 120, .power = 110,
.type = TYPE_WATER, .type = TYPE_WATER,
.accuracy = 80, .accuracy = 80,
.pp = 5, .pp = 5,
@ -689,7 +689,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
}, },
{ // MOVE_SURF { // MOVE_SURF
.effect = EFFECT_HIT, .effect = EFFECT_HIT,
.power = 95, .power = 90,
.type = TYPE_WATER, .type = TYPE_WATER,
.accuracy = 100, .accuracy = 100,
.pp = 15, .pp = 15,
@ -701,7 +701,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
}, },
{ // MOVE_ICE_BEAM { // MOVE_ICE_BEAM
.effect = EFFECT_FREEZE_HIT, .effect = EFFECT_FREEZE_HIT,
.power = 95, .power = 90,
.type = TYPE_ICE, .type = TYPE_ICE,
.accuracy = 100, .accuracy = 100,
.pp = 10, .pp = 10,
@ -713,7 +713,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
}, },
{ // MOVE_BLIZZARD { // MOVE_BLIZZARD
.effect = EFFECT_FREEZE_HIT, .effect = EFFECT_FREEZE_HIT,
.power = 120, .power = 110,
.type = TYPE_ICE, .type = TYPE_ICE,
.accuracy = 70, .accuracy = 70,
.pp = 5, .pp = 5,
@ -800,7 +800,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.power = 80, .power = 80,
.type = TYPE_FIGHTING, .type = TYPE_FIGHTING,
.accuracy = 80, .accuracy = 80,
.pp = 25, .pp = 20,
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
.priority = 0, .priority = 0,
@ -860,7 +860,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.power = 20, .power = 20,
.type = TYPE_GRASS, .type = TYPE_GRASS,
.accuracy = 100, .accuracy = 100,
.pp = 20, .pp = 25,
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
.priority = 0, .priority = 0,
@ -872,7 +872,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.power = 40, .power = 40,
.type = TYPE_GRASS, .type = TYPE_GRASS,
.accuracy = 100, .accuracy = 100,
.pp = 10, .pp = 15,
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
.priority = 0, .priority = 0,
@ -896,7 +896,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.power = 0, .power = 0,
.type = TYPE_NORMAL, .type = TYPE_NORMAL,
.accuracy = 0, .accuracy = 0,
.pp = 40, .pp = 20,
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
.target = MOVE_TARGET_USER, .target = MOVE_TARGET_USER,
.priority = 0, .priority = 0,
@ -965,10 +965,10 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
}, },
{ // MOVE_PETAL_DANCE { // MOVE_PETAL_DANCE
.effect = EFFECT_RAMPAGE, .effect = EFFECT_RAMPAGE,
.power = 70, .power = 120,
.type = TYPE_GRASS, .type = TYPE_GRASS,
.accuracy = 100, .accuracy = 100,
.pp = 20, .pp = 10,
.secondaryEffectChance = 100, .secondaryEffectChance = 100,
.target = MOVE_TARGET_RANDOM, .target = MOVE_TARGET_RANDOM,
.priority = 0, .priority = 0,
@ -1001,9 +1001,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
}, },
{ // MOVE_FIRE_SPIN { // MOVE_FIRE_SPIN
.effect = EFFECT_TRAP, .effect = EFFECT_TRAP,
.power = 15, .power = 35,
.type = TYPE_FIRE, .type = TYPE_FIRE,
.accuracy = 70, .accuracy = 85,
.pp = 15, .pp = 15,
.secondaryEffectChance = 100, .secondaryEffectChance = 100,
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
@ -1025,7 +1025,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
}, },
{ // MOVE_THUNDERBOLT { // MOVE_THUNDERBOLT
.effect = EFFECT_PARALYZE_HIT, .effect = EFFECT_PARALYZE_HIT,
.power = 95, .power = 90,
.type = TYPE_ELECTRIC, .type = TYPE_ELECTRIC,
.accuracy = 100, .accuracy = 100,
.pp = 15, .pp = 15,
@ -1039,7 +1039,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.effect = EFFECT_PARALYZE, .effect = EFFECT_PARALYZE,
.power = 0, .power = 0,
.type = TYPE_ELECTRIC, .type = TYPE_ELECTRIC,
.accuracy = 100, .accuracy = 90,
.pp = 20, .pp = 20,
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
@ -1049,7 +1049,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
}, },
{ // MOVE_THUNDER { // MOVE_THUNDER
.effect = EFFECT_THUNDER, .effect = EFFECT_THUNDER,
.power = 120, .power = 110,
.type = TYPE_ELECTRIC, .type = TYPE_ELECTRIC,
.accuracy = 70, .accuracy = 70,
.pp = 10, .pp = 10,
@ -1097,7 +1097,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
}, },
{ // MOVE_DIG { // MOVE_DIG
.effect = EFFECT_SEMI_INVULNERABLE, .effect = EFFECT_SEMI_INVULNERABLE,
.power = 60, .power = 80,
.type = TYPE_GROUND, .type = TYPE_GROUND,
.accuracy = 100, .accuracy = 100,
.pp = 10, .pp = 10,
@ -1111,7 +1111,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.effect = EFFECT_TOXIC, .effect = EFFECT_TOXIC,
.power = 0, .power = 0,
.type = TYPE_POISON, .type = TYPE_POISON,
.accuracy = 85, .accuracy = 90,
.pp = 10, .pp = 10,
.secondaryEffectChance = 100, .secondaryEffectChance = 100,
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
@ -1268,7 +1268,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.power = 0, .power = 0,
.type = TYPE_NORMAL, .type = TYPE_NORMAL,
.accuracy = 0, .accuracy = 0,
.pp = 20, .pp = 10,
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
.target = MOVE_TARGET_USER, .target = MOVE_TARGET_USER,
.priority = 0, .priority = 0,
@ -1292,7 +1292,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.power = 0, .power = 0,
.type = TYPE_NORMAL, .type = TYPE_NORMAL,
.accuracy = 0, .accuracy = 0,
.pp = 20, .pp = 10,
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
.target = MOVE_TARGET_USER, .target = MOVE_TARGET_USER,
.priority = 0, .priority = 0,
@ -1352,7 +1352,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.power = 0, .power = 0,
.type = TYPE_PSYCHIC, .type = TYPE_PSYCHIC,
.accuracy = 0, .accuracy = 0,
.pp = 30, .pp = 20,
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
.target = MOVE_TARGET_USER, .target = MOVE_TARGET_USER,
.priority = 0, .priority = 0,
@ -1411,7 +1411,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.effect = EFFECT_BIDE, .effect = EFFECT_BIDE,
.power = 1, .power = 1,
.type = TYPE_NORMAL, .type = TYPE_NORMAL,
.accuracy = 100, .accuracy = 0,
.pp = 10, .pp = 10,
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
.target = MOVE_TARGET_USER, .target = MOVE_TARGET_USER,
@ -1469,7 +1469,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
}, },
{ // MOVE_LICK { // MOVE_LICK
.effect = EFFECT_PARALYZE_HIT, .effect = EFFECT_PARALYZE_HIT,
.power = 20, .power = 30,
.type = TYPE_GHOST, .type = TYPE_GHOST,
.accuracy = 100, .accuracy = 100,
.pp = 30, .pp = 30,
@ -1484,7 +1484,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.power = 20, .power = 20,
.type = TYPE_POISON, .type = TYPE_POISON,
.accuracy = 70, .accuracy = 70,
.pp = 20, .pp = 30,
.secondaryEffectChance = 40, .secondaryEffectChance = 40,
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
.priority = 0, .priority = 0,
@ -1517,7 +1517,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
}, },
{ // MOVE_FIRE_BLAST { // MOVE_FIRE_BLAST
.effect = EFFECT_BURN_HIT, .effect = EFFECT_BURN_HIT,
.power = 120, .power = 110,
.type = TYPE_FIRE, .type = TYPE_FIRE,
.accuracy = 85, .accuracy = 85,
.pp = 5, .pp = 5,
@ -1543,8 +1543,8 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.effect = EFFECT_TRAP, .effect = EFFECT_TRAP,
.power = 35, .power = 35,
.type = TYPE_WATER, .type = TYPE_WATER,
.accuracy = 75, .accuracy = 85,
.pp = 10, .pp = 15,
.secondaryEffectChance = 100, .secondaryEffectChance = 100,
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
.priority = 0, .priority = 0,
@ -1565,10 +1565,10 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
}, },
{ // MOVE_SKULL_BASH { // MOVE_SKULL_BASH
.effect = EFFECT_SKULL_BASH, .effect = EFFECT_SKULL_BASH,
.power = 100, .power = 130,
.type = TYPE_NORMAL, .type = TYPE_NORMAL,
.accuracy = 100, .accuracy = 100,
.pp = 15, .pp = 10,
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
.priority = 0, .priority = 0,
@ -1637,7 +1637,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
}, },
{ // MOVE_HI_JUMP_KICK { // MOVE_HI_JUMP_KICK
.effect = EFFECT_RECOIL_IF_MISS, .effect = EFFECT_RECOIL_IF_MISS,
.power = 85, .power = 100,
.type = TYPE_FIGHTING, .type = TYPE_FIGHTING,
.accuracy = 90, .accuracy = 90,
.pp = 20, .pp = 20,
@ -1651,7 +1651,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.effect = EFFECT_PARALYZE, .effect = EFFECT_PARALYZE,
.power = 0, .power = 0,
.type = TYPE_NORMAL, .type = TYPE_NORMAL,
.accuracy = 75, .accuracy = 100,
.pp = 30, .pp = 30,
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
@ -1675,7 +1675,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.effect = EFFECT_POISON, .effect = EFFECT_POISON,
.power = 0, .power = 0,
.type = TYPE_POISON, .type = TYPE_POISON,
.accuracy = 55, .accuracy = 90,
.pp = 40, .pp = 40,
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
@ -1697,10 +1697,10 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
}, },
{ // MOVE_LEECH_LIFE { // MOVE_LEECH_LIFE
.effect = EFFECT_ABSORB, .effect = EFFECT_ABSORB,
.power = 20, .power = 80,
.type = TYPE_BUG, .type = TYPE_BUG,
.accuracy = 100, .accuracy = 100,
.pp = 15, .pp = 10,
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
.priority = 0, .priority = 0,
@ -1746,7 +1746,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
}, },
{ // MOVE_BUBBLE { // MOVE_BUBBLE
.effect = EFFECT_SPEED_DOWN_HIT, .effect = EFFECT_SPEED_DOWN_HIT,
.power = 20, .power = 40,
.type = TYPE_WATER, .type = TYPE_WATER,
.accuracy = 100, .accuracy = 100,
.pp = 30, .pp = 30,
@ -1784,7 +1784,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.effect = EFFECT_ACCURACY_DOWN, .effect = EFFECT_ACCURACY_DOWN,
.power = 0, .power = 0,
.type = TYPE_NORMAL, .type = TYPE_NORMAL,
.accuracy = 70, .accuracy = 100,
.pp = 20, .pp = 20,
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
@ -1796,7 +1796,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.effect = EFFECT_PSYWAVE, .effect = EFFECT_PSYWAVE,
.power = 1, .power = 1,
.type = TYPE_PSYCHIC, .type = TYPE_PSYCHIC,
.accuracy = 80, .accuracy = 100,
.pp = 15, .pp = 15,
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
@ -1821,7 +1821,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.power = 0, .power = 0,
.type = TYPE_POISON, .type = TYPE_POISON,
.accuracy = 0, .accuracy = 0,
.pp = 40, .pp = 20,
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
.target = MOVE_TARGET_USER, .target = MOVE_TARGET_USER,
.priority = 0, .priority = 0,
@ -1830,9 +1830,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
}, },
{ // MOVE_CRABHAMMER { // MOVE_CRABHAMMER
.effect = EFFECT_HIT, .effect = EFFECT_HIT,
.power = 90, .power = 100,
.type = TYPE_WATER, .type = TYPE_WATER,
.accuracy = 85, .accuracy = 90,
.pp = 10, .pp = 10,
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
@ -1988,7 +1988,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.effect = EFFECT_RECOIL, .effect = EFFECT_RECOIL,
.power = 50, .power = 50,
.type = TYPE_NORMAL, .type = TYPE_NORMAL,
.accuracy = 100, .accuracy = 0,
.pp = 1, .pp = 1,
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
@ -2022,10 +2022,10 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
}, },
{ // MOVE_THIEF { // MOVE_THIEF
.effect = EFFECT_THIEF, .effect = EFFECT_THIEF,
.power = 40, .power = 60,
.type = TYPE_DARK, .type = TYPE_DARK,
.accuracy = 100, .accuracy = 100,
.pp = 10, .pp = 25,
.secondaryEffectChance = 100, .secondaryEffectChance = 100,
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
.priority = 0, .priority = 0,
@ -2048,7 +2048,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.effect = EFFECT_LOCK_ON, .effect = EFFECT_LOCK_ON,
.power = 0, .power = 0,
.type = TYPE_NORMAL, .type = TYPE_NORMAL,
.accuracy = 100, .accuracy = 0,
.pp = 5, .pp = 5,
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
@ -2082,7 +2082,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
}, },
{ // MOVE_SNORE { // MOVE_SNORE
.effect = EFFECT_SNORE, .effect = EFFECT_SNORE,
.power = 40, .power = 50,
.type = TYPE_NORMAL, .type = TYPE_NORMAL,
.accuracy = 100, .accuracy = 100,
.pp = 15, .pp = 15,
@ -2144,7 +2144,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.effect = EFFECT_SPEED_DOWN_2, .effect = EFFECT_SPEED_DOWN_2,
.power = 0, .power = 0,
.type = TYPE_GRASS, .type = TYPE_GRASS,
.accuracy = 85, .accuracy = 100,
.pp = 40, .pp = 40,
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
@ -2216,7 +2216,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.effect = EFFECT_SPEED_DOWN_2, .effect = EFFECT_SPEED_DOWN_2,
.power = 0, .power = 0,
.type = TYPE_NORMAL, .type = TYPE_NORMAL,
.accuracy = 90, .accuracy = 100,
.pp = 10, .pp = 10,
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
@ -2239,7 +2239,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
{ // MOVE_SWEET_KISS { // MOVE_SWEET_KISS
.effect = EFFECT_CONFUSE, .effect = EFFECT_CONFUSE,
.power = 0, .power = 0,
.type = TYPE_NORMAL, .type = TYPE_FAIRY,
.accuracy = 75, .accuracy = 75,
.pp = 10, .pp = 10,
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
@ -2310,7 +2310,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
}, },
{ // MOVE_ZAP_CANNON { // MOVE_ZAP_CANNON
.effect = EFFECT_PARALYZE_HIT, .effect = EFFECT_PARALYZE_HIT,
.power = 100, .power = 120,
.type = TYPE_ELECTRIC, .type = TYPE_ELECTRIC,
.accuracy = 50, .accuracy = 50,
.pp = 5, .pp = 5,
@ -2384,7 +2384,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.effect = EFFECT_MULTI_HIT, .effect = EFFECT_MULTI_HIT,
.power = 25, .power = 25,
.type = TYPE_GROUND, .type = TYPE_GROUND,
.accuracy = 80, .accuracy = 90,
.pp = 10, .pp = 10,
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
@ -2396,7 +2396,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.effect = EFFECT_LOCK_ON, .effect = EFFECT_LOCK_ON,
.power = 0, .power = 0,
.type = TYPE_NORMAL, .type = TYPE_NORMAL,
.accuracy = 100, .accuracy = 0,
.pp = 5, .pp = 5,
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
@ -2406,10 +2406,10 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
}, },
{ // MOVE_OUTRAGE { // MOVE_OUTRAGE
.effect = EFFECT_RAMPAGE, .effect = EFFECT_RAMPAGE,
.power = 90, .power = 120,
.type = TYPE_DRAGON, .type = TYPE_DRAGON,
.accuracy = 100, .accuracy = 100,
.pp = 15, .pp = 10,
.secondaryEffectChance = 100, .secondaryEffectChance = 100,
.target = MOVE_TARGET_RANDOM, .target = MOVE_TARGET_RANDOM,
.priority = 0, .priority = 0,
@ -2430,10 +2430,10 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
}, },
{ // MOVE_GIGA_DRAIN { // MOVE_GIGA_DRAIN
.effect = EFFECT_ABSORB, .effect = EFFECT_ABSORB,
.power = 60, .power = 75,
.type = TYPE_GRASS, .type = TYPE_GRASS,
.accuracy = 100, .accuracy = 100,
.pp = 5, .pp = 10,
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
.priority = 0, .priority = 0,
@ -2492,7 +2492,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.effect = EFFECT_SWAGGER, .effect = EFFECT_SWAGGER,
.power = 0, .power = 0,
.type = TYPE_NORMAL, .type = TYPE_NORMAL,
.accuracy = 90, .accuracy = 85,
.pp = 15, .pp = 15,
.secondaryEffectChance = 100, .secondaryEffectChance = 100,
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
@ -2526,7 +2526,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
}, },
{ // MOVE_FURY_CUTTER { // MOVE_FURY_CUTTER
.effect = EFFECT_FURY_CUTTER, .effect = EFFECT_FURY_CUTTER,
.power = 10, .power = 40,
.type = TYPE_BUG, .type = TYPE_BUG,
.accuracy = 95, .accuracy = 95,
.pp = 20, .pp = 20,
@ -2648,7 +2648,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.effect = EFFECT_PAIN_SPLIT, .effect = EFFECT_PAIN_SPLIT,
.power = 0, .power = 0,
.type = TYPE_NORMAL, .type = TYPE_NORMAL,
.accuracy = 100, .accuracy = 0,
.pp = 20, .pp = 20,
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
@ -2839,7 +2839,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
{ // MOVE_MOONLIGHT { // MOVE_MOONLIGHT
.effect = EFFECT_MOONLIGHT, .effect = EFFECT_MOONLIGHT,
.power = 0, .power = 0,
.type = TYPE_NORMAL, .type = TYPE_FAIRY,
.accuracy = 0, .accuracy = 0,
.pp = 5, .pp = 5,
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
@ -2982,10 +2982,10 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
}, },
{ // MOVE_FUTURE_SIGHT { // MOVE_FUTURE_SIGHT
.effect = EFFECT_FUTURE_SIGHT, .effect = EFFECT_FUTURE_SIGHT,
.power = 80, .power = 120,
.type = TYPE_PSYCHIC, .type = TYPE_PSYCHIC,
.accuracy = 90, .accuracy = 100,
.pp = 15, .pp = 10,
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
.priority = 0, .priority = 0,
@ -2994,7 +2994,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
}, },
{ // MOVE_ROCK_SMASH { // MOVE_ROCK_SMASH
.effect = EFFECT_DEFENSE_DOWN_HIT, .effect = EFFECT_DEFENSE_DOWN_HIT,
.power = 20, .power = 40,
.type = TYPE_FIGHTING, .type = TYPE_FIGHTING,
.accuracy = 100, .accuracy = 100,
.pp = 15, .pp = 15,
@ -3006,9 +3006,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
}, },
{ // MOVE_WHIRLPOOL { // MOVE_WHIRLPOOL
.effect = EFFECT_TRAP, .effect = EFFECT_TRAP,
.power = 15, .power = 35,
.type = TYPE_WATER, .type = TYPE_WATER,
.accuracy = 70, .accuracy = 85,
.pp = 15, .pp = 15,
.secondaryEffectChance = 100, .secondaryEffectChance = 100,
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
@ -3042,7 +3042,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
}, },
{ // MOVE_UPROAR { // MOVE_UPROAR
.effect = EFFECT_UPROAR, .effect = EFFECT_UPROAR,
.power = 50, .power = 90,
.type = TYPE_NORMAL, .type = TYPE_NORMAL,
.accuracy = 100, .accuracy = 100,
.pp = 10, .pp = 10,
@ -3057,7 +3057,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.power = 0, .power = 0,
.type = TYPE_NORMAL, .type = TYPE_NORMAL,
.accuracy = 0, .accuracy = 0,
.pp = 10, .pp = 20,
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
.target = MOVE_TARGET_USER, .target = MOVE_TARGET_USER,
.priority = 0, .priority = 0,
@ -3090,7 +3090,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
}, },
{ // MOVE_HEAT_WAVE { // MOVE_HEAT_WAVE
.effect = EFFECT_BURN_HIT, .effect = EFFECT_BURN_HIT,
.power = 100, .power = 95,
.type = TYPE_FIRE, .type = TYPE_FIRE,
.accuracy = 90, .accuracy = 90,
.pp = 10, .pp = 10,
@ -3140,7 +3140,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.effect = EFFECT_WILL_O_WISP, .effect = EFFECT_WILL_O_WISP,
.power = 0, .power = 0,
.type = TYPE_FIRE, .type = TYPE_FIRE,
.accuracy = 75, .accuracy = 85,
.pp = 15, .pp = 15,
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
@ -3186,7 +3186,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
}, },
{ // MOVE_SMELLING_SALT { // MOVE_SMELLING_SALT
.effect = EFFECT_SMELLINGSALT, .effect = EFFECT_SMELLINGSALT,
.power = 60, .power = 70,
.type = TYPE_NORMAL, .type = TYPE_NORMAL,
.accuracy = 100, .accuracy = 100,
.pp = 10, .pp = 10,
@ -3390,7 +3390,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
}, },
{ // MOVE_KNOCK_OFF { // MOVE_KNOCK_OFF
.effect = EFFECT_KNOCK_OFF, .effect = EFFECT_KNOCK_OFF,
.power = 20, .power = 65,
.type = TYPE_DARK, .type = TYPE_DARK,
.accuracy = 100, .accuracy = 100,
.pp = 20, .pp = 20,
@ -3714,9 +3714,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
}, },
{ // MOVE_METEOR_MASH { // MOVE_METEOR_MASH
.effect = EFFECT_ATTACK_UP_HIT, .effect = EFFECT_ATTACK_UP_HIT,
.power = 100, .power = 90,
.type = TYPE_STEEL, .type = TYPE_STEEL,
.accuracy = 85, .accuracy = 90,
.pp = 10, .pp = 10,
.secondaryEffectChance = 20, .secondaryEffectChance = 20,
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
@ -3774,7 +3774,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
}, },
{ // MOVE_AIR_CUTTER { // MOVE_AIR_CUTTER
.effect = EFFECT_HIT, .effect = EFFECT_HIT,
.power = 55, .power = 60,
.type = TYPE_FLYING, .type = TYPE_FLYING,
.accuracy = 95, .accuracy = 95,
.pp = 25, .pp = 25,
@ -3786,7 +3786,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
}, },
{ // MOVE_OVERHEAT { // MOVE_OVERHEAT
.effect = EFFECT_OVERHEAT, .effect = EFFECT_OVERHEAT,
.power = 140, .power = 130,
.type = TYPE_FIRE, .type = TYPE_FIRE,
.accuracy = 90, .accuracy = 90,
.pp = 5, .pp = 5,
@ -3810,10 +3810,10 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
}, },
{ // MOVE_ROCK_TOMB { // MOVE_ROCK_TOMB
.effect = EFFECT_SPEED_DOWN_HIT, .effect = EFFECT_SPEED_DOWN_HIT,
.power = 50, .power = 60,
.type = TYPE_ROCK, .type = TYPE_ROCK,
.accuracy = 80, .accuracy = 95,
.pp = 10, .pp = 15,
.secondaryEffectChance = 100, .secondaryEffectChance = 100,
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
.priority = 0, .priority = 0,
@ -3921,7 +3921,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.power = 80, .power = 80,
.type = TYPE_PSYCHIC, .type = TYPE_PSYCHIC,
.accuracy = 100, .accuracy = 100,
.pp = 30, .pp = 20,
.secondaryEffectChance = 10, .secondaryEffectChance = 10,
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
.priority = 0, .priority = 0,
@ -3942,9 +3942,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
}, },
{ // MOVE_SAND_TOMB { // MOVE_SAND_TOMB
.effect = EFFECT_TRAP, .effect = EFFECT_TRAP,
.power = 15, .power = 35,
.type = TYPE_GROUND, .type = TYPE_GROUND,
.accuracy = 70, .accuracy = 85,
.pp = 15, .pp = 15,
.secondaryEffectChance = 100, .secondaryEffectChance = 100,
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
@ -3966,7 +3966,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
}, },
{ // MOVE_MUDDY_WATER { // MOVE_MUDDY_WATER
.effect = EFFECT_ACCURACY_DOWN_HIT, .effect = EFFECT_ACCURACY_DOWN_HIT,
.power = 95, .power = 90,
.type = TYPE_WATER, .type = TYPE_WATER,
.accuracy = 85, .accuracy = 85,
.pp = 10, .pp = 10,
@ -3978,7 +3978,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
}, },
{ // MOVE_BULLET_SEED { // MOVE_BULLET_SEED
.effect = EFFECT_MULTI_HIT, .effect = EFFECT_MULTI_HIT,
.power = 10, .power = 25,
.type = TYPE_GRASS, .type = TYPE_GRASS,
.accuracy = 100, .accuracy = 100,
.pp = 30, .pp = 30,
@ -4002,7 +4002,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
}, },
{ // MOVE_ICICLE_SPEAR { // MOVE_ICICLE_SPEAR
.effect = EFFECT_MULTI_HIT, .effect = EFFECT_MULTI_HIT,
.power = 10, .power = 25,
.type = TYPE_ICE, .type = TYPE_ICE,
.accuracy = 100, .accuracy = 100,
.pp = 30, .pp = 30,
@ -4122,10 +4122,10 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
}, },
{ // MOVE_COVET { // MOVE_COVET
.effect = EFFECT_THIEF, .effect = EFFECT_THIEF,
.power = 40, .power = 60,
.type = TYPE_NORMAL, .type = TYPE_NORMAL,
.accuracy = 100, .accuracy = 100,
.pp = 40, .pp = 25,
.secondaryEffectChance = 100, .secondaryEffectChance = 100,
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
.priority = 0, .priority = 0,
@ -4183,7 +4183,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
}, },
{ // MOVE_LEAF_BLADE { // MOVE_LEAF_BLADE
.effect = EFFECT_HIT, .effect = EFFECT_HIT,
.power = 70, .power = 90,
.type = TYPE_GRASS, .type = TYPE_GRASS,
.accuracy = 100, .accuracy = 100,
.pp = 15, .pp = 15,
@ -4209,7 +4209,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.effect = EFFECT_MULTI_HIT, .effect = EFFECT_MULTI_HIT,
.power = 25, .power = 25,
.type = TYPE_ROCK, .type = TYPE_ROCK,
.accuracy = 80, .accuracy = 90,
.pp = 10, .pp = 10,
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
@ -4243,9 +4243,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
}, },
{ // MOVE_DOOM_DESIRE { // MOVE_DOOM_DESIRE
.effect = EFFECT_FUTURE_SIGHT, .effect = EFFECT_FUTURE_SIGHT,
.power = 120, .power = 140,
.type = TYPE_STEEL, .type = TYPE_STEEL,
.accuracy = 85, .accuracy = 100,
.pp = 5, .pp = 5,
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,

1
src/data/text/move_names.h
View File

@ -657,6 +657,7 @@ const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1] =
[MOVE_CLANGING_SCALES] = _("Clanging Sca"), [MOVE_CLANGING_SCALES] = _("Clanging Sca"),
[MOVE_DRAGON_HAMMER] = _("DragonHammer"), [MOVE_DRAGON_HAMMER] = _("DragonHammer"),
[MOVE_BRUTAL_SWING] = _("Brutal Swing"), [MOVE_BRUTAL_SWING] = _("Brutal Swing"),
[MOVE_AURORA_VEIL] = _("Aurora Veil"),
[MOVE_SHELL_TRAP] = _("Shell Trap"), [MOVE_SHELL_TRAP] = _("Shell Trap"),
[MOVE_FLEUR_CANNON] = _("Fleur Cannon"), [MOVE_FLEUR_CANNON] = _("Fleur Cannon"),
[MOVE_PSYCHIC_FANGS] = _("PsychicFangs"), [MOVE_PSYCHIC_FANGS] = _("PsychicFangs"),