diff options
Diffstat (limited to 'engine/events')
| -rw-r--r-- | engine/events/poison.asm | 6 | ||||
| -rw-r--r-- | engine/events/prize_menu.asm | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/engine/events/poison.asm b/engine/events/poison.asm index 467d1a5f..18546254 100644 --- a/engine/events/poison.asm +++ b/engine/events/poison.asm @@ -22,7 +22,7 @@ ApplyOutOfBattlePoisonDamage: ld de, wPartySpecies .applyDamageLoop ld a, [hl] - and (1 << PSN) + and 1 << PSN jr z, .nextMon2 ; not poisoned dec hl dec hl @@ -92,7 +92,7 @@ ApplyOutOfBattlePoisonDamage: ld e, 0 .countPoisonedLoop ld a, [hl] - and (1 << PSN) + and 1 << PSN or e ld e, a ld bc, wPartyMon2 - wPartyMon1 @@ -103,7 +103,7 @@ ApplyOutOfBattlePoisonDamage: and a ; are any party members poisoned? jr z, .skipPoisonEffectAndSound ld b, $2 - predef ChangeBGPalColor0_4Frames ; change BG white to dark grey for 4 frames + predef ChangeBGPalColor0_4Frames ; change BG white to dark gray for 4 frames ld a, SFX_POISONED call PlaySound .skipPoisonEffectAndSound diff --git a/engine/events/prize_menu.asm b/engine/events/prize_menu.asm index a365f45f..4b2121f5 100644 --- a/engine/events/prize_menu.asm +++ b/engine/events/prize_menu.asm @@ -128,15 +128,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 NoThanksText: |