From 659e86d14037d085f2c5a4fe1cd011234037143f Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Fri, 15 May 2020 15:54:24 -0400 Subject: [PATCH] mist: can look at blue book now red book animation temporarily disabled --- mist/brother_books.s | 59 ++++++++++++++-- mist/graphics_octagon/Makefile | 3 + mist/graphics_octagon/blue_book_closed.png | Bin 0 -> 6107 bytes mist/graphics_octagon/blue_book_open.png | Bin 0 -> 7493 bytes mist/leveldata_octagon.inc | 78 ++++++++++++++++++++- 5 files changed, 131 insertions(+), 9 deletions(-) create mode 100644 mist/graphics_octagon/blue_book_closed.png create mode 100644 mist/graphics_octagon/blue_book_open.png diff --git a/mist/brother_books.s b/mist/brother_books.s index 9c6d39b2..6fc91d45 100644 --- a/mist/brother_books.s +++ b/mist/brother_books.s @@ -1,8 +1,7 @@ - ;=========================== - ; open the red book + ; Touch the red book ;=========================== -red_book: +touch_red_book: ; if have a red page, take it and increment count @@ -17,11 +16,52 @@ red_book: not_red_page: - - bit KEYRESET lda #0 sta FRAMEL + lda #OCTAGON_RED_BOOK_CLOSED + sta LOCATION + + jsr change_location + + rts + + + ;=========================== + ; Touch the blue book + ;=========================== +touch_blue_book: + + ; if have a blue page, take it and increment count + + lda HOLDING_PAGE + cmp #HOLDING_BLUE_PAGE + bne not_blue_page + + lda #0 ; put down page + sta HOLDING_PAGE + + inc BLUE_PAGE_COUNT ; increment page count + +not_blue_page: + + lda #0 + sta FRAMEL + + lda #OCTAGON_BLUE_BOOK_CLOSED + sta LOCATION + + jsr change_location + + rts + + + + + + + + red_book_loop: lda #> octagon_graphics.inc echo "frame_bookcase_open_lzsa: .incbin \"frame_bookcase_open.lzsa\"" >> octagon_graphics.inc echo "blue_book_shelf_lzsa: .incbin \"blue_book_shelf.lzsa\"" >> octagon_graphics.inc + echo "blue_book_open_lzsa: .incbin \"blue_book_open.lzsa\"" >> octagon_graphics.inc + echo "blue_book_closed_lzsa: .incbin \"blue_book_closed.lzsa\"" >> octagon_graphics.inc echo "bookshelf_n_lzsa: .incbin \"bookshelf_n.lzsa\"" >> octagon_graphics.inc echo "bookshelf_open_n_lzsa: .incbin \"bookshelf_open_n.lzsa\"" >> octagon_graphics.inc echo "bookshelf_close_n_lzsa: .incbin \"bookshelf_close_n.lzsa\"" >> octagon_graphics.inc diff --git a/mist/graphics_octagon/blue_book_closed.png b/mist/graphics_octagon/blue_book_closed.png new file mode 100644 index 0000000000000000000000000000000000000000..ad3ac878fb63e41355e9f097e5542680744525a1 GIT binary patch literal 6107 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 literal 0 HcmV?d00001 diff --git a/mist/graphics_octagon/blue_book_open.png b/mist/graphics_octagon/blue_book_open.png new file mode 100644 index 0000000000000000000000000000000000000000..144eded51fff8b7971ca2f2b38c2025d76a0540a GIT binary patch literal 7493 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 P00000NkvXXu0mjfQLS1l literal 0 HcmV?d00001 diff --git a/mist/leveldata_octagon.inc b/mist/leveldata_octagon.inc index 2ff50e37..0dd243a8 100644 --- a/mist/leveldata_octagon.inc +++ b/mist/leveldata_octagon.inc @@ -10,7 +10,9 @@ locations: .word location12,location13,location14,location15 .word location16,location17,location18,location19 .word location20,location21,location22,location23 - .word location24,location25,location26 + .word location24,location25,location26,location27 + .word location28,location29,location30 + ; OCTAGON_TEMPLE_DOORWAY -- temple doorway location0: @@ -72,7 +74,7 @@ location2: .byte DIRECTION_W ; special exit .byte 16,25 ; special x .byte 16,32 ; special y - .word red_book-1 ; special function + .word touch_red_book-1 ; special function ; OCTAGON_FIREPLACE -- fireplace location3: @@ -216,7 +218,10 @@ location10: .word blue_book_shelf_lzsa ; east bg .word $0000 ; west bg .byte BG_EAST - .byte $ff + .byte DIRECTION_E ; special exit + .byte 16,25 ; special x + .byte 16,32 ; special y + .word touch_blue_book-1 ; special function ; OCTAGON_TOWER_ROTATION -- looking at tower rotation location11: @@ -499,3 +504,70 @@ location26: .byte BG_SOUTH|BG_NORTH .byte $ff +; OCTAGON_RED_BOOK_CLOSED -- red book, but closed +location27: + .byte $ff ; north exit + .byte $ff ; south exit + .byte $ff ; east exit + .byte OCTAGON_RED_BOOK_OPEN ; west exit + .byte $ff ; north exit_dir + .byte $ff ; south exit_dir + .byte $ff ; east exit_dir + .byte DIRECTION_W|DIRECTION_ONLY_POINT ; west exit_dir + .word $0000 ; north bg + .word $0000 ; south bg + .word $0000 ; east bg + .word red_book_closed_lzsa ; west bg + .byte BG_WEST ; west + .byte $ff + +; OCTAGON_RED_BOOK_OPEN -- red book, but closed +location28: + .byte $ff ; north exit + .byte $ff ; south exit + .byte $ff ; east exit + .byte OCTAGON_TEMPLE_CENTER ; west exit + .byte $ff ; north exit_dir + .byte $ff ; south exit_dir + .byte $ff ; east exit_dir + .byte DIRECTION_W|DIRECTION_ONLY_POINT ; west exit_dir + .word $0000 ; north bg + .word $0000 ; south bg + .word $0000 ; east bg + .word red_book_open_lzsa ; west bg + .byte BG_WEST ; west + .byte $ff + +; OCTAGON_BLUE_BOOK_CLOSED -- blue book, but closed +location29: + .byte $ff ; north exit + .byte $ff ; south exit + .byte OCTAGON_BLUE_BOOK_OPEN ; east exit + .byte $ff ; west exit + .byte $ff ; north exit_dir + .byte $ff ; south exit_dir + .byte DIRECTION_E ; east exit_dir + .byte $ff ; west exit_dir + .word $0000 ; north bg + .word $0000 ; south bg + .word blue_book_closed_lzsa ; east bg + .word $0000 ; west bg + .byte BG_EAST ; east + .byte $ff + +; OCTAGON_BLUE_BOOK_OPEN -- blue book, but open +location30: + .byte $ff ; north exit + .byte $ff ; south exit + .byte OCTAGON_TEMPLE_CENTER ; east exit + .byte $ff ; west exit + .byte $ff ; north exit_dir + .byte $ff ; south exit_dir + .byte DIRECTION_E|DIRECTION_ONLY_POINT ; east exit_dir + .byte $ff ; west exit_dir + .word $0000 ; north bg + .word $0000 ; south bg + .word blue_book_open_lzsa ; east bg + .word $0000 ; west bg + .byte BG_EAST ; east + .byte $ff