summaryrefslogtreecommitdiff
path: root/include/battle.h
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2018-11-19 17:36:39 +0100
committerDizzyEggg <jajkodizzy@wp.pl>2018-11-19 17:36:39 +0100
commit37d49b34e0fafcbe6bd62f9f549efb656837ff31 (patch)
tree267be1c5ea296109aa09ad42607de88a80c86d7f /include/battle.h
parent5d5b4b853c3b79db2abc7f062105f4e1dcdfcea2 (diff)
Move vars to battle_main.c
Diffstat (limited to 'include/battle.h')
-rw-r--r--include/battle.h25
1 files changed, 12 insertions, 13 deletions
diff --git a/include/battle.h b/include/battle.h
index 70b1856a8..c4a0fe9a5 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -664,6 +664,18 @@ struct MonSpritesGfx
};
// All battle variables are declared in battle_main.c
+extern u16 gBattle_BG0_X;
+extern u16 gBattle_BG0_Y;
+extern u16 gBattle_BG1_X;
+extern u16 gBattle_BG1_Y;
+extern u16 gBattle_BG2_X;
+extern u16 gBattle_BG2_Y;
+extern u16 gBattle_BG3_X;
+extern u16 gBattle_BG3_Y;
+extern u16 gBattle_WIN0H;
+extern u16 gBattle_WIN0V;
+extern u16 gBattle_WIN1H;
+extern u16 gBattle_WIN1V;
extern u8 gDisplayedStringBattle[300];
extern u8 gBattleTextBuff1[TEXT_BUFF_ARRAY_COUNT];
extern u8 gBattleTextBuff2[TEXT_BUFF_ARRAY_COUNT];
@@ -769,17 +781,4 @@ extern u8 gMultiUsePlayerCursor;
extern u8 gNumberOfMovesToChoose;
extern u8 gUnknown_03005D7C[MAX_BATTLERS_COUNT];
-extern u16 gBattle_WIN0H;
-extern u16 gBattle_WIN0V;
-extern u16 gBattle_WIN1H;
-extern u16 gBattle_WIN1V;
-extern u16 gBattle_BG0_X;
-extern u16 gBattle_BG0_Y;
-extern u16 gBattle_BG1_X;
-extern u16 gBattle_BG1_Y;
-extern u16 gBattle_BG2_X;
-extern u16 gBattle_BG2_Y;
-extern u16 gBattle_BG3_X;
-extern u16 gBattle_BG3_Y;
-
#endif // GUARD_BATTLE_H