From 92c92f79461f7eb0ee8c64f489ef945b3315c6c4 Mon Sep 17 00:00:00 2001 From: Pecusx Date: Tue, 20 May 2025 21:09:23 +0200 Subject: [PATCH] AXE PMG (and fixes) --- lumber.asm | 76 +++++++++++++++++++++++++++++++++++++---------------- lumber.xex | Bin 28912 -> 28970 bytes 2 files changed, 53 insertions(+), 23 deletions(-) diff --git a/lumber.asm b/lumber.asm index 39b53b2..9845300 100644 --- a/lumber.asm +++ b/lumber.asm @@ -705,6 +705,7 @@ DLI9 mva #$8a HPOSM0 ; right side hand :4 sta WSYNC mva GameColors+c_shirtC COLPF2 + mva GameColors+c_light_brown COLPM1 ; axe color mwa #TitlesDLI1.DLI10 VDSLST pla rti @@ -712,8 +713,15 @@ DLI10 pha ; font for titles and timberman mva #>font_titles CHBASE + mva #$75 HPOSP1 ; axe + sta WSYNC + mva #$6a HPOSM1 ; axe + sta WSYNC + mva #$03 SIZEP3 + mva #$6a HPOSP3 + mva GameColors+c_dark_brown COLPM3 ; axe color 2 ; color bars - :3 sta WSYNC + sta WSYNC mva GameColors+c_shirtA COLPF2 :4 sta WSYNC mva GameColors+c_shirtC COLPF2 @@ -1013,7 +1021,7 @@ EndOfStartScreen .proc LevelScreen ;-------------------------------------------------- jsr MakeDarkScreen - + jsr ClearPM mva #>font_game_upper CHBAS mva #>font_game_lower_right LowCharsetBase mva GameColors+c_black PCOLR0 ; = $02C0 ;- - rejestr-cień COLPM0 @@ -1318,15 +1326,7 @@ no_branch_l mva GameColors+c_light_brown COLOR3 ; light brown ;mva #$ff COLOR4 - ;clear P/M memory - lda #0 - tax -@ sta PMmemory,x - sta PMmemory+$100,x - sta PMmemory+$200,x - sta PMmemory+$300,x - inx - bne @- + jsr ClearPM mva #>PMmemory PMBASE jsr HidePM mva #%00100100 GPRIOR @@ -1367,6 +1367,22 @@ no_branch_l mwa #PowerSpeedTableB SpeedTableAdr ; difficulty level rts .endp + +;-------------------------------------------------- +.proc ClearPM +; clear P/M memory +;-------------------------------------------------- + ;clear P/M memory + lda #0 + tax +@ sta PMmemory,x + sta PMmemory+$100,x + sta PMmemory+$200,x + sta PMmemory+$300,x + inx + bne @- + rts +.endp ;-------------------------------------------------- .proc HidePM ; hide P/M on right side of screen @@ -1880,8 +1896,8 @@ timlogoPM ldx #datalines_tlogo-1 @ lda tlogo_data_m,x sta PMmemory+$180+Hoffset_tlogo,x - ;lda tlogo_data_b,x - ;sta PMmemory+$280+Hoffset_tlogo,x + lda tlogo_data_p3,x + sta PMmemory+$380+Hoffset_tlogo,x dey dex bpl @- @@ -1930,6 +1946,7 @@ logo_data_a dta %11111000 dta %11111000 dta %11111000 + dta %00000000 logo_data_b dta %11111111 dta %11111111 @@ -1969,20 +1986,33 @@ logo_data_b dta %00000000 dta %00000000 dta %00000000 - dta %00000000 - dta %00000000 - dta %00000000 - dta %00000000 + dta %10100111 + dta %10100111 + dta %00000111 + dta %00000111 + dta %00000111 Hoffset_logo=12 -datalines_logo=57 +datalines_logo=58 tlogo_data_m dta %00000011 - dta %00000011 - dta %00000011 - dta %00000011 - dta %00000011 + dta %00000111 + dta %00000111 + dta %00001011 + dta %00001011 + dta %00000000 + dta %00000000 + dta %00000000 +tlogo_data_p3 + dta %00000000 + dta %10111000 + dta %10111000 + dta %10111000 + dta %00011000 + dta %00011000 + dta %00011000 + dta %00011000 Hoffset_tlogo=64 -datalines_tlogo=5 +datalines_tlogo=8 .endp ;-------------------------------------------------- .proc SetPMl1 diff --git a/lumber.xex b/lumber.xex index d7e45877493998a116dda4c844e63719138b73fd..bc95f334a7ed5218f581d001b3478f32553e3aba 100644 GIT binary patch delta 3392 zcma)84R90371l|%<)6qFKaOP^;gt;}=Fj3clp32R}kgM{rf zhi(tc-pqif9C6f9@OpY_ToMMiTmqSpSQO|Xpfd!VLfSAP4a|`=6QBY5_7rT?q%+lM z_U?V(+xNcrc5mEsL;mlI{dC$CGMJ#&%wtJzi z@o3xYq`>2wstH5(xd(<@-L};Bkcpa5MiYI&w<1eZcyHu^o`!xNII&kx0Bo$&?f!?)C-I`T#N%*S`|d#K1adG>6h z$sJp(bg5F@0JpE2j6QrNwlrR8frf*CBsB`e!|zD7nqFSQ=xdqog7;wMb44 z)sk-)=2;=|ZyV7TlD}v%G-S)7p}zff${^uHi~eh4mCf2fSZ7dF60z#`NV=BD??tZ( z;efuxbETHwOD(V?3I+5>0oCqOas}|=v?R29hiBtK`J0JC$ z&Y<`}Gh%`I`UiEu6xLHO9m&5!2eWqmL?YU=HeYL8f+ex3y_&qtJ{RY*oI&v#o?}pa zprx@uF%65DvCPn5W*VLZ4c{#(DPC-=ikCkpHnmqnIkV&Yu#iFV8axb&4>Z>ZMBaHe zZ$-SgDud|j{7PoWSGkHo@foTa6d!0=ED&W?5%=Qk|60+RF}k;sGG@nDvVcMHd1f&v zzLMFoK(THB7MwT~N!IhAiw==qFjEu1 z&v*f}?nHPqSTg#bhY{c0d-%XXb9d>OoR-*$2MRl66Ov6X*_1Dv3O>_rk+BuS`tx<6 z3^k)(US6Q))yr24)FQIJV(`S$dbv9Pr2QMnc3646gg+KaR(o8|pVrGgu9NnEg%Z?j zF6Z2O`5LpB!*PJh$vYK`lOUp9eSu_Gj!rn(h$xv;na^D!8!H{$-^s2@WX)?p(;CnQ z@Tt5>DDb_dN@VNj_67O3lcDfO@cKW@M;9U53Q zoU_7t{&pkkCex}%4*8LKsZo9`U(MVl<9sMe_lB(M{9W=fm%0ST0tS($>dBmmM5-rb z9z1BZS}j&ip${n_Ud6qgXm(Z*4`hB^U70^Gx^ z;bxwou*4d@zDWOC)UywxuYvUS% zLW9(~hsS7#;Jp?M2P3IkLK02kgJ=g?;vH6d(+9{ z!mh9&7kl5cM;oAAK^i0|If9fcDA|IPBPb3*$`+I?L2?N2F=o;;*!LBuCmWZJ&jM1G z;6?Dg0&npL`kgjY!(6YD5iLy6tV&8WLh@?T)2OIDsWg~%7y1L4R8z!#NY>UAC2kU1 zvjnogW@vhuC?620 z>X$E)`>V$KPKesmYM02LQdN;Zee}3^|G3zBia%Re8kwS}zd2rxh~1s1W*6>|FUDp* zbeX;SEd0Y~3w8Olc*UZ<6~4%SBu&7cs$is4&jsR`o{~CzI3)9=1tA99Ky0`VpLM5! z&0hr5=Q-B|b*C^M$a77ejZGeN^GWyJqZdW@ZS-Q$QxOCW;Y*OE^L@ETf+-l@sixEsdnAXJlY7-I^Sod!6@7{3gcCNt5_{jHk|9; z*K=JArs~NM^_HmK5FrdSBExxFZ0|Dd;m?Poh3V~G6ES}#d_MarERVwKJyCbTNtUBt z5FOhSvEwL*x6Z~OrE3|}>Dkfz@jdZqCO&2hj!~W1XCJn&rytgm)ocv+BFce_JY6_loor4~zw?w-`JuT`3+SNOd;A;`e4JPfoZijw`qp}MZzNjaL&w1`O zs}a$$>YQV{4M(N~t*})_VOrYWdB(B*f+!c_lWvPAxmodz!M3s3HV)gyt{E!_UOB2kLO;HFV rb5UhDmd#O^BU_@%2rMT=l_D%BMwO9RPKqjKH$L>$+J9TkH(&k_odWoS delta 3371 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 R_@sxpYFPGDqyF5c{{V|PG4%id