diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-11-19 17:32:32 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-11-19 17:32:32 +0100 |
| commit | 5d5b4b853c3b79db2abc7f062105f4e1dcdfcea2 (patch) | |
| tree | 953062d60fe4180479ff83ec8ef9742f434637d5 /include/battle.h | |
| parent | 8a00334102f8dada18523bd3c2b57d0b68fbd6ce (diff) | |
| parent | 8f2ddf2997041bc813a32ac604002fcbb987e3a0 (diff) | |
Merge branch 'master' into frontier
Diffstat (limited to 'include/battle.h')
| -rw-r--r-- | include/battle.h | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/include/battle.h b/include/battle.h index 90bef24ac..70b1856a8 100644 --- a/include/battle.h +++ b/include/battle.h @@ -660,7 +660,7 @@ struct MonSpritesGfx u8 field_F4[0x80]; u8 *barFontGfx; void *field_178; - void *field_17C; + u16 *field_17C; }; // All battle variables are declared in battle_main.c @@ -769,4 +769,17 @@ 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 |