Label surfing minigame SFX

9 files changed, 59 insertions, 32 deletions

diff --git a/audio.asm b/audio.asm
index f37d8580..be132c72 100644
--- a/audio.asm
+++ b/audio.asm
@@ -371,16 +371,16 @@ INCLUDE "audio/sfx/triangle3_4.asm"
 INCLUDE "audio/sfx/muted_snare2_4.asm"
 INCLUDE "audio/sfx/muted_snare3_4.asm"
 INCLUDE "audio/sfx/muted_snare4_4.asm"
-INCLUDE "audio/sfx/unknown_80250.asm"
+INCLUDE "audio/sfx/surfing_add_points.asm"
 INCLUDE "audio/sfx/unknown_80263.asm"
 INCLUDE "audio/sfx/unknown_8026a.asm"
 INCLUDE "audio/sfx/heal_ailment_4.asm"
 INCLUDE "audio/sfx/tink_4.asm"
-INCLUDE "audio/sfx/unknown_8029f.asm"
-INCLUDE "audio/sfx/unknown_802b5.asm"
+INCLUDE "audio/sfx/surfing_jump.asm"
+INCLUDE "audio/sfx/surfing_flip.asm"
 INCLUDE "audio/sfx/unknown_802cc.asm"
-INCLUDE "audio/sfx/unknown_802d7.asm"
-INCLUDE "audio/sfx/unknown_802e1.asm"
+INCLUDE "audio/sfx/surfing_crash.asm"
+INCLUDE "audio/sfx/surfing_land.asm"
 INCLUDE "audio/sfx/get_item2_4_2.asm"
 INCLUDE "audio/sfx/unknown_80337.asm"
 INCLUDE "audio/sfx/unknown_803da.asm"
diff --git a/audio/headers/sfxheaders4.asm b/audio/headers/sfxheaders4.asm
index 16e69e1f..1fdb69ab 100644
--- a/audio/headers/sfxheaders4.asm
+++ b/audio/headers/sfxheaders4.asm
@@ -270,23 +270,23 @@ SFX_Start_Menu_4::
 SFX_PressAB_4::
 	dbw CH7, SFX_80263_4_Ch7
 
-SFX_801b0_4::
-	dbw CH4, SFX_80250_4_Ch4
+SFX_Surfing_Add_Points::
+	dbw CH4, SFX_Surfing_Add_Points_Ch4
 
-SFX_801b3_4::
-	dbw CH7, SFX_8029f_4_Ch7
+SFX_Surfing_Jump::
+	dbw CH7, SFX_Surfing_Jump_Ch7
 
-SFX_801b6_4::
-	dbw CH4, SFX_802b5_4_Ch4
+SFX_Surfing_Flip::
+	dbw CH4, SFX_Surfing_Flip_Ch4
 
-SFX_801b9_4::
-	dbw CH7, SFX_802e1_4_Ch7
+SFX_Surfing_Land::
+	dbw CH7, SFX_Surfing_Land_Ch7
 
 SFX_801bc_4::
 	dbw CH4, SFX_802cc_4_Ch4
 
-SFX_801bf_4::
-	dbw CH7, SFX_802d7_4_Ch7
+SFX_Surfing_Crash::
+	dbw CH7, SFX_Surfing_Crash_Ch7
 
 SFX_Get_Item2_4_2::
 	dbw ( $80 | CH4 ), SFX_Get_Item2_4_2_Ch1
diff --git a/audio/sfx/unknown_80250.asm b/audio/sfx/surfing_add_points.asm
index 4f65a6a0..ea95edf8 100644
--- a/audio/sfx/unknown_80250.asm
+++ b/audio/sfx/surfing_add_points.asm
@@ -1,4 +1,4 @@
-SFX_80250_4_Ch4:
+SFX_Surfing_Add_Points_Ch4:
 	duty 2
 	unknownsfx0x20 0, 145, 192, 7
 	unknownsfx0x20 0, 129, 208, 7
diff --git a/audio/sfx/unknown_802d7.asm b/audio/sfx/surfing_crash.asm
index 4a1f1ab4..88055c35 100755..100644
--- a/audio/sfx/unknown_802d7.asm
+++ b/audio/sfx/surfing_crash.asm
@@ -1,4 +1,4 @@
-SFX_802d7_4_Ch7:
+SFX_Surfing_Crash_Ch7:
 	unknownnoise0x20 2, 241, 50
 	unknownnoise0x20 2, 0, 0
 	unknownnoise0x20 4, 230, 33
diff --git a/audio/sfx/unknown_802b5.asm b/audio/sfx/surfing_flip.asm
index 364443cf..5a135d02 100644
--- a/audio/sfx/unknown_802b5.asm
+++ b/audio/sfx/surfing_flip.asm
@@ -1,4 +1,4 @@
-SFX_802b5_4_Ch4:
+SFX_Surfing_Flip_Ch4:
 	duty 2
 	unknownsfx0x20 3, 196, 96, 7
 	unknownsfx0x20 0, 164, 64, 7
diff --git a/audio/sfx/unknown_8029f.asm b/audio/sfx/surfing_jump.asm
index 475c2813..13fffb64 100755..100644
--- a/audio/sfx/unknown_8029f.asm
+++ b/audio/sfx/surfing_jump.asm
@@ -1,4 +1,4 @@
-SFX_8029f_4_Ch7:
+SFX_Surfing_Jump_Ch7:
 	unknownnoise0x20 6, 241, 17
 	unknownnoise0x20 7, 242, 34
 	unknownnoise0x20 8, 243, 51
diff --git a/audio/sfx/unknown_802e1.asm b/audio/sfx/surfing_land.asm
index e1963b23..028ef16a 100644
--- a/audio/sfx/unknown_802e1.asm
+++ b/audio/sfx/surfing_land.asm
@@ -1,4 +1,4 @@
-SFX_802e1_4_Ch7:
+SFX_Surfing_Land_Ch7:
 	unknownnoise0x20 3, 243, 102
 	unknownnoise0x20 3, 51, 83
 	unknownnoise0x20 7, 245, 81
diff --git a/constants/music_constants.asm b/constants/music_constants.asm
index 955a3899..2fc4a0dc 100644
--- a/constants/music_constants.asm
+++ b/constants/music_constants.asm
@@ -276,10 +276,10 @@ ENDM
 	music_const SFX_SHOOTING_STAR,      SFX_Shooting_Star
 
 	; AUDIO_4
-	music_const SFX_UNKNOWN_801B0_4,       SFX_801b0_4
-	music_const SFX_UNKNOWN_801B3_4,       SFX_801b3_4
-	music_const SFX_UNKNOWN_801B6_4,       SFX_801b6_4
-	music_const SFX_UNKNOWN_801B9_4,       SFX_801b9_4
+	music_const SFX_SURFING_ADD_POINTS,    SFX_Surfing_Add_Points
+	music_const SFX_SURFING_JUMP,          SFX_Surfing_Jump
+	music_const SFX_SURFING_FLIP,          SFX_Surfing_Flip
+	music_const SFX_SURFING_LAND,          SFX_Surfing_Land
 	music_const SFX_UNKNOWN_801BC_4,       SFX_801bc_4
-	music_const SFX_UNKNOWN_801BF_4,       SFX_801bf_4
-	music_const SFX_GET_ITEM2_4_2, SFX_Get_Item2_4_2
+	music_const SFX_SURFING_CRASH,         SFX_Surfing_Crash
+	music_const SFX_GET_ITEM2_4_2, SFX_Get_Item2_4_2
\ No newline at end of file
diff --git a/engine/surfing_minigame.asm b/engine/surfing_minigame.asm
index 380093f1..50d30ec4 100755
--- a/engine/surfing_minigame.asm
+++ b/engine/surfing_minigame.asm
@@ -716,7 +716,7 @@ Func_f848d:
 	ld [wSurfingMinigameTrickFlags], a
 	xor a
 	ld [wChannelSoundIDs + CH7], a
-	ld a, SFX_UNKNOWN_801B3_4
+	ld a, SFX_SURFING_JUMP
 	call PlaySound
 	ret
 
@@ -752,7 +752,7 @@ SurfingMinigame_ScoreCurrentWave:
 	call SetCurrentAnimatedObjectCallbackAndResetFrameStateRegisters
 	xor a
 	ld [wChannelSoundIDs + CH7], a
-	ld a, SFX_UNKNOWN_801B9_4
+	ld a, SFX_SURFING_LAND
 	call PlaySound
 	ret
 
@@ -796,6 +796,33 @@ Func_f8545:
 	ld hl, ANIM_OBJ_Y_COORD
 	add hl, bc
 	ld [hl], a
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+	
 	ret
 
 .asm_f8556
@@ -914,7 +941,7 @@ SurfingMinigame_DPadAction:
 	ld hl, ANIM_OBJ_FIELD_E
 	add hl, bc
 	ld [hl], a
-	ld a, SFX_UNKNOWN_801B6_4
+	ld a, SFX_SURFING_FLIP
 	call PlaySound
 	ret
 
@@ -1011,7 +1038,7 @@ SurfingMinigame_TileInteraction:
 .action_3
 	xor a
 	ld [wChannelSoundIDs + CH7], a
-	ld a, SFX_UNKNOWN_801BF_4
+	ld a, SFX_SURFING_CRASH
 	call PlaySound
 	and a
 	ret
@@ -1559,7 +1586,7 @@ SurfingMinigame_AddRemainingHPToTotal:
 	pop bc
 	dec c
 	jr nz, .loop
-	ld a, SFX_UNKNOWN_801B0_4
+	ld a, SFX_SURFING_ADD_POINTS
 	call PlaySound
 	and a
 	ret
@@ -1621,7 +1648,7 @@ SurfingMinigame_AddRadnessToTotal:
 	pop bc
 	dec c
 	jr nz, .loop
-	ld a, SFX_UNKNOWN_801B0_4
+	ld a, SFX_SURFING_ADD_POINTS
 	call PlaySound
 	and a
 	ret