This commit is contained in:
parent
354eba32a8
commit
c2e12f8c57
12 changed files with 32 additions and 8 deletions
|
@ -6,9 +6,12 @@ translations/ita.dat
|
||||||
translations/ger.dat
|
translations/ger.dat
|
||||||
translations/id.dat
|
translations/id.dat
|
||||||
translations/eng.dat
|
translations/eng.dat
|
||||||
music/ingame.pxm
|
music/chapter1.pxm
|
||||||
music/ingame.vb
|
music/chapter1.vb
|
||||||
music/ingame.vh
|
music/chapter1.vh
|
||||||
|
music/chapter3.pxm
|
||||||
|
music/chapter3.vb
|
||||||
|
music/chapter3.vh
|
||||||
music/sb-title.pxm
|
music/sb-title.pxm
|
||||||
music/sb-title.vb
|
music/sb-title.vb
|
||||||
music/sb-title.vh
|
music/sb-title.vh
|
||||||
|
|
BIN
data/Music/chapter1/CHAPTER1.PXM
Normal file
BIN
data/Music/chapter1/CHAPTER1.PXM
Normal file
Binary file not shown.
BIN
data/Music/chapter1/CHAPTER1.VB
Normal file
BIN
data/Music/chapter1/CHAPTER1.VB
Normal file
Binary file not shown.
BIN
data/Music/chapter1/CHAPTER1.VH
Normal file
BIN
data/Music/chapter1/CHAPTER1.VH
Normal file
Binary file not shown.
BIN
data/Music/chapter1/CHAPTER1.XM
Normal file
BIN
data/Music/chapter1/CHAPTER1.XM
Normal file
Binary file not shown.
BIN
data/Music/chapter3/CHAPTER3.PXM
Normal file
BIN
data/Music/chapter3/CHAPTER3.PXM
Normal file
Binary file not shown.
BIN
data/Music/chapter3/CHAPTER3.VB
Normal file
BIN
data/Music/chapter3/CHAPTER3.VB
Normal file
Binary file not shown.
BIN
data/Music/chapter3/CHAPTER3.VH
Normal file
BIN
data/Music/chapter3/CHAPTER3.VH
Normal file
Binary file not shown.
BIN
data/Music/chapter3/CHAPTER3.XM
Normal file
BIN
data/Music/chapter3/CHAPTER3.XM
Normal file
Binary file not shown.
|
@ -401,7 +401,8 @@ GFX_DATA_OUT += $(MC_HEADER_OUT)
|
||||||
MUSIC_IN_DIR := data/music
|
MUSIC_IN_DIR := data/music
|
||||||
MUSIC_OUT_DIR := $(DATA_OUT)/music
|
MUSIC_OUT_DIR := $(DATA_OUT)/music
|
||||||
|
|
||||||
MUSIC_LIST := ingame sb-title
|
MUSIC_LIST := sb-title \
|
||||||
|
chapter1 chapter3
|
||||||
|
|
||||||
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)
|
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)
|
||||||
MUSIC_ALL_OUT := $(foreach MUSIC,$(MUSIC_LIST),$(MUSIC_OUT_DIR)/$(MUSIC).PXM $(MUSIC_OUT_DIR)/$(MUSIC).VH $(MUSIC_OUT_DIR)/$(MUSIC).VB)
|
MUSIC_ALL_OUT := $(foreach MUSIC,$(MUSIC_LIST),$(MUSIC_OUT_DIR)/$(MUSIC).PXM $(MUSIC_OUT_DIR)/$(MUSIC).VH $(MUSIC_OUT_DIR)/$(MUSIC).VB)
|
||||||
|
|
|
@ -95,12 +95,22 @@ static CXMPlaySound *s_xmplaySound;
|
||||||
// Songs
|
// Songs
|
||||||
static XMSONGDATA s_xmSongData[CSoundMediator::NUM_SONGIDS]=
|
static XMSONGDATA s_xmSongData[CSoundMediator::NUM_SONGIDS]=
|
||||||
{
|
{
|
||||||
{ MUSIC_INGAME_VH, MUSIC_INGAME_VB, MUSIC_INGAME_PXM, 0 }, // SONG_INGAME
|
{ MUSIC_SB_TITLE_VH, MUSIC_SB_TITLE_VB, MUSIC_SB_TITLE_PXM, 0x00 }, // SONG_TITLE
|
||||||
{ MUSIC_SB_TITLE_VH, MUSIC_SB_TITLE_VB, MUSIC_SB_TITLE_PXM, 0 }, // SONG_TITLE
|
{ MUSIC_SB_TITLE_VH, MUSIC_SB_TITLE_VB, MUSIC_SB_TITLE_PXM, 0x0a }, // SONG_OPTIONS
|
||||||
{ MUSIC_SB_TITLE_VH, MUSIC_SB_TITLE_VB, MUSIC_SB_TITLE_PXM, 0xa }, // SONG_OPTIONS
|
|
||||||
{ MUSIC_SB_TITLE_VH, MUSIC_SB_TITLE_VB, MUSIC_SB_TITLE_PXM, 0x13 }, // SONG_MEMORYCARD
|
{ MUSIC_SB_TITLE_VH, MUSIC_SB_TITLE_VB, MUSIC_SB_TITLE_PXM, 0x13 }, // SONG_MEMORYCARD
|
||||||
{ MUSIC_SB_TITLE_VH, MUSIC_SB_TITLE_VB, MUSIC_SB_TITLE_PXM, 0x14 }, // SONG_GAMECOMPLETE
|
{ MUSIC_SB_TITLE_VH, MUSIC_SB_TITLE_VB, MUSIC_SB_TITLE_PXM, 0x14 }, // SONG_GAMECOMPLETE
|
||||||
{ MUSIC_SB_TITLE_VH, MUSIC_SB_TITLE_VB, MUSIC_SB_TITLE_PXM, 0x23 }, // SONG_GAMEOVER
|
{ MUSIC_SB_TITLE_VH, MUSIC_SB_TITLE_VB, MUSIC_SB_TITLE_PXM, 0x23 }, // SONG_GAMEOVER
|
||||||
|
{ 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,
|
||||||
|
{ MUSIC_CHAPTER1_VH, MUSIC_CHAPTER1_VB, MUSIC_CHAPTER1_PXM, 0x2c }, // SONG_CHAPTER1_LEVEL4,
|
||||||
|
{ MUSIC_CHAPTER1_VH, MUSIC_CHAPTER1_VB, MUSIC_CHAPTER1_PXM, 0x40 }, // SONG_CHAPTER1_BOSS,
|
||||||
|
{ MUSIC_CHAPTER3_VH, MUSIC_CHAPTER3_VB, MUSIC_CHAPTER3_PXM, 0x18 }, // SONG_CHAPTER1_LEVEL1,
|
||||||
|
{ MUSIC_CHAPTER3_VH, MUSIC_CHAPTER3_VB, MUSIC_CHAPTER3_PXM, 0x00 }, // SONG_CHAPTER1_LEVEL2,
|
||||||
|
{ MUSIC_CHAPTER3_VH, MUSIC_CHAPTER3_VB, MUSIC_CHAPTER3_PXM, 0x00 }, // SONG_CHAPTER1_LEVEL3,
|
||||||
|
{ MUSIC_CHAPTER3_VH, MUSIC_CHAPTER3_VB, MUSIC_CHAPTER3_PXM, 0x0b }, // SONG_CHAPTER1_LEVEL4,
|
||||||
|
{ MUSIC_CHAPTER3_VH, MUSIC_CHAPTER3_VB, MUSIC_CHAPTER3_PXM, 0x21 }, // SONG_CHAPTER1_BOSS_ASLEEP,
|
||||||
|
{ MUSIC_CHAPTER3_VH, MUSIC_CHAPTER3_VB, MUSIC_CHAPTER3_PXM, 0x22 }, // SONG_CHAPTER1_BOSS_AWAKE,
|
||||||
};
|
};
|
||||||
|
|
||||||
// SFX banks
|
// SFX banks
|
||||||
|
|
|
@ -49,12 +49,22 @@ class CSoundMediator
|
||||||
public:
|
public:
|
||||||
typedef enum SONGID
|
typedef enum SONGID
|
||||||
{
|
{
|
||||||
SONG_INGAME,
|
|
||||||
SONG_TITLE,
|
SONG_TITLE,
|
||||||
SONG_OPTIONS,
|
SONG_OPTIONS,
|
||||||
SONG_MEMORYCARD,
|
SONG_MEMORYCARD,
|
||||||
SONG_GAMECOMPLETE,
|
SONG_GAMECOMPLETE,
|
||||||
SONG_GAMEOVER,
|
SONG_GAMEOVER,
|
||||||
|
SONG_CHAPTER1_LEVEL1,
|
||||||
|
SONG_CHAPTER1_LEVEL2,
|
||||||
|
SONG_CHAPTER1_LEVEL3,
|
||||||
|
SONG_CHAPTER1_LEVEL4,
|
||||||
|
SONG_CHAPTER1_BOSS,
|
||||||
|
SONG_CHAPTER3_LEVEL1,
|
||||||
|
SONG_CHAPTER3_LEVEL2,
|
||||||
|
SONG_CHAPTER3_LEVEL3,
|
||||||
|
SONG_CHAPTER3_LEVEL4,
|
||||||
|
SONG_CHAPTER3_BOSS_ALSEEP,
|
||||||
|
SONG_CHAPTER3_BOSS_AWAKE,
|
||||||
NUM_SONGIDS,
|
NUM_SONGIDS,
|
||||||
};
|
};
|
||||||
typedef enum SFXBANKID
|
typedef enum SFXBANKID
|
||||||
|
|
Loading…
Add table
Reference in a new issue