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

Merge pull request #438 from LOuroboros/effect_sleep_hit

Browse source 
Implemented Relic Song's effect
This commit is contained in:
DizzyEggg 2020-06-22 10:10:15 +02:00 committed by GitHub
commit f2d2c1b76f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
data/battle_scripts_1.s
View file

@ -364,6 +364,11 @@ gBattleScriptsForMoveEffects:: @ 82D86A8
.4byte BattleScript_EffectGeomancy .4byte BattleScript_EffectGeomancy
.4byte BattleScript_EffectFairyLock .4byte BattleScript_EffectFairyLock
.4byte BattleScript_EffectAllySwitch .4byte BattleScript_EffectAllySwitch
.4byte BattleScript_EffectSleepHit
BattleScript_EffectSleepHit:
setmoveeffect MOVE_EFFECT_SLEEP
goto BattleScript_EffectHit
BattleScript_EffectAllySwitch: BattleScript_EffectAllySwitch:
attackcanceler attackcanceler

1
include/constants/battle_move_effects.h
View file

@ -351,5 +351,6 @@
#define EFFECT_GEOMANCY 345 #define EFFECT_GEOMANCY 345
#define EFFECT_FAIRY_LOCK 346 #define EFFECT_FAIRY_LOCK 346
#define EFFECT_ALLY_SWITCH 347 #define EFFECT_ALLY_SWITCH 347
#define EFFECT_SLEEP_HIT 348 // Relic Song
#endif // GUARD_CONSTANTS_BATTLE_MOVE_EFFECTS_H #endif // GUARD_CONSTANTS_BATTLE_MOVE_EFFECTS_H

2
src/data/battle_moves.h
View file

@ -7671,7 +7671,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
[MOVE_RELIC_SONG] = [MOVE_RELIC_SONG] =
{ {
.effect = EFFECT_SLEEP, .effect = EFFECT_SLEEP_HIT,
.power = 75, .power = 75,
.type = TYPE_NORMAL, .type = TYPE_NORMAL,
.accuracy = 100, .accuracy = 100,