diff options
| author | Garak <thomastaps194@comcast.net> | 2018-06-26 00:01:17 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-26 00:01:17 -0400 |
| commit | 1cada74444df875649b239ed488c6ee4deb8a7f1 (patch) | |
| tree | 0cd68b160fa8d4a27cd65d6ffa80159b231f715c /include/battle.h | |
| parent | b3dec86071ae7d2eb5c1258ea778f0e823a5f636 (diff) | |
| parent | fa0e1ca4de35c9723a0972efeb6f7de4dca25594 (diff) | |
Merge pull request #3 from pret/master
upstream merge
Diffstat (limited to 'include/battle.h')
| -rw-r--r-- | include/battle.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/include/battle.h b/include/battle.h index 346423e65..c9bbb56eb 100644 --- a/include/battle.h +++ b/include/battle.h @@ -725,6 +725,21 @@ void MarkBufferBankForExecution(u8 bank); extern u8 gBattleTextBuff1[]; +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[]; + extern u16 gBattleTypeFlags; extern u8 gUnknown_02023A14_50; extern u16 gTrainerBattleOpponent; |