Leahnaya/pokegold
1
0
Fork 0
mirror of https://github.com/pret/pokegold.git synced 2026-04-26 01:47:27 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename SLP to SLP_MASK (#84)

Browse Source 
Co-authored-by: Rangi <35663410+Rangi42@users.noreply.github.com>
This commit is contained in:
vulcandth 2022-06-17 21:25:55 -05:00 committed by GitHub
parent 357a90f08f
commit 6805c678ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
constants/battle_constants.asm
View File

@ -152,14 +152,14 @@ assert const_value % 2 == 0
DEF NUM_BATTLE_VAR_LOCATION_PAIRS EQU const_value / 2
; status condition bit flags
DEF SLP EQU %111 ; 0-7 turns
DEF SLP_MASK EQU %111 ; 0-7 turns
const_def 3
const PSN
const BRN
const FRZ
const PAR
DEF ALL_STATUS EQU (1 << PSN) | (1 << BRN) | (1 << FRZ) | (1 << PAR) | SLP
DEF ALL_STATUS EQU (1 << PSN) | (1 << BRN) | (1 << FRZ) | (1 << PAR) | SLP_MASK
; wPlayerSubStatus1 or wEnemySubStatus1 bit flags
const_def

2
data/battle/held_heal_status.asm
View File

@ -4,7 +4,7 @@ HeldStatusHealingEffects:
db HELD_HEAL_POISON, 1 << PSN
db HELD_HEAL_FREEZE, 1 << FRZ
db HELD_HEAL_BURN, 1 << BRN
db HELD_HEAL_SLEEP, SLP
db HELD_HEAL_SLEEP, SLP_MASK
db HELD_HEAL_PARALYZE, 1 << PAR
db HELD_HEAL_STATUS, ALL_STATUS
db -1 ; end

4
data/items/heal_status.asm
View File

@ -5,7 +5,7 @@ StatusHealingActions:
db ANTIDOTE, PARTYMENUTEXT_HEAL_PSN, 1 << PSN
db BURN_HEAL, PARTYMENUTEXT_HEAL_BRN, 1 << BRN
db ICE_HEAL, PARTYMENUTEXT_HEAL_FRZ, 1 << FRZ
db AWAKENING, PARTYMENUTEXT_HEAL_SLP, SLP
db AWAKENING, PARTYMENUTEXT_HEAL_SLP, SLP_MASK
db PARLYZ_HEAL, PARTYMENUTEXT_HEAL_PAR, 1 << PAR
db FULL_HEAL, PARTYMENUTEXT_HEAL_ALL, %11111111
db FULL_RESTORE, PARTYMENUTEXT_HEAL_ALL, %11111111
@ -14,6 +14,6 @@ StatusHealingActions:
db PRZCUREBERRY, PARTYMENUTEXT_HEAL_PAR, 1 << PAR
db BURNT_BERRY, PARTYMENUTEXT_HEAL_FRZ, 1 << FRZ
db ICE_BERRY, PARTYMENUTEXT_HEAL_BRN, 1 << BRN
db MINT_BERRY, PARTYMENUTEXT_HEAL_SLP, SLP
db MINT_BERRY, PARTYMENUTEXT_HEAL_SLP, SLP_MASK
db MIRACLEBERRY, PARTYMENUTEXT_HEAL_ALL, %11111111
db -1, 0, 0 ; end

2
engine/battle/ai/items.asm
View File

@ -305,7 +305,7 @@ AI_Items:
jp c, .Use
.FailToxicCheck:
ld a, [wEnemyMonStatus]
and 1 << FRZ | SLP
and 1 << FRZ | SLP_MASK
jp z, .DontUse
jp .Use

4
engine/battle/ai/redundant.asm
View File

@ -102,7 +102,7 @@ AI_Redundant:
.Snore:
.SleepTalk:
ld a, [wEnemyMonStatus]
and SLP
and SLP_MASK
jr z, .Redundant
jr .NotRedundant
@ -166,7 +166,7 @@ AI_Redundant:
.DreamEater:
ld a, [wBattleMonStatus]
and SLP
and SLP_MASK
jr z, .Redundant
jr .NotRedundant

4
engine/battle/ai/scoring.asm
View File

@ -1459,7 +1459,7 @@ AI_Smart_SleepTalk:
; Greatly discourage this move otherwise.
ld a, [wEnemyMonStatus]
and SLP
and SLP_MASK
cp 1
jr z, .discourage
@ -1597,7 +1597,7 @@ AI_Smart_HealBell:
jr z, .ok
dec [hl]
.ok
and 1 << FRZ | SLP
and 1 << FRZ | SLP_MASK
ret z
call AI_50_50
ret c

2
engine/battle/core.asm
View File

@ -720,7 +720,7 @@ TryEnemyFlee:
jr nz, .Stay
ld a, [wEnemyMonStatus]
and 1 << FRZ | SLP
and 1 << FRZ | SLP_MASK
jr nz, .Stay
ld a, [wTempEnemyMonSpecies]

26
engine/battle/effect_commands.asm
View File

@ -158,12 +158,12 @@ BattleCommand_CheckTurn:
ld hl, wBattleMonStatus
ld a, [hl]
and SLP
and SLP_MASK
jr z, .not_asleep
dec a
ld [wBattleMonStatus], a
and SLP
and SLP_MASK
jr z, .woke_up
xor a
@ -387,7 +387,7 @@ CheckEnemyTurn:
ld hl, wEnemyMonStatus
ld a, [hl]
and SLP
and SLP_MASK
jr z, .not_asleep
dec a
@ -779,7 +779,7 @@ BattleCommand_CheckObedience:
call BattleRandom
add a
swap a
and SLP
and SLP_MASK
jr z, .Nap
ld [wBattleMonStatus], a
@ -932,7 +932,7 @@ IgnoreSleepOnly:
.CheckSleep:
ld a, BATTLE_VARS_STATUS
call GetBattleVar
and SLP
and SLP_MASK
ret z
; 'ignored orders…sleeping!'
@ -1639,7 +1639,7 @@ BattleCommand_CheckHit:
ld a, BATTLE_VARS_STATUS_OPP
call GetBattleVar
and SLP
and SLP_MASK
ret
.Protect:
@ -3567,7 +3567,7 @@ BattleCommand_SleepTarget:
ld d, h
ld e, l
ld a, [de]
and SLP
and SLP_MASK
ld hl, AlreadyAsleepText
jr nz, .fail
@ -3590,9 +3590,9 @@ BattleCommand_SleepTarget:
.random_loop
call BattleRandom
and SLP
and SLP_MASK
jr z, .random_loop
cp SLP
cp SLP_MASK
jr z, .random_loop
inc a
ld [de], a
@ -4886,7 +4886,7 @@ BattleCommand_Rampage:
; No rampage during Sleep Talk.
ld a, BATTLE_VARS_STATUS
call GetBattleVar
and SLP
and SLP_MASK
ret nz
ld de, wPlayerRolloutCount
@ -5299,7 +5299,7 @@ BattleCommand_FakeOut:
ld a, BATTLE_VARS_STATUS_OPP
call GetBattleVar
and 1 << FRZ | SLP
and 1 << FRZ | SLP_MASK
jr nz, .fail
call CheckOpponentWentFirst
@ -5316,7 +5316,7 @@ BattleCommand_FlinchTarget:
ld a, BATTLE_VARS_STATUS_OPP
call GetBattleVar
and 1 << FRZ | SLP
and 1 << FRZ | SLP_MASK
ret nz
call CheckOpponentWentFirst
@ -5432,7 +5432,7 @@ BattleCommand_Charge:
call BattleCommand_ClearText
ld a, BATTLE_VARS_STATUS
call GetBattleVar
and SLP
and SLP_MASK
jr z, .awake
call BattleCommand_MoveDelay

2
engine/battle/move_effects/baton_pass.asm
View File

@ -105,7 +105,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

2
engine/battle/move_effects/nightmare.asm
View File

@ -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.

2
engine/battle/move_effects/rollout.asm
View File

@ -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

2
engine/battle/move_effects/sleep_talk.asm
View File

@ -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

2
engine/battle/move_effects/snore.asm
View File

@ -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

6
engine/items/item_effects.asm
View File

@ -341,7 +341,7 @@ PokeBallEffect:
; Uncomment the line below to fix this.
ld b, a
ld a, [wEnemyMonStatus]
and 1 << FRZ | SLP
and 1 << FRZ | SLP_MASK
ld c, 10
jr nz, .addstatus
; ld a, [wEnemyMonStatus]
@ -2155,7 +2155,7 @@ PokeFluteEffect:
xor a
ld [wPokeFluteCuredSleep], a
ld b, ~SLP
ld b, ~SLP_MASK
ld hl, wPartyMon1Status
call .CureSleep
@ -2197,7 +2197,7 @@ PokeFluteEffect:
.loop
ld a, [hl]
push af
and SLP
and SLP_MASK
jr z, .not_asleep
ld a, TRUE
ld [wPokeFluteCuredSleep], a

2
engine/pokemon/mon_stats.asm
View File

@ -403,7 +403,7 @@ PlaceNonFaintStatus:
bit PAR, a
jr nz, .place
ld de, SlpString
and SLP
and SLP_MASK
jr z, .no_status
.place