diff options
| -rw-r--r-- | battle/ai/scoring.asm | 20 | ||||
| -rw-r--r-- | battle/core.asm | 2 | ||||
| -rw-r--r-- | battle/effect_commands.asm | 18 | ||||
| -rw-r--r-- | battle/moves/move_effects.asm | 172 | ||||
| -rw-r--r-- | battle/moves/move_effects_pointers.asm | 36 | ||||
| -rw-r--r-- | battle/moves/moves.asm | 28 | ||||
| -rw-r--r-- | constants/battle_constants.asm | 16 |
7 files changed, 63 insertions, 229 deletions
diff --git a/battle/ai/scoring.asm b/battle/ai/scoring.asm index 733322f82..b52f37311 100644 --- a/battle/ai/scoring.asm +++ b/battle/ai/scoring.asm @@ -320,22 +320,22 @@ AI_Smart: ; 386be .table_386f2 dbw EFFECT_SLEEP, AI_Smart_Sleep dbw EFFECT_LEECH_HIT, AI_Smart_LeechHit - dbw EFFECT_EXPLOSION, AI_Smart_Explosion + dbw EFFECT_SELFDESTRUCT, AI_Smart_Selfdestruct dbw EFFECT_DREAM_EATER, AI_Smart_DreamEater dbw EFFECT_MIRROR_MOVE, AI_Smart_MirrorMove dbw EFFECT_EVASION_UP, AI_Smart_EvasionUp dbw EFFECT_ALWAYS_HIT, AI_Smart_AlwaysHit dbw EFFECT_ACCURACY_DOWN, AI_Smart_AccuracyDown - dbw EFFECT_HAZE, AI_Smart_Haze + dbw EFFECT_RESET_STATS, AI_Smart_ResetStats dbw EFFECT_BIDE, AI_Smart_Bide - dbw EFFECT_WHIRLWIND, AI_Smart_Whirlwind + dbw EFFECT_FORCE_SWITCH, AI_Smart_ForceSwitch dbw EFFECT_HEAL, AI_Smart_Heal dbw EFFECT_TOXIC, AI_Smart_Toxic dbw EFFECT_LIGHT_SCREEN, AI_Smart_LightScreen dbw EFFECT_OHKO, AI_Smart_Ohko dbw EFFECT_RAZOR_WIND, AI_Smart_RazorWind dbw EFFECT_SUPER_FANG, AI_Smart_SuperFang - dbw EFFECT_BIND, AI_Smart_Bind + dbw EFFECT_TRAP_TARGET, AI_Smart_TrapTarget dbw EFFECT_UNUSED_2B, AI_Smart_Unused2B dbw EFFECT_CONFUSE, AI_Smart_Confuse dbw EFFECT_SP_DEF_UP_2, AI_Smart_SpDefenseUp2 @@ -565,7 +565,7 @@ AI_Smart_LockOn: ; 3881d ; 388a6 -AI_Smart_Explosion: ; 388a6 +AI_Smart_Selfdestruct: ; 388a6 ; Selfdestruct, Explosion ; Unless this is the enemy's last Pokemon... @@ -904,7 +904,7 @@ AI_Smart_AccuracyDown: ; 38985 ; 389f5 -AI_Smart_Haze: ; 389f5 +AI_Smart_ResetStats: ; 389f5 ; 85% chance to encourage this move if any of enemy's stat levels is lower than -2. push hl @@ -960,7 +960,7 @@ AI_Smart_Bide: ; 38a1e ; 38a2a -AI_Smart_Whirlwind: ; 38a2a +AI_Smart_ForceSwitch: ; 38a2a ; Whirlwind, Roar. ; Discourage this move if the player has not shown @@ -1044,7 +1044,7 @@ AI_Smart_Ohko: ; 38a60 ; 38a71 -AI_Smart_Bind: ; 38a71 +AI_Smart_TrapTarget: ; 38a71 ; Bind, Wrap, Fire Spin, Clamp ; 50% chance to discourage this move if the player is already trapped. @@ -3317,7 +3317,7 @@ AI_Aggressive: ; 39369 ret .RecklessMoves: - db EFFECT_EXPLOSION + db EFFECT_SELFDESTRUCT db EFFECT_RAMPAGE db EFFECT_MULTI_HIT db EFFECT_DOUBLE_HIT @@ -3539,7 +3539,7 @@ endr jr .checkmove .RiskyMoves: - db EFFECT_EXPLOSION + db EFFECT_SELFDESTRUCT db EFFECT_OHKO db $ff ; 39502 diff --git a/battle/core.asm b/battle/core.asm index cb709e08d..18c06e848 100644 --- a/battle/core.asm +++ b/battle/core.asm @@ -903,7 +903,7 @@ MoveEffectPriorities: ; 3c5df db EFFECT_PROTECT, 3 db EFFECT_ENDURE, 3 db EFFECT_PRIORITY_HIT, 2 - db EFFECT_WHIRLWIND, 0 + db EFFECT_FORCE_SWITCH, 0 db EFFECT_COUNTER, 0 db EFFECT_MIRROR_COAT, 0 db -1 diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm index 221570d76..9eefdbc50 100644 --- a/battle/effect_commands.asm +++ b/battle/effect_commands.asm @@ -2167,7 +2167,7 @@ BattleCommand_HitTargetNoSub: ; 34f60 jr z, .conversion cp EFFECT_DOUBLE_HIT jr z, .doublehit - cp EFFECT_TWINEEDLE + cp EFFECT_POISON_MULTI_HIT jr z, .twineedle cp EFFECT_TRIPLE_KICK jr z, .triplekick @@ -2315,7 +2315,7 @@ BattleCommand_FailureText: ; 35023 jr z, .multihit cp EFFECT_DOUBLE_HIT jr z, .multihit - cp EFFECT_TWINEEDLE + cp EFFECT_POISON_MULTI_HIT jr z, .multihit jp EndMoveEffect @@ -2661,7 +2661,7 @@ BattleCommand_CheckDestinyBond: ; 351c0 jr z, .multiple_hit_raise_sub cp EFFECT_DOUBLE_HIT jr z, .multiple_hit_raise_sub - cp EFFECT_TWINEEDLE + cp EFFECT_POISON_MULTI_HIT jr z, .multiple_hit_raise_sub cp EFFECT_TRIPLE_KICK jr z, .multiple_hit_raise_sub @@ -3434,14 +3434,14 @@ BattleCommand_DamageCalc: ; 35612 call GetBattleVar ; Selfdestruct and Explosion halve defense. - cp EFFECT_EXPLOSION - jr nz, .dont_explode + cp EFFECT_SELFDESTRUCT + jr nz, .dont_selfdestruct srl c - jr nz, .dont_explode + jr nz, .dont_selfdestruct inc c -.dont_explode +.dont_selfdestruct ; Variable-hit moves and Conversion can have a power of 0. cp EFFECT_MULTI_HIT @@ -4919,7 +4919,7 @@ SelfInflictDamageToSubstitute: ; 35de0 jr z, .ok cp EFFECT_DOUBLE_HIT jr z, .ok - cp EFFECT_TWINEEDLE + cp EFFECT_POISON_MULTI_HIT jr z, .ok cp EFFECT_TRIPLE_KICK jr z, .ok @@ -6999,7 +6999,7 @@ BattleCommand_EndLoop: ; 369b6 ld a, BATTLE_VARS_MOVE_EFFECT call GetBattleVarAddr ld a, [hl] - cp EFFECT_TWINEEDLE + cp EFFECT_POISON_MULTI_HIT jr z, .twineedle cp EFFECT_DOUBLE_HIT ld a, 1 diff --git a/battle/moves/move_effects.asm b/battle/moves/move_effects.asm index 2d4c06a33..73bc3cbec 100644 --- a/battle/moves/move_effects.asm +++ b/battle/moves/move_effects.asm @@ -1,38 +1,3 @@ -Pound: -KarateChop: -MegaPunch: -Scratch: -Vicegrip: -Cut: -WingAttack: -Slam: -VineWhip: -MegaKick: -HornAttack: -Tackle: -WaterGun: -HydroPump: -Surf: -Peck: -DrillPeck: -Strength: -RazorLeaf: -RockThrow: -EggBomb: -Waterfall: -Crabhammer: -Slash: -Aeroblast: -Megahorn: -CrossChop: -Swift: -FaintAttack: -VitalThrow: -JumpKick: -HiJumpKick: -QuickAttack: -MachPunch: -Extremespeed: NormalHit: checkobedience usedmovetext @@ -53,11 +18,6 @@ NormalHit: kingsrock endmove -Sing: -SleepPowder: -Hypnosis: -LovelyKiss: -Spore: DoSleep: checkobedience usedmovetext @@ -67,10 +27,6 @@ DoSleep: sleeptarget endmove -PoisonSting: -Smog: -Sludge: -SludgeBomb: PoisonHit: checkobedience usedmovetext @@ -92,10 +48,6 @@ PoisonHit: poisontarget endmove -Absorb: -MegaDrain: -LeechLife: -GigaDrain: LeechHit: checkobedience usedmovetext @@ -117,10 +69,6 @@ LeechHit: kingsrock endmove -FirePunch: -Ember: -Flamethrower: -FireBlast: BurnHit: checkobedience usedmovetext @@ -142,10 +90,6 @@ BurnHit: burntarget endmove -IcePunch: -IceBeam: -Blizzard: -PowderSnow: FreezeHit: checkobedience usedmovetext @@ -167,14 +111,6 @@ FreezeHit: freezetarget endmove -Thunderpunch: -BodySlam: -Thundershock: -Thunderbolt: -Lick: -ZapCannon: -Spark: -Dragonbreath: ParalyzeHit: checkobedience usedmovetext @@ -197,7 +133,6 @@ ParalyzeHit: endmove Selfdestruct: -Explosion: checkobedience usedmovetext doturn @@ -245,8 +180,6 @@ MirrorMove: mirrormove endmove -Meditate: -Sharpen: AttackUp: checkobedience usedmovetext @@ -259,8 +192,6 @@ AttackUp: statupfailtext endmove -Harden: -Withdraw: DefenseUp: checkobedience usedmovetext @@ -285,7 +216,6 @@ SpeedUp: statupfailtext endmove -Growth: SpecialAttackUp: checkobedience usedmovetext @@ -322,8 +252,6 @@ AccuracyUp: statupfailtext endmove -DoubleTeam: -Minimize: EvasionUp: checkobedience usedmovetext @@ -337,7 +265,6 @@ EvasionUp: statupfailtext endmove -SwordsDance: AttackUp2: checkobedience usedmovetext @@ -350,8 +277,6 @@ AttackUp2: statupfailtext endmove -Barrier: -AcidArmor: DefenseUp2: checkobedience usedmovetext @@ -364,7 +289,6 @@ DefenseUp2: statupfailtext endmove -Agility: SpeedUp2: checkobedience usedmovetext @@ -389,7 +313,6 @@ SpecialAttackUp2: statupfailtext endmove -Amnesia: SpecialDefenseUp2: checkobedience usedmovetext @@ -426,7 +349,6 @@ EvasionUp2: statupfailtext endmove -Growl: AttackDown: checkobedience usedmovetext @@ -440,8 +362,6 @@ AttackDown: statdownfailtext endmove -TailWhip: -Leer: DefenseDown: checkobedience usedmovetext @@ -455,7 +375,6 @@ DefenseDown: statdownfailtext endmove -StringShot: SpeedDown: checkobedience usedmovetext @@ -495,10 +414,6 @@ SpecialDefenseDown: statdownfailtext endmove -SandAttack: -Smokescreen: -Kinesis: -Flash: AccuracyDown: checkobedience usedmovetext @@ -512,7 +427,6 @@ AccuracyDown: statdownfailtext endmove -SweetScent: EvasionDown: checkobedience usedmovetext @@ -526,7 +440,6 @@ EvasionDown: statdownfailtext endmove -Charm: AttackDown2: checkobedience usedmovetext @@ -540,7 +453,6 @@ AttackDown2: statdownfailtext endmove -Screech: DefenseDown2: checkobedience usedmovetext @@ -554,8 +466,6 @@ DefenseDown2: statdownfailtext endmove -CottonSpore: -ScaryFace: SpeedDown2: checkobedience usedmovetext @@ -621,7 +531,6 @@ EvasionDown2: statdownfailtext endmove -AuroraBeam: AttackDownHit: checkobedience usedmovetext @@ -644,9 +553,6 @@ AttackDownHit: statdownmessage endmove -Acid: -IronTail: -RockSmash: DefenseDownHit: checkobedience usedmovetext @@ -670,10 +576,6 @@ DefenseDownHit: statdownmessage endmove -Bubblebeam: -Constrict: -Bubble: -IcyWind: SpeedDownHit: checkobedience usedmovetext @@ -718,9 +620,6 @@ SpecialAttackDownHit: statdownmessage endmove -PsychicM: -Crunch: -ShadowBall: SpecialDefenseDownHit: checkobedience usedmovetext @@ -743,8 +642,6 @@ SpecialDefenseDownHit: statdownmessage endmove -MudSlap: -Octazooka: AccuracyDownHit: checkobedience usedmovetext @@ -789,7 +686,6 @@ EvasionDownHit: statdownmessage endmove -SteelWing: DefenseUpHit: checkobedience usedmovetext @@ -812,7 +708,6 @@ DefenseUpHit: statupmessage endmove -MetalClaw: AttackUpHit: checkobedience usedmovetext @@ -835,7 +730,6 @@ AttackUpHit: statupmessage endmove -Ancientpower: AllUpHit: checkobedience usedmovetext @@ -885,7 +779,7 @@ Conversion: conversion endmove -Haze: +ResetStats: checkobedience usedmovetext doturn @@ -908,9 +802,6 @@ Bide: kingsrock endmove -Thrash: -PetalDance: -Outrage: Rampage: checkrampage checkobedience @@ -934,8 +825,7 @@ Rampage: kingsrock endmove -Whirlwind: -Roar: +ForceSwitch: checkobedience usedmovetext doturn @@ -943,16 +833,6 @@ Roar: forceswitch endmove -Doubleslap: -CometPunch: -FuryAttack: -PinMissile: -SpikeCannon: -Barrage: -FurySwipes: -BoneRush: -DoubleKick: -Bonemerang: MultiHit: checkobedience usedmovetext @@ -979,7 +859,6 @@ MultiHit: kingsrock endmove -Twineedle: PoisonMultiHit: checkobedience usedmovetext @@ -1008,13 +887,6 @@ PoisonMultiHit: poisontarget endmove -RollingKick: -Headbutt: -Bite: -LowKick: -BoneClub: -RockSlide: -HyperFang: FlinchHit: checkobedience usedmovetext @@ -1036,9 +908,6 @@ FlinchHit: flinchtarget endmove -Guillotine: -HornDrill: -Fissure: OHKOHit: checkobedience usedmovetext @@ -1054,10 +923,6 @@ OHKOHit: buildopponentrage endmove -TakeDown: -DoubleEdge: -Submission: -Struggle: RecoilHit: checkobedience usedmovetext @@ -1087,16 +952,12 @@ Mist: endmove FocusEnergy: -CriticalUp: checkobedience usedmovetext doturn focusenergy endmove -Supersonic: -ConfuseRay: -SweetKiss: DoConfuse: checkobedience usedmovetext @@ -1106,10 +967,6 @@ DoConfuse: confuse endmove -Psybeam: -Confusion: -DizzyPunch: -Dynamicpunch: ConfuseHit: checkobedience usedmovetext @@ -1131,10 +988,6 @@ ConfuseHit: confusetarget endmove -Recover: -Softboiled: -Rest: -MilkDrink: Heal: checkobedience usedmovetext @@ -1151,7 +1004,6 @@ Transform: LightScreen: Reflect: -Screen: checkobedience usedmovetext doturn @@ -1179,8 +1031,6 @@ TriAttack: endmove Toxic: -Poisonpowder: -PoisonGas: DoPoison: checkobedience usedmovetext @@ -1191,9 +1041,6 @@ DoPoison: poison endmove -StunSpore: -ThunderWave: -Glare: DoParalyze: checkobedience usedmovetext @@ -1338,7 +1185,6 @@ RazorWind: endmove Fly: -Dig: checkcharge checkobedience doturn @@ -1361,11 +1207,7 @@ Dig: kingsrock endmove -Bind: -Wrap: -FireSpin: -Clamp: -Whirlpool: +TrapTarget: checkobedience usedmovetext doturn @@ -1387,10 +1229,6 @@ Whirlpool: endmove SuperFang: -Sonicboom: -DragonRage: -SeismicToss: -NightShade: Psywave: StaticDamage: checkobedience @@ -1407,7 +1245,6 @@ StaticDamage: kingsrock endmove -Flail: Reversal: checkobedience usedmovetext @@ -1484,7 +1321,6 @@ Conversion2: conversion2 endmove -MindReader: LockOn: checkobedience usedmovetext @@ -1607,7 +1443,6 @@ Thief: kingsrock endmove -SpiderWeb: MeanLook: checkobedience usedmovetext @@ -1652,7 +1487,6 @@ Curse: endmove Protect: -Detect: checkobedience usedmovetext doturn diff --git a/battle/moves/move_effects_pointers.asm b/battle/moves/move_effects_pointers.asm index 3f364f521..2e4f1ea31 100644 --- a/battle/moves/move_effects_pointers.asm +++ b/battle/moves/move_effects_pointers.asm @@ -5,28 +5,28 @@ dw BurnHit dw FreezeHit dw ParalyzeHit - dw Explosion + dw Selfdestruct dw DreamEater dw MirrorMove dw AttackUp dw DefenseUp dw SpeedUp - dw Growth + dw SpecialAttackUp dw SpecialDefenseUp dw AccuracyUp dw EvasionUp dw NormalHit - dw Growl + dw AttackDown dw DefenseDown - dw StringShot + dw SpeedDown dw SpecialAttackDown dw SpecialDefenseDown dw AccuracyDown - dw SweetScent - dw Haze + dw EvasionDown + dw ResetStats dw Bide dw Rampage - dw Whirlwind + dw ForceSwitch dw MultiHit dw Conversion dw FlinchHit @@ -40,7 +40,7 @@ dw RazorWind dw SuperFang dw StaticDamage - dw Bind + dw TrapTarget dw NormalHit dw MultiHit dw NormalHit @@ -48,16 +48,16 @@ dw FocusEnergy dw RecoilHit dw DoConfuse - dw SwordsDance + dw AttackUp2 dw DefenseUp2 - dw Agility + dw SpeedUp2 dw SpecialAttackUp2 - dw Amnesia + dw SpecialDefenseUp2 dw AccuracyUp2 dw EvasionUp2 dw Transform - dw Charm - dw Screech + dw AttackDown2 + dw DefenseDown2 dw SpeedDown2 dw SpecialAttackDown2 dw SpecialDefenseDown2 @@ -66,7 +66,7 @@ dw Reflect dw DoPoison dw DoParalyze - dw AuroraBeam + dw AttackDownHit dw DefenseDownHit dw SpeedDownHit dw SpecialAttackDownHit @@ -75,7 +75,7 @@ dw EvasionDownHit dw SkyAttack dw ConfuseHit - dw Twineedle + dw PoisonMultiHit dw NormalHit dw Substitute dw HyperBeam @@ -136,9 +136,9 @@ dw HiddenPower dw RainDance dw SunnyDay - dw SteelWing - dw MetalClaw - dw Ancientpower + dw DefenseUpHit + dw AttackUpHit + dw AllUpHit dw FakeOut dw BellyDrum dw PsychUp diff --git a/battle/moves/moves.asm b/battle/moves/moves.asm index ac9f49300..43ba6f10d 100644 --- a/battle/moves/moves.asm +++ b/battle/moves/moves.asm @@ -28,9 +28,9 @@ ENDM move CUT, EFFECT_NORMAL_HIT, 50, NORMAL, 95, 30, 0 move GUST, EFFECT_GUST, 40, FLYING, 100, 35, 0 move WING_ATTACK, EFFECT_NORMAL_HIT, 60, FLYING, 100, 35, 0 - move WHIRLWIND, EFFECT_WHIRLWIND, 0, NORMAL, 100, 20, 0 + move WHIRLWIND, EFFECT_FORCE_SWITCH, 0, NORMAL, 100, 20, 0 move FLY, EFFECT_FLY, 70, FLYING, 95, 15, 0 - move BIND, EFFECT_BIND, 15, NORMAL, 75, 20, 0 + move BIND, EFFECT_TRAP_TARGET, 15, NORMAL, 75, 20, 0 move SLAM, EFFECT_NORMAL_HIT, 80, NORMAL, 75, 20, 0 move VINE_WHIP, EFFECT_NORMAL_HIT, 35, GRASS, 100, 10, 0 move STOMP, EFFECT_STOMP, 65, NORMAL, 100, 20, 30 @@ -45,18 +45,18 @@ ENDM move HORN_DRILL, EFFECT_OHKO, 1, NORMAL, 30, 5, 0 move TACKLE, EFFECT_NORMAL_HIT, 35, NORMAL, 95, 35, 0 move BODY_SLAM, EFFECT_PARALYZE_HIT, 85, NORMAL, 100, 15, 30 - move WRAP, EFFECT_BIND, 15, NORMAL, 85, 20, 0 + move WRAP, EFFECT_TRAP_TARGET, 15, NORMAL, 85, 20, 0 move TAKE_DOWN, EFFECT_RECOIL_HIT, 90, NORMAL, 85, 20, 0 move THRASH, EFFECT_RAMPAGE, 90, NORMAL, 100, 20, 0 move DOUBLE_EDGE, EFFECT_RECOIL_HIT, 120, NORMAL, 100, 15, 0 move TAIL_WHIP, EFFECT_DEFENSE_DOWN, 0, NORMAL, 100, 30, 0 move POISON_STING, EFFECT_POISON_HIT, 15, POISON, 100, 35, 30 - move TWINEEDLE, EFFECT_TWINEEDLE, 25, BUG, 100, 20, 20 + move TWINEEDLE, EFFECT_POISON_MULTI_HIT, 25, BUG, 100, 20, 20 move PIN_MISSILE, EFFECT_MULTI_HIT, 14, BUG, 85, 20, 0 move LEER, EFFECT_DEFENSE_DOWN, 0, NORMAL, 100, 30, 0 move BITE, EFFECT_FLINCH_HIT, 60, DARK, 100, 25, 30 move GROWL, EFFECT_ATTACK_DOWN, 0, NORMAL, 100, 40, 0 - move ROAR, EFFECT_WHIRLWIND, 0, NORMAL, 100, 20, 0 + move ROAR, EFFECT_FORCE_SWITCH, 0, NORMAL, 100, 20, 0 move SING, EFFECT_SLEEP, 0, NORMAL, 55, 15, 0 move SUPERSONIC, EFFECT_CONFUSE, 0, NORMAL, 55, 20, 0 move SONICBOOM, EFFECT_STATIC_DAMAGE, 20, NORMAL, 90, 20, 0 @@ -93,7 +93,7 @@ ENDM move PETAL_DANCE, EFFECT_RAMPAGE, 70, GRASS, 100, 20, 0 move STRING_SHOT, EFFECT_SPEED_DOWN, 0, BUG, 95, 40, 0 move DRAGON_RAGE, EFFECT_STATIC_DAMAGE, 40, DRAGON, 100, 10, 0 - move FIRE_SPIN, EFFECT_BIND, 15, FIRE, 70, 15, 0 + move FIRE_SPIN, EFFECT_TRAP_TARGET, 15, FIRE, 70, 15, 0 move THUNDERSHOCK, EFFECT_PARALYZE_HIT, 40, ELECTRIC, 100, 30, 10 move THUNDERBOLT, EFFECT_PARALYZE_HIT, 95, ELECTRIC, 100, 15, 10 move THUNDER_WAVE, EFFECT_PARALYZE, 0, ELECTRIC, 100, 20, 0 @@ -124,13 +124,13 @@ ENDM move DEFENSE_CURL, EFFECT_DEFENSE_CURL, 0, NORMAL, 100, 40, 0 move BARRIER, EFFECT_DEFENSE_UP_2, 0, PSYCHIC, 100, 30, 0 move LIGHT_SCREEN, EFFECT_LIGHT_SCREEN, 0, PSYCHIC, 100, 30, 0 - move HAZE, EFFECT_HAZE, 0, ICE, 100, 30, 0 + move HAZE, EFFECT_RESET_STATS, 0, ICE, 100, 30, 0 move REFLECT, EFFECT_REFLECT, 0, PSYCHIC, 100, 20, 0 move FOCUS_ENERGY, EFFECT_FOCUS_ENERGY, 0, NORMAL, 100, 30, 0 move BIDE, EFFECT_BIDE, 0, NORMAL, 100, 10, 0 move METRONOME, EFFECT_METRONOME, 0, NORMAL, 100, 10, 0 move MIRROR_MOVE, EFFECT_MIRROR_MOVE, 0, FLYING, 100, 20, 0 - move SELFDESTRUCT, EFFECT_EXPLOSION, 200, NORMAL, 100, 5, 0 + move SELFDESTRUCT, EFFECT_SELFDESTRUCT, 200, NORMAL, 100, 5, 0 move EGG_BOMB, EFFECT_NORMAL_HIT, 100, NORMAL, 75, 10, 0 move LICK, EFFECT_PARALYZE_HIT, 20, GHOST, 100, 30, 30 move SMOG, EFFECT_POISON_HIT, 20, POISON, 70, 20, 40 @@ -138,7 +138,7 @@ ENDM move BONE_CLUB, EFFECT_FLINCH_HIT, 65, GROUND, 85, 20, 10 move FIRE_BLAST, EFFECT_BURN_HIT, 120, FIRE, 85, 5, 10 move WATERFALL, EFFECT_NORMAL_HIT, 80, WATER, 100, 15, 0 - move CLAMP, EFFECT_BIND, 35, WATER, 75, 10, 0 + move CLAMP, EFFECT_TRAP_TARGET, 35, WATER, 75, 10, 0 move SWIFT, EFFECT_ALWAYS_HIT, 60, NORMAL, 100, 20, 0 move SKULL_BASH, EFFECT_SKULL_BASH, 100, NORMAL, 100, 15, 0 move SPIKE_CANNON, EFFECT_MULTI_HIT, 20, NORMAL, 100, 15, 0 @@ -163,7 +163,7 @@ ENDM move SPLASH, EFFECT_SPLASH, 0, NORMAL, 100, 40, 0 move ACID_ARMOR, EFFECT_DEFENSE_UP_2, 0, POISON, 100, 40, 0 move CRABHAMMER, EFFECT_NORMAL_HIT, 90, WATER, 85, 10, 0 - move EXPLOSION, EFFECT_EXPLOSION, 250, NORMAL, 100, 5, 0 + move EXPLOSION, EFFECT_SELFDESTRUCT, 250, NORMAL, 100, 5, 0 move FURY_SWIPES, EFFECT_MULTI_HIT, 18, NORMAL, 80, 15, 0 move BONEMERANG, EFFECT_DOUBLE_HIT, 50, GROUND, 90, 10, 0 move REST, EFFECT_HEAL, 0, PSYCHIC, 100, 10, 0 @@ -221,7 +221,7 @@ ENDM move MILK_DRINK, EFFECT_HEAL, 0, NORMAL, 100, 10, 0 move SPARK, EFFECT_PARALYZE_HIT, 65, ELECTRIC, 100, 20, 30 move FURY_CUTTER, EFFECT_FURY_CUTTER, 10, BUG, 95, 20, 0 - move STEEL_WING, EFFECT_STEEL_WING, 70, STEEL, 90, 25, 10 + move STEEL_WING, EFFECT_DEFENSE_UP_HIT, 70, STEEL, 90, 25, 10 move MEAN_LOOK, EFFECT_MEAN_LOOK, 0, NORMAL, 100, 5, 0 move ATTRACT, EFFECT_ATTRACT, 0, NORMAL, 100, 15, 0 move SLEEP_TALK, EFFECT_SLEEP_TALK, 0, NORMAL, 100, 10, 0 @@ -242,7 +242,7 @@ ENDM move RAPID_SPIN, EFFECT_RAPID_SPIN, 20, NORMAL, 100, 40, 0 move SWEET_SCENT, EFFECT_EVASION_DOWN, 0, NORMAL, 100, 20, 0 move IRON_TAIL, EFFECT_DEFENSE_DOWN_HIT, 100, STEEL, 75, 15, 30 - move METAL_CLAW, EFFECT_METAL_CLAW, 50, STEEL, 95, 35, 10 + move METAL_CLAW, EFFECT_ATTACK_UP_HIT, 50, STEEL, 95, 35, 10 move VITAL_THROW, EFFECT_ALWAYS_HIT, 70, FIGHTING, 100, 10, 0 move MORNING_SUN, EFFECT_MORNING_SUN, 0, NORMAL, 100, 5, 0 move SYNTHESIS, EFFECT_SYNTHESIS, 0, GRASS, 100, 5, 0 @@ -256,9 +256,9 @@ ENDM move MIRROR_COAT, EFFECT_MIRROR_COAT, 1, PSYCHIC, 100, 20, 0 move PSYCH_UP, EFFECT_PSYCH_UP, 0, NORMAL, 100, 10, 0 move EXTREMESPEED, EFFECT_PRIORITY_HIT, 80, NORMAL, 100, 5, 0 - move ANCIENTPOWER, EFFECT_ANCIENTPOWER, 60, ROCK, 100, 5, 10 + move ANCIENTPOWER, EFFECT_ALL_UP_HIT, 60, ROCK, 100, 5, 10 move SHADOW_BALL, EFFECT_SP_DEF_DOWN_HIT, 80, GHOST, 100, 15, 20 move FUTURE_SIGHT, EFFECT_FUTURE_SIGHT, 80, PSYCHIC, 90, 15, 0 move ROCK_SMASH, EFFECT_DEFENSE_DOWN_HIT, 20, FIGHTING, 100, 15, 50 - move WHIRLPOOL, EFFECT_BIND, 15, WATER, 70, 15, 0 + move WHIRLPOOL, EFFECT_TRAP_TARGET, 15, WATER, 70, 15, 0 move BEAT_UP, EFFECT_BEAT_UP, 10, DARK, 100, 10, 0 diff --git a/constants/battle_constants.asm b/constants/battle_constants.asm index 793650913..523713574 100644 --- a/constants/battle_constants.asm +++ b/constants/battle_constants.asm @@ -171,7 +171,7 @@ SUBSTATUS_CURLED EQU 0 const EFFECT_BURN_HIT const EFFECT_FREEZE_HIT const EFFECT_PARALYZE_HIT - const EFFECT_EXPLOSION + const EFFECT_SELFDESTRUCT const EFFECT_DREAM_EATER const EFFECT_MIRROR_MOVE const EFFECT_ATTACK_UP @@ -189,10 +189,10 @@ SUBSTATUS_CURLED EQU 0 const EFFECT_SP_DEF_DOWN const EFFECT_ACCURACY_DOWN const EFFECT_EVASION_DOWN - const EFFECT_HAZE + const EFFECT_RESET_STATS const EFFECT_BIDE const EFFECT_RAMPAGE - const EFFECT_WHIRLWIND + const EFFECT_FORCE_SWITCH const EFFECT_MULTI_HIT const EFFECT_CONVERSION const EFFECT_FLINCH_HIT @@ -206,7 +206,7 @@ SUBSTATUS_CURLED EQU 0 const EFFECT_RAZOR_WIND const EFFECT_SUPER_FANG const EFFECT_STATIC_DAMAGE - const EFFECT_BIND + const EFFECT_TRAP_TARGET const EFFECT_UNUSED_2B const EFFECT_DOUBLE_HIT const EFFECT_JUMP_KICK @@ -241,7 +241,7 @@ SUBSTATUS_CURLED EQU 0 const EFFECT_EVASION_DOWN_HIT const EFFECT_SKY_ATTACK const EFFECT_CONFUSE_HIT - const EFFECT_TWINEEDLE + const EFFECT_POISON_MULTI_HIT const EFFECT_UNUSED_4E const EFFECT_SUBSTITUTE const EFFECT_HYPER_BEAM @@ -302,9 +302,9 @@ SUBSTATUS_CURLED EQU 0 const EFFECT_HIDDEN_POWER const EFFECT_RAIN_DANCE const EFFECT_SUNNY_DAY - const EFFECT_STEEL_WING - const EFFECT_METAL_CLAW - const EFFECT_ANCIENTPOWER + const EFFECT_DEFENSE_UP_HIT + const EFFECT_ATTACK_UP_HIT + const EFFECT_ALL_UP_HIT const EFFECT_FAKE_OUT const EFFECT_BELLY_DRUM const EFFECT_PSYCH_UP |