summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile21
1 files changed, 8 insertions, 13 deletions
diff --git a/Makefile b/Makefile
index ff18771a..77352f41 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,6 @@
# Makefile to build Pokemon Diamond image
include config.mk
-include filesystem.mk
HOSTCC = $(CC)
HOSTCXX = $(CXX)
@@ -204,6 +203,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,9 +300,16 @@ $(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)
+include filesystem.mk
+
%.4bpp: %.png
$(GFX) $< $@
@@ -318,18 +325,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