ref: 108245cb21abb3abac051b7db84ed6c694192a61
parent: 90430e6dee9e207dc0b618d07566f83617343f60
parent: 703224335280bf1170982113ac3d09fe198c0564
author: Daniel Harding <33dannye@gmail.com>
date: Sun Jan 13 17:36:13 EST 2019
Merge pull request #195 from Rangi42/master Remove 'extras' submodule; and add 'make tidy'
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,0 @@
-[submodule "extras"]
- path = extras
- url = git://github.com/kanzure/pokemon-reverse-engineering-tools.git
--- a/Makefile
+++ b/Makefile
@@ -1,22 +1,34 @@
-MD5 := md5sum -c
+roms := pokered.gbc pokeblue.gbc
pokered_obj := audio_red.o main_red.o text_red.o wram_red.o
pokeblue_obj := audio_blue.o main_blue.o text_blue.o wram_blue.o
+
+### Build tools
+
+MD5 := md5sum -c
+
+RGBDS ?=
+RGBASM ?= $(RGBDS)rgbasm
+RGBFIX ?= $(RGBDS)rgbfix
+RGBGFX ?= $(RGBDS)rgbgfx
+RGBLINK ?= $(RGBDS)rgblink
+
+
+### Build targets
+
.SUFFIXES:
.SECONDEXPANSION:
.PRECIOUS:
.SECONDARY:
-.PHONY: all clean red blue compare tools
+.PHONY: all red blue clean tidy compare tools
-roms := pokered.gbc pokeblue.gbc
-
all: $(roms)
red: pokered.gbc
blue: pokeblue.gbc
# For contributors to make sure a change didn't affect the contents of the rom.
-compare: red blue
+compare: $(roms)
@$(MD5) roms.md5
clean:
@@ -24,6 +36,10 @@
find . \( -iname '*.1bpp' -o -iname '*.2bpp' -o -iname '*.pic' \) -exec rm {} +$(MAKE) clean -C tools/
+tidy:
+ rm -f $(roms) $(pokered_obj) $(pokeblue_obj) $(roms:.gbc=.sym)
+ $(MAKE) clean -C tools/
+
tools:
$(MAKE) -C tools/
@@ -39,40 +55,48 @@
%_red.o: dep = $(shell tools/scan_includes $(@D)/$*.asm)
$(pokered_obj): %_red.o: %.asm $$(dep)
- rgbasm -D _RED -h -o $@ $*.asm
+ $(RGBASM) -D _RED -h -o $@ $*.asm
%_blue.o: dep = $(shell tools/scan_includes $(@D)/$*.asm)
$(pokeblue_obj): %_blue.o: %.asm $$(dep)
- rgbasm -D _BLUE -h -o $@ $*.asm
+ $(RGBASM) -D _BLUE -h -o $@ $*.asm
pokered_opt = -jsv -k 01 -l 0x33 -m 0x13 -p 0 -r 03 -t "POKEMON RED"
pokeblue_opt = -jsv -k 01 -l 0x33 -m 0x13 -p 0 -r 03 -t "POKEMON BLUE"
%.gbc: $$(%_obj)
- rgblink -d -n $*.sym -l pokered.link -o $@ $^
- rgbfix $($*_opt) $@
+ $(RGBLINK) -d -n $*.sym -l pokered.link -o $@ $^
+ $(RGBFIX) $($*_opt) $@
sort $*.sym -o $*.sym
-gfx/blue/intro_purin_1.2bpp: rgbgfx += -h
-gfx/blue/intro_purin_2.2bpp: rgbgfx += -h
-gfx/blue/intro_purin_3.2bpp: rgbgfx += -h
-gfx/red/intro_nido_1.2bpp: rgbgfx += -h
-gfx/red/intro_nido_2.2bpp: rgbgfx += -h
-gfx/red/intro_nido_3.2bpp: rgbgfx += -h
+### Misc file-specific graphics rules
+
+gfx/blue/intro_purin_1.2bpp: $(RGBGFX) += -h
+gfx/blue/intro_purin_2.2bpp: $(RGBGFX) += -h
+gfx/blue/intro_purin_3.2bpp: $(RGBGFX) += -h
+gfx/red/intro_nido_1.2bpp: $(RGBGFX) += -h
+gfx/red/intro_nido_2.2bpp: $(RGBGFX) += -h
+gfx/red/intro_nido_3.2bpp: $(RGBGFX) += -h
+
gfx/game_boy.2bpp: tools/gfx += --remove-duplicates
gfx/theend.2bpp: tools/gfx += --interleave --png=$<
gfx/tilesets/%.2bpp: tools/gfx += --trim-whitespace
+
+### Catch-all graphics rules
+
%.png: ;
%.2bpp: %.png
- rgbgfx $(rgbgfx) -o $@ $<
+ $(RGBGFX) $(rgbgfx) -o $@ $<
$(if $(tools/gfx),\
tools/gfx $(tools/gfx) -o $@ $@)
+
%.1bpp: %.png
- rgbgfx -d1 $(rgbgfx) -o $@ $<
+ $(RGBGFX) -d1 $(rgbgfx) -o $@ $<
$(if $(tools/gfx),\
tools/gfx $(tools/gfx) -d1 -o $@ $@)
+
%.pic: %.2bpp
tools/pkmncompress $< $@