From 63b108234ed6e0d816c86dcbd88457b0ae1e06d6 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 8 Jun 2020 11:36:15 -0400
Subject: Move filesystem rules to filesystem.mk; stub rule invoking makerom

---
 Makefile | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index ff18771a..a6e7de2e 100644
--- a/Makefile
+++ b/Makefile
@@ -204,6 +204,7 @@ JSONPROC = $(TOOLS_DIR)/jsonproc/jsonproc
 GFX = $(TOOLS_DIR)/nitrogfx/nitrogfx
 MWASMARM_PATCHER = $(TOOLS_DIR)/mwasmarm_patcher/mwasmarm_patcher$(EXE) -q
 MAKEBANNER = $(WINE) $(TOOLS_DIR)/bin/makebanner.exe
+MAKEROM    = $(WIND) $(TOOLS_DIR)/bin/makerom.exe
 
 TOOLDIRS = $(filter-out $(TOOLS_DIR)/mwccarm $(TOOLS_DIR)/bin,$(wildcard $(TOOLS_DIR)/*))
 TOOLBASE = $(TOOLDIRS:$(TOOLS_DIR)/%=%)
@@ -300,6 +301,11 @@ $(ELF): $(BUILD_DIR)/$(LD_SCRIPT) $(O_FILES) $(BINFILES) $(BUILD_DIR)/pokediamon
 $(ROM): $(ELF)
 	$(OBJCOPY) -O binary --gap-fill=0xFF --pad-to=0x04000000 $< $@
 
+# TODO: Rules for Pearl
+# FIXME: Computed secure area CRC in header is incorrect due to first 8 bytes of header not actually being "encryObj"
+#$(ROM): pokediamond.rsf $(BUILD_DIR)/pokediamond_bnr.bin $(SBINFILES) $(HOSTFS_FILES)
+#	$(MAKEROM) -DNITROFS_FILES="$(NITROFS_FILES)" $< $@
+
 # Make sure build directory exists before compiling anything
 DUMMY != mkdir -p $(ALL_DIRS)
 
@@ -318,18 +324,6 @@ DUMMY != mkdir -p $(ALL_DIRS)
 %.png: ;
 %.pal: ;
 
-%.narc:
-	$(KNARC) -d $(basename $@)/ -p $@
-
-%.arc:
-	$(KNARC) -d $(basename $@)/ -p $@
-
-files/poketool/personal/pms.narc: ;
-
-files/poketool/personal/growtbl.narc: $(wildcard files/poketool/personal/growtbl/*.txt)
-	$(MAKE) -C $(<D)
-	$(NARCCOMP) -o $@ -p 255 $(^:%.txt=%.bin)
-
 ######################## Misc #######################
 
 $(BUILD_DIR)/pokediamond_bnr.bin: pokediamond.bsf graphics/icon.4bpp graphics/icon.gbapal
-- 
cgit v1.2.3