From 7b71a12ed1a11b29997877419cf609ed3e6afd99 Mon Sep 17 00:00:00 2001
From: yenatch <yenatch@gmail.com>
Date: Mon, 29 Dec 2014 22:08:10 -0800
Subject: Rename some graphics to avoid collisions later.

chris.5x7.2bpp and chris.7x7.2bpp would probably both end up as chris.png.
---
 gfx/misc/chris.5x7.2bpp      | Bin 560 -> 0 bytes
 gfx/misc/chris_card.5x7.2bpp | Bin 0 -> 560 bytes
 gfx/misc/kris.5x7.2bpp       | Bin 560 -> 0 bytes
 gfx/misc/kris_card.5x7.2bpp  | Bin 0 -> 560 bytes
 main.asm                     |   4 ++--
 5 files changed, 2 insertions(+), 2 deletions(-)
 delete mode 100644 gfx/misc/chris.5x7.2bpp
 create mode 100644 gfx/misc/chris_card.5x7.2bpp
 delete mode 100644 gfx/misc/kris.5x7.2bpp
 create mode 100644 gfx/misc/kris_card.5x7.2bpp

diff --git a/gfx/misc/chris.5x7.2bpp b/gfx/misc/chris.5x7.2bpp
deleted file mode 100644
index 747bd0da5..000000000
Binary files a/gfx/misc/chris.5x7.2bpp and /dev/null differ
diff --git a/gfx/misc/chris_card.5x7.2bpp b/gfx/misc/chris_card.5x7.2bpp
new file mode 100644
index 000000000..747bd0da5
Binary files /dev/null and b/gfx/misc/chris_card.5x7.2bpp differ
diff --git a/gfx/misc/kris.5x7.2bpp b/gfx/misc/kris.5x7.2bpp
deleted file mode 100644
index 0cb916e9f..000000000
Binary files a/gfx/misc/kris.5x7.2bpp and /dev/null differ
diff --git a/gfx/misc/kris_card.5x7.2bpp b/gfx/misc/kris_card.5x7.2bpp
new file mode 100644
index 000000000..0cb916e9f
Binary files /dev/null and b/gfx/misc/kris_card.5x7.2bpp differ
diff --git a/main.asm b/main.asm
index e1c565d1e..4ad45599d 100644
--- a/main.asm
+++ b/main.asm
@@ -66179,11 +66179,11 @@ Function8833e: ; 8833e
 ; 88365 (22:4365)
 
 ChrisCardPic: ; 88365
-INCBIN "gfx/misc/chris.5x7.2bpp"
+INCBIN "gfx/misc/chris_card.5x7.2bpp"
 ; 88595
 
 KrisCardPic: ; 88595
-INCBIN "gfx/misc/kris.5x7.2bpp"
+INCBIN "gfx/misc/kris_card.5x7.2bpp"
 ; 887c5
 
 CardGFX: ; 887c5
-- 
cgit v1.2.3