diff options
| author | yenatch <yenatch@gmail.com> | 2018-04-09 21:30:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-09 21:30:24 -0400 |
| commit | 40b537d45b4b8937038126f7e5d2d21ccee460c0 (patch) | |
| tree | 881a090b80b2c22985fc6d1231b03c6721a83462 /constants/battle_constants.asm | |
| parent | e4b41fad4fd3787ca2e61adb5377ba8f68fca7ef (diff) | |
| parent | 53ff57ca663dc5bf9c3731022b0eb0dc73f2207f (diff) | |
Merge pull request #503 from Rangi42/master
Factor wMisc into meaningful parts; move most code out of home.asm
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) |