summaryrefslogtreecommitdiff
path: root/gfx
diff options
context:
space:
mode:
Diffstat (limited to 'gfx')
-rw-r--r--gfx/font.asm5
-rw-r--r--gfx/font/unused_weekday_kanji.pngbin0 -> 142 bytes
-rw-r--r--gfx/intro/charizard1.2bpp.lz.binbin1344 -> 0 bytes
-rw-r--r--gfx/intro/charizard1.pngbin1203 -> 1219 bytes
-rw-r--r--gfx/intro/charizard2.2bpp.lz.binbin896 -> 0 bytes
-rw-r--r--gfx/intro/charizard2.pngbin809 -> 816 bytes
-rw-r--r--gfx/intro/charizard3.2bpp.lz.binbin1200 -> 0 bytes
-rw-r--r--gfx/intro/charizard3.pngbin1239 -> 1233 bytes
-rw-r--r--gfx/intro/grass1.2bpp.lz.binbin480 -> 0 bytes
-rw-r--r--gfx/intro/grass2.2bpp.lz.binbin1376 -> 0 bytes
-rw-r--r--gfx/intro/water1.2bpp.lz.binbin1248 -> 0 bytes
-rw-r--r--gfx/intro/water2.2bpp.lz.binbin896 -> 0 bytes
-rw-r--r--gfx/lz.mk11
-rw-r--r--gfx/pc/pc.2bpp.lz.binbin32 -> 0 bytes
-rw-r--r--gfx/pokegear/town_map.2bpp.lz.binbin900 -> 0 bytes
-rw-r--r--gfx/title/logo_bottom_gold.2bpp.lz.binbin1142 -> 0 bytes
-rw-r--r--gfx/title/logo_bottom_silver.2bpp.lz.binbin1176 -> 0 bytes
-rw-r--r--gfx/title/logo_top_gold.2bpp.lz.binbin416 -> 0 bytes
-rw-r--r--gfx/title/logo_top_silver.2bpp.lz.binbin402 -> 0 bytes
19 files changed, 15 insertions, 1 deletions
diff --git a/gfx/font.asm b/gfx/font.asm
index 6d21bd49..4d22efef 100644
--- a/gfx/font.asm
+++ b/gfx/font.asm
@@ -31,7 +31,10 @@ ExpBarGFX:
INCBIN "gfx/battle/expbar.2bpp"
TownMapGFX:
-INCBIN "gfx/pokegear/town_map.2bpp.lz.bin"
+INCBIN "gfx/pokegear/town_map.2bpp.lz"
+
+UnusedWeekdayKanjiGFX:
+INCBIN "gfx/font/unused_weekday_kanji.2bpp"
PokegearPhoneIconGFX:
INCBIN "gfx/font/phone_icon.2bpp"
diff --git a/gfx/font/unused_weekday_kanji.png b/gfx/font/unused_weekday_kanji.png
new file mode 100644
index 00000000..6eeb69b1
--- /dev/null
+++ b/gfx/font/unused_weekday_kanji.png
Binary files differ
diff --git a/gfx/intro/charizard1.2bpp.lz.bin b/gfx/intro/charizard1.2bpp.lz.bin
deleted file mode 100644
index dbcfd4b4..00000000
--- a/gfx/intro/charizard1.2bpp.lz.bin
+++ /dev/null
Binary files differ
diff --git a/gfx/intro/charizard1.png b/gfx/intro/charizard1.png
index 79b8dfa0..c8cbe6b1 100644
--- a/gfx/intro/charizard1.png
+++ b/gfx/intro/charizard1.png
Binary files differ
diff --git a/gfx/intro/charizard2.2bpp.lz.bin b/gfx/intro/charizard2.2bpp.lz.bin
deleted file mode 100644
index 1fc35fd5..00000000
--- a/gfx/intro/charizard2.2bpp.lz.bin
+++ /dev/null
Binary files differ
diff --git a/gfx/intro/charizard2.png b/gfx/intro/charizard2.png
index e6ec2139..56cf3121 100644
--- a/gfx/intro/charizard2.png
+++ b/gfx/intro/charizard2.png
Binary files differ
diff --git a/gfx/intro/charizard3.2bpp.lz.bin b/gfx/intro/charizard3.2bpp.lz.bin
deleted file mode 100644
index c4de8391..00000000
--- a/gfx/intro/charizard3.2bpp.lz.bin
+++ /dev/null
Binary files differ
diff --git a/gfx/intro/charizard3.png b/gfx/intro/charizard3.png
index ff4f656c..031a08a3 100644
--- a/gfx/intro/charizard3.png
+++ b/gfx/intro/charizard3.png
Binary files differ
diff --git a/gfx/intro/grass1.2bpp.lz.bin b/gfx/intro/grass1.2bpp.lz.bin
deleted file mode 100644
index e10c760e..00000000
--- a/gfx/intro/grass1.2bpp.lz.bin
+++ /dev/null
Binary files differ
diff --git a/gfx/intro/grass2.2bpp.lz.bin b/gfx/intro/grass2.2bpp.lz.bin
deleted file mode 100644
index 32ee96d2..00000000
--- a/gfx/intro/grass2.2bpp.lz.bin
+++ /dev/null
Binary files differ
diff --git a/gfx/intro/water1.2bpp.lz.bin b/gfx/intro/water1.2bpp.lz.bin
deleted file mode 100644
index b1d0c164..00000000
--- a/gfx/intro/water1.2bpp.lz.bin
+++ /dev/null
Binary files differ
diff --git a/gfx/intro/water2.2bpp.lz.bin b/gfx/intro/water2.2bpp.lz.bin
deleted file mode 100644
index e6c59440..00000000
--- a/gfx/intro/water2.2bpp.lz.bin
+++ /dev/null
Binary files differ
diff --git a/gfx/lz.mk b/gfx/lz.mk
index 0469b3be..b0c67a06 100644
--- a/gfx/lz.mk
+++ b/gfx/lz.mk
@@ -10,9 +10,14 @@ gfx/diploma/diploma.2bpp.lz: LZFLAGS += --method 8 --align 1
gfx/dummy_game/dummy_game.2bpp.lz: LZFLAGS += --method 2 --align 4
+gfx/intro/%.2bpp.lz: LZFLAGS += --align 4
+gfx/intro/water1.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 += --align 4
+
gfx/player/chris_back.2bpp.lz: LZFLAGS += --align 4
gfx/pokedex/pokedex.2bpp.lz: LZFLAGS += --method 8 --align 1
@@ -22,6 +27,7 @@ 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
@@ -42,5 +48,10 @@ gfx/tilesets/radio_tower.2bpp.lz: LZFLAGS += --method 2 --align 4
gfx/tilesets/ruins_of_alph.2bpp.lz: LZFLAGS += --method 2 --align 4
gfx/tilesets/tower.2bpp.lz: LZFLAGS += --method 2 --align 4
+gfx/title/logo_bottom_gold.2bpp.lz: LZFLAGS += --method 9 --align 1
+gfx/title/logo_bottom_silver.2bpp.lz: LZFLAGS += --method 9 --align 1
+gfx/title/logo_top_gold.2bpp.lz: LZFLAGS += --method 9 --align 1
+gfx/title/logo_top_silver.2bpp.lz: LZFLAGS += --method 9 --align 1
+
gfx/unown_puzzle/%.lz: LZFLAGS += --align 4
gfx/unown_puzzle/start_cancel.2bpp.lz: LZFLAGS += --method 8 --align 1
diff --git a/gfx/pc/pc.2bpp.lz.bin b/gfx/pc/pc.2bpp.lz.bin
deleted file mode 100644
index c2cf8491..00000000
--- a/gfx/pc/pc.2bpp.lz.bin
+++ /dev/null
Binary files differ
diff --git a/gfx/pokegear/town_map.2bpp.lz.bin b/gfx/pokegear/town_map.2bpp.lz.bin
deleted file mode 100644
index 9deac78d..00000000
--- a/gfx/pokegear/town_map.2bpp.lz.bin
+++ /dev/null
Binary files differ
diff --git a/gfx/title/logo_bottom_gold.2bpp.lz.bin b/gfx/title/logo_bottom_gold.2bpp.lz.bin
deleted file mode 100644
index eb9ff7f8..00000000
--- a/gfx/title/logo_bottom_gold.2bpp.lz.bin
+++ /dev/null
Binary files differ
diff --git a/gfx/title/logo_bottom_silver.2bpp.lz.bin b/gfx/title/logo_bottom_silver.2bpp.lz.bin
deleted file mode 100644
index 09683bb6..00000000
--- a/gfx/title/logo_bottom_silver.2bpp.lz.bin
+++ /dev/null
Binary files differ
diff --git a/gfx/title/logo_top_gold.2bpp.lz.bin b/gfx/title/logo_top_gold.2bpp.lz.bin
deleted file mode 100644
index 615d2f30..00000000
--- a/gfx/title/logo_top_gold.2bpp.lz.bin
+++ /dev/null
Binary files differ
diff --git a/gfx/title/logo_top_silver.2bpp.lz.bin b/gfx/title/logo_top_silver.2bpp.lz.bin
deleted file mode 100644
index 9620ec0c..00000000
--- a/gfx/title/logo_top_silver.2bpp.lz.bin
+++ /dev/null
Binary files differ