summaryrefslogtreecommitdiff
path: root/include/constants
diff options
context:
space:
mode:
authorPokeCodec <doremylover456@gmail.com>2020-08-16 13:14:35 -0400
committerPokeCodec <doremylover456@gmail.com>2020-08-18 22:05:01 -0400
commite27975afaae8604ce397f09b6a75185cc2c84342 (patch)
tree46fdfaffeebff0aeb6ac6872e80f4d501b82378c /include/constants
parent52bada97cda7d7aea8b67de5d07b6f527c7905ef (diff)
Match battle script commands by correcting a function and the pokemon struct
Diffstat (limited to 'include/constants')
-rw-r--r--include/constants/battle.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/constants/battle.h b/include/constants/battle.h
index 8b860e384..fa8f422c4 100644
--- a/include/constants/battle.h
+++ b/include/constants/battle.h
@@ -186,7 +186,7 @@
#define HITMARKER_x4000000 (1 << 26)
#define HITMARKER_CHARGING (1 << 27)
#define HITMARKER_FAINTED(battler) (gBitTable[battler] << 28)
-#define HITMARKER_FAINTED2(battler) (1 << (28 + battler))
+#define HITMARKER_FAINTED2(battler) ((1 << 28) << battler)
// Per-side statuses that affect an entire party
#define SIDE_STATUS_REFLECT (1 << 0)