Changeset 1672 for trunk/asma/Docs

Timestamp:

Dec 30, 2020, 11:31:47 AM (4 years ago)

Author:

marok

Message:

• the STIL.txt update (required).

File:

• trunk/asma/Docs/STIL.txt (modified) (19 diffs)

trunk/asma/Docs/STIL.txt

@@ -2 +2 @@
 #
 #  STIL v3.9 - SAP Tune Information List
-#  Total number of entries: 1742
+#  Total number of entries: 1741
 #
 ##############################################################################
@@ -199 +199 @@
   TITLE: Moonlight Shadow [from Crises]
  ARTIST: Mike Oldfield & Simon Philips
+
+/Composers/Bienias_Adam/Muff_3_Mix.sap
+COMMENT: Same as /Composers/Grad_Jacek/Muff_3.sap
 
 /Composers/Bienias_Adam/Rzog_Joins_XE_Team_2.sap
@@ -1413 +1416 @@
  ARTIST: Shinobu Ogawa
 
+<<<<<<< .mine
+/Composers/Fragmare/Journey_to_Sillius_Stage_2.sap
+=======
 /Composers/Fragmare/Haunted_Castle_Cross_Your.sap
   TITLE: Cross Your Heart [from the Arcade game Castlevania: Haunted Castle (Devil's Castle Dracula)]
@@ -1418 +1424 @@
 
 /Composers/Fragmare/Journey_to_Sillius_Undergr.sap
+>>>>>>> .r1671
   TITLE: Underground Concourse Stage [from the NES game Journey to Silius]
  ARTIST: Naoki Kodaka
 
-/Composers/Fragmare/Mega_Man_2_Dr_Wily_1.sap
+/Composers/Fragmare/Mega_Man_2_Wily_Stage_1_2.sap
   TITLE: Dr. Wily Stages 1-2 (Castle Song) [from the NES game Mega Man 2]
  ARTIST: Takashi Tateishi
@@ -1639 +1646 @@
 COMMENT: Music from the game 'Muff' released by ASF in 1992.
 
-/Composers/Grad_Jacek/Muff_3_Mix.sap
-COMMENT: Same as /Composers/Grad_Jacek/Muff_3.sap
-
 ### /Composers/Grayscale #####################################################
 
@@ -2146 +2150 @@
 ### /Composers/Holik_Antonin #################################################
 
-/Composers/Holik_Antonin/Bad_Apple_stereo_version.sap
+/Composers/Holik_Antonin/Bad_Apple_stereo.sap
   TITLE: Bad Apple [from Lovelight]
  ARTIST: Alstroemeria Records
@@ -2406 +2410 @@
   TITLE: Red Sector A [from Grace Under Pressure]
  ARTIST: Rush
+
+### /Composers/Jurgawka_Artur ################################################
+
+/Composers/Jurgawka_Artur/Pizza_Margerita_Suxx.sap
+COMMENT: Lato Ludzików 2000 music compo entry.
 
 ### /Composers/Kalinowski_Bartosz ############################################
@@ -3748 +3757 @@
 COMMENT: Rush Hours 1997 music compo entry.
 
-### /Composers/Panopticum ####################################################
-
-/Composers/Panopticum/Cramer.sap
+### /Composers/Wyszynski_Jaroslaw ############################################
+
+/Composers/Wyszynski_Jaroslaw/Cramer.sap
   TITLE: Speak Softly Love (Love Theme from The Godfather)
  ARTIST: Nino Rota
 
-/Composers/Panopticum/Gladiator.sap
+/Composers/Wyszynski_Jaroslaw/Gladiator.sap
   TITLE: Entry of the Gladiators
  ARTIST: Julius Fucik
 
-/Composers/Panopticum/Indy.sap
+/Composers/Wyszynski_Jaroslaw/Indy.sap
   TITLE: The Raiders March [from all the Indiana Jones movies]
  ARTIST: John Williams
 
-/Composers/Panopticum/Unforgiven.sap
+/Composers/Wyszynski_Jaroslaw/Unforgiven.sap
   TITLE: The Unforgiven [from Black Album]
  ARTIST: Metallica
@@ -3868 +3877 @@
          but with second POKEY support (stereo version).
 
+<<<<<<< .mine
+=======
 /Composers/Pesout_Marek/Bol_Effects.sap
 COMMENT: Soundtrack from the part 7 ("Bol Effects) of "Top Secret Megademo"
          which took first place at Forever 2019 Atari demo compo.
 
+>>>>>>> .r1671
 /Composers/Pesout_Marek/Breathe.sap
   TITLE: Breathe [from The Fat of the Land]
@@ -4026 +4038 @@
   TITLE: Viva Las Vegas
  ARTIST: Elvis Presley
+
+### /Composers/Pigu ##########################################################
+
+/Composers/Pigu/Gehehjsj.sap
+COMMENT: 1st place at Silly Venture 2019 music compo.
 
 ### /Composers/Piscol_Juergen ################################################
@@ -4545 +4562 @@
  ARTIST: Gershon Kingsley
 
+### /Composers/Sabath_Peter ##################################################
+
+/Composers/Sabath_Peter/High_Society_Girl.sap
+  TITLE: High Society Girl
+ ARTIST: Laid Back
+
+/Composers/Sabath_Peter/House_of_Rising_Sun.sap
+  TITLE: House of the Rising Sun
+ ARTIST: Traditional
+
+/Composers/Sabath_Peter/Lunatic.sap
+  TITLE: Lunatic [from Gazebo]
+ ARTIST: Gazebo
+COMMENT: Present also in "Fortress Underground" game, no author credited.
+
 ### /Composers/Sasik_Marcel ##################################################
 
@@ -4680 +4712 @@
   TITLE: Stand by Me [from Don't Play That Song!]
  ARTIST: Ben E.King (written by Ben E. King, Jerry Leiber, Mike Stoller)
+
+### /Composers/Spilka_David ##################################################
+
+/Composers/Spilka_David/SCMC_Demo.sap
+(#10)
+  TITLE: Popcorn [from Music To Moog By]
+ ARTIST: Gershon Kingsley
+(#12)
+  TITLE: Marchewkowe pole [from O dwóch takich, co ukradli księżyc]
+ ARTIST: Jan Borysewicz (music), Andrzej Mogielnicki (lyrics), performed by Lady Pank.
 
 ### /Composers/Sporka_Adam ###################################################
@@ -6485 +6527 @@
  ARTIST: Tor Bernhard Gausen (Walkman)
 
-/Composers/Misc/Bitratte.sap
+/Misc/Bitratte.sap
   TITLE: Deck the Halls with Boughs of Holly
  ARTIST: Welsh Traditional
@@ -6547 +6589 @@
   TITLE: The Prelude [from Final Fantasy IV Piano Collections]
  ARTIST: Nobuo Uematsu
-
-/Misc/Gehehjsj.sap
-COMMENT: 1st place at Silly Venture 2019 music compo.
 
 /Misc/Grass_Slideshow_Intro.sap
@@ -6590 +6629 @@
 COMMENT: 3rd place at Lost Party 2019 executable music compo.
 
-/Misc/Pizza_Margerita_Suxx.sap
-COMMENT: Lato Ludzików 2000 music compo entry.
-
 /Misc/Preludium_no_20.sap
   TITLE: Prelude No.20 in A minor (BWV 889)
@@ -6617 +6653 @@
  ARTIST: J.Łągwa (music), K.Lenarczyk & M.Wiśniewski (lyrics), performed by
          Ich Troje.
-
-/Misc/SCMC_Demo.sap
-(#10)
-  TITLE: Popcorn [from Music To Moog By]
- ARTIST: Gershon Kingsley
-(#12)
-  TITLE: Marchewkowe pole [from O dwóch takich, co ukradli księżyc]
- ARTIST: Jan Borysewicz (music), Andrzej Mogielnicki (lyrics), performed by Lady Pank.
 
 /Misc/Self_Test.sap
@@ -6750 +6778 @@
  ARTIST: Jeroen Tel
 
-/Unknown/High_Society_Girl.sap
-  TITLE: High Society Girl
- ARTIST: Laid Back
-
-/Unknown/House_of_Rising_Sun.sap
-  TITLE: House of the Rising Sun
- ARTIST: Traditional
-
 /Unknown/Ice_in_the_Sunshine.sap
   TITLE: Ice In The Sunshine
@@ -6765 +6785 @@
   TITLE: Let It Be [from Let It Be]
  ARTIST: The Beatles
-
-/Unknown/Lunatic.sap
-  TITLE: Lunatic [from Gazebo]
- ARTIST: Gazebo
-COMMENT: Present also in "Fortress Underground" game, no author credited.
 
 /Unknown/Magnetic_Fields.sap
@@ -6932 +6947 @@
  ARTIST: Jay Livingston & Ray Evans
 
-/Unknown/AMP/We_Wish_You.sap
+/Unknown/AMP/We_Wish_You_a_Merry_Christ.sap
   TITLE: We Wish You a Merry Christmas
  ARTIST: Traditional