diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-10-03 17:55:16 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-10-03 18:00:08 -0500 |
| commit | 09b8f4c09e69a2359cdf5e4497b97aca3746b8b1 (patch) | |
| tree | 2a5f838839c6c962830d6e34c1399918cecc4a0c | |
| parent | f2f28382c4ad2b283d485f70b28d14317d58c997 (diff) | |
Fix build
| -rw-r--r-- | include/graphics.h | 2 | ||||
| -rw-r--r-- | src/data/graphics.c | 7 | ||||
| -rw-r--r-- | tools/gbafix/Makefile | 6 |
3 files changed, 7 insertions, 8 deletions
diff --git a/include/graphics.h b/include/graphics.h index 585ed15bf..c9fdb9a81 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -2630,7 +2630,7 @@ extern const u8 gUnknown_08E8D9C0[]; extern const u8 gUnknown_08EA1DEC[]; extern const u16 gUnknown_08EA0328[]; -extern const u16 gUnknown_08EA02C8[][16]; +extern const u16 gUnknown_08EA02C8[]; extern const u16 gUnknown_08EA0348[]; extern const u16 gUnknown_08EA15C8[]; extern const u16 gTradeMonBoxTilemap[]; diff --git a/src/data/graphics.c b/src/data/graphics.c index 7a7599631..6262734c3 100644 --- a/src/data/graphics.c +++ b/src/data/graphics.c @@ -1342,12 +1342,7 @@ const u8 gUnknown_08E9FF58[] = INCBIN_U8("graphics/unknown/unknown_E9FF58.bin.lz const u8 gPokenavRibbonPokeView_Gfx[] = INCBIN_U8("graphics/pokenav/ribbon_pokeview.4bpp"); const u8 gDialogueFrame_Gfx[] = INCBIN_U8("graphics/text_window/message_box.4bpp"); -const u16 gUnknown_08EA02C8[][16] = -{ - INCBIN_U16("graphics/trade/menu.gbapal"), - INCBIN_U16("graphics/trade/stripes.gbapal"), - INCBIN_U16("graphics/trade/stripes.gbapal"), -}; +const u16 gUnknown_08EA02C8[] = INCBIN_U16("graphics/trade/menu.gbapal", "graphics/trade/stripes.gbapal", "graphics/trade/stripes.gbapal"); const u16 gUnknown_08EA0328[] = INCBIN_U16("graphics/trade/selected_mon.gbapal"); const u8 gUnknown_08EA0348[] = INCBIN_U8("graphics/trade/menu.4bpp"); diff --git a/tools/gbafix/Makefile b/tools/gbafix/Makefile index f12c8cc4f..350af76cd 100644 --- a/tools/gbafix/Makefile +++ b/tools/gbafix/Makefile @@ -1,8 +1,12 @@ CC = gcc -.PHONY: clean SRCS = gbafix.c +.PHONY: all clean + +all: gbafix + @: + gbafix: $(SRCS) $(CC) $(SRCS) -o $@ $(LDFLAGS) |