ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-18 17:34:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

water shuriken and howl

Browse Source
This commit is contained in:
amiosi 2021-02-11 16:20:13 -05:00
parent 172fe3a257
commit c0ba7436af
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/constants/battle_config.h
View File

@ -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_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_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_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 // Other move settings
#define B_SOUND_SUBSTITUTE GEN_6 // In Gen6+, sound moves bypass Substitute. #define B_SOUND_SUBSTITUTE GEN_6 // In Gen6+, sound moves bypass Substitute.

8
src/data/battle_moves.h
View File

@ -5354,13 +5354,17 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
[MOVE_HOWL] = [MOVE_HOWL] =
{ {
#if B_UPDATED_MOVE_DATA >= GEN_8
.target = MOVE_TARGET_SELECTED,
#else
.target = MOVE_TARGET_USER,
#endif
.effect = EFFECT_ATTACK_UP, .effect = EFFECT_ATTACK_UP,
.power = 0, .power = 0,
.type = TYPE_NORMAL, .type = TYPE_NORMAL,
.accuracy = 0, .accuracy = 0,
.pp = 40, .pp = 40,
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
.target = MOVE_TARGET_USER,
.priority = 0, .priority = 0,
.flags = FLAG_SNATCH_AFFECTED | FLAG_SOUND, .flags = FLAG_SNATCH_AFFECTED | FLAG_SOUND,
.split = SPLIT_STATUS, .split = SPLIT_STATUS,
@ -9303,7 +9307,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
[MOVE_WATER_SHURIKEN] = [MOVE_WATER_SHURIKEN] =
{ {
#if B_WATER_SHURIKEN_SPLIT >= GEN_7 #if B_UPDATED_MOVE_DATA >= GEN_7
.split = SPLIT_SPECIAL, .split = SPLIT_SPECIAL,
#else #else
.split = SPLIT_PHYSICAL, .split = SPLIT_PHYSICAL,