From cdd238211f69551dffe3f89ef88d48c6966c6a39 Mon Sep 17 00:00:00 2001 From: Pecusx Date: Sat, 26 Apr 2025 23:57:09 +0200 Subject: [PATCH] PAL and NTSC logo colors --- lumber.asm | 59 ++++++++++++++++++++++++++++++++--------------------- lumber.xex | Bin 30032 -> 30051 bytes 2 files changed, 36 insertions(+), 23 deletions(-) diff --git a/lumber.asm b/lumber.asm index 9077fd4..fdd786d 100644 --- a/lumber.asm +++ b/lumber.asm @@ -186,13 +186,17 @@ c_horizonA = 12 ; thin horizon line A c_horizonB = 13 ; thin horizon line B c_grass = 14 ; green grass c_hat = 15 -c_buckle = 16 ; button and buckle +c_buckle = 16 ; button and buckle .. and logo c_pants = 17 ; blue pants c_greyRIP = 18 c_font1 = 19 ; title fonts colors -c_font2 = 20 +c_font2 = 20 ; .. and logo c_font3 = 21 c_font4 = 22 +c_logo1 = 23 ; rest of logo colors +c_logo2 = 24 +c_logo3 = 25 +c_logo4 = 26 ;--------------------------------------------------- icl 'art/anim_exported.asm' ; Animations: @@ -485,8 +489,8 @@ no_clouds_change :3 sta WSYNC mva #$70 HPOSP0 mva #$7a HPOSP1 - mva #$ec COLPF2 - mva #$ee COLPM0 + mva GameColors+c_logo4 COLPF2 + mva GameColors+c_font2 COLPM0 sta COLPM1 lda #0 sta SIZEP0 @@ -496,17 +500,17 @@ no_clouds_change DLI2 pha :5 sta WSYNC - mva #$12 COLPF1 - mva #$ec COLPM1 + mva GameColors+c_logo2 COLPF1 + mva GameColors+c_logo4 COLPM1 mwa #TitlesDLI1.DLI3 VDSLST pla rti DLI3 pha mva #$9a HPOSP1 - mva #$04 COLPM0 + mva GameColors+c_logo1 COLPM0 :7 sta WSYNC - mva #$ea COLPF2 + mva GameColors+c_buckle COLPF2 mwa #TitlesDLI1.DLI4 VDSLST pla rti @@ -522,34 +526,34 @@ DLI4 sta HPOSP3 adc #8 sta HPOSM3 - mva #$04 COLPF2 - mva #$14 COLPF1 + mva GameColors+c_logo1 COLPF2 + mva GameColors+c_logo3 COLPF1 mva #$70 HPOSP0 sta HPOSP1 mva #$03 SIZEP0 sta SIZEP1 - mva #$ee COLPM0 + mva GameColors+c_font2 COLPM0 :5 sta WSYNC - mva #$ee COLPF2 + sta COLPF2 mwa #TitlesDLI1.DLI5 VDSLST pla rti DLI5 pha sta WSYNC - mva #$ec COLPF2 - mva #$ea COLPM1 + mva GameColors+c_logo4 COLPF2 + mva GameColors+c_buckle COLPM1 mwa #TitlesDLI1.DLI6 VDSLST pla rti DLI6 pha :3 sta WSYNC - mva #$12 COLPF1 + mva GameColors+c_logo2 COLPF1 :2 sta WSYNC - mva #$ea COLPF2 + mva GameColors+c_buckle COLPF2 :2 sta WSYNC - mva #$04 COLPF2 + mva GameColors+c_logo1 COLPF2 mwa #TitlesDLI1.DLI7 VDSLST pla rti @@ -735,10 +739,9 @@ gameOver mva #>font_logo CHBAS mwa #dl_title dlptrs mva GameColors+c_sky COLBAKS - mva #$0e COLOR0 - mva #$14 COLOR1 - mva #$ee COLOR2 - mva #$46 COLOR3 + mva GameColors+c_clouds COLOR0 + mva GameColors+c_logo3 COLOR1 + mva GameColors+c_font2 COLOR2 lda #@dmactl(standard|dma|missiles|players|lineX2) ; normal screen width, DL on, P/M on (2lines) sta dmactls mva #%00000011 GRACTL @@ -1627,7 +1630,7 @@ datalines_clouds=12 jsr logoPM mva #1 SIZEP0_u sta SIZEP1_u - mva #$ec PCOLR0 + mva GameColors+c_logo4 PCOLR0 sta PCOLR1 lda #$58 sta HPOSP0_u @@ -2360,7 +2363,7 @@ PAL_colors .by $2a ; birds .by $04 - ; clouds + ; clouds and logo .by $0e ; light red (power bar up) .by $3f @@ -2383,6 +2386,11 @@ PAL_colors .by $ee .by $de .by $12 + ; rest of logo colors + .by $04 + .by $12 + .by $14 + .by $ec NTSC_colors ; black .by $00 @@ -2427,6 +2435,11 @@ NTSC_colors .by $fe .by $ee .by $22 + ; rest of logo colors + .by $04 + .by $22 + .by $24 + .by $fc ;-------------------------------------------------- initial_branches_list diff --git a/lumber.xex b/lumber.xex index 48f2f3be2d41e4ad387bc2646b494c6eff8eaffe..553564855c4fbb5cd3276252eee7b50630d042cc 100644 GIT binary patch delta 3538 zcmbVP3vg7`8Qy!dc|+Jqcw{1(J$cAOZGzy8Xp>cW2*r&Qlxh{pO&rh=LLkJ_IyxI| zE^HpBz@CjcH=AYBwM#wJtF@_4L2qqm2*ajiyk;1}D};zcE3ILrPA$kt|8pBo(@{~N#}~D; z>$1;X`DwUa&s5X;=U&rYFvtp0N#nZWnV06 zWIYbf{~0F+5pN_0LJ%mEb35Y_GE*^=GXvhZH{!8}$vnv=$fQ= zWKqRzp@D3yK*Fy{OGSaFDS(zYqrV2wRUfmV;}m`FWyyS;t#D#l6WY*>27T_od*MQ# zHo1Ge91j!pc004lJJ~|~rO2}IJdu^)yG7OS!be24(}fR-yy_m2xA(Bfig2+Ah3D!a zK}|mvaqPbGSz2HEF;ZNap6ConXgPVHa>0t#3VJJm`V^Kedzm0Np}h(W7*=L+30s7h zl(2qWR>B^{kCvbaL8>2Rx3N1$gR>uu20^9dgGy&IB-+;wxqec)MsSja&))8d5cLf0 z!Fq!GffnN-6ZNU^m_?GJ8zafltVo8QDEm;Q680J{?y6=mKcna+1(j0uG>sNT1brH4 zMAIUoo`l+dS^ltr_`^p2&mncIGgOD%`2VJjyJ zJ!=Y?Vb^g3aTO-YSh~>z^5TZcq;`E`jWyvPnKNT4JkD)vVQ(ciV+ zE8=qa3Ae3PKQS?fM>u3%Z?`FAHhwWT{@?q(!Ss$byN=t|(zkKQ+U(~zWL@v)O(8RE zIXAxV`(0+vjHU1-x2=``ltb1OZl?11^{$GGSkG;1(JxGlc(X-|@=pF!%&&*cA;9Lz zyZDCO=nrGqog8dF-y6E(A@suaDlcKzVmt=|AbBdkMg^$Tz*fbF8R-@;*viM*|kmN zi%rv=Tm8X7aQYH}3wgOO`hyp^rFOVv4ImGhRkJ1ulpR_pd8MYv{&71xPP%LIb5h!r zw0xx@U-9RAdmT|JlpLnnRVi<14sxjmCA-^DT^pPXr*H1^?0QYH6=;`UQyL1imF-GH z9!$6>LDObv0fYM5pq?J1M4*0aP{{xmXwQvN2|#rlRF*+)8>8$%eP~clgYuZvG9D}u zxW5_Pod(x3HZ2LL0fV~NpxR@UcHV#&8}RGhFV)^5WWW(}c)X(W2#d%FW27 zNEceet&uc+ik+p(tp?Dt4_H!DH)HZ%MLO(t*x_OFqP=8K-Tbsc8eOoTB`*AYko47M zdj_aBvr~Rmb9TzVeCO3Y4M+acrGKRk(lq|5S}ixQk}8}0%9|(X0q%Ez`*qnSdR~rs zp8R%CG+%+-KsnSEvFl=}VMilGm<2(6FtyYOa%$q#LybHg(!A|<&*^VxrIA4jvarqx z=zIqpdL{Uo1L!oxXQ+CL;?q<;N%1MFo}l<7RR<_OLE+z!Ejoq&!4aY<#<2e%&3J%H z2oCaaj=dhe(q(Hblhi5wbM1Pvn%W;BMfDl!Wu5vQwNZ@bp?b2czF24?+v|&GPw!L) zsFyF7+#^S?N$OO6Zbo!c$fM)nA>sZU>8p1-?U_^mWt&6`XDyk3&;9m{m4_~# Z@Ll~)(p}$-*Zj=B3Pg*RB=#^>g@hGPEsSYjF}4xjQT z?8=zz_tbtE3+nl5?%;y2^a{AiA##N6*|g}oj{=_8WzrXrVy*?*`r25Ro`+sv=x$QU z1~!!x)ORW$$l;!Ftb2mVA^Vx5dX7uEL}%;DD9zXDEM2ithpwz(cUHTXDfzTe2Nuu< zY7>>cR1oWz-=lODI+M?#ST>yFL=S&g)+_5rsKQ}(5E@$@vQS92k`#S zq)?!4W;cRKtP(tIUClh9 zg*{$FgiaQ$DXxDeOe)&QpTZ>JS8U|3oLulJ*?7M$gv7Fas8po4(CRZAqppERhPf zrnW49HS{k`PK1=%vQH7@eT1?7weIXU895RldF)v2HI7maL~AsYt=~L58$zB4LexvO z8w3}t+LIc`ANI6UPRpmD<+7f*E?m>+QR zXo!?@Rp*I?aX~KtjYMu-)U!zYe$VoDvV+3^6!`jc2p&0L0UzuD^I@{09d1d@f^ki8 zLQ??ELYzp(Qkn>^K8WBVR5k-4_%Ujd0hA;|2Z<{jFVZhdo@(a#joaJE$+0kby9?In zigINYU0FWau0s2$#pQm4KJicXx*H*@&}vi2RINm#6jh+=R8nq{4=A6~wdKlk%D%31 zcqQc5TcXsM^OK1^g7!X(%XWmUiPWYGZ8n9>L^h#OU?d`9BJ&}ULCPBI@~6~cjX5hB z{^w|0>#zYKYxw`K4l|mpC8(Q{Lo?de5vV|HDc!@fJ+&e$$j3o0$3h$hwR?rjS|r z6=!a^L$Xfm_2wA&dZwi??RHJb<@BUhIRxt&Fyu54pOhET@~^hQHS<^(VQ)T$ooaT z&d;KD?PAfK=0M~kTIiqww397v+K>f`PR-BSn-@O70d}FO5Dr3@n@DzL zC#mm*b0B%-uvb15vK4C|9SZF#)>Z{WyNZ0h&JhWUP^cX=sQ((&eJM%=Dq>Jy8`Q=W zl>wAuP&oh=YYi#N4%BM~RbWs%O=>j;%LMK%gDWz)XH(O%fa*7>9~%@+Qrf!)yu^S* zukPJ`voHfrNy9-Xa!fv|Tw;H2E^&Muj7*=aT?rl;X%@WaxO$Gq-Flhgr04kPS+1Vt z@d7=AYzYB62hg(|#&B*L9p>sVx;g+H=A%PgQk>C@$Pn*!eknyWv>_fL%b-0{tYdbA zlgi7YncClY#A{$tVQ)w8-ga$fx7>v8L zmeVco)~0vMzkhl6!CmkC<*@#_I_}<31%Bn|_fkJUj(*3{@31Z1^V6i~>6E8yvMZSv zf+tW1S9MCn(#Tf2LrRt9XERQZ)T;@K@O=w*E7iZE;t6`I|h)>=^3sLaH@0l zG^Ybx?dS9~SNk~a=kQC&mY9h@ZiIxxxV`wVHrmG}0%v$Q_>LtmAGYmTE2%RF7ufY| zHD@r+mbBzeTiUJ9SNDjCBGSOBS{4b