diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2019-01-27 00:11:44 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2019-01-27 00:11:44 -0600 |
| commit | 6b2dda422b533bf0edadcd727f4b491e4e6f4fb7 (patch) | |
| tree | 2b175aba4460597f688bb6b5f8deeef01fc9bee1 /src/graphics.c | |
| parent | 7a60f36954e9baeab2df64e24ce7fea5a8d2ada1 (diff) | |
| parent | f4af987c01c95d98a9d2ee943cc11315f80951d1 (diff) | |
Merge branch 'master' of github.com:pret/pokeemerald
Diffstat (limited to 'src/graphics.c')
| -rw-r--r-- | src/graphics.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/graphics.c b/src/graphics.c index 10efd5043..287a1f5d6 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -1590,7 +1590,7 @@ const u32 gUnknown_08DE0644[] = INCBIN_U32("graphics/title_screen/title_screen2. // more trainer card stuff -const u16 gUnknown_08DE07C8[] = INCBIN_U16("graphics/frontier_pass/tiles.gbapal");// size in LoadPalette calls is reported as 0xD0 << 1, which is 0x1A0, but palette is only 0x100 bytes long so it loads garbage as well +const u16 gUnknown_08DE07C8[][16] = INCBIN_U16("graphics/frontier_pass/tiles.gbapal");// size in LoadPalette calls is reported as 0xD0 << 1, which is 0x1A0, but palette is only 0x100 bytes long so it loads garbage as well const u32 gUnknown_08DE08C8[] = INCBIN_U32("graphics/frontier_pass/tiles.4bpp.lz"); const u32 gUnknown_08DE2084[] = INCBIN_U32("graphics/frontier_pass/tiles2.8bpp.lz"); const u32 gUnknown_08DE3060[] = INCBIN_U32("graphics/frontier_pass/tiles.bin.lz"); |