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

hg-commit-id: 9dfe76962f8c
---
 common.asm                                    |  48 ++++++++++++++++--
 ...supergameboyborder.2bpp => sgbborder.2bpp} | Bin
 gfx/blue/sgbborder.map                        | Bin 0 -> 1792 bytes
 ...supergameboyborder.2bpp => sgbborder.2bpp} | Bin
 gfx/red/sgbborder.map                         | Bin 0 -> 1792 bytes
 5 files changed, 44 insertions(+), 4 deletions(-)
 rename gfx/blue/{supergameboyborder.2bpp => sgbborder.2bpp} (100%)
 create mode 100644 gfx/blue/sgbborder.map
 rename gfx/red/{supergameboyborder.2bpp => sgbborder.2bpp} (100%)
 create mode 100644 gfx/red/sgbborder.map

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/supergameboyborder.2bpp b/gfx/blue/sgbborder.2bpp
similarity index 100%
rename from gfx/blue/supergameboyborder.2bpp
rename to gfx/blue/sgbborder.2bpp
diff --git a/gfx/blue/sgbborder.map b/gfx/blue/sgbborder.map
new file mode 100644
index 0000000000000000000000000000000000000000..b0b0b94b5e87974b6b89d5958b462e0b0ef6655e
GIT binary patch
literal 1792
zcmbu=*-pbS5Cu?pFZ32}ih&ATcIe6u6_Bt)+00(T_DlY>d=hOXH|3!yLvtTSa(rYz
zjK(3tzT%_E5`Fk6HHwXPHAT~^N!QD$G<W-`m~z{>nruC^y)ub0D2!tQy>_(L372W)
z5@x7ln$~#8!ZSn~0|~!$(>t|n7P!bIE{lAC3`Q`Dz-)4h+uY$UCFg78F@srXbILQG
z^MaQmU&Sicu#OFA`@&Z?_$Kn&9`cCCJYis;_{@0*k>vgc_jte~f{50$S?e{c#K)>`
zT_oO_x*ddz#5>bn|L5y)k$7k7aVHvy@AR)}bz;G0Od#^H(%9oZ52!_6V}&W^jW$>6
zTHUByb*Civuc8JZg{pa1AL>(msc(_jHg9W~gN_25u?3TfWc}M#XsJ#oMw0u-%1tj~
jD&h3XVYq94^*8-P!JIGkco&k*`S^YKz5lP-p5)&TP}|o?

literal 0
HcmV?d00001

diff --git a/gfx/red/supergameboyborder.2bpp b/gfx/red/sgbborder.2bpp
similarity index 100%
rename from gfx/red/supergameboyborder.2bpp
rename to gfx/red/sgbborder.2bpp
diff --git a/gfx/red/sgbborder.map b/gfx/red/sgbborder.map
new file mode 100644
index 0000000000000000000000000000000000000000..4077ed8efb380c426759646350bc69c47375c4f5
GIT binary patch
literal 1792
zcmb`Hc~65t6vXud2v42pm^7sIz6IiaV(NVsx+>n^|6AB4*<#daUyzsmgAKpT4w+ez
zL6HipE)A)&s%TrbE+HaBCN!CRoe>$5VZpcktjjby-a|%=@-Xk0T8}f(WvspjAHMNS
zQ~G**n&Q!?pL@C0U&R{M5kSLla*NyCq18XaF-~x*;?H=_3trOd8{FX@4=O(ABcJ$O
z=m#dlhVuMDo-t!k=qGG<CdoDa6SO;%80){qlxf~l@hzlCP0LvSF8>;R$5?%re+}=L
z|In|RKbJ+#`JJZq@3N@jUFNNS*Iy0qI&1ZJv4?%cs{W00f|HDk{$1f3H@H>he~Qzb
z;cSur7rf#P?<#(d^IYI!k^dM=SjLKqk2y+mtk8E|IOy^As>z`^#{PfTg|D~gZ|{!z
Xoc}V@WhegLEBjY=O0%cY`sv#bjwyp7

literal 0
HcmV?d00001