From 7da86ec0e85e59f3771d76360485ea85a0e651c7 Mon Sep 17 00:00:00 2001
From: yenatch <yenatch@gmail.com>
Date: Fri, 28 Feb 2014 22:12:29 -0500
Subject: [PATCH] Split up pack graphics and point to them.

---
 gfx/misc/pack.2bpp      | Bin 2240 -> 960 bytes
 gfx/misc/pack_menu.2bpp | Bin 0 -> 1280 bytes
 main.asm                |  28 +++++++++++++++++++++-------
 3 files changed, 21 insertions(+), 7 deletions(-)
 create mode 100644 gfx/misc/pack_menu.2bpp

diff --git a/gfx/misc/pack.2bpp b/gfx/misc/pack.2bpp
index 283d04fcea138c7797af4965065c56bd972b8e25..22be550812c2f47168017d53597dad29c7bda96d 100644
GIT binary patch
delta 8
PcmX>gcz}Hq>j7o}4}1d?

literal 2240
zcmeHHO-mb56uov9k)R+*7G}|aLJKX1P%&{)oE8e*Sb~V@#$RBC6bjXapdjvq{DD9g
zZi*}EqHeSq5pfebTM5{VBvg#XqzUGuWb%5?n~WWc9~269(R0bnJ#*ij-1F|tkRYKt
zf|xfQaZ?Rz5!V4V=l#fIv4eyC{R76zihW-ywY<EwwYzKck&%gssj2aCaAz;b2Mdo+
z9v(gT_9#DCfF3YB?D3qR_w|`(rQ-8#Y^<(+V)XXPA|C<))IA<>Xc*bC@Y{DUULqf<
zkGAZ9p5K3VmdoYyXAG>bGLU~|fS)jqkKJyZ!8ene$)_rgn@Q;X?l+q)6!0q)4iB;Z
z2gB=4r@dac8ywi%OC*ktVlm{<a0agZ%UGM7T>JcdaxL$9{Q)`sA%rl^M&mo9(J)Oo
z&17_akD=?C47jy>*=&&k9*@6iBOV7&rz4Rsj7TJ%1|Jxx)n;dFj8F*tZ@@50rAEV6
zYBuNQN+p}MT0$%=sHzaigy`>o-$pP9?)T?%)6;l{{C@CQESXFsbiG)#CXQ?Wad$gl
z7@7k@5V^?Lp>|sVe)$teWKeyvxo(9JE|=nfrfq9Gju72ROR1~XIohdqUig&n2`jIg
zmQrA$XTGP|qbN(tjx*X?+uWmJ2r(*E)Gp!ju>!gSWQRD5d8yJ22%|2!t+m8Gx?K48
ztNh-lC+)EOLem1cL31?Lj@$f}sr;<0m9>girK(obE_7rfC`_-UQi`H9L#K3`->L?c
zidLt~e&HE@XQWDst9Rx1qujY6s#1_bwq4mBdJI$eURVh$x)P<RQsgPzJl~*H8DckA
v`;974(UrURTk8mQIQ_~e+cDqb;_2e;^JNWI`Q^9$eqgq8zO2D2*U$GSc4*Ap

diff --git a/gfx/misc/pack_menu.2bpp b/gfx/misc/pack_menu.2bpp
new file mode 100644
index 0000000000000000000000000000000000000000..484bc94cbee4e8cda1d1c7a08f6b076cf92f64da
GIT binary patch
literal 1280
zcmeH_ziPrz6o;L&N(QqC3N5r4T>LYXhC-oBp@^6+K7m~dh3e+yCgcT#3@*h7sEam}
zxJa`~z($EwRH7EKHpO^*f7L)Jv`{FtL%&0A&X;rVA@?R8;vs@7Jk(dN_^O7vh|fUH
zy&kzFbvo^Khf*v$>sqZsp<Zt^9FND7$#goAfV<xXdC1%!?+$hz_eLQT{XitbvWtb!
zXWR3+-(Rhk%eNG-_q|Ama2R!#g`-E;I6b?(IzB-je>q$`fqpzcne_Xk(S(Be&lKbj
z6!@4j95M{<@S0Ln4g`!f1^qtm*Dy>ImudETnEy)QI8Ea?hJk}-Q<et<NkWbu?!dFZ
zOeK}7+#RJVBli3Tx#yb@V%wJWM6oQ}#!huzRhtx5)phvh^bBK4ftN}bTS_IkritP`
zMHDp+9t<v*+3b=Mi@|?_Zg)1bET_|ImCMa$j;+^(<nw|+2r@zff$J^ND4gf}{Y(b`
Y5YNLUNl|23Rj1R<7ss=Ie(MC@0ChY&)c^nh

literal 0
HcmV?d00001

diff --git a/main.asm b/main.asm
index 0fd5b36fc..a4f31a4ec 100644
--- a/main.asm
+++ b/main.asm
@@ -16019,14 +16019,14 @@ Function1089d: ; 1089d
 	jr nz, .asm_108c5
 
 .asm_108b3
-	ld hl, $48cc
+	ld hl, PackGFXPointers
 	add hl, de
 	add hl, de
 	ld a, [hli]
 	ld e, a
 	ld d, [hl]
 	ld hl, $9500
-	ld bc, $040f
+	lb bc, BANK(PackGFX), 15
 	call Request2bpp
 	ret
 
@@ -16035,7 +16035,12 @@ Function1089d: ; 1089d
 	ret
 ; 108cc
 
-INCBIN "baserom.gbc",$108cc,$108d4 - $108cc
+PackGFXPointers: ; 108cc
+	dw PackGFX + $f0 * 1
+	dw PackGFX + $f0 * 3
+	dw PackGFX + $f0 * 0
+	dw PackGFX + $f0 * 2
+; 108d4
 
 ; known jump sources: 1008c (4:408c), 100cb (4:40cb), 100f2 (4:40f2), 101bd (4:41bd), 1051f (4:451f), 1055e (4:455e), 1058b (4:458b), 105cb (4:45cb)
 Function108d4: ; 108d4 (4:48d4)
@@ -16230,6 +16235,9 @@ Function10a40: ; 10a40
 
 INCBIN "baserom.gbc",$10a4f,$10b16 - $10a4f
 
+PackMenuGFX:
+INCBIN "gfx/misc/pack_menu.2bpp"
+
 PackGFX:
 INCBIN "gfx/misc/pack.2bpp"
 
@@ -47972,22 +47980,28 @@ INCBIN "baserom.gbc",$48e71,$48e81 - $48e71
 
 
 Function48e81: ; 48e81
-	ld hl, $4e93
+	ld hl, PackFGFXPointers
 	add hl, de
 	add hl, de
 	ld a, [hli]
 	ld e, a
 	ld d, [hl]
 	ld hl, $9500
-	ld bc, $120f
+	lb bc, BANK(PackFGFX), 15
 	call Request2bpp
 	ret
 ; 48e93
 
-INCBIN "baserom.gbc",$48e93,$48e9b - $48e93
+PackFGFXPointers: ; 48e93
+	dw PackFGFX + $f0 * 1
+	dw PackFGFX + $f0 * 3
+	dw PackFGFX + $f0 * 0
+	dw PackFGFX + $f0 * 2
+; 48e9b
 
-PackFGFX:
+PackFGFX: ; 48e9b
 INCBIN "gfx/misc/pack_f.2bpp"
+; 4925b
 
 Function4925b: ; 4925b
 	call FadeToMenu