From 2012795526cb12274de5de7c106c2b9d62584e0b Mon Sep 17 00:00:00 2001 From: Prakxo Date: Sat, 13 Jan 2024 22:51:39 +0100 Subject: [PATCH] introduce sound effects enum --- include/audio_defs.h | 105 ++++++++++++++++++++++++++++++++++-- src/ac_npc_sendo_move.c_inc | 4 +- src/m_bank_ovl.c | 10 ++-- src/m_birthday_ovl.c | 6 +-- src/m_choice_sound.c_inc | 10 ++-- src/m_editEndChk_ovl.c | 6 +-- src/m_kankyo.c | 4 +- src/m_map_ovl.c | 2 +- src/m_passwordChk_ovl.c | 2 +- src/m_passwordMake_ovl.c | 2 +- src/m_repay_ovl.c | 10 ++-- src/m_select.c | 2 +- src/m_timeIn_ovl.c | 2 +- src/m_warning_ovl.c | 4 +- src/m_watch_my_step.c | 4 +- 15 files changed, 136 insertions(+), 37 deletions(-) diff --git a/include/audio_defs.h b/include/audio_defs.h index 0259be88..72f4ad01 100644 --- a/include/audio_defs.h +++ b/include/audio_defs.h @@ -9,12 +9,111 @@ extern "C" { /* audio is monophonic */ #define MONO(id) (id | 0x1000) +#define SE_FLAG_15(id) (id | 0x8000) -#define SE_CURSOR_MOVE 0x01 -#define SE_MENU_EXIT 0x02 -#define SE_COIN 0x4C +//TODO: Make the rest of Sound Effects with parameters #define SE_REGISTER MONO(0x50) +typedef enum audio_sound_effects{ + NA_SE_START, + NA_SE_CURSOL, + NA_SE_MENU_EXIT, + + NA_SE_ZOOMUP = 4, + NA_SE_ZOOMDOWN_SHORT, + + NA_SE_PAGE_OKURI = 0xB, + + NA_SE_SENTAKU_OPEN, + NA_SE_SENTAKU_KETTEI, + + NA_SE_ZOOMDOWN_LONG = 0x15, + NA_SE_LIGHT_ON, + NA_SE_LIGHT_OFF, + + NA_SE_ITEM_GET = 0x40, + NA_SE_ITEM_HORIDASHI = 0x47, + + NA_SE_MONEY0 = 0x49, + NA_SE_MONEY1, + NA_SE_MONEY2, + NA_SE_COIN, + + NA_SE_TOOL_FURI = 0x5A, // swing? + NA_SE_AMI_HIT = 0x5C, + NA_SE_TOOL_GET, + + NA_SE_GASAGOSO = 0x69, + + NA_SE_TOILE_CHAIR_STANDUP = 0x72, + + NA_SE_TOOL_BROKEN1 = 0x74, + NA_SE_TOOL_BROKEN2, + NA_SE_TOOL_BROKEN3, + + NA_SE_ROD_STROKE = 0x109, + NA_SE_ROD_BACK, + + NA_SE_WEAR = 0x11C, + + NA_SE_SCOOP1 = 0x11E, + + NA_SE_SCOOP_UMERU = 0x120, + NA_SE_SCOOP_HIT, + + NA_SE_TREE_TOUCH = 0x134, + NA_SE_TREE_YURASU, + + NA_SE_KIRIBASU_SCOOP = 0x148, + NA_SE_KIRIBASU_OUT, + + NA_SE_SOUND_KNOCK, + + NA_SE_ARAIIKI_BOY = 0x158, + NA_sE_ARAIIKI_GIRL = 0x15A, + + NA_SE_ZASSOU_NUKU = 0x15F, + NA_SE_HACHI_SASARERU, + + NA_SE_UCHIWA = 0x167, + + NA_SE_SCOOP_SHIGEMI = 0x401, + + NA_SE_CAMERA_MOVE1 = 0x40D, + NA_SE_CAMERA_MOVE2, + + NA_SE_TOILE_CHAIR_SIT = 0x410, + + NA_SE_BED_IN = 0x415, + NA_SE_BED_NEGAERI, + NA_SE_BED_OUT, + + NA_SE_SOFT_CHAIR_SIT = 0x41F, + NA_SE_HARD_CHAIR_SIT, + NA_SE_BUBU_CHAIR_SIT, + NA_SE_SOFT_CHAIR_STANDUP, + NA_SE_HARD_CHAIR_STANDUP, + + NA_SE_BUBU_CHAIR_STANDUP = 0x429, + NA_SE_DAI_UE_KAKUNOU = 0x430, + + NA_SE_UMBRELLA_ROTATE = 0x432, + + NA_SE_JUMP, + NA_SE_LANDING, + + NA_SE_KARABURI = 0x43A, + + NA_SE_ROD_STROKE_SMALL = 0x445, + + NA_SE_SCOOP_TREE_HIT = 0x448, + NA_SE_SCOOP_ITEM_HIT, + NA_SE_AXE_BALL_HIT, + + NA_SE_COIN_GASAGOSO = 0x465, + +}AudioSE; + #ifdef __cplusplus } #endif diff --git a/src/ac_npc_sendo_move.c_inc b/src/ac_npc_sendo_move.c_inc index 9971eb67..5a244707 100644 --- a/src/ac_npc_sendo_move.c_inc +++ b/src/ac_npc_sendo_move.c_inc @@ -502,13 +502,13 @@ static int aSEN_get_msg_no(NPC_SENDO_ACTOR* sendo, int msg_no) { static void aSEN_agb_trans_se_proc(NPC_SENDO_ACTOR* sendo, int enable) { if (enable == TRUE) { if (sendo->agb_trans_se == FALSE) { - sAdo_SysLevStart(0x47); + sAdo_SysLevStart(NA_SE_ITEM_HORIDASHI); sendo->agb_trans_se = TRUE; } } else { if (sendo->agb_trans_se == TRUE) { - sAdo_SysLevStop(0x47); + sAdo_SysLevStop(NA_SE_ITEM_HORIDASHI); sendo->agb_trans_se = FALSE; } } diff --git a/src/m_bank_ovl.c b/src/m_bank_ovl.c index 9999feb1..5da26139 100644 --- a/src/m_bank_ovl.c +++ b/src/m_bank_ovl.c @@ -124,7 +124,7 @@ static void mBN_bank_ok(Submenu* submenu, mSM_MenuInfo_c* menu, mBN_Overlay_c* b Common_Get(now_private)->inventory.wallet = bank_ovl->now_bell; (*submenu->overlay->move_chg_base_proc)(menu, mSM_MOVE_OUT_TOP); - sAdo_SysTrgStart(SE_MENU_EXIT); + sAdo_SysTrgStart(NA_SE_MENU_EXIT); } } @@ -139,7 +139,7 @@ static void mBN_move_Play(Submenu* submenu, mSM_MenuInfo_c* menu) { if (trigger & BUTTON_B) { (*overlay->move_chg_base_proc)(menu, mSM_MOVE_OUT_TOP); - sAdo_SysTrgStart(SE_MENU_EXIT); + sAdo_SysTrgStart(NA_SE_MENU_EXIT); } else if (trigger & BUTTON_START) { mBN_bank_ok(submenu, menu, bank_ovl); @@ -153,16 +153,16 @@ static void mBN_move_Play(Submenu* submenu, mSM_MenuInfo_c* menu) { } else if (trigger & (BUTTON_CLEFT | BUTTON_CUP)) { bank_ovl->cursol = cursol - 1; - sAdo_SysTrgStart(SE_CURSOR_MOVE); + sAdo_SysTrgStart(NA_SE_CURSOL); } } else if ((trigger & BUTTON_CLEFT) && cursol > 0) { bank_ovl->cursol = cursol - 1; - sAdo_SysTrgStart(SE_CURSOR_MOVE); + sAdo_SysTrgStart(NA_SE_CURSOL); } else if (trigger & BUTTON_CRIGHT) { bank_ovl->cursol += 1; - sAdo_SysTrgStart(SE_CURSOR_MOVE); + sAdo_SysTrgStart(NA_SE_CURSOL); } else if ((trigger & BUTTON_CDOWN) || (trigger & BUTTON_CUP)) { int keta = mBN_cursol_2_keta(cursol); diff --git a/src/m_birthday_ovl.c b/src/m_birthday_ovl.c index a06db759..b74d98f1 100644 --- a/src/m_birthday_ovl.c +++ b/src/m_birthday_ovl.c @@ -12,7 +12,7 @@ static void mBR_window_close(Submenu* submenu, mSM_MenuInfo_c* menu_info, mBR_Ov (*submenu->overlay->move_chg_base_proc)(menu_info, mSM_MOVE_OUT_TOP); Common_Get(now_private)->birthday.month = data_p[mBR_Ovl_IDX_MONTH]; Common_Get(now_private)->birthday.day = data_p[mBR_Ovl_IDX_DAY]; - sAdo_SysTrgStart(2); + sAdo_SysTrgStart(NA_SE_MENU_EXIT); } static void mBR_move_Move(Submenu* submenu, mSM_MenuInfo_c* menu_info) { @@ -43,7 +43,7 @@ static void mBR_move_Play(Submenu* submenu, mSM_MenuInfo_c* menu_info) { } else { (*idx_p)++; - sAdo_SysTrgStart(0xD); + sAdo_SysTrgStart(NA_SE_SENTAKU_KETTEI); } } else if ((trigger & (BUTTON_CUP | BUTTON_CDOWN))) { @@ -83,7 +83,7 @@ static void mBR_move_Play(Submenu* submenu, mSM_MenuInfo_c* menu_info) { } } - sAdo_SysTrgStart(1); + sAdo_SysTrgStart(NA_SE_CURSOL); } } } diff --git a/src/m_choice_sound.c_inc b/src/m_choice_sound.c_inc index 978a0bf8..86f8c2a1 100644 --- a/src/m_choice_sound.c_inc +++ b/src/m_choice_sound.c_inc @@ -1,19 +1,19 @@ static void mChoice_sound_SENTAKU_KETTEI() { - sAdo_SysTrgStart(0xD); + sAdo_SysTrgStart(NA_SE_SENTAKU_KETTEI); } static void mChoice_sound_SENTAKU_OPEN() { - sAdo_SysTrgStart(0xC); + sAdo_SysTrgStart(NA_SE_SENTAKU_OPEN); } static void mChoice_sound_CURSOL() { - sAdo_SysTrgStart(0x1); + sAdo_SysTrgStart(NA_SE_CURSOL); } static void mChoice_sound_ZOOMDOWN_SHORT() { - sAdo_SysTrgStart(0x8005); + sAdo_SysTrgStart(SE_FLAG_15(NA_SE_ZOOMDOWN_SHORT)); } static void mChoice_sound_ZOOMDOWN_LONG() { - sAdo_SysTrgStart(0x8015); + sAdo_SysTrgStart(SE_FLAG_15(NA_SE_ZOOMDOWN_LONG)); } diff --git a/src/m_editEndChk_ovl.c b/src/m_editEndChk_ovl.c index 2cdacaeb..ece4f7ca 100644 --- a/src/m_editEndChk_ovl.c +++ b/src/m_editEndChk_ovl.c @@ -103,7 +103,7 @@ static void mEE_move_Play(Submenu* submenu, mSM_MenuInfo_c* menu_info) { sAdo_SysTrgStart(0x1003); } else { - sAdo_SysTrgStart(0x2); + sAdo_SysTrgStart(NA_SE_MENU_EXIT); } } else if (editEndChk_ovl->moving_in == TRUE) { @@ -116,13 +116,13 @@ static void mEE_move_Play(Submenu* submenu, mSM_MenuInfo_c* menu_info) { if ((trigger & BUTTON_CUP)) { if (editEndChk_ovl->selected_answer != 0) { editEndChk_ovl->selected_answer--; - sAdo_SysTrgStart(0x1); + sAdo_SysTrgStart(NA_SE_CURSOL); } } else if ((trigger & BUTTON_CDOWN)) { if (editEndChk_ovl->selected_answer < max_answer_no) { editEndChk_ovl->selected_answer++; - sAdo_SysTrgStart(0x1); + sAdo_SysTrgStart(NA_SE_CURSOL); } } } diff --git a/src/m_kankyo.c b/src/m_kankyo.c index 49cb8c37..257465c7 100644 --- a/src/m_kankyo.c +++ b/src/m_kankyo.c @@ -2052,7 +2052,7 @@ extern int mEnv_RequestChangeLightON(GAME_PLAY* play, int light_on_type, int pla l_mEnv_electric_light.light_anime_frame = 0; if (play_sfx == TRUE) { - sAdo_SysTrgStart(0x16); + sAdo_SysTrgStart(NA_SE_LIGHT_ON); } } @@ -2069,7 +2069,7 @@ extern int mEnv_RequestChangeLightOFF(GAME_PLAY* play, int light_off_type, f32 s if (light_off_type == mEnv_LIGHT_TYPE_PLAYER) { PLAYER_ACTOR* player = get_player_actor_withoutCheck(play); // unused - sAdo_SysTrgStart(0x17); + sAdo_SysTrgStart(NA_SE_LIGHT_OFF); } return TRUE; } diff --git a/src/m_map_ovl.c b/src/m_map_ovl.c index 73fabd1c..bf107cc2 100644 --- a/src/m_map_ovl.c +++ b/src/m_map_ovl.c @@ -866,7 +866,7 @@ static void mMP_move_Play(Submenu* submenu, mSM_MenuInfo_c* menu) { if (cursor_moved == TRUE) { menu->proc_status = 2; // TODO: enum & name - sAdo_SysTrgStart(1); + sAdo_SysTrgStart(NA_SE_CURSOL); } map_ovl->cursor_frame++; diff --git a/src/m_passwordChk_ovl.c b/src/m_passwordChk_ovl.c index c4598ed1..3808a1a7 100644 --- a/src/m_passwordChk_ovl.c +++ b/src/m_passwordChk_ovl.c @@ -17,7 +17,7 @@ static void mPC_move_Obey(Submenu* submenu, mSM_MenuInfo_c* menu_info) { if (submenu->overlay->menu_info[mSM_OVL_EDITOR].next_proc_status == mSM_PROCESS_END) { (*submenu->overlay->move_chg_base_proc)(menu_info, mSM_PROCESS_END); // close this submenu overlay too - sAdo_SysTrgStart(2); + sAdo_SysTrgStart(NA_SE_MENU_EXIT); passwordChk_ovl = submenu->overlay->passwordChk_ovl; mem_copy( (u8*)menu_info->data2, passwordChk_ovl->line0, mPC_STR_SIZE); mem_copy((u8*)menu_info->data2 + mPC_STR_SIZE, passwordChk_ovl->line1, mPC_STR_SIZE); diff --git a/src/m_passwordMake_ovl.c b/src/m_passwordMake_ovl.c index 98cee5d4..f6a13bbb 100644 --- a/src/m_passwordMake_ovl.c +++ b/src/m_passwordMake_ovl.c @@ -18,7 +18,7 @@ static void mPM_move_Obey(Submenu* submenu, mSM_MenuInfo_c* menu_info) { if (submenu->overlay->menu_info[mSM_OVL_EDITOR].next_proc_status == mSM_PROCESS_END) { (*submenu->overlay->move_chg_base_proc)(menu_info, mSM_PROCESS_END); // close this submenu overlay too - sAdo_SysTrgStart(2); + sAdo_SysTrgStart(NA_SE_MENU_EXIT); dst = (u8*)menu_info->data2; passwordMake_ovl = submenu->overlay->passwordMake_ovl; mem_copy( dst, passwordMake_ovl->town_name, LAND_NAME_SIZE); diff --git a/src/m_repay_ovl.c b/src/m_repay_ovl.c index 70dbdffc..a0f233f5 100644 --- a/src/m_repay_ovl.c +++ b/src/m_repay_ovl.c @@ -69,7 +69,7 @@ static void mRP_move_Play(Submenu* submenu, mSM_MenuInfo_c* menu_info) { if ((trigger & BUTTON_B)) { (*submenu->overlay->move_chg_base_proc)(menu_info, mSM_MOVE_OUT_TOP); - sAdo_SysTrgStart(2); + sAdo_SysTrgStart(NA_SE_MENU_EXIT); } else if (repay_ovl->cursor_idx >= mRP_CURSOR_OK || (trigger & BUTTON_START)) { if ((trigger & BUTTON_A) || (trigger & BUTTON_START)) { @@ -80,20 +80,20 @@ static void mRP_move_Play(Submenu* submenu, mSM_MenuInfo_c* menu_info) { } (*submenu->overlay->move_chg_base_proc)(menu_info, mSM_MOVE_OUT_TOP); - sAdo_SysTrgStart(2); + sAdo_SysTrgStart(NA_SE_MENU_EXIT); } else if ((trigger & (BUTTON_CUP | BUTTON_CLEFT))) { repay_ovl->cursor_idx--; - sAdo_SysTrgStart(1); + sAdo_SysTrgStart(NA_SE_CURSOL); } } else if (repay_ovl->cursor_idx != 0 && (trigger & BUTTON_CLEFT)) { repay_ovl->cursor_idx--; - sAdo_SysTrgStart(1); + sAdo_SysTrgStart(NA_SE_CURSOL); } else if ((trigger & BUTTON_CRIGHT)) { repay_ovl->cursor_idx++; - sAdo_SysTrgStart(1); + sAdo_SysTrgStart(NA_SE_CURSOL); } else if ((trigger & (BUTTON_CDOWN | BUTTON_CUP))) { u32 repay_amount = repay_ovl->repay_amount; diff --git a/src/m_select.c b/src/m_select.c index cfb9af4b..2333a593 100644 --- a/src/m_select.c +++ b/src/m_select.c @@ -544,7 +544,7 @@ static void select_course_step(GAME_SELECT* select, int step_add) { if (ABS(new_step) >= 32) { int course = select->selected_course; - sAdo_SysTrgStart(1); + sAdo_SysTrgStart(NA_SE_CURSOL); if (new_step > 0) { new_step = 0; diff --git a/src/m_timeIn_ovl.c b/src/m_timeIn_ovl.c index b78acde3..1b949ab8 100644 --- a/src/m_timeIn_ovl.c +++ b/src/m_timeIn_ovl.c @@ -106,7 +106,7 @@ static void mTI_window_close(Submenu* submenu, mSM_MenuInfo_c* menu_info) { lbRTC_GetTime(Common_GetPointer(old_time)); } - sAdo_SysTrgStart(2); + sAdo_SysTrgStart(NA_SE_MENU_EXIT); } static void mTI_move_Move(Submenu* submenu, mSM_MenuInfo_c* menu_info) { diff --git a/src/m_warning_ovl.c b/src/m_warning_ovl.c index b69b7587..8b8c508f 100644 --- a/src/m_warning_ovl.c +++ b/src/m_warning_ovl.c @@ -290,13 +290,13 @@ static void mWR_move_Play(Submenu* submenu, mSM_MenuInfo_c* menu_info) { if ((trigger & BUTTON_CLEFT) != 0) { if (warning_ovl->selected == 1) { warning_ovl->selected = 0; - sAdo_SysTrgStart(1); + sAdo_SysTrgStart(NA_SE_CURSOL); } } else if ((trigger & BUTTON_CRIGHT) != 0) { if (warning_ovl->selected == 0) { warning_ovl->selected = 1; - sAdo_SysTrgStart(1); + sAdo_SysTrgStart(NA_SE_CURSOL); } } } diff --git a/src/m_watch_my_step.c b/src/m_watch_my_step.c index b3947350..7a1685e0 100644 --- a/src/m_watch_my_step.c +++ b/src/m_watch_my_step.c @@ -441,14 +441,14 @@ static void mWt_set_coin_se(int play_flag) { if (play_flag == FALSE) { if (S_se_play_flg == TRUE) { - sAdo_SysLevStop(SE_COIN); // TODO: enum for sound effects + sAdo_SysLevStop(NA_SE_COIN); // TODO: enum for sound effects S_mybell_conf.update_money = FALSE; S_mybell_conf.play_finish_sfx = FALSE; S_mybell_conf.coin_sfx_timer = 0; } } else if (S_se_play_flg == FALSE) { - sAdo_SysLevStart(SE_COIN); + sAdo_SysLevStart(NA_SE_COIN); S_mybell_conf.update_money = TRUE; S_mybell_conf.play_finish_sfx = FALSE; S_mybell_conf.coin_sfx_timer = 300;