From a20664d41528e8b9eacc7d9c278c5b5e7822507d Mon Sep 17 00:00:00 2001
From: yenatch <yenatch@gmail.com>
Date: Sat, 24 Jun 2017 16:30:12 -0400
Subject: Fix gfx/misc

---
 Makefile                |  3 ++-
 engine/trainer_card.asm |  4 ++--
 main.asm                | 16 ++++++++--------
 misc/gbc_only.asm       |  2 +-
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index d01fb9236..65e6d367e 100644
--- a/Makefile
+++ b/Makefile
@@ -159,8 +159,9 @@ gfx/misc/kris.2bpp: rgbgfx += -h
 gfx/misc/kris_card.2bpp: rgbgfx += -h
 gfx/misc/kris_back.2bpp: rgbgfx += -h
 gfx/misc/dude.2bpp: rgbgfx += -h
+gfx/misc/unknown_egg.2bpp: rgbgfx += -h
 gfx/misc/player.2bpp: rgbgfx += -h
-gfx/misc/pokegear.2bpp: tools/gfx += --trim-whitespace
+gfx/misc/pokegear.2bpp: rgbgfx += -x2
 gfx/misc/pokegear_sprites.2bpp: tools/gfx += --trim-whitespace
 
 gfx/unknown/0e0ea8.2bpp: tools/gfx += --remove-whitespace
diff --git a/engine/trainer_card.asm b/engine/trainer_card.asm
index a993ce4ba..23defe919 100755
--- a/engine/trainer_card.asm
+++ b/engine/trainer_card.asm
@@ -608,8 +608,8 @@ TrainerCard_JohtoBadgesOAM: ; 254c9
 
 CardStatusGFX: INCBIN "gfx/misc/card_status.2bpp"
 
-LeaderGFX:  INCBIN "gfx/misc/leaders.w24.2bpp"
-LeaderGFX2: INCBIN "gfx/misc/leaders.w24.2bpp"
+LeaderGFX:  INCBIN "gfx/misc/leaders.2bpp"
+LeaderGFX2: INCBIN "gfx/misc/leaders.2bpp"
 BadgeGFX:   INCBIN "gfx/misc/badges.2bpp"
 BadgeGFX2:  INCBIN "gfx/misc/badges.2bpp"
 
diff --git a/main.asm b/main.asm
index 385f865d7..a1dc24fdc 100644
--- a/main.asm
+++ b/main.asm
@@ -1178,10 +1178,10 @@ INCLUDE "engine/wildmons.asm"
 INCLUDE "battle/link_result.asm"
 
 ChrisBackpic: ; 2ba1a
-INCBIN "gfx/misc/player.6x6.2bpp.lz"
+INCBIN "gfx/misc/player.2bpp.lz"
 
 DudeBackpic: ; 2bbaa
-INCBIN "gfx/misc/dude.6x6.2bpp.lz"
+INCBIN "gfx/misc/dude.2bpp.lz"
 
 SECTION "bankB", ROMX, BANK[$B]
 
@@ -4664,7 +4664,7 @@ Unknown_53d84: ; unreferenced
 
 UnknownEggPic:: ; 53d9c
 ; Another egg pic. This is shifted up a few pixels.
-INCBIN "gfx/misc/unknown_egg.5x5.2bpp.lz"
+INCBIN "gfx/misc/unknown_egg.2bpp.lz"
 
 SECTION "bank19", ROMX, BANK[$19]
 
@@ -4857,10 +4857,10 @@ GetCardPic: ; 8833e
 	ret
 
 ChrisCardPic: ; 88365
-INCBIN "gfx/misc/chris_card.5x7.2bpp"
+INCBIN "gfx/misc/chris_card.2bpp"
 
 KrisCardPic: ; 88595
-INCBIN "gfx/misc/kris_card.5x7.2bpp"
+INCBIN "gfx/misc/kris_card.2bpp"
 
 CardGFX: ; 887c5
 INCBIN "gfx/misc/trainer_card.2bpp"
@@ -4943,10 +4943,10 @@ DrawIntroPlayerPic: ; 88874
 	ret
 
 ChrisPic: ; 888a9
-INCBIN "gfx/misc/chris.7x7.2bpp"
+INCBIN "gfx/misc/chris.2bpp"
 
 KrisPic: ; 88bb9
-INCBIN "gfx/misc/kris.7x7.2bpp"
+INCBIN "gfx/misc/kris.2bpp"
 
 GetKrisBackpic: ; 88ec9
 ; Kris's backpic is uncompressed.
@@ -4957,7 +4957,7 @@ GetKrisBackpic: ; 88ec9
 	ret
 
 KrisBackpic: ; 88ed6
-INCBIN "gfx/misc/kris_back.6x6.2bpp"
+INCBIN "gfx/misc/kris_back.2bpp"
 
 String_89116:
 	db "-----@"
diff --git a/misc/gbc_only.asm b/misc/gbc_only.asm
index cae976a1c..f4b3eba8b 100644
--- a/misc/gbc_only.asm
+++ b/misc/gbc_only.asm
@@ -145,5 +145,5 @@ GBCOnlyString: ; 4eb38
 
 
 GBCOnlyGFX: ; 4eb76
-INCBIN "gfx/misc/gbc_only.w112.2bpp.lz"
+INCBIN "gfx/misc/gbc_only.2bpp.lz"
 ; 4f0bc
-- 
cgit v1.2.3