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

Merge pull request #1716 from AsparagusEduardo/fix_Howl

Browse Source 
Updated sound flags for Howl and Heal Bell
This commit is contained in:
ghoulslash 2021-10-06 09:25:57 -04:00 committed by GitHub
commit 2a45d9041c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/data/battle_moves.h
View File

@ -3424,6 +3424,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
[MOVE_HEAL_BELL] = [MOVE_HEAL_BELL] =
{ {
#if B_UPDATED_MOVE_DATA != GEN_5
.flags = FLAG_SNATCH_AFFECTED | FLAG_SOUND,
#else
.flags = FLAG_SNATCH_AFFECTED,
#endif
.effect = EFFECT_HEAL_BELL, .effect = EFFECT_HEAL_BELL,
.power = 0, .power = 0,
.type = TYPE_NORMAL, .type = TYPE_NORMAL,
@ -3432,7 +3437,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
.target = MOVE_TARGET_USER, .target = MOVE_TARGET_USER,
.priority = 0, .priority = 0,
.flags = FLAG_SNATCH_AFFECTED | FLAG_SOUND,
.split = SPLIT_STATUS, .split = SPLIT_STATUS,
}, },
@ -5338,6 +5342,11 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
[MOVE_HOWL] = [MOVE_HOWL] =
{ {
#if B_UPDATED_MOVE_DATA >= GEN_8
.flags = FLAG_SNATCH_AFFECTED | FLAG_SOUND,
#else
.flags = FLAG_SNATCH_AFFECTED,
#endif
.effect = EFFECT_ATTACK_UP, .effect = EFFECT_ATTACK_UP,
.power = 0, .power = 0,
.type = TYPE_NORMAL, .type = TYPE_NORMAL,
@ -5346,7 +5355,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
.target = MOVE_TARGET_USER, .target = MOVE_TARGET_USER,
.priority = 0, .priority = 0,
.flags = FLAG_SNATCH_AFFECTED | FLAG_SOUND,
.split = SPLIT_STATUS, .split = SPLIT_STATUS,
}, },