From e15a86caae6272dbc35561fda2d08be518111e75 Mon Sep 17 00:00:00 2001
From: ultima-soul <akshayjhanji@hotmail.com>
Date: Tue, 17 Nov 2020 10:32:24 -0800
Subject: [PATCH] =?UTF-8?q?Add=20ifdef=20for=20Hidden=20Abilities=20from?=
 =?UTF-8?q?=20Pok=C3=A9mon=20Expansion=20and=20change=20gBattlerAbility=20?=
 =?UTF-8?q?back=20to=20a=20u8.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/battle.h  | 2 +-
 include/pokemon.h | 7 +++++--
 src/battle_main.c | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/include/battle.h b/include/battle.h
index 5846321a62..a6e201a239 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -815,7 +815,7 @@ extern u16 gMoveToLearn;
 extern u8 gBattleMonForms[MAX_BATTLERS_COUNT];
 extern u32 gFieldStatuses;
 extern struct FieldTimer gFieldTimers;
-extern u16 gBattlerAbility;
+extern u8 gBattlerAbility;
 extern u16 gPartnerSpriteId;
 
 extern void (*gPreBattleCallback1)(void);
diff --git a/include/pokemon.h b/include/pokemon.h
index 8a8beb1063..0c64d21377 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -199,8 +199,11 @@ struct BaseStats
  /* 0x14 */ u8 eggGroup1;
  /* 0x15 */ u8 eggGroup2;
  /* 0x16 */ u16 abilities[2];
- /* 0x1A */ u8 safariZoneFleeRate;
- /* 0x1B */ u8 bodyColor : 7;
+#ifdef POKEMON_EXPANSION
+            u16 abilityHidden;
+#endif
+            u8 safariZoneFleeRate;
+            u8 bodyColor : 7;
             u8 noFlip : 1;
 };
 
diff --git a/src/battle_main.c b/src/battle_main.c
index f0c658773c..48129c5230 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -226,7 +226,7 @@ EWRAM_DATA u16 gMoveToLearn = 0;
 EWRAM_DATA u8 gBattleMonForms[MAX_BATTLERS_COUNT] = {0};
 EWRAM_DATA u32 gFieldStatuses = 0;
 EWRAM_DATA struct FieldTimer gFieldTimers = {0};
-EWRAM_DATA u16 gBattlerAbility = 0;
+EWRAM_DATA u8 gBattlerAbility = 0;
 EWRAM_DATA u16 gPartnerSpriteId = 0;
 
 // IWRAM common vars