diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-11-19 13:29:07 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-19 13:29:07 -0600 |
| commit | 6acf6aed0486d090bf4f8e731189b9d4ad07dadb (patch) | |
| tree | 14944f58ff26ce5d59ed1383e9550a6215cbc83e /include/battle.h | |
| parent | 8f2ddf2997041bc813a32ac604002fcbb987e3a0 (diff) | |
| parent | 58a1bba059a74203edb5d8819bf7af7e1171877a (diff) | |
Merge pull request #391 from DizzyEggg/frontier
Clean up bss/common/ewram symbols and decompile mossdeep
Diffstat (limited to 'include/battle.h')
| -rw-r--r-- | include/battle.h | 25 |
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 |