Match hooh_gold.2bpp.lz and lugia_silver.2bpp.lz, and fix the Travis CI webhook.sh

To do: revise hooh_gold.png and lugia_silver.png to resemble their screens, and use rgbgfx options to match the 2bpp tiles

8 files changed, 7 insertions, 2 deletions

diff --git a/.travis/webhook.sh b/.travis/webhook.sh
index 49a9a471..49a9a471 100644..100755
--- a/.travis/webhook.sh
+++ b/.travis/webhook.sh
diff --git a/gfx/lz.mk b/gfx/lz.mk
index b0c67a06..6a6f6c80 100644
--- a/gfx/lz.mk
+++ b/gfx/lz.mk
@@ -48,10 +48,12 @@ 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/hooh_gold.2bpp.lz: LZFLAGS += --align 3
 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/title/lugia_silver.2bpp.lz: LZFLAGS += --align 4
 
 gfx/unown_puzzle/%.lz: LZFLAGS += --align 4
 gfx/unown_puzzle/start_cancel.2bpp.lz: LZFLAGS += --method 8 --align 1
diff --git a/gfx/pics_silver.asm b/gfx/pics_silver.asm
index e8140f5a..abf460e2 100644
--- a/gfx/pics_silver.asm
+++ b/gfx/pics_silver.asm
@@ -60,6 +60,9 @@ LaprasFrontpic:      INCBIN "gfx/pokemon/lapras/front_silver.2bpp.lz"
 KimonoGirlPic:       INCBIN "gfx/trainers/kimono_girl.2bpp.lz"
 MagnetonFrontpic:    INCBIN "gfx/pokemon/magneton/front_silver.2bpp.lz"
 KadabraFrontpic:     INCBIN "gfx/pokemon/kadabra/front_silver.2bpp.lz"
+; alakazam/back_silver.2bpp has an extra $80 byte at the end, and lzcomp
+; cannot perfectly match the way it's compressed.
+; Delete the ".bin" if you don't care about matching.
 AlakazamBackpic:     INCBIN "gfx/pokemon/alakazam/back_silver.2bpp.lz.bin"
 HitmontopBackpic:    INCBIN "gfx/pokemon/hitmontop/back_silver.2bpp.lz"
 CloysterBackpic:     INCBIN "gfx/pokemon/cloyster/back.2bpp.lz"
diff --git a/gfx/title/hooh_gold.2bpp.lz.bin b/gfx/title/hooh_gold.2bpp.lz.bin
deleted file mode 100644
index e7fa5b54..00000000
--- a/gfx/title/hooh_gold.2bpp.lz.bin
+++ /dev/null
diff --git a/gfx/title/hooh_gold.png b/gfx/title/hooh_gold.png
index 646166b1..0e10fbf6 100644
--- a/gfx/title/hooh_gold.png
+++ b/gfx/title/hooh_gold.png
diff --git a/gfx/title/lugia_silver.2bpp.lz.bin b/gfx/title/lugia_silver.2bpp.lz.bin
deleted file mode 100644
index 14ce9337..00000000
--- a/gfx/title/lugia_silver.2bpp.lz.bin
+++ /dev/null
diff --git a/gfx/title/lugia_silver.png b/gfx/title/lugia_silver.png
index 7edb8538..86b55635 100644
--- a/gfx/title/lugia_silver.png
+++ b/gfx/title/lugia_silver.png
diff --git a/main.asm b/main.asm
index 5adb78f5..c8777586 100644
--- a/main.asm
+++ b/main.asm
@@ -333,13 +333,13 @@ IF DEF(_GOLD)
 TitleScreenGFX3:
 INCBIN "gfx/title/title_trail_gold.2bpp"
 TitleScreenGFX4:
-INCBIN "gfx/title/hooh_gold.2bpp.lz.bin"
+INCBIN "gfx/title/hooh_gold.2bpp.lz"
 
 ELIF DEF(_SILVER)
 TitleScreenGFX3:
 INCBIN "gfx/title/title_trail_silver.2bpp"
 TitleScreenGFX4:
-INCBIN "gfx/title/lugia_silver.2bpp.lz.bin"
+INCBIN "gfx/title/lugia_silver.2bpp.lz"
 ENDC
 
 INCLUDE "engine/menus/options_menu.asm"