mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-05-23 06:34:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

introduce sound effects enum

Browse Source
This commit is contained in:
Prakxo
2024-01-13 22:51:39 +01:00
parent 8b277a2f19
commit 2012795526
15 changed files with 136 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/audio_defs.h
+102 -3
View File
@@ -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
src/ac_npc_sendo_move.c_inc
+2 -2
View File
@@ -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;
}
}
src/m_bank_ovl.c
+5 -5
View File
@@ -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);
src/m_birthday_ovl.c
+3 -3
View File
@@ -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);
}
}
}
src/m_choice_sound.c_inc
+5 -5
View File
@@ -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));
}
src/m_editEndChk_ovl.c
+3 -3
View File
@@ -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);
}
}
}
src/m_kankyo.c
+2 -2
View File
@@ -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;
}
src/m_map_ovl.c
+1 -1
View File
@@ -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++;
src/m_passwordChk_ovl.c
+1 -1
View File
@@ -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);
src/m_passwordMake_ovl.c
+1 -1
View File
@@ -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);
src/m_repay_ovl.c
+5 -5
View File
@@ -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;
src/m_select.c
+1 -1
View File
@@ -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;
src/m_timeIn_ovl.c
+1 -1
View File
@@ -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) {
src/m_warning_ovl.c
+2 -2
View File
@@ -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);
}
}
}
src/m_watch_my_step.c
+2 -2
View File
@@ -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;