diff options
| author | garak <garakmon@gmail.com> | 2018-10-21 15:12:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-21 15:12:18 -0400 |
| commit | 7a9c7e5f068a2ec88ce6fe24a5c72f4b4ae7f48b (patch) | |
| tree | b8e391c9e856a2546075d44cba353c4b100a52ef /src/berry_fix_program.c | |
| parent | 2bb286ab4e3a967ce129d82cdad0ede4d744fa73 (diff) | |
| parent | 804d0a4b6a12907974ffd8cb20f6ed6c527b663b (diff) | |
Merge branch 'master' into sprite-tags
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, |