From c3bf7fd0bd4c6557123f0acd4b9f3dd385fa3472 Mon Sep 17 00:00:00 2001 From: Daniel Harding <33dannye@gmail.com> Date: Mon, 6 Jun 2022 16:09:33 -0500 Subject: [PATCH] Fix channel 3 wave 9 id (#926) --- audio/music/indigoplateau.asm | 2 +- audio/music/johtogymbattle.asm | 2 +- audio/music/johtotrainerbattle.asm | 2 +- audio/music/kantogymbattle.asm | 2 +- audio/music/lighthouse.asm | 2 +- audio/music/rivalbattle.asm | 2 +- audio/music/rocketbattle.asm | 2 +- audio/music/rockethideout.asm | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/audio/music/indigoplateau.asm b/audio/music/indigoplateau.asm index 371b970d4..189cbb2af 100644 --- a/audio/music/indigoplateau.asm +++ b/audio/music/indigoplateau.asm @@ -115,7 +115,7 @@ Music_IndigoPlateau_Ch2: sound_ret Music_IndigoPlateau_Ch3: - note_type 12, 1, -1 + note_type 12, 1, 9 .mainloop: sound_call .sub1 octave 3 diff --git a/audio/music/johtogymbattle.asm b/audio/music/johtogymbattle.asm index fadf4d83e..2c29e79b0 100644 --- a/audio/music/johtogymbattle.asm +++ b/audio/music/johtogymbattle.asm @@ -614,7 +614,7 @@ Music_JohtoGymBattle_Ch2: sound_loop 0, .mainloop Music_JohtoGymBattle_Ch3: - note_type 12, 1, -1 + note_type 12, 1, 9 octave 4 note F_, 1 rest 1 diff --git a/audio/music/johtotrainerbattle.asm b/audio/music/johtotrainerbattle.asm index cb512bcbc..e21420866 100644 --- a/audio/music/johtotrainerbattle.asm +++ b/audio/music/johtotrainerbattle.asm @@ -900,7 +900,7 @@ Music_JohtoTrainerBattle_Ch2: sound_ret Music_JohtoTrainerBattle_Ch3: - note_type 12, 1, -1 + note_type 12, 1, 9 octave 4 note E_, 1 note D#, 1 diff --git a/audio/music/kantogymbattle.asm b/audio/music/kantogymbattle.asm index b70f43447..3c9d3a5c5 100644 --- a/audio/music/kantogymbattle.asm +++ b/audio/music/kantogymbattle.asm @@ -436,7 +436,7 @@ Music_KantoGymBattle_Ch2: sound_ret Music_KantoGymBattle_Ch3: - note_type 12, 1, -1 + note_type 12, 1, 9 octave 2 note E_, 1 rest 1 diff --git a/audio/music/lighthouse.asm b/audio/music/lighthouse.asm index 2cc3b451f..6e2a28a5e 100644 --- a/audio/music/lighthouse.asm +++ b/audio/music/lighthouse.asm @@ -212,7 +212,7 @@ Music_Lighthouse_Ch2: sound_loop 0, .mainloop Music_Lighthouse_Ch3: - note_type 12, 1, -1 + note_type 12, 1, 9 stereo_panning TRUE, FALSE .mainloop: octave 2 diff --git a/audio/music/rivalbattle.asm b/audio/music/rivalbattle.asm index 655164c42..9ac571997 100644 --- a/audio/music/rivalbattle.asm +++ b/audio/music/rivalbattle.asm @@ -536,7 +536,7 @@ Music_RivalBattle_Ch2: sound_ret Music_RivalBattle_Ch3: - note_type 12, 1, -1 + note_type 12, 1, 9 octave 3 note F#, 2 note A#, 2 diff --git a/audio/music/rocketbattle.asm b/audio/music/rocketbattle.asm index b95f2a89d..6fa39f38d 100644 --- a/audio/music/rocketbattle.asm +++ b/audio/music/rocketbattle.asm @@ -669,7 +669,7 @@ Music_RocketBattle_Ch2: sound_ret Music_RocketBattle_Ch3: - note_type 12, 1, -1 + note_type 12, 1, 9 octave 3 note A_, 2 octave 4 diff --git a/audio/music/rockethideout.asm b/audio/music/rockethideout.asm index 850eb29d8..424c99103 100644 --- a/audio/music/rockethideout.asm +++ b/audio/music/rockethideout.asm @@ -223,7 +223,7 @@ Music_RocketHideout_Ch2: sound_loop 0, .mainloop Music_RocketHideout_Ch3: - note_type 12, 1, -1 + note_type 12, 1, 9 .mainloop: .loop1: octave 2