From c0ba7436af0ccd9ea41a397d545fe7c5d225b0fd Mon Sep 17 00:00:00 2001 From: amiosi <44352097+amiosi@users.noreply.github.com> Date: Thu, 11 Feb 2021 16:20:13 -0500 Subject: [PATCH] water shuriken and howl --- include/constants/battle_config.h | 1 - src/data/battle_moves.h | 8 ++++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/include/constants/battle_config.h b/include/constants/battle_config.h index f7b38000c..5794afaf6 100644 --- a/include/constants/battle_config.h +++ b/include/constants/battle_config.h @@ -98,7 +98,6 @@ #define B_FELL_STINGER_STAT_RAISE GEN_6 // In Gen7+, it raises Atk by 3 stages instead of 2 if it causes the target to faint. #define B_KINGS_SHIELD_LOWER_ATK GEN_6 // In Gen7+, it lowers Atk by 1 stage instead of 2 of oponents that hit it. #define B_SPEED_BUFFING_RAPID_SPIN GEN_8 // In Gen8, Rapid Spin raises the user's Speed by 1 stage. -#define B_WATER_SHURIKEN_SPLIT GEN_8 // In Gen7, Water Shuriken was changed from Physical to Special. // Other move settings #define B_SOUND_SUBSTITUTE GEN_6 // In Gen6+, sound moves bypass Substitute. diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index baa7f9fb7..30b25f810 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -5354,13 +5354,17 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = [MOVE_HOWL] = { + #if B_UPDATED_MOVE_DATA >= GEN_8 + .target = MOVE_TARGET_SELECTED, + #else + .target = MOVE_TARGET_USER, + #endif .effect = EFFECT_ATTACK_UP, .power = 0, .type = TYPE_NORMAL, .accuracy = 0, .pp = 40, .secondaryEffectChance = 0, - .target = MOVE_TARGET_USER, .priority = 0, .flags = FLAG_SNATCH_AFFECTED | FLAG_SOUND, .split = SPLIT_STATUS, @@ -9303,7 +9307,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = [MOVE_WATER_SHURIKEN] = { - #if B_WATER_SHURIKEN_SPLIT >= GEN_7 + #if B_UPDATED_MOVE_DATA >= GEN_7 .split = SPLIT_SPECIAL, #else .split = SPLIT_PHYSICAL,