diff options
| author | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-11-12 14:14:50 +0000 |
|---|---|---|
| committer | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-11-12 14:14:50 +0000 |
| commit | 1b895ff52c011d51a9516791148cd5088ba411b5 (patch) | |
| tree | 3f1dee86f96098d38131426e11a0f9c39a1244fe /src/berry_fix_program.c | |
| parent | be33878b94cc38913447682d3e34e674df68619f (diff) | |
| parent | 65f053fd89e09b13e407ac53488043b728660e6e (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise
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, |