summaryrefslogtreecommitdiff
path: root/include/battle.h
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2017-07-28 23:42:03 +0200
committerDizzyEggg <jajkodizzy@wp.pl>2017-07-28 23:42:03 +0200
commit6785868132dbebc8dd9fa95cc47189ccd7b8d3b7 (patch)
treed679bcc597d08d608706ecb00480f5ebdc881b2b /include/battle.h
parent3d0adf41579297b670238259f1b73046267a68be (diff)
last function IsPokeDisobedient
Diffstat (limited to 'include/battle.h')
-rw-r--r--include/battle.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/battle.h b/include/battle.h
index d68c8280e..4b2542017 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -96,6 +96,7 @@
#define HITMARKER_IGNORE_UNDERWATER 0x00040000
#define HITMARKER_UNABLE_TO_USE_MOVE 0x00080000
#define HITMARKER_x100000 0x00100000
+#define HITMARKER_x200000 0x00200000
#define HITMARKER_x400000 0x00400000
#define HITMARKER_x800000 0x00800000
#define HITMARKER_GRUDGE 0x01000000
@@ -661,6 +662,8 @@ extern u8 ewram[];
#define ewram17840 (*(struct Struct2017840 *) (ewram + 0x17840))
#define ewram17000 ((u32 *) (ewram + 0x17100))
+typedef void (*BattleCmdFunc)(void);
+
struct funcStack
{
void* ptr[8];