Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-08-27 21:20:50 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Set EFFECT_PLACEHOLDER as the default move effect (#4079)

Browse Source
This commit is contained in:
Eduardo Quezada D'Ottone
2024-01-27 15:33:29 -03:00
committed by GitHub
parent b9a02b205d
commit 308bf50dcc
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/constants/battle_move_effects.h
View File

@@ -2,6 +2,7 @@
#define GUARD_CONSTANTS_BATTLE_MOVE_EFFECTS_H
enum {
EFFECT_PLACEHOLDER,
EFFECT_HIT,
EFFECT_SLEEP,
EFFECT_ABSORB,
@@ -173,7 +174,6 @@ enum {
EFFECT_COSMIC_POWER,
EFFECT_SKY_UPPERCUT,
EFFECT_BULK_UP,
EFFECT_PLACEHOLDER,
EFFECT_WATER_SPORT,
EFFECT_CALM_MIND,
EFFECT_DRAGON_DANCE,

12
src/data/battle_move_effects.h
View File

@@ -4,6 +4,12 @@
const struct BattleMoveEffect gBattleMoveEffects[NUM_BATTLE_MOVE_EFFECTS] =
{
[EFFECT_PLACEHOLDER] =
{
.battleScript = BattleScript_EffectPlaceholder,
.battleTvScore = 0,
},
[EFFECT_HIT] =
{
.battleScript = BattleScript_EffectHit,
@@ -1108,12 +1114,6 @@ const struct BattleMoveEffect gBattleMoveEffects[NUM_BATTLE_MOVE_EFFECTS] =
.encourageEncore = TRUE,
},
[EFFECT_PLACEHOLDER] =
{
.battleScript = BattleScript_EffectPlaceholder,
.battleTvScore = 0, // TODO: Assign points
},
[EFFECT_WATER_SPORT] =
{
.battleScript = BattleScript_EffectWaterSport,