Merge remote-tracking branch 'yenatch/png'

.gitignore

@@ -1,6 +1,3 @@
-# global label defs are generated
-globals.asm
-
 # precompiled python
 *.pyc
 
@@ -21,6 +18,11 @@ globals.asm
 # generated
 *.tx
 
+# converted image data
+*.2bpp
+*.1bpp
+*.pic
+
 # swap files for vim
 .*.swp
 

Makefile

@@ -1,8 +1,16 @@
 PYTHON := python
+
+.SUFFIXES:
 .SUFFIXES: .asm .tx .o .gbc
-.PHONY: all clean red blue compare
+.PHONY: all clean red blue compare pngs
+.PRECIOUS: %.2bpp
 .SECONDEXPANSION:
 
+POKEMONTOOLS := extras/pokemontools
+GFX          := $(PYTHON) $(POKEMONTOOLS)/gfx.py
+PIC          := $(PYTHON) $(POKEMONTOOLS)/pic.py
+INCLUDES     := $(PYTHON) $(POKEMONTOOLS)/scan_includes.py
+PREPROCESS   := $(PYTHON) prequeue.py
 
 TEXTQUEUE :=
 
@@ -23,10 +31,8 @@ OBJS := $(sort $(OBJS))
 
 ROMS := pokered.gbc pokeblue.gbc
 
-# generate dependencies for each object
+# object dependencies
-$(shell $(foreach obj, $(OBJS), \
+$(shell $(foreach obj, $(OBJS), $(eval $(obj:.o=)_DEPENDENCIES := $(shell $(INCLUDES) $(obj:.o=.asm)))))
-	$(eval $(obj:.o=)_DEPENDENCIES := $(shell $(PYTHON) extras/pokemontools/scan_includes.py $(obj:.o=.asm))) \
-))
 
 all: $(ROMS)
 red:  pokered.gbc
@@ -36,7 +42,10 @@ compare:
 clean:
 	rm -f $(ROMS)
 	rm -f $(OBJS)
-	find . -iname '*.tx' -exec rm {} +
+	find .   -iname '*.tx'      -exec rm {} +
+	find gfx -iname '*.[12]bpp' -exec rm {} +
+	find pic -iname '*.pic'     -exec rm {} +
+	find pic -iname '*.2bpp'    -exec rm {} +
 	rm -f redrle
 
 
@@ -50,8 +59,14 @@ redrle: extras/redtools/redrle.c
 	@rm -f $@
 
 $(OBJS): $$*.tx $$(patsubst %.asm, %.tx, $$($$*_DEPENDENCIES))
-	@$(PYTHON) prequeue.py $(TEXTQUEUE)
+	@$(PREPROCESS) $(TEXTQUEUE)
 	@$(eval TEXTQUEUE :=)
+	@$(GFX) 2bpp $(2BPPQUEUE)
+	@$(eval 2BPPQUEUE :=)
+	@$(GFX) 1bpp $(1BPPQUEUE)
+	@$(eval 1BPPQUEUE :=)
+	@$(PIC) compress $(PICQUEUE)
+	@$(eval PICQUEUE  :=)
 	rgbasm -o $@ $*.tx
 
 
@@ -65,3 +80,15 @@ pokeblue.gbc: $(BLUE_OBJS)
 	rgblink -n $*.sym -m $*.map -o $@ $^
 	rgbfix $(OPTIONS) -t "POKEMON BLUE" $@
 
+
+%.2bpp: %.png
+	$(eval 2BPPQUEUE += $<)
+	@rm -f $@
+%.1bpp: %.png
+	$(eval 1BPPQUEUE += $<)
+	@rm -f $@
+%.pic: %.2bpp
+	$(eval PICQUEUE  += $<)
+	@rm -f $@
+
+

extras

@@ -1 +1 @@
-Subproject commit 61b83803be9ccdcdcd95b7f8ea7accafab8d4d4d
+Subproject commit 1840111de5b4c8aa18717d088f0718dbc0d17841

gfx/ED_tile.1bpp

@@ -1 +0,0 @@
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>



gfx/battle_transition.2bpp

@@ -1 +0,0 @@
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>

gfx/minimized_mon_sprite.1bpp

@@ -1 +0,0 @@
-<~<$

gfx/mon_nest_icon.1bpp

@@ -1 +0,0 @@
-Bf˙˝™˙Z$

gfx/red_fishing_tile_back.2bpp

@@ -1 +0,0 @@
-?3,?+?Эл4ЭтЭ≤x8ЬХЬ┬Ьpp

gfx/red_fishing_tile_front.2bpp

@@ -1 +0,0 @@
-?2/?'?<0F>Lרפ<>ה<EFBFBD>ר˜ר˜טרננ

gfx/red_fishing_tile_side.2bpp

@@ -1 +0,0 @@
-ßÐûü??<'?'ðà`0ðpðÐðpð àÀÀ