Index: trunk/asma/Docs/Asma.txt
===================================================================
--- trunk/asma/Docs/Asma.txt	(revision 32)
+++ trunk/asma/Docs/Asma.txt	(revision 34)
@@ -15,10 +15,10 @@
 
                             Atari SAP Music Archive
-                                  Version 2.0
+                                  Version 2.1
 
                          Started on 4th of August 1999
-                       Last updated on 4th of August 2001
+                      Last updated on 31th of August 2001
 
-                      Total number of tunes: 1055 (70 new)
+                      Total number of tunes: 1181 (131 new)
 
 
@@ -33,22 +33,23 @@
  Statistics
  ~~~~~~~~~~
- 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)
+ Number of tunes:      1181 (1581 including subtunes)
+ Compared to HVSC:     7.5% (HVSC v4.1 contains 15808 tunes)
+ Disk space ocupied:   6552742 bytes (6458873 bytes excluding Docs folder)
+ Average SAP filesize: 5469 bytes
+ Songs with subsongs:  129
+ Unsorted tunes:       69
+ Number of musicians:  72
+ Most active musician: Lukasz Sychowicz    (76 tunes)
  Biggest SAP tune:     Garfield_Part_2.sap (61547 bytes)
  Smallest SAP tune:    Self_Test.sap       (150 bytes)
  Files with subtunes:
-  2 tunes: 34x
-  3 tunes: 21x
-  4 tunes: 20x
-  5 tunes: 16x
-  6 tunes:  6x
+  2 tunes: 36x
+  3 tunes: 28x
+  4 tunes: 23x
+  5 tunes: 21x
+  6 tunes:  7x
   7 tunes:  4x
   8 tunes:  2x
-  9 tunes:  1x
+  9 tunes:  2x
  10 tunes:  1x
  11 tunes:  2x
@@ -68,15 +69,15 @@
  (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 :-)
+ annihilate the unrecognized tunes.
 
 
  For contributors
  ~~~~~~~~~~~~~~~~
- If you want to send me some tunes, they must be already converted to SAP
+ If you want to send me some tunes, they should be already converted to SAP
  format and should include all the information needed (author, name, date,
  number of songs). If you're unsure about any information needed, you can
  send me the music as well, maybe we can find the info together. If you don't
  know how to create SAP files, send me the binary file with the INIT and PLAY
- addresses and memory location where the tune has to be loaded. See SAP.TXT
+ addresses and memory location where the tune has to be loaded. See Sap.txt
  for SAP format description. The filenames must not be longer than 26
  characters (plus .sap) e.g.:
@@ -84,5 +85,5 @@
  12345678901234567890123456.123
  Intel_Outside_Fractal_Part.sap - all right
- Jocky_Wilsons_Darts_Challenge.sap - wrong!
+ Jocky_Wilsons_Darts_Compendium.sap - wrong!
 
  Because of compatibility reasons only characters 'A..Z', 'a..z', and '0..9'
@@ -93,8 +94,10 @@
  Creator & Contributors
  ~~~~~~~~~~~~~~~~~~~~~~
+ (in ABC order)
+
  Mr. Bacardi
  Tamas Bene (<?> of Hard)
  Adam Bienias (SoTe of Slight)
- Zdenek Eisenhammer (PG of Unreal)
+ Zdenek Eisenhammer (PG)
  Piotr Fusik (Fox of Taquart)
  Michal Garbaciak (Dracon of Taquart)
@@ -108,5 +111,6 @@
  Contact
  ~~~~~~~
- E-mail:   pg@dspaudio.com
- ICQ:      66411804
- Homepage: http://asma.dspaudio.com
+ E-mail:       pg@dspaudio.com
+ ICQ:          66411804
+ Homepage:     http://asma.dspaudio.com (alias http://asma.atari.org)
+ Czech mirror: http://mp3.musichall.cz/Unreal/ASMA
Index: trunk/asma/Docs/Bugs.txt
===================================================================
--- trunk/asma/Docs/Bugs.txt	(revision 32)
+++ trunk/asma/Docs/Bugs.txt	(revision 34)
@@ -2,10 +2,9 @@
 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\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\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
@@ -13,2 +12,3 @@
 Various\Kwiatek_Grzegorz\Ultra_Intro.sap - tune plays twice as fast after repeating
 Various\Liebich_Tomasz\Deimos.sap - tune 0 doesn't exist (distorted sounds)
+Various\Majewski_Tomasz\Crocketts_Theme.sap - tune doesn't reinit well after repeating
Index: trunk/asma/Docs/Composers.txt
===================================================================
--- trunk/asma/Docs/Composers.txt	(revision 32)
+++ trunk/asma/Docs/Composers.txt	(revision 34)
@@ -1,12 +1,15 @@
-Known Atari composers and handles                                 Jul 18 2001
+Known Atari composers and handles                                 Aug 31 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 64 composers in this list.
+(if known, otherwise by their handles). There are 72 composers in this list.
 
 Badkowski, Marek - Bac
 Bienias, Adam - SoTe
+Bloszko, Marek - Markus
 Brooke, Jason C.
-Bruenninski, Uwe - Hu Soft
+Bruenninski, Uwe - Hu-Soft
+Bryla, Krzysztof - Woppie, Foster
+Cierkonski, Michal - Morgoth
 Cornelius, Orall
 Czartynski, Marcin - Cedyn
@@ -15,10 +18,9 @@
 Drozdowski, Marek - Marucha
 Duesterhoeft, Stephan - Benjy
-<?> - Flash
 Galinski, Adrian - Daxey
 Gilmore, Adam
-<?> - Gnome Design
 Golewski Filip, - Zoltar X
 Grad, Jacek - Tabu
+Grzyb, Janusz
 Gwozdziej, Mirek - Zur-soft 1/2
 <?> - Hard Software
@@ -28,5 +30,7 @@
 Kalinowski, Bartosz - Bartman
 Karwacki, Jakub - Yezus
+Kielczyk, Piotr - Pet
 Krawczyk, Adam
+Kucharski, Konrad - Kuchara
 Kucisz, Tomasz - VLX
 Kuczek, Konrad
@@ -40,9 +44,9 @@
 Majewski, Jerzy - Zur-soft 2/2
 Majewski, Tomasz - Mayonez
+Makara, Grzegorz
 Makowski, Robert - Gutek
-<?> - Marcys
 Martin, Aleksander - Alex
 Matyasik, Krzysztof - Mateoos
-<?> - Morgoth
+Mrozowski, Robert
 Munns, Richard
 Numan, Daniel - Zbx Virus
@@ -50,10 +54,12 @@
 Padula, Jaroslaw - Solo
 Pelc, Janusz
-<?> - Pet
+Pesout, Marek
 Podedworny, Wojtek - Ferro
 Pucimski, Rafal - Dex
 Radecki, Michal - Tehno
 Radzikowski, Ireneusz - Jager
+Roszkowski, Marek - Marcys
 <?> - Ramzes
+Skowiniak, Krystian - Pinokio
 Skwiot, Stanislaw - Stanley
 Sterba, Radek - RASTER
@@ -62,6 +68,7 @@
 Szmatola, Krysztof
 Szpilowski, Michal - Miker
-Szymczuk, Daniel
+Szymczuk, Daniel - Lorien
 <?> - Top Odin
+Tegethoff, Sven - Gnome Design
 Trokowicz, B.
 Vogt, Dariusz - DJ V
@@ -69,2 +76,3 @@
 Wasilewski, Dariusz - Trener
 Whittaker, David
+Witkiewicz, Dariusz - Flash
Index: trunk/asma/Docs/STIL.txt
===================================================================
--- trunk/asma/Docs/STIL.txt	(revision 32)
+++ trunk/asma/Docs/STIL.txt	(revision 34)
@@ -1,4 +1,7 @@
-# STIL v1.0 - SAP Tune Information List
-# The fileformat is 100% HVSC STIL compatible
+##############################################################################
+#
+#  STIL v2.1 - SAP Tune Information List
+#  The fileformat is 100% HVSC STIL compatible
+#  Total number of entries: 122
 
 ### Orall Corneliuss #########################################################
@@ -14,5 +17,5 @@
 ### Rob Hubbard ##############################################################
 
-/Hubbard_Rob/
+/Classics/Hubbard_Rob/
 COMMENT: All of these tunes have been confirmed by Rob Hubbard to be his. 
          Hubbard's own comments are denoted by (RH).
@@ -49,4 +52,8 @@
  ARTIST: <?>
 
+/Demos/Digital_Trash.sap
+  TITLE: Domino Dancing [from Introspective]
+ ARTIST: Pet Shop Boys
+
 /Demos/Hobbytronic_89_2.sap
   TITLE: Neunundneunzig (99) Luftballons
@@ -118,7 +125,4 @@
 
 ### Unsorted #################################################################
-
-/Unsorted/Avm.sap
-COMMENT: Last Party '99 music compo entry.
 
 /Unsorted/Benny_Hill_Show_theme.sap
@@ -150,10 +154,4 @@
  ARTIST: The Beatles
 
-/Unsorted/Lark.sap
-COMMENT: Last Party '99 music compo entry.
-
-/Unsorted/Old_Socks.sap
-COMMENT: Last Party '99 music compo entry.
-
 /Unsorted/Picca.sap
 COMMENT: Lato Ludzikow 2000 music compo entry.
@@ -162,57 +160,56 @@
 COMMENT: Lato Ludzikow 2000 music compo entry.
 
-/Unsorted/Shakemix.sap
+/Unsorted/Spellbound_Partial_Version.sap
+  TITLE: Spellbound
+ ARTIST: Rob Hubbard
+
+/Unsorted/Suprajs.sap
+COMMENT: Lato Ludzikow 2000 music compo entry.
+
+/Unsorted/Takie_Cos.sap
+COMMENT: Lato Ludzikow 2001 music compo entry.
+
+/Unsorted/That_Demo_1.sap
+  TITLE: Oxygene 4 [from Oxygene]
+ ARTIST: Jean Michel Jarre
+
+/Unsorted/Turrican_2_Level_1_Traps.sap
+  TITLE: Turrican 2 - World 1, Tune #3
+ ARTIST: Chris Huelsbeck
+
+### Adam Bienias (SoTe) ######################################################
+
+/Various/Bienias_Adam/Crazy.sap
+  TITLE: Crazy
+ ARTIST: Fine Young Cannibals
+
+/Various/Bienias_Adam/Bitter_Reality_Greetings_P.sap
+  TITLE: megaforce02 [from the Amiga MOD module]
+ ARTIST: <?> (Luxor)
+
+/Various/Bienias_Adam/Ice_Machine.sap
+  TITLE: Ice Machine
+ ARTIST: Depeche Mode
+
+### Adrian Galinski (Daxey) ##################################################
+
+/Various/Galinski_Adrian/Abdicus.sap
+COMMENT: 1st place at Shadows Party music compo.
+
+/Various/Galinski_Adrian/Bells.sap
+COMMENT: 3rd place at Shadows Party music compo.
+
+/Various/Galinski_Adrian/Intel_Outside_The_Intro.sap
+  TITLE: Oxygene 4 [from Oxygene]
+ ARTIST: Jean Michel Jarre
+
+### Marek Drozdowski (Marucha) ###############################################
+
+/Various/Drozdowski_Marek/Shakemix.sap
   TITLE: Shake
  ARTIST: Marek Drozdowski (Marucha)
 COMMENT: This cover uses just slightly different sounds.
 
-/Unsorted/Spellbound_Partial_Version.sap
-  TITLE: Spellbound
- ARTIST: Rob Hubbard
-
-/Unsorted/Suprajs.sap
-COMMENT: Lato Ludzikow 2000 music compo entry.
-
-/Unsorted/That_Demo_1.sap
-  TITLE: Oxygene 4 [from Oxygene]
- ARTIST: Jean Michel Jarre
-
-/Unsorted/Turrican_2_Level_1_Traps.sap
-  TITLE: Turrican 2 - World 1, Tune #3
- ARTIST: Chris Huelsbeck
-
-### Adam Bienias #############################################################
-
-/Various/Bienias_Adam/Crazy.sap
-  TITLE: Crazy
- ARTIST: Fine Young Cannibals
-
-/Various/Bienias_Adam/Bitter_Reality_Greetings_P.sap
-  TITLE: megaforce02 [from the Amiga MOD module]
- ARTIST: <?> (Luxor)
-
-/Various/Bienias_Adam/Ice_Machine.sap
-  TITLE: Ice Machine
- ARTIST: Depeche Mode
-
-### Adrian Galinski ##########################################################
-
-/Various/Galinski_Adrian/Abdicus.sap
-COMMENT: 1st place at Shadows Party music compo.
-
-/Various/Galinski_Adrian/Bells.sap
-COMMENT: 3rd place at Shadows Party music compo.
-
-/Various/Galinski_Adrian/Intel_Outside_The_Intro.sap
-  TITLE: Oxygene 4 [from Oxygene]
- ARTIST: Jean Michel Jarre
-
-### Gnome Design #############################################################
-
-/Various/Gnome_Design/Abbuc_20_2.sap
-  TITLE: Commando, Tune #2
- ARTIST: Rob Hubbard
-
-### Jacek Grad ###############################################################
+### Jacek Grad (Tabu) ########################################################
 
 /Various/Grad_Jacek/Fatum.sap
@@ -258,6 +255,12 @@
 COMMENT: Originally a C64 SID tune "S-Express" with POKEY routine added.
 
+/Various/Hard_Software/Veronika_2.sap
+COMMENT: Originally a C64 SID tune "Wonderland" 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_5.sap
+COMMENT: Originally a C64 SID tune "Hollywood Poker Pro" with POKEY routine added.
 
 /Various/Hard_Software/Veronika_6.sap
@@ -274,5 +277,8 @@
  ARTIST: Kraftwerk
 
-### Jakub Karwacki ###########################################################
+### Jakub Karwacki (Yezus) ###################################################
+
+/Various/Karwacki_Jakub/Lark.sap
+COMMENT: Last Party '99 music compo entry.
 
 /Various/Karwacki_Jakub/Geotion.sap
@@ -281,4 +287,13 @@
 /Various/Karwacki_Jakub/Shell.sap
 COMMENT: Lato Ludzikow 2000 music compo entry.
+
+/Various/Karwacki_Jakub/Somemuz.sap
+COMMENT: Lato Ludzikow 2001 music compo entry.
+
+### Tomasz Kucisz (VLX) ######################################################
+
+/Various/Kucisz_Tomasz/Scene_Register_4_0_Intro.sap
+  TITLE: Star Wars Theme [from the movie]
+ ARTIST: John Williams
 
 ### Konrad Kuczek ############################################################
@@ -292,5 +307,5 @@
  ARTIST: Phil Collins
 
-### Grzegorz Kwiatek #########################################################
+### Grzegorz Kwiatek (Greg) ##################################################
 
 /Various/Kwiatek_Grzegorz/Alive.sap
@@ -322,5 +337,23 @@
  ARTIST: Matt Gray
 
-### Robert Makowski #########################################################
+
+### Tomasz Majewski (Mayonez) ###############################################
+
+/Various/Majewski_Tomasz/Crocketts_Theme.sap
+  TITLE: Crockett's Theme [from the TV series Miami Vice]
+ ARTIST: Jan Hammer
+
+### Grzegorz Makara #########################################################
+
+/Various/Makara_Grzegorz/Neron_Ingame.sap
+  TITLE: The Hootchy Kootchy Dance
+ ARTIST: Sol Bloom
+
+### Robert Makowski (Gutek) #################################################
+
+/Various/Makowski_Robert/Alfaboot_Ingame.sap
+  TITLE: Das Boot [from the movie]
+ ARTIST: Klaus Doldinger
+COMMENT: Covers the U96 version of this song.
 
 /Various/Makowski_Robert/Incydent.sap
@@ -328,5 +361,46 @@
  ARTIST: Enigma
 
-### Jaroslaw Padula ##########################################################
+/Various/Makowski_Robert/Joshgoa.sap
+COMMENT: Rush Hours '97 music compo entry.
+
+### Aleksander Martin (Alex) #################################################
+
+/Various/Martin_Aleksander/Temptation.sap
+  TITLE: Ob-La-Di, Ob-La-Da [from White Album]
+ ARTIST: The Beatles
+
+### Robert Mrozowski #########################################################
+
+/Various/Mrozowski_Robert/Going_to_California.sap
+  TITLE: Going to California
+ ARTIST: Led Zeppelin
+
+/Various/Mrozowski_Robert/Rock_And_Roll.sap
+  TITLE: Rock And Roll
+ ARTIST: Led Zeppelin
+
+/Various/Mrozowski_Robert/Stairway_to_Heaven.sap
+  TITLE: Stairway To Heaven [from Led Zeppelin IV: Four Symbols]
+ ARTIST: Led Zeppelin
+
+### Daniel Numan (Zbx Virus) #################################################
+
+/Various/Numan_Daniel/Pentagram_4_Axel_F.sap
+  TITLE: Axel F [from the movie Beverly Hills Cop]
+ ARTIST: Harold Faltermeyer
+
+/Various/Numan_Daniel/Pentagram_4_Croceth.sap
+  TITLE: Crockett's Theme [from the TV series Miami Vice]
+ ARTIST: Jan Hammer
+
+/Various/Numan_Daniel/Pentagram_4_Echoing.sap
+  TITLE: Echoing [from the Amiga MOD module]
+ ARTIST: Christof Mühlan (Banana)
+
+/Various/Numan_Daniel/Pentagram_4_Moonlight.sap
+  TITLE: Moonlight Shadow [from Crises]
+ ARTIST: Mike Oldfield
+
+### Jaroslaw Padula (Solo) ###################################################
 
 /Various/Padula_Jaroslaw/Pmix.sap
@@ -342,27 +416,34 @@
  ARTIST: Orchestral Manoeuvres in the Dark (OMD)
 
-### Robert Makowski ##########################################################
-
-/Various/Makowski_Robert/Joshgoa.sap
-COMMENT: Rush Hours '97 music compo entry.
-
-### Aleksander Martin ########################################################
-
-Various/Martin_Aleksander/Temptation.sap
-
-  TITLE: Ob-La-Di, Ob-La-Da [from White Album]
- ARTIST: The Beatles
-
-### Michal Radecki ###########################################################
+### Marek Pesout #############################################################
+
+/Various/Pesout_Marek/Blade.sap
+  TITLE: Blade Runner (End Titles) [from the movie]
+ ARTIST: Vangelis
+
+### Michal Radecki (Tehno) ###################################################
 
 /Various/Radecki_Michal/Entrance_of_Dragon_Intro_2.sap
-
   TITLE: Imperial March [from the movie Star Wars]
  ARTIST: John Williams
 
-### Stanislaw Skwiot #########################################################
+### Krystian Skowiniak (Pinokio) #############################################
+
+/Various/Skowiniak_Krystian/Avm.sap
+COMMENT: Last Party '99 music compo entry.
+
+/Various/Skowiniak_Krystian/Old_Socks.sap
+COMMENT: Last Party '99 music compo entry.
+
+/Various/Skowiniak_Krystian/THC10.sap
+COMMENT: Lato Ludzikow 2001 music compo entry.
+
+/Various/Skowiniak_Krystian/THC11.sap
+COMMENT: Lato Ludzikow 2001 music compo entry.
+
+### Stanislaw Skwiot (Stanley) ###############################################
 
 /Various/Skwiot_Stanislaw/Fortuna.sap
-<#1)
+(#1)
   TITLE: <?> [from the Amiga MOD module]
 
@@ -371,9 +452,10 @@
  ARTIST: Roxette
 
-### Radek Sterba #############################################################
+### Radek Sterba (RASTER) ####################################################
 
 /Various/Sterba_Radek/Flop_Magazin_30_Just_Now.sap
   TITLE: Prave Ted
  ARTIST: Janek Ledecky
+COMMENT: Covers a song by a popular Czech singer.
 
 /Various/Sterba_Radek/Flop_Magazin_31_Christmas.sap
@@ -394,5 +476,5 @@
 COMMENT: Covers only a part of it.
 
-### Piotr Swierszcz ##########################################################
+### Piotr Swierszcz (Samurai) ################################################
 
 /Various/Swierszcz_Piotr/Popcorn.sap
@@ -400,5 +482,5 @@
  ARTIST: Hot Butter
 
-### Lukasz Sychowicz #########################################################
+### Lukasz Sychowicz (X-Ray) #################################################
 
 /Various/Sychowicz_Lukasz/Cabil.sap
@@ -419,5 +501,5 @@
          Lukasz Sychowicz and Piotr Swierszcz.
 
-### Michal Szpilowski ########################################################
+### Michal Szpilowski (Miker) ################################################
 
 /Various/Szpilowski_Michal/Rubicon.sap
@@ -435,4 +517,10 @@
 COMMENT: Silly Venture 2k music compo entry.
 
+### Sven Tegethoff (Gnome Design) ############################################
+
+/Various/Tegethoff_Sven/Abbuc_20_2.sap
+  TITLE: Commando, Tune #2
+ ARTIST: Rob Hubbard
+
 ### Top Odin #################################################################
 
@@ -441,5 +529,12 @@
  ARTIST: John Williams
 
-### Dariusz Wasilewski #######################################################
+### B. Trokowicz #############################################################
+
+/Various/Trokowicz_B/Miecze_Valdgira_II.sap
+(#2)
+  TITLE: Echoing [from the Amiga MOD module]
+ ARTIST: Christof Mühlan (Banana)
+
+### Dariusz Wasilewski (Trener) ##############################################
 
 /Various/Wasilewski_Dariusz/No_Limits.sap 
@@ -451,5 +546,5 @@
  ARTIST: <?>
 
-### Zur-soft #################################################################
+### Mirek Gwozdziej & Jerzy Majewski (Zur-soft) ##############################
 
 /Various/Zur-soft/The_Top_3_Part_9.sap
Index: trunk/asma/Docs/Sap.txt
===================================================================
--- trunk/asma/Docs/Sap.txt	(revision 32)
+++ trunk/asma/Docs/Sap.txt	(revision 34)
@@ -1,46 +1,59 @@
 SAP file divides into two parts. First part (in text format) describes
-player/music type. Second part (in binary format) contains player and music
-data formed into Atari Binary File Format. This format has two bytes header
-FF,FF. Next two bytes tell loader, where to load data, and next two bytes
-describes where the data end.
-Init data block ($02E2,$02E3) is not supported.
-
-A little example:
-
-FF FF 00 20 05 20 01 42 A3 04 D5
-\___/ \_________/ \____________/
-  A        B            C
-
-A - Binary file header identification (always FF FF)
-B - Load addres (StartAddr, EndAddr in LO,HI order - $2000 to $2005)
-C - Data (that will be loaded from StartAddr)
-
-This example will load values 01,42,A3,04,D5 into memory from $2000 to $2005.
+player/music type and contains credits for the song. Second part (in binary
+format) contains player and music data formed into Atari Binary File format.
 
 
-Player Description format (first part of .sap file)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-This description (in text format) is loaded line per line. Each line contains
-command with parameters. Other lines which are not recognized are treated as
-comment lines. Right now only these commands are supported:
+First part - text info
+~~~~~~~~~~~~~~~~~~~~~~
+For identification of the format, it always starts with "SAP" string.
+After that the credits follow. However, this is not fixed order, just a
+recommendation. Each line should end with EOL string (0D 0A).
 
-   TYPE      - player type
-   PLAYER    - address of player part which will be executed in 1/50 sec
-               intervals
-   MUSIC     - address with data
-   INIT      - address of player part which will init player
-   SONGS     - number of songs
-   DEFSONG   - first song which will be played when .sap will be loaded
-   FASTPLAY  - number of lines between each call of playing routine (312 by
-               default, which is one screen - 1/50 of sec.). For example for
-               double-speed tune put here the value 156 (312/2). 99% of tunes
-               are single-speed which means that you don't have to define the
-               FASTPLAY variable for them. Works for player TYPE "B".
+Credits tags:
+AUTHOR "" - Name of composer. For ASMA purposes, the name should consist of 
+            real name and nickname (scene handle) in parentheses. No scene
+            group allowed. If song was composed by more authors, use "&".
+            Examples: 
+            AUTHOR "Dariusz Duma (Dhor)"
+            AUTHOR "Lukasz Sychowicz (X-Ray) & Piotr Swierszcz (Samurai)"
+NAME "" - Song title. No restrictions, except for it shouldn't contain
+          quotation marks. Use apostroph instead.
+          Example:
+          NAME "Jocky Wilson's Darts Challenge"
+DATE "" - Copyright year. If exact date is known, it can also be included in
+          DD/MM/YYYY format.
+          Examples:
+          DATE "1986"
+          DATE "28/08/1997"
+          DATE "12/2000" 
 
-commands PLAYER, MUSIC, INIT contain addresses in hexadecimal format:
+After that the player info follows:
+TYPE      - player type
+PLAYER    - address of player part which will be executed in 1/50 sec
+            intervals (or as definet with FASTPLAY)
+MUSIC     - address with music data (for type C)
+INIT      - address of player part which will init player (for all types
+            except C)
+SONGS     - number of songs. If SONGS tag not defined, the default value is
+            0.
+DEFSONG   - first song which will be played when .sap will be loaded.
+            This value is counted from zero (if there are 5 songs in the
+            file and the last is the default, the value will be DEFSONG 4).
+            The default is 0 if DEFSONG not defined.
+FASTPLAY  - number of lines between each call of playing routine (312 by
+            default, which is one screen - 1/50 of sec.). For example for
+            double-speed tune put here the value 156 (312/2). 99% of tunes
+            are single-speed which means that you don't have to define the
+            FASTPLAY variable for them. Works for player TYPE "B".
+            Another values recommended: 104 (triple speed), 78 (quadruple
+            speed)
+STEREO - tune uses dual POKEY configuration.
+
+commands PLAYER, MUSIC, INIT contain addresses in hexadecimal format. Both
+lower- and uppercase characters are allowed for the number.
 
 PLAYER A000
 PLAYER 1234
-MUSIC  F400
+MUSIC  f42e
 
 commands SONGS, DEFSONG contain decimal numbers:
@@ -49,13 +62,6 @@
 DEFSONG 9
 
-command TYPE contains single character which describes player type. Right now
-only the following characters are supported:
-
-TYPE C
-TYPE B
-TYPE M
-TYPE S
-TYPE D
-TYPE R
+command TYPE contains single character which describes player type. The
+following player types are supported:
 
 TYPE C - player from CMC (Chaos Music Composer). In this case, also these
@@ -75,15 +81,6 @@
          jsr PLAYER+6
 
-TYPE M - player from ???????? (this player was used by composers like Adam
-         Gilmore, David Whittaker, etc). In this case, also these commands
-         must appear: PLAYER, INIT, SONGS, and DEFSONG. Player will be
-         initialized as follows:
-
-         lda #DEFSONG
-         jsr INIT
-
-         in 1/50 intervals will be executed:
-
-         jsr PLAYER
+         This is just internal structure already contained in SAP player, you
+         don't have to add this code to the CMC player.
 
 TYPE B - any player. In this case, also these commands must appear: PLAYER,
@@ -97,23 +94,23 @@
          jsr PLAYER
 
-         TYPE B is right now exactly the same like TYPE M but this
-         distinguish is for future SAP releases.
-
 TYPE S - SoftSynth. Like type "C", this type is temporary, and is used only
          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
-         "INIT" and "PLAYER". "PLAYER" (like in type "B") sets address of
-         procedure that will be called in 1/50s intervals and (like in type
-         "B") must end with RTS opcode. INIT this time is a bit different. It
-         sets address of procedure that will be called (with number of song
-         in register A) to initialize program, but it can't end with RTS. It
-         should start playing digis in endless loop. In SAP player there are
-         emulated two ANTIC registers $D40A and $D40B that can help playing
-         samples. D40B register increases its contents each two screen lines.
-         D40A holds CPU till the end of actually created line. SAP emulates
-         Atari in PAL with disabled screen. It means that we have 312 PAL
-         lines, while each lines has 105 CPU cycles and 9 cycles of memory
-         refresh (114 cycles per line).
+TYPE D - Digital. In SAP file with this type, there must be also defined 
+         commands "INIT" and "PLAYER". "PLAYER" (like in type B) sets 
+         address of procedure that will be called in 1/50s intervals and 
+         (like in type B) must end with RTS opcode. INIT this time is a bit
+         different. It sets address of procedure that will be called (with 
+         number of song in register A) to initialize program, but it can't
+         end with RTS. It should start playing digis in endless loop. In SAP
+         player two ANTIC registers $D40A and $D40B are emulated. They help
+         playing samples. D40B register increases its contents each two
+         screen lines. D40A holds CPU till the end of actually drawn line.
+         SAP emulates Atari in PAL with disabled screen. It means that we
+         have 312 lines per screen, each taking 105 CPU cycles and 9 cycles
+         of memory refresh (114 cycles per line).
+
+One more type is recognized by SAP player - TYPE M. Right now it's exactly
+the same as TYPE B but this differentiation is for future SAP releases.
 
 Planned features:
@@ -121,5 +118,38 @@
          This part contains values that will be directly written to Pokey
          registers ($D200-$D208) in 1/50s intervals.
-TIME xx:xx - song duration
+TIME xx:xx - Song duration. This is actually already supported by SAP WinAMP
+             plug-in
+
+Example of the header:
+SAP
+AUTHOR "Jakub Husak"
+NAME "Inside"
+DATE "1990"
+SONGS 3
+DEFSONG 0
+TYPE B
+INIT 0F80
+PLAYER 247F
+
+
+Second part - binary data
+~~~~~~~~~~~~~~~~~~~~~~~~~
+This part contains player and music data represented in Atari binary file
+format. This format has two bytes header FF,FF. Next two bytes tell loader,
+where to load data, and next two bytes describes where the data end.
+Init data block ($02E2,$02E3) is not supported.
+
+A little example:
+
+FF FF 00 20 04 20 01 42 A3 04 D5
+\___/ \_________/ \____________/
+  A        B            C
+
+A - Binary file header identification (always FF FF)
+B - Load addres (StartAddr, EndAddr in LO,HI order - $2000 to $2004)
+C - Data (that will be loaded from StartAddr)
+
+This example will load values 01,42,A3,04,D5 into memory from $2000 to $2004.
+
 
 How to create .SAP file
@@ -132,6 +162,6 @@
 copy /b music.txt+music.bin music.sap
 
-The file is done now!
-If you didn't find that song in ASMA, feel free to send it to pg@pinknet.cz
-with all needed information (see ASMA.TXT for details). The song should be 
-included in the nearest ASMA update.
+The file is made now!
+If you didn't find that song in ASMA, feel free to send it to p
+g@dspaudio.com with all needed information (see ASMA.TXT for details). The
+song should be then included in the nearest ASMA update.
Index: trunk/asma/Docs/Update11.txt
===================================================================
--- trunk/asma/Docs/Update11.txt	(revision 34)
+++ trunk/asma/Docs/Update11.txt	(revision 34)
@@ -0,0 +1,195 @@
+ASMA Update #11
+Date: August 31, 2001
+
+These rips together with the original ASMA collection will make version 2.1
+of the ASMA (out of version 2.0).
+
+Number of new tunes: 131
+Credits fixes: 34
+Better rips: 3
+Removed files: 5
+
+New tunes
+---------
+Demos\Digital_Trash.sap
+Demos\Running_Cow.sap
+Demos\Time_To_Enjoy_2.sap
+Demos\Ray_of_Hope_Display_List.sap
+Games\Classic\Dan_Strikes_Back.sap
+Unsorted\Takie_Cos.sap
+Various\Cierkonski_Michal\Ergo_Bibamus_Endpart.sap
+Various\Cierkonski_Michal\Ergo_Bibamus_Trackmo.sap
+Various\Galinski_Adrian\Crypts_of_Egypt.sap
+Various\Grzyb_Janusz\Around_the_Planet.sap
+Various\Grzyb_Janusz\Around_the_Planet_Ingame.sap
+Various\Grzyb_Janusz\Around_the_Planet_Intro.sap
+Various\Duma_Dariusz\Rotten_Juice_Credits.sap
+Various\Duma_Dariusz\Rotten_Juice_Dentro.sap
+Various\Duma_Dariusz\Rotten_Juice_Intro.sap
+Various\Duma_Dariusz\Rotten_Juice_Techno.sap
+Various\Golewski_Filip\Echo.sap
+Various\Karwacki_Jakub\Bug.sap
+Various\Karwacki_Jakub\Somemuz.sap
+Various\Kucisz_Tomasz\Scene_Register_4_0_Intro.sap
+Various\Kucharski_Konrad\Psychotropy.sap
+Various\Kucharski_Konrad\Sillent_But_Violent.sap
+Various\Kucharski_Konrad\Vanity.sap
+Various\Lepkowski_Michal\Bombtrack.sap
+Various\Lepkowski_Michal\Cool.sap
+Various\Lepkowski_Michal\Crash.sap
+Various\Lepkowski_Michal\Cypress.sap
+Various\Lepkowski_Michal\Dusk.sap
+Various\Lepkowski_Michal\Figment.sap
+Various\Lepkowski_Michal\Hobbit.sap
+Various\Lepkowski_Michal\Hot.sap
+Various\Lepkowski_Michal\Odyssey_of_the_Mind.sap
+Various\Lepkowski_Michal\Sight.sap
+Various\Lepkowski_Michal\Vent_1.sap
+Various\Lepkowski_Michal\Vent_2.sap
+Various\Lepkowski_Michal\Wolfmoon.sap
+Various\Liebich_Tomasz\Nemesis.sap
+Various\Majewski_Tomasz\Crocketts_Theme.sap
+Various\Makara_Grzegorz\Neron.sap
+Various\Makara_Grzegorz\Neron_Game_Over.sap
+Various\Martin_Aleksander\Sheol_side_A.sap
+Various\Martin_Aleksander\Sheol_side_B.sap
+Various\Martin_Aleksander\Sexquix_Ingame.sap
+Various\Martin_Aleksander\Sexquix.sap
+Various\Mrozowski_Robert\Going_to_California.sap
+Various\Mrozowski_Robert\Rock_And_Roll.sap
+Various\Mrozowski_Robert\Stairway_to_Heaven.sap
+Various\Numan_Daniel\Chistoria_Pewnego_Pecetofca.sap
+Various\Numan_Daniel\Demonic_Laughter_Intro.sap
+Various\Numan_Daniel\It_Means_War.sap
+Various\Numan_Daniel\Komercja.sap
+Various\Numan_Daniel\Pentagram_4_Axel_F.sap
+Various\Numan_Daniel\Pentagram_4_Bojkot.sap
+Various\Numan_Daniel\Pentagram_4_Croceth.sap
+Various\Numan_Daniel\Pentagram_4_Discopolo.sap
+Various\Numan_Daniel\Pentagram_4_Echoing.sap
+Various\Numan_Daniel\Pentagram_4_Error.sap
+Various\Numan_Daniel\Pentagram_4_Intro.sap
+Various\Numan_Daniel\Pentagram_4_Killos.sap
+Various\Numan_Daniel\Pentagram_4_Moonlight.sap
+Various\Numan_Daniel\Pentagram_4_Silence.sap
+Various\Numan_Daniel\Pentagram_4_Taki_Jusi.sap
+Various\Numan_Daniel\Pentagram_4_Techno.sap
+Various\Numan_Daniel\Psychodelic_Acied.sap
+Various\Numan_Daniel\Raving_Vieprz_1.sap
+Various\Numan_Daniel\Raving_Vieprz_2.sap
+Various\Numan_Daniel\Raving_Vieprz_3.sap
+Various\Numan_Daniel\Spirit_Vision_1.sap
+Various\Numan_Daniel\Vasco_Public_Domain_10_1.sap
+Various\Numan_Daniel\Vasco_Public_Domain_10_2.sap
+Various\Numan_Daniel\Vasco_Public_Domain_10_3.sap
+Various\Padula_Jaroslaw\Toy_Intro.sap
+Various\Pesout_Marek\Blade.sap
+Various\Pesout_Marek\Innov.sap
+Various\Pesout_Marek\Minos.sap
+Various\Pesout_Marek\Science.sap
+Various\Pesout_Marek\Shadow.sap
+Various\Pesout_Marek\Ticket.sap
+Various\Pesout_Marek\ZC2.sap
+Various\Pucimski_Rafal\Memory.sap
+Various\Radzikowski_Ireneusz\Accused.sap
+Various\Radzikowski_Ireneusz\Cyper_Space.sap
+Various\Radzikowski_Ireneusz\Electro_Based.sap
+Various\Radzikowski_Ireneusz\Escape_from_the_Orbit.sap
+Various\Radzikowski_Ireneusz\Galactics_Dream.sap
+Various\Radzikowski_Ireneusz\Power_Run.sap
+Various\Radzikowski_Ireneusz\Savage.sap
+Various\Radzikowski_Ireneusz\Savage_Intro.sap
+Various\Radzikowski_Ireneusz\Terra_Titanic_96.sap
+Various\Skowiniak_Krystian\Daze_4.sap
+Various\Skowiniak_Krystian\THC03.sap
+Various\Skowiniak_Krystian\THC10.sap
+Various\Skowiniak_Krystian\THC11.sap
+Various\Sychowicz_Lukasz\Andal.sap
+Various\Sychowicz_Lukasz\Awari.sap
+Various\Sychowicz_Lukasz\Bodek.sap
+Various\Sychowicz_Lukasz\Buum.sap
+Various\Sychowicz_Lukasz\Ciszi.sap
+Various\Sychowicz_Lukasz\Colka.sap
+Various\Sychowicz_Lukasz\Czary.sap
+Various\Sychowicz_Lukasz\Draka.sap
+Various\Sychowicz_Lukasz\Dred.sap
+Various\Sychowicz_Lukasz\Dynas.sap
+Various\Sychowicz_Lukasz\Falex.sap
+Various\Sychowicz_Lukasz\Genia.sap
+Various\Sychowicz_Lukasz\Get.sap
+Various\Sychowicz_Lukasz\Graba.sap
+Various\Sychowicz_Lukasz\Ground.sap
+Various\Sychowicz_Lukasz\Klita.sap
+Various\Sychowicz_Lukasz\Live.sap
+Various\Sychowicz_Lukasz\Loscz.sap
+Various\Sychowicz_Lukasz\Maxi_2.sap
+Various\Sychowicz_Lukasz\Mc_ss.sap
+Various\Sychowicz_Lukasz\Mener.sap
+Various\Sychowicz_Lukasz\Mepss.sap
+Various\Sychowicz_Lukasz\Milos.sap
+Various\Sychowicz_Lukasz\Minii.sap
+Various\Sychowicz_Lukasz\Orygo.sap
+Various\Sychowicz_Lukasz\Pepa.sap
+Various\Sychowicz_Lukasz\Piona.sap
+Various\Sychowicz_Lukasz\Pios_9.sap
+Various\Sychowicz_Lukasz\Pozyn.sap
+Various\Sychowicz_Lukasz\Princ.sap
+Various\Sychowicz_Lukasz\Proko.sap
+Various\Sychowicz_Lukasz\Smuty.sap
+Various\Sychowicz_Lukasz\Stdem.sap
+Various\Sychowicz_Lukasz\Traig.sap
+Various\Sychowicz_Lukasz\Uran.sap
+Various\Sychowicz_Lukasz\Zanos.sap
+Various\Szpilowski_Michal\Liga_Polska.sap
+Various\Szpilowski_Michal\Stallion.sap
+
+Credits fixes (includes filename or location changes)
+-----------------------------------------------------
+Unsorted\Atari_XC-12_tape_recorder.sap > Various\Numan_Daniel\Pentagram_4_Hidden_Part.sap
+Demos\Endless_Dream_2.sap > Various\Bryla_Krzystof\
+Demos\Mortal_Kombat_Demo.sap > Various\Numan_Daniel\Pentagram_4_Requiem.sap
+Demos\Ray_of_Hope_1.sap > Ray_of_Hope_Intro.sap : AUTHOR "<?> (Jaro)" NAME "Ray of Hope - Intro"
+Demos\Ray_of_Hope_2.sap > Ray_of_Hope_Shade_Bobs.sap : AUTHOR "Krzysztof Swiecicki (Swiety)" NAME "Ray of Hope - Shade Bobs"
+Demos\Ray_of_Hope_3.sap > Ray_of_Hope_Plasma.sap : AUTHOR "Lukasz Pazera (Pazur)" NAME "Ray of Hope - Plasma"
+Demos\Ray_of_Hope_4.sap > Ray_of_Hope_Bars.sap : AUTHOR "Krzysztof Swiecicki (Swiety)" NAME "Ray of Hope - Bars"
+Demos\Ray_of_Hope_Display_List.sap > Various\Bryla_Krzystof\
+Demos\Ray_of_Hope_End.sap > Various\Bryla_Krzystof\
+Games\Classic\Master_of_the_Lamps.sap : DATE "1985"
+Games\Classic\Quasimodo.sap : DATE "1984"
+Games\Classic\Shamus.sap > Shamus_Case_II.sap
+Games\Classic\Space_Ball.sap : NAME "Spaceball"
+Games\Classic\Submission.sap : DATE "1985"
+Games\Various\Neron_Ingame.sap > Various\Makara_Grzegorz\ : NAME "Neron - Ingame"
+Unsorted\Avm.sap > Various\Skowiniak_Krystian\
+Unsorted\Old_Socks.sap > Various\Skowiniak_Krystian\
+Unsorted\Piczka.sap > Various\Kucharski_Konrad\
+Unsorted\Silent_But_Violent_Main.sap > Various\Lepkowski_Michal\Angry_Virus.sap
+Various\Flash\ > Various\Witkiewicz_Dariusz
+Various\Golewski_Filip\Echo.sap > Echo_Sampled.sap
+Various\Hard_Software\Cool_Emotion_Heal_the_World.sap > Cool_Emotion_Heal_the_Worl.sap
+Various\Hard_Software\Veronika_2.sap : AUTHOR "Antti Hannula / <?> (Hard Software)"
+Various\Hard_Software\Veronika_5.sap : AUTHOR "Chris Huelsbeck / <?> (Hard Software)" NAME "Veronika - 5"
+Various\Husak_Jakub\Wsrod_Gwiazd.Nadzieji.sap > Wsrod_Gwiazd.Nadziei.sap
+Various\Kucharski_Konrad\Piczka.sap : AUTHOR "Konrad Kucharski (Kuchara)"
+Various\Lepkowski_Michal\Silent_But_Violent_Intro.sap > Blackout.sap
+Various\Lepkowski_Michal\Silent_But_Violent_Risk.sap > Risk.sap
+Various\Loos_Uwe\Abbuc_25.sap : NAME "Abbuc 25"
+Various\Makowski_Robert\Alfaboot_Ingame.sap : AUTHOR "Robert Makowski (Gutek)"
+Various\Marcys\ > Various\Roszkowski_Marek
+Various\Martin_Aleksander\Bobsland.sap : AUTHOR "Aleksander Martin (Alex)"
+Various\Pet\ > Various\Kielczyk_Piotr
+Various\Swierszcz_Piotr\Overmind_TLB_546_Dots.sap : AUTHOR "Piotr Swierszcz (Samurai)"
+
+Better rips
+-----------
+Classics\Gilmore_Adam\Arcade_Fruit_Machine_Simul.sap (wrong init address in previous update)
+Various\Czartynski_Marcin\Outer_1.sap (better rip of Outer_Part_1.sap, includes subtunes)
+Various\Liebich_Tomasz\Smus.sap (includes subtunes)
+
+Removed files
+-------------
+Unsorted\Chip.sap (same as Various\Duesterhoeft_Stephan\Chiptune.sap)
+Various\Czartynski_Marcin\Barymag_1_3.sap (same as Outer.sap, subtune 4)
+Various\Czartynski_Marcin\Barymag_1_6.sap (same as Outer.sap, subtune 3)
+Various\Krawczyk_Adam\Euro_Demo_1.sap (same as Magic_Dimension_1.sap)
+Various\Numan_Daniel\Ascii_Art.sap (same as Pentagram_3_Info.sap, subtune 1)
Index: trunk/asma/Docs/Wanted.txt
===================================================================
--- trunk/asma/Docs/Wanted.txt	(revision 32)
+++ trunk/asma/Docs/Wanted.txt	(revision 34)
@@ -1,12 +1,9 @@
-At the time we are searching for these tunes:
-
-Alex
-Sheol
+Currently we are searching for these tunes:
 
 Jason C. Brooke
-any tunes..
+any tunes
 
 Ben Daglish
-any tunes..
+any tunes
 
 Rob Hubbard <?>
@@ -14,15 +11,25 @@
 
 Fred Brooker
-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 
-into binaries on PC, let me know)
+Balleantro, Vaxeen, Digisynth, Rabbacan, Brutal Recall Demo and game, any other 
+tunes
+
+Radek Sterba
+Dangerous Street
 
 Hard Software
-missing digi tunes from Cool Emotion
+Blip, missing digi tunes from Cool Emotion
 
 Robert Zaborowski
-Crix, Ra, Classic, any other tunes..
+Crix, Ra, Classic, any other tunes
 
 Classic games
-any tunes..
+Air Strike 2, Alf, Archon 2 Adept, Astrodroid, Ataroid, Aztec Challenge 1983,
+Ball Blaster, Bristles, Creep, Donkey Kong Junior, Donkey, Kong, Frogger 1,
+Frogger 2, Ghostbusters (incl. speech), Gremlins, Gyruss, Hardball, Henri,
+Henry's House, Hover Bovver, Jump!, Jungle Hunt, Keystone Kapers, Mr. Do's 
+Castles, Pengon, Pharaoh's Curse, Pole Position, Pooyan, Preppie!, Preppie! 2,
+Q*bert, Rampage, Screaming Wings, Seawolf 2, Shadow World, Spy's Demise, 
+Starquake, Tarzan, Unicum, any other tunes
+
+New wave games
+Krucjata, Megablast (digitunes)
