From 72f79573b921482822944d6c927952beae7a597e Mon Sep 17 00:00:00 2001 From: Pecusx Date: Fri, 20 Jun 2025 22:11:33 +0200 Subject: [PATCH] GFX fixes compiled. Titles DLI corrected --- art/over_screen.asm | 6 +++--- art/title_timber.asm | 2 +- lumber.asm | 33 +++++++++++++++++---------------- lumber.xex | Bin 38125 -> 38128 bytes 4 files changed, 21 insertions(+), 20 deletions(-) diff --git a/art/over_screen.asm b/art/over_screen.asm index ec5c985..b6f7ac0 100644 --- a/art/over_screen.asm +++ b/art/over_screen.asm @@ -6,8 +6,8 @@ dta $00,$00,$00,$2E,$B9,$00,$00,$00,$08,$09,$1F,$0A,$08,$09,$26,$27,$19,$09,$16,$17,$19,$14,$28,$2B,$2C,$00,$00,$00,$2F,$00,$00,$00 dta $00,$00,$00,$2E,$B9,$00,$00,$00,$B3,$31,$31,$35,$B3,$31,$35,$00,$32,$31,$31,$31,$32,$31,$B3,$31,$00,$00,$00,$00,$2F,$00,$00,$00 dta $00,$00,$00,$5E,$A8,$00,$0C,$0D,$0C,$0D,$0C,$0D,$0C,$0D,$31,$00,$20,$21,$20,$21,$20,$21,$20,$21,$20,$21,$31,$2C,$5F,$00,$00,$00 - dta $00,$00,$00,$5E,$2A,$00,$0C,$0D,$0C,$0D,$0C,$0D,$0C,$0D,$31,$00,$20,$21,$20,$21,$20,$21,$20,$21,$20,$21,$31,$2C,$5F,$00,$00,$00 - dta $00,$00,$00,$5E,$A8,$00,$0C,$0D,$0C,$0D,$0C,$0D,$0C,$0D,$31,$00,$20,$21,$20,$21,$20,$21,$20,$21,$20,$21,$31,$00,$5F,$00,$00,$00 - dta $00,$00,$00,$5E,$00,$00,$0C,$0D,$0C,$0D,$0C,$0D,$0C,$0D,$31,$00,$20,$21,$20,$21,$20,$21,$20,$21,$20,$21,$31,$00,$5F,$00,$00,$00 + dta $00,$00,$00,$5E,$AE,$00,$0C,$0D,$0C,$0D,$0C,$0D,$0C,$0D,$31,$00,$20,$21,$20,$21,$20,$21,$20,$21,$20,$21,$31,$2C,$5F,$00,$00,$00 + dta $00,$00,$00,$5E,$AE,$00,$0C,$0D,$0C,$0D,$0C,$0D,$0C,$0D,$31,$00,$20,$21,$20,$21,$20,$21,$20,$21,$20,$21,$31,$00,$5F,$00,$00,$00 + dta $00,$00,$00,$5E,$AE,$00,$0C,$0D,$0C,$0D,$0C,$0D,$0C,$0D,$31,$00,$20,$21,$20,$21,$20,$21,$20,$21,$20,$21,$31,$00,$5F,$00,$00,$00 dta $00,$00,$00,$5E,$00,$00,$0C,$0D,$0C,$0D,$0C,$0D,$0C,$0D,$31,$00,$20,$21,$20,$21,$20,$21,$20,$21,$20,$21,$31,$00,$5F,$00,$00,$00 dta $00,$00,$00,$2E,$4D,$4E,$4F,$50,$50,$4F,$50,$4F,$50,$50,$50,$50,$50,$50,$50,$50,$50,$50,$50,$50,$50,$50,$50,$50,$2F,$00,$00,$00 diff --git a/art/title_timber.asm b/art/title_timber.asm index e2cebf1..edd7464 100644 --- a/art/title_timber.asm +++ b/art/title_timber.asm @@ -5,7 +5,7 @@ dta $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$67,$68,$69,$6A,$6B,$6C,$63,$63,$65,$6D,$6E,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 dta $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$6F,$70,$71,$72,$F3,$74,$75,$76,$77,$71,$78,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 dta $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$79,$7A,$7B,$7B,$7C,$7D,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$5D,$59,$59,$59,$59,$59,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + dta $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$5D,$59,$59,$59,$59,$7F,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 dta $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$6C,$6D,$6E,$E2,$E3,$6F,$70,$71,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 dta $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$6C,$6D,$6E,$E4,$E5,$6F,$70,$71,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 dta $00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$6C,$6D,$6E,$E6,$E7,$6F,$70,$71,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00,$00 diff --git a/lumber.asm b/lumber.asm index f8efbc9..722c7a5 100644 --- a/lumber.asm +++ b/lumber.asm @@ -12,7 +12,7 @@ ;--------------------------------------------------- .macro build - dta d"0.64" ; number of this build (4 bytes) + dta d"0.65" ; number of this build (4 bytes) .endm .macro RMTSong @@ -823,6 +823,16 @@ DLI2 :5 sta WSYNC mva GameColors+c_logo2 COLPF1 mva GameColors+c_logo4 COLPM1 + ; set cloud 2 horizontal position + lda clouds2Hpos + clc + sta HPOSM2 + adc #4 + sta HPOSP2 + adc #8 + sta HPOSP3 + adc #8 + sta HPOSM3 mwa #TitlesDLI1.DLI3 VDSLST pla rti @@ -836,16 +846,7 @@ DLI3 rti DLI4 pha - ; set cloud 2 horizontal position - lda clouds2Hpos - clc - sta HPOSM2 - adc #4 - sta HPOSP2 - adc #8 - sta HPOSP3 - adc #8 - sta HPOSM3 + sta WSYNC mva GameColors+c_logo1 COLPF2 mva #$70 HPOSP0 mva #$03 SIZEP0 @@ -876,11 +877,6 @@ DLI6 mva GameColors+c_logo5 COLPF2 :2 sta WSYNC mva GameColors+c_logo1 COLPF2 - mwa #TitlesDLI1.DLI7 VDSLST - pla - rti -DLI7 - pha ; set cloud 3 horizontal position lda clouds3Hpos clc @@ -897,6 +893,11 @@ DLI7 sta HPOSP2 sta HPOSP3 sta HPOSM3 */ + mwa #TitlesDLI1.DLI7 VDSLST + pla + rti +DLI7 + pha ; timberman initial colors mva GameColors+c_black COLPF0 mva GameColors+c_shirtB COLPF1 diff --git a/lumber.xex b/lumber.xex index fe7d0e01b06c7e4e0c1820f0c149917502dcd225..d992bc2290a405414a712f5fa6273a5faf348ee0 100644 GIT binary patch delta 4190 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 JI*0u)_dj8BO^N^j delta 4140 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