From c75a270a82fdf7f92d118c61237fea034cbc17f3 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 31 Aug 2020 13:16:24 -0400 Subject: Bump inja; trdata and trpoke to json --- filesystem.mk | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'filesystem.mk') diff --git a/filesystem.mk b/filesystem.mk index 7471d644..33d82c23 100644 --- a/filesystem.mk +++ b/filesystem.mk @@ -290,16 +290,27 @@ O2NARC_TARGETS := \ files/poketool/waza/waza_tbl.narc \ files/itemtool/itemdata/item_data.narc \ files/itemtool/itemdata/nuts_data.narc \ + files/poketool/trainer/trdata.narc \ + +ALL_O2NARC_TARGETS := $(O2NARC_TARGETS) \ + files/poketool/trainer/trpoke.narc files/poketool/personal/pms.narc: O2NARCFLAGS = -f files/itemtool/itemdata/item_data.narc: O2NARCFLAGS = -p 0xFF ifeq (,$(NODEP)) -$(O2NARC_TARGETS): dep = $(shell $(SCANINC) -I include -I include-mw -I arm9/lib/include $(patsubst %.narc,%.json.txt,$@)) +$(ALL_O2NARC_TARGETS): dep = $(shell $(SCANINC) -I include -I include-mw -I arm9/lib/include $(patsubst %.narc,%.json.txt,$@)) else -$(O2NARC_TARGETS): dep := +$(ALL_O2NARC_TARGETS): dep := endif +## This specific target shares its source JSON with trdata.narc +files/poketool/trainer/trpoke.narc: %/trpoke.narc: %/trdata.json %/trpoke.json.txt $$(dep) + $(JSONPROC) $< $(word 2,$^) $*/trpoke.c + $(CC) $(CFLAGS) -c -o $*/trpoke.o $*/trpoke.c + $(O2NARC) $(O2NARCFLAGS) $*/trpoke.o $@ + @$(RM) $*/trpoke.o $*/trpoke.c + $(O2NARC_TARGETS): %.narc: %.json %.json.txt $$(dep) $(JSONPROC) $*.json $*.json.txt $*.c $(CC) $(CFLAGS) -c -o $*.o $*.c -- cgit v1.2.3 From 00cbfe2e138c842d9c0bce4e1848d3eaa88a39b8 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 31 Aug 2020 13:36:26 -0400 Subject: Trainer frontpics to png --- filesystem.mk | 198 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 198 insertions(+) (limited to 'filesystem.mk') diff --git a/filesystem.mk b/filesystem.mk index 33d82c23..96eafc4b 100644 --- a/filesystem.mk +++ b/filesystem.mk @@ -2299,6 +2299,204 @@ files/poketool/trgra/trbgra.narc: \ files/poketool/trgra/trbgra/narc_0014.NCGR \ files/poketool/trgra/trbgra/narc_0014.NCLR +files/poketool/trgra/trfgra.narc: \ + files/poketool/trgra/trfgra/narc_0000.NCGR \ + files/poketool/trgra/trfgra/narc_0000.NCLR \ + files/poketool/trgra/trfgra/narc_0002.NCGR \ + files/poketool/trgra/trfgra/narc_0002.NCLR \ + files/poketool/trgra/trfgra/narc_0004.NCGR \ + files/poketool/trgra/trfgra/narc_0004.NCLR \ + files/poketool/trgra/trfgra/narc_0006.NCGR \ + files/poketool/trgra/trfgra/narc_0006.NCLR \ + files/poketool/trgra/trfgra/narc_0008.NCGR \ + files/poketool/trgra/trfgra/narc_0008.NCLR \ + files/poketool/trgra/trfgra/narc_0010.NCGR \ + files/poketool/trgra/trfgra/narc_0010.NCLR \ + files/poketool/trgra/trfgra/narc_0012.NCGR \ + files/poketool/trgra/trfgra/narc_0012.NCLR \ + files/poketool/trgra/trfgra/narc_0014.NCGR \ + files/poketool/trgra/trfgra/narc_0014.NCLR \ + files/poketool/trgra/trfgra/narc_0016.NCGR \ + files/poketool/trgra/trfgra/narc_0016.NCLR \ + files/poketool/trgra/trfgra/narc_0018.NCGR \ + files/poketool/trgra/trfgra/narc_0018.NCLR \ + files/poketool/trgra/trfgra/narc_0020.NCGR \ + files/poketool/trgra/trfgra/narc_0020.NCLR \ + files/poketool/trgra/trfgra/narc_0022.NCGR \ + files/poketool/trgra/trfgra/narc_0022.NCLR \ + files/poketool/trgra/trfgra/narc_0024.NCGR \ + files/poketool/trgra/trfgra/narc_0024.NCLR \ + files/poketool/trgra/trfgra/narc_0026.NCGR \ + files/poketool/trgra/trfgra/narc_0026.NCLR \ + files/poketool/trgra/trfgra/narc_0028.NCGR \ + files/poketool/trgra/trfgra/narc_0028.NCLR \ + files/poketool/trgra/trfgra/narc_0030.NCGR \ + files/poketool/trgra/trfgra/narc_0030.NCLR \ + files/poketool/trgra/trfgra/narc_0032.NCGR \ + files/poketool/trgra/trfgra/narc_0032.NCLR \ + files/poketool/trgra/trfgra/narc_0034.NCGR \ + files/poketool/trgra/trfgra/narc_0034.NCLR \ + files/poketool/trgra/trfgra/narc_0036.NCGR \ + files/poketool/trgra/trfgra/narc_0036.NCLR \ + files/poketool/trgra/trfgra/narc_0038.NCGR \ + files/poketool/trgra/trfgra/narc_0038.NCLR \ + files/poketool/trgra/trfgra/narc_0040.NCGR \ + files/poketool/trgra/trfgra/narc_0040.NCLR \ + files/poketool/trgra/trfgra/narc_0042.NCGR \ + files/poketool/trgra/trfgra/narc_0042.NCLR \ + files/poketool/trgra/trfgra/narc_0044.NCGR \ + files/poketool/trgra/trfgra/narc_0044.NCLR \ + files/poketool/trgra/trfgra/narc_0046.NCGR \ + files/poketool/trgra/trfgra/narc_0046.NCLR \ + files/poketool/trgra/trfgra/narc_0048.NCGR \ + files/poketool/trgra/trfgra/narc_0048.NCLR \ + files/poketool/trgra/trfgra/narc_0050.NCGR \ + files/poketool/trgra/trfgra/narc_0050.NCLR \ + files/poketool/trgra/trfgra/narc_0052.NCGR \ + files/poketool/trgra/trfgra/narc_0052.NCLR \ + files/poketool/trgra/trfgra/narc_0054.NCGR \ + files/poketool/trgra/trfgra/narc_0054.NCLR \ + files/poketool/trgra/trfgra/narc_0056.NCGR \ + files/poketool/trgra/trfgra/narc_0056.NCLR \ + files/poketool/trgra/trfgra/narc_0058.NCGR \ + files/poketool/trgra/trfgra/narc_0058.NCLR \ + files/poketool/trgra/trfgra/narc_0060.NCGR \ + files/poketool/trgra/trfgra/narc_0060.NCLR \ + files/poketool/trgra/trfgra/narc_0062.NCGR \ + files/poketool/trgra/trfgra/narc_0062.NCLR \ + files/poketool/trgra/trfgra/narc_0064.NCGR \ + files/poketool/trgra/trfgra/narc_0064.NCLR \ + files/poketool/trgra/trfgra/narc_0066.NCGR \ + files/poketool/trgra/trfgra/narc_0066.NCLR \ + files/poketool/trgra/trfgra/narc_0068.NCGR \ + files/poketool/trgra/trfgra/narc_0068.NCLR \ + files/poketool/trgra/trfgra/narc_0070.NCGR \ + files/poketool/trgra/trfgra/narc_0070.NCLR \ + files/poketool/trgra/trfgra/narc_0072.NCGR \ + files/poketool/trgra/trfgra/narc_0072.NCLR \ + files/poketool/trgra/trfgra/narc_0074.NCGR \ + files/poketool/trgra/trfgra/narc_0074.NCLR \ + files/poketool/trgra/trfgra/narc_0076.NCGR \ + files/poketool/trgra/trfgra/narc_0076.NCLR \ + files/poketool/trgra/trfgra/narc_0078.NCGR \ + files/poketool/trgra/trfgra/narc_0078.NCLR \ + files/poketool/trgra/trfgra/narc_0080.NCGR \ + files/poketool/trgra/trfgra/narc_0080.NCLR \ + files/poketool/trgra/trfgra/narc_0082.NCGR \ + files/poketool/trgra/trfgra/narc_0082.NCLR \ + files/poketool/trgra/trfgra/narc_0084.NCGR \ + files/poketool/trgra/trfgra/narc_0084.NCLR \ + files/poketool/trgra/trfgra/narc_0086.NCGR \ + files/poketool/trgra/trfgra/narc_0086.NCLR \ + files/poketool/trgra/trfgra/narc_0088.NCGR \ + files/poketool/trgra/trfgra/narc_0088.NCLR \ + files/poketool/trgra/trfgra/narc_0090.NCGR \ + files/poketool/trgra/trfgra/narc_0090.NCLR \ + files/poketool/trgra/trfgra/narc_0092.NCGR \ + files/poketool/trgra/trfgra/narc_0092.NCLR \ + files/poketool/trgra/trfgra/narc_0094.NCGR \ + files/poketool/trgra/trfgra/narc_0094.NCLR \ + files/poketool/trgra/trfgra/narc_0096.NCGR \ + files/poketool/trgra/trfgra/narc_0096.NCLR \ + files/poketool/trgra/trfgra/narc_0098.NCGR \ + files/poketool/trgra/trfgra/narc_0098.NCLR \ + files/poketool/trgra/trfgra/narc_0100.NCGR \ + files/poketool/trgra/trfgra/narc_0100.NCLR \ + files/poketool/trgra/trfgra/narc_0102.NCGR \ + files/poketool/trgra/trfgra/narc_0102.NCLR \ + files/poketool/trgra/trfgra/narc_0104.NCGR \ + files/poketool/trgra/trfgra/narc_0104.NCLR \ + files/poketool/trgra/trfgra/narc_0106.NCGR \ + files/poketool/trgra/trfgra/narc_0106.NCLR \ + files/poketool/trgra/trfgra/narc_0108.NCGR \ + files/poketool/trgra/trfgra/narc_0108.NCLR \ + files/poketool/trgra/trfgra/narc_0110.NCGR \ + files/poketool/trgra/trfgra/narc_0110.NCLR \ + files/poketool/trgra/trfgra/narc_0112.NCGR \ + files/poketool/trgra/trfgra/narc_0112.NCLR \ + files/poketool/trgra/trfgra/narc_0114.NCGR \ + files/poketool/trgra/trfgra/narc_0114.NCLR \ + files/poketool/trgra/trfgra/narc_0116.NCGR \ + files/poketool/trgra/trfgra/narc_0116.NCLR \ + files/poketool/trgra/trfgra/narc_0118.NCGR \ + files/poketool/trgra/trfgra/narc_0118.NCLR \ + files/poketool/trgra/trfgra/narc_0120.NCGR \ + files/poketool/trgra/trfgra/narc_0120.NCLR \ + files/poketool/trgra/trfgra/narc_0122.NCGR \ + files/poketool/trgra/trfgra/narc_0122.NCLR \ + files/poketool/trgra/trfgra/narc_0124.NCGR \ + files/poketool/trgra/trfgra/narc_0124.NCLR \ + files/poketool/trgra/trfgra/narc_0126.NCGR \ + files/poketool/trgra/trfgra/narc_0126.NCLR \ + files/poketool/trgra/trfgra/narc_0128.NCGR \ + files/poketool/trgra/trfgra/narc_0128.NCLR \ + files/poketool/trgra/trfgra/narc_0130.NCGR \ + files/poketool/trgra/trfgra/narc_0130.NCLR \ + files/poketool/trgra/trfgra/narc_0132.NCGR \ + files/poketool/trgra/trfgra/narc_0132.NCLR \ + files/poketool/trgra/trfgra/narc_0134.NCGR \ + files/poketool/trgra/trfgra/narc_0134.NCLR \ + files/poketool/trgra/trfgra/narc_0136.NCGR \ + files/poketool/trgra/trfgra/narc_0136.NCLR \ + files/poketool/trgra/trfgra/narc_0138.NCGR \ + files/poketool/trgra/trfgra/narc_0138.NCLR \ + files/poketool/trgra/trfgra/narc_0140.NCGR \ + files/poketool/trgra/trfgra/narc_0140.NCLR \ + files/poketool/trgra/trfgra/narc_0142.NCGR \ + files/poketool/trgra/trfgra/narc_0142.NCLR \ + files/poketool/trgra/trfgra/narc_0144.NCGR \ + files/poketool/trgra/trfgra/narc_0144.NCLR \ + files/poketool/trgra/trfgra/narc_0146.NCGR \ + files/poketool/trgra/trfgra/narc_0146.NCLR \ + files/poketool/trgra/trfgra/narc_0148.NCGR \ + files/poketool/trgra/trfgra/narc_0148.NCLR \ + files/poketool/trgra/trfgra/narc_0150.NCGR \ + files/poketool/trgra/trfgra/narc_0150.NCLR \ + files/poketool/trgra/trfgra/narc_0152.NCGR \ + files/poketool/trgra/trfgra/narc_0152.NCLR \ + files/poketool/trgra/trfgra/narc_0154.NCGR \ + files/poketool/trgra/trfgra/narc_0154.NCLR \ + files/poketool/trgra/trfgra/narc_0156.NCGR \ + files/poketool/trgra/trfgra/narc_0156.NCLR \ + files/poketool/trgra/trfgra/narc_0158.NCGR \ + files/poketool/trgra/trfgra/narc_0158.NCLR \ + files/poketool/trgra/trfgra/narc_0160.NCGR \ + files/poketool/trgra/trfgra/narc_0160.NCLR \ + files/poketool/trgra/trfgra/narc_0162.NCGR \ + files/poketool/trgra/trfgra/narc_0162.NCLR \ + files/poketool/trgra/trfgra/narc_0164.NCGR \ + files/poketool/trgra/trfgra/narc_0164.NCLR \ + files/poketool/trgra/trfgra/narc_0166.NCGR \ + files/poketool/trgra/trfgra/narc_0166.NCLR \ + files/poketool/trgra/trfgra/narc_0168.NCGR \ + files/poketool/trgra/trfgra/narc_0168.NCLR \ + files/poketool/trgra/trfgra/narc_0170.NCGR \ + files/poketool/trgra/trfgra/narc_0170.NCLR \ + files/poketool/trgra/trfgra/narc_0172.NCGR \ + files/poketool/trgra/trfgra/narc_0172.NCLR \ + files/poketool/trgra/trfgra/narc_0174.NCGR \ + files/poketool/trgra/trfgra/narc_0174.NCLR \ + files/poketool/trgra/trfgra/narc_0176.NCGR \ + files/poketool/trgra/trfgra/narc_0176.NCLR \ + files/poketool/trgra/trfgra/narc_0178.NCGR \ + files/poketool/trgra/trfgra/narc_0178.NCLR \ + files/poketool/trgra/trfgra/narc_0180.NCGR \ + files/poketool/trgra/trfgra/narc_0180.NCLR \ + files/poketool/trgra/trfgra/narc_0182.NCGR \ + files/poketool/trgra/trfgra/narc_0182.NCLR \ + files/poketool/trgra/trfgra/narc_0184.NCGR \ + files/poketool/trgra/trfgra/narc_0184.NCLR \ + files/poketool/trgra/trfgra/narc_0186.NCGR \ + files/poketool/trgra/trfgra/narc_0186.NCLR \ + files/poketool/trgra/trfgra/narc_0188.NCGR \ + files/poketool/trgra/trfgra/narc_0188.NCLR \ + files/poketool/trgra/trfgra/narc_0190.NCGR \ + files/poketool/trgra/trfgra/narc_0190.NCLR \ + files/poketool/trgra/trfgra/narc_0192.NCGR \ + files/poketool/trgra/trfgra/narc_0192.NCLR \ + files/poketool/trgra/trfgra/narc_0194.NCGR \ + files/poketool/trgra/trfgra/narc_0194.NCLR \ + files/poketool/pokegra/pokegra.narc: \ files/poketool/pokegra/pokegra/narc_0006.NCGR \ files/poketool/pokegra/pokegra/narc_0007.NCGR \ -- cgit v1.2.3