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 /src/battle/battle_controller_player.c | |
| parent | b3dec86071ae7d2eb5c1258ea778f0e823a5f636 (diff) | |
| parent | fa0e1ca4de35c9723a0972efeb6f7de4dca25594 (diff) | |
Merge pull request #3 from pret/master
upstream merge
Diffstat (limited to 'src/battle/battle_controller_player.c')
| -rw-r--r-- | src/battle/battle_controller_player.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c index d1dcf8bf4..a83946554 100644 --- a/src/battle/battle_controller_player.c +++ b/src/battle/battle_controller_player.c @@ -35,9 +35,6 @@ struct MovePpInfo #define SUB_803037C_TILE_DATA_OFFSET 444 #endif -extern u16 gBattle_BG0_X; -extern u16 gBattle_BG0_Y; - extern struct Window gUnknown_03004210; extern void (*gBattleBankFunc[])(void); @@ -71,13 +68,6 @@ extern u8 gUnknown_02024E68[]; extern struct SpriteTemplate gUnknown_02024E8C; extern u8 gAnimMoveTurn; extern u8 gUnknown_02038470[]; -extern u16 gBattle_BG3_X; -extern u16 gBattle_BG1_Y; -extern u16 gBattle_BG3_Y; -extern u16 gBattle_BG2_Y; -extern u16 gBattle_BG2_X; -extern u16 gBattle_BG0_X; -extern u16 gBattle_BG1_X; extern u8 gUnknown_03004344; extern u8 gUnknown_0300434C[]; @@ -151,8 +141,6 @@ extern u8 gAbsentBattlerFlags; extern u8 gUnknown_03004344; extern u8 gBattlersCount; extern u16 gBattlerPartyIndexes[]; -extern u16 gBattle_BG0_Y; -extern u16 gBattle_BG0_X; extern struct Window gUnknown_03004210; extern const u8 BattleText_SwitchWhich[]; extern u8 gUnknown_03004348; |