Remove .xor files and build them with xor_compress.py

23 files changed, 15 insertions, 4 deletions

diff --git a/.gitignore b/.gitignore
index 71f4697..aac1c0f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@
 !shim.sym
 __pycache__
 *.pyc
+*.exe
 /coverage.png
 /picross.png
 tools/scan_includes
diff --git a/Makefile b/Makefile
index 61eb6f7..6bdf53d 100644
--- a/Makefile
+++ b/Makefile
@@ -37,6 +37,11 @@ tools: $(tools)
 clean:
 	rm -rf $(name).gbc $(name).sym $(name).map $(dir_build) $(tools)
 
+.PHONY: tidy
+tidy:
+	rm -rf $(name).gbc $(name).sym $(name).map
+	find $(dir_build) \( -name "*.o" \) -delete
+
 $(name).gbc: layout.link $(objects) | $(baserom)
 	$(RGBLINK) $(RGBLINKFLAGS) -O $(baserom) -l $< -n $(@:.gbc=.sym) -m $(@:.gbc=.map) -o $@ $(filter-out $<, $^)
 	$(RGBFIX) $(RGBFIXFLAGS) -v $@
diff --git a/gfx/copyright/copyright.bin.xor b/gfx/copyright/copyright.bin.xor
deleted file mode 100644
index 463037b..0000000
--- a/gfx/copyright/copyright.bin.xor
+++ /dev/null
diff --git a/gfx/copyright/copyright.tilemap.xor b/gfx/copyright/copyright.tilemap.xor
deleted file mode 100644
index 1156fd6..0000000
--- a/gfx/copyright/copyright.tilemap.xor
+++ /dev/null
diff --git a/gfx/data_select/data_select.bin.xor b/gfx/data_select/data_select.bin.xor
deleted file mode 100644
index 064f8da..0000000
--- a/gfx/data_select/data_select.bin.xor
+++ /dev/null
diff --git a/gfx/data_select/data_select.tilemap_attrmap.xor b/gfx/data_select/data_select.tilemap_attrmap.xor
deleted file mode 100644
index f8274ae..0000000
--- a/gfx/data_select/data_select.tilemap_attrmap.xor
+++ /dev/null
diff --git a/gfx/easy_picross/easy_picross.tilemap_attrmap.xor b/gfx/easy_picross/easy_picross.tilemap_attrmap.xor
deleted file mode 100644
index 083e5e0..0000000
--- a/gfx/easy_picross/easy_picross.tilemap_attrmap.xor
+++ /dev/null
diff --git a/gfx/game_select/game_select.bin.xor b/gfx/game_select/game_select.bin.xor
deleted file mode 100644
index 7f3803d..0000000
--- a/gfx/game_select/game_select.bin.xor
+++ /dev/null
diff --git a/gfx/game_select/pokemon_picross.tilemap_attrmap.xor b/gfx/game_select/pokemon_picross.tilemap_attrmap.xor
deleted file mode 100644
index e36d310..0000000
--- a/gfx/game_select/pokemon_picross.tilemap_attrmap.xor
+++ /dev/null
diff --git a/gfx/game_select/safari_picross.tilemap_attrmap.xor b/gfx/game_select/safari_picross.tilemap_attrmap.xor
deleted file mode 100644
index c2cd4c1..0000000
--- a/gfx/game_select/safari_picross.tilemap_attrmap.xor
+++ /dev/null
diff --git a/gfx/gfx.mk b/gfx/gfx.mk
index 4cb9ef4..d1b43d9 100644
--- a/gfx/gfx.mk
+++ b/gfx/gfx.mk
@@ -2,12 +2,17 @@ RGBGFXFLAGS :=
 $(dir_build)/%.bin: %.png | $$(dir $$@)
 	$(RGBGFX) $(RGBGFXFLAGS) -o $@ $<
 
-$(dir_build)/%.tilemap_attrmap: %.tilemap %.attrmap | $$(dir $$@)
-	cat $^ > $@
-
 $(dir_build)/gfx/sprites/%.bin: RGBGFXFLAGS = -h
 
 # data_select.bin.xor decompresses to 2bpp-encoded data_select.png with an extra byte $33 (ASCII "3") appended
-$(dir_build)/gfx/data_select/data_select.bin: gfx/data_select/data_select.bin.png | $$(dir $$@)
+$(dir_build)/gfx/data_select/data_select.bin: gfx/data_select/data_select.png | $$(dir $$@)
 	$(RGBGFX) $(RGBGFXFLAGS) -o $@ $<
 	printf 3 >> $@
+
+$(dir_build)/%.xor: $(dir_build)/% | $$(dir $$@)
+	tools/xor_compress.py $< > $@
+$(dir_build)/%.xor: % | $$(dir $$@)
+	tools/xor_compress.py $< > $@
+
+$(dir_build)/%.tilemap_attrmap.xor: %.tilemap %.attrmap | $$(dir $$@)
+	tools/xor_compress.py $^ > $@
diff --git a/gfx/how_to_play/safari.tilemap_attrmap.xor b/gfx/how_to_play/safari.tilemap_attrmap.xor
deleted file mode 100644
index 2621f8e..0000000
--- a/gfx/how_to_play/safari.tilemap_attrmap.xor
+++ /dev/null
diff --git a/gfx/pokedex/pokedex_list.tilemap_attrmap.xor b/gfx/pokedex/pokedex_list.tilemap_attrmap.xor
deleted file mode 100644
index 8e3e43a..0000000
--- a/gfx/pokedex/pokedex_list.tilemap_attrmap.xor
+++ /dev/null
diff --git a/gfx/pokedex/pokedex_pic.tilemap_attrmap.xor b/gfx/pokedex/pokedex_pic.tilemap_attrmap.xor
deleted file mode 100644
index b4a03b4..0000000
--- a/gfx/pokedex/pokedex_pic.tilemap_attrmap.xor
+++ /dev/null
diff --git a/gfx/pokedex/pokedex_scroll.tilemap_attrmap.xor b/gfx/pokedex/pokedex_scroll.tilemap_attrmap.xor
deleted file mode 100644
index 06c2d86..0000000
--- a/gfx/pokedex/pokedex_scroll.tilemap_attrmap.xor
+++ /dev/null
diff --git a/gfx/safari_map/safari_map.tilemap_attrmap.xor b/gfx/safari_map/safari_map.tilemap_attrmap.xor
deleted file mode 100644
index 2dc4da1..0000000
--- a/gfx/safari_map/safari_map.tilemap_attrmap.xor
+++ /dev/null
diff --git a/gfx/safari_zone_album/album_list.tilemap_attrmap.xor b/gfx/safari_zone_album/album_list.tilemap_attrmap.xor
deleted file mode 100644
index 9fbc2ce..0000000
--- a/gfx/safari_zone_album/album_list.tilemap_attrmap.xor
+++ /dev/null
diff --git a/gfx/safari_zone_album/album_pic.tilemap_attrmap.xor b/gfx/safari_zone_album/album_pic.tilemap_attrmap.xor
deleted file mode 100644
index 3e19e45..0000000
--- a/gfx/safari_zone_album/album_pic.tilemap_attrmap.xor
+++ /dev/null
diff --git a/gfx/safari_zone_album/album_scroll.tilemap_attrmap.xor b/gfx/safari_zone_album/album_scroll.tilemap_attrmap.xor
deleted file mode 100644
index 67e2e41..0000000
--- a/gfx/safari_zone_album/album_scroll.tilemap_attrmap.xor
+++ /dev/null
diff --git a/gfx/title/title_1.bin.xor b/gfx/title/title_1.bin.xor
deleted file mode 100644
index 411a863..0000000
--- a/gfx/title/title_1.bin.xor
+++ /dev/null
diff --git a/gfx/title/title_2.bin.xor b/gfx/title/title_2.bin.xor
deleted file mode 100644
index de5e98b..0000000
--- a/gfx/title/title_2.bin.xor
+++ /dev/null
diff --git a/gfx/town_map/town_map.tilemap_attrmap.xor b/gfx/town_map/town_map.tilemap_attrmap.xor
deleted file mode 100644
index 9588588..0000000
--- a/gfx/town_map/town_map.tilemap_attrmap.xor
+++ /dev/null
diff --git a/gfx/unknown/unknown_6b_7f34.tilemap_attrmap.xor b/gfx/unknown/unknown_6b_7f34.tilemap_attrmap.xor
deleted file mode 100644
index 5151eef..0000000
--- a/gfx/unknown/unknown_6b_7f34.tilemap_attrmap.xor
+++ /dev/null