summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorjiangzhengwenjz <jiangzhengwenjzw@qq.com>2019-07-15 06:34:49 +0800
committerjiangzhengwenjz <jiangzhengwenjzw@qq.com>2019-07-15 06:34:49 +0800
commitcb3722a57a45db006e2fe293b8c8b77afc944dc9 (patch)
tree90e295856e70a61641658251a56c6598f6f4e0ea /include
parent96fa1a23edaf12082034b4ef79244e6ce3dd3128 (diff)
decompiled learnset and evo table
Diffstat (limited to 'include')
-rw-r--r--include/battle_2.h1
-rw-r--r--include/pokemon.h3
2 files changed, 2 insertions, 2 deletions
diff --git a/include/battle_2.h b/include/battle_2.h
index cb9247372..02050afd9 100644
--- a/include/battle_2.h
+++ b/include/battle_2.h
@@ -2,6 +2,7 @@
#define GUARD_BATTLE_2_H
#include "global.h"
+#include "sprite.h"
void CB2_InitBattle(void);
void BattleMainCB2(void);
diff --git a/include/pokemon.h b/include/pokemon.h
index e84778fa3..157e65e16 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -426,8 +426,7 @@ struct BaseStats
/* 0x13 */ u8 growthRate;
/* 0x14 */ u8 eggGroup1;
/* 0x15 */ u8 eggGroup2;
- /* 0x16 */ u8 ability1;
- /* 0x17 */ u8 ability2;
+ /* 0x16 */ u8 abilities[2];
/* 0x18 */ u8 safariZoneFleeRate;
/* 0x19 */ u8 bodyColor : 7;
u8 noFlip : 1;