atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated a few more moves' data to Gen. 8 standards

Browse source
This commit is contained in:
LOuroboros 2020-09-04 16:34:14 -03:00
parent 1b9aa1f023
commit c90c146d0d
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/data/battle_moves.h
View file

@ -6557,7 +6557,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
.priority = 0, .priority = 0,
.flags = FLAG_MAKES_CONTACT | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED | FLAG_DMG_MINIMIZE, .flags = FLAG_MAKES_CONTACT | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED,
.split = SPLIT_PHYSICAL, .split = SPLIT_PHYSICAL,
}, },
@ -6796,7 +6796,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.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_KINGSROCK_AFFECTED, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED | FLAG_DMG_MINIMIZE,
.split = SPLIT_PHYSICAL, .split = SPLIT_PHYSICAL,
}, },
@ -7048,7 +7048,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.pp = 15, .pp = 15,
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
.target = MOVE_TARGET_USER, .target = MOVE_TARGET_USER,
.priority = 1, .priority = 2,
.flags = 0, .flags = 0,
.split = SPLIT_STATUS, .split = SPLIT_STATUS,
}, },
@ -7949,7 +7949,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.secondaryEffectChance = 100, .secondaryEffectChance = 100,
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
.priority = 0, .priority = 0,
.flags = FLAG_MAKES_CONTACT | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED | FLAG_DMG_MINIMIZE, .flags = FLAG_MAKES_CONTACT | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED,
.split = SPLIT_PHYSICAL, .split = SPLIT_PHYSICAL,
.argument = MOVE_EFFECT_FEINT, .argument = MOVE_EFFECT_FEINT,
}, },

20
src/data/text/move_names.h
View file

@ -11,7 +11,7 @@ const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1] =
[MOVE_ICE_PUNCH] = _("Ice Punch"), [MOVE_ICE_PUNCH] = _("Ice Punch"),
[MOVE_THUNDER_PUNCH] = _("ThunderPunch"), [MOVE_THUNDER_PUNCH] = _("ThunderPunch"),
[MOVE_SCRATCH] = _("Scratch"), [MOVE_SCRATCH] = _("Scratch"),
[MOVE_VICE_GRIP] = _("Vice Grip"), [MOVE_VICE_GRIP] = _("Vise Grip"),
[MOVE_GUILLOTINE] = _("Guillotine"), [MOVE_GUILLOTINE] = _("Guillotine"),
[MOVE_RAZOR_WIND] = _("Razor Wind"), [MOVE_RAZOR_WIND] = _("Razor Wind"),
[MOVE_SWORDS_DANCE] = _("Swords Dance"), [MOVE_SWORDS_DANCE] = _("Swords Dance"),
@ -28,7 +28,7 @@ const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1] =
[MOVE_MEGA_KICK] = _("Mega Kick"), [MOVE_MEGA_KICK] = _("Mega Kick"),
[MOVE_JUMP_KICK] = _("Jump Kick"), [MOVE_JUMP_KICK] = _("Jump Kick"),
[MOVE_ROLLING_KICK] = _("Rolling Kick"), [MOVE_ROLLING_KICK] = _("Rolling Kick"),
[MOVE_SAND_ATTACK] = _("Sand-Attack"), [MOVE_SAND_ATTACK] = _("Sand Attack"),
[MOVE_HEADBUTT] = _("Headbutt"), [MOVE_HEADBUTT] = _("Headbutt"),
[MOVE_HORN_ATTACK] = _("Horn Attack"), [MOVE_HORN_ATTACK] = _("Horn Attack"),
[MOVE_FURY_ATTACK] = _("Fury Attack"), [MOVE_FURY_ATTACK] = _("Fury Attack"),
@ -108,7 +108,7 @@ const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1] =
[MOVE_RECOVER] = _("Recover"), [MOVE_RECOVER] = _("Recover"),
[MOVE_HARDEN] = _("Harden"), [MOVE_HARDEN] = _("Harden"),
[MOVE_MINIMIZE] = _("Minimize"), [MOVE_MINIMIZE] = _("Minimize"),
[MOVE_SMOKESCREEN] = _("SmokeScreen"), [MOVE_SMOKESCREEN] = _("Smokescreen"),
[MOVE_CONFUSE_RAY] = _("Confuse Ray"), [MOVE_CONFUSE_RAY] = _("Confuse Ray"),
[MOVE_WITHDRAW] = _("Withdraw"), [MOVE_WITHDRAW] = _("Withdraw"),
[MOVE_DEFENSE_CURL] = _("Defense Curl"), [MOVE_DEFENSE_CURL] = _("Defense Curl"),
@ -120,7 +120,7 @@ const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1] =
[MOVE_BIDE] = _("Bide"), [MOVE_BIDE] = _("Bide"),
[MOVE_METRONOME] = _("Metronome"), [MOVE_METRONOME] = _("Metronome"),
[MOVE_MIRROR_MOVE] = _("Mirror Move"), [MOVE_MIRROR_MOVE] = _("Mirror Move"),
[MOVE_SELF_DESTRUCT] = _("Selfdestruct"), [MOVE_SELF_DESTRUCT] = _("SelfDestruct"),
[MOVE_EGG_BOMB] = _("Egg Bomb"), [MOVE_EGG_BOMB] = _("Egg Bomb"),
[MOVE_LICK] = _("Lick"), [MOVE_LICK] = _("Lick"),
[MOVE_SMOG] = _("Smog"), [MOVE_SMOG] = _("Smog"),
@ -135,7 +135,7 @@ const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1] =
[MOVE_CONSTRICT] = _("Constrict"), [MOVE_CONSTRICT] = _("Constrict"),
[MOVE_AMNESIA] = _("Amnesia"), [MOVE_AMNESIA] = _("Amnesia"),
[MOVE_KINESIS] = _("Kinesis"), [MOVE_KINESIS] = _("Kinesis"),
[MOVE_SOFT_BOILED] = _("Softboiled"), [MOVE_SOFT_BOILED] = _("Soft-Boiled"),
[MOVE_HI_JUMP_KICK] = _("Hi Jump Kick"), [MOVE_HI_JUMP_KICK] = _("Hi Jump Kick"),
[MOVE_GLARE] = _("Glare"), [MOVE_GLARE] = _("Glare"),
[MOVE_DREAM_EATER] = _("Dream Eater"), [MOVE_DREAM_EATER] = _("Dream Eater"),
@ -358,7 +358,7 @@ const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1] =
[MOVE_ROOST] = _("Roost"), [MOVE_ROOST] = _("Roost"),
[MOVE_GRAVITY] = _("Gravity"), [MOVE_GRAVITY] = _("Gravity"),
[MOVE_MIRACLE_EYE] = _("Miracle Eye"), [MOVE_MIRACLE_EYE] = _("Miracle Eye"),
[MOVE_WAKE_UP_SLAP] = _("Wake Up Slap"), [MOVE_WAKE_UP_SLAP] = _("Wake-Up Slap"),
[MOVE_HAMMER_ARM] = _("Hammer Arm"), [MOVE_HAMMER_ARM] = _("Hammer Arm"),
[MOVE_GYRO_BALL] = _("Gyro Ball"), [MOVE_GYRO_BALL] = _("Gyro Ball"),
[MOVE_HEALING_WISH] = _("Healing Wish"), [MOVE_HEALING_WISH] = _("Healing Wish"),
@ -369,7 +369,7 @@ const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1] =
[MOVE_TAILWIND] = _("Tailwind"), [MOVE_TAILWIND] = _("Tailwind"),
[MOVE_ACUPRESSURE] = _("Acupressure"), [MOVE_ACUPRESSURE] = _("Acupressure"),
[MOVE_METAL_BURST] = _("Metal Burst"), [MOVE_METAL_BURST] = _("Metal Burst"),
[MOVE_U_TURN] = _("U-Turn"), [MOVE_U_TURN] = _("U-turn"),
[MOVE_CLOSE_COMBAT] = _("Close Combat"), [MOVE_CLOSE_COMBAT] = _("Close Combat"),
[MOVE_PAYBACK] = _("Payback"), [MOVE_PAYBACK] = _("Payback"),
[MOVE_ASSURANCE] = _("Assurance"), [MOVE_ASSURANCE] = _("Assurance"),
@ -404,7 +404,7 @@ const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1] =
[MOVE_AQUA_TAIL] = _("Aqua Tail"), [MOVE_AQUA_TAIL] = _("Aqua Tail"),
[MOVE_SEED_BOMB] = _("Seed Bomb"), [MOVE_SEED_BOMB] = _("Seed Bomb"),
[MOVE_AIR_SLASH] = _("Air Slash"), [MOVE_AIR_SLASH] = _("Air Slash"),
[MOVE_X_SCISSOR] = _("X Scissor"), [MOVE_X_SCISSOR] = _("X-Scissor"),
[MOVE_BUG_BUZZ] = _("Bug Buzz"), [MOVE_BUG_BUZZ] = _("Bug Buzz"),
[MOVE_DRAGON_PULSE] = _("Dragon Pulse"), [MOVE_DRAGON_PULSE] = _("Dragon Pulse"),
[MOVE_DRAGON_RUSH] = _("Dragon Rush"), [MOVE_DRAGON_RUSH] = _("Dragon Rush"),
@ -459,7 +459,7 @@ const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1] =
[MOVE_HEAL_ORDER] = _("Heal Order"), [MOVE_HEAL_ORDER] = _("Heal Order"),
[MOVE_HEAD_SMASH] = _("Head Smash"), [MOVE_HEAD_SMASH] = _("Head Smash"),
[MOVE_DOUBLE_HIT] = _("Double Hit"), [MOVE_DOUBLE_HIT] = _("Double Hit"),
[MOVE_ROAR_OF_TIME] = _("Roar Of Time"), [MOVE_ROAR_OF_TIME] = _("Roar of Time"),
[MOVE_SPACIAL_REND] = _("Spacial Rend"), [MOVE_SPACIAL_REND] = _("Spacial Rend"),
[MOVE_LUNAR_DANCE] = _("Lunar Dance"), [MOVE_LUNAR_DANCE] = _("Lunar Dance"),
[MOVE_CRUSH_GRIP] = _("Crush Grip"), [MOVE_CRUSH_GRIP] = _("Crush Grip"),
@ -576,7 +576,7 @@ const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1] =
[MOVE_FREEZE_DRY] = _("Freeze-Dry"), [MOVE_FREEZE_DRY] = _("Freeze-Dry"),
[MOVE_DISARMING_VOICE] = _("Disarming Vo"), [MOVE_DISARMING_VOICE] = _("Disarming Vo"),
[MOVE_PARTING_SHOT] = _("Parting Shot"), [MOVE_PARTING_SHOT] = _("Parting Shot"),
[MOVE_TOPSY_TURVY] = _("Topsy Turvy"), [MOVE_TOPSY_TURVY] = _("Topsy-Turvy"),
[MOVE_DRAINING_KISS] = _("DrainingKiss"), [MOVE_DRAINING_KISS] = _("DrainingKiss"),
[MOVE_CRAFTY_SHIELD] = _("CraftyShield"), [MOVE_CRAFTY_SHIELD] = _("CraftyShield"),
[MOVE_FLOWER_SHIELD] = _("FlowerShield"), [MOVE_FLOWER_SHIELD] = _("FlowerShield"),