From 7b530a34bf20cf117a231a9133d8ed00aed490c2 Mon Sep 17 00:00:00 2001 From: amiosi <44352097+amiosi@users.noreply.github.com> Date: Thu, 27 May 2021 20:14:46 -0400 Subject: [PATCH] finish requested changes --- src/battle_script_commands.c | 21 ++++++++++++++++++--- src/data/battle_moves.h | 18 +++--------------- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 690ebb160d..fb53445ee0 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -920,6 +920,7 @@ static const u8 sForbiddenMoves[MOVES_COUNT] = [MOVE_ASSIST] = FORBIDDEN_METRONOME | FORBIDDEN_ASSIST | FORBIDDEN_COPYCAT | FORBIDDEN_SLEEP_TALK, [MOVE_ASTRAL_BARRAGE] = FORBIDDEN_METRONOME, [MOVE_AURA_WHEEL] = FORBIDDEN_METRONOME, + [MOVE_BADDY_BAD] = FORBIDDEN_METRONOME, [MOVE_BANEFUL_BUNKER] = FORBIDDEN_METRONOME | FORBIDDEN_ASSIST | FORBIDDEN_COPYCAT, [MOVE_BEAK_BLAST] = FORBIDDEN_METRONOME | FORBIDDEN_ASSIST | FORBIDDEN_COPYCAT | FORBIDDEN_SLEEP_TALK, [MOVE_BEHEMOTH_BASH] = FORBIDDEN_METRONOME | FORBIDDEN_COPYCAT, @@ -929,8 +930,10 @@ static const u8 sForbiddenMoves[MOVES_COUNT] = [MOVE_BIDE] = FORBIDDEN_SLEEP_TALK, [MOVE_BODY_PRESS] = FORBIDDEN_METRONOME, [MOVE_BOUNCE] = FORBIDDEN_ASSIST | FORBIDDEN_SLEEP_TALK, + [MOVE_BOUNCY_BUBBLE] = FORBIDDEN_METRONOME, [MOVE_BRANCH_POKE] = FORBIDDEN_METRONOME, [MOVE_BREAKING_SWIPE] = FORBIDDEN_METRONOME, + [MOVE_BUZZY_BUZZ] = FORBIDDEN_METRONOME, [MOVE_CELEBRATE] = FORBIDDEN_METRONOME | FORBIDDEN_ASSIST | FORBIDDEN_COPYCAT | FORBIDDEN_SLEEP_TALK, [MOVE_CHATTER] = FORBIDDEN_METRONOME | FORBIDDEN_ASSIST | FORBIDDEN_COPYCAT | FORBIDDEN_MIMIC | FORBIDDEN_SLEEP_TALK, [MOVE_CIRCLE_THROW] = FORBIDDEN_ASSIST | FORBIDDEN_COPYCAT, @@ -938,7 +941,7 @@ static const u8 sForbiddenMoves[MOVES_COUNT] = [MOVE_COPYCAT] = FORBIDDEN_METRONOME | FORBIDDEN_ASSIST | FORBIDDEN_COPYCAT | FORBIDDEN_SLEEP_TALK, [MOVE_COUNTER] = FORBIDDEN_METRONOME | FORBIDDEN_ASSIST | FORBIDDEN_COPYCAT, [MOVE_COVET] = FORBIDDEN_METRONOME | FORBIDDEN_ASSIST | FORBIDDEN_COPYCAT, - [MOVE_CRAFTY_SHIELD] = FORBIDDEN_METRONOME | FORBIDDEN_COPYCAT, + [MOVE_CRAFTY_SHIELD] = FORBIDDEN_METRONOME, [MOVE_DECORATE] = FORBIDDEN_METRONOME, [MOVE_DESTINY_BOND] = FORBIDDEN_METRONOME | FORBIDDEN_ASSIST | FORBIDDEN_COPYCAT, [MOVE_DETECT] = FORBIDDEN_METRONOME | FORBIDDEN_ASSIST | FORBIDDEN_COPYCAT, @@ -957,13 +960,16 @@ static const u8 sForbiddenMoves[MOVES_COUNT] = [MOVE_FEINT] = FORBIDDEN_METRONOME | FORBIDDEN_ASSIST | FORBIDDEN_COPYCAT, [MOVE_FIERY_WRATH] = FORBIDDEN_METRONOME, [MOVE_FLEUR_CANNON] = FORBIDDEN_METRONOME, + [MOVE_FLOATY_FALL] = FORBIDDEN_METRONOME, [MOVE_FLY] = FORBIDDEN_ASSIST | FORBIDDEN_SLEEP_TALK, [MOVE_FOCUS_PUNCH] = FORBIDDEN_METRONOME | FORBIDDEN_ASSIST | FORBIDDEN_COPYCAT | FORBIDDEN_SLEEP_TALK, [MOVE_FOLLOW_ME] = FORBIDDEN_METRONOME | FORBIDDEN_ASSIST | FORBIDDEN_COPYCAT, [MOVE_FREEZE_SHOCK] = FORBIDDEN_METRONOME | FORBIDDEN_SLEEP_TALK, [MOVE_FREEZING_GLARE] = FORBIDDEN_METRONOME, + [MOVE_FREEZY_FROST] = FORBIDDEN_METRONOME, [MOVE_GEOMANCY] = FORBIDDEN_METRONOME | FORBIDDEN_SLEEP_TALK, [MOVE_GLACIAL_LANCE] = FORBIDDEN_METRONOME, + [MOVE_GLITZY_GLOW] = FORBIDDEN_METRONOME, [MOVE_GRAV_APPLE] = FORBIDDEN_METRONOME, [MOVE_HELPING_HAND] = FORBIDDEN_METRONOME | FORBIDDEN_ASSIST | FORBIDDEN_COPYCAT, [MOVE_HOLD_HANDS] = FORBIDDEN_METRONOME | FORBIDDEN_ASSIST | FORBIDDEN_COPYCAT | FORBIDDEN_SLEEP_TALK, @@ -991,6 +997,7 @@ static const u8 sForbiddenMoves[MOVES_COUNT] = [MOVE_OVERDRIVE] = FORBIDDEN_METRONOME, [MOVE_PHANTOM_FORCE] = FORBIDDEN_ASSIST | FORBIDDEN_SLEEP_TALK, [MOVE_PHOTON_GEYSER] = FORBIDDEN_METRONOME, + [MOVE_PIKA_PAPOW] = FORBIDDEN_METRONOME, [MOVE_PLASMA_FISTS] = FORBIDDEN_METRONOME, [MOVE_PRECIPICE_BLADES] = FORBIDDEN_METRONOME, [MOVE_PROTECT] = FORBIDDEN_METRONOME | FORBIDDEN_ASSIST | FORBIDDEN_COPYCAT, @@ -1001,9 +1008,11 @@ static const u8 sForbiddenMoves[MOVES_COUNT] = [MOVE_RAZOR_WIND] = FORBIDDEN_SLEEP_TALK, [MOVE_RELIC_SONG] = FORBIDDEN_METRONOME, [MOVE_ROAR] = FORBIDDEN_ASSIST | FORBIDDEN_COPYCAT, + [MOVE_SAPPY_SEED] = FORBIDDEN_METRONOME, [MOVE_SECRET_SWORD] = FORBIDDEN_METRONOME, [MOVE_SHADOW_FORCE] = FORBIDDEN_ASSIST | FORBIDDEN_SLEEP_TALK, [MOVE_SHELL_TRAP] = FORBIDDEN_METRONOME | FORBIDDEN_ASSIST | FORBIDDEN_COPYCAT | FORBIDDEN_SLEEP_TALK, + [MOVE_SIZZLY_SLIDE] = FORBIDDEN_METRONOME, [MOVE_SKETCH] = FORBIDDEN_METRONOME | FORBIDDEN_ASSIST | FORBIDDEN_COPYCAT | FORBIDDEN_MIMIC | FORBIDDEN_SLEEP_TALK, [MOVE_SKULL_BASH] = FORBIDDEN_SLEEP_TALK, [MOVE_SKY_ATTACK] = FORBIDDEN_SLEEP_TALK, @@ -1015,9 +1024,11 @@ static const u8 sForbiddenMoves[MOVES_COUNT] = [MOVE_SNORE] = FORBIDDEN_METRONOME, [MOVE_SOLAR_BEAM] = FORBIDDEN_SLEEP_TALK, [MOVE_SOLAR_BLADE] = FORBIDDEN_SLEEP_TALK, + [MOVE_SPARKLY_SWIRL] = FORBIDDEN_METRONOME, [MOVE_SPECTRAL_THIEF] = FORBIDDEN_METRONOME, [MOVE_SPIKY_SHIELD] = FORBIDDEN_METRONOME | FORBIDDEN_ASSIST | FORBIDDEN_COPYCAT, [MOVE_SPIRIT_BREAK] = FORBIDDEN_METRONOME, + [MOVE_SPLISHY_SPLASH] = FORBIDDEN_METRONOME, [MOVE_SPOTLIGHT] = FORBIDDEN_METRONOME | FORBIDDEN_ASSIST | FORBIDDEN_COPYCAT, [MOVE_STEAM_ERUPTION] = FORBIDDEN_METRONOME, [MOVE_STEEL_BEAM] = FORBIDDEN_METRONOME, @@ -1035,9 +1046,11 @@ static const u8 sForbiddenMoves[MOVES_COUNT] = [MOVE_TRICK] = FORBIDDEN_METRONOME | FORBIDDEN_ASSIST | FORBIDDEN_COPYCAT, [MOVE_UPROAR] = FORBIDDEN_SLEEP_TALK, [MOVE_V_CREATE] = FORBIDDEN_METRONOME, + [MOVE_VEEVEE_VOLLEY] = FORBIDDEN_METRONOME, [MOVE_WHIRLWIND] = FORBIDDEN_ASSIST | FORBIDDEN_COPYCAT, [MOVE_WICKED_BLOW] = FORBIDDEN_METRONOME, [MOVE_WIDE_GUARD] = FORBIDDEN_METRONOME, + [MOVE_ZIPPY_ZAP] = FORBIDDEN_METRONOME, }; static const u16 sMoveEffectsForbiddenToInstruct[] = @@ -1046,11 +1059,13 @@ static const u16 sMoveEffectsForbiddenToInstruct[] = //EFFECT_BEAK_BLAST, EFFECT_BELCH, EFFECT_BIDE, + //EFFECT_CELEBRATE, + //EFFECT_CHATTER, EFFECT_COPYCAT, - EFFECT_DO_NOTHING, //EFFECT_DYNAMAX_CANNON, EFFECT_FOCUS_PUNCH, EFFECT_GEOMANCY, + //EFFECT_HOLD_HANDS, EFFECT_INSTRUCT, EFFECT_ME_FIRST, EFFECT_METRONOME, @@ -1059,7 +1074,7 @@ static const u16 sMoveEffectsForbiddenToInstruct[] = EFFECT_NATURE_POWER, //EFFECT_OBSTRUCT, EFFECT_RAMPAGE, - EFFECT_RECHARGE, + //EFFECT_RECHARGE, EFFECT_RECOIL_25, EFFECT_ROLLOUT, EFFECT_SEMI_INVULNERABLE, diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index 564ce9b821..872c2b228f 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -16,11 +16,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = [MOVE_POUND] = { - #if B_UPDATED_MOVE_DATA == GEN_4 - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - #else - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, - #endif .effect = EFFECT_HIT, .power = 40, .type = TYPE_NORMAL, @@ -29,6 +24,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, .split = SPLIT_PHYSICAL, }, @@ -238,11 +234,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = [MOVE_GUST] = { - #if B_UPDATED_MOVE_DATA == GEN_4 - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_DMG_IN_AIR, - #else - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_DMG_IN_AIR, - #endif .effect = EFFECT_GUST, .power = 40, .type = TYPE_FLYING, @@ -251,6 +242,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_DMG_IN_AIR, .split = SPLIT_SPECIAL, }, @@ -1306,11 +1298,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = [MOVE_DRAGON_RAGE] = { - #if B_UPDATED_MOVE_DATA == GEN_4 - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, - #else - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, - #endif .effect = EFFECT_DRAGON_RAGE, .power = 1, .type = TYPE_DRAGON, @@ -1319,6 +1306,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, .split = SPLIT_SPECIAL, },