Match mosh remaining .2bpp.lz files

Still to go:

- gfx/pokemon/alakazam/back_silver.2bpp.lz.bin
- gfx/title/hooh_gold.2bpp.lz.bin
- gfx/title/lugia_silver.2bpp.lz.bin

Makefile

@@ -145,6 +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/new_game/shrink1.2bpp: rgbgfx += -h
 gfx/new_game/shrink2.2bpp: rgbgfx += -h
 
@@ -166,6 +169,9 @@ gfx/mystery_gift/mystery_gift.2bpp: tools/gfx += --remove-whitespace
 gfx/mystery_gift/mystery_gift_2.2bpp: tools/gfx += --trim-whitespace
 gfx/mystery_gift/question_mark.1bpp: tools/gfx += --remove-whitespace
 
+gfx/title/logo_bottom_gold.2bpp: tools/gfx += --trim-whitespace
+gfx/title/logo_bottom_silver.2bpp: tools/gfx += --trim-whitespace
+
 gfx/trade/ball.2bpp: tools/gfx += --remove-whitespace
 
 gfx/slots/slots_1.2bpp: tools/gfx += --trim-whitespace

engine/movie/gold_silver_intro.asm

@@ -1571,7 +1571,7 @@ Intro_ResetLYOverrides:
 	ret
 
 Intro_WaterGFX1:
-INCBIN "gfx/intro/water1.2bpp.lz.bin"
+INCBIN "gfx/intro/water1.2bpp.lz"
 
 Intro_WaterTilemap:
 INCBIN "gfx/intro/water.tilemap"
@@ -1580,10 +1580,10 @@ Intro_WaterMeta:
 INCBIN "gfx/intro/water.bin"
 
 Intro_WaterGFX2:
-INCBIN "gfx/intro/water2.2bpp.lz.bin"
+INCBIN "gfx/intro/water2.2bpp.lz"
 
 Intro_GrassGFX1:
-INCBIN "gfx/intro/grass1.2bpp.lz.bin"
+INCBIN "gfx/intro/grass1.2bpp.lz"
 
 Intro_GrassTilemap:
 INCBIN "gfx/intro/grass.tilemap"
@@ -1592,13 +1592,13 @@ Intro_GrassMeta:
 INCBIN "gfx/intro/grass.bin"
 
 Intro_GrassGFX2:
-INCBIN "gfx/intro/grass2.2bpp.lz.bin"
+INCBIN "gfx/intro/grass2.2bpp.lz"
 
 Intro_FireGFX1:
-INCBIN "gfx/intro/charizard1.2bpp.lz.bin"
+INCBIN "gfx/intro/charizard1.2bpp.lz"
 
 Intro_FireGFX2:
-INCBIN "gfx/intro/charizard2.2bpp.lz.bin"
+INCBIN "gfx/intro/charizard2.2bpp.lz"
 
 Intro_FireGFX3:
-INCBIN "gfx/intro/charizard3.2bpp.lz.bin"
+INCBIN "gfx/intro/charizard3.2bpp.lz"

engine/pokemon/bills_pc.asm

@@ -2185,7 +2185,7 @@ BillsPC_InitGFX:
 	call EnableLCD
 	ret
 
-PCSelectLZ: INCBIN "gfx/pc/pc.2bpp.lz.bin"
+PCSelectLZ: INCBIN "gfx/pc/pc.2bpp.lz"
 PCMailGFX:  INCBIN "gfx/pc/pc_mail.2bpp"
 
 PCString_ChooseaPKMN: db "Choose a <PK><MN>.@"

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"

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

main.asm

@@ -255,15 +255,15 @@ SECTION "bank26", ROMX
 
 IF DEF(_GOLD)
 TitleScreenGFX1:
-INCBIN "gfx/title/logo_bottom_gold.2bpp.lz.bin"
+INCBIN "gfx/title/logo_bottom_gold.2bpp.lz"
 TitleScreenGFX2:
-INCBIN "gfx/title/logo_top_gold.2bpp.lz.bin"
+INCBIN "gfx/title/logo_top_gold.2bpp.lz"
 
 ELIF DEF(_SILVER)
 TitleScreenGFX1:
-INCBIN "gfx/title/logo_bottom_silver.2bpp.lz.bin"
+INCBIN "gfx/title/logo_bottom_silver.2bpp.lz"
 TitleScreenGFX2:
-INCBIN "gfx/title/logo_top_silver.2bpp.lz.bin"
+INCBIN "gfx/title/logo_top_silver.2bpp.lz"
 ENDC
 
 TitleScreenTilemap: