diff --git a/demos/trogdor/NOTES b/demos/trogdor/NOTES index 2d63d4a1..19b9bcb7 100644 --- a/demos/trogdor/NOTES +++ b/demos/trogdor/NOTES @@ -159,4 +159,4 @@ Space: dragonman: original man=1973 dragonman=1982 = 3955 bytes combined = 3669 bytes - optimize so bases same: = 3191 bytes + optimize so bases same: = 3132 bytes diff --git a/demos/trogdor/graphics/actual01_dragonman.png b/demos/trogdor/graphics/actual01_dragonman.png index 98c6905c..3141aca1 100644 Binary files a/demos/trogdor/graphics/actual01_dragonman.png and b/demos/trogdor/graphics/actual01_dragonman.png differ diff --git a/demos/trogdor/hgr_copy_part.s b/demos/trogdor/hgr_copy_part.s index 9b570c22..d0f8ad42 100644 --- a/demos/trogdor/hgr_copy_part.s +++ b/demos/trogdor/hgr_copy_part.s @@ -31,6 +31,7 @@ hgr_copy_outer_loop: ldy COPY_WIDTH + dey hgr_copy_inner_loop: lda (INL),Y sta (OUTL),Y diff --git a/demos/trogdor/trogdor.s b/demos/trogdor/trogdor.s index bc9b0b6a..007e50db 100644 --- a/demos/trogdor/trogdor.s +++ b/demos/trogdor/trogdor.s @@ -334,17 +334,7 @@ scroll_in_loop: ; flames: left ss11221122ss ; flames gone: 30 frames (roughly 1s) ; dragon man: 160 frames (roughly 5s) - ; dragon: 150 frames (roughly 5s) - ; dragon zoom: 5 frames - ; dragon: 5 frames \ - ; dragon zoom: 5 frames / repeat 6 times - ; dragon zoom scroll off screen: 30 frames - ; white screen: 20 frames - - ; 916 - - ;======================================= ;====================================== @@ -380,32 +370,60 @@ scroll_in_loop: lda #42 jsr wait_ticks - jsr wait_until_keypress + + ;====================================== + ; dragon man + + ldy #$7f + jsr hgr_clear_screen + + ; FIXME: make a "copy left" routine + + lda #0 + sta COPY_Y1 + sta SPRITE_Y + lda #10 + sta SPRITE_X + lda #20 + sta COPY_X1 + lda #20 + sta COPY_WIDTH + lda #191 + sta COPY_Y2 + + jsr hgr_copy_part + + jsr hgr_page_flip + + lda #160 + jsr wait_ticks + + + + ;====================================== + ; draw SCENE 6 + ;====================================== + ; dragon: 150 frames (roughly 5s) + ; dragon zoom: 5 frames + ; + ; dragon: 5 frames \ + ; dragon zoom: 5 frames / repeat 6 times + ; dragon zoom scroll off screen: 30 frames + ; white screen: 20 frames + + ; 916 + + ;======================================= + + finished: + jsr wait_until_keypress + jsr hgr_page_flip + jmp finished - - ; start music - -; lda SOUND_STATUS -; and #SOUND_MOCKINGBOARD -; beq no_music -; cli ; enable sound -;no_music: - - - ;0123456789012345678901234567890123456789 -;merry_text: -; .byte " MERRY CHRISTMAS!!! MERRY CHRISTMAS!!! ME" - - - - - - - trog00_graphics: .incbin "graphics/actual00_trog_cottage.hgr.zx02"