summaryrefslogtreecommitdiff
path: root/constants
diff options
context:
space:
mode:
Diffstat (limited to 'constants')
-rw-r--r--constants/battle.s37
1 files changed, 31 insertions, 6 deletions
diff --git a/constants/battle.s b/constants/battle.s
index 799ede409..c6094b15f 100644
--- a/constants/battle.s
+++ b/constants/battle.s
@@ -1,3 +1,4 @@
+@ status 1
.equiv SLP, 0x07
.equiv PSN, 0x08
.equiv BRN, 0x10
@@ -5,12 +6,36 @@
.equiv PAR, 0x40
.equiv TOX, 0x80
-.equiv S_CONFUSED, 0x07
-.equiv S_CONTINUE, 0x1000
-.equiv S_FOCUS_ENERGY, 0x100000
-.equiv S_SUBSTITUTE, 0x1000000
-.equiv S_MEAN_LOOK, 0x4000000
-.equiv S_NIGHTMARE, 0x8000000
+@ status 2
+.equiv S_CONFUSED, 0x00000007
+.equiv S_CONTINUE, 0x00001000
+.equiv S_TEMP_TRAP, 0x0000E000 @ Wrap, Bind, etc.
+.equiv S_INFATUATED, 0x000F0000
+.equiv S_FOCUS_ENERGY, 0x00100000
+.equiv S_SUBSTITUTE, 0x01000000
+.equiv S_MEAN_LOOK, 0x04000000
+.equiv S_NIGHTMARE, 0x08000000
+.equiv S_CURSED, 0x10000000
+.equiv S_FORESIGHT, 0x20000000
+.equiv S_TORMENT, 0x80000000
+
+@ status 3
+.equiv S_LEECH_SEED, 0x00000004
+.equiv S_ALWAYS_HIT, 0x00000010
+.equiv S_PERISH_SONG, 0x00000020
+.equiv S_ROOTED, 0x00000400
+.equiv S_YAWN, 0x00001800
+.equiv S_IMPRISONED, 0x00002000
+.equiv S_MUD_SPORT, 0x00010000
+.equiv S_WATER_SPORT, 0x00020000
+
+@ status 4
+.equiv S_REFLECT, 0x0001
+.equiv S_LIGHT_SCREEN, 0x0002
+.equiv S_SPIKES, 0x0010
+.equiv S_SAFEGUARD, 0x0020
+.equiv S_FUTURE_SIGHT, 0x0040
+.equiv S_MIST, 0x0100
.equiv TARGET, 0
.equiv USER, 1