diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-11-06 20:20:56 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-11-06 20:20:56 -0600 |
| commit | 18839a4872057fde33be45c5d2c4ecf4274bcc8d (patch) | |
| tree | 5f48809915af5d02c2f75efc790bd598ed9f3975 /src/berry_fix_program.c | |
| parent | 054a015c950ca9869ce28245a2f13c3f72cddb37 (diff) | |
| parent | 93ff71fcfdf8b71a7b4899f271a5214503bcd510 (diff) | |
Merge remote-tracking branch 'pret/master' into script_menu
Diffstat (limited to 'src/berry_fix_program.c')
| -rw-r--r-- | src/berry_fix_program.c | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/src/berry_fix_program.c b/src/berry_fix_program.c index 2ae15a806..a90906d05 100644 --- a/src/berry_fix_program.c +++ b/src/berry_fix_program.c @@ -3,6 +3,7 @@ #include "multiboot.h" #include "malloc.h" #include "bg.h" +#include "graphics.h" #include "main.h" #include "sprite.h" #include "task.h" @@ -81,26 +82,7 @@ static const u8 *const gUnknown_08618160[] = { Unknown_08617EA3 }; -extern const u8 gBerryFixGameboy_Gfx[]; -extern const u8 gBerryFixGameboy_Tilemap[]; -extern const u8 gBerryFixGameboy_Pal[]; -extern const u8 gBerryFixGameboyLogo_Gfx[]; -extern const u8 gBerryFixGameboyLogo_Tilemap[]; -extern const u8 gBerryFixGameboyLogo_Pal[]; -extern const u8 gBerryFixGbaTransfer_Gfx[]; -extern const u8 gBerryFixGbaTransfer_Tilemap[]; -extern const u8 gBerryFixGbaTransfer_Pal[]; -extern const u8 gBerryFixGbaTransferHighlight_Gfx[]; -extern const u8 gBerryFixGbaTransferHighlight_Tilemap[]; -extern const u8 gBerryFixGbaTransferHighlight_Pal[]; -extern const u8 gBerryFixGbaTransferError_Gfx[]; -extern const u8 gBerryFixGbaTransferError_Tilemap[]; -extern const u8 gBerryFixGbaTransferError_Pal[]; -extern const u8 gBerryFixWindow_Gfx[]; -extern const u8 gBerryFixWindow_Tilemap[]; -extern const u8 gBerryFixWindow_Pal[]; - -static const u8 *const gUnknown_08618178[][3] = { +static const void *const gUnknown_08618178[][3] = { { gBerryFixGameboy_Gfx, gBerryFixGameboy_Tilemap, |