diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2014-06-27 21:33:08 -0500 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2014-06-27 21:33:08 -0500 |
| commit | 1ecfe6bd23bb9b4e1886342c082bd5c3a108abbb (patch) | |
| tree | 8190d5b11ebec4505c5494baf74b339ae9c82078 /constants/battle_constants.asm | |
| parent | 1fbe471b74908be6e89777857bf7407ef427225b (diff) | |
| parent | d6fbdfb8decf6231d6b43fbfcba63f9ce60308dc (diff) | |
Merge pull request #256 from yenatch/master
Fix predefs and battle code.
Diffstat (limited to 'constants/battle_constants.asm')
| -rw-r--r-- | constants/battle_constants.asm | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/constants/battle_constants.asm b/constants/battle_constants.asm index d4a5abb14..f5dbe0b42 100644 --- a/constants/battle_constants.asm +++ b/constants/battle_constants.asm @@ -1,6 +1,8 @@ MAX_LEVEL EQU 100 NUM_MOVES EQU 4 +REST_TURNS EQU 2 + ATTACK EQU 0 DEFENSE EQU 1 SPEED EQU 2 @@ -44,9 +46,12 @@ BATTLETYPE_CANLOSE EQU $01 BATTLETYPE_TUTORIAL EQU $03 BATTLETYPE_FISH EQU $04 BATTLETYPE_ROAMING EQU $05 +BATTLETYPE_CONTEST EQU $06 BATTLETYPE_SHINY EQU $07 BATTLETYPE_TREE EQU $08 +BATTLETYPE_TRAP EQU $09 BATTLETYPE_FORCEITEM EQU $0a +BATTLETYPE_CELEBI EQU $0b BATTLETYPE_SUICUNE EQU $0c ; battle variables @@ -81,7 +86,7 @@ PAR EQU 6 ; substatus SUBSTATUS_IN_LOVE EQU 7 -SUBSTATUS_ENCORED EQU 6 +SUBSTATUS_ROLLOUT EQU 6 SUBSTATUS_ENDURE EQU 5 SUBSTATUS_PERISH EQU 4 SUBSTATUS_IDENTIFIED EQU 3 @@ -96,7 +101,8 @@ SUBSTATUS_FLYING EQU 6 SUBSTATUS_UNDERGROUND EQU 5 SUBSTATUS_CHARGED EQU 4 SUBSTATUS_FLINCHED EQU 3 -SUBSTATUS_ROLLOUT EQU 1 +SUBSTATUS_IN_LOOP EQU 2 +SUBSTATUS_RAMPAGE EQU 1 SUBSTATUS_BIDE EQU 0 SUBSTATUS_LEECH_SEED EQU 7 @@ -110,6 +116,8 @@ SUBSTATUS_UNLEASH EQU 0 SUBSTATUS_CANT_RUN EQU 7 SUBSTATUS_DESTINY_BOND EQU 6 SUBSTATUS_LOCK_ON EQU 5 +SUBSTATUS_ENCORED EQU 4 +SUBSTATUS_TRANSFORMED EQU 3 SUBSTATUS_TOXIC EQU 0 ; environmental @@ -119,6 +127,7 @@ SCREENS_SAFEGUARD EQU 2 SCREENS_SPIKES EQU 0 ; weather +WEATHER_NONE EQU 0 WEATHER_RAIN EQU 1 WEATHER_SUN EQU 2 WEATHER_SANDSTORM EQU 3 |