From ef5781541ffec49644f38d0fe898da8cc069bbd3 Mon Sep 17 00:00:00 2001 From: Zumi Daxuya Date: Fri, 1 Nov 2024 21:41:09 +0700 Subject: [PATCH 1/2] Adjust Cerulean music a bit --- audio/music/ceruleancity.asm | 51 ++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 28 deletions(-) diff --git a/audio/music/ceruleancity.asm b/audio/music/ceruleancity.asm index 78b1beb32..68a675e73 100644 --- a/audio/music/ceruleancity.asm +++ b/audio/music/ceruleancity.asm @@ -23,7 +23,9 @@ Music_CeruleanCity_Ch1: volume 7, 7 note_type 12, 10, 2 vibrato 18, 3, 4 - sound_call .pattern0 + pitch_offset 1 + rest 16 + rest 16 .loop sound_call .pattern1 sound_call .pattern1 @@ -37,17 +39,10 @@ Music_CeruleanCity_Ch1: sound_loop 0, .loop sound_ret -.pattern0 - pitch_offset 1 - rest 16 - pitch_offset 1 - rest 16 - sound_ret - .pattern1 duty_cycle 0 stereo_panning TRUE, FALSE - note_type 12, 13, 1 + note_type 12, 11, 1 octave 3 note G#, 4 note E_, 2 @@ -81,7 +76,7 @@ Music_CeruleanCity_Ch1: .pattern2 duty_cycle 0 - note_type 12, 13, 1 + note_type 12, 11, 1 octave 3 note G#, 4 note E_, 2 @@ -91,7 +86,7 @@ Music_CeruleanCity_Ch1: note G#, 4 duty_cycle 2 stereo_panning FALSE, TRUE - note_type 12, 10, 2 + note_type 12, 11, 2 octave 4 note E_, 2 octave 3 @@ -103,15 +98,15 @@ Music_CeruleanCity_Ch1: note D#, 2 note E_, 2 note F#, 2 - note_type 12, 10, 4 + note_type 12, 11, 4 note C#, 8 octave 3 note B_, 4 - note_type 12, 13, 1 + note_type 12, 11, 1 octave 4 note C#, 2 note D#, 2 - note_type 12, 10, 4 + note_type 12, 11, 4 note C#, 8 octave 3 note B_, 8 @@ -128,7 +123,7 @@ Music_CeruleanCity_Ch1: note G#, 2 note G#, 8 duty_cycle 0 - note_type 12, 10, 2 + note_type 12, 11, 1 note G#, 4 note E_, 2 note C#, 2 @@ -151,14 +146,14 @@ Music_CeruleanCity_Ch1: .pattern8 duty_cycle 1 - note_type 12, 12, 3 + note_type 12, 11, 3 octave 3 note E_, 4 note F#, 4 sound_ret .pattern4 - note_type 12, 10, 3 + note_type 12, 11, 3 octave 3 note G#, 4 rest 4 @@ -350,7 +345,7 @@ Music_CeruleanCity_Ch2: .pattern4 duty_cycle 2 stereo_panning FALSE, TRUE - note_type 12, 13, 1 + note_type 12, 12, 1 octave 4 note E_, 2 note E_, 2 @@ -362,7 +357,7 @@ Music_CeruleanCity_Ch2: note E_, 2 octave 3 note B_, 2 - note_type 12, 13, 2 + note_type 12, 12, 2 octave 4 note C#, 4 note D#, 4 @@ -372,7 +367,7 @@ Music_CeruleanCity_Ch2: note A_, 2 note_type 12, 12, 4 note G#, 12 - note_type 12, 13, 1 + note_type 12, 12, 1 note E_, 2 note G#, 2 note_type 12, 12, 4 @@ -381,7 +376,7 @@ Music_CeruleanCity_Ch2: .pattern9 duty_cycle 2 - note_type 12, 10, 6 + note_type 12, 12, 3 octave 4 note C#, 2 octave 3 @@ -451,7 +446,7 @@ Music_CeruleanCity_Ch2: rest 16 rest 16 stereo_panning FALSE, TRUE - note_type 12, 12, 7 + note_type 12, 11, 7 octave 2 note B_, 8 octave 3 @@ -460,7 +455,7 @@ Music_CeruleanCity_Ch2: sound_ret .pattern8 - note_type 12, 12, 7 + note_type 12, 11, 7 octave 3 note B_, 16 note E_, 16 @@ -476,7 +471,7 @@ Music_CeruleanCity_Ch2: Music_CeruleanCity_Ch3: vibrato 18, 3, 3 - note_type 12, 9, 2 + note_type 12, 2, 5 sound_call .pattern0 .loop sound_call .pattern1 @@ -504,7 +499,7 @@ Music_CeruleanCity_Ch3: .pattern1 stereo_panning TRUE, TRUE - note_type 12, 2, 6 + note_type 12, 1, 6 octave 2 note E_, 4 rest 2 @@ -537,7 +532,7 @@ Music_CeruleanCity_Ch3: sound_ret .pattern2 - note_type 12, 2, 6 + note_type 12, 1, 6 octave 2 note E_, 4 note F#, 4 @@ -609,7 +604,7 @@ Music_CeruleanCity_Ch3: note D_, 1 note C#, 8 note D#, 8 - note_type 12, 2, 6 + note_type 12, 1, 6 octave 2 note B_, 3 rest 1 @@ -793,4 +788,4 @@ Music_CeruleanCity_Ch4: drum_note DRUM_CERULEAN_CITY_0c, 4 drum_note DRUM_CERULEAN_CITY_0d, 2 drum_note DRUM_CERULEAN_CITY_0d, 2 - sound_ret \ No newline at end of file + sound_ret From 8e3ac43ff6b63ec831c8fce17c9185a883bed3d6 Mon Sep 17 00:00:00 2001 From: Zumi Daxuya Date: Fri, 1 Nov 2024 21:41:22 +0700 Subject: [PATCH 2/2] Pick softer waveforms for R24 --- audio/music/nuggetbridge.asm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/audio/music/nuggetbridge.asm b/audio/music/nuggetbridge.asm index 1fb437fa3..cebcf5948 100644 --- a/audio/music/nuggetbridge.asm +++ b/audio/music/nuggetbridge.asm @@ -285,7 +285,7 @@ Music_NuggetBridgeHGSS_Loop2: loopchannel 0, Music_NuggetBridgeHGSS_Loop2 Music_NuggetBridgeHGSS_Ch3: - notetype $C, $15 + notetype $C, $14 octave 2 note E_, 4 note __, 8 @@ -302,7 +302,7 @@ Music_NuggetBridgeHGSS_Loop3: note E_, 1 note __, 11 note G#, 4 - notetype 4, $24 + notetype 4, $23 octave 3 note A_, 2 octave 5 @@ -367,7 +367,7 @@ Music_NuggetBridgeHGSS_Loop3: octave 6 note C#, 3 note __, 9 - notetype $C, $15 + notetype $C, $14 callchannel Music_NuggetBridgeHGSS_Bar7 callchannel Music_NuggetBridgeHGSS_Bar7 callchannel Music_NuggetBridgeHGSS_Bar7 @@ -392,7 +392,7 @@ Music_NuggetBridgeHGSS_Loop3: callchannel Music_NuggetBridgeHGSS_Bar12 callchannel Music_NuggetBridgeHGSS_Bar12 callchannel Music_NuggetBridgeHGSS_Bar12 - notetype 6, $15 + notetype 6, $14 octave 1 note B_, 2 note __, 16 @@ -412,7 +412,7 @@ Music_NuggetBridgeHGSS_Loop3: note __, 1 note B_, 6 note __, 2 - notetype $C, $15 + notetype $C, $14 octave 2 note E_, 4 note __, 8 @@ -428,7 +428,7 @@ Music_NuggetBridgeHGSS_Bar7: note A_, 1 octave 4 note D_, 1 - intensity $15 + intensity $14 endchannel Music_NuggetBridgeHGSS_Bar8: octave 2 @@ -439,7 +439,7 @@ Music_NuggetBridgeHGSS_Bar8: note B_, 1 octave 4 note E_, 1 - intensity $15 + intensity $14 endchannel Music_NuggetBridgeHGSS_Bar9: octave 1 @@ -450,7 +450,7 @@ Music_NuggetBridgeHGSS_Bar9: note D_, 1 octave 4 note F#, 1 - intensity $15 + intensity $14 endchannel Music_NuggetBridgeHGSS_Bar10: octave 2 @@ -461,7 +461,7 @@ Music_NuggetBridgeHGSS_Bar10: note E_, 1 octave 4 note B_, 1 - intensity $15 + intensity $14 endchannel Music_NuggetBridgeHGSS_Bar11: octave 1 @@ -473,7 +473,7 @@ Music_NuggetBridgeHGSS_Bar11: note F#, 1 octave 5 note D_, 1 - intensity $15 + intensity $14 endchannel Music_NuggetBridgeHGSS_Bar12: octave 2 @@ -485,7 +485,7 @@ Music_NuggetBridgeHGSS_Bar12: note G#, 1 octave 5 note E_, 1 - intensity $15 + intensity $14 endchannel Music_NuggetBridgeHGSS_Ch4: