diff --git a/res/ACTION.HGR.UNCOMPRESSED/ONE.ON.ONE b/res/ACTION.HGR.UNCOMPRESSED/ONE.ON.ONE new file mode 100644 index 0000000..f436807 Binary files /dev/null and b/res/ACTION.HGR.UNCOMPRESSED/ONE.ON.ONE differ diff --git a/res/ACTION.HGR.UNCOMPRESSED/ONE.ON.ONE2 b/res/ACTION.HGR.UNCOMPRESSED/ONE.ON.ONE2 new file mode 100644 index 0000000..ddfe0f4 Binary files /dev/null and b/res/ACTION.HGR.UNCOMPRESSED/ONE.ON.ONE2 differ diff --git a/res/ACTION.HGR.UNCOMPRESSED/SKI.CRAZED b/res/ACTION.HGR.UNCOMPRESSED/SKI.CRAZED new file mode 100644 index 0000000..cd73101 Binary files /dev/null and b/res/ACTION.HGR.UNCOMPRESSED/SKI.CRAZED differ diff --git a/res/ACTION.HGR.UNCOMPRESSED/SKI.CRAZED2 b/res/ACTION.HGR.UNCOMPRESSED/SKI.CRAZED2 new file mode 100644 index 0000000..6741a78 Binary files /dev/null and b/res/ACTION.HGR.UNCOMPRESSED/SKI.CRAZED2 differ diff --git a/res/ACTION.HGR/ONE.ON.ONE b/res/ACTION.HGR/ONE.ON.ONE new file mode 100644 index 0000000..4f0ef20 Binary files /dev/null and b/res/ACTION.HGR/ONE.ON.ONE differ diff --git a/res/ACTION.HGR/ONE.ON.ONE2 b/res/ACTION.HGR/ONE.ON.ONE2 new file mode 100644 index 0000000..ef8f55f Binary files /dev/null and b/res/ACTION.HGR/ONE.ON.ONE2 differ diff --git a/res/ACTION.HGR/SKI.CRAZED b/res/ACTION.HGR/SKI.CRAZED new file mode 100644 index 0000000..faef6df Binary files /dev/null and b/res/ACTION.HGR/SKI.CRAZED differ diff --git a/res/ACTION.HGR/SKI.CRAZED2 b/res/ACTION.HGR/SKI.CRAZED2 new file mode 100644 index 0000000..ac73dc9 Binary files /dev/null and b/res/ACTION.HGR/SKI.CRAZED2 differ diff --git a/res/ACTION.HGR/_FileInformation.txt b/res/ACTION.HGR/_FileInformation.txt index f088675..e872de4 100644 --- a/res/ACTION.HGR/_FileInformation.txt +++ b/res/ACTION.HGR/_FileInformation.txt @@ -9,8 +9,12 @@ FORMULA.1.RACER=Type(06),AuxType(3FF8),Access(C3) HARDBALL=Type(06),AuxType(3FF8),Access(C3) INTL.GRAN.PRIX=Type(06),AuxType(3FF8),Access(C3) KARATE.CHAMP=Type(06),AuxType(3FF8),Access(C3) +ONE.ON.ONE=Type(06),AuxType(3FF8),Access(C3) +ONE.ON.ONE2=Type(06),AuxType(3FF8),Access(C3) SHUFFLEBOARD=Type(06),AuxType(3FF8),Access(C3) SHUFFLEBOARD2=Type(06),AuxType(3FF8),Access(C3) +SKI.CRAZED=Type(06),AuxType(3FF8),Access(C3) +SKI.CRAZED2=Type(06),AuxType(3FF8),Access(C3) SPDWAY.CLASSIC=Type(06),AuxType(3FF8),Access(C3) SPDWAY.CLASSIC2=Type(06),AuxType(3FF8),Access(C3) SUM.GAMES.II01=Type(06),AuxType(3FF8),Access(C3) diff --git a/res/ARTWORK.SHR.UNCOMPRESSED/ONE.ON.ONE b/res/ARTWORK.SHR.UNCOMPRESSED/ONE.ON.ONE new file mode 100644 index 0000000..cb9bf32 Binary files /dev/null and b/res/ARTWORK.SHR.UNCOMPRESSED/ONE.ON.ONE differ diff --git a/res/ARTWORK.SHR/ONE.ON.ONE b/res/ARTWORK.SHR/ONE.ON.ONE new file mode 100644 index 0000000..91b25a7 Binary files /dev/null and b/res/ARTWORK.SHR/ONE.ON.ONE differ diff --git a/res/ARTWORK.SHR/_FileInformation.txt b/res/ARTWORK.SHR/_FileInformation.txt index 22c4f62..bd42320 100644 --- a/res/ARTWORK.SHR/_FileInformation.txt +++ b/res/ARTWORK.SHR/_FileInformation.txt @@ -6,6 +6,7 @@ CALI.GAMES=Type(06),AuxType(1FF8),Access(C3) FIGHT.NIGHT=Type(06),AuxType(1FF8),Access(C3) HARDBALL=Type(06),AuxType(1FF8),Access(C3) KARATE.CHAMP=Type(06),AuxType(1FF8),Access(C3) +ONE.ON.ONE=Type(06),AuxType(1FF8),Access(C3) SUMMER.EDITION=Type(06),AuxType(1FF8),Access(C3) SUMMER.GAMES=Type(06),AuxType(1FF8),Access(C3) SUMMER.GAMES.II=Type(06),AuxType(1FF8),Access(C3) diff --git a/res/ATTRACT.CONF b/res/ATTRACT.CONF index 06d8c29..4de3b1d 100644 --- a/res/ATTRACT.CONF +++ b/res/ATTRACT.CONF @@ -28,6 +28,11 @@ CATLOUNGE.CONF=1 ACTLOUNGE.CONF=2 CATBASEB.CONF=1 ACTBASEB.CONF=2 +CATBASKETB.CONF=1 +ACTBASKETB.CONF=2 +CATSKIING.CONF=1 +ACTSKIING.CONF=2 + [eof] diff --git a/res/ATTRACT/ONE.ON.ONE b/res/ATTRACT/ONE.ON.ONE new file mode 100644 index 0000000..aa90591 --- /dev/null +++ b/res/ATTRACT/ONE.ON.ONE @@ -0,0 +1,10 @@ +# +# Attract mode for ONE.ON.ONE +# This file is automatically generated +# + +ARTWORK.SHR/ONE.ON.ONE=C +ACTION.HGR/ONE.ON.ONE2=A +ACTION.HGR/ONE.ON.ONE=A + +[eof] diff --git a/res/ATTRACT/SKI.CRAZED b/res/ATTRACT/SKI.CRAZED new file mode 100644 index 0000000..83f4ffb --- /dev/null +++ b/res/ATTRACT/SKI.CRAZED @@ -0,0 +1,9 @@ +# +# Attract mode for SKI.CRAZED +# This file is automatically generated +# + +ACTION.HGR/SKI.CRAZED2=A +ACTION.HGR/SKI.CRAZED=A + +[eof] diff --git a/res/ATTRACT/_FileInformation.txt b/res/ATTRACT/_FileInformation.txt index 571b2ae..5bd79a8 100644 --- a/res/ATTRACT/_FileInformation.txt +++ b/res/ATTRACT/_FileInformation.txt @@ -10,7 +10,9 @@ FUJI.SPEED.WAY=Type(04),AuxType(8000),Access(C3) HARDBALL=Type(04),AuxType(8000),Access(C3) INTL.GRAN.PRIX=Type(04),AuxType(8000),Access(C3) KARATE.CHAMP=Type(04),AuxType(8000),Access(C3) +ONE.ON.ONE=Type(04),AuxType(8000),Access(C3) SHUFFLEBOARD=Type(04),AuxType(8000),Access(C3) +SKI.CRAZED=Type(04),AuxType(8000),Access(C3) SPDWAY.CLASSIC=Type(04),AuxType(8000),Access(C3) SUMMER.EDITION=Type(04),AuxType(8000),Access(C3) SUMMER.GAMES=Type(04),AuxType(8000),Access(C3) diff --git a/res/GAMES.CONF b/res/GAMES.CONF index 820a8ca..4982a92 100755 --- a/res/GAMES.CONF +++ b/res/GAMES.CONF @@ -8,6 +8,8 @@ 1000,HARDBALL 1000,INTL.GRAN.PRIX=International Gran Prix 1000,KARATE.CHAMP +1000,ONE.ON.ONE=One on One +0000,SKI.CRAZED 0000,SHUFFLEBOARD 0000,SPDWAY.CLASSIC=Speedway Classic 0000,SUMMER.GAMES diff --git a/res/SS/ACTAM.CONF b/res/SS/ACTAM.CONF index 997b297..7122236 100644 --- a/res/SS/ACTAM.CONF +++ b/res/SS/ACTAM.CONF @@ -11,5 +11,7 @@ FIGHT.NIGHT FORMULA.1.RACER INTL.GRAN.PRIX HARDBALL +ONE.ON.ONE +ONE.ON.ONE2=ONE.ON.ONE [eof] diff --git a/res/SS/ACTBASKETB.CONF b/res/SS/ACTBASKETB.CONF new file mode 100644 index 0000000..007aee0 --- /dev/null +++ b/res/SS/ACTBASKETB.CONF @@ -0,0 +1,8 @@ +# +# Basketball action slideshow +# + +ONE.ON.ONE +ONE.ON.ONE2=ONE.ON.ONE + +[eof] diff --git a/res/SS/ACTNZ.CONF b/res/SS/ACTNZ.CONF index f147d13..2429f26 100644 --- a/res/SS/ACTNZ.CONF +++ b/res/SS/ACTNZ.CONF @@ -27,5 +27,7 @@ TAG.TEAM TRACK.AND.FIELD SHUFFLEBOARD SHUFFLEBOARD2=SHUFFLEBOARD +SKI.CRAZED +SKI.CRAZED2=SKI.CRAZED [eof] diff --git a/res/SS/ACTSKIING.CONF b/res/SS/ACTSKIING.CONF new file mode 100644 index 0000000..e72bffe --- /dev/null +++ b/res/SS/ACTSKIING.CONF @@ -0,0 +1,8 @@ +# +# Skiing games action slideshow +# + +SKI.CRAZED +SKI.CRAZED2=SKI.CRAZED + +[eof] diff --git a/res/SS/CATBASKETB.CONF b/res/SS/CATBASKETB.CONF new file mode 100644 index 0000000..02cc3f1 --- /dev/null +++ b/res/SS/CATBASKETB.CONF @@ -0,0 +1,7 @@ +# +# HGR title slideshow of basketball games +# + +ONE.ON.ONE + +[eof] diff --git a/res/SS/CATSKIING.CONF b/res/SS/CATSKIING.CONF new file mode 100644 index 0000000..642f7dd --- /dev/null +++ b/res/SS/CATSKIING.CONF @@ -0,0 +1,7 @@ +# +# HGR title slideshow of skiing games +# + +SKI.CRAZED + +[eof] diff --git a/res/SS/SHR1.CONF b/res/SS/SHR1.CONF index 92acbf5..88e3708 100644 --- a/res/SS/SHR1.CONF +++ b/res/SS/SHR1.CONF @@ -17,5 +17,6 @@ FIGHT.NIGHT TAG.TEAM TEST.DRIVE HARDBALL +ONE.ON.ONE [eof] diff --git a/res/SS/TITLENZ.CONF b/res/SS/TITLENZ.CONF index cf6e387..9efe789 100644 --- a/res/SS/TITLENZ.CONF +++ b/res/SS/TITLENZ.CONF @@ -10,5 +10,7 @@ SPDWAY.CLASSIC TAG.TEAM TRACK.AND.FIELD SHUFFLEBOARD +ONE.ON.ONE +SKI.CRAZED [eof] diff --git a/res/SS/_FileInformation.txt b/res/SS/_FileInformation.txt index a5abd48..87bbdd4 100644 --- a/res/SS/_FileInformation.txt +++ b/res/SS/_FileInformation.txt @@ -2,6 +2,7 @@ ACTAM.CONF=Type(04),AuxType(4000),Access(C3) ACTBASEB.CONF=Type(04),AuxType(4000),Access(C3) +ACTBASKETB.CONF=Type(04),AuxType(4000),Access(C3) ACTBOXING.CONF=Type(04),AuxType(4000),Access(C3) ACTCOMPIL.CONF=Type(04),AuxType(4000),Access(C3) ACTDHGR1.CONF=Type(04),AuxType(4000),Access(C3) @@ -13,16 +14,19 @@ ACTKARATE.CONF=Type(04),AuxType(4000),Access(C3) ACTLOUNGE.CONF=Type(04),AuxType(4000),Access(C3) ACTNZ.CONF=Type(04),AuxType(4000),Access(C3) ACTRACING.CONF=Type(04),AuxType(4000),Access(C3) +ACTSKIING.CONF=Type(04),AuxType(4000),Access(C3) ACTSUMGAM.CONF=Type(04),AuxType(4000),Access(C3) ACTSUMGAM2.CONF=Type(04),AuxType(4000),Access(C3) ACTWINGAM.CONF=Type(04),AuxType(4000),Access(C3) ACTWRESTLE.CONF=Type(04),AuxType(4000),Access(C3) CATBASEB.CONF=Type(04),AuxType(4000),Access(C3) +CATBASKETB.CONF=Type(04),AuxType(4000),Access(C3) CATBOXING.CONF=Type(04),AuxType(4000),Access(C3) CATCOMPIL.CONF=Type(04),AuxType(4000),Access(C3) CATKARATE.CONF=Type(04),AuxType(4000),Access(C3) CATLOUNGE.CONF=Type(04),AuxType(4000),Access(C3) CATRACING.CONF=Type(04),AuxType(4000),Access(C3) +CATSKIING.CONF=Type(04),AuxType(4000),Access(C3) CATWRESTLE.CONF=Type(04),AuxType(4000),Access(C3) DHGR1.CONF=Type(04),AuxType(4000),Access(C3) SHR1.CONF=Type(04),AuxType(4000),Access(C3) diff --git a/res/TITLE.HGR/ONE.ON.ONE b/res/TITLE.HGR/ONE.ON.ONE new file mode 100644 index 0000000..a29809b Binary files /dev/null and b/res/TITLE.HGR/ONE.ON.ONE differ diff --git a/res/TITLE.HGR/SKI.CRAZED b/res/TITLE.HGR/SKI.CRAZED new file mode 100644 index 0000000..a89d597 Binary files /dev/null and b/res/TITLE.HGR/SKI.CRAZED differ diff --git a/res/TITLE.HGR/_FileInformation.txt b/res/TITLE.HGR/_FileInformation.txt index 4417006..e4d2ccd 100644 --- a/res/TITLE.HGR/_FileInformation.txt +++ b/res/TITLE.HGR/_FileInformation.txt @@ -8,7 +8,9 @@ FUJI.SPEED.WAY=Type(06),AuxType(4000),Access(C3) HARDBALL=Type(06),AuxType(4000),Access(C3) INTL.GRAN.PRIX=Type(06),AuxType(4000),Access(C3) KARATE.CHAMP=Type(06),AuxType(4000),Access(C3) +ONE.ON.ONE=Type(06),AuxType(4000),Access(C3) SHUFFLEBOARD=Type(06),AuxType(4000),Access(C3) +SKI.CRAZED=Type(06),AuxType(4000),Access(C3) SPDWAY.CLASSIC=Type(06),AuxType(4000),Access(C3) SUMMER.GAMES=Type(06),AuxType(4000),Access(C3) SUMMER.GAMES.II=Type(06),AuxType(4000),Access(C3) diff --git a/res/dsk/one on one 20k file PRODOS (san inc pack).po b/res/dsk/one on one 20k file PRODOS (san inc pack).po new file mode 100644 index 0000000..649df70 Binary files /dev/null and b/res/dsk/one on one 20k file PRODOS (san inc pack).po differ diff --git a/res/dsk/ski crazed PRODOS (san inc pack).po b/res/dsk/ski crazed PRODOS (san inc pack).po new file mode 100644 index 0000000..3377317 Binary files /dev/null and b/res/dsk/ski crazed PRODOS (san inc pack).po differ diff --git a/res/history.md b/res/history.md index cc68e09..7a94528 100644 --- a/res/history.md +++ b/res/history.md @@ -15,7 +15,9 @@ - Hardball - International Gran Prix - Karate Champ + - One on One - Shuffleboard + - Ski Crazed - Speedway Classic - Summer Games - Summer Games II diff --git a/res/notes/wishlist.txt b/res/notes/wishlist.txt index 7feabb6..4d8d062 100644 --- a/res/notes/wishlist.txt +++ b/res/notes/wishlist.txt @@ -15,8 +15,6 @@ skiing (2) wrestling (3) //migrate from Total Replay -One on One -Ski Crazed Street Sports Baseball Street Sports Basketball Street Sports Football diff --git a/src/prelaunch/one.on.one.a b/src/prelaunch/one.on.one.a new file mode 100644 index 0000000..5baaf0f --- /dev/null +++ b/src/prelaunch/one.on.one.a @@ -0,0 +1,54 @@ +;license:MIT +;(c) 2020 by qkumba + +!cpu 6502 +!to "build/PRELAUNCH/ONE.ON.ONE",plain +*=$106 + + !source "src/prelaunch/common.a" + + +READ_RAM2_WRITE_RAM2 + jsr EnableAccelerator + lda MockingboardStuff + cmp #1 + ora #$C0 + php + pha + bcc + + +LC_REBOOT ++ + +READ_ROM_NO_WRITE + lda #$60 + sta $408B + jsr $4000 ; decompress + pla + plp + php + bcc skipmb + plp + cli ; enable MB music on title + php + cmp #$C4 + beq skipmb + + sta $E9BC ; Replace #$C4 with configured slot + ldy #00 +- ldx $EAF6,Y ; Find #$C4s + cpx #$C4 + bne + + sta $EAF6,Y ; Replace #$C4 with configured slot ++ iny + bne - + +skipmb + +READ_RAM2_WRITE_RAM2 + jsr DisableAccelerator + plp + bcs + + +READ_ROM_NO_WRITE ++ + jmp $400 + +!if * > $1C0 { + !error "code is too large, ends at ", * +} diff --git a/src/prelaunch/ski.crazed.a b/src/prelaunch/ski.crazed.a new file mode 100644 index 0000000..b5e96f4 --- /dev/null +++ b/src/prelaunch/ski.crazed.a @@ -0,0 +1,49 @@ +;license:MIT +;(c) 2020 by qkumba + +!cpu 6502 +!to "build/PRELAUNCH/SKI.CRAZED",plain +*=$106 + + !source "src/prelaunch/common.a" + + lda #$60 + sta $A23 + jsr $800 ; load "DOS" + lda #$82 + sta $101 + lda #$A6 + sta $104 + lda #$FA + sta $105 ; update reset hook to reboot + lda #callback1 + sta $E0BE + jmp $E03A + +callback1 + ldy #$4C + sty $DA9D + ldy #callback2 + sty $DA9F + jmp $D000 + +callback2 + lda #$A2 + sta $DA9D + ldx #$FF + stx $DA9E + lda #$9A + sta $DA9F + inc $3F4 + inx + stx $A2C + lsr $A37 + jmp $A00 + +!if * > $1C0 { + !error "code is too large, ends at ", * +}