From 721dbe917849039df29644729aa879256b24fe16 Mon Sep 17 00:00:00 2001 From: MissingNoL Date: Sat, 12 Jun 2021 18:01:35 -0700 Subject: [PATCH] Implemented all PLG effects --- data/battle_scripts_1.s | 31 +++++++++++++++++++++++++ include/constants/battle_move_effects.h | 7 +++++- src/data/battle_moves.h | 10 ++++---- 3 files changed, 42 insertions(+), 6 deletions(-) diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index d41231dcd8..1343b0523e 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -371,6 +371,37 @@ gBattleScriptsForMoveEffects:: @ 82D86A8 .4byte BattleScript_EffectBodyPress .4byte BattleScript_EffectEvasionUpHit .4byte BattleScript_EffectDoubleIronBash + .4byte BattleScript_EffectGlitzyGlow + .4byte BattleScript_EffectBaddyBad + .4byte BattleScript_EffectSappySeed + .4byte BattleScript_EffectFreezyFrost + .4byte BattleScript_EffectSparklySwirl + +BattleScript_EffectSparklySwirl: + healpartystatus + waitstate + updatestatusicon BS_ATTACKER_WITH_PARTNER + waitstate + goto BattleScript_EffectHit + +BattleScript_EffectFreezyFrost: + normalisebuffs + goto BattleScript_EffectHit + +BattleScript_EffectSappySeed: + jumpifstatus3 BS_TARGET, STATUS3_LEECHSEED, BattleScript_EffectHit + setseeded + goto BattleScript_EffectHit + +BattleScript_EffectBaddyBad: + jumpifsideaffecting BS_ATTACKER, SIDE_STATUS_REFLECT, BattleScript_EffectHit + setreflect + goto BattleScript_EffectHit + +BattleScript_EffectGlitzyGlow: + jumpifsideaffecting BS_ATTACKER, SIDE_STATUS_LIGHTSCREEN, BattleScript_EffectHit + setlightscreen + goto BattleScript_EffectHit BattleScript_EffectDoubleIronBash: attackcanceler diff --git a/include/constants/battle_move_effects.h b/include/constants/battle_move_effects.h index d056edf6a9..884a83d604 100644 --- a/include/constants/battle_move_effects.h +++ b/include/constants/battle_move_effects.h @@ -355,7 +355,12 @@ #define EFFECT_BODY_PRESS 349 #define EFFECT_EVASION_UP_HIT 350 #define EFFECT_DOUBLE_IRON_BASH 351 +#define EFFECT_GLITZY_GLOW 352 +#define EFFECT_BADDY_BAD 353 +#define EFFECT_SAPPY_SEED 354 +#define EFFECT_FREEZY_FROST 355 +#define EFFECT_SPARKLY_SWIRL 356 -#define NUM_BATTLE_MOVE_EFFECTS 352 +#define NUM_BATTLE_MOVE_EFFECTS 357 #endif // GUARD_CONSTANTS_BATTLE_MOVE_EFFECTS_H diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index 4a917dc9be..df33efb21c 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -10599,7 +10599,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .accuracy = 100, .flags = FLAG_PROTECT_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, #endif - .effect = EFFECT_PLACEHOLDER, //TODO (Light Screen + Hit) + .effect = EFFECT_GLITZY_GLOW, .type = TYPE_PSYCHIC, .pp = 15, .secondaryEffectChance = 0, @@ -10619,7 +10619,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .accuracy = 100, .flags = FLAG_PROTECT_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, #endif - .effect = EFFECT_PLACEHOLDER, //TODO (Reflect + Hit) + .effect = EFFECT_BADDY_BAD, .type = TYPE_DARK, .pp = 15, .secondaryEffectChance = 0, @@ -10641,7 +10641,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .pp = 15, .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGIC_COAT_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, #endif - .effect = EFFECT_PLACEHOLDER, //TODO (Leech Seed + Hit) + .effect = EFFECT_SAPPY_SEED, .type = TYPE_GRASS, .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, @@ -10662,7 +10662,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .pp = 15, .flags = FLAG_PROTECT_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, #endif - .effect = EFFECT_PLACEHOLDER, //TODO (Haze + Hit) + .effect = EFFECT_FREEZY_FROST, .type = TYPE_ICE, .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, @@ -10683,7 +10683,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .pp = 15, .flags = FLAG_PROTECT_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, #endif - .effect = EFFECT_PLACEHOLDER, //TODO (Heal Bell + Hit) + .effect = EFFECT_SPARKLY_SWIRL, .type = TYPE_FAIRY, .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED,