mist: make all ages share some includes

mist/Makefile

@@ -50,7 +50,7 @@ mist_title.o:	mist_title.s zp.inc hardware.inc common_defines.inc \
 MIST:	mist.o
 	ld65 -o MIST mist.o -C ../linker_scripts/apple2_1400.inc
 
-mist.o:	mist.s zp.inc hardware.inc \
+mist.o:	mist.s zp.inc hardware.inc common_defines.inc \
 	graphics_mist/mist_graphics.inc \
 	common_sprites.inc \
 	leveldata_mist.inc \
@@ -71,7 +71,7 @@ mist.o:	mist.s zp.inc hardware.inc \
 MECHE:	meche.o
 	ld65 -o MECHE meche.o -C ../linker_scripts/apple2_1400.inc
 
-meche.o:	meche.s zp.inc hardware.inc \
+meche.o:	meche.s zp.inc hardware.inc common_defines.inc \
 	graphics_meche/meche_graphics.inc \
 	common_sprites.inc \
 	leveldata_meche.inc \
@@ -87,7 +87,7 @@ meche.o:	meche.s zp.inc hardware.inc \
 SELENA:	selena.o
 	ld65 -o SELENA selena.o -C ../linker_scripts/apple2_1400.inc
 
-selena.o:	selena.s zp.inc hardware.inc \
+selena.o:	selena.s zp.inc hardware.inc common_defines.inc \
 	graphics_selena/selena_graphics.inc \
 	common_sprites.inc \
 	leveldata_selena.inc \

mist/graphics_mist/Makefile

@@ -10,7 +10,6 @@ all:	mist_graphics.inc
 ####
 
 mist_graphics.inc:	\
-	m_link_book.lzsa \
 	dock_n.lzsa dock_s.lzsa dock_e.lzsa dock_w.lzsa \
 	dock_switch_n.lzsa dock_switch_s.lzsa \
 	dock_steps_w.lzsa \
@@ -58,8 +57,7 @@ mist_graphics.inc:	\
 	tower1_trail2_n.lzsa tower1_trail2_w.lzsa tower1_trail2_s.lzsa \
 	tower1_base_e.lzsa \
 	tower1_top_e.lzsa
-	echo "m_link_book_lzsa: .incbin \"m_link_book.lzsa\"" > mist_graphics.inc
+	echo "dock_n_lzsa: .incbin \"dock_n.lzsa\"" > mist_graphics.inc
-	echo "dock_n_lzsa: .incbin \"dock_n.lzsa\"" >> mist_graphics.inc
 	echo "dock_s_lzsa: .incbin \"dock_s.lzsa\"" >> mist_graphics.inc
 	echo "dock_e_lzsa: .incbin \"dock_e.lzsa\"" >> mist_graphics.inc
 	echo "dock_w_lzsa: .incbin \"dock_w.lzsa\"" >> mist_graphics.inc

mist/graphics_mist/mist_graphics.inc

@@ -1,4 +1,3 @@
-m_link_book_lzsa: .incbin "m_link_book.lzsa"
 dock_n_lzsa: .incbin "dock_n.lzsa"
 dock_s_lzsa: .incbin "dock_s.lzsa"
 dock_e_lzsa: .incbin "dock_e.lzsa"

mist/leveldata_meche.inc

@@ -2,35 +2,6 @@
 ;===============================================
 ; level data for Meche level
 ;===============================================
-; 24 bytes each location
-; we put special at end as it's ignored if not set
-
-LOCATION_NORTH_EXIT=0			; new room when heading north
-LOCATION_SOUTH_EXIT=1			; new room when heading south
-LOCATION_EAST_EXIT=2			; new room when heading east
-LOCATION_WEST_EXIT=3			; new room when heading west
-LOCATION_NORTH_EXIT_DIR=4		; direction faced in new room when N
-LOCATION_SOUTH_EXIT_DIR=5		; direction faced in new room when S
-LOCATION_EAST_EXIT_DIR=6		; direction faced in new room when E
-LOCATION_WEST_EXIT_DIR=7		; direction faced in new room when W
-LOCATION_NORTH_BG=8			; pointer to north background image
-LOCATION_SOUTH_BG=10			; pointer to south background image
-LOCATION_EAST_BG=12			; pointer to east background image
-LOCATION_WEST_BG=14			; pointer to west background image
-LOCATION_BGS	= 16			; bitmap saying which backgrounds valid
-	BG_NORTH = 1
-	BG_SOUTH = 2
-	BG_EAST = 4
-	BG_WEST = 8
-LOCATION_SPECIAL_EXIT=17		; if we have something clickable
-					; $FF if not, direction if so
-LOCATION_SPECIAL_X1=18			; collision box for the thing to click
-LOCATION_SPECIAL_X2=19
-LOCATION_SPECIAL_Y1=20
-LOCATION_SPECIAL_Y2=21
-LOCATION_SPECIAL_FUNC=22		; pointer-1 of function to call on click
-
-
 
 locations:
 	.word location0, location1, location2, location3

mist/leveldata_mist.inc

@@ -4,7 +4,7 @@
 ;===============================================
 
 locations:
-	.word location0, location1, location2, location3
+	.word location1, location1, location2, location3
 	.word location4, location5, location6, location7
 	.word location8, location9, location10,location11
 	.word location12,location13,location14,location15
@@ -18,24 +18,24 @@ locations:
 	.word location44,location45,location46
 
 ; myst linking book
-location0:
+;location0:
-	.byte	$ff		; north exit
+;	.byte	$ff		; north exit
-	.byte	$ff		; south exit
+;	.byte	$ff		; south exit
-	.byte	$ff		; east exit
+;	.byte	$ff		; east exit
-	.byte	$ff		; west exit
+;	.byte	$ff		; west exit
-	.byte	$ff		; north exit_dir
+;	.byte	$ff		; north exit_dir
-	.byte	$ff		; south exit_dir
+;	.byte	$ff		; south exit_dir
-	.byte	$ff		; east exit_dir
+;	.byte	$ff		; east exit_dir
-	.byte	$ff		; west exit_dir
+;	.byte	$ff		; west exit_dir
-	.word	m_link_book_lzsa	; north bg
+;	.word	m_link_book_lzsa	; north bg
-	.word	$0000		; south bg
+;	.word	$0000		; south bg
-	.word	$0000		; east bg
+;	.word	$0000		; east bg
-	.word	$0000		; west bg
+;	.word	$0000		; west bg
-	.byte	BG_NORTH	; only north bg
+;	.byte	BG_NORTH	; only north bg
-	.byte	DIRECTION_N	; special exit
+;	.byte	DIRECTION_N	; special exit
-	.byte	21,31		; special x
+;	.byte	21,31		; special x
-	.byte	10,24		; special y
+;	.byte	10,24		; special y
-	.word	mist_link_book-1		; special function
+;	.word	mist_link_book-1		; special function
 
 
 ; dock

mist/leveldata_selena.inc

@@ -2,35 +2,6 @@
 ;===============================================
 ; level data for Selena level
 ;===============================================
-; 24 bytes each location
-; we put special at end as it's ignored if not set
-
-LOCATION_NORTH_EXIT=0			; new room when heading north
-LOCATION_SOUTH_EXIT=1			; new room when heading south
-LOCATION_EAST_EXIT=2			; new room when heading east
-LOCATION_WEST_EXIT=3			; new room when heading west
-LOCATION_NORTH_EXIT_DIR=4		; direction faced in new room when N
-LOCATION_SOUTH_EXIT_DIR=5		; direction faced in new room when S
-LOCATION_EAST_EXIT_DIR=6		; direction faced in new room when E
-LOCATION_WEST_EXIT_DIR=7		; direction faced in new room when W
-LOCATION_NORTH_BG=8			; pointer to north background image
-LOCATION_SOUTH_BG=10			; pointer to south background image
-LOCATION_EAST_BG=12			; pointer to east background image
-LOCATION_WEST_BG=14			; pointer to west background image
-LOCATION_BGS	= 16			; bitmap saying which backgrounds valid
-	BG_NORTH = 1
-	BG_SOUTH = 2
-	BG_EAST = 4
-	BG_WEST = 8
-LOCATION_SPECIAL_EXIT=17		; if we have something clickable
-					; $FF if not, direction if so
-LOCATION_SPECIAL_X1=18			; collision box for the thing to click
-LOCATION_SPECIAL_X2=19
-LOCATION_SPECIAL_Y1=20
-LOCATION_SPECIAL_Y2=21
-LOCATION_SPECIAL_FUNC=22		; pointer-1 of function to call on click
-
-
 
 locations:
 	.word location0, location1, location2, location3

mist/meche.s

@@ -5,7 +5,7 @@
 ; Zero Page
 	.include "zp.inc"
 	.include "hardware.inc"
-
+	.include "common_defines.inc"
 
 meche_start:
 	;===================
@@ -21,6 +21,7 @@ meche_start:
 
 	lda	#0
 	sta	DRAW_PAGE
+	sta	LEVEL_OVER
 
 	; init cursor
 
@@ -140,8 +141,18 @@ nothing_special:
 	inc	FRAMEH
 room_frame_no_oflo:
 
+	;====================================
+	; check level over
+	;====================================
+
+	lda	LEVEL_OVER
+	bne	really_exit
 	jmp	game_loop
 
+really_exit:
+	jmp	end_level
+
+
 
 	;==========================
 	; includes
@@ -156,6 +167,7 @@ room_frame_no_oflo:
 	.include	"decompress_fast_v2.s"
 	.include	"keyboard.s"
 	.include	"draw_pointer.s"
+	.include	"end_level.s"
 
 	.include	"audio.s"
 

mist/mist.s

@@ -262,8 +262,6 @@ green_house:
 
 	; linking books
 
-	.include	"link_book_mist_dock.s"
-
 	; letters
 
 	.include	"letter_cat.s"
@@ -280,7 +278,6 @@ green_house:
 ;.align $100
 ;audio_red_page:
 ;.incbin "audio/red_page.btc"
-;audio_link_noise:
+
-;.incbin "audio/link_noise.btc"
 
 

mist/selena.s

@@ -5,6 +5,7 @@
 ; Zero Page
 	.include "zp.inc"
 	.include "hardware.inc"
+	.include "common_defines.inc"
 
 
 selena_start: