Start music

assets/sfx_noise.raw

@@ -0,0 +1 @@
+yB㊨k頻fw嬌dkq葺｡n刹掾p峻ｯ<EFBFBD>拝zf|m蛙<cｯ枠慾]b嘛gﾒｰ義賠》{酢＾u`粗n~′赫i暫Zd郭嚼ｶ€學bｩ宜GWN孛g義]d､qZ弛ﾕcQH笥<48>€馬ｲ秩foj｣fkｨ}mLfニｩｯf<EFBDAF>血J慧|x､ti`e毆ｴKн<4B>|桷fｽ溶袈w脹:Nbｴ`CｩhSk|争ｨ箱<EFBDA8>n3杠|I燕Lsｸ貌ﾑmｪv生izx@<40>^芸ｾ晋ﾈxDｻXvｧkｲz§n師㌃旨x凭｣圄\[←u<E28690>]]r勃R屏=pﾆyi{｢Q梼}wvｦsK葡y决sZ~o峽嫺K<E5ABBA>ｪ`]izﾁXlscｼ<63>}o{ｯ凰ﾔ’<EFBE94>}<7D>フ\『co寃渚tOjv<6A>ｩ<EFBFBD>reｩ劉K<E58A89>ｨｦ琶｢絞｣fｵ盃W<E79B83>鏑鑑伺ar〕{R{宵o<E5AEB5>``銃壮Q藁誠汾徑~ｫﾏ訊<EFBE8F>>笈{ｺA{q套刹d腕ｦ}<7D>吏idncsRhD@ｯp喊昧kuqgyｨe_7v<37>lpnkl<6B>椛ｮ｣V梛vｩ浦q<E6B5A6>yo?X<>Us€sbP{oaGｨi`掵ｦ噤葬Nuz搆ｫhO梱f;p{yｰxb<78>6t梨zxsz淑qz<71>ﾀ<EFBFBD>｢ｧyｺX矧ｮ=knyЩmu<6D>ﾁs+jvcShﾀeyｭs埋奪}酢sjT剿nQ麿除Si怛iｄx揆ﾉ<E68F86>]bｪU槽殷･釦撫<E987A6>tqkｬ`s達yxf|Ttmzu∥k<E288A5>ы浙g}ｬ}n_享<5F>&L<>ｧrtｪ<74>r､aRｴrﾉy祝2oyQZ｣€ｸｩs<EFBDA9>┃ｐ€頻x[V右\抖Bddj_}ooｮgTｶ身@}YNｪqwｩ俳сf━５Ymm|u<>Y}㌻浪Lｧ~叙q<E58F99>tkﾉawoj渓㍉jxo斬x寫ｴ<E5AFAB>}z｡ﾆ恵m｢･`嚆{p孫s€hp斌<70>X刧~･帳撒Kｩ<4B>嗅劃`YRdN}芸l?W|ｬ綰WΜnjRW背л｢Zﾁx€万ｧ圍h親噫~yl西ljqmｸ蛎ｩ着ｺlV<6C>團yg^~^`徃Eff穀c殕L鞄Syｧw倉拵笠j}<7D>Yｲyh甥､x柤^Z<>佳戎b_V岨n插促qｼ学a^ﾊｧ坊RｨfC筈㎎<E7AD88>~h錐crArzﾆlqg_徘団Ｋ瀕6V糎[Yq|ww図]e<瓶鋳ｦHIO軒峻ｩ歎ｽ活Zy-b{<7B><>度<EFBFBD>疹寔oﾄFqSgnm｢}i尋zｹｻWR[_俵楔ﾌ祷_ec8USM~s]bd撻I密Ff歔浙k楼Oｭ織<EFBDAD>ｫ鱒zE浚xTﾓe‘oGkｰUeｵ哭kR<6B>ﾗv⑦宙｢[祷Id<7F>h妖<68>ｬy<EFBDAC>@鋒鯨｡t€ｶ匝<EFBDB6>潟j`cjﾄn<EFBE84>n存jyヶﾆynu]X讃xmp^昭ｦ准<EFBDA6>ネ島孛ｬﾔ散<EFBE94>M<7F>Qn沛n<E6B29B>Eu<45>弾om､ﾀｯ<EFBE80>ｨｳ矧捉Z<E68D89>ｦ8庶ﾀﾏё|<7C><>bstｧ|\ｒY~ｷ牌<EFBDB7>y<EFBFBD>0}㈲ｨm<EFBDA8>抹ﾒ捏用産Wbz<62>Y:ue|ｳ棡ｨt[Tx<54>殄P|v㎎~<7E>ｦ<7F>]Xｸ｡rk｢､燦_ｴww吹~c屁貫盈ﾈ枠wＺｧ｢<EFBDA7>ipiゞne詩}S<>Rw寒Ur復宕ie､葺┣hZe~yld=从a^槙ｷｱt<EFBDB1>Xj抽ы酪ｳv[n悒<6E>j洶｡粋<EFBDA1>.yｼ<79>€]q孺qj味j<E591B3>T2剞棍姥jzv<76>ｺ<EFBFBD>yj逐婉|ｴC}ｳ梼r]ｲ尢ｪxｨ視bvp<76>等\<5C>{G<>v岑トﾚbwpｲNuqｫ労z<E58AB4>轄㌦<E8BD84>ｨ尸ｵｨY泪S<E6B3AA>ﾁｧe転[{剋~蓉聡IuEo}･ﾆ|€拍ｳ<E68B8D>ﾂ操｣/kYnuち<75><E381A1>ｯ朧fz冪､-u吐｣脹g｡Ζ｣嫖♂_<E29982>=u:`W客~ｱ<>bs€ラｨ､PG<50>ｫXｷOX€V嗔杉jI･xuO容昆~sR^[ａ組S糊]bpy･vyｶヤ怐ｧ~ｬｨ孕i答<69>ｳ蒲j<E892B2>n罵oKb寥R|G掟lｯO迅qﾇ重~ｃＵ鰐憧|ｫW€N`U<>?€防<C280>Y執､ｵtｦｫ^豫<>do嫉ｸﾌ検ｺWo~資衰｢ｫgｷｪpw℡続ぃ惣zw儷b｢l｡ﾁ丶cmlcﾐ~~q~ｧv~ﾂr吏<72>W<EFBFBD>r洳Ｔ汞ayDe勦ｯz･嗇~R｣ｎuYc€=緒vf潟q･｣<EFBDA5>{ｲｴ輿€防杜狽iwwｽｭ評<EFBDAD><E8A995>ぞv〟･ｯonx途Yｦy媛ｪ｢]垣〕{D尢Ut㊤他qэ`l<>p<EFBFBD><70>f拷Wmja<6A>}€ｪ憶ｭV越|悍敷ﾄox|ｬ<>€oub<75>}S綱孱w蝕推jl営nsｵ縛瑛ﾀzyW€CｌI錨m_ョ|p剥d鋭iーr恬「jo北荘](qﾂ<71>Wｱｬ<EFBDB1>剪iho~Hx｡_諜j負iｔ<69>Ia<49>x者rwO∟oursn

platform_sdl.h

@@ -179,14 +179,21 @@ void emscripten_set_main_loop(em_callback_func func, int fps, int simulate_infin
 uint8_t audioBuff[SFG_SFX_SAMPLE_COUNT];
 uint16_t audioPos = 0;
 
+static inline uint8_t addSamples(uint8_t sample1, uint8_t sample2)
+{
+  int16_t mixed = sample1;
+  mixed -= 127;
+  mixed += sample2;
+  mixed = (mixed > 0) ? ((mixed < 255) ? mixed : 255) : 0;
+  return mixed;
+}
+
 void audioFillCallback(void *userdata, uint8_t *s, int l)
 {
   for (int i = 0; i < l; ++i)
   {
-    s[i] = audioBuff[audioPos];
+    s[i] = addSamples(audioBuff[audioPos],SFG_getNextMusicSample());
-
     audioBuff[audioPos] = 127;
-
     audioPos = (audioPos < SFG_SFX_SAMPLE_COUNT - 1) ? (audioPos + 1) : 0;
   }
 }
@@ -199,12 +206,8 @@ void SFG_playSound(uint8_t soundIndex, uint8_t volume)
 
   for (int i = 0; i < SFG_SFX_SAMPLE_COUNT; ++i)
   {
-    int16_t mixedValue =
+    audioBuff[pos] =
-      audioBuff[pos] - 127 + SFG_GET_SFX_SAMPLE(soundIndex,i) * volumeStep;
+      addSamples(audioBuff[pos],SFG_GET_SFX_SAMPLE(soundIndex,i) * volumeStep);
-
-    mixedValue = (mixedValue > 0) ? ((mixedValue < 255) ? mixedValue : 255) : 0;
-
-    audioBuff[pos] = mixedValue; 
 
     pos = (pos < SFG_SFX_SAMPLE_COUNT - 1) ? (pos + 1) : 0;
   }

sounds.h

@@ -30,6 +30,84 @@
    (SFG_sounds[soundIndex][sampleIndex / 2] >> 4) : \
    (SFG_sounds[soundIndex][sampleIndex / 2] & 0x0f))
 
+#define SFG_TRACK_SAMPLES (512 * 1024)
+
+struct
+{ // all should be initialized to 0
+  uint8_t track;
+  uint32_t t;
+  uint32_t t2;
+  uint32_t n3t;
+  uint32_t n5t;
+  uint32_t n7t;
+} SFG_MusicState;
+
+uint8_t SFG_getNextMusicSample()
+{
+  if (SFG_MusicState.t >= SFG_TRACK_SAMPLES)
+  {
+    SFG_MusicState.track++;
+
+    if (SFG_MusicState.track >= 3)
+      SFG_MusicState.track = 0;
+
+    SFG_MusicState.t = 0;
+    SFG_MusicState.t2 = 0;
+    SFG_MusicState.n3t = 0;
+    SFG_MusicState.n5t = 0;
+    SFG_MusicState.n7t = 0;
+  }
+
+  uint8_t result;
+
+  #define t SFG_MusicState.t
+  #define t2 SFG_MusicState.t2
+  #define n3t SFG_MusicState.n3t
+
+  switch (SFG_MusicState.track)
+  {
+    case 0:
+    {
+      uint32_t a = ((t >> 7) | (t >> 9) | (~t << 1) | t);
+      result = ((t) & 65536 ? (a & (((t * t) >> 16) & 0x09)) : ~a);
+
+      break;
+    }
+
+    case 1:
+    {
+      result = (t & (3 << (((t >> 10) ^ ((t >> 10) << (t >> 6))))));
+
+      break;
+    }
+
+    case 2:
+    {
+      result =
+        ((((t >> (t >> 2)) + (t >> (t >> 7)))) & 0x3f | (t >> 5) | (t >> 11))
+        & (t & (32768 | 8192) ? 0xf0 : 0x30);
+
+      break;
+    }
+
+    default:
+      result = 127;
+      break;
+  }
+
+  #undef t
+  #undef t2
+  #undef n3t
+
+  SFG_MusicState.t += 1;
+  SFG_MusicState.t2 += SFG_MusicState.t;
+  SFG_MusicState.n3t += 3;
+  SFG_MusicState.n5t += 5;
+  SFG_MusicState.n7t += 7;
+
+  return result;
+}
+
 SFG_PROGRAM_MEMORY uint8_t SFG_sounds[][SFG_SFX_SIZE] =
 {
   { // 0, bullet shot