diff options
| -rw-r--r-- | battle/ai/scoring.asm | 2 | ||||
| -rw-r--r-- | battle/moves/moves.asm | 10 | ||||
| -rw-r--r-- | constants/battle_constants.asm | 20 |
3 files changed, 16 insertions, 16 deletions
diff --git a/battle/ai/scoring.asm b/battle/ai/scoring.asm index 3ad219851..e0c0248e5 100644 --- a/battle/ai/scoring.asm +++ b/battle/ai/scoring.asm @@ -326,7 +326,7 @@ AIScoring_Smart: ; 386be dbw EFFECT_BIND, AIScoring_Bind dbw EFFECT_UNUSED_2B, AIScoring_Unused2B dbw EFFECT_CONFUSE, AIScoring_Confuse - dbw EFFECT_SP_DEFENSE_UP_2, AIScoring_SpDefenseUp2 + dbw EFFECT_SP_DEF_UP_2, AIScoring_SpDefenseUp2 dbw EFFECT_REFLECT, AIScoring_Reflect dbw EFFECT_PARALYZE, AIScoring_Paralyze dbw EFFECT_SPEED_DOWN_HIT, AIScoring_SpeedDownHit diff --git a/battle/moves/moves.asm b/battle/moves/moves.asm index ee30cd1e7..d7f94743a 100644 --- a/battle/moves/moves.asm +++ b/battle/moves/moves.asm @@ -77,7 +77,7 @@ Move2: db ABSORB, EFFECT_LEECH_HIT, 20, GRASS, $ff, 20, $00 db MEGA_DRAIN, EFFECT_LEECH_HIT, 40, GRASS, $ff, 10, $00 db LEECH_SEED, EFFECT_LEECH_SEED, 0, GRASS, $e5, 10, $00 - db GROWTH, EFFECT_SP_ATTACK_UP, 0, NORMAL, $ff, 40, $00 + db GROWTH, EFFECT_SP_ATK_UP, 0, NORMAL, $ff, 40, $00 db RAZOR_LEAF, EFFECT_NORMAL_HIT, 55, GRASS, $f2, 25, $00 db SOLARBEAM, EFFECT_SOLARBEAM, 120, GRASS, $ff, 10, $00 db POISONPOWDER, EFFECT_POISON, 0, POISON, $bf, 35, $00 @@ -97,7 +97,7 @@ Move2: db DIG, EFFECT_FLY, 60, GROUND, $ff, 10, $00 db TOXIC, EFFECT_TOXIC, 0, POISON, $d8, 10, $00 db CONFUSION, EFFECT_CONFUSE_HIT, 50, PSYCHIC, $ff, 25, $19 - db PSYCHIC_M, EFFECT_SP_DEFENSE_DOWN_HIT, 90, PSYCHIC, $ff, 10, $19 + db PSYCHIC_M, EFFECT_SP_DEF_DOWN_HIT, 90, PSYCHIC, $ff, 10, $19 db HYPNOSIS, EFFECT_SLEEP, 0, PSYCHIC, $99, 20, $00 db MEDITATE, EFFECT_ATTACK_UP, 0, PSYCHIC, $ff, 40, $00 db AGILITY, EFFECT_SPEED_UP_2, 0, PSYCHIC, $ff, 30, $00 @@ -136,7 +136,7 @@ Move2: db SKULL_BASH, EFFECT_SKULL_BASH, 100, NORMAL, $ff, 15, $00 db SPIKE_CANNON, EFFECT_MULTI_HIT, 20, NORMAL, $ff, 15, $00 db CONSTRICT, EFFECT_SPEED_DOWN_HIT, 10, NORMAL, $ff, 35, $19 - db AMNESIA, EFFECT_SP_DEFENSE_UP_2, 0, PSYCHIC, $ff, 20, $00 + db AMNESIA, EFFECT_SP_DEF_UP_2, 0, PSYCHIC, $ff, 20, $00 db KINESIS, EFFECT_ACCURACY_DOWN, 0, PSYCHIC, $cc, 15, $00 db SOFTBOILED, EFFECT_HEAL, 0, NORMAL, $ff, 10, $00 db HI_JUMP_KICK, EFFECT_JUMP_KICK, 85, FIGHTING, $e5, 20, $00 @@ -245,12 +245,12 @@ Move2: db TWISTER, EFFECT_TWISTER, 40, DRAGON, $ff, 20, $33 db RAIN_DANCE, EFFECT_RAIN_DANCE, 0, WATER, $e5, 5, $00 db SUNNY_DAY, EFFECT_SUNNY_DAY, 0, FIRE, $e5, 5, $00 - db CRUNCH, EFFECT_SP_DEFENSE_DOWN_HIT, 80, DARK, $ff, 15, $33 + db CRUNCH, EFFECT_SP_DEF_DOWN_HIT, 80, DARK, $ff, 15, $33 db MIRROR_COAT, EFFECT_MIRROR_COAT, 1, PSYCHIC, $ff, 20, $00 db PSYCH_UP, EFFECT_PSYCH_UP, 0, NORMAL, $ff, 10, $00 db EXTREMESPEED, EFFECT_PRIORITY_HIT, 80, NORMAL, $ff, 5, $00 db ANCIENTPOWER, EFFECT_ANCIENTPOWER, 60, ROCK, $ff, 5, $19 - db SHADOW_BALL, EFFECT_SP_DEFENSE_DOWN_HIT, 80, GHOST, $ff, 15, $33 + db SHADOW_BALL, EFFECT_SP_DEF_DOWN_HIT, 80, GHOST, $ff, 15, $33 db FUTURE_SIGHT, EFFECT_FUTURE_SIGHT, 80, PSYCHIC, $e5, 15, $00 db ROCK_SMASH, EFFECT_DEFENSE_DOWN_HIT, 20, FIGHTING, $ff, 15, $7f db WHIRLPOOL, EFFECT_BIND, 15, WATER, $b2, 15, $00 diff --git a/constants/battle_constants.asm b/constants/battle_constants.asm index b95991ae7..d4a5abb14 100644 --- a/constants/battle_constants.asm +++ b/constants/battle_constants.asm @@ -141,16 +141,16 @@ EFFECT_MIRROR_MOVE EQU $09 EFFECT_ATTACK_UP EQU $0a EFFECT_DEFENSE_UP EQU $0b EFFECT_SPEED_UP EQU $0c -EFFECT_SP_ATTACK_UP EQU $0d -EFFECT_SP_DEFENSE_UP EQU $0e +EFFECT_SP_ATK_UP EQU $0d +EFFECT_SP_DEF_UP EQU $0e EFFECT_ACCURACY_UP EQU $0f EFFECT_EVASION_UP EQU $10 EFFECT_ALWAYS_HIT EQU $11 EFFECT_ATTACK_DOWN EQU $12 EFFECT_DEFENSE_DOWN EQU $13 EFFECT_SPEED_DOWN EQU $14 -EFFECT_SP_ATTACK_DOWN EQU $15 -EFFECT_SP_DEFENSE_DOWN EQU $16 +EFFECT_SP_ATK_DOWN EQU $15 +EFFECT_SP_DEF_DOWN EQU $16 EFFECT_ACCURACY_DOWN EQU $17 EFFECT_EVASION_DOWN EQU $18 EFFECT_HAZE EQU $19 @@ -181,16 +181,16 @@ EFFECT_CONFUSE EQU $31 EFFECT_ATTACK_UP_2 EQU $32 EFFECT_DEFENSE_UP_2 EQU $33 EFFECT_SPEED_UP_2 EQU $34 -EFFECT_SP_ATTACK_UP_2 EQU $35 -EFFECT_SP_DEFENSE_UP_2 EQU $36 +EFFECT_SP_ATK_UP_2 EQU $35 +EFFECT_SP_DEF_UP_2 EQU $36 EFFECT_ACCURACY_UP_2 EQU $37 EFFECT_EVASION_UP_2 EQU $38 EFFECT_TRANSFORM EQU $39 EFFECT_ATTACK_DOWN_2 EQU $3a EFFECT_DEFENSE_DOWN_2 EQU $3b EFFECT_SPEED_DOWN_2 EQU $3c -EFFECT_SP_ATTACK_DOWN_2 EQU $3d -EFFECT_SP_DEFENSE_DOWN_2 EQU $3e +EFFECT_SP_ATK_DOWN_2 EQU $3d +EFFECT_SP_DEF_DOWN_2 EQU $3e EFFECT_ACCURACY_DOWN_2 EQU $3f EFFECT_EVASION_DOWN_2 EQU $40 EFFECT_REFLECT EQU $41 @@ -199,8 +199,8 @@ EFFECT_PARALYZE EQU $43 EFFECT_ATTACK_DOWN_HIT EQU $44 EFFECT_DEFENSE_DOWN_HIT EQU $45 EFFECT_SPEED_DOWN_HIT EQU $46 -EFFECT_SP_ATTACK_DOWN_HIT EQU $47 -EFFECT_SP_DEFENSE_DOWN_HIT EQU $48 +EFFECT_SP_ATK_DOWN_HIT EQU $47 +EFFECT_SP_DEF_DOWN_HIT EQU $48 EFFECT_ACCURACY_DOWN_HIT EQU $49 EFFECT_EVASION_DOWN_HIT EQU $4a EFFECT_SKY_ATTACK EQU $4b |