merge with master

2017-12-01 21:27:29 +01:00
parent 646664ff29 0250aefb73
commit 039c9f4bd8
17 changed files with 282 additions and 483 deletions
--- a/include/battle.h
+++ b/include/battle.h
@@ -88,6 +88,7 @@

 #define BATTLE_OUTCOME_BIT_x80      0x80

+#define STATUS_NONE             0x0
 #define STATUS_SLEEP            0x7
 #define STATUS_POISON           0x8
 #define STATUS_BURN             0x10