diff options
| author | Akira Akashi <rubenru09@aol.com> | 2021-06-01 20:40:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-01 20:40:37 +0100 |
| commit | 389b33f7d8499cab5b3b9e2ba21d786b1059c059 (patch) | |
| tree | f02042907a117ce618b0a67c0b5cd82fc45cfcd7 /filesystem.mk | |
| parent | 5a73f4f645faf368cf8e20cfe4793e2b12672472 (diff) | |
| parent | f67d6fe193eeee8058a45934d08c3b883cc08eb9 (diff) | |
Merge branch 'master' into unkk_020851B8
Diffstat (limited to 'filesystem.mk')
| -rw-r--r-- | filesystem.mk | 10 |
1 files changed, 7 insertions, 3 deletions
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,$@)) |