diff --git a/mist/graphics_octagon/Makefile b/mist/graphics_octagon/Makefile
index a1bc9f9a..78c7ca87 100644
--- a/mist/graphics_octagon/Makefile
+++ b/mist/graphics_octagon/Makefile
@@ -38,7 +38,9 @@ octagon_graphics.inc:	\
 	tower_book_view_blank_s.lzsa tower_book_view_ship_s.lzsa \
 	tower_key_n.lzsa tower_key_s.lzsa tower_key_e.lzsa tower_key_w.lzsa \
 	tower_left_n.lzsa tower_left_s.lzsa \
-	tower_right_n.lzsa tower_right_s.lzsa
+	tower_right_n.lzsa tower_right_s.lzsa \
+	tower_key_ladder_n.lzsa tower_key_ladder_s.lzsa \
+	tower_key_view_blank_n.lzsa tower_key_view_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
@@ -93,6 +95,11 @@ octagon_graphics.inc:	\
 	echo "tower_left_s_lzsa: .incbin \"tower_left_s.lzsa\"" >> octagon_graphics.inc
 	echo "tower_right_n_lzsa: .incbin \"tower_right_n.lzsa\"" >> octagon_graphics.inc
 	echo "tower_right_s_lzsa: .incbin \"tower_right_s.lzsa\"" >> octagon_graphics.inc
+	echo "tower_key_ladder_n_lzsa: .incbin \"tower_key_ladder_n.lzsa\"" >> octagon_graphics.inc
+	echo "tower_key_ladder_s_lzsa: .incbin \"tower_key_ladder_s.lzsa\"" >> octagon_graphics.inc
+	echo "tower_key_view_blank_n_lzsa: .incbin \"tower_key_view_blank_n.lzsa\"" >> octagon_graphics.inc
+	echo "tower_key_view_s_lzsa: .incbin \"tower_key_view_s.lzsa\"" >> octagon_graphics.inc
+
 
 %.gr: %.png
 	$(PNG2GR) $< $@
diff --git a/mist/graphics_octagon/tower_key_ladder_hint_n.png b/mist/graphics_octagon/tower_key_ladder_hint_n.png
new file mode 100644
index 00000000..91066261
Binary files /dev/null and b/mist/graphics_octagon/tower_key_ladder_hint_n.png differ
diff --git a/mist/graphics_octagon/tower_key_ladder_n.png b/mist/graphics_octagon/tower_key_ladder_n.png
new file mode 100644
index 00000000..7f395ab0
Binary files /dev/null and b/mist/graphics_octagon/tower_key_ladder_n.png differ
diff --git a/mist/graphics_octagon/tower_key_ladder_s.png b/mist/graphics_octagon/tower_key_ladder_s.png
new file mode 100644
index 00000000..f91e3f5f
Binary files /dev/null and b/mist/graphics_octagon/tower_key_ladder_s.png differ
diff --git a/mist/graphics_octagon/tower_key_view_blank_n.png b/mist/graphics_octagon/tower_key_view_blank_n.png
new file mode 100644
index 00000000..9cae6e9c
Binary files /dev/null and b/mist/graphics_octagon/tower_key_view_blank_n.png differ
diff --git a/mist/graphics_octagon/tower_key_view_hint_n.png b/mist/graphics_octagon/tower_key_view_hint_n.png
new file mode 100644
index 00000000..58d6556b
Binary files /dev/null and b/mist/graphics_octagon/tower_key_view_hint_n.png differ
diff --git a/mist/graphics_octagon/tower_key_view_n.png b/mist/graphics_octagon/tower_key_view_n.png
new file mode 100644
index 00000000..64615538
Binary files /dev/null and b/mist/graphics_octagon/tower_key_view_n.png differ
diff --git a/mist/graphics_octagon/tower_key_view_s.png b/mist/graphics_octagon/tower_key_view_s.png
new file mode 100644
index 00000000..94bfaa9e
Binary files /dev/null and b/mist/graphics_octagon/tower_key_view_s.png differ
diff --git a/mist/leveldata_octagon.inc b/mist/leveldata_octagon.inc
index c14be7a3..31c22cb9 100644
--- a/mist/leveldata_octagon.inc
+++ b/mist/leveldata_octagon.inc
@@ -10,7 +10,7 @@ locations:
 	.word location12,location13,location14,location15
 	.word location16,location17,location18,location19
 	.word location20,location21,location22,location23
-	.word location24
+	.word location24,location25,location26
 
 ; OCTAGON_TEMPLE_DOORWAY	-- temple doorway
 location0:
@@ -459,5 +459,37 @@ location24:
 	.byte	BG_SOUTH|BG_NORTH
 	.byte	$ff
 
+; OCTAGON_KEY_LADDER		-- ladder, key side
+location25:
+	.byte	OCTAGON_KEY_VIEW	; north exit
+	.byte	OCTAGON_TOWER_KEY	; 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_key_ladder_n_lzsa		; north bg
+	.word	tower_key_ladder_s_lzsa		; south bg
+	.word	$0000				; east bg
+	.word	$0000				; west bg
+	.byte	BG_SOUTH|BG_NORTH
+	.byte	$ff
 
+; OCTAGON_KEY_VIEW		-- key ladder, view hint
+location26:
+	.byte	$ff			; north exit
+	.byte	OCTAGON_KEY_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_key_view_blank_n_lzsa	; north bg
+	.word	tower_key_view_s_lzsa		; south bg
+	.word	$0000				; east bg
+	.word	$0000				; west bg
+	.byte	BG_SOUTH|BG_NORTH
+	.byte	$ff