From d3aa41be9004ab376a6ef49ba04e162ea78fa838 Mon Sep 17 00:00:00 2001
From: Marcus Huderle <huderlem@gmail.com>
Date: Mon, 5 Jun 2017 20:26:08 -0700
Subject: [PATCH] SGB INCBINs

---
 gfx/sgb_border.interleave.png | Bin 0 -> 686 bytes
 gfx/sgb_border_blank.png      | Bin 0 -> 96 bytes
 gfx/tilemaps/sgb_border.map   | Bin 0 -> 2144 bytes
 main.asm                      | 171 +++++++++++++++++++++++++++++-----
 4 files changed, 147 insertions(+), 24 deletions(-)
 create mode 100644 gfx/sgb_border.interleave.png
 create mode 100644 gfx/sgb_border_blank.png
 create mode 100755 gfx/tilemaps/sgb_border.map

diff --git a/gfx/sgb_border.interleave.png b/gfx/sgb_border.interleave.png
new file mode 100644
index 0000000000000000000000000000000000000000..86b6d32650ab8ae0cf00e23ecc2d3e9b3b852d36
GIT binary patch
literal 686
zcmV;f0#W^mP)<h;3K|Lk000e1NJLTq004jh004jj00000tmP)Q0007YNkl<Zc-rlj
zPl_uc5XKAK4!D|o<Ny!)5>vvs&*JrcTA10pXiw4L_Q71m0|b1Zf70DDNt$Mow|Oa&
zSjrE}`m{6@BeQe7GS?VA1hB4m#yYL90;6_(6R;Jq`f~;nZI$ERCcu>tqtTavG<60(
z@(h%}i^aws1BBQ`AEK03fs>4M69^Ru@@obX9YmxqBp{X$CoeApY3dC8!3+l4D5yVZ
z3va+jn|Eagr6JTOgc?{6Y;Dgfd%%=ow#>S2*3c_uj{~L{j8eU_8m&F{b_Sf$<57*w
z#$a!Z?QI%xV+-&WaQux!bOp$37~c`v7zF?hfYlmu7EWXF#$dXXMT$9R;h~Ly`jZUs
zCVZrS5n&P%LVZD~iR45fbR@C|On9O|B<p5Poe<$LVT#EM(TO0@hC>%-AbNQ^h!c_b
z*c%_ZkOtzZ1!xO6{K6r+0^~KEUJ%-Q0RRqw)f#dZQDX7lW4e?@iaBRd&V$2wfKV1f
z!GTcuJfu=0(^h*atGTlUxRL(_;BML$kg_P}A>uqhr~skhK&X5kaw++?+Dlo@oh=}y
zO@2HOZ`u}+vM5()y+Wa!8<@*)>9s&@8z8%TfptJySl$ifUJKN=0oLhV1j^M}uTUr#
zC!+Fu?yZ5^Hb8dw0!_emw7o#?wLonfV4dDY0B^BgDh1C$QK_~loV@_+q_(~TFdL=U
z=}dEf2jHB=0>I?zt(R5p+KRXvAeq#bcK{YkuhUF-cL2^=EXIAkGv8jdeIt6+?WNKJ
zNxJVq8U6vl_XO&{*l$2i?kYfCy)%<wd1v+mW%vgG-4i$u?E~V5J%K0i1pZs#FFr%F
Up;`*E`v3p{07*qoM6N<$f?}01lmGw#

literal 0
HcmV?d00001

diff --git a/gfx/sgb_border_blank.png b/gfx/sgb_border_blank.png
new file mode 100644
index 0000000000000000000000000000000000000000..52d8345df2718d867ba44fd4788de9f4021fc8dd
GIT binary patch
literal 96
zcmeAS@N?(olHy`uVBq!ia0vp^4Is<}BpB8_Roe!n)ID7sLn>~)J++XLfq{of;eUOU
le?&y9PgREkM-vPk(&ss<`{9x1Dz{Z2t)8xaF6*2UngC{O8nplb

literal 0
HcmV?d00001

diff --git a/gfx/tilemaps/sgb_border.map b/gfx/tilemaps/sgb_border.map
new file mode 100755
index 0000000000000000000000000000000000000000..4def863e0752e6bde22f23cc8268f60d00807661
GIT binary patch
literal 2144
zcmeH|*;2wl5JgkC;(CmND=6+8C@L-}h>E!H>zkk90}uHfe$B6llNn1=#==S7tV(XB
z)9K9ZN!{x1X`(q0T4<$>b`FS0M1}46@|{ShxVz+gw=1gFIyS=!t7Ih~`Y`EdfEaP%
z4Kl<qBaDjp7zujl_2gJ%oegr5KS7E~rkG}iS>eqw&jO1qiTE;Ul8k%!n{2Vo&iDUE
zxZ_?E4<cKXJiF|<_>UN-9-aihK#_e)f%$Izl&b#rck35~@72%W{-J(9>o3$#uX_yB
z>7TIv>hn+a?=vr&c>PsBl||Rq`}dF|${bU{pQq;E38$QKE>8phUX}|kx#F4|ZUcBZ
l?U}7xoBwT{ZPn7Y<>0MSjmc;6J)t7D^<mhS(eV1~`zOY0t^fc4

literal 0
HcmV?d00001

diff --git a/main.asm b/main.asm
index 5b6496f..839c84b 100755
--- a/main.asm
+++ b/main.asm
@@ -52170,22 +52170,22 @@ Func_31281: ; 0x31282
 .asm_3129e
 	ld [wd4e2], a
 	cp $3
-	jr c, .asm_312b2
+	jr c, .chooseFirstMapMoveIndex
 	cp $5
-	jr c, .asm_312e7
+	jr c, .chooseSecondMapMoveIndex
 	ld a, INDIGO_PLATEAU
 	ld [wCurrentMap], a
 	ld [wd4e8], a
 	ret
 
-.asm_312b2
+.chooseFirstMapMoveIndex
 	call GenRandom
 	and $7
 	cp $7
-	jr nc, .asm_312b2
+	jr nc, .chooseFirstMapMoveIndex
 	ld c, a
 	ld b, $0
-	ld hl, Data_31319
+	ld hl, FirstMapMoveSet_RedField
 	add hl, bc
 	ld c, [hl]
 	ld hl, wd4e3
@@ -52196,7 +52196,7 @@ Func_31281: ; 0x31282
 .asm_312cd
 	ld a, [hli]
 	cp c
-	jr z, .asm_312b2
+	jr z, .chooseFirstMapMoveIndex
 	dec b
 	jr nz, .asm_312cd
 .asm_312d4
@@ -52211,12 +52211,12 @@ Func_31281: ; 0x31282
 	ld [hl], a
 	ret
 
-.asm_312e7
+.chooseSecondMapMoveIndex
 	call GenRandom
 	and $3
 	ld c, a
 	ld b, $0
-	ld hl, Data_31320
+	ld hl, SecondMapMoveSet_RedField
 	add hl, bc
 	ld c, [hl]
 	ld hl, wd4e6
@@ -52227,7 +52227,7 @@ Func_31281: ; 0x31282
 .asm_312ff
 	ld a, [hli]
 	cp c
-	jr z, .asm_312e7
+	jr z, .chooseSecondMapMoveIndex
 	dec b
 	jr nz, .asm_312ff
 .asm_31306
@@ -52242,11 +52242,20 @@ Func_31281: ; 0x31282
 	ld [hl], a
 	ret
 
-Data_31319:
-	dr $31319, $31320
+FirstMapMoveSet_RedField:
+	db PALLET_TOWN
+	db VIRIDIAN_FOREST
+	db PEWTER_CITY
+	db CERULEAN_CITY
+	db VERMILION_SEASIDE
+	db ROCK_MOUNTAIN
+	db LAVENDER_TOWN
 
-Data_31320:
-	dr $31320, $31324
+SecondMapMoveSet_RedField:
+	db CYCLING_ROAD
+	db SAFARI_ZONE
+	db SEAFOAM_ISLANDS
+	db CINNABAR_ISLAND
 
 Func_31324: ; 0x31324
 	ret
@@ -52352,7 +52361,7 @@ Func_3140b: ; 0x3140b
 	jr nc, .asm_3143c
 	ld c, a
 	ld b, $0
-	ld hl, Data_314a3
+	ld hl, FirstMapMoveSet_BlueField
 	add hl, bc
 	ld c, [hl]
 	ld hl, wd4e3
@@ -52383,7 +52392,7 @@ Func_3140b: ; 0x3140b
 	and $3
 	ld c, a
 	ld b, $0
-	ld hl, Data_314aa
+	ld hl, SecondMapMoveSet_BlueField
 	add hl, bc
 	ld c, [hl]
 	ld hl, wd4e6
@@ -52409,11 +52418,20 @@ Func_3140b: ; 0x3140b
 	ld [hl], a
 	ret
 
-Data_314a3:
-	dr $314a3, $314aa
+FirstMapMoveSet_BlueField:
+	db VIRIDIAN_CITY
+	db VIRIDIAN_FOREST
+	db MT_MOON
+	db CERULEAN_CITY
+	db VERMILION_STREETS
+	db ROCK_MOUNTAIN
+	db CELADON_CITY
 
-Data_314aa:
-	dr $314aa, $314ae
+SecondMapMoveSet_BlueField:
+	db FUCHSIA_CITY
+	db SAFARI_ZONE
+	db SAFFRON_CITY
+	db CINNABAR_ISLAND
 
 Func_314ae: ; 0x314ae
 	ld a, [wd57d]
@@ -52743,7 +52761,13 @@ Data_38020:
 
 Data_38030:
 	db $a9, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
-	dr $38040, $3809a ; 38040
+
+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 
 Data_3809a:
 	db $00, $00, $00
@@ -52753,19 +52777,118 @@ Data_3809a:
 
 Data_380a6:
 	db $59, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
-	dr $380b6, $38156 ; 380b6
+	
+	RGB 31, 31, 31
+    RGB 31, 31, 31
+    RGB 31, 31, 31
+    RGB 31, 31, 31
+
+    RGB 31, 31, 31
+    RGB 31, 31, 31
+    RGB 31, 31, 31
+    RGB 31, 31, 31
+
+    RGB 31, 31, 31
+    RGB 31, 31, 31
+    RGB 31, 31, 31
+    RGB 31, 31, 31
+
+    RGB 31, 31, 31
+    RGB 31, 31, 31
+    RGB 31, 31, 31
+    RGB 31, 31, 31
+
+    RGB 30, 31, 29
+    RGB 28, 28, 25
+    RGB 27, 26, 24
+    RGB 24, 24, 24
+
+    RGB 23, 23, 23
+    RGB 23, 23, 23
+    RGB 23, 23, 23
+    RGB 23, 23, 23
+
+    RGB 23, 23, 23
+    RGB 23, 23, 23
+    RGB 23, 23, 23
+    RGB 23, 23, 23
+
+    RGB 23, 23, 23
+    RGB 23, 23, 23
+    RGB 23, 23, 23
+    RGB 23, 23, 23
+
+    RGB 30, 31, 27
+    RGB 25, 26, 20
+    RGB 23, 21, 18
+    RGB 17, 17, 17
+
+    RGB 15, 15, 15
+    RGB 15, 15, 15
+    RGB 15, 15, 15
+    RGB 15, 15, 15
+
+    RGB 15, 15, 15
+    RGB 15, 15, 15
+    RGB 15, 15, 15
+    RGB 15, 15, 15
+
+    RGB 15, 15, 15
+    RGB 15, 15, 15
+    RGB 15, 15, 15
+    RGB 15, 15, 15
+
+    RGB 29, 31, 25
+    RGB 22, 24, 15
+    RGB 19, 16, 12
+    RGB 10, 10, 10
+
+    RGB 7, 7, 7
+    RGB 7, 7, 7
+    RGB 7, 7, 7
+    RGB 7, 7, 7
+
+    RGB 7, 7, 7
+    RGB 7, 7, 7
+    RGB 7, 7, 7
+    RGB 7, 7, 7
+
+    RGB 7, 7, 7
+    RGB 7, 7, 7
+    RGB 7, 7, 7
+    RGB 7, 7, 7
+
+    RGB 29, 31, 23
+    RGB 20, 22, 10
+    RGB 15, 12, 6
+    RGB 3, 3, 4
+
+    RGB 0, 0, 0
+    RGB 0, 0, 0
+    RGB 0, 0, 0
+    RGB 0, 0, 0
+
+    RGB 0, 0, 0
+    RGB 0, 0, 0
+    RGB 0, 0, 0
+    RGB 0, 0, 0
+
+    RGB 0, 0, 0
+    RGB 0, 0, 0
+    RGB 0, 0, 0
+    RGB 0, 0, 0
 
 Data_38156:
 	db $99, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
-	dr $38166, $39166
+	INCBIN "gfx/sgb_border.interleave.2bpp"
 
 Data_39166:
 	db $99, $01, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
-	dr $39176, $3a176 ; 39176
+	INCBIN "gfx/sgb_border_blank.2bpp"
 
 Data_3a176:
 	db $a1, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
-	dr $3a186, $3a9e6 ; 3a186
+	INCBIN "gfx/tilemaps/sgb_border.map"
 
 Data_3a9e6:
 	db $79, $5d, $08, $00, $0b, $8c, $d0, $f4, $60, $00, $00, $00, $00, $00, $00, $00