Rename SLP to SLP_MASK (#918)

Co-authored-by: Rangi <35663410+Rangi42@users.noreply.github.com>
2025-04-09 05:44:44 -07:00 · 2022-06-17 21:25:56 -05:00
parent 73c020074e
commit 5f0597e944
17 changed files with 35 additions and 35 deletions
--- a/engine/battle/move_effects/baton_pass.asm
+++ b/engine/battle/move_effects/baton_pass.asm
@@ -128,7 +128,7 @@ ResetBatonPassStatus:
 	; Nightmare isn't passed.
 	ld a, BATTLE_VARS_STATUS
 	call GetBattleVar
-	and SLP
+	and SLP_MASK
 	jr nz, .ok

 	ld a, BATTLE_VARS_SUBSTATUS1
--- a/engine/battle/move_effects/nightmare.asm
+++ b/engine/battle/move_effects/nightmare.asm
@@ -13,7 +13,7 @@ BattleCommand_Nightmare:

 	ld a, BATTLE_VARS_STATUS_OPP
 	call GetBattleVarAddr
-	and SLP
+	and SLP_MASK
 	jr z, .failed

 ; Bail if the opponent is already having a nightmare.
--- a/engine/battle/move_effects/rollout.asm
+++ b/engine/battle/move_effects/rollout.asm
@@ -23,7 +23,7 @@ BattleCommand_CheckCurl:
 BattleCommand_RolloutPower:
 	ld a, BATTLE_VARS_STATUS
 	call GetBattleVar
-	and SLP
+	and SLP_MASK
 	ret nz

 	ld hl, wPlayerRolloutCount
--- a/engine/battle/move_effects/sleep_talk.asm
+++ b/engine/battle/move_effects/sleep_talk.asm
@@ -15,7 +15,7 @@ BattleCommand_SleepTalk:
 .got_moves
 	ld a, BATTLE_VARS_STATUS
 	call GetBattleVar
-	and SLP
+	and SLP_MASK
 	jr z, .fail
 	ld a, [hl]
 	and a
--- a/engine/battle/move_effects/snore.asm
+++ b/engine/battle/move_effects/snore.asm
@@ -1,7 +1,7 @@
 BattleCommand_Snore:
 	ld a, BATTLE_VARS_STATUS
 	call GetBattleVar
-	and SLP
+	and SLP_MASK
 	ret nz
 	call ResetDamage
 	ld a, $1