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 | |
| parent | aa97e196dd5b37e89db5ddf154dc7aea9b02a045 (diff) | |
Clean up some data, using macros for multiline list entries
Diffstat (limited to 'data/battle')
| -rw-r--r-- | data/battle/always_happen_effects.asm | 4 | ||||
| -rw-r--r-- | data/battle/critical_hit_moves.asm | 2 | ||||
| -rw-r--r-- | data/battle/residual_effects_1.asm | 2 | ||||
| -rw-r--r-- | data/battle/residual_effects_2.asm | 4 | ||||
| -rw-r--r-- | data/battle/set_damage_effects.asm | 2 | ||||
| -rw-r--r-- | data/battle/special_effects.asm | 6 | ||||
| -rw-r--r-- | data/battle/unused_critical_hit_moves.asm | 2 |
7 files changed, 11 insertions, 11 deletions
diff --git a/data/battle/always_happen_effects.asm b/data/battle/always_happen_effects.asm index 4b6d466f..c8e5247e 100644 --- a/data/battle/always_happen_effects.asm +++ b/data/battle/always_happen_effects.asm @@ -5,9 +5,9 @@ AlwaysHappenSideEffects: db DREAM_EATER_EFFECT db PAY_DAY_EFFECT db TWO_TO_FIVE_ATTACKS_EFFECT - db $1E + db EFFECT_1E db ATTACK_TWICE_EFFECT db RECOIL_EFFECT db TWINEEDLE_EFFECT db RAGE_EFFECT - db -1 + db -1 ; end diff --git a/data/battle/critical_hit_moves.asm b/data/battle/critical_hit_moves.asm index ee7543e8..a567a934 100644 --- a/data/battle/critical_hit_moves.asm +++ b/data/battle/critical_hit_moves.asm @@ -3,4 +3,4 @@ HighCriticalMoves: db RAZOR_LEAF db CRABHAMMER db SLASH - db $FF + db -1 ; end diff --git a/data/battle/residual_effects_1.asm b/data/battle/residual_effects_1.asm index 36e28391..b478487d 100644 --- a/data/battle/residual_effects_1.asm +++ b/data/battle/residual_effects_1.asm @@ -17,4 +17,4 @@ ResidualEffects1: db MIMIC_EFFECT db LEECH_SEED_EFFECT db SPLASH_EFFECT - db -1 + db -1 ; end diff --git a/data/battle/residual_effects_2.asm b/data/battle/residual_effects_2.asm index cde55cc9..f58bb47c 100644 --- a/data/battle/residual_effects_2.asm +++ b/data/battle/residual_effects_2.asm @@ -2,7 +2,7 @@ ResidualEffects2: ; non-side effects not included in ResidualEffects1 ; stat-affecting moves, sleep-inflicting moves, and Bide ; e.g., Meditate, Bide, Hypnosis - db $01 + db EFFECT_01 db ATTACK_UP1_EFFECT db DEFENSE_UP1_EFFECT db SPEED_UP1_EFFECT @@ -29,4 +29,4 @@ ResidualEffects2: db SPECIAL_DOWN2_EFFECT db ACCURACY_DOWN2_EFFECT db EVASION_DOWN2_EFFECT - db -1 + db -1 ; end diff --git a/data/battle/set_damage_effects.asm b/data/battle/set_damage_effects.asm index 3fc75e41..cedb3bc1 100644 --- a/data/battle/set_damage_effects.asm +++ b/data/battle/set_damage_effects.asm @@ -3,4 +3,4 @@ SetDamageEffects: ; e.g., Super Fang, Psywave db SUPER_FANG_EFFECT db SPECIAL_DAMAGE_EFFECT - db -1 + db -1 ; end 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 diff --git a/data/battle/unused_critical_hit_moves.asm b/data/battle/unused_critical_hit_moves.asm index 84cb65ce..bc88b2cb 100644 --- a/data/battle/unused_critical_hit_moves.asm +++ b/data/battle/unused_critical_hit_moves.asm @@ -3,4 +3,4 @@ UnusedHighCriticalMoves: db RAZOR_LEAF db CRABHAMMER db SLASH - db $FF + db -1 ; end |