From 71bc1436876d72a38c4d69cc2b9ce9c94f82d376 Mon Sep 17 00:00:00 2001 From: yenatch Date: Wed, 30 Jan 2013 01:38:32 -0500 Subject: [PATCH 1/3] A couple more general functions --- main.asm | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/main.asm b/main.asm index 18144c630..193830db7 100644 --- a/main.asm +++ b/main.asm @@ -2686,7 +2686,39 @@ CopyData: ; 0x9a52 ret ; 0x9a5b -INCBIN "baserom.gbc",$9a5b,$c000 - $9a5b +ClearBytes: ; 0x9a5b +; clear bc bytes of data starting from de + xor a + ld [de], a + inc de + dec bc + ld a, c + or b + jr nz, ClearBytes + ret +; 0x9a64 + +DrawDefaultTiles: ; 0x9a64 +; Draw 240 tiles (2/3 of the screen) from tiles in VRAM + ld hl, $9800 ; BG Map 0 + ld de, 32 - 20 + ld a, $80 ; starting tile + ld c, 12 + 1 +.line + ld b, 20 +.tile + ld [hli], a + inc a + dec b + jr nz, .tile +; next line + add hl, de + dec c + jr nz, .line + ret +; 0x9a7a + +INCBIN "baserom.gbc",$9a7a,$c000 - $9a7a SECTION "bank3",DATA,BANK[$3] From b13fba2500a3d9805b28ebcf5d21dc9afc6def62 Mon Sep 17 00:00:00 2001 From: yenatch Date: Wed, 30 Jan 2013 22:41:26 -0500 Subject: [PATCH 2/3] Some more uncompressed gfx --- gfx/misc/mobile_adapter.2bpp | Bin 0 -> 3232 bytes gfx/misc/mystery_gift.2bpp | Bin 0 -> 1072 bytes gfx/misc/mystery_gift_jp.2bpp | Bin 0 -> 1152 bytes gfx/misc/pack.2bpp | Bin 0 -> 2240 bytes gfx/misc/{division.2bpp => sgb_border.2bpp} | Bin main.asm | 33 +++++++++++++++++--- 6 files changed, 29 insertions(+), 4 deletions(-) create mode 100644 gfx/misc/mobile_adapter.2bpp create mode 100644 gfx/misc/mystery_gift.2bpp create mode 100644 gfx/misc/mystery_gift_jp.2bpp create mode 100644 gfx/misc/pack.2bpp rename gfx/misc/{division.2bpp => sgb_border.2bpp} (100%) diff --git a/gfx/misc/mobile_adapter.2bpp b/gfx/misc/mobile_adapter.2bpp new file mode 100644 index 0000000000000000000000000000000000000000..7c496ac42526737831fa14ed80548300cd8593a2 GIT binary patch literal 3232 zcmah~U2GIp6u#5xcJ`rR%1_ADY&xY>Lwq1BCfbC$gAjfmP-C)mWzcRd$m>_iDBSS;^Ylhc9d;rd6PsC7H{-(lqK&(4o<6ov9&Z4J?sp zVW~wa{v;U7W`Dl{XQl?OXMf?7hK8VJ<;vsnk)d(Uj~*RwES`d&{FDE1e(l;++}l08 z%)j;q=ME#_3IsGtRXKl}n{ahc1tmx%pCQJ@8}f*7%7JS*U`OWXa>Y|Ki2FZ?h!|VG zd}I)I!SeG=(;eYn-Z3pvVUnyUs;(P`sT+)Sc|L^~n3!ng^ER4e<3=8AI@d8xRaI0) zk(E#v?|Ow(<{FV@#5nBw>ImhG&?j8R~>B`CEC1mLpN~eXw^DCxSosVxTNv09Sapz$NX_C>rG6JULGAK z4Kl2SO|g|D`R|^hs=Ty@X_!q|-BGd$vYyMbEJ;*Wn*@1$_Cxi;Rj?*>YVbtQ)1y_P zaVyUyY15VeyUO(21##WRT(aBA?JNRkPgVFClI5}5OXv?Q!!Xfrc~!gOJJc6!#C<>y3H7wao*j(ZiQ=%}uE0`)qq zE^2TkI{P%4YRb;Ouf&R_dCY$%}-M!&#|Ja9XkbCzs zE1qoGxBdICo^D;iYHLrNxZXR~d+T%msw-MX;{Q}U6AVVMg^}$2<#bLk@ z@g$_(c0@Xdt!chz?lQ>?li~LPpaTZEE3H$_U2n6OqZ5F@d$rp5y`(z2oj_g2b_oT`{1Uqp;dD#Vg5kJ<;jE1CBa9G^`^;j;5Q01E1$kH^SHZ*Ix!h4TyAk8k zZIu>7EMkk;Q@ktq9gJy5gaeyoO%c9??PG66_!0IAI~U=9umYkS311|__Z^y?KRN&1 zkHW}y92@L-?6<*=kiYZs`3>iuf4@KEi~rhmdei9ze}{bg@o!)J`jzd+L*CVwTThRp z@ z-M9xjkQXneC>DeTON}*VPiY4-TrFir>_kLeUZn_ievIp{uhc+s4j7uj=y3T$Vs;l%>KR>BTK|tK)xzbFo}cRJPz$!@YMKcDCL?-b zTduZJkE`dAL)`NxFJ`fTg-5e@WBQH`+{fh4({Cnq-HSAmO{JAyUAN%@TrVE(w(0sh zCNS}qq3e1GY4=oXU7*oZf?^6!u={Umm{VjrFzY+{6wg^k}R zKf72mR1wQi>7}kNhr`ju+1i1Ljt&nG4SBsjW|<7Ichc$X?~g1+mcpN(eZm#>SUBwU zuB{o3re@^;CxV0D<|1>E=Nz>JgWTiyv&i`nGxiv8+nvrpAkg=f+43^581?!3`W%k4 z%(k~-Qd`XJ_6wd74)0Ma7je2*jN*@ViCsRfRC}h&b6iiWI7g$Mx*U! zhH?nWy5V}~(7CpX#(%H>Cb7alv{>Q4h|hEG9McK6VpD86cY@6u5NIfKbtYw45duiz zDcJSa3CW(gJ&ObEV$=Sev1#5l9k3mLnR&|8ZR|9*7+cVZZcG`=22CLK9Bc&3nhFIx UE0DoPs0ZTWwoyV~$p6hPCYB#?OrB;26BoJ};hpI{o%J{)yeJUQqJN zER~RRrin6+jF_%U+jFEr6K=uPGq)!vCnhQ?Vh>Y2sUE$BMr(6NljoB&L*>XgPAo46 zgOQM_?$DJBgBQJCK~NOZ_rdJ!bWK~$QJ?-xs+Ll4PL9j6ev9X^Or-HVzsrBC%8Kdu zGd#Z7)z#b8d$~KnY7!_N2p}*{LDHFK}ThA`Yea0f*V`-Yl~51uFk&z8dtBN15OWj~ayYQik)ZGPZUo{oDx2cp z$-wVNXb6p>5uyP^j)H`bhz6;ntYeKxk82(cKvC6k^)!)jMd&6PMl}2g{M3CFzcOlz R)%#i1`n1=YYKZ*jz+aa3N09&k literal 0 HcmV?d00001 diff --git a/gfx/misc/pack.2bpp b/gfx/misc/pack.2bpp new file mode 100644 index 0000000000000000000000000000000000000000..283d04fcea138c7797af4965065c56bd972b8e25 GIT binary patch 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-ywYXc*bC@Y{DUULqf< zkGAZ9p5K3VmdoYyXAG>bGLU~|fS)jqkKJyZ!8ene$)_rgn@Q;X?l+q)6!0q)4iB;Z z2gB=4r@dac8ywi%OC*ktVlm{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 Date: Thu, 31 Jan 2013 21:55:47 -0500 Subject: [PATCH 3/3] Credits Just the strings for now. These are probably pointed to from elsewhere. There is an unused/dummied string at line 90029 ("????????@"). Could someone have been removed from the credits? --- main.asm | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 115 insertions(+), 1 deletion(-) diff --git a/main.asm b/main.asm index 9a9ad64f7..e635665f3 100644 --- a/main.asm +++ b/main.asm @@ -89961,7 +89961,121 @@ IntroLogoGFX: ; 109407 INCBIN "gfx/intro/lz/logo.lz" ; 10983f -INCBIN "baserom.gbc", $10983f, $10c000 - $10983f +INCBIN "baserom.gbc", $10983f, $10aee1 - $10983f + +Credits: + db " SATOSHI TAJIRI@" + db " JUNICHI MASUDA@" + db " TETSUYA WATANABE@" + db " SHIGEKI MORIMOTO@" + db " SOUSUKE TAMADA@" + db " TAKENORI OOTA@" + db " KEN SUGIMORI@" + db " MOTOFUMI FUJIWARA@" + db " ATSUKO NISHIDA@" + db " MUNEO SAITO@" + db " SATOSHI OOTA@" + db " RENA YOSHIKAWA@" + db " JUN OKUTANI@" + db " HIRONOBU YOSHIDA@" + db " ASUKA IWASHITA@" + db " GO ICHINOSE@" + db " MORIKAZU AOKI@" + db " KOHJI NISHINO@" + db " KENJI MATSUSHIMA@" + db "TOSHINOBU MATSUMIYA@" + db " SATORU IWATA@" + db " NOBUHIRO SEYA@" + db " KAZUHITO SEKINE@" + db " TETSUJI OOTA@" + db "NCL SUPER MARIO CLUB@" + db " SARUGAKUCHO@" + db " AKITO MORI@" + db " TAKAHIRO HARADA@" + db " TOHRU HASHIMOTO@" + db " NOBORU MATSUMOTO@" + db " TAKEHIRO IZUSHI@" + db " TAKASHI KAWAGUCHI@" + db " TSUNEKAZU ISHIHARA@" + db " HIROSHI YAMAUCHI@" + db " KENJI SAIKI@" + db " ATSUSHI TADA@" + db " NAOKO KAWAKAMI@" + db " HIROYUKI ZINNAI@" + db " KUNIMI KAWAMURA@" + db " HISASHI SOGABE@" + db " KEITA KAGAYA@" + db " YOSHINORI MATSUDA@" + db " HITOMI SATO@" + db " TORU OSAWA@" + db " TAKAO OHARA@" + db " YUICHIRO ITO@" + db " TAKAO SHIMIZU@" + db " SPECIAL PRODUCTION", $4e + db " PLANNING", $4e + db " & DEVELOPMENT DEPT.@" + db " KEITA NAKAMURA@" + db " HIROTAKA UEMURA@" + db " HIROAKI TAMURA@" + db " NORIAKI SAKAGUCHI@" + db " MIYUKI SATO@" + db " GAKUZI NOMOTO@" + db " AI MASHIMA@" + db " MIKIHIRO ISHIKAWA@" + db " HIDEYUKI HASHIMOTO@" + db " SATOSHI YAMATO@" + db " SHIGERU MIYAMOTO@" + db " END@" + db " ????????@" + db " GAIL TILDEN@" + db " NOB OGASAWARA@" + db " SETH McMAHILL@" + db " HIROTO ALEXANDER@" + db " TERESA LILLYGREN@" + db " THOMAS HERTZOG@" + db " ERIK JOHNSON@" + db " HIRO NAKAMURA@" + db " TERUKI MURAKAWA@" + db " KAZUYOSHI OSAWA@" + db " KIMIKO NAKAMICHI@" + db " #MON", $4e + db " CRYSTAL VERSION", $4e + db " STAFF@" + db " DIRECTOR@" + db " CO-DIRECTOR@" + db " PROGRAMMERS@" + db " GRAPHICS DIRECTOR@" + db " MONSTER DESIGN@" + db " GRAPHICS DESIGN@" + db " MUSIC@" + db " SOUND EFFECTS@" + db " GAME DESIGN@" + db " GAME SCENARIO@" + db " TOOL PROGRAMMING@" + db " PARAMETRIC DESIGN@" + db " SCRIPT DESIGN@" + db " MAP DATA DESIGN@" + db " MAP DESIGN@" + db " PRODUCT TESTING@" + db " SPECIAL THANKS@" + db " PRODUCERS@" + db " EXECUTIVE PRODUCER@" + db " #MON ANIMATION@" + db " #DEX TEXT@" + db " MOBILE PRJ. LEADER@" + db " MOBILE SYSTEM AD.@" + db "MOBILE STADIUM DIR.@" + db " COORDINATION@" + db " US VERSION STAFF@" + db " US COORDINATION@" + db " TEXT TRANSLATION@" + db " PAAD TESTING@" + ; (C) 1 9 9 5 - 2 0 0 1 N i n t e n d o + db $60,$61,$62,$63,$64,$65,$66, $67, $68, $69, $6a, $6b, $6c, $4e + ; (C) 1 9 9 5 - 2 0 0 1 C r e a t u r e s i n c . + db $60,$61,$62,$63,$64,$65,$66, $6d, $6e, $6f, $70, $71, $72, $7a, $7b, $7c, $4e + ; (C) 1 9 9 5 - 2 0 0 1 G A M E F R E A K i n c . + db $60,$61,$62,$63,$64,$65,$66, $73, $74, $75, $76, $77, $78, $79, $7a, $7b, $7c, "@" SECTION "bank43",DATA,BANK[$43]