New sound effects

This commit is contained in:
Nobuo Squidimatsu 2015-11-17 23:28:37 -08:00
parent cb4e3eb3c5
commit bf088f6669
3 changed files with 49 additions and 61 deletions

18
game.c
View File

@ -59,9 +59,9 @@ extern const unsigned char music_music_data[];
/* Sound effects */
#define SFX_START 0
#define SFX_ITEM 1
#define SFX_SPLAT 1
#define SFX_RESPAWN1 2
#define SFX_RESPAWN2 3
#define SFX_DEATH 3
/* Music */
#define MUSIC_LEVEL 0
@ -561,13 +561,13 @@ void show_title(void) {
/* Splat splat splat */
WAIT_WITH_SKIP(20);
sfx_play(SFX_ITEM,0);
sfx_play(SFX_SPLAT,0);
pal_bg(palTitleB);
WAIT_WITH_SKIP(20);
sfx_play(SFX_ITEM,0);
sfx_play(SFX_SPLAT,0);
pal_bg(palTitleC);
WAIT_WITH_SKIP(20);
sfx_play(SFX_ITEM,0);
sfx_play(SFX_SPLAT,0);
pal_bg(palTitle);
WAIT_WITH_SKIP(20);
music_play(MUSIC_TITLE);
@ -970,7 +970,7 @@ void player_move(unsigned char id,unsigned char dir) {
player_cnt[id]=TILE_SIZE<<FP_BITS;
player_diag_flip[id]=1;
sfx_play(SFX_ITEM,0);
sfx_play(SFX_SPLAT,0);
}
/**
@ -999,7 +999,7 @@ void player_die(unsigned char id) {
player_dir[id] = DIR_NONE;
player_wait[id] = RESPAWN_TIME;
sfx_play(SFX_ITEM,0);
sfx_play(SFX_DEATH,0);
}
@ -1165,7 +1165,7 @@ void game_loop(void) {
pal_spr(levelList[game_level*LEVEL_ENTRY+2]);
}
music_pause(game_paused);
sfx_play(SFX_ITEM,0);
sfx_play(SFX_SPLAT,0);
}
/* Skip processing inputs when the game is paused. */
@ -1196,7 +1196,7 @@ void game_loop(void) {
/* Flash respawning players, and prevent them from providing input. */
if (player_wait[i]) {
if (player_wait[i] == 16) {
sfx_play(i?SFX_RESPAWN2:SFX_RESPAWN1,i);
sfx_play(SFX_RESPAWN1,0);
}
--player_wait[i];
continue;

Binary file not shown.

View File

@ -1,52 +1,40 @@
;this file for FamiTone2 libary generated by nsf2data tool
sounds:
.word @sfx_ntsc_0,@sfx_pal_0
.word @sfx_ntsc_1,@sfx_pal_1
.word @sfx_ntsc_2,@sfx_pal_2
.word @sfx_ntsc_3,@sfx_pal_3
@sfx_ntsc_0:
.byte $80,$7f,$81,$ab,$82,$01,$04,$81,$3f,$04,$81,$1c,$04,$81,$d5,$82
.byte $00,$04,$81,$9f,$04,$81,$8e,$04,$80,$74,$81,$ab,$82,$01,$04,$81
.byte $3f,$04,$81,$1c,$04,$81,$d5,$82,$00,$04,$81,$9f,$04,$81,$8e,$04
.byte $80,$71,$81,$ab,$82,$01,$04,$81,$3f,$04,$81,$1c,$04,$81,$d5,$82
.byte $00,$04,$81,$9f,$04,$81,$8e,$04,$80,$30,$00
@sfx_ntsc_1:
.byte $80,$3f,$81,$ab,$82,$01,$01,$81,$3f,$01,$81,$2d,$01,$81,$1c,$01
.byte $80,$32,$81,$ab,$01,$81,$3f,$01,$81,$2d,$01,$81,$1c,$01,$80,$30
.byte $00
@sfx_ntsc_2:
.byte $80,$38,$81,$34,$82,$00,$01,$80,$3a,$81,$27,$01,$80,$3c,$81,$23
.byte $01,$80,$3e,$81,$34,$01,$80,$3f,$81,$27,$01,$81,$23,$01,$81,$34
.byte $01,$81,$27,$01,$80,$32,$81,$23,$01,$81,$34,$01,$81,$27,$01,$81
.byte $23,$01,$81,$34,$01,$81,$27,$01,$81,$23,$01,$81,$34,$01,$81,$27
.byte $01,$81,$23,$01,$81,$34,$01,$81,$27,$01,$81,$23,$01,$80,$30,$00
@sfx_ntsc_3:
.byte $83,$38,$84,$46,$85,$00,$01,$83,$3a,$84,$42,$01,$83,$3c,$84,$5e
.byte $01,$83,$3e,$84,$46,$01,$83,$3f,$84,$42,$01,$84,$5e,$01,$84,$46
.byte $01,$84,$42,$01,$83,$32,$84,$5e,$01,$84,$46,$01,$84,$42,$01,$84
.byte $5e,$01,$84,$46,$01,$84,$42,$01,$84,$5e,$01,$84,$46,$01,$84,$42
.byte $01,$84,$5e,$01,$84,$46,$01,$84,$42,$01,$84,$5e,$01,$83,$30,$00
@sfx_pal_0:
.byte $80,$7f,$81,$8c,$82,$01,$04,$81,$29,$03,$81,$08,$03,$81,$c6,$82
.byte $00,$04,$81,$94,$03,$81,$84,$03,$80,$74,$81,$8c,$82,$01,$04,$81
.byte $29,$03,$81,$08,$03,$81,$c6,$82,$00,$04,$81,$94,$03,$81,$84,$03
.byte $80,$71,$81,$8c,$82,$01,$04,$81,$29,$03,$81,$08,$03,$81,$c6,$82
.byte $00,$04,$81,$94,$03,$81,$84,$03,$80,$30,$00
@sfx_pal_1:
.byte $80,$3f,$81,$8c,$82,$01,$01,$81,$29,$01,$81,$18,$01,$81,$08,$01
.byte $80,$32,$81,$8c,$01,$81,$29,$01,$81,$18,$01,$81,$08,$01,$80,$30
.byte $00
@sfx_pal_2:
.byte $80,$38,$81,$31,$82,$00,$01,$80,$3a,$81,$24,$01,$80,$3c,$81,$20
.byte $01,$80,$3e,$81,$31,$01,$80,$3f,$81,$24,$01,$81,$20,$01,$81,$31
.byte $01,$81,$24,$01,$80,$32,$81,$20,$01,$81,$31,$01,$81,$24,$01,$81
.byte $20,$01,$81,$31,$01,$81,$24,$01,$81,$20,$01,$81,$31,$01,$81,$24
.byte $01,$81,$20,$01,$81,$31,$01,$81,$24,$01,$81,$20,$01,$80,$30,$00
@sfx_pal_3:
.byte $83,$38,$84,$41,$85,$00,$01,$83,$3a,$84,$3e,$01,$83,$3c,$84,$57
.byte $01,$83,$3e,$84,$41,$01,$83,$3f,$84,$3e,$01,$84,$57,$01,$84,$41
.byte $01,$84,$3e,$01,$83,$32,$84,$57,$01,$84,$41,$01,$84,$3e,$01,$84
.byte $57,$01,$84,$41,$01,$84,$3e,$01,$84,$57,$01,$84,$41,$01,$84,$3e
.byte $01,$84,$57,$01,$84,$41,$01,$84,$3e,$01,$84,$57,$01,$83,$30,$00
;this file for FamiTone2 libary generated by nsf2data tool
sounds:
.word @sfx_ntsc_0,@sfx_pal_0
.word @sfx_ntsc_1,@sfx_pal_1
.word @sfx_ntsc_2,@sfx_pal_2
.word @sfx_ntsc_3,@sfx_pal_3
@sfx_ntsc_0:
.byte $80,$7f,$81,$7e,$82,$00,$04,$81,$6a,$04,$81,$5e,$04,$81,$7e,$04
.byte $80,$74,$04,$81,$6a,$04,$81,$5e,$04,$81,$7e,$04,$80,$71,$04,$81
.byte $6a,$04,$81,$5e,$04,$81,$7e,$00
@sfx_ntsc_1:
.byte $89,$3f,$8a,$00,$01,$89,$3e,$8a,$0e,$01,$89,$3d,$8a,$0c,$01,$89
.byte $3c,$8a,$0a,$00
@sfx_ntsc_2:
.byte $80,$ff,$81,$ab,$82,$01,$01,$81,$3c,$01,$81,$9c,$82,$00,$01,$81
.byte $b5,$01,$81,$cb,$01,$80,$30,$00
@sfx_ntsc_3:
.byte $80,$3b,$81,$d5,$82,$00,$06,$80,$3f,$81,$cf,$01,$81,$c9,$01,$81
.byte $c3,$01,$81,$bd,$01,$81,$b7,$01,$81,$b1,$01,$80,$bf,$81,$ab,$01
.byte $81,$a5,$01,$81,$9f,$01,$81,$99,$01,$81,$96,$02,$81,$9a,$01,$81
.byte $9e,$01,$81,$a2,$01,$81,$a6,$01,$81,$aa,$01,$81,$ae,$01,$81,$b2
.byte $01,$81,$b6,$01,$81,$ba,$01,$81,$be,$01,$81,$c2,$01,$81,$c6,$00
@sfx_pal_0:
.byte $80,$7f,$81,$75,$82,$00,$04,$81,$62,$03,$81,$57,$03,$81,$75,$04
.byte $80,$74,$03,$81,$62,$03,$81,$57,$04,$81,$75,$03,$80,$71,$03,$81
.byte $62,$04,$81,$57,$03,$81,$75,$00
@sfx_pal_1:
.byte $89,$3f,$8a,$00,$01,$89,$3e,$8a,$0e,$01,$89,$3d,$8a,$0c,$01,$89
.byte $3c,$8a,$0a,$00
@sfx_pal_2:
.byte $80,$ff,$81,$8c,$82,$01,$01,$81,$26,$01,$81,$91,$82,$00,$01,$81
.byte $a8,$01,$81,$bc,$01,$80,$30,$00
@sfx_pal_3:
.byte $80,$3b,$81,$c6,$82,$00,$05,$80,$3f,$81,$c0,$01,$81,$ba,$01,$81
.byte $b4,$01,$81,$ae,$01,$81,$a8,$01,$80,$bf,$81,$a2,$01,$81,$9c,$01
.byte $81,$96,$01,$81,$90,$01,$81,$8b,$01,$81,$8f,$01,$81,$93,$01,$81
.byte $97,$01,$81,$9b,$01,$81,$9f,$01,$81,$a3,$01,$81,$a7,$01,$81,$ab
.byte $01,$81,$af,$01,$81,$b3,$00