From bd9e0d92c0a097c42d7fbb2ab90fdd02e0290088 Mon Sep 17 00:00:00 2001 From: Tauwasser Date: Fri, 1 Jun 2018 01:39:55 +0200 Subject: Makefile: add coverage target and necessary python scripts Signed-off-by: Tauwasser --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 86e4925..cb1cfb8 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,7 @@ GFX := $(patsubst %.png, $(BUILD)/%.2bpp, \ .SECONDEXPANSION: .PHONY: all -all: $(ROMS) compare +all: $(ROMS) compare coverage .PHONY: compare compare: $(ROMS) @@ -56,6 +56,10 @@ $(ROMS): $(OBJS) $(BUILD)/shim.asm: tools/make_shim.py shim.sym | $$(dir $$@) $(PYTHON) tools/make_shim.py -w -- $(filter-out $<, $^) > $@ +.PHONY: coverage +coverage: $(ROMS) + $(PYTHON) tools/disasm_coverage.py -m $(ROMS:.gb=.map) -b 0x40 + $(BUILD)/gfx.o: | $(GFX) $(BUILD)/%.o: $(BUILD)/%.asm | $$(dir $$@) $(RGBASM) $(RGBASMFLAGS) -M $(@:.o=.d) $(OUTPUT_OPTION) $< -- cgit v1.2.3 From a7e358cd7e3bb99b3189afe753831656fcc0c354 Mon Sep 17 00:00:00 2001 From: Rangi Date: Thu, 31 May 2018 19:47:03 -0400 Subject: Keep pokemon data in data/pokemon Don't print "Here" a lot 'make mostlyclean' needs to remove .d files in case a file was renamed --- Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index cb1cfb8..233f9a9 100644 --- a/Makefile +++ b/Makefile @@ -48,6 +48,7 @@ clean: .PHONY: mostlyclean mostlyclean: rm -rf $(ROMS) $(OBJS) $(ROMS:.gb=.sym) $(ROMS:.gb=.map) + find . \( -iname '*.d' \) -exec rm {} + $(ROMS): $(OBJS) $(RGBLINK) -d -n $(@:.gb=.sym) -m $(@:.gb=.map) -O $(BASEROM) -o $@ $^ -- cgit v1.2.3 From 7424ae9256f9434b9e3bf0d8fa410703b2d7f22d Mon Sep 17 00:00:00 2001 From: obskyr Date: Fri, 1 Jun 2018 15:16:12 +0200 Subject: Build additional ROMs with corrected header --- Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 233f9a9..8e9e55c 100644 --- a/Makefile +++ b/Makefile @@ -15,6 +15,7 @@ ROMS := pokegold-spaceworld.gb BASEROM := baserom.gb DIRS := home engine data audio OBJS := $(addprefix $(BUILD)/, gfx.o sram.o wram.o hram.o shim.o) +CORRECTEDROMS := $(ROMS:%.gb=%-correctheader.gb) rwildcard = $(foreach d, $(wildcard $1*), $(filter $(subst *, %, $2), $d) $(call rwildcard, $d/, $2)) OBJS += $(patsubst %.asm, $(BUILD)/%.o, $(call rwildcard, $(DIRS), *.asm)) @@ -28,7 +29,7 @@ GFX := $(patsubst %.png, $(BUILD)/%.2bpp, \ .SECONDEXPANSION: .PHONY: all -all: $(ROMS) compare coverage +all: $(ROMS) $(CORRECTEDROMS) compare coverage .PHONY: compare compare: $(ROMS) @@ -54,6 +55,10 @@ $(ROMS): $(OBJS) $(RGBLINK) -d -n $(@:.gb=.sym) -m $(@:.gb=.map) -O $(BASEROM) -o $@ $^ $(RGBFIX) -f lh -k 01 -l 0x33 -m 0x03 -p 0 -r 3 -t "POKEMON2GOLD" $@ +$(CORRECTEDROMS): %-correctheader.gb: %.gb + cp $< $@ + $(RGBFIX) -m 0x10 $@ + $(BUILD)/shim.asm: tools/make_shim.py shim.sym | $$(dir $$@) $(PYTHON) tools/make_shim.py -w -- $(filter-out $<, $^) > $@ -- cgit v1.2.3 From 64e48babd8717a5da4886e8ee337747f326ad8da Mon Sep 17 00:00:00 2001 From: obskyr Date: Fri, 1 Jun 2018 15:32:04 +0200 Subject: Fix corrected ROM's checksum --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 8e9e55c..ae76e52 100644 --- a/Makefile +++ b/Makefile @@ -57,7 +57,7 @@ $(ROMS): $(OBJS) $(CORRECTEDROMS): %-correctheader.gb: %.gb cp $< $@ - $(RGBFIX) -m 0x10 $@ + $(RGBFIX) -f h -m 0x10 $@ $(BUILD)/shim.asm: tools/make_shim.py shim.sym | $$(dir $$@) $(PYTHON) tools/make_shim.py -w -- $(filter-out $<, $^) > $@ -- cgit v1.2.3 From 56ecc42c12b73c23e7e0e8fbcfc0fc293cc63dde Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Fri, 1 Jun 2018 23:00:33 -0500 Subject: Compress trainer pics add missing include for soldier pic --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index ae76e52..9f71250 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,8 @@ GFX := $(patsubst %.png, $(BUILD)/%.2bpp, \ $(patsubst %.1bpp.png, $(BUILD)/%.1bpp, \ $(patsubst gfx/pokemon/%/front.png, $(BUILD)/gfx/pokemon/%/front.pic, \ $(patsubst gfx/pokemon/%/back.png, $(BUILD)/gfx/pokemon/%/back.pic, \ - $(call rwildcard, gfx, *.png))))) + $(patsubst gfx/trainer/%.png, $(BUILD)/gfx/trainer/%.pic, \ + $(call rwildcard, gfx, *.png)))))) .SECONDEXPANSION: -- cgit v1.2.3 From e1f279c5133c169f47fb6d54ac438a1728020c09 Mon Sep 17 00:00:00 2001 From: pfero Date: Sat, 2 Jun 2018 17:04:48 +0200 Subject: Clean the correctheader rom --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 9f71250..bb53748 100644 --- a/Makefile +++ b/Makefile @@ -43,13 +43,13 @@ tools tools/pkmncompress tools/gfx: # Remove files generated by the build process. .PHONY: clean clean: - rm -rf $(ROMS) $(BUILD) $(ROMS:.gb=.sym) $(ROMS:.gb=.map) + rm -rf $(ROMS) $(BUILD) $(ROMS:.gb=.sym) $(ROMS:.gb=.map) $(CORRECTEDROMS) make -C tools clean # Remove files except for graphics. .PHONY: mostlyclean mostlyclean: - rm -rf $(ROMS) $(OBJS) $(ROMS:.gb=.sym) $(ROMS:.gb=.map) + rm -rf $(ROMS) $(OBJS) $(ROMS:.gb=.sym) $(ROMS:.gb=.map) $(CORRECTEDROMS) find . \( -iname '*.d' \) -exec rm {} + $(ROMS): $(OBJS) -- cgit v1.2.3