diff options
| author | scnorton <scnorton@biociphers.org> | 2017-06-27 09:48:16 -0400 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-06-27 09:48:16 -0400 |
| commit | 08c23fb1c483ffcf7c17b8ac061ad4ff77318625 (patch) | |
| tree | 65bfdd399541ebd4f558614fd566aa92cfb94422 /src/intro.c | |
| parent | 41cc0382a43161c0c66ddaf73742ecec8dcbdcc6 (diff) | |
| parent | 06b6cada0ddedc62063171703ba6607019751a9a (diff) | |
Merge branch 'master' into field_tasks
Diffstat (limited to 'src/intro.c')
| -rw-r--r-- | src/intro.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/intro.c b/src/intro.c index 396f5e5df..462a2134d 100644 --- a/src/intro.c +++ b/src/intro.c @@ -43,7 +43,11 @@ extern void *const gUnknown_0840B5A0[]; static const u16 Palette_406340[] = INCBIN_U16("graphics/intro/unknown1.gbapal"); static const u16 Palette_406360[] = INCBIN_U16("graphics/intro/unknown2.gbapal"); +#if ENGLISH static const u8 gIntroTiles[] = INCBIN_U8("graphics/intro/intro.4bpp.lz"); +#elif GERMAN +extern const u8 gIntroTiles[]; +#endif static const u16 gIntro1BGPals[][16] = { INCBIN_U16("graphics/intro/intro1_bgpal1.gbapal"), |