aboutsummaryrefslogtreecommitdiffstats
path: root/audio/music
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2019-08-18 21:43:15 -0500
committerdannye <33dannye@gmail.com>2019-08-18 21:43:15 -0500
commit8b0cd72a6095db7f1639dae81c3d8eefd5b814d8 (patch)
tree28be7183055a671b23864ac873b32d4c7439fcf1 /audio/music
parentUpdate labels to match new audio macro names (diff)
downloadpokeyellow-8b0cd72a6095db7f1639dae81c3d8eefd5b814d8.tar.gz
pokeyellow-8b0cd72a6095db7f1639dae81c3d8eefd5b814d8.tar.xz
pokeyellow-8b0cd72a6095db7f1639dae81c3d8eefd5b814d8.zip
Finish cleaning up audio macro arguments and descriptions
break up arguments for stereo_panning and duty_cycle_pattern note_type fade is signed properly document arguments for vibrato, tempo, pitch_slide etc
Diffstat (limited to 'audio/music')
-rw-r--r--audio/music/bikeriding.asm2
-rw-r--r--audio/music/celadon.asm2
-rw-r--r--audio/music/defeatedgymleader.asm4
-rw-r--r--audio/music/dungeon1.asm10
-rw-r--r--audio/music/dungeon2.asm2
-rw-r--r--audio/music/finalbattle.asm10
-rw-r--r--audio/music/gymleaderbattle.asm2
-rw-r--r--audio/music/indigoplateau.asm6
-rw-r--r--audio/music/introbattle.asm6
-rw-r--r--audio/music/jigglypuffsong.asm4
-rw-r--r--audio/music/meeteviltrainer.asm6
-rw-r--r--audio/music/pkmnhealed.asm10
-rw-r--r--audio/music/pokemontower.asm2
-rw-r--r--audio/music/routes3.asm2
-rw-r--r--audio/music/routes4.asm6
-rw-r--r--audio/music/safarizone.asm8
-rw-r--r--audio/music/silphco.asm16
-rw-r--r--audio/music/titlescreen.asm12
-rw-r--r--audio/music/trainerbattle.asm4
-rw-r--r--audio/music/wildbattle.asm8
20 files changed, 61 insertions, 61 deletions
diff --git a/audio/music/bikeriding.asm b/audio/music/bikeriding.asm
index 43c8618e..ef293f54 100644
--- a/audio/music/bikeriding.asm
+++ b/audio/music/bikeriding.asm
@@ -114,7 +114,7 @@ Music_BikeRiding_branch_7dbc9::
note B_, 1
octave 4
note C_, 4
- note_type 12, 3, 13
+ note_type 12, 3, -5
note C_, 4
note_type 12, 11, 4
note F_, 6
diff --git a/audio/music/celadon.asm b/audio/music/celadon.asm
index b64fc6dd..5f03fc51 100644
--- a/audio/music/celadon.asm
+++ b/audio/music/celadon.asm
@@ -3,7 +3,7 @@ Music_Celadon_Ch1::
volume 7, 7
duty_cycle 3
toggle_perfect_pitch
- note_type 12, 2, 15
+ note_type 12, 2, -7
rest 8
octave 3
note D_, 8
diff --git a/audio/music/defeatedgymleader.asm b/audio/music/defeatedgymleader.asm
index 94c9eae3..159bf42b 100644
--- a/audio/music/defeatedgymleader.asm
+++ b/audio/music/defeatedgymleader.asm
@@ -287,7 +287,7 @@ Music_DefeatedGymLeader_branch_23d84::
note G_, 6
note E_, 1
note G_, 1
- note_type 12, 6, 15
+ note_type 12, 6, -7
octave 4
note C#, 8
note_type 12, 12, 7
@@ -318,7 +318,7 @@ Music_DefeatedGymLeader_branch_23d84::
note B_, 6
note G#, 1
note B_, 1
- note_type 12, 4, 15
+ note_type 12, 4, -7
octave 4
note E_, 8
note_type 12, 11, 0
diff --git a/audio/music/dungeon1.asm b/audio/music/dungeon1.asm
index 996a3ea6..76b8d168 100644
--- a/audio/music/dungeon1.asm
+++ b/audio/music/dungeon1.asm
@@ -4,12 +4,12 @@ Music_Dungeon1_Ch1::
duty_cycle 3
toggle_perfect_pitch
vibrato 10, 1, 4
- note_type 12, 4, 13
+ note_type 12, 4, -5
rest 8
- stereo_panning 237
+ stereo_panning %1110, %1101
octave 4
note F#, 8
- stereo_panning 255
+ stereo_panning %1111, %1111
Music_Dungeon1_branch_7dee5::
note_type 12, 11, 2
@@ -229,10 +229,10 @@ Music_Dungeon1_branch_7dfd5::
Music_Dungeon1_Ch2::
vibrato 11, 1, 5
duty_cycle 3
- note_type 12, 0, 15
+ note_type 12, 0, -7
octave 4
note G#, 8
- note_type 12, 4, 13
+ note_type 12, 4, -5
octave 5
note D_, 8
diff --git a/audio/music/dungeon2.asm b/audio/music/dungeon2.asm
index 86cb7ad2..e213e2a4 100644
--- a/audio/music/dungeon2.asm
+++ b/audio/music/dungeon2.asm
@@ -52,7 +52,7 @@ Music_Dungeon2_branch_7e892::
note A_, 4
note F#, 2
sound_loop 2, Music_Dungeon2_branch_7e892
- note_type 12, 1, 15
+ note_type 12, 1, -7
octave 3
note E_, 16
note C_, 16
diff --git a/audio/music/finalbattle.asm b/audio/music/finalbattle.asm
index 19fc01e5..6dec6bbb 100644
--- a/audio/music/finalbattle.asm
+++ b/audio/music/finalbattle.asm
@@ -147,7 +147,7 @@ Music_FinalBattle_branch_23429::
note F_, 4
note F#, 12
note A#, 4
- note_type 12, 5, 14
+ note_type 12, 5, -6
note B_, 12
note_type 12, 11, 2
note E_, 3
@@ -475,7 +475,7 @@ Music_FinalBattle_Ch2::
octave 4
note E_, 1
note E_, 3
- note_type 12, 4, 10
+ note_type 12, 4, -2
octave 3
note G#, 4
@@ -634,7 +634,7 @@ Music_FinalBattle_branch_235e6::
note F#, 12
note_type 12, 12, 7
note F#, 4
- note_type 12, 1, 15
+ note_type 12, 1, -7
octave 3
note F#, 8
note_type 12, 9, 0
@@ -686,7 +686,7 @@ Music_FinalBattle_branch_235e6::
note_type 12, 12, 7
octave 4
note D_, 8
- note_type 12, 4, 12
+ note_type 12, 4, -4
note C_, 8
note_type 12, 13, 7
note E_, 8
@@ -696,7 +696,7 @@ Music_FinalBattle_branch_235e6::
note B_, 8
note A#, 4
note B_, 12
- note_type 12, 5, 13
+ note_type 12, 5, -5
octave 4
note D_, 8
note_type 12, 12, 0
diff --git a/audio/music/gymleaderbattle.asm b/audio/music/gymleaderbattle.asm
index cebda01b..5befd665 100644
--- a/audio/music/gymleaderbattle.asm
+++ b/audio/music/gymleaderbattle.asm
@@ -779,7 +779,7 @@ Music_GymLeaderBattle_branch_225e0::
note_type 12, 11, 0
octave 3
note B_, 16
- note_type 12, 3, 15
+ note_type 12, 3, -7
octave 4
note F#, 16
note_type 12, 12, 3
diff --git a/audio/music/indigoplateau.asm b/audio/music/indigoplateau.asm
index d237a329..d341ecd6 100644
--- a/audio/music/indigoplateau.asm
+++ b/audio/music/indigoplateau.asm
@@ -68,7 +68,7 @@ Music_IndigoPlateau_branch_a605::
note_type 12, 11, 7
octave 3
note F_, 8
- note_type 12, 4, 14
+ note_type 12, 4, -6
octave 2
note A#, 8
sound_loop 0, Music_IndigoPlateau_branch_a605
@@ -95,7 +95,7 @@ Music_IndigoPlateau_Ch2::
note D_, 8
note D_, 8
note D_, 4
- note_type 12, 5, 10
+ note_type 12, 5, -2
note D#, 4
Music_IndigoPlateau_branch_a673::
@@ -129,7 +129,7 @@ Music_IndigoPlateau_branch_a673::
note D_, 8
octave 4
note C_, 8
- note_type 12, 4, 13
+ note_type 12, 4, -5
octave 4
note D#, 8
sound_loop 0, Music_IndigoPlateau_branch_a673
diff --git a/audio/music/introbattle.asm b/audio/music/introbattle.asm
index fdea3ee1..b2709b76 100644
--- a/audio/music/introbattle.asm
+++ b/audio/music/introbattle.asm
@@ -42,7 +42,7 @@ Music_IntroBattle_Ch1::
octave 2
note A_, 2
note A_, 2
- note_type 12, 2, 9
+ note_type 12, 2, -1
octave 3
note G_, 4
note_type 12, 11, 0
@@ -52,7 +52,7 @@ Music_IntroBattle_Ch1::
note_type 12, 11, 7
octave 3
note F_, 8
- note_type 12, 4, 15
+ note_type 12, 4, -7
octave 2
note F_, 8
note_type 12, 11, 1
@@ -157,7 +157,7 @@ Music_IntroBattle_Ch2::
note_type 12, 12, 5
octave 4
note C#, 4
- note_type 12, 2, 15
+ note_type 12, 2, -7
note D_, 16
note_type 12, 12, 1
octave 5
diff --git a/audio/music/jigglypuffsong.asm b/audio/music/jigglypuffsong.asm
index 3c0d5234..d8995fbd 100644
--- a/audio/music/jigglypuffsong.asm
+++ b/audio/music/jigglypuffsong.asm
@@ -3,7 +3,7 @@ Music_JigglypuffSong_Ch1::
volume 7, 7
vibrato 8, 2, 4
duty_cycle 2
- duty_cycle_pattern 165
+ duty_cycle_pattern 2, 2, 1, 1
toggle_perfect_pitch
note_type 13, 6, 7
octave 4
@@ -24,7 +24,7 @@ Music_JigglypuffSong_Ch1::
Music_JigglypuffSong_Ch2::
vibrato 5, 1, 5
duty_cycle 2
- duty_cycle_pattern 10
+ duty_cycle_pattern 0, 0, 2, 2
note_type 12, 10, 7
octave 4
note E_, 8
diff --git a/audio/music/meeteviltrainer.asm b/audio/music/meeteviltrainer.asm
index eb4f05ae..eb7b5944 100644
--- a/audio/music/meeteviltrainer.asm
+++ b/audio/music/meeteviltrainer.asm
@@ -8,7 +8,7 @@ Music_MeetEvilTrainer_Ch1::
octave 3
note D_, 2
note C#, 2
- note_type 12, 4, 15
+ note_type 12, 4, -7
note D_, 4
Music_MeetEvilTrainer_branch_7f6ae::
@@ -42,7 +42,7 @@ Music_MeetEvilTrainer_branch_7f6c2::
note B_, 4
note B_, 4
note B_, 4
- note_type 12, 4, 15
+ note_type 12, 4, -7
note A#, 4
note_type 12, 12, 2
note G_, 2
@@ -54,7 +54,7 @@ Music_MeetEvilTrainer_branch_7f6c2::
note B_, 4
note B_, 4
note B_, 4
- note_type 12, 3, 15
+ note_type 12, 3, -7
note A#, 4
note_type 12, 12, 2
sound_loop 0, Music_MeetEvilTrainer_branch_7f6c2
diff --git a/audio/music/pkmnhealed.asm b/audio/music/pkmnhealed.asm
index f3b78d38..2fe9e4ce 100644
--- a/audio/music/pkmnhealed.asm
+++ b/audio/music/pkmnhealed.asm
@@ -5,16 +5,16 @@ Music_PkmnHealed_Ch1::
toggle_perfect_pitch
note_type 12, 8, 1
rest 2
- pitch_slide 0, 75
+ pitch_slide 1, 4, B_
note B_, 2
- pitch_slide 0, 84
+ pitch_slide 1, 3, E_
note B_, 2
- pitch_slide 0, 68
+ pitch_slide 1, 4, E_
note E_, 2
rest 4
- pitch_slide 0, 59
+ pitch_slide 1, 5, B_
note E_, 4
- pitch_slide 0, 75
+ pitch_slide 1, 4, B_
note B_, 4
sound_ret
diff --git a/audio/music/pokemontower.asm b/audio/music/pokemontower.asm
index 8f78c613..ef3a3b88 100644
--- a/audio/music/pokemontower.asm
+++ b/audio/music/pokemontower.asm
@@ -236,7 +236,7 @@ Music_PokemonTower_branch_7f0ee::
note A_, 4
note G#, 4
note F#, 4
- note_type 12, 2, 15
+ note_type 12, 2, -7
octave 5
note D_, 16
note_type 12, 12, 0
diff --git a/audio/music/routes3.asm b/audio/music/routes3.asm
index 0cd4e769..d83ec8c0 100644
--- a/audio/music/routes3.asm
+++ b/audio/music/routes3.asm
@@ -69,7 +69,7 @@ Music_Routes3_branch_9fc3::
note A_, 4
note F_, 4
note A_, 4
- note_type 8, 4, 15
+ note_type 8, 4, -7
note A_, 12
note_type 8, 9, 0
note F_, 12
diff --git a/audio/music/routes4.asm b/audio/music/routes4.asm
index 41bc9e04..962cd36b 100644
--- a/audio/music/routes4.asm
+++ b/audio/music/routes4.asm
@@ -9,7 +9,7 @@ Music_Routes4_Ch1::
note G#, 4
note G#, 4
note G#, 4
- note_type 12, 7, 15
+ note_type 12, 7, -7
note G#, 4
note_type 12, 10, 2
note G#, 4
@@ -223,7 +223,7 @@ Music_Routes4_branch_a325::
note G#, 6
note_type 12, 7, 0
note G#, 6
- note_type 12, 6, 15
+ note_type 12, 6, -7
note G#, 6
note_type 12, 12, 7
note G#, 4
@@ -233,7 +233,7 @@ Music_Routes4_branch_a325::
note F#, 4
note_type 8, 9, 0
note F#, 6
- note_type 8, 7, 15
+ note_type 8, 7, -7
note F#, 6
duty_cycle 0
note_type 8, 9, 0
diff --git a/audio/music/safarizone.asm b/audio/music/safarizone.asm
index 083d077a..0ca2f71a 100644
--- a/audio/music/safarizone.asm
+++ b/audio/music/safarizone.asm
@@ -6,13 +6,13 @@ Music_SafariZone_Ch1::
duty_cycle 2
note_type 12, 9, 2
octave 3
- pitch_slide 0, 73
+ pitch_slide 1, 4, A_
note C_, 1
- pitch_slide 0, 73
+ pitch_slide 1, 4, A_
note G_, 1
- pitch_slide 0, 73
+ pitch_slide 1, 4, A_
note C_, 1
- pitch_slide 0, 73
+ pitch_slide 1, 4, A_
note G_, 1
rest 4
duty_cycle 3
diff --git a/audio/music/silphco.asm b/audio/music/silphco.asm
index 58af9209..3c7512ba 100644
--- a/audio/music/silphco.asm
+++ b/audio/music/silphco.asm
@@ -292,7 +292,7 @@ Music_SilphCo_branch_7f26d::
note A#, 1
octave 3
note C_, 1
- note_type 6, 3, 15
+ note_type 6, 3, -7
note C_, 16
note_type 6, 10, 0
note C_, 11
@@ -303,7 +303,7 @@ Music_SilphCo_branch_7f26d::
note G#, 1
note F#, 1
note E_, 1
- note_type 6, 3, 15
+ note_type 6, 3, -7
note E_, 16
note_type 6, 9, 0
note E_, 11
@@ -314,7 +314,7 @@ Music_SilphCo_branch_7f26d::
octave 3
note C_, 1
note D_, 1
- note_type 6, 3, 15
+ note_type 6, 3, -7
note D_, 16
note_type 6, 10, 7
note D_, 11
@@ -477,7 +477,7 @@ Music_SilphCo_branch_7f42e::
note D_, 8
note D#, 8
duty_cycle 3
- note_type 6, 6, 15
+ note_type 6, 6, -7
note E_, 16
note_type 6, 12, 0
note B_, 16
@@ -528,7 +528,7 @@ Music_SilphCo_branch_7f42e::
note F_, 8
note_type 6, 11, 7
note F_, 8
- note_type 6, 8, 10
+ note_type 6, 8, -2
note F_, 4
note_type 6, 12, 4
duty_cycle 3
@@ -539,7 +539,7 @@ Music_SilphCo_branch_7f42e::
note F#, 8
note_type 6, 11, 0
note F#, 8
- note_type 6, 9, 9
+ note_type 6, 9, -1
note F#, 4
note_type 6, 12, 4
note F#, 4
@@ -547,7 +547,7 @@ Music_SilphCo_branch_7f42e::
note F#, 4
note_type 6, 9, 0
note G_, 12
- note_type 6, 5, 9
+ note_type 6, 5, -1
note G_, 8
note_type 6, 12, 4
note G_, 4
@@ -766,7 +766,7 @@ Music_SilphCo_branch_7f42e::
note_type 6, 8, 3
note G_, 2
rest 6
- note_type 6, 4, 15
+ note_type 6, 4, -7
note G#, 8
note_type 6, 11, 4
note G_, 2
diff --git a/audio/music/titlescreen.asm b/audio/music/titlescreen.asm
index c12bd1de..b814cba3 100644
--- a/audio/music/titlescreen.asm
+++ b/audio/music/titlescreen.asm
@@ -237,7 +237,7 @@ Music_TitleScreen_branch_7e594::
note G_, 8
vibrato 16, 2, 6
duty_cycle 3
- note_type 12, 0, 11
+ note_type 12, 0, -3
note G_, 8
note_type 12, 14, 7
note A_, 8
@@ -383,14 +383,14 @@ Music_TitleScreen_branch_7e664::
note A_, 3
sound_call Music_TitleScreen_branch_7e6e5
octave 5
- pitch_slide 0, 66
+ pitch_slide 1, 4, D_
note D_, 4
rest 4
octave 6
- pitch_slide 0, 50
+ pitch_slide 1, 5, D_
note D_, 4
octave 5
- pitch_slide 0, 66
+ pitch_slide 1, 4, D_
note D_, 4
rest 2
note_type 8, 1, 0
@@ -400,11 +400,11 @@ Music_TitleScreen_branch_7e664::
note C#, 4
sound_call Music_TitleScreen_branch_7e6e5
octave 6
- pitch_slide 0, 50
+ pitch_slide 1, 5, D_
note D_, 4
rest 4
octave 5
- pitch_slide 0, 66
+ pitch_slide 1, 4, D_
note D_, 4
rest 6
note_type 8, 1, 0
diff --git a/audio/music/trainerbattle.asm b/audio/music/trainerbattle.asm
index 17e82ea9..ba5d6d1b 100644
--- a/audio/music/trainerbattle.asm
+++ b/audio/music/trainerbattle.asm
@@ -735,7 +735,7 @@ Music_TrainerBattle_branch_22bfc::
note C_, 8
note_type 12, 3, 0
note C_, 8
- note_type 12, 4, 14
+ note_type 12, 4, -6
note C_, 8
note_type 12, 12, 7
note C_, 8
@@ -827,7 +827,7 @@ Music_TrainerBattle_branch_22bfc::
note B_, 8
note_type 12, 6, 0
note B_, 8
- note_type 12, 6, 9
+ note_type 12, 6, -1
note B_, 6
note_type 12, 9, 6
note B_, 6
diff --git a/audio/music/wildbattle.asm b/audio/music/wildbattle.asm
index 582b55eb..f7cfab14 100644
--- a/audio/music/wildbattle.asm
+++ b/audio/music/wildbattle.asm
@@ -50,7 +50,7 @@ Music_WildBattle_Ch1::
note C#, 14
note E_, 6
note D#, 10
- note_type 12, 4, 15
+ note_type 12, 4, -7
note C#, 10
note_type 12, 11, 1
note G_, 6
@@ -279,7 +279,7 @@ Music_WildBattle_branch_230e0::
note_type 12, 11, 7
octave 4
note C_, 16
- note_type 12, 3, 15
+ note_type 12, 3, -7
note G_, 16
note_type 12, 11, 5
octave 3
@@ -416,7 +416,7 @@ Music_WildBattle_branch_23225::
note G#, 16
note_type 12, 11, 0
note G#, 16
- note_type 12, 4, 14
+ note_type 12, 4, -6
note G_, 16
note_type 12, 12, 7
note G_, 16
@@ -438,7 +438,7 @@ Music_WildBattle_branch_23225::
note F_, 8
note_type 12, 12, 0
note G_, 16
- note_type 12, 3, 15
+ note_type 12, 3, -7
octave 5
note C_, 16
note_type 12, 12, 5