From 33a45ba181f9f3e35b11a4dc90f86bf1741a0597 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Tue, 16 Jun 2020 07:06:38 -0300 Subject: [PATCH] Implemented Relic Song's effect --- data/battle_scripts_1.s | 5 +++++ include/constants/battle_move_effects.h | 1 + src/data/battle_moves.h | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index bd55ca97c7..7cd0a89953 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -364,6 +364,11 @@ gBattleScriptsForMoveEffects:: @ 82D86A8 .4byte BattleScript_EffectGeomancy .4byte BattleScript_EffectFairyLock .4byte BattleScript_EffectAllySwitch + .4byte BattleScript_EffectSleepHit + +BattleScript_EffectSleepHit: + setmoveeffect MOVE_EFFECT_SLEEP + goto BattleScript_EffectHit BattleScript_EffectAllySwitch: attackcanceler diff --git a/include/constants/battle_move_effects.h b/include/constants/battle_move_effects.h index 7cdc993d25..7b19d1eb71 100644 --- a/include/constants/battle_move_effects.h +++ b/include/constants/battle_move_effects.h @@ -351,5 +351,6 @@ #define EFFECT_GEOMANCY 345 #define EFFECT_FAIRY_LOCK 346 #define EFFECT_ALLY_SWITCH 347 +#define EFFECT_SLEEP_HIT 348 // Relic Song #endif // GUARD_CONSTANTS_BATTLE_MOVE_EFFECTS_H diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index 29f0a86906..dae8dea55a 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -7671,7 +7671,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = [MOVE_RELIC_SONG] = { - .effect = EFFECT_SLEEP, + .effect = EFFECT_SLEEP_HIT, .power = 75, .type = TYPE_NORMAL, .accuracy = 100,