diff options
| author | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2014-05-19 10:38:20 -0400 |
|---|---|---|
| committer | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2014-05-19 16:05:19 -0400 |
| commit | 1a0992a2f16ba2026c7fbf9fcfd1576a0f81c329 (patch) | |
| tree | 0981af81f93d33b07cbfe47674d87ae4aa2d46b0 /constants/move_effect_constants.asm | |
| parent | 82ffb336a975fe8cf9c3953fc380339feaae65b3 (diff) | |
| parent | d218d1972a9be5b9d0025a17842239e1fbf5b622 (diff) | |
Merge branch 'master' of https://github.com/huderlem/pokered into pull-data
Conflicts:
main.asm
text.asm
text/maps/route_22.asm
Diffstat (limited to 'constants/move_effect_constants.asm')
| -rw-r--r-- | constants/move_effect_constants.asm | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/constants/move_effect_constants.asm b/constants/move_effect_constants.asm index 088482dc..ff7ddc12 100644 --- a/constants/move_effect_constants.asm +++ b/constants/move_effect_constants.asm @@ -13,24 +13,30 @@ DREAM_EATER_EFFECT EQU $08 MIRROR_MOVE_EFFECT EQU $09 ATTACK_UP1_EFFECT EQU $0A DEFENSE_UP1_EFFECT EQU $0B +SPEED_UP1_EFFECT EQU $0C SPECIAL_UP1_EFFECT EQU $0D +ACCURACY_UP1_EFFECT EQU $0E EVASION_UP1_EFFECT EQU $0F PAY_DAY_EFFECT EQU $10 SWIFT_EFFECT EQU $11 ATTACK_DOWN1_EFFECT EQU $12 DEFENSE_DOWN1_EFFECT EQU $13 SPEED_DOWN1_EFFECT EQU $14 +SPECIAL_DOWN1_EFFECT EQU $15 ACCURACY_DOWN1_EFFECT EQU $16 +EVASION_DOWN1_EFFECT EQU $17 CONVERSION_EFFECT EQU $18 HAZE_EFFECT EQU $19 BIDE_EFFECT EQU $1A THRASH_PETAL_DANCE_EFFECT EQU $1B SWITCH_AND_TELEPORT_EFFECT EQU $1C TWO_TO_FIVE_ATTACKS_EFFECT EQU $1D +; unused effect EQU $1E FLINCH_SIDE_EFFECT1 EQU $1F SLEEP_EFFECT EQU $20 POISON_SIDE_EFFECT2 EQU $21 BURN_SIDE_EFFECT2 EQU $22 +; unused effect EQU $23 PARALYZE_SIDE_EFFECT2 EQU $24 FLINCH_SIDE_EFFECT2 EQU $25 OHKO_EFFECT EQU $26 ; moves like Horn Drill @@ -49,9 +55,16 @@ ATTACK_UP2_EFFECT EQU $32 DEFENSE_UP2_EFFECT EQU $33 SPEED_UP2_EFFECT EQU $34 SPECIAL_UP2_EFFECT EQU $35 +ACCURACY_UP2_EFFECT EQU $36 +EVASION_UP2_EFFECT EQU $37 HEAL_EFFECT EQU $38 ; Recover, Softboiled, Rest TRANSFORM_EFFECT EQU $39 +ATTACK_DOWN2_EFFECT EQU $3A DEFENSE_DOWN2_EFFECT EQU $3B +SPEED_DOWN2_EFFECT EQU $3C +SPECIAL_DOWN2_EFFECT EQU $3D +ACCURACY_DOWN2_EFFECT EQU $3E +EVASION_DOWN2_EFFECT EQU $3F LIGHT_SCREEN_EFFECT EQU $40 REFLECT_EFFECT EQU $41 POISON_EFFECT EQU $42 @@ -60,8 +73,13 @@ ATTACK_DOWN_SIDE_EFFECT EQU $44 DEFENSE_DOWN_SIDE_EFFECT EQU $45 SPEED_DOWN_SIDE_EFFECT EQU $46 SPECIAL_DOWN_SIDE_EFFECT EQU $47 +; unused effect EQU $48 +; unused effect EQU $49 +; unused effect EQU $4A +; unused effect EQU $4B CONFUSION_SIDE_EFFECT EQU $4C TWINEEDLE_EFFECT EQU $4D +; unused effect EQU $4E SUBSTITUTE_EFFECT EQU $4F HYPER_BEAM_EFFECT EQU $50 RAGE_EFFECT EQU $51 @@ -73,4 +91,4 @@ DISABLE_EFFECT EQU $56 ; fixed damage constants SONICBOOM_DAMAGE EQU 20 -DRAGON_RAGE_DAMAGE EQU 40
\ No newline at end of file +DRAGON_RAGE_DAMAGE EQU 40 |