diff --git a/CREDITS-MUSIC b/CREDITS-MUSIC index a5399117..aeb42821 100644 --- a/CREDITS-MUSIC +++ b/CREDITS-MUSIC @@ -97,9 +97,9 @@ Cluster 3 --FreeDM-- -Title: (same as Phase 2) -Intermission: (same as Phase 2) -Story: (same as Phase 2) +Title: "I Hate Fredrik Johansson" by Toby "Tobester" Collins Jr. +Intermission: "Burn the Bodies" by Tyler "Picklehammer" Pantella +Story: dave3d25.mid by jute DM01: "Zero Fort" by Ralph "Ralphis" Vickers DM02: "Untitled Jam" by Ralph "Ralphis" Vickers @@ -141,7 +141,7 @@ Story: (same as Phase 2) --Previously Featured in 0.12.1-- Phase 1 Title: "Fountain Dance" by Tyler "Picklehammer" Pantella -Phase 1 OPL Title: "I Hate Fredrik Johansson" by Toby "Tobester" Collins Jr. +Phase 1 OPL Title: "I Hate Fredrik Johansson" by Toby "Tobester" Collins Jr. (moved to FreeDM Title, not removed) Phase 1 Intermission: "Music for Freedoom 10" by Jeremy "Vandalorian" Emerson Victory: "Ominous Theme" by Jared "BlackJar72" Blackburn Bunny: "Look At The Bunnies" by RestlessRodent @@ -161,7 +161,7 @@ E2M8: "Pit" by Anthony "Ajanddino" Pierce E2M9: dave3d34.mid by jute Phase 2 + FreeDM Title: "Warpath" by Tyler "Picklehammer" Pantella -Phase 2 + FreeDM Intermission: "Burn the Bodies" by Tyler "Picklehammer" Pantella +Phase 2 Intermission: "Burn the Bodies" by Tyler "Picklehammer" Pantella MAP04: "Soviet Porno" by Jeremy "Vandalorian" Emerson (moved to MAP10, not removed) MAP06: "Dark Trail" by Tyler "Picklehammer" Pantella MAP07: "Riders of Hell" by Tyler "Picklehammer" Pantella (moved to DM05, not removed) diff --git a/buildcfg.txt b/buildcfg.txt index a7e8d648..1d48cf8d 100644 --- a/buildcfg.txt +++ b/buildcfg.txt @@ -492,11 +492,6 @@ D_BUNNY #else /* #ifndef PHASE2 */ -; doom 2 music -D_READ_M -D_DM2TTL -D_DM2INT - #ifndef FREEDM D_RUNNIN = D_MAP01 @@ -531,6 +526,9 @@ D_SHAWN3 = D_MAP29 D_OPENIN = D_MAP30 D_EVIL = D_MAP31 D_ULTIMA = D_MAP32 +D_READ_M +D_DM2TTL +D_DM2INT #else /* FREEDM */ @@ -568,6 +566,9 @@ D_SHAWN3 = D_DM29 D_OPENIN = D_DM30 D_EVIL = D_DM31 D_ULTIMA = D_DM32 +D_DM2TTL = D_FDMTTL +D_DM2INT = D_FDMINT +D_READ_M = D_FDMRDM #endif /* #ifdef FREEDM */ #endif /* #ifndef PHASE2 */ diff --git a/musics/d_fdmint.mid b/musics/d_fdmint.mid new file mode 100644 index 00000000..a7c20e24 Binary files /dev/null and b/musics/d_fdmint.mid differ diff --git a/musics/d_fdmrdm.mid b/musics/d_fdmrdm.mid new file mode 100644 index 00000000..d0f4d1da Binary files /dev/null and b/musics/d_fdmrdm.mid differ diff --git a/musics/d_fdmttl.mid b/musics/d_fdmttl.mid new file mode 100644 index 00000000..ab7c95f8 Binary files /dev/null and b/musics/d_fdmttl.mid differ