diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-03-29 20:56:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-29 20:56:15 -0400 |
| commit | 50e9666e1637b15bd57fd7ee88180e50d2eb5e8c (patch) | |
| tree | b1543b6d79695862cb60d686548dd1a996b69e8c /src/graphics.c | |
| parent | dea07dc8656c8fb32f5b389b9f4f9a30fe26e555 (diff) | |
| parent | e8b6b4b65e3b53f5fcf83035b9f848c5ef6378bd (diff) | |
Merge branch 'master' into doc-introcred
Diffstat (limited to 'src/graphics.c')
| -rw-r--r-- | src/graphics.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/graphics.c b/src/graphics.c index 1a3423fb6..7a7a11b2b 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -1543,9 +1543,9 @@ const u16 gUnknown_08DE3350[] = INCBIN_U16("graphics/frontier_pass/tilemap1.bin" const u16 gUnknown_08DE3374[] = INCBIN_U16("graphics/frontier_pass/tilemap2.bin"); // Berry Crush -const u16 gUnknown_08DE3398[] = INCBIN_U16("graphics/berry_crusher/tiles.gbapal"); -const u32 gUnknown_08DE34B8[] = INCBIN_U32("graphics/berry_crusher/tiles.4bpp.lz"); -const u32 gUnknown_08DE3FD4[] = INCBIN_U32("graphics/berry_crusher/tiles.bin.lz"); +const u16 gBerryCrush_Crusher_Pal[] = INCBIN_U16("graphics/berry_crush/crusher.gbapal"); +const u32 gBerryCrush_Crusher_Gfx[] = INCBIN_U32("graphics/berry_crush/crusher.4bpp.lz"); +const u32 gBerryCrush_Crusher_Tilemap[] = INCBIN_U32("graphics/berry_crush/crusher.bin.lz"); // random garbage at the end. static const u8 sEmpty3[0x54BAC] = {0}; |