summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi@gmail.com>2018-05-30 14:55:37 -0400
committerRangi <remy.oukaour+rangi@gmail.com>2018-05-30 14:55:37 -0400
commita1550d4c160ffdadd91a3776135aeeeb0fb6a4b6 (patch)
tree321124ae36ab7f42ed1b669df64b5fa2bd617ad5
parentaa11780082158395153c930403a90219383da681 (diff)
'make mostlyclean' preserves graphics; separate frame gfx files
-rw-r--r--Makefile7
-rw-r--r--gfx/frames/1.pngbin0 -> 137 bytes
-rw-r--r--gfx/frames/2.pngbin0 -> 199 bytes
-rw-r--r--gfx/frames/3.pngbin0 -> 167 bytes
-rw-r--r--gfx/frames/4.pngbin0 -> 189 bytes
-rw-r--r--gfx/frames/5.pngbin0 -> 172 bytes
-rw-r--r--gfx/frames/6.pngbin0 -> 178 bytes
-rw-r--r--gfx/frames/7.pngbin0 -> 181 bytes
-rw-r--r--gfx/frames/8.pngbin0 -> 168 bytes
-rw-r--r--gfx/frames/9.pngbin0 -> 177 bytes
-rw-r--r--gfx/frames/frames.pngbin330 -> 0 bytes
-rw-r--r--main.asm11
12 files changed, 16 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index f88940a..f6d8f33 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
MD5 := md5sum -c
-.PHONY: all compare clean text
+.PHONY: all compare clean mostlyclean text
.SUFFIXES:
.SUFFIXES: .asm .o .gb .png
@@ -44,6 +44,11 @@ clean:
rm -rf $(ROMS) $(OBJS) $(ROMS:.gb=.sym) build/* shim.asm
find . \( -iname '*.1bpp' -o -iname '*.2bpp' -o -iname '*.pic' -o -iname '*.pcm' \) -exec rm {} +
+# Remove files except for graphics.
+mostlyclean:
+ rm -rf $(ROMS) $(OBJS) $(ROMS:.gb=.sym) build/* shim.asm
+ find . \( -iname '*.pcm' \) -exec rm {} +
+
gfx/sgb/sgb_border_alt.2bpp: tools/gfx += --trim-whitespace
gfx/sgb/sgb_border.2bpp: tools/gfx += --trim-whitespace
gfx/title/title.2bpp: tools/gfx += --trim-whitespace
diff --git a/gfx/frames/1.png b/gfx/frames/1.png
new file mode 100644
index 0000000..2908ddb
--- /dev/null
+++ b/gfx/frames/1.png
Binary files differ
diff --git a/gfx/frames/2.png b/gfx/frames/2.png
new file mode 100644
index 0000000..9c7a904
--- /dev/null
+++ b/gfx/frames/2.png
Binary files differ
diff --git a/gfx/frames/3.png b/gfx/frames/3.png
new file mode 100644
index 0000000..2cb50a5
--- /dev/null
+++ b/gfx/frames/3.png
Binary files differ
diff --git a/gfx/frames/4.png b/gfx/frames/4.png
new file mode 100644
index 0000000..3bb2824
--- /dev/null
+++ b/gfx/frames/4.png
Binary files differ
diff --git a/gfx/frames/5.png b/gfx/frames/5.png
new file mode 100644
index 0000000..53b6219
--- /dev/null
+++ b/gfx/frames/5.png
Binary files differ
diff --git a/gfx/frames/6.png b/gfx/frames/6.png
new file mode 100644
index 0000000..6c4ce23
--- /dev/null
+++ b/gfx/frames/6.png
Binary files differ
diff --git a/gfx/frames/7.png b/gfx/frames/7.png
new file mode 100644
index 0000000..6aca564
--- /dev/null
+++ b/gfx/frames/7.png
Binary files differ
diff --git a/gfx/frames/8.png b/gfx/frames/8.png
new file mode 100644
index 0000000..8b53e8b
--- /dev/null
+++ b/gfx/frames/8.png
Binary files differ
diff --git a/gfx/frames/9.png b/gfx/frames/9.png
new file mode 100644
index 0000000..1fab315
--- /dev/null
+++ b/gfx/frames/9.png
Binary files differ
diff --git a/gfx/frames/frames.png b/gfx/frames/frames.png
deleted file mode 100644
index 9cc73b9..0000000
--- a/gfx/frames/frames.png
+++ /dev/null
Binary files differ
diff --git a/main.asm b/main.asm
index 190ec77..2c1847e 100644
--- a/main.asm
+++ b/main.asm
@@ -255,7 +255,16 @@ FontGFX::
INCBIN "gfx/font/font.1bpp"
FontBattleExtraGFX::
INCBIN "gfx/font/font_battle_extra.2bpp"
-INCBIN "gfx/frames/frames.1bpp"
+FrameGFX::
+INCBIN "gfx/frames/1.1bpp"
+INCBIN "gfx/frames/2.1bpp"
+INCBIN "gfx/frames/3.1bpp"
+INCBIN "gfx/frames/4.1bpp"
+INCBIN "gfx/frames/5.1bpp"
+INCBIN "gfx/frames/6.1bpp"
+INCBIN "gfx/frames/7.1bpp"
+INCBIN "gfx/frames/8.1bpp"
+INCBIN "gfx/frames/9.1bpp"
StatsSeparatorGFX::
INCBIN "gfx/stats/separator.2bpp"
StatsGFX::