diff options
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/audio_constants.asm | 2 | ||||
| -rw-r--r-- | constants/battle_constants.asm | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/constants/audio_constants.asm b/constants/audio_constants.asm index 288caad91..85c5cc577 100644 --- a/constants/audio_constants.asm +++ b/constants/audio_constants.asm @@ -31,6 +31,8 @@ NUM_NOISE_CHANS EQU const_value const CHAN8 ; 7 NUM_CHANNELS EQU const_value +NOISE_CHAN_F EQU 2 ; bit set in CHAN5-CHAN7 + ; Flags1 const_def const SOUND_CHANNEL_ON ; 0 diff --git a/constants/battle_constants.asm b/constants/battle_constants.asm index b1f57514a..64e99d1d7 100644 --- a/constants/battle_constants.asm +++ b/constants/battle_constants.asm @@ -157,7 +157,7 @@ SLP EQU %111 ; 0-7 turns const FRZ const PAR -ALL_STATUS EQU (1 << PSN) + (1 << BRN) + (1 << FRZ) + (1 << PAR) + SLP +ALL_STATUS EQU (1 << PSN) | (1 << BRN) | (1 << FRZ) | (1 << PAR) | SLP ; wPlayerSubStatus1 or wEnemySubStatus1 bit flags enum_start 7, -1 @@ -248,3 +248,7 @@ SUBSTATUS_CURLED EQU 0 const WIN const LOSE const DRAW + +BATTLERESULT_CAUGHT_CELEBI EQU 6 +BATTLERESULT_BOX_FULL EQU 7 +BATTLERESULT_BITMASK EQU (1 << BATTLERESULT_CAUGHT_CELEBI) | (1 << BATTLERESULT_BOX_FULL) |