Apple-2-SW/dos33fsprogs
1
0
Fork 0
mirror of https://github.com/deater/dos33fsprogs.git synced 2025-01-13 22:30:49 +00:00
Code Issues Projects Releases Wiki Activity

peasant: properly hook up new outer level

Browse Source
This commit is contained in:
Vince Weaver 2024-10-22 23:56:00 -04:00
parent e389f21d82
commit 1155f3b113
11 changed files with 145 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
games/peasant/Makefile
View File

@ -43,10 +43,8 @@ peasant_disk2.dsk: QBOOT QLOAD \
$(DOS33_RAW) peasant_disk2.dsk 25 0 PEASANT3 0 0
$(DOS33_RAW) peasant_disk2.dsk 30 0 PEASANT4 0 0
peasant_disk3.dsk: ./trogdor/TROGDOR ./ending/ENDING \
./cliff_base/CLIFF_BASE ./cliff_heights/CLIFF_HEIGHTS \
./climb/CLIMB \
./game_over/GAME_OVER ./inside/INSIDE ./inn/INN \
peasant_disk3.dsk: \
./inside/INSIDE ./inn/INN \
./archery/ARCHERY ./map/MAP \
./wrong_boot/WBOOT3
cp $(EMPTY_DISK)/empty.dsk peasant_disk3.dsk
@ -55,18 +53,20 @@ peasant_disk3.dsk: ./trogdor/TROGDOR ./ending/ENDING \
$(DOS33_RAW) peasant_disk3.dsk 3 0 ./archery/ARCHERY 0 0
$(DOS33_RAW) peasant_disk3.dsk 7 0 ./inside/INSIDE 0 0
$(DOS33_RAW) peasant_disk3.dsk 11 0 ./inn/INN 0 0
$(DOS33_RAW) peasant_disk3.dsk 15 0 ./trogdor/TROGDOR 0 0
$(DOS33_RAW) peasant_disk3.dsk 19 0 ./ending/ENDING 0 0
$(DOS33_RAW) peasant_disk3.dsk 24 0 ./cliff_base/CLIFF_BASE 0 0
$(DOS33_RAW) peasant_disk3.dsk 26 0 ./climb/CLIMB 0 0
$(DOS33_RAW) peasant_disk3.dsk 30 0 ./cliff_heights/CLIFF_HEIGHTS 0 0
peasant_disk4.dsk: ./wrong_boot/WBOOT4 \
./cliff_base/CLIFF_BASE ./climb/CLIMB \
./cliff_heights/CLIFF_HEIGHTS \
./cliff_heights/CLIFF_HEIGHTS ./outer/OUTER \
./trogdor/TROGDOR ./ending/ENDING
cp $(EMPTY_DISK)/empty.dsk peasant_disk4.dsk
$(DOS33_RAW) peasant_disk4.dsk 0 0 ./wrong_boot/WBOOT4 0 1
$(DOS33_RAW) peasant_disk4.dsk 0 0 ./wrong_boot/WBOOT4 0 1
$(DOS33_RAW) peasant_disk4.dsk 1 0 ./cliff_base/CLIFF_BASE 0 0
$(DOS33_RAW) peasant_disk4.dsk 3 0 ./climb/CLIMB 0 0
$(DOS33_RAW) peasant_disk4.dsk 7 0 ./cliff_heights/CLIFF_HEIGHTS 0 0
$(DOS33_RAW) peasant_disk4.dsk 11 0 ./outer/OUTER 0 0
$(DOS33_RAW) peasant_disk4.dsk 15 0 ./trogdor/TROGDOR 0 0
$(DOS33_RAW) peasant_disk4.dsk 19 0 ./ending/ENDING 0 0
peasant.2mg: dts_block PROBOOTHD QLOAD_HD \
@ -74,7 +74,7 @@ peasant.2mg: dts_block PROBOOTHD QLOAD_HD \
./music/MUSIC ./copy/COPY_CHECK ./inventory/INVENTORY \
./map/MAP ./archery/ARCHERY ./inside/INSIDE ./inn/INN \
./trogdor/TROGDOR ./ending/ENDING ./cliff_base/CLIFF_BASE \
./climb/CLIMB \
./climb/CLIMB ./outer/OUTER \
./cliff_heights/CLIFF_HEIGHTS \
./saves/SAVE_DATA PARSE_INPUT.ZX02 ./game_over/GAME_OVER
$(PRODOSDIR)/mkprodosfs peasant.2mg -n PeasantsQ -b 2800 -2
@ -99,11 +99,13 @@ peasant.2mg: dts_block PROBOOTHD QLOAD_HD \
$(PRODOS_RAW) peasant.2mg `./dts_block 3 3 0` ./archery/ARCHERY 0 0
$(PRODOS_RAW) peasant.2mg `./dts_block 3 7 0` ./inside/INSIDE 0 0
$(PRODOS_RAW) peasant.2mg `./dts_block 3 11 0` ./inn/INN 0 0
$(PRODOS_RAW) peasant.2mg `./dts_block 3 15 0` ./trogdor/TROGDOR 0 0
$(PRODOS_RAW) peasant.2mg `./dts_block 3 19 0` ./ending/ENDING 0 0
$(PRODOS_RAW) peasant.2mg `./dts_block 3 24 0` ./cliff_base/CLIFF_BASE 0 0
$(PRODOS_RAW) peasant.2mg `./dts_block 3 26 0` ./climb/CLIMB 0 0
$(PRODOS_RAW) peasant.2mg `./dts_block 3 30 0` ./cliff_heights/CLIFF_HEIGHTS 0 0
$(PRODOS_RAW) peasant.2mg `./dts_block 4 1 0` ./cliff_base/CLIFF_BASE 0 0
$(PRODOS_RAW) peasant.2mg `./dts_block 4 3 0` ./climb/CLIMB 0 0
$(PRODOS_RAW) peasant.2mg `./dts_block 4 7 0` ./cliff_heights/CLIFF_HEIGHTS 0 0
$(PRODOS_RAW) peasant.2mg `./dts_block 4 11 0` ./outer/OUTER 0 0
$(PRODOS_RAW) peasant.2mg `./dts_block 4 15 0` ./trogdor/TROGDOR 0 0
$(PRODOS_RAW) peasant.2mg `./dts_block 4 19 0` ./ending/ENDING 0 0
###
@ -318,10 +320,12 @@ inventory/INVENTORY:
./game_over/GAME_OVER:
cd game_over && make
./knight_falls_rock/KNIGHT_FALLS_ROCK: DIALOG_KNIGHT_FALLS_ROCK.ZX02
cd knight_falls_rock && make
./outer/OUTER:
cd outer && make
###
@ -496,10 +500,10 @@ text/dialog_peasant4.inc:
####
dialog_test: dialog_test.o
ld65 -o dialog_test dialog_test.o -C ../../linker_scripts/apple2_d000.inc
#dialog_test: dialog_test.o
# ld65 -o dialog_test dialog_test.o -C ../../linker_scripts/apple2_d000.inc
dialog_test.o: dialog_test.s
##dialog_test.o: dialog_test.s
ca65 -o dialog_test.o dialog_test.s -l dialog_test.lst
####
@ -553,6 +557,7 @@ distclean:
cd intro && make distclean
cd inventory && make distclean
cd map && make distclean
cd outer && make distclean
cd saves && make distclean
cd text && make distclean
cd trogdor && make distclean
@ -579,6 +584,7 @@ clean:
cd inventory && make clean
cd map && make clean
cd music && make clean
cd outer && make clean
cd saves && make clean
cd text && make clean
cd title && make clean

54
games/peasant/cliff_heights/cliff_heights.s
View File

@ -13,7 +13,7 @@
.include "../inventory/inventory.inc"
.include "../parse_input.inc"
.include "../redbook_sound.inc"
.include "../common_locations.inc"
.include "../common_defines.inc"
LOCATION_BASE = LOCATION_CLIFF_HEIGHTS ; (21 = $15)
@ -268,61 +268,35 @@ wait_loop:
oops_new_location:
; new location but same file
; lda MAP_LOCATION
; cmp #LOCATION_TROGDOR_OUTER
; bne not_outer
lda MAP_LOCATION
cmp #LOCATION_CLIFF_HEIGHTS
bne not_the_cliff
lda PREVIOUS_LOCATION
cmp #LOCATION_TROGDOR_OUTER
beq to_cliff_from_outer
to_cliff_from_cliff:
lda #18
sta PEASANT_X
lda #140
sta PEASANT_Y
bne not_the_cliff ; bra
to_cliff_from_outer:
lda #32
sta PEASANT_X
lda #120
sta PEASANT_Y
bne not_the_cliff ; bra
not_the_cliff:
lda MAP_LOCATION
cmp #LOCATION_TROGDOR_OUTER
bne not_outer
lda #2
sta PEASANT_X
lda #100
sta PEASANT_Y
; lda #2
; sta PEASANT_X
; lda #100
; sta PEASANT_Y
not_outer:
just_go_there:
jmp new_location
; jmp new_location
;************************
;========================
; exit level
;************************
;========================
level_over:
cmp #NEW_FROM_LOAD ; see if loading save game
beq exiting_cliff
; new location
; in theory this can only be TROGDOR
; in theory this can only be OUTER
lda #4
lda #2
sta PEASANT_X
lda #170
lda #100
sta PEASANT_Y
lda #0

13
games/peasant/docs/NOTES
View File

@ -1,3 +1,16 @@
Moving locations around on disk:
+ Make sure LOCATIONS and LOAD are up to date in zp.inc
+ Update end of qload.s
+ edit new_map_location.s
Dialog issues:
Uncompressed LZSA ZX02
DIALOG_PEASANT1 7394 4002 3804

18
games/peasant/docs/TODO
View File

@ -1,7 +1,10 @@
current:
finish base (mostly walk_to)
finish cliff_base (mostly walk_to)
fix/add sound effects for rocks/lightning
add lightning
finish outer
maybe have exiting x,y data in new_map_location somehow?
===============================
@ -219,20 +222,21 @@ Cliff_Base:
Cliff Climb
~~~~~~~~~~~
+ Hook up
+ Sound effects for rocks falling
+ Sound effect for falling
+ Message upon hitting ground
Cliff Heights
~~~~~~~~~~~~~
+ Hook up points/message for arriving at cliff
+ Animate lightning
+ Fix the priority/entry points for the various entrances
+ Improve left lightning
Outer
~~~~~
+ Hook up dialog with keepers
+ Animate keepers
+ Animate the three deaths
+ peasant sprites for the various outfits
+ When give items, have them taken out of inventory
+ If don't have item like sub, skip letting them try to give something
Trogdor:
~~~~~~~~

2
games/peasant/new_map_location.s
View File

@ -262,7 +262,7 @@ location_to_file:
.byte LOAD_CLIFF_BASE ; LOCATION_CLIFF_BASE = 20
.byte LOAD_HEIGHTS ; LOCATION_CLIFF_HEIGHTS= 21
.byte LOAD_HEIGHTS ; LOCATION_TROGDOR_OUTER= 22
.byte LOAD_OUTER ; LOCATION_TROGDOR_OUTER= 22
.byte LOAD_TROGDOR ; LOCATION_TROGDOR_LAIR = 23
.byte LOAD_INSIDE ; LOCATION_HIDDEN_GLEN = 24

1
games/peasant/outer/Makefile
View File

@ -20,6 +20,7 @@ outer.o: outer.s \
sprites_outer/ron_sprites.inc \
sprites_outer/keeper1_sprites.inc \
sprites_outer/keeper2_sprites.inc \
sprites_outer/guitar_sprites.inc \
../sprites_peasant/robe_sprites.zx02 \
../draw_peasant.s ../move_peasant.s \
../gr_copy.s ../hgr_copy.s \

70
games/peasant/outer/outer.s
View File

@ -304,44 +304,38 @@ not_in_quiz:
oops_new_location:
; new location but same file
; actually not possible
lda MAP_LOCATION
cmp #LOCATION_CLIFF_HEIGHTS
bne not_the_cliff
lda PREVIOUS_LOCATION
cmp #LOCATION_TROGDOR_OUTER
beq to_cliff_from_outer
;to_cliff_from_cliff:
; lda #18
; sta PEASANT_X
; lda #140
; sta PEASANT_Y
; bne not_the_cliff ; bra
to_cliff_from_cliff:
lda #18
sta PEASANT_X
lda #140
sta PEASANT_Y
bne not_the_cliff ; bra
;to_cliff_from_outer:
; lda #32
; sta PEASANT_X
; lda #120
; sta PEASANT_Y
; bne not_the_cliff ; bra
to_cliff_from_outer:
lda #32
sta PEASANT_X
lda #120
sta PEASANT_Y
bne not_the_cliff ; bra
;not_the_cliff:
not_the_cliff:
; lda MAP_LOCATION
; cmp #LOCATION_TROGDOR_OUTER
; bne not_outer
lda MAP_LOCATION
cmp #LOCATION_TROGDOR_OUTER
bne not_outer
lda #2
sta PEASANT_X
lda #100
sta PEASANT_Y
; lda #2
; sta PEASANT_X
; lda #100
; sta PEASANT_Y
not_outer:
just_go_there:
jmp new_location
; jmp new_location
;========================
@ -350,20 +344,31 @@ just_go_there:
level_over:
cmp #NEW_FROM_LOAD ; see if loading save game
beq exiting_cliff
beq exiting_outer
; new location
; in theory this can only be TROGDOR
lda MAP_LOCATION
cmp #LOCATION_CLIFF_HEIGHTS
bne not_cliff
was_cliff:
lda #32
sta PEASANT_X
lda #120
bne done_outer_pos ; bra
not_cliff:
; trogdor
lda #4
sta PEASANT_X
lda #170
done_outer_pos:
sta PEASANT_Y
lda #0
sta PEASANT_XADD
sta PEASANT_YADD
exiting_cliff:
exiting_outer:
rts
@ -422,7 +427,8 @@ robe_sprite_data:
.include "sprites_outer/keeper1_sprites.inc"
.include "sprites_outer/ron_sprites.inc"
;.include "sprites_outer/keeper2_sprites.inc"
.include "sprites_outer/keeper2_sprites.inc"
.include "sprites_outer/guitar_sprites.inc"
;==========================================

33
games/peasant/outer/sprites_outer/Makefile
View File

@ -2,7 +2,7 @@
HGR_SPRITE = ../../../../utils/hgr-utils/hgr_make_sprite
all: keeper1_sprites.inc ron_sprites.inc \
keeper2_sprites.inc
keeper2_sprites.inc guitar_sprites.inc
keeper1_sprites.inc: keeper1_sprites.png
$(HGR_SPRITE) -l keeper_r0 keeper1_sprites.png 14 128 27 156 > keeper1_sprites.inc
@ -36,16 +36,16 @@ ron_sprites.inc: keeper1_sprites.png
keeper2_sprites.inc: keeper2_sprites.png
$(HGR_SPRITE) -l keeper_l0 keeper2_sprites.png 14 128 27 156 > keeper2_sprites.inc
$(HGR_SPRITE) -l keeper_l1 keeper2_sprites.png 42 128 55 156 >> keeper2_sprites.inc
$(HGR_SPRITE) -l keeper_l0 keeper2_sprites.png 14 128 34 156 > keeper2_sprites.inc
$(HGR_SPRITE) -l keeper_l1 keeper2_sprites.png 42 128 62 156 >> keeper2_sprites.inc
$(HGR_SPRITE) -l keeper_l2 keeper2_sprites.png 70 128 90 156 >> keeper2_sprites.inc
$(HGR_SPRITE) -l keeper_l3 keeper2_sprites.png 98 128 118 156 >> keeper2_sprites.inc
$(HGR_SPRITE) -l keeper_l4 keeper2_sprites.png 126 128 146 156 >> keeper2_sprites.inc
$(HGR_SPRITE) -l keeper_l5 keeper2_sprites.png 154 128 174 156 >> keeper2_sprites.inc
$(HGR_SPRITE) -l keeper_l6 keeper2_sprites.png 182 128 202 156 >> keeper2_sprites.inc
$(HGR_SPRITE) -l keeper_l7 keeper2_sprites.png 210 128 230 156 >> keeper2_sprites.inc
$(HGR_SPRITE) -l keeper_l0_mask keeper2_sprites.png 14 159 27 187 >> keeper2_sprites.inc
$(HGR_SPRITE) -l keeper_l1_mask keeper2_sprites.png 42 159 55 187 >> keeper2_sprites.inc
$(HGR_SPRITE) -l keeper_l0_mask keeper2_sprites.png 14 159 34 187 >> keeper2_sprites.inc
$(HGR_SPRITE) -l keeper_l1_mask keeper2_sprites.png 42 159 62 187 >> keeper2_sprites.inc
$(HGR_SPRITE) -l keeper_l2_mask keeper2_sprites.png 70 159 90 187 >> keeper2_sprites.inc
$(HGR_SPRITE) -l keeper_l3_mask keeper2_sprites.png 98 159 118 187 >> keeper2_sprites.inc
$(HGR_SPRITE) -l keeper_l4_mask keeper2_sprites.png 126 159 146 187 >> keeper2_sprites.inc
@ -53,7 +53,28 @@ keeper2_sprites.inc: keeper2_sprites.png
$(HGR_SPRITE) -l keeper_l6_mask keeper2_sprites.png 182 159 202 187 >> keeper2_sprites.inc
$(HGR_SPRITE) -l keeper_l7_mask keeper2_sprites.png 210 159 230 187 >> keeper2_sprites.inc
guitar_sprites.inc: guitar_sprites.png
$(HGR_SPRITE) -l guitar0 guitar_sprites.png 14 128 27 158 > guitar_sprites.inc
$(HGR_SPRITE) -l guitar1 guitar_sprites.png 56 128 68 158 >> guitar_sprites.inc
$(HGR_SPRITE) -l guitar2 guitar_sprites.png 98 128 118 158 >> guitar_sprites.inc
$(HGR_SPRITE) -l guitar3 guitar_sprites.png 140 128 167 158 >> guitar_sprites.inc
$(HGR_SPRITE) -l guitar4 guitar_sprites.png 140 32 167 62 >> guitar_sprites.inc
$(HGR_SPRITE) -l guitar5 guitar_sprites.png 14 32 41 62 >> guitar_sprites.inc
$(HGR_SPRITE) -l guitar6 guitar_sprites.png 56 32 83 62 >> guitar_sprites.inc
$(HGR_SPRITE) -l guitar7 guitar_sprites.png 98 32 125 62 >> guitar_sprites.inc
$(HGR_SPRITE) -l guitar0_mask guitar_sprites.png 14 159 27 189 >> guitar_sprites.inc
$(HGR_SPRITE) -l guitar1_mask guitar_sprites.png 56 159 68 189 >> guitar_sprites.inc
$(HGR_SPRITE) -l guitar2_mask guitar_sprites.png 98 159 118 189 >> guitar_sprites.inc
$(HGR_SPRITE) -l guitar3_mask guitar_sprites.png 140 159 167 189 >> guitar_sprites.inc
$(HGR_SPRITE) -l guitar4_mask guitar_sprites.png 140 63 167 92 >> guitar_sprites.inc
$(HGR_SPRITE) -l guitar5_mask guitar_sprites.png 14 63 41 92 >> guitar_sprites.inc
$(HGR_SPRITE) -l guitar6_mask guitar_sprites.png 56 63 83 92 >> guitar_sprites.inc
$(HGR_SPRITE) -l guitar7_mask guitar_sprites.png 98 63 125 92 >> guitar_sprites.inc
clean:
rm -f *~ \
keeper1_sprites.inc ron_sprites.inc \
keeper2_sprites.inc
keeper2_sprites.inc guitar_sprites.inc

BIN
games/peasant/outer/sprites_outer/guitar_sprites.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 26 KiB

18
games/peasant/qload.s
View File

@ -29,10 +29,10 @@ qload_start:
which_disk_array:
.byte 1,1,1,1 ; VID_LOGO, TITLE, INTRO. COPY_CHECK
.byte 2,2,2,2 ; PEASANT1, PEASANT2, PEASANT3, PEASANT4
.byte 3,3,1,3 ; TROGDOR, ENDING, MUSIC, CLIFF_BASE
.byte 4,4,1,4 ; TROGDOR, ENDING, MUSIC, CLIFF_BASE
.byte 1,1,1,3 ; GAME_OVER, INVENTORY, PARSE_INPUT, INN
.byte 3,3,3,3 ; INSIDE, ARCHERY, MAP, CLIMB
.byte 3 ; HEIGHTS
.byte 3,3,3,4 ; INSIDE, ARCHERY, MAP, CLIMB
.byte 4,4 ; HEIGHTS, OUTER
.byte 1,1,1 ; SAVE_DATA, ?, ?
.byte $f ; disk detect
@ -43,7 +43,7 @@ load_address_array:
.byte $60,$60,$D0,$60 ; TROGDOR, ENDING, MUSIC, CLIFF
.byte $60,$D0,$20,$60 ; GAME_OVER, INVENTORY, PARSE_INPUT, INN
.byte $60,$60,$60,$60 ; INSIDE, ARCHERY, MAP, CLIMB
.byte $60 ; HEIGHTS
.byte $60,$60 ; HEIGHTS, OUTER
.byte $BC,$BC,$BC ; SAVE_DATA,? , ?
.byte $BC ; disk detect
@ -51,10 +51,10 @@ load_address_array:
track_array:
.byte 4, 6, 9,1 ; VID_LOGO, TITLE, INTRO, COPY_CHECK
.byte 15,20,25,30 ; PEASANT1, PEASANT2, PEASANT3, PEASANT4
.byte 15,19, 3,24 ; TROGDOR, ENDING, MUSIC, CLIFF_BASE
.byte 15,19, 3, 1 ; TROGDOR, ENDING, MUSIC, CLIFF_BASE
.byte 15,14,13,11 ; GAME_OVER, INVENTORY, PARSE_INPUT, INN
.byte 7,3,1,26 ; INSIDE, ARCHERY, MAP, CLIMB
.byte 30 ; HEIGHTS
.byte 7,3,1,3 ; INSIDE, ARCHERY, MAP, CLIMB
.byte 7,11 ; HEIGHTS, OUTER
.byte 0, 0, 0 ; SAVE_DATA, ?, ?
.byte 0 ; disk detect
@ -65,7 +65,7 @@ sector_array:
.byte 0, 0, 0, 0 ; TROGDOR, ENDING, MUSIC, CLIFF_BASE
.byte 0, 0, 0, 0 ; GAME_OVER, INVENTORY, PARSE_INPUT, INN
.byte 0, 0, 0, 0 ; INSIDE, ARCHERY, MAP, CLIMB
.byte 0 ; HEIGHTS
.byte 0, 0 ; HEIGHTS, OUTER
.byte 12,0,0 ; SAVE_DATA, ?, ?
.byte 0 ; disk detect
@ -76,7 +76,7 @@ length_array:
.byte 64, 80, 16, 32 ; TROGDOR, ENDING, MUSIC, CLIFF_BASE
.byte 16, 16, 16, 64 ; GAME_OVER, INVENTORY, PARSE_INPUT, INN
.byte 64, 64, 32, 64 ; INSIDE, ARCHERY, MAP, CLIMB
.byte 64 ; HEIGHTS
.byte 64, 64 ; HEIGHTS, OUTER
.byte 1,1,1 ; SAVE_DATA, ? , ?
.byte 1 ; disk detect

7
games/peasant/zp.inc
View File

@ -349,10 +349,11 @@ LOAD_ARCHERY = 17
LOAD_MAP = 18
LOAD_CLIMB = 19
LOAD_HEIGHTS = 20
LOAD_OUTER = 21
LOAD_SAVE1 = 21
LOAD_SAVE2 = 22
LOAD_SAVE3 = 23
LOAD_SAVE1 = 22
LOAD_SAVE2 = 23
LOAD_SAVE3 = 24
VGI_RCOLOR = P0