summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorstag019 <stag019@gmail.com>2012-01-14 16:33:58 -0500
committerstag019 <stag019@gmail.com>2012-01-14 16:33:58 -0500
commitbfef13bfa25e3d4300d71bbf4818c249bc498f80 (patch)
tree1422432512bb388676a158a6229b1fb8ea195bc8
parente67ba5b197c973405e23bff02cdce352e2a4459e (diff)
Adding graphical differences between Red/Blue.
hg-commit-id: 9dfe76962f8c
-rw-r--r--common.asm48
-rw-r--r--gfx/blue/sgbborder.2bpp (renamed from gfx/blue/supergameboyborder.2bpp)bin1536 -> 1536 bytes
-rw-r--r--gfx/blue/sgbborder.mapbin0 -> 1792 bytes
-rw-r--r--gfx/red/sgbborder.2bpp (renamed from gfx/red/supergameboyborder.2bpp)bin1536 -> 1536 bytes
-rw-r--r--gfx/red/sgbborder.mapbin0 -> 1792 bytes
5 files changed, 44 insertions, 4 deletions
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
index a7261b18..a7261b18 100644
--- a/gfx/blue/supergameboyborder.2bpp
+++ b/gfx/blue/sgbborder.2bpp
Binary files differ
diff --git a/gfx/blue/sgbborder.map b/gfx/blue/sgbborder.map
new file mode 100644
index 00000000..b0b0b94b
--- /dev/null
+++ b/gfx/blue/sgbborder.map
Binary files differ
diff --git a/gfx/red/supergameboyborder.2bpp b/gfx/red/sgbborder.2bpp
index 17266d99..17266d99 100644
--- a/gfx/red/supergameboyborder.2bpp
+++ b/gfx/red/sgbborder.2bpp
Binary files differ
diff --git a/gfx/red/sgbborder.map b/gfx/red/sgbborder.map
new file mode 100644
index 00000000..4077ed8e
--- /dev/null
+++ b/gfx/red/sgbborder.map
Binary files differ