Another banks reorganizing

- Use the Jammie O'Connel's fmsymth interlnal bank instead of externally placed gm.ibk and drum.ibk
- Put hmi banks in a friendly way
- Crafted the WOPL of "Master of Magic" using original AIL OPL files rather than deal with dirty AdLib-Gold banks. Now the first bank has both standard and orchestral percussion in a proper way
- Use the Jammie O'Connel's drums bank with the Cyberpuck's bank

1 files changed, 102 insertions, 102 deletions

diff --git a/banks.ini b/banks.ini
index 5af3a83..2f1be5f 100644
--- a/banks.ini
+++ b/banks.ini
@@ -17,68 +17,68 @@ banks = 78
 ;AIL (Star Control 3, Albion, Empire 2, Sensible Soccer, Settlers 2, many others)
 name     = "AIL (Star Control 3, Albion, Empire 2, etc.)"
 format   = AIL
-file     = "fm_banks/opl_files/sc3.opl"
+file     = "fm_banks/ail/star_control_3.opl"
 prefix   = "G"
 
 [bank-1]
 name     = "Bisqwit (selection of 4op and 2op)"
 format   = Bisqwit
-file     = "fm_banks/op3_files/bisqwit.adlraw"
+file     = "fm_banks/misc_files/bisqwit.adlraw"
 prefix   = "Bisq"
 
 [bank-2]
 name     = "HMI (Descent, Asterix)"
 format   = HMI
-file     = "fm_banks/bnk_files/melodic.bnk"
-file-p   = "fm_banks/bnk_files/drum.bnk"
+file     = "fm_banks/hmi/Descent/melodic.bnk"
+file-p   = "fm_banks/hmi/Descent/drum.bnk"
 prefix   = "HMIGM"
 prefix-p = "HMIGP"
 
 [bank-3]
 name     = "HMI (Descent:: Int)"
 format   = HMI
-file     = "fm_banks/bnk_files/intmelo.bnk"
-file-p   = "fm_banks/bnk_files/intdrum.bnk"
+file     = "fm_banks/hmi/Descent/intmelo.bnk"
+file-p   = "fm_banks/hmi/Descent/intdrum.bnk"
 prefix   = "intM"
 prefix-p = "intP"
 
 [bank-4]
 name     = "HMI (Descent:: Ham)"
 format   = HMI
-file     = "fm_banks/bnk_files/hammelo.bnk"
-file-p   = "fm_banks/bnk_files/hamdrum.bnk"
+file     = "fm_banks/hmi/Descent/hammelo.bnk"
+file-p   = "fm_banks/hmi/Descent/hamdrum.bnk"
 prefix   = "hamM"
 prefix-p = "hamP"
 
 [bank-5]
 name     = "HMI (Descent:: Rick)"
 format   = HMI
-file     = "fm_banks/bnk_files/rickmelo.bnk"
-file-p   = "fm_banks/bnk_files/rickdrum.bnk"
+file     = "fm_banks/hmi/Descent/rickmelo.bnk"
+file-p   = "fm_banks/hmi/Descent/rickdrum.bnk"
 prefix   = "rickM"
 prefix-p = "rickP"
 
 [bank-6]
 name     = "HMI (Descent 2)"
 format   = HMI
-file     = "fm_banks/bnk_files/d2melo.bnk"
-file-p   = "fm_banks/bnk_files/d2drum.bnk"
+file     = "fm_banks/hmi/Descent_2/melodic.bnk"
+file-p   = "fm_banks/hmi/Descent_2/drum.bnk"
 prefix   = "b6M"
 prefix-p = "b6P"
 
 [bank-7]
 name     = "HMI (Normality)"
 format   = HMI
-file     = "fm_banks/bnk_files/normmelo.bnk"
-file-p   = "fm_banks/bnk_files/normdrum.bnk"
+file     = "fm_banks/hmi/Normality/melodic.bnk"
+file-p   = "fm_banks/hmi/Normality/drum.bnk"
 prefix   = "b7M"
 prefix-p = "b7P"
 
 [bank-8]
 name     = "HMI (Shattered Steel)"
 format   = HMI
-file     = "fm_banks/bnk_files/ssmelo.bnk"
-file-p   = "fm_banks/bnk_files/ssdrum.bnk"
+file     = "fm_banks/hmi/Shattered_Steel/melodic.bnk"
+file-p   = "fm_banks/hmi/Shattered_Steel/drum.bnk"
 prefix   = "b8M"
 prefix-p = "b8P"
 
@@ -93,40 +93,40 @@ prefix-p = "b8P"
 [bank-9]
 name     = "HMI (Theme Park)"
 format   = HMI
-file     = "fm_banks/bnk_files/file131.bnk"
-file-p   = "fm_banks/bnk_files/file132.bnk"
+file     = "fm_banks/hmi/Theme_Park/melodic.bnk"
+file-p   = "fm_banks/hmi/Theme_Park/drum.bnk"
 prefix   = "b9M"
 prefix-p = "b9P"
 
 [bank-10]
 name     = "HMI (3d Table Sports, Battle Arena Toshinden)"
 format   = HMI
-file     = "fm_banks/bnk_files/file134.bnk"
-file-p   = "fm_banks/bnk_files/file133.bnk"
+file     = "fm_banks/hmi/3d_Table_Sports/melodic.bnk"
+file-p   = "fm_banks/hmi/3d_Table_Sports/drum.bnk"
 prefix   = "b9MP"
 prefix-p = "b10P"
 
 [bank-11]
 name     = "HMI (Aces of the Deep)"
 format   = HMI
-file     = "fm_banks/bnk_files/file143.bnk"
-file-p   = "fm_banks/bnk_files/file142.bnk"
+file     = "fm_banks/hmi/Aces_of_the_Deep/melodic.bnk"
+file-p   = "fm_banks/hmi/Aces_of_the_Deep/drum.bnk"
 prefix   = "b10M"
 prefix-p = "b11P"
 
 [bank-12]
 name     = "HMI (Earthsiege)"
 format   = HMI
-file     = "fm_banks/bnk_files/file145.bnk"
-file-p   = "fm_banks/bnk_files/file144.bnk"
+file     = "fm_banks/hmi/Earthsiege/melodic.bnk"
+file-p   = "fm_banks/hmi/Earthsiege/drum.bnk"
 prefix   = "b12M"
 prefix-p = "b12P"
 
 [bank-13]
 name     = "HMI (Anvil of Dawn)"
 format   = HMI
-file     = "fm_banks/bnk_files/file168.bnk"
-file-p   = "fm_banks/bnk_files/file167.bnk"
+file     = "fm_banks/hmi/Anvil_of_Dawn/melodic.bnk"
+file-p   = "fm_banks/hmi/Anvil_of_Dawn/drum.bnk"
 prefix   = "b12P"
 prefix-p = "b13P"
 
@@ -152,238 +152,238 @@ prefix   = "mus"
 ;AIL (Discworld, Grandest Fleet, Pocahontas, Slob Zone 3d, Ultima 4, Zorro)
 name     = "AIL (Discworld, Grandest Fleet, etc.)"
 format   = AIL
-file     = "fm_banks/opl_files/file17.opl"
+file     = "fm_banks/ail/Discworld.opl"
 prefix   = "f17G"
 
 [bank-18]
 name     = "AIL (Warcraft 2)"
 format   = AIL
-file     = "fm_banks/opl_files/warcraft.ad"
+file     = "fm_banks/ail/warcraft2.ad"
 prefix   = "sG"
 
 [bank-19]
 name     = "AIL (Syndicate)"
 format   = AIL
-file     = "fm_banks/opl_files/file19.opl"
+file     = "fm_banks/ail/Syndicate.opl"
 prefix   = "f19G"
 
 [bank-20]
 ;Guilty, Orion Conspiracy, Terra Nova Strike Force Centauri
 name     = "AIL (Guilty, Orion Conspiracy, TNSFC ::4op)"
 format   = AIL
-file     = "fm_banks/opl_files/file20.opl"
+file     = "fm_banks/ail/Guilty.opl"
 prefix   = "f20G"
 
 [bank-21]
-name     = "AIL (Magic Carpet 2)"
+name     = "AIL (Magic Carpet 2) :NON-GM:"
 format   = AIL
-file     = "fm_banks/opl_files/file21.opl"
+file     = "fm_banks/ail/non-gm/MagicCarpet2.opl"
 prefix   = "f21G"
 
 [bank-22]
 name     = "AIL (Nemesis)"
 format   = AIL
-file     = "fm_banks/opl_files/nemesis.opl"
+file     = "fm_banks/ail/nemesis.opl"
 prefix   = "nem"
 
 [bank-23]
-name     = "AIL (Jagged Alliance)"
+name     = "AIL (Jagged Alliance) :NON-GM:"
 format   = AIL
-file     = "fm_banks/opl_files/file23.opl"
+file     = "fm_banks/ail/non-gm/JaggedAlliance.opl"
 prefix   = "f23G"
 
 [bank-24]
 ; :: 4op, MISSING INSTRUMENTS
-name     = "AIL (When Two Worlds War :MISS-INS:)"
+name     = "AIL (When Two Worlds War) :MISS-INS:"
 format   = AIL
-file     = "fm_banks/opl_files/file24.opl"
+file     = "fm_banks/ail/miss-inst/WhenTwoWorldsWar.opl"
 prefix   = "f24G"
 
 [bank-25]
 ; :: MISSING INSTRUMENTS
-name     = "AIL (Bards Tale Construction :MISS-INS:)"
+name     = "AIL (Bards Tale Construction) :MISS-INS:"
 format   = AIL
-file     = "fm_banks/opl_files/file25.opl"
+file     = "fm_banks/ail/miss-inst/BardsTaleConstruction.opl"
 prefix   = "f25G"
 
 [bank-26]
-name     = "AIL (Return to Zork)"
+name     = "AIL (Return to Zork) :NON-GM:"
 format   = AIL
-file     = "fm_banks/opl_files/file26.opl"
+file     = "fm_banks/ail/non-gm/ReturnToZork.opl"
 prefix   = "f26G"
 
 [bank-27]
 name     = "AIL (Theme Hospital)"
 format   = AIL
-file     = "fm_banks/opl_files/file27.opl"
+file     = "fm_banks/ail/ThemeHospital.opl"
 prefix   = "f27G"
 
 [bank-28]
 name     = "AIL (National Hockey League PA)"
 format   = AIL
-file     = "fm_banks/opl_files/nhlpa.opl"
+file     = "fm_banks/ail/NationalHockeyLeaguePA.opl"
 prefix   = "nhl"
 
 [bank-29]
-name     = "AIL (Inherit The Earth)"
+name     = "AIL (Inherit The Earth) :NON-GM:"
 format   = AIL
-file     = "fm_banks/opl_files/file29.opl"
+file     = "fm_banks/ail/non-gm/InteritTheEarth.opl"
 prefix   = "f29G"
 
 [bank-30]
-name     = "AIL (Inherit The Earth, file two)"
+name     = "AIL (Inherit The Earth, file two) :NON-GM:"
 format   = AIL
-file     = "fm_banks/opl_files/file30.opl"
+file     = "fm_banks/ail/non-gm/InteritTheEarth2.opl"
 prefix   = "f30G"
 
 [bank-31]
-name     = "AIL (Little Big Adventure :: 4op)"
+name     = "AIL (Little Big Adventure) :4op:"
 format   = AIL
-file     = "fm_banks/opl_files/file31.opl"
+file     = "fm_banks/ail/LittleBigAdventure.opl"
 prefix   = "f31G"
 
 [bank-32]
-name     = "AIL (Wreckin Crew)"
+name     = "AIL (Wreckin Crew) :NON-GM:"
 format   = AIL
-file     = "fm_banks/opl_files/file32.opl"
+file     = "fm_banks/ail/non-gm/WreckinCrew.opl"
 prefix   = "f32G"
 
 [bank-33]
 name     = "AIL (Death Gate)"
 format   = AIL
-file     = "fm_banks/opl_files/file13.opl"
+file     = "fm_banks/ail/DeathGate.opl"
 prefix   = "f13G"
 
 [bank-34]
 name     = "AIL (FIFA International Soccer)"
 format   = AIL
-file     = "fm_banks/opl_files/file34.opl"
+file     = "fm_banks/ail/FIFAInternationalSoccer.opl"
 prefix   = "f34G"
 
 [bank-35]
 name     = "AIL (Starship Invasion)"
 format   = AIL
-file     = "fm_banks/opl_files/file35.opl"
+file     = "fm_banks/ail/StarshipInvasion.opl"
 prefix   = "f35G"
 
 [bank-36]
 name     = "AIL (Super Street Fighter 2 :4op:)"
 format   = AIL
-file     = "fm_banks/opl_files/file36.opl"
+file     = "fm_banks/ail/SuperStreetFighter2.opl"
 prefix   = "f36G"
 
 [bank-37]
-name     = "AIL (Lords of the Realm :MISS-INS:)"
+name     = "AIL (Lords of the Realm) :MISS-INS:"
 format   = AIL
-file     = "fm_banks/opl_files/file37.opl"
+file     = "fm_banks/ail/miss-inst/LordsOfTheRealm.opl"
 prefix   = "f37G"
 
 [bank-38]
-name     = "AIL (SimFarm, SimHealth :: 4op)"
+name     = "AIL (SimFarm, SimHealth) :4op:"
 format   = AIL
-file     = "fm_banks/opl_files/simfarm.opl"
+file     = "fm_banks/ail/simfarm.opl"
 prefix   = "qG"
 
 [bank-39]
 name     = "AIL (SimFarm, Settlers, Serf City)"
 format   = AIL
-file     = "fm_banks/opl_files/simfarm.ad"
+file     = "fm_banks/ail/simfarm.ad"
 prefix   = "mG"
 
 [bank-40]
-name     = "AIL (Caesar 2, :p4op::MISS-INS:)"
+name     = "AIL (Caesar 2) :p4op: :MISS-INS:"
 format   = AIL
-file     = "fm_banks/opl_files/file12.opl"
+file     = "fm_banks/ail/miss-inst/Caesar2.opl"
 prefix   = "f12G"
 
 [bank-41]
 name     = "AIL (Syndicate Wars)"
 format   = AIL
-file     = "fm_banks/opl_files/file41.opl"
+file     = "fm_banks/ail/SyndicateWars.opl"
 prefix   = "f41G"
 
 [bank-42]
 name     = "AIL (Bubble Bobble Feat. Rainbow Islands, Z)"
 format   = AIL
-file     = "fm_banks/opl_files/file42.opl"
+file     = "fm_banks/ail/BubbleBobble.opl"
 prefix   = "f42G"
 
 [bank-43]
-name     = "AIL (Warcraft)"
+name     = "AIL (Warcraft) :NON-GM:"
 format   = AIL
-file     = "fm_banks/opl_files/file47.opl"
+file     = "fm_banks/ail/non-gm/warcraft1.opl"
 prefix   = "f47G"
 
 [bank-44]
-name     = "AIL (Terra Nova Strike Force Centuri :p4op:)"
+name     = "AIL (Terra Nova Strike Force Centuri) :p4op:"
 format   = AIL
-file     = "fm_banks/opl_files/file48.opl"
+file     = "fm_banks/ail/TerraNovaStrikeForceCenturi.opl"
 prefix   = "f48G"
 
 [bank-45]
-name     = "AIL (System Shock :p4op:)"
+name     = "AIL (System Shock) :p4op:"
 format   = AIL
-file     = "fm_banks/opl_files/file49.opl"
+file     = "fm_banks/ail/SystemShock.opl"
 prefix   = "f49G"
 
 [bank-46]
 name     = "AIL (Advanced Civilization)"
 format   = AIL
-file     = "fm_banks/opl_files/file50.opl"
+file     = "fm_banks/ail/AdvancedCivilization.opl"
 prefix   = "f50G"
 
 ; Originally had no drums, but now has custom drums,
 ; copied from Earthsiege bank
 [bank-47]
-name     = "AIL (Battle Chess 4000 :p4op:)"
+name     = "AIL (Battle Chess 4000) :p4op: :NON-GM:"
 format   = AIL
-file     = "fm_banks/opl_files/file53-2.opl"
-;file     = "fm_banks/opl_files/file50.opl"
+file     = "fm_banks/ail/non-gm/BattleChess4000-2.opl"
+;file     = "fm_banks/ail/non-gm/BattleChess4000.opl"
 prefix   = "f53G"
 
 [bank-48]
 name     = "AIL (Ultimate Soccer Manager :p4op:)"
 format   = AIL
-file     = "fm_banks/opl_files/file54.opl"
+file     = "fm_banks/ail/UltimateSoccerManager.opl"
 prefix   = "f54G"
 
 [bank-49]
 ;AIL (Air Bucks, Blue And The Gray, America Invades, Terminator 2029)
-name     = "AIL (Air Bucks, Blue And The Gray, etc)"
+name     = "AIL (Air Bucks, Blue And The Gray, etc) :NON-GM:"
 format   = AIL
-file     = "fm_banks/opl_files/sample.ad"
+file     = "fm_banks/ail/non-gm/AirBucks.ad"
 prefix   = "MG"
 
 [bank-50]
-name     = "AIL (Ultima Underworld 2)"
+name     = "AIL (Ultima Underworld 2) :NON-GM:"
 format   = AIL
-file     = "fm_banks/opl_files/sample.opl"
+file     = "fm_banks/ail/non-gm/UltimaUnderworld2.opl"
 prefix   = "oG"
 
 [bank-51]
-name     = "AIL (Kasparov's Gambit)"
+name     = "AIL (Kasparov's Gambit) :NON-GM:"
 format   = AIL
-file     = "fm_banks/opl_files/file15.opl"
+file     = "fm_banks/ail/non-gm/KasparovGambit.opl"
 prefix   = "f15G"
 
 [bank-52]
-name     = "AIL (High Seas Trader :MISS-INS:)"
+name     = "AIL (High Seas Trader) :MISS-INS:"
 format   = AIL
-file     = "fm_banks/opl_files/file16.opl"
+file     = "fm_banks/ail/miss-inst/HighSeasTrader.opl"
 prefix   = "f16G"
 
 [bank-53]
-name     = "AIL (Master of Magic, :4op: std percussion)"
-format   = AdLibGold
-file     = "fm_banks/bnk_files/file159.bnk"
+name     = "AIL (Master of Magic) :4op:"
+format   = WOPL
+file     = "fm_banks/ail/master_of_magic.wopl"
 prefix   = "b50"
 filter-m = "gm"
 filter-p = "gps"
 
 [bank-54]
-name     = "AIL (Master of Magic, :4op: orchestral percussion)"
-format   = AdLibGold
-file     = "fm_banks/bnk_files/file159.bnk"
+name     = "AIL (Master of Magic) :4op: orchestral drums"
+format   = AIL
+file     = "fm_banks/ail/master_of_magic_orchestral.opl"
 prefix   = "b51"
 filter-m = "gm"
 filter-p = "gpo"
@@ -401,7 +401,7 @@ prefix-p = "b55P"
 name     = "SB (3d Cyberpuck :: melodic only)"
 format   = IBK
 file     = "fm_banks/ibk_files/game.ibk"
-;file-p   = "fm_banks/ibk_files/soccer-percs.ibk"
+file-p   = "fm_banks/ibk_files/fmsymth_internal_drum.ibk" ; use O'Connel's drums
 prefix   = "b56M"
 prefix-p = "b56P"
 
@@ -421,15 +421,15 @@ prefix-p = "b57P"
 [bank-58]
 name     = "OP3 (The Fat Man 2op set; Win9x)"
 format   = Junglevision
-file     = "fm_banks/op3_files/fat2.op3"
+file     = "fm_banks/junglevision/fat2.op3"
 prefix   = "fat2"
 
 ; FatMan bank, 4-operators variant
 [bank-59]
 name     = "OP3 (The Fat Man 4op set)"
 format   = WOPL
-;file     = "fm_banks/op3_files/fat4.op3"
-file     = "fm_banks/op3_files/fat4-fixed.wopl"
+;file     = "fm_banks/junglevision/fat4.op3"
+file     = "fm_banks/junglevision/fat4-fixed.wopl"
 prefix   = "fat4"
 
 ; Bank used in JungleVision Sound Drive demos in combination with PCM
@@ -437,7 +437,7 @@ prefix   = "fat4"
 [bank-60]
 name     = "OP3 (JungleVision 2op set :: melodic only)"
 format   = Junglevision
-file     = "fm_banks/op3_files/jv_2op.op3"
+file     = "fm_banks/junglevision/jv_2op.op3"
 prefix   = "b60"
 
 ; Another bank used in JungleVision Sound Drive demos in combination with PCM
@@ -445,7 +445,7 @@ prefix   = "b60"
 [bank-61]
 name     = "OP3 (Wallace 2op set, Nitemare 3D :: melodic only)"
 format   = Junglevision
-file     = "fm_banks/op3_files/wallace.op3"
+file     = "fm_banks/junglevision/wallace.op3"
 prefix   = "b61"
 
 [bank-62]
@@ -474,7 +474,7 @@ format   = IBK
 file     = "fm_banks/ibk_files/gmopl_wohl_mod.ibk"
 file-p   = "fm_banks/ibk_files/gmopl_wohl_mod-drums.ibk"
 ;format   = TMB
-;file     = "fm_banks/op3_files/gmopl_wohl_mod.tmb"
+;file     = "fm_banks/junglevision/gmopl_wohl_mod.tmb"
 prefix   = "b65M"
 prefix-p = "b65P"
 
@@ -483,17 +483,17 @@ prefix-p = "b65P"
 [bank-66]
 name     = "SB (Jamie O'Connell's bank)"
 format   = IBK
-file     = "fm_banks/ibk_files/JOconnel.IBK"
-file-p   = "fm_banks/ibk_files/JOconnel-DRUM.IBK"
+file     = "fm_banks/ibk_files/fmsymth_internal_melodic.ibk"
+file-p   = "fm_banks/ibk_files/fmsymth_internal_drum.ibk"
 ;format   = TMB
-;file     = "fm_banks/op3_files/gmoconel.tmb"
+;file     = "fm_banks/junglevision/gmoconel.tmb"
 prefix   = "b66"
 
 ; Default timbre bank saved from Apogee Audio System library source code.
 ; May be listened from the setup utiltiy while testing music,
 ; or in the Duke Nukem 3D Beta.
 [bank-67]
-name     = "TMB (Default bank of Apogee Sound System)"
+name     = "TMB (Apogee Sound System Default bank) :broken drums:"
 format   = TMB
 file     = "fm_banks/tmb_files/default.tmb"
 prefix   = "3drm67"
@@ -507,7 +507,7 @@ prefix   = "3drm67"
 [bank-68]
 name     = "WOPL (4op bank by James Alan Nguyen and Wohlstand)"
 ;format   = AIL
-;file     = "fm_banks/op3_files/2x2.opl"
+;file     = "fm_banks/junglevision/2x2.opl"
 format   = WOPL
 file     = "fm_banks/wopl_files/GM-By-J.A.Nguyen-and-Wohlstand.wopl"
 prefix   = "2x2byJAN"
@@ -560,7 +560,7 @@ prefix   = "apogeeimf"
 [bank-75]
 name    = "The Lost Vikings"
 format  = AIL
-file    = "fm_banks/opl_files/lost-vikings.opl"
+file    = "fm_banks/ail/non-gm/lost-vikings.opl"
 prefix  = "lostvik"
 
 [bank-76]