Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_engine

Browse Source
This commit is contained in:
Evan 2020-10-15 18:25:21 -06:00
commit bd26919acc
9 changed files with 145 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
data/battle_scripts_1.s
View File

@ -8,6 +8,7 @@
#include "constants/moves.h"
#include "constants/songs.h"
#include "constants/game_stat.h"
#include "constants/battle_config.h"
.include "asm/macros.inc"
.include "asm/macros/battle_script.inc"
.include "constants/constants.inc"
@ -3823,7 +3824,41 @@ BattleScript_EffectBatonPass::
goto BattleScript_MoveEnd
BattleScript_EffectRapidSpin::
.if B_SPEED_BUFFING_RAPID_SPIN == GEN_8
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
critcalc
damagecalc
adjustdamage
attackanimation
waitanimation
effectivenesssound
hitanimation BS_TARGET
waitstate
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
critmessage
waitmessage 0x40
resultmessage
waitmessage 0x40
setmoveeffect MOVE_EFFECT_RAPIDSPIN | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN
seteffectwithchance
setstatchanger STAT_SPEED, 1, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_EffectRapidSpinEnd
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_EffectRapidSpinEnd
setgraphicalstatchangevalues
playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
printfromtable gStatUpStringIds
waitmessage 0x40
BattleScript_EffectRapidSpinEnd::
tryfaintmon BS_TARGET, FALSE, NULL
moveendall
end
.else
setmoveeffect MOVE_EFFECT_RAPIDSPIN | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN
.endif
goto BattleScript_EffectHit
BattleScript_EffectSonicboom::

1
include/constants/battle_config.h
View File

@ -82,6 +82,7 @@
#define B_DISABLE_TURNS GEN_6 // Disable's turns. See Cmd_disablelastusedattack.
#define B_INCINERATE_GEMS GEN_6 // In Gen6+, Incinerate can destroy Gems.
#define B_MINIMIZE_DMG_ACC GEN_6 // In Gen6+, moves that causes double damage to minimized Pokémon will also skip accuracy checks.
#define B_SPEED_BUFFING_RAPID_SPIN GEN_8 // In Gen8, Rapid Spin raises the user's Speed by 1 stage.
// Ability settings
#define B_ABILITY_POP_UP GEN_6 // In Gen5+, the Pokémon abilities are displayed in a pop-up, when they activate in battle.

2
include/constants/hold_effects.h
View File

@ -102,7 +102,7 @@
#define HOLD_EFFECT_GRISEOUS_ORB 96
#define HOLD_EFFECT_GRACIDEA 97
#define HOLD_EFFECT_RESIST_BERRY 98
#define HOLD_EFFECT_EV_BOOST 99
#define HOLD_EFFECT_POWER_ITEM 99
#define HOLD_EFFECT_RESTORE_PCT_HP 100
// Gen5 hold effects

2
src/battle_controller_opponent.c
View File

@ -299,7 +299,7 @@ static void sub_805F560(void)
TryShinyAnimation(gActiveBattler, &gEnemyParty[gBattlerPartyIndexes[gActiveBattler]]);
if (!(gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS)
&& !(gBattleTypeFlags & BATTLE_TYPE_MULTI)
&& (!(gBattleTypeFlags & BATTLE_TYPE_MULTI) || BATTLE_TWO_VS_ONE_OPPONENT)
&& IsDoubleBattle()
&& !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].triedShinyMonAnim
&& !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].ballAnimActive

2
src/battle_main.c
View File

@ -4242,7 +4242,7 @@ u32 GetBattlerTotalSpeedStat(u8 battlerId)
}
// item effects
if (GetBattlerHoldEffect(battlerId, FALSE) == HOLD_EFFECT_MACHO_BRACE || GetBattlerHoldEffect(battlerId, FALSE) == HOLD_EFFECT_EV_BOOST)
if (GetBattlerHoldEffect(battlerId, FALSE) == HOLD_EFFECT_MACHO_BRACE || GetBattlerHoldEffect(battlerId, FALSE) == HOLD_EFFECT_POWER_ITEM)
speed /= 2;
else if (holdEffect == HOLD_EFFECT_IRON_BALL)
speed /= 2;

1
src/battle_util.c
View File

@ -19,7 +19,6 @@
#include "berry.h"
#include "pokedex.h"
#include "mail.h"
#include "constants/battle_config.h"
#include "field_weather.h"
#include "constants/abilities.h"
#include "constants/battle_anim.h"

108
src/data/battle_moves.h
View File

@ -202,7 +202,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.power = 0,
.type = TYPE_NORMAL,
.accuracy = 0,
.pp = 30,
.pp = 20,
.secondaryEffectChance = 0,
.target = MOVE_TARGET_USER,
.priority = 0,
@ -257,12 +257,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.effect = EFFECT_ROAR,
.power = 0,
.type = TYPE_NORMAL,
.accuracy = 100,
.accuracy = 0,
.pp = 20,
.secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED,
.priority = -6,
.flags = FLAG_MIRROR_MOVE_AFFECTED,
.flags = FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED,
.split = SPLIT_STATUS,
},
@ -495,7 +495,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.effect = EFFECT_TRAP,
.power = 15,
.type = TYPE_NORMAL,
.accuracy = 85,
.accuracy = 90,
.pp = 20,
.secondaryEffectChance = 100,
.target = MOVE_TARGET_SELECTED,
@ -649,7 +649,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.effect = EFFECT_ROAR,
.power = 0,
.type = TYPE_NORMAL,
.accuracy = 100,
.accuracy = 0,
.pp = 20,
.secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED,
@ -1409,7 +1409,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.pp = 20,
.secondaryEffectChance = 0,
.target = MOVE_TARGET_USER,
.priority = 0,
.priority = -6,
.flags = 0,
.split = SPLIT_STATUS,
},
@ -1433,7 +1433,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.effect = EFFECT_MIMIC,
.power = 0,
.type = TYPE_NORMAL,
.accuracy = 100,
.accuracy = 0,
.pp = 10,
.secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED,
@ -1725,10 +1725,10 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
[MOVE_SMOG] =
{
.effect = EFFECT_POISON_HIT,
.power = 20,
.power = 30,
.type = TYPE_POISON,
.accuracy = 70,
.pp = 30,
.pp = 20,
.secondaryEffectChance = 40,
.target = MOVE_TARGET_SELECTED,
.priority = 0,
@ -1954,7 +1954,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.accuracy = 90,
.pp = 40,
.secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED,
.target = MOVE_TARGET_BOTH,
.priority = 0,
.flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED,
.split = SPLIT_STATUS,
@ -2321,7 +2321,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED,
.priority = 0,
.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED,
.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED,
.split = SPLIT_PHYSICAL,
},
@ -2372,7 +2372,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.effect = EFFECT_MEAN_LOOK,
.power = 0,
.type = TYPE_BUG,
.accuracy = 100,
.accuracy = 0,
.pp = 10,
.secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED,
@ -2501,7 +2501,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.accuracy = 100,
.pp = 40,
.secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED,
.target = MOVE_TARGET_BOTH,
.priority = 0,
.flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_POWDER,
.split = SPLIT_STATUS,
@ -2558,7 +2558,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.pp = 10,
.secondaryEffectChance = 0,
.target = MOVE_TARGET_USER,
.priority = 3,
.priority = 4,
.flags = FLAG_PROTECTION_MOVE,
.split = SPLIT_STATUS,
},
@ -2601,7 +2601,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED,
.priority = 0,
.flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED,
.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED,
.split = SPLIT_PHYSICAL,
},
@ -2768,7 +2768,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.pp = 5,
.secondaryEffectChance = 0,
.target = MOVE_TARGET_USER,
.priority = 3,
.priority = 4,
.flags = FLAG_PROTECTION_MOVE,
.split = SPLIT_STATUS,
},
@ -2852,7 +2852,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.pp = 10,
.secondaryEffectChance = 0,
.target = MOVE_TARGET_USER,
.priority = 3,
.priority = 4,
.flags = FLAG_PROTECTION_MOVE,
.split = SPLIT_STATUS,
},
@ -2974,7 +2974,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.effect = EFFECT_MEAN_LOOK,
.power = 0,
.type = TYPE_NORMAL,
.accuracy = 100,
.accuracy = 0,
.pp = 5,
.secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED,
@ -3210,7 +3210,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
[MOVE_RAPID_SPIN] =
{
.effect = EFFECT_RAPID_SPIN,
.power = 20,
.power = 50,
.type = TYPE_NORMAL,
.accuracy = 100,
.pp = 40,
@ -3268,7 +3268,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.effect = EFFECT_VITAL_THROW,
.power = 70,
.type = TYPE_FIGHTING,
.accuracy = 100,
.accuracy = 0,
.pp = 10,
.secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED,
@ -3371,7 +3371,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.secondaryEffectChance = 0,
.target = MOVE_TARGET_USER,
.priority = 0,
.flags = FLAG_DANCE,
.flags = 0,
.split = SPLIT_STATUS,
},
@ -3413,7 +3413,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.secondaryEffectChance = 0,
.target = MOVE_TARGET_DEPENDS,
.priority = -5,
.flags = FLAG_MIRROR_MOVE_AFFECTED,
.flags = FLAG_PROTECT_AFFECTED,
.split = SPLIT_SPECIAL,
},
@ -3427,7 +3427,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED,
.priority = 0,
.flags = FLAG_SNATCH_AFFECTED,
.flags = 0,
.split = SPLIT_STATUS,
},
@ -3455,7 +3455,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.secondaryEffectChance = 10,
.target = MOVE_TARGET_SELECTED,
.priority = 0,
.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST,
.flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST,
.split = SPLIT_SPECIAL,
},
@ -3538,7 +3538,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.pp = 10,
.secondaryEffectChance = 100,
.target = MOVE_TARGET_SELECTED,
.priority = 1,
.priority = 3,
.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST,
.split = SPLIT_PHYSICAL,
},
@ -3735,7 +3735,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.pp = 20,
.secondaryEffectChance = 0,
.target = MOVE_TARGET_USER,
.priority = 3,
.priority = 2,
.flags = 0,
.split = SPLIT_STATUS,
},
@ -3778,7 +3778,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED,
.priority = 0,
.flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED,
.flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED,
.split = SPLIT_STATUS,
},
@ -3815,7 +3815,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.effect = EFFECT_ROLE_PLAY,
.power = 0,
.type = TYPE_PSYCHIC,
.accuracy = 100,
.accuracy = 0,
.pp = 10,
.secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED,
@ -3941,7 +3941,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.effect = EFFECT_YAWN,
.power = 0,
.type = TYPE_NORMAL,
.accuracy = 100,
.accuracy = 0,
.pp = 10,
.secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED,
@ -3997,7 +3997,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.effect = EFFECT_SKILL_SWAP,
.power = 0,
.type = TYPE_PSYCHIC,
.accuracy = 100,
.accuracy = 0,
.pp = 10,
.secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED,
@ -4184,7 +4184,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.secondaryEffectChance = 0,
.target = MOVE_TARGET_FOES_AND_ALLY,
.priority = 0,
.flags = FLAG_PROTECT_AFFECTED | FLAG_DANCE,
.flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_DANCE,
.split = SPLIT_STATUS,
},
@ -4279,7 +4279,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.type = TYPE_POISON,
.accuracy = 100,
.pp = 15,
.secondaryEffectChance = 30,
.secondaryEffectChance = 50,
.target = MOVE_TARGET_SELECTED,
.priority = 0,
.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_SHEER_FORCE_BOOST | FLAG_STRONG_JAW_BOOST,
@ -4422,7 +4422,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.secondaryEffectChance = 100,
.target = MOVE_TARGET_SELECTED,
.priority = 0,
.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED,
.flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED,
.split = SPLIT_SPECIAL,
},
@ -4697,7 +4697,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.effect = EFFECT_MEAN_LOOK,
.power = 0,
.type = TYPE_NORMAL,
.accuracy = 100,
.accuracy = 0,
.pp = 5,
.secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED,
@ -4716,7 +4716,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.secondaryEffectChance = 0,
.target = MOVE_TARGET_USER,
.priority = 0,
.flags = FLAG_SNATCH_AFFECTED,
.flags = FLAG_SNATCH_AFFECTED | FLAG_SOUND,
.split = SPLIT_STATUS,
},
@ -4815,7 +4815,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.secondaryEffectChance = 100,
.target = MOVE_TARGET_SELECTED,
.priority = 0,
.flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED,
.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED,
.split = SPLIT_PHYSICAL,
},
@ -5167,7 +5167,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.secondaryEffectChance = 0,
.target = MOVE_TARGET_DEPENDS,
.priority = 0,
.flags = 0,
.flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED,
.split = SPLIT_PHYSICAL,
},
@ -5644,7 +5644,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED,
.priority = 0,
.flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED,
.flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED | FLAG_BALLISTIC,
.split = SPLIT_PHYSICAL,
},
@ -6557,7 +6557,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED,
.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,
},
@ -6796,7 +6796,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED,
.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,
},
@ -6806,7 +6806,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.power = 120,
.type = TYPE_PSYCHIC,
.accuracy = 100,
.pp = 15,
.pp = 10,
.secondaryEffectChance = 0,
.target = MOVE_TARGET_FOES_AND_ALLY,
.priority = 0,
@ -7048,7 +7048,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.pp = 15,
.secondaryEffectChance = 0,
.target = MOVE_TARGET_USER,
.priority = 1,
.priority = 2,
.flags = 0,
.split = SPLIT_STATUS,
},
@ -7949,7 +7949,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.secondaryEffectChance = 100,
.target = MOVE_TARGET_SELECTED,
.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,
.argument = MOVE_EFFECT_FEINT,
},
@ -8824,7 +8824,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED,
.priority = 0,
.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED,
.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_IRON_FIST_BOOST,
.split = SPLIT_PHYSICAL,
},
@ -8978,7 +8978,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED,
.priority = 0,
.flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED,
.flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED | FLAG_BALLISTIC,
.split = SPLIT_SPECIAL,
},
@ -9174,7 +9174,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED,
.priority = -3,
.flags = FLAG_PROTECT_AFFECTED,
.flags = FLAG_PROTECT_AFFECTED | FLAG_BALLISTIC,
.split = SPLIT_PHYSICAL,
},
@ -9272,7 +9272,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED,
.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_STRONG_JAW_BOOST,
.split = SPLIT_PHYSICAL,
},
@ -9433,7 +9433,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
[MOVE_MULTI_ATTACK] =
{
.effect = EFFECT_PLACEHOLDER,
.power = 90,
.power = 120,
.type = TYPE_NORMAL,
.accuracy = 100,
.pp = 10,
@ -9468,7 +9468,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.secondaryEffectChance = 0,
.target = MOVE_TARGET_FOES_AND_ALLY,
.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_IRON_FIST_BOOST,
.split = SPLIT_PHYSICAL,
},
@ -9496,7 +9496,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.secondaryEffectChance = 30,
.target = MOVE_TARGET_FOES_AND_ALLY,
.priority = 0,
.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED,
.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_DMG_MINIMIZE | FLAG_IRON_FIST_BOOST,
.split = SPLIT_PHYSICAL,
},
@ -9538,7 +9538,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED,
.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_STRONG_JAW_BOOST,
.split = SPLIT_PHYSICAL,
},
@ -9594,7 +9594,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED,
.priority = 0,
.flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED,
.flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_POWDER,
.split = SPLIT_STATUS,
.argument = TYPE_PSYCHIC,
},
@ -9665,7 +9665,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.secondaryEffectChance = 0,
.target = MOVE_TARGET_SELECTED,
.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_STRONG_JAW_BOOST,
.split = SPLIT_PHYSICAL,
},
@ -9763,7 +9763,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.secondaryEffectChance = 10,
.target = MOVE_TARGET_SELECTED,
.priority = 0,
.flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED,
.flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED | FLAG_BALLISTIC,
.split = SPLIT_PHYSICAL,
},

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

61
src/pokemon.c
View File

@ -5560,6 +5560,24 @@ void MonGainEVs(struct Pokemon *mon, u16 defeatedSpecies)
u16 heldItem;
u8 holdEffect;
int i, multiplier;
u8 stat;
u8 bonus;
heldItem = GetMonData(mon, MON_DATA_HELD_ITEM, 0);
if (heldItem == ITEM_ENIGMA_BERRY)
{
if (gMain.inBattle)
holdEffect = gEnigmaBerries[0].holdEffect;
else
holdEffect = gSaveBlock1Ptr->enigmaBerry.holdEffect;
}
else
{
holdEffect = ItemId_GetHoldEffect(heldItem);
}
stat = ItemId_GetSecondaryId(heldItem);
bonus = ItemId_GetHoldEffectParam(heldItem);
for (i = 0; i < NUM_STATS; i++)
{
@ -5580,36 +5598,41 @@ void MonGainEVs(struct Pokemon *mon, u16 defeatedSpecies)
switch (i)
{
case STAT_HP:
evIncrease = gBaseStats[defeatedSpecies].evYield_HP * multiplier;
if (holdEffect == HOLD_EFFECT_POWER_ITEM && stat == STAT_HP)
evIncrease = (gBaseStats[defeatedSpecies].evYield_HP + bonus) * multiplier;
else
evIncrease = gBaseStats[defeatedSpecies].evYield_HP * multiplier;
break;
case STAT_ATK:
evIncrease = gBaseStats[defeatedSpecies].evYield_Attack * multiplier;
if (holdEffect == HOLD_EFFECT_POWER_ITEM && stat == STAT_ATK)
evIncrease = (gBaseStats[defeatedSpecies].evYield_Attack + bonus) * multiplier;
else
evIncrease = gBaseStats[defeatedSpecies].evYield_Attack * multiplier;
break;
case STAT_DEF:
evIncrease = gBaseStats[defeatedSpecies].evYield_Defense * multiplier;
if (holdEffect == HOLD_EFFECT_POWER_ITEM && stat == STAT_DEF)
evIncrease = (gBaseStats[defeatedSpecies].evYield_Defense + bonus) * multiplier;
else
evIncrease = gBaseStats[defeatedSpecies].evYield_Defense * multiplier;
break;
case STAT_SPEED:
evIncrease = gBaseStats[defeatedSpecies].evYield_Speed * multiplier;
if (holdEffect == HOLD_EFFECT_POWER_ITEM && stat == STAT_SPEED)
evIncrease = (gBaseStats[defeatedSpecies].evYield_Speed + bonus) * multiplier;
else
evIncrease = gBaseStats[defeatedSpecies].evYield_Speed * multiplier;
break;
case STAT_SPATK:
evIncrease = gBaseStats[defeatedSpecies].evYield_SpAttack * multiplier;
if (holdEffect == HOLD_EFFECT_POWER_ITEM && stat == STAT_SPATK)
evIncrease = (gBaseStats[defeatedSpecies].evYield_SpAttack + bonus) * multiplier;
else
evIncrease = gBaseStats[defeatedSpecies].evYield_SpAttack * multiplier;
break;
case STAT_SPDEF:
evIncrease = gBaseStats[defeatedSpecies].evYield_SpDefense * multiplier;
break;
}
heldItem = GetMonData(mon, MON_DATA_HELD_ITEM, 0);
if (heldItem == ITEM_ENIGMA_BERRY)
{
if (gMain.inBattle)
holdEffect = gEnigmaBerries[0].holdEffect;
if (holdEffect == HOLD_EFFECT_POWER_ITEM && stat == STAT_SPDEF)
evIncrease = (gBaseStats[defeatedSpecies].evYield_SpDefense + bonus) * multiplier;
else
holdEffect = gSaveBlock1Ptr->enigmaBerry.holdEffect;
}
else
{
holdEffect = ItemId_GetHoldEffect(heldItem);
evIncrease = gBaseStats[defeatedSpecies].evYield_SpDefense * multiplier;
break;
}
if (holdEffect == HOLD_EFFECT_MACHO_BRACE)