From 788af45988dd98e58aeeb307ad51a2f12299588d Mon Sep 17 00:00:00 2001 From: yenatch Date: Wed, 11 Mar 2015 18:33:20 -0700 Subject: [PATCH] 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 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