diff --git a/mist/brother_books.s b/mist/brother_books.s index 9763bb46..9c6d39b2 100644 --- a/mist/brother_books.s +++ b/mist/brother_books.s @@ -108,3 +108,27 @@ red_book_done: + +; comment summary + +; red 0 +; only static + +; red 1 +; who are you, bring me a red page, I can't see you +; I am sirrus + +; blue 0 +; only static + +; blue 1 +; sirrus is that you? who are you? help me. bring blue pages +; I must have the blue page + +; blue 2 +; you've returned, I'm Achenar. don't listen to my brother. +; egotistical fool and liar, bring the blue pages, not the red ones +; I've been wrongly imprisoned. I will have my retribution. + + + diff --git a/mist/common_defines.inc b/mist/common_defines.inc index d24806c8..70d087c7 100644 --- a/mist/common_defines.inc +++ b/mist/common_defines.inc @@ -130,6 +130,9 @@ OCTAGON_ELEVATOR_VIEW = 15 OCTAGON_ELEVATOR_OUT = 16 OCTAGON_ELEVATOR_OPEN = 17 OCTAGON_ELEVATOR_IN = 18 +OCTAGON_TOWER_BOOK = 19 +OCTAGON_BOOK_LADDER = 20 +OCTAGON_BOOK_VIEW = 21 ; Mechanical Engineering diff --git a/mist/graphics_octagon/Makefile b/mist/graphics_octagon/Makefile index bb139c10..b8efa970 100644 --- a/mist/graphics_octagon/Makefile +++ b/mist/graphics_octagon/Makefile @@ -30,7 +30,12 @@ octagon_graphics.inc: \ tower_hall2_n.lzsa tower_hall2_s.lzsa \ elevator_far_n.lzsa \ elevator_n.lzsa elevator_s.lzsa elevator_open_n.lzsa \ - elevator_lib_s.lzsa + elevator_lib_s.lzsa \ + elevator_tower_s.lzsa \ + tower_book_s.lzsa tower_book_n.lzsa tower_book_e.lzsa tower_book_w.lzsa \ + tower_book_ladder_s.lzsa tower_book_ladder_n.lzsa \ + tower_book_view_n.lzsa \ + tower_book_view_blank_s.lzsa tower_book_view_ship_s.lzsa echo "temple_door_n_lzsa: .incbin \"temple_door_n.lzsa\"" > octagon_graphics.inc echo "temple_door_s_lzsa: .incbin \"temple_door_s.lzsa\"" >> octagon_graphics.inc echo "temple_door_closed_s_lzsa: .incbin \"temple_door_closed_s.lzsa\"" >> octagon_graphics.inc @@ -67,6 +72,16 @@ octagon_graphics.inc: \ echo "elevator_s_lzsa: .incbin \"elevator_s.lzsa\"" >> octagon_graphics.inc echo "elevator_open_n_lzsa: .incbin \"elevator_open_n.lzsa\"" >> octagon_graphics.inc echo "elevator_lib_s_lzsa: .incbin \"elevator_lib_s.lzsa\"" >> octagon_graphics.inc + echo "elevator_tower_s_lzsa: .incbin \"elevator_tower_s.lzsa\"" >> octagon_graphics.inc + echo "tower_book_s_lzsa: .incbin \"tower_book_s.lzsa\"" >> octagon_graphics.inc + echo "tower_book_n_lzsa: .incbin \"tower_book_n.lzsa\"" >> octagon_graphics.inc + echo "tower_book_e_lzsa: .incbin \"tower_book_e.lzsa\"" >> octagon_graphics.inc + echo "tower_book_w_lzsa: .incbin \"tower_book_w.lzsa\"" >> octagon_graphics.inc + echo "tower_book_ladder_s_lzsa: .incbin \"tower_book_ladder_s.lzsa\"" >> octagon_graphics.inc + echo "tower_book_ladder_n_lzsa: .incbin \"tower_book_ladder_n.lzsa\"" >> octagon_graphics.inc + echo "tower_book_view_n_lzsa: .incbin \"tower_book_view_n.lzsa\"" >> octagon_graphics.inc + echo "tower_book_view_blank_s_lzsa: .incbin \"tower_book_view_blank_s.lzsa\"" >> octagon_graphics.inc + echo "tower_book_view_ship_s_lzsa: .incbin \"tower_book_view_ship_s.lzsa\"" >> octagon_graphics.inc %.gr: %.png $(PNG2GR) $< $@ diff --git a/mist/graphics_octagon/elevator_tower_s.png b/mist/graphics_octagon/elevator_tower_s.png new file mode 100644 index 00000000..b14c3fc1 Binary files /dev/null and b/mist/graphics_octagon/elevator_tower_s.png differ diff --git a/mist/graphics_octagon/tower_book_e.png b/mist/graphics_octagon/tower_book_e.png new file mode 100644 index 00000000..116de7fe Binary files /dev/null and b/mist/graphics_octagon/tower_book_e.png differ diff --git a/mist/graphics_octagon/tower_book_ladder_n.png b/mist/graphics_octagon/tower_book_ladder_n.png new file mode 100644 index 00000000..151f248f Binary files /dev/null and b/mist/graphics_octagon/tower_book_ladder_n.png differ diff --git a/mist/graphics_octagon/tower_book_ladder_s.png b/mist/graphics_octagon/tower_book_ladder_s.png new file mode 100644 index 00000000..6bbd945b Binary files /dev/null and b/mist/graphics_octagon/tower_book_ladder_s.png differ diff --git a/mist/graphics_octagon/tower_book_n.png b/mist/graphics_octagon/tower_book_n.png new file mode 100644 index 00000000..3bdc2c48 Binary files /dev/null and b/mist/graphics_octagon/tower_book_n.png differ diff --git a/mist/graphics_octagon/tower_book_s.png b/mist/graphics_octagon/tower_book_s.png new file mode 100644 index 00000000..75199cde Binary files /dev/null and b/mist/graphics_octagon/tower_book_s.png differ diff --git a/mist/graphics_octagon/tower_book_view_blank_s.png b/mist/graphics_octagon/tower_book_view_blank_s.png new file mode 100644 index 00000000..7ebb13a7 Binary files /dev/null and b/mist/graphics_octagon/tower_book_view_blank_s.png differ diff --git a/mist/graphics_octagon/tower_book_view_n.png b/mist/graphics_octagon/tower_book_view_n.png new file mode 100644 index 00000000..aa7eb047 Binary files /dev/null and b/mist/graphics_octagon/tower_book_view_n.png differ diff --git a/mist/graphics_octagon/tower_book_view_ship_s.png b/mist/graphics_octagon/tower_book_view_ship_s.png new file mode 100644 index 00000000..13ab25fc Binary files /dev/null and b/mist/graphics_octagon/tower_book_view_ship_s.png differ diff --git a/mist/graphics_octagon/tower_book_w.png b/mist/graphics_octagon/tower_book_w.png new file mode 100644 index 00000000..6ed6a700 Binary files /dev/null and b/mist/graphics_octagon/tower_book_w.png differ diff --git a/mist/leveldata_octagon.inc b/mist/leveldata_octagon.inc index 570c7a48..f4f6d869 100644 --- a/mist/leveldata_octagon.inc +++ b/mist/leveldata_octagon.inc @@ -8,7 +8,8 @@ locations: .word location4, location5, location6, location7 .word location8, location9, location10,location11 .word location12,location13,location14,location15 - .word location16,location17,location18 + .word location16,location17,location18,location19 + .word location20,location21 ; OCTAGON_TEMPLE_DOORWAY -- temple doorway location0: @@ -352,3 +353,54 @@ location18: .byte BG_SOUTH .byte $ff + +; OCTAGON_TOWER_BOOK -- tower, bookside +location19: + .byte OCTAGON_ELEVATOR_IN ; north exit + .byte OCTAGON_BOOK_LADDER ; south exit + .byte $ff ; east exit + .byte $ff ; west exit + .byte DIRECTION_S ; north exit_dir + .byte DIRECTION_S ; south exit_dir + .byte $ff ; east exit_dir + .byte $ff ; west exit_dir + .word tower_book_n_lzsa ; north bg + .word tower_book_s_lzsa ; south bg + .word tower_book_e_lzsa ; east bg + .word tower_book_w_lzsa ; west bg + .byte BG_SOUTH|BG_NORTH|BG_EAST|BG_WEST + .byte $ff + +; OCTAGON_BOOK_LADDER -- ladder, bookside +location20: + .byte OCTAGON_TOWER_BOOK ; north exit + .byte OCTAGON_BOOK_VIEW ; south exit + .byte $ff ; east exit + .byte $ff ; west exit + .byte DIRECTION_N ; north exit_dir + .byte DIRECTION_S ; south exit_dir + .byte $ff ; east exit_dir + .byte $ff ; west exit_dir + .word tower_book_ladder_n_lzsa ; north bg + .word tower_book_ladder_s_lzsa ; south bg + .word $0000 ; east bg + .word $0000 ; west bg + .byte BG_SOUTH|BG_NORTH + .byte $ff + +; OCTAGON_BOOK_VIEW -- ladder, view outside +location21: + .byte $ff ; north exit + .byte OCTAGON_BOOK_LADDER ; south exit + .byte $ff ; east exit + .byte $ff ; west exit + .byte $ff ; north exit_dir + .byte DIRECTION_S ; south exit_dir + .byte $ff ; east exit_dir + .byte $ff ; west exit_dir + .word tower_book_view_n_lzsa ; north bg + .word tower_book_view_blank_s_lzsa ; south bg + .word $0000 ; east bg + .word $0000 ; west bg + .byte BG_SOUTH|BG_NORTH + .byte $ff