From f21598fbb594af3bdcd348af3c1b4d9cd576c1d1 Mon Sep 17 00:00:00 2001 From: red031000 Date: Tue, 18 May 2021 20:32:22 +0100 Subject: some box sprites --- filesystem.mk | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'filesystem.mk') diff --git a/filesystem.mk b/filesystem.mk index 4264c367..1ebf684b 100644 --- a/filesystem.mk +++ b/filesystem.mk @@ -2599,6 +2599,21 @@ files/poketool/icongra/poke_icon.narc: \ files/poketool/icongra/poke_icon/narc_0014.NCGR \ files/poketool/icongra/poke_icon/narc_0015.NCGR \ files/poketool/icongra/poke_icon/narc_0016.NCGR \ + files/poketool/icongra/poke_icon/narc_0017.NCGR \ + files/poketool/icongra/poke_icon/narc_0018.NCGR \ + files/poketool/icongra/poke_icon/narc_0019.NCGR \ + files/poketool/icongra/poke_icon/narc_0020.NCGR \ + files/poketool/icongra/poke_icon/narc_0021.NCGR \ + files/poketool/icongra/poke_icon/narc_0022.NCGR \ + files/poketool/icongra/poke_icon/narc_0023.NCGR \ + files/poketool/icongra/poke_icon/narc_0024.NCGR \ + files/poketool/icongra/poke_icon/narc_0025.NCGR \ + files/poketool/icongra/poke_icon/narc_0026.NCGR \ + files/poketool/icongra/poke_icon/narc_0027.NCGR \ + files/poketool/icongra/poke_icon/narc_0028.NCGR \ + files/poketool/icongra/poke_icon/narc_0029.NCGR \ + files/poketool/icongra/poke_icon/narc_0030.NCGR \ + files/poketool/icongra/poke_icon/narc_0031.NCGR \ files/poketool/icongra/poke_icon/narc_0402.NCGR files/msgdata/msg.narc: \ -- cgit v1.2.3 From 929c5c94cf404904ea4601e7c083c716f84ceca9 Mon Sep 17 00:00:00 2001 From: red031000 Date: Wed, 19 May 2021 22:29:57 +0100 Subject: a few more icons --- filesystem.mk | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'filesystem.mk') diff --git a/filesystem.mk b/filesystem.mk index 1ebf684b..2f8034cb 100644 --- a/filesystem.mk +++ b/filesystem.mk @@ -2614,6 +2614,11 @@ files/poketool/icongra/poke_icon.narc: \ files/poketool/icongra/poke_icon/narc_0029.NCGR \ files/poketool/icongra/poke_icon/narc_0030.NCGR \ files/poketool/icongra/poke_icon/narc_0031.NCGR \ + files/poketool/icongra/poke_icon/narc_0032.NCGR \ + files/poketool/icongra/poke_icon/narc_0033.NCGR \ + files/poketool/icongra/poke_icon/narc_0034.NCGR \ + files/poketool/icongra/poke_icon/narc_0035.NCGR \ + files/poketool/icongra/poke_icon/narc_0036.NCGR \ files/poketool/icongra/poke_icon/narc_0402.NCGR files/msgdata/msg.narc: \ -- cgit v1.2.3 From 73d208810e888514be6cb13bd34db9c8bc47032c Mon Sep 17 00:00:00 2001 From: red031000 Date: Wed, 19 May 2021 22:58:03 +0100 Subject: implement nitrogfx ncer mapping type --- filesystem.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'filesystem.mk') diff --git a/filesystem.mk b/filesystem.mk index 2f8034cb..f06a5429 100644 --- a/filesystem.mk +++ b/filesystem.mk @@ -2589,6 +2589,7 @@ files/poketool/icongra/poke_icon.narc: \ files/poketool/icongra/poke_icon/narc_0000.NCLR \ files/poketool/icongra/poke_icon/narc_0002.NCER \ files/poketool/icongra/poke_icon/narc_0004.NCER \ + files/poketool/icongra/poke_icon/narc_0006.NCER \ files/poketool/icongra/poke_icon/narc_0007.NCGR \ files/poketool/icongra/poke_icon/narc_0008.NCGR \ files/poketool/icongra/poke_icon/narc_0009.NCGR \ -- cgit v1.2.3 From b934918219cb4871c726b4e9815f0b801210865b Mon Sep 17 00:00:00 2001 From: red031000 Date: Thu, 20 May 2021 17:08:43 +0100 Subject: bunch of item icons --- filesystem.mk | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'filesystem.mk') diff --git a/filesystem.mk b/filesystem.mk index f06a5429..2b74f25f 100644 --- a/filesystem.mk +++ b/filesystem.mk @@ -1742,7 +1742,17 @@ files/itemtool/itemdata/item_icon.narc: \ files/itemtool/itemdata/item_icon/narc_0162.NCGR \ files/itemtool/itemdata/item_icon/narc_0162.NCLR \ files/itemtool/itemdata/item_icon/narc_0164.NCGR \ - files/itemtool/itemdata/item_icon/narc_0164.NCLR + files/itemtool/itemdata/item_icon/narc_0164.NCLR \ + files/itemtool/itemdata/item_icon/narc_0166.NCGR \ + files/itemtool/itemdata/item_icon/narc_0166.NCLR \ + files/itemtool/itemdata/item_icon/narc_0168.NCGR \ + files/itemtool/itemdata/item_icon/narc_0168.NCLR \ + files/itemtool/itemdata/item_icon/narc_0170.NCGR \ + files/itemtool/itemdata/item_icon/narc_0170.NCLR \ + files/itemtool/itemdata/item_icon/narc_0172.NCGR \ + files/itemtool/itemdata/item_icon/narc_0172.NCLR \ + files/itemtool/itemdata/item_icon/narc_0174.NCGR \ + files/itemtool/itemdata/item_icon/narc_0174.NCLR files/application/custom_ball/data/cb_data.narc: \ -- cgit v1.2.3 From 79e77921c30109d29c3d791099aa42696c25ba99 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 29 May 2021 18:45:31 -0400 Subject: Output NARC contents as C enums in .naix files You can include these by typing out the full path to the .naix file (minus the files/ prefix). Example: ```c ``` Also: - Build the filesystem before building the C objects --- filesystem.mk | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'filesystem.mk') diff --git a/filesystem.mk b/filesystem.mk index 2b74f25f..387231bf 100644 --- a/filesystem.mk +++ b/filesystem.mk @@ -275,10 +275,13 @@ endif HOSTFS_FILES := $(NITROFS_FILES:%=files/%) %.narc: - $(KNARC) -d $(basename $@)/ -p $@ + $(KNARC) -d $(basename $@)/ -p $@ -i %.arc: - $(KNARC) -d $(basename $@)/ -p $@ + $(KNARC) -d $(basename $@)/ -p $@ -i + +%.naix: %.narc +files/wazaeffect/we.naix: %.naix: %.arc O2NARC_TARGETS := \ files/poketool/personal/personal.narc \ @@ -295,8 +298,9 @@ O2NARC_TARGETS := \ ALL_O2NARC_TARGETS := $(O2NARC_TARGETS) \ files/poketool/trainer/trpoke.narc +O2NARCFLAGS := -i files/poketool/personal/pms.narc: O2NARCFLAGS = -f -files/itemtool/itemdata/item_data.narc: O2NARCFLAGS = -p 0xFF +files/itemtool/itemdata/item_data.narc: O2NARCFLAGS += -p 0xFF ifeq (,$(NODEP)) $(ALL_O2NARC_TARGETS): dep = $(shell $(SCANINC) -I include -I include-mw -I arm9/lib/include $(patsubst %.narc,%.json.txt,$@)) -- cgit v1.2.3