thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-06 15:45:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename SLP to SLP_MASK (#361)

Browse source 
Co-authored-by: Rangi <35663410+Rangi42@users.noreply.github.com>
This commit is contained in:
vulcandth 2022-06-17 21:25:52 -05:00 • committed by GitHub
parent 6c945a6b6a
commit edb55e00f8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
engine/items/item_effects.asm
View file

@ -225,7 +225,7 @@ ItemUseBall:
ld a, [wEnemyMonStatus]
and a
jr z, .skipAilmentValueSubtraction ; no ailments
and 1 << FRZ | SLP
and (1 << FRZ) | SLP_MASK
ld c, 12
jr z, .notFrozenOrAsleep
ld c, 25
@ -380,7 +380,7 @@ ItemUseBall:
ld a, [wEnemyMonStatus]
and a
jr z, .skip5
and 1 << FRZ | SLP
and (1 << FRZ) | SLP_MASK
ld b, 5
jr z, .addAilmentValue
ld b, 10
@ -878,7 +878,7 @@ ItemUseMedicine:
lb bc, ICE_HEAL_MSG, 1 << FRZ
cp ICE_HEAL
jr z, .checkMonStatus
lb bc, AWAKENING_MSG, SLP
lb bc, AWAKENING_MSG, SLP_MASK
cp AWAKENING
jr z, .checkMonStatus
lb bc, PARALYZ_HEAL_MSG, 1 << PAR
@ -1700,7 +1700,7 @@ ItemUsePokeflute:
.inBattle
xor a
ld [wWereAnyMonsAsleep], a
ld b, ~SLP & $ff
ld b, ~SLP_MASK
ld hl, wPartyMon1Status
call WakeUpEntireParty
ld a, [wIsInBattle]
@ -1752,7 +1752,7 @@ WakeUpEntireParty:
.loop
ld a, [hl]
push af
and SLP ; is pokemon asleep?
and SLP_MASK
jr z, .notAsleep
ld a, 1
ld [wWereAnyMonsAsleep], a ; indicate that a pokemon had to be woken up