diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-06-04 09:10:09 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-06-04 09:10:09 -0400 |
| commit | 75ab879fd876d35eac8498296994278e213b6e7a (patch) | |
| tree | b9763615e9771ac5dce777031a80b57b12d9cac2 /src/graphics.c | |
| parent | e82080d42bbb81b2add8bef5c073cc353dfea307 (diff) | |
| parent | 2d3210dc1129e3d60a9d138838dc867d8b106b41 (diff) | |
Merge remote-tracking branch 'origin/master' into modern_ld
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"); |