summaryrefslogtreecommitdiff
path: root/include/battle.h
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2017-07-28 18:02:08 +0200
committerDizzyEggg <jajkodizzy@wp.pl>2017-07-28 18:02:08 +0200
commitdddca2951a2619d98e5008473408a83d69d8c99e (patch)
treefb53a7989c77d1571bed3e2579bbe2cbc4d4a49d /include/battle.h
parent1416c0c79d9fd6903f1d13f2a7740df4bad100d3 (diff)
IBE matches
Diffstat (limited to 'include/battle.h')
-rw-r--r--include/battle.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/include/battle.h b/include/battle.h
index 44b7c048a..0f1a5f26b 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -34,7 +34,9 @@
#define STATUS_FREEZE 0x20
#define STATUS_PARALYSIS 0x40
#define STATUS_TOXIC_POISON 0x80
+#define STATUS_TOXIC_COUNTER 0xF00
+#define STATUS_PSN_ANY ((STATUS_POISON | STATUS_TOXIC_POISON))
#define STATUS_ANY ((STATUS_SLEEP | STATUS_POISON | STATUS_BURN | STATUS_FREEZE | STATUS_PARALYSIS | STATUS_TOXIC_POISON))
#define STATUS2_CONFUSION 0x00000007
@@ -597,9 +599,9 @@ struct SpecialStatus
u8 flag40 : 1;
u8 focusBanded : 1;
u8 field1[3];
- u32 moveturnLostHP;
- u32 moveturnLostHP_physical;
- u32 moveturnLostHP_special;
+ s32 moveturnLostHP;
+ s32 moveturnLostHP_physical;
+ s32 moveturnLostHP_special;
u8 moveturnPhysicalBank;
u8 moveturnSpecialBank;
u8 field12;