diff --git a/main.lua b/main.lua index dfa580ce..c77ce0c6 100644 --- a/main.lua +++ b/main.lua @@ -206,6 +206,8 @@ BGM.init{ "sugar fairy","rockblock","magicblock",--classic, 49/99 "cruelty","final","8-bit happiness","end","how feeling",--49/99 + + "mXmas",--Festival: Xmas } VOC.init{ "zspin","sspin","lspin","jspin","tspin","ospin","ispin", diff --git a/media/BGM/mXmas.ogg b/media/BGM/mXmas.ogg new file mode 100644 index 00000000..69d92719 Binary files /dev/null and b/media/BGM/mXmas.ogg differ diff --git a/parts/scenes/customGame.lua b/parts/scenes/customGame.lua index b7f2b602..68267eb6 100644 --- a/parts/scenes/customGame.lua +++ b/parts/scenes/customGame.lua @@ -28,7 +28,7 @@ function scene.sceneInit() end end function scene.sceneBack() - BGM.play("blank") + BGM.play(FESTIVAL=="Xmas"and"mXmas"or"blank") end function scene.keyDown(key) diff --git a/parts/scenes/intro.lua b/parts/scenes/intro.lua index bcb5c461..a815386a 100644 --- a/parts/scenes/intro.lua +++ b/parts/scenes/intro.lua @@ -10,7 +10,7 @@ local t1,t2,r function scene.sceneInit() BG.set() - BGM.play("blank") + BGM.play(FESTIVAL=="Xmas"and"mXmas"or"blank") t1,t2=0,0--Timer r={}--Random animation type for i=1,8 do r[i]=rnd(5)end