From 518234e1d28acc709eb88037707155df9f41feb4 Mon Sep 17 00:00:00 2001 From: Randy Thiemann Date: Fri, 27 Oct 2023 04:25:41 +0200 Subject: [PATCH] Graphics. --- bin/DMGTRIS.GBC | Bin 65536 -> 65536 bytes bin/DMGTRIS.pocket | Bin 65536 -> 65536 bytes src/gbc.asm | 41 +++++++++++++++++++++++++++-------------- 3 files changed, 27 insertions(+), 14 deletions(-) diff --git a/bin/DMGTRIS.GBC b/bin/DMGTRIS.GBC index 99e589205825e9129ec9dcfbaea1a71ca169e5b3..1e6e1a7beb0812039f2f9726b8cef60b18399209 100644 GIT binary patch delta 1914 zcmY+Fe{2(F7{~9uAMMtzW1VGdw*prNa&~LFAMLu8?KTxH$R7hToif-KF+oWTF(xn) zNGB>GBn-?Oj7EtkCYw=`K^hhmMNA=fOW%PBi3W|HI)R;I9I|Pw%hl)FyE*>2_rBlH z^Stl-ym#-tH!#2s46tWtM0=u`MNiSc-Nl>G9vkvIQz;*M2bJNsSU#bmXBc!c5#xqA z%S40dAVEB9JFLqhkO%EM4Vt)XKZej=9Ctj6&f)JJ%XMytlzE3>-`l7X`5L(#CKHKZ z@h1iD$y%}^C{D^TdA)dC-az~za-xa28u7id3N(R>%G>nrPUyb5Jccggcgs(rU?Sp{ zYy}IcKdGZcm!sgt6E)>m-TKt0c8W|U$q0C!r-ch*-lQV&h(@;BwB=( zx}Zfy@aTdODWOCcEC{PEI1zQJlICjSM5@bOsWBkfE_bO$gW$T{h3bbI#WNz8xFdXk z&?G+U_vmHJz>KH;tK+b?Ne%I3nO$jEmbF#cm4@|-mi%4)9b!xMm_@L*eHvSf` z+eqk6D^^H|imYNvjfVI(Bfc%I6y)NxVoIpNo7rx}x2KgtqrWLNmd`y-N^rC)J!!=z zky39!pMx{3?(i?wEr`)XY9lt&giVF@)hR_);PX0 z(+fL9AHytjWI-)1*g+K@c<6zO128=4!Ir?w?ZJRL^cn9`htKm%NKfDZtVnfxeeKi&K)LiA10S!LDV3cj2l9_+s$e z4DSH%$@#}}4^S%xaBNY+67b8xZ#O!WfY(dxHN5kZI0Lp%xA<(s1{&4l`G)qTN*H$6 zKN>B}$=CIdlHsjH!J9+N-2X>3PPiwJDOa=lxqBHO3h|F9VfRlW*SkzuN|dl~EPGLy zt-2_va81K?+x@j@%?I(-P#H|3r||DVuKVp=geNl2gjS%Ba7EaQ6dVcnue=n}sPQWy zI9YxTY4o@wtg++S5Sb0%Y}2Z0{~m+FzYQNogLrG>4$ELfEP=Bv*;s>uSZxdy2kX^y zG4=F$ffJWNpgtm^!Ne<(b*Or(3AyJ9wC`u3E&dCd^>Dc>#B57p)BKgW{$Olhu!H## zHDkHyg=*Nr8A{S_@mn%Tf;YD@LrYpEzb?Z_a5S}MSV{BnjTuhTD)8>+mXb<^mPA@% zB+;X=l30N+H20!wxH8(-rT?8M@_aM7K#@}vNkzz4b(y}j<`k@!RJ>zG$MC{p+-uubqN!W9g9!DCamRD$WAPV9J>@oNx$od@y{#&dFOw4?l1epI zoGkZbn+e;5ugfuc4L&5VC6xksqmA4RiMMNNQA)JCJLz;MOkeMgp%daq?oW{`74{^o z<#VmSFY?w+E=>b3^Kb4VaNTR$*Z2VC8lkI(n8{KwQE8?cVt<>EYC+U^jwCyT0j`A?{j{CFfhTJh!BH;)*A4;glgz zj;T{S)tlQ+@uorYQ%iPGo8~IyXD zOWpzATkww-ZlG2H;NZN5O7QjIH2<@lQDpn*I~^K zp}|F;3mP+aQh?XeML{!+-4Qf)?7Bd%h9)|-K=Z#@NHP`Lj|Rk7Teq4A!ng`vjMrKl zkxR6Ng$maS^;As#>I`qfl~8ypjL|^q-SBF({8Ah8+$S)8l83S49~joa;i<*>c1zp+ z3$uewv0Y8w#@{B|#CvTozKGs#OdL>{g5k z>{VD8#GfO5=#gqGxJuOg*{|_=zsaOC2 diff --git a/bin/DMGTRIS.pocket b/bin/DMGTRIS.pocket index 785fb2dc6bc08e393602616fa2217edb06247ea7..240d6563b9ddf1d834dde4d639c2b137508a8ac5 100644 GIT binary patch delta 2955 zcmY+F4QvzV8ONXZ?!EKHU$M<4vE$U736vura!8yHQaD0K8z_}XXhIkS$kqzFY7&~J zl~ihF)^>t4Xs_>u1cn^Q|K%rwldZ&sTM~$U{a+`ZMAt5qj2NnSi`1y=)C8? zXt3mapWpxa-}^rAbMM(lj?g1V=xK&9iC&eG$C%46sRQI$KWU22&85kYNUizQy>pGLtrcIv74I~zia23=JfLCZN3m(; zlh}(BD<7mooZMXAw_p;5mseN;qp)(q3Rnf?h!s!_d{)3IWW>muVh^XlNIYq>7|@Y; z%w#a&M&eb*TP8@X!WC}FZxV7@J>HbC%D9OuzSp!WhkLth5~;TQ%mQx9w?Thq0r#u$ z&S?Atb2V0umwoFUZOTnuG0FT;vl;0L82`G$nykdm3^f~{qxw+GedgGombivLux))*%4duOV ze(!=_<=*dwCY9`Vf*jhQ?_1FQc`eq^YOTS!Xp#E2X0Zu1qVHeO1J)FA7B9xcA!G6& z`Jz(wLTN$|=ASQ3>Y@D1adml1U0}L*%G-sysYSHetywXitORG#;RZ`i%UiV6y zx)))QY5T#-q4i6u!U>#;?Sf5CN|yKI39;tz%AC3vEiE_%RWIc3tGE@X*Y>q8-A2(` z5hO~)CyMwKD0zLTh~1{-&5Ggt zrXrNCD}ALK+F}PvAO-Iij-Zf3$2QNwpwNrLBcAXg3VTYq>&l>~5L7mxT@==$ zu-y|_6dF-@)DvDp;SLHrJb|KcVX5O~6gHwT@S358Dki!zjGE#88c# zLf-4%5J9#|-0yPqL**von1$;59a|aFuHNnFtI<3082{H~-u znK3!}cB!aetXMzrv+B{Tv_|iY|3%^UKOom=dS|*=IWI3Zo|g^$UdQj%`0o^-lT@gLe5Nh_)4>~iu`wZ5}~=xTT8_=*p+Cd_}7#h*F! zyt2`3Z2M0U3;$#1F>*rP-Ss4YqFagJkLXNS3(2TPS2mn!H_r4M@12!7r5Y3M-3mIt z)!jp&@NRd2G+*l>@w*ycU$5Xb{BOK$!Ed}?sjRQ+x%<(b@l5}7neFUnWSv^-d8!%D zaT)UF=hBWc$>a0eR%Y^MQrcW*^Z2rDDAT-|kh;oT-sIIo>()n-I+Irzoy{u=o#qu@ z{a{^|2@a~a*R3I!)MW3*5$it@w6CwzJ^<})(B`_e->xl>EtpZ+$DcGdpOyZnO#uG0 z;R~XD(yjdg(x-ckMIN?SU7Pt+(@aC1=lZ0Qp1+s5Sa`oT%l)!%SybJ&b0!A~UpOTV zu=~gW%Qyh^Bmv608Txwy9ChG3^iu@RwQ-9Cco7nOI28we7Xv;E1O(qX1_TjA8>(Jr zAtFMA@`(sUAEyu#A!tMFG|j;>hXf2b5Jm7)Ui5)D&Owb0F&=6@{jdK8-+Ko7G|Lqn(lHJ9dX{7_i&Tx;D4N>hT@3qu}>P648zhE(BQy zA()76-aHzGM_31jhYK~ZlRDtk%Qj?MH7iRiIoXIH@YE#PBOZzqLcJkdgO zkW5BWvbO~rye-(^ZNag*Td={~f(_ml9Gkm^WYV8Xc!wkz^QR)-A&G_ksUQdvn}aG5 z!h%1=gL`Dcf)M2)a+QTBK5!eN2zY*cKB1b27y=$2o=2!u!1@poV&Nc8NDvrnzF<8M z3<7IGpq2*~fm-wV@n}&5&Y3UA0f&Sq+M1AlIbqOtlBetmgFYd~0W)V$803X0bsFa0 o1@3-%jt^nk&S^)$6N#tYu9o8kwo(b>iDSa}xi=QZcI7Ak4?ajN-v9sr delta 2979 zcmY+FZA=`;8OLXKXZMzS;|?!y$KlJKvE#)C0p@tS!kWgU*r{8<4%iLYrb=WdQKU$< zQj;ptQ8$eotF7H`-IUTQ*UE)DZAFx`Q>waYRAQO4ZjC>rRntc4eQ=0?bgKqcv{hw!^ng8tU-S{{eA1ALcm@zt3f*)X7KT-SfH@%Cs;raOl{wc0de@LXP zj)z!$Jlo4nb9}a03236a>`h=(t?(VDf**wAz9UX9`=Rd?#v^Jvupj?S{YM~9bsv=6 z3CO;YR$VJx)6TVM*=$4bWg(Jl)JTJJz0h0OshlqC(n^!sx7xK&Thxy#s&H2IS8k`n z!!UfHvKOCICn|q|#cW$7;}up*|GgnveY19MGNs=zkX)wUgsWfw4_tYT>Z(}t{msJ- z`deB_W1?|B{F5C7H*9-R-*&_Mf*47Kw$o9T=vVaD4vn?iQDE#lK4@`AW! z0sshm4kT$E1bNM28=@F7!6p3m&<5C6eO3>fK#xH_URczlvo92h1!>} zlxtLC)Hk?3wNXKZ<(cB+dF6$|SLsx@V5-YoHl@MTbpuNkE05>FkEaVtz^KC8cl|xc zmD3zAdpd26cA)5Kl52{pmmnzjkxz%5)UU`U4iv->A1; z#i%PRdplR1%&bP>DMmdJns$xMtVUodMlCTk?fRHmjlfZiInERjUdkX4@W4_M`i^LwrG#EW)$ z;{Cx~;>UY(npm$-{ZSJ2=~<~%+fn~4OkS9J1|}~|hyQDW64j^vELG}}>5EbsRF6Iu zU0X9ZnY~)yhvAipH+;yX#cet5jV8mCHrqGJzD2FuyawrBed$U4gCiGYZcO`IQ*O+- zB?Sw&6rr%BbQeC*-fjj7N&dTqaS+l_@nyGy0U-s#{jP8vgyBMZNf~ez3`!T2>~Mu| zgU|#*pDVB+)PV3MSNIMHw?WwB3Iv3!Yb%}uVLJ#9x)mG@3S`02!e2G zO+hJe9Qc4UAOuX8c*x=K8_F%fQHpB5c^9+Tq*f-o%NJVU(0&Rp$L+#f^d({?kG7yb zkz617JY#V3M}=H*!K7dM=hR;&CI3Q8(zD~xue1L=O$c(pTK1&d?Hnf*;&$l=hE%5 zhTf+e`q+0C+ttt7AAzo;9b!e5)U(27j7q6%g=CC~)VjiD;FtGgM`x(2$YhktBAZbn zMUqiE)W3HmnVuolpQ^p7ftoW z2j3hqz1~nX+}z9sP?7=gN5efmBVlwuYs27Rwj2!+8x9}#R-q%D4abgsJ&wji03jMa zabk7@dVvC87M_?W-8?ZNn%O@L*5R}ni-qE{Yrz87f(5PxyUej*fos76*MeQQz7L1NRWL^OkfH_oGy=U5b?AcT1oy1}BbXbKjD z0m?+v;}J@ER0gn4GK5ZcdM#v=m2+5OTS z;(%bkX+!dPL%&stAF&$xJwh3Wn0c$ApBKW!-Y{pB`^b2X55Tf_6S`UeFD&~NVy%|r z1=ekjL($S;TrNkY2&wUb*|Zt;1mjXadl2`tj17qHG#n#4W1SCT!&Bs6)-kd&?#xj> z7>~F+9pwc8XQxFAoV^VZJ{oct=(hkCn5HYFBtXC+5zYzWMGq3kI8<%{>{dT1S;fKhj*6n)VG9;5yf>(GD&1lz~k0tUN>7{*|n-M#<(^#1|Pgmw=A diff --git a/src/gbc.asm b/src/gbc.asm index 5125e7a..ae71675 100644 --- a/src/gbc.asm +++ b/src/gbc.asm @@ -737,39 +737,52 @@ GBCGameplayProcess:: ; Color based on mode. ld a, [wSpeedCurveState] cp a, SCURVE_DMGT - ld a, $03 ;Blue - jr z, .higoverride + ld a, $05 ;Blue + jr z, .goverride ld a, [wSpeedCurveState] cp a, SCURVE_TGM1 - ld a, $05 ;Yellow - jr z, .higoverride + ld a, $06 ;Cyan + jr z, .goverride ld a, [wSpeedCurveState] cp a, SCURVE_TGM3 - ld a, $04 ;Orange - jr z, .higoverride + ld a, $03 ;Blue + jr z, .goverride ld a, [wSpeedCurveState] cp a, SCURVE_DEAT - ld a, $06 ;Cyan - jr z, .higoverride + ld a, $00 ;Red + jr z, .goverride ld a, [wSpeedCurveState] cp a, SCURVE_SHIR ld a, $00 ;Red - jr z, .higoverride ;Always red + jr z, .goverride ;Always red ld a, [wSpeedCurveState] cp a, SCURVE_CHIL ld a, $01 ;Green - jr z, .higoverride ; Are we 20G? -.higoverride +.goverride ld d, a ldh a, [hCurrentIntegerGravity] cp a, 20 - jr nz, .colorfield - - ; Strobe the frame. + jr c, :+ ld a, $00 ld d, a + jr .colorfield +: cp a, 3 + jr c, :+ + ld a, $04 + ld d, a + jr .colorfield +: cp a, 2 + jr c, :+ + ld a, $05 + ld d, a + jr .colorfield +: ldh a, [hCurrentFractionalGravity] + cp a, 0 + jr nz, .colorfield + ld a, $05 + ld d, a .colorfield ld hl, wShadowTileAttrs