diff options
| author | Daniel Harding <33dannye@gmail.com> | 2021-01-03 11:36:16 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-03 11:36:16 -0600 |
| commit | fec3f3580a54dbaa3dfb138398c92b37d6c58dee (patch) | |
| tree | 1c847cc130c7f6f4966ec524fe4097bfcc13f263 /src | |
| parent | 122cbc06aea38592b037cf0e6d5f5c7f48e98ac5 (diff) | |
| parent | 433d278f7e82cd1d4632d12c746869fe1a2bc85b (diff) | |
Merge pull request #89 from dannye/master
Document remaining music commands
Diffstat (limited to 'src')
37 files changed, 1680 insertions, 1476 deletions
diff --git a/src/audio/music/boosterpack.asm b/src/audio/music/boosterpack.asm index c5287d0..e3951e2 100644 --- a/src/audio/music/boosterpack.asm +++ b/src/audio/music/boosterpack.asm @@ -1,8 +1,8 @@ Music_BoosterPack_Ch1: ; f7d60 (3d:7d60) - musicdc 17 + stereo_panning 1, 1 vibrato_type 1 vibrato_delay 20 - musice8 8 + cutoff 8 octave 4 duty 1 speed 1 @@ -44,10 +44,10 @@ Music_BoosterPack_Ch1: ; f7d60 (3d:7d60) Music_BoosterPack_Ch2: ; f7d9e (3d:7d9e) - musicdc 17 + stereo_panning 1, 1 vibrato_type 1 vibrato_delay 20 - musice8 8 + cutoff 8 octave 3 duty 1 speed 1 @@ -88,11 +88,11 @@ Music_BoosterPack_Ch2: ; f7d9e (3d:7d9e) Music_BoosterPack_Ch3: ; f7ddb (3d:7ddb) - musicdc 17 + stereo_panning 1, 1 wave 1 volume 32 - musice8 8 - musice9 0 + cutoff 8 + echo 0 octave 1 speed 1 D# 6 diff --git a/src/audio/music/cardpop.asm b/src/audio/music/cardpop.asm index e536dca..2bc7fdb 100644 --- a/src/audio/music/cardpop.asm +++ b/src/audio/music/cardpop.asm @@ -1,7 +1,7 @@ Music_CardPop_Ch1: ; f703a (3d:703a) speed 4 - musicdc 17 - musice8 8 + stereo_panning 1, 1 + cutoff 8 duty 2 volume 144 MainLoop @@ -11,10 +11,10 @@ Music_CardPop_Ch1: ; f703a (3d:703a) rest 14 Loop 2 octave 5 - musice8 8 + cutoff 8 F# 1 G_ 1 - musice8 6 + cutoff 6 F# 1 volume 55 F# 1 @@ -63,10 +63,10 @@ Music_CardPop_Ch1: ; f703a (3d:703a) rest 14 octave 5 volume 144 - musice8 8 + cutoff 8 E_ 1 F_ 1 - musice8 6 + cutoff 6 E_ 1 volume 55 E_ 1 @@ -121,11 +121,11 @@ Music_CardPop_Ch1: ; f703a (3d:703a) Music_CardPop_Ch2: ; f70df (3d:70df) speed 4 - musicdc 17 - musice8 8 + stereo_panning 1, 1 + cutoff 8 duty 2 volume 96 - musice8 3 + cutoff 3 Loop 2 octave 2 A_ 2 @@ -208,10 +208,10 @@ Music_CardPop_Ch2: ; f70df (3d:70df) Music_CardPop_Ch3: ; f713a (3d:713a) speed 4 wave 1 - musicdc 17 + stereo_panning 1, 1 volume 32 - musice9 0 - musice8 8 + echo 0 + cutoff 8 music_call Branch_f715b C_ 2 C# 2 diff --git a/src/audio/music/challengehall.asm b/src/audio/music/challengehall.asm index 0bd1876..5b28ffe 100644 --- a/src/audio/music/challengehall.asm +++ b/src/audio/music/challengehall.asm @@ -1,12 +1,12 @@ Music_ChallengeHall_Ch1: ; f9646 (3e:5646) - musicdc 17 + stereo_panning 1, 1 vibrato_type 8 vibrato_delay 15 - musice8 7 + cutoff 7 octave 3 duty 2 volume 128 - musice8 8 + cutoff 8 speed 1 A_ 7 G# 4 @@ -401,10 +401,10 @@ Branch_f9848: Music_ChallengeHall_Ch2: ; f9883 (3e:5883) - musicdc 17 + stereo_panning 1, 1 vibrato_type 8 vibrato_delay 15 - musice8 7 + cutoff 7 octave 3 speed 10 Loop 2 @@ -413,7 +413,7 @@ Music_ChallengeHall_Ch2: ; f9883 (3e:5883) MainLoop duty 1 volume 144 - musice8 8 + cutoff 8 speed 10 E_ 6 tie @@ -676,11 +676,11 @@ Music_ChallengeHall_Ch2: ; f9883 (3e:5883) C# 15 duty 1 volume 128 - musice8 7 + cutoff 7 C# 5 C# 5 C# 5 - musice8 8 + cutoff 8 C# 7 volume 39 C# 8 @@ -772,19 +772,19 @@ Branch_f9a28: Music_ChallengeHall_Ch3: ; f9a92 (3e:5a92) - musicdc 17 + stereo_panning 1, 1 volume 32 wave 1 - musice9 0 - musice8 8 - musice8 8 + echo 0 + cutoff 8 + cutoff 8 speed 10 Loop 2 rest 6 EndLoop MainLoop octave 1 - musice8 8 + cutoff 8 E_ 6 tie E_ 6 @@ -793,10 +793,10 @@ Music_ChallengeHall_Ch3: ; f9a92 (3e:5a92) E_ 7 rest 8 dec_octave - musice8 7 + cutoff 7 E_ 7 E_ 8 - musice8 8 + cutoff 8 E_ 7 rest 8 E_ 7 @@ -965,11 +965,11 @@ Music_ChallengeHall_Ch3: ; f9a92 (3e:5a92) dec_octave A_ 7 rest 8 - musice8 7 + cutoff 7 A_ 5 A_ 5 A_ 5 - musice8 8 + cutoff 8 A_ 7 rest 8 A_ 7 diff --git a/src/audio/music/club1.asm b/src/audio/music/club1.asm index 785a126..3b75f45 100644 --- a/src/audio/music/club1.asm +++ b/src/audio/music/club1.asm @@ -1,13 +1,13 @@ Music_Club1_Ch1: ; f9be5 (3e:5be5) speed 5 - musicdc 17 + stereo_panning 1, 1 vibrato_type 8 vibrato_delay 20 - musice8 8 + cutoff 8 octave 3 duty 0 volume 146 - musice8 8 + cutoff 8 C# 2 dec_octave A_ 2 @@ -66,7 +66,7 @@ Music_Club1_Ch1: ; f9be5 (3e:5be5) rest 2 duty 0 volume 148 - musice8 8 + cutoff 8 E_ 6 rest 2 MainLoop @@ -291,14 +291,14 @@ Music_Club1_Ch1: ; f9be5 (3e:5be5) Music_Club1_Ch2: ; f9d5f (3e:5d5f) speed 5 - musicdc 17 + stereo_panning 1, 1 vibrato_type 8 vibrato_delay 20 - musice8 7 + cutoff 7 octave 2 duty 0 volume 146 - musice8 8 + cutoff 8 A_ 2 E_ 2 A_ 2 @@ -573,11 +573,11 @@ Music_Club1_Ch2: ; f9d5f (3e:5d5f) Music_Club1_Ch3: ; f9ec4 (3e:5ec4) speed 5 - musicdc 17 + stereo_panning 1, 1 volume 32 wave 1 - musice9 96 - musice8 7 + echo 96 + cutoff 7 octave 1 A_ 2 rest 2 @@ -590,16 +590,16 @@ Music_Club1_Ch3: ; f9ec4 (3e:5ec4) A# 2 rest 4 B_ 2 - musice8 4 + cutoff 4 B_ 2 - musice8 7 + cutoff 7 F# 2 F_ 2 inc_octave - musice8 4 + cutoff 4 D_ 2 dec_octave - musice8 7 + cutoff 7 E_ 2 rest 4 inc_octave @@ -610,262 +610,262 @@ Music_Club1_Ch3: ; f9ec4 (3e:5ec4) octave 1 A_ 4 inc_octave - musice8 4 + cutoff 4 A_ 2 dec_octave - musice8 7 + cutoff 7 C# 6 E_ 4 inc_octave - musice8 4 + cutoff 4 A_ 2 dec_octave - musice8 7 + cutoff 7 F_ 4 inc_octave - musice8 4 + cutoff 4 A# 2 dec_octave - musice8 7 + cutoff 7 F# 4 inc_octave - musice8 4 + cutoff 4 F# 2 - musice8 7 + cutoff 7 C# 6 dec_octave A# 4 inc_octave inc_octave - musice8 4 + cutoff 4 C# 2 dec_octave dec_octave - musice8 7 + cutoff 7 F# 6 music_call Branch_fa01a octave 1 - musice8 7 + cutoff 7 A_ 4 inc_octave - musice8 4 + cutoff 4 A_ 2 dec_octave - musice8 7 + cutoff 7 C# 6 E_ 4 inc_octave - musice8 4 + cutoff 4 A_ 2 dec_octave - musice8 7 + cutoff 7 F_ 4 inc_octave inc_octave - musice8 4 + cutoff 4 C# 2 dec_octave dec_octave - musice8 7 + cutoff 7 F# 4 inc_octave - musice8 4 + cutoff 4 F# 2 - musice8 7 + cutoff 7 C# 6 dec_octave A# 4 inc_octave inc_octave - musice8 4 + cutoff 4 E_ 2 dec_octave dec_octave - musice8 7 + cutoff 7 F# 6 music_call Branch_fa01a octave 1 - musice8 7 + cutoff 7 D_ 4 inc_octave - musice8 4 + cutoff 4 F# 2 dec_octave - musice8 7 + cutoff 7 D_ 4 rest 2 D_ 4 inc_octave - musice8 4 + cutoff 4 A_ 2 dec_octave - musice8 7 + cutoff 7 D_ 4 inc_octave - musice8 4 + cutoff 4 F# 2 dec_octave - musice8 7 + cutoff 7 D_ 4 inc_octave - musice8 4 + cutoff 4 F_ 2 dec_octave - musice8 7 + cutoff 7 D_ 4 rest 2 D_ 4 inc_octave - musice8 4 + cutoff 4 A_ 2 dec_octave - musice8 7 + cutoff 7 D_ 4 inc_octave - musice8 4 + cutoff 4 F_ 2 dec_octave - musice8 7 + cutoff 7 C# 4 inc_octave - musice8 4 + cutoff 4 E_ 2 dec_octave - musice8 7 + cutoff 7 C# 6 E_ 4 inc_octave inc_octave - musice8 4 + cutoff 4 E_ 2 dec_octave dec_octave - musice8 7 + cutoff 7 F_ 6 F# 4 inc_octave - musice8 4 + cutoff 4 A# 2 - musice8 7 + cutoff 7 C# 6 dec_octave A# 4 inc_octave - musice8 4 + cutoff 4 F# 2 dec_octave - musice8 7 + cutoff 7 F# 6 B_ 4 inc_octave - musice8 4 + cutoff 4 A_ 2 dec_octave - musice8 7 + cutoff 7 F# 6 A_ 4 inc_octave - musice8 4 + cutoff 4 F# 2 dec_octave - musice8 7 + cutoff 7 A# 4 inc_octave inc_octave - musice8 4 + cutoff 4 D_ 2 dec_octave dec_octave - musice8 7 + cutoff 7 B_ 4 inc_octave - musice8 4 + cutoff 4 A_ 2 dec_octave - musice8 7 + cutoff 7 F# 6 D_ 4 inc_octave - musice8 4 + cutoff 4 F# 2 dec_octave - musice8 7 + cutoff 7 F# 6 E_ 4 inc_octave - musice8 4 + cutoff 4 A_ 2 dec_octave - musice8 6 + cutoff 6 E_ 6 - musice8 7 + cutoff 7 E_ 4 inc_octave - musice8 4 + cutoff 4 F# 2 dec_octave - musice8 7 + cutoff 7 E_ 4 inc_octave - musice8 4 + cutoff 4 F# 2 - musice8 7 + cutoff 7 E_ 4 - musice8 4 + cutoff 4 G# 2 dec_octave - musice8 7 + cutoff 7 E_ 4 inc_octave - musice8 4 + cutoff 4 F# 2 dec_octave - musice8 7 + cutoff 7 F# 4 inc_octave - musice8 4 + cutoff 4 G# 2 dec_octave - musice8 7 + cutoff 7 G# 4 inc_octave - musice8 4 + cutoff 4 B_ 2 - musice8 7 + cutoff 7 EndMainLoop Branch_fa01a: octave 1 B_ 4 inc_octave - musice8 4 + cutoff 4 A_ 2 dec_octave - musice8 7 + cutoff 7 C# 6 D_ 4 inc_octave - musice8 4 + cutoff 4 F# 2 dec_octave - musice8 7 + cutoff 7 D# 6 E_ 4 inc_octave - musice8 4 + cutoff 4 B_ 2 dec_octave - musice8 7 + cutoff 7 B_ 6 G# 4 inc_octave - musice8 4 + cutoff 4 B_ 2 dec_octave - musice8 7 + cutoff 7 E_ 4 inc_octave - musice8 4 + cutoff 4 E_ 2 music_ret diff --git a/src/audio/music/club2.asm b/src/audio/music/club2.asm index 2b608d5..786273a 100644 --- a/src/audio/music/club2.asm +++ b/src/audio/music/club2.asm @@ -1,8 +1,8 @@ Music_Club2_Ch1: ; fa077 (3e:6077) speed 6 duty 2 - musicdc 17 - musice8 8 + stereo_panning 1, 1 + cutoff 8 MainLoop octave 4 Loop 8 @@ -95,8 +95,8 @@ Music_Club2_Ch1: ; fa077 (3e:6077) Music_Club2_Ch2: ; fa0e3 (3e:60e3) speed 6 duty 2 - musicdc 17 - musice8 8 + stereo_panning 1, 1 + cutoff 8 MainLoop octave 2 Loop 8 @@ -209,15 +209,15 @@ Music_Club2_Ch2: ; fa0e3 (3e:60e3) Music_Club2_Ch3: ; fa164 (3e:6164) speed 6 volume 32 - musicdc 17 + stereo_panning 1, 1 wave 0 vibrato_type 4 vibrato_delay 35 - musice8 6 - musice9 64 + cutoff 6 + echo 64 MainLoop volume 96 - musice8 8 + cutoff 8 rest 2 octave 4 G_ 4 @@ -233,16 +233,16 @@ Music_Club2_Ch3: ; fa164 (3e:6164) rest 2 rest 14 volume 64 - musice9 96 + echo 96 music_call Branch_fa1cf octave 4 - musice8 8 + cutoff 8 G_ 8 music_call Branch_fa1cf - musice9 64 + echo 64 volume 32 octave 3 - musice8 8 + cutoff 8 G_ 8 music_call Branch_fa1f3 octave 3 @@ -251,7 +251,7 @@ Music_Club2_Ch3: ; fa164 (3e:6164) G_ 12 rest 16 rest 8 - musice8 8 + cutoff 8 E_ 8 music_call Branch_fa1f3 octave 3 @@ -263,10 +263,10 @@ Music_Club2_Ch3: ; fa164 (3e:6164) tie G_ 8 rest 4 - musice8 8 + cutoff 8 A_ 2 G_ 2 - musice8 6 + cutoff 6 F# 16 tie F# 12 @@ -284,34 +284,34 @@ Music_Club2_Ch3: ; fa164 (3e:6164) A_ 16 rest 16 rest 16 - musice9 96 + echo 96 EndMainLoop Branch_fa1cf: - musice8 6 + cutoff 6 octave 5 C# 1 tie D_ 15 tie D_ 12 - musice8 8 + cutoff 8 C_ 2 dec_octave B_ 2 - musice8 6 + cutoff 6 G_ 16 tie G_ 8 rest 4 - musice8 8 + cutoff 8 E_ 4 B_ 4 inc_octave C_ 4 dec_octave B_ 4 - musice8 6 + cutoff 6 A_ 16 tie A_ 8 @@ -332,12 +332,12 @@ Branch_fa1f3: B_ 4 inc_octave C_ 4 - musice8 6 + cutoff 6 D_ 16 tie D_ 8 rest 4 - musice8 8 + cutoff 8 C_ 2 dec_octave B_ 2 @@ -345,6 +345,6 @@ Branch_fa1f3: C_ 2 dec_octave B_ 2 - musice8 6 + cutoff 6 music_ret ; 0xfa210 diff --git a/src/audio/music/club3.asm b/src/audio/music/club3.asm index 1407cd5..dd0671e 100644 --- a/src/audio/music/club3.asm +++ b/src/audio/music/club3.asm @@ -1,9 +1,9 @@ Music_Club3_Ch1: ; fa210 (3e:6210) speed 9 - musicdc 17 + stereo_panning 1, 1 vibrato_type 5 vibrato_delay 20 - musice8 8 + cutoff 8 MainLoop duty 0 Loop 2 @@ -51,7 +51,7 @@ Music_Club3_Ch1: ; fa210 (3e:6210) EndLoop duty 1 volume 147 - musice8 7 + cutoff 7 music_call Branch_fa330 music_call Branch_fa403 A# 1 @@ -79,7 +79,7 @@ Music_Club3_Ch1: ; fa210 (3e:6210) octave 2 G_ 1 inc_octave - musice8 8 + cutoff 8 speed 1 G_ 5 volume 55 @@ -91,7 +91,7 @@ Music_Club3_Ch1: ; fa210 (3e:6210) dec_octave A# 1 volume 147 - musice8 7 + cutoff 7 music_call Branch_fa330 music_call Branch_fa403 inc_octave @@ -124,7 +124,7 @@ Music_Club3_Ch1: ; fa210 (3e:6210) duty 2 volume 112 speed 1 - musice8 8 + cutoff 8 G_ 5 C# 4 C_ 5 @@ -136,7 +136,7 @@ Music_Club3_Ch1: ; fa210 (3e:6210) dec_octave A# 4 duty 1 - musice8 7 + cutoff 7 speed 9 music_call Branch_fa370 music_call Branch_fa403 @@ -165,7 +165,7 @@ Music_Club3_Ch1: ; fa210 (3e:6210) octave 2 G_ 1 inc_octave - musice8 8 + cutoff 8 speed 1 G_ 5 volume 55 @@ -207,7 +207,7 @@ Music_Club3_Ch1: ; fa210 (3e:6210) inc_octave duty 2 speed 1 - musice8 8 + cutoff 8 volume 112 G_ 5 C# 4 @@ -220,7 +220,7 @@ Music_Club3_Ch1: ; fa210 (3e:6210) dec_octave A# 4 speed 9 - musice8 8 + cutoff 8 EndMainLoop Branch_fa330: @@ -245,11 +245,11 @@ Branch_fa330: A# 1 dec_octave speed 1 - musice8 8 + cutoff 8 F_ 5 F# 4 speed 9 - musice8 7 + cutoff 7 G_ 1 inc_octave E_ 1 @@ -288,7 +288,7 @@ Branch_fa330: Branch_fa370: octave 2 volume 147 - musice8 7 + cutoff 7 G_ 1 inc_octave D_ 1 @@ -309,7 +309,7 @@ Branch_fa370: A# 1 dec_octave speed 1 - musice8 8 + cutoff 8 F_ 5 F# 4 octave 4 @@ -355,7 +355,7 @@ Branch_fa370: G_ 2 speed 9 duty 1 - musice8 7 + cutoff 7 volume 147 octave 2 G_ 1 @@ -382,7 +382,7 @@ Branch_fa370: octave 5 duty 2 speed 1 - musice8 8 + cutoff 8 volume 112 octave 5 G_ 5 @@ -397,7 +397,7 @@ Branch_fa370: A# 4 speed 9 duty 1 - musice8 7 + cutoff 7 volume 147 music_ret @@ -423,21 +423,21 @@ Branch_fa403: A# 1 dec_octave speed 1 - musice8 8 + cutoff 8 F_ 5 F# 4 speed 9 - musice8 7 + cutoff 7 G_ 1 music_ret Music_Club3_Ch2: ; fa423 (3e:6423) speed 9 - musicdc 17 + stereo_panning 1, 1 vibrato_type 5 vibrato_delay 20 - musice8 8 + cutoff 8 MainLoop duty 0 Loop 2 @@ -491,18 +491,18 @@ Music_Club3_Ch2: ; fa423 (3e:6423) D_ 4 speed 9 volume 147 - musice8 7 + cutoff 7 G_ 1 dec_octave speed 1 - musice8 8 + cutoff 8 volume 128 F_ 5 F# 4 inc_octave speed 9 volume 147 - musice8 7 + cutoff 7 G_ 1 G_ 1 volume 55 @@ -526,7 +526,7 @@ Music_Club3_Ch2: ; fa423 (3e:6423) rest 1 dec_octave speed 1 - musice8 8 + cutoff 8 G_ 5 D_ 4 dec_octave @@ -549,18 +549,18 @@ Music_Club3_Ch2: ; fa423 (3e:6423) D_ 4 speed 9 volume 147 - musice8 7 + cutoff 7 G_ 1 dec_octave speed 1 - musice8 8 + cutoff 8 volume 128 F_ 5 F# 4 inc_octave speed 9 volume 147 - musice8 7 + cutoff 7 A# 1 volume 55 A# 2 @@ -584,7 +584,7 @@ Music_Club3_Ch2: ; fa423 (3e:6423) rest 1 dec_octave volume 128 - musice8 8 + cutoff 8 A# 1 B_ 1 inc_octave @@ -600,18 +600,18 @@ Music_Club3_Ch2: ; fa423 (3e:6423) D_ 4 speed 9 volume 147 - musice8 7 + cutoff 7 G_ 1 dec_octave speed 1 - musice8 8 + cutoff 8 volume 128 F_ 5 F# 4 inc_octave speed 9 volume 147 - musice8 7 + cutoff 7 G_ 1 G_ 1 volume 55 @@ -652,11 +652,11 @@ Music_Club3_Ch2: ; fa423 (3e:6423) D_ 4 speed 9 volume 147 - musice8 7 + cutoff 7 G_ 1 dec_octave speed 1 - musice8 8 + cutoff 8 volume 128 F_ 5 F# 4 @@ -664,7 +664,7 @@ Music_Club3_Ch2: ; fa423 (3e:6423) inc_octave speed 9 volume 147 - musice8 7 + cutoff 7 C# 1 volume 55 C# 2 @@ -686,7 +686,7 @@ Music_Club3_Ch2: ; fa423 (3e:6423) speed 9 rest 1 dec_octave - musice8 8 + cutoff 8 D_ 1 D# 1 E_ 1 @@ -703,17 +703,17 @@ Branch_fa5a6: D_ 4 speed 9 volume 147 - musice8 7 + cutoff 7 G_ 1 dec_octave speed 1 volume 128 - musice8 8 + cutoff 8 F_ 5 F# 4 inc_octave speed 9 - musice8 7 + cutoff 7 volume 147 G_ 1 G_ 1 @@ -727,7 +727,7 @@ Branch_fa5a6: E_ 1 inc_octave volume 128 - musice8 8 + cutoff 8 speed 1 D_ 5 volume 55 @@ -737,7 +737,7 @@ Branch_fa5a6: rest 1 dec_octave speed 1 - musice8 8 + cutoff 8 G_ 5 D_ 4 dec_octave @@ -760,18 +760,18 @@ Branch_fa5a6: D_ 4 speed 9 volume 147 - musice8 7 + cutoff 7 G_ 1 dec_octave speed 1 volume 128 - musice8 8 + cutoff 8 F_ 5 F# 4 speed 9 inc_octave volume 147 - musice8 7 + cutoff 7 A# 1 volume 55 A# 2 @@ -790,7 +790,7 @@ Branch_fa5a6: A# 1 volume 55 A# 1 - musice8 8 + cutoff 8 volume 128 A# 1 volume 55 @@ -800,11 +800,11 @@ Branch_fa5a6: Music_Club3_Ch3: ; fa63e (3e:663e) speed 9 - musicdc 17 + stereo_panning 1, 1 volume 32 wave 1 - musice9 0 - musice8 8 + echo 0 + cutoff 8 Loop 4 octave 1 G_ 1 @@ -829,11 +829,11 @@ Music_Club3_Ch3: ; fa63e (3e:663e) octave 1 G_ 1 octave 3 - musice8 4 + cutoff 4 G_ 1 rest 1 octave 1 - musice8 8 + cutoff 8 G_ 1 inc_octave F_ 1 @@ -846,25 +846,25 @@ Music_Club3_Ch3: ; fa63e (3e:663e) G_ 1 rest 1 octave 4 - musice8 4 + cutoff 4 G_ 1 rest 1 octave 1 - musice8 8 + cutoff 8 E_ 1 F_ 1 octave 4 - musice8 4 + cutoff 4 G_ 1 octave 1 - musice8 8 + cutoff 8 G_ 1 octave 3 - musice8 4 + cutoff 4 G_ 1 rest 1 octave 1 - musice8 8 + cutoff 8 G_ 1 inc_octave F_ 1 @@ -877,21 +877,21 @@ Music_Club3_Ch3: ; fa63e (3e:663e) G_ 1 rest 1 inc_octave - musice8 4 + cutoff 4 F_ 1 rest 1 - musice8 8 + cutoff 8 E_ 1 octave 1 F_ 1 F# 1 D# 1 octave 3 - musice8 4 + cutoff 4 G_ 1 rest 1 octave 1 - musice8 8 + cutoff 8 D# 1 inc_octave D_ 1 @@ -904,25 +904,25 @@ Music_Club3_Ch3: ; fa63e (3e:663e) D# 1 rest 1 octave 4 - musice8 4 + cutoff 4 G_ 1 rest 1 octave 1 - musice8 8 + cutoff 8 C_ 1 C# 1 octave 4 - musice8 4 + cutoff 4 G_ 1 octave 1 - musice8 8 + cutoff 8 D# 1 octave 3 - musice8 4 + cutoff 4 G_ 1 rest 1 octave 1 - musice8 8 + cutoff 8 D# 1 inc_octave D_ 1 @@ -935,22 +935,22 @@ Music_Club3_Ch3: ; fa63e (3e:663e) D# 1 rest 1 inc_octave - musice8 4 + cutoff 4 F_ 1 rest 1 dec_octave - musice8 8 + cutoff 8 D_ 1 D# 1 E_ 1 dec_octave C_ 1 octave 3 - musice8 4 + cutoff 4 G_ 1 rest 1 octave 1 - musice8 8 + cutoff 8 C_ 1 A# 1 inc_octave @@ -963,25 +963,25 @@ Music_Club3_Ch3: ; fa63e (3e:663e) C_ 1 rest 1 octave 4 - musice8 4 + cutoff 4 G_ 1 rest 1 octave 1 - musice8 8 + cutoff 8 A_ 1 A# 1 octave 4 - musice8 4 + cutoff 4 G_ 1 octave 1 - musice8 8 + cutoff 8 C_ 1 octave 3 - musice8 4 + cutoff 4 G_ 1 rest 1 octave 1 - musice8 8 + cutoff 8 C_ 1 A# 1 inc_octave @@ -994,21 +994,21 @@ Music_Club3_Ch3: ; fa63e (3e:663e) C_ 1 rest 1 inc_octave - musice8 4 + cutoff 4 F_ 1 rest 1 - musice8 8 + cutoff 8 E_ 1 octave 1 A# 1 B_ 1 D_ 1 octave 3 - musice8 4 + cutoff 4 G_ 1 rest 1 octave 1 - musice8 8 + cutoff 8 D_ 1 inc_octave C_ 1 @@ -1021,23 +1021,23 @@ Music_Club3_Ch3: ; fa63e (3e:663e) D_ 1 rest 1 octave 4 - musice8 4 + cutoff 4 C_ 1 rest 1 octave 2 - musice8 6 + cutoff 6 A# 1 dec_octave - musice8 8 + cutoff 8 C_ 1 C# 1 D_ 1 octave 3 - musice8 4 + cutoff 4 G_ 1 rest 1 octave 1 - musice8 8 + cutoff 8 D_ 1 inc_octave C_ 1 @@ -1049,11 +1049,11 @@ Music_Club3_Ch3: ; fa63e (3e:663e) F_ 1 rest 1 inc_octave - musice8 4 + cutoff 4 A# 1 rest 1 dec_octave - musice8 8 + cutoff 8 A# 1 B_ 1 inc_octave diff --git a/src/audio/music/credits.asm b/src/audio/music/credits.asm index 6a8b050..b26e8c8 100644 --- a/src/audio/music/credits.asm +++ b/src/audio/music/credits.asm @@ -1,9 +1,9 @@ Music_Credits_Ch1: ; fb1fe (3e:71fe) speed 13 - musicdc 17 + stereo_panning 1, 1 vibrato_type 1 vibrato_delay 20 - musice8 8 + cutoff 8 octave 2 duty 1 volume 79 @@ -850,10 +850,10 @@ Branch_fb651: Music_Credits_Ch2: ; fb68a (3e:768a) - musicdc 17 + stereo_panning 1, 1 vibrato_type 1 vibrato_delay 20 - musice8 8 + cutoff 8 duty 1 octave 2 speed 13 @@ -904,9 +904,9 @@ Music_Credits_Ch2: ; fb68a (3e:768a) inc_octave volume 128 D_ 1 - musice8 4 + cutoff 4 E_ 1 - musice8 8 + cutoff 8 C_ 3 dec_octave volume 146 @@ -915,18 +915,18 @@ Music_Credits_Ch2: ; fb68a (3e:768a) inc_octave volume 128 D_ 1 - musice8 4 + cutoff 4 E_ 1 dec_octave - musice8 8 + cutoff 8 A_ 3 volume 146 C_ 1 rest 2 - musice8 4 + cutoff 4 volume 128 F_ 1 - musice8 8 + cutoff 8 volume 146 C_ 1 volume 128 @@ -948,10 +948,10 @@ Music_Credits_Ch2: ; fb68a (3e:768a) volume 128 B_ 1 inc_octave - musice8 4 + cutoff 4 C_ 1 volume 146 - musice8 8 + cutoff 8 D_ 1 volume 128 E_ 3 @@ -960,20 +960,20 @@ Music_Credits_Ch2: ; fb68a (3e:768a) rest 1 volume 128 E_ 1 - musice8 4 + cutoff 4 F_ 1 - musice8 8 + cutoff 8 volume 146 C_ 1 volume 128 A_ 3 volume 146 C_ 1 - musice8 4 + cutoff 4 A_ 1 rest 1 F_ 1 - musice8 8 + cutoff 8 volume 146 C_ 1 volume 128 @@ -1261,17 +1261,17 @@ Branch_fb79e: G_ 10 inc_octave speed 13 - musice8 4 + cutoff 4 C_ 1 dec_octave B_ 1 - musice8 8 + cutoff 8 A# 1 rest 1 music_call Branch_fbacb octave 3 volume 146 - musice8 8 + cutoff 8 D_ 1 speed 1 volume 128 @@ -1297,44 +1297,44 @@ Branch_fb79e: C_ 1 C_ 1 dec_octave - musice8 4 + cutoff 4 F_ 1 - musice8 8 + cutoff 8 volume 146 C_ 1 volume 128 - musice8 4 + cutoff 4 D_ 1 rest 1 - musice8 8 + cutoff 8 F_ 1 volume 146 C_ 1 inc_octave volume 128 C_ 2 - musice8 4 + cutoff 4 D_ 1 dec_octave - musice8 8 + cutoff 8 volume 146 C_ 1 volume 128 - musice8 4 + cutoff 4 A_ 1 rest 1 - musice8 8 + cutoff 8 B_ 1 volume 146 C_ 1 volume 128 - musice8 4 + cutoff 4 A_ 1 - musice8 8 + cutoff 8 G_ 1 - musice8 4 + cutoff 4 A_ 1 - musice8 8 + cutoff 8 volume 146 C_ 1 inc_octave @@ -1347,14 +1347,14 @@ Branch_fb79e: C_ 10 dec_octave speed 13 - musice8 4 + cutoff 4 B_ 1 - musice8 6 + cutoff 6 A# 2 music_call Branch_fbacb octave 4 G_ 1 - musice8 8 + cutoff 8 E_ 1 speed 13 rest 1 @@ -1372,36 +1372,36 @@ Branch_fb79e: C_ 1 inc_octave volume 128 - musice8 7 + cutoff 7 C_ 2 - musice8 8 + cutoff 8 C_ 1 dec_octave volume 146 C_ 1 volume 128 - musice8 4 + cutoff 4 F_ 1 rest 1 - musice8 8 + cutoff 8 A_ 1 volume 146 C_ 1 inc_octave volume 128 - musice8 7 + cutoff 7 C_ 2 - musice8 8 + cutoff 8 C_ 1 dec_octave volume 146 C_ 1 volume 128 - musice8 4 + cutoff 4 F_ 1 rest 1 G# 1 - musice8 8 + cutoff 8 volume 146 C_ 1 speed 1 @@ -1416,10 +1416,10 @@ Branch_fb79e: dec_octave A_ 1 inc_octave - musice8 4 + cutoff 4 C_ 1 dec_octave - musice8 8 + cutoff 8 volume 146 C_ 1 speed 1 @@ -1459,9 +1459,9 @@ Branch_fb79e: C_ 1 rest 1 dec_octave - musice8 7 + cutoff 7 G_ 1 - musice8 8 + cutoff 8 G_ 1 inc_octave volume 146 @@ -1637,7 +1637,7 @@ Branch_fba9d: Branch_fbacb: octave 3 - musice8 8 + cutoff 8 Loop 3 A# 1 rest 1 @@ -1651,10 +1651,10 @@ Branch_fbacb: volume 128 A_ 1 inc_octave - musice8 4 + cutoff 4 C_ 1 dec_octave - musice8 8 + cutoff 8 volume 146 C_ 1 speed 1 @@ -1685,7 +1685,7 @@ Branch_fbacb: volume 128 B_ 1 inc_octave - musice8 4 + cutoff 4 D_ 1 music_ret @@ -1694,17 +1694,17 @@ Branch_fbb10: speed 13 volume 128 C_ 1 - musice8 3 + cutoff 3 D_ 1 volume 146 - musice8 8 + cutoff 8 C_ 1 volume 128 B_ 2 - musice8 3 + cutoff 3 A_ 1 volume 147 - musice8 8 + cutoff 8 C_ 1 speed 1 volume 128 @@ -1782,21 +1782,21 @@ Branch_fbb10: inc_octave C_ 10 speed 13 - musice8 3 + cutoff 3 D_ 1 E_ 1 - musice8 8 + cutoff 8 F_ 2 music_ret Music_Credits_Ch3: ; fbb9d (3e:7b9d) speed 1 - musicdc 17 + stereo_panning 1, 1 volume 32 wave 1 - musice9 96 - musice8 8 + echo 96 + cutoff 8 octave 1 Loop 12 G_ 6 @@ -1820,10 +1820,10 @@ Music_Credits_Ch3: ; fbb9d (3e:7b9d) rest 7 EndLoop inc_octave - musice8 4 + cutoff 4 G_ 13 dec_octave - musice8 8 + cutoff 8 B_ 6 rest 7 EndLoop @@ -1833,10 +1833,10 @@ Music_Credits_Ch3: ; fbb9d (3e:7b9d) rest 7 EndLoop inc_octave - musice8 4 + cutoff 4 F_ 13 dec_octave - musice8 8 + cutoff 8 A_ 6 rest 7 EndLoop @@ -1846,10 +1846,10 @@ Music_Credits_Ch3: ; fbb9d (3e:7b9d) rest 7 EndLoop inc_octave - musice8 4 + cutoff 4 F_ 13 dec_octave - musice8 8 + cutoff 8 G# 6 rest 7 EndLoop @@ -1869,11 +1869,11 @@ Music_Credits_Ch3: ; fbb9d (3e:7b9d) rest 7 inc_octave inc_octave - musice8 4 + cutoff 4 D# 13 dec_octave dec_octave - musice8 8 + cutoff 8 G# 6 rest 7 EndLoop @@ -1884,10 +1884,10 @@ Music_Credits_Ch3: ; fbb9d (3e:7b9d) C# 6 rest 7 inc_octave - musice8 4 + cutoff 4 F_ 13 dec_octave - musice8 8 + cutoff 8 C# 6 rest 7 EndLoop @@ -1896,10 +1896,10 @@ Music_Credits_Ch3: ; fbb9d (3e:7b9d) C_ 6 rest 7 inc_octave - musice8 4 + cutoff 4 C_ 13 dec_octave - musice8 8 + cutoff 8 C_ 6 rest 7 C_ 6 @@ -1928,9 +1928,9 @@ Branch_fbc46: C_ 6 rest 7 EndLoop - musice8 4 + cutoff 4 A_ 13 - musice8 8 + cutoff 8 C_ 6 rest 7 Loop 2 @@ -1938,10 +1938,10 @@ Branch_fbc46: rest 7 EndLoop inc_octave - musice8 4 + cutoff 4 C_ 13 dec_octave - musice8 8 + cutoff 8 C_ 6 rest 7 music_call Branch_fbd47 @@ -1951,19 +1951,19 @@ Branch_fbc46: C_ 6 rest 7 EndLoop - musice8 4 + cutoff 4 G_ 13 - musice8 8 + cutoff 8 C_ 6 rest 7 Loop 2 C_ 6 rest 7 EndLoop - musice8 4 + cutoff 4 G_ 13 dec_octave - musice8 8 + cutoff 8 G_ 13 tie speed 13 @@ -2039,10 +2039,10 @@ Branch_fbc46: rest 7 EndLoop inc_octave - musice8 4 + cutoff 4 F_ 13 dec_octave - musice8 8 + cutoff 8 A# 6 rest 7 A# 6 @@ -2066,9 +2066,9 @@ Branch_fbd47: C_ 6 rest 7 EndLoop - musice8 4 + cutoff 4 G_ 13 - musice8 8 + cutoff 8 C_ 6 rest 7 EndLoop @@ -2082,10 +2082,10 @@ Branch_fbd58: rest 7 EndLoop inc_octave - musice8 4 + cutoff 4 G_ 13 dec_octave - musice8 8 + cutoff 8 B_ 6 rest 7 EndLoop @@ -2099,10 +2099,10 @@ Branch_fbd6b: rest 7 EndLoop inc_octave - musice8 4 + cutoff 4 G_ 13 dec_octave - musice8 8 + cutoff 8 A_ 6 rest 7 EndLoop @@ -2116,10 +2116,10 @@ Branch_fbd7e: rest 7 EndLoop inc_octave - musice8 4 + cutoff 4 G_ 13 dec_octave - musice8 8 + cutoff 8 G_ 6 rest 7 EndLoop @@ -2133,10 +2133,10 @@ Branch_fbd91: rest 7 EndLoop inc_octave - musice8 4 + cutoff 4 F_ 13 dec_octave - musice8 8 + cutoff 8 F_ 6 rest 7 EndLoop @@ -2150,10 +2150,10 @@ Branch_fbda4: rest 7 EndLoop inc_octave - musice8 4 + cutoff 4 E_ 13 dec_octave - musice8 8 + cutoff 8 E_ 6 rest 7 EndLoop @@ -2167,10 +2167,10 @@ Branch_fbdb7: rest 7 EndLoop inc_octave - musice8 4 + cutoff 4 F_ 13 dec_octave - musice8 8 + cutoff 8 D_ 6 rest 7 EndLoop @@ -2184,10 +2184,10 @@ Branch_fbdca: rest 7 EndLoop inc_octave - musice8 4 + cutoff 4 F_ 13 dec_octave - musice8 8 + cutoff 8 G_ 6 rest 7 EndLoop @@ -2201,10 +2201,10 @@ Branch_fbddd: rest 7 EndLoop inc_octave - musice8 4 + cutoff 4 G# 13 dec_octave - musice8 8 + cutoff 8 F_ 6 rest 7 EndLoop @@ -2218,10 +2218,10 @@ Branch_fbdf0: rest 7 EndLoop inc_octave - musice8 4 + cutoff 4 F_ 13 dec_octave - musice8 8 + cutoff 8 A# 6 rest 7 EndLoop @@ -2250,10 +2250,10 @@ Branch_fbe10: rest 7 EndLoop inc_octave - musice8 4 + cutoff 4 G_ 13 dec_octave - musice8 8 + cutoff 8 E_ 6 rest 7 EndLoop @@ -2265,18 +2265,18 @@ Branch_fbe23: C_ 6 rest 7 EndLoop - musice8 4 + cutoff 4 A_ 13 - musice8 8 + cutoff 8 C_ 6 rest 7 Loop 2 C_ 6 rest 7 EndLoop - musice8 4 + cutoff 4 F_ 13 - musice8 8 + cutoff 8 C_ 6 rest 7 music_ret @@ -2288,10 +2288,10 @@ Branch_fbe3d: rest 7 EndLoop inc_octave - musice8 4 + cutoff 4 F_ 13 dec_octave - musice8 8 + cutoff 8 G_ 6 rest 7 G_ 6 diff --git a/src/audio/music/deckmachine.asm b/src/audio/music/deckmachine.asm index f947df9..e2fe594 100644 --- a/src/audio/music/deckmachine.asm +++ b/src/audio/music/deckmachine.asm @@ -1,12 +1,12 @@ Music_DeckMachine_Ch1: ; f6ef1 (3d:6ef1) - musicdc 17 - musice8 8 + stereo_panning 1, 1 + cutoff 8 duty 3 MainLoop octave 5 speed 1 Loop 9 - musice8 6 + cutoff 6 volume 145 C_ 7 volume 49 @@ -36,9 +36,9 @@ Music_DeckMachine_Ch1: ; f6ef1 (3d:6ef1) volume 49 G_ 8 volume 145 - musice8 4 + cutoff 4 F_ 7 - musice8 5 + cutoff 5 volume 65 G_ 8 EndLoop @@ -54,10 +54,10 @@ Music_DeckMachine_Ch1: ; f6ef1 (3d:6ef1) Music_DeckMachine_Ch2: ; f6f41 (3d:6f41) - musicdc 17 - musice8 8 + stereo_panning 1, 1 + cutoff 8 duty 1 - musice8 7 + cutoff 7 MainLoop octave 3 speed 1 @@ -98,11 +98,11 @@ Music_DeckMachine_Ch2: ; f6f41 (3d:6f41) Music_DeckMachine_Ch3: ; f6f7b (3d:6f7b) - musicdc 17 + stereo_panning 1, 1 volume 32 wave 1 - musice9 96 - musice8 8 + echo 96 + cutoff 8 MainLoop octave 2 speed 1 @@ -111,32 +111,32 @@ Music_DeckMachine_Ch3: ; f6f7b (3d:6f7b) rest 8 G_ 7 inc_octave - musice8 5 + cutoff 5 G_ 8 - musice8 8 + cutoff 8 rest 7 dec_octave C_ 8 inc_octave - musice8 5 + cutoff 5 E_ 7 dec_octave - musice8 8 + cutoff 8 C_ 8 D_ 7 inc_octave - musice8 5 + cutoff 5 C_ 8 dec_octave rest 7 - musice8 8 + cutoff 8 A_ 8 inc_octave - musice8 5 + cutoff 5 G_ 7 dec_octave dec_octave - musice8 8 + cutoff 8 A_ 8 inc_octave D_ 7 @@ -145,31 +145,31 @@ Music_DeckMachine_Ch3: ; f6f7b (3d:6f7b) rest 8 G_ 7 inc_octave - musice8 5 + cutoff 5 G_ 8 rest 7 dec_octave - musice8 8 + cutoff 8 E_ 8 inc_octave - musice8 5 + cutoff 5 E_ 7 dec_octave - musice8 8 + cutoff 8 C_ 8 F_ 7 inc_octave - musice8 5 + cutoff 5 C_ 8 rest 7 dec_octave - musice8 8 + cutoff 8 F_ 8 inc_octave - musice8 5 + cutoff 5 G_ 7 dec_octave - musice8 8 + cutoff 8 E_ 8 D_ 7 rest 8 @@ -178,33 +178,33 @@ Music_DeckMachine_Ch3: ; f6f7b (3d:6f7b) rest 8 G_ 7 inc_octave - musice8 5 + cutoff 5 G_ 8 rest 7 dec_octave - musice8 8 + cutoff 8 C_ 8 inc_octave - musice8 5 + cutoff 5 E_ 7 dec_octave dec_octave - musice8 8 + cutoff 8 G_ 8 inc_octave C_ 7 inc_octave - musice8 5 + cutoff 5 C_ 8 rest 7 dec_octave - musice8 8 + cutoff 8 F_ 8 inc_octave - musice8 5 + cutoff 5 G_ 7 dec_octave - musice8 8 + cutoff 8 E_ 8 D_ 7 rest 8 diff --git a/src/audio/music/dueltheme1.asm b/src/audio/music/dueltheme1.asm index 4487bc1..dc7d665 100644 --- a/src/audio/music/dueltheme1.asm +++ b/src/audio/music/dueltheme1.asm @@ -1,9 +1,9 @@ Music_DuelTheme1_Ch1: ; f532a (3d:532a) speed 7 - musicdc 17 + stereo_panning 1, 1 vibrato_type 8 vibrato_delay 20 - musice8 8 + cutoff 8 duty 2 MainLoop octave 2 @@ -177,7 +177,7 @@ Music_DuelTheme1_Ch1: ; f532a (3d:532a) dec_octave duty 1 volume 160 - musice8 8 + cutoff 8 Loop 3 A_ 1 rest 2 @@ -408,7 +408,7 @@ Branch_f5538: rest 3 duty 1 volume 160 - musice8 8 + cutoff 8 dec_octave Loop 3 G_ 1 @@ -511,10 +511,10 @@ Branch_f5580: Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) speed 7 - musicdc 17 + stereo_panning 1, 1 vibrato_type 8 vibrato_delay 20 - musice8 8 + cutoff 8 MainLoop duty 1 volume 144 @@ -540,7 +540,7 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) D_ 1 duty 2 volume 162 - musice8 6 + cutoff 6 A_ 2 music_call Branch_f59f9 EndLoop @@ -551,7 +551,7 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) duty 2 inc_octave volume 162 - musice8 6 + cutoff 6 D_ 2 music_call Branch_f59f9 octave 2 @@ -561,12 +561,12 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) duty 2 inc_octave volume 162 - musice8 6 + cutoff 6 C_ 2 dec_octave duty 1 volume 144 - musice8 8 + cutoff 8 D_ 1 rest 3 dec_octave @@ -575,12 +575,12 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) inc_octave duty 2 volume 162 - musice8 6 + cutoff 6 G_ 1 dec_octave duty 1 volume 144 - musice8 8 + cutoff 8 B_ 1 rest 2 inc_octave @@ -592,7 +592,7 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) duty 2 inc_octave volume 162 - musice8 6 + cutoff 6 D_ 2 music_call Branch_f59f9 EndLoop @@ -603,12 +603,12 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) duty 2 inc_octave volume 162 - musice8 6 + cutoff 6 C_ 2 dec_octave duty 1 volume 144 - musice8 8 + cutoff 8 D_ 1 rest 3 dec_octave @@ -617,12 +617,12 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) inc_octave duty 2 volume 162 - musice8 6 + cutoff 6 G_ 1 dec_octave duty 1 volume 144 - musice8 8 + cutoff 8 B_ 1 rest 2 inc_octave @@ -632,7 +632,7 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) duty 2 inc_octave volume 162 - musice8 6 + cutoff 6 D_ 2 music_call Branch_f59f9 octave 2 @@ -642,23 +642,23 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) duty 2 inc_octave volume 162 - musice8 6 + cutoff 6 D_ 2 dec_octave duty 1 volume 144 - musice8 8 + cutoff 8 D_ 1 rest 3 D_ 1 rest 1 duty 2 volume 162 - musice8 6 + cutoff 6 A_ 2 duty 1 volume 144 - musice8 8 + cutoff 8 F# 1 rest 1 Loop 2 @@ -667,22 +667,22 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) G_ 1 duty 2 volume 162 - musice8 6 + cutoff 6 G_ 2 duty 1 volume 144 - musice8 8 + cutoff 8 G_ 1 rest 3 D_ 1 rest 1 duty 2 volume 162 - musice8 6 + cutoff 6 G_ 1 duty 1 volume 144 - musice8 8 + cutoff 8 E_ 1 rest 2 EndLoop @@ -691,7 +691,7 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) F# 1 duty 2 volume 162 - musice8 6 + cutoff 6 inc_octave C# 2 music_call Branch_f5a17 @@ -702,7 +702,7 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) inc_octave duty 2 volume 162 - musice8 6 + cutoff 6 E_ 2 music_call Branch_f5a17 E_ 1 @@ -710,22 +710,22 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) E_ 1 duty 2 volume 162 - musice8 6 + cutoff 6 G_ 2 duty 1 volume 144 - musice8 8 + cutoff 8 E_ 1 rest 3 E_ 1 rest 1 duty 2 volume 162 - musice8 6 + cutoff 6 B_ 1 duty 1 volume 144 - musice8 8 + cutoff 8 G_ 1 rest 2 A_ 1 @@ -733,22 +733,22 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) A_ 1 duty 2 volume 162 - musice8 6 + cutoff 6 G_ 2 duty 1 volume 144 - musice8 8 + cutoff 8 A_ 1 rest 3 E_ 1 rest 1 duty 2 volume 162 - musice8 6 + cutoff 6 A_ 1 duty 1 volume 144 - musice8 8 + cutoff 8 A_ 1 rest 2 D_ 1 @@ -756,11 +756,11 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) D_ 1 duty 2 volume 162 - musice8 6 + cutoff 6 A_ 2 duty 1 volume 144 - musice8 8 + cutoff 8 D_ 1 rest 3 dec_octave @@ -769,12 +769,12 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) inc_octave duty 2 volume 162 - musice8 6 + cutoff 6 A_ 1 dec_octave duty 1 volume 144 - musice8 8 + cutoff 8 B_ 1 rest 2 inc_octave @@ -783,11 +783,11 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) D_ 1 duty 2 volume 162 - musice8 6 + cutoff 6 A_ 2 duty 1 volume 144 - musice8 8 + cutoff 8 D_ 1 rest 3 dec_octave @@ -796,7 +796,7 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) inc_octave duty 2 volume 112 - musice4 0 + frequency_offset 0 E_ 1 F# 1 A_ 1 @@ -815,26 +815,26 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) dec_octave F# 1 volume 162 - musice8 6 + cutoff 6 F# 2 volume 112 - musice8 8 + cutoff 8 A_ 10 duty 1 volume 144 - musice8 8 + cutoff 8 D_ 1 rest 2 D_ 1 duty 2 volume 162 - musice8 6 + cutoff 6 inc_octave D_ 2 dec_octave duty 1 volume 144 - musice8 8 + cutoff 8 D_ 1 rest 3 dec_octave @@ -856,19 +856,19 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) dec_octave duty 1 volume 144 - musice8 8 + cutoff 8 D_ 1 rest 2 D_ 1 duty 2 inc_octave volume 162 - musice8 6 + cutoff 6 D_ 2 dec_octave duty 1 volume 144 - musice8 8 + cutoff 8 D_ 1 rest 3 inc_octave @@ -889,7 +889,7 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) dec_octave duty 1 volume 144 - musice8 8 + cutoff 8 G_ 1 rest 2 G_ 1 @@ -907,11 +907,11 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) rest 1 dec_octave volume 162 - musice8 6 + cutoff 6 G_ 1 duty 1 volume 144 - musice8 8 + cutoff 8 E_ 1 rest 2 inc_octave @@ -926,7 +926,7 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) dec_octave duty 1 volume 144 - musice8 8 + cutoff 8 F# 1 rest 2 F# 1 @@ -944,11 +944,11 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) rest 1 dec_octave volume 162 - musice8 6 + cutoff 6 A_ 1 duty 1 volume 144 - musice8 8 + cutoff 8 E_ 1 rest 2 inc_octave @@ -963,7 +963,7 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) dec_octave duty 1 volume 144 - musice8 8 + cutoff 8 A_ 1 rest 2 A_ 1 @@ -990,20 +990,20 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) F# 13 duty 1 volume 144 - musice8 8 + cutoff 8 D_ 1 rest 2 D_ 1 inc_octave duty 2 volume 162 - musice8 6 + cutoff 6 D_ 2 dec_octave - musice4 0 + frequency_offset 0 duty 1 volume 144 - musice8 8 + cutoff 8 D_ 1 rest 2 music_call Branch_f59b4 @@ -1033,7 +1033,7 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) dec_octave duty 1 volume 144 - musice8 8 + cutoff 8 Loop 3 D_ 1 rest 2 @@ -1154,7 +1154,7 @@ Branch_f594d: dec_octave duty 1 volume 144 - musice8 8 + cutoff 8 D_ 1 rest 1 inc_octave @@ -1169,11 +1169,11 @@ Branch_f594d: D_ 1 dec_octave volume 162 - musice8 6 + cutoff 6 G_ 2 inc_octave volume 112 - musice8 8 + cutoff 8 C_ 1 rest 1 music_ret @@ -1252,7 +1252,7 @@ Branch_f59b4: rest 3 speed 7 rest 3 - musice8 8 + cutoff 8 dec_octave duty 1 volume 128 @@ -1279,7 +1279,7 @@ Branch_f59f9: octave 2 duty 1 volume 144 - musice8 8 + cutoff 8 D_ 1 rest 3 dec_octave @@ -1288,12 +1288,12 @@ Branch_f59f9: inc_octave duty 2 volume 162 - musice8 6 + cutoff 6 A_ 1 dec_octave duty 1 volume 144 - musice8 8 + cutoff 8 B_ 1 rest 2 music_ret @@ -1302,18 +1302,18 @@ Branch_f5a17: octave 2 duty 1 volume 144 - musice8 8 + cutoff 8 F# 1 rest 3 C# 1 rest 1 duty 2 volume 162 - musice8 6 + cutoff 6 A_ 1 duty 1 volume 144 - musice8 8 + cutoff 8 E_ 1 rest 2 music_ret @@ -1321,11 +1321,11 @@ Branch_f5a17: Music_DuelTheme1_Ch3: ; f5a32 (3d:5a32) speed 7 - musicdc 17 + stereo_panning 1, 1 volume 32 wave 4 - musice9 96 - musice8 8 + echo 96 + cutoff 8 octave 1 MainLoop Loop 4 @@ -1342,11 +1342,11 @@ Music_DuelTheme1_Ch3: ; f5a32 (3d:5a32) D_ 1 inc_octave inc_octave - musice8 3 + cutoff 3 D_ 2 dec_octave dec_octave - musice8 8 + cutoff 8 D_ 1 rest 3 music_call Branch_f5c47 @@ -1356,10 +1356,10 @@ Music_DuelTheme1_Ch3: ; f5a32 (3d:5a32) rest 2 D_ 1 inc_octave - musice8 3 + cutoff 3 F# 2 dec_octave - musice8 8 + cutoff 8 D_ 1 rest 3 music_call Branch_f5c47 @@ -1368,11 +1368,11 @@ Music_DuelTheme1_Ch3: ; f5a32 (3d:5a32) D_ 1 inc_octave inc_octave - musice8 3 + cutoff 3 D_ 2 dec_octave dec_octave - musice8 8 + cutoff 8 D_ 1 rest 3 music_call Branch_f5c47 @@ -1381,10 +1381,10 @@ Music_DuelTheme1_Ch3: ; f5a32 (3d:5a32) rest 2 D_ 1 inc_octave - musice8 3 + cutoff 3 A_ 2 dec_octave - musice8 8 + cutoff 8 D_ 1 rest 3 music_call Branch_f5c47 @@ -1392,10 +1392,10 @@ Music_DuelTheme1_Ch3: ; f5a32 (3d:5a32) rest 2 D_ 1 inc_octave - musice8 3 + cutoff 3 A_ 2 dec_octave - musice8 8 + cutoff 8 D_ 1 rest 2 D_ 2 @@ -1451,30 +1451,30 @@ Music_DuelTheme1_Ch3: ; f5a32 (3d:5a32) rest 1 music_call Branch_f5c60 octave 1 - musice8 8 + cutoff 8 E_ 1 rest 1 E_ 2 - musice8 6 + cutoff 6 B_ 2 music_call Branch_f5c60 octave 1 - musice8 8 + cutoff 8 F# 2 G_ 2 - musice8 6 + cutoff 6 G# 2 music_call Branch_f5c6f octave 1 - musice8 8 + cutoff 8 A_ 1 rest 1 A_ 2 - musice8 6 + cutoff 6 E_ 2 music_call Branch_f5c6f octave 1 - musice8 8 + cutoff 8 B_ 2 inc_octave C_ 2 @@ -1492,9 +1492,9 @@ Music_DuelTheme1_Ch3: ; f5a32 (3d:5a32) rest 1 E_ 1 rest 1 - musice8 7 + cutoff 7 E_ 1 - musice8 8 + cutoff 8 E_ 1 rest 1 E_ 2 @@ -1508,9 +1508,9 @@ Music_DuelTheme1_Ch3: ; f5a32 (3d:5a32) rest 1 F# 1 rest 1 - musice8 7 + cutoff 7 F# 1 - musice8 8 + cutoff 8 F# 1 rest 1 F# 2 @@ -1524,9 +1524,9 @@ Music_DuelTheme1_Ch3: ; f5a32 (3d:5a32) rest 1 G_ 1 rest 1 - musice8 7 + cutoff 7 G_ 1 - musice8 8 + cutoff 8 F# 1 rest 1 E_ 2 @@ -1541,9 +1541,9 @@ Music_DuelTheme1_Ch3: ; f5a32 (3d:5a32) rest 1 B_ 1 rest 1 - musice8 7 + cutoff 7 B_ 1 - musice8 8 + cutoff 8 F# 1 rest 1 F_ 2 @@ -1585,9 +1585,9 @@ Music_DuelTheme1_Ch3: ; f5a32 (3d:5a32) rest 1 D_ 1 rest 1 - musice8 7 + cutoff 7 D_ 1 - musice8 8 + cutoff 8 D_ 1 rest 1 A_ 14 @@ -1599,10 +1599,10 @@ Branch_f5b8d: rest 2 D_ 1 inc_octave - musice8 3 + cutoff 3 A_ 2 dec_octave - musice8 8 + cutoff 8 D_ 1 rest 3 music_call Branch_f5c47 @@ -1610,10 +1610,10 @@ Branch_f5b8d: rest 2 D_ 1 inc_octave - musice8 3 + cutoff 3 G_ 2 dec_octave - musice8 8 + cutoff 8 D_ 1 rest 3 music_call Branch_f5c47 @@ -1622,10 +1622,10 @@ Branch_f5b8d: rest 2 D_ 1 inc_octave - musice8 3 + cutoff 3 A_ 2 dec_octave - musice8 8 + cutoff 8 D_ 1 rest 3 music_call Branch_f5c47 @@ -1634,10 +1634,10 @@ Branch_f5b8d: rest 2 D_ 1 inc_octave - musice8 3 + cutoff 3 G_ 2 dec_octave - musice8 8 + cutoff 8 D_ 1 rest 3 music_call Branch_f5c47 @@ -1645,10 +1645,10 @@ Branch_f5b8d: rest 2 D_ 1 inc_octave - musice8 3 + cutoff 3 A_ 2 dec_octave - musice8 8 + cutoff 8 D_ 1 rest 3 music_call Branch_f5c47 @@ -1656,10 +1656,10 @@ Branch_f5b8d: rest 2 D_ 1 inc_octave - musice8 3 + cutoff 3 A_ 2 dec_octave - musice8 8 + cutoff 8 D_ 1 rest 3 D_ 1 @@ -1672,10 +1672,10 @@ Branch_f5b8d: rest 2 G_ 1 inc_octave - musice8 3 + cutoff 3 B_ 2 dec_octave - musice8 8 + cutoff 8 G_ 1 rest 3 D_ 1 @@ -1688,10 +1688,10 @@ Branch_f5b8d: rest 2 F# 1 inc_octave - musice8 3 + cutoff 3 A_ 2 dec_octave - musice8 8 + cutoff 8 F# 1 rest 3 C# 1 @@ -1704,11 +1704,11 @@ Branch_f5b8d: F# 1 inc_octave inc_octave - musice8 3 + cutoff 3 C# 2 dec_octave dec_octave - musice8 8 + cutoff 8 F# 1 rest 3 C# 1 @@ -1720,10 +1720,10 @@ Branch_f5b8d: rest 2 E_ 1 inc_octave - musice8 3 + cutoff 3 B_ 2 dec_octave - musice8 8 + cutoff 8 E_ 1 rest 3 E_ 1 @@ -1735,10 +1735,10 @@ Branch_f5b8d: rest 2 A_ 1 inc_octave - musice8 3 + cutoff 3 B_ 2 dec_octave - musice8 8 + cutoff 8 A_ 1 rest 3 E_ 1 @@ -1767,9 +1767,9 @@ Branch_f5c4d: rest 1 D_ 1 rest 1 - musice8 7 + cutoff 7 D_ 1 - musice8 8 + cutoff 8 D_ 1 rest 1 D_ 2 @@ -1777,7 +1777,7 @@ Branch_f5c4d: Branch_f5c60: octave 1 - musice8 8 + cutoff 8 E_ 1 rest 1 E_ 1 @@ -1786,13 +1786,13 @@ Branch_f5c60: rest 1 E_ 1 rest 1 - musice8 6 + cutoff 6 E_ 1 music_ret Branch_f5c6f: octave 1 - musice8 8 + cutoff 8 A_ 1 rest 1 A_ 1 @@ -1801,7 +1801,7 @@ Branch_f5c6f: rest 1 A_ 1 rest 1 - musice8 6 + cutoff 6 A_ 1 music_ret diff --git a/src/audio/music/dueltheme2.asm b/src/audio/music/dueltheme2.asm index 2dc8816..a4e9b5e 100644 --- a/src/audio/music/dueltheme2.asm +++ b/src/audio/music/dueltheme2.asm @@ -1,9 +1,9 @@ Music_DuelTheme2_Ch1: ; f5d68 (3d:5d68) speed 9 - musicdc 17 + stereo_panning 1, 1 vibrato_type 8 vibrato_delay 20 - musice8 8 + cutoff 8 octave 1 duty 1 volume 148 @@ -50,21 +50,21 @@ Music_DuelTheme2_Ch1: ; f5d68 (3d:5d68) G_ 6 speed 9 volume 160 - musice8 8 + cutoff 8 A_ 1 volume 55 A_ 1 volume 160 - musice8 6 + cutoff 6 D_ 1 - musice8 8 + cutoff 8 D_ 9 tie D_ 9 volume 71 D_ 3 duty 2 - musice8 8 + cutoff 8 volume 47 E_ 4 volume 96 @@ -81,7 +81,7 @@ Music_DuelTheme2_Ch1: ; f5d68 (3d:5d68) inc_octave speed 9 volume 127 - musice8 8 + cutoff 8 C_ 3 duty 1 volume 160 @@ -98,7 +98,7 @@ Music_DuelTheme2_Ch1: ; f5d68 (3d:5d68) C_ 3 speed 9 music_call Branch_f5f3d - musice8 8 + cutoff 8 C_ 4 tie speed 1 @@ -115,7 +115,7 @@ Music_DuelTheme2_Ch1: ; f5d68 (3d:5d68) E_ 6 speed 9 volume 160 - musice8 8 + cutoff 8 C_ 1 volume 55 C_ 1 @@ -125,10 +125,10 @@ Music_DuelTheme2_Ch1: ; f5d68 (3d:5d68) D_ 1 dec_octave volume 160 - musice8 6 + cutoff 6 A_ 1 inc_octave - musice8 8 + cutoff 8 D_ 9 tie D_ 10 @@ -136,7 +136,7 @@ Music_DuelTheme2_Ch1: ; f5d68 (3d:5d68) D_ 1 volume 160 speed 1 - musice8 8 + cutoff 8 D_ 4 D# 5 speed 9 @@ -149,7 +149,7 @@ Music_DuelTheme2_Ch1: ; f5d68 (3d:5d68) G_ 1 volume 160 inc_octave - musice8 8 + cutoff 8 C_ 3 dec_octave speed 1 @@ -206,9 +206,9 @@ Music_DuelTheme2_Ch1: ; f5d68 (3d:5d68) D_ 3 C# 3 dec_octave - musice8 6 + cutoff 6 B_ 3 - musice8 8 + cutoff 8 B_ 4 volume 71 B_ 1 @@ -224,14 +224,14 @@ Music_DuelTheme2_Ch1: ; f5d68 (3d:5d68) A_ 1 duty 1 volume 147 - musice8 8 + cutoff 8 D_ 2 D_ 2 rest 2 C# 2 duty 1 volume 160 - musice8 8 + cutoff 8 music_call Branch_f5f62 octave 4 volume 71 @@ -249,23 +249,23 @@ Music_DuelTheme2_Ch1: ; f5d68 (3d:5d68) volume 71 D_ 1 volume 160 - musice8 7 + cutoff 7 C# 1 D_ 1 - musice8 8 + cutoff 8 E_ 3 D_ 3 C# 3 dec_octave - musice8 6 + cutoff 6 A_ 3 inc_octave - musice8 8 + cutoff 8 F_ 10 - musice8 7 + cutoff 7 E_ 1 F_ 1 - musice8 8 + cutoff 8 G_ 3 F_ 3 E_ 3 @@ -277,12 +277,12 @@ Music_DuelTheme2_Ch1: ; f5d68 (3d:5d68) C_ 9 speed 9 volume 160 - musice8 8 + cutoff 8 A_ 10 - musice8 7 + cutoff 7 G_ 1 F_ 1 - musice8 8 + cutoff 8 G_ 6 inc_octave C_ 3 @@ -311,7 +311,7 @@ Music_DuelTheme2_Ch1: ; f5d68 (3d:5d68) EndLoop duty 1 volume 160 - musice8 8 + cutoff 8 octave 5 D_ 1 C_ 1 @@ -336,7 +336,7 @@ Music_DuelTheme2_Ch1: ; f5d68 (3d:5d68) EndMainLoop Branch_f5f3d: - musice8 8 + cutoff 8 D_ 12 tie D_ 4 @@ -399,9 +399,9 @@ Branch_f5f62: B_ 1 volume 160 inc_octave - musice8 6 + cutoff 6 F# 1 - musice8 8 + cutoff 8 F# 9 music_ret @@ -431,14 +431,14 @@ Branch_f5f90: Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) speed 9 - musicdc 17 + stereo_panning 1, 1 vibrato_type 8 vibrato_delay 15 - musice8 8 + cutoff 8 octave 2 duty 1 volume 116 - musice4 5 + frequency_offset 5 Loop 8 D_ 2 D_ 1 @@ -450,7 +450,7 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) EndLoop duty 2 volume 107 - musice4 0 + frequency_offset 0 Loop 12 inc_octave D_ 1 @@ -475,9 +475,9 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) D_ 1 rest 1 dec_octave - musice8 6 + cutoff 6 A_ 1 - musice8 8 + cutoff 8 A_ 9 duty 2 volume 107 @@ -488,7 +488,7 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) EndLoop duty 2 inc_octave - musice8 8 + cutoff 8 volume 47 C_ 4 volume 96 @@ -552,9 +552,9 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) rest 1 A_ 1 rest 1 - musice8 6 + cutoff 6 D_ 1 - musice8 8 + cutoff 8 A_ 9 duty 2 volume 107 @@ -591,7 +591,7 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) rest 1 duty 1 volume 116 - musice4 5 + frequency_offset 5 dec_octave dec_octave D_ 1 @@ -601,7 +601,7 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) EndLoop duty 2 volume 107 - musice4 0 + frequency_offset 0 inc_octave E_ 1 rest 1 @@ -650,13 +650,13 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) volume 147 octave 2 rest 1 - musice8 8 + cutoff 8 B_ 2 B_ 2 rest 2 A_ 2 inc_octave - musice8 8 + cutoff 8 C# 1 D_ 1 E_ 1 @@ -766,7 +766,7 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) rest 1 duty 1 volume 116 - musice4 5 + frequency_offset 5 dec_octave dec_octave D_ 1 @@ -777,7 +777,7 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) rest 12 duty 1 volume 112 - musice4 0 + frequency_offset 0 inc_octave A_ 12 tie @@ -785,7 +785,7 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) dec_octave duty 1 volume 116 - musice4 5 + frequency_offset 5 EndMainLoop Branch_f6173: @@ -823,7 +823,7 @@ Branch_f618f: A_ 1 rest 1 volume 116 - musice4 5 + frequency_offset 5 dec_octave dec_octave D_ 1 @@ -833,7 +833,7 @@ Branch_f618f: EndLoop D_ 2 volume 112 - musice4 0 + frequency_offset 0 inc_octave inc_octave G_ 4 @@ -843,11 +843,11 @@ Branch_f618f: Music_DuelTheme2_Ch3: ; f61ac (3d:61ac) speed 9 - musicdc 17 + stereo_panning 1, 1 volume 32 wave 1 - musice9 64 - musice8 7 + echo 64 + cutoff 7 octave 1 Loop 4 music_call Branch_f62e5 @@ -861,9 +861,9 @@ Music_DuelTheme2_Ch3: ; f61ac (3d:61ac) music_call Branch_f62e5 EndLoop octave 1 - musice8 4 + cutoff 4 D_ 2 - musice8 7 + cutoff 7 C_ 3 E_ 1 EndLoop @@ -871,7 +871,7 @@ Music_DuelTheme2_Ch3: ; f61ac (3d:61ac) music_call Branch_f62e5 EndLoop octave 1 - musice8 8 + cutoff 8 E_ 1 inc_octave E_ 1 @@ -897,9 +897,9 @@ Music_DuelTheme2_Ch3: ; f61ac (3d:61ac) EndLoop octave 1 Loop 4 - musice8 4 + cutoff 4 E_ 2 - musice8 7 + cutoff 7 E_ 1 inc_octave E_ 1 @@ -910,9 +910,9 @@ Music_DuelTheme2_Ch3: ; f61ac (3d:61ac) dec_octave EndLoop Loop 4 - musice8 4 + cutoff 4 A_ 2 - musice8 7 + cutoff 7 A_ 1 inc_octave A_ 1 @@ -926,7 +926,7 @@ Music_DuelTheme2_Ch3: ; f61ac (3d:61ac) music_call Branch_f62e5 EndLoop octave 1 - musice8 8 + cutoff 8 E_ 1 inc_octave E_ 1 @@ -955,9 +955,9 @@ Music_DuelTheme2_Ch3: ; f61ac (3d:61ac) EndLoop octave 1 Loop 4 - musice8 4 + cutoff 4 E_ 2 - musice8 7 + cutoff 7 E_ 1 inc_octave E_ 1 @@ -968,9 +968,9 @@ Music_DuelTheme2_Ch3: ; f61ac (3d:61ac) dec_octave EndLoop Loop 2 - musice8 4 + cutoff 4 G_ 2 - musice8 7 + cutoff 7 G_ 1 inc_octave G_ 1 @@ -981,9 +981,9 @@ Music_DuelTheme2_Ch3: ; f61ac (3d:61ac) dec_octave EndLoop Loop 2 - musice8 4 + cutoff 4 A_ 2 - musice8 7 + cutoff 7 A_ 1 inc_octave A_ 1 @@ -994,9 +994,9 @@ Music_DuelTheme2_Ch3: ; f61ac (3d:61ac) dec_octave EndLoop Loop 2 - musice8 4 + cutoff 4 A# 2 - musice8 7 + cutoff 7 A# 1 inc_octave A# 1 @@ -1008,9 +1008,9 @@ Music_DuelTheme2_Ch3: ; f61ac (3d:61ac) EndLoop inc_octave Loop 2 - musice8 4 + cutoff 4 C_ 2 - musice8 7 + cutoff 7 C_ 1 inc_octave C_ 1 @@ -1022,9 +1022,9 @@ Music_DuelTheme2_Ch3: ; f61ac (3d:61ac) EndLoop dec_octave Loop 2 - musice8 4 + cutoff 4 A# 2 - musice8 7 + cutoff 7 A# 1 inc_octave A# 1 @@ -1036,9 +1036,9 @@ Music_DuelTheme2_Ch3: ; f61ac (3d:61ac) EndLoop inc_octave Loop 2 - musice8 4 + cutoff 4 C_ 2 - musice8 7 + cutoff 7 C_ 1 inc_octave C_ 1 @@ -1053,9 +1053,9 @@ Music_DuelTheme2_Ch3: ; f61ac (3d:61ac) music_call Branch_f62e5 EndLoop octave 1 - musice8 4 + cutoff 4 D_ 2 - musice8 7 + cutoff 7 C_ 3 E_ 1 EndLoop @@ -1063,7 +1063,7 @@ Music_DuelTheme2_Ch3: ; f61ac (3d:61ac) music_call Branch_f62e5 EndLoop octave 2 - musice8 8 + cutoff 8 D_ 1 C_ 1 dec_octave @@ -1086,9 +1086,9 @@ Music_DuelTheme2_Ch3: ; f61ac (3d:61ac) Branch_f62e5: octave 1 - musice8 4 + cutoff 4 D_ 2 - musice8 7 + cutoff 7 D_ 1 inc_octave D_ 1 diff --git a/src/audio/music/dueltheme3.asm b/src/audio/music/dueltheme3.asm index 55ed4e1..325a1e4 100644 --- a/src/audio/music/dueltheme3.asm +++ b/src/audio/music/dueltheme3.asm @@ -1,9 +1,9 @@ Music_DuelTheme3_Ch1: ; f63a1 (3d:63a1) speed 11 - musicdc 17 + stereo_panning 1, 1 vibrato_type 8 vibrato_delay 20 - musice8 8 + cutoff 8 MainLoop octave 2 duty 0 @@ -109,7 +109,7 @@ Music_DuelTheme3_Ch1: ; f63a1 (3d:63a1) EndLoop vibrato_delay 20 duty 2 - musice8 6 + cutoff 6 Loop 4 music_call Branch_f661d EndLoop @@ -148,7 +148,7 @@ Music_DuelTheme3_Ch1: ; f63a1 (3d:63a1) speed 11 duty 1 volume 144 - musice8 8 + cutoff 8 D_ 2 C# 2 dec_octave @@ -475,14 +475,14 @@ Branch_f661d: Music_DuelTheme3_Ch2: ; f6649 (3d:6649) speed 11 - musicdc 17 + stereo_panning 1, 1 vibrato_type 8 vibrato_delay 20 - musice8 8 + cutoff 8 MainLoop octave 2 duty 0 - musice4 3 + frequency_offset 3 Loop 4 Loop 4 volume 130 @@ -494,7 +494,7 @@ Music_DuelTheme3_Ch2: ; f6649 (3d:6649) volume 133 F_ 2 EndLoop - musice4 0 + frequency_offset 0 octave 3 Loop 4 rest 6 @@ -554,69 +554,69 @@ Music_DuelTheme3_Ch2: ; f6649 (3d:6649) vibrato_delay 10 Loop 4 volume 163 - musice8 6 + cutoff 6 F# 1 F# 1 - musice8 8 + cutoff 8 speed 1 F# 5 volume 39 F# 6 volume 163 - musice8 6 + cutoff 6 speed 11 F# 1 inc_octave volume 144 - musice8 8 + cutoff 8 C# 2 dec_octave volume 163 - musice8 6 + cutoff 6 F# 1 F# 1 speed 1 - musice8 8 + cutoff 8 F# 5 volume 39 F# 6 volume 163 - musice8 6 + cutoff 6 speed 11 F# 1 volume 144 - musice8 8 + cutoff 8 B_ 2 volume 163 - musice8 6 + cutoff 6 F# 1 F# 1 - musice8 8 + cutoff 8 speed 1 F# 5 volume 39 F# 6 volume 163 - musice8 6 + cutoff 6 speed 11 F# 1 volume 144 - musice8 8 + cutoff 8 B_ 2 volume 163 - musice8 6 + cutoff 6 F# 1 F# 1 speed 1 - musice8 8 + cutoff 8 F# 5 volume 39 F# 6 volume 163 - musice8 6 + cutoff 6 speed 11 F# 1 - musice8 8 + cutoff 8 volume 144 A_ 2 G# 2 @@ -909,22 +909,22 @@ Branch_f6866: Music_DuelTheme3_Ch3: ; f68c2 (3d:68c2) speed 11 - musicdc 17 + stereo_panning 1, 1 volume 32 wave 1 - musice9 96 + echo 96 vibrato_type 8 vibrato_delay 0 - musice8 8 + cutoff 8 MainLoop octave 1 Loop 4 Loop 4 - musice8 4 + cutoff 4 F# 2 rest 1 EndLoop - musice8 8 + cutoff 8 E_ 2 F_ 2 EndLoop @@ -958,7 +958,7 @@ Music_DuelTheme3_Ch3: ; f68c2 (3d:68c2) music_call Branch_f69f0 speed 11 octave 3 - musice8 8 + cutoff 8 D_ 2 C# 2 dec_octave @@ -966,7 +966,7 @@ Music_DuelTheme3_Ch3: ; f68c2 (3d:68c2) EndLoop music_call Branch_f69f0 octave 1 - musice8 8 + cutoff 8 F# 2 E_ 2 vibrato_delay 0 @@ -1004,7 +1004,7 @@ Music_DuelTheme3_Ch3: ; f68c2 (3d:68c2) E_ 2 F_ 2 EndLoop - musice8 7 + cutoff 7 Loop 4 inc_octave Loop 4 @@ -1037,7 +1037,7 @@ Music_DuelTheme3_Ch3: ; f68c2 (3d:68c2) dec_octave E_ 1 EndLoop - musice8 8 + cutoff 8 EndMainLoop Branch_f6973: @@ -1046,11 +1046,11 @@ Branch_f6973: rest 1 inc_octave inc_octave - musice8 4 + cutoff 4 E_ 1 dec_octave dec_octave - musice8 8 + cutoff 8 F# 1 rest 2 F# 1 @@ -1060,11 +1060,11 @@ Branch_f6973: rest 1 inc_octave inc_octave - musice8 4 + cutoff 4 E_ 1 dec_octave dec_octave - musice8 8 + cutoff 8 E_ 2 F_ 2 music_ret @@ -1076,11 +1076,11 @@ Branch_f6992: rest 1 inc_octave inc_octave - musice8 4 + cutoff 4 E_ 1 dec_octave dec_octave - musice8 8 + cutoff 8 F# 1 rest 2 F# 1 @@ -1090,11 +1090,11 @@ Branch_f6992: rest 1 inc_octave inc_octave - musice8 4 + cutoff 4 E_ 1 dec_octave dec_octave - musice8 8 + cutoff 8 F# 1 rest 1 F# 2 @@ -1102,11 +1102,11 @@ Branch_f6992: rest 1 inc_octave inc_octave - musice8 4 + cutoff 4 F# 1 dec_octave dec_octave - musice8 8 + cutoff 8 G_ 1 rest 2 G_ 1 @@ -1116,22 +1116,22 @@ Branch_f6992: rest 1 inc_octave inc_octave - musice8 4 + cutoff 4 F# 1 dec_octave dec_octave - musice8 8 + cutoff 8 F_ 2 F# 2 G_ 1 rest 1 inc_octave inc_octave - musice8 4 + cutoff 4 F# 1 dec_octave dec_octave - musice8 8 + cutoff 8 G_ 1 rest 2 G_ 1 @@ -1141,11 +1141,11 @@ Branch_f6992: rest 1 inc_octave inc_octave - musice8 4 + cutoff 4 F# 1 dec_octave dec_octave - musice8 8 + cutoff 8 G_ 1 rest 1 F_ 2 @@ -1153,67 +1153,67 @@ Branch_f6992: Branch_f69f0: octave 1 - musice8 6 + cutoff 6 F# 1 inc_octave C# 1 inc_octave - musice8 4 + cutoff 4 C# 1 dec_octave dec_octave - musice8 6 + cutoff 6 F# 1 inc_octave inc_octave - musice8 8 + cutoff 8 F# 2 dec_octave dec_octave - musice8 6 + cutoff 6 F# 1 inc_octave C# 1 inc_octave - musice8 4 + cutoff 4 C# 1 dec_octave dec_octave - musice8 6 + cutoff 6 F# 1 inc_octave inc_octave - musice8 8 + cutoff 8 E_ 2 dec_octave dec_octave - musice8 6 + cutoff 6 F# 1 inc_octave C# 1 inc_octave - musice8 4 + cutoff 4 C# 1 dec_octave dec_octave - musice8 6 + cutoff 6 F# 1 inc_octave inc_octave - musice8 8 + cutoff 8 D# 2 dec_octave dec_octave - musice8 6 + cutoff 6 F# 1 inc_octave C# 1 inc_octave - musice8 4 + cutoff 4 C# 1 dec_octave dec_octave - musice8 6 + cutoff 6 F# 1 music_ret diff --git a/src/audio/music/hallofhonor.asm b/src/audio/music/hallofhonor.asm index 3117df7..f840761 100644 --- a/src/audio/music/hallofhonor.asm +++ b/src/audio/music/hallofhonor.asm @@ -1,7 +1,7 @@ Music_HallOfHonor_Ch1: ; fafea (3e:6fea) speed 7 - musicdc 17 - musice8 8 + stereo_panning 1, 1 + cutoff 8 duty 2 Loop 4 music_call Branch_fb016 @@ -94,10 +94,10 @@ Branch_fb044: Music_HallOfHonor_Ch2: ; fb06e (3e:706e) speed 7 - musicdc 17 - musice8 8 + stereo_panning 1, 1 + cutoff 8 duty 2 - musice4 255 + frequency_offset -1 rest 2 speed 1 rest 4 @@ -123,7 +123,7 @@ Music_HallOfHonor_Ch2: ; fb06e (3e:706e) speed 1 rest 3 speed 7 - musice4 0 + frequency_offset 0 MainLoop octave 1 duty 1 @@ -173,16 +173,16 @@ Branch_fb0bb: Music_HallOfHonor_Ch3: ; fb0d5 (3e:70d5) speed 7 volume 64 - musicdc 17 + stereo_panning 1, 1 wave 2 vibrato_type 4 vibrato_delay 35 - musice8 6 - musice9 64 + cutoff 6 + echo 64 rest 3 volume 96 - musice8 8 - musice4 255 + cutoff 8 + frequency_offset -1 Loop 4 rest 14 EndLoop @@ -205,10 +205,10 @@ Music_HallOfHonor_Ch3: ; fb0d5 (3e:70d5) dec_octave F_ 1 volume 32 - musice4 0 + frequency_offset 0 octave 4 speed 1 - musice8 6 + cutoff 6 B_ 3 inc_octave C_ 4 @@ -218,20 +218,20 @@ Music_HallOfHonor_Ch3: ; fb0d5 (3e:70d5) tie C_ 8 dec_octave - musice8 8 + cutoff 8 B_ 2 - musice8 4 + cutoff 4 A_ 2 - musice8 6 + cutoff 6 G_ 6 C_ 10 tie C_ 12 speed 1 - musice8 8 + cutoff 8 B_ 3 inc_octave - musice8 6 + cutoff 6 C_ 4 tie speed 7 @@ -239,30 +239,30 @@ Music_HallOfHonor_Ch3: ; fb0d5 (3e:70d5) tie C_ 6 dec_octave - musice8 8 + cutoff 8 B_ 2 inc_octave C_ 2 - musice8 4 + cutoff 4 D_ 2 dec_octave speed 1 - musice8 8 + cutoff 8 F# 3 - musice8 6 + cutoff 6 G_ 4 tie speed 7 G_ 15 tie G_ 6 - musice8 8 + cutoff 8 G_ 2 A_ 2 - musice8 4 + cutoff 4 B_ 2 speed 1 - musice8 8 + cutoff 8 B_ 3 inc_octave C_ 4 @@ -273,15 +273,15 @@ Music_HallOfHonor_Ch3: ; fb0d5 (3e:70d5) C_ 8 dec_octave B_ 2 - musice8 4 + cutoff 4 A_ 2 - musice8 6 + cutoff 6 G_ 6 - musice8 8 + cutoff 8 speed 1 B_ 3 inc_octave - musice8 6 + cutoff 6 C_ 4 tie speed 7 @@ -289,91 +289,91 @@ Music_HallOfHonor_Ch3: ; fb0d5 (3e:70d5) tie C_ 6 dec_octave - musice8 8 + cutoff 8 G_ 2 inc_octave C_ 2 - musice8 4 + cutoff 4 E_ 2 speed 1 - musice8 8 + cutoff 8 E_ 3 F_ 4 tie speed 7 F_ 1 E_ 2 - musice8 4 + cutoff 4 C_ 2 - musice8 7 + cutoff 7 C_ 10 tie C_ 10 - musice8 4 + cutoff 4 E_ 2 speed 1 - musice8 8 + cutoff 8 E_ 3 F_ 4 tie speed 7 F_ 1 E_ 2 - musice8 4 + cutoff 4 C_ 2 - musice8 6 + cutoff 6 C_ 10 tie C_ 12 speed 1 - musice8 8 + cutoff 8 F# 3 - musice8 7 + cutoff 7 G_ 4 tie speed 7 G_ 15 tie G_ 8 - musice8 8 + cutoff 8 F_ 2 - musice8 4 + cutoff 4 E_ 2 - musice8 8 + cutoff 8 F_ 2 - musice8 4 + cutoff 4 E_ 2 C_ 2 dec_octave - musice8 7 + cutoff 7 G_ 10 tie G_ 10 - musice8 8 + cutoff 8 E_ 2 F_ 2 inc_octave - musice8 4 + cutoff 4 C_ 2 - musice8 7 + cutoff 7 C_ 12 tie C_ 10 dec_octave - musice8 8 + cutoff 8 E_ 2 F_ 2 inc_octave - musice8 4 + cutoff 4 C_ 2 - musice8 6 + cutoff 6 C_ 12 tie C_ 12 rest 3 volume 96 - musice4 255 - musice8 8 + frequency_offset -1 + cutoff 8 EndMainLoop Branch_fb1ec: diff --git a/src/audio/music/imakuni.asm b/src/audio/music/imakuni.asm index 74cf2d7..13e2350 100644 --- a/src/audio/music/imakuni.asm +++ b/src/audio/music/imakuni.asm @@ -1,9 +1,9 @@ Music_Imakuni_Ch1: ; fad55 (3e:6d55) speed 3 - musicdc 17 + stereo_panning 1, 1 vibrato_type 5 vibrato_delay 20 - musice8 8 + cutoff 8 duty 2 volume 160 MainLoop @@ -186,10 +186,10 @@ Branch_fae1d: Music_Imakuni_Ch2: ; fae32 (3e:6e32) - musicdc 17 + stereo_panning 1, 1 vibrato_type 0 vibrato_delay 0 - musice8 8 + cutoff 8 duty 1 volume 160 Loop 6 @@ -292,13 +292,13 @@ Branch_faea5: Music_Imakuni_Ch3: ; faebc (3e:6ebc) - musicdc 17 + stereo_panning 1, 1 volume 32 wave 1 vibrato_type 6 vibrato_delay 0 - musice9 0 - musice8 8 + echo 0 + cutoff 8 MainLoop music_call Branch_faf7d vibrato_delay 8 diff --git a/src/audio/music/darkdiddly.asm b/src/audio/music/matchdraw.asm index a82dd00..de3d41e 100644 --- a/src/audio/music/darkdiddly.asm +++ b/src/audio/music/matchdraw.asm @@ -1,7 +1,7 @@ -Music_DarkDiddly_Ch1: ; f7cdf (3d:7cdf) +Music_MatchDraw_Ch1: ; f7cdf (3d:7cdf) speed 3 - musicdc 17 - musice8 8 + stereo_panning 1, 1 + cutoff 8 octave 4 duty 1 volume 176 @@ -45,10 +45,10 @@ Music_DarkDiddly_Ch1: ; f7cdf (3d:7cdf) music_end -Music_DarkDiddly_Ch2: ; f7d17 (3d:7d17) +Music_MatchDraw_Ch2: ; f7d17 (3d:7d17) speed 3 - musicdc 17 - musice8 8 + stereo_panning 1, 1 + cutoff 8 octave 3 duty 1 volume 176 @@ -84,13 +84,13 @@ Music_DarkDiddly_Ch2: ; f7d17 (3d:7d17) music_end -Music_DarkDiddly_Ch3: ; f7d47 (3d:7d47) +Music_MatchDraw_Ch3: ; f7d47 (3d:7d47) speed 6 - musicdc 17 + stereo_panning 1, 1 wave 1 volume 32 - musice8 8 - musice9 0 + cutoff 8 + echo 0 octave 1 rest 16 G_ 2 diff --git a/src/audio/music/matchloss.asm b/src/audio/music/matchloss.asm index a80a9be..1029270 100644 --- a/src/audio/music/matchloss.asm +++ b/src/audio/music/matchloss.asm @@ -1,8 +1,8 @@ Music_MatchLoss_Ch1: ; f7c2e (3d:7c2e) - musicdc 17 + stereo_panning 1, 1 vibrato_type 1 vibrato_delay 20 - musice8 8 + cutoff 8 octave 4 duty 2 volume 176 @@ -65,10 +65,10 @@ Music_MatchLoss_Ch1: ; f7c2e (3d:7c2e) Music_MatchLoss_Ch2: ; f7c87 (3d:7c87) - musicdc 17 + stereo_panning 1, 1 vibrato_type 5 vibrato_delay 20 - musice8 8 + cutoff 8 octave 3 duty 2 volume 144 @@ -89,42 +89,42 @@ Music_MatchLoss_Ch2: ; f7c87 (3d:7c87) Music_MatchLoss_Ch3: ; f7ca7 (3d:7ca7) - musicdc 17 + stereo_panning 1, 1 wave 1 volume 32 - musice8 8 - musice9 64 + cutoff 8 + echo 64 octave 1 speed 5 A# 4 inc_octave - musice8 4 + cutoff 4 F_ 4 A# 4 dec_octave - musice8 8 + cutoff 8 speed 7 G# 3 inc_octave - musice8 4 + cutoff 4 speed 2 D# 11 G# 11 dec_octave - musice8 8 + cutoff 8 speed 1 F# 11 tie F# 12 inc_octave - musice8 4 + cutoff 4 speed 12 C# 2 speed 2 F# 13 dec_octave speed 9 - musice8 8 + cutoff 8 F_ 12 music_end ; 0xf7cdf diff --git a/src/audio/music/matchstart1.asm b/src/audio/music/matchstart1.asm index 92557ab..365f914 100644 --- a/src/audio/music/matchstart1.asm +++ b/src/audio/music/matchstart1.asm @@ -1,7 +1,7 @@ Music_MatchStart1_Ch1: ; f7919 (3d:7919) speed 1 - musicdc 17 - musice8 8 + stereo_panning 1, 1 + cutoff 8 Loop 3 duty 2 volume 240 diff --git a/src/audio/music/matchstart2.asm b/src/audio/music/matchstart2.asm index ef56499..feae659 100644 --- a/src/audio/music/matchstart2.asm +++ b/src/audio/music/matchstart2.asm @@ -1,7 +1,7 @@ Music_MatchStart2_Ch1: ; f7956 (3d:7956) speed 1 - musicdc 17 - musice8 8 + stereo_panning 1, 1 + cutoff 8 octave 2 volume 240 duty 0 @@ -90,9 +90,9 @@ Music_MatchStart2_Ch1: ; f7956 (3d:7956) Music_MatchStart2_Ch2: ; f79b4 (3d:79b4) speed 1 - musicdc 17 - musice8 8 - musice4 6 + stereo_panning 1, 1 + cutoff 8 + frequency_offset 6 rest 4 octave 2 volume 96 diff --git a/src/audio/music/matchstart3.asm b/src/audio/music/matchstart3.asm index 995d017..be1c322 100644 --- a/src/audio/music/matchstart3.asm +++ b/src/audio/music/matchstart3.asm @@ -1,7 +1,7 @@ Music_MatchStart3_Ch1: ; f7a0f (3d:7a0f) speed 1 - musicdc 17 - musice8 8 + stereo_panning 1, 1 + cutoff 8 octave 2 volume 240 duty 1 @@ -165,9 +165,9 @@ Music_MatchStart3_Ch1: ; f7a0f (3d:7a0f) Music_MatchStart3_Ch2: ; f7aba (3d:7aba) speed 1 - musicdc 17 - musice8 8 - musice4 6 + stereo_panning 1, 1 + cutoff 8 + frequency_offset 6 rest 4 octave 2 volume 96 diff --git a/src/audio/music/matchvictory.asm b/src/audio/music/matchvictory.asm index 44adeea..feda345 100644 --- a/src/audio/music/matchvictory.asm +++ b/src/audio/music/matchvictory.asm @@ -1,8 +1,8 @@ Music_MatchVictory_Ch1: ; f7b61 (3d:7b61) - musicdc 17 + stereo_panning 1, 1 vibrato_type 1 vibrato_delay 20 - musice8 8 + cutoff 8 octave 3 duty 0 volume 176 @@ -54,10 +54,10 @@ Music_MatchVictory_Ch1: ; f7b61 (3d:7b61) Music_MatchVictory_Ch2: ; f7bb0 (3d:7bb0) - musicdc 17 + stereo_panning 1, 1 vibrato_type 1 vibrato_delay 20 - musice8 8 + cutoff 8 octave 3 duty 0 volume 176 @@ -117,11 +117,11 @@ Music_MatchVictory_Ch2: ; f7bb0 (3d:7bb0) Music_MatchVictory_Ch3: ; f7c09 (3d:7c09) - musicdc 17 + stereo_panning 1, 1 wave 1 volume 32 - musice8 8 - musice9 0 + cutoff 8 + echo 0 octave 1 speed 1 F_ 15 diff --git a/src/audio/music/medal.asm b/src/audio/music/medal.asm index 638c365..47cc456 100644 --- a/src/audio/music/medal.asm +++ b/src/audio/music/medal.asm @@ -1,8 +1,8 @@ Music_Medal_Ch1: ; f7df8 (3d:7df8) - musicdc 17 + stereo_panning 1, 1 vibrato_type 1 vibrato_delay 20 - musice8 8 + cutoff 8 octave 2 duty 1 volume 160 @@ -33,11 +33,11 @@ Music_Medal_Ch1: ; f7df8 (3d:7df8) volume 55 A_ 5 volume 160 - musice8 7 + cutoff 7 A_ 5 A_ 5 A_ 5 - musice8 8 + cutoff 8 A_ 15 volume 55 A_ 5 @@ -63,10 +63,10 @@ Music_Medal_Ch1: ; f7df8 (3d:7df8) Music_Medal_Ch2: ; f7e4b (3d:7e4b) - musicdc 17 + stereo_panning 1, 1 vibrato_type 1 vibrato_delay 20 - musice8 8 + cutoff 8 octave 1 duty 0 volume 144 @@ -96,11 +96,11 @@ Music_Medal_Ch2: ; f7e4b (3d:7e4b) volume 39 C_ 5 volume 160 - musice8 7 + cutoff 7 C_ 5 C_ 5 C_ 5 - musice8 8 + cutoff 8 D_ 15 volume 55 D_ 5 @@ -126,11 +126,11 @@ Music_Medal_Ch2: ; f7e4b (3d:7e4b) Music_Medal_Ch3: ; f7e9d (3d:7e9d) - musicdc 17 + stereo_panning 1, 1 wave 1 volume 32 - musice8 8 - musice9 0 + cutoff 8 + echo 0 octave 1 speed 1 speed 15 @@ -140,11 +140,11 @@ Music_Medal_Ch3: ; f7e9d (3d:7e9d) speed 1 F_ 10 rest 5 - musice8 7 + cutoff 7 F_ 5 F_ 5 F_ 5 - musice8 8 + cutoff 8 A# 15 rest 5 A# 16 diff --git a/src/audio/music/overworld.asm b/src/audio/music/overworld.asm index 3497988..a06be35 100644 --- a/src/audio/music/overworld.asm +++ b/src/audio/music/overworld.asm @@ -1,11 +1,11 @@ Music_Overworld_Ch1: ; f71a0 (3d:71a0) speed 7 duty 0 - musicdc 17 + stereo_panning 1, 1 vibrato_type 9 vibrato_delay 25 volume 162 - musice8 7 + cutoff 7 octave 3 rest 3 music_call Branch_f72ba @@ -13,7 +13,7 @@ Music_Overworld_Ch1: ; f71a0 (3d:71a0) MainLoop music_call Branch_f72ba duty 1 - musice8 8 + cutoff 8 octave 3 volume 160 A_ 5 @@ -44,14 +44,14 @@ Music_Overworld_Ch1: ; f71a0 (3d:71a0) C_ 2 duty 0 volume 146 - musice8 7 + cutoff 7 octave 3 E_ 4 E_ 3 E_ 3 duty 1 volume 160 - musice8 8 + cutoff 8 music_call Branch_f72fb C_ 6 volume 55 @@ -96,7 +96,7 @@ Music_Overworld_Ch1: ; f71a0 (3d:71a0) volume 55 E_ 1 volume 160 - musice8 8 + cutoff 8 C_ 9 volume 55 C_ 3 @@ -121,7 +121,7 @@ Music_Overworld_Ch1: ; f71a0 (3d:71a0) volume 55 C_ 6 duty 2 - musice8 8 + cutoff 8 volume 95 octave 4 G_ 1 @@ -138,7 +138,7 @@ Music_Overworld_Ch1: ; f71a0 (3d:71a0) C_ 1 duty 1 volume 160 - musice8 8 + cutoff 8 music_call Branch_f72fb C_ 6 volume 55 @@ -190,7 +190,7 @@ Music_Overworld_Ch1: ; f71a0 (3d:71a0) F_ 3 duty 0 volume 162 - musice8 7 + cutoff 7 EndMainLoop Branch_f72ba: @@ -200,22 +200,22 @@ Branch_f72ba: A_ 1 inc_octave volume 160 - musice8 4 + cutoff 4 C_ 1 rest 1 dec_octave volume 146 - musice8 7 + cutoff 7 A# 3 A# 1 inc_octave volume 160 - musice8 4 + cutoff 4 D_ 1 rest 2 dec_octave volume 146 - musice8 7 + cutoff 7 G_ 3 A# 3 rest 3 @@ -224,21 +224,21 @@ Branch_f72ba: inc_octave C_ 1 volume 160 - musice8 4 + cutoff 4 C_ 1 rest 1 dec_octave volume 146 - musice8 7 + cutoff 7 A# 3 A# 1 inc_octave volume 160 - musice8 4 + cutoff 4 D_ 1 rest 2 volume 146 - musice8 7 + cutoff 7 C_ 3 dec_octave A# 3 @@ -288,27 +288,27 @@ Branch_f72fb: Music_Overworld_Ch2: ; f7334 (3d:7334) speed 7 duty 0 - musicdc 17 + stereo_panning 1, 1 vibrato_type 9 vibrato_delay 30 - musice8 7 + cutoff 7 octave 3 music_call Branch_f7535 MainLoop music_call Branch_f7535 volume 146 - musice8 7 + cutoff 7 rest 3 C_ 5 C_ 3 volume 144 - musice8 4 + cutoff 4 inc_octave F_ 1 rest 2 dec_octave volume 146 - musice8 7 + cutoff 7 C_ 4 C_ 3 C_ 3 @@ -316,13 +316,13 @@ Music_Overworld_Ch2: ; f7334 (3d:7334) C_ 5 C_ 3 volume 144 - musice8 4 + cutoff 4 inc_octave G_ 1 rest 2 dec_octave volume 146 - musice8 7 + cutoff 7 D_ 4 D_ 3 C_ 3 @@ -332,13 +332,13 @@ Music_Overworld_Ch2: ; f7334 (3d:7334) inc_octave D_ 3 volume 144 - musice8 4 + cutoff 4 inc_octave F_ 1 rest 2 dec_octave volume 146 - musice8 7 + cutoff 7 C_ 4 C_ 3 dec_octave @@ -348,13 +348,13 @@ Music_Overworld_Ch2: ; f7334 (3d:7334) inc_octave C# 3 volume 144 - musice8 4 + cutoff 4 inc_octave F_ 1 rest 2 dec_octave volume 146 - musice8 7 + cutoff 7 C# 4 dec_octave F_ 3 @@ -365,39 +365,39 @@ Music_Overworld_Ch2: ; f7334 (3d:7334) E_ 2 C_ 3 volume 144 - musice8 4 + cutoff 4 inc_octave G_ 1 - musice8 7 + cutoff 7 volume 96 - musice8 8 + cutoff 8 octave 3 E_ 3 F_ 3 G_ 3 - musice8 7 + cutoff 7 A# 6 volume 146 - musice8 7 + cutoff 7 octave 3 D_ 3 volume 96 - musice8 8 + cutoff 8 octave 3 A_ 3 volume 146 - musice8 7 + cutoff 7 octave 2 A_ 2 inc_octave inc_octave volume 144 - musice8 4 + cutoff 4 F_ 1 dec_octave rest 2 volume 146 - musice8 7 + cutoff 7 D_ 4 D_ 3 dec_octave @@ -409,7 +409,7 @@ Music_Overworld_Ch2: ; f7334 (3d:7334) dec_octave A# 3 volume 144 - musice8 4 + cutoff 4 inc_octave inc_octave F_ 1 @@ -417,7 +417,7 @@ Music_Overworld_Ch2: ; f7334 (3d:7334) dec_octave dec_octave volume 146 - musice8 7 + cutoff 7 A# 4 A# 3 A# 3 @@ -428,13 +428,13 @@ Music_Overworld_Ch2: ; f7334 (3d:7334) dec_octave A# 3 volume 144 - musice8 4 + cutoff 4 inc_octave A_ 1 rest 2 dec_octave volume 146 - musice8 7 + cutoff 7 A# 6 inc_octave D_ 1 @@ -445,12 +445,12 @@ Music_Overworld_Ch2: ; f7334 (3d:7334) C_ 5 C_ 3 volume 144 - musice8 4 + cutoff 4 inc_octave F_ 1 rest 2 volume 146 - musice8 7 + cutoff 7 dec_octave C_ 4 C_ 3 @@ -459,17 +459,17 @@ Music_Overworld_Ch2: ; f7334 (3d:7334) C_ 5 C_ 3 volume 144 - musice8 4 + cutoff 4 inc_octave G_ 1 rest 2 dec_octave volume 146 - musice8 7 + cutoff 7 D_ 4 duty 2 volume 95 - musice8 8 + cutoff 8 octave 4 C_ 1 tie @@ -486,20 +486,20 @@ Music_Overworld_Ch2: ; f7334 (3d:7334) E_ 1 duty 0 volume 146 - musice8 7 + cutoff 7 octave 2 rest 3 A# 5 inc_octave D_ 3 volume 144 - musice8 4 + cutoff 4 inc_octave F_ 1 rest 2 dec_octave volume 146 - musice8 7 + cutoff 7 C_ 4 C_ 3 dec_octave @@ -509,13 +509,13 @@ Music_Overworld_Ch2: ; f7334 (3d:7334) inc_octave C# 3 volume 144 - musice8 4 + cutoff 4 inc_octave F_ 1 rest 2 dec_octave volume 146 - musice8 7 + cutoff 7 C# 4 C# 3 C# 3 @@ -526,13 +526,13 @@ Music_Overworld_Ch2: ; f7334 (3d:7334) inc_octave C_ 3 volume 144 - musice8 4 + cutoff 4 inc_octave G_ 1 rest 2 dec_octave volume 146 - musice8 7 + cutoff 7 C_ 4 E_ 3 C_ 3 @@ -543,15 +543,15 @@ Music_Overworld_Ch2: ; f7334 (3d:7334) inc_octave inc_octave volume 144 - musice8 4 + cutoff 4 F_ 1 rest 2 dec_octave volume 146 - musice8 7 + cutoff 7 D_ 4 volume 96 - musice8 8 + cutoff 8 octave 4 D_ 2 E_ 1 @@ -561,26 +561,26 @@ Music_Overworld_Ch2: ; f7334 (3d:7334) volume 96 F_ 11 volume 146 - musice8 7 + cutoff 7 octave 4 volume 144 - musice8 4 + cutoff 4 F_ 1 rest 2 dec_octave dec_octave volume 146 - musice8 7 + cutoff 7 A# 1 volume 96 - musice8 8 + cutoff 8 octave 3 A# 3 inc_octave F_ 3 G_ 9 volume 146 - musice8 7 + cutoff 7 octave 3 D_ 2 dec_octave @@ -588,9 +588,9 @@ Music_Overworld_Ch2: ; f7334 (3d:7334) inc_octave inc_octave volume 144 - musice8 4 + cutoff 4 F_ 1 - musice8 8 + cutoff 8 volume 96 octave 4 C_ 5 @@ -602,40 +602,40 @@ Music_Overworld_Ch2: ; f7334 (3d:7334) volume 39 A# 1 volume 146 - musice8 7 + cutoff 7 octave 3 rest 3 F_ 3 C_ 2 F_ 1 volume 144 - musice8 4 + cutoff 4 inc_octave F_ 1 rest 1 dec_octave volume 146 - musice8 7 + cutoff 7 G_ 3 G_ 3 speed 1 volume 144 - musice8 8 + cutoff 8 inc_octave F_ 4 C_ 3 speed 7 dec_octave volume 146 - musice8 7 + cutoff 7 E_ 3 G_ 2 inc_octave volume 144 - musice8 4 + cutoff 4 F_ 1 volume 146 - musice8 7 + cutoff 7 dec_octave rest 3 A_ 3 @@ -643,107 +643,107 @@ Music_Overworld_Ch2: ; f7334 (3d:7334) A_ 1 inc_octave volume 144 - musice8 4 + cutoff 4 F_ 1 rest 1 dec_octave volume 146 - musice8 7 + cutoff 7 G_ 3 G_ 3 speed 1 volume 144 - musice8 8 + cutoff 8 inc_octave F_ 4 C_ 3 dec_octave speed 7 volume 146 - musice8 7 + cutoff 7 A_ 3 G_ 2 inc_octave volume 144 - musice8 4 + cutoff 4 F_ 1 EndMainLoop Branch_f7535: octave 3 volume 146 - musice8 7 + cutoff 7 rest 3 C_ 3 C_ 2 F_ 1 volume 144 - musice8 4 + cutoff 4 inc_octave F_ 1 rest 1 dec_octave volume 146 - musice8 7 + cutoff 7 G_ 3 G_ 1 volume 144 - musice8 4 + cutoff 4 inc_octave F_ 1 rest 1 dec_octave - musice8 8 + cutoff 8 speed 1 inc_octave F_ 4 C_ 3 speed 7 volume 146 - musice8 7 + cutoff 7 dec_octave E_ 3 G_ 2 volume 144 - musice8 4 + cutoff 4 inc_octave F_ 1 dec_octave rest 3 volume 146 - musice8 8 + cutoff 8 F_ 3 F_ 2 A_ 1 volume 144 - musice8 4 + cutoff 4 inc_octave F_ 1 rest 1 dec_octave volume 146 - musice8 7 + cutoff 7 G_ 3 G_ 1 volume 144 - musice8 4 + cutoff 4 inc_octave F_ 1 rest 1 dec_octave - musice8 8 + cutoff 8 speed 1 inc_octave F_ 4 C_ 3 speed 7 volume 146 - musice8 7 + cutoff 7 dec_octave A_ 3 G_ 2 volume 144 - musice8 4 + cutoff 4 inc_octave F_ 1 dec_octave @@ -752,11 +752,11 @@ Branch_f7535: Music_Overworld_Ch3: ; f75a1 (3d:75a1) speed 7 - musicdc 17 + stereo_panning 1, 1 volume 32 wave 1 - musice9 64 - musice8 7 + echo 64 + cutoff 7 octave 1 music_call Branch_f77f8 F_ 2 @@ -767,71 +767,71 @@ Music_Overworld_Ch3: ; f75a1 (3d:75a1) F_ 3 music_call Branch_f7826 octave 1 - musice8 8 + cutoff 8 F_ 1 A# 2 rest 1 octave 3 - musice8 3 + cutoff 3 C# 2 dec_octave - musice8 8 + cutoff 8 F_ 1 A# 1 rest 1 inc_octave - musice8 3 + cutoff 3 F_ 2 rest 1 inc_octave C# 1 octave 1 - musice8 8 + cutoff 8 A# 1 rest 1 octave 3 - musice8 7 + cutoff 7 G_ 1 octave 1 - musice8 8 + cutoff 8 A# 1 rest 1 F_ 1 inc_octave - musice8 3 + cutoff 3 A# 2 dec_octave - musice8 8 + cutoff 8 A# 1 octave 3 - musice8 3 + cutoff 3 C# 2 octave 1 - musice8 8 + cutoff 8 F_ 1 A_ 2 rest 1 octave 3 - musice8 3 + cutoff 3 E_ 2 octave 1 - musice8 8 + cutoff 8 A_ 1 octave 3 - musice8 3 + cutoff 3 G_ 2 - musice8 7 + cutoff 7 E_ 1 - musice8 8 + cutoff 8 dec_octave E_ 1 rest 1 inc_octave inc_octave - musice8 3 + cutoff 3 E_ 1 octave 1 - musice8 8 + cutoff 8 A_ 1 rest 1 inc_octave @@ -852,240 +852,240 @@ Music_Overworld_Ch3: ; f75a1 (3d:75a1) D_ 2 rest 1 octave 3 - musice8 3 + cutoff 3 F_ 2 octave 1 - musice8 8 + cutoff 8 A_ 1 inc_octave D_ 2 dec_octave A_ 1 octave 3 - musice8 3 + cutoff 3 D_ 2 inc_octave C_ 1 octave 1 - musice8 8 + cutoff 8 D_ 2 octave 3 - musice8 3 + cutoff 3 F_ 2 rest 1 octave 1 - musice8 8 + cutoff 8 A_ 1 octave 3 - musice8 3 + cutoff 3 F_ 2 octave 1 - musice8 8 + cutoff 8 D_ 1 octave 3 - musice8 3 + cutoff 3 D_ 2 - musice8 8 + cutoff 8 octave 1 A_ 1 G_ 2 rest 1 octave 3 - musice8 3 + cutoff 3 D_ 2 octave 1 - musice8 8 + cutoff 8 G_ 1 octave 3 - musice8 3 + cutoff 3 F_ 2 - musice8 7 + cutoff 7 D_ 1 dec_octave - musice8 8 + cutoff 8 D_ 1 rest 1 - musice8 3 + cutoff 3 inc_octave A# 1 octave 1 - musice8 8 + cutoff 8 G_ 1 rest 1 octave 3 - musice8 3 + cutoff 3 D_ 2 rest 1 dec_octave - musice8 8 + cutoff 8 D_ 1 inc_octave - musice8 3 + cutoff 3 F_ 2 octave 1 - musice8 8 + cutoff 8 G_ 1 octave 3 - musice8 3 + cutoff 3 D_ 2 - musice8 8 + cutoff 8 dec_octave D_ 1 C_ 2 rest 1 inc_octave - musice8 3 + cutoff 3 D_ 2 octave 1 - musice8 8 + cutoff 8 G_ 1 octave 3 - musice8 3 + cutoff 3 F_ 2 - musice8 7 + cutoff 7 D_ 1 octave 1 - musice8 8 + cutoff 8 C_ 1 rest 1 octave 3 - musice8 3 + cutoff 3 F_ 1 dec_octave - musice8 8 + cutoff 8 C_ 1 rest 1 inc_octave - musice8 3 + cutoff 3 D_ 2 rest 1 octave 1 - musice8 8 + cutoff 8 E_ 1 inc_octave C_ 1 rest 1 inc_octave - musice8 7 + cutoff 7 F_ 1 - musice8 3 + cutoff 3 E_ 2 - musice8 8 + cutoff 8 octave 1 E_ 1 music_call Branch_f7826 - musice8 8 + cutoff 8 octave 2 C_ 1 C# 2 rest 1 inc_octave - musice8 3 + cutoff 3 C# 2 octave 1 - musice8 8 + cutoff 8 G# 1 inc_octave C# 1 rest 1 inc_octave - musice8 3 + cutoff 3 F_ 2 rest 1 inc_octave C# 1 octave 2 - musice8 8 + cutoff 8 C# 1 rest 1 inc_octave G_ 1 dec_octave - musice8 8 + cutoff 8 C# 1 rest 1 dec_octave G# 1 octave 3 - musice8 3 + cutoff 3 G_ 2 dec_octave - musice8 8 + cutoff 8 C# 1 inc_octave - musice8 3 + cutoff 3 F_ 2 octave 1 - musice8 8 + cutoff 8 G# 1 inc_octave C_ 2 rest 1 inc_octave - musice8 3 + cutoff 3 E_ 2 dec_octave - musice8 8 + cutoff 8 G_ 1 inc_octave - musice8 3 + cutoff 3 C_ 2 - musice8 7 + cutoff 7 E_ 1 dec_octave - musice8 8 + cutoff 8 E_ 1 rest 1 octave 4 - musice8 3 + cutoff 3 E_ 1 octave 2 - musice8 8 + cutoff 8 C_ 1 rest 1 inc_octave - musice8 3 + cutoff 3 E_ 2 rest 1 octave 1 - musice8 8 + cutoff 8 G_ 1 octave 3 - musice8 3 + cutoff 3 G_ 2 dec_octave - musice8 8 + cutoff 8 C_ 1 inc_octave - musice8 3 + cutoff 3 E_ 2 octave 1 - musice8 8 + cutoff 8 G_ 1 B_ 2 rest 1 octave 3 - musice8 3 + cutoff 3 F_ 2 dec_octave - musice8 8 + cutoff 8 F_ 1 B_ 2 F_ 1 inc_octave - musice8 3 + cutoff 3 D_ 2 inc_octave D_ 1 octave 1 - musice8 8 + cutoff 8 B_ 2 octave 3 - musice8 3 + cutoff 3 F_ 2 rest 1 dec_octave - musice8 8 + cutoff 8 F_ 1 B_ 2 F_ 1 @@ -1095,27 +1095,27 @@ Music_Overworld_Ch3: ; f75a1 (3d:75a1) A# 2 rest 1 octave 3 - musice8 3 + cutoff 3 D_ 2 dec_octave - musice8 8 + cutoff 8 F_ 1 A# 2 F_ 1 inc_octave - musice8 3 + cutoff 3 F_ 2 inc_octave D_ 1 octave 1 - musice8 8 + cutoff 8 A# 1 rest 1 octave 3 - musice8 7 + cutoff 7 D_ 1 octave 1 - musice8 8 + cutoff 8 A# 1 rest 2 A# 2 @@ -1126,33 +1126,33 @@ Music_Overworld_Ch3: ; f75a1 (3d:75a1) C_ 2 rest 1 inc_octave - musice8 3 + cutoff 3 D_ 2 octave 1 - musice8 8 + cutoff 8 G_ 1 octave 3 - musice8 3 + cutoff 3 F_ 2 - musice8 7 + cutoff 7 D_ 1 octave 1 - musice8 8 + cutoff 8 C_ 1 rest 1 octave 4 - musice8 3 + cutoff 3 D_ 1 octave 2 - musice8 8 + cutoff 8 C_ 1 rest 1 inc_octave - musice8 3 + cutoff 3 D_ 2 rest 1 octave 1 - musice8 8 + cutoff 8 E_ 1 inc_octave C_ 1 @@ -1164,13 +1164,13 @@ Music_Overworld_Ch3: ; f75a1 (3d:75a1) E_ 1 F_ 3 octave 3 - musice8 3 + cutoff 3 A_ 2 dec_octave - musice8 8 + cutoff 8 C_ 1 inc_octave - musice8 5 + cutoff 5 F_ 2 A_ 1 inc_octave @@ -1186,24 +1186,24 @@ Music_Overworld_Ch3: ; f75a1 (3d:75a1) rest 2 G_ 2 dec_octave - musice8 8 + cutoff 8 C_ 1 inc_octave - musice8 5 + cutoff 5 A# 2 inc_octave C_ 1 octave 1 - musice8 8 + cutoff 8 F_ 3 octave 4 - musice8 3 + cutoff 3 C_ 2 octave 2 - musice8 8 + cutoff 8 C_ 1 inc_octave - musice8 5 + cutoff 5 A_ 2 inc_octave C_ 1 @@ -1218,13 +1218,13 @@ Music_Overworld_Ch3: ; f75a1 (3d:75a1) rest 2 C_ 2 octave 2 - musice8 8 + cutoff 8 C_ 1 inc_octave - musice8 5 + cutoff 5 A# 2 dec_octave - musice8 8 + cutoff 8 C_ 1 EndMainLoop @@ -1232,10 +1232,10 @@ Branch_f77f8: octave 1 F_ 3 octave 3 - musice8 3 + cutoff 3 A_ 2 dec_octave - musice8 8 + cutoff 8 C_ 1 F_ 2 C_ 1 @@ -1254,10 +1254,10 @@ Branch_f77f8: dec_octave F_ 3 octave 4 - musice8 3 + cutoff 3 C_ 2 octave 2 - musice8 8 + cutoff 8 C_ 1 F_ 2 C_ 1 @@ -1277,68 +1277,68 @@ Branch_f7826: F_ 2 rest 1 octave 3 - musice8 3 + cutoff 3 F_ 2 dec_octave - musice8 8 + cutoff 8 C_ 1 F_ 1 rest 1 inc_octave - musice8 3 + cutoff 3 F_ 2 rest 1 inc_octave C_ 1 octave 1 - musice8 8 + cutoff 8 F_ 1 rest 1 octave 3 - musice8 7 + cutoff 7 G_ 1 octave 1 - musice8 8 + cutoff 8 F_ 1 rest 1 C_ 1 octave 3 - musice8 3 + cutoff 3 G_ 2 octave 1 - musice8 8 + cutoff 8 F_ 1 octave 3 - musice8 7 + cutoff 7 F_ 2 octave 1 - musice8 8 + cutoff 8 G_ 1 A_ 2 rest 1 octave 3 - musice8 3 + cutoff 3 E_ 2 dec_octave - musice8 8 + cutoff 8 E_ 1 A_ 1 rest 1 inc_octave - musice8 3 + cutoff 3 E_ 2 rest 1 inc_octave C_ 1 octave 1 - musice8 8 + cutoff 8 A_ 1 rest 1 octave 3 - musice8 7 + cutoff 7 E_ 1 octave 1 - musice8 8 + cutoff 8 Loop 2 A_ 1 rest 1 @@ -1349,39 +1349,39 @@ Branch_f7826: A# 2 rest 1 octave 3 - musice8 3 + cutoff 3 D_ 2 dec_octave - musice8 8 + cutoff 8 F_ 1 A# 1 rest 1 inc_octave - musice8 3 + cutoff 3 F_ 2 rest 1 inc_octave D_ 1 octave 1 - musice8 8 + cutoff 8 A# 1 rest 1 octave 3 - musice8 7 + cutoff 7 D_ 1 octave 1 - musice8 8 + cutoff 8 A# 1 rest 1 F_ 1 octave 3 - musice8 3 + cutoff 3 D_ 2 octave 1 - musice8 8 + cutoff 8 A# 1 octave 3 - musice8 3 + cutoff 3 D_ 2 music_ret diff --git a/src/audio/music/pausemenu.asm b/src/audio/music/pausemenu.asm index 7ac67d9..ec0fdd6 100644 --- a/src/audio/music/pausemenu.asm +++ b/src/audio/music/pausemenu.asm @@ -1,7 +1,7 @@ Music_PauseMenu_Ch2: ; f6bb7 (3d:6bb7) speed 7 - musicdc 17 - musice8 8 + stereo_panning 1, 1 + cutoff 8 duty 2 MainLoop volume 112 @@ -60,12 +60,12 @@ Music_PauseMenu_Ch2: ; f6bb7 (3d:6bb7) music_call Branch_f6c80 Loop 3 octave 6 - musice8 4 + cutoff 4 C_ 1 music_call Branch_f6ce9 music_call Branch_f6c80 EndLoop - musice8 8 + cutoff 8 EndMainLoop Branch_f6c24: @@ -140,11 +140,11 @@ Branch_f6c60: Branch_f6c80: octave 6 - musice8 4 + cutoff 4 C_ 1 octave 3 volume 112 - musice8 8 + cutoff 8 speed 1 C_ 4 volume 39 @@ -152,11 +152,11 @@ Branch_f6c80: volume 96 speed 7 octave 5 - musice8 4 + cutoff 4 G_ 1 E_ 1 octave 3 - musice8 8 + cutoff 8 volume 112 speed 1 E_ 4 @@ -165,12 +165,12 @@ Branch_f6c80: speed 7 volume 96 octave 5 - musice8 4 + cutoff 4 B_ 1 G_ 1 dec_octave volume 112 - musice8 8 + cutoff 8 speed 1 C_ 4 volume 39 @@ -178,10 +178,10 @@ Branch_f6c80: volume 96 speed 7 octave 6 - musice8 4 + cutoff 4 C_ 1 octave 3 - musice8 8 + cutoff 8 volume 112 speed 1 C_ 4 @@ -190,12 +190,12 @@ Branch_f6c80: speed 7 octave 5 volume 96 - musice8 4 + cutoff 4 G_ 1 E_ 1 volume 112 octave 3 - musice8 8 + cutoff 8 speed 1 E_ 4 volume 39 @@ -203,7 +203,7 @@ Branch_f6c80: speed 7 volume 96 octave 5 - musice8 4 + cutoff 4 B_ 1 G_ 1 E_ 1 @@ -212,7 +212,7 @@ Branch_f6c80: Branch_f6ce9: octave 2 speed 1 - musice8 8 + cutoff 8 volume 112 B_ 4 volume 39 @@ -220,12 +220,12 @@ Branch_f6ce9: speed 7 volume 96 octave 5 - musice8 4 + cutoff 4 G_ 1 D_ 1 octave 3 volume 112 - musice8 8 + cutoff 8 speed 1 D_ 4 volume 39 @@ -233,12 +233,12 @@ Branch_f6ce9: speed 7 volume 96 octave 5 - musice8 4 + cutoff 4 B_ 1 G_ 1 volume 112 octave 3 - musice8 8 + cutoff 8 speed 1 B_ 4 volume 39 @@ -246,11 +246,11 @@ Branch_f6ce9: volume 96 speed 7 octave 6 - musice8 4 + cutoff 4 C_ 1 volume 112 octave 2 - musice8 8 + cutoff 8 speed 1 B_ 4 volume 39 @@ -258,12 +258,12 @@ Branch_f6ce9: speed 7 volume 96 octave 5 - musice8 4 + cutoff 4 G_ 1 D_ 1 volume 112 octave 3 - musice8 8 + cutoff 8 speed 1 D_ 4 volume 39 @@ -271,7 +271,7 @@ Branch_f6ce9: speed 7 volume 96 octave 5 - musice8 4 + cutoff 4 B_ 1 G_ 1 D_ 1 @@ -280,8 +280,8 @@ Branch_f6ce9: Music_PauseMenu_Ch1: ; f6d4e (3d:6d4e) speed 7 - musicdc 17 - musice8 8 + stereo_panning 1, 1 + cutoff 8 duty 2 MainLoop volume 128 @@ -312,12 +312,12 @@ Music_PauseMenu_Ch1: ; f6d4e (3d:6d4e) volume 208 speed 7 octave 1 - musice8 6 + cutoff 6 G_ 1 - musice8 4 + cutoff 4 G_ 1 octave 3 - musice8 8 + cutoff 8 volume 112 speed 1 F# 4 @@ -337,7 +337,7 @@ Music_PauseMenu_Ch1: ; f6d4e (3d:6d4e) speed 7 octave 1 volume 208 - musice8 8 + cutoff 8 G_ 1 octave 3 volume 112 @@ -348,12 +348,12 @@ Music_PauseMenu_Ch1: ; f6d4e (3d:6d4e) speed 7 volume 208 octave 1 - musice8 6 + cutoff 6 G_ 1 - musice8 4 + cutoff 4 G_ 1 octave 3 - musice8 8 + cutoff 8 speed 1 F# 4 volume 39 @@ -376,12 +376,12 @@ Music_PauseMenu_Ch1: ; f6d4e (3d:6d4e) volume 208 speed 7 octave 1 - musice8 6 + cutoff 6 D_ 1 - musice8 4 + cutoff 4 D_ 1 octave 3 - musice8 8 + cutoff 8 speed 1 G_ 4 volume 39 @@ -400,7 +400,7 @@ Music_PauseMenu_Ch1: ; f6d4e (3d:6d4e) speed 7 octave 1 volume 208 - musice8 8 + cutoff 8 D_ 1 octave 3 volume 112 @@ -410,13 +410,13 @@ Music_PauseMenu_Ch1: ; f6d4e (3d:6d4e) E_ 3 speed 7 volume 208 - musice8 6 + cutoff 6 octave 1 D_ 1 - musice8 4 + cutoff 4 D_ 1 octave 3 - musice8 8 + cutoff 8 speed 1 G_ 4 volume 39 @@ -435,13 +435,13 @@ Music_PauseMenu_Ch1: ; f6d4e (3d:6d4e) Music_PauseMenu_Ch3: ; f6e2d (3d:6e2d) speed 1 wave 3 - musicdc 17 + stereo_panning 1, 1 volume 64 - musice9 96 - musice8 4 + echo 96 + cutoff 4 octave 4 G_ 7 - musice8 8 + cutoff 8 F# 4 volume 96 G_ 3 diff --git a/src/audio/music/pcmainmenu.asm b/src/audio/music/pcmainmenu.asm index bd9ae7f..35fe010 100644 --- a/src/audio/music/pcmainmenu.asm +++ b/src/audio/music/pcmainmenu.asm @@ -1,7 +1,7 @@ Music_PCMainMenu_Ch1: ; f9052 (3e:5052) speed 7 - musicdc 17 - musice8 8 + stereo_panning 1, 1 + cutoff 8 octave 3 duty 2 MainLoop @@ -9,12 +9,12 @@ Music_PCMainMenu_Ch1: ; f9052 (3e:5052) rest 4 dec_octave duty 1 - musice8 5 + cutoff 5 volume 97 F_ 1 rest 1 duty 2 - musice8 8 + cutoff 8 volume 180 A_ 1 volume 55 @@ -27,12 +27,12 @@ Music_PCMainMenu_Ch1: ; f9052 (3e:5052) C_ 1 dec_octave duty 1 - musice8 5 + cutoff 5 volume 97 F_ 1 rest 1 duty 2 - musice8 8 + cutoff 8 volume 180 B_ 1 volume 55 @@ -41,13 +41,13 @@ Music_PCMainMenu_Ch1: ; f9052 (3e:5052) rest 4 dec_octave duty 1 - musice8 5 + cutoff 5 volume 97 F_ 1 rest 1 inc_octave duty 2 - musice8 8 + cutoff 8 volume 180 E_ 1 volume 55 @@ -58,14 +58,14 @@ Music_PCMainMenu_Ch1: ; f9052 (3e:5052) volume 55 C_ 1 duty 1 - musice8 5 + cutoff 5 volume 97 dec_octave F_ 1 rest 1 inc_octave duty 2 - musice8 8 + cutoff 8 volume 180 D_ 1 volume 55 @@ -77,10 +77,10 @@ Branch_f90c2: rest 4 duty 1 volume 97 - musice8 5 + cutoff 5 G_ 1 rest 3 - musice8 8 + cutoff 8 duty 2 volume 180 B_ 2 @@ -91,12 +91,12 @@ Branch_f90c2: dec_octave duty 1 volume 97 - musice8 5 + cutoff 5 G_ 1 rest 1 inc_octave duty 2 - musice8 8 + cutoff 8 volume 180 C_ 1 volume 55 @@ -106,8 +106,8 @@ Branch_f90c2: Music_PCMainMenu_Ch2: ; f90ed (3e:50ed) speed 7 - musicdc 17 - musice8 8 + stereo_panning 1, 1 + cutoff 8 octave 3 duty 2 MainLoop @@ -115,13 +115,13 @@ Music_PCMainMenu_Ch2: ; f90ed (3e:50ed) rest 4 inc_octave duty 1 - musice8 5 + cutoff 5 volume 97 C_ 1 rest 1 dec_octave duty 2 - musice8 8 + cutoff 8 volume 132 F_ 1 volume 39 @@ -132,14 +132,14 @@ Music_PCMainMenu_Ch2: ; f90ed (3e:50ed) volume 39 A_ 1 duty 1 - musice8 5 + cutoff 5 volume 97 inc_octave C_ 1 rest 1 dec_octave duty 2 - musice8 8 + cutoff 8 volume 132 G_ 1 volume 39 @@ -148,12 +148,12 @@ Music_PCMainMenu_Ch2: ; f90ed (3e:50ed) rest 4 inc_octave duty 1 - musice8 5 + cutoff 5 volume 97 C_ 1 rest 1 duty 2 - musice8 8 + cutoff 8 volume 132 C_ 1 volume 39 @@ -167,12 +167,12 @@ Music_PCMainMenu_Ch2: ; f90ed (3e:50ed) duty 1 inc_octave volume 97 - musice8 5 + cutoff 5 C_ 1 rest 1 dec_octave duty 2 - musice8 8 + cutoff 8 volume 132 B_ 1 volume 39 @@ -183,12 +183,12 @@ Branch_f915e: octave 4 rest 4 duty 1 - musice8 5 + cutoff 5 volume 97 D_ 1 rest 3 duty 2 - musice8 8 + cutoff 8 dec_octave volume 132 G_ 2 @@ -197,13 +197,13 @@ Branch_f915e: B_ 1 inc_octave duty 1 - musice8 5 + cutoff 5 volume 97 D_ 1 rest 1 dec_octave duty 2 - musice8 8 + cutoff 8 volume 132 A_ 1 volume 39 @@ -214,16 +214,16 @@ Branch_f915e: Music_PCMainMenu_Ch3: ; f9189 (3e:5189) speed 7 volume 32 - musicdc 17 + stereo_panning 1, 1 wave 1 - musice8 7 - musice9 0 + cutoff 7 + echo 0 MainLoop octave 1 - musice8 7 + cutoff 7 G_ 1 rest 1 - musice8 8 + cutoff 8 G_ 1 rest 1 speed 1 @@ -234,22 +234,22 @@ Music_PCMainMenu_Ch3: ; f9189 (3e:5189) speed 7 B_ 1 rest 1 - musice8 4 + cutoff 4 inc_octave C_ 1 rest 1 C_ 1 - musice8 8 + cutoff 8 C# 2 D_ 2 dec_octave G_ 1 tie F# 1 - musice8 7 + cutoff 7 F_ 1 rest 1 - musice8 8 + cutoff 8 F_ 1 rest 1 speed 1 @@ -260,11 +260,11 @@ Music_PCMainMenu_Ch3: ; f9189 (3e:5189) speed 7 A_ 1 rest 1 - musice8 4 + cutoff 4 A# 1 rest 1 A# 1 - musice8 8 + cutoff 8 B_ 2 inc_octave C_ 2 @@ -272,10 +272,10 @@ Music_PCMainMenu_Ch3: ; f9189 (3e:5189) F_ 1 tie F# 1 - musice8 7 + cutoff 7 G_ 1 rest 1 - musice8 8 + cutoff 8 G_ 1 rest 1 speed 1 @@ -286,22 +286,22 @@ Music_PCMainMenu_Ch3: ; f9189 (3e:5189) speed 7 B_ 1 rest 1 - musice8 4 + cutoff 4 inc_octave C_ 1 rest 1 C_ 1 - musice8 8 + cutoff 8 C# 2 D_ 2 dec_octave G_ 1 tie F# 1 - musice8 7 + cutoff 7 F_ 1 rest 1 - musice8 8 + cutoff 8 F_ 1 rest 1 speed 1 @@ -313,7 +313,7 @@ Music_PCMainMenu_Ch3: ; f9189 (3e:5189) speed 7 C_ 1 rest 1 - musice8 8 + cutoff 8 speed 1 F# 4 tie @@ -321,9 +321,9 @@ Music_PCMainMenu_Ch3: ; f9189 (3e:5189) tie speed 7 G_ 1 - musice8 4 + cutoff 4 F_ 1 - musice8 8 + cutoff 8 C_ 2 F_ 2 speed 1 diff --git a/src/audio/music/pokemondome.asm b/src/audio/music/pokemondome.asm index b7b5a84..77c7ca0 100644 --- a/src/audio/music/pokemondome.asm +++ b/src/audio/music/pokemondome.asm @@ -1,9 +1,9 @@ Music_PokemonDome_Ch1: ; f9251 (3e:5251) speed 7 - musicdc 17 + stereo_panning 1, 1 vibrato_type 9 vibrato_delay 20 - musice8 8 + cutoff 8 octave 2 duty 0 volume 160 @@ -311,10 +311,10 @@ Music_PokemonDome_Ch1: ; f9251 (3e:5251) Music_PokemonDome_Ch2: ; f93f8 (3e:53f8) speed 7 - musicdc 17 + stereo_panning 1, 1 vibrato_type 9 vibrato_delay 20 - musice8 8 + cutoff 8 octave 1 duty 0 volume 128 @@ -455,9 +455,9 @@ Music_PokemonDome_Ch2: ; f93f8 (3e:53f8) E_ 4 F# 8 F# 4 - musice8 6 + cutoff 6 F# 3 - musice8 8 + cutoff 8 speed 1 F# 5 rest 2 @@ -620,20 +620,20 @@ Branch_f9554: Music_PokemonDome_Ch3: ; f9579 (3e:5579) speed 7 - musicdc 17 + stereo_panning 1, 1 volume 32 wave 1 - musice9 64 - musice8 6 + echo 64 + cutoff 6 octave 1 - musice8 4 + cutoff 4 speed 1 Loop 8 G_ 5 G_ 5 G_ 4 EndLoop - musice8 6 + cutoff 6 speed 7 MainLoop inc_octave @@ -644,10 +644,10 @@ Music_PokemonDome_Ch3: ; f9579 (3e:5579) C_ 1 music_call Branch_f9613 octave 1 - musice8 4 + cutoff 4 C_ 2 inc_octave - musice8 6 + cutoff 6 C_ 2 rest 2 C_ 1 @@ -765,9 +765,9 @@ Branch_f9613: C_ 2 C_ 2 dec_octave - musice8 4 + cutoff 4 G_ 2 - musice8 6 + cutoff 6 G_ 2 music_ret diff --git a/src/audio/music/ronald.asm b/src/audio/music/ronald.asm index 54817ac..36886d0 100644 --- a/src/audio/music/ronald.asm +++ b/src/audio/music/ronald.asm @@ -1,18 +1,18 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) - musicdc 17 + stereo_panning 1, 1 vibrato_type 8 vibrato_delay 12 - musice8 8 + cutoff 8 duty 0 MainLoop octave 3 speed 13 Loop 2 volume 146 - musice8 3 + cutoff 3 D_ 1 D_ 1 - musice8 4 + cutoff 4 F_ 1 rest 2 D_ 1 @@ -24,16 +24,16 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) F_ 1 rest 1 volume 144 - musice8 8 + cutoff 8 E_ 2 rest 1 dec_octave volume 146 - musice8 3 + cutoff 3 G_ 1 inc_octave D_ 1 - musice8 4 + cutoff 4 F_ 1 rest 2 F_ 1 @@ -44,7 +44,7 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) rest 1 A_ 1 rest 1 - musice8 8 + cutoff 8 volume 144 G_ 2 rest 1 @@ -86,7 +86,7 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) volume 144 rest 6 dec_octave - musice8 4 + cutoff 4 G_ 7 inc_octave F_ 6 @@ -101,12 +101,12 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) dec_octave G_ 7 inc_octave - musice8 8 + cutoff 8 C_ 4 C# 4 C_ 5 dec_octave - musice8 4 + cutoff 4 A# 6 inc_octave C_ 7 @@ -115,22 +115,22 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) G_ 7 F_ 6 F# 7 - musice8 8 + cutoff 8 G_ 6 - musice8 4 + cutoff 4 C# 7 C_ 6 dec_octave A# 7 inc_octave - musice8 8 + cutoff 8 C_ 4 C# 4 C_ 5 dec_octave A# 6 inc_octave - musice8 4 + cutoff 4 C_ 7 dec_octave A# 6 @@ -138,7 +138,7 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) F_ 6 F# 7 G_ 6 - musice8 8 + cutoff 8 A# 7 inc_octave C_ 6 @@ -154,7 +154,7 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) volume 144 rest 6 dec_octave - musice8 4 + cutoff 4 G_ 7 inc_octave F_ 6 @@ -169,12 +169,12 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) dec_octave G_ 7 inc_octave - musice8 8 + cutoff 8 C_ 4 C# 4 C_ 5 dec_octave - musice8 4 + cutoff 4 A# 6 inc_octave C_ 7 @@ -184,20 +184,20 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) F_ 6 F# 7 G_ 6 - musice8 8 + cutoff 8 A# 7 inc_octave - musice8 4 + cutoff 4 C_ 6 dec_octave A# 7 inc_octave - musice8 8 + cutoff 8 C# 4 C_ 4 dec_octave A# 5 - musice8 4 + cutoff 4 G_ 6 F_ 7 G_ 6 @@ -206,15 +206,15 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) dec_octave A# 7 inc_octave - musice8 8 + cutoff 8 C_ 4 C# 4 C_ 5 dec_octave - musice8 4 + cutoff 4 A# 6 G_ 7 - musice8 8 + cutoff 8 music_call Branch_fa9cb speed 1 octave 4 @@ -224,19 +224,19 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) duty 2 volume 144 rest 13 - musice8 4 + cutoff 4 F_ 6 rest 7 - musice8 8 + cutoff 8 E_ 4 F_ 4 E_ 5 - musice8 4 + cutoff 4 D_ 6 rest 7 - musice8 8 + cutoff 8 E_ 6 - musice8 4 + cutoff 4 C_ 7 dec_octave G_ 6 @@ -245,33 +245,33 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) C# 6 D_ 7 dec_octave - musice8 8 + cutoff 8 A# 6 - musice8 4 + cutoff 4 G_ 7 rest 6 F_ 7 - musice8 8 + cutoff 8 F# 6 - musice8 4 + cutoff 4 G_ 7 - musice8 8 + cutoff 8 A# 6 - musice8 4 + cutoff 4 G_ 7 A# 6 inc_octave C_ 7 - musice8 8 + cutoff 8 C# 6 - musice8 4 + cutoff 4 D_ 7 F_ 6 D_ 7 - musice8 8 + cutoff 8 F_ 6 dec_octave - musice8 4 + cutoff 4 G_ 7 dec_octave G_ 6 @@ -279,7 +279,7 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) D_ 7 duty 1 volume 160 - musice8 8 + cutoff 8 music_call Branch_fa9cb speed 1 octave 4 @@ -508,10 +508,10 @@ Branch_fa9ec: Music_Ronald_Ch2: ; faa0e (3e:6a0e) - musicdc 17 + stereo_panning 1, 1 vibrato_type 8 vibrato_delay 12 - musice8 8 + cutoff 8 duty 0 MainLoop octave 2 @@ -603,12 +603,12 @@ Music_Ronald_Ch2: ; faa0e (3e:6a0e) EndLoop Loop 4 music_call Branch_fab76 - musice8 8 + cutoff 8 volume 128 C_ 2 rest 1 music_call Branch_fab76 - musice8 8 + cutoff 8 volume 128 E_ 2 rest 1 @@ -620,14 +620,14 @@ Music_Ronald_Ch2: ; faa0e (3e:6a0e) duty 1 octave 4 rest 2 - musice8 4 + cutoff 4 F_ 1 rest 1 - musice8 8 + cutoff 8 D_ 1 dec_octave dec_octave - musice8 4 + cutoff 4 duty 0 volume 146 A# 1 @@ -638,11 +638,11 @@ Music_Ronald_Ch2: ; faa0e (3e:6a0e) volume 128 C_ 1 rest 1 - musice8 8 + cutoff 8 D_ 1 - musice8 3 + cutoff 3 E_ 1 - musice8 4 + cutoff 4 C_ 1 rest 1 dec_octave @@ -665,7 +665,7 @@ Music_Ronald_Ch2: ; faa0e (3e:6a0e) rest 1 A_ 1 rest 1 - musice8 8 + cutoff 8 volume 144 G_ 2 rest 1 @@ -677,7 +677,7 @@ Music_Ronald_Ch2: ; faa0e (3e:6a0e) vibrato_delay 12 duty 0 volume 146 - musice8 4 + cutoff 4 F_ 1 rest 2 F_ 1 @@ -690,7 +690,7 @@ Music_Ronald_Ch2: ; faa0e (3e:6a0e) rest 1 A_ 1 rest 1 - musice8 8 + cutoff 8 volume 144 G_ 2 rest 1 @@ -699,7 +699,7 @@ Music_Ronald_Ch2: ; faa0e (3e:6a0e) octave 3 rest 1 speed 1 - musice8 8 + cutoff 8 E_ 3 F_ 10 E_ 3 @@ -710,7 +710,7 @@ Music_Ronald_Ch2: ; faa0e (3e:6a0e) vibrato_delay 12 duty 0 volume 146 - musice8 4 + cutoff 4 G_ 1 rest 1 inc_octave @@ -718,26 +718,26 @@ Music_Ronald_Ch2: ; faa0e (3e:6a0e) rest 1 D_ 1 rest 1 - musice8 8 + cutoff 8 volume 144 E_ 2 rest 1 music_call Branch_fabb1 rest 1 - musice8 4 + cutoff 4 octave 2 A# 1 rest 1 A# 1 rest 1 inc_octave - musice8 8 + cutoff 8 volume 144 C_ 2 rest 1 volume 146 rest 2 - musice8 4 + cutoff 4 F_ 1 rest 2 F_ 1 @@ -748,33 +748,33 @@ Music_Ronald_Ch2: ; faa0e (3e:6a0e) rest 1 A_ 1 rest 1 - musice8 8 + cutoff 8 volume 144 F_ 2 rest 1 music_call Branch_fabb1 rest 1 octave 2 - musice8 4 + cutoff 4 G_ 1 rest 1 G_ 1 rest 1 inc_octave - musice8 8 + cutoff 8 volume 144 C_ 2 rest 1 rest 2 dec_octave volume 146 - musice8 4 + cutoff 4 G_ 1 rest 2 G_ 1 rest 1 vibrato_delay 20 - musice8 8 + cutoff 8 duty 1 volume 112 F# 8 @@ -788,7 +788,7 @@ Branch_fab76: volume 146 speed 13 rest 2 - musice8 4 + cutoff 4 A# 1 rest 2 A# 1 @@ -808,10 +808,10 @@ Branch_fab8a: volume 128 speed 13 C_ 1 - musice8 3 + cutoff 3 D_ 1 E_ 1 - musice8 4 + cutoff 4 C_ 1 rest 1 dec_octave @@ -820,15 +820,15 @@ Branch_fab8a: A# 1 rest 1 inc_octave - musice8 8 + cutoff 8 C_ 1 - musice8 3 + cutoff 3 D_ 1 E_ 1 - musice8 8 + cutoff 8 C_ 1 dec_octave - musice8 4 + cutoff 4 A_ 1 rest 1 A# 1 @@ -839,7 +839,7 @@ Branch_fabb1: volume 146 speed 13 rest 2 - musice8 4 + cutoff 4 A# 1 rest 2 A# 1 @@ -851,11 +851,11 @@ Branch_fabb1: Music_Ronald_Ch3: ; fabc0 (3e:6bc0) speed 1 - musicdc 17 + stereo_panning 1, 1 volume 32 wave 1 - musice9 0 - musice8 8 + echo 0 + cutoff 8 MainLoop octave 1 Loop 4 diff --git a/src/audio/music/titlescreen.asm b/src/audio/music/titlescreen.asm index f95689c..2730ca9 100644 --- a/src/audio/music/titlescreen.asm +++ b/src/audio/music/titlescreen.asm @@ -1,20 +1,20 @@ Music_TitleScreen_Ch1: ; f5052 (3d:5052) speed 7 duty 0 - musicdc 17 + stereo_panning 1, 1 vibrato_type 1 vibrato_delay 20 volume 160 - musice8 8 + cutoff 8 octave 3 G_ 1 volume 55 G_ 1 rest 1 volume 160 - musice8 6 + cutoff 6 F_ 1 - musice8 8 + cutoff 8 E_ 3 volume 55 E_ 1 @@ -28,10 +28,10 @@ Music_TitleScreen_Ch1: ; f5052 (3d:5052) volume 55 D_ 1 volume 208 - musice8 6 + cutoff 6 C_ 2 dec_octave - musice8 8 + cutoff 8 G_ 10 volume 55 G_ 2 @@ -41,16 +41,16 @@ Music_TitleScreen_Ch1: ; f5052 (3d:5052) E_ 1 rest 1 volume 160 - musice8 6 + cutoff 6 G_ 1 - musice8 8 + cutoff 8 G_ 5 volume 55 G_ 1 volume 160 - musice8 6 + cutoff 6 F_ 2 - musice8 8 + cutoff 8 F_ 2 speed 1 E_ 5 @@ -67,7 +67,7 @@ Music_TitleScreen_Ch1: ; f5052 (3d:5052) volume 55 C_ 1 volume 160 - musice8 8 + cutoff 8 D_ 11 volume 55 D_ 1 @@ -77,9 +77,9 @@ Music_TitleScreen_Ch1: ; f5052 (3d:5052) G_ 1 rest 1 volume 160 - musice8 6 + cutoff 6 F_ 1 - musice8 8 + cutoff 8 E_ 3 volume 55 E_ 1 @@ -93,10 +93,10 @@ Music_TitleScreen_Ch1: ; f5052 (3d:5052) volume 55 D_ 1 volume 208 - musice8 6 + cutoff 6 E_ 2 dec_octave - musice8 8 + cutoff 8 G_ 8 volume 55 G_ 2 @@ -117,9 +117,9 @@ Music_TitleScreen_Ch1: ; f5052 (3d:5052) volume 55 D_ 1 volume 208 - musice8 6 + cutoff 6 C_ 2 - musice8 8 + cutoff 8 G_ 9 volume 55 G_ 1 @@ -137,9 +137,9 @@ Music_TitleScreen_Ch1: ; f5052 (3d:5052) E_ 1 rest 1 volume 160 - musice8 6 + cutoff 6 E_ 1 - musice8 8 + cutoff 8 EndLoop E_ 12 volume 55 @@ -152,19 +152,19 @@ Music_TitleScreen_Ch1: ; f5052 (3d:5052) D_ 1 rest 1 volume 160 - musice8 6 + cutoff 6 G_ 1 - musice8 8 + cutoff 8 G_ 8 volume 55 G_ 2 volume 160 speed 1 - musice8 7 + cutoff 7 G_ 5 G_ 4 G_ 5 - musice8 8 + cutoff 8 speed 7 G_ 9 volume 55 @@ -181,10 +181,10 @@ Music_TitleScreen_Ch1: ; f5052 (3d:5052) volume 55 C_ 1 rest 1 - musice8 6 + cutoff 6 volume 160 E_ 1 - musice8 8 + cutoff 8 E_ 6 volume 55 E_ 2 @@ -207,9 +207,9 @@ Music_TitleScreen_Ch1: ; f5052 (3d:5052) B_ 2 volume 160 inc_octave - musice8 6 + cutoff 6 C_ 1 - musice8 8 + cutoff 8 C_ 8 tie C_ 8 @@ -223,11 +223,11 @@ Music_TitleScreen_Ch1: ; f5052 (3d:5052) Music_TitleScreen_Ch2: ; f5193 (3d:5193) speed 7 duty 0 - musicdc 17 + stereo_panning 1, 1 vibrato_type 1 vibrato_delay 20 volume 128 - musice8 8 + cutoff 8 octave 2 B_ 1 volume 39 @@ -235,9 +235,9 @@ Music_TitleScreen_Ch2: ; f5193 (3d:5193) rest 1 inc_octave volume 128 - musice8 6 + cutoff 6 D_ 1 - musice8 8 + cutoff 8 C_ 3 volume 39 C_ 1 @@ -246,23 +246,23 @@ Music_TitleScreen_Ch2: ; f5193 (3d:5193) rest 1 G_ 5 rest 1 - musice8 6 + cutoff 6 G_ 2 - musice8 8 + cutoff 8 E_ 10 rest 2 C_ 1 rest 2 - musice8 6 + cutoff 6 E_ 1 - musice8 8 + cutoff 8 F_ 5 rest 1 - musice8 6 + cutoff 6 C_ 2 - musice8 7 + cutoff 7 C_ 2 - musice8 8 + cutoff 8 C_ 2 dec_octave G_ 1 @@ -273,18 +273,18 @@ Music_TitleScreen_Ch2: ; f5193 (3d:5193) A_ 1 rest 2 inc_octave - musice8 6 + cutoff 6 C_ 1 dec_octave - musice8 8 + cutoff 8 B_ 3 rest 1 B_ 1 rest 2 inc_octave - musice8 6 + cutoff 6 D_ 1 - musice8 8 + cutoff 8 C_ 3 volume 39 C_ 1 @@ -293,9 +293,9 @@ Music_TitleScreen_Ch2: ; f5193 (3d:5193) rest 1 G_ 5 rest 1 - musice8 6 + cutoff 6 G_ 2 - musice8 8 + cutoff 8 E_ 8 rest 2 C_ 2 @@ -307,9 +307,9 @@ Music_TitleScreen_Ch2: ; f5193 (3d:5193) rest 1 G# 5 rest 1 - musice8 6 + cutoff 6 F_ 2 - musice8 8 + cutoff 8 G# 9 rest 1 G# 2 @@ -325,9 +325,9 @@ Music_TitleScreen_Ch2: ; f5193 (3d:5193) rest 1 volume 128 inc_octave - musice8 6 + cutoff 6 C_ 1 - musice8 8 + cutoff 8 dec_octave B_ 10 rest 2 @@ -336,9 +336,9 @@ Music_TitleScreen_Ch2: ; f5193 (3d:5193) G_ 1 rest 1 volume 128 - musice8 6 + cutoff 6 B_ 1 - musice8 8 + cutoff 8 A_ 12 volume 39 A_ 2 @@ -351,33 +351,33 @@ Music_TitleScreen_Ch2: ; f5193 (3d:5193) rest 1 volume 128 inc_octave - musice8 6 + cutoff 6 D_ 1 - musice8 8 + cutoff 8 D_ 8 rest 2 speed 1 - musice8 7 + cutoff 7 D_ 5 D_ 4 D_ 5 speed 7 - musice8 8 + cutoff 8 C_ 9 rest 1 C_ 2 dec_octave - musice8 7 + cutoff 7 G# 2 - musice8 8 + cutoff 8 G# 2 G_ 10 rest 2 G_ 1 rest 2 - musice8 6 + cutoff 6 G_ 1 - musice8 8 + cutoff 8 A_ 6 rest 2 F# 3 @@ -388,13 +388,13 @@ Music_TitleScreen_Ch2: ; f5193 (3d:5193) rest 2 F_ 5 rest 2 - musice8 6 + cutoff 6 F_ 1 - musice8 8 + cutoff 8 F_ 7 rest 1 speed 1 - musice8 8 + cutoff 8 F_ 14 rest 5 D_ 13 @@ -412,9 +412,9 @@ Music_TitleScreen_Ch3: ; f5286 (3d:5286) speed 7 wave 4 volume 32 - musice9 0 - musicdc 17 - musice8 6 + echo 0 + stereo_panning 1, 1 + cutoff 6 octave 2 rest 4 music_call Branch_f52f0 @@ -489,7 +489,7 @@ Music_TitleScreen_Ch3: ; f5286 (3d:5286) tie G_ 10 speed 7 - musice8 8 + cutoff 8 C_ 8 music_end diff --git a/src/audio/music1.asm b/src/audio/music1.asm index 03c55b9..6cc4fed 100644 --- a/src/audio/music1.asm +++ b/src/audio/music1.asm @@ -47,21 +47,21 @@ Music1_PlaySFX: ; f402d (3d:402d) ld b, $0 ld c, a or a - jr z, .asm_f4043 - ld hl, Unknown_f4e85 + jr z, .play_sfx ; SFX_STOP + ld hl, Music1_SFXPriorities add hl, bc ld b, [hl] - ld a, [wdd83] + ld a, [wSfxPriority] or a - jr z, .asm_f4043 + jr z, .play_sfx ; no sfx is currently playing cp b - jr c, .asm_f404b -.asm_f4043 + jr c, .skip ; lower priority +.play_sfx ld a, b - ld [wdd83], a + ld [wSfxPriority], a ld a, c ld [wCurSfxID], a -.asm_f404b +.skip pop hl pop bc ret @@ -128,7 +128,7 @@ Music1_Init: ; f407d (3d:407d) ld [wddf0], a ld [wddf2], a dec a - ld [wMusicDC], a + ld [wMusicStereoPanning], a ld de, $0001 ld bc, $0000 .zero_loop1 @@ -141,10 +141,10 @@ Music1_Init: ; f407d (3d:407d) ld hl, wddb3 add hl, bc ld [hl], d - ld hl, wMusicEC + ld hl, wMusicPitchOffset add hl, bc ld [hl], d - ld hl, wMusicE8 + ld hl, wMusicCutoff add hl, bc ld [hl], d inc c @@ -287,16 +287,16 @@ Music1_BeginSong: ; f418c (3d:418c) ld [wMusicIsPlaying], a xor a ld [wMusicTie], a - ld [wMusicE4], a - ld [wMusicE8], a + ld [wMusicFrequencyOffset], a + ld [wMusicCutoff], a ld [wMusicVibratoDelay], a - ld [wMusicEC], a + ld [wMusicPitchOffset], a ld a, [Music1_ChannelLoopStacks] ld [wMusicChannelStackPointers], a ld a, [Music1_ChannelLoopStacks + 1] ld [wMusicChannelStackPointers + 1], a ld a, $8 - ld [wMusicE9], a + ld [wMusicEcho], a .no_channel_1 rr e jr nc, .no_channel_2 @@ -313,16 +313,16 @@ Music1_BeginSong: ; f418c (3d:418c) ld [wMusicIsPlaying + 1], a xor a ld [wMusicTie + 1], a - ld [wMusicE4 + 1], a - ld [wMusicE8 + 1], a + ld [wMusicFrequencyOffset + 1], a + ld [wMusicCutoff + 1], a ld [wMusicVibratoDelay + 1], a - ld [wMusicEC + 1], a + ld [wMusicPitchOffset + 1], a ld a, [Music1_ChannelLoopStacks + 2] ld [wMusicChannelStackPointers + 2], a ld a, [Music1_ChannelLoopStacks + 3] ld [wMusicChannelStackPointers + 3], a ld a, $8 - ld [wMusicE9 + 1], a + ld [wMusicEcho + 1], a .no_channel_2 rr e jr nc, .no_channel_3 @@ -339,16 +339,16 @@ Music1_BeginSong: ; f418c (3d:418c) ld [wMusicIsPlaying + 2], a xor a ld [wMusicTie + 2], a - ld [wMusicE4 + 2], a - ld [wMusicE8 + 2], a + ld [wMusicFrequencyOffset + 2], a + ld [wMusicCutoff + 2], a ld [wMusicVibratoDelay + 2], a - ld [wMusicEC + 2], a + ld [wMusicPitchOffset + 2], a ld a, [Music1_ChannelLoopStacks + 4] ld [wMusicChannelStackPointers + 4], a ld a, [Music1_ChannelLoopStacks + 5] ld [wMusicChannelStackPointers + 5], a ld a, $40 - ld [wMusicE9 + 2], a + ld [wMusicEcho + 2], a .no_channel_3 rr e jr nc, .no_channel_4 @@ -365,15 +365,15 @@ Music1_BeginSong: ; f418c (3d:418c) ld [wMusicIsPlaying + 3], a xor a ld [wMusicTie + 3], a - ld [wMusicE8 + 3], a + ld [wMusicCutoff + 3], a ld [wMusicVibratoDelay + 3], a - ld [wMusicEC + 3], a + ld [wMusicPitchOffset + 3], a ld a, [Music1_ChannelLoopStacks + 6] ld [wMusicChannelStackPointers + 6], a ld a, [Music1_ChannelLoopStacks + 7] ld [wMusicChannelStackPointers + 7], a ld a, $40 - ld [wMusicE9 + 3], a + ld [wMusicEcho + 3], a .no_channel_4 xor a ld [wddf2], a @@ -400,7 +400,7 @@ Music1_UpdateChannel1: ; f42a5 (3d:42a5) bit 0, a jr nz, .asm_f42d4 ld hl, rNR12 - ld a, [wMusicE9] + ld a, [wMusicEcho] ld [hli], a inc hl ld a, $80 @@ -453,7 +453,7 @@ Music1_UpdateChannel2: ; f430a (3d:430a) bit 1, a jr nz, .asm_f4339 ld hl, rNR22 - ld a, [wMusicE9 + 1] + ld a, [wMusicEcho + 1] ld [hli], a inc hl ld a, $80 @@ -505,7 +505,7 @@ Music1_UpdateChannel3: ; f436f (3d:436f) ld a, [wddbb + 2] cp $1 jr z, .asm_f4398 - ld a, [wMusicE9 + 2] + ld a, [wMusicEcho + 2] ldh [rNR32], a .asm_f4398 ld a, [wddbb + 2] @@ -608,7 +608,7 @@ Music1_CommandTable: ; f442c (3d:442c) dw Music1_tie dw Music1_end dw Music1_end - dw Music1_musicdc + dw Music1_stereo_panning dw Music1_MainLoop dw Music1_EndMainLoop dw Music1_Loop @@ -616,16 +616,16 @@ Music1_CommandTable: ; f442c (3d:442c) dw Music1_jp dw Music1_call dw Music1_ret - dw Music1_musice4 + dw Music1_frequency_offset dw Music1_duty dw Music1_volume dw Music1_wave - dw Music1_musice8 - dw Music1_musice9 + dw Music1_cutoff + dw Music1_echo dw Music1_vibrato_type dw Music1_vibrato_delay - dw Music1_musicec - dw Music1_musiced + dw Music1_pitch_offset + dw Music1_adjust_pitch_offset dw Music1_end dw Music1_end dw Music1_end @@ -700,7 +700,7 @@ Music1_note: ; f448c (3d:448c) ld a, d jr z, .asm_f44fb ld e, a - ld hl, wMusicE8 + ld hl, wMusicCutoff add hl, bc ld a, [hl] cp $8 @@ -772,10 +772,10 @@ Music1_note: ; f448c (3d:448c) ld l, a ld a, [hli] ld d, a - ld a, [wMusicDC] + ld a, [wMusicStereoPanning] and $77 or d - ld [wMusicDC], a + ld [wMusicStereoPanning], a ld de, wddab ld a, [hli] ld [de], a @@ -808,18 +808,18 @@ Music1_note: ; f448c (3d:448c) add hl, bc ld e, [hl] ld d, $0 - ld hl, Unknown_f4c28 + ld hl, Music1_OctaveOffsets add hl, de add a ld e, [hl] add e - ld hl, wMusicEC + ld hl, wMusicPitchOffset add hl, bc ld e, [hl] add e add e ld e, a - ld hl, Unknown_f4c30 + ld hl, Music1_Pitches add hl, de ld a, [hli] ld e, a @@ -884,25 +884,25 @@ Music1_tie: ; f45cb (3d:45cb) ld [hl], $80 jp Music1_PlayNextNote_pop -Music1_musicdc: ; f45d4 (3d:45d4) +Music1_stereo_panning: ; f45d4 (3d:45d4) pop hl ld a, [hli] push hl push bc inc c - ld e, $ee -.asm_f45db + ld e, %11101110 ; mask +.loop dec c - jr z, .asm_f45e3 - rlca - rlc e - jr .asm_f45db -.asm_f45e3 + jr z, .done + rlca ; rotate input param + rlc e ; rotate mask + jr .loop +.done ld d, a - ld hl, wMusicDC + ld hl, wMusicStereoPanning ld a, [hl] - and e - or d + and e ; keep old panning for all other channels + or d ; apply new panning for this channel ld [hl], a pop bc jp Music1_PlayNextNote_pop @@ -1004,11 +1004,11 @@ Music1_ret: ; f4656 (3d:4656) call Music1_SetChannelStackPointer jp Music1_PlayNextNote_pop -Music1_musice4: ; f4667 (3d:4667) +Music1_frequency_offset: ; f4667 (3d:4667) pop de ld a, [de] inc de - ld hl, wMusicE4 + ld hl, wMusicFrequencyOffset add hl, bc ld [hl], a ld h, d @@ -1049,22 +1049,22 @@ Music1_wave: ; f4690 (3d:4690) ld l, e jp Music1_PlayNextNote -Music1_musice8: ; f46a0 (3d:46a0) +Music1_cutoff: ; f46a0 (3d:46a0) pop de ld a, [de] inc de - ld hl, wMusicE8 + ld hl, wMusicCutoff add hl, bc ld [hl], a ld h, d ld l, e jp Music1_PlayNextNote -Music1_musice9: ; f46ad (3d:46ad) +Music1_echo: ; f46ad (3d:46ad) pop de ld a, [de] inc de - ld hl, wMusicE9 + ld hl, wMusicEcho add hl, bc ld [hl], a ld h, d @@ -1096,22 +1096,22 @@ Music1_vibrato_delay: ; f46cc (3d:46cc) ld l, e jp Music1_PlayNextNote -Music1_musicec: ; f46d9 (3d:46d9) +Music1_pitch_offset: ; f46d9 (3d:46d9) pop de ld a, [de] inc de - ld hl, wMusicEC + ld hl, wMusicPitchOffset add hl, bc ld [hl], a ld h, d ld l, e jp Music1_PlayNextNote -Music1_musiced: ; f46e6 (3d:46e6) +Music1_adjust_pitch_offset: ; f46e6 (3d:46e6) pop de ld a, [de] inc de - ld hl, wMusicEC + ld hl, wMusicPitchOffset add hl, bc add [hl] ld [hl], a @@ -1371,7 +1371,7 @@ Func_f4866: ; f4866 (3d:4866) ldh [rNR50], a ld a, [wdd8c] or a - ld hl, wMusicDC + ld hl, wMusicStereoPanning ld a, [hli] jr z, .asm_f4888 ld a, [wdd8c] @@ -1539,7 +1539,7 @@ Func_f490b: ; f490b (3d:490b) ret Func_f4967: ; f4967 (3d:4967) - ld hl, wMusicE4 + ld hl, wMusicFrequencyOffset add hl, bc ld a, [hl] bit 7, a @@ -1629,8 +1629,8 @@ Music1_BackupSong: ; f49dc (3d:49dc) ld [wCurSongIDBackup], a ld a, [wCurSongBank] ld [wCurSongBankBackup], a - ld a, [wMusicDC] - ld [wMusicDCBackup], a + ld a, [wMusicStereoPanning] + ld [wMusicStereoPanningBackup], a ld hl, wMusicDuty1 ld de, wMusicDuty1Backup ld a, $4 @@ -1675,20 +1675,20 @@ Music1_BackupSong: ; f49dc (3d:49dc) ld de, wde84 ld a, $4 call Music1_CopyData - ld hl, wMusicE8 - ld de, wMusicE8Backup + ld hl, wMusicCutoff + ld de, wMusicCutoffBackup ld a, $4 call Music1_CopyData ld hl, wddc3 ld de, wde8c ld a, $4 call Music1_CopyData - ld hl, wMusicE9 - ld de, wMusicE9Backup + ld hl, wMusicEcho + ld de, wMusicEchoBackup ld a, $4 call Music1_CopyData - ld hl, wMusicEC - ld de, wMusicECBackup + ld hl, wMusicPitchOffset + ld de, wMusicPitchOffsetBackup ld a, $4 call Music1_CopyData ld hl, wMusicSpeed @@ -1712,8 +1712,8 @@ Music1_BackupSong: ; f49dc (3d:49dc) ld de, wMusicVolumeBackup ld a, $3 call Music1_CopyData - ld hl, wMusicE4 - ld de, wMusicE4Backup + ld hl, wMusicFrequencyOffset + ld de, wMusicFrequencyOffsetBackup ld a, $3 call Music1_CopyData ld hl, wdded @@ -1737,8 +1737,8 @@ Music1_LoadBackup: ; f4b01 (3d:4b01) ld [wCurSongID], a ld a, [wCurSongBankBackup] ld [wCurSongBank], a - ld a, [wMusicDCBackup] - ld [wMusicDC], a + ld a, [wMusicStereoPanningBackup] + ld [wMusicStereoPanning], a ld hl, wMusicDuty1Backup ld de, wMusicDuty1 ld a, $4 @@ -1783,20 +1783,20 @@ Music1_LoadBackup: ; f4b01 (3d:4b01) ld de, wddbb ld a, $4 call Music1_CopyData - ld hl, wMusicE8Backup - ld de, wMusicE8 + ld hl, wMusicCutoffBackup + ld de, wMusicCutoff ld a, $4 call Music1_CopyData ld hl, wde8c ld de, wddc3 ld a, $4 call Music1_CopyData - ld hl, wMusicE9Backup - ld de, wMusicE9 + ld hl, wMusicEchoBackup + ld de, wMusicEcho ld a, $4 call Music1_CopyData - ld hl, wMusicECBackup - ld de, wMusicEC + ld hl, wMusicPitchOffsetBackup + ld de, wMusicPitchOffset ld a, $4 call Music1_CopyData ld hl, wMusicSpeedBackup @@ -1815,8 +1815,8 @@ Music1_LoadBackup: ; f4b01 (3d:4b01) ld de, wMusicVolume ld a, $3 call Music1_CopyData - ld hl, wMusicE4Backup - ld de, wMusicE4 + ld hl, wMusicFrequencyOffsetBackup + ld de, wMusicFrequencyOffset ld a, $3 call Music1_CopyData ld hl, wdeaa @@ -1852,11 +1852,104 @@ Music1_ChannelLoopStacks: ; f4c20 (3d:4c20) dw wMusicCh3Stack dw wMusicCh4Stack -Unknown_f4c28: ; f4c28 (3d:4c28) - INCROM $f4c28, $f4c30 - -Unknown_f4c30: ; f4c30 (3d:4c30) - INCROM $f4c30, $f4cda +; these are address offsets into the pitches table below +; offset = (12 notes per octave * 2 bytes per pitch) * octave +Music1_OctaveOffsets: ; f4c28 (3d:4c28) + db (12 * 2) * 0 + db (12 * 2) * 1 + db (12 * 2) * 2 + db (12 * 2) * 3 + db (12 * 2) * 4 + db (12 * 2) * 5 + db (12 * 2) * 6 + db (12 * 2) * 7 + +Music1_Pitches: ; f4c30 (3d:4c30) + dw $002c ; C_ 0 + dw $009c ; C# 0 + dw $0106 ; D_ 0 + dw $016b ; D# 0 + dw $01c9 ; E_ 0 + dw $0222 ; F_ 0 + dw $0278 ; F# 0 + dw $02c6 ; G_ 0 + dw $0312 ; G# 0 + dw $0358 ; A_ 0 + dw $039b ; A# 0 + dw $03da ; B_ 0 + dw $0416 ; C_ 1 + dw $044e ; C# 1 + dw $0483 ; D_ 1 + dw $04b5 ; D# 1 + dw $04e5 ; E_ 1 + dw $0511 ; F_ 1 + dw $053c ; F# 1 + dw $0563 ; G_ 1 + dw $0589 ; G# 1 + dw $05ac ; A_ 1 + dw $05cd ; A# 1 + dw $05ed ; B_ 1 + dw $060b ; C_ 2 + dw $0628 ; C# 2 + dw $0642 ; D_ 2 + dw $065b ; D# 2 + dw $0672 ; E_ 2 + dw $0689 ; F_ 2 + dw $069e ; F# 2 + dw $06b2 ; G_ 2 + dw $06c4 ; G# 2 + dw $06d6 ; A_ 2 + dw $06e7 ; A# 2 + dw $06f6 ; B_ 2 + dw $0705 ; C_ 3 + dw $0714 ; C# 3 + dw $0721 ; D_ 3 + dw $072d ; D# 3 + dw $0739 ; E_ 3 + dw $0744 ; F_ 3 + dw $074f ; F# 3 + dw $0759 ; G_ 3 + dw $0762 ; G# 3 + dw $076b ; A_ 3 + dw $0773 ; A# 3 + dw $077b ; B_ 3 + dw $0783 ; C_ 4 + dw $078a ; C# 4 + dw $0790 ; D_ 4 + dw $0797 ; D# 4 + dw $079d ; E_ 4 + dw $07a2 ; F_ 4 + dw $07a7 ; F# 4 + dw $07ac ; G_ 4 + dw $07b1 ; G# 4 + dw $07b6 ; A_ 4 + dw $07ba ; A# 4 + dw $07be ; B_ 4 + dw $07c1 ; C_ 5 + dw $07c5 ; C# 5 + dw $07c8 ; D_ 5 + dw $07cb ; D# 5 + dw $07ce ; E_ 5 + dw $07d1 ; F_ 5 + dw $07d4 ; F# 5 + dw $07d6 ; G_ 5 + dw $07d9 ; G# 5 + dw $07db ; A_ 5 + dw $07dd ; A# 5 + dw $07df ; B_ 5 + dw $07e1 ; C_ 6 + dw $07e3 ; C# 6 + dw $07e4 ; D_ 6 + dw $07e5 ; D# 6 + dw $07e7 ; E_ 6 + dw $07e8 ; F_ 6 + dw $07ea ; F# 6 + dw $07eb ; G_ 6 + dw $07ec ; G# 6 + dw $07ed ; A_ 6 + dw $07ee ; A# 6 + dw $07ef ; B_ 6 + dw $07f0 ; C_ 7 Music1_WaveInstruments: ; f4cda (3d:4cda) INCLUDE "audio/wave_instruments.asm" @@ -1867,8 +1960,14 @@ INCLUDE "audio/noise_instruments.asm" Music1_VibratoTypes: ; f4dde (3d:4dde) INCLUDE "audio/vibrato_types.asm" -Unknown_f4e85: ; f4e85 (3d:4e85) - INCROM $f4e85, $f4ee5 +; all real SFX have the same priority (SFX_STOP does not use this table) +Music1_SFXPriorities: ; f4e85 (3d:4e85) + db $00, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a + db $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a + db $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a + db $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a + db $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a + db $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a INCLUDE "audio/music1_headers.asm" @@ -1885,7 +1984,7 @@ INCLUDE "audio/music/matchstart2.asm" INCLUDE "audio/music/matchstart3.asm" INCLUDE "audio/music/matchvictory.asm" INCLUDE "audio/music/matchloss.asm" -INCLUDE "audio/music/darkdiddly.asm" +INCLUDE "audio/music/matchdraw.asm" INCLUDE "audio/music/boosterpack.asm" INCLUDE "audio/music/medal.asm" diff --git a/src/audio/music1_headers.asm b/src/audio/music1_headers.asm index f5008fe..05f33bb 100644 --- a/src/audio/music1_headers.asm +++ b/src/audio/music1_headers.asm @@ -28,7 +28,7 @@ SongBanks1: ; f4ee6 (3d:4ee6) db BANK(Music_MatchStart3) db BANK(Music_MatchVictory) db BANK(Music_MatchLoss) - db BANK(Music_DarkDiddly) + db BANK(Music_MatchDraw) db BANK(Music_Unused1b) db BANK(Music_BoosterPack) db BANK(Music_Medal) @@ -61,7 +61,7 @@ SongHeaderPointers1: ; f4f05 (3d:4f05) dw Music_MatchStart3 dw Music_MatchVictory dw Music_MatchLoss - dw Music_DarkDiddly + dw Music_MatchDraw dw Music_Unused1b dw Music_BoosterPack dw Music_Medal @@ -245,11 +245,11 @@ Music_MatchLoss: ; f501c (3d:501c) dw Music_MatchLoss_Ch3 dw $0000 -Music_DarkDiddly: ; f5025 (3d:5025) +Music_MatchDraw: ; f5025 (3d:5025) db %0111 - dw Music_DarkDiddly_Ch1 - dw Music_DarkDiddly_Ch2 - dw Music_DarkDiddly_Ch3 + dw Music_MatchDraw_Ch1 + dw Music_MatchDraw_Ch2 + dw Music_MatchDraw_Ch3 dw $0000 Music_Unused1b: ; f502e (3d:502e) diff --git a/src/audio/music2.asm b/src/audio/music2.asm index 4a8178e..13638d4 100644 --- a/src/audio/music2.asm +++ b/src/audio/music2.asm @@ -47,21 +47,21 @@ Music2_PlaySFX: ; f802d (3e:402d) ld b, $0 ld c, a or a - jr z, .asm_f8043 - ld hl, Unknown_f8e85 + jr z, .play_sfx ; SFX_STOP + ld hl, Music2_SFXPriorities add hl, bc ld b, [hl] - ld a, [wdd83] + ld a, [wSfxPriority] or a - jr z, .asm_f8043 + jr z, .play_sfx ; no sfx is currently playing cp b - jr c, .asm_f804b -.asm_f8043 + jr c, .skip ; lower priority +.play_sfx ld a, b - ld [wdd83], a + ld [wSfxPriority], a ld a, c ld [wCurSfxID], a -.asm_f804b +.skip pop hl pop bc ret @@ -128,7 +128,7 @@ Music2_Init: ; f807d (3e:407d) ld [wddf0], a ld [wddf2], a dec a - ld [wMusicDC], a + ld [wMusicStereoPanning], a ld de, $0001 ld bc, $0000 .zero_loop1 @@ -141,10 +141,10 @@ Music2_Init: ; f807d (3e:407d) ld hl, wddb3 add hl, bc ld [hl], d - ld hl, wMusicEC + ld hl, wMusicPitchOffset add hl, bc ld [hl], d - ld hl, wMusicE8 + ld hl, wMusicCutoff add hl, bc ld [hl], d inc c @@ -287,16 +287,16 @@ Music2_BeginSong: ; f818c (3e:418c) ld [wMusicIsPlaying], a xor a ld [wMusicTie], a - ld [wMusicE4], a - ld [wMusicE8], a + ld [wMusicFrequencyOffset], a + ld [wMusicCutoff], a ld [wMusicVibratoDelay], a - ld [wMusicEC], a + ld [wMusicPitchOffset], a ld a, [Music2_ChannelLoopStacks] ld [wMusicChannelStackPointers], a ld a, [Music2_ChannelLoopStacks + 1] ld [wMusicChannelStackPointers + 1], a ld a, $8 - ld [wMusicE9], a + ld [wMusicEcho], a .no_channel_1 rr e jr nc, .no_channel_2 @@ -313,16 +313,16 @@ Music2_BeginSong: ; f818c (3e:418c) ld [wMusicIsPlaying + 1], a xor a ld [wMusicTie + 1], a - ld [wMusicE4 + 1], a - ld [wMusicE8 + 1], a + ld [wMusicFrequencyOffset + 1], a + ld [wMusicCutoff + 1], a ld [wMusicVibratoDelay + 1], a - ld [wMusicEC + 1], a + ld [wMusicPitchOffset + 1], a ld a, [Music2_ChannelLoopStacks + 2] ld [wMusicChannelStackPointers + 2], a ld a, [Music2_ChannelLoopStacks + 3] ld [wMusicChannelStackPointers + 3], a ld a, $8 - ld [wMusicE9 + 1], a + ld [wMusicEcho + 1], a .no_channel_2 rr e jr nc, .no_channel_3 @@ -339,16 +339,16 @@ Music2_BeginSong: ; f818c (3e:418c) ld [wMusicIsPlaying + 2], a xor a ld [wMusicTie + 2], a - ld [wMusicE4 + 2], a - ld [wMusicE8 + 2], a + ld [wMusicFrequencyOffset + 2], a + ld [wMusicCutoff + 2], a ld [wMusicVibratoDelay + 2], a - ld [wMusicEC + 2], a + ld [wMusicPitchOffset + 2], a ld a, [Music2_ChannelLoopStacks + 4] ld [wMusicChannelStackPointers + 4], a ld a, [Music2_ChannelLoopStacks + 5] ld [wMusicChannelStackPointers + 5], a ld a, $40 - ld [wMusicE9 + 2], a + ld [wMusicEcho + 2], a .no_channel_3 rr e jr nc, .no_channel_4 @@ -365,15 +365,15 @@ Music2_BeginSong: ; f818c (3e:418c) ld [wMusicIsPlaying + 3], a xor a ld [wMusicTie + 3], a - ld [wMusicE8 + 3], a + ld [wMusicCutoff + 3], a ld [wMusicVibratoDelay + 3], a - ld [wMusicEC + 3], a + ld [wMusicPitchOffset + 3], a ld a, [Music2_ChannelLoopStacks + 6] ld [wMusicChannelStackPointers + 6], a ld a, [Music2_ChannelLoopStacks + 7] ld [wMusicChannelStackPointers + 7], a ld a, $40 - ld [wMusicE9 + 3], a + ld [wMusicEcho + 3], a .no_channel_4 xor a ld [wddf2], a @@ -400,7 +400,7 @@ Music2_UpdateChannel1: ; f82a5 (3e:42a5) bit 0, a jr nz, .asm_f82d4 ld hl, rNR12 - ld a, [wMusicE9] + ld a, [wMusicEcho] ld [hli], a inc hl ld a, $80 @@ -453,7 +453,7 @@ Music2_UpdateChannel2: ; f830a (3e:430a) bit 1, a jr nz, .asm_f8339 ld hl, rNR22 - ld a, [wMusicE9 + 1] + ld a, [wMusicEcho + 1] ld [hli], a inc hl ld a, $80 @@ -505,7 +505,7 @@ Music2_UpdateChannel3: ; f836f (3e:436f) ld a, [wddbb + 2] cp $1 jr z, .asm_f8398 - ld a, [wMusicE9 + 2] + ld a, [wMusicEcho + 2] ldh [rNR32], a .asm_f8398 ld a, [wddbb + 2] @@ -608,7 +608,7 @@ Music2_CommandTable: ; f842c (3e:442c) dw Music2_tie dw Music2_end dw Music2_end - dw Music2_musicdc + dw Music2_stereo_panning dw Music2_MainLoop dw Music2_EndMainLoop dw Music2_Loop @@ -616,16 +616,16 @@ Music2_CommandTable: ; f842c (3e:442c) dw Music2_jp dw Music2_call dw Music2_ret - dw Music2_musice4 + dw Music2_frequency_offset dw Music2_duty dw Music2_volume dw Music2_wave - dw Music2_musice8 - dw Music2_musice9 + dw Music2_cutoff + dw Music2_echo dw Music2_vibrato_type dw Music2_vibrato_delay - dw Music2_musicec - dw Music2_musiced + dw Music2_pitch_offset + dw Music2_adjust_pitch_offset dw Music2_end dw Music2_end dw Music2_end @@ -700,7 +700,7 @@ Music2_note: ; f448c (3d:448c) ld a, d jr z, .asm_f84fb ld e, a - ld hl, wMusicE8 + ld hl, wMusicCutoff add hl, bc ld a, [hl] cp $8 @@ -772,10 +772,10 @@ Music2_note: ; f448c (3d:448c) ld l, a ld a, [hli] ld d, a - ld a, [wMusicDC] + ld a, [wMusicStereoPanning] and $77 or d - ld [wMusicDC], a + ld [wMusicStereoPanning], a ld de, wddab ld a, [hli] ld [de], a @@ -808,18 +808,18 @@ Music2_note: ; f448c (3d:448c) add hl, bc ld e, [hl] ld d, $0 - ld hl, Unknown_f8c28 + ld hl, Music2_OctaveOffsets add hl, de add a ld e, [hl] add e - ld hl, wMusicEC + ld hl, wMusicPitchOffset add hl, bc ld e, [hl] add e add e ld e, a - ld hl, Unknown_f8c30 + ld hl, Music2_Pitches add hl, de ld a, [hli] ld e, a @@ -884,25 +884,25 @@ Music2_tie: ; f85cb (3e:45cb) ld [hl], $80 jp Music2_PlayNextNote_pop -Music2_musicdc: ; f85d4 (3e:45d4) +Music2_stereo_panning: ; f85d4 (3e:45d4) pop hl ld a, [hli] push hl push bc inc c - ld e, $ee -.asm_f85db + ld e, %11101110 ; mask +.loop dec c - jr z, .asm_f85e3 - rlca - rlc e - jr .asm_f85db -.asm_f85e3 + jr z, .done + rlca ; rotate input param + rlc e ; rotate mask + jr .loop +.done ld d, a - ld hl, wMusicDC + ld hl, wMusicStereoPanning ld a, [hl] - and e - or d + and e ; keep old panning for all other channels + or d ; apply new panning for this channel ld [hl], a pop bc jp Music2_PlayNextNote_pop @@ -1004,11 +1004,11 @@ Music2_ret: ; f8656 (3e:4656) call Music2_SetChannelStackPointer jp Music2_PlayNextNote_pop -Music2_musice4: ; f8667 (3e:4667) +Music2_frequency_offset: ; f8667 (3e:4667) pop de ld a, [de] inc de - ld hl, wMusicE4 + ld hl, wMusicFrequencyOffset add hl, bc ld [hl], a ld h, d @@ -1049,22 +1049,22 @@ Music2_wave: ; f8690 (3e:4690) ld l, e jp Music2_PlayNextNote -Music2_musice8: ; f86a0 (3e:46a0) +Music2_cutoff: ; f86a0 (3e:46a0) pop de ld a, [de] inc de - ld hl, wMusicE8 + ld hl, wMusicCutoff add hl, bc ld [hl], a ld h, d ld l, e jp Music2_PlayNextNote -Music2_musice9: ; f86ad (3e:46ad) +Music2_echo: ; f86ad (3e:46ad) pop de ld a, [de] inc de - ld hl, wMusicE9 + ld hl, wMusicEcho add hl, bc ld [hl], a ld h, d @@ -1096,22 +1096,22 @@ Music2_vibrato_delay: ; f86cc (3e:46cc) ld l, e jp Music2_PlayNextNote -Music2_musicec: ; f86d9 (3e:46d9) +Music2_pitch_offset: ; f86d9 (3e:46d9) pop de ld a, [de] inc de - ld hl, wMusicEC + ld hl, wMusicPitchOffset add hl, bc ld [hl], a ld h, d ld l, e jp Music2_PlayNextNote -Music2_musiced: ; f86e6 (3e:46e6) +Music2_adjust_pitch_offset: ; f86e6 (3e:46e6) pop de ld a, [de] inc de - ld hl, wMusicEC + ld hl, wMusicPitchOffset add hl, bc add [hl] ld [hl], a @@ -1371,7 +1371,7 @@ Func_f8866: ; f8866 (3e:4866) ldh [rNR50], a ld a, [wdd8c] or a - ld hl, wMusicDC + ld hl, wMusicStereoPanning ld a, [hli] jr z, .asm_f8888 ld a, [wdd8c] @@ -1539,7 +1539,7 @@ Func_f890b: ; f890b (3e:490b) ret Func_f8967: ; f8967 (3e:4967) - ld hl, wMusicE4 + ld hl, wMusicFrequencyOffset add hl, bc ld a, [hl] bit 7, a @@ -1629,8 +1629,8 @@ Music2_BackupSong: ; f89dc (3e:49dc) ld [wCurSongIDBackup], a ld a, [wCurSongBank] ld [wCurSongBankBackup], a - ld a, [wMusicDC] - ld [wMusicDCBackup], a + ld a, [wMusicStereoPanning] + ld [wMusicStereoPanningBackup], a ld hl, wMusicDuty1 ld de, wMusicDuty1Backup ld a, $4 @@ -1675,20 +1675,20 @@ Music2_BackupSong: ; f89dc (3e:49dc) ld de, wde84 ld a, $4 call Music2_CopyData - ld hl, wMusicE8 - ld de, wMusicE8Backup + ld hl, wMusicCutoff + ld de, wMusicCutoffBackup ld a, $4 call Music2_CopyData ld hl, wddc3 ld de, wde8c ld a, $4 call Music2_CopyData - ld hl, wMusicE9 - ld de, wMusicE9Backup + ld hl, wMusicEcho + ld de, wMusicEchoBackup ld a, $4 call Music2_CopyData - ld hl, wMusicEC - ld de, wMusicECBackup + ld hl, wMusicPitchOffset + ld de, wMusicPitchOffsetBackup ld a, $4 call Music2_CopyData ld hl, wMusicSpeed @@ -1712,8 +1712,8 @@ Music2_BackupSong: ; f89dc (3e:49dc) ld de, wMusicVolumeBackup ld a, $3 call Music2_CopyData - ld hl, wMusicE4 - ld de, wMusicE4Backup + ld hl, wMusicFrequencyOffset + ld de, wMusicFrequencyOffsetBackup ld a, $3 call Music2_CopyData ld hl, wdded @@ -1737,8 +1737,8 @@ Music2_LoadBackup: ; f8b01 (3e:4b01) ld [wCurSongID], a ld a, [wCurSongBankBackup] ld [wCurSongBank], a - ld a, [wMusicDCBackup] - ld [wMusicDC], a + ld a, [wMusicStereoPanningBackup] + ld [wMusicStereoPanning], a ld hl, wMusicDuty1Backup ld de, wMusicDuty1 ld a, $4 @@ -1783,20 +1783,20 @@ Music2_LoadBackup: ; f8b01 (3e:4b01) ld de, wddbb ld a, $4 call Music2_CopyData - ld hl, wMusicE8Backup - ld de, wMusicE8 + ld hl, wMusicCutoffBackup + ld de, wMusicCutoff ld a, $4 call Music2_CopyData ld hl, wde8c ld de, wddc3 ld a, $4 call Music2_CopyData - ld hl, wMusicE9Backup - ld de, wMusicE9 + ld hl, wMusicEchoBackup + ld de, wMusicEcho ld a, $4 call Music2_CopyData - ld hl, wMusicECBackup - ld de, wMusicEC + ld hl, wMusicPitchOffsetBackup + ld de, wMusicPitchOffset ld a, $4 call Music2_CopyData ld hl, wMusicSpeedBackup @@ -1815,8 +1815,8 @@ Music2_LoadBackup: ; f8b01 (3e:4b01) ld de, wMusicVolume ld a, $3 call Music2_CopyData - ld hl, wMusicE4Backup - ld de, wMusicE4 + ld hl, wMusicFrequencyOffsetBackup + ld de, wMusicFrequencyOffset ld a, $3 call Music2_CopyData ld hl, wdeaa @@ -1852,11 +1852,104 @@ Music2_ChannelLoopStacks: ; f8c20 (3e:4c20) dw wMusicCh3Stack dw wMusicCh4Stack -Unknown_f8c28: ; f8c28 (3e:4c28) - INCROM $f8c28, $f8c30 - -Unknown_f8c30: ; f8c30 (3e:4c30) - INCROM $f8c30, $f8cda +; these are address offsets into the pitches table below +; offset = (12 notes per octave * 2 bytes per pitch) * octave +Music2_OctaveOffsets: ; f8c28 (3e:4c28) + db (12 * 2) * 0 + db (12 * 2) * 1 + db (12 * 2) * 2 + db (12 * 2) * 3 + db (12 * 2) * 4 + db (12 * 2) * 5 + db (12 * 2) * 6 + db (12 * 2) * 7 + +Music2_Pitches: ; f8c30 (3e:4c30) + dw $002c ; C_ 0 + dw $009c ; C# 0 + dw $0106 ; D_ 0 + dw $016b ; D# 0 + dw $01c9 ; E_ 0 + dw $0222 ; F_ 0 + dw $0278 ; F# 0 + dw $02c6 ; G_ 0 + dw $0312 ; G# 0 + dw $0358 ; A_ 0 + dw $039b ; A# 0 + dw $03da ; B_ 0 + dw $0416 ; C_ 1 + dw $044e ; C# 1 + dw $0483 ; D_ 1 + dw $04b5 ; D# 1 + dw $04e5 ; E_ 1 + dw $0511 ; F_ 1 + dw $053c ; F# 1 + dw $0563 ; G_ 1 + dw $0589 ; G# 1 + dw $05ac ; A_ 1 + dw $05cd ; A# 1 + dw $05ed ; B_ 1 + dw $060b ; C_ 2 + dw $0628 ; C# 2 + dw $0642 ; D_ 2 + dw $065b ; D# 2 + dw $0672 ; E_ 2 + dw $0689 ; F_ 2 + dw $069e ; F# 2 + dw $06b2 ; G_ 2 + dw $06c4 ; G# 2 + dw $06d6 ; A_ 2 + dw $06e7 ; A# 2 + dw $06f6 ; B_ 2 + dw $0705 ; C_ 3 + dw $0714 ; C# 3 + dw $0721 ; D_ 3 + dw $072d ; D# 3 + dw $0739 ; E_ 3 + dw $0744 ; F_ 3 + dw $074f ; F# 3 + dw $0759 ; G_ 3 + dw $0762 ; G# 3 + dw $076b ; A_ 3 + dw $0773 ; A# 3 + dw $077b ; B_ 3 + dw $0783 ; C_ 4 + dw $078a ; C# 4 + dw $0790 ; D_ 4 + dw $0797 ; D# 4 + dw $079d ; E_ 4 + dw $07a2 ; F_ 4 + dw $07a7 ; F# 4 + dw $07ac ; G_ 4 + dw $07b1 ; G# 4 + dw $07b6 ; A_ 4 + dw $07ba ; A# 4 + dw $07be ; B_ 4 + dw $07c1 ; C_ 5 + dw $07c5 ; C# 5 + dw $07c8 ; D_ 5 + dw $07cb ; D# 5 + dw $07ce ; E_ 5 + dw $07d1 ; F_ 5 + dw $07d4 ; F# 5 + dw $07d6 ; G_ 5 + dw $07d9 ; G# 5 + dw $07db ; A_ 5 + dw $07dd ; A# 5 + dw $07df ; B_ 5 + dw $07e1 ; C_ 6 + dw $07e3 ; C# 6 + dw $07e4 ; D_ 6 + dw $07e5 ; D# 6 + dw $07e7 ; E_ 6 + dw $07e8 ; F_ 6 + dw $07ea ; F# 6 + dw $07eb ; G_ 6 + dw $07ec ; G# 6 + dw $07ed ; A_ 6 + dw $07ee ; A# 6 + dw $07ef ; B_ 6 + dw $07f0 ; C_ 7 Music2_WaveInstruments: ; f8cda (3e:4cda) INCLUDE "audio/wave_instruments.asm" @@ -1867,8 +1960,14 @@ INCLUDE "audio/noise_instruments.asm" Music2_VibratoTypes: ; f8dde (3e:4dde) INCLUDE "audio/vibrato_types.asm" -Unknown_f8e85: ; f8e85 (3e:4e85) - INCROM $f8e85, $f8ee5 +; all real SFX have the same priority (SFX_STOP does not use this table) +Music2_SFXPriorities: ; f8e85 (3e:4e85) + db $00, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a + db $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a + db $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a + db $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a + db $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a + db $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a INCLUDE "audio/music2_headers.asm" diff --git a/src/audio/music2_headers.asm b/src/audio/music2_headers.asm index cafaa4f..206d8fd 100644 --- a/src/audio/music2_headers.asm +++ b/src/audio/music2_headers.asm @@ -28,7 +28,7 @@ SongBanks2: ; f8ee6 (3e:4ee6) db BANK(Music_MatchStart3) db BANK(Music_MatchVictory) db BANK(Music_MatchLoss) - db BANK(Music_DarkDiddly) + db BANK(Music_MatchDraw) db BANK(Music_Unused1b) db BANK(Music_BoosterPack) db BANK(Music_Medal) @@ -245,7 +245,7 @@ Music_Credits: ; f8fdd (3e:4fdd) dw $0000 dw $0000 -;Music_DarkDiddly +;Music_MatchDraw db %0000 dw $0000 dw $0000 diff --git a/src/audio/sfx.asm b/src/audio/sfx.asm index c682191..7e87930 100644 --- a/src/audio/sfx.asm +++ b/src/audio/sfx.asm @@ -474,7 +474,7 @@ SFX_end: ; fc249 (3f:4249) Func_fc26c: ; fc26c (3f:426c) xor a ld [wde53], a - ld [wdd83], a + ld [wSfxPriority], a ld a, $80 ld [wCurSfxID], a ret diff --git a/src/constants/music_constants.asm b/src/constants/music_constants.asm index c6c50f7..d9ebb2b 100644 --- a/src/constants/music_constants.asm +++ b/src/constants/music_constants.asm @@ -25,7 +25,7 @@ const MUSIC_MATCH_START_3 ; $17 const MUSIC_MATCH_VICTORY ; $18 const MUSIC_MATCH_LOSS ; $19 - const MUSIC_DARK_DIDDLY ; $1a + const MUSIC_MATCH_DRAW ; $1a const MUSIC_UNUSED_1B ; $1b const MUSIC_BOOSTER_PACK ; $1c const MUSIC_MEDAL ; $1d diff --git a/src/data/effect_commands.asm b/src/data/effect_commands.asm index e95a93b..e58f2d4 100644 --- a/src/data/effect_commands.asm +++ b/src/data/effect_commands.asm @@ -177,7 +177,7 @@ ExeggutorBigEggsplosionEffectCommands: NidokingThrashEffectCommands: dbw EFFECTCMDTYPE_BEFORE_DAMAGE, Thrash_ModifierEffect - dbw EFFECTCMDTYPE_AFTER_DAMAGE, Thrash_LowRecoilEffect + dbw EFFECTCMDTYPE_AFTER_DAMAGE, Thrash_RecoilEffect dbw EFFECTCMDTYPE_AI, Thrash_AIEffect db $00 diff --git a/src/engine/bank01.asm b/src/engine/bank01.asm index a7184a6..572109f 100644 --- a/src/engine/bank01.asm +++ b/src/engine/bank01.asm @@ -189,7 +189,7 @@ MainDuelLoop: ; 40ee (1:40ee) cp TURN_PLAYER_LOST jr z, .active_duelist_lost_battle ld a, $5f - ld c, MUSIC_DARK_DIDDLY + ld c, MUSIC_MATCH_DRAW ldtx hl, DuelWasADrawText jr .handle_duel_finished diff --git a/src/engine/effect_functions.asm b/src/engine/effect_functions.asm index 1b015cb..b381661 100644 --- a/src/engine/effect_functions.asm +++ b/src/engine/effect_functions.asm @@ -297,7 +297,7 @@ SetDefiniteDamage: ; 2c166 (b:4166) ; overwrites wAIMinDamage and wAIMaxDamage ; with value in wDamage. -SetMinMaxDamageSameAsDamage: ; 2c174 (b:4174) +SetDefiniteAIDamage: ; 2c174 (b:4174) ld a, [wDamage] ld [wAIMinDamage], a ld [wAIMaxDamage], a @@ -1916,7 +1916,7 @@ Thrash_ModifierEffect: ; 2c973 (b:4973) call AddToDamage ret -Thrash_LowRecoilEffect: ; 2c982 (b:4982) +Thrash_RecoilEffect: ; 2c982 (b:4982) ldh a, [hTemp_ffa0] or a ret nz @@ -2959,7 +2959,7 @@ HydroPumpEffect: ; 2cf48 (b:4f48) KinglerFlail_AIEffect: ; 2cf4e (b:4f4e) call KinglerFlail_HPCheck - jp SetMinMaxDamageSameAsDamage + jp SetDefiniteAIDamage ; 0x2cf54 KinglerFlail_HPCheck: ; 2cf54 (b:4f54) @@ -3079,7 +3079,7 @@ KrabbyCallForFamily_PutInPlayAreaEffect: ; 2cfca (b:4fca) MagikarpFlail_AIEffect: ; 2cfff (b:4fff) call MagikarpFlail_HPCheck - jp SetMinMaxDamageSameAsDamage + jp SetDefiniteAIDamage ; 0x2d005 MagikarpFlail_HPCheck: ; 2d005 (b:5005) @@ -3785,7 +3785,7 @@ FlamesOfRage_DiscardEffect: ; 2d3de (b:53de) FlamesOfRage_AIEffect: ; 2d3e9 (b:53e9) call FlamesOfRage_DamageBoostEffect - jp SetMinMaxDamageSameAsDamage + jp SetDefiniteAIDamage ; 0x2d3ef FlamesOfRage_DamageBoostEffect: ; 2d3ef (b:53ef) @@ -4249,7 +4249,7 @@ EnergyBurnCheck_Unreferenced: ; 2d620 (b:5620) FlareonRage_AIEffect: ; 2d638 (b:5638) call FlareonRage_DamageBoostEffect - jp SetMinMaxDamageSameAsDamage + jp SetDefiniteAIDamage ; 0x2d63e FlareonRage_DamageBoostEffect: ; 2d63e (b:563e) @@ -5254,7 +5254,7 @@ InvisibleWallEffect: ; 2db77 (b:5b77) MrMimeMeditate_AIEffect: ; 2db79 (b:5b79) call MrMimeMeditate_DamageBoostEffect - jp SetMinMaxDamageSameAsDamage + jp SetDefiniteAIDamage ; 0x2db7f MrMimeMeditate_DamageBoostEffect: ; 2db7f (b:5b7f) @@ -5646,7 +5646,7 @@ NeutralizingShieldEffect: ; 2dd79 (b:5d79) Psychic_AIEffect: ; 2dd7b (b:5d7b) call Psychic_DamageBoostEffect - jp SetMinMaxDamageSameAsDamage + jp SetDefiniteAIDamage ; 0x2dd81 Psychic_DamageBoostEffect: ; 2dd81 (b:5d81) @@ -6106,7 +6106,7 @@ JynxDoubleslap_MultiplierEffect: ; 2dfcf (b:5fcf) JynxMeditate_AIEffect: ; 2dff2 (b:5ff2) call JynxMeditate_DamageBoostEffect - jp SetMinMaxDamageSameAsDamage + jp SetDefiniteAIDamage ; 0x2dfec JynxMeditate_DamageBoostEffect: ; 2dfec (b:5fec) @@ -6279,7 +6279,7 @@ SnivelEffect: ; 2e0cb (b:60cb) CuboneRage_AIEffect: ; 2e0d1 (b:60d1) call CuboneRage_DamageBoostEffect - jp SetMinMaxDamageSameAsDamage + jp SetDefiniteAIDamage ; 0x2e0d7 CuboneRage_DamageBoostEffect: ; 2e0d7 (b:60d7) @@ -6428,7 +6428,7 @@ MarowakCallForFamily_PutInPlayAreaEffect: ; 2e194 (b:6194) KarateChop_AIEffect: ; 2e1b4 (b:61b4) call KarateChop_DamageSubtractionEffect - jp SetMinMaxDamageSameAsDamage + jp SetDefiniteAIDamage ; 0x2e1ba KarateChop_DamageSubtractionEffect: ; 2e1ba (b:61ba) @@ -8247,7 +8247,7 @@ Rampage_AIEffect: ; 2eb96 (b:6b96) ld e, PLAY_AREA_ARENA call GetCardDamageAndMaxHP call AddToDamage - jp SetMinMaxDamageSameAsDamage + jp SetDefiniteAIDamage ; 0x2eba1 Rampage_Confusion50PercentEffect: ; 2eba1 (b:6ba1) @@ -8287,7 +8287,7 @@ RetreatAidEffect: ; 2ebd7 (b:6bd7) DodrioRage_AIEffect: ; 2ebd9 (b:6bd9) call DodrioRage_DamageBoostEffect - jp SetMinMaxDamageSameAsDamage + jp SetDefiniteAIDamage ; 0x2ebdf DodrioRage_DamageBoostEffect: ; 2ebdf (b:6bdf) @@ -8905,7 +8905,7 @@ ChanseyDoubleEdgeEffect: ; 2eefb (b:6efb) SuperFang_AIEffect: ; 2ef01 (b:6f01) call SuperFang_HalfHPEffect - jp SetMinMaxDamageSameAsDamage + jp SetDefiniteAIDamage ; 0x2ef07 SuperFang_HalfHPEffect: ; 2ef07 (b:6f07) diff --git a/src/macros/audio.asm b/src/macros/audio.asm index 0c13596..4bc6d91 100644 --- a/src/macros/audio.asm +++ b/src/macros/audio.asm @@ -94,8 +94,8 @@ tie: MACRO db $d9 ENDM -musicdc: MACRO - db $dc, \1 +stereo_panning: MACRO + db $dc, (\1 << 4) | \2 ENDM MainLoop: MACRO @@ -129,7 +129,7 @@ music_ret: MACRO db $e3 ENDM -musice4: MACRO +frequency_offset: MACRO db $e4, \1 ENDM @@ -145,11 +145,11 @@ wave: MACRO db $e7, \1 ENDM -musice8: MACRO +cutoff: MACRO db $e8, \1 ENDM -musice9: MACRO +echo: MACRO db $e9, \1 ENDM @@ -162,12 +162,12 @@ vibrato_delay: MACRO ENDM ; unused -;musicec: MACRO +;pitch_offset: MACRO ; db $ec, \1 ;ENDM ; unused -;musiced: MACRO +;adjust_pitch_offset: MACRO ; db $ed, \1 ;ENDM diff --git a/src/wram.asm b/src/wram.asm index dc1d91f..3189288 100644 --- a/src/wram.asm +++ b/src/wram.asm @@ -2654,10 +2654,12 @@ wCurSongBank:: ; dd81 wCurSfxID:: ; dd82 ds $1 -wdd83:: ; dd83 +; priority value of current sfx (0 if nothing is playing) +wSfxPriority:: ; dd83 ds $1 -wMusicDC:: ; dd84 +; 8-bit output enable mask for left/right output for each channel +wMusicStereoPanning:: ; dd84 ds $1 wdd85:: ; dd85 @@ -2741,16 +2743,19 @@ wddba:: ; ddba wddbb:: ; ddbb ds $4 -wMusicE8:: ; ddbf +; the delay (1-8) before a note is cut off early (0 is disabled) +wMusicCutoff:: ; ddbf ds $4 wddc3:: ; ddc3 ds $4 -wMusicE9:: ; ddc7 +; the volume to apply after a cutoff +wMusicEcho:: ; ddc7 ds $4 -wMusicEC:: ; ddcb +; the pitch offset to apply to each note (see Music1_Pitches) +wMusicPitchOffset:: ; ddcb ds $4 wMusicSpeed:: ; ddcf @@ -2774,7 +2779,8 @@ wdde3:: ; dde3 wMusicVolume:: ; dde7 ds $3 -wMusicE4:: ; ddea +; the frequency offset to apply to each note +wMusicFrequencyOffset:: ; ddea ds $3 wdded:: ; dded @@ -2853,7 +2859,7 @@ wCurSongIDBackup:: ; de55 wCurSongBankBackup:: ; de56 ds $1 -wMusicDCBackup:: ; de57 +wMusicStereoPanningBackup:: ; de57 ds $1 wMusicDuty1Backup:: ; de58 @@ -2895,16 +2901,16 @@ wde80:: ; de80 wde84:: ; de84 ds $4 -wMusicE8Backup:: ; de88 +wMusicCutoffBackup:: ; de88 ds $4 wde8c:: ; de8c ds $4 -wMusicE9Backup:: ; de90 +wMusicEchoBackup:: ; de90 ds $4 -wMusicECBackup:: ; de94 +wMusicPitchOffsetBackup:: ; de94 ds $4 wMusicSpeedBackup:: ; de98 @@ -2919,7 +2925,7 @@ wMusicVibratoDelayBackup:: ; dea0 wMusicVolumeBackup:: ; dea4 ds $3 -wMusicE4Backup:: ; dea7 +wMusicFrequencyOffsetBackup:: ; dea7 ds $3 wdeaa:: ; deaa |