From 41bc3a65c4c3dc8bdb25a19acdce55f05a3895e3 Mon Sep 17 00:00:00 2001 From: Amber Brault Date: Fri, 11 Oct 2019 11:34:08 -0400 Subject: Label surfing minigame SFX --- audio.asm | 10 +++++----- audio/headers/sfxheaders4.asm | 20 ++++++++++---------- audio/sfx/surfing_add_points.asm | 7 +++++++ audio/sfx/surfing_crash.asm | 6 ++++++ audio/sfx/surfing_flip.asm | 8 ++++++++ audio/sfx/surfing_jump.asm | 10 ++++++++++ audio/sfx/surfing_land.asm | 6 ++++++ audio/sfx/unknown_80250.asm | 7 ------- audio/sfx/unknown_8029f.asm | 10 ---------- audio/sfx/unknown_802b5.asm | 8 -------- audio/sfx/unknown_802d7.asm | 6 ------ audio/sfx/unknown_802e1.asm | 6 ------ constants/music_constants.asm | 12 ++++++------ engine/surfing_minigame.asm | 39 +++++++++++++++++++++++++++++++++------ 14 files changed, 91 insertions(+), 64 deletions(-) create mode 100644 audio/sfx/surfing_add_points.asm create mode 100644 audio/sfx/surfing_crash.asm create mode 100644 audio/sfx/surfing_flip.asm create mode 100644 audio/sfx/surfing_jump.asm create mode 100644 audio/sfx/surfing_land.asm delete mode 100644 audio/sfx/unknown_80250.asm delete mode 100755 audio/sfx/unknown_8029f.asm delete mode 100644 audio/sfx/unknown_802b5.asm delete mode 100755 audio/sfx/unknown_802d7.asm delete mode 100644 audio/sfx/unknown_802e1.asm 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/surfing_add_points.asm b/audio/sfx/surfing_add_points.asm new file mode 100644 index 00000000..ea95edf8 --- /dev/null +++ b/audio/sfx/surfing_add_points.asm @@ -0,0 +1,7 @@ +SFX_Surfing_Add_Points_Ch4: + duty 2 + unknownsfx0x20 0, 145, 192, 7 + unknownsfx0x20 0, 129, 208, 7 + unknownsfx0x20 0, 145, 192, 7 + unknownsfx0x20 12, 161, 208, 7 + endchannel diff --git a/audio/sfx/surfing_crash.asm b/audio/sfx/surfing_crash.asm new file mode 100644 index 00000000..88055c35 --- /dev/null +++ b/audio/sfx/surfing_crash.asm @@ -0,0 +1,6 @@ +SFX_Surfing_Crash_Ch7: + unknownnoise0x20 2, 241, 50 + unknownnoise0x20 2, 0, 0 + unknownnoise0x20 4, 230, 33 + endchannel + diff --git a/audio/sfx/surfing_flip.asm b/audio/sfx/surfing_flip.asm new file mode 100644 index 00000000..5a135d02 --- /dev/null +++ b/audio/sfx/surfing_flip.asm @@ -0,0 +1,8 @@ +SFX_Surfing_Flip_Ch4: + duty 2 + unknownsfx0x20 3, 196, 96, 7 + unknownsfx0x20 0, 164, 64, 7 + unknownsfx0x20 2, 196, 64, 7 + unknownsfx0x20 0, 164, 96, 7 + unknownsfx0x20 15, 193, 96, 7 + endchannel diff --git a/audio/sfx/surfing_jump.asm b/audio/sfx/surfing_jump.asm new file mode 100644 index 00000000..13fffb64 --- /dev/null +++ b/audio/sfx/surfing_jump.asm @@ -0,0 +1,10 @@ +SFX_Surfing_Jump_Ch7: + unknownnoise0x20 6, 241, 17 + unknownnoise0x20 7, 242, 34 + unknownnoise0x20 8, 243, 51 + unknownnoise0x20 9, 244, 66 + unknownnoise0x20 10, 245, 51 + unknownnoise0x20 11, 246, 34 + unknownnoise0x20 12, 247, 17 + endchannel + diff --git a/audio/sfx/surfing_land.asm b/audio/sfx/surfing_land.asm new file mode 100644 index 00000000..028ef16a --- /dev/null +++ b/audio/sfx/surfing_land.asm @@ -0,0 +1,6 @@ +SFX_Surfing_Land_Ch7: + unknownnoise0x20 3, 243, 102 + unknownnoise0x20 3, 51, 83 + unknownnoise0x20 7, 245, 81 + endchannel + diff --git a/audio/sfx/unknown_80250.asm b/audio/sfx/unknown_80250.asm deleted file mode 100644 index 4f65a6a0..00000000 --- a/audio/sfx/unknown_80250.asm +++ /dev/null @@ -1,7 +0,0 @@ -SFX_80250_4_Ch4: - duty 2 - unknownsfx0x20 0, 145, 192, 7 - unknownsfx0x20 0, 129, 208, 7 - unknownsfx0x20 0, 145, 192, 7 - unknownsfx0x20 12, 161, 208, 7 - endchannel diff --git a/audio/sfx/unknown_8029f.asm b/audio/sfx/unknown_8029f.asm deleted file mode 100755 index 475c2813..00000000 --- a/audio/sfx/unknown_8029f.asm +++ /dev/null @@ -1,10 +0,0 @@ -SFX_8029f_4_Ch7: - unknownnoise0x20 6, 241, 17 - unknownnoise0x20 7, 242, 34 - unknownnoise0x20 8, 243, 51 - unknownnoise0x20 9, 244, 66 - unknownnoise0x20 10, 245, 51 - unknownnoise0x20 11, 246, 34 - unknownnoise0x20 12, 247, 17 - endchannel - diff --git a/audio/sfx/unknown_802b5.asm b/audio/sfx/unknown_802b5.asm deleted file mode 100644 index 364443cf..00000000 --- a/audio/sfx/unknown_802b5.asm +++ /dev/null @@ -1,8 +0,0 @@ -SFX_802b5_4_Ch4: - duty 2 - unknownsfx0x20 3, 196, 96, 7 - unknownsfx0x20 0, 164, 64, 7 - unknownsfx0x20 2, 196, 64, 7 - unknownsfx0x20 0, 164, 96, 7 - unknownsfx0x20 15, 193, 96, 7 - endchannel diff --git a/audio/sfx/unknown_802d7.asm b/audio/sfx/unknown_802d7.asm deleted file mode 100755 index 4a1f1ab4..00000000 --- a/audio/sfx/unknown_802d7.asm +++ /dev/null @@ -1,6 +0,0 @@ -SFX_802d7_4_Ch7: - unknownnoise0x20 2, 241, 50 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 4, 230, 33 - endchannel - diff --git a/audio/sfx/unknown_802e1.asm b/audio/sfx/unknown_802e1.asm deleted file mode 100644 index e1963b23..00000000 --- a/audio/sfx/unknown_802e1.asm +++ /dev/null @@ -1,6 +0,0 @@ -SFX_802e1_4_Ch7: - unknownnoise0x20 3, 243, 102 - unknownnoise0x20 3, 51, 83 - unknownnoise0x20 7, 245, 81 - endchannel - 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 -- cgit v1.2.3