From 41366a1dbc6d99e29837bd7926aa0e8141ffe01e Mon Sep 17 00:00:00 2001 From: SuperDude88 <82904174+SuperDude88@users.noreply.github.com> Date: Sat, 2 Dec 2023 23:03:58 -0500 Subject: [PATCH] Sound IDs Use the enum --- src/d/d_a_race_item_static.cpp | 36 +++++++++++++++++----------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/d/d_a_race_item_static.cpp b/src/d/d_a_race_item_static.cpp index 0613d0a0e..42a1d4166 100644 --- a/src/d/d_a_race_item_static.cpp +++ b/src/d/d_a_race_item_static.cpp @@ -24,31 +24,31 @@ void daRaceItem_c::raceItemForceGet() { void daRaceItem_c::raceItemGet() { switch(m_itemNo) { case GREEN_RUPEE: - mDoAud_seStart(0x826, 0, 0, 0); + mDoAud_seStart(JA_SE_LUPY_GET, 0, 0, 0); dComIfGp_plusMiniGameRupee(1); break; case BLUE_RUPEE: - mDoAud_seStart(0x835, 0, 0, 0); + mDoAud_seStart(JA_SE_BLUE_LUPY_GET, 0, 0, 0); dComIfGp_plusMiniGameRupee(5); break; case YELLOW_RUPEE: - mDoAud_seStart(0x826, 0, 0, 0); + mDoAud_seStart(JA_SE_LUPY_GET, 0, 0, 0); dComIfGp_plusMiniGameRupee(10); break; case RED_RUPEE: - mDoAud_seStart(0x836, 0, 0, 0); + mDoAud_seStart(JA_SE_RED_LUPY_GET, 0, 0, 0); dComIfGp_plusMiniGameRupee(20); break; case PURPLE_RUPEE: - mDoAud_seStart(0x826, 0, 0, 0); + mDoAud_seStart(JA_SE_LUPY_GET, 0, 0, 0); dComIfGp_plusMiniGameRupee(50); break; case ORANGE_RUPEE: - mDoAud_seStart(0x826, 0, 0, 0); + mDoAud_seStart(JA_SE_LUPY_GET, 0, 0, 0); dComIfGp_plusMiniGameRupee(100); break; case SILVER_RUPEE: - mDoAud_seStart(0x826, 0, 0, 0); + mDoAud_seStart(JA_SE_LUPY_GET, 0, 0, 0); dComIfGp_plusMiniGameRupee(200); break; } @@ -63,28 +63,28 @@ void daRaceItem_c::normalItemGet() { switch(m_itemNo) { case GREEN_RUPEE: - mDoAud_seStart(0x826, 0, 0, 0); + mDoAud_seStart(JA_SE_LUPY_GET, 0, 0, 0); break; case BLUE_RUPEE: - mDoAud_seStart(0x835, 0, 0, 0); + mDoAud_seStart(JA_SE_BLUE_LUPY_GET, 0, 0, 0); break; case YELLOW_RUPEE: - mDoAud_seStart(0x836, 0, 0, 0); + mDoAud_seStart(JA_SE_RED_LUPY_GET, 0, 0, 0); break; case RED_RUPEE: - mDoAud_seStart(0x836, 0, 0, 0); + mDoAud_seStart(JA_SE_RED_LUPY_GET, 0, 0, 0); break; case PURPLE_RUPEE: - mDoAud_seStart(0x836, 0, 0, 0); + mDoAud_seStart(JA_SE_RED_LUPY_GET, 0, 0, 0); break; case ORANGE_RUPEE: - mDoAud_seStart(0x836, 0, 0, 0); + mDoAud_seStart(JA_SE_RED_LUPY_GET, 0, 0, 0); break; case S_MAGIC: - mDoAud_seStart(0x836, 0, 0, 0); + mDoAud_seStart(JA_SE_RED_LUPY_GET, 0, 0, 0); break; case L_MAGIC: - mDoAud_seStart(0x879, 0, 0, 0); + mDoAud_seStart(JA_SE_MAGIC_POT_GET_S, 0, 0, 0); break; case BOMB_5: case BOMB_10: @@ -93,13 +93,13 @@ void daRaceItem_c::normalItemGet() { case ARROW_10: case ARROW_20: case ARROW_30: - mDoAud_seStart(0x87A, 0, 0, 0); + mDoAud_seStart(JA_SE_MAGIC_POT_GET_L, 0, 0, 0); break; case SILVER_RUPEE: - mDoAud_seStart(0x827, 0, 0, 0); + mDoAud_seStart(JA_SE_CONSUMP_ITEM_GET, 0, 0, 0); break; case TRIPLE_HEART: - mDoAud_seStart(0x821, 0, 0, 0); + mDoAud_seStart(JA_SE_HEART_PIECE, 0, 0, 0); break; } }