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

Implemented Ceaseless Edge's effect

Browse Source
This commit is contained in:
LOuroboros 2022-12-12 21:08:46 -03:00
parent da535fc8f1
commit ae482ed1f4
3 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
data/battle_scripts_1.s
View File

@ -416,6 +416,18 @@ gBattleScriptsForMoveEffects::
.4byte BattleScript_EffectDoubleShock @ EFFECT_DOUBLE_SHOCK .4byte BattleScript_EffectDoubleShock @ EFFECT_DOUBLE_SHOCK
.4byte BattleScript_EffectSpecialAttackUpHit @ EFFECT_SPECIAL_ATTACK_UP_HIT .4byte BattleScript_EffectSpecialAttackUpHit @ EFFECT_SPECIAL_ATTACK_UP_HIT
.4byte BattleScript_EffectVictoryDance @ EFFECT_VICTORY_DANCE .4byte BattleScript_EffectVictoryDance @ EFFECT_VICTORY_DANCE
.4byte BattleScript_EffectCeaselessEdge @ EFFECT_CEASELESS_EDGE
BattleScript_EffectCeaselessEdge::
call BattleScript_EffectHit_Ret
trysetspikes BattleScript_ButItFailedAtkStringPpReduce
attackstring
ppreduce
attackanimation
waitanimation
printstring STRINGID_SPIKESSCATTERED
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
BattleScript_AffectionBasedEndurance:: BattleScript_AffectionBasedEndurance::
playanimation BS_TARGET, B_ANIM_AFFECTION_HANGED_ON playanimation BS_TARGET, B_ANIM_AFFECTION_HANGED_ON
@ -3029,6 +3041,29 @@ BattleScript_MoveEnd::
moveendall moveendall
end end
BattleScript_EffectHit_Ret::
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 B_WAIT_TIME_LONG
resultmessage
waitmessage B_WAIT_TIME_LONG
seteffectwithchance
tryfaintmon BS_TARGET
return
BattleScript_EffectNaturalGift: BattleScript_EffectNaturalGift:
attackcanceler attackcanceler
attackstring attackstring

3
include/constants/battle_move_effects.h
View File

@ -397,7 +397,8 @@
#define EFFECT_DOUBLE_SHOCK 391 #define EFFECT_DOUBLE_SHOCK 391
#define EFFECT_SPECIAL_ATTACK_UP_HIT 392 #define EFFECT_SPECIAL_ATTACK_UP_HIT 392
#define EFFECT_VICTORY_DANCE 393 #define EFFECT_VICTORY_DANCE 393
#define EFFECT_CEASELESS_EDGE 394
#define NUM_BATTLE_MOVE_EFFECTS 394 #define NUM_BATTLE_MOVE_EFFECTS 395
#endif // GUARD_CONSTANTS_BATTLE_MOVE_EFFECTS_H #endif // GUARD_CONSTANTS_BATTLE_MOVE_EFFECTS_H

2
src/data/battle_moves.h
View File

@ -13598,7 +13598,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] =
[MOVE_CEASELESS_EDGE] = [MOVE_CEASELESS_EDGE] =
{ {
.effect = EFFECT_PLACEHOLDER, // EFFECT_CEASELESS_EDGE, .effect = EFFECT_CEASELESS_EDGE,
.power = 65, .power = 65,
.type = TYPE_DARK, .type = TYPE_DARK,
.accuracy = 90, .accuracy = 90,