diff --git a/mist/brother_books.s b/mist/brother_books.s index a4f276ed..d2300d54 100644 --- a/mist/brother_books.s +++ b/mist/brother_books.s @@ -59,14 +59,12 @@ red_book_loop: jsr page_flip ; FIXME -.if 0 lda #audio_red_page sta BTC_H ldx #21 ; 21 pages long??? jsr play_audio -.endif ; lda #100 ; jsr WAIT diff --git a/mist/graphics_sizes.txt b/mist/graphics_sizes.txt index c5b47676..0a6acd06 100644 --- a/mist/graphics_sizes.txt +++ b/mist/graphics_sizes.txt @@ -93,4 +93,15 @@ DISK VOLUME 254 78.5k +DISK VOLUME 254 + A 003 HELLO + B 005 LOADER + B 035 MIST_TITLE + B 138 MIST + B 028 OCTAGON + B 025 MECHE + B 043 SELENA + B 047 LINK_NOISE.BTC + + 81k diff --git a/mist/leveldata_mist.inc b/mist/leveldata_mist.inc index b42a626e..ed6f442e 100644 --- a/mist/leveldata_mist.inc +++ b/mist/leveldata_mist.inc @@ -88,7 +88,7 @@ location3: .byte BG_SOUTH|BG_NORTH|BG_EAST .byte $ff ; special exit -; base of steps +; MIST_BASE_STEPS -- base of steps location4: .byte MIST_ABOVE_DOCK ; north exit .byte MIST_STEPS_1ST_LANDING ; south exit @@ -179,7 +179,6 @@ location8: ; MIST_OUTSIDE_TEMPLE -- at the top outside temple location9: -; .byte 10 ; north exit .byte $ff ; north exit .byte MIST_POOL ; south exit .byte MIST_STEPS_4TH_LANDING ; east exit @@ -193,7 +192,10 @@ location9: .word step_top_e_lzsa ; east bg .word step_top_w_lzsa ; west bg .byte BG_EAST|BG_WEST|BG_NORTH|BG_SOUTH ; all dirs - .byte $ff ; special exit + .byte DIRECTION_N ; special exit + .byte 10,30 ; special x + .byte 0,46 ; special y + .word enter_octagon-1 ; MIST_POOL -- pool @@ -253,7 +255,7 @@ location13: .byte $ff ; south exit .byte $ff ; east exit .byte $ff ; west exit - .byte DIRECTION_N ; north exit_dir + .byte DIRECTION_N|DIRECTION_ONLY_POINT ; north exit_dir .byte $ff ; south exit_dir .byte $ff ; east exit_dir .byte $ff ; west exit_dir diff --git a/mist/leveldata_octagon.inc b/mist/leveldata_octagon.inc index 574b7696..8cf05162 100644 --- a/mist/leveldata_octagon.inc +++ b/mist/leveldata_octagon.inc @@ -23,7 +23,10 @@ location0: .word $0000 ; east bg .word $0000 ; west bg .byte BG_NORTH|BG_SOUTH ; north and south - .byte $ff ; special exit + .byte DIRECTION_S ; special exit + .byte 10,30 ; special x + .byte 0,46 ; special y + .word leave_octagon-1 ; special function ; OCTAGON_TEMPLE_CENTER -- temple inside @@ -33,7 +36,7 @@ location1: .byte OCTAGON_FIREPLACE ; east exit .byte OCTAGON_RED_BOOKSHELF ; west exit .byte $ff ; north exit_dir - .byte DIRECTION_S ; south exit_dir + .byte DIRECTION_S|DIRECTION_ONLY_POINT ; south exit_dir .byte DIRECTION_E ; east exit_dir .byte DIRECTION_W ; west exit_dir .word temple_center_n_lzsa ; north bg diff --git a/mist/mist.s b/mist/mist.s index 26d2ac95..281a48c4 100644 --- a/mist/mist.s +++ b/mist/mist.s @@ -233,6 +233,20 @@ green_house: rts +enter_octagon: + + lda #OCTAGON_TEMPLE_DOORWAY + sta LOCATION + + lda #LOAD_OCTAGON + sta WHICH_LOAD + + lda #$ff + sta LEVEL_OVER + + rts + + ;========================== ; includes diff --git a/mist/octagon.s b/mist/octagon.s index 9df3aa8d..1659c2ba 100644 --- a/mist/octagon.s +++ b/mist/octagon.s @@ -101,6 +101,20 @@ really_exit: jmp end_level +leave_octagon: + + lda #MIST_OUTSIDE_TEMPLE + sta LOCATION + + lda #LOAD_MIST + sta WHICH_LOAD + + lda #$ff + sta LEVEL_OVER + + rts + + ;========================== ; includes ;========================== @@ -138,5 +152,5 @@ really_exit: ;.align $100 -;audio_red_page: -;.incbin "audio/red_page.btc" +audio_red_page: +.incbin "audio/red_page.btc"