From bfef13bfa25e3d4300d71bbf4818c249bc498f80 Mon Sep 17 00:00:00 2001
From: stag019 <stag019@gmail.com>
Date: Sat, 14 Jan 2012 16:33:58 -0500
Subject: Adding graphical differences between Red/Blue.

hg-commit-id: 9dfe76962f8c
---
 common.asm                       |  48 +++++++++++++++++++++++++++++++++++----
 gfx/blue/sgbborder.2bpp          | Bin 0 -> 1536 bytes
 gfx/blue/sgbborder.map           | Bin 0 -> 1792 bytes
 gfx/blue/supergameboyborder.2bpp | Bin 1536 -> 0 bytes
 gfx/red/sgbborder.2bpp           | Bin 0 -> 1536 bytes
 gfx/red/sgbborder.map            | Bin 0 -> 1792 bytes
 gfx/red/supergameboyborder.2bpp  | Bin 1536 -> 0 bytes
 7 files changed, 44 insertions(+), 4 deletions(-)
 create mode 100644 gfx/blue/sgbborder.2bpp
 create mode 100644 gfx/blue/sgbborder.map
 delete mode 100644 gfx/blue/supergameboyborder.2bpp
 create mode 100644 gfx/red/sgbborder.2bpp
 create mode 100644 gfx/red/sgbborder.map
 delete mode 100644 gfx/red/supergameboyborder.2bpp

diff --git a/common.asm b/common.asm
index 66d9710b..4b8f9010 100644
--- a/common.asm
+++ b/common.asm
@@ -14205,7 +14205,16 @@ VictreebelPicFront:
 VictreebelPicBack:
 	INCBIN "pic/monback/victreebelb.pic"
 
-INCBIN "baserom.gbc",$37244,$3e88-$3244
+INCBIN "baserom.gbc",$37244,$37AF1-$37244
+
+IF _RED
+	INCBIN "gfx/red/slotmachine1.2bpp"
+ENDC
+IF _BLUE
+	INCBIN "gfx/blue/slotmachine1.2bpp"
+ENDC
+
+INCBIN "baserom.gbc",$37CA1,$37e88-$37CA1
 
 SECTION "bankE",DATA,BANK[$E]
 
@@ -20232,7 +20241,15 @@ PokedexOrder: ; 5024
 	db DEX_BELLSPROUT
 	db DEX_WEEPINBELL
 	db DEX_VICTREEBEL
-INCBIN "baserom.gbc",$410E2,$2769 - $10E2
+
+INCBIN "baserom.gbc",$410E2,$20D9 - $10E2
+
+IF _RED
+	INCBIN "gfx/red/introfight.2bpp"
+ENDC
+IF _BLUE
+	INCBIN "gfx/blue/introfight.2bpp"
+ENDC
 
 ; XXX what do these do
 	FuncCoord 5,0
@@ -35718,7 +35735,23 @@ SuperPalettes: ; 6660
 	RGB 3,2,2
 BorderPalettes: ; 6788
 
-INCBIN "baserom.gbc",$72788,$4000 - $2788
+IF _RED
+	INCBIN "gfx/red/sgbborder.map"
+ENDC
+IF _BLUE
+	INCBIN "gfx/blue/sgbborder.map"
+ENDC
+
+INCBIN "baserom.gbc",$72E88,$2FE8 - $2E88
+
+IF _RED
+	INCBIN "gfx/red/sgbborder.2bpp"
+ENDC
+IF _BLUE
+	INCBIN "gfx/blue/sgbborder.2bpp"
+ENDC
+
+INCBIN "baserom.gbc",$735E8,$4000 - $35E8
 
 SECTION "bank1D",DATA,BANK[$1D]
 
@@ -37986,7 +38019,14 @@ PlayAnimation: ; 40F1
 .AnimationOver\@ ; 417B
 	ret
 
-INCBIN "baserom.gbc",$7817C,$78D5E - $7817C
+INCBIN "baserom.gbc",$7817C,$78BDE - $7817C
+
+IF _RED
+	INCBIN "gfx/red/slotmachine2.2bpp"
+ENDC
+IF _BLUE
+	INCBIN "gfx/blue/slotmachine2.2bpp"
+ENDC
 
 AttackAnimation: ; 4D5E
 	push hl
diff --git a/gfx/blue/sgbborder.2bpp b/gfx/blue/sgbborder.2bpp
new file mode 100644
index 00000000..a7261b18
Binary files /dev/null and b/gfx/blue/sgbborder.2bpp differ
diff --git a/gfx/blue/sgbborder.map b/gfx/blue/sgbborder.map
new file mode 100644
index 00000000..b0b0b94b
Binary files /dev/null and b/gfx/blue/sgbborder.map differ
diff --git a/gfx/blue/supergameboyborder.2bpp b/gfx/blue/supergameboyborder.2bpp
deleted file mode 100644
index a7261b18..00000000
Binary files a/gfx/blue/supergameboyborder.2bpp and /dev/null differ
diff --git a/gfx/red/sgbborder.2bpp b/gfx/red/sgbborder.2bpp
new file mode 100644
index 00000000..17266d99
Binary files /dev/null and b/gfx/red/sgbborder.2bpp differ
diff --git a/gfx/red/sgbborder.map b/gfx/red/sgbborder.map
new file mode 100644
index 00000000..4077ed8e
Binary files /dev/null and b/gfx/red/sgbborder.map differ
diff --git a/gfx/red/supergameboyborder.2bpp b/gfx/red/supergameboyborder.2bpp
deleted file mode 100644
index 17266d99..00000000
Binary files a/gfx/red/supergameboyborder.2bpp and /dev/null differ
-- 
cgit v1.2.3