Use scan_includes and gfx tools from pokecrystal

1 files changed, 20 insertions, 22 deletions

diff --git a/Makefile b/Makefile
index 6b2e814..1108128 100755
--- a/Makefile
+++ b/Makefile
@@ -1,31 +1,26 @@
-.PHONY: all compare clean tidy
+.PHONY: all tools compare clean tidy
 
 .SUFFIXES:
-.SUFFIXES: .asm .o .gbc .png
+.SUFFIXES: .asm .o .gbc .1bpp .2bpp .png .pcm .wav
 .SECONDEXPANSION:
+.PRECIOUS:
+.SECONDARY:
 
-# Build Pokemon Pinball.
 ROM := pokepinball.gbc
 OBJS := main.o wram.o sram.o
 
-# If your default python is 3, you may want to change this to python27.
 PYTHON := python
 PRET := pokemon-reverse-engineering-tools/pokemontools
 MD5 := md5sum -c --quiet
 
-$(foreach obj, $(OBJS), \
-	$(eval $(obj:.o=)_dep := $(shell $(PYTHON) $(PRET)/scan_includes.py $(obj:.o=.asm))) \
-)
-
-# Link objects together to build a rom.
 all: $(ROM) compare
 
-# Assemble source files into objects.
-# Use rgbasm -h to use halts without nops.
-$(OBJS): $$*.asm $$($$*_dep)
-	@$(PYTHON) $(PRET)/gfx.py 2bpp $(2bppq)
-	@$(PYTHON) $(PRET)/gfx.py 1bpp $(1bppq)
-	@$(PYTHON) $(PRET)/pcm.py pcm $(pcmq)
+ifeq (,$(filter $(MAKECMDGOALS),tools))
+Makefile: tools
+endif
+
+%.o: dep = $(shell tools/scan_includes $(@D)/$*.asm)
+%.o: %.asm $$(dep)
 	rgbasm -h -o $@ $<
 
 $(ROM): $(OBJS) contents/contents.link
@@ -36,21 +31,24 @@ $(ROM): $(OBJS) contents/contents.link
 compare: $(ROM)
 	@$(MD5) rom.md5
 
-# Remove files generated by the build process.
+tools:
+	@$(MAKE) -C tools
+
 tidy:
 	rm -f $(ROM) $(OBJS) $(ROM:.gbc=.sym) $(ROM:.gbc=.map)
 
 clean: tidy
 	find . \( -iname '*.1bpp' -o -iname '*.2bpp' -o -iname '*.pcm' \) -exec rm {} +
 
+%.interleave.2bpp: %.interleave.png
+	rgbgfx -o $@ $<
+	tools/gfx --interleave --png $< -o $@ $@
+
 %.2bpp: %.png
-	$(eval 2bppq += $<)
-	@rm -f $@
+	rgbgfx -o $@ $<
 
 %.1bpp: %.png
-	$(eval 1bppq += $<)
-	@rm -f $@
+	rgbgfx -d1 -o $@ $<
 
 %.pcm: %.wav
-	$(eval pcmq += $<)
-	@rm -f $@
+	$(PYTHON) $(PRET)/pcm.py pcm $<