diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-05-27 06:46:29 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-27 06:46:29 -0400 |
| commit | c396aaa804543c6950bdef918f3773394da09bdf (patch) | |
| tree | a925bd32e0745ddf3ecef23d1ef3e710f3250273 /src/graphics.c | |
| parent | 3dce3407d5f9bca69d61b1cf1b314fb1e921d572 (diff) | |
| parent | 1a9ba7bb0aeb27a7d0bca43190edd054e517f27b (diff) | |
Merge pull request #431 from PikalaxALT/sync_bery_crush
Sync berry crush from Emerald
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 04a6f6206..03986a03f 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -1414,7 +1414,7 @@ const u32 gTradeGba_Gfx[] = INCBIN_U32("graphics/link/gba.4bpp"); const u16 gUnknown_8EAFE80[] = INCBIN_U16("graphics/interface/blank2.gbapal"); -const u16 gUnknown_8EAFEA0[] = INCBIN_U16("graphics/berry_crush/berry_crush.gbapal"); +const u16 gBerryCrush_Crusher_Pal[] = INCBIN_U16("graphics/berry_crush/berry_crush.gbapal"); const u16 gUnknown_8EAFF60[] = INCBIN_U16("graphics/unknown/unknown_EAFF60.gbapal"); -const u32 gUnknown_8EAFFC0[] = INCBIN_U32("graphics/berry_crush/berry_crush.4bpp.lz"); -const u32 gUnknown_8EB0ADC[] = INCBIN_U32("graphics/berry_crush/data_EB0ADC.bin.lz"); +const u32 gBerryCrush_Crusher_Gfx[] = INCBIN_U32("graphics/berry_crush/berry_crush.4bpp.lz"); +const u32 gBerryCrush_Crusher_Tilemap[] = INCBIN_U32("graphics/berry_crush/data_EB0ADC.bin.lz"); |