From 7a1a2ed617d6187b29ad4dd2bf7c0d0846c67a69 Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Wed, 3 Jan 2024 15:01:29 -0600 Subject: [PATCH] Used original Pascal_SnakeCase for sound functions (#241) Rhokin originally named the DSE sound library functions with Pascal_SnakeCase, but I had to change them because the format wasn't supported at the time. Now that the format is supported, renaming the functions to match their original intention. --- headers/functions/arm9/libs.h | 52 +++++++++++++++++------------------ symbols/arm9/libs.yml | 48 ++++++++++++++++---------------- 2 files changed, 50 insertions(+), 50 deletions(-) diff --git a/headers/functions/arm9/libs.h b/headers/functions/arm9/libs.h index de4b0b73..20ecfc3e 100644 --- a/headers/functions/arm9/libs.h +++ b/headers/functions/arm9/libs.h @@ -1,7 +1,7 @@ #ifndef HEADERS_FUNCTIONS_ARM9_LIBS_H_ #define HEADERS_FUNCTIONS_ARM9_LIBS_H_ -int SoundUtilGetRandomNumber(void); +int SoundUtil_GetRandomNumber(void); void* ReadWaviEntry(struct wavi_data* wavi_data, int entry_index); int ResumeBgm(undefined4 param_1, undefined4 param_2, undefined4 param_3); void* FindSmdlSongChunk(void* smdl_data, uint16_t value_to_search); @@ -9,32 +9,32 @@ int FlushChannels(undefined* param_1, int param_2, int param_3); void ParseDseEvent(undefined* audio_state, struct track_data* track_data); void UpdateSequencerTracks(int param_1, undefined4 param_2, undefined4 param_3, undefined4 param_4); void UpdateChannels(void); -void SoundEnvelopeReset(struct sound_envelope* envelope); -void SoundEnvelopeParametersReset(struct sound_envelope_parameters* parameters); -void SoundEnvelopeParametersCheckValidity(struct sound_envelope_parameters* parameters); -void SoundEnvelopeSetParameters(struct sound_envelope* envelope, - struct sound_envelope_parameters* parameters); -void SoundEnvelopeSetSlide(struct sound_envelope* envelope, int target_volume, int msec_tab_index); +void SoundEnvelope_Reset(struct sound_envelope* envelope); +void SoundEnvelopeParameters_Reset(struct sound_envelope_parameters* parameters); +void SoundEnvelopeParameters_CheckValidity(struct sound_envelope_parameters* parameters); +void SoundEnvelope_SetParameters(struct sound_envelope* envelope, + struct sound_envelope_parameters* parameters); +void SoundEnvelope_SetSlide(struct sound_envelope* envelope, int target_volume, int msec_tab_index); void UpdateTrackVolumeEnvelopes(struct sound_envelope* envelope); -void SoundEnvelopeRelease(struct sound_envelope* envelope); -void SoundEnvelopeStop(struct sound_envelope* envelope); -void SoundEnvelopeForceVolume(struct sound_envelope* envelope, int volume); -void SoundEnvelopeStop2(struct sound_envelope* envelope); -int8_t SoundEnvelopeTick(struct sound_envelope* envelope); -void SoundLfoBankReset(struct dse_lfo_bank* lfo_bank); -void SoundLfoBankSet(struct dse_lfo_bank* lfo_bank, struct dse_lfo_settings* lfo_settings, - int8_t const_envelope_level); -void SoundLfoBankSetConstEnvelopes(struct dse_lfo_bank* lfo_bank, int8_t level); -uint16_t SoundLfoBankTick(struct dse_lfo_bank* lfo_bank); -int SoundLfoWaveInvalidFunc(struct dse_lfo* lfo); -int SoundLfoWaveHalfSquareFunc(struct dse_lfo* lfo); -int SoundLfoWaveFullSquareFunc(struct dse_lfo* lfo); -int SoundLfoWaveHalfTriangleFunc(struct dse_lfo* lfo); -int SoundLfoWaveFullTriangleFunc(struct dse_lfo* lfo); -int SoundLfoWaveSawFunc(struct dse_lfo* lfo); -int SoundLfoWaveReverseSawFunc(struct dse_lfo* lfo); -int SoundLfoWaveHalfNoiseFunc(struct dse_lfo* lfo); -int SoundLfoWaveFullNoiseFunc(struct dse_lfo* lfo); +void SoundEnvelope_Release(struct sound_envelope* envelope); +void SoundEnvelope_Stop(struct sound_envelope* envelope); +void SoundEnvelope_ForceVolume(struct sound_envelope* envelope, int volume); +void SoundEnvelope_Stop2(struct sound_envelope* envelope); +int8_t SoundEnvelope_Tick(struct sound_envelope* envelope); +void SoundLfoBank_Reset(struct dse_lfo_bank* lfo_bank); +void SoundLfoBank_Set(struct dse_lfo_bank* lfo_bank, struct dse_lfo_settings* lfo_settings, + int8_t const_envelope_level); +void SoundLfoBank_SetConstEnvelopes(struct dse_lfo_bank* lfo_bank, int8_t level); +uint16_t SoundLfoBank_Tick(struct dse_lfo_bank* lfo_bank); +int SoundLfoWave_InvalidFunc(struct dse_lfo* lfo); +int SoundLfoWave_HalfSquareFunc(struct dse_lfo* lfo); +int SoundLfoWave_FullSquareFunc(struct dse_lfo* lfo); +int SoundLfoWave_HalfTriangleFunc(struct dse_lfo* lfo); +int SoundLfoWave_FullTriangleFunc(struct dse_lfo* lfo); +int SoundLfoWave_SawFunc(struct dse_lfo* lfo); +int SoundLfoWave_ReverseSawFunc(struct dse_lfo* lfo); +int SoundLfoWave_HalfNoiseFunc(struct dse_lfo* lfo); +int SoundLfoWave_FullNoiseFunc(struct dse_lfo* lfo); void EnableVramBanksInSetDontSave(struct vram_banks_set vram_banks); void EnableVramBanksInSet(struct vram_banks_set* vram_banks); void G3_LoadMtx43(struct matrix_4x3* matrix); diff --git a/symbols/arm9/libs.yml b/symbols/arm9/libs.yml index 97a73649..42200a71 100644 --- a/symbols/arm9/libs.yml +++ b/symbols/arm9/libs.yml @@ -18,7 +18,7 @@ libs: Where the library region starts and ends is a guess, but there appear to be fairly sharp boundaries. The function directly before it calls functions at lower memory addresses outside of the region, while all functions in the region only call other functions within the region. The bytes after the region seem to be the start of a global data region, used by both the libraries and the rest of ARM9. functions: - - name: SoundUtilGetRandomNumber + - name: SoundUtil_GetRandomNumber address: EU: 0x206CC8C NA: 0x206C8F4 @@ -91,29 +91,29 @@ libs: From https://projectpokemon.org/docs/mystery-dungeon-nds/procyon-studios-digital-sound-elements-r12/ and Irdkwia's notes. No params. - - name: SoundEnvelopeReset + - name: SoundEnvelope_Reset address: EU: 0x2075008 NA: 0x2074C70 description: "r0: Sound envelope pointer" - - name: SoundEnvelopeParametersReset + - name: SoundEnvelopeParameters_Reset address: EU: 0x207501C NA: 0x2074C84 description: "r0: Sound envelope parameters pointer" - - name: SoundEnvelopeParametersCheckValidity + - name: SoundEnvelopeParameters_CheckValidity address: EU: 0x2075038 NA: 0x2074CA0 description: "r0: Sound envelope parameters pointer" - - name: SoundEnvelopeSetParameters + - name: SoundEnvelope_SetParameters address: EU: 0x207508C NA: 0x2074CF4 description: |- r0: Sound envelope pointer r1: Sound envelope parameters pointer - - name: SoundEnvelopeSetSlide + - name: SoundEnvelope_SetSlide address: EU: 0x20750F0 NA: 0x2074D58 @@ -130,41 +130,41 @@ libs: From https://projectpokemon.org/docs/mystery-dungeon-nds/procyon-studios-digital-sound-elements-r12/ r0: Sound envelope pointer - - name: SoundEnvelopeRelease + - name: SoundEnvelope_Release address: EU: 0x2075270 NA: 0x2074ED8 description: "r0: Sound envelope pointer" - - name: SoundEnvelopeStop + - name: SoundEnvelope_Stop address: EU: 0x207529C NA: 0x2074F04 description: "r0: Sound envelope pointer" - - name: SoundEnvelopeForceVolume + - name: SoundEnvelope_ForceVolume address: EU: 0x20752B4 NA: 0x2074F1C description: |- r0: Sound envelope pointer r1: Volume - - name: SoundEnvelopeStop2 + - name: SoundEnvelope_Stop2 address: EU: 0x20752D4 NA: 0x2074F3C description: "r0: Sound envelope pointer" - - name: SoundEnvelopeTick + - name: SoundEnvelope_Tick address: EU: 0x20752EC NA: 0x2074F54 description: |- r0: Sound envelope pointer return: Current volume - - name: SoundLfoBankReset + - name: SoundLfoBank_Reset address: EU: 0x2075434 NA: 0x207509C description: "r0: LFO bank pointer" - - name: SoundLfoBankSet + - name: SoundLfoBank_Set address: EU: 0x207544C NA: 0x20750B4 @@ -172,77 +172,77 @@ libs: r0: LFO bank pointer r1: LFO settings pointer r2: Envelope level - - name: SoundLfoBankSetConstEnvelopes + - name: SoundLfoBank_SetConstEnvelopes address: EU: 0x2075644 NA: 0x20752AC description: |- r0: LFO bank pointer r1: Level - - name: SoundLfoBankTick + - name: SoundLfoBank_Tick address: EU: 0x2075690 NA: 0x20752F8 description: |- r0: LFO bank pointer return: New voice update flags - - name: SoundLfoWaveInvalidFunc + - name: SoundLfoWave_InvalidFunc address: EU: 0x2075744 NA: 0x20753AC description: |- r0: LFO pointer return: 0 - - name: SoundLfoWaveHalfSquareFunc + - name: SoundLfoWave_HalfSquareFunc address: EU: 0x2075758 NA: 0x20753C0 description: |- r0: LFO pointer return: LFO current output - - name: SoundLfoWaveFullSquareFunc + - name: SoundLfoWave_FullSquareFunc address: EU: 0x2075794 NA: 0x20753FC description: |- r0: LFO pointer return: LFO current output - - name: SoundLfoWaveHalfTriangleFunc + - name: SoundLfoWave_HalfTriangleFunc address: EU: 0x20757DC NA: 0x2075444 description: |- r0: LFO pointer return: LFO current output - - name: SoundLfoWaveFullTriangleFunc + - name: SoundLfoWave_FullTriangleFunc address: EU: 0x2075830 NA: 0x2075498 description: |- r0: LFO pointer return: LFO current output - - name: SoundLfoWaveSawFunc + - name: SoundLfoWave_SawFunc address: EU: 0x2075894 NA: 0x20754FC description: |- r0: LFO pointer return: LFO current output - - name: SoundLfoWaveReverseSawFunc + - name: SoundLfoWave_ReverseSawFunc address: EU: 0x20758D0 NA: 0x2075538 description: |- r0: LFO pointer return: LFO current output - - name: SoundLfoWaveHalfNoiseFunc + - name: SoundLfoWave_HalfNoiseFunc address: EU: 0x207590C NA: 0x2075574 description: |- r0: LFO pointer return: LFO current output - - name: SoundLfoWaveFullNoiseFunc + - name: SoundLfoWave_FullNoiseFunc address: EU: 0x2075950 NA: 0x20755B8