diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-11-23 21:19:29 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-11-23 21:19:29 -0500 |
| commit | 7574e186e7505e237efc3ab0969fed60bec6eb9d (patch) | |
| tree | 527ec48412989e98cca7827c5e31d89cdf742b05 /engine/battle/move_effects | |
| parent | Identify starter pikachu happiness boost medicine check (#72) (diff) | |
| parent | Use ~X instead of $ff ^ X (diff) | |
| download | pokeyellow-7574e186e7505e237efc3ab0969fed60bec6eb9d.tar.gz pokeyellow-7574e186e7505e237efc3ab0969fed60bec6eb9d.tar.xz pokeyellow-7574e186e7505e237efc3ab0969fed60bec6eb9d.zip | |
Merge remote-tracking branch 'remotes/pokered/master'
Diffstat (limited to 'engine/battle/move_effects')
| -rw-r--r-- | engine/battle/move_effects/haze.asm | 2 | ||||
| -rw-r--r-- | engine/battle/move_effects/substitute.asm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engine/battle/move_effects/haze.asm b/engine/battle/move_effects/haze.asm index 915eeed8..c15c848b 100644 --- a/engine/battle/move_effects/haze.asm +++ b/engine/battle/move_effects/haze.asm @@ -51,7 +51,7 @@ CureVolatileStatuses: inc hl ; BATTSTATUS2 ld a, [hl] ; clear USING_X_ACCURACY, PROTECTED_BY_MIST, GETTING_PUMPED, and SEEDED statuses - and $ff ^((1 << USING_X_ACCURACY) | (1 << PROTECTED_BY_MIST) | (1 << GETTING_PUMPED) | (1 << SEEDED)) + and ~((1 << USING_X_ACCURACY) | (1 << PROTECTED_BY_MIST) | (1 << GETTING_PUMPED) | (1 << SEEDED)) ld [hli], a ; BATTSTATUS3 ld a, [hl] and %11110000 | (1 << TRANSFORMED) ; clear Bad Poison, Reflect and Light Screen statuses diff --git a/engine/battle/move_effects/substitute.asm b/engine/battle/move_effects/substitute.asm index 860b76b6..b1fd8ac2 100644 --- a/engine/battle/move_effects/substitute.asm +++ b/engine/battle/move_effects/substitute.asm @@ -45,7 +45,7 @@ SubstituteEffect_: ld l, c set HAS_SUBSTITUTE_UP, [hl] ld a, [wOptions] - bit 7, a ; battle animation is enabled? + bit BIT_BATTLE_ANIMATION, a ld hl, PlayCurrentMoveAnimation ld b, BANK(PlayCurrentMoveAnimation) jr z, .animationEnabled |