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 /include/graphics.h | |
| parent | 3dce3407d5f9bca69d61b1cf1b314fb1e921d572 (diff) | |
| parent | 1a9ba7bb0aeb27a7d0bca43190edd054e517f27b (diff) | |
Merge pull request #431 from PikalaxALT/sync_bery_crush
Sync berry crush from Emerald
Diffstat (limited to 'include/graphics.h')
| -rw-r--r-- | include/graphics.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/graphics.h b/include/graphics.h index 6b2c87bad..a92b798ae 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4888,9 +4888,9 @@ extern const u32 gFile_graphics_battle_transitions_vs_frame_palette[]; extern const u32 gFile_graphics_battle_transitions_vs_frame_tilemap[]; // berry_crush -extern const u16 gUnknown_8EAFEA0[]; -extern const u32 gUnknown_8EAFFC0[]; -extern const u32 gUnknown_8EB0ADC[]; +extern const u16 gBerryCrush_Crusher_Pal[]; +extern const u32 gBerryCrush_Crusher_Gfx[]; +extern const u32 gBerryCrush_Crusher_Tilemap[]; // easy_chat_3 extern const u32 gEasyChatWindow_Gfx[]; |