From b9990a37292bf50b17cccaf41f16cf33b7ec6aa7 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Tue, 23 Oct 2018 00:27:18 -0400 Subject: [PATCH] megademo: finish getting starring_people looking nice --- megademo/Makefile | 2 +- megademo/SIZE | 3 + megademo/c64_opener.s | 3 +- megademo/megademo.s | 22 +++--- megademo/sp_names.png | Bin 13651 -> 14376 bytes megademo/starring_people.s | 134 ++++++++++++++++++++++++++++--------- 6 files changed, 119 insertions(+), 45 deletions(-) diff --git a/megademo/Makefile b/megademo/Makefile index 664f31e7..9c46cf05 100644 --- a/megademo/Makefile +++ b/megademo/Makefile @@ -100,7 +100,7 @@ takeoff.img: takeoff_hgr.png #### sp_names.inc: sp_names.png - $(PNG_TO_RLE) asm ./deater.png sp_names > sp_names.inc + $(PNG_TO_RLE) asm ./sp_names.png sp_names > sp_names.inc #### diff --git a/megademo/SIZE b/megademo/SIZE index 9ba07a10..0c959cff 100644 --- a/megademo/SIZE +++ b/megademo/SIZE @@ -27,6 +27,9 @@ 28989 -- add timeouts to check-email, takeoff, and spacebars 28893 -- convert people names to tengwar 29166 -- add back english names + 29291 -- add starring people english wipe + 30636 -- add in susie scenes + 30380 -- messing with alignment a bit Graphics sizes: (LG lores=300B) diff --git a/megademo/c64_opener.s b/megademo/c64_opener.s index 84e4dcd3..8569cf0f 100644 --- a/megademo/c64_opener.s +++ b/megademo/c64_opener.s @@ -338,7 +338,6 @@ loopcoF:dex ; 2 dey ; 2 bne loopcoE ; 2nt/3 - lda KEYPRESS ; 4 bpl no_c64_keypress ; 3 jmp done_c64 @@ -413,7 +412,7 @@ loopc6b:dex ; 2 jmp c64_done_screen ; 3 -.align $100 +;.align $100 apple2_text: diff --git a/megademo/megademo.s b/megademo/megademo.s index 4fefa913..ea3ceb74 100644 --- a/megademo/megademo.s +++ b/megademo/megademo.s @@ -49,8 +49,8 @@ apple_iie: jsr starring_people jsr setup_people_deater jsr starring_people -; jsr setup_people_lg -; jsr starring_people + jsr setup_people_lg + jsr starring_people ; E-mail arriving jsr check_email @@ -79,16 +79,13 @@ apple_iie: ; Fireworks jsr fireworks + ;================== ; Game over + ;================== + ; we never get here game_over_man: jmp game_over_man - ;=================== - ; Loop Forever - ;=================== -loop_forever: - jmp loop_forever - .include "lz4_decode.s" .include "c64_opener.s" @@ -148,7 +145,8 @@ loop_forever: .include "starring2.inc" .include "fs.inc" .include "deater.inc" -;.include "lg.inc" +.include "lg.inc" +.include "sp_names.inc" ; e-mail .include "email_40_96.inc" @@ -182,9 +180,9 @@ fs_hgr_end: deater_hgr: .incbin "DEATER_HGRC.BIN.lz4",11 deater_hgr_end: -;lg_hgr: -;.incbin "LG_HGRC.BIN.lz4",11 -;lg_hgr_end: +lg_hgr: +.incbin "LG_HGRC.BIN.lz4",11 +lg_hgr_end: ; bird mountain katahdin: diff --git a/megademo/sp_names.png b/megademo/sp_names.png index 301d0cedf531f148f0691b14be5ec2a872c13fcb..7c57f753d4f39146c81eaef5ef43bf7c574b3643 100644 GIT binary patch delta 8936 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 N002ovPDHLkV1oEP%FzG- diff --git a/megademo/starring_people.s b/megademo/starring_people.s index 537e0b3d..3a3275e8 100644 --- a/megademo/starring_people.s +++ b/megademo/starring_people.s @@ -18,6 +18,9 @@ starring_people: sta FRAME sta FRAMEH + lda #40 + sta XPOS + ;============================= ; Load graphic hgr @@ -44,34 +47,24 @@ sp_smc4: ;============================= - ; Load graphic page0 + ; Load list of names to PAGE2 lda #$0c sta BASH lda #$00 - sta BASL ; load image to $c00 - - - ; Load overwrite version - lda #fs + lda #>sp_names sta GBASH jsr load_rle_gr lda #4 sta DRAW_PAGE - - jsr gr_copy_to_current ; copy to page1 - - ; GR part - bit PAGE1 - bit LORES ; 4 - bit SET_GR ; 4 - bit FULLGR ; 4 + jsr gr_copy_to_current ; then copy to PAGE2 ;============================= - ; Load graphic page1 + ; Load person image to PAGE1 lda #$0c sta BASH @@ -86,14 +79,9 @@ sp_smc6: sta GBASH jsr load_rle_gr - ;=================== - ; copy to page3 - lda #0 sta DRAW_PAGE - jsr gr_copy_to_current - ; GR part bit PAGE0 @@ -190,9 +178,72 @@ sp_outer_loop: ; -7 exit on timeout ; -10 keypress ; -2 ldy at top + ; -8 pause a bit + ; -32 draw yellow + ; -49 wipe ; =========== - ; 7365 + ; 7276 + lda FRAMEH ; 3 + cmp #15 ; 2 + bcs sp_name_wipe ; bge ; 3 + ; -1 + + lda #52 ; 2 + jsr delay_a ; 25+52 + jmp sp_done_copy ; 3 + +sp_name_wipe: + ;======================= + ; do the name wipe + ;======================= + ; 10 + 22 = 32 + + lda #$dd ; 2 + ldx XPOS ; 3 + dex ; 2 + bmi sp_no_yellow ; 3 + + ;-1 + sta $650,X ; 5 + sta $6d0,X ; 5 + sta $750,X ; 5 + sta $7d0,X ; 5 + jmp sp_done_yellow ; 3 +sp_no_yellow: + dec XPOS + inc XPOS + dec XPOS + inc XPOS + nop +sp_done_yellow: + + ;======================= + ; do the name wipe + ;======================= + ; 6 + 43 + ldx XPOS ; 3 + bmi sp_no_copy ; 3 + + ;-1 +sp_smc8: + lda $800,X ; 4 + sta $650,X ; 5 +sp_smc9: + lda $880,X ; 4 + sta $6d0,X ; 5 +sp_smc10: + lda $900,X ; 4 + sta $750,X ; 5 +sp_smc11: + lda $980,X ; 4 + sta $7d0,X ; 5 + dec XPOS ; 5 + jmp sp_done_copy ; 3 +sp_no_copy: + lda #16 ; 2 + jsr delay_a ; 25+16 +sp_done_copy: ;================ ; wrap counter @@ -221,15 +272,16 @@ sp_wrap_done: ; 7 cycles sp_timeout: lda FRAMEH ; 3 - cmp #80 ; 2 + cmp #75 ; 2 beq sp_done ; 3 ; -1 - ; Try X=18 Y=77 cycles=7393 R2 - ; Try X=104 Y=14 cycles=7365 - ldy #14 ; 2 -sploop1:ldx #104 ; 2 + ; Try X=17 Y=80 cycles=7281 R3 + ; Try X=57 Y=25 cycles=7276 + + ldy #25 ; 2 +sploop1:ldx #57 ; 2 sploop2:dex ; 2 bne sploop2 ; 2nt/3 dey ; 2 @@ -266,6 +318,14 @@ setup_people_fs: lda #>fs sta sp_smc6+1 + lda #$0 + sta sp_smc8+1 + sta sp_smc10+1 + + lda #$80 + sta sp_smc9+1 + sta sp_smc11+1 + rts setup_people_deater: @@ -286,9 +346,17 @@ setup_people_deater: lda #>deater sta sp_smc6+1 + + lda #$28 + sta sp_smc8+1 + sta sp_smc10+1 + + lda #$a8 + sta sp_smc9+1 + sta sp_smc11+1 + rts -.if 0 setup_people_lg: lda #lg sta sp_smc6+1 - rts -.endif + lda #$50 + sta sp_smc8+1 + sta sp_smc10+1 + lda #$d0 + sta sp_smc9+1 + sta sp_smc11+1 + + rts