Do not require "extras" submodule to build

Author: JustRegularLuna

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "extras"]
-	path = extras
-	url = git://github.com/kanzure/pokemon-reverse-engineering-tools.git

INSTALL.md

@@ -4,23 +4,14 @@ else
 RGBDS_DIR =
 endif
 
-PYTHON := python2
-MD5 := md5sum -c --quiet
-
-2bpp     := $(PYTHON) extras/pokemontools/gfx.py 2bpp
-1bpp     := $(PYTHON) extras/pokemontools/gfx.py 1bpp
-pic      := $(PYTHON) extras/pokemontools/pic.py compress
-includes := $(PYTHON) extras/pokemontools/scan_includes.py
+MD5 := md5sum -c
 
 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
 
 .SUFFIXES:
-.SUFFIXES: .asm .o .gbc .png .2bpp .1bpp .pic
 .SECONDEXPANSION:
-# Suppress annoying intermediate file deletion messages.
-.PRECIOUS: %.2bpp
-.PHONY: all clean red blue compare
+.PHONY: all clean red blue compare tools
 
 roms := pokered.gbc pokeblue.gbc
 
@@ -35,14 +26,27 @@ compare: red blue
 clean:
 	rm -f $(roms) $(pokered_obj) $(pokeblue_obj) $(roms:.gbc=.sym)
 	find . \( -iname '*.1bpp' -o -iname '*.2bpp' -o -iname '*.pic' \) -exec rm {} +
+	#$(MAKE) clean -C tools/
+
+tools:
+	$(MAKE) -C tools/
+
+
+# Build tools when building the rom.
+# This has to happen before the rules are processed, since that's when scan_includes is run.
+ifeq (,$(filter clean tools,$(MAKECMDGOALS)))
+$(info $(shell $(MAKE) -C tools))
+endif
+
+
 
 %.asm: ;
 
-%_red.o: dep = $(shell $(includes) $(@D)/$*.asm)
+%_red.o: dep = $(shell tools/scan_includes $(@D)/$*.asm)
 $(pokered_obj): %_red.o: %.asm $$(dep)
 	$(RGBDS_DIR)rgbasm -D _RED -h -o $@ $*.asm
 
-%_blue.o: dep = $(shell $(includes) $(@D)/$*.asm)
+%_blue.o: dep = $(shell tools/scan_includes $(@D)/$*.asm)
 $(pokeblue_obj): %_blue.o: %.asm $$(dep)
 	$(RGBDS_DIR)rgbasm -D _BLUE -h -o $@ $*.asm
 
@@ -54,7 +58,26 @@ pokeblue_opt = -Cjv -k 01 -l 0x33 -m 0x13 -p 0 -r 03 -t "POKEMON RED"
 	$(RGBDS_DIR)rgbfix $($*_opt) $@
 	sort $*.sym -o $*.sym
 
-%.png:  ;
-%.2bpp: %.png  ; $(2bpp) $<
-%.1bpp: %.png  ; $(1bpp) $<
-%.pic:  %.2bpp ; $(pic)  $<
+gfx/blue/intro_purin_1.6x6.2bpp: rgbgfx += -h
+gfx/blue/intro_purin_2.6x6.2bpp: rgbgfx += -h
+gfx/blue/intro_purin_3.6x6.2bpp: rgbgfx += -h
+gfx/red/intro_nido_1.6x6.2bpp: rgbgfx += -h
+gfx/red/intro_nido_2.6x6.2bpp: rgbgfx += -h
+gfx/red/intro_nido_3.6x6.2bpp: rgbgfx += -h
+
+gfx/game_boy.norepeat.2bpp: tools/gfx += --remove-duplicates
+gfx/theend.interleave.2bpp: tools/gfx += --interleave --png=$<
+gfx/tilesets/%.2bpp: tools/gfx += --trim-whitespace
+
+%.png: ;
+
+%.2bpp: %.png
+	rgbgfx $(rgbgfx) -o $@ $<
+	$(if $(tools/gfx),\
+		tools/gfx $(tools/gfx) -o $@ $@)
+%.1bpp: %.png
+	rgbgfx -d1 $(rgbgfx) -o $@ $<
+	$(if $(tools/gfx),\
+		tools/gfx $(tools/gfx) -d1 -o $@ $@)
+%.pic:  %.2bpp
+	tools/pkmncompress $< $@

Makefile

@@ -3,4 +3,4 @@ FarawayIslandInside_h:
 	db FARAWAY_ISLAND_INSIDE_HEIGHT, FARAWAY_ISLAND_INSIDE_WIDTH ; dimensions (y, x)
 	dw FarawayIslandInsideBlocks, FarawayIslandInsideTextPointers, FarawayIslandInsideScript ; blocks, texts, scripts
 	db $00 ; connections
-	dw FarawayIslandInsideObject ; objects
+	dw FarawayIslandInsideObject ; objects

data/mapHeaders/FarawayIslandInside.asm

@@ -3,4 +3,4 @@ FarawayIslandOutside_h:
 	db FARAWAY_ISLAND_OUTSIDE_HEIGHT, FARAWAY_ISLAND_OUTSIDE_WIDTH ; dimensions (y, x)
 	dw FarawayIslandOutsideBlocks, FarawayIslandOutsideTextPointers, FarawayIslandOutsideScript ; blocks, texts, scripts
 	db $00 ; connections
-	dw FarawayIslandOutsideObject ; objects
+	dw FarawayIslandOutsideObject ; objects

data/mapHeaders/FarawayIslandOutside.asm

@@ -3,4 +3,4 @@ NavelRockOutside_h:
 	db NAVEL_ROCK_OUTSIDE_HEIGHT, NAVEL_ROCK_OUTSIDE_WIDTH ; dimensions (y, x)
 	dw NavelRockOutsideBlocks, NavelRockOutsideTextPointers, NavelRockOutsideScript ; blocks, texts, scripts
 	db $00 ; connections
-	dw NavelRockOutsideObject ; objects
+	dw NavelRockOutsideObject ; objects

data/mapHeaders/NavelRockOutside.asm

@@ -3,4 +3,4 @@ SouthernIslandInside_h:
 	db SOUTHERN_ISLAND_INSIDE_HEIGHT, SOUTHERN_ISLAND_INSIDE_WIDTH ; dimensions (y, x)
 	dw SouthernIslandInsideBlocks, SouthernIslandInsideTextPointers, SouthernIslandInsideScript ; blocks, texts, scripts
 	db $00 ; connections
-	dw SouthernIslandInsideObject ; objects
+	dw SouthernIslandInsideObject ; objects

data/mapHeaders/SouthernIslandInside.asm

@@ -3,4 +3,4 @@ SouthernIslandOutside_h:
 	db SOUTHERN_ISLAND_OUTSIDE_HEIGHT, SOUTHERN_ISLAND_OUTSIDE_WIDTH ; dimensions (y, x)
 	dw SouthernIslandOutsideBlocks, SouthernIslandOutsideTextPointers, SouthernIslandOutsideScript ; blocks, texts, scripts
 	db $00 ; connections
-	dw SouthernIslandOutsideObject ; objects
+	dw SouthernIslandOutsideObject ; objects

data/mapHeaders/SouthernIslandOutside.asm

@@ -12,4 +12,4 @@ FarawayIslandInsideObject:
 
 	; warp-to
 	EVENT_DISP FARAWAY_ISLAND_INSIDE_WIDTH, $13, $c ; FARAWAY_ISLAND_OUTSIDE
-	EVENT_DISP FARAWAY_ISLAND_INSIDE_WIDTH, $13, $d ; FARAWAY_ISLAND_OUTSIDE
+	EVENT_DISP FARAWAY_ISLAND_INSIDE_WIDTH, $13, $d ; FARAWAY_ISLAND_OUTSIDE

data/mapObjects/FarawayIslandInside.asm

@@ -16,4 +16,4 @@ FarawayIslandOutsideObject:
 	; warp-to
 	EVENT_DISP FARAWAY_ISLAND_OUTSIDE_WIDTH, $27, $e ; INSIDE_FERRY
 	EVENT_DISP FARAWAY_ISLAND_OUTSIDE_WIDTH, $7, $16 ; FARAWAY_ISLAND_INSIDE
-	EVENT_DISP FARAWAY_ISLAND_OUTSIDE_WIDTH, $7, $17 ; FARAWAY_ISLAND_INSIDE
+	EVENT_DISP FARAWAY_ISLAND_OUTSIDE_WIDTH, $7, $17 ; FARAWAY_ISLAND_INSIDE

data/mapObjects/FarawayIslandOutside.asm

@@ -14,4 +14,4 @@ NavelRockOutsideObject:
 	; warp-to
 	EVENT_DISP NAVEL_ROCK_OUTSIDE_WIDTH, $5, $8 ; NAVEL_ROCK_CAVE_1
 	EVENT_DISP NAVEL_ROCK_OUTSIDE_WIDTH, $b, $9 ; NAVEL_ROCK_FERRY_DOCK
-	EVENT_DISP NAVEL_ROCK_OUTSIDE_WIDTH, $b, $a ; NAVEL_ROCK_FERRY_DOCK
+	EVENT_DISP NAVEL_ROCK_OUTSIDE_WIDTH, $b, $a ; NAVEL_ROCK_FERRY_DOCK

data/mapObjects/NavelRockOutside.asm

@@ -14,4 +14,4 @@ SouthernIslandInsideObject:
 
 	; warp-to
 	EVENT_DISP SOUTHERN_ISLAND_INSIDE_WIDTH, $15, $c ; SOUTHERN_ISLAND_OUTSIDE
-	EVENT_DISP SOUTHERN_ISLAND_INSIDE_WIDTH, $15, $d ; SOUTHERN_ISLAND_OUTSIDE
+	EVENT_DISP SOUTHERN_ISLAND_INSIDE_WIDTH, $15, $d ; SOUTHERN_ISLAND_OUTSIDE

data/mapObjects/SouthernIslandInside.asm

@@ -16,4 +16,4 @@ SouthernIslandOutsideObject:
 	; warp-to
 	EVENT_DISP SOUTHERN_ISLAND_OUTSIDE_WIDTH, $17, $e ; INSIDE_FERRY
 	EVENT_DISP SOUTHERN_ISLAND_OUTSIDE_WIDTH, $5, $e ; SOUTHERN_ISLAND_INSIDE
-	EVENT_DISP SOUTHERN_ISLAND_OUTSIDE_WIDTH, $5, $f ; SOUTHERN_ISLAND_INSIDE
+	EVENT_DISP SOUTHERN_ISLAND_OUTSIDE_WIDTH, $5, $f ; SOUTHERN_ISLAND_INSIDE

data/mapObjects/SouthernIslandOutside.asm

@@ -0,0 +1,3 @@
+scan_includes
+gfx
+pkmncompress

extras

@@ -0,0 +1,16 @@
+.PHONY: all clean
+
+CC := gcc
+CFLAGS := -O3 -std=c99 -Wall -Wextra -pedantic
+
+tools := scan_includes gfx pkmncompress
+
+all: $(tools)
+	@:
+
+clean:
+	rm -f $(tools)
+
+gfx: common.h
+%: %.c
+	$(CC) $(CFLAGS) -o $@ $<