Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-09-27 12:26:51 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

A couple of audio-related improvements (#2359)

Browse Source 
* Add .porydaw to gitignore

* alt -> reverse, and add generic ADSR macros for compressed directsound voices
This commit is contained in:
Marcus Huderle
2026-09-26 13:54:22 -07:00
committed by GitHub
parent 5eff78649e
commit f3a0ca8d82
3 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -44,3 +44,4 @@ prefabs.json
*.js
/pokeemerald-*.png
/pokeemerald_modern-*.png
.porydaw/

24
asm/macros/music_voice.inc
View File

@@ -4,12 +4,22 @@
.endm
.macro voice_directsound_no_resample base_midi_key:req, pan:req, sample_data_pointer:req, attack:req, decay:req, sustain:req, release:req
.byte 8
.byte 0x8
_voice_directsound \base_midi_key, \pan, \sample_data_pointer, \attack, \decay, \sustain, \release
.endm
.macro voice_directsound_alt base_midi_key:req, pan:req, sample_data_pointer:req, attack:req, decay:req, sustain:req, release:req
.byte 16
.macro voice_directsound_reverse base_midi_key:req, pan:req, sample_data_pointer:req, attack:req, decay:req, sustain:req, release:req
.byte 0x10
_voice_directsound \base_midi_key, \pan, \sample_data_pointer, \attack, \decay, \sustain, \release
.endm
.macro voice_directsound_compressed base_midi_key:req, pan:req, sample_data_pointer:req, attack:req, decay:req, sustain:req, release:req
.byte 0x20
_voice_directsound \base_midi_key, \pan, \sample_data_pointer, \attack, \decay, \sustain, \release
.endm
.macro voice_directsound_compressed_reverse base_midi_key:req, pan:req, sample_data_pointer:req, attack:req, decay:req, sustain:req, release:req
.byte 0x30
_voice_directsound \base_midi_key, \pan, \sample_data_pointer, \attack, \decay, \sustain, \release
.endm
@@ -140,13 +150,9 @@
.endm
.macro cry sample:req
.byte 0x20, 60, 0, 0
.4byte \sample
.byte 0xff, 0, 0xff, 0
voice_directsound_compressed 60, 0, \sample, 255, 0, 255, 0
.endm
.macro cry_reverse sample:req
.byte 0x30, 60, 0, 0
.4byte \sample
.byte 0xff, 0, 0xff, 0
voice_directsound_compressed_reverse 60, 0, \sample, 255, 0, 255, 0
.endm

4
sound/voicegroups/rs_sfx_2.inc
View File

@@ -1,6 +1,6 @@
voice_group rs_sfx_2
voice_directsound_no_resample 60, 0, DirectSoundWaveData_bicycle_bell, 255, 249, 0, 165
voice_directsound_alt 60, 0, DirectSoundWaveData_bicycle_bell, 255, 0, 255, 165
voice_directsound_reverse 60, 0, DirectSoundWaveData_bicycle_bell, 255, 0, 255, 165
voice_directsound 60, 0, DirectSoundWaveData_unknown_synth_snare, 255, 0, 255, 165
voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 242, 0, 127
voice_noise_alt 60, 0, 0, 0, 1, 0, 1
@@ -32,7 +32,7 @@ voice_group rs_sfx_2
voice_square_1_alt 60, 0, 19, 2, 0, 2, 0, 0
voice_directsound 60, 0, DirectSoundWaveData_trinity_30303_mega_bass, 255, 0, 255, 127
voice_square_1 60, 0, 103, 0, 0, 0, 15, 0
voice_directsound_alt 60, 0, DirectSoundWaveData_unknown_6, 255, 0, 255, 127
voice_directsound_reverse 60, 0, DirectSoundWaveData_unknown_6, 255, 0, 255, 127
voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 255, 255, 127
voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 0, 255, 127
voice_directsound 60, 0, DirectSoundWaveData_unknown_7, 255, 0, 255, 127