diff options
author | Rémi Calixte <remicalixte.rmc@gmail.com> | 2021-06-01 20:03:16 +0200 |
---|---|---|
committer | Rémi Calixte <remicalixte.rmc@gmail.com> | 2021-06-01 20:03:16 +0200 |
commit | d6f348ce384723cecd3e1fe0f9db572f252cc6fa (patch) | |
tree | dc033bd9e39a01b37896295fa4e29549f566c214 /filesystem.mk | |
parent | 8e4dda14ff3f4390af69d52b928f987f3618e9a1 (diff) | |
parent | f84ce2d813902c7c4bdd6db34b40152ddf9cadde (diff) |
Merge branch 'master' into unk_0200BB14
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,$@)) |