From 239f1aedc7c1012ebd325f9d0a107d926451d46b Mon Sep 17 00:00:00 2001 From: uni Date: Tue, 5 Dec 2023 19:18:56 +0000 Subject: [PATCH] Unique tracks for FreeDM title, intermission, and text screen (#1219) Finally resolve #10 after nearly 10 years... The Jute MIDI used for the text screen here was never used. --- CREDITS-MUSIC | 10 +++++----- buildcfg.txt | 11 ++++++----- musics/d_fdmint.mid | Bin 0 -> 12595 bytes musics/d_fdmrdm.mid | Bin 0 -> 11473 bytes musics/d_fdmttl.mid | Bin 0 -> 672 bytes 5 files changed, 11 insertions(+), 10 deletions(-) create mode 100644 musics/d_fdmint.mid create mode 100644 musics/d_fdmrdm.mid create mode 100644 musics/d_fdmttl.mid 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 0000000000000000000000000000000000000000..a7c20e243a60dd58c3573037c8c4884c270e75cb GIT binary patch literal 12595 zcmeHN%}*0S6#p$n>qRd{BL_`2s9XdBGz7*`2o{<`Bh?1*Bo!8EXjxM+k<+uHcRx;E zOgwt?<77hO*U7|_caQ!Z_3ciPX-lC%DaFoZxAW#VzkU1mea&v8@%dQ*hhf2whtYUu zfk!RKO*J<+ojQWtttKAlVm{y7N62+R0gg5!=Q|!v&L%J356n54z+A?*XB{VvFK6)1 zPb<^UE|Itd=^ZWYC_5?Zbi(T3QwOYe676}^2G}kJb-~In*&MqA-fpJvhSfu&r@Rh3 z;5GWH=Vt6%L;vj~(Fdt~IY=T1DM*MyiH^BU;&S0^DZZaX{~AVLTaI7nyh7p%WEY7p zNQJ*j;_4ckk_?a-Sd&!3uVeIUmD9)Q-#GR+^~TgkQ_pMHFX_3sT>jNDCSRAQXj3*YC>{Kd&uf2Hhr#I8jLxc#42oS>46WSmf)CMc( zBZMf4C=kJNm@r0S3&f z8kj%(YXf^53)Rqr)&u3x9}bij6(_e0XV&2WPf=b5xqIsC&?N97s1q~Vcy zD^_BweTop}oz;qs>ayuRxP^ud?`f6CBfL1}l%(P}pOg!u*zz#>xK+>(s(plVf`8%`H&-Zg}6SbH%;QHY&d6X+`~M-OuQES)}`(Wz5R^gM)%J zy*2-v4m;gv>pp0D>uT*_OY}j6unN`CbB9(AgY#49Mu}xvO;ljFlkbErtT=FNkn2d5`_(>Ng<_FB2B4U z7GyjTRaV5=Wkc0JfNbx)gR)}X1wRC_4(GfNH?Atx2^A^HEJpL@`rPk3_uV)0%$2Ve zMC6#n4eHz!z*Id_p zkI!}ApXBuOliZr&`{jSB?@?lJap|3})*aB^88^BDy4OU!x_m$WEZb*HDaZbj?f&Dl z)rG{_MCxvJ`J1%-dQ}>qO-ti=pEL%3kVf2n_BqyA6v5TMQ93Uhb5jEiydt>bjbq0J zSG?ii*^!5zua-ns=j5mYemwQ?dqwyd1RtC;B=|tg7{atAOdFOt%d#gKYpYuEzmsy1 zWUQ^mI;nr{Po(~Ye{=EL%JR~+#N?f&mFjXLb)$O!ep-HeN17;tCW@emB51}_&pdw^ zYoZ8n#hXYzu6Ps4#}#iP`M7Fp{q-?7tOR3{uKV7D?*d<9^|4|&uPCk?&IT@i8uhRk z#bUw@%fW=KO>tGhDqSyC#!XmS{0ZWf~ToO^qeHm7J)Zt+PKjxJmF1==EI$jruQ326*jMP2KAs5nEQQ!^+6wU5Y zj=|_u@5GeBwO2VEn^6sAxHD4sX^*LoigIu#W?oS`+3eJiZ?ox9jt4m|<l%#nz~|3e}=*6Q8s#dJ>sq zi)NcwEt&|nXtq~1b`&iFEn1BqR)#_7t>U>dj22F3daEeetpZ0FwN<>>4uhCCGB8tF zJFJY$+R|B!UfP$E-Lfo#GSnDBJM?JtUu>No>`>zfcRBmMsIf@zlzNm<;}H>Rr-Y?y zOtL#A#}PFO*}ZfE2sJiMfQ7s5IO3tkr*Y*Rhj)dT#Q?7nc`GAtw2az#j4BpwhZ^^G zS{jX39Dk$HO46OOwfH zC`02|41sd`d|0lXmXXcm2esF0Nw6og!9B&ElyFM3V|=vi^NNzm2jA8*0B3U0m4>d2 zge8q3m`a@jBs-8i?1p!=h2#5R>QEM@4#Cu+cVVhi7{miibztG}1WaWN5tcG+-fvT* zs3I3ptwy!_a+}qzI)HN#&5F$d?W>{}?3tvbF9g@n;@;jIanVvnuyD9=kT0hYe1Qch zXARhSKfDKyw?GZpJQde1aGl!BT!M-W1ZMDw!7gUi0*y#F*v?y!rgpaOWC4pL7wp(c zG^@zeLmt)r-B_dDiajBktfI+E&%G~cwBFTj6?Fh?zP%h+b`{lVV?E>>Yg7PH0Ys+& z9CKdgf#vDPuVbh9x1P#M_0~dlc_A^iv?70qwDHNSjZa=}eDZ3?2V-sgd!vodU2S~s zYU32Oy||V1Hr`lIN^Hw*%dJn}Xk%3H)EYvYkM@yObEWKBG>HXa8Kfp}zXJe0SH UN6yCM5WX*mt2^x0TmJd)A16=@N&o-= literal 0 HcmV?d00001 diff --git a/musics/d_fdmttl.mid b/musics/d_fdmttl.mid new file mode 100644 index 0000000000000000000000000000000000000000..ab7c95f8ab363f477b372a94434c9ff7ee701192 GIT binary patch literal 672 zcmeYb$w*;fU|?flWMF1E;2Tnu4de+k{EuK^VUplr_#ep3zEFYTzdi#*icyc@KeI?k zVv=Wxg0H8Gr-H6RNKs;Pwt^wUNd|_UTn-E~l@km)l^H0Z6QKHGbfW`>2ErT!GZ048 z%-}W#kc$zaW{D%zj2I5cF>K&+Xl9t8mB28;5QxnZ5*oA^!2AY7APp32Fay%K#akTk zYR~~105Zq~YLF$+0v)IYCQu73!4?oO2