Match LZ compressed files (#724)

Replace lzcomp with new version and match all LZ compressed files

Makefile

@@ -108,16 +108,13 @@ pokecrystal-au.gbc: $(crystal_au_obj) layout.link
 	$(RGBFIX) -Cjv -t PM_CRYSTAL -i BYTU -k 01 -l 0x33 -m 0x10 -r 3 -p 0 $@
 
 
-# For files that the compressor can't match, there will be a .lz file suffixed with the md5 hash of the correct uncompressed file.
+### LZ compression rules
-# If the hash of the uncompressed file matches, use this .lz instead.
+
-# This allows pngs to be used for compressed graphics and still match.
+# Delete this line if you don't care about matching and just want optimal compression.
+include gfx/lz.mk
 
-%.lz: hash = $(shell tools/md5 $(*D)/$(*F) | sed "s/\(.\{8\}\).*/\1/")
 %.lz: %
-	$(eval filename := $@.$(hash))
+	tools/lzcomp $(LZFLAGS) -- $< $@
-	$(if $(wildcard $(filename)),\
-		cp $(filename) $@,\
-		tools/lzcomp -- $< $@)
 
 
 ### Pokemon pic animation rules

gfx/lz.mk

@@ -0,0 +1,67 @@
+# Delete these rules if you don't care about matching.
+
+%.lz: LZFLAGS = --compressor multipass
+
+gfx/battle_anims/%.lz: LZFLAGS += --method 2 --align 4
+
+gfx/battle/dude.2bpp.lz: LZFLAGS += --align 4
+
+gfx/diploma/diploma.2bpp.lz: LZFLAGS += --method 8 --align 1
+
+gfx/dummy_game/dummy_game.2bpp.lz: LZFLAGS += --method 2 --align 4
+
+gfx/intro/%.lz: LZFLAGS += --align 4
+gfx/intro/logo.2bpp.lz: LZFLAGS += --method 2 --align 4
+gfx/intro/suicune_close.2bpp.lz: LZFLAGS += --method 2 --align 4
+gfx/intro/unown_back.2bpp.lz: LZFLAGS += --method 2 --align 4
+
+gfx/mobile/mobile_trade.%.lz: LZFLAGS += --align 4
+gfx/mobile/mobile_trade_sprites.2bpp.lz: LZFLAGS += --align 4
+
+gfx/new_game/shrink1.2bpp.lz: LZFLAGS += --align 4
+gfx/new_game/shrink2.2bpp.lz: LZFLAGS += --align 4
+
+gfx/pc/pc.2bpp.lz: LZFLAGS = --compressor null --method 1 --align 1
+
+gfx/player/chris_back.2bpp.lz: LZFLAGS += --align 4
+
+gfx/pokedex/pokedex.2bpp.lz: LZFLAGS += --method 8 --align 1
+gfx/pokedex/pokedex_sgb.2bpp.lz: LZFLAGS += --method 8 --align 1
+gfx/pokedex/question_mark.2bpp.lz: LZFLAGS += --align 4
+gfx/pokedex/slowpoke.2bpp.lz: LZFLAGS = --compressor null --method 1 --align 1
+
+gfx/pokegear/pokegear.2bpp.lz: LZFLAGS = --compressor null --method 1 --align 1
+gfx/pokegear/pokegear_sprites.2bpp.lz: LZFLAGS += --align 4
+gfx/pokegear/town_map.2bpp.lz: LZFLAGS = --compressor null --method 1 --align 1
+
+gfx/pokemon/hitmontop/back.2bpp.lz: LZFLAGS += --method 4
+gfx/pokemon/voltorb/front.animated.2bpp.lz: LZFLAGS += --method 4
+
+gfx/sgb/gbc_only.2bpp.lz: LZFLAGS = --compressor null --method 1 --align 1
+
+gfx/slots/slots_1.2bpp.lz: LZFLAGS += --method 2 --align 4
+gfx/slots/slots_2.2bpp.lz: LZFLAGS += --align 4
+gfx/slots/slots_3.2bpp.lz: LZFLAGS += --align 4
+
+gfx/tilesets/%.lz: LZFLAGS += --align 4
+gfx/tilesets/aerodactyl_word_room.2bpp.lz: LZFLAGS = --compressor null --method 1 --align 1
+gfx/tilesets/battle_tower_outside.2bpp.lz: LZFLAGS = --compressor null --method 1 --align 1
+gfx/tilesets/beta_word_room.2bpp.lz: LZFLAGS = --compressor null --method 1 --align 1
+gfx/tilesets/ho_oh_word_room.2bpp.lz: LZFLAGS = --compressor null --method 1 --align 1
+gfx/tilesets/house.2bpp.lz: LZFLAGS += --method 2 --align 4
+gfx/tilesets/johto.2bpp.lz: LZFLAGS = --compressor null --method 1 --align 1
+gfx/tilesets/johto_modern.2bpp.lz: LZFLAGS = --compressor null --method 1 --align 1
+gfx/tilesets/kabuto_word_room.2bpp.lz: LZFLAGS = --compressor null --method 1 --align 1
+gfx/tilesets/kanto.2bpp.lz: LZFLAGS = --compressor null --method 1 --align 1
+gfx/tilesets/mansion.2bpp.lz: LZFLAGS += --method 2 --align 4
+gfx/tilesets/mart.2bpp.lz: LZFLAGS += --method 2 --align 4
+gfx/tilesets/omanyte_word_room.2bpp.lz: LZFLAGS = --compressor null --method 1 --align 1
+gfx/tilesets/ruins_of_alph.2bpp.lz: LZFLAGS = --compressor null --method 1 --align 1
+gfx/tilesets/tower.2bpp.lz: LZFLAGS += --method 2 --align 4
+
+gfx/title/crystal.2bpp.lz: LZFLAGS += --align 4
+gfx/title/logo.2bpp.lz: LZFLAGS = --compressor null --method 1 --align 1
+gfx/title/suicune.2bpp.lz: LZFLAGS += --align 4
+
+gfx/unown_puzzle/%.lz: LZFLAGS += --align 4
+gfx/unown_puzzle/start_cancel.2bpp.lz: LZFLAGS += --method 8 --align 1