From 795bb92a823b0eeeb4050aae85fa07a2913d0ab4 Mon Sep 17 00:00:00 2001 From: ElectroDeoxys Date: Mon, 5 Apr 2021 00:13:50 +0100 Subject: [PATCH] Extract sgb border data --- src/data/sgb_data/sgb_border_intro_1.bin | Bin 0 -> 2833 bytes src/data/sgb_data/sgb_border_intro_2.bin | Bin 0 -> 943 bytes src/data/sgb_data/sgb_border_intro_3.bin | Bin 0 -> 82 bytes src/data/sgb_data/sgb_border_intro_4.bin | Bin 0 -> 765 bytes src/data/sgb_data/sgb_border_medals_1.bin | Bin 0 -> 3435 bytes src/data/sgb_data/sgb_border_medals_2.bin | Bin 0 -> 246 bytes src/data/sgb_data/sgb_border_medals_3.bin | Bin 0 -> 73 bytes src/data/sgb_data/sgb_border_medals_4.bin | Bin 0 -> 72 bytes src/data/sgb_data/sgb_border_medals_5.bin | Bin 0 -> 440 bytes src/engine/bank1c.asm | 118 +++++++++++++++++----- tools/compressed_data_extractor.py | 2 +- 11 files changed, 91 insertions(+), 29 deletions(-) create mode 100644 src/data/sgb_data/sgb_border_intro_1.bin create mode 100644 src/data/sgb_data/sgb_border_intro_2.bin create mode 100644 src/data/sgb_data/sgb_border_intro_3.bin create mode 100644 src/data/sgb_data/sgb_border_intro_4.bin create mode 100644 src/data/sgb_data/sgb_border_medals_1.bin create mode 100644 src/data/sgb_data/sgb_border_medals_2.bin create mode 100644 src/data/sgb_data/sgb_border_medals_3.bin create mode 100644 src/data/sgb_data/sgb_border_medals_4.bin create mode 100644 src/data/sgb_data/sgb_border_medals_5.bin diff --git a/src/data/sgb_data/sgb_border_intro_1.bin b/src/data/sgb_data/sgb_border_intro_1.bin new file mode 100644 index 0000000000000000000000000000000000000000..ff39636e51c0e79575181f2f36ee7303a9a27750 GIT binary patch literal 2833 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 literal 0 HcmV?d00001 diff --git a/src/data/sgb_data/sgb_border_intro_2.bin b/src/data/sgb_data/sgb_border_intro_2.bin new file mode 100644 index 0000000000000000000000000000000000000000..5d17da6f0b50e7fde572c3b43610970a7bcbd2c6 GIT binary patch literal 943 zcmWO2?@t?b901_Y_1d)yg*%54l+C-%E$+?Ijv6HqxdSyWdo$jc;S19dbucku8pRBT zSEr1cy+Ef4GbCL75fih;%J{j#xB~0yGGj^R;x;B%=vcvxUg3am%iZ4c^TtcOIZwot5HPmKb0q*ZRj&9s83!* z1_Xz*hAur=?DKggsm|wG7z#92PE|Hn2~wm_sLPrb^__2<87G-nQ}uS*<+QY8xShoI z6R8Z+*JNki>B8RmeOxthJt*}V!E{f0^w!QlM`3dbcv0n{zEMmSwn3OQ}r~sY3+%k=l^02 zL!Cyc8W~l3l#M5ozsfc*Gf_pDj1-9K<-`bSO*)$);#C5ge(_0lGwwO2qf@*wrItDRWEIwWjg~;ZrvjVL6Mbnz4ACJV@hYI5>Vzs zDzE+k7cM|nx-TTS9NDlQZRl1lAbBPSdBQ-UjdmkA8a$r5$!j0)>n!#ZUElju8T=N> zbS=Y64-fB}s7iJ*9Cy~y5N4H=`1CB6Ef-td3QHtK5Cy2Bb`04l*t(_AzS$2_|Gi|w zlVwbj%HO1-wcdyeGxtl&-KLZcW1n8;SbKayV)?s)y>8lTFwTm%`DVzEr_HhK-y?ry z?(Wt<|4b3*UJy%4W*A2Ecy!+HZ(U!63?MyilS6j)U_Nh|MmkGY23UgepW9@xQFi*w zV@iq3!%7T3i~nw)IZLi;Q!h8e_g%-iHzCn$)Zcqfch|(dCXv(8 zhPY&n{Yg~$ljqSga(Iy%L_*eei%_;r<3v9EM#BFhKTscP~hm*KieAGuw9+QdY6`P@>`?MNQdCF|{CEkW~>+fQnG4 zE1vKaNd?pNK}WwxIjN{KIMYls*q3IE8E7=$PcClb^lB52kK;e^yYBnCf3krL+Hi3- zJ*JJ|^;jA$sWB0s7}H*3*ydOQ@v+S4kV(#7@^lB9u8CgkdJ4mJExDIC{Z(GkwV^lY z(2XZE%Vlj-z5Ixe`Ghs}f54K1PWddU?h8p7n+Q=ZSGV&-@0I_j#ER=B8^n6?smM8x*OpjWZakf5-MhZ)vP}dDS0`72dtd0C&*7;;3b<(-V$HTM%kFGM1`u!mlrO8%3$P^O9>nj!VYZQ~6W z>62w$c=_WrQoRq{4mvfja=2Y~yP6*=n0M@wfG8XgWnxojf-DLfN<$-G@)d`hto)}g z#q&67+FLlqY0h+WHdi*dng#ZN=YhMO@A;0-Z$0NZ`m_A?uK!wP);F~BwO1QF$4O3b z++*c36@RI(B-wT~(WBy;S^_Qc<`Y|nslo+J$A)H(5J4X15C=KHwfY?A6y71{$Ep&W zl4+_sRi-wS4%10q*woaknC*0P7_Zg!dJL5hfE-;ey)x|1EqYPM6wHsn^e z5N0y{lkiROB_+ran>F$o&!Wa3nl;n literal 0 HcmV?d00001 diff --git a/src/data/sgb_data/sgb_border_medals_1.bin b/src/data/sgb_data/sgb_border_medals_1.bin new file mode 100644 index 0000000000000000000000000000000000000000..4dcc13c728c87a7625152a13884421e79e399293 GIT binary patch literal 3435 zcmZwJiC0r+8prYXl0Z<9B%l_nHDOWIQWmWdW@OGqx~_EU{-+)Br>O6!byY! zd3qTHN_?FH2ZHvCDE)Rb)LIRyUD8b(z09Z<8QSG46+SFIAmglZC)f<=t1?aL*5h&; zCv%KmvUkg`pA^hW}|W!^zlJErKr zdM`?*H2TNLm;_o%n-Fdb>ek*LOsk;_A=4d?rRgb;lf9C!?p<9eI4>OC<&vfsxG>6% zBFCa|^ie`+MA6V5@5nd{va8IDqJ}T*s;Jl-|G1*MFtg&|?BhufYvR^_emh4MF+yWQ zST8tOu-Pq4Gte|;+@a5P$ZWngOJH-9k2(hAG}tGqBVYraSw+v2TkYOqnvRGLq8U#N z5WqZfH@gEB<|BbHf1thM&n_%@TJp4V)k9HjzU=e!0XL6@ zv>)y6Znw%Uz?k+cKJ7tQyZwj@XTWx>9oie~OPC5;M_1`ekyYM4s&U^RrmsM{xPlQQ zpGiuG5X`LMrSryMD#Ksd>~!+C{1HBz6Xf(dk(2=zu+pxQ_4;mo9j`A%dHHBZy@$Rc zcMhXEjC53q*59B+L%=0bWjYY02||YSpcSQrgp2G$n>g3oBcg=8QiUfc2}6=0?P$6Z zDfcMYZI9YJ*Z74hM!;YCA zV;)AWr8t3d*09wV_;cuhBk~5)tf+~rw#4%u`NUVb+0^>Qh{u0wgONx+JwYEguFWRh z=%B53*6xT!60Gq|DMb$1S1htSKT&Yo;5)F9J7p_pTQR zpNaE-Rrb+OA*PcZWI1c7zX~eO6UAICv{(WS>9R#db|>?(rF^Kp5K)YxZu*q8Dh0zA z>orItu?MZ4gBGlku447}y9-=fzDFkh0nH140)6g+^6o9$IZ24eEFYw&a04gfp&RDx zB*?1qYFYNtbcdqHo>VTBBgyfky6n1OhB8vxKwONM6IGPP=n*zP4hLDG4Qe3=1axxI z2RTcRg3a5axDrx4i;ps#kteB|5L9b?tSATFPOUYPt9_zyJ|&TZQs(VNNTd=9v3Bp6 zi?2Os^6OrKR!C-ga$BwFjK=D(RQ{~0_q=_3-Gh%2>#<1fG2Y=o$nNE%9zpCYT*-0GV8%PPO#%0ae>@E)-1nv$xQHKmnN&tL7%|$h5Fx!%$5c*R1$vs>Td-+x3j{}gW?WMT zxc~&es_P$y5qwNCoA<=xk9OEODdgScAAm^3a%7JxOE6X?{2az8RSJ++6!vxe^kj@P z1lLdm!=TkBMq2yy9)oIXwHPxf<`%0EAPx2$(PR@Wh;EYGvY|5gyWhd78O}>KVZhCN z0NiYq@fpRCx=$=ZR0B8LH^Wy>rPE?BA(N=Kg`e+`(WG&1AZ|iAB3fQE;$?_L*wU0w z!5%_H%Z#SjV&;nN-7hc3!ZWv7DmMv)FNI8XeTW@oyx0A4rU@OOb}1UuTC-X~+q%33 z|Ag;Dc2}&)d)Xip-2huqs=lrofn8x?eq};Cv#J8|RDKI$0J0+Z4ba)q0Nt-z-eF$F z-cUp-v67$6!$Ua1eqMR}U+@c|-|kk!HjzzK6M*bhWx3TDk&RSH@1khfxyg?pL^UHJ zmm`ZM{#x!mgCMV|t&1S!@TMtUcr2oUTTMip4w?BqvQ7~V+-hz##tP;NqCYk_n_KNS zv59PJrgo*mB~5H#{m2#{``6>iT^)po2G|0jWN75uuray?w?bzP-+dsJA z4z;KEWIUY<#)DKKJB1Ggeq~Sm)23_ZV7D&(?3(B&B>O~lIkI8tVj7C7hh+}~B@5B) zB$tKAF0k_=S^)8)wb;JV|7}eR(u{EP@_QPIGuEA2B#Jx_PjhJsYI$T4)kqYXbt?A8fXxb&xdpk|zSF<}n?(r&H~Q^xyPJ&{Tcb4ur}$tLUQT^? z%12c5MLeSOj06$Kh-M;MzZqtiGMyQlJ6@z##sz?|L)aWruLkhsy;{|`Lc3rL8_=-M zlyw6Vum8D4XTo;@cakatc>o|0w?NCO{XfC(Z4pUKl3i`msm~*OasyKbOvi>@UKKkp zfTL}2#l(d7<-*n?=(fjQ-G`tT8rfVn&jl7qR-s!BPZ~G4XBYFHut+P8MYO7zwW zB%&o|CZY??Ijf*HvENLah+;NpLHh5^^7``spP7B&K1H&WPu=(Voa~!^ve-A=_X!%$ zsD#pkbI7iej7hKOScVf#!1`B=-8h5Z2~>Y-bp{YGR7|bYM)ml(Q*$=MKx)Ef2yP62 zHmFx(f-qXmsM&xu;^gt}{9sH=<6G(pi$s^gF={m!y~XYP#Z$Rd1N_CoG;8a#gq&atnoicO3Cl`y%_lR!F@7<^dw**y26&4*J5%RDMi zh*%0@;4X1s0^^$z`udBzEUP+OQzF!42iFJNJ#HdsQC}Ca_yE3f-5v2R+vzH7@o3%p zD5ivoszMHN(76+u6J#kWMTA70FUXG2hA$hpZ7|3O(-XAgiYTm7RDW9C3*9UfRqp-X zLg2#wOU!tAh%ZN<5=Xz!YC7NL6X`_mOEee=ISW$-D?6yB)>vmmhRS!B?WuwBzuEkd z%+#KG7`VfioBv0|h*52bf3G+ho^Spk=->QRv1_SmtHq|SXkGbgcngFwp)Td+ zwKux-H2T$%%RVbs)ni^#l9_ z|JWeZAnPIf6939-)O^@m(^uc$e0sj93J%7Hx0sjC$o0}m1!2JNe w!0*BTf1A71`w;*BY5$O(Kz#xK`vbRU1J(x={|9UinLKm(#_;nD=NRDM-OCu5K>z>% literal 0 HcmV?d00001 diff --git a/src/data/sgb_data/sgb_border_medals_3.bin b/src/data/sgb_data/sgb_border_medals_3.bin new file mode 100644 index 0000000000000000000000000000000000000000..9cbc8401de920796bb52ef69bfa43cf8b2164c34 GIT binary patch literal 73 zcmV-P0Ji`C%`yLfyMLH}|B-U4WhP}{ME@W#02Kc#yAuC%4MqsIA0!EX?EoJDzXAUP f?cW377&qX5pndxQd<}dbBmgui;3ZN@@elnV9To$;oRomU7T=onAHwu12$cQvNTR@_Zv22pfG$;hmKGusfuY#DJJbZq{tC5l;U z#~kLdfGzGcd+XJ7@)^o4@P9VE<(e*SwihE?x6QMx@|j+=Bi~6Y+0|s0DWN3oIxpGm zLCF8-Ov~2=#q*B`iN^z9;^81+S3`s@bmKX~;TkQ4a((ET>?I69Wq@`86(UNRP;UGb z(o!v~?&9x8G#t|LuUPZ`nTlpX>J}Hl=@d&E7VrO(@>Nt-YY36^%dfX8SfR&Ewd~a+ t7U~fTO#a(7DV_8F1n8RiZ=5xn{cu~8w8&Py-4i-IzS&S@!tXg5+ykuCtJ44g literal 0 HcmV?d00001 diff --git a/src/engine/bank1c.asm b/src/engine/bank1c.asm index 2207d2e8..140044e1 100644 --- a/src/engine/bank1c.asm +++ b/src/engine/bank1c.asm @@ -1,7 +1,7 @@ Func_70000: ; 70000 (1c:4000) ld a, [wConsole] - cp $1 - ret nz + cp CONSOLE_SGB + ret nz ; exit if not SGB ld b, $1 ld a, EVENT_RECEIVED_LEGENDARY_CARDS farcall GetEventValue @@ -15,8 +15,8 @@ Func_70000: ; 70000 (1c:4000) Func_70018: ; 70018 (1c:4018) ld a, [wConsole] - cp $1 - ret nz + cp CONSOLE_SGB + ret nz ; exit if not SGB ld a, $0 call Func_70044 ret @@ -35,10 +35,10 @@ IconEnPacket: ; 70034 (1c:4034) Func_70044: ; 70044 (1c:4044) push hl push bc - add a + add a ; *2 ld c, a - add a - add c + add a ; *4 + add c ; *6 ld c, a ld b, $0 ld hl, Unknown_70057 @@ -49,12 +49,17 @@ Func_70044: ; 70044 (1c:4044) ret Unknown_70057: ; 70057 (1c:4057) - INCROM $70057, $70082 + dw SGBBorderIntroGfxPointers, SGBData_BorderIntro3, SGBData_BorderIntro4 + dw SGBBorderMedalsGfxPointers, SGBData_BorderMedals3, SGBData_BorderMedals5 + dw SGBBorderMedalsGfxPointers, SGBData_BorderMedals4, SGBData_BorderMedals5 +; 0x70069 + + INCROM $70069, $70082 Func_70082: ; 70082 (1c:4082) ld a, [wConsole] - cp $1 - ret nz + cp CONSOLE_SGB + ret nz ; exit if not SGB push hl push bc ld a, [hli] @@ -64,6 +69,7 @@ Func_70082: ; 70082 (1c:4082) call Func_700a3 pop hl inc hl + ld a, [hli] ld e, a ld a, [hli] @@ -84,17 +90,19 @@ Func_700a3: ; 700a3 (1c:40a3) push hl call Func_70136 pop hl + push hl ld a, [hli] ld h, [hl] ld l, a ld de, v0Tiles1 - call Func_701e9 - call Func_701fe + call DecompressSGBData + call PrepareBGMapForSendingSGBBorder ld hl, ChrTrnPacket_BGTiles1 - call Func_70177 + call SendSGBBorder pop hl - ld de, $0002 + + ld de, 2 add hl, de ld a, [hli] ld h, [hl] @@ -105,9 +113,9 @@ Func_700a3: ; 700a3 (1c:40a3) call Func_70136 dec hl ld de, v0Tiles1 - call Func_701e9 + call DecompressSGBData ld hl, ChrTrnPacket_BGTiles2 - call Func_70177 + call SendSGBBorder .asm_700da pop de pop bc @@ -136,15 +144,16 @@ Func_700fe: ; 700fe (1c:40fe) call Func_70136 pop hl ld de, v0Tiles1 - call Func_701e9 - pop hl + call DecompressSGBData + + pop hl ; input de ld de, v0Tiles2 - call Func_701e9 - call Func_701fe + call DecompressSGBData + call PrepareBGMapForSendingSGBBorder pop hl call Func_70214 ld hl, PctTrnPacket - call Func_70177 + call SendSGBBorder pop de pop bc pop hl @@ -167,6 +176,7 @@ Func_70136: ; 70136 (1c:4136) ld [wd41f], a ld a, [wLCDC] ld [wd420], a + di ld hl, MaskEnPacket_Freeze_Bank1c call SendSGB @@ -178,6 +188,7 @@ Func_70136: ; 70136 (1c:4136) ld a, %11100100 ldh [rBGP], a call SetBGP + xor a ldh [hSCX], a ldh [rSCX], a @@ -188,7 +199,7 @@ Func_70136: ; 70136 (1c:4136) pop hl ret -Func_70177: ; 70177 (1c:4177) +SendSGBBorder: ; 70177 (1c:4177) push hl push bc push de @@ -249,7 +260,8 @@ Func_701c0: ; 701c0 (1c:41c0) pop hl ret -Func_701e9: ; 701e9 (1c:41e9) +; decompresses data pointed by hl to de +DecompressSGBData: ; 701e9 (1c:41e9) ld a, [hli] ld c, a ld a, [hli] @@ -267,13 +279,15 @@ Func_701e9: ; 701e9 (1c:41e9) call DecompressData ret -Func_701fe: ; 701fe (1c:41fe) +; fills a 20x13 rectangle in v0BGMap0 +; with values ascending bytes starting at $80 +PrepareBGMapForSendingSGBBorder: ; 701fe (1c:41fe) ld hl, v0BGMap0 ld de, $000c ld a, $80 ld c, $d .asm_70208 - ld b, $14 + ld b, SCREEN_WIDTH .asm_7020a ld [hli], a inc a @@ -502,7 +516,57 @@ Func_704c7: ; 704c7 (1c:44c7) ret ; 0x704d3 - INCROM $704d3, $7322f + INCROM $704d3, $706dd + +SGBData_BorderIntro4: ; 706dd (1c:46dd) + dw $800 ; length + INCBIN "data/sgb_data/sgb_border_intro_4.bin" + +SGBData_BorderMedals5: ; 709dc (1c:49dc) + dw $800 ; length + INCBIN "data/sgb_data/sgb_border_medals_5.bin" + + INCROM $70b96, $713a9 + +SGBBorderIntroGfxPointers: ; 713a9 (1c:53a9) + dw SGBData_BorderIntro1 + dw SGBData_BorderIntro2 + +SGBData_BorderIntro1: ; 713ad (1c:53ad) + dw $1000 ; length + INCBIN "data/sgb_data/sgb_border_intro_1.bin" + +SGBData_BorderIntro2: ; 71ec0 (1c:5ec0) + dw $4e0 ; length + INCBIN "data/sgb_data/sgb_border_intro_2.bin" + + INCROM $72271, $72273 + +SGBBorderMedalsGfxPointers: ; 72273 (1c:6273) + dw SGBData_BorderMedals1 + dw SGBData_BorderMedals2 + +SGBData_BorderMedals1: ; 72277 (1c:5277) + dw $1000 ; length + INCBIN "data/sgb_data/sgb_border_medals_1.bin" + +SGBData_BorderMedals2: ; 72fe4 (1c:5fe4) + dw $100 ; length + INCBIN "data/sgb_data/sgb_border_medals_2.bin" + + INCROM $730dc, $73146 + +SGBData_BorderIntro3: ; 73146 (1c:7146) + dw $60 ; length + INCBIN "data/sgb_data/sgb_border_intro_3.bin" + +SGBData_BorderMedals3: ; 7319a (1c:719a) + dw $60 ; length + INCBIN "data/sgb_data/sgb_border_medals_3.bin" + +SGBData_BorderMedals4: ; 731e5 (1c:71e5) + dw $60 ; length + INCBIN "data/sgb_data/sgb_border_medals_4.bin" SGBData_MapPals1: ; 7322f (1c:722f) dw $20 ; length @@ -589,5 +653,3 @@ SGBData_GameBoyPrinter: ; 73b05 (1c:7b05) SGBData_TitleScreen: ; 73b33 (1c:7b33) dw $40 ; length INCBIN "data/sgb_data/title_screen_pals.bin" - - INCROM $73b63, $74000 diff --git a/tools/compressed_data_extractor.py b/tools/compressed_data_extractor.py index c978fa5b..71b2d31f 100644 --- a/tools/compressed_data_extractor.py +++ b/tools/compressed_data_extractor.py @@ -113,7 +113,7 @@ def decompressData(source): lenByte = source[sourcePos + 1] bytesToCopy = [] - curLen = ((lenByte & 0xf0) >> 4) + 2 + curLen = (lenByte >> 4) + 2 for i in range(curLen): buffer[bufferPos] = buffer[offsetToCopy] bytesToCopy.append(buffer[offsetToCopy])