Index: trunk/asma/Docs/Asma.txt
===================================================================
--- trunk/asma/Docs/Asma.txt	(revision 30)
+++ trunk/asma/Docs/Asma.txt	(revision 32)
@@ -15,10 +15,10 @@
 
                             Atari SAP Music Archive
-                                  Version 1.9
+                                  Version 2.0
 
                          Started on 4th of August 1999
-                       Last updated on 18th of April 2001
+                       Last updated on 4th of August 2001
 
-                      Total number of tunes: 985 (89 new)
+                      Total number of tunes: 1055 (70 new)
 
 
@@ -28,27 +28,29 @@
  The outfit of the whole collection was inspired by the HVSC collection (with 
  some differences). I hope you'll like this collection. To get in touch with 
- me, see the "Contact" chapter.
+ me, see the "Contact" section of this document.
 
 
  Statistics
  ~~~~~~~~~~
- Number of tunes:      985 (1304 including subtunes)
- Compared to HVSC:     6.4% (HVSC v4.0 contains 15342 tunes)
- Unsorted tunes:       70
- Number of musicians:  61
+ Number of tunes:      1055 (1397 including subtunes)
+ Compared to HVSC:     6.7% (HVSC v4.1 contains 15808 tunes)
+ Disk space ocupied:   5616279 bytes (excluding Docs folder)
+ Average SAP filesize: 5323 bytes
+ Unsorted tunes:       74
+ Number of musicians:  64
  Most active musician: Grzegorz Kwiatek    (75 tunes)
- Biggest SAP tune:     Garfield_Part_2.sap (61556 bytes)
- Smallest SAP tune:    Self_Test.sap       (159 bytes)
+ Biggest SAP tune:     Garfield_Part_2.sap (61547 bytes)
+ Smallest SAP tune:    Self_Test.sap       (150 bytes)
  Files with subtunes:
-  2 tunes: 29x
-  3 tunes: 20x
+  2 tunes: 34x
+  3 tunes: 21x
   4 tunes: 20x
-  5 tunes: 12x
-  6 tunes:  5x
+  5 tunes: 16x
+  6 tunes:  6x
   7 tunes:  4x
   8 tunes:  2x
   9 tunes:  1x
  10 tunes:  1x
- 11 tunes:  1x
+ 11 tunes:  2x
  13 tunes:  1x
  14 tunes:  1x
@@ -63,7 +65,7 @@
  it come from, when was it composed), please let us know immediately so that 
  we can complete the information about the tune in ASMA (and move it to the 
- right directory). We would welcome if you sent us also the binary file (or 
- an ATR/XFD disk image) with the original peace of software with that tune. 
- Mail any such information to pg@pinknet.cz. Our aim is to completely 
+ appropriate directory). We would welcome if you sent us also the binary file 
+ (or an ATR/XFD disk image) with the original piece of software with that 
+ tune. Mail any such information to pg@dspaudio.com. Our aim is to completely 
  annihilate the 'Unsorted' directory :-)
 
@@ -91,4 +93,5 @@
  Creator & Contributors
  ~~~~~~~~~~~~~~~~~~~~~~
+ Mr. Bacardi
  Tamas Bene (<?> of Hard)
  Adam Bienias (SoTe of Slight)
Index: trunk/asma/Docs/Bugs.txt
===================================================================
--- trunk/asma/Docs/Bugs.txt	(revision 30)
+++ trunk/asma/Docs/Bugs.txt	(revision 32)
@@ -1,10 +1,12 @@
+Classics\Gilmore_Adam\Arcade_Fruit_Machine_Simul.sap - subtunes missing
 Classics\Gilmore_Adam\Las_Vegas_Casino.sap - tune 0 doesn't exist (silence)
 Classics\Munns_Richard\Rebound.sap - tune doesn't play first note (drum)
 Classics\Whittaker_David\BMX_Simulator.sap - subtunes missing
 Demos\World_of_Wonders_2.sap - strange noise after tune end
-Games\Classic\Archon.sap - the first few notes of the bass sound are inaudible
 Games\Classic\Ghostbusters.sap - sample at the beginning is missing
 Games\Classic\Mule.sap - tune falls out of synch after about 0:35
 Unsorted\Dupa.sap - tune plays wrong after repeating
+Various\Cool_Emotion_Heal_the_World.sap - rogue note at the beginning
+Various\Hard_Software\Veronika_5.sap - rogue note at the beginning
 Various\Husak_Jakub\Bank_Bang_2.sap - strange note at the end of subsong #1
 Various\Kwiatek_Grzegorz\Far_Away.sap - strange sounds at 0:48
Index: trunk/asma/Docs/Composers.txt
===================================================================
--- trunk/asma/Docs/Composers.txt	(revision 30)
+++ trunk/asma/Docs/Composers.txt	(revision 32)
@@ -1,7 +1,7 @@
-Known Atari composers and handles                                 Apr 18 2001
+Known Atari composers and handles                                 Jul 18 2001
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 This list contains only composers who have at least 3 songs in ASMA
 collection. The composers are sorted in ABC order according to their surnames
-(if known, otherwise by their handles). There are 61 composers in this list.
+(if known, otherwise by their handles). There are 64 composers in this list.
 
 Badkowski, Marek - Bac
@@ -11,9 +11,9 @@
 Cornelius, Orall
 Czartynski, Marcin - Cedyn
-Daglish, Ben
 Dariusz Duma - Dhor
 Dojwa, Jacek
 Drozdowski, Marek - Marucha
 Duesterhoeft, Stephan - Benjy
+<?> - Flash
 Galinski, Adrian - Daxey
 Gilmore, Adam
@@ -22,4 +22,5 @@
 Grad, Jacek - Tabu
 Gwozdziej, Mirek - Zur-soft 1/2
+<?> - Hard Software
 Holda, Leszek
 Hubbard, Rob
@@ -46,4 +47,5 @@
 Munns, Richard
 Numan, Daniel - Zbx Virus
+Oscadal, Filip - Fred Brooker
 Padula, Jaroslaw - Solo
 Pelc, Janusz
@@ -52,4 +54,5 @@
 Pucimski, Rafal - Dex
 Radecki, Michal - Tehno
+Radzikowski, Ireneusz - Jager
 <?> - Ramzes
 Skwiot, Stanislaw - Stanley
Index: trunk/asma/Docs/STIL.txt
===================================================================
--- trunk/asma/Docs/STIL.txt	(revision 30)
+++ trunk/asma/Docs/STIL.txt	(revision 32)
@@ -1,5 +1,14 @@
-# STIL betaversion
-# Just an attempt how it would look like. The fileformat is 100% C-64 STIL
-# compatible
+# STIL v1.0 - SAP Tune Information List
+# The fileformat is 100% HVSC STIL compatible
+
+### Orall Corneliuss #########################################################
+
+/Classics/Cornelius_Orall/Sidewinder_2.sap
+  TITLE: Zybex
+ ARTIST: Adam Gilmore
+
+/Classics/Cornelius_Orall/Tiger_Attack.sap 
+  TITLE: Phantoms of the Asteroids
+ ARTIST: Rob Hubbard
 
 ### Rob Hubbard ##############################################################
@@ -52,14 +61,4 @@
  ARTIST: Chris Huelsbeck
 
-/Demos/Joyride_End.sap
-  TITLE: Remark Intro
- ARTIST: Jeroen Tel
-COMMENT: Originally a C64 SID tune with POKEY routine added.
-
-/Demos/Joyride_Landscape.sap
-  TITLE: Enigma PHA theme [Covering Musiklinjen by Firefox - the Amiga MOD module]
- ARTIST: Alain Hertenstein (Iron Cat)
-COMMENT: Originally a C64 SID tune with POKEY routine added.
-
 /Demos/Magnetic_Fields.sap
   TITLE: Magnetic Fields, Part 2 [from Magnetic Fields]
@@ -86,9 +85,13 @@
 /Games/Classic/Last_V8.sap
 COMMENT: Although the C64 version was composed by Rob Hubbard, Hubbard has 
-         confirmed that Atari version isn't his.
+         confirmed that the Atari version isn't his.
 
 /Games/Classic/Nadral.sap
   TITLE: The Entertainer
  ARTIST: Scott Joplin
+
+/Games/Classic/Ninja.sap
+COMMENT: Although the C64 version was composed by Rob Hubbard, Hubbard has 
+         confirmed that the Atari version isn't his.
 
 /Games/Classic/Shamus.sap
@@ -179,5 +182,5 @@
  ARTIST: Chris Huelsbeck
 
-### Adam Bienas ##############################################################
+### Adam Bienias #############################################################
 
 /Various/Bienias_Adam/Crazy.sap
@@ -187,5 +190,5 @@
 /Various/Bienias_Adam/Bitter_Reality_Greetings_P.sap
   TITLE: megaforce02 [from the Amiga MOD module]
- ARTIST: Luxor of Megaforce
+ ARTIST: <?> (Luxor)
 
 /Various/Bienias_Adam/Ice_Machine.sap
@@ -193,10 +196,4 @@
  ARTIST: Depeche Mode
 
-### Orall Corneliuss ##############################################################
-
-/Various/Cornelius_Orall/Tiger_Attack.sap 
-  Title: Phantoms of the Asteroids (from the C-64 game)
- ARTIST: Rob Hubbard
-
 ### Adrian Galinski ##########################################################
 
@@ -222,4 +219,48 @@
   TITLE: unit5 [from the Amiga module]
  ARTIST: Mark II <?>
+
+### Hard Software ############################################################
+
+/Various/Hard_Software/Cool_Emotion_Chessboard.sap
+COMMENT: Originally a C64 SID tune "Shape" with POKEY routine added.
+
+/Various/Hard_Software/Cool_Emotion_End.sap
+COMMENT: Originally a C64 SID tune "Gammeldaws" with POKEY routine added.
+
+/Various/Hard_Software/Cool_Emotion_Ghostbusters.sap
+  TITLE: Ghostbusters [from the movie]
+ ARTIST: Ray Parker, Jr.
+COMMENT: Originally a C64 SID tune "Ghostbusters" with POKEY routine added.
+
+/Various/Hard_Software/Cool_Emotion_Heal_the_World.sap
+  TITLE: Heal the World (from Dangerous)
+ ARTIST: Michael Jackson
+COMMENT: Originally a C64 SID tune "Heal the World" with POKEY routine added.
+
+/Various/Hard_Software/Cool_Emotion_Scrolls.sap
+COMMENT: Originally a C64 SID tune "Frazze" with POKEY routine added.
+
+/Various/Hard_Software/Joyride_End.sap
+COMMENT: Originally a C64 SID tune "Remark Intro" with POKEY routine added.
+
+/Various/Hard_Software/Joyride_Landscape.sap
+  TITLE: Musiklinjen [from the Amiga MOD module]
+ ARTIST: <?> (Firefox) & <?> (Tip)
+COMMENT: Originally a C64 SID tune "Enigma/PHA theme" with POKEY routine added.
+
+/Various/Hard_Software/Joyride_Scrolls.sap
+COMMENT: Originally a C64 SID tune "Happy Hour" with POKEY routine added.
+
+/Various/Hard_Software/Joyride_Turn_Disk.sap
+COMMENT: Originally a C64 SID tune "Time Runner" with POKEY routine added.
+
+/Various/Hard_Software/Veronika_1.sap
+COMMENT: Originally a C64 SID tune "S-Express" with POKEY routine added.
+
+/Various/Hard_Software/Veronika_3.sap
+COMMENT: Originally a C64 SID tune "Ace II" with POKEY routine added.
+
+/Various/Hard_Software/Veronika_6.sap
+COMMENT: Originally a C64 SID tune "Turrican 2 - The Final Fight (song 2)" with POKEY routine added.
 
 ### Jakub Husak ##############################################################
@@ -372,9 +413,9 @@
 /Various/Sychowicz_Lukasz/Porazka.sap
 COMMENT: 1st place at Quast party '96. This song is a cooperation between 
-         Lukasz Sychowicz and Samurai (Piotr Swierszcz).
+         Lukasz Sychowicz and Piotr Swierszcz.
 
 /Various/Sychowicz_Lukasz/Porazka_2.sap
 COMMENT: 1st place at Quast party '97. This song is a cooperation between 
-         Lukasz Sychowicz and Samurai (Piotr Swierszcz).
+         Lukasz Sychowicz and Piotr Swierszcz.
 
 ### Michal Szpilowski ########################################################
Index: trunk/asma/Docs/Sap.txt
===================================================================
--- trunk/asma/Docs/Sap.txt	(revision 30)
+++ trunk/asma/Docs/Sap.txt	(revision 32)
@@ -101,5 +101,5 @@
 
 TYPE S - SoftSynth. Like type "C", this type is temporary, and is used only
-         for special type of songs, that where composed using program
+         for special type of songs, that were composed using program
          SoftSynth.
 TYPE D - Digital. In SAP file with this type, must be also defined commands
Index: trunk/asma/Docs/Update09.txt
===================================================================
--- trunk/asma/Docs/Update09.txt	(revision 30)
+++ trunk/asma/Docs/Update09.txt	(revision 32)
@@ -1,3 +1,3 @@
-ASMA Update #08
+ASMA Update #09
 Date: April 18, 2001
 
Index: trunk/asma/Docs/Update10.txt
===================================================================
--- trunk/asma/Docs/Update10.txt	(revision 32)
+++ trunk/asma/Docs/Update10.txt	(revision 32)
@@ -0,0 +1,150 @@
+ASMA Update #10
+Date: August 4, 2001
+
+These rips together with the original ASMA collection will make version 2.0
+of the ASMA (out of version 1.9).
+
+Number of new tunes: 70
+Credits fixes: 25
+Filename and location changes: 27
+Better rips: 5
+
+New tunes
+---------
+Classics\Brooke_Jason\Rockford.sap
+Classics\Cornelius_Orall\Sidewinder_2.sap
+Classics\Cornelius_Orall\Slingshot.sap
+Classics\Gilmore_Adam\Jocky_Wilsons_Darts_Compen.sap
+Games\Classic\Cavelord.sap
+Games\Classic\Gauntlet.sap
+Games\Classic\Vanguard.sap
+Demos\Asskicker_Hidden_Part.sap
+Demos\Grass_Slideshow_Intro.sap
+Demos\Robot_Demo.sap
+Demos\Te_mod.sap
+Games\Classic\Alley_Cat.sap
+Games\Classic\Capture_the_Flag.sap
+Games\Classic\Capture_the_Flag_Sirius.sap
+Games\Classic\Decathlon.sap
+Games\Classic\Fire_Chief.sap
+Games\Classic\Flip_and_Flop.sap
+Games\Classic\Mr_Robot_and_His_Robot_Fac.sap
+Games\Classic\One_Man_and_His_Droid.sap
+Games\Classic\Pac_Man.sap
+Games\Classic\Pac_Man_Eric_Wolz.sap
+Games\Classic\Speed_Matter.sap
+Games\Classic\Strip_Poker.sap
+Games\Classic\Tapper.sap
+Games\Various\Megablast.sap
+Unsorted\Abbuc_39.sap
+Unsorted\Back_to_Life.sap
+Unsorted\Forest.sap
+Unsorted\Lamaliza.sap
+Unsorted\Short.sap
+Various\Badkowski_Marek\Drunklob.sap
+Various\Badkowski_Marek\Mental_Age.sap
+Various\Badkowski_Marek\Mental_Age_End.sap
+Various\Bienias_Adam\Overmind_4.sap
+Various\Bienias_Adam\Overmind_9.sap
+Various\Flash\Grass_Slideshow_End.sap
+Various\Flash\Grass_Slideshow_Main.sap
+Various\Hard_Software\Cool_Emotion_Chessboard.sap
+Various\Hard_Software\Cool_Emotion_End.sap
+Various\Hard_Software\Cool_Emotion_First_Part.sap
+Various\Hard_Software\Cool_Emotion_Ghostbusters.sap
+Various\Hard_Software\Cool_Emotion_Heal_the_World.sap
+Various\Hard_Software\Cool_Emotion_Plasma.sap
+Various\Hard_Software\Cool_Emotion_Scrolls.sap
+Various\Hard_Software\Veronika_1.sap
+Various\Hard_Software\Veronika_2.sap
+Various\Hard_Software\Veronika_3.sap
+Various\Hard_Software\Veronika_4.sap
+Various\Hard_Software\Veronika_5.sap
+Various\Hard_Software\Veronika_6.sap
+Various\Hard_Software\Veronika_Intro.sap
+Various\Laciak_Pavol\Starway.sap
+Various\Laciak_Pavol\Theme_from_Beerland.sap
+Various\Laciak_Pavol\Wild_Jet.sap
+Various\Liebich_Tomasz\Perestroyka_Channel_1.sap
+Various\Martin_Aleksander\More.sap
+Various\Cierkonski_Michal\Alcoholic_Bewerages.sap
+Various\Cierkonski_Michal\Alcoholics_Delirium.sap
+Various\Cierkonski_Michal\Coitus_Interruptus.sap
+Various\Cierkonski_Michal\Polyphonic_Pollution.sap
+Various\Cierkonski_Michal\Wit_Beer_Forever.sap
+Various\Oscadal_Filip\Lemmings_Intro_2.sap
+Various\Radzikowski_Ireneusz\Comeback.sap
+Various\Sychowicz_Lukasz\Overmind_3.sap
+Various\Sychowicz_Lukasz\Overmind_8.sap
+Various\Swierszcz_Piotr\Good_1.sap
+Various\Swierszcz_Piotr\Good_2.sap
+Various\Swierszcz_Piotr\Good_3.sap
+Various\Swierszcz_Piotr\Jimmy.sap
+Various\Swierszcz_Piotr\Overmind_TLB_546_Dots.sap
+
+Credits fixes
+-------------
+Classics\Brooke_Jason\180.sap : DATE "1987"
+Classics\Brooke_Jason\Feud.sap : DATE "1987"
+Classics\Gilmore_Adam\Blinkys_Scary_School.sap : DATE "1990"
+Classics\Gilmore_Adam\Jocky_Wilsons_Darts_Chall.sap : DATE "1988"
+Classics\Gilmore_Adam\Las_Vegas_Casino.sap : DATE "1988"
+Classics\Gilmore_Adam\Zybex.sap : DATE "1988"
+Classics\Hubbard_Rob\Extirpator.sap : DATE "1987"
+Classics\Hubbard_Rob\International_Karate.sap : DATE "1986"
+Classics\Munns_Richard\Plastron.sap : NAME "Plastron" DATE "1990"
+Classics\Whittaker_David\Amaurote.sap : DATE "1987"
+Classics\Whittaker_David\Panther.sap : DATE "1987"
+Demos\Strange_Mountains.sap : AUTHOR "Jiri Bernasek (Bewesoft)"
+Games\Classic\Axis_Slotmachine.sap : AUTHOR "Christoph Schulte-Vennbur"
+Games\Classic\Bomb_Fusion.sap : AUTHOR "<?> (Riff)" DATE "1989"
+Games\Classic\Milk_Race.sap : AUTHOR "Tiny Williams" DATE "1987"
+Games\Classic\Spy_vs_Spy_3.sap : AUTHOR "Nick Scarim" DATE "1986"
+Games\Classic\Zorro.sap : DATE "1985"
+Games\Various\Puzmania.sap : AUTHOR "Ireneusz Radzikowski (Jager)"
+Various\Hard_Software\Joyride_End.sap : AUTHOR "Jeroen Tel / <?> (Hard Software)
+Various\Hard_Software\Joyride_Landscape.sap : AUTHOR "Alain Hertenstein (Iron Cat) / <?> (Hard Software)"
+Various\Hard_Software\Joyride_Scrolls.sap : AUTHOR "Thomas E. Petersen (Laxity) / <?> (Hard Software)"
+Various\Hard_Software\Joyride_Turn_Disk.sap : AUTHOR "Markus Schneider / <?> (Hard Software)"
+Various\Liebich_Tomasz\Technus.sap : AUTHOR "Tomasz Liebich" DATE "1993"
+Various\Oscadal_Filip\Lemmings_Intro.sap : DATE "1993"
+Various\Sychowicz_Lukasz\Overmind_TLB.sap : NAME "Ovedmind (TLB)"
+Various\Wasilewski_Dariusz\Technoid.sap : DATE "1995"
+
+Filename and location changes (these may change also because of credits fix)
+-----------------------------
+Classics\Daglish_Ben\Basil.sap > Games\Classic\
+Classics\Whittaker_David\Milk_Race.sap > Games\Classic\
+Demos\Annael.sap > Various\Flash\
+Demos\Joyride_End.sap > Various\Hard_Software\
+Demos\Joyride_Info.sap > Various\Hard_Software\
+Demos\Joyride_Juggler.sap > Various\Hard_Software\
+Demos\Joyride_Landscape.sap > Various\Hard_Software\
+Demos\Joyride_Plasma.sap > Various\Hard_Software\
+Demos\Joyride_Scrolls.sap > Various\Hard_Software\
+Demos\Joyride_Tunnel.sap > Various\Hard_Software\
+Demos\Joyride_Turn_Disk.sap > Various\Hard_Software\
+Demos\Joyride_Twirl.sap > Various\Hard_Software\
+Demos\Lemmings_Intro_2.sap > Various\Oscadal_Filip\
+Games\Various\Bomb_Fusion.sap > Games\Classic
+Games\Various\Microx.sap > Various\Oscadal_Filip\
+Games\Various\Puzmania.sap > Various\Radzikowski_Ireneusz\
+Unsorted\Back_to_Life.sap > Various\Radzikowski_Ireneusz\
+Various\Badkowski_Marek\Energy_1_1.sap > Deafman.sap
+Various\Cornelius_Orall\Ruff_And_Reddy.sap > Classics\Cornelius_Orall\
+Various\Cornelius_Orall\Speed_Hawk.sap > Classics\Cornelius_Orall\
+Various\Cornelius_Orall\Tiger_Attack.sap > Classics\Cornelius_Orall\
+Various\Lepkowski_Michal\Debilizator_1_Music_5.sap > Incredible_Story.sap
+Various\Morgoth\ > Various\Cierkonski_Michal\ (All songs in this directory have credits fixed)
+Various\Sychowicz_Lukasz\Overmind_4.sap > Overmind_10.sap
+Various\Szpilowski_Michal\Overmind_3.sap > Overmind_6.sap
+Various\Sychowicz_Lukasz\Overmind_Final.sap > Overmind_TLB_End.sap
+Various\Sychowicz_Lukasz\Taquart_Demo_Loader.sap > Overmind_11.sap
+
+Better rips
+-----------
+Classics\Brooke_Jason\180.sap - subsong counter now works as it should
+Classics\Gilmore_Adam\Arcade_Fruit_Machine_Simul.sap - smaller rip, init works
+Classics\Whittaker_David\BMX_Simulator.sap - subsongs added
+Various\Liebich_Tomasz\Technus.sap - subsong added
+Various\Vybostok_Marian\Dynakillers.sap - subsong added
Index: trunk/asma/Docs/Wanted.txt
===================================================================
--- trunk/asma/Docs/Wanted.txt	(revision 30)
+++ trunk/asma/Docs/Wanted.txt	(revision 32)
@@ -4,9 +4,15 @@
 Sheol
 
+Jason C. Brooke
+any tunes..
+
 Ben Daglish
-Gauntlet, any other tunes..
+any tunes..
+
+Rob Hubbard <?>
+Action Biker
 
 Fred Brooker
-Balleantro, Vaxeen, Digisynth, Rabbacan, Brutal Recall Demo, any other tunes..
+Balleantro, Vaxeen, Digisynth, Rabbacan, Brutal Recall Demo and game, any other tunes..
 (Unfortunately most of these titles aren't probably converted to PC disk
 images. I've got them on my T2000 tapes so if you know how to convert these 
@@ -14,10 +20,9 @@
 
 Hard Software
-Veronika
+missing digi tunes from Cool Emotion
 
 Robert Zaborowski
 Crix, Ra, Classic, any other tunes..
 
-Various composers
-Decathlon, Gyruss, Megablast, Mr. Robot and His Robot Factory, any other 
-tunes..
+Classic games
+any tunes..
