From bf088f6669163c7feb6a0c4c77331f243119711b Mon Sep 17 00:00:00 2001
From: Nobuo Squidimatsu <squidimatsu@squidworks>
Date: Tue, 17 Nov 2015 23:28:37 -0800
Subject: [PATCH] New sound effects

---
 game.c           |  18 +++++-----
 sound/sounds.ftm | Bin 1577 -> 970 bytes
 sounds.s         |  92 +++++++++++++++++++++--------------------------
 3 files changed, 49 insertions(+), 61 deletions(-)

diff --git a/game.c b/game.c
index 7cd4fb6..2f055a8 100644
--- a/game.c
+++ b/game.c
@@ -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;
diff --git a/sound/sounds.ftm b/sound/sounds.ftm
index b709f459d63b707bc1d873cfa45723476ef0ad72..2cb64acf0051096df14bd6d18ee8cfe0887a1a9b 100644
GIT binary patch
literal 970
zcmcIj+fKqj6g<69Q4uOpV|>xXFYp6Q+CYgUwpJ+bHp+t$!~n+lBmRINsxxQ12tN7Z
zlGB}?ojp6}wDij9V=*u9pT_gEboTH%8Rx!89uMMlD66pzbjnq2MTwlmA`aG!L*@Hf
z?`BP)J9q2EKjEt+?k0nu<fuR{5#C~1&X=-ynUqVJj~6fH+w+CI&1TbgBX%5^cZoed
zcuxG#{QB9j7>v>+D@-HUgL4GS<#5;wyHG~YFK5r=VRAc4vQA<<7-0M4m)iNlXz{_b
zJ@k7e$C`Eu1oPA12O>h~Aj$X}$;&sCd0Z69AhYI#g3rxDWDlI|_|j^t1JoLl@x2NJ
z*i)tspl#c+nugUhttJG}{B5f_u$m*QIYxb<CZbZ`24?nL>Mm@s3D}96`$ULHEkYPI
zD8kW*Grv#+P?iB(7Sx*+!z=VI%&x)J<#lL{4f1v%18(;uY}1$%0EI+uP<6rc0o0lA
zR#Xj_X@}^;q_kBroBoj;Uv}Fx;%uSS0bc~JjY6%~0~hXdS5v9qZr(}HhH;u-n~#Ns
IFeJ&k-<?@JdH?_b

literal 1577
zcmdUu&2G~`6otn)ab13r68;fF5ki73Y}nRn9DzhkaNIo+cu_%Hlm_u8ydIAN=eyVA
zhAk2cMj7jPzPY}0&z;QIrzg#3{qb|VnJ&&hef!c*2O%trx>&42KeQAc@HXt1LP(?m
z2byoH`MVut?8ENDKhm$uVpi6dA5SG;X{Hz3^=2DRw(V)yv=?93-_Kq|@zS>^i3+%a
zCdevL8LOr~UX)ei#e;upQYs^%{`g`m|Mi3JZO_lzRr&t7td7dq@l5LvHFqmberb$(
zQ1V>&qu;J~ENnE1z_cHlhnhB6Wd7yivS^yJuHxaWQ?>QXKhN_{CzCXcCkZFWQZ6PH
z=BB7A8L*Z^O<jeWx(-d*K7v{V_u6A8P}_GKYU(c3)O~15g?Q$%kD&II$57ihg_?Q-
zHT6_#6b_Z@nUp*`7=-7&!n8OzE5j-@J3SM%?pY=*@tjnxeL~z<-$(tvZ?E5n6C*pv
zH7U=|_u{zMi6jg8#B*jr2Vqa11(`-pQJF^0EDK}LDXN;xb5rCL?c5jDC-yy7Yt-hH
zb9k(E#3F9=l-@X18uBVuzb^J>Ppw}@Z}pVUc`SFuJ*RVC_3m}T^*>4M13hQt!|2EU
zF#3@WqaUK3AEKQfqB<ykh)Usys1!XA?fh_xA5QVZWAVc&emKPsr}*I%Kb+!+Q~Yp>
dA5QVZ>7^gD<<VlgDi+JP{@<o<tG%pdzX7QiLEZoW

diff --git a/sounds.s b/sounds.s
index d8dcda4..a3cda85 100644
--- a/sounds.s
+++ b/sounds.s
@@ -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