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

Merge pull request #465 from roeming/master

Browse Source 
renaming variables in game64
This commit is contained in:
Cuyler36
2025-04-18 19:19:55 -04:00
committed by GitHub
parent 5b2ab7e624 535a724a55
commit abebf12b19
4 changed files with 914 additions and 878 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/jaudio_NES/audiocommon.h
+43 -3
View File
@@ -116,10 +116,10 @@ typedef enum SoundOutputMode {
} SoundOutputMode;
typedef enum SampleCodec {
/* 0 */ CODEC_ADPCM, // 16 2-byte samples (32 bytes) compressed into 4-bit samples (8 bytes) + 1 header byte
/* 1 */ CODEC_S8, // 16 2-byte samples (32 bytes) compressed into 8-bit samples (16 bytes)
/* 0 */ CODEC_ADPCM, // 16 2-byte samples (32 bytes) compressed into 4-bit samples (8 bytes) + 1 header byte
/* 1 */ CODEC_S8, // 16 2-byte samples (32 bytes) compressed into 8-bit samples (16 bytes)
/* 2 */ CODEC_S16_INMEMORY,
/* 3 */ CODEC_SMALL_ADPCM, // 16 2-byte samples (32 bytes) compressed into 2-bit samples (4 bytes) + 1 header byte
/* 3 */ CODEC_SMALL_ADPCM, // 16 2-byte samples (32 bytes) compressed into 2-bit samples (4 bytes) + 1 header byte
/* 4 */ CODEC_REVERB,
/* 5 */ CODEC_S16
} SampleCodec;
@@ -247,6 +247,46 @@ typedef enum AUDIO_CALLBACKS {
/* 0xFF */ AUDIO_CALLBACK_SOUND
} AUDIO_CALLBACKS;
#define NA_COMMAND_AUDIO_START_SEQ(groupID, seqID, fadeinTime) \
Nap_SetS32(NA_MAKE_COMMAND(AUDIOCMD_START_SEQ, groupID, seqID, 0), fadeinTime)
#define NA_COMMAND_AUDIO_STOP_SEQ(groupID, fadeoutTime) \
Nap_SetS32(NA_MAKE_COMMAND(AUDIOCMD_STOP_SEQ, groupID, 0, 0), fadeoutTime)
#define NA_COMMAND_AUDIO_GRP_FADE_VOLUME_SCALE(groupID, volumeScale) \
Nap_SetF32(NA_MAKE_COMMAND(AUDIOCMD_OP_GRP_FADE_VOLUME_SCALE, groupID, 0, 0), volumeScale)
#define NA_COMMAND_AUDIO_SET_SOUND_MODE(mode) Nap_SetS32(NA_MAKE_COMMAND(AUDIOCMD_SET_SOUND_MODE, 0, 0, 0), mode)
#define NA_COMMAND_AUDIO_CLEAR_STAY_CACHE(type) Nap_SetS32(NA_MAKE_COMMAND(AUDIOCMD_CLEAR_STAY_CACHE, 0, 0, 0), type)
#define NA_COMMAND_AUDIO_SUBTRACK_SET_MUTE(groupMask, subtrack, muted) \
Nap_SetS8(NA_MAKE_COMMAND(AUDIOCMD_OP_SUB_SET_MUTE, groupMask, subtrack, 0), muted)
#define NA_COMMAND_AUDIO_SUBTRACK_SET_VOL_SCALE(group, subtrack, volume) \
Nap_SetF32(NA_MAKE_COMMAND(AUDIOCMD_OP_SUB_SET_VOL_SCALE, group, subtrack, 0), volume)
#define NA_COMMAND_AUDIO_SUBTRACK_SET_FREQ_SCALE(group, subtrack, freqScale) \
Nap_SetF32(NA_MAKE_COMMAND(AUDIOCMD_OP_SUB_SET_FREQ_SCALE, group, subtrack, 0), freqScale)
#define NA_COMMAND_AUDIO_SUBTRACK_SET_PAN(group, subtrack, pan) \
Nap_SetS8(NA_MAKE_COMMAND(AUDIOCMD_OP_SUB_SET_PAN, group, subtrack, 0), pan)
#define NA_COMMAND_AUDIO_SUBTRACK_SET_PORT(group, subtrack, port, value) \
Nap_SetS8(NA_MAKE_COMMAND(AUDIOCMD_OP_SUB_SET_PORT, group, subtrack, port), value)
#define NA_COMMAND_AUDIO_SUBTRACK_REVERB_VOLUME(group, subtrack, reverb) \
Nap_SetS8(NA_MAKE_COMMAND(AUDIOCMD_OP_SUB_SET_REVERB_VOLUME, group, subtrack, 0), reverb)
#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_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) \
Nap_SetS32(NA_MAKE_COMMAND(AUDIOCMD_OP_SUB_SET_FILTER, group, subtrack, filterCutoff), (s32)pFilter)
#ifdef __cplusplus
}
#endif
include/jaudio_NES/game64.h
+28 -29
View File
@@ -11,7 +11,8 @@ extern "C" {
f32 distance2vol4KITEKI(f32);
f32 distance2vol4MD(f32);
extern void Na_InitAudio(void (*fatal_callback)(), u8* load_addr, size_t load_size, u8* bootsound, size_t bootsound_size, BOOL cut_flag);
extern void Na_InitAudio(void (*fatal_callback)(), u8* load_addr, size_t load_size, u8* bootsound,
size_t bootsound_size, BOOL cut_flag);
extern void Na_GameFrame();
extern void Na_Reset();
extern void Na_SoftReset();
@@ -20,30 +21,28 @@ extern void Na_BgmStart(u8);
extern void Na_BgmCrossfadeStart(u8);
extern void Na_BgmStop(u16);
extern void Na_SysTrgStart(u16);
extern void Na_PlyWalkSe(u16, u16, f32);
extern void Na_PlyWalkSeRoom(u8, u16, f32);
extern void Na_NpcWalkSe(u16, u16, f32);
extern void Na_NpcWalkSeRoom(u8, u16, f32);
// #ifdef BUGFIXES
extern void Na_PlayerStatusLevel(u8, f32);
// #endif // BUGFIXES
extern void Na_PlyWalkSe(u16 id, u16 angle, f32 distance);
extern void Na_PlyWalkSeRoom(u8 a, u16 angle, f32 distance);
extern void Na_NpcWalkSe(u16 id, u16 angle, f32 distance);
extern void Na_NpcWalkSeRoom(u8 index, u16 angle, f32 distance);
extern void Na_PlayerStatusLevel(u8 playerDash, f32 playerSpeed);
extern void Na_VoiceSe(u8, u8, u8, s16, u8, u8);
extern void Na_MessageStatus(u8);
extern void Na_MessageSpeed(u8);
extern void Na_MessageStatus(u8 messageStatus);
extern void Na_MessageSpeed(u8 messageSpeed);
extern u8 Na_MessageSpeedGet();
extern void Na_OngenPos(u32, u8, u16, f32);
extern void Na_OngenTrgStartSpeed(u16, u16, f32, f32);
extern void Na_OngenTrgStart(u16, u16, f32);
extern void Na_SetOutMode(u8);
extern void Na_OngenPos(u32 id, u8 index, u16 angle, f32 distance);
extern void Na_OngenTrgStartSpeed(u16 num, u16 angle, f32 distance, f32 speed);
extern void Na_OngenTrgStart(u16 a, u16 angle, f32 distance);
extern void Na_SetOutMode(u8 outMode);
extern void Na_SetVoiceMode(u8);
extern void Na_FloorTrgStart(u8, u16, f32);
extern void Na_FloorTrgStart(u8 index, u16 angle, f32 distance);
extern void Na_SysLevStart(u8);
extern void Na_SysLevStop(u8);
extern void Na_Pause(u8);
extern void Na_RhythmPos(u32, u8, u16, f32);
extern void Na_Pause(u8 pauseFlag);
extern void Na_RhythmPos(u32 index, u8 unused, u16 angle, f32 distance);
extern void Na_SpecChange(int);
extern void Na_MDPlayerPos(u16 a, f32 e, u16 b, u16 c, u32 d);
extern void Na_BGMVolume(f32, u16);
extern void Na_MDPlayerPos(u16 angle, f32 distance, u16 b, u16 c, u32 id);
extern void Na_BGMVolume(f32 volumeScale, u16 b);
extern void Na_RestartPrepare();
extern u8 Na_CheckRestartReady();
extern void Na_Restart();
@@ -55,21 +54,21 @@ extern void Na_TTKK_ARM(u8);
extern void Na_BgmMuteClear();
extern u8 Na_BgmFadeoutCheck();
extern u8 Na_SeFadeoutCheck();
extern void Na_BgmTrOn(u8 a);
extern void Na_BgmTrOff(u8 a);
extern void Na_BgmTrOn(u8 subTrack);
extern void Na_BgmTrOff(u8 subTrack);
extern void Na_SubGameStart();
extern void Na_SubGameEnd();
extern void Na_SceneMode(u8);
extern u8 Na_RoomIncectPos(int, u8, u16, f32);
extern void Na_FurnitureInstPos(int, u16, f32);
extern void Na_TrgSeEcho(u8);
extern void Na_LevSeEcho(u8);
extern void Na_BGMFilter(u8);
extern void Na_RoomType(u8);
extern u8 Na_RoomIncectPos(int insectID, u8 index, u16 angle, f32 distance);
extern void Na_FurnitureInstPos(int id, u16 angle, f32 distance);
extern void Na_TrgSeEcho(u8 echo);
extern void Na_LevSeEcho(u8 echo);
extern void Na_BGMFilter(u8 filterStatus);
extern void Na_RoomType(u8 roomType);
extern u8 Na_CheckNeosBoot();
extern void Na_Museum(u8);
extern void Na_Museum(u8 museumType);
extern int Na_GetSoundFrameCounter();
extern void Na_kazagurumaLevel(f32);
extern void Na_kazagurumaLevel(f32 kazagurumaSpeed);
// __declspec(weak) extern int OSAttention(const char* msg, ...) {
// va_list marker;
include/jaudio_NES/game64_cpp.h
+18 -18
View File
@@ -7,47 +7,47 @@
/* C++ linkage */
extern void Sou_lev_ongen_data_struct_clear();
extern void Sou_BgmFadeoutEndCheck();
extern u8 Sou_BgmTenkiConv(u8);
extern void Sou_GroupControl(u8, u8, f32);
extern void Sou_GroupControl_MD(u8, u8, f32);
extern u8 Sou_BgmTenkiConv(u8 id);
extern void Sou_GroupControl(u8 a, u8 pan, f32 volume);
extern void Sou_GroupControl_MD(u8 a, u8 pan, f32 volume);
extern u8 pan_kochou(u8, f32);
extern u8 angle2pan(u16 angle, f32 dist);
extern f32 distance2vol(f32 distance);
extern void Sou_VoiceStart(u8, u8);
extern void Sou_TrgStart(u16, f32, f32, f32, u8, u8, f32);
extern void Sou_TrgStart(u16 id, f32 volume, f32 optVolume, f32 freqScale, u8 pan, u8 reverb, f32 distance);
extern void Sou_SpecialRoutine00();
extern void Sou_SpecialRoutine02();
extern void Sou_SpecialRoutine03();
extern void Sou_TrgEndCheck();
extern void Sou_LevStart(u8, u8);
extern void Sou_LevStop(u8, u8);
extern void Sou_TrgMake(u8);
extern void Sou_VoiceMake(u8);
extern void Sou_LevMake(u8);
extern void Sou_LevStart(u8 index, u8 b);
extern void Sou_LevStop(u8 index, u8 b);
extern void Sou_TrgMake(u8 index);
extern void Sou_VoiceMake(u8 index);
extern void Sou_LevMake(u8 index);
extern void Sou_ChimeMake();
extern void Sou_LevSet(u8);
extern void Sou_LevSet(u8 index);
extern void Sou_Insect_Lev_Cont();
extern void Sou_Ongen_Lev_Cont();
extern void Sou_Ongen_Lev_Prog(u8);
extern void Sou_BgmStart(u8, u16);
extern void Sou_Ongen_Lev_Prog(u8 index);
extern void Sou_BgmStart(u8 id, u16 parameter);
extern void Sou_BGMVolMove();
extern void Sou_Na_BgmStart(u8);
extern void Sou_Na_BgmStop(u16);
extern void Sou_Na_BgmStart(u8 id);
extern void Sou_Na_BgmStop(u16 id);
extern void Sou_SpecialRoutine06();
extern void Sou_SpecialRoutine07();
extern void Sou_SeFadeoutRoutine();
extern void Sou_SeFadeinRoutine();
extern void Sou_SeVolumeReset();
extern void Sou_SeTrFadeout(u8, u16);
extern void Sou_SeFadeout(u16);
extern void Sou_SeTrFadeout(u8 idnex, u16 b);
extern void Sou_SeFadeout(u16 a);
extern void Sou_SpecialRoutine08();
extern void Sou_SpecialRoutine10();
extern void Sou_InitAudio();
extern void Sou_DVD_Error(char*, u8*);
extern void Sou_WalkSe(u16, u16, f32, u8, f32);
extern void Sou_WalkSe(u16 id, u16 angle, f32 distance, u8 reverb, f32 optVolume);
extern u8 Sou_TanboinHenkan(u8, u8);
extern u8 Sou_ChouboinHenkan(u8, u8);
extern u8 Sou_ConnectCheck(u8, u8, u8);
extern u8 Sou_BoinShiinCheck(u8);
extern void Sou_PosTrgStart(u16, u16, f32, u8, f32);
extern void Sou_PosTrgStart(u16 num, u16 angle, f32 distance, u8 reverb, f32 optVolume);
#endif
src/static/jaudio_NES/game/game64.c_inc
+825 -828
View File
File diff suppressed because it is too large Load Diff