From 308bf50dccf923f911fa2d7931d247e807dca3b8 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada D'Ottone Date: Sat, 27 Jan 2024 15:33:29 -0300 Subject: [PATCH] Set EFFECT_PLACEHOLDER as the default move effect (#4079) --- include/constants/battle_move_effects.h | 2 +- src/data/battle_move_effects.h | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/constants/battle_move_effects.h b/include/constants/battle_move_effects.h index d118be8a31..7f6b607c63 100644 --- a/include/constants/battle_move_effects.h +++ b/include/constants/battle_move_effects.h @@ -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, diff --git a/src/data/battle_move_effects.h b/src/data/battle_move_effects.h index 3e82246114..b739c007a7 100644 --- a/src/data/battle_move_effects.h +++ b/src/data/battle_move_effects.h @@ -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,