From 25001f7a96c6112e11f487bb0f4d3438a896ae1e Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Fri, 17 Apr 2020 01:47:12 -0400 Subject: [PATCH] mist: proper animation on stoney linking book --- mist/leveldata_stoney.inc | 4 +- mist/link_book_stoney.s | 184 +++++++++++++++++++++++--------------- mist/stoney.s | 2 +- 3 files changed, 117 insertions(+), 73 deletions(-) diff --git a/mist/leveldata_stoney.inc b/mist/leveldata_stoney.inc index 91754a9c..504d2659 100644 --- a/mist/leveldata_stoney.inc +++ b/mist/leveldata_stoney.inc @@ -142,11 +142,11 @@ location7: .byte $ff ; north exit .byte $ff ; south exit .byte $ff ; east exit - .byte $ff ; west exit + .byte STONEY_UMBRELLA_PATH ; west exit .byte $ff ; north exit_dir .byte $ff ; south exit_dir .byte $ff ; east exit_dir - .byte $ff ; west exit_dir + .byte DIRECTION_W ; west exit_dir .word arrival_n_lzsa ; north bg .word arrival_s_lzsa ; south bg .word arrival_e_lzsa ; east bg diff --git a/mist/link_book_stoney.s b/mist/link_book_stoney.s index 7c608b82..b4785673 100644 --- a/mist/link_book_stoney.s +++ b/mist/link_book_stoney.s @@ -43,111 +43,155 @@ stoney_link_book: stoney_movie: - .word stoney_sprite0,stoney_sprite1,stoney_sprite2 - .word stoney_sprite3,stoney_sprite4,stoney_sprite5 - .word stoney_sprite6,stoney_sprite7,stoney_sprite8 - .word stoney_sprite9,stoney_sprite10 + .word stoney_sprite0,stoney_sprite1,stoney_sprite2,stoney_sprite3 + .word stoney_sprite4,stoney_sprite5,stoney_sprite6,stoney_sprite7 + .word stoney_sprite8,stoney_sprite9,stoney_sprite10,stoney_sprite11 + .word stoney_sprite12,stoney_sprite13,stoney_sprite14,stoney_sprite15 + stoney_sprite0: .byte 9,6 - .byte $77,$77,$77,$7f,$77,$55,$77,$7f,$77 - .byte $77,$77,$77,$77,$57,$55,$57,$75,$77 - .byte $77,$ff,$55,$f7,$5f,$55,$ff,$ff,$57 - .byte $57,$ff,$55,$ff,$ff,$55,$55,$ff,$55 - .byte $55,$7f,$75,$77,$77,$55,$77,$77,$55 - .byte $55,$77,$77,$57,$57,$55,$77,$77,$75 + .byte $dd,$dd,$dd,$dd,$dd,$dd,$dd,$dd,$dd + .byte $dd,$5d,$dd,$dd,$dd,$dd,$dd,$dd,$dd + .byte $58,$55,$5d,$7d,$dd,$7d,$dd,$5d,$77 + .byte $55,$80,$55,$57,$6d,$67,$6d,$55,$57 + .byte $66,$66,$66,$66,$66,$66,$66,$66,$66 + .byte $66,$66,$66,$66,$66,$66,$66,$66,$66 stoney_sprite1: .byte 9,6 - .byte $77,$78,$88,$87,$88,$87,$78,$77,$77 - .byte $77,$77,$77,$78,$88,$87,$88,$78,$77 - .byte $55,$87,$88,$f8,$88,$88,$8f,$55,$ff - .byte $55,$f8,$58,$ff,$88,$88,$f8,$58,$ff - .byte $55,$7f,$55,$88,$55,$88,$7f,$55,$7f - .byte $55,$77,$77,$88,$55,$78,$77,$77,$77 + .byte $dd,$dd,$dd,$dd,$dd,$dd,$dd,$dd,$dd + .byte $dd,$dd,$dd,$dd,$dd,$dd,$dd,$dd,$0d + .byte $dd,$7d,$dd,$dd,$dd,$7d,$5d,$77,$00 + .byte $dd,$77,$dd,$77,$6d,$55,$55,$67,$00 + .byte $68,$66,$66,$66,$66,$65,$65,$66,$00 + .byte $66,$66,$66,$66,$66,$66,$66,$66,$66 stoney_sprite2: .byte 9,6 - .byte $87,$88,$87,$87,$87,$87,$87,$87,$87 - .byte $88,$88,$77,$78,$78,$88,$88,$78,$77 - .byte $8f,$88,$88,$8f,$ff,$55,$ff,$55,$ff - .byte $58,$88,$ff,$58,$88,$85,$ff,$55,$ff - .byte $55,$88,$8f,$55,$78,$88,$8f,$55,$7f - .byte $55,$88,$88,$55,$77,$78,$78,$55,$77 + .byte $dd,$dd,$dd,$dd,$dd,$dd,$dd,$0d,$dd + .byte $dd,$dd,$dd,$dd,$dd,$dd,$dd,$00,$dd + .byte $dd,$dd,$7d,$dd,$7d,$7d,$00,$00,$0d + .byte $5d,$dd,$77,$55,$77,$55,$00,$00,$00 + .byte $55,$66,$67,$55,$66,$66,$00,$00,$00 + .byte $66,$66,$66,$65,$66,$66,$60,$00,$00 stoney_sprite3: .byte 9,6 - .byte $87,$77,$77,$77,$77,$77,$77,$55,$55 - .byte $88,$88,$88,$87,$87,$77,$77,$55,$55 - .byte $ff,$58,$88,$88,$88,$88,$8f,$85,$ff - .byte $ff,$55,$ff,$58,$88,$88,$88,$88,$f8 - .byte $88,$55,$77,$55,$77,$78,$78,$55,$77 - .byte $88,$85,$77,$55,$77,$77,$77,$55,$77 + .byte $dd,$dd,$dd,$dd,$dd,$dd,$dd,$dd,$00 + .byte $dd,$dd,$5d,$dd,$dd,$dd,$5d,$dd,$00 + .byte $55,$dd,$55,$77,$dd,$dd,$55,$00,$00 + .byte $00,$00,$55,$77,$6d,$6d,$65,$00,$00 + .byte $00,$00,$55,$66,$66,$66,$66,$00,$00 + .byte $00,$00,$66,$66,$66,$66,$66,$00,$00 stoney_sprite4: .byte 9,6 - .byte $78,$78,$78,$78,$78,$88,$88,$88,$88 - .byte $78,$58,$78,$58,$78,$58,$78,$58,$58 - .byte $ff,$55,$ff,$55,$ff,$55,$ff,$ff,$55 - .byte $ff,$55,$f5,$55,$ff,$55,$ff,$ff,$55 - .byte $7f,$55,$7f,$55,$7f,$55,$7f,$7f,$55 - .byte $77,$55,$77,$55,$77,$55,$77,$77,$55 + .byte $00,$dd,$dd,$dd,$dd,$dd,$dd,$dd,$dd + .byte $00,$00,$dd,$5d,$dd,$dd,$5d,$dd,$dd + .byte $00,$00,$7d,$55,$dd,$dd,$55,$dd,$dd + .byte $00,$00,$67,$65,$6d,$6d,$55,$6d,$6d + .byte $00,$60,$66,$66,$66,$66,$66,$66,$66 + .byte $66,$66,$66,$66,$66,$66,$66,$66,$66 stoney_sprite5: .byte 9,6 - .byte $55,$55,$00,$00,$05,$50,$55,$00,$00 - .byte $05,$05,$05,$00,$50,$05,$55,$00,$70 - .byte $50,$00,$55,$00,$55,$ff,$55,$00,$ff - .byte $55,$00,$55,$00,$55,$ff,$55,$00,$ff - .byte $55,$00,$55,$00,$55,$77,$55,$00,$77 - .byte $55,$00,$55,$00,$55,$77,$55,$00,$77 + .byte $00,$dd,$dd,$dd,$dd,$dd,$dd,$dd,$dd + .byte $00,$dd,$dd,$dd,$5d,$dd,$dd,$dd,$dd + .byte $00,$6d,$dd,$5d,$55,$dd,$dd,$dd,$55 + .byte $00,$66,$67,$55,$55,$dd,$dd,$55,$55 + .byte $00,$66,$66,$66,$66,$66,$66,$55,$55 + .byte $00,$66,$66,$66,$66,$66,$66,$55,$55 stoney_sprite6: .byte 9,6 - .byte $00,$00,$00,$50,$00,$00,$00,$00,$00 - .byte $00,$00,$00,$05,$00,$55,$00,$00,$00 - .byte $50,$00,$00,$00,$00,$f5,$55,$00,$00 - .byte $55,$ff,$55,$f0,$00,$ff,$55,$ff,$00 - .byte $55,$7f,$55,$7f,$00,$7f,$55,$ff,$00 - .byte $55,$77,$55,$77,$00,$77,$55,$77,$00 + .byte $dd,$dd,$dd,$dd,$dd,$dd,$dd,$dd,$dd + .byte $dd,$dd,$55,$dd,$dd,$dd,$dd,$dd,$dd + .byte $6d,$55,$d5,$dd,$dd,$dd,$55,$dd,$dd + .byte $66,$55,$6d,$6d,$dd,$77,$55,$dd,$dd + .byte $66,$66,$66,$66,$77,$55,$55,$dd,$dd + .byte $66,$66,$66,$66,$66,$65,$65,$66,$6d stoney_sprite7: .byte 9,6 - .byte $55,$75,$00,$50,$00,$00,$55,$00,$00 - .byte $88,$87,$00,$55,$77,$57,$55,$00,$87 - .byte $88,$88,$00,$75,$77,$57,$55,$00,$88 - .byte $08,$58,$00,$78,$57,$87,$85,$80,$58 - .byte $77,$50,$00,$70,$55,$77,$55,$00,$88 - .byte $77,$55,$00,$77,$55,$77,$55,$00,$88 + .byte $dd,$dd,$dd,$dd,$dd,$dd,$dd,$dd,$dd + .byte $dd,$5d,$dd,$dd,$5d,$55,$dd,$dd,$dd + .byte $57,$55,$dd,$dd,$55,$dd,$dd,$dd,$dd + .byte $65,$65,$66,$5d,$55,$dd,$dd,$dd,$dd + .byte $66,$66,$66,$65,$65,$66,$6d,$6d,$dd + .byte $66,$66,$66,$66,$66,$66,$66,$66,$77 stoney_sprite8: .byte 9,6 - .byte $88,$8f,$8f,$8f,$ff,$00,$00,$ff,$ff - .byte $88,$88,$ff,$55,$0f,$00,$00,$00,$ff - .byte $88,$88,$5f,$55,$5f,$00,$ff,$f0,$f0 - .byte $88,$88,$ff,$55,$ff,$00,$ff,$55,$ff - .byte $88,$88,$7f,$55,$7f,$00,$7f,$55,$ff - .byte $88,$88,$87,$85,$77,$00,$77,$55,$77 + .byte $dd,$dd,$dd,$dd,$dd,$dd,$55,$dd,$dd + .byte $dd,$ed,$dd,$dd,$dd,$dd,$55,$dd,$dd + .byte $dd,$87,$dd,$55,$77,$55,$55,$dd,$dd + .byte $66,$68,$6d,$65,$66,$55,$55,$77,$66 + .byte $66,$66,$66,$66,$66,$65,$65,$67,$66 + .byte $66,$66,$66,$66,$66,$66,$66,$66,$66 stoney_sprite9: .byte 9,6 - .byte $00,$05,$55,$00,$05,$00,$55,$00,$00 - .byte $00,$55,$55,$ff,$55,$00,$55,$55,$00 - .byte $00,$f0,$00,$ff,$55,$00,$55,$55,$00 - .byte $00,$05,$00,$05,$55,$00,$f5,$f5,$00 - .byte $00,$7f,$00,$ff,$55,$00,$ff,$ff,$00 - .byte $00,$77,$00,$77,$55,$00,$77,$77,$00 + .byte $dd,$dd,$dd,$dd,$dd,$dd,$dd,$dd,$55 + .byte $dd,$dd,$dd,$dd,$dd,$dd,$dd,$dd,$55 + .byte $dd,$dd,$dd,$7e,$dd,$55,$77,$dd,$55 + .byte $5d,$dd,$7d,$88,$5d,$55,$67,$6d,$55 + .byte $85,$68,$66,$66,$65,$65,$66,$66,$55 + .byte $66,$66,$66,$66,$66,$66,$66,$66,$65 stoney_sprite10: .byte 9,6 - .byte $88,$55,$88,$55,$00,$88,$77,$77,$77 - .byte $88,$55,$88,$55,$00,$88,$77,$77,$77 - .byte $88,$55,$88,$55,$00,$88,$77,$77,$77 - .byte $68,$66,$88,$26,$00,$88,$66,$66,$66 - .byte $26,$62,$68,$66,$00,$68,$66,$66,$66 - .byte $66,$62,$26,$26,$00,$66,$66,$66,$66 + .byte $dd,$dd,$dd,$dd,$dd,$5d,$dd,$dd,$dd + .byte $dd,$dd,$dd,$ee,$dd,$55,$5d,$dd,$dd + .byte $77,$7d,$dd,$87,$55,$55,$55,$5d,$dd + .byte $68,$66,$56,$58,$55,$55,$55,$55,$55 + .byte $66,$66,$65,$55,$55,$55,$55,$55,$55 + .byte $66,$66,$66,$55,$55,$55,$55,$55,$55 +stoney_sprite11: + .byte 9,6 + .byte $dd,$ed,$dd,$dd,$dd,$dd,$dd,$dd,$dd + .byte $7e,$7e,$dd,$dd,$dd,$dd,$dd,$dd,$dd + .byte $55,$87,$dd,$7d,$5d,$dd,$7d,$5d,$dd + .byte $55,$58,$6d,$67,$65,$6d,$67,$65,$6d + .byte $55,$55,$66,$66,$66,$66,$66,$66,$66 + .byte $55,$55,$55,$66,$66,$66,$66,$66,$66 +stoney_sprite12: + .byte 9,6 + .byte $ed,$dd,$dd,$dd,$dd,$dd,$dd,$dd,$dd + .byte $ee,$ed,$dd,$dd,$dd,$dd,$dd,$dd,$dd + .byte $77,$dd,$dd,$dd,$dd,$dd,$dd,$dd,$dd + .byte $87,$6d,$6d,$77,$7d,$dd,$5d,$dd,$77 + .byte $58,$66,$66,$66,$66,$66,$55,$66,$67 + .byte $55,$66,$66,$66,$66,$66,$66,$66,$66 + +stoney_sprite13: + .byte 9,6 + .byte $dd,$dd,$dd,$dd,$dd,$dd,$dd,$dd,$dd + .byte $ed,$5d,$dd,$dd,$dd,$dd,$dd,$dd,$dd + .byte $5d,$55,$dd,$dd,$dd,$dd,$dd,$dd,$dd + .byte $55,$55,$85,$6d,$6d,$77,$7d,$5d,$dd + .byte $65,$68,$66,$66,$66,$66,$66,$55,$5d + .byte $66,$66,$66,$66,$66,$66,$66,$66,$65 + +stoney_sprite14: + .byte 9,6 + .byte $dd,$dd,$dd,$dd,$dd,$dd,$dd,$dd,$dd + .byte $dd,$5d,$55,$dd,$dd,$dd,$dd,$dd,$dd + .byte $5d,$55,$55,$57,$7d,$dd,$dd,$dd,$dd + .byte $55,$85,$85,$75,$57,$66,$66,$67,$6d + .byte $65,$68,$68,$65,$66,$66,$66,$66,$66 + .byte $66,$66,$66,$66,$66,$66,$66,$66,$66 + +stoney_sprite15: + .byte 9,6 + .byte $55,$dd,$dd,$dd,$dd,$dd,$dd,$dd,$dd + .byte $55,$dd,$dd,$dd,$dd,$dd,$dd,$dd,$dd + .byte $55,$87,$7d,$dd,$77,$dd,$dd,$dd,$dd + .byte $55,$58,$77,$66,$77,$6d,$6d,$67,$6d + .byte $75,$77,$57,$55,$66,$66,$66,$66,$66 + .byte $57,$55,$55,$55,$66,$66,$66,$66,$66 linking_filename: diff --git a/mist/stoney.s b/mist/stoney.s index 0f051bdb..7edf78a0 100644 --- a/mist/stoney.s +++ b/mist/stoney.s @@ -91,7 +91,7 @@ animate_stoney_book: inc ANIMATE_FRAME lda ANIMATE_FRAME - cmp #11 + cmp #16 bne done_animate_book lda #0 sta ANIMATE_FRAME