summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore3
-rw-r--r--Makefile3
-rw-r--r--gfx/intro/charizard1.2bpp.lz.binbin0 -> 1344 bytes
-rw-r--r--gfx/intro/charizard2.2bpp.lz.binbin0 -> 896 bytes
-rw-r--r--gfx/intro/charizard3.2bpp.lz.binbin0 -> 1200 bytes
-rw-r--r--gfx/intro/grass1.2bpp.lz.binbin0 -> 480 bytes
-rw-r--r--gfx/intro/grass2.2bpp.lz.binbin0 -> 1376 bytes
-rw-r--r--gfx/intro/water1.2bpp.lz.binbin0 -> 1248 bytes
-rw-r--r--gfx/intro/water2.2bpp.lz.binbin0 -> 896 bytes
-rw-r--r--gfx/lz.mk3
-rw-r--r--gfx/pc/pc.2bpp.lz.binbin0 -> 32 bytes
-rw-r--r--gfx/pokegear/town_map.2bpp.lz.binbin0 -> 900 bytes
-rw-r--r--gfx/pokemon/alakazam/back_silver.2bpp.lz.bin (renamed from gfx/pokemon/alakazam/back_silver.2bpp.lz)bin460 -> 460 bytes
-rw-r--r--gfx/title/hooh_gold.2bpp.lz.binbin0 -> 936 bytes
-rw-r--r--gfx/title/logo_bottom_gold.2bpp.lz.binbin0 -> 1142 bytes
-rw-r--r--gfx/title/logo_bottom_silver.2bpp.lz.binbin0 -> 1176 bytes
-rw-r--r--gfx/title/logo_top_gold.2bpp.lz.binbin0 -> 416 bytes
-rw-r--r--gfx/title/logo_top_silver.2bpp.lz.binbin0 -> 402 bytes
-rw-r--r--gfx/title/lugia_silver.2bpp.lz.binbin0 -> 560 bytes
19 files changed, 1 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore
index 57814d77..bbf9fefd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,6 +47,3 @@ used_space.png
*.lz
*.2bpp
*.1bpp
-
-# with the singular exception of Alakazam's silver lz
-!gfx/pokemon/alakazam/back_silver.2bpp.lz
diff --git a/Makefile b/Makefile
index 5ef37f04..63c1364b 100644
--- a/Makefile
+++ b/Makefile
@@ -56,7 +56,7 @@ silver: pokesilver.gbc
clean:
rm -f $(roms) $(gold_obj) $(silver_obj) $(roms:.gbc=.map) $(roms:.gbc=.sym) rgbdscheck.o
- find gfx \( -name "*.[12]bpp" -o -name "*.lz" ! -path "gfx/pokemon/alakazam/back_silver.2bpp.lz" \) -delete
+ find gfx \( -name "*.[12]bpp" -o -name "*.lz" \) -delete
$(MAKE) clean -C tools/
tidy:
@@ -210,7 +210,6 @@ gfx/pokemon/%/back_gold.2bpp: gfx/pokemon/%/back.png
$(if $(tools/gfx),\
tools/gfx $(tools/gfx) -o $@ $@)
-# TODO: alakazam/back_silver.2bpp should be an exception, made by decompressing its lz
gfx/pokemon/%/back_silver.2bpp: gfx/pokemon/%/back.png
$(RGBGFX) $(rgbgfx) -o $@ $<
$(if $(tools/gfx),\
diff --git a/gfx/intro/charizard1.2bpp.lz.bin b/gfx/intro/charizard1.2bpp.lz.bin
new file mode 100644
index 00000000..dbcfd4b4
--- /dev/null
+++ b/gfx/intro/charizard1.2bpp.lz.bin
Binary files differ
diff --git a/gfx/intro/charizard2.2bpp.lz.bin b/gfx/intro/charizard2.2bpp.lz.bin
new file mode 100644
index 00000000..1fc35fd5
--- /dev/null
+++ b/gfx/intro/charizard2.2bpp.lz.bin
Binary files differ
diff --git a/gfx/intro/charizard3.2bpp.lz.bin b/gfx/intro/charizard3.2bpp.lz.bin
new file mode 100644
index 00000000..c4de8391
--- /dev/null
+++ b/gfx/intro/charizard3.2bpp.lz.bin
Binary files differ
diff --git a/gfx/intro/grass1.2bpp.lz.bin b/gfx/intro/grass1.2bpp.lz.bin
new file mode 100644
index 00000000..e10c760e
--- /dev/null
+++ b/gfx/intro/grass1.2bpp.lz.bin
Binary files differ
diff --git a/gfx/intro/grass2.2bpp.lz.bin b/gfx/intro/grass2.2bpp.lz.bin
new file mode 100644
index 00000000..32ee96d2
--- /dev/null
+++ b/gfx/intro/grass2.2bpp.lz.bin
Binary files differ
diff --git a/gfx/intro/water1.2bpp.lz.bin b/gfx/intro/water1.2bpp.lz.bin
new file mode 100644
index 00000000..b1d0c164
--- /dev/null
+++ b/gfx/intro/water1.2bpp.lz.bin
Binary files differ
diff --git a/gfx/intro/water2.2bpp.lz.bin b/gfx/intro/water2.2bpp.lz.bin
new file mode 100644
index 00000000..e6c59440
--- /dev/null
+++ b/gfx/intro/water2.2bpp.lz.bin
Binary files differ
diff --git a/gfx/lz.mk b/gfx/lz.mk
index f0d4afd5..0469b3be 100644
--- a/gfx/lz.mk
+++ b/gfx/lz.mk
@@ -13,8 +13,6 @@ gfx/dummy_game/dummy_game.2bpp.lz: LZFLAGS += --method 2 --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
@@ -24,7 +22,6 @@ 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_gold.2bpp.lz: LZFLAGS += --method 4
gfx/pokemon/miltank/back_gold.2bpp.lz: LZFLAGS += --method 4
diff --git a/gfx/pc/pc.2bpp.lz.bin b/gfx/pc/pc.2bpp.lz.bin
new file mode 100644
index 00000000..c2cf8491
--- /dev/null
+++ b/gfx/pc/pc.2bpp.lz.bin
Binary files differ
diff --git a/gfx/pokegear/town_map.2bpp.lz.bin b/gfx/pokegear/town_map.2bpp.lz.bin
new file mode 100644
index 00000000..9deac78d
--- /dev/null
+++ b/gfx/pokegear/town_map.2bpp.lz.bin
Binary files differ
diff --git a/gfx/pokemon/alakazam/back_silver.2bpp.lz b/gfx/pokemon/alakazam/back_silver.2bpp.lz.bin
index 6d4179eb..6d4179eb 100644
--- a/gfx/pokemon/alakazam/back_silver.2bpp.lz
+++ b/gfx/pokemon/alakazam/back_silver.2bpp.lz.bin
Binary files differ
diff --git a/gfx/title/hooh_gold.2bpp.lz.bin b/gfx/title/hooh_gold.2bpp.lz.bin
new file mode 100644
index 00000000..e7fa5b54
--- /dev/null
+++ b/gfx/title/hooh_gold.2bpp.lz.bin
Binary files differ
diff --git a/gfx/title/logo_bottom_gold.2bpp.lz.bin b/gfx/title/logo_bottom_gold.2bpp.lz.bin
new file mode 100644
index 00000000..eb9ff7f8
--- /dev/null
+++ b/gfx/title/logo_bottom_gold.2bpp.lz.bin
Binary files differ
diff --git a/gfx/title/logo_bottom_silver.2bpp.lz.bin b/gfx/title/logo_bottom_silver.2bpp.lz.bin
new file mode 100644
index 00000000..09683bb6
--- /dev/null
+++ b/gfx/title/logo_bottom_silver.2bpp.lz.bin
Binary files differ
diff --git a/gfx/title/logo_top_gold.2bpp.lz.bin b/gfx/title/logo_top_gold.2bpp.lz.bin
new file mode 100644
index 00000000..615d2f30
--- /dev/null
+++ b/gfx/title/logo_top_gold.2bpp.lz.bin
Binary files differ
diff --git a/gfx/title/logo_top_silver.2bpp.lz.bin b/gfx/title/logo_top_silver.2bpp.lz.bin
new file mode 100644
index 00000000..9620ec0c
--- /dev/null
+++ b/gfx/title/logo_top_silver.2bpp.lz.bin
Binary files differ
diff --git a/gfx/title/lugia_silver.2bpp.lz.bin b/gfx/title/lugia_silver.2bpp.lz.bin
new file mode 100644
index 00000000..14ce9337
--- /dev/null
+++ b/gfx/title/lugia_silver.2bpp.lz.bin
Binary files differ