diff --git a/art/over_screen.asm b/art/over_screen.asm index 034fc77..73c2752 100644 --- a/art/over_screen.asm +++ b/art/over_screen.asm @@ -2,40 +2,9 @@ dta $00,$00,$00,$00,$00,$00,$00,$00 dta $00,$00,$00,$00,$00,$00,$00,$00 dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$00,$46,$47,$30,$38,$39 - dta $22,$23,$28,$29,$42,$43,$38,$39 - dta $20,$21,$3A,$3B,$31,$00,$00,$00 - dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $2C,$2D,$20,$21,$38,$39,$28,$29 - dta $31,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $3C,$3D,$4A,$4B,$28,$29,$42,$43 + dta $00,$00,$00,$00,$00,$00,$00,$46 + dta $47,$30,$38,$39,$22,$23,$28,$29 + dta $42,$43,$38,$39,$20,$21,$3A,$3B dta $31,$00,$00,$00,$00,$00,$00,$00 dta $00,$00,$00,$00,$00,$00,$00,$00 dta $00,$00,$00,$00,$00,$00,$00,$00 @@ -54,7 +23,26 @@ dta $00,$00,$00,$00,$00,$00,$00,$00 dta $00,$00,$00,$00,$00,$00,$00,$00 dta $00,$00,$00,$00,$00,$00,$00,$00 + dta $00,$00,$00,$00,$2C,$2D,$20,$21 + dta $38,$39,$28,$29,$31,$00,$00,$00 + dta $00,$00,$00,$00,$00,$00,$00,$00 + dta $00,$00,$00,$00,$00,$00,$00,$00 + dta $00,$00,$00,$00,$3C,$3D,$4A,$4B + dta $28,$29,$42,$43,$31,$00,$00,$00 dta $00,$00,$00,$00,$00,$00,$00,$00 dta $00,$00,$00,$00,$00,$00,$00,$00 dta $00,$00,$00,$00,$00,$00,$00,$00 dta $00,$00,$00,$00,$00,$00,$00,$00 + dta $00,$00,$00,$00,$00,$00,$00,$00 + dta $00,$00,$00,$00,$00,$00,$00,$00 + dta $00,$00,$00,$00,$00,$00,$00,$00 + dta $00,$00,$00,$00,$00,$00,$00,$00 + dta $00,$00,$00,$00,$00,$00,$00,$00 + dta $00,$00,$00,$00,$00,$00,$00,$00 + dta $00,$00,$00,$00,$00,$00,$00,$00 + dta $00,$00,$00,$00,$00,$00,$00,$00 + dta $00,$00,$00,$00,$00,$00,$00,$00 + dta $00,$00,$00,$00,$00,$00,$00,$00 + dta $00,$00,$00,$00,$00,$00,$00,$00 + dta $00,$00,$00,$00,$00,$00,$00,$00 + dta $00,$00,$00,$00,$00,$00,$00,$00 \ No newline at end of file diff --git a/art/title_logo.asm b/art/title_logo.asm index ec94c2a..3cc9514 100644 --- a/art/title_logo.asm +++ b/art/title_logo.asm @@ -1,40 +1,32 @@ + dta $00,$00,$00,$00,$00,$00,$01,$02 + dta $02,$03,$04,$05,$06,$07,$04,$05 + dta $04,$04,$09,$04,$04,$0A,$02,$02 + dta $0B,$0C,$00,$00,$00,$00,$00,$00 + dta $00,$00,$00,$00,$00,$00,$0D,$0E + dta $0F,$10,$11,$12,$13,$14,$11,$12 + dta $15,$16,$17,$11,$18,$19,$1A,$1B + dta $1C,$1D,$00,$00,$00,$00,$00,$00 + dta $00,$00,$00,$00,$00,$00,$1E,$1F + dta $20,$21,$11,$12,$22,$23,$11,$12 + dta $24,$25,$26,$11,$27,$28,$11,$29 + dta $11,$2A,$00,$00,$00,$00,$00,$00 + dta $00,$00,$00,$00,$00,$00,$00,$1F + dta $20,$2B,$11,$12,$2C,$2D,$11,$12 + dta $2E,$2F,$30,$11,$31,$32,$11,$33 + dta $12,$20,$00,$00,$00,$00,$00,$00 + dta $00,$00,$00,$00,$00,$00,$00,$36 + dta $37,$38,$39,$39,$3A,$3B,$3C,$3D + dta $3E,$3F,$40,$41,$42,$39,$39,$43 + dta $39,$37,$00,$00,$00,$00,$00,$00 dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$01,$02,$02,$03,$04,$05 - dta $06,$07,$04,$05,$04,$04,$09,$04 - dta $04,$0A,$02,$02,$0B,$0C,$00,$00 + dta $00,$00,$00,$00,$1F,$44,$45,$46 + dta $47,$48,$49,$4A,$4B,$00,$00,$00 dta $00,$00,$00,$00,$00,$00,$00,$00 dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$0D,$0E,$0F,$10,$11,$12 - dta $13,$14,$11,$12,$15,$16,$17,$11 - dta $18,$19,$1A,$1B,$1C,$1D,$00,$00 + dta $00,$00,$00,$00,$4C,$4D,$4E,$4F + dta $50,$51,$52,$53,$54,$00,$00,$00 dta $00,$00,$00,$00,$00,$00,$00,$00 dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$1E,$1F,$20,$21,$11,$12 - dta $22,$23,$11,$12,$24,$25,$26,$11 - dta $27,$28,$11,$29,$11,$2A,$00,$00 - dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$00,$1F,$20,$2B,$11,$12 - dta $2C,$2D,$11,$12,$2E,$2F,$30,$11 - dta $31,$32,$11,$33,$12,$20,$00,$00 - dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$00,$36,$37,$38,$39,$39 - dta $3A,$3B,$3C,$3D,$3E,$3F,$40,$41 - dta $42,$39,$39,$43,$39,$37,$00,$00 - dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $1F,$44,$45,$46,$47,$48,$49,$4A - dta $4B,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $4C,$4D,$4E,$4F,$50,$51,$52,$53 - dta $54,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $55,$56,$57,$58,$59,$5A,$5B,$5C - dta $5D,$00,$00,$00,$00,$00,$00,$00 + dta $00,$00,$00,$00,$55,$56,$57,$58 + dta $59,$5A,$5B,$5C,$5D,$00,$00,$00 dta $00,$00,$00,$00,$00,$00,$00,$00 \ No newline at end of file diff --git a/art/title_timber.asm b/art/title_timber.asm index aec1fd6..d7acb57 100644 --- a/art/title_timber.asm +++ b/art/title_timber.asm @@ -1,60 +1,48 @@ dta $00,$00,$00,$00,$00,$00,$00,$00 + dta $00,$00,$00,$00,$00,$00,$00,$34 + dta $35,$00,$00,$00,$00,$00,$00,$00 + dta $00,$00,$00,$00,$00,$00,$00,$00 dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$00,$34,$35,$00,$00,$00 + dta $00,$00,$00,$00,$6C,$6D,$6E,$E0 + dta $E1,$6F,$70,$71,$00,$00,$00,$00 dta $00,$00,$00,$00,$00,$00,$00,$00 dta $00,$00,$00,$00,$00,$00,$00,$00 + dta $00,$00,$00,$72,$73,$74,$75,$76 + dta $77,$78,$79,$7A,$7B,$00,$00,$00 dta $00,$00,$00,$00,$00,$00,$00,$00 dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $6C,$6D,$6E,$E0,$E1,$6F,$70,$71 + dta $00,$00,$00,$E0,$E1,$62,$63,$64 + dta $63,$63,$65,$E1,$E6,$00,$00,$00 dta $00,$00,$00,$00,$00,$00,$00,$00 dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$00,$00,$00,$00,$00,$72 - dta $73,$74,$75,$76,$77,$78,$79,$7A - dta $7B,$00,$00,$00,$00,$00,$00,$00 + dta $00,$00,$67,$68,$69,$6A,$6B,$6C + dta $63,$63,$65,$6D,$6E,$00,$00,$00 dta $00,$00,$00,$00,$00,$00,$00,$00 dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$00,$00,$00,$00,$00,$E0 - dta $E1,$62,$63,$64,$63,$63,$65,$E1 - dta $E6,$00,$00,$00,$00,$00,$00,$00 + dta $00,$00,$6F,$70,$71,$72,$F3,$74 + dta $75,$76,$77,$71,$78,$00,$00,$00 dta $00,$00,$00,$00,$00,$00,$00,$00 dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$00,$00,$00,$00,$67,$68 - dta $69,$6A,$6B,$6C,$63,$63,$65,$6D - dta $6E,$00,$00,$00,$00,$00,$00,$00 + dta $00,$00,$00,$00,$00,$79,$7A,$7B + dta $7B,$7C,$7D,$00,$00,$00,$00,$00 dta $00,$00,$00,$00,$00,$00,$00,$00 dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$00,$00,$00,$00,$6F,$70 - dta $71,$72,$F3,$74,$75,$76,$77,$71 - dta $78,$00,$00,$00,$00,$00,$00,$00 + dta $00,$00,$00,$00,$6C,$6D,$6E,$E2 + dta $E3,$6F,$70,$71,$00,$00,$00,$00 dta $00,$00,$00,$00,$00,$00,$00,$00 dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$79,$7A,$7B,$7B,$7C,$7D,$00 + dta $00,$00,$00,$00,$6C,$6D,$6E,$E4 + dta $E5,$6F,$70,$71,$00,$00,$00,$00 dta $00,$00,$00,$00,$00,$00,$00,$00 dta $00,$00,$00,$00,$00,$00,$00,$00 + dta $00,$00,$00,$00,$6C,$6D,$6E,$E6 + dta $E7,$6F,$70,$71,$00,$00,$00,$00 dta $00,$00,$00,$00,$00,$00,$00,$00 dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $6C,$6D,$6E,$E2,$E3,$6F,$70,$71 + dta $00,$00,$00,$00,$6C,$6D,$6E,$E8 + dta $E9,$6F,$70,$71,$00,$00,$00,$00 dta $00,$00,$00,$00,$00,$00,$00,$00 dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $6C,$6D,$6E,$E4,$E5,$6F,$70,$71 - dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $6C,$6D,$6E,$E6,$E7,$6F,$70,$71 - dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $6C,$6D,$6E,$E8,$E9,$6F,$70,$71 - dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$00,$00,$00,$00,$00,$00,$00 - dta $00,$79,$7A,$7B,$7B,$7C,$7E,$00 - dta $00,$00,$00,$00,$00,$00,$00,$00 + dta $00,$00,$00,$00,$00,$79,$7A,$7B + dta $7B,$7C,$7E,$00,$00,$00,$00,$00 dta $00,$00,$00,$00,$00,$00,$00,$00 \ No newline at end of file diff --git a/lumber.asm b/lumber.asm index 7710006..1cb0241 100644 --- a/lumber.asm +++ b/lumber.asm @@ -138,7 +138,7 @@ dl_title timber_eyes_addr .wo eyes_0 .by $44+$80 ; DLI10 - timbermaner charset change and horizon and color bars - .wo title_timber+80 + .wo title_timber+(32*2) .by $84 ; DLI11 - color bars .by $84 ; DLI12 - pants color .by $04 @@ -240,16 +240,16 @@ c_shirtC = 33 ; timberman shirt on title screen ; v9 - if the branch opposite the lumberjack and branch above on the other side - (now v7) ;-------------------------------------------------- title_logo - icl 'art/title_logo.asm' ; 8 lines, mode 4 + icl 'art/title_logo.asm' ; 8 lines, mode 4 narrow title_timber - icl 'art/title_timber.asm' ; 7 lines, mode 4 (+ 4 lines - eyes animation, + 1 line - foot animation) -eyes_0 = title_timber+40 -eyes_1 = title_timber+(40*7) -eyes_2 = title_timber+(40*8) -eyes_3 = title_timber+(40*9) -eyes_4 = title_timber+(40*10) -foot_0 = title_timber+(40*6) -foot_1 = title_timber+(40*11) + icl 'art/title_timber.asm' ; 7 lines, mode 4 narrow (+ 4 lines - eyes animation, + 1 line - foot animation) +eyes_0 = title_timber+32 +eyes_1 = title_timber+(32*7) +eyes_2 = title_timber+(32*8) +eyes_3 = title_timber+(32*9) +eyes_4 = title_timber+(32*10) +foot_0 = title_timber+(32*6) +foot_1 = title_timber+(32*11) empty_line :40 .by 0 difficulty_normal_text @@ -257,7 +257,7 @@ difficulty_normal_text difficulty_easy_text = difficulty_normal_text + 40 .align $400 over_screen - icl 'art/over_screen.asm' ; 12 lines, mode 5 + icl 'art/over_screen.asm' ; 12 lines, mode 5 narrow credits_texts icl 'art/credits.asm' ; 10 lines, mode 5 number_of_credits = 5 @@ -641,6 +641,7 @@ DLI4 mva GameColors+c_logo1 COLPF2 mva #$70 HPOSP0 mva #$03 SIZEP0 + sta WSYNC mva GameColors+c_font2 COLPM0 :2 sta WSYNC mva GameColors+c_logo3 COLPF1 @@ -732,8 +733,8 @@ DLI9 DLI10 pha ; font for titles and timberman - mva #>font_titles CHBASE mva #$75 HPOSP1 ; axe + mva #>font_titles CHBASE sta WSYNC mva #$7e HPOSP2 ; buttons and buckle mva #$6a HPOSM1 ; axe @@ -796,6 +797,8 @@ DLI13 pla tax inc SyncByte + lda #@dmactl(standard|dma|missiles|players|lineX2) ; normal screen width, DL on, P/M on (2lines) + sta dmactl mwa #TitlesDLI1.DLI_L1 VDSLST pla rti @@ -1009,7 +1012,7 @@ gameOver mva GameColors+c_white2 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) + lda #@dmactl(narrow|dma|missiles|players|lineX2) ; narrow screen width, DL on, P/M on (2lines) sta dmactls mva #%00000011 GRACTL difficulty_display @@ -1089,7 +1092,7 @@ EndOfStartScreen mva GameColors+c_font1 COLOR1 mva GameColors+c_font2 COLOR2 mva GameColors+c_font3 COLOR3 - lda #@dmactl(standard|dma|missiles|players|lineX2) ; normal screen width, DL on, P/M on (2lines) + lda #@dmactl(narrow|dma|missiles|players|lineX2) ; narrow screen width, DL on, P/M on (2lines) sta dmactls mva #%00000011 GRACTL pause 1 diff --git a/lumber.xex b/lumber.xex index b21a255..33675c1 100644 Binary files a/lumber.xex and b/lumber.xex differ