Concatenate multiple intro 2bpps together before compression

10 files changed, 6 insertions, 5 deletions

diff --git a/Makefile b/Makefile
index c52dd8d1..10a5f879 100644
--- a/Makefile
+++ b/Makefile
@@ -145,8 +145,9 @@ gfx/pokemon/%/back_silver.2bpp: gfx/pokemon/%/back.png
 
 gfx/trainers/%.2bpp: rgbgfx += -h
 
-gfx/intro/charizard2.2bpp: tools/gfx += --trim-whitespace
-gfx/intro/charizard3.2bpp: tools/gfx += --trim-whitespace
+gfx/intro/fire1.2bpp: gfx/intro/charizard1.2bpp gfx/intro/charizard2_top.2bpp gfx/intro/space.2bpp ; cat $^ > $@
+gfx/intro/fire2.2bpp: gfx/intro/charizard2_bottom.2bpp gfx/intro/charizard3.2bpp ; cat $^ > $@
+gfx/intro/fire3.2bpp: gfx/intro/fire.2bpp gfx/intro/unused_blastoise_venusaur.2bpp ; cat $^ > $@
 
 gfx/new_game/shrink1.2bpp: rgbgfx += -h
 gfx/new_game/shrink2.2bpp: rgbgfx += -h
diff --git a/engine/movie/gold_silver_intro.asm b/engine/movie/gold_silver_intro.asm
index 7195e7dc..1f3630ee 100644
--- a/engine/movie/gold_silver_intro.asm
+++ b/engine/movie/gold_silver_intro.asm
@@ -1595,10 +1595,10 @@ Intro_GrassGFX2:
 INCBIN "gfx/intro/grass2.2bpp.lz"
 
 Intro_FireGFX1:
-INCBIN "gfx/intro/charizard1.2bpp.lz"
+INCBIN "gfx/intro/fire1.2bpp.lz"
 
 Intro_FireGFX2:
-INCBIN "gfx/intro/charizard2.2bpp.lz"
+INCBIN "gfx/intro/fire2.2bpp.lz"
 
 Intro_FireGFX3:
-INCBIN "gfx/intro/charizard3.2bpp.lz"
+INCBIN "gfx/intro/fire3.2bpp.lz"
diff --git a/gfx/intro/charizard1.png b/gfx/intro/charizard1.png
index c8cbe6b1..76afd19e 100644
--- a/gfx/intro/charizard1.png
+++ b/gfx/intro/charizard1.png
diff --git a/gfx/intro/charizard2.png b/gfx/intro/charizard2.png
deleted file mode 100644
index 56cf3121..00000000
--- a/gfx/intro/charizard2.png
+++ /dev/null
diff --git a/gfx/intro/charizard2_bottom.png b/gfx/intro/charizard2_bottom.png
new file mode 100644
index 00000000..87720b7e
--- /dev/null
+++ b/gfx/intro/charizard2_bottom.png
diff --git a/gfx/intro/charizard2_top.png b/gfx/intro/charizard2_top.png
new file mode 100644
index 00000000..2efdf380
--- /dev/null
+++ b/gfx/intro/charizard2_top.png
diff --git a/gfx/intro/charizard3.png b/gfx/intro/charizard3.png
index 031a08a3..a834a4f6 100644
--- a/gfx/intro/charizard3.png
+++ b/gfx/intro/charizard3.png
diff --git a/gfx/intro/fire.png b/gfx/intro/fire.png
new file mode 100644
index 00000000..cb81f19f
--- /dev/null
+++ b/gfx/intro/fire.png
diff --git a/gfx/intro/space.png b/gfx/intro/space.png
new file mode 100644
index 00000000..3233c135
--- /dev/null
+++ b/gfx/intro/space.png
diff --git a/gfx/intro/unused_blastoise_venusaur.png b/gfx/intro/unused_blastoise_venusaur.png
new file mode 100644
index 00000000..2689b4d8
--- /dev/null
+++ b/gfx/intro/unused_blastoise_venusaur.png