diff options
| author | garak <garakmon@gmail.com> | 2018-11-27 13:31:07 -0500 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2018-11-27 13:31:07 -0500 |
| commit | 50f00b0827a4952a12f90009bd992f23c80a56af (patch) | |
| tree | 6a5f78b04b42c162ed95cfc66c91a8b24f4051b2 /src/title_screen.c | |
| parent | f02cb667bbddf4f4a1152c86cbf9616468e7f0d2 (diff) | |
| parent | c909aa92dee0a8d202d9195d80d0cc96b0d1ebc8 (diff) | |
Merge remote-tracking branch 'upstream/master' into fldeff
Diffstat (limited to 'src/title_screen.c')
| -rw-r--r-- | src/title_screen.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/title_screen.c b/src/title_screen.c index 40e0f5b2f..70a1a3449 100644 --- a/src/title_screen.c +++ b/src/title_screen.c @@ -1,4 +1,5 @@ #include "global.h" +#include "battle.h" #include "title_screen.h" #include "sprite.h" #include "gba/m4a_internal.h" @@ -37,8 +38,6 @@ #define A_B_START_SELECT (A_BUTTON | B_BUTTON | START_BUTTON | SELECT_BUTTON) extern struct MusicPlayerInfo gMPlayInfo_BGM; -extern u16 gBattle_BG1_X; -extern u16 gBattle_BG1_Y; // this file's functions static void MainCB2(void); |