This commit is contained in:
Paul 2001-01-29 20:08:14 +00:00
parent 43a5a00b2a
commit 177b885a35
8 changed files with 12 additions and 2 deletions

View file

@ -21,6 +21,9 @@ music/chapter4.vh
music/chapter5.pxm music/chapter5.pxm
music/chapter5.vb music/chapter5.vb
music/chapter5.vh music/chapter5.vh
music/chapter6.pxm
music/chapter6.vb
music/chapter6.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

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View file

@ -418,7 +418,7 @@ MUSIC_IN_DIR := data/music
MUSIC_OUT_DIR := $(DATA_OUT)/music MUSIC_OUT_DIR := $(DATA_OUT)/music
MUSIC_LIST := sb-title \ MUSIC_LIST := sb-title \
chapter1 chapter2 chapter3 chapter4 chapter5 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) 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)

View file

@ -127,6 +127,12 @@ static XMSONGDATA s_xmSongData[CSoundMediator::NUM_SONGIDS]=
{ MUSIC_CHAPTER5_VH, MUSIC_CHAPTER5_VB, MUSIC_CHAPTER5_PXM, 0x00 }, // SONG_CHAPTER5_LEVEL3, { MUSIC_CHAPTER5_VH, MUSIC_CHAPTER5_VB, MUSIC_CHAPTER5_PXM, 0x00 }, // SONG_CHAPTER5_LEVEL3,
{ MUSIC_CHAPTER5_VH, MUSIC_CHAPTER5_VB, MUSIC_CHAPTER5_PXM, 0x2a }, // SONG_CHAPTER5_LEVEL4, { MUSIC_CHAPTER5_VH, MUSIC_CHAPTER5_VB, MUSIC_CHAPTER5_PXM, 0x2a }, // SONG_CHAPTER5_LEVEL4,
{ MUSIC_CHAPTER5_VH, MUSIC_CHAPTER5_VB, MUSIC_CHAPTER5_PXM, 0x3e }, // SONG_CHAPTER5_BOSS, { MUSIC_CHAPTER5_VH, MUSIC_CHAPTER5_VB, MUSIC_CHAPTER5_PXM, 0x3e }, // SONG_CHAPTER5_BOSS,
{ MUSIC_CHAPTER6_VH, MUSIC_CHAPTER6_VB, MUSIC_CHAPTER6_PXM, 0x00 }, // SONG_CHAPTER6_ROLLERCOASTER
{ MUSIC_CHAPTER6_VH, MUSIC_CHAPTER6_VB, MUSIC_CHAPTER6_PXM, 0x00 }, // SONG_CHAPTER6_SNAILRACE
{ MUSIC_CHAPTER6_VH, MUSIC_CHAPTER6_VB, MUSIC_CHAPTER6_PXM, 0x0c }, // SONG_CHAPTER6_BIGWHEEL
{ MUSIC_CHAPTER6_VH, MUSIC_CHAPTER6_VB, MUSIC_CHAPTER6_PXM, 0x0c }, // SONG_CHAPTER6_TUNNELOFLOVE
{ MUSIC_CHAPTER6_VH, MUSIC_CHAPTER6_VB, MUSIC_CHAPTER6_PXM, 0x15 }, // SONG_CHAPTER6_GHOSTTRAIN
{ MUSIC_CHAPTER6_VH, MUSIC_CHAPTER6_VB, MUSIC_CHAPTER6_PXM, 0x2b }, // SONG_CHAPTER6_BIGTOP
}; };
// SFX banks // SFX banks

View file

@ -49,12 +49,13 @@ class CSoundMediator
public: public:
typedef enum SONGID typedef enum SONGID
{ {
SONG_TITLE, SONG_OPTIONS, SONG_MEMORYCARD, SONG_GAMECOMPLETE, SONG_GAMEOVER, SONG_TITLE, SONG_OPTIONS, SONG_MEMORYCARD, SONG_GAMECOMPLETE, SONG_GAMEOVER,
SONG_CHAPTER1_LEVEL1, SONG_CHAPTER1_LEVEL2, SONG_CHAPTER1_LEVEL3, SONG_CHAPTER1_LEVEL4, SONG_CHAPTER1_BOSS, 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_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, SONG_CHAPTER3_LEVEL1, SONG_CHAPTER3_LEVEL2, SONG_CHAPTER3_LEVEL3, SONG_CHAPTER3_LEVEL4, SONG_CHAPTER3_BOSS_ALSEEP, SONG_CHAPTER3_BOSS_AWAKE,
SONG_CHAPTER4_LEVEL1, SONG_CHAPTER4_LEVEL2, SONG_CHAPTER4_LEVEL3, SONG_CHAPTER4_LEVEL4, SONG_CHAPTER4_BOSS, SONG_CHAPTER4_LEVEL1, SONG_CHAPTER4_LEVEL2, SONG_CHAPTER4_LEVEL3, SONG_CHAPTER4_LEVEL4, SONG_CHAPTER4_BOSS,
SONG_CHAPTER5_LEVEL1, SONG_CHAPTER5_LEVEL2, SONG_CHAPTER5_LEVEL3, SONG_CHAPTER5_LEVEL4, SONG_CHAPTER5_BOSS, SONG_CHAPTER5_LEVEL1, SONG_CHAPTER5_LEVEL2, SONG_CHAPTER5_LEVEL3, SONG_CHAPTER5_LEVEL4, SONG_CHAPTER5_BOSS,
SONG_CHAPTER6_ROLLERCOASTER, SONG_CHAPTER6_SNAILRACE, SONG_CHAPTER6_BIGWHEEL, SONG_CHAPTER6_TUNNELOFLOVE, SONG_CHAPTER6_GHOSTTRAIN, SONG_CHAPTER6_BIGTOP,
NUM_SONGIDS, NUM_SONGIDS,
}; };