Apple-2-SW
/
dos33fsprogs
mirror of https://github.com/deater/dos33fsprogs.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

peasant: save almost works 

well it does but there's a weird bug when loading it back
This commit is contained in:
Vince Weaver 2021-09-29 00:17:39 -04:00
parent bc788d0d4a
commit 4a32b31c4d
7 changed files with 347 additions and 273 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
games/peasant/Makefile
View File

@ -69,7 +69,8 @@ qload.o: qload.s qboot.inc \
hgr_text_box.s \
clear_bottom.s \
hgr_hgr2.s \
gr_offsets.s
gr_offsets.s \
qkumba_popwr.s
ca65 -o qload.o qload.s -l qload.lst
###
@ -92,6 +93,8 @@ generate_common.o: generate_common.c
qload.inc: generate_common QLOAD
./generate_common -a 0xb00 -s load_file qload.lst > qload.inc
./generate_common -a 0xb00 -s sector_write qload.lst >> qload.inc
./generate_common -a 0xb00 -s requested_sector qload.lst >> qload.inc
./generate_common -a 0xb00 -s decompress_lzsa2_fast qload.lst >> qload.inc
./generate_common -a 0xb00 -s getsrc_smc qload.lst >> qload.inc
./generate_common -a 0xb00 -s hgr2 qload.lst >> qload.inc
@ -116,6 +119,8 @@ qload.inc: generate_common QLOAD
./generate_common -a 0xb00 -s vgi_simple_rectangle qload.lst >> qload.inc
echo "hposn_high = \$$BA00" >> qload.inc
echo "hposn_low = \$$BB00" >> qload.inc
echo "driveoff = \$$A22" >> qload.inc
echo "driveon = \$$A9D" >> qload.inc
####

5
games/peasant/generate_common.c
View File

@ -20,7 +20,10 @@ static void find_address(char *symbol_name, int routine_offset) {
while(1) {
result=fgets(string,BUFSIZ,fff);
if (result==NULL) break;
if (result==NULL) {
fprintf(stderr,"Error: %s not found!\n",symbol_name);
exit(-1);
}
result=strstr(string,temp_name);
if (result!=NULL) {

91
games/peasant/loadsave_menu.s
View File

@ -2,10 +2,33 @@
; o/~ It's the Loading Screen o/~
; FIXME: we can share some of the code here a bit more
;=====================
; load_menu
;=====================
load_menu:
lda #0
sta loadsave_smc1+1
sta loadsave_smc2+1
jmp common_menu
;=====================
; save_menu
;=====================
save_menu:
lda #1
sta loadsave_smc1+1
sta loadsave_smc2+1
jmp common_menu
;=====================
; common_menu
;=====================
common_menu:
;============================
; first read all three saves
@ -148,7 +171,7 @@ save_memset:
;====================
; draw text box
draw_loadstore_box:
draw_loadsave_box:
lda #0
sta BOX_X1H
@ -168,13 +191,26 @@ draw_loadstore_box:
;===================
; draw main text
draw_loadstore_text:
draw_loadsave_text:
; TODO: use SAVE message if we're saving instead
loadsave_smc1:
lda #0
bne do_save_message
do_load_message:
; load message
lda #<load_message
sta OUTL
lda #>load_message
jmp loadsave_ready
do_save_message:
; save message
lda #<save_message
sta OUTL
lda #>save_message
loadsave_ready:
sta OUTH
jsr disp_put_string
@ -297,8 +333,16 @@ ls_return:
rts
do_actual_load:
loadsave_smc2:
lda #0
bne go_for_save
go_for_load:
jmp load_game
go_for_save:
jmp save_game
ls_done_moving:
@ -457,17 +501,22 @@ done_load:
save_game:
.if 0
; lda #<save_message
; sta OUTL
; lda #>save_message
; sta OUTH
; print are you sure message
; jsr confirm_action
; bcs done_save
jsr confirm_action
pha
bcs done_save
; put which save into A
lda INVENTORY_Y
pha ; save slot for later on stack
; clc
; adc #LOAD_SAVE1
; sta WHICH_LOAD ; get proper WHICH_LOAD value
;========================
@ -478,22 +527,24 @@ actually_save:
; first load something from
; disk1/track0 to seek the head there
lda WHICH_LOAD
lda WHICH_LOAD ; save this value as we
; destroy it for load
pha
lda #LOAD_SAVE1
lda #LOAD_SAVE1 ; use SAVE1 as it's on track 0
sta WHICH_LOAD
jsr load_file
pla
sta WHICH_LOAD
; copy save data to $d00
; copy save data to $BC00
ldx #0
copy_loop:
lda WHICH_LOAD,X
sta $d00,X
sta $BC00,X
inx
cpx #(END_OF_SAVE-WHICH_LOAD+1)
bne copy_loop
@ -512,9 +563,9 @@ copy_loop:
jsr driveoff
done_save:
lda #$FF ; reload level as we scrawled on $2000
sta GAME_OVER
jsr change_location ; restore graphics
.endif
rts
@ -571,6 +622,9 @@ are_you_sure:
;=========================
update_save_info:
lda WHICH_LOAD
pha
ldx #0
update_save_info_loop:
clc
@ -595,6 +649,9 @@ update_save_info_loop:
cpx #3
bne update_save_info_loop
pla
sta WHICH_LOAD
rts

16
games/peasant/parse_input.s
View File

@ -62,15 +62,19 @@ parse_show:
cmp #'S'
bne parse_version
bit LORES
bit PAGE1
; bit LORES
; bit PAGE1
jsr wait_until_keypress
; jsr wait_until_keypress
bit PAGE2
bit HIRES
; bit PAGE2
; bit HIRES
jmp done_parse_message
; jmp done_parse_message
jsr save_menu
jmp restore_parse_message
parse_version:
cmp #'V'

17
games/peasant/qkumba_popwr.s
View File

@ -1,13 +1,13 @@
; popwr -- code provided by qkumba
frombuff=$d00 ; sector data to write
frombuff=$bc00 ; sector data to write
; note these must be contiguous
encbuf=$e00 ; nibble buffer must be page alined
bit2tbl=$f00
encbuf=$2000 ; nibble buffer must be page alined
bit2tbl=$2100
readnib = $1001
readnib = $901
readd5aa:
@ -68,7 +68,7 @@ frombuff_smc:
jmp cmpsecwr
.align $100
.align $100 ; why do we align? to ensure timing?
; look for the proper sector to write
@ -85,9 +85,10 @@ b3:
sta tmpsec
jsr readnib
and tmpsec ; and with prev nibble?
dey
bne b3
dey ; sector value is two bytes
bne b3 ; 1 D7 1 D5 1 D3 1 D1
; 1 D6 1 D4 1 D2 1 D0
; so you shift left and AND to get value
requested_sector:
cmp #$d1

4
games/peasant/qload.inc
View File

@ -1,4 +1,6 @@
load_file =$0b20
sector_write =$0c63
requested_sector =$0d17
decompress_lzsa2_fast =$0de6
getsrc_smc =$0edc
hgr2 =$16e3
@ -23,3 +25,5 @@ hgr_put_char_cursor =$0f15
vgi_simple_rectangle =$12ef
hposn_high = $BA00
hposn_low = $BB00
driveoff = $A22
driveon = $A9D

2
games/peasant/save3.s
View File

@ -20,7 +20,7 @@
.byte $00 ; KERREK_STATE = $9C
.byte $00 ; ARROW_SCORE = $9D
.byte $01 ; SCORE_HUNDREDS= $9E
.byte $09 ; SCORE_TENSONES= $9F
.byte $39 ; SCORE_TENSONES= $9F
.byte $FF ; INVENTORY_1 = $A0
.byte $FF ; INVENTORY_2 = $A1
.byte $FF ; INVENTORY_3 = $A2