ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-21 11:43:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Implemented all PLG effects

Browse Source
This commit is contained in:
MissingNoL 2021-06-12 18:01:35 -07:00
parent 610b18bfdb
commit 721dbe9178
3 changed files with 42 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
data/battle_scripts_1.s
View File

@ -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

7
include/constants/battle_move_effects.h
View File

@ -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

10
src/data/battle_moves.h
View File

@ -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,