From 10cfe0903414a572baa48e3d5a0b091ce512a4f4 Mon Sep 17 00:00:00 2001
From: vulcandth <vulcandth@gmail.com>
Date: Fri, 17 Jun 2022 21:25:53 -0500
Subject: Rename `SLP` to `SLP_MASK` (#89)

Co-authored-by: Rangi <35663410+Rangi42@users.noreply.github.com>
---
 engine/items/item_effects.asm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'engine/items')

diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm
index bfb6c96e..66f7832b 100644
--- a/engine/items/item_effects.asm
+++ b/engine/items/item_effects.asm
@@ -237,7 +237,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
@@ -394,7 +394,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
@@ -977,7 +977,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
@@ -1894,7 +1894,7 @@ ItemUsePokeflute:
 .inBattle
 	xor a
 	ld [wWereAnyMonsAsleep], a
-	ld b, ~SLP & $ff
+	ld b, ~SLP_MASK
 	ld hl, wPartyMon1Status
 	call WakeUpEntireParty
 	ld a, [wIsInBattle]
@@ -1914,7 +1914,7 @@ ItemUsePokeflute:
 	and b ; remove Sleep status
 	ld [hl], a
 	ld a, c
-	and SLP
+	and SLP_MASK
 	jr z, .asm_e063
 	ld a, $1
 	ld [wWereAnyMonsAsleep], a
@@ -1953,7 +1953,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
-- 
cgit v1.3.1-sl0p