diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2025-01-28 23:31:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-28 23:31:27 -0500 |
| commit | ec37f6117da6c550e70f466118731e8f752e3afb (patch) | |
| tree | 3dc48ad754a31ed08770943ff9053146f05b9cf9 /engine/battle | |
| parent | Miscellaneous cleanup (#488) (diff) | |
| download | pokeyellow-ec37f6117da6c550e70f466118731e8f752e3afb.tar.gz pokeyellow-ec37f6117da6c550e70f466118731e8f752e3afb.tar.xz pokeyellow-ec37f6117da6c550e70f466118731e8f752e3afb.zip | |
Consistently capitalize `ASSERT` directives (#489)
Diffstat (limited to 'engine/battle')
| -rw-r--r-- | engine/battle/core.asm | 4 | ||||
| -rw-r--r-- | engine/battle/effects.asm | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 4e68b5c5..f304af10 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -5157,7 +5157,7 @@ MetronomePickMove: and a jr z, .pickMoveLoop cp STRUGGLE - assert NUM_ATTACKS == STRUGGLE ; random numbers greater than STRUGGLE are not moves + ASSERT NUM_ATTACKS == STRUGGLE ; random numbers greater than STRUGGLE are not moves jr nc, .pickMoveLoop cp METRONOME jr z, .pickMoveLoop @@ -6755,7 +6755,7 @@ HandleExplodingAnimation: ret nz ld a, ANIMATIONTYPE_SHAKE_SCREEN_HORIZONTALLY_LIGHT ld [wAnimationType], a - assert ANIMATIONTYPE_SHAKE_SCREEN_HORIZONTALLY_LIGHT == MEGA_PUNCH + ASSERT ANIMATIONTYPE_SHAKE_SCREEN_HORIZONTALLY_LIGHT == MEGA_PUNCH ; ld a, MEGA_PUNCH ; fallthrough PlayMoveAnimation: diff --git a/engine/battle/effects.asm b/engine/battle/effects.asm index 47b13311..439e41e2 100644 --- a/engine/battle/effects.asm +++ b/engine/battle/effects.asm @@ -216,8 +216,8 @@ FreezeBurnParalyzeEffect: jr c, .regular_effectiveness ; extra effectiveness ld b, 30 percent + 1 - 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 + 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 |