summaryrefslogtreecommitdiff
path: root/src/pokemon.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/pokemon.c')
-rw-r--r--src/pokemon.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/pokemon.c b/src/pokemon.c
index 62c444121..06a7a01f1 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -38,6 +38,7 @@
#include "constants/abilities.h"
#include "constants/battle_frontier.h"
#include "constants/battle_move_effects.h"
+#include "constants/battle_script_commands.h"
#include "constants/hold_effects.h"
#include "constants/item_effects.h"
#include "constants/items.h"
@@ -3103,7 +3104,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de
if (!typeOverride)
type = gBattleMoves[move].type;
else
- type = typeOverride & 0x3F;
+ type = typeOverride & DYNAMIC_TYPE_MASK;
attack = attacker->attack;
defense = defender->defense;