diff options
Diffstat (limited to 'engine/events')
| -rw-r--r-- | engine/events/poison.asm | 4 | ||||
| -rw-r--r-- | engine/events/prize_menu.asm | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/engine/events/poison.asm b/engine/events/poison.asm index bd79ad16..c0b4a18f 100644 --- a/engine/events/poison.asm +++ b/engine/events/poison.asm @@ -15,7 +15,7 @@ ApplyOutOfBattlePoisonDamage: ld de, wPartySpecies .applyDamageLoop ld a, [hl] - and (1 << PSN) + and 1 << PSN jr z, .nextMon2 ; not poisoned dec hl dec hl @@ -79,7 +79,7 @@ ApplyOutOfBattlePoisonDamage: ld e, 0 .countPoisonedLoop ld a, [hl] - and (1 << PSN) + and 1 << PSN or e ld e, a ld bc, wPartyMon2 - wPartyMon1 diff --git a/engine/events/prize_menu.asm b/engine/events/prize_menu.asm index 816637bf..f2b24a3f 100644 --- a/engine/events/prize_menu.asm +++ b/engine/events/prize_menu.asm @@ -129,15 +129,15 @@ GetPrizeMenuId: ; reg. c: ; [low nybble] number of bytes ; [bits 765 = %100] space-padding (not zero-padding) - ld c, (1 << 7 | 2) + ld c, (1 << 7) | 2 call PrintBCDNumber ld de, wPrize2Price hlcoord 13, 7 - ld c, (1 << 7 | 2) + ld c, (1 << 7) | 2 call PrintBCDNumber ld de, wPrize3Price hlcoord 13, 9 - ld c, (1 << 7 | 2) + ld c, (1 << 7) | 2 jp PrintBCDNumber INCLUDE "data/events/prizes.asm" |