summaryrefslogtreecommitdiff
path: root/src/battle/battle_message.c
diff options
context:
space:
mode:
authorProjectRevoTPP <projectrevotpp@hotmail.com>2018-01-18 15:04:09 -0500
committerProjectRevoTPP <projectrevotpp@hotmail.com>2018-01-18 15:04:09 -0500
commit751af64d727a2c46a8a56931ce97488144e13704 (patch)
tree214100fdbe37eb076826b0d76bb9eb0d2e070de5 /src/battle/battle_message.c
parentb8b4a11a032d7fb21ae14c5372a266509d2f918b (diff)
parent58dd1c92ac6270d229c6762ca640118e4dd5e3cf (diff)
Merge branch 'master' of https://github.com/pret/pokeruby into fixes
Diffstat (limited to 'src/battle/battle_message.c')
-rw-r--r--src/battle/battle_message.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/battle/battle_message.c b/src/battle/battle_message.c
index 18e07acf6..e9334ef61 100644
--- a/src/battle/battle_message.c
+++ b/src/battle/battle_message.c
@@ -158,7 +158,6 @@ extern u8 gBankAttacker;
extern u8 gBankTarget;
extern u8 gStringBank;
extern u8 gEffectBank;
-extern u8 gAbilitiesPerBank[4];
extern u8 gBattleTextBuff1[];
extern u8 gBattleTextBuff2[];
extern u8 gBattleTextBuff3[];
@@ -175,6 +174,8 @@ extern u16 gBattlePartyID[4];
extern struct BattleEnigmaBerry gEnigmaBerries[4];
extern u8 gBattleBufferA[4][0x200];
+EWRAM_DATA u8 gAbilitiesPerBank[4] = {0};
+
extern const u8* const gUnknown_08401674[]; // table of pointers to 'a -TYPE' strings
extern const u8* const gUnknown_08400F58[]; // table of pointers to stat strings
extern const u8* const gUnknown_08400F78[]; // table of pointers to flavour strings