diff --git a/bin/rename.py b/bin/rename.py index 4a3da1267..e16ef76c0 100755 --- a/bin/rename.py +++ b/bin/rename.py @@ -102,7 +102,6 @@ def driver(): rename("MS.PACMAN", "MP") rename("NIGHT.MISSION", "NM") rename("NIGHTMARE", "NI") - rename("ONE.ON.ONE", "OO") rename("ORILEYS.MINE", "OM") rename("OOTW", "OW") rename("PANDORAS.BOX", "PB") diff --git a/res/ACTION.HGR.UNCOMPRESSED/ONE.ON.ONE b/res/ACTION.HGR.UNCOMPRESSED/ONE.ON.ONE deleted file mode 100644 index f436807e9..000000000 Binary files a/res/ACTION.HGR.UNCOMPRESSED/ONE.ON.ONE and /dev/null differ diff --git a/res/ACTION.HGR.UNCOMPRESSED/ONE.ON.ONE2 b/res/ACTION.HGR.UNCOMPRESSED/ONE.ON.ONE2 deleted file mode 100644 index ddfe0f4b9..000000000 Binary files a/res/ACTION.HGR.UNCOMPRESSED/ONE.ON.ONE2 and /dev/null differ diff --git a/res/ACTION.HGR.UNCOMPRESSED/SKI.CRAZED b/res/ACTION.HGR.UNCOMPRESSED/SKI.CRAZED deleted file mode 100644 index cd731018a..000000000 Binary files a/res/ACTION.HGR.UNCOMPRESSED/SKI.CRAZED and /dev/null differ diff --git a/res/ACTION.HGR.UNCOMPRESSED/SKI.CRAZED2 b/res/ACTION.HGR.UNCOMPRESSED/SKI.CRAZED2 deleted file mode 100644 index 6741a782c..000000000 Binary files a/res/ACTION.HGR.UNCOMPRESSED/SKI.CRAZED2 and /dev/null differ diff --git a/res/ACTION.HGR/ONE.ON.ONE b/res/ACTION.HGR/ONE.ON.ONE deleted file mode 100644 index 4f0ef206f..000000000 Binary files a/res/ACTION.HGR/ONE.ON.ONE and /dev/null differ diff --git a/res/ACTION.HGR/ONE.ON.ONE2 b/res/ACTION.HGR/ONE.ON.ONE2 deleted file mode 100644 index ef8f55f5e..000000000 Binary files a/res/ACTION.HGR/ONE.ON.ONE2 and /dev/null differ diff --git a/res/ACTION.HGR/SKI.CRAZED b/res/ACTION.HGR/SKI.CRAZED deleted file mode 100644 index faef6df3b..000000000 Binary files a/res/ACTION.HGR/SKI.CRAZED and /dev/null differ diff --git a/res/ACTION.HGR/SKI.CRAZED2 b/res/ACTION.HGR/SKI.CRAZED2 deleted file mode 100644 index ac73dc9cf..000000000 Binary files a/res/ACTION.HGR/SKI.CRAZED2 and /dev/null differ diff --git a/res/ACTION.HGR/_FileInformation.txt b/res/ACTION.HGR/_FileInformation.txt index 498e95994..c4b0a8906 100644 --- a/res/ACTION.HGR/_FileInformation.txt +++ b/res/ACTION.HGR/_FileInformation.txt @@ -474,8 +474,6 @@ NIGHT.MISSION=Type(06),AuxType(3FF8),Access(C3) NIGHT.STALKER=Type(06),AuxType(3FF8),Access(C3) NIGHTMARE=Type(06),AuxType(3FF8),Access(C3) OID.ZONE=Type(06),AuxType(3FF8),Access(C3) -ONE.ON.ONE=Type(06),AuxType(3FF8),Access(C3) -ONE.ON.ONE2=Type(06),AuxType(3FF8),Access(C3) ORBITRON=Type(06),AuxType(3FF8),Access(C3) ORILEYS.MINE=Type(06),AuxType(3FF8),Access(C3) OUTPOST=Type(06),AuxType(3FF8),Access(C3) @@ -595,8 +593,6 @@ SHORT.CIRCUIT2=Type(06),AuxType(3FF8),Access(C3) SITUATION.CRTC2=Type(06),AuxType(3FF8),Access(C3) SITUATION.CRTC3=Type(06),AuxType(3FF8),Access(C3) SITUATION.CRTCL=Type(06),AuxType(3FF8),Access(C3) -SKI.CRAZED=Type(06),AuxType(3FF8),Access(C3) -SKI.CRAZED2=Type(06),AuxType(3FF8),Access(C3) SKYFOX=Type(06),AuxType(3FF8),Access(C3) SKYFOX2=Type(06),AuxType(3FF8),Access(C3) SKYFOX3=Type(06),AuxType(3FF8),Access(C3) diff --git a/res/ARTWORK.SHR.UNCOMPRESSED/ONE.ON.ONE b/res/ARTWORK.SHR.UNCOMPRESSED/ONE.ON.ONE deleted file mode 100644 index cb9bf3225..000000000 Binary files a/res/ARTWORK.SHR.UNCOMPRESSED/ONE.ON.ONE and /dev/null differ diff --git a/res/ARTWORK.SHR/ONE.ON.ONE b/res/ARTWORK.SHR/ONE.ON.ONE deleted file mode 100644 index 91b25a7f8..000000000 Binary files a/res/ARTWORK.SHR/ONE.ON.ONE and /dev/null differ diff --git a/res/ARTWORK.SHR/_FileInformation.txt b/res/ARTWORK.SHR/_FileInformation.txt index 15fc45391..c3d101d95 100644 --- a/res/ARTWORK.SHR/_FileInformation.txt +++ b/res/ARTWORK.SHR/_FileInformation.txt @@ -114,7 +114,6 @@ MR.ROBOT=Type(06),AuxType(1FF8),Access(C3) N.O.R.A.D=Type(06),AuxType(1FF8),Access(C3) NIGHT.MISSION=Type(06),AuxType(1FF8),Access(C3) NIGHTMARE=Type(06),AuxType(1FF8),Access(C3) -ONE.ON.ONE=Type(06),AuxType(1FF8),Access(C3) ORBITRON=Type(06),AuxType(1FF8),Access(C3) ORILEYS.MINE=Type(06),AuxType(1FF8),Access(C3) OUTPOST=Type(06),AuxType(1FF8),Access(C3) diff --git a/res/ATTRACT/ONE.ON.ONE b/res/ATTRACT/ONE.ON.ONE deleted file mode 100644 index aa90591d5..000000000 --- a/res/ATTRACT/ONE.ON.ONE +++ /dev/null @@ -1,10 +0,0 @@ -# -# 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 deleted file mode 100644 index 83f4ffb71..000000000 --- a/res/ATTRACT/SKI.CRAZED +++ /dev/null @@ -1,9 +0,0 @@ -# -# 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 03113f54a..1f294b012 100644 --- a/res/ATTRACT/_FileInformation.txt +++ b/res/ATTRACT/_FileInformation.txt @@ -190,7 +190,6 @@ NIGHT.MISSION=Type(04),AuxType(8000),Access(C3) NIGHT.STALKER=Type(04),AuxType(8000),Access(C3) NIGHTMARE=Type(04),AuxType(8000),Access(C3) OID.ZONE=Type(04),AuxType(8000),Access(C3) -ONE.ON.ONE=Type(04),AuxType(8000),Access(C3) OOTW=Type(04),AuxType(8000),Access(C3) ORBITRON=Type(04),AuxType(8000),Access(C3) ORILEYS.MINE=Type(04),AuxType(8000),Access(C3) @@ -246,7 +245,6 @@ SERPENTINE=Type(04),AuxType(8000),Access(C3) SHAMUS=Type(04),AuxType(8000),Access(C3) SHORT.CIRCUIT=Type(04),AuxType(8000),Access(C3) SITUATION.CRTCL=Type(04),AuxType(8000),Access(C3) -SKI.CRAZED=Type(04),AuxType(8000),Access(C3) SKYFOX=Type(04),AuxType(8000),Access(C3) SLICKS=Type(04),AuxType(8000),Access(C3) SMURFEN=Type(04),AuxType(8000),Access(C3) diff --git a/res/GAMES.CONF b/res/GAMES.CONF index 8c121a51f..1b47dcbb1 100755 --- a/res/GAMES.CONF +++ b/res/GAMES.CONF @@ -190,7 +190,6 @@ 0000,NIGHTMARE=Nightmare Gallery 0000,N.O.R.A.D 0001,OID.ZONE -1000,ONE.ON.ONE=One on One 0000,ORBITRON 0000,ORILEYS.MINE=O'Riley's Mine 0000,OOTW=Out of This World @@ -245,7 +244,6 @@ 1000,SHAMUS 0000,SHORT.CIRCUIT 0000,SITUATION.CRTCL=Situation Critical -0000,SKI.CRAZED 1000,SKYFOX 0000,SNACK.ATTACK 0000,SNAKE.BYTE diff --git a/res/SS/ACTIONMNO2.CONF b/res/SS/ACTIONMNO2.CONF index 94f1a28dc..ff9902f89 100644 --- a/res/SS/ACTIONMNO2.CONF +++ b/res/SS/ACTIONMNO2.CONF @@ -7,7 +7,6 @@ NIGHT.MISSION MEGABOTS3=MEGABOTS MARIO.BROS1=MARIO.BROS MOON.PATROL -ONE.ON.ONE2=ONE.ON.ONE MINIT.MAN MICROWAVE OUTWORLD2=OUTWORLD diff --git a/res/SS/ACTIONMNO4.CONF b/res/SS/ACTIONMNO4.CONF index 8710b4487..7883cd4bf 100644 --- a/res/SS/ACTIONMNO4.CONF +++ b/res/SS/ACTIONMNO4.CONF @@ -7,7 +7,6 @@ MEGABOTS MONSTER.MASH THUNDERHEAD2=THUNDERHEAD MINIT.MAN3=MINIT.MAN -ONE.ON.ONE NEPTUNE MAXWELL.MANOR OUTWORLD diff --git a/res/SS/ACTIONS5.CONF b/res/SS/ACTIONS5.CONF index 6f2e89da9..905a8c131 100644 --- a/res/SS/ACTIONS5.CONF +++ b/res/SS/ACTIONS5.CONF @@ -11,6 +11,5 @@ SPIDER.RAID SABOTAGE SEA.DRAGON2=SEA.DRAGON STAR.THIEF2=STAR.THIEF -SKI.CRAZED2=SKI.CRAZED [eof] diff --git a/res/SS/ACTIONS6.CONF b/res/SS/ACTIONS6.CONF index a0486b94e..a61ab06a5 100644 --- a/res/SS/ACTIONS6.CONF +++ b/res/SS/ACTIONS6.CONF @@ -14,6 +14,5 @@ SARACEN SUPER.BUNNY STARGLIDER STAR.CRUISER -SKI.CRAZED [eof] diff --git a/res/SS/EA.CONF b/res/SS/EA.CONF index a78e8f92c..383685a56 100644 --- a/res/SS/EA.CONF +++ b/res/SS/EA.CONF @@ -7,7 +7,6 @@ HARD.HAT.MACK ARCHON MARBLE.MADNESS AXIS.ASSASSIN -ONE.ON.ONE BOULDER.DASH ARCHON.II LAST.GLADIATOR diff --git a/res/SS/MNO3.CONF b/res/SS/MNO3.CONF index a2b391c94..45251a5e7 100644 --- a/res/SS/MNO3.CONF +++ b/res/SS/MNO3.CONF @@ -10,7 +10,6 @@ OUTPOST NIBBLER N.O.R.A.D MINGS.CHALLENGE -ONE.ON.ONE MINER.II MANIC.MINER diff --git a/res/SS/OTHER4.CONF b/res/SS/OTHER4.CONF index 90de94d38..e9bb180ec 100644 --- a/res/SS/OTHER4.CONF +++ b/res/SS/OTHER4.CONF @@ -5,7 +5,6 @@ WOLFEN84 FAT.CITY DARKSTAR.UNHNGD -SKI.CRAZED MICRO.INVADERS STARGLIDER RUN.FOR.IT diff --git a/res/SS/S4.CONF b/res/SS/S4.CONF index e9a6e90d3..0dd8ee026 100644 --- a/res/SS/S4.CONF +++ b/res/SS/S4.CONF @@ -10,6 +10,5 @@ STATION.5 SUPER.BUNNY STARGLIDER SPECTRE -SKI.CRAZED [eof] diff --git a/res/SS/SHR1.CONF b/res/SS/SHR1.CONF index b01178451..2ad02a085 100644 --- a/res/SS/SHR1.CONF +++ b/res/SS/SHR1.CONF @@ -4,7 +4,6 @@ CANYON.CLIMBER MR.COOL -ONE.ON.ONE LANCASTER AGENT.U.S.A INDIANA.JONES diff --git a/res/TITLE.HGR/ONE.ON.ONE b/res/TITLE.HGR/ONE.ON.ONE deleted file mode 100644 index a29809b8c..000000000 Binary files a/res/TITLE.HGR/ONE.ON.ONE and /dev/null differ diff --git a/res/TITLE.HGR/SKI.CRAZED b/res/TITLE.HGR/SKI.CRAZED deleted file mode 100644 index a89d597c8..000000000 Binary files a/res/TITLE.HGR/SKI.CRAZED and /dev/null differ diff --git a/res/TITLE.HGR/_FileInformation.txt b/res/TITLE.HGR/_FileInformation.txt index 6e7c57073..8db8af24d 100644 --- a/res/TITLE.HGR/_FileInformation.txt +++ b/res/TITLE.HGR/_FileInformation.txt @@ -178,7 +178,6 @@ NIGHT.MISSION=Type(06),AuxType(4000),Access(C3) NIGHT.STALKER=Type(06),AuxType(4000),Access(C3) NIGHTMARE=Type(06),AuxType(4000),Access(C3) OID.ZONE=Type(06),AuxType(4000),Access(C3) -ONE.ON.ONE=Type(06),AuxType(4000),Access(C3) OOTW=Type(06),AuxType(4000),Access(C3) ORBITRON=Type(06),AuxType(4000),Access(C3) ORILEYS.MINE=Type(06),AuxType(4000),Access(C3) @@ -225,7 +224,6 @@ SERPENTINE=Type(06),AuxType(4000),Access(C3) SHAMUS=Type(06),AuxType(4000),Access(C3) SHORT.CIRCUIT=Type(06),AuxType(4000),Access(C3) SITUATION.CRTCL=Type(06),AuxType(4000),Access(C3) -SKI.CRAZED=Type(06),AuxType(4000),Access(C3) SKYFOX=Type(06),AuxType(4000),Access(C3) SMURFEN=Type(06),AuxType(4000),Access(C3) SNACK.ATTACK=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 deleted file mode 100644 index 649df70e1..000000000 Binary files a/res/dsk/one on one 20k file PRODOS (san inc pack).po and /dev/null differ diff --git a/res/dsk/ski crazed PRODOS (san inc pack).po b/res/dsk/ski crazed PRODOS (san inc pack).po deleted file mode 100644 index 3377317b9..000000000 Binary files a/res/dsk/ski crazed PRODOS (san inc pack).po and /dev/null differ diff --git a/res/history.md b/res/history.md index 07a425893..3a4d0b624 100644 --- a/res/history.md +++ b/res/history.md @@ -8,9 +8,12 @@ - Fight Night - Formula 1 Racer - Fuji Crowded Speedway + - Hardball - International Gran Prix - Karate Champ + - One on One - Shuffleboard + - Ski Crazed - Speedway Classic - Summer Games - Summer Games II diff --git a/src/prelaunch/one.on.one.a b/src/prelaunch/one.on.one.a deleted file mode 100644 index 5baaf0fb4..000000000 --- a/src/prelaunch/one.on.one.a +++ /dev/null @@ -1,54 +0,0 @@ -;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 deleted file mode 100644 index b5e96f4fc..000000000 --- a/src/prelaunch/ski.crazed.a +++ /dev/null @@ -1,49 +0,0 @@ -;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 ", * -}