diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-11-19 17:36:39 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-11-19 17:36:39 +0100 |
| commit | 37d49b34e0fafcbe6bd62f9f549efb656837ff31 (patch) | |
| tree | 267be1c5ea296109aa09ad42607de88a80c86d7f /src | |
| parent | 5d5b4b853c3b79db2abc7f062105f4e1dcdfcea2 (diff) | |
Move vars to battle_main.c
Diffstat (limited to 'src')
| -rw-r--r-- | src/battle_main.c | 12 | ||||
| -rw-r--r-- | src/battle_tent.c | 1 |
2 files changed, 13 insertions, 0 deletions
diff --git a/src/battle_main.c b/src/battle_main.c index 4669e9123..116f5963a 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -173,6 +173,18 @@ static void HandleAction_NothingIsFainted(void); static void HandleAction_ActionFinished(void); // EWRAM vars +EWRAM_DATA u16 gBattle_BG0_X = 0; +EWRAM_DATA u16 gBattle_BG0_Y = 0; +EWRAM_DATA u16 gBattle_BG1_X = 0; +EWRAM_DATA u16 gBattle_BG1_Y = 0; +EWRAM_DATA u16 gBattle_BG2_X = 0; +EWRAM_DATA u16 gBattle_BG2_Y = 0; +EWRAM_DATA u16 gBattle_BG3_X = 0; +EWRAM_DATA u16 gBattle_BG3_Y = 0; +EWRAM_DATA u16 gBattle_WIN0H = 0; +EWRAM_DATA u16 gBattle_WIN0V = 0; +EWRAM_DATA u16 gBattle_WIN1H = 0; +EWRAM_DATA u16 gBattle_WIN1V = 0; EWRAM_DATA u8 gDisplayedStringBattle[300] = {0}; EWRAM_DATA u8 gBattleTextBuff1[TEXT_BUFF_ARRAY_COUNT] = {0}; EWRAM_DATA u8 gBattleTextBuff2[TEXT_BUFF_ARRAY_COUNT] = {0}; diff --git a/src/battle_tent.c b/src/battle_tent.c index ebb639600..c7e70912c 100644 --- a/src/battle_tent.c +++ b/src/battle_tent.c @@ -10,6 +10,7 @@ #include "item.h" #include "battle_factory_screen.h" #include "frontier_util.h" +#include "string_util.h" #include "constants/items.h" #include "constants/region_map_sections.h" |