diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-14 10:21:18 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-14 13:32:09 -0400 |
| commit | f37cf959c930ae9595f9f71ce0d9b17dcf5421d0 (patch) | |
| tree | 33cc0d34fec73e972f4fb040b8b31f59b7e69805 /data/battle/special_effects.asm | |
| parent | Merge pull request #269 from Rangi42/master (diff) | |
| download | pokeyellow-f37cf959c930ae9595f9f71ce0d9b17dcf5421d0.tar.gz pokeyellow-f37cf959c930ae9595f9f71ce0d9b17dcf5421d0.tar.xz pokeyellow-f37cf959c930ae9595f9f71ce0d9b17dcf5421d0.zip | |
Clean up some data, using macros for multiline list entries
Diffstat (limited to 'data/battle/special_effects.asm')
| -rw-r--r-- | data/battle/special_effects.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/battle/special_effects.asm b/data/battle/special_effects.asm index 0db05b9a..3e21ee2f 100644 --- a/data/battle/special_effects.asm +++ b/data/battle/special_effects.asm @@ -8,7 +8,7 @@ SpecialEffects: db PAY_DAY_EFFECT db SWIFT_EFFECT db TWO_TO_FIVE_ATTACKS_EFFECT - db $1E + db EFFECT_1E db CHARGE_EFFECT db SUPER_FANG_EFFECT db SPECIAL_DAMAGE_EFFECT @@ -16,9 +16,9 @@ SpecialEffects: db ATTACK_TWICE_EFFECT db JUMP_KICK_EFFECT db RECOIL_EFFECT - ; fallthrough to Next EffectsArray + ; fallthrough SpecialEffectsCont: ; damaging moves whose effect is executed prior to damage calculation db THRASH_PETAL_DANCE_EFFECT db TRAPPING_EFFECT - db -1 + db -1 ; end |