diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-05-31 19:40:49 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-05-31 19:40:49 -0400 |
| commit | ac4c884a31636419226b91147aedd2476900511e (patch) | |
| tree | 0b0c0f41dfbabf25328a95b388e0bb6dbd4d6f32 /filesystem.mk | |
| parent | cc9652a5f1340c9d0c127565adc291b3840649cd (diff) | |
| parent | 40bf7584958428b8645256d5093143b7f0c6ebdd (diff) | |
Merge remote-tracking branch 'origin/master' into doc_heap_etc
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,$@)) |