From 788af45988dd98e58aeeb307ad51a2f12299588d Mon Sep 17 00:00:00 2001 From: yenatch Date: Wed, 11 Mar 2015 18:33:20 -0700 Subject: [PATCH 1/8] Get rid of baserom incbins in main.asm. --- main.asm | 148 +++++++++++++++++++++++++++++++++++++++------ unknown/1f0000.bin | Bin 0 -> 2520 bytes unknown/1f4018.bin | Bin 0 -> 3494 bytes unknown/1f4dd3.bin | Bin 0 -> 4044 bytes unknown/1f5db4.bin | Bin 0 -> 1462 bytes 5 files changed, 129 insertions(+), 19 deletions(-) create mode 100644 unknown/1f0000.bin create mode 100644 unknown/1f4018.bin create mode 100644 unknown/1f4dd3.bin create mode 100644 unknown/1f5db4.bin diff --git a/main.asm b/main.asm index 61c9042fb..89a0d1f61 100644 --- a/main.asm +++ b/main.asm @@ -41747,7 +41747,14 @@ Function49856: ; 49856 ; 4985a Unknown_4985a: ; unreferenced -INCBIN "baserom.gbc",$4985a,$4989a - $4985a + db $ab, $03, $57, $24, $ac, $0e, $13, $32 + db $be, $30, $5b, $4c, $47, $60, $ed, $f2 + db $ab, $03, $55, $26, $aa, $0a, $13, $3a + db $be, $28, $33, $24, $6e, $71, $df, $b0 + db $a8, $00, $e5, $e0, $9a, $fc, $f4, $2c + db $fe, $4c, $a3, $5e, $c6, $3a, $ab, $4d + db $a8, $00, $b5, $b0, $de, $e8, $fc, $1c + db $ba, $66, $f7, $0e, $ba, $5e, $43, $bd Function4989a: ; 4989a call DelayFrame @@ -51477,7 +51484,20 @@ INCLUDE "data/base_stats.asm" PokemonNames:: INCLUDE "data/pokemon_names.asm" -INCBIN "baserom.gbc",$53d84,$53d9c - $53d84 +Unknown_53d84: ; unreferenced + db $1a, $15 + db $33, $16 + db $4b, $17 + db $62, $18 + db $79, $19 + db $90, $1a + db $a8, $1b + db $c4, $1c + db $e0, $1d + db $f6, $1e + db $ff, $1f + db $ff, $20 +; 53d9c UnknownEggPic:: ; 53d9c ; Another egg pic. This is shifted up a few pixels. @@ -56372,7 +56392,7 @@ MenuDataHeader_0x8810d: ; 0x8810d db 09, 06 ; start coords db 12, 19 ; end coords -INCBIN "baserom.gbc",$88112,$88116 - $88112 + db 0, 0, -1, 0 ; XXX Function88116: ; 88116 call Function1cfd @@ -82034,7 +82054,11 @@ Functione124e: ; e124e ; e126d Unknown_e126d: ; e126d -INCBIN "baserom.gbc",$e126d,$e127d - $e126d + db $00, $01, $02, $03 + db $04, $05, $06, $0b + db $0c, $11, $12, $17 + db $18, $1d, $1e, $23 +; e127d Functione127d: ; e127d call Functione128d @@ -82400,7 +82424,12 @@ Functione1481: ; e1481 ; e148f Unknown_e148f: ; e148f -INCBIN "baserom.gbc", $e148f, $e14a0 - $e148f + db $e0 + db $00, $03, $06, $09 + db $24, $27, $2a, $2d + db $48, $4b, $4e, $51 + db $6c, $6f, $72, $75 +; e14a0 Functione14a0: ; e14a0 ld hl, Unknown_e14b5 @@ -82423,7 +82452,13 @@ Functione14a0: ; e14a0 ; e14b5 Unknown_e14b5: ; e14b5 -INCBIN "baserom.gbc", $e14b5, $e14d9 - $e14b5 + db $00, $00, $00, $00, $00, $00 + db $00, $01, $02, $03, $04, $00 + db $00, $05, $06, $07, $08, $00 + db $00, $09, $0a, $0b, $0c, $00 + db $00, $0d, $0e, $0f, $10, $00 + db $00, $00, $00, $00, $00, $00 +; e14d9 Functione14d9: ; e14d9 call Functione1481 @@ -82467,13 +82502,73 @@ Functione14d9: ; e14d9 ; e150f Unknown_e150f: ; e150f -INCBIN "baserom.gbc",$e150f,$e1534 - $e150f + db $f4, $f4, $00, $00 + db $f4, $fc, $01, $00 + db $f4, $04, $02, $00 + db $fc, $f4, $0c, $00 + db $fc, $fc, $0d, $00 + db $fc, $04, $0e, $00 + db $04, $f4, $18, $00 + db $04, $fc, $19, $00 + db $04, $04, $1a, $00 + db $ff Unknown_e1534: ; e1534 -INCBIN "baserom.gbc",$e1534,$e1559 - $e1534 + db $f4, $f4, $00, $00 + db $f4, $fc, $01, $00 + db $f4, $04, $00, $20 + db $fc, $f4, $02, $00 + db $fc, $fc, $03, $00 + db $fc, $04, $02, $20 + db $04, $f4, $00, $40 + db $04, $fc, $01, $40 + db $04, $04, $00, $60 + db $ff Unknown_e1559: ; e1559 -INCBIN "baserom.gbc",$e1559,$e1631 - $e1559 + +macro_e1559: macro + db \1, \2 + dwcoord \3, \4 + db \5, \6 +endm + + macro_e1559 $1c, $1c, 1, 0, $ee, $00 + macro_e1559 $34, $1c, 4, 0, $ee, $00 + macro_e1559 $4c, $1c, 7, 0, $ee, $00 + macro_e1559 $64, $1c, 10, 0, $ee, $00 + macro_e1559 $7c, $1c, 13, 0, $ee, $00 + macro_e1559 $94, $1c, 16, 0, $ee, $00 + macro_e1559 $1c, $34, 1, 3, $ee, $00 + macro_e1559 $34, $34, 4, 3, $ef, $00 + macro_e1559 $4c, $34, 7, 3, $ef, $00 + macro_e1559 $64, $34, 10, 3, $ef, $00 + macro_e1559 $7c, $34, 13, 3, $ef, $00 + macro_e1559 $94, $34, 16, 3, $ee, $00 + macro_e1559 $1c, $4c, 1, 6, $ee, $00 + macro_e1559 $34, $4c, 4, 6, $ef, $00 + macro_e1559 $4c, $4c, 7, 6, $ef, $00 + macro_e1559 $64, $4c, 10, 6, $ef, $00 + macro_e1559 $7c, $4c, 13, 6, $ef, $00 + macro_e1559 $94, $4c, 16, 6, $ee, $00 + macro_e1559 $1c, $64, 1, 9, $ee, $00 + macro_e1559 $34, $64, 4, 9, $ef, $00 + macro_e1559 $4c, $64, 7, 9, $ef, $00 + macro_e1559 $64, $64, 10, 9, $ef, $00 + macro_e1559 $7c, $64, 13, 9, $ef, $00 + macro_e1559 $94, $64, 16, 9, $ee, $00 + macro_e1559 $1c, $7c, 1, 12, $ee, $00 + macro_e1559 $34, $7c, 4, 12, $ef, $00 + macro_e1559 $4c, $7c, 7, 12, $ef, $00 + macro_e1559 $64, $7c, 10, 12, $ef, $00 + macro_e1559 $7c, $7c, 13, 12, $ef, $00 + macro_e1559 $94, $7c, 16, 12, $ee, $00 + macro_e1559 $1c, $94, 1, 15, $ee, $00 + macro_e1559 $34, $94, 4, 15, $ee, $00 + macro_e1559 $4c, $94, 7, 15, $ee, $00 + macro_e1559 $64, $94, 10, 15, $ee, $00 + macro_e1559 $7c, $94, 13, 15, $ee, $00 + macro_e1559 $94, $94, 16, 15, $ee, $00 Functione1631: ; e1631 ld hl, VTiles2 @@ -85888,7 +85983,7 @@ Functione36f9: ; e36f9 (38:76f9) ret ; e3778 (38:7778) -INCBIN "baserom.gbc",$e3778,$e377b - $e3778 + hlcoord 11, 7 ; XXX MenuDataHeader_0xe377b: ; 0xe377b db $40 ; flags @@ -91302,7 +91397,7 @@ Unknown_fd15e: ; fd15e db $01, $86, $a0, $00, $59, $10, $02, $1a ; SNORLAX_DOLL ; fd1ae -INCBIN "baserom.gbc", $fd1ae, $fd1b1 - $fd1ae + db 0, 0, 0 ; XXX UnknownText_0xfd1b1: ; 0xfd1b1 ; Hi, ! How are you? @@ -91340,13 +91435,13 @@ UnknownText_0xfd1ca: ; 0xfd1ca db "@" ; 0xfd1cf -INCBIN "baserom.gbc", $fd1cf, $fd1d0 - $fd1cf + db 0 ; XXX Functionfd1d0: ; fd1d0 ret ; fd1d1 -INCBIN "baserom.gbc", $fd1d1, $fd1d2 - $fd1d1 + ret ; XXX INCLUDE "misc/mobile_40.asm" @@ -94047,7 +94142,22 @@ Function1058e9: ; 1058e9 (41:58e9) ; 1058f0 (41:58f0) OAM_1058f0: ; 1058f0 -INCBIN "baserom.gbc",$1058f0,$105930 - $1058f0 + db $11, $34, $00, $00 + db $11, $3c, $01, $00 + db $11, $44, $02, $00 + db $11, $4c, $03, $00 + db $19, $34, $04, $00 + db $19, $3c, $05, $00 + db $19, $44, $06, $00 + db $19, $4c, $07, $00 + db $01, $5c, $00, $00 + db $01, $64, $01, $00 + db $01, $6c, $02, $00 + db $01, $74, $03, $00 + db $09, $5c, $04, $00 + db $09, $64, $05, $00 + db $09, $6c, $06, $00 + db $09, $74, $07, $00 ; japanese mystery gift gfx MysteryGiftJP_GFX: ; 105930 @@ -96414,12 +96524,12 @@ INCLUDE "text/battle_tower.asm" SECTION "bank7C", ROMX, BANK[$7C] -INCBIN "baserom.gbc",$1f0000,$1f09d8 - $1f0000 +INCBIN "unknown/1f0000.bin" SECTION "bank7D", ROMX, BANK[$7D] -INCBIN "baserom.gbc",$1f4000,$1f4003 - $1f4000 + db $cc, $6b, $1e ; XXX Function1f4003: ; 1f4003 ld a, $6 @@ -96433,7 +96543,7 @@ Function1f4003: ; 1f4003 ; 1f4018 Unknown_1f4018: -INCBIN "baserom.gbc", $1f4018, $1f4dbe - $1f4018 +INCBIN "unknown/1f4018.bin" Function1f4dbe: ; 1f4dbe ld a, $6 @@ -96447,7 +96557,7 @@ Function1f4dbe: ; 1f4dbe ; 1f4dd3 Unknown_1f4dd3: -INCBIN "baserom.gbc", $1f4dd3, $1f5d9f - $1f4dd3 +INCBIN "unknown/1f4dd3.bin" Function1f5d9f: ; 1f5d9f ld a, $6 @@ -96461,7 +96571,7 @@ Function1f5d9f: ; 1f5d9f ; 1f5db4 Unknown_1f5db4: -INCBIN "baserom.gbc", $1f5db4, $1f636a - $1f5db4 +INCBIN "unknown/1f5db4.bin" SECTION "bank7E", ROMX, BANK[$7E] diff --git a/unknown/1f0000.bin b/unknown/1f0000.bin new file mode 100644 index 0000000000000000000000000000000000000000..1ecd2d61e02cad666c898c0b0928de7b5ce47c80 GIT binary patch literal 2520 zcmYjTTXq^t5-hs1vZ}i}i>Ckq7Egn)vBg7x0ND+acW_rSTbQlfRow46^W(p}qlp5K zXT&*>UEQ4-l^GGGy$S zh~=jm>Xd8r=yO@~ijqXrC{gB2U$`!9T~J**`G(e#@+hgxC?Dln>fIBM?1&fCVX+13 zdY9s=AA0`c|5O*E zrD%30F%9cXM{!F~%Jd%O`6g+5M&On&`tCma1p3rejvOLD0)on)=?yqO~N)Rckh=#N17rtjU7 z4!X{DzIQ|9Ip`F3&-&;-$;wp2lDf{iT)Ig&DVe(@qaY)*;>3L5lMPs3pnuO=>8fY`3L#XM1R)eI1N82bt9n=qq#Gv zUVtUf(lGUelH3&Zf+@`1TDInn&nD5&mZYW=vKC!Lo`tUI&zym&D~U0a@S{)6gS$t^OaOXd6`~OQ)Z?W zcL#kw$sM?%lL;ND42@L5AE5&#FgFeyd%yOl;)#?oSMK#q3F~eBicTgx_AC9a>$WN7 za1U%AweBV0n@!)wJ}^`=hbzQ*d!5SM$N4tF1ut_KIq+Xz%)yg3`sgu@hrDF^=7arU z7c_(-GE+;|Qq6PjNS^O?N1tizr&+-%b?qJsoiPQCUQM%;>)N*Ny174tG0Hsg+(*ts z$>2{teB}{8;rX6U!b*RV3GlSFm!&&9LWUmZsBv!w25z8>8#gd7L<4?E&kP6p9mC(? zbu>hSMeQu9MK|8I_1fNHM`Ep{$XU))vT_n{8a$y)Ua|LvNzu0lCLrpV z$kJw_5^FNN>qB(rxzBV>Ce-m8(UR#c`pHmy1DF@2guxk-JR*k1Q!1h24sMxXeF&ei znB>1z1pG)?hj@2)-OYvz%H+e~ogGULv*4|d7^SA5fQmXc5GjLUhJjW|XGv;i?p5zhI= zCvGnlGsoFI2myZlW|!`fE5J-RQ{!);o1t*gbz*;FZ;!mPD;a|S@!k~g9yy*=t^Com t9J!T`y}*}7(m;(?-t%3c>Y|$w_t>xHv+ZMdsZFsyMb1Kx?B8lF{{bV6uy+6e literal 0 HcmV?d00001 diff --git a/unknown/1f4018.bin b/unknown/1f4018.bin new file mode 100644 index 0000000000000000000000000000000000000000..aa8c73e78d3f626258b69c3aed7f632a80c84fbd GIT binary patch literal 3494 zcmb7G4{Vjy6+h?R`@Pqe)<*0bZ5P*tM|HSKJL-~+#U+R#+8Ez`lddF!(?Y9~g+;Vv z$+~?74B%P@vqGnCS~Ugn6|k@LwY5hVxz% zZo$Mxcmg!*uO6NRr34oXcp9Ds6v&rAeuIouOT$u)c52n_Yzb#l*+e0gqSN-kBNeJ5X0-#G?H;TRxiT8Tnu z7MI{2oD-{2`&KDzO^(Ay@K->zw|oW_b9>x4FPD-G#v7FDhtBvSW06> z!@kJu{lP|mckDtWs2)6?Zk_RcFdj}-sr{7$!CIVhX_Xp$ey04z^dGBKtJDx75(-9pOe2|-jF#*ond$O)ENFr;<2!l5x{#Yh?g%QVQis3BRmenQE zyP0AzWkxd7WkQIOTaV;)uushnkZuXw%C+TGJaFiHr|tYCWz+ATWRTUL{*|E^S|A!_=l)A8-3qSy`O5Ny#}a*!NI;!pQljyT8Diz zH<(n*6esW;Ucc;^yCuJ*@~l+P+&Dm!ao)t$Av)og6a zd}GV*FY}#^i=FTrN__pNX}e*snf!3TptRSi{@rAfEn^;C#t+&kR2{)qWDafl&x|G|LGUaaN2g+LI5#$a zV)5xV_yzIl^Mq|X9%jA#qA*@EUXx`-m64 z4M{92aG&Byq3M=kx}RZc|Kd)k4Sjfr?n}v^;>T=-UTf;``30)!{m0S4#9VPU`yBI& zh8V?!V*rog0P&C5<#az!oOd26f_I&kEBG;9L4u>eX~|{(!dymhY{))R2iMCy%*zOl zKBv#Utb*Ok2#y}7rItO&Y8k=Ne*)QQ`DC$q)0BoZy(u zwrKiyXel%#!(xbs1;UCVyL_$)4*IKK=Ck}VN67m*T;=Wx(}9>pT%&jpN$t&27mET> zERd1flclZ@%S44hPU;O=>b2sBVy!?y>JwS&jpD~*qdO)!TQ{uQdB`}xNXDzihAM`cBODc5Evr+iBFj!_(y=VGU z86Ht}%2BJLp-*LZ>|!R9k)wA{|D@4iA9IgIiK@Zf_Cn`yTQ<4eUg?}}%LcdG3xnhB Ug~|2y%HVu^VRFB{GJ3#&0j+bxSpWb4 literal 0 HcmV?d00001 diff --git a/unknown/1f4dd3.bin b/unknown/1f4dd3.bin new file mode 100644 index 0000000000000000000000000000000000000000..511d62cb77ed26d199d3e5f254b2193b922c0fd3 GIT binary patch literal 4044 zcmb7HZ*Wsp7C+}EX|Y9NOFLS|v^&tSDg`s9e%P+dIOq(s{qXWS+iaatc0o{BXUE0W z>dZRp1yQ>!AV|SKi;SRK5bKD2uXzb+QbLm#Hz_f(VQEt6E0CFX$94R`&dMKMv*+ed z8^Qfx-XuBqynD_)=XcLN=Ug~=>Re>rJ;1cx}gW&fcKyVm*NUsji$<5bEXP= z?v~uVoX}|5vOw-RlHHr_?R%xKQWgune7HwGJ(`j0Eu`qSdhCU}bJ#v7w|GMw7H^CL z{tk2Y9CVZ!>;naSfF_z_D)Byr2z&}?E|)W491K89Y0j7MIeZCNQ5t^>*Wg>g z%F?(7tFQ)fPPyJi*no==Zz|2X2bbeLNE4r`$mL2#ufhj#71F0@a3}r}J8{l z4koh>HjDClwuY@|vnW5qHnC^etkEyA&Fm#Mi|}5yo9$&qgbTqUzxY~3OdD#8HIGK5 zfw9)1kas-DJEVl6YgQ!~jZI0?M3cH_-)c7Linw|`fQ~TfB8t3l3Q7N$e&u0(Njlo1dWR#D`(#Mb72cxWQ2=UX z?~ePAW@&n2M0fj1z_aX*Kw6StKJ-RKqi{GA_DIUfR)Yt;Bp1?_#R{v52?U<7g|d>O zh^4QJrLSDNmS36dkmPq4^hK4Hh(!O5!N75=G8q*5T5MvoGQ<_yMm*d;859bx5J?KI zj(EtDYxFDsZTp+s_k2uqrG7(KnhEciq$YWzZnPQ{0D{T=6asnIDS?dU4WNHg@U{4p zJA{x;8Hh+r6rb0YiY}qOKiV1Hy!CF8-CoMRvVa0M%117$n!FG; z#@E7H_$}oksv@Vs^bX~XgZYV9e@MS3%G!I zJJ9rQp4Sika2&9fcq*FS%jKxjaQ_9BLd_`_ZB&m_yo!<|!*XM}!4vj`oj0G?oxbrV z_lkj#?hU1A3+-oBS6ETcs5KCws<_>ty;L%qKII$X#GL-+hEE+J``teM+<3-Sn&9BVsE8{};`yW&)D&09 z2$bw8f>M*+)z+U*3>nwAWXX&#+~)9*;hlwu&%?UJnH;C4DNi>NZb{0diGWkIccQVQ z9`0P4-uoy?7y7-ZliD-uuoB{>j%`r!U$m{tR$EgoV(JeF&EHUHif=CWFsz;l&1c~i z*hj(COQ~Tk1d5LcO%aq-NvU(aei!8uN<|puVM1wkgXC08Mqd0Vb-U{*5QnOBM4O1l zB3(f=6Ld1D@H`e1&VjLF41JGBbvK*V#iP`geGcF0+#iBt>i!MD*o#YF2 z)^_Fl_I_{|pYOUv+wSEBjODtj&2oueQ&+upW{~$|J^A37n`?SBj*Him4+WYL%>+#d z(IFI`oK!r#+>sxO+I3sWL_M{e%x z5g8y*xUWT~JL@W{!HiXO)1bBFL50_uE1^9h26#njguQPs1lk!3nA~D8)XbcOrBR1Wzv5xig4{!nq!*lND&XpShH|8#*2GGFm`%&|=-IQ@s+qAl=_SR6#Ex#X4$m2**&5 z2He9_gt36EA)ClHqIu^@%~L98%OdIQ#TWIZSq}L-y81;P$HH-oee6%O#q~!Y7S{8J z*Kh^bK&pr=DNrZOFCn8CgAvH(vQ*+%m;YksMu0mTW=+w{BW)v{{Qj0q6ORrKRCK?J zmOHV9J!0f#g-AySczme0!^#FL;RK2^7s{W0Rx76C`t3RvC5Fl>`qHsvd7!m75v&wn z#Fy^e8B5K+q25HUXs7-_g0+jd<#*m5Hj7S$S~7EZT;*JToH?h+z8N+@_A7S^0`F4- z+kYu{VUH{D0n{mZFX1Zg;E9qw?wT#IEw1JvfNW?vd*Wt*N0kOqkqEO7@#N=D5fwZZ zPPVZqf%i_Vd7$s!qmonogznn*nBo<1$bL& zyZ8qoW0qEvdJhZVFrj63;F)5x-(j>HdtF8caRevOs5o6m3!;d*Hj&X9E7rzy>ayhe z@Vn<$-uo2ZWR+Pf!+GB!Q>%!q)#Q@u6!Fz6A~{SIrZ!e8sfM!Yyb!JYPc~Cj?yuXV zE8vj#(+zYhWe07qHnp8r(ZiHcubL`*dNiupbfvuQNO2RlFw>qM@&J?VJ3uCzL1xo` zS#HjjRi_kbbz$Qj;gl6Y4@SU@X;h%f3ul{NY=FFt0glr^vw2jEc*pbq)J>?@lHU9a)PIrP;b|aC7XC`zq14OgWZx`Iq zz3{RiGqgh354(rrWRQ%K@#A{xf<}?Oxl=SRv-rZhp))5#Su@ffNQSfjf6Ynb@oqH{ zb>=GTwN Date: Wed, 11 Mar 2015 21:15:15 -0700 Subject: [PATCH 2/8] Get rid of baserom incbins in misc/. Battle Tower text was hiding here. --- gfx/mobile/havewant_map.bin | Bin 0 -> 1136 bytes misc/mobile_40.asm | 9 +- misc/mobile_42.asm | 10 +- misc/mobile_45.asm | 986 +++++++++++++++++++++++++++++++++++- misc/mobile_5f.asm | 90 +++- 5 files changed, 1060 insertions(+), 35 deletions(-) create mode 100644 gfx/mobile/havewant_map.bin diff --git a/gfx/mobile/havewant_map.bin b/gfx/mobile/havewant_map.bin new file mode 100644 index 0000000000000000000000000000000000000000..3551a77c5ea2362d8d044b22b13bdcd28972423e GIT binary patch literal 1136 zcmb7?TTjA35QQ74%JQKVK>;sF1r@v{isFsPD^TA>{r~^NZIkU~1=7iR*k&@P-`Uye zP{?SLOExl<0$beUxXa}O6}H*IW0xu}4X={z}r}xa<@Zwi7w+N(cBRXwHIamv-aoSi|Id$={%?MA=r{KN0pEx&>i_@% literal 0 HcmV?d00001 diff --git a/misc/mobile_40.asm b/misc/mobile_40.asm index 12cbd326c..ede68c544 100644 --- a/misc/mobile_40.asm +++ b/misc/mobile_40.asm @@ -1980,8 +1980,7 @@ Function100c98: ; 100c98 ; 100cad Unknown_100cad: ; 100cad -INCBIN "baserom.gbc",$100cad,$100cb5 - $100cad - + db $0a, $01, $ff, $01, $a0, $00, $20, $c3 Function100cb5: ; 100cb5 call Function100dd8 @@ -6305,7 +6304,7 @@ String_102a26: ; 102a26 ; 102a33 Unknown_102a33: -INCBIN "baserom.gbc", $102a33, $102a3b - $102a33 + db $08, $0b, $02, $01, $80, $00, $20, $01 Function102a3b: ; 102a3b ld a, [wcd30] @@ -6455,7 +6454,7 @@ Function102b68: ; 102b68 ; unreferenced ; 102b73 Unknown_102b73: -INCBIN "baserom.gbc", $102b73, $102b7b - $102b73 + db $09, $06, $ff, $01, $a0, $00, $10, $c1 Function102b7b: ; 102b7b xor a @@ -6472,7 +6471,7 @@ Function102b7b: ; 102b7b ; 102b94 Unknown_102b94: -INCBIN "baserom.gbc", $102b94, $102b9c - $102b94 + db $01, $06, $ff, $01, $a0, $00, $10, $c1 Function102b9c: ; 102b9c ld a, [wcd4d] diff --git a/misc/mobile_42.asm b/misc/mobile_42.asm index 310ceb622..761eb90c2 100644 --- a/misc/mobile_42.asm +++ b/misc/mobile_42.asm @@ -9,7 +9,7 @@ Function108000: ; 108000 ; 10800b Unknown_10800b: -INCBIN "baserom.gbc", $10800b, $108012 - $10800b + db $0d, $12, $10, $03, $06, $0f, $0c Function108012: ld a, $80 @@ -24,7 +24,7 @@ asm_108018: ; 108021 Unknown_108021: -INCBIN "baserom.gbc", $108021, $108026 - $108021 + db $11, $07, $08, $0e, $0c Function108026: ; 108026 ld a, $0 @@ -40,7 +40,7 @@ asm_10802c: ; 108035 Unknown_108035: -INCBIN "baserom.gbc", $108035, $10803d - $108035 + db $01, $12, $02, $03, $05, $08, $0b, $0c Function10803d: ; 10803d ld a, $0 @@ -50,7 +50,7 @@ Function10803d: ; 10803d ; 108048 Unknown_108048: -INCBIN "baserom.gbc", $108048, $10804d - $108048 + db $11, $07, $08, $13, $0c Function10804d: ; 10804d ld a, $0 @@ -60,7 +60,7 @@ Function10804d: ; 10804d ; 108058 Unknown_108058: -INCBIN "baserom.gbc", $108058, $10805b - $108058 + db $11, $0e, $0c Function10805b: ; 10805b ld hl, wc734 diff --git a/misc/mobile_45.asm b/misc/mobile_45.asm index 8cecaf721..f03209ca3 100644 --- a/misc/mobile_45.asm +++ b/misc/mobile_45.asm @@ -5648,17 +5648,22 @@ Jumptable_1161c7: ; 1161c7 Function1161d5: ; 1161d5 ld a, [rSVBK] push af + ld a, $6 ld [rSVBK], a + ld hl, Unknown_117356 ld de, w6_d000 ld bc, $0300 call CopyBytes + di + .asm_1161e9 ld a, [rLY] cp $91 jr nz, .asm_1161e9 + ld a, $d0 ld [rHDMA1], a ld a, $0 @@ -5669,6 +5674,7 @@ Function1161d5: ; 1161d5 ld [rHDMA4], a ld a, $8 ld [rHDMA5], a + ld a, $d0 ld [rHDMA1], a ld a, $80 @@ -5679,6 +5685,7 @@ Function1161d5: ; 1161d5 ld [rHDMA4], a ld a, $8 ld [rHDMA5], a + ld a, $d1 ld [rHDMA1], a ld a, $0 @@ -5689,8 +5696,10 @@ Function1161d5: ; 1161d5 ld [rHDMA4], a ld a, $8 ld [rHDMA5], a + ld a, $1 ld [rVBK], a + ld a, $d1 ld [rHDMA1], a ld a, $80 @@ -5701,6 +5710,7 @@ Function1161d5: ; 1161d5 ld [rHDMA4], a ld a, $8 ld [rHDMA5], a + ld a, $d2 ld [rHDMA1], a ld a, $0 @@ -5711,6 +5721,7 @@ Function1161d5: ; 1161d5 ld [rHDMA4], a ld a, $8 ld [rHDMA5], a + ld a, $d2 ld [rHDMA1], a ld a, $80 @@ -5721,11 +5732,15 @@ Function1161d5: ; 1161d5 ld [rHDMA4], a ld a, $8 ld [rHDMA5], a + xor a ld [rVBK], a + ei + pop af ld [rSVBK], a + callba Function104061 ld a, $8 ld [MusicFade], a @@ -7571,7 +7586,56 @@ Palette_11734e: RGB 15, 14, 14 Unknown_117356: -INCBIN "baserom.gbc", $117356, $117656 - $117356 + db $c9, $c9, $c9, $c9, $c9, $c9, $c9, $c9, $c9, $c9, $c9, $c9, $c9, $c9, $c9, $c9 + db $c9, $c9, $c9, $c9, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1 + db $c5, $c6, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2 + db $c2, $c2, $c6, $c5, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1 + db $c3, $c4, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2 + db $c2, $c2, $c4, $c3, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1 + db $c3, $c4, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2 + db $c2, $c2, $c4, $c3, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1 + db $c3, $c4, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2 + db $c2, $c2, $c4, $c3, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1 + db $c3, $c4, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2 + db $c2, $c2, $c4, $c3, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1 + db $c3, $c4, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2 + db $c2, $c2, $c4, $c3, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1 + db $c3, $c4, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2 + db $c2, $c2, $c4, $c3, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1 + db $c3, $c4, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2 + db $c2, $c2, $c4, $c3, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1 + db $c3, $c4, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $d8, $c2, $c2, $d8, $c2, $c2, $c2 + db $c2, $c2, $c4, $c3, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1 + db $c7, $c8, $ca, $cb, $cc, $cd, $ce, $c2, $cf, $d0, $d1, $d2, $d3, $c2, $d4, $d5 + db $d6, $d7, $c8, $c7, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1 + db $c9, $c9, $c9, $c9, $c9, $c9, $c9, $c9, $c9, $c9, $c9, $c9, $c9, $c9, $c9, $c9 + db $c9, $c9, $c9, $c9, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1 + + db $8f, $8f, $8f, $8f, $8f, $8f, $8f, $8f, $8f, $8f, $8f, $8f, $8f, $8f, $8f, $8f + db $8f, $8f, $8f, $8f, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08 + db $8f, $8f, $0f, $0f, $0f, $0f, $0f, $0f, $0f, $0f, $0f, $0f, $0f, $0f, $0f, $0f + db $0f, $0f, $af, $af, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08 + db $8f, $8f, $0f, $0f, $0f, $0f, $0f, $0f, $0f, $0f, $0f, $0f, $0f, $0f, $0f, $0f + db $0f, $0f, $af, $af, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08 + db $8f, $8f, $0f, $0f, $0f, $0f, $0f, $0f, $0f, $0f, $0f, $0f, $0f, $0f, $0f, $0f + db $0f, $0f, $af, $af, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08 + db $8f, $8f, $0f, $0f, $0f, $0f, $0f, $0f, $0f, $0f, $0f, $0f, $0f, $0f, $0f, $0f + db $0f, $0f, $af, $af, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08 + db $8f, $8f, $0f, $0f, $0f, $0f, $0f, $0f, $0f, $0f, $0f, $0f, $0f, $0f, $0f, $0f + db $0f, $0f, $af, $af, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08 + db $8f, $8f, $0f, $0f, $0f, $0f, $0f, $0f, $0f, $0f, $0f, $0f, $0f, $0f, $0f, $0f + db $0f, $0f, $af, $af, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08 + db $8f, $8f, $0f, $0f, $0f, $0f, $0f, $0f, $0f, $0f, $0f, $0f, $0f, $0f, $0f, $0f + db $0f, $0f, $af, $af, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08 + db $8f, $8f, $0f, $0f, $0f, $0f, $0f, $0f, $0f, $0f, $0f, $0f, $0f, $0f, $0f, $0f + db $0f, $0f, $af, $af, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08 + db $8f, $8f, $0f, $0f, $0f, $0f, $0f, $0f, $0f, $8f, $0f, $0f, $8f, $0f, $0f, $0f + db $0f, $0f, $af, $af, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08 + db $8f, $8f, $8f, $8f, $8f, $8f, $8f, $0f, $8f, $8f, $8f, $8f, $8f, $0f, $8f, $8f + db $8f, $8f, $af, $af, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08 + db $8f, $8f, $8f, $8f, $8f, $8f, $8f, $8f, $8f, $8f, $8f, $8f, $8f, $8f, $8f, $8f + db $8f, $8f, $8f, $8f, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08 +; 117656 SECTION "Mobile Stadium", ROMX, BANK[$45] @@ -15347,14 +15411,16 @@ Function11b31b: ; 11b31b ; 11b350 Unknown_11b350: -INCBIN "baserom.gbc",$11b350,$11b36d - $11b350 + db $1a, $5e, $1a, $66, $1a, $6e, $1a, $76, $1a, $7e, $1a, $86, $1a, $8e + db $22, $5e, $22, $66, $22, $6e, $22, $76, $22, $7e, $22, $86, $22, $8e + db $ff Unknown_11b36d: -INCBIN "baserom.gbc",$11b36d,$11b37b - $11b36d + db $30, $31, $31, $31, $31, $31, $32, $40, $41, $41, $41, $41, $41, $42 Unknown_11b37b: -INCBIN "baserom.gbc",$11b37b,$11b389 - $11b37b + db $30, $31, $31, $39, $39, $39, $39, $40, $41, $41, $39, $39, $39, $39 Unknown_11b389: -INCBIN "baserom.gbc",$11b389,$11b397 - $11b389 + db $39, $39, $39, $39, $39, $39, $39, $39, $39, $39, $39, $39, $39, $39 Function11b397: ; 11b397 ld de, Sprites @@ -16320,10 +16386,85 @@ Function11ba38: ; 11ba38 ; 11ba44 Unknown_11ba44: -INCBIN "baserom.gbc",$11ba44,$11bb7d - $11ba44 + db $47, $30, $0a, $0a, $0a, $0a, $0a, $56 + db $46, $2f, $0a, $0a, $0a, $0a, $0a, $55 + db $45, $3d, $0a, $0a, $0a, $0a, $0a, $54 + db $44, $30, $0a, $0a, $0a, $0a, $0a, $53 + db $43, $2f, $0a, $0a, $0a, $0a, $0a, $52 + db $4a, $3d, $0a, $0a, $0a, $0a, $0a, $51 + db $4a, $30, $0a, $0a, $0a, $0a, $0a, $50 + db $4a, $2f, $0a, $0a, $0a, $0a, $0a, $4f + db $4a, $3d, $0a, $0a, $0a, $0a, $0a, $4e + db $4a, $30, $0a, $0a, $0a, $0a, $4d, $42 + db $4a, $2f, $0a, $0a, $0a, $0a, $6b, $58 + db $4a, $3d, $0a, $0a, $0a, $0a, $6a, $58 + db $4a, $30, $0a, $0a, $0a, $0a, $69, $58 + db $4a, $2f, $0a, $0a, $0a, $0a, $68, $58 + db $4a, $3d, $0a, $0a, $0a, $66, $67, $58 + db $4a, $30, $0a, $0a, $0a, $65, $0a, $58 + db $4a, $2f, $0a, $0a, $0a, $64, $0a, $58 + db $4a, $3d, $0a, $0a, $0a, $63, $0a, $58 + db $4a, $30, $0a, $0a, $61, $62, $0a, $58 + db $4a, $2f, $0a, $0a, $5f, $60, $0a, $58 + db $4a, $3d, $0a, $61, $62, $0a, $0a, $58 + db $4a, $30, $0a, $63, $0a, $0a, $0a, $58 + db $4a, $2f, $69, $0a, $0a, $0a, $0a, $58 + db $4a, $3d, $81, $0a, $0a, $0a, $0a, $58 + db $4a, $30, $80, $0a, $0a, $0a, $0a, $58 + db $4a, $2f, $7f, $0a, $0a, $0a, $0a, $58 + db $4a, $3d, $0a, $0a, $0a, $0a, $0a, $58 + db $4a, $30, $0a, $0a, $0a, $0a, $0a, $58 + db $4a, $2f, $68, $87, $88, $89, $0a, $58 + db $4a, $3d, $6e, $6f, $70, $75, $76, $58 + db $4a, $30, $75, $76, $5c, $5d, $5e, $58 + db $4a, $2f, $71, $72, $73, $74, $6d, $58 + db $4a, $3d, $75, $76, $77, $8a, $8b, $58 + db $4a, $30, $66, $67, $65, $0a, $6a, $58 + db $4a, $2f, $83, $84, $0a, $83, $84, $58 + db $4a, $3d, $0a, $85, $82, $84, $0a, $58 + db $4a, $30, $41, $80, $40, $0a, $0a, $58 + db $4a, $2f, $83, $0a, $0a, $0a, $0a, $58 + db $4a, $3d, $40, $0a, $0a, $0a, $0a, $58 + db $ff Unknown_11bb7d: -INCBIN "baserom.gbc",$11bb7d,$11bc9e - $11bb7d + db $0a, $0a, $0a, $0a, $0a, $0a, $16, $00 + db $78, $0a, $0a, $0a, $0a, $0a, $8c, $00 + db $79, $0a, $0a, $0a, $0a, $0a, $8d, $00 + db $7a, $0a, $0a, $0a, $0a, $0a, $8e, $00 + db $7b, $0a, $0a, $0a, $0a, $0a, $8c, $00 + db $7c, $0a, $0a, $0a, $0a, $0a, $8d, $00 + db $7d, $0a, $0a, $0a, $0a, $0a, $8e, $00 + db $2e, $7e, $0a, $0a, $0a, $0a, $8c, $00 + db $2e, $80, $0a, $0a, $0a, $0a, $8d, $00 + db $2e, $81, $0a, $0a, $0a, $0a, $8e, $00 + db $2e, $82, $0a, $0a, $0a, $0a, $8c, $00 + db $2e, $69, $0a, $0a, $0a, $0a, $8d, $00 + db $2e, $6a, $0a, $0a, $0a, $0a, $8e, $00 + db $2e, $6b, $0a, $0a, $0a, $0a, $8c, $00 + db $2e, $0a, $68, $0a, $0a, $0a, $8d, $00 + db $2e, $0a, $69, $0a, $0a, $0a, $8e, $00 + db $2e, $0a, $0a, $6a, $0a, $0a, $8c, $00 + db $2e, $0a, $0a, $6b, $0a, $0a, $8d, $00 + db $2e, $0a, $0a, $0a, $80, $0a, $8e, $00 + db $2e, $0a, $0a, $0a, $82, $0a, $8c, $00 + db $2e, $0a, $0a, $0a, $6c, $0a, $8d, $00 + db $2e, $0a, $0a, $0a, $0a, $83, $8e, $00 + db $2e, $0a, $6b, $0a, $0a, $0a, $8c, $00 + db $2e, $0a, $0a, $69, $0a, $0a, $8d, $00 + db $2e, $0a, $0a, $6a, $0a, $0a, $8e, $00 + db $2e, $0a, $0a, $0a, $68, $0a, $8c, $00 + db $2e, $0a, $0a, $0a, $63, $0a, $8d, $00 + db $2e, $0a, $0a, $61, $62, $0a, $8e, $00 + db $2e, $0a, $0a, $0a, $5f, $60, $8c, $00 + db $2e, $0a, $0a, $0a, $63, $0a, $8d, $00 + db $2e, $0a, $0a, $0a, $0a, $69, $8c, $00 + db $2e, $0a, $0a, $0a, $0a, $6b, $8d, $00 + db $2e, $0a, $0a, $0a, $0a, $83, $8e, $00 + db $2e, $0a, $0a, $0a, $0a, $86, $8c, $00 + db $2e, $0a, $85, $0a, $0a, $0a, $8d, $00 + db $2e, $0a, $0a, $84, $0a, $0a, $8e, $00 + db $ff SECTION "bank47", ROMX, BANK[$47] @@ -19015,19 +19156,133 @@ Function11d1fc: ; 11d1fc (47:51fc) ; 11d208 (47:5208) Unknown_11d208: ; 11d208 -INCBIN "baserom.gbc",$11d208,$11d21a - $11d208 + db $0d, $1a + db $3d, $1a + db $6d, $1a + db $0d, $2a + db $3d, $2a + db $6d, $2a + db $0d, $8a + db $3d, $8a + db $6d, $8a + Unknown_11d21a: ; 11d21a -INCBIN "baserom.gbc",$11d21a,$11d23e - $11d21a + db $0d, $42 + db $3d, $42 + db $6d, $42 + db $0d, $52 + db $3d, $52 + db $6d, $52 + db $0d, $62 + db $3d, $62 + db $6d, $62 + db $0d, $72 + db $3d, $72 + db $6d, $72 + db $0d, $82 + db $3d, $82 + db $6d, $82 + db $0d, $92 + db $3d, $92 + db $6d, $92 + Unknown_11d23e: ; 11d23e -INCBIN "baserom.gbc",$11d23e,$11d29e - $11d23e + db $10, $48 + db $18, $48 + db $20, $48 + db $28, $48 + db $30, $48 + db $10, $58 + db $18, $58 + db $20, $58 + db $28, $58 + db $30, $58 + db $10, $68 + db $18, $68 + db $20, $68 + db $28, $68 + db $30, $68 + db $10, $78 + db $18, $78 + db $20, $78 + db $28, $78 + db $30, $78 + db $40, $48 + db $48, $48 + db $50, $48 + db $58, $48 + db $60, $48 + db $40, $58 + db $48, $58 + db $50, $58 + db $58, $58 + db $60, $58 + db $40, $68 + db $48, $68 + db $50, $68 + db $58, $68 + db $60, $68 + db $70, $48 + db $80, $48 + db $90, $48 + db $40, $78 + db $48, $78 + db $50, $78 + db $58, $78 + db $60, $78 + db $70, $58 + db $70, $68 + db $0d, $92 + db $3d, $92 + db $6d, $92 + Unknown_11d29e: ; 11d29e -INCBIN "baserom.gbc",$11d29e,$11d2b6 - $11d29e + db $10, $50 + db $40, $50 + db $70, $50 + db $10, $60 + db $40, $60 + db $70, $60 + db $10, $70 + db $40, $70 + db $70, $70 + db $10, $80 + db $40, $80 + db $70, $80 + Unknown_11d2b6: ; 11d2b6 -INCBIN "baserom.gbc",$11d2b6,$11d2ba - $11d2b6 + db $80, $50 + db $80, $60 + Unknown_11d2ba: ; 11d2ba -INCBIN "baserom.gbc",$11d2ba,$11d2be - $11d2ba + db $20, $50 + db $20, $60 + Unknown_11d2be: ; 11d2be -INCBIN "baserom.gbc",$11d2be,$11d2ee - $11d2be + db $28, $28 + db $28, $28 + db $28, $28 + db $28, $28 + db $28, $28 + db $28, $28 + db $28, $28 + db $28, $28 + db $28, $28 + db $28, $28 + db $28, $28 + db $28, $28 + db $28, $28 + db $28, $28 + db $28, $28 + db $28, $28 + db $28, $28 + db $28, $28 + db $28, $28 + db $28, $28 + db $28, $28 + db $28, $28 + db $29, $26 + db $26, $26 Function11d2ee: ; 11d2ee (47:52ee) ld hl, wcd24 @@ -20288,20 +20543,701 @@ Unknown_11f100: ; 11f100 ; 11f220 Unknown_11f220: -INCBIN "baserom.gbc",$11f220,$11f23c - $11f220 + db $12, $01, $24, $02 + db $45, $05, $45, $05 + db $42, $05, $42, $05 + db $45, $05, $42, $05 + db $27, $03, $27, $03 + db $45, $05, $27, $03 + db $42, $05, $24, $02 Unknown_11f23c: -INCBIN "baserom.gbc",$11f23c,$11f2f0 - $11f23c + db $12, $00, $2f, $00 + db $70, $00, $1e, $00 + db $ac, $00, $11, $00 + db $ce, $00, $09, $00 + db $e0, $00, $2e, $00 + db $3c, $01, $24, $00 + db $84, $01, $1b, $00 + db $ba, $01, $09, $00 + db $cc, $01, $07, $00 + db $da, $01, $1c, $00 + db $12, $02, $12, $00 + db $36, $02, $2b, $00 + db $8c, $02, $10, $00 + db $ac, $02, $08, $00 + db $bc, $02, $0c, $00 + db $d4, $02, $2c, $00 + db $2c, $03, $09, $00 + db $3e, $03, $12, $00 + db $62, $03, $1b, $00 + db $98, $03, $1a, $00 + db $cc, $03, $1c, $00 + db $04, $04, $05, $00 + db $0e, $04, $02, $00 + db $12, $04, $05, $00 + db $1c, $04, $07, $00 + db $2a, $04, $16, $00 + db $56, $04, $0e, $00 + db $72, $04, $0c, $00 + db $8a, $04, $05, $00 + db $94, $04, $16, $00 + db $c0, $04, $19, $00 + db $f2, $04, $0e, $00 + db $0e, $05, $08, $00 + db $1e, $05, $07, $00 + db $2c, $05, $09, $00 + db $3e, $05, $0d, $00 + db $58, $05, $04, $00 + db $60, $05, $14, $00 + db $88, $05, $0b, $00 + db $9e, $05, $01, $00 + db $a0, $05, $02, $00 + db $a4, $05, $02, $00 + db $a8, $05, $02, $00 + db $ac, $05, $15, $00 + db $00, $00, $09, $00 Unknown_11f2f0: -INCBIN "baserom.gbc",$11f2f0,$11f332 - $11f2f0 + db $00, $01, $01, $00, $00, $01 + db $00, $01, $00, $00, $01, $00 + db $00, $01, $00, $00, $00, $01 + db $00, $00, $01, $00, $00, $00 + db $01, $01, $00, $01, $01, $00 + db $00, $00, $01, $01, $01, $00 + db $00, $00, $01, $00, $00, $00 + db $00, $00, $00, $00, $00, $00 + db $00, $00, $00, $00, $01, $00 + db $01, $00, $01, $00, $00, $01 + db $01, $01, $00, $00, $00, $01 + Unknown_11f332: -INCBIN "baserom.gbc",$11f332,$11f3ce - $11f332 + dw Unknown_11f338 + dw Unknown_11f36a + dw Unknown_11f39c + +Unknown_11f338: ; 11f338 + dw UnknownText_0x11f42e + dw UnknownText_0x11f43d + dw UnknownText_0x11f44c + dw UnknownText_0x11f45b + dw UnknownText_0x11f46a + dw UnknownText_0x11f479 + dw UnknownText_0x11f488 + dw UnknownText_0x11f497 + dw UnknownText_0x11f4a6 + dw UnknownText_0x11f4b5 + dw UnknownText_0x11f4c4 + dw UnknownText_0x11f4d3 + dw UnknownText_0x11f4e2 + dw UnknownText_0x11f4f1 + dw UnknownText_0x11f500 + dw UnknownText_0x11f50f + dw UnknownText_0x11f51e + dw UnknownText_0x11f52d + dw UnknownText_0x11f53c + dw UnknownText_0x11f54b + dw UnknownText_0x11f55a + dw UnknownText_0x11f569 + dw UnknownText_0x11f578 + dw UnknownText_0x11f587 + dw UnknownText_0x11f596 + +Unknown_11f36a: ; 11f36a + dw UnknownText_0x11f433 + dw UnknownText_0x11f442 + dw UnknownText_0x11f451 + dw UnknownText_0x11f460 + dw UnknownText_0x11f46f + dw UnknownText_0x11f47e + dw UnknownText_0x11f48d + dw UnknownText_0x11f49c + dw UnknownText_0x11f4ab + dw UnknownText_0x11f4ba + dw UnknownText_0x11f4c9 + dw UnknownText_0x11f4d8 + dw UnknownText_0x11f4e7 + dw UnknownText_0x11f4f6 + dw UnknownText_0x11f505 + dw UnknownText_0x11f514 + dw UnknownText_0x11f523 + dw UnknownText_0x11f532 + dw UnknownText_0x11f541 + dw UnknownText_0x11f550 + dw UnknownText_0x11f55f + dw UnknownText_0x11f56e + dw UnknownText_0x11f57d + dw UnknownText_0x11f58c + dw UnknownText_0x11f59b + +Unknown_11f39c: ; 11f39c + dw UnknownText_0x11f438 + dw UnknownText_0x11f447 + dw UnknownText_0x11f456 + dw UnknownText_0x11f465 + dw UnknownText_0x11f474 + dw UnknownText_0x11f483 + dw UnknownText_0x11f492 + dw UnknownText_0x11f4a1 + dw UnknownText_0x11f4b0 + dw UnknownText_0x11f4bf + dw UnknownText_0x11f4ce + dw UnknownText_0x11f4dd + dw UnknownText_0x11f4ec + dw UnknownText_0x11f4fb + dw UnknownText_0x11f50a + dw UnknownText_0x11f519 + dw UnknownText_0x11f528 + dw UnknownText_0x11f537 + dw UnknownText_0x11f546 + dw UnknownText_0x11f555 + dw UnknownText_0x11f564 + dw UnknownText_0x11f573 + dw UnknownText_0x11f582 + dw UnknownText_0x11f591 + dw UnknownText_0x11f5a0 + Unknown_11f3ce: -INCBIN "baserom.gbc",$11f3ce,$11f686 - $11f3ce + dw Unknown_11f3d4 + dw Unknown_11f3f2 + dw Unknown_11f410 +Unknown_11f3d4: ; 11f3d4 + dw UnknownText_0x11f5a5 + dw UnknownText_0x11f5b4 + dw UnknownText_0x11f5c3 + dw UnknownText_0x11f5d2 + dw UnknownText_0x11f5e1 + dw UnknownText_0x11f5f0 + dw UnknownText_0x11f5ff + dw UnknownText_0x11f60e + dw UnknownText_0x11f61d + dw UnknownText_0x11f62c + dw UnknownText_0x11f63b + dw UnknownText_0x11f64a + dw UnknownText_0x11f659 + dw UnknownText_0x11f668 + dw UnknownText_0x11f677 + +Unknown_11f3f2: ; 11f3f2 + dw UnknownText_0x11f5aa + dw UnknownText_0x11f5b9 + dw UnknownText_0x11f5c8 + dw UnknownText_0x11f5d7 + dw UnknownText_0x11f5e6 + dw UnknownText_0x11f5f5 + dw UnknownText_0x11f604 + dw UnknownText_0x11f613 + dw UnknownText_0x11f622 + dw UnknownText_0x11f631 + dw UnknownText_0x11f640 + dw UnknownText_0x11f64f + dw UnknownText_0x11f65e + dw UnknownText_0x11f66d + dw UnknownText_0x11f67c + +Unknown_11f410: ; 11f410 + dw UnknownText_0x11f5af + dw UnknownText_0x11f5be + dw UnknownText_0x11f5cd + dw UnknownText_0x11f5dc + dw UnknownText_0x11f5eb + dw UnknownText_0x11f5fa + dw UnknownText_0x11f609 + dw UnknownText_0x11f618 + dw UnknownText_0x11f627 + dw UnknownText_0x11f636 + dw UnknownText_0x11f645 + dw UnknownText_0x11f654 + dw UnknownText_0x11f663 + dw UnknownText_0x11f672 + dw UnknownText_0x11f681 + + +UnknownText_0x11f42e: ; 0x11f42e + text_jump UnknownText_0x1ec000 + db "@" + +UnknownText_0x11f433: ; 0x11f433 + text_jump UnknownText_0x1ec03b + db "@" + +UnknownText_0x11f438: ; 0x11f438 + text_jump UnknownText_0x1ec060 + db "@" + +UnknownText_0x11f43d: ; 0x11f43d + text_jump UnknownText_0x1ec080 + db "@" + +UnknownText_0x11f442: ; 0x11f442 + text_jump UnknownText_0x1ec0a3 + db "@" + +UnknownText_0x11f447: ; 0x11f447 + text_jump UnknownText_0x1ec0c4 + db "@" + +UnknownText_0x11f44c: ; 0x11f44c + text_jump UnknownText_0x1ec0e1 + db "@" + +UnknownText_0x11f451: ; 0x11f451 + text_jump UnknownText_0x1ec108 + db "@" + +UnknownText_0x11f456: ; 0x11f456 + text_jump UnknownText_0x1ec12a + db "@" + +UnknownText_0x11f45b: ; 0x11f45b + text_jump UnknownText_0x1ec14d + db "@" + +UnknownText_0x11f460: ; 0x11f460 + text_jump UnknownText_0x1ec16f + db "@" + +UnknownText_0x11f465: ; 0x11f465 + text_jump UnknownText_0x1ec190 + db "@" + +UnknownText_0x11f46a: ; 0x11f46a + text_jump UnknownText_0x1ec1ae + db "@" + +UnknownText_0x11f46f: ; 0x11f46f + text_jump UnknownText_0x1ec1d0 + db "@" + +UnknownText_0x11f474: ; 0x11f474 + text_jump UnknownText_0x1ec1f4 + db "@" + +UnknownText_0x11f479: ; 0x11f479 + text_jump UnknownText_0x1ec216 + db "@" + +UnknownText_0x11f47e: ; 0x11f47e + text_jump UnknownText_0x1ec238 + db "@" + +UnknownText_0x11f483: ; 0x11f483 + text_jump UnknownText_0x1ec259 + db "@" + +UnknownText_0x11f488: ; 0x11f488 + text_jump UnknownText_0x1ec27b + db "@" + +UnknownText_0x11f48d: ; 0x11f48d + text_jump UnknownText_0x1ec2a0 + db "@" + +UnknownText_0x11f492: ; 0x11f492 + text_jump UnknownText_0x1ec2c0 + db "@" + +UnknownText_0x11f497: ; 0x11f497 + text_jump UnknownText_0x1ec2d9 + db "@" + +UnknownText_0x11f49c: ; 0x11f49c + text_jump UnknownText_0x1ec2fe + db "@" + +UnknownText_0x11f4a1: ; 0x11f4a1 + text_jump UnknownText_0x1ec320 + db "@" + +UnknownText_0x11f4a6: ; 0x11f4a6 + text_jump UnknownText_0x1ec33f + db "@" + +UnknownText_0x11f4ab: ; 0x11f4ab + text_jump UnknownText_0x1ec36c + db "@" + +UnknownText_0x11f4b0: ; 0x11f4b0 + text_jump UnknownText_0x1ec389 + db "@" + +UnknownText_0x11f4b5: ; 0x11f4b5 + text_jump UnknownText_0x1ec3ad + db "@" + +UnknownText_0x11f4ba: ; 0x11f4ba + text_jump UnknownText_0x1ec3c5 + db "@" + +UnknownText_0x11f4bf: ; 0x11f4bf + text_jump UnknownText_0x1ec3e5 + db "@" + +UnknownText_0x11f4c4: ; 0x11f4c4 + text_jump UnknownText_0x1ec402 + db "@" + +UnknownText_0x11f4c9: ; 0x11f4c9 + text_jump UnknownText_0x1ec411 + db "@" + +UnknownText_0x11f4ce: ; 0x11f4ce + text_jump UnknownText_0x1ec41f + db "@" + +UnknownText_0x11f4d3: ; 0x11f4d3 + text_jump UnknownText_0x1ec42e + db "@" + +UnknownText_0x11f4d8: ; 0x11f4d8 + text_jump UnknownText_0x1ec461 + db "@" + +UnknownText_0x11f4dd: ; 0x11f4dd + text_jump UnknownText_0x1ec4a0 + db "@" + +UnknownText_0x11f4e2: ; 0x11f4e2 + text_jump UnknownText_0x1ec4d6 + db "@" + +UnknownText_0x11f4e7: ; 0x11f4e7 + text_jump UnknownText_0x1ec4f5 + db "@" + +UnknownText_0x11f4ec: ; 0x11f4ec + text_jump UnknownText_0x1ec512 + db "@" + +UnknownText_0x11f4f1: ; 0x11f4f1 + text_jump UnknownText_0x1ec532 + db "@" + +UnknownText_0x11f4f6: ; 0x11f4f6 + text_jump UnknownText_0x1ec54b + db "@" + +UnknownText_0x11f4fb: ; 0x11f4fb + text_jump UnknownText_0x1ec565 + db "@" + +UnknownText_0x11f500: ; 0x11f500 + text_jump UnknownText_0x1ec580 + db "@" + +UnknownText_0x11f505: ; 0x11f505 + text_jump UnknownText_0x1ec59d + db "@" + +UnknownText_0x11f50a: ; 0x11f50a + text_jump UnknownText_0x1ec5b5 + db "@" + +UnknownText_0x11f50f: ; 0x11f50f + text_jump UnknownText_0x1ec5d3 + db "@" + +UnknownText_0x11f514: ; 0x11f514 + text_jump UnknownText_0x1ec5ee + db "@" + +UnknownText_0x11f519: ; 0x11f519 + text_jump UnknownText_0x1ec60d + db "@" + +UnknownText_0x11f51e: ; 0x11f51e + text_jump UnknownText_0x1ec631 + db "@" + +UnknownText_0x11f523: ; 0x11f523 + text_jump UnknownText_0x1ec651 + db "@" + +UnknownText_0x11f528: ; 0x11f528 + text_jump UnknownText_0x1ec68f + db "@" + +UnknownText_0x11f52d: ; 0x11f52d + text_jump UnknownText_0x1ec6b1 + db "@" + +UnknownText_0x11f532: ; 0x11f532 + text_jump UnknownText_0x1ec6d0 + db "@" + +UnknownText_0x11f537: ; 0x11f537 + text_jump UnknownText_0x1ec708 + db "@" + +UnknownText_0x11f53c: ; 0x11f53c + text_jump UnknownText_0x1ec720 + db "@" + +UnknownText_0x11f541: ; 0x11f541 + text_jump UnknownText_0x1ec73e + db "@" + +UnknownText_0x11f546: ; 0x11f546 + text_jump UnknownText_0x1ec75b + db "@" + +UnknownText_0x11f54b: ; 0x11f54b + text_jump UnknownText_0x1ec77f + db "@" + +UnknownText_0x11f550: ; 0x11f550 + text_jump UnknownText_0x1ec798 + db "@" + +UnknownText_0x11f555: ; 0x11f555 + text_jump UnknownText_0x1ec7bb + db "@" + +UnknownText_0x11f55a: ; 0x11f55a + text_jump UnknownText_0x1ec7d8 + db "@" + +UnknownText_0x11f55f: ; 0x11f55f + text_jump UnknownText_0x1ec818 + db "@" + +UnknownText_0x11f564: ; 0x11f564 + text_jump UnknownText_0x1ec837 + db "@" + +UnknownText_0x11f569: ; 0x11f569 + text_jump UnknownText_0x1ec858 + db "@" + +UnknownText_0x11f56e: ; 0x11f56e + text_jump UnknownText_0x1ec876 + db "@" + +UnknownText_0x11f573: ; 0x11f573 + text_jump UnknownText_0x1ec898 + db "@" + +UnknownText_0x11f578: ; 0x11f578 + text_jump UnknownText_0x1ec8b1 + db "@" + +UnknownText_0x11f57d: ; 0x11f57d + text_jump UnknownText_0x1ec8d5 + db "@" + +UnknownText_0x11f582: ; 0x11f582 + text_jump UnknownText_0x1ec8f0 + db "@" + +UnknownText_0x11f587: ; 0x11f587 + text_jump UnknownText_0x1ec911 + db "@" + +UnknownText_0x11f58c: ; 0x11f58c + text_jump UnknownText_0x1ec928 + db "@" + +UnknownText_0x11f591: ; 0x11f591 + text_jump UnknownText_0x1ec949 + db "@" + +UnknownText_0x11f596: ; 0x11f596 + text_jump UnknownText_0x1ec969 + db "@" + +UnknownText_0x11f59b: ; 0x11f59b + text_jump UnknownText_0x1ec986 + db "@" + +UnknownText_0x11f5a0: ; 0x11f5a0 + text_jump UnknownText_0x1ec99b + db "@" + + + + +UnknownText_0x11f5a5: ; 0x11f5a5 + text_jump UnknownText_0x1ec9bd + db "@" + +UnknownText_0x11f5aa: ; 0x11f5aa + text_jump UnknownText_0x1ec9d9 + db "@" + +UnknownText_0x11f5af: ; 0x11f5af + text_jump UnknownText_0x1ec9f7 + db "@" + +UnknownText_0x11f5b4: ; 0x11f5b4 + text_jump UnknownText_0x1eca0a + db "@" + +UnknownText_0x11f5b9: ; 0x11f5b9 + text_jump UnknownText_0x1eca2a + db "@" + +UnknownText_0x11f5be: ; 0x11f5be + text_jump UnknownText_0x1eca47 + db "@" + +UnknownText_0x11f5c3: ; 0x11f5c3 + text_jump UnknownText_0x1eca64 + db "@" + +UnknownText_0x11f5c8: ; 0x11f5c8 + text_jump UnknownText_0x1eca82 + db "@" + +UnknownText_0x11f5cd: ; 0x11f5cd + text_jump UnknownText_0x1eca9d + db "@" + +UnknownText_0x11f5d2: ; 0x11f5d2 + text_jump UnknownText_0x1ecabf + db "@" + +UnknownText_0x11f5d7: ; 0x11f5d7 + text_jump UnknownText_0x1ecade + db "@" + +UnknownText_0x11f5dc: ; 0x11f5dc + text_jump UnknownText_0x1ecafa + db "@" + +UnknownText_0x11f5e1: ; 0x11f5e1 + text_jump UnknownText_0x1ecb19 + db "@" + +UnknownText_0x11f5e6: ; 0x11f5e6 + text_jump UnknownText_0x1ecb37 + db "@" + +UnknownText_0x11f5eb: ; 0x11f5eb + text_jump UnknownText_0x1ecb55 + db "@" + +UnknownText_0x11f5f0: ; 0x11f5f0 + text_jump UnknownText_0x1ecb70 + db "@" + +UnknownText_0x11f5f5: ; 0x11f5f5 + text_jump UnknownText_0x1ecb92 + db "@" + +UnknownText_0x11f5fa: ; 0x11f5fa + text_jump UnknownText_0x1ecbb6 + db "@" + +UnknownText_0x11f5ff: ; 0x11f5ff + text_jump UnknownText_0x1ecbd9 + db "@" + +UnknownText_0x11f604: ; 0x11f604 + text_jump UnknownText_0x1ecbf3 + db "@" + +UnknownText_0x11f609: ; 0x11f609 + text_jump UnknownText_0x1ecc15 + db "@" + +UnknownText_0x11f60e: ; 0x11f60e + text_jump UnknownText_0x1ecc39 + db "@" + +UnknownText_0x11f613: ; 0x11f613 + text_jump UnknownText_0x1ecc55 + db "@" + +UnknownText_0x11f618: ; 0x11f618 + text_jump UnknownText_0x1ecc75 + db "@" + +UnknownText_0x11f61d: ; 0x11f61d + text_jump UnknownText_0x1ecc92 + db "@" + +UnknownText_0x11f622: ; 0x11f622 + text_jump UnknownText_0x1ecca7 + db "@" + +UnknownText_0x11f627: ; 0x11f627 + text_jump UnknownText_0x1eccc1 + db "@" + +UnknownText_0x11f62c: ; 0x11f62c + text_jump UnknownText_0x1eccd7 + db "@" + +UnknownText_0x11f631: ; 0x11f631 + text_jump UnknownText_0x1eccef + db "@" + +UnknownText_0x11f636: ; 0x11f636 + text_jump UnknownText_0x1ecd0e + db "@" + +UnknownText_0x11f63b: ; 0x11f63b + text_jump UnknownText_0x1ecd2b + db "@" + +UnknownText_0x11f640: ; 0x11f640 + text_jump UnknownText_0x1ecd4d + db "@" + +UnknownText_0x11f645: ; 0x11f645 + text_jump UnknownText_0x1ecd6b + db "@" + +UnknownText_0x11f64a: ; 0x11f64a + text_jump UnknownText_0x1ecd8d + db "@" + +UnknownText_0x11f64f: ; 0x11f64f + text_jump UnknownText_0x1ecdaf + db "@" + +UnknownText_0x11f654: ; 0x11f654 + text_jump UnknownText_0x1ecdcf + db "@" + +UnknownText_0x11f659: ; 0x11f659 + text_jump UnknownText_0x1ecded + db "@" + +UnknownText_0x11f65e: ; 0x11f65e + text_jump UnknownText_0x1ece0d + db "@" + +UnknownText_0x11f663: ; 0x11f663 + text_jump UnknownText_0x1ece2a + db "@" + +UnknownText_0x11f668: ; 0x11f668 + text_jump UnknownText_0x1ece4b + db "@" + +UnknownText_0x11f66d: ; 0x11f66d + text_jump UnknownText_0x1ece70 + db "@" + +UnknownText_0x11f672: ; 0x11f672 + text_jump UnknownText_0x1ece8a + db "@" + +UnknownText_0x11f677: ; 0x11f677 + text_jump UnknownText_0x1ecea8 + db "@" + +UnknownText_0x11f67c: ; 0x11f67c + text_jump UnknownText_0x1ecec9 + db "@" + +UnknownText_0x11f681: ; 0x11f681 + text_jump UnknownText_0x1ecee8 + db "@" SECTION "bank5B", ROMX, BANK[$5B] @@ -23215,7 +24151,17 @@ Function170b44: ; 170b44 ; 170b90 Unknown_170b90: -INCBIN "baserom.gbc",$170b90,$170bd2 - $170b90 + db $12, $13, $14, $15, $18, $17 + db $16, $19, $04, $05, $11, $01 + db $1c, $1b, $21, $1e, $1a, $1d + db $1f, $3c, $20, $27, $27, $27 + db $28, $0a, $23, $24, $2a, $2b + db $35, $40, $2a, $29, $22, $25 + db $3a, $2b, $24, $49, $2b, $07 + db $2c, $2d, $4a, $0d, $4b, $3a + db $2b, $41, $35, $27, $28, $27 + db $36, $3e, $30, $2c, $2d, $3d + db $26, $2e, $06, $07, $43, $36 Function170bd2: ; 170bd2 ret diff --git a/misc/mobile_5f.asm b/misc/mobile_5f.asm index 375701a2c..b39c1d6ae 100644 --- a/misc/mobile_5f.asm +++ b/misc/mobile_5f.asm @@ -93,11 +93,89 @@ INCBIN "gfx/mobile/select.2bpp" HaveWantMap: ; 17cb83 ; Interleaved tile/palette map. -INCBIN "baserom.gbc", $17cb83, $17cff3 - $17cb83 +INCBIN "gfx/mobile/havewant_map.bin" HaveWantPals: ; 17cff3 ; BG and OBJ palettes. -INCBIN "baserom.gbc", $17cff3, $17d073 - $17cff3 + RGB 0, 0, 0 + RGB 21, 21, 21 + RGB 0, 0, 0 + RGB 0, 0, 0 + + RGB 0, 0, 0 + RGB 4, 17, 29 + RGB 6, 19, 31 + RGB 31, 31, 31 + + RGB 0, 0, 0 + RGB 0, 0, 0 + RGB 0, 0, 0 + RGB 0, 0, 0 + + RGB 0, 0, 0 + RGB 2, 13, 18 + RGB 6, 19, 31 + RGB 31, 31, 31 + + RGB 0, 0, 0 + RGB 31, 5, 5 + RGB 29, 21, 21 + RGB 31, 31, 31 + + 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 4, 17, 29 + RGB 6, 19, 31 + RGB 2, 15, 27 + + RGB 0, 0, 0 + RGB 28, 19, 18 + RGB 25, 9, 0 + RGB 0, 0, 0 + + RGB 0, 0, 0 + RGB 31, 27, 27 + RGB 31, 10, 4 + RGB 29, 0, 0 + + RGB 0, 0, 0 + RGB 31, 31, 31 + RGB 26, 8, 23 + RGB 22, 0, 16 + + RGB 0, 0, 0 + RGB 31, 31, 31 + RGB 20, 8, 31 + RGB 15, 1, 26 + + RGB 0, 0, 0 + RGB 31, 31, 31 + RGB 17, 12, 31 + RGB 12, 6, 31 + + RGB 0, 16, 0 + RGB 11, 11, 14 + RGB 5, 5, 7 + RGB 31, 31, 31 + + RGB 0, 31, 0 + RGB 0, 0, 0 + RGB 0, 0, 0 + RGB 0, 0, 0 + + RGB 16, 31, 0 + RGB 0, 0, 0 + RGB 0, 0, 0 + RGB 0, 0, 0 Function17d073: ; 17d073 @@ -258,7 +336,8 @@ Function17d187: ; 17d187 ; 17d194 Unknown_17d194: -INCBIN "baserom.gbc", $17d194, $17d199 - $17d194 + db "クりス@@" +; 17d198 Function17d199: ; 17d199 ld hl, Unknown_17d1a6 @@ -269,7 +348,7 @@ Function17d199: ; 17d199 ; 17d1a6 Unknown_17d1a6: -INCBIN "baserom.gbc", $17d1a6, $17d1ab - $17d1a6 + db "?????" Function17d1ab: ; 17d1ab ld a, $50 @@ -284,7 +363,8 @@ Function17d1ab: ; 17d1ab ; 17d1c3 Unknown_17d1c3: -INCBIN "baserom.gbc", $17d1c3, $17d1c9 - $17d1c3 + db "こんにちは@" +; 17d1c9 Function17d1c9: ; 17d1c9 ld a, $50 From 411335983e2d5be7dfebd802bbe57ec715c30461 Mon Sep 17 00:00:00 2001 From: yenatch Date: Wed, 11 Mar 2015 21:21:03 -0700 Subject: [PATCH 3/8] Unused palette maps? --- tilesets/palette_maps.asm | 9 ++++++--- tilesets/unused_palette_map_1.bin | Bin 0 -> 112 bytes tilesets/unused_palette_map_2.bin | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 tilesets/unused_palette_map_1.bin create mode 100644 tilesets/unused_palette_map_2.bin diff --git a/tilesets/palette_maps.asm b/tilesets/palette_maps.asm index 9f2f76676..fc5867aad 100644 --- a/tilesets/palette_maps.asm +++ b/tilesets/palette_maps.asm @@ -105,7 +105,9 @@ Tileset20PalMap: ; 0x4caf5 INCBIN "tilesets/20_palette_map.bin" ; 0x4cb65 -INCBIN "baserom.gbc", $4cb65, $4cbd5 - $4cb65 +UnusedPalMap1: +INCBIN "tilesets/unused_palette_map_1.bin" +; 4cbd5 Tileset29PalMap: ; 0x4cbd5 INCBIN "tilesets/29_palette_map.bin" @@ -127,5 +129,6 @@ Tileset04PalMap: ; 0x4cd95 INCBIN "tilesets/04_palette_map.bin" ; 0x4ce05 -INCBIN "baserom.gbc", $4ce05, $4ce1f - $4ce05 - +UnusedPalMap2: +INCBIN "tilesets/unused_palette_map_2.bin" +; 4ce1f diff --git a/tilesets/unused_palette_map_1.bin b/tilesets/unused_palette_map_1.bin new file mode 100644 index 0000000000000000000000000000000000000000..04cb3ff2d026e4b9ec5df1fc71f1400211a98001 GIT binary patch literal 112 zcmWf3Q49)Y00JPL3Zg>;Qo};i($au5TUZ)M1Vjje7$EQ;4a`2X^48rBAOO;DLG;}l YZ|~iG_wF5#?z{I6BmyF4f*2qG0DJp5I{*Lx literal 0 HcmV?d00001 diff --git a/tilesets/unused_palette_map_2.bin b/tilesets/unused_palette_map_2.bin new file mode 100644 index 000000000..aba1b3cbf --- /dev/null +++ b/tilesets/unused_palette_map_2.bin @@ -0,0 +1 @@ + \ No newline at end of file From 75ba97a039796bbecf1390edbe71c73dc52f124f Mon Sep 17 00:00:00 2001 From: yenatch Date: Wed, 11 Mar 2015 22:23:30 -0700 Subject: [PATCH 4/8] no more incbins --- lib/mobile/main.asm | 101 ++++++++++++++++++++++++++++++++------------ 1 file changed, 75 insertions(+), 26 deletions(-) diff --git a/lib/mobile/main.asm b/lib/mobile/main.asm index 6b6e3eacc..7fb32906d 100644 --- a/lib/mobile/main.asm +++ b/lib/mobile/main.asm @@ -4866,58 +4866,65 @@ Function111f97: ; 111f97 (44:5f97) ds 14 Unknown_112000: ; 112000 -INCBIN "baserom.gbc", $112000, $112001 - $112000 + db $4b Unknown_112001: ; 112001 -INCBIN "baserom.gbc", $112001, $112006 - $112001 + db $99, $66, $10, $00, $00 Unknown_112006: ; 112006 -INCBIN "baserom.gbc", $112006, $112013 - $112006 + db $08, "NINTENDO", $02, $77, $80, $00 Unknown_112013: ; 112013 -INCBIN "baserom.gbc", $112013, $11201d - $112013 + db $99, $66, $11, $00, $00, $00, $00, $11, $80, $00 Unknown_11201d: ; 11201d -INCBIN "baserom.gbc", $11201d, $112023 - $11201d + db $99, $66, $12, $00, $00, $00 Unknown_112023: ; 112023 -INCBIN "baserom.gbc", $112023, $11202d - $112023 + db $99, $66, $13, $00, $00, $00, $00, $13, $80, $00 Unknown_11202d: ; 11202d -INCBIN "baserom.gbc", $11202d, $112037 - $11202d + db $99, $66, $17, $00, $00, $00, $00, $17, $80, $00 Unknown_112037: ; 112037 -INCBIN "baserom.gbc", $112037, $11203c - $112037 + db $99, $66, $21, $00, $00 Unknown_11203c: ; 11203c -INCBIN "baserom.gbc", $11203c, $112046 - $11203c + db $99, $66, $22, $00, $00, $00, $00, $22, $80, $00 Unknown_112046: ; 112046 -INCBIN "baserom.gbc", $112046, $112052 - $112046 + db $99, $66, $19, $00, $00, $02, $00, $60, $00, $7b, $80, $00 Unknown_112052: ; 112052 -INCBIN "baserom.gbc", $112052, $11205e - $112052 + db $99, $66, $19, $00, $00, $02, $60, $60, $00, $db, $80, $00 Unknown_11205e: ; 11205e -INCBIN "baserom.gbc", $11205e, $112063 - $11205e + db $99, $66, $1a, $00, $00 Unknown_112063: ; 112063 -INCBIN "baserom.gbc", $112063, $112068 - $112063 + db $99, $66, $28, $00, $00 Unknown_112068: ; 112068 -INCBIN "baserom.gbc", $112068, $112072 - $112068 + db $99, $66, $14, $00, $00, $00, $00, $14, $80, $00 Unknown_112072: ; 112072 -INCBIN "baserom.gbc", $112072, $11207d - $112072 + db $99, $66, $15, $00, $00, $01, $ff, $01, $15, $80, $00 Unknown_11207d: ; 11207d -INCBIN "baserom.gbc", $11207d, $112083 - $11207d + db $99, $66, $23, $00, $00, $06 Unknown_112083: ; 112083 -INCBIN "baserom.gbc", $112083, $112089 - $112083 + db $99, $66, $24, $00, $00, $01 Unknown_112089: ; 112089 -INCBIN "baserom.gbc", $112089, $11209e - $112089 + db $ec, $14, $c9 + db $e4, $0f, $0e + db $e0, $0c, $53 + db $c4, $07, $94 + db $b0, $05, $ee + db $ec, $10, $b4 + db $e4, $0c, $dd +; 11209e Unknown_11209e: db "HELO ", 0 @@ -8496,14 +8503,14 @@ Function1136c1: ; 1136c1 .asm_113734 ld hl, $cc0c - ld a, $8e + ld a, Unknown_113b8e % $100 ld [hli], a - ld a, $7b + ld a, Unknown_113b8e / $100 ld [hl], a ld hl, $cc0e - ld a, $70 + ld a, Unknown_113a70 % $100 ld [hli], a - ld a, $7a + ld a, Unknown_113a70 / $100 ld [hl], a ld hl, $cbe7 ld de, $cc18 @@ -8586,7 +8593,7 @@ Function1136c1: ; 1136c1 ld [$cc0d], a ld a, l ld [$cc0c], a - cp $8e + cp $8e ; XXX (Unknown_113b8e + $100) % $100 ??? jp nz, .asm_113751 ld de, $cc18 ld hl, $cbe7 @@ -9020,13 +9027,55 @@ Unknown_113a55: ; 113a55 db "Authorization: GB00 name=", $22, 0 ; 113a70 -INCBIN "baserom.gbc", $113a70, $113b70 - $113a70 +Unknown_113a70: + db $00, $00, $00, $07, $06, $04, $00, $0c, $04, $08, $00, $11, $02, $0c, $00, $16 + db $00, $10, $00, $07, $06, $14, $00, $0c, $04, $18, $00, $11, $02, $1c, $00, $16 + db $00, $20, $00, $07, $06, $24, $00, $0c, $04, $28, $00, $11, $02, $2c, $00, $16 + db $00, $30, $00, $07, $06, $34, $00, $0c, $04, $38, $00, $11, $02, $3c, $00, $16 + db $10, $04, $00, $05, $16, $18, $00, $09, $14, $2c, $00, $0e, $12, $00, $00, $14 + db $10, $14, $00, $05, $16, $28, $00, $09, $14, $3c, $00, $0e, $12, $10, $00, $14 + db $10, $24, $00, $05, $16, $38, $00, $09, $14, $0c, $00, $0e, $12, $20, $00, $14 + db $10, $34, $00, $05, $16, $08, $00, $09, $14, $1c, $00, $0e, $12, $30, $00, $14 + db $20, $14, $00, $04, $26, $20, $00, $0b, $24, $2c, $00, $10, $22, $38, $00, $17 + db $20, $04, $00, $04, $26, $10, $00, $0b, $24, $1c, $00, $10, $22, $28, $00, $17 + db $20, $34, $00, $04, $26, $00, $00, $0b, $24, $0c, $00, $10, $22, $18, $00, $17 + db $20, $24, $00, $04, $26, $30, $00, $0b, $24, $3c, $00, $10, $22, $08, $00, $17 + db $30, $00, $00, $06, $36, $1c, $00, $0a, $34, $38, $00, $0f, $32, $14, $00, $15 + db $30, $30, $00, $06, $36, $0c, $00, $0a, $34, $28, $00, $0f, $32, $04, $00, $15 + db $30, $20, $00, $06, $36, $3c, $00, $0a, $34, $18, $00, $0f, $32, $34, $00, $15 + db $30, $10, $00, $06, $36, $2c, $00, $0a, $34, $08, $00, $0f, $32, $24, $00, $15 +; 113b70 Unknown_113b70: ; 113b70 -INCBIN "baserom.gbc", $113b70, $113b7e - $113b70 + dw $cbe7 + dw $cbeb + dw $cbef + dw $cbf3 + dw $cbe7 + dw $cbeb + dw $cbef Unknown_113b7e: ; 113b7e -INCBIN "baserom.gbc", $113b7e, $113c8e - $113b7e + db $01,$23,$45,$67,$89,$ab,$cd,$ef + db $fe,$dc,$ba,$98,$76,$54,$32,$10 + +Unknown_113b8e: + db $78, $a4, $6a, $d7, $56, $b7, $c7, $e8, $db, $70, $20, $24, $ee, $ce, $bd, $c1 + db $af, $0f, $7c, $f5, $2a, $c6, $87, $47, $13, $46, $30, $a8, $01, $95, $46, $fd + db $d8, $98, $80, $69, $af, $f7, $44, $8b, $b1, $5b, $ff, $ff, $be, $d7, $5c, $89 + db $22, $11, $90, $6b, $93, $71, $98, $fd, $8e, $43, $79, $a6, $21, $08, $b4, $49 + db $62, $25, $1e, $f6, $40, $b3, $40, $c0, $51, $5a, $5e, $26, $aa, $c7, $b6, $e9 + db $5d, $10, $2f, $d6, $53, $14, $44, $02, $81, $e6, $a1, $d8, $c8, $fb, $d3, $e7 + db $e6, $cd, $e1, $21, $d6, $07, $37, $c3, $87, $0d, $d5, $f4, $ed, $14, $5a, $45 + db $05, $e9, $e3, $a9, $f8, $a3, $ef, $fc, $d9, $02, $6f, $67, $8a, $4c, $2a, $8d + db $42, $39, $fa, $ff, $81, $f6, $71, $87, $22, $61, $9d, $6d, $0c, $38, $e5, $fd + db $44, $ea, $be, $a4, $a9, $cf, $de, $4b, $60, $4b, $bb, $f6, $70, $bc, $bf, $be + db $c6, $7e, $9b, $28, $fa, $27, $a1, $ea, $85, $30, $ef, $d4, $05, $1d, $88, $04 + db $39, $d0, $d4, $d9, $e5, $99, $db, $e6, $f8, $7c, $a2, $1f, $65, $56, $ac, $c4 + db $44, $22, $29, $f4, $97, $ff, $2a, $43, $a7, $23, $94, $ab, $39, $a0, $93, $fc + db $c3, $59, $5b, $65, $92, $cc, $0c, $8f, $7d, $f4, $ef, $ff, $d1, $5d, $84, $85 + db $4f, $7e, $a8, $6f, $e0, $e6, $2c, $fe, $14, $43, $01, $a3, $a1, $11, $08, $4e + db $82, $7e, $53, $f7, $35, $f2, $3a, $bd, $bb, $d2, $d7, $2a, $91, $d3, $86, $eb Function113c8e: ; 113c8e ld a, c From 967977b7af6d2079f2fde6d151e6e1f9f9b34077 Mon Sep 17 00:00:00 2001 From: yenatch Date: Wed, 11 Mar 2015 22:25:54 -0700 Subject: [PATCH 5/8] baserom.gbc is no longer required to build --- INSTALL.md | 10 ---------- Makefile | 5 ----- 2 files changed, 15 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 67ad45e28..a3e551dda 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -10,8 +10,6 @@ git clone --recursive git://github.com/kanzure/pokecrystal.git cd pokecrystal -- Copy a Pokémon Crystal rom into `pokecrystal/`. Name it **baserom.gbc**. Eventually this will not be required. - To build **pokecrystal.gbc**: make @@ -35,8 +33,6 @@ In the shell, run: git clone --recursive git://github.com/kanzure/pokecrystal.git cd pokecrystal -- Copy a Pokémon Crystal rom into `pokecrystal/`. Name it **baserom.gbc**. Eventually this will not be required. - To build **pokecrystal.gbc**: make @@ -56,8 +52,6 @@ In the **Cygwin terminal**: git clone --recursive git://github.com/kanzure/pokecrystal.git cd pokecrystal -- Copy a Pokémon Crystal rom into `C:\cygwin\home\\pokecrystal`. Name it **baserom.gbc**. Eventually this will not be required. - To build: make @@ -91,7 +85,3 @@ ssh"): cd /vagrant/pokecrystal make - -To make the build work you will need to copy baserom.gbc into the "pokecrystal" -directory inside the "virtualbox" directory on the host machine. Eventually -this will not be required. diff --git a/Makefile b/Makefile index ca59f0bcf..357262f01 100644 --- a/Makefile +++ b/Makefile @@ -56,9 +56,6 @@ crystal: pokecrystal.gbc clean: rm -f $(roms) $(all_obj) $(roms:.gbc=.map) $(roms:.gbc=.sym) -baserom.gbc: ; - @echo "Wait! Need baserom.gbc first. Check README and INSTALL for details." && false - %.asm: ; $(all_obj): $$*.asm $$($$*_dep) @@ -70,12 +67,10 @@ $(all_obj): $$*.asm $$($$*_dep) pokecrystal11.gbc: $(crystal11_obj) rgblink -n $*.sym -m $*.map -o $@ $^ rgbfix -Cjv -i BYTE -k 01 -l 0x33 -m 0x10 -n 1 -p 0 -r 3 -t PM_CRYSTAL $@ - cmp crystal11.gbc $@ pokecrystal.gbc: $(crystal_obj) rgblink -n $*.sym -m $*.map -o $@ $^ rgbfix -Cjv -i BYTE -k 01 -l 0x33 -m 0x10 -p 0 -r 3 -t PM_CRYSTAL $@ - cmp baserom.gbc $@ pngs: From 074184c31c8f0279cede08fdb68f4ea3e167cad5 Mon Sep 17 00:00:00 2001 From: yenatch Date: Wed, 11 Mar 2015 22:35:47 -0700 Subject: [PATCH 6/8] builds both 1.0 and 1.1 --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 058e6d63b..3fceb92e8 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,10 @@ This is a disassembly of Pokémon Crystal. -The following rom is used as a base: +It builds the following roms: * Pokemon - Crystal Version (UE) (V1.0) [C][!].gbc `md5: 9f2922b235a5eeb78d65594e82ef5dde` +* Pokemon - Crystal Version (UE) (V1.1) [C][!].gbc `md5: 301899b8087289a6436b0a241fbbb474` To set up the repository, see [**INSTALL.md**](INSTALL.md). From a09903a2a465f0a5450c5be9feb3b75457b8a090 Mon Sep 17 00:00:00 2001 From: yenatch Date: Wed, 11 Mar 2015 22:37:36 -0700 Subject: [PATCH 7/8] make compare --- Makefile | 3 +++ roms.md5 | 2 ++ 2 files changed, 5 insertions(+) create mode 100644 roms.md5 diff --git a/Makefile b/Makefile index 357262f01..be38d9e08 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,5 @@ PYTHON := python +MD5 := md5sum -c --quiet .SUFFIXES: .SUFFIXES: .asm .o .gbc .png .2bpp .1bpp .lz .pal .bin .blk .tilemap @@ -56,6 +57,8 @@ crystal: pokecrystal.gbc clean: rm -f $(roms) $(all_obj) $(roms:.gbc=.map) $(roms:.gbc=.sym) +compare: pokecrystal.gbc pokecrystal11.gbc + @$(MD5) roms.md5 %.asm: ; $(all_obj): $$*.asm $$($$*_dep) diff --git a/roms.md5 b/roms.md5 new file mode 100644 index 000000000..79ca0bc51 --- /dev/null +++ b/roms.md5 @@ -0,0 +1,2 @@ +9f2922b235a5eeb78d65594e82ef5dde pokecrystal.gbc +301899b8087289a6436b0a241fbbb474 pokecrystal11.gbc From b5f55a5f6f6f07bf2c15acac0f3dea5811a6199c Mon Sep 17 00:00:00 2001 From: yenatch Date: Thu, 12 Mar 2015 12:03:52 -0700 Subject: [PATCH 8/8] bump extras so the build actually works without baserom.gbc also fixed some problems with gfx.py: - choking on filenames in graphics conversion - faulty 'repeat' method in the compressor --- extras | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extras b/extras index a87f66964..46492bd90 160000 --- a/extras +++ b/extras @@ -1 +1 @@ -Subproject commit a87f66964cc602ff5575efebf27c388ef03fa94d +Subproject commit 46492bd9075313a52622cc585fe7b2ca404cbdcd