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

Implemented Take Heart's effect

Browse Source
This commit is contained in:
LOuroboros 2022-12-14 11:13:52 -03:00
parent d2a221eb85
commit 8ae57dc912
3 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
data/battle_scripts_1.s
View File

@ -425,6 +425,25 @@ gBattleScriptsForMoveEffects::
.4byte BattleScript_EffectBarbBarrage @ EFFECT_BARB_BARRAGE .4byte BattleScript_EffectBarbBarrage @ EFFECT_BARB_BARRAGE
.4byte BattleScript_EffectTripleArrows @ EFFECT_TRIPLE_ARROWS .4byte BattleScript_EffectTripleArrows @ EFFECT_TRIPLE_ARROWS
.4byte BattleScript_EffectInfernalParade @ EFFECT_INFERNAL_PARADE .4byte BattleScript_EffectInfernalParade @ EFFECT_INFERNAL_PARADE
.4byte BattleScript_EffectTakeHeart @ EFFECT_TAKE_HEART
BattleScript_EffectTakeHeart::
@ TO DO: Use modifybattlerstatstage here once PR #2470 is merged.
printstring STRINGID_EMPTYSTRING3
playstatchangeanimation BS_ATTACKER, BIT_SPATK, 0
setstatchanger STAT_SPATK, 1, FALSE
statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_TakeHeartTrySpDef
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_TakeHeartTrySpDef:
printstring STRINGID_EMPTYSTRING3
playstatchangeanimation BS_ATTACKER, BIT_SPDEF, 0
setstatchanger STAT_SPDEF, 1, FALSE
statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_TakeHeart_MoveEnd
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_TakeHeart_MoveEnd:
goto BattleScript_MoveEnd
BattleScript_EffectInfernalParade:: BattleScript_EffectInfernalParade::
setmoveeffect MOVE_EFFECT_BURN setmoveeffect MOVE_EFFECT_BURN

3
include/constants/battle_move_effects.h
View File

@ -406,7 +406,8 @@
#define EFFECT_BARB_BARRAGE 400 #define EFFECT_BARB_BARRAGE 400
#define EFFECT_TRIPLE_ARROWS 401 #define EFFECT_TRIPLE_ARROWS 401
#define EFFECT_INFERNAL_PARADE 402 #define EFFECT_INFERNAL_PARADE 402
#define EFFECT_TAKE_HEART 403
#define NUM_BATTLE_MOVE_EFFECTS 403 #define NUM_BATTLE_MOVE_EFFECTS 404
#endif // GUARD_CONSTANTS_BATTLE_MOVE_EFFECTS_H #endif // GUARD_CONSTANTS_BATTLE_MOVE_EFFECTS_H

2
src/data/battle_moves.h
View File

@ -12850,7 +12850,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] =
[MOVE_TAKE_HEART] = [MOVE_TAKE_HEART] =
{ {
.effect = EFFECT_PLACEHOLDER, // EFFECT_TAKE_HEART, .effect = EFFECT_TAKE_HEART,
.power = 0, .power = 0,
.type = TYPE_PSYCHIC, .type = TYPE_PSYCHIC,
.accuracy = 0, .accuracy = 0,