ref: edb55e00f84024dd3634a25df8715e8b9cb3454b
parent: 6c945a6b6a0d21ba4bf0c2977bb44d2482dffcb8
author: vulcandth <vulcandth@gmail.com>
date: Fri Jun 17 17:25:52 EDT 2022
Rename `SLP` to `SLP_MASK` (#361) Co-authored-by: Rangi <35663410+Rangi42@users.noreply.github.com>
--- a/constants/battle_constants.asm
+++ b/constants/battle_constants.asm
@@ -57,7 +57,7 @@
DEF NO_EFFECT EQU 00
; non-volatile statuses
-DEF SLP EQU %111 ; sleep counter
+DEF SLP_MASK EQU %111 ; 0-7 turns
const_def 3
const PSN ; 3
const BRN ; 4
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -308,7 +308,7 @@
and a
ret nz ; return if pokedoll was used to escape from battle
ld a, [wBattleMonStatus]
- and (1 << FRZ) | SLP ; is mon frozen or asleep?
+ and (1 << FRZ) | SLP_MASK
jr nz, .selectEnemyMove ; if so, jump
ld a, [wPlayerBattleStatus1]
and (1 << STORING_ENERGY) | (1 << USING_TRAPPING_MOVE) ; check player is using Bide or using a multi-turn attack like wrap
@@ -2934,7 +2934,7 @@
and (1 << CHARGING_UP) | (1 << THRASHING_ABOUT) ; using a charging move or thrash/petal dance
ret nz
ld a, [wEnemyMonStatus]
- and SLP | 1 << FRZ ; sleeping or frozen
+ and (1 << FRZ) | SLP_MASK
ret nz
ld a, [wEnemyBattleStatus1]
and (1 << USING_TRAPPING_MOVE) | (1 << STORING_ENERGY) ; using a trapping move like wrap or bide
@@ -3275,7 +3275,7 @@
and a
jr nz, .Ghost
ld a, [wBattleMonStatus] ; player's turn
- and SLP | (1 << FRZ)
+ and (1 << FRZ) | SLP_MASK
ret nz
ld hl, ScaredText
call PrintText
@@ -3317,7 +3317,7 @@
CheckPlayerStatusConditions:
ld hl, wBattleMonStatus
ld a, [hl]
- and SLP ; sleep mask
+ and SLP_MASK
jr z, .FrozenCheck
; sleeping
dec a
@@ -4029,7 +4029,7 @@
call BattleRandom
add a
swap a
- and SLP ; sleep mask
+ and SLP_MASK
jr z, .monNaps ; keep trying until we get at least 1 turn of sleep
ld [wBattleMonStatus], a
ld hl, BeganToNapText
@@ -5362,7 +5362,7 @@
cp DREAM_EATER_EFFECT
jr nz, .swiftCheck
ld a, [bc]
- and SLP ; is the target pokemon sleeping?
+ and SLP_MASK
jp z, .moveMissed
.swiftCheck
ld a, [de]
@@ -5796,7 +5796,7 @@
CheckEnemyStatusConditions:
ld hl, wEnemyMonStatus
ld a, [hl]
- and SLP ; sleep mask
+ and SLP_MASK
jr z, .checkIfFrozen
dec a ; decrement number of turns left
ld [wEnemyMonStatus], a
--- a/engine/battle/move_effects/haze.asm
+++ b/engine/battle/move_effects/haze.asm
@@ -24,7 +24,7 @@
.cureStatuses
ld a, [hl]
ld [hl], $0
- and SLP | (1 << FRZ)
+ and (1 << FRZ) | SLP_MASK
jr z, .cureVolatileStatuses
; prevent the Pokemon from executing a move if it was asleep or frozen
ld a, $ff
--- a/engine/items/item_effects.asm
+++ b/engine/items/item_effects.asm
@@ -225,7 +225,7 @@
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 @@
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 @@
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 @@
.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 @@
.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
--- a/engine/pokemon/status_ailments.asm
+++ b/engine/pokemon/status_ailments.asm
@@ -8,7 +8,7 @@
jr nz, .frz
bit PAR, a
jr nz, .par
- and SLP
+ and SLP_MASK
ret z
ld a, "S"
ld [hli], a