diff --git a/src/zinfo/z5/gamedata.txt b/src/zinfo/z5/gamedata.txt index 4a34e2b..d411b01 100644 --- a/src/zinfo/z5/gamedata.txt +++ b/src/zinfo/z5/gamedata.txt @@ -45,6 +45,176 @@ ztuur16b !text "R16.970828.SAV" ztuur16e + !byte advente-adventb +adventb + !text "ADVENT.SAV" +advente + + !byte beare-bearb +bearb + !text "BEAR.SAV" +beare + + !byte buildinge-buildingb +buildingb + !text "BUILDING.SAV" +buildinge + + !byte changee-changeb +changeb + !text "CHANGE.SAV" +changee + + !byte clawe-clawb +clawb + !text "CLAW.SAV" +clawe + + !byte cursese-cursesb +cursesb + !text "CURSES.SAV" +cursese + + !byte delusnse-delusnsb +delusnsb + !text "DELUSNS.SAV" +delusnse + + !byte ease-easb +easb + !text "EAS.SAV" +ease + + !byte edificee-edificeb +edificeb + !text "EDIFICE.SAV" +edificee + + !byte elevene-elevenb +elevenb + !text "ELEVEN.SAV" +elevene + + !byte feare-fearb +fearb + !text "FEAR.SAV" +feare + + !byte geiste-geistb +geistb + !text "GEIST.SAV" +geiste + + !byte heroese-heroesb +heroesb + !text "HEROES.SAV" +heroese + + !byte i0e-i0b +i0b + !text "I0.SAV" +i0e + + !byte inevitae-inevitab +inevitab + !text "INEVITA.SAV" +inevitae + + !byte jewele-jewelb +jewelb + !text "JEWEL.SAV" +jewele + + !byte jigsawe-jigsawb +jigsawb + !text "JIGSAW.SAV" +jigsawe + + !byte loosee-looseb +looseb + !text "LOOSE.SAV" +loosee + + !byte moonlite-moonlitb +moonlitb + !text "MOONLIT.SAV" +moonlite + + !byte ralphe-ralphb +ralphb + !text "RALPH.SAV" +ralphe + + !byte ramesese-ramesesb +ramesesb + !text "RAMESES.SAV" +ramesese + + !byte shadee-shadeb +shadeb + !text "SHADE.SAV" +shadee + + !byte sherbete-sherbetb +sherbetb + !text "SHERBET.SAV" +sherbete + + !byte softfoode-softfoodb +softfoodb + !text "SOFTFOOD.SAV" +softfoode + + !byte spirite-spiritb +spiritb + !text "SPIRIT.SAV" +spirite + + !byte springe-springb +springb + !text "SPRING.SAV" +springe + + !byte tanglee-tangleb +tangleb + !text "TANGLE.SAV" +tanglee + + !byte tapestrye-tapestryb +tapestryb + !text "TAPESTRY.SAV" +tapestrye + + !byte theatree-theatreb +theatreb + !text "THEATRE.SAV" +theatree + + !byte vacatione-vacationb +vacationb + !text "VACATION.SAV" +vacatione + + !byte waspe-waspb +waspb + !text "WASP.SAV" +waspe + + !byte weathere-weatherb +weatherb + !text "WEATHER.SAV" +weathere + + !byte wintere-winterb +winterb + !text "WINTER.SAV" +wintere + + !byte yagwade-yagwadb +yagwadb + !text "YAGWAD.SAV" +yagwade + !byte 0 ;end of list gameloc @@ -75,6 +245,108 @@ gameloc ;ztuur16 !byte $28 +;advent + !byte $10 + +;bear + !byte $10 + +;building + !byte $10 + +;change + !byte $10 + +;claw + !byte $10 + +;curses + !byte $11 + +;delusns + !byte $10 + +;eas + !byte $10 + +;edifice + !byte $10 + +;eleven + !byte $10 + +;fear + !byte $10 + +;geist + !byte $10 + +;heroes + !byte $11 + +;i0 + !byte $10 + +;inevita + !byte $1b + +;jewel + !byte $10 + +;jigsaw + !byte $10 + +;loose + !byte $10 + +;moonlit + !byte $10 + +;ralph + !byte $11 + +;rameses + !byte $10 + +;shade + !byte $10 + +;sherbet + !byte $10 + +;softfood + !byte $10 + +;spirit + !byte $10 + +;spring + !byte $1f + +;tangle + !byte $1f + +;tapestry + !byte $10 + +;theatre + !byte $10 + +;vacation + !byte $11 + +;wasp + !byte $11 + +;weather + !byte $10 + +;winter + !byte $16 + +;yagwad + !byte $13 + gametime ;bzoner9 !byte $8a @@ -103,6 +375,108 @@ gametime ;ztuur16 !byte 0 ;no time +;advent + !byte 0 ;no time + +;bear + !byte 0 ;no time + +;building + !byte 0 ;no time + +;change + !byte 0 ;no time + +;claw + !byte 0 ;no time + +;curses + !byte 0 ;no time + +;delusns + !byte $12 + +;eas + !byte 0 ;no time + +;edifice + !byte 0 ;no time + +;eleven + !byte $19 + +;fear + !byte 0 ;no time + +;geist + !byte 0 ;no time + +;heroes + !byte 0 ;no time + +;i0 + !byte $11 + +;inevita + !byte 0 ;no time + +;jewel + !byte 0 ;no time + +;jigsaw + !byte $11 + +;loose + !byte 0 ;no time + +;moonlit + !byte 0 ;no time + +;ralph + !byte 0 ;no time + +;rameses + !byte $11 + +;shade + !byte 0 ;no time + +;sherbet + !byte 0 ;no time + +;softfood + !byte 0 ;no time + +;spirit + !byte 0 ;no time + +;spring + !byte 0 ;no time + +;tangle + !byte 0 ;no time + +;tapestry + !byte 0 ;no time + +;theatre + !byte 0 ;no time + +;vacation + !byte 0 ;no time + +;wasp + !byte 0 ;no time + +;weather + !byte 0 ;no time + +;winter + !byte 0 ;no time + +;yagwad + !byte 0 ;no time + gamescore ;bzoner9 !byte 0 ;no score @@ -131,6 +505,108 @@ gamescore ;ztuur16 !byte $16 +;advent + !byte $21 + +;bear + !byte $1d + +;building + !byte $21 + +;change + !byte 0 ;no score + +;claw + !byte 0 ;no score + +;curses + !byte $17 + +;delusns + !byte $11 + +;eas + !byte 0 ;no score + +;edifice + !byte 0 ;no score + +;eleven + !byte 0 ;no score + +;fear + !byte $11 + +;geist + !byte $21 + +;heroes + !byte $1e + +;i0 + !byte 0 ;no score + +;inevita + !byte $28 + +;jewel + !byte $1d + +;jigsaw + !byte $16 + +;loose + !byte $1d + +;moonlit + !byte 0 ;no score + +;ralph + !byte $22 + +;rameses + !byte 0 ;no score + +;shade + !byte 0 ;no score + +;sherbet + !byte $1d + +;softfood + !byte $1d + +;spirit + !byte $18 + +;spring + !byte $2c + +;tangle + !byte 0 ;no score + +;tapestry + !byte 0 ;no score + +;theatre + !byte 0 ;no score + +;vacation + !byte $17 + +;wasp + !byte $12 + +;weather + !byte 0 ;no score + +;winter + !byte $1c + +;yagwad + !byte $20 + gamemoves ;bzoner9 !byte 0 ;no moves @@ -159,6 +635,108 @@ gamemoves ;ztuur16 !byte $17 +;advent + !byte $1c + +;bear + !byte $18 + +;building + !byte $1c + +;change + !byte 0 ;no moves + +;claw + !byte 0 ;no moves + +;curses + !byte $18 + +;delusns + !byte 0 ;no moves + +;eas + !byte 0 ;no moves + +;edifice + !byte 0 ;no moves + +;eleven + !byte 0 ;no moves + +;fear + !byte $12 + +;geist + !byte $1c + +;heroes + !byte $19 + +;i0 + !byte 0 ;no moves + +;inevita + !byte $23 + +;jewel + !byte $18 + +;jigsaw + !byte $17 + +;loose + !byte $18 + +;moonlit + !byte 0 ;no moves + +;ralph + !byte $1d + +;rameses + !byte 0 ;no moves + +;shade + !byte 0 ;no moves + +;sherbet + !byte $18 + +;softfood + !byte $18 + +;spirit + !byte $19 + +;spring + !byte $27 + +;tangle + !byte 0 ;no moves + +;tapestry + !byte 0 ;no moves + +;theatre + !byte 0 ;no moves + +;vacation + !byte $18 + +;wasp + !byte $13 + +;weather + !byte $93 + +;winter + !byte $1d + +;yagwad + !byte $1b + gameday ;bzoner9 !byte 0 ;no day @@ -186,3 +764,106 @@ gameday ;ztuur16 !byte 0 ;no day + +;advent + !byte 0 ;no day + +;bear + !byte 0 ;no day + +;building + !byte 0 ;no day + +;change + !byte 0 ;no day + +;claw + !byte 0 ;no day + +;curses + !byte $8c + +;delusns + !byte 0 ;no day + +;eas + !byte 0 ;no day + +;edifice + !byte 0 ;no day + +;eleven + !byte 0 ;no day + +;fear + !byte 0 ;no day + +;geist + !byte 0 ;no day + +;heroes + !byte 0 ;no day + +;i0 + !byte 0 ;no day + +;inevita + !byte 0 ;no day + +;jewel + !byte 0 ;no day + +;jigsaw + !byte 0 ;no day + +;loose + !byte 0 ;no day + +;moonlit + !byte 0 ;no day + +;ralph + !byte 0 ;no day + +;rameses + !byte 0 ;no day + +;shade + !byte 0 ;no day + +;sherbet + !byte 0 ;no day + +;softfood + !byte 0 ;no day + +;spirit + !byte 0 ;no day + +;spring + !byte 0 ;no day + +;tangle + !byte 0 ;no day + +;tapestry + !byte 0 ;no day + +;theatre + !byte 0 ;no day + +;vacation + !byte 0 ;no day + +;wasp + !byte 0 ;no day + +;weather + !byte 0 ;no day + +;winter + !byte 0 ;no day + +;yagwad + !byte 0 ;no day + diff --git a/src/zinfo/z5/z5.s b/src/zinfo/z5/z5.s index 1b6dc7a..3c4d166 100644 --- a/src/zinfo/z5/z5.s +++ b/src/zinfo/z5/z5.s @@ -317,15 +317,25 @@ dump_info lda zp_6C sta zp_59 ldx zpage_gamind - beq bzone + beq branch_bzone cpx #3 beq branch_print + cpx #$0f + beq branch_print cpx #4 beq sherlock1 cpx #5 beq sherlock1 cpx #6 beq wishbr + cpx #$12 + beq eleven + cpx #$16 + beq i0 + cpx #$19 + beq jigsaw + cpx #$1d + beq ramses branch_skip jmp skip_time @@ -333,6 +343,26 @@ branch_skip branch_print jmp print_time +branch_bzone + jmp bzone + +ramses +jigsaw +i0 + lda #$12 + jsr fetch_obj + lda zp_6B + pha + lda zp_6C + pha + lda zp_58 + sta zp_6B + cmp #$0c + bcc + + sbc #$0c ++ sta zp_58 + jmp print_hhmm + sherlock1 ldy zp_6B iny @@ -359,7 +389,7 @@ wishbr lda #$5c jsr fetch_obj lda zp_6B - cmp #$0d + cmp #$0c bcc + sbc #$0c + sta zp_58 @@ -367,6 +397,25 @@ wishbr sta zp_59 jmp print_hhmm +eleven + lda #$3c + sta zp_5A + lda #0 + sta zp_5B + jsr sub_E7E1 + sta zp_59 + stx zp_6B + txa + cmp #$0c + bcc + + sbc #$0c ++ sta zp_58 + lda zp_CF + pha + lda zp_D0 + pha + jmp print_hhmm + bzone lda #$3c sta zp_5A @@ -425,11 +474,19 @@ print_time jsr loc_EA1C ldx zpage_gamind + cpx #$1d + beq ++ + cpx #$19 + beq ++ + cpx #$16 + beq ++ + cpx #$12 + beq ++ cpx #4 bcc + cpx #7 bcs + - lda zp_6B +++ lda zp_6B cmp #$0c lda #'a' bcc print_ampm @@ -505,6 +562,8 @@ skip_moves ldx zpage_gamind cpx #6 beq + + cpx #$0e + beq curses ldy zp_6B iny iny @@ -526,7 +585,7 @@ skip_moves sta zp_5B jsr sub_E7E1 ldx zp_CF - lda day_index, x +- lda day_index, x sta day_load+1 day_load lda day_table @@ -535,6 +594,12 @@ day_load inc day_load+1 bne day_load + jsr loc_EA1C + jmp ++ +curses + lda zp_58 + adc #(date_index - day_index) - 2 + tax + bne - ++ sec lda zpage_ptr sbc #date_offset @@ -548,7 +613,10 @@ rts day_index !byte