Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

c64_cass: 17 new dumps #8232

Merged
merged 9 commits into from
Jul 12, 2021
Merged

c64_cass: 17 new dumps #8232

merged 9 commits into from
Jul 12, 2021

Conversation

scoomby
Copy link
Contributor

@scoomby scoomby commented Jun 27, 2021

New working software list additions

10 Computer Hits 2 (Beau-Jolly, alt) [C64 Ultimate Tape Archive V2.0]
10 Computer Hits 3 (Beau-Jolly) [C64 Ultimate Tape Archive V2.0]
10 Computer Hits 4 (Beau-Jolly) [C64 Ultimate Tape Archive V2.0]
10th Frame (U.S. Gold) [C64 Ultimate Tape Archive V2.0]
1942 (Elite Systems) [C64 Ultimate Tape Archive V2.0]
1942 (Elite Systems, alt) [C64 Ultimate Tape Archive V2.0]
1943: The Battle of Midway (Go!) [C64 Ultimate Tape Archive V2.0]
3D Pool (Firebird) [C64 Ultimate Tape Archive V2.0]
3D Pool (Kixx) [C64 Ultimate Tape Archive V2.0]
4 Most Horror (Alternative Software) [C64 Ultimate Tape Archive V2.0]
4 Soccer Simulators (Codemasters) [C64 Ultimate Tape Archive V2.0]
4th & Inches (U.S. Gold) [C64 Ultimate Tape Archive V2.0]
5th Gear (Prism Leisure) [C64 Ultimate Tape Archive V2.0]
6 Computer Hits (Beau-Jolly) [C64 Ultimate Tape Archive V2.0]
6 Computer Hits (Beau-Jolly, alt) [C64 Ultimate Tape Archive V2.0]
6 Pak (Elite Systems) [C64 Ultimate Tape Archive V2.0]
720 (U.S. Gold) [C64 Ultimate Tape Archive V2.0]

This pull request is the first step to update the c64_cass software list to reflect the C64 Ultimate Tape Archive V2.0.
I have loaded the tapes into MAME and they all load OK.
Please let me know if there is anything else that needs to be done. Thanks.

New working software list additions:
10 Computer Hits 3 (Beau-Jolly), 10 Computer Hits 4 (Beau-Jolly), 10th Frame (U.S. Gold), 1942 (Elite Systems), 1942 (Elite Systems, alt), 1943: The Battle of Midway (Go!), 3D Pool (Firebird), 3D Pool (Kixx), 4 Most Horror (Alternative Software), 4 Soccer Simulators (Codemasters), 4th & Inches (U.S. Gold), 5th Gear (Prism Leisure), 6 Computer Hits (Beau-Jolly), 6 Computer Hits (Beau-Jolly, alt), 6 Pak (Elite Systems), 720 (U.S. Gold)

Replaced software list items:
10 Computer Hits 2 (Beau-Jolly)

This pull request is the first step to update the c64_cass software list to reflect the C64 Ultimate Tape Archive V2.0.
I have loaded the tapes into MAME and they all load OK.  However, 1943 loads OK and gets to the title screen but resets/crashes when trying to start the game.  Is this a potential emulation issue?
Please let me know if there is anything else that needs to be done.  Thanks.
@0kmg
Copy link
Contributor

0kmg commented Jun 27, 2021

Hi scoomby. I believe it's best to format your commit message for software list additions following the patterns in: https://github.com/mamedev/build/blob/master/whatsnew/whatsnew_template.txt. The python commit message scraper looks for things like the "---" line. After that put one software list item per line with a source credit after each one in [] brackets. [C64 Ultimate Tape Archive V2.0] I guess? I don't know how smart the python script is for variations of this format.

Anyhoo, if there's more to know maybe someone else can chime in. Looking forward to your next PR. Later dude! :)

@scoomby
Copy link
Contributor Author

scoomby commented Jun 27, 2021

Thanks for the comments Bob. I have added square brackets to cover the source credit. I have checked recent whatsnew.txt files and typically each new software list addition for a particular device are separated by a comma rather than one software item per line as long as they are all from the same source. It would be good to get this assumption confirmed though.

I have just noticed that the original "10 Computer Hits 2 (Beau-Jolly)" was incorrectly credited to the Ultimate Tape Archive V1.0. The CRC and SHA1 do not match the V1.0 set and they haven't changed on the V2.0 set meaning that the 10 Computer Hits 2 should be considered an alternative set rather than a replacement. I will look at this more closely tomorrow.

@0kmg
Copy link
Contributor

0kmg commented Jun 27, 2021

The comma separated lists in the post-processed whatsnew for each release is generated by a python script AFAICT. If you list them one-per-line the script will do that for you. Plus a commit with one software item per line is generally easier to know how many and what items are being added at a glance. Anyway, all the long-time contributors split them into separate lines so it seems the way to go even if the python script is smart enough to grab a comma separated list.

See ya next commit! ;)

@scoomby scoomby changed the title c64_cass: 17 new dumps, 1 replacement c64_cass: 18 new dumps Jun 28, 2021
@scoomby scoomby changed the title c64_cass: 18 new dumps c64_cass: 17 new dumps Jun 28, 2021
@scoomby
Copy link
Contributor Author

scoomby commented Jun 28, 2021

Hi Bob. Thanks for information. I have updated the pull request as advised. I have been looking through some of your pull requests :)

I have also re-instated the original 10 Computer Hits 2 tap files and made the tap files from the C64 Ultimate Tape Archive an alternative set.

The filenames for 10th Frame and 4th Inches have been updated for clarity (I have read that we don't need to keep the filenames to 8 characters in length but must be no more than 16 characters in length).

@0kmg
Copy link
Contributor

0kmg commented Jun 28, 2021

Well, I'm still learning the ropes. Look at a long-time contributor like rzero9's commits for a better idea of how to update a softwarelist.

So, I looked in your commit and have more free tips :) You should make 10hits2a, 1942a, and 6hitsa clones of their respective non-a sets, e.g. <software name="1942a" cloneof="1942">. If 3dpoolk and 5thgearp are just releases of the same software by separate publishers they can be made clones too. Don't make them clones if they are independently developed software that happen to share the same name though.

@scoomby
Copy link
Contributor Author

scoomby commented Jun 28, 2021

Thanks Bob for the tips. You have been a great help. There is indeed a lot to learn!

@0kmg
Copy link
Contributor

0kmg commented Jun 28, 2021

One more: if 1943 crashes and is not playable it should be marked as not supported perhaps with an optional comment above or beside it, e.g.:
<software name="1943" supported="no"> <!-- crashes when starting new game -->

You should then change the commit message by adding a "New NOT_WORKING software list additions" section. Also FYI, there's also a supported="partial" tag for SL entries that are playable yet have say graphics glitches or non-working features. These are generally put in the "working" part of the commit message as there's no separate category for whatsnew info.

@scoomby
Copy link
Contributor Author

scoomby commented Jun 29, 2021

Thanks again Bob for the comments and clarifications. I have updated this PR as advised :)

@Tafoid
Copy link
Contributor

Tafoid commented Jul 9, 2021

@scoomby Unable to confirm the data to support this software list addition was sent so this can be verified. Please use instructions @ THIS LINK and send links or data.

@scoomby
Copy link
Contributor Author

scoomby commented Jul 9, 2021

Thanks. Data submitted to the link as advised. I know what to do from now on. Regards. Steve

@scoomby
Copy link
Contributor Author

scoomby commented Jul 10, 2021

Whilst testing the next batch of new dumps, I realised what was causing 1943 to crash (operator error). Further testing confirms that new dump for 1943 is working correctly in MAME

@scoomby
Copy link
Contributor Author

scoomby commented Jul 11, 2021

Hi Bob. Thanks for the tip. It wasn't actually intentional to sync with the master. I was trying anything I could to recover my work-in-progress 30 new dumps PR that I have completely lost. My PC decided to restart itself whilst watching TV last night to install some updates which lost the online changes to the new PR. Not a problem I thought initially as I had backed it up offline, but then I checked XML back-up containing these changes, the file was corrupted. Arrgggh!

New working software list additions
---------------------------------------
A View to a Kill (Domark) [C64 Ultimate Tape Archive V2.0]
ACE: The Air Combat Emulator (Cascade Games) [C64 Ultimate Tape Archive V2.0]
AcroJet (U.S. Gold) [C64 Ultimate Tape Archive V2.0]
Action Pack (Prism Leisure Corporation, alt) [C64 Ultimate Tape Archive V2.0]
Addicted to Fun: Rainbow Collection (Ocean) [C64 Ultimate Tape Archive V2.0]
Advanced Pinball Simulator (Codemasters) [C64 Ultimate Tape Archive V2.0]
Adventures of Bond... Basildon Bond (Probe Software) [C64 Ultimate Tape Archive V2.0]
Alleykat (Hewson Consultants, alt) [C64 Ultimate Tape Archive V2.0]
Altered Beast (Activision) [C64 Ultimate Tape Archive V2.0]
Alternative World Games (Gremlin Graphics) [C64 Ultimate Tape Archive V2.0]
America's Cup Challenge (U.S. Gold) [C64 Ultimate Tape Archive V2.0]
Anarchy (Rack It, alt) [C64 Ultimate Tape Archive V2.0]
Annihilator (Rabbit Software) [C64 Ultimate Tape Archive V2.0]
Anter-Planter (Romik Software) [C64 Ultimate Tape Archive V2.0]
Arcade Force Four (U.S. Gold) [C64 Ultimate Tape Archive V2.0]
Arcade Hits 2 in 1 (Elite Systems) [C64 Ultimate Tape Archive V2.0]
Arkanoid (Imagine) [C64 Ultimate Tape Archive V2.0]
Arkanoid: Revenge of Doh (Imagine) [C64 Ultimate Tape Archive V2.0]
Armalyte (Thalamus) [C64 Ultimate Tape Archive V2.0]
Armourdillo (Codemasters) [C64 Ultimate Tape Archive V2.0]
Army Moves (Imagine) [C64 Ultimate Tape Archive V2.0]
Athena (Imagine) [C64 Ultimate Tape Archive V2.0]
Atomic Robo-Kid (Activision) [C64 Ultimate Tape Archive V2.0]
Attack of the Mutant Camels (Llamasoft, alt) [C64 Ultimate Tape Archive V2.0]
Auf Wiedersehen Monty (Gremlin Graphics) [C64 Ultimate Tape Archive V2.0]
Avenger (Gremlin Graphics) [C64 Ultimate Tape Archive V2.0]

New NOT_WORKING software list additions
---------------------------------------
Ace of Aces (U.S. Gold) [C64 Ultimate Tape Archive V2.0]
APB (Domark, alt) [C64 Ultimate Tape Archive V2.0]
Aquanaut (Interceptor Software) [C64 Ultimate Tape Archive V2.0]
Asterix and the Magic Cauldron (Melbourne House) [C64 Ultimate Tape Archive V2.0]

This pull request is the second step to update the c64_cass software list to reflect the C64 Ultimate Tape Archive V2.0.
All new software list items have been tested in MAME 0.233.  4 of them failed to load correctly.  Loading the same tape into Vice and they work OK.  Is this an issue with the C64 tape loader emulation?
I have removed the individual <!-- Dumped by The Ultimate Tape Archive V1.0 --> credits as the dumps CRC's, SHA1's, filesize & filenames do not match the dumps found in the Ultimate Tape Archive V1 or V2 sets.  Strangely, where there is no individual dump credit, they do actually match the Ultimate Tape Archive V1/V2 sets!
Please let me know if you spot any errors. Thanks.
Last commit for 30 new dumps was submitted in error
@Tafoid
Copy link
Contributor

Tafoid commented Jul 11, 2021

I've gone through this PR and it passes the -validate and xmllint scans. However, there are a number of other issues which need addressing concerning labels and hashes as detailed below. Please correct these and always try to double check your work before sending your Pull Requests.


Both Side 1 And Side 2 have the same label. They should be different labels, especially if sitting in the same setname, despite the different hashes.

Set: 6 Pak
Name: 6pak
ROM: 6_Pak_Side_1.tap


The following entries have (alt) sets or different manufacturer releases which you have the same labels as the original (parent) set.
This is a problem when running merged sets, where all data files would be stored in the parent's setname - all of them should have unique labels.

Set: 10 Computer Hits 2 (alt)
Name: 10hits2a
ROM: 10_Computer_Hits_2_Tape_A.tap
ROM: 10_Computer_Hits_2_Tape_B.tap

Set: 3D Pool (Kixx)
Name: 3dpoolk
ROM: 3D_Pool.tap

Set: 5th Gear (Prism)
Name: 5thgearp
ROM: 5th_Gear.tap


The following entries have problems where the hashes do not match the actual data provided.

  • Problem: SHA1s appear swapped between Tape 1 and 2. CRC32s for both appears correct.

10 Computer Hits 3 [folder: 10hits3]
missing set: 10 Computer Hits 3
missing rom: 10_Computer_Hits_3_Tape_1.tap [size: 1627377] [CRC32: b32d52df] [SHA1: c0da12e89bf2a78e4c42f9e4ee97776d36746ba4]
missing rom: 10_Computer_Hits_3_Tape_2.tap [size: 2323293] [CRC32: b108b920] [SHA1: 0a4e5ea9df2d4a5d2d6c6362c61f369b3a20bfc6]

Name: 10_Computer_Hits_3_Tape_2.tap
Size: 1627377
CRC32: b32d52df
SHA1: 0a4e5ea9df2d4a5d2d6c6362c61f369b3a20bfc6

Name: 10_Computer_Hits_3_Tape_1.tap
Size: 2323293
CRC32: b108b920
SHA1: c0da12e89bf2a78e4c42f9e4ee97776d36746ba4

  • Problem: CRC32 is correct, SHA1 appears to match entry for "1985 - The Day After" and needs correcting.

1942 (alt) [folder: 1942a - parent: 1942]
missing set: 1942 (alt)
missing rom: 1942_a1.tap [size: 718105] [CRC32: 1a156870] [SHA1: ef8fd74086dbbfe10935f096e6839ab48dc7d5b8]

Name: 1942_a1.tap
Size: 718105
CRC32: 1a156870
SHA1: ef99ae65f2c4b9d4d3b66cc09328b64cb7489a98

@scoomby
Copy link
Contributor Author

scoomby commented Jul 12, 2021

Thanks Scott. I will perform more double checking in future. Regards. Steve

@Tafoid Tafoid merged commit af16049 into mamedev:master Jul 12, 2021
</software>

<software name="720">
<description>720</description>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this actually a game called “720” or is this a variant of the skateboarding game “720°” for C64?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's the US Gold conversion of 720° most likely

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is the US Gold conversion of 720 Degrees. Description probably needs to be updated to show 720 Degrees in the same manner as the arcade version in MAME to be consistent.

@scoomby scoomby deleted the patch-3 branch July 12, 2021 15:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants