diff --git a/data/DataCache.scr b/data/DataCache.scr index bbae3fe51..aad7923d1 100644 --- a/data/DataCache.scr +++ b/data/DataCache.scr @@ -99,6 +99,9 @@ music/chapter6.vh music/sb-title.pxm music/sb-title.vb music/sb-title.vh +music/fma.pxm +music/fma.vb +music/fma.vh sfx/ingame.pxm sfx/ingame.vb sfx/ingame.vh diff --git a/data/Sfx/ingame/INGAME.VB b/data/Sfx/ingame/INGAME.VB index 0af55c01b..3ea143d43 100644 Binary files a/data/Sfx/ingame/INGAME.VB and b/data/Sfx/ingame/INGAME.VB differ diff --git a/data/Sfx/ingame/INGAME.VH b/data/Sfx/ingame/INGAME.VH index 4cf46b6d1..282fb56ea 100644 Binary files a/data/Sfx/ingame/INGAME.VH and b/data/Sfx/ingame/INGAME.VH differ diff --git a/data/Sfx/ingame/ingame.pxm b/data/Sfx/ingame/ingame.pxm index b6dd7616d..a68b3b1e8 100644 Binary files a/data/Sfx/ingame/ingame.pxm and b/data/Sfx/ingame/ingame.pxm differ diff --git a/data/Sfx/ingame/ingame.xm b/data/Sfx/ingame/ingame.xm index 209230f93..c239cb702 100644 Binary files a/data/Sfx/ingame/ingame.xm and b/data/Sfx/ingame/ingame.xm differ diff --git a/makefile.gfx b/makefile.gfx index 58cc9a926..c70f4baaf 100644 --- a/makefile.gfx +++ b/makefile.gfx @@ -573,7 +573,7 @@ GFX_DATA_OUT += $(MC_HEADER_OUT) MUSIC_IN_DIR := data/music MUSIC_OUT_DIR := $(DATA_OUT)/music -MUSIC_LIST := sb-title \ +MUSIC_LIST := sb-title fma \ chapter1 chapter2 chapter3 chapter4 chapter5 chapter6 MUSIC_ALL_IN := $(foreach MUSIC,$(MUSIC_LIST),$(MUSIC_IN_DIR)/$(MUSIC)/$(MUSIC).PXM $(MUSIC_IN_DIR)/$(MUSIC)/$(MUSIC).VH $(MUSIC_IN_DIR)/$(MUSIC)/$(MUSIC).VB) diff --git a/source/level/level.cpp b/source/level/level.cpp index 7c344ab5d..0b4d8d5ab 100644 --- a/source/level/level.cpp +++ b/source/level/level.cpp @@ -162,8 +162,8 @@ {5,4, CHAPTER05_LEVEL04_INF_TOTAL_ITEM_GOLDEN_SPATULA, LEVELS_CHAPTER05_LEVEL04_LVL,LEVELS_CHAPTER05_LEVEL04_TEX, CSoundMediator::SONG_CHAPTER5_LEVEL4, STR__CHAPTER_5,STR__CHAPTER_5_LEVEL_4, CFmaScene::FMA_SCRIPT__CH5FINISHED }, {5,5, CHAPTER06_LEVEL05_INF_TOTAL_ITEM_KELP_TOKEN, LEVELS_CHAPTER06_LEVEL05_LVL,LEVELS_CHAPTER06_LEVEL05_TEX, CSoundMediator::SONG_CHAPTER6_TUNNELOFLOVE, STR__KELP_WORLD,STR__CHAPTER_6_LEVEL_5, CFmaScene::FMA_SCRIPT__NONE }, // FMA - {6,0, 0, LEVELS_FMA_SHADYSHOALS_LVL,LEVELS_FMA_SHADYSHOALS_TEX, CSoundMediator::SONG_TITLE, STR__NOW_LOADING,STR__BLANK, CFmaScene::FMA_SCRIPT__NONE }, - {6,0, 0, LEVELS_FMA_CONTROLROOM_LVL,LEVELS_FMA_CONTROLROOM_TEX, CSoundMediator::SONG_TITLE, STR__NOW_LOADING,STR__BLANK, CFmaScene::FMA_SCRIPT__NONE }, + {6,0, 0, LEVELS_FMA_SHADYSHOALS_LVL,LEVELS_FMA_SHADYSHOALS_TEX, CSoundMediator::SONG_FMA, STR__NOW_LOADING,STR__BLANK, CFmaScene::FMA_SCRIPT__NONE }, + {6,0, 0, LEVELS_FMA_CONTROLROOM_LVL,LEVELS_FMA_CONTROLROOM_TEX, CSoundMediator::SONG_FMA, STR__NOW_LOADING,STR__BLANK, CFmaScene::FMA_SCRIPT__NONE }, }; const int LvlTableSize=sizeof(LvlTable)/sizeof(sLvlTab); diff --git a/source/sound/sound.cpp b/source/sound/sound.cpp index 3c5bc92d3..0578a3754 100644 --- a/source/sound/sound.cpp +++ b/source/sound/sound.cpp @@ -107,6 +107,7 @@ static XMSONGDATA s_xmSongData[CSoundMediator::NUM_SONGIDS]= { MUSIC_SB_TITLE_VH, MUSIC_SB_TITLE_VB, MUSIC_SB_TITLE_PXM, 0x2c }, // SONG_MEMCARD2 { MUSIC_SB_TITLE_VH, MUSIC_SB_TITLE_VB, MUSIC_SB_TITLE_PXM, 0x2f }, // SONG_MAPSCREEN { MUSIC_SB_TITLE_VH, MUSIC_SB_TITLE_VB, MUSIC_SB_TITLE_PXM, 0x33 }, // SONG_SHOPSCREEN + { MUSIC_FMA_VH, MUSIC_FMA_VB, MUSIC_FMA_PXM, 0x00 }, // SONG_FMA { MUSIC_CHAPTER1_VH, MUSIC_CHAPTER1_VB, MUSIC_CHAPTER1_PXM, 0x19 }, // SONG_CHAPTER1_LEVEL1, { MUSIC_CHAPTER1_VH, MUSIC_CHAPTER1_VB, MUSIC_CHAPTER1_PXM, 0x2d }, // SONG_CHAPTER1_LEVEL2, { MUSIC_CHAPTER1_VH, MUSIC_CHAPTER1_VB, MUSIC_CHAPTER1_PXM, 0x00 }, // SONG_CHAPTER1_LEVEL3, diff --git a/source/sound/sound.h b/source/sound/sound.h index b0a81ae05..a8c9b0286 100644 --- a/source/sound/sound.h +++ b/source/sound/sound.h @@ -50,6 +50,7 @@ public: typedef enum SONGID { SONG_TITLE, SONG_OPTIONS, SONG_MEMORYCARD, SONG_GAMECOMPLETE, SONG_GAMEOVER, SONG_PARTY, SONG_MEMCARD2, SONG_MAPSCREEN, SONG_SHOPSCREEN, + SONG_FMA, SONG_CHAPTER1_LEVEL1, SONG_CHAPTER1_LEVEL2, SONG_CHAPTER1_LEVEL3, SONG_CHAPTER1_LEVEL4, SONG_CHAPTER1_BOSS, SONG_CHAPTER2_LEVEL1, SONG_CHAPTER2_LEVEL2, SONG_CHAPTER2_LEVEL3, SONG_CHAPTER2_LEVEL4, SONG_CHAPTER2_BOSS, SONG_CHAPTER3_LEVEL1, SONG_CHAPTER3_LEVEL2, SONG_CHAPTER3_LEVEL3, SONG_CHAPTER3_LEVEL4, SONG_CHAPTER3_BOSS_ALSEEP, SONG_CHAPTER3_BOSS_AWAKE,