diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2018-01-11 13:51:45 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-11 13:51:45 -0600 |
| commit | 2b56f43fce75871f2be993d43b483ceefd0bfc0f (patch) | |
| tree | 6fefa6a95a940c731ce7e551d1bc5c00a2626db0 /src/battle/battle_controller_player.c | |
| parent | a51b95150ba86a3982f613886471626f742aeacd (diff) | |
| parent | e7672a1aeb5e42d6f4e416ede9f6220122d11743 (diff) | |
Merge branch 'master' into assert
Diffstat (limited to 'src/battle/battle_controller_player.c')
| -rw-r--r-- | src/battle/battle_controller_player.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c index 489581132..a5f833b6c 100644 --- a/src/battle/battle_controller_player.c +++ b/src/battle/battle_controller_player.c @@ -67,9 +67,9 @@ extern u8 gUnknown_02024E68[]; extern struct SpriteTemplate gUnknown_02024E8C; extern u8 gAnimMoveTurn; extern u8 gUnknown_02038470[]; -extern u16 gUnknown_030041B0; +extern u16 gBattle_BG3_X; extern u16 gBattle_BG1_Y; -extern u16 gUnknown_030041B8; +extern u16 gBattle_BG3_Y; extern u16 gBattle_BG2_Y; extern u16 gBattle_BG2_X; extern u16 gBattle_BG0_X; |