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

ootw: fix off by-one in track load count for c15 

last sector not loaded, making for hard-to-debug crash
This commit is contained in:
Vince Weaver 2021-04-19 12:42:13 -04:00
parent 3109c9b39c
commit 47b1fc2a6c
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
games/ootw/Makefile
View File

@ -91,7 +91,7 @@ ootw_side3.dsk: ./qboot/QBOOT_DISK3 ./qboot/QLOAD \
$(DOS33_RAW) ootw_side3.dsk 8 0 ./ootw_c13/OOTW_C13 0 39 $(DOS33_RAW) ootw_side3.dsk 8 0 ./ootw_c13/OOTW_C13 0 39
$(DOS33_RAW) ootw_side3.dsk 11 0 ./ootw_c14/OOTW_C14 0 38 $(DOS33_RAW) ootw_side3.dsk 11 0 ./ootw_c14/OOTW_C14 0 38
$(DOS33_RAW) ootw_side3.dsk 13 0 ./ootw_c15/OOTW_C15 0 97 $(DOS33_RAW) ootw_side3.dsk 13 0 ./ootw_c15/OOTW_C15 0 97
$(DOS33_RAW) ootw_side3.dsk 19 0 ./ending/ENDING 0 90 $(DOS33_RAW) ootw_side3.dsk 20 0 ./ending/ENDING 0 90
#### ####
@ -192,7 +192,7 @@ clean:
cd ootw_c14 && make clean cd ootw_c14 && make clean
cd ootw_c15 && make clean cd ootw_c15 && make clean
cd ending && make clean cd ending && make clean
cd title && make clean cd qboot && make clean
distclean: distclean:
make clean make clean

4
games/ootw/README
View File

@ -273,8 +273,8 @@ DISK3:
OOTW_C12 9707 38s 2T6S T5-T7 OOTW_C12 9707 38s 2T6S T5-T7
OOTW_C13 9828 39s 2T7S T8-T10 OOTW_C13 9828 39s 2T7S T8-T10
OOTW_C14 9749 38s 2T6S T11-T12 OOTW_C14 9749 38s 2T6S T11-T12
OOTW_C15 24658 97s 6T1S T13-T18 OOTW_C15 24658 97s 6T1S T13-T19
ENDING 22899 90s 5T10S T19-T24 ENDING 22899 90s 5T10S T20-T25
==== ====
350 = 87.5k 350 = 87.5k

8
games/ootw/ootw_c15/ootw_c15.s
View File

@ -150,6 +150,11 @@ ootw_c15_level_init:
lda #P_STANDING lda #P_STANDING
sta PHYSICIST_STATE sta PHYSICIST_STATE
; set up friend
lda #$ff ; not there at start
sta friend_room
; set up aliens ; set up aliens
jsr clear_aliens jsr clear_aliens
@ -701,7 +706,6 @@ start_soldier:
ldy #2 ldy #2
sty FOREGROUND_COUNT sty FOREGROUND_COUNT
not_new_walk: not_new_walk:
ldy FOREGROUND_COUNT ldy FOREGROUND_COUNT
@ -1118,7 +1122,7 @@ bath_intro:
lda #0 lda #0
sta DRAW_PAGE sta DRAW_PAGE
lda #1 lda #4
sta DISP_PAGE sta DISP_PAGE
lda #<bath_arrival_sequence lda #<bath_arrival_sequence

2
games/ootw/qboot/qload.s
View File

@ -197,7 +197,7 @@ track_array:
.byte 26,30, 2, 5 ; C4,C5,C6,C7 .byte 26,30, 2, 5 ; C4,C5,C6,C7
.byte 8,11,14, 2 ; C8,C9,C10,C11 .byte 8,11,14, 2 ; C8,C9,C10,C11
.byte 5, 8,11,13 ; C12,C13,C14,C15 .byte 5, 8,11,13 ; C12,C13,C14,C15
.byte 19 ; ENDING .byte 20 ; ENDING
.byte 99,0 ; TITLE,FIRST_SECTOR .byte 99,0 ; TITLE,FIRST_SECTOR