Move some vars to C

2019-01-13 13:15:23 +01:00
parent 11a49a7f02
commit c0bc01d301
19 changed files with 282 additions and 250 deletions
--- a/include/constants/battle.h
+++ b/include/constants/battle.h
@@ -174,7 +174,7 @@
 #define HITMARKER_GRUDGE                0x01000000
 #define HITMARKER_OBEYS                 0x02000000
 #define HITMARKER_x4000000              0x04000000
-#define HITMARKER_x8000000              0x08000000
+#define HITMARKER_CHARGING              0x08000000
 #define HITMARKER_FAINTED(battler)      (gBitTable[battler] << 0x1C)
 #define HITMARKER_UNK(battler)          (0x10000000 << battler)