Eliminate enum: use const instead, with case-by-case parallel const implementations
This commit is contained in:
@@ -162,59 +162,60 @@ SLP EQU %111 ; 0-7 turns
|
||||
ALL_STATUS EQU (1 << PSN) | (1 << BRN) | (1 << FRZ) | (1 << PAR) | SLP
|
||||
|
||||
; wPlayerSubStatus1 or wEnemySubStatus1 bit flags
|
||||
enum_start 7, -1
|
||||
enum SUBSTATUS_IN_LOVE
|
||||
enum SUBSTATUS_ROLLOUT
|
||||
enum SUBSTATUS_ENDURE
|
||||
enum SUBSTATUS_PERISH
|
||||
enum SUBSTATUS_IDENTIFIED
|
||||
enum SUBSTATUS_PROTECT
|
||||
enum SUBSTATUS_CURSE
|
||||
enum SUBSTATUS_NIGHTMARE
|
||||
const_def
|
||||
const SUBSTATUS_NIGHTMARE
|
||||
const SUBSTATUS_CURSE
|
||||
const SUBSTATUS_PROTECT
|
||||
const SUBSTATUS_IDENTIFIED
|
||||
const SUBSTATUS_PERISH
|
||||
const SUBSTATUS_ENDURE
|
||||
const SUBSTATUS_ROLLOUT
|
||||
const SUBSTATUS_IN_LOVE
|
||||
|
||||
; wPlayerSubStatus2 or wEnemySubStatus2 bit flags
|
||||
SUBSTATUS_CURLED EQU 0
|
||||
const_def
|
||||
const SUBSTATUS_CURLED
|
||||
|
||||
; wPlayerSubStatus3 or wEnemySubStatus3 bit flags
|
||||
enum_start 7, -1
|
||||
enum SUBSTATUS_CONFUSED
|
||||
enum SUBSTATUS_FLYING
|
||||
enum SUBSTATUS_UNDERGROUND
|
||||
enum SUBSTATUS_CHARGED
|
||||
enum SUBSTATUS_FLINCHED
|
||||
enum SUBSTATUS_IN_LOOP
|
||||
enum SUBSTATUS_RAMPAGE
|
||||
enum SUBSTATUS_BIDE
|
||||
const_def
|
||||
const SUBSTATUS_BIDE
|
||||
const SUBSTATUS_RAMPAGE
|
||||
const SUBSTATUS_IN_LOOP
|
||||
const SUBSTATUS_FLINCHED
|
||||
const SUBSTATUS_CHARGED
|
||||
const SUBSTATUS_UNDERGROUND
|
||||
const SUBSTATUS_FLYING
|
||||
const SUBSTATUS_CONFUSED
|
||||
|
||||
; wPlayerSubStatus4 or wEnemySubStatus4 bit flags
|
||||
enum_start 7, -1
|
||||
enum SUBSTATUS_LEECH_SEED
|
||||
enum SUBSTATUS_RAGE
|
||||
enum SUBSTATUS_RECHARGE
|
||||
enum SUBSTATUS_SUBSTITUTE
|
||||
enum SUBSTATUS_UNKNOWN_1
|
||||
enum SUBSTATUS_FOCUS_ENERGY
|
||||
enum SUBSTATUS_MIST
|
||||
enum SUBSTATUS_X_ACCURACY
|
||||
const_def
|
||||
const SUBSTATUS_X_ACCURACY
|
||||
const SUBSTATUS_MIST
|
||||
const SUBSTATUS_FOCUS_ENERGY
|
||||
const SUBSTATUS_UNKNOWN_1
|
||||
const SUBSTATUS_SUBSTITUTE
|
||||
const SUBSTATUS_RECHARGE
|
||||
const SUBSTATUS_RAGE
|
||||
const SUBSTATUS_LEECH_SEED
|
||||
|
||||
; wPlayerSubStatus5 or wEnemySubStatus5 bit flags
|
||||
enum_start 7, -1
|
||||
enum SUBSTATUS_CANT_RUN
|
||||
enum SUBSTATUS_DESTINY_BOND
|
||||
enum SUBSTATUS_LOCK_ON
|
||||
enum SUBSTATUS_ENCORED
|
||||
enum SUBSTATUS_TRANSFORMED
|
||||
enum SUBSTATUS_UNKNOWN_2
|
||||
enum SUBSTATUS_UNKNOWN_3
|
||||
enum SUBSTATUS_TOXIC
|
||||
const_def
|
||||
const SUBSTATUS_TOXIC
|
||||
const SUBSTATUS_UNKNOWN_2
|
||||
const SUBSTATUS_UNKNOWN_3
|
||||
const SUBSTATUS_TRANSFORMED
|
||||
const SUBSTATUS_ENCORED
|
||||
const SUBSTATUS_LOCK_ON
|
||||
const SUBSTATUS_DESTINY_BOND
|
||||
const SUBSTATUS_CANT_RUN
|
||||
|
||||
; wPlayerScreens or wEnemyScreens bit flags
|
||||
enum_start 4, -1
|
||||
enum SCREENS_REFLECT
|
||||
enum SCREENS_LIGHT_SCREEN
|
||||
enum SCREENS_SAFEGUARD
|
||||
enum SCREENS_UNUSED
|
||||
enum SCREENS_SPIKES
|
||||
const_def
|
||||
const SCREENS_SPIKES
|
||||
const SCREENS_UNUSED
|
||||
const SCREENS_SAFEGUARD
|
||||
const SCREENS_LIGHT_SCREEN
|
||||
const SCREENS_REFLECT
|
||||
|
||||
; values in wBattleWeather
|
||||
const_def
|
||||
|
Reference in New Issue
Block a user