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

rename NA_COMMAND_AUDIO_GROUP_SET_MASK to NA_COMMAND_AUDIO_GROUP_SET_APPLY_SUBTRACK_MASK

Browse Source
This commit is contained in:
roeming
2025-04-18 18:37:56 -04:00
parent 07314b05c4
commit 535a724a55
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/jaudio_NES/audiocommon.h
+1 -1
View File
@@ -281,7 +281,7 @@ typedef enum AUDIO_CALLBACKS {
#define NA_COMMAND_AUDIO_GROUP_SET_PORT(group, port, value) \
Nap_SetS8(NA_MAKE_COMMAND(AUDIOCMD_OP_GRP_SET_PORT, group, 0, port), value)
#define NA_COMMAND_AUDIO_GROUP_SET_MASK(group, mask) \
#define NA_COMMAND_AUDIO_GROUP_SET_APPLY_SUBTRACK_MASK(group, mask) \
Nap_SetU16(NA_MAKE_COMMAND(AUDIOCMD_SET_GROUP_MASK, group, 0, 0), mask)
#define NA_COMMAND_AUDIO_SUBTRACK_SET_FILTER(group, subtrack, filterCutoff, pFilter) \
src/static/jaudio_NES/game/game64.c_inc
+8 -8
View File
@@ -644,7 +644,7 @@ u8 Sou_BgmTenkiConv(u8 id) {
if (id >= 1 && id <= 24) {
switch (sou_tenki) {
case 0: {
NA_COMMAND_AUDIO_GROUP_SET_MASK(sou_now_bgm_handle, BGM_MUTE_TABLE_FINE[id - 1]);
NA_COMMAND_AUDIO_GROUP_SET_APPLY_SUBTRACK_MASK(sou_now_bgm_handle, BGM_MUTE_TABLE_FINE[id - 1]);
NA_COMMAND_AUDIO_SUBTRACK_SET_MUTE(sou_now_bgm_handle, AUDIOCMD_ALL_SUBTRACKS, TRUE);
} break;
@@ -652,11 +652,11 @@ u8 Sou_BgmTenkiConv(u8 id) {
id = 0x45;
} break;
case 2: {
NA_COMMAND_AUDIO_GROUP_SET_MASK(sou_now_bgm_handle, BGM_MUTE_TABLE_SNOW[id - 1]);
NA_COMMAND_AUDIO_GROUP_SET_APPLY_SUBTRACK_MASK(sou_now_bgm_handle, BGM_MUTE_TABLE_SNOW[id - 1]);
NA_COMMAND_AUDIO_SUBTRACK_SET_MUTE(sou_now_bgm_handle, AUDIOCMD_ALL_SUBTRACKS, TRUE);
} break;
case 3: {
NA_COMMAND_AUDIO_GROUP_SET_MASK(sou_now_bgm_handle, BGM_MUTE_TABLE_SAKURA[id - 1]);
NA_COMMAND_AUDIO_GROUP_SET_APPLY_SUBTRACK_MASK(sou_now_bgm_handle, BGM_MUTE_TABLE_SAKURA[id - 1]);
NA_COMMAND_AUDIO_SUBTRACK_SET_MUTE(sou_now_bgm_handle, AUDIOCMD_ALL_SUBTRACKS, TRUE);
} break;
case 4:
@@ -3578,11 +3578,11 @@ extern void Na_TTKK_ARM(u8 a) {
extern void Na_BgmMuteClear() {
u8 unused = 0;
if (sou_now_bgm_handle == 1) {
NA_COMMAND_AUDIO_GROUP_SET_MASK(1, AUDIO_GROUP_ALL_SUBTRACKS);
NA_COMMAND_AUDIO_GROUP_SET_APPLY_SUBTRACK_MASK(1, AUDIO_GROUP_ALL_SUBTRACKS);
NA_COMMAND_AUDIO_SUBTRACK_SET_MUTE(1, AUDIOCMD_ALL_SUBTRACKS, FALSE);
} else {
NA_COMMAND_AUDIO_GROUP_SET_MASK(3, AUDIO_GROUP_ALL_SUBTRACKS);
NA_COMMAND_AUDIO_GROUP_SET_APPLY_SUBTRACK_MASK(3, AUDIO_GROUP_ALL_SUBTRACKS);
NA_COMMAND_AUDIO_SUBTRACK_SET_MUTE(3, AUDIOCMD_ALL_SUBTRACKS, FALSE);
}
}
@@ -3953,10 +3953,10 @@ extern void Na_BGMFilter(u8 filterStatus) {
status = filterStatus;
firStatus = SOU_FIR_STATE;
if (sou_now_bgm_handle == 1) {
NA_COMMAND_AUDIO_GROUP_SET_MASK(1, AUDIO_GROUP_ALL_SUBTRACKS);
NA_COMMAND_AUDIO_GROUP_SET_APPLY_SUBTRACK_MASK(1, AUDIO_GROUP_ALL_SUBTRACKS);
NA_COMMAND_AUDIO_SUBTRACK_SET_FILTER(1, AUDIO_GROUP_ALL_SUBTRACKS, status, firStatus);
} else {
NA_COMMAND_AUDIO_GROUP_SET_MASK(3, AUDIO_GROUP_ALL_SUBTRACKS);
NA_COMMAND_AUDIO_GROUP_SET_APPLY_SUBTRACK_MASK(3, AUDIO_GROUP_ALL_SUBTRACKS);
NA_COMMAND_AUDIO_SUBTRACK_SET_FILTER(3, AUDIO_GROUP_ALL_SUBTRACKS, status, firStatus);
}
}
@@ -3992,7 +3992,7 @@ extern u8 Na_CheckNeosBoot() {
extern void Na_Museum(u8 museumType) {
if (sou_museum_type != museumType) {
Na_BgmMuteClear();
NA_COMMAND_AUDIO_GROUP_SET_MASK(sou_now_bgm_handle, BGM_MUTE_TABLE_MUSEUM[museumType]);
NA_COMMAND_AUDIO_GROUP_SET_APPLY_SUBTRACK_MASK(sou_now_bgm_handle, BGM_MUTE_TABLE_MUSEUM[museumType]);
NA_COMMAND_AUDIO_SUBTRACK_SET_MUTE(sou_now_bgm_handle, AUDIOCMD_ALL_SUBTRACKS, TRUE);
sou_museum_type = museumType;
}