peasant: clean up cliff_base a bit

can now walk around there again

games/peasant/TODO

@@ -2,11 +2,24 @@ New:
 ~~~~
 use updated speaker_beeps.s from music/redbook_sound
 use updates ssi263 code from wargames
+	or alternately use SAM
 check if newer pt3_lib needed
 updated qload code
-add hard-disk image support
-change keyboard to use ;,/ for up/down on II+
-remove need to type enter
+
+
+further out there:
+	include "Peasant's Quest" text in the background images so
+		it doesn't flicker when loaded?
+
+input code:
+	once active, leave it up on screen with >
+	maybe leave it active all the time?
+	if move to next screen and active, preserve it
+	fix "version" not working?
+cliff:
+	force cloak/on-fire
+	remove bush
+
 
 
 QUESTIONS FOR VIDELECTRIX:

games/peasant/cliff_base/Makefile

@@ -1,5 +1,6 @@
 include ../../../Makefile.inc
 
+ZX02 = ~/research/6502_compression/zx02.git/build/zx02
 LINKER_SCRIPTS = ../../../linker_scripts
 
 all:	CLIFF_BASE
@@ -14,7 +15,7 @@ cliff_base.o:	cliff_base.s \
 		../inventory/inventory.inc \
 		../parse_input.inc \
 		cliff_actions.s \
-		../DIALOG_CLIFF.ZX02 ../dialog_cliff.inc \
+		DIALOG_CLIFF_BASE.ZX02 dialog_cliff_base.inc \
 		graphics_cliff/cliff_graphics.inc \
 		graphics_cliff/priority_cliff.inc \
 		../sprites/peasant_sprites.inc \
@@ -27,6 +28,22 @@ cliff_base.o:	cliff_base.s \
 
 ###
 
+DIALOG_CLIFF_BASE.ZX02:	dialog_cliff_base
+	$(ZX02) -f  dialog_cliff_base DIALOG_CLIFF_BASE.ZX02
+
+dialog_cliff_base:   dialog_cliff_base.o
+	ld65 -o dialog_cliff_base dialog_cliff_base.o -C $(LINKER_SCRIPTS)/apple2_d000.inc
+
+dialog_cliff_base.o:	dialog_cliff_base.s ../text/cliff.inc
+	ca65 -o dialog_cliff_base.o dialog_cliff_base.s -l dialog_cliff_base.lst
+
+###
+
+dialog_cliff_base.inc:	../generate_all_symbols dialog_cliff_base
+	../generate_all_symbols -a 0xd000 dialog_cliff_base.lst > dialog_cliff_base.inc
+
+###
+
 graphics_cliff/cliff_graphics.inc:
 	cd graphics_cliff && make
 

games/peasant/cliff_base/cliff_base.s

@@ -326,7 +326,7 @@ verb_tables_hi:
 
 
 cliff_text_zx02:
-.incbin "../DIALOG_CLIFF.ZX02"
+.incbin "DIALOG_CLIFF_BASE.ZX02"
 
 .include "cliff_actions.s"
 

games/peasant/cliff_base/dialog_cliff_base.s

@@ -0,0 +1,2 @@
+.include "../text/lookup.inc"
+.include "../text/cliff_base.inc.lookup"

games/peasant/init_vars.s

@@ -0,0 +1,9 @@
+; putting these here because can never remember where to stick
+; global init that's guaranteed to get run
+
+init_global_vars:
+	lda	#0
+	sta	DRAW_PAGE
+	sta	INPUT_X		; text pointer
+
+	rts

games/peasant/text/Makefile

@@ -9,6 +9,7 @@ all:	dump_text shrink_text \
 	kerrek.inc.lookup \
 	inside.inc.lookup \
 	inn.inc.lookup \
+	cliff_base.inc.lookup \
 	cliff.inc.lookup \
 	trogdor.inc.lookup \
 	common.inc.lookup \
@@ -19,6 +20,9 @@ all:	dump_text shrink_text \
 cliff.inc.lookup:	cliff.inc shrink_text
 	./shrink_text < cliff.inc > cliff.inc.lookup
 
+cliff_base.inc.lookup:	cliff_base.inc shrink_text
+	./shrink_text < cliff_base.inc > cliff_base.inc.lookup
+
 common.inc.lookup:	common.inc shrink_text
 	./shrink_text < common.inc > common.inc.lookup
 

games/peasant/text/cliff_base.inc

@@ -0,0 +1,30 @@
+;============
+; Cliff Base
+;============
+
+; + look 
+cliff_base_look_message:
+.byte "You're at the base of a",13
+.byte "very climbable cliff that",13
+.byte "leads to Trogdor's",13
+.byte "lair. This cliff is huge -",13
+.byte "the kind where rocks start",13
+.byte "falling down the minute you",13
+.byte "try to climb it.",0
+
+; + climb  (walks to center of cliff)
+cliff_base_climb_message:
+.byte "With a new determination",13
+.byte "you dig your fingers into",13
+.byte "the cliff face and begin to",13
+.byte "haul yourself up the",13
+.byte "mountain like you were in a",13
+.byte "sports drink commercial.",0
+
+cliff_base_climb2_message:
+.byte "The mountain starts",13
+.byte "rumbling and big loose",13
+.byte "boulders start tumblin",13
+.byte "down. You'd best avoid",13
+.byte "thems.",0
+

games/peasant/vid_logo/Makefile

@@ -12,6 +12,7 @@ VID_LOGO:	vid_logo.o
 
 vid_logo.o:	vid_logo.s ../qload.inc \
 		../hgr_overlay.s ../speaker_beeps.s \
+		../init_vars.s \
 		graphics_vid/vid_graphics.inc
 	ca65 -o vid_logo.o vid_logo.s -l vid_logo.lst
 

games/peasant/vid_logo/vid_logo.s

@@ -13,17 +13,26 @@
 
 .include "../qload.inc"
 
-intro_text:
+videlectrix_intro:
 
 	;===========================
-	; print text part of intro
+	; clear text
 	;===========================
 
+	; FIXME: should we use our own routines and not monitor?
+
 	jsr	TEXT
 	jsr	HOME
 
-	lda	#0
-	sta	DRAW_PAGE
+	;==========================
+	; init various zero page vars
+	; at astart of game
+
+	jsr	init_global_vars
+
+	;===========================
+	; print text part of intro
+	;===========================
 
 	; print non-inverse
 	lda	#$80
@@ -265,7 +274,7 @@ skip_all_checks:
 	;===================================
 	;===================================
 
-videlectrix_intro:
+do_animated_videlectrix_intro:
 	jsr	hgr2				; HGR_PAGE=$40
 
 	lda	#$20
@@ -510,6 +519,8 @@ delays:
 
 .include "../wait.s"
 
+.include "../init_vars.s"
+
 .include "graphics_vid/vid_graphics.inc"