diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-09-26 22:04:08 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-09-26 22:04:08 -0400 |
| commit | 30d8a72d845bb76331659883815758c8223b9762 (patch) | |
| tree | b5caf8a04ed1ed278d46d3eeaf5f964e1e05d00d /engine | |
| parent | c91db56f422a6604d00a2df4e8c9f14879f70928 (diff) | |
Use EFFECTIVE constant for 1.0× battle damage
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/battle/effect_commands.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm index 1791cbdb..e73582ca 100644 --- a/engine/battle/effect_commands.asm +++ b/engine/battle/effect_commands.asm @@ -1426,7 +1426,7 @@ CheckTypeMatchup: ld b, [hl] inc hl ld c, [hl] - ld a, 10 ; 1.0 + ld a, EFFECTIVE ld [wTypeMatchup], a ld hl, TypeMatchups .TypesLoop: @@ -1489,7 +1489,7 @@ BattleCommand_ResetTypeMatchup: call BattleCheckTypeMatchup ld a, [wTypeMatchup] and a - ld a, 10 ; 1.0 + ld a, EFFECTIVE jr nz, .reset call ResetDamage xor a @@ -2365,7 +2365,7 @@ BattleCommand_SuperEffectiveText: ld a, [wTypeModifier] and $7f - cp 10 ; 1.0 + cp EFFECTIVE ret z ld hl, SuperEffectiveText jr nc, .print |