diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-04-05 11:44:02 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-04-05 11:44:02 -0400 |
| commit | 7307fc8dce605823fbdf8e5ec8530d7aaf675cfa (patch) | |
| tree | 63a1d741812989026ac3a22806f7677525c3512c /constants/battle_constants.asm | |
| parent | 99df17d57173cb82abc668714727c5dada6aac73 (diff) | |
Use constants for bit/set/res more
Diffstat (limited to 'constants/battle_constants.asm')
| -rw-r--r-- | constants/battle_constants.asm | 6 |
1 files changed, 5 insertions, 1 deletions
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) |