diff options
| -rw-r--r-- | audio/music/battletheme1.asm | 102 | ||||
| -rw-r--r-- | audio/music/battletheme2.asm | 26 | ||||
| -rw-r--r-- | audio/music/battletheme3.asm | 6 | ||||
| -rw-r--r-- | audio/music/boosterpack.asm | 12 | ||||
| -rw-r--r-- | audio/music/challengehall.asm | 16 | ||||
| -rw-r--r-- | audio/music/club2.asm | 62 | ||||
| -rw-r--r-- | audio/music/club3.asm | 14 | ||||
| -rw-r--r-- | audio/music/credits.asm | 128 | ||||
| -rw-r--r-- | audio/music/hallofhonor.asm | 50 | ||||
| -rw-r--r-- | audio/music/imakuni.asm | 22 | ||||
| -rw-r--r-- | audio/music/matchloss.asm | 12 | ||||
| -rw-r--r-- | audio/music/matchvictory.asm | 4 | ||||
| -rw-r--r-- | audio/music/medal.asm | 16 | ||||
| -rw-r--r-- | audio/music/overworld.asm | 30 | ||||
| -rw-r--r-- | audio/music/pcmainmenu.asm | 34 | ||||
| -rw-r--r-- | audio/music/pokemondome.asm | 10 | ||||
| -rw-r--r-- | audio/music/ronald.asm | 6 | ||||
| -rw-r--r-- | audio/music/titlescreen.asm | 14 | ||||
| -rwxr-xr-x | macros.asm | 2 |
19 files changed, 283 insertions, 283 deletions
diff --git a/audio/music/battletheme1.asm b/audio/music/battletheme1.asm index 9a061b0..50f5b71 100644 --- a/audio/music/battletheme1.asm +++ b/audio/music/battletheme1.asm @@ -18,7 +18,7 @@ Music_BattleTheme1_Ch1: ; f532a (3d:532a) speed 1 note F_, 4 note F#, 3 - no_fade + tie speed 7 note F#, 1 volume 55 @@ -55,7 +55,7 @@ Music_BattleTheme1_Ch1: ; f532a (3d:532a) speed 1 note A#, 4 note B_, 3 - no_fade + tie speed 7 note B_, 15 volume 55 @@ -64,7 +64,7 @@ Music_BattleTheme1_Ch1: ; f532a (3d:532a) speed 1 note A#, 4 note B_, 3 - no_fade + tie speed 7 note B_, 3 note A_, 3 @@ -78,7 +78,7 @@ Music_BattleTheme1_Ch1: ; f532a (3d:532a) speed 1 note G#, 4 note A_, 3 - no_fade + tie speed 7 note A_, 15 volume 55 @@ -87,7 +87,7 @@ Music_BattleTheme1_Ch1: ; f532a (3d:532a) speed 1 note G#, 4 note A_, 3 - no_fade + tie speed 7 note A_, 3 note G_, 4 @@ -98,7 +98,7 @@ Music_BattleTheme1_Ch1: ; f532a (3d:532a) speed 1 note F#, 4 note G_, 3 - no_fade + tie speed 7 note G_, 15 volume 55 @@ -107,7 +107,7 @@ Music_BattleTheme1_Ch1: ; f532a (3d:532a) speed 1 note F#, 4 note G_, 3 - no_fade + tie speed 7 note G_, 3 note F#, 4 @@ -118,7 +118,7 @@ Music_BattleTheme1_Ch1: ; f532a (3d:532a) speed 1 note D#, 4 note E_, 3 - no_fade + tie speed 7 note E_, 1 volume 55 @@ -135,7 +135,7 @@ Music_BattleTheme1_Ch1: ; f532a (3d:532a) speed 1 note C#, 4 note D_, 3 - no_fade + tie speed 7 note D_, 1 rest 1 @@ -147,7 +147,7 @@ Music_BattleTheme1_Ch1: ; f532a (3d:532a) speed 1 note G#, 4 note A_, 3 - no_fade + tie speed 7 note A_, 1 volume 55 @@ -186,7 +186,7 @@ Music_BattleTheme1_Ch1: ; f532a (3d:532a) speed 1 note C#, 4 note D_, 3 - no_fade + tie speed 7 note D_, 1 rest 1 @@ -198,12 +198,12 @@ Music_BattleTheme1_Ch1: ; f532a (3d:532a) speed 1 note G#, 4 note A_, 3 - no_fade + tie speed 7 note A_, 5 - no_fade + tie note A_, 10 - no_fade + tie note A_, 6 volume 55 note A_, 2 @@ -212,7 +212,7 @@ Music_BattleTheme1_Ch1: ; f532a (3d:532a) speed 1 note C#, 4 note D_, 3 - no_fade + tie speed 7 note D_, 2 note C#, 1 @@ -227,14 +227,14 @@ Music_BattleTheme1_Ch1: ; f532a (3d:532a) speed 1 note A#, 4 note B_, 3 - no_fade + tie speed 7 note B_, 1 volume 55 note B_, 1 volume 160 note A_, 13 - no_fade + tie note A_, 6 volume 55 note A_, 2 @@ -261,11 +261,11 @@ Music_BattleTheme1_Ch1: ; f532a (3d:532a) music_call Branch_f5580 volume 160 note A_, 2 - no_fade + tie note A_, 8 - no_fade + tie note A_, 8 - no_fade + tie note A_, 6 duty 1 volume 160 @@ -287,7 +287,7 @@ Music_BattleTheme1_Ch1: ; f532a (3d:532a) speed 1 note G#, 4 note A_, 3 - no_fade + tie speed 7 note A_, 5 note G_, 2 @@ -302,7 +302,7 @@ Music_BattleTheme1_Ch1: ; f532a (3d:532a) speed 1 note F#, 4 note G_, 3 - no_fade + tie speed 7 note G_, 5 note F#, 2 @@ -315,10 +315,10 @@ Music_BattleTheme1_Ch1: ; f532a (3d:532a) note D_, 2 volume 160 note D_, 8 - no_fade + tie note D_, 8 note D_, 8 - no_fade + tie note D_, 8 volume 55 note D_, 2 @@ -328,7 +328,7 @@ Music_BattleTheme1_Ch1: ; f532a (3d:532a) note D_, 2 volume 160 note D_, 6 - no_fade + tie note D_, 8 rest 4 EndMainLoop @@ -346,7 +346,7 @@ Branch_f54f9: speed 1 note F_, 4 note F#, 3 - no_fade + tie speed 7 note F#, 10 volume 55 @@ -359,7 +359,7 @@ Branch_f54f9: speed 1 note D#, 4 note E_, 3 - no_fade + tie speed 7 note E_, 5 volume 55 @@ -368,7 +368,7 @@ Branch_f54f9: speed 1 note F#, 4 note G_, 3 - no_fade + tie speed 7 note G_, 2 note F#, 1 @@ -420,7 +420,7 @@ Branch_f5538: speed 1 note A#, 4 note B_, 3 - no_fade + tie speed 7 note B_, 2 note A_, 1 @@ -438,7 +438,7 @@ Branch_f5580: volume 160 note F_, 4 note F#, 3 - no_fade + tie speed 7 note F#, 9 volume 55 @@ -460,7 +460,7 @@ Branch_f5580: speed 1 note F_, 4 note F#, 3 - no_fade + tie speed 7 note F#, 7 note E_, 1 @@ -484,7 +484,7 @@ Branch_f5580: speed 1 note A#, 4 note B_, 3 - no_fade + tie speed 7 note B_, 8 volume 55 @@ -808,7 +808,7 @@ Music_BattleTheme1_Ch2: ; f55e7 (3d:55e7) speed 1 note C#, 4 note D_, 3 - no_fade + tie speed 7 note D_, 1 rest 1 @@ -883,7 +883,7 @@ Music_BattleTheme1_Ch2: ; f55e7 (3d:55e7) speed 1 note F#, 4 note G_, 3 - no_fade + tie speed 7 note G_, 15 dec_octave @@ -899,7 +899,7 @@ Music_BattleTheme1_Ch2: ; f55e7 (3d:55e7) speed 1 note F#, 4 note G_, 3 - no_fade + tie speed 7 note G_, 2 rest 1 @@ -920,7 +920,7 @@ Music_BattleTheme1_Ch2: ; f55e7 (3d:55e7) speed 1 note E_, 4 note F#, 3 - no_fade + tie speed 7 note F#, 15 dec_octave @@ -936,7 +936,7 @@ Music_BattleTheme1_Ch2: ; f55e7 (3d:55e7) speed 1 note E_, 4 note F#, 3 - no_fade + tie speed 7 note F#, 2 rest 1 @@ -957,7 +957,7 @@ Music_BattleTheme1_Ch2: ; f55e7 (3d:55e7) speed 1 note D#, 4 note E_, 3 - no_fade + tie speed 7 note E_, 15 dec_octave @@ -972,7 +972,7 @@ Music_BattleTheme1_Ch2: ; f55e7 (3d:55e7) speed 1 note A#, 4 note B_, 3 - no_fade + tie speed 7 note B_, 2 rest 1 @@ -983,7 +983,7 @@ Music_BattleTheme1_Ch2: ; f55e7 (3d:55e7) speed 1 note F#, 4 note G_, 3 - no_fade + tie speed 7 note G_, 1 rest 1 @@ -1012,7 +1012,7 @@ Music_BattleTheme1_Ch2: ; f55e7 (3d:55e7) volume 112 note F_, 4 note F#, 3 - no_fade + tie speed 7 note F#, 1 rest 1 @@ -1042,13 +1042,13 @@ Music_BattleTheme1_Ch2: ; f55e7 (3d:55e7) volume 128 octave 3 note D_, 16 - no_fade + tie note D_, 6 rest 2 speed 1 note G#, 4 note A_, 3 - no_fade + tie speed 7 note A_, 2 note A_, 1 @@ -1085,7 +1085,7 @@ Music_BattleTheme1_Ch2: ; f55e7 (3d:55e7) speed 7 music_call Branch_f598c note D_, 8 - no_fade + tie note D_, 8 note C#, 6 dec_octave @@ -1118,10 +1118,10 @@ Music_BattleTheme1_Ch2: ; f55e7 (3d:55e7) note A_, 2 rest 2 note G_, 8 - no_fade + tie note G_, 8 note F#, 8 - no_fade + tie note F#, 8 rest 2 note G_, 12 @@ -1135,7 +1135,7 @@ Branch_f594d: speed 1 note C#, 4 note D_, 3 - no_fade + tie speed 7 note D_, 9 dec_octave @@ -1163,7 +1163,7 @@ Branch_f594d: speed 1 note D#, 4 note E_, 3 - no_fade + tie speed 7 note E_, 2 note D_, 1 @@ -1216,7 +1216,7 @@ Branch_f598c: note D_, 2 rest 2 note D_, 2 - no_fade + tie music_ret Branch_f59b4: @@ -1225,7 +1225,7 @@ Branch_f59b4: speed 1 note G#, 4 note A_, 3 - no_fade + tie speed 7 note A_, 1 rest 1 @@ -1266,7 +1266,7 @@ Branch_f59b4: speed 1 note F#, 4 note G_, 3 - no_fade + tie speed 7 note G_, 2 note F#, 1 diff --git a/audio/music/battletheme2.asm b/audio/music/battletheme2.asm index e66504f..7d78c8a 100644 --- a/audio/music/battletheme2.asm +++ b/audio/music/battletheme2.asm @@ -34,7 +34,7 @@ Music_BattleTheme2_Ch1: ; f5d68 (3d:5d68) speed 9 music_call Branch_f5f3d note C_, 6 - no_fade + tie speed 1 note C_, 12 volume 55 @@ -59,7 +59,7 @@ Music_BattleTheme2_Ch1: ; f5d68 (3d:5d68) note D_, 1 musice8 8 note D_, 9 - no_fade + tie note D_, 9 volume 71 note D_, 3 @@ -100,7 +100,7 @@ Music_BattleTheme2_Ch1: ; f5d68 (3d:5d68) music_call Branch_f5f3d musice8 8 note C_, 4 - no_fade + tie speed 1 note C_, 4 note E_, 5 @@ -130,7 +130,7 @@ Music_BattleTheme2_Ch1: ; f5d68 (3d:5d68) inc_octave musice8 8 note D_, 9 - no_fade + tie note D_, 10 volume 55 note D_, 1 @@ -271,7 +271,7 @@ Music_BattleTheme2_Ch1: ; f5d68 (3d:5d68) note E_, 3 speed 1 note C_, 2 - no_fade + tie note C_, 16 volume 71 note C_, 9 @@ -329,7 +329,7 @@ Music_BattleTheme2_Ch1: ; f5d68 (3d:5d68) note F_, 1 note C_, 1 note D_, 12 - no_fade + tie note D_, 12 duty 1 volume 148 @@ -338,31 +338,31 @@ Music_BattleTheme2_Ch1: ; f5d68 (3d:5d68) Branch_f5f3d: musice8 8 note D_, 12 - no_fade + tie note D_, 4 - no_fade + tie speed 1 note D_, 7 volume 71 note D_, 2 - no_fade + tie speed 9 note D_, 1 dec_octave volume 160 note A_, 4 - no_fade + tie speed 1 note A_, 7 volume 71 note A_, 2 - no_fade + tie speed 9 note A_, 1 inc_octave volume 160 note C_, 12 - no_fade + tie music_ret Branch_f5f62: @@ -780,7 +780,7 @@ Music_BattleTheme2_Ch2: ; f5fad (3d:5fad) musice4 0 inc_octave note A_, 12 - no_fade + tie note A_, 12 dec_octave duty 1 diff --git a/audio/music/battletheme3.asm b/audio/music/battletheme3.asm index 71eeaba..e499484 100644 --- a/audio/music/battletheme3.asm +++ b/audio/music/battletheme3.asm @@ -260,7 +260,7 @@ Music_BattleTheme3_Ch1: ; f63a1 (3d:63a1) volume 160 note A_, 2 note B_, 1 - no_fade + tie speed 1 note B_, 5 volume 55 @@ -352,7 +352,7 @@ Branch_f65a7: octave 4 volume 160 note C#, 5 - no_fade + tie note C#, 4 volume 55 note C#, 2 @@ -372,7 +372,7 @@ Branch_f65a7: volume 160 inc_octave note C#, 5 - no_fade + tie note C#, 4 volume 55 note C#, 4 diff --git a/audio/music/boosterpack.asm b/audio/music/boosterpack.asm index b33bea9..d169785 100644 --- a/audio/music/boosterpack.asm +++ b/audio/music/boosterpack.asm @@ -34,9 +34,9 @@ Music_BoosterPack_Ch1: ; f7d60 (3d:7d60) dec_octave volume 160 note B_, 16 - no_fade + tie note B_, 16 - no_fade + tie note B_, 6 volume 55 note B_, 9 @@ -78,9 +78,9 @@ Music_BoosterPack_Ch2: ; f7d9e (3d:7d9e) note A_, 2 volume 144 note G_, 16 - no_fade + tie note G_, 16 - no_fade + tie note G_, 6 volume 39 note G_, 9 @@ -106,9 +106,9 @@ Music_BoosterPack_Ch3: ; f7ddb (3d:7ddb) note F_, 7 dec_octave note G_, 16 - no_fade + tie note G_, 16 - no_fade + tie note G_, 6 music_end ; 0xf7df8
\ No newline at end of file diff --git a/audio/music/challengehall.asm b/audio/music/challengehall.asm index 0c3c525..c48e381 100644 --- a/audio/music/challengehall.asm +++ b/audio/music/challengehall.asm @@ -103,7 +103,7 @@ Music_ChallengeHall_Ch1: ; f9646 (3e:5646) note D_, 8 speed 10 note C#, 6 - no_fade + tie note C#, 6 volume 55 speed 1 @@ -136,7 +136,7 @@ Music_ChallengeHall_Ch1: ; f9646 (3e:5646) dec_octave speed 10 note A_, 6 - no_fade + tie note A_, 6 volume 55 speed 1 @@ -175,7 +175,7 @@ Music_ChallengeHall_Ch1: ; f9646 (3e:5646) volume 160 speed 10 note A_, 3 - no_fade + tie speed 1 note A_, 15 dec_octave @@ -224,7 +224,7 @@ Music_ChallengeHall_Ch1: ; f9646 (3e:5646) note A_, 8 volume 160 note G#, 15 - no_fade + tie note G#, 7 volume 55 note G#, 8 @@ -416,7 +416,7 @@ Music_ChallengeHall_Ch2: ; f9883 (3e:5883) musice8 8 speed 10 note E_, 6 - no_fade + tie note E_, 6 speed 1 note E_, 7 @@ -445,7 +445,7 @@ Music_ChallengeHall_Ch2: ; f9883 (3e:5883) note B_, 8 speed 10 note A_, 6 - no_fade + tie note A_, 6 speed 1 rest 15 @@ -473,7 +473,7 @@ Music_ChallengeHall_Ch2: ; f9883 (3e:5883) note G#, 8 speed 10 note E_, 6 - no_fade + tie note E_, 6 speed 1 rest 15 @@ -786,7 +786,7 @@ Music_ChallengeHall_Ch3: ; f9a92 (3e:5a92) octave 1 musice8 8 note E_, 6 - no_fade + tie note E_, 6 speed 1 inc_octave diff --git a/audio/music/club2.asm b/audio/music/club2.asm index cbef1ea..12432ff 100644 --- a/audio/music/club2.asm +++ b/audio/music/club2.asm @@ -12,7 +12,7 @@ Music_Club2_Ch1: ; fa077 (3e:6077) note C_, 4 volume 119 note F#, 4 - no_fade + tie note F#, 16 volume 117 note G_, 4 @@ -20,7 +20,7 @@ Music_Club2_Ch1: ; fa077 (3e:6077) note B_, 4 volume 119 note F#, 4 - no_fade + tie note F#, 16 EndLoop volume 117 @@ -31,7 +31,7 @@ Music_Club2_Ch1: ; fa077 (3e:6077) inc_octave volume 119 note B_, 4 - no_fade + tie note B_, 16 volume 117 note G_, 4 @@ -39,7 +39,7 @@ Music_Club2_Ch1: ; fa077 (3e:6077) note C_, 4 volume 119 note B_, 4 - no_fade + tie note B_, 16 dec_octave volume 117 @@ -77,17 +77,17 @@ Music_Club2_Ch1: ; fa077 (3e:6077) note F#, 4 note A_, 4 note A_, 3 - no_fade + tie speed 1 note A_, 3 inc_octave volume 119 rest 4 note D_, 5 - no_fade + tie speed 6 note D_, 15 - no_fade + tie note D_, 16 EndMainLoop @@ -108,7 +108,7 @@ Music_Club2_Ch2: ; fa0e3 (3e:60e3) inc_octave volume 119 note D_, 4 - no_fade + tie note D_, 16 dec_octave dec_octave @@ -120,7 +120,7 @@ Music_Club2_Ch2: ; fa0e3 (3e:60e3) note C_, 4 volume 119 note D_, 4 - no_fade + tie note D_, 16 dec_octave dec_octave @@ -135,7 +135,7 @@ Music_Club2_Ch2: ; fa0e3 (3e:60e3) inc_octave volume 119 note G_, 4 - no_fade + tie note G_, 16 dec_octave dec_octave @@ -149,7 +149,7 @@ Music_Club2_Ch2: ; fa0e3 (3e:60e3) inc_octave volume 119 note C_, 4 - no_fade + tie note C_, 16 dec_octave dec_octave @@ -189,7 +189,7 @@ Music_Club2_Ch2: ; fa0e3 (3e:60e3) inc_octave note D_, 4 note E_, 3 - no_fade + tie speed 1 note E_, 3 dec_octave @@ -198,10 +198,10 @@ Music_Club2_Ch2: ; fa0e3 (3e:60e3) inc_octave volume 119 note F#, 7 - no_fade + tie speed 6 note F#, 14 - no_fade + tie note F#, 16 EndMainLoop @@ -247,7 +247,7 @@ Music_Club2_Ch3: ; fa164 (3e:6164) music_call Branch_fa1f3 octave 3 note G_, 16 - no_fade + tie note G_, 12 rest 16 rest 8 @@ -256,11 +256,11 @@ Music_Club2_Ch3: ; fa164 (3e:6164) music_call Branch_fa1f3 octave 3 note G_, 16 - no_fade + tie note G_, 12 - no_fade + tie note G_, 16 - no_fade + tie note G_, 8 rest 4 musice8 8 @@ -268,19 +268,19 @@ Music_Club2_Ch3: ; fa164 (3e:6164) note G_, 2 musice8 6 note F#, 16 - no_fade + tie note F#, 12 rest 4 note F#, 1 - no_fade + tie note G_, 15 - no_fade + tie note G_, 12 rest 4 note G#, 1 - no_fade + tie note A_, 15 - no_fade + tie note A_, 16 rest 16 rest 16 @@ -291,9 +291,9 @@ Branch_fa1cf: musice8 6 octave 5 note C#, 1 - no_fade + tie note D_, 15 - no_fade + tie note D_, 12 musice8 8 note C_, 2 @@ -301,7 +301,7 @@ Branch_fa1cf: note B_, 2 musice8 6 note G_, 16 - no_fade + tie note G_, 8 rest 4 musice8 8 @@ -313,9 +313,9 @@ Branch_fa1cf: note B_, 4 musice8 6 note A_, 16 - no_fade + tie note A_, 8 - no_fade + tie note A_, 16 rest 4 music_ret @@ -323,9 +323,9 @@ Branch_fa1cf: Branch_fa1f3: octave 4 note C#, 1 - no_fade + tie note D_, 15 - no_fade + tie note D_, 4 note E_, 4 dec_octave @@ -334,7 +334,7 @@ Branch_fa1f3: note C_, 4 musice8 6 note D_, 16 - no_fade + tie note D_, 8 rest 4 musice8 8 diff --git a/audio/music/club3.asm b/audio/music/club3.asm index bfff7f4..98719f7 100644 --- a/audio/music/club3.asm +++ b/audio/music/club3.asm @@ -21,7 +21,7 @@ Music_Club3_Ch1: ; fa210 (3e:6210) dec_octave volume 144 note A#, 6 - no_fade + tie note A#, 12 volume 55 note A#, 4 @@ -34,9 +34,9 @@ Music_Club3_Ch1: ; fa210 (3e:6210) volume 144 speed 1 note C_, 5 - no_fade + tie note C#, 4 - no_fade + tie speed 9 note C_, 1 volume 55 @@ -44,7 +44,7 @@ Music_Club3_Ch1: ; fa210 (3e:6210) dec_octave volume 144 note A#, 6 - no_fade + tie note A#, 12 volume 55 note A#, 4 @@ -453,7 +453,7 @@ Music_Club3_Ch2: ; fa423 (3e:6423) note F_, 2 volume 112 note E_, 6 - no_fade + tie note E_, 12 volume 55 note E_, 4 @@ -465,7 +465,7 @@ Music_Club3_Ch2: ; fa423 (3e:6423) volume 112 speed 1 note F_, 5 - no_fade + tie note F#, 4 speed 9 note F_, 1 @@ -473,7 +473,7 @@ Music_Club3_Ch2: ; fa423 (3e:6423) note F_, 1 volume 112 note E_, 6 - no_fade + tie note E_, 12 volume 55 note E_, 4 diff --git a/audio/music/credits.asm b/audio/music/credits.asm index b81c85f..73bd868 100644 --- a/audio/music/credits.asm +++ b/audio/music/credits.asm @@ -10,7 +10,7 @@ Music_Credits_Ch1: ; fb1fe (3e:71fe) note F_, 1 volume 96 note F_, 2 - no_fade + tie speed 1 note F_, 6 volume 55 @@ -20,7 +20,7 @@ Music_Credits_Ch1: ; fb1fe (3e:71fe) note G_, 1 volume 112 note G_, 2 - no_fade + tie speed 1 note G_, 6 volume 71 @@ -30,7 +30,7 @@ Music_Credits_Ch1: ; fb1fe (3e:71fe) note A_, 1 volume 128 note A_, 2 - no_fade + tie speed 1 note A_, 6 volume 71 @@ -56,7 +56,7 @@ Music_Credits_Ch1: ; fb1fe (3e:71fe) speed 1 note D#, 3 note E_, 10 - no_fade + tie speed 13 note E_, 4 volume 55 @@ -94,7 +94,7 @@ Music_Credits_Ch1: ; fb1fe (3e:71fe) volume 160 note C#, 3 note D_, 10 - no_fade + tie speed 13 note D_, 2 volume 55 @@ -112,7 +112,7 @@ Music_Credits_Ch1: ; fb1fe (3e:71fe) speed 1 note F#, 3 note G_, 10 - no_fade + tie speed 13 note G_, 3 volume 55 @@ -131,10 +131,10 @@ Music_Credits_Ch1: ; fb1fe (3e:71fe) note B_, 3 inc_octave note C_, 10 - no_fade + tie speed 13 note C_, 2 - no_fade + tie speed 1 note C_, 6 volume 55 @@ -171,10 +171,10 @@ Music_Credits_Ch1: ; fb1fe (3e:71fe) note B_, 3 inc_octave note C_, 10 - no_fade + tie speed 13 note C_, 2 - no_fade + tie speed 1 note C_, 6 volume 55 @@ -183,16 +183,16 @@ Music_Credits_Ch1: ; fb1fe (3e:71fe) volume 160 note C#, 3 note D_, 10 - no_fade + tie speed 13 note D_, 2 volume 55 note D_, 1 volume 160 note C_, 8 - no_fade + tie note C_, 8 - no_fade + tie note C_, 8 volume 55 note C_, 1 @@ -202,7 +202,7 @@ Music_Credits_Ch1: ; fb1fe (3e:71fe) volume 160 note D_, 3 note D#, 10 - no_fade + tie speed 13 note D#, 4 volume 55 @@ -216,7 +216,7 @@ Music_Credits_Ch1: ; fb1fe (3e:71fe) volume 160 note E_, 3 note F_, 10 - no_fade + tie speed 13 note F_, 3 volume 55 @@ -230,7 +230,7 @@ Music_Credits_Ch1: ; fb1fe (3e:71fe) volume 160 note F#, 3 note G_, 10 - no_fade + tie speed 13 note G_, 4 dec_octave @@ -250,7 +250,7 @@ Music_Credits_Ch1: ; fb1fe (3e:71fe) note D_, 7 speed 13 note E_, 8 - no_fade + tie note E_, 1 volume 55 note E_, 2 @@ -295,7 +295,7 @@ Branch_fb36b: dec_octave volume 160 note G_, 4 - no_fade + tie note G_, 8 volume 55 note G_, 1 @@ -309,7 +309,7 @@ Branch_fb36b: volume 160 note F#, 3 note G_, 10 - no_fade + tie speed 13 note G_, 4 volume 55 @@ -322,11 +322,11 @@ Branch_fb36b: speed 1 note E_, 3 note F_, 10 - no_fade + tie speed 13 note F_, 2 note E_, 1 - no_fade + tie speed 1 note E_, 6 note F_, 4 @@ -338,10 +338,10 @@ Branch_fb36b: volume 160 note C#, 3 note D_, 10 - no_fade + tie speed 13 note D_, 4 - no_fade + tie note D_, 8 volume 55 note D_, 2 @@ -354,7 +354,7 @@ Branch_fb36b: dec_octave volume 160 note G_, 4 - no_fade + tie note G_, 8 volume 55 note G_, 1 @@ -368,7 +368,7 @@ Branch_fb36b: volume 160 note G_, 3 note G#, 10 - no_fade + tie note G#, 13 volume 55 note G#, 13 @@ -386,7 +386,7 @@ Branch_fb36b: volume 160 note F#, 3 note G_, 10 - no_fade + tie speed 13 note G_, 2 note F_, 1 @@ -401,7 +401,7 @@ Branch_fb36b: speed 1 note D#, 3 note E_, 10 - no_fade + tie speed 13 note E_, 8 music_call Branch_fb60c @@ -452,7 +452,7 @@ Branch_fb36b: volume 160 note D#, 3 note E_, 10 - no_fade + tie note E_, 13 note F_, 6 volume 55 @@ -469,7 +469,7 @@ Branch_fb36b: volume 160 note C#, 3 note D_, 10 - no_fade + tie note D_, 13 note C#, 6 note C_, 7 @@ -525,7 +525,7 @@ Branch_fb36b: volume 160 note E_, 3 note F_, 10 - no_fade + tie note F_, 13 note E_, 13 note C_, 6 @@ -548,7 +548,7 @@ Branch_fb36b: volume 160 note E_, 3 note F_, 10 - no_fade + tie note F_, 13 note E_, 13 note C_, 6 @@ -569,7 +569,7 @@ Branch_fb36b: volume 160 note F#, 3 note G_, 10 - no_fade + tie speed 13 note G_, 8 volume 55 @@ -602,7 +602,7 @@ Branch_fb36b: volume 160 note G#, 3 note A_, 10 - no_fade + tie note A_, 13 volume 55 note A_, 13 @@ -619,7 +619,7 @@ Branch_fb36b: volume 160 note F#, 3 note G_, 10 - no_fade + tie note G_, 13 volume 55 note G_, 13 @@ -636,10 +636,10 @@ Branch_fb36b: volume 160 note C#, 3 note D_, 10 - no_fade + tie speed 13 note D_, 4 - no_fade + tie note D_, 8 volume 55 note D_, 1 @@ -659,7 +659,7 @@ Branch_fb36b: volume 160 note G_, 3 note G#, 10 - no_fade + tie note G#, 13 volume 55 note G#, 13 @@ -677,7 +677,7 @@ Branch_fb36b: volume 160 note F#, 3 note G_, 10 - no_fade + tie speed 13 note G_, 2 note F_, 1 @@ -747,7 +747,7 @@ Branch_fb5e4: speed 1 note C#, 3 note D_, 10 - no_fade + tie speed 13 note D_, 4 volume 55 @@ -778,7 +778,7 @@ Branch_fb60c: speed 1 note G#, 3 note A_, 10 - no_fade + tie speed 13 note A_, 8 volume 55 @@ -800,7 +800,7 @@ Branch_fb60c: volume 160 note F#, 3 note G_, 10 - no_fade + tie music_ret Branch_fb651: @@ -819,7 +819,7 @@ Branch_fb651: volume 160 note C#, 3 note D_, 10 - no_fade + tie note D_, 13 note C_, 6 volume 55 @@ -829,9 +829,9 @@ Branch_fb651: speed 13 volume 160 note G_, 6 - no_fade + tie note G_, 6 - no_fade + tie note G_, 8 volume 55 note G_, 1 @@ -861,7 +861,7 @@ Music_Credits_Ch2: ; fb68a (3e:768a) note A_, 1 volume 112 note A_, 2 - no_fade + tie speed 1 note A_, 6 volume 39 @@ -871,7 +871,7 @@ Music_Credits_Ch2: ; fb68a (3e:768a) note B_, 1 volume 128 note B_, 2 - no_fade + tie speed 1 note B_, 6 volume 55 @@ -882,7 +882,7 @@ Music_Credits_Ch2: ; fb68a (3e:768a) note C_, 1 volume 144 note C_, 2 - no_fade + tie speed 1 note C_, 6 volume 55 @@ -989,7 +989,7 @@ Music_Credits_Ch2: ; fb68a (3e:768a) speed 13 volume 128 note C_, 1 - no_fade + tie note C_, 2 dec_octave dec_octave @@ -1006,7 +1006,7 @@ Music_Credits_Ch2: ; fb68a (3e:768a) inc_octave volume 128 note C_, 1 - no_fade + tie note C_, 2 dec_octave volume 146 @@ -1022,7 +1022,7 @@ Music_Credits_Ch2: ; fb68a (3e:768a) inc_octave volume 128 note E_, 1 - no_fade + tie note E_, 4 dec_octave dec_octave @@ -1041,7 +1041,7 @@ Music_Credits_Ch2: ; fb68a (3e:768a) inc_octave speed 13 note C_, 8 - no_fade + tie note C_, 1 volume 39 note C_, 2 @@ -1084,7 +1084,7 @@ Branch_fb79e: speed 1 note E_, 3 note F_, 10 - no_fade + tie speed 13 note F_, 1 note E_, 1 @@ -1150,7 +1150,7 @@ Branch_fb79e: volume 112 note E_, 3 note F_, 10 - no_fade + tie note F_, 13 note E_, 5 note F_, 4 @@ -1182,7 +1182,7 @@ Branch_fb79e: note B_, 3 inc_octave note C_, 10 - no_fade + tie speed 13 note C_, 3 rest 1 @@ -1193,7 +1193,7 @@ Branch_fb79e: volume 128 note A#, 3 note B_, 10 - no_fade + tie speed 13 note B_, 4 rest 1 @@ -1217,7 +1217,7 @@ Branch_fb79e: volume 128 note E_, 3 note F_, 10 - no_fade + tie speed 13 note F_, 1 rest 1 @@ -1232,7 +1232,7 @@ Branch_fb79e: speed 1 note D_, 3 note D#, 10 - no_fade + tie speed 13 note D#, 2 dec_octave @@ -1409,7 +1409,7 @@ Branch_fb79e: note B_, 3 inc_octave note C_, 10 - no_fade + tie speed 13 note C_, 3 rest 1 @@ -1471,7 +1471,7 @@ Branch_fb79e: volume 128 note E_, 3 note F_, 10 - no_fade + tie speed 13 note F_, 1 rest 1 @@ -1501,7 +1501,7 @@ Branch_fb79e: volume 112 note D#, 3 note E_, 10 - no_fade + tie speed 13 note E_, 1 note F_, 1 @@ -1543,7 +1543,7 @@ Branch_fb79e: volume 128 note D_, 3 note D#, 10 - no_fade + tie speed 13 note D#, 2 dec_octave @@ -1710,7 +1710,7 @@ Branch_fbb10: volume 128 note D#, 3 note E_, 10 - no_fade + tie speed 13 note E_, 2 volume 146 @@ -1913,7 +1913,7 @@ Music_Credits_Ch3: ; fbb9d (3e:7b9d) rest 7 speed 13 note C_, 8 - no_fade + tie note C_, 1 rest 2 music_end @@ -1965,7 +1965,7 @@ Branch_fbc46: dec_octave musice8 8 note G_, 13 - no_fade + tie speed 13 note G_, 7 rest 1 diff --git a/audio/music/hallofhonor.asm b/audio/music/hallofhonor.asm index 76eba8e..92777ab 100644 --- a/audio/music/hallofhonor.asm +++ b/audio/music/hallofhonor.asm @@ -134,7 +134,7 @@ Music_HallOfHonor_Ch2: ; fb06e (3e:706e) note E_, 5 volume 208 note E_, 11 - no_fade + tie note E_, 12 EndLoop music_call Branch_fb0bb @@ -143,7 +143,7 @@ Music_HallOfHonor_Ch2: ; fb06e (3e:706e) note G_, 5 volume 208 note G_, 11 - no_fade + tie note G_, 12 EndMainLoop @@ -153,19 +153,19 @@ Branch_fb0bb: note F_, 5 volume 208 note F_, 11 - no_fade + tie note F_, 12 volume 109 note E_, 5 volume 208 note E_, 11 - no_fade + tie note E_, 12 volume 109 note D_, 5 volume 208 note D_, 11 - no_fade + tie note D_, 12 music_ret @@ -212,10 +212,10 @@ Music_HallOfHonor_Ch3: ; fb0d5 (3e:70d5) note B_, 3 inc_octave note C_, 4 - no_fade + tie speed 7 note C_, 15 - no_fade + tie note C_, 8 dec_octave musice8 8 @@ -225,7 +225,7 @@ Music_HallOfHonor_Ch3: ; fb0d5 (3e:70d5) musice8 6 note G_, 6 note C_, 10 - no_fade + tie note C_, 12 speed 1 musice8 8 @@ -233,10 +233,10 @@ Music_HallOfHonor_Ch3: ; fb0d5 (3e:70d5) inc_octave musice8 6 note C_, 4 - no_fade + tie speed 7 note C_, 15 - no_fade + tie note C_, 6 dec_octave musice8 8 @@ -251,10 +251,10 @@ Music_HallOfHonor_Ch3: ; fb0d5 (3e:70d5) note F#, 3 musice8 6 note G_, 4 - no_fade + tie speed 7 note G_, 15 - no_fade + tie note G_, 6 musice8 8 note G_, 2 @@ -266,10 +266,10 @@ Music_HallOfHonor_Ch3: ; fb0d5 (3e:70d5) note B_, 3 inc_octave note C_, 4 - no_fade + tie speed 7 note C_, 15 - no_fade + tie note C_, 8 dec_octave note B_, 2 @@ -283,10 +283,10 @@ Music_HallOfHonor_Ch3: ; fb0d5 (3e:70d5) inc_octave musice8 6 note C_, 4 - no_fade + tie speed 7 note C_, 9 - no_fade + tie note C_, 6 dec_octave musice8 8 @@ -299,7 +299,7 @@ Music_HallOfHonor_Ch3: ; fb0d5 (3e:70d5) musice8 8 note E_, 3 note F_, 4 - no_fade + tie speed 7 note F_, 1 note E_, 2 @@ -307,7 +307,7 @@ Music_HallOfHonor_Ch3: ; fb0d5 (3e:70d5) note C_, 2 musice8 7 note C_, 10 - no_fade + tie note C_, 10 musice8 4 note E_, 2 @@ -315,7 +315,7 @@ Music_HallOfHonor_Ch3: ; fb0d5 (3e:70d5) musice8 8 note E_, 3 note F_, 4 - no_fade + tie speed 7 note F_, 1 note E_, 2 @@ -323,17 +323,17 @@ Music_HallOfHonor_Ch3: ; fb0d5 (3e:70d5) note C_, 2 musice8 6 note C_, 10 - no_fade + tie note C_, 12 speed 1 musice8 8 note F#, 3 musice8 7 note G_, 4 - no_fade + tie speed 7 note G_, 15 - no_fade + tie note G_, 8 musice8 8 note F_, 2 @@ -347,7 +347,7 @@ Music_HallOfHonor_Ch3: ; fb0d5 (3e:70d5) dec_octave musice8 7 note G_, 10 - no_fade + tie note G_, 10 musice8 8 note E_, 2 @@ -357,7 +357,7 @@ Music_HallOfHonor_Ch3: ; fb0d5 (3e:70d5) note C_, 2 musice8 7 note C_, 12 - no_fade + tie note C_, 10 dec_octave musice8 8 @@ -368,7 +368,7 @@ Music_HallOfHonor_Ch3: ; fb0d5 (3e:70d5) note C_, 2 musice8 6 note C_, 12 - no_fade + tie note C_, 12 rest 3 volume 96 diff --git a/audio/music/imakuni.asm b/audio/music/imakuni.asm index 64d1de2..1887a88 100644 --- a/audio/music/imakuni.asm +++ b/audio/music/imakuni.asm @@ -20,7 +20,7 @@ Music_Imakuni_Ch1: ; fad55 (3e:6d55) rest 8 speed 9 note F_, 10 - no_fade + tie speed 1 note F_, 7 rest 8 @@ -51,7 +51,7 @@ Music_Imakuni_Ch1: ; fad55 (3e:6d55) note F#, 7 rest 8 note G_, 15 - no_fade + tie note G_, 7 note F#, 3 note G_, 2 @@ -153,7 +153,7 @@ Branch_fadf9: note E_, 7 rest 8 note F_, 15 - no_fade + tie note F_, 7 note E_, 3 note F_, 2 @@ -176,7 +176,7 @@ Branch_fae1d: rest 8 speed 9 note F_, 10 - no_fade + tie speed 1 note F_, 7 rest 8 @@ -224,7 +224,7 @@ Music_Imakuni_Ch2: ; fae32 (3e:6e32) speed 1 octave 2 note F_, 15 - no_fade + tie note F_, 7 inc_octave note F_, 8 @@ -240,7 +240,7 @@ Music_Imakuni_Ch2: ; fae32 (3e:6e32) speed 1 dec_octave note D#, 15 - no_fade + tie note D#, 7 inc_octave note D#, 8 @@ -266,7 +266,7 @@ Music_Imakuni_Ch2: ; fae32 (3e:6e32) rest 15 vibrato_delay 5 note D_, 15 - no_fade + tie note D_, 7 rest 8 vibrato_delay 0 @@ -304,7 +304,7 @@ Music_Imakuni_Ch3: ; faebc (3e:6ebc) vibrato_delay 8 speed 1 note D_, 15 - no_fade + tie note D_, 7 inc_octave vibrato_delay 0 @@ -370,7 +370,7 @@ Music_Imakuni_Ch3: ; faebc (3e:6ebc) speed 1 octave 1 note F_, 15 - no_fade + tie note F_, 7 inc_octave note F_, 8 @@ -389,7 +389,7 @@ Music_Imakuni_Ch3: ; faebc (3e:6ebc) speed 1 dec_octave note D#, 15 - no_fade + tie note D#, 7 inc_octave note D#, 8 @@ -425,7 +425,7 @@ Music_Imakuni_Ch3: ; faebc (3e:6ebc) octave 3 vibrato_delay 5 note C_, 15 - no_fade + tie note C_, 7 inc_octave vibrato_delay 0 diff --git a/audio/music/matchloss.asm b/audio/music/matchloss.asm index a41f968..101f3ab 100644 --- a/audio/music/matchloss.asm +++ b/audio/music/matchloss.asm @@ -9,7 +9,7 @@ Music_MatchLoss_Ch1: ; f7c2e (3d:7c2e) speed 1 note E_, 3 note F_, 2 - no_fade + tie speed 5 note F_, 3 note C_, 1 @@ -25,7 +25,7 @@ Music_MatchLoss_Ch1: ; f7c2e (3d:7c2e) volume 160 note D_, 3 note D#, 2 - no_fade + tie note D#, 16 dec_octave note A#, 6 @@ -39,7 +39,7 @@ Music_MatchLoss_Ch1: ; f7c2e (3d:7c2e) volume 160 note C_, 3 note C#, 8 - no_fade + tie note C#, 12 dec_octave speed 6 @@ -56,7 +56,7 @@ Music_MatchLoss_Ch1: ; f7c2e (3d:7c2e) note B_, 5 inc_octave note C_, 4 - no_fade + tie speed 9 note C_, 11 volume 55 @@ -81,7 +81,7 @@ Music_MatchLoss_Ch2: ; f7c87 (3d:7c87) speed 9 rest 6 note G_, 6 - no_fade + tie note G_, 6 volume 55 note G_, 2 @@ -114,7 +114,7 @@ Music_MatchLoss_Ch3: ; f7ca7 (3d:7ca7) musice8 8 speed 1 note F#, 11 - no_fade + tie note F#, 12 inc_octave musice8 4 diff --git a/audio/music/matchvictory.asm b/audio/music/matchvictory.asm index ca0ff50..7e78648 100644 --- a/audio/music/matchvictory.asm +++ b/audio/music/matchvictory.asm @@ -8,7 +8,7 @@ Music_MatchVictory_Ch1: ; f7b61 (3d:7b61) volume 176 speed 1 note A_, 15 - no_fade + tie note A_, 9 volume 39 note A_, 5 @@ -125,7 +125,7 @@ Music_MatchVictory_Ch3: ; f7c09 (3d:7c09) octave 1 speed 1 note F_, 15 - no_fade + tie note F_, 9 rest 5 note F_, 7 diff --git a/audio/music/medal.asm b/audio/music/medal.asm index 0ed5f8b..babc358 100644 --- a/audio/music/medal.asm +++ b/audio/music/medal.asm @@ -27,7 +27,7 @@ Music_Medal_Ch1: ; f7df8 (3d:7df8) note E_, 5 speed 15 note A_, 2 - no_fade + tie speed 1 note A_, 10 volume 55 @@ -52,9 +52,9 @@ Music_Medal_Ch1: ; f7df8 (3d:7df8) volume 160 speed 9 note A_, 5 - no_fade + tie note A_, 8 - no_fade + tie speed 1 note A_, 2 volume 55 @@ -90,7 +90,7 @@ Music_Medal_Ch2: ; f7e4b (3d:7e4b) inc_octave speed 15 note C_, 2 - no_fade + tie speed 1 note C_, 10 volume 39 @@ -115,9 +115,9 @@ Music_Medal_Ch2: ; f7e4b (3d:7e4b) volume 144 speed 9 note C#, 5 - no_fade + tie note C#, 8 - no_fade + tie speed 1 note C#, 2 volume 39 @@ -136,7 +136,7 @@ Music_Medal_Ch3: ; f7e9d (3d:7e9d) speed 15 rest 4 note F_, 2 - no_fade + tie speed 1 note F_, 10 rest 5 @@ -153,7 +153,7 @@ Music_Medal_Ch3: ; f7e9d (3d:7e9d) rest 6 speed 9 note A_, 13 - no_fade + tie speed 1 note A_, 2 music_end diff --git a/audio/music/overworld.asm b/audio/music/overworld.asm index 73505c5..bd86a95 100644 --- a/audio/music/overworld.asm +++ b/audio/music/overworld.asm @@ -125,16 +125,16 @@ Music_Overworld_Ch1: ; f71a0 (3d:71a0) volume 95 octave 4 note G_, 1 - no_fade + tie note E_, 1 - no_fade + tie note C_, 1 - no_fade + tie dec_octave note G_, 1 - no_fade + tie note E_, 1 - no_fade + tie note C_, 1 duty 1 volume 160 @@ -176,15 +176,15 @@ Music_Overworld_Ch1: ; f71a0 (3d:71a0) note G_, 1 volume 144 note F_, 8 - no_fade + tie note F_, 8 - no_fade + tie note F_, 8 - no_fade + tie note F_, 8 - no_fade + tie note F_, 8 - no_fade + tie note F_, 8 volume 55 note F_, 3 @@ -472,17 +472,17 @@ Music_Overworld_Ch2: ; f7334 (3d:7334) musice8 8 octave 4 note C_, 1 - no_fade + tie dec_octave note G_, 1 - no_fade + tie note E_, 1 - no_fade + tie note C_, 1 - no_fade + tie dec_octave note G_, 1 - no_fade + tie note E_, 1 duty 0 volume 146 diff --git a/audio/music/pcmainmenu.asm b/audio/music/pcmainmenu.asm index 99924b0..b58acec 100644 --- a/audio/music/pcmainmenu.asm +++ b/audio/music/pcmainmenu.asm @@ -228,9 +228,9 @@ Music_PCMainMenu_Ch3: ; f9189 (3e:5189) rest 1 speed 1 note A#, 4 - no_fade + tie note B_, 3 - no_fade + tie speed 7 note B_, 1 rest 1 @@ -244,7 +244,7 @@ Music_PCMainMenu_Ch3: ; f9189 (3e:5189) note D_, 2 dec_octave note G_, 1 - no_fade + tie note F#, 1 musice8 7 note F_, 1 @@ -254,9 +254,9 @@ Music_PCMainMenu_Ch3: ; f9189 (3e:5189) rest 1 speed 1 note G#, 4 - no_fade + tie note A_, 3 - no_fade + tie speed 7 note A_, 1 rest 1 @@ -270,7 +270,7 @@ Music_PCMainMenu_Ch3: ; f9189 (3e:5189) note C_, 2 dec_octave note F_, 1 - no_fade + tie note F#, 1 musice8 7 note G_, 1 @@ -280,9 +280,9 @@ Music_PCMainMenu_Ch3: ; f9189 (3e:5189) rest 1 speed 1 note A#, 4 - no_fade + tie note B_, 3 - no_fade + tie speed 7 note B_, 1 rest 1 @@ -296,7 +296,7 @@ Music_PCMainMenu_Ch3: ; f9189 (3e:5189) note D_, 2 dec_octave note G_, 1 - no_fade + tie note F#, 1 musice8 7 note F_, 1 @@ -306,19 +306,19 @@ Music_PCMainMenu_Ch3: ; f9189 (3e:5189) rest 1 speed 1 note B_, 4 - no_fade + tie inc_octave note C_, 3 - no_fade + tie speed 7 note C_, 1 rest 1 musice8 8 speed 1 note F#, 4 - no_fade + tie note G_, 3 - no_fade + tie speed 7 note G_, 1 musice8 4 @@ -328,14 +328,14 @@ Music_PCMainMenu_Ch3: ; f9189 (3e:5189) note F_, 2 speed 1 note C_, 3 - no_fade + tie dec_octave note B_, 3 - no_fade + tie note A#, 3 - no_fade + tie note A_, 3 - no_fade + tie note G#, 2 speed 7 EndMainLoop diff --git a/audio/music/pokemondome.asm b/audio/music/pokemondome.asm index 5045119..744160c 100644 --- a/audio/music/pokemondome.asm +++ b/audio/music/pokemondome.asm @@ -243,9 +243,9 @@ Music_PokemonDome_Ch1: ; f9251 (3e:5251) note E_, 4 note F_, 4 note G_, 8 - no_fade + tie note G_, 8 - no_fade + tie note G_, 8 volume 55 note G_, 2 @@ -298,13 +298,13 @@ Music_PokemonDome_Ch1: ; f9251 (3e:5251) note G#, 1 inc_octave note C_, 12 - no_fade + tie note C_, 8 note D_, 8 note C_, 8 - no_fade + tie note C_, 8 - no_fade + tie note C_, 12 EndMainLoop diff --git a/audio/music/ronald.asm b/audio/music/ronald.asm index 4e3ba48..d3e02c1 100644 --- a/audio/music/ronald.asm +++ b/audio/music/ronald.asm @@ -56,7 +56,7 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) octave 4 note C#, 3 note D_, 10 - no_fade + tie speed 13 note D_, 2 vibrato_delay 12 @@ -69,7 +69,7 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) octave 4 note C#, 3 note D_, 10 - no_fade + tie speed 13 note D_, 2 vibrato_delay 12 @@ -406,7 +406,7 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) rest 7 note C#, 3 note D_, 10 - no_fade + tie speed 13 note D_, 5 rest 1 diff --git a/audio/music/titlescreen.asm b/audio/music/titlescreen.asm index 6462632..371568f 100644 --- a/audio/music/titlescreen.asm +++ b/audio/music/titlescreen.asm @@ -54,9 +54,9 @@ Music_TitleScreen_Ch1: ; f5052 (3d:5052) note F_, 2 speed 1 note E_, 5 - no_fade + tie note F_, 4 - no_fade + tie note E_, 5 speed 7 note D_, 1 @@ -211,9 +211,9 @@ Music_TitleScreen_Ch1: ; f5052 (3d:5052) note C_, 1 musice8 8 note C_, 8 - no_fade + tie note C_, 8 - no_fade + tie note C_, 8 volume 55 note C_, 8 @@ -479,14 +479,14 @@ Music_TitleScreen_Ch3: ; f5286 (3d:5286) note C_, 4 speed 1 note C_, 9 - no_fade + tie note C_, 10 dec_octave note G_, 9 - no_fade + tie note G_, 9 note G_, 9 - no_fade + tie note G_, 10 speed 7 musice8 8 @@ -78,7 +78,7 @@ dec_octave: MACRO db $d8 ENDM -no_fade: MACRO +tie: MACRO db $d9 ENDM |