diff options
| author | Sylvie <35663410+Rangi42@users.noreply.github.com> | 2024-11-24 19:13:11 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-24 19:13:11 -0500 |
| commit | f801d67f8e9b1a7f690a0b6e1549c5811ac015cd (patch) | |
| tree | 2d9e6319f54214886123160128fc43d4a023ec83 /engine | |
| parent | GitHub Actions needs libpng-dev installed for rgbds (diff) | |
| download | pokeyellow-f801d67f8e9b1a7f690a0b6e1549c5811ac015cd.tar.gz pokeyellow-f801d67f8e9b1a7f690a0b6e1549c5811ac015cd.tar.xz pokeyellow-f801d67f8e9b1a7f690a0b6e1549c5811ac015cd.zip | |
Assert the relations between some move effect constants (#478)
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/battle/effects.asm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/engine/battle/effects.asm b/engine/battle/effects.asm index 95c8706f..47b13311 100644 --- a/engine/battle/effects.asm +++ b/engine/battle/effects.asm @@ -216,7 +216,9 @@ FreezeBurnParalyzeEffect: jr c, .regular_effectiveness ; extra effectiveness ld b, 30 percent + 1 - sub BURN_SIDE_EFFECT2 - BURN_SIDE_EFFECT1 ; treat extra effective as regular from now on + assert PARALYZE_SIDE_EFFECT2 - PARALYZE_SIDE_EFFECT1 == BURN_SIDE_EFFECT2 - BURN_SIDE_EFFECT1 + assert PARALYZE_SIDE_EFFECT2 - PARALYZE_SIDE_EFFECT1 == FREEZE_SIDE_EFFECT2 - FREEZE_SIDE_EFFECT1 + sub PARALYZE_SIDE_EFFECT2 - PARALYZE_SIDE_EFFECT1 ; treat extra effective as regular from now on .regular_effectiveness push af call BattleRandom ; get random 8bit value for probability test @@ -226,7 +228,7 @@ FreezeBurnParalyzeEffect: ld a, b ; what type of effect is this? cp BURN_SIDE_EFFECT1 jr z, .burn1 - cp FREEZE_SIDE_EFFECT + cp FREEZE_SIDE_EFFECT1 jr z, .freeze1 ; .paralyze1 ld a, 1 << PAR @@ -279,7 +281,7 @@ FreezeBurnParalyzeEffect: ld a, b cp BURN_SIDE_EFFECT1 jr z, .burn2 - cp FREEZE_SIDE_EFFECT + cp FREEZE_SIDE_EFFECT1 jr z, .freeze2 ; .paralyze2 ld a, 1 << PAR |