From db2b995bc6504e5a4df777c13c36ed39dd4170da Mon Sep 17 00:00:00 2001
From: ExpoSeed <>
Date: Fri, 16 Apr 2021 20:36:45 -0500
Subject: [PATCH] Introduce NUM_ABILITY_SLOTS

---
 include/constants/pokemon.h |  2 ++
 include/pokemon.h           | 10 +++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h
index 5a44dad1cc..9cc05d09c5 100644
--- a/include/constants/pokemon.h
+++ b/include/constants/pokemon.h
@@ -368,4 +368,6 @@
 
 #define MON_PIC_SIZE (64 * 64 / 2)
 
+#define NUM_ABILITY_SLOTS 2
+
 #endif // GUARD_CONSTANTS_POKEMON_H
diff --git a/include/pokemon.h b/include/pokemon.h
index 6041be7dda..0587eaea8d 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -204,12 +204,12 @@ struct BaseStats
  /* 0x13 */ u8 growthRate;
  /* 0x14 */ u8 eggGroup1;
  /* 0x15 */ u8 eggGroup2;
- /* 0x16 */ u8 abilities[2];
- /* 0x18 */ u8 abilityHidden;
- /* 0x19 */ u8 safariZoneFleeRate;
- /* 0x1A */ u8 bodyColor : 7;
+ /* 0x16 */ u8 abilities[NUM_ABILITY_SLOTS];
+            u8 abilityHidden;
+            u8 safariZoneFleeRate;
+            u8 bodyColor : 7;
             u8 noFlip : 1;
- /* 0x1B */ u8 flags;
+            u8 flags;
 };
 
 struct BattleMove