diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2022-07-09 23:39:10 -0400 |
|---|---|---|
| committer | Rangi <35663410+Rangi42@users.noreply.github.com> | 2022-07-10 20:26:21 -0400 |
| commit | 9630fd73044c0a7d7202eaf005ab323473be5365 (patch) | |
| tree | bcc3cfabfff8868391eab94d007ac522de6968b0 | |
| parent | wOAMBuffer -> wShadowOAM (#95) (diff) | |
| download | pokeyellow-9630fd73044c0a7d7202eaf005ab323473be5365.tar.gz pokeyellow-9630fd73044c0a7d7202eaf005ab323473be5365.tar.xz pokeyellow-9630fd73044c0a7d7202eaf005ab323473be5365.zip | |
Replace "branch" labels in music files with local names
50 files changed, 832 insertions, 1084 deletions
diff --git a/audio/alternate_tempo.asm b/audio/alternate_tempo.asm index eb47d62d..24a09b7c 100644 --- a/audio/alternate_tempo.asm +++ b/audio/alternate_tempo.asm @@ -4,11 +4,11 @@ Music_RivalAlternateStart:: ld a, MUSIC_MEET_RIVAL call PlayMusic ld hl, wChannelCommandPointers - ld de, Music_MeetRival_branch_b1a2 + ld de, Music_MeetRival_Ch1_AlternateStart call Audio1_OverwriteChannelPointer - ld de, Music_MeetRival_branch_b21d + ld de, Music_MeetRival_Ch2_AlternateStart call Audio1_OverwriteChannelPointer - ld de, Music_MeetRival_branch_b2b5 + ld de, Music_MeetRival_Ch3_AlternateStart Audio1_OverwriteChannelPointer: ld a, e @@ -22,13 +22,13 @@ Music_RivalAlternateTempo:: ld c, BANK(Music_MeetRival) ld a, MUSIC_MEET_RIVAL call PlayMusic - ld de, Music_MeetRival_branch_b119 + ld de, Music_MeetRival_Ch1_AlternateTempo jr FinishAlternateRivalMusic ; applies both the alternate start and alternate tempo Music_RivalAlternateStartAndTempo:: call Music_RivalAlternateStart - ld de, Music_MeetRival_branch_b19b + ld de, Music_MeetRival_Ch1_AlternateStartAndTempo FinishAlternateRivalMusic: ld hl, wChannelCommandPointers jp Audio1_OverwriteChannelPointer @@ -48,5 +48,5 @@ Music_Cities1AlternateTempo:: ld a, MUSIC_CITIES1 call PlayMusic ld hl, wChannelCommandPointers - ld de, Music_Cities1_branch_aa6f + ld de, Music_Cities1_Ch1_AlternateTempo jp Audio1_OverwriteChannelPointer diff --git a/audio/music/bikeriding.asm b/audio/music/bikeriding.asm index 302e5cf9..5ee7ba85 100644 --- a/audio/music/bikeriding.asm +++ b/audio/music/bikeriding.asm @@ -6,8 +6,7 @@ Music_BikeRiding_Ch1:: note_type 12, 11, 5 octave 3 note G_, 2 - -Music_BikeRiding_branch_7dbc9:: +.mainloop: octave 4 note C_, 4 note D_, 4 @@ -150,8 +149,7 @@ Music_BikeRiding_branch_7dbc9:: note G_, 12 note_type 12, 11, 5 vibrato 8, 1, 4 - sound_loop 0, Music_BikeRiding_branch_7dbc9 - + sound_loop 0, .mainloop Music_BikeRiding_Ch2:: duty_cycle 2 @@ -159,8 +157,7 @@ Music_BikeRiding_Ch2:: note_type 12, 12, 3 octave 4 note C_, 2 - -Music_BikeRiding_branch_7dc75:: +.mainloop: note E_, 4 note F_, 4 note G_, 4 @@ -299,14 +296,12 @@ Music_BikeRiding_branch_7dc75:: note_type 12, 12, 7 note B_, 12 note_type 12, 12, 3 - sound_loop 0, Music_BikeRiding_branch_7dc75 - + sound_loop 0, .mainloop Music_BikeRiding_Ch3:: note_type 12, 1, 3 rest 2 - -Music_BikeRiding_branch_7dd17:: +.mainloop: octave 4 note C_, 1 rest 1 @@ -640,36 +635,34 @@ Music_BikeRiding_branch_7dd17:: octave 4 note F_, 1 rest 1 - sound_loop 0, Music_BikeRiding_branch_7dd17 - + sound_loop 0, .mainloop Music_BikeRiding_Ch4:: drum_speed 12 rest 2 +.mainloop: + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 + sound_call .sub3 + sound_call .sub2 + sound_call .sub2 + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 + sound_call .sub3 + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_loop 0, .mainloop -Music_BikeRiding_branch_7de6a:: - sound_call Music_BikeRiding_branch_7dea7 - sound_call Music_BikeRiding_branch_7deb4 - sound_call Music_BikeRiding_branch_7dea7 - sound_call Music_BikeRiding_branch_7dec2 - sound_call Music_BikeRiding_branch_7deb4 - sound_call Music_BikeRiding_branch_7deb4 - sound_call Music_BikeRiding_branch_7dea7 - sound_call Music_BikeRiding_branch_7dea7 - sound_call Music_BikeRiding_branch_7dea7 - sound_call Music_BikeRiding_branch_7dea7 - sound_call Music_BikeRiding_branch_7deb4 - sound_call Music_BikeRiding_branch_7dea7 - sound_call Music_BikeRiding_branch_7dec2 - sound_call Music_BikeRiding_branch_7dea7 - sound_call Music_BikeRiding_branch_7deb4 - sound_call Music_BikeRiding_branch_7dea7 - sound_call Music_BikeRiding_branch_7dea7 - sound_call Music_BikeRiding_branch_7dea7 - sound_call Music_BikeRiding_branch_7dea7 - sound_loop 0, Music_BikeRiding_branch_7de6a - -Music_BikeRiding_branch_7dea7:: +.sub1: rest 2 drum_note 16, 2 rest 2 @@ -680,7 +673,7 @@ Music_BikeRiding_branch_7dea7:: drum_note 16, 2 sound_ret -Music_BikeRiding_branch_7deb4:: +.sub2: rest 2 drum_note 16, 2 rest 2 @@ -691,7 +684,7 @@ Music_BikeRiding_branch_7deb4:: drum_note 16, 2 sound_ret -Music_BikeRiding_branch_7dec2:: +.sub3: rest 2 drum_note 16, 2 rest 2 diff --git a/audio/music/celadon.asm b/audio/music/celadon.asm index 5f03fc51..30723112 100644 --- a/audio/music/celadon.asm +++ b/audio/music/celadon.asm @@ -7,8 +7,7 @@ Music_Celadon_Ch1:: rest 8 octave 3 note D_, 8 - -Music_Celadon_branch_b6d4:: +.mainloop: duty_cycle 2 note_type 12, 11, 2 note G_, 4 @@ -104,8 +103,7 @@ Music_Celadon_branch_b6d4:: note G_, 4 note F#, 4 note A_, 4 - sound_loop 0, Music_Celadon_branch_b6d4 - + sound_loop 0, .mainloop Music_Celadon_Ch2:: duty_cycle 3 @@ -121,8 +119,7 @@ Music_Celadon_Ch2:: note G_, 1 note_type 12, 10, 0 note A_, 8 - -Music_Celadon_branch_b74a:: +.mainloop: duty_cycle 2 note_type 12, 12, 2 octave 4 @@ -223,8 +220,7 @@ Music_Celadon_branch_b74a:: note D_, 2 note E_, 2 note D_, 8 - sound_loop 0, Music_Celadon_branch_b74a - + sound_loop 0, .mainloop Music_Celadon_Ch3:: note_type 12, 1, 3 @@ -238,8 +234,7 @@ Music_Celadon_Ch3:: note E_, 1 note F#, 1 note G_, 1 - -Music_Celadon_branch_b7c1:: +.mainloop: octave 4 note D_, 2 note B_, 2 @@ -408,4 +403,4 @@ Music_Celadon_branch_b7c1:: note G_, 2 note F#, 2 note E_, 2 - sound_loop 0, Music_Celadon_branch_b7c1 + sound_loop 0, .mainloop diff --git a/audio/music/cinnabar.asm b/audio/music/cinnabar.asm index 69496af5..b0c69ce2 100644 --- a/audio/music/cinnabar.asm +++ b/audio/music/cinnabar.asm @@ -4,8 +4,7 @@ Music_Cinnabar_Ch1:: duty_cycle 3 vibrato 12, 3, 4 toggle_perfect_pitch - -Music_Cinnabar_branch_b878:: +.mainloop: note_type 12, 11, 5 rest 4 octave 3 @@ -82,14 +81,12 @@ Music_Cinnabar_branch_b878:: note G_, 8 note F#, 4 note E_, 4 - sound_loop 0, Music_Cinnabar_branch_b878 - + sound_loop 0, .mainloop Music_Cinnabar_Ch2:: duty_cycle 3 vibrato 10, 2, 3 - -Music_Cinnabar_branch_b8d9:: +.mainloop: note_type 12, 12, 7 octave 3 note G_, 6 @@ -176,13 +173,11 @@ Music_Cinnabar_branch_b8d9:: octave 3 note B_, 2 note A_, 6 - sound_loop 0, Music_Cinnabar_branch_b8d9 - + sound_loop 0, .mainloop Music_Cinnabar_Ch3:: note_type 12, 1, 0 - -Music_Cinnabar_branch_b93f:: +.mainloop: octave 4 note G_, 1 rest 3 @@ -351,4 +346,4 @@ Music_Cinnabar_branch_b93f:: octave 5 note C_, 1 rest 1 - sound_loop 0, Music_Cinnabar_branch_b93f + sound_loop 0, .mainloop diff --git a/audio/music/cinnabarmansion.asm b/audio/music/cinnabarmansion.asm index ac6c08c3..426715d6 100644 --- a/audio/music/cinnabarmansion.asm +++ b/audio/music/cinnabarmansion.asm @@ -3,8 +3,8 @@ Music_CinnabarMansion_Ch1:: volume 7, 7 vibrato 11, 2, 5 duty_cycle 2 - -Music_CinnabarMansion_branch_7ed19:: +.mainloop: +.loop1: note_type 12, 6, 2 octave 5 note E_, 1 @@ -25,7 +25,7 @@ Music_CinnabarMansion_branch_7ed19:: octave 5 note B_, 1 rest 2 - sound_loop 14, Music_CinnabarMansion_branch_7ed19 + sound_loop 14, .loop1 note_type 12, 10, 5 rest 16 rest 16 @@ -35,26 +35,22 @@ Music_CinnabarMansion_branch_7ed19:: octave 5 note B_, 1 note B_, 2 - sound_loop 0, Music_CinnabarMansion_branch_7ed19 - + sound_loop 0, .mainloop Music_CinnabarMansion_Ch2:: duty_cycle 2 toggle_perfect_pitch vibrato 10, 2, 4 note_type 12, 12, 2 - -Music_CinnabarMansion_branch_7ed48:: +.introloop: rest 16 rest 16 - sound_loop 4, Music_CinnabarMansion_branch_7ed48 - -Music_CinnabarMansion_branch_7ed4e:: + sound_loop 4, .introloop +.mainloop: note_type 12, 12, 2 - -Music_CinnabarMansion_branch_7ed50:: - sound_call Music_CinnabarMansion_branch_7ed6c - sound_loop 3, Music_CinnabarMansion_branch_7ed50 +.loop1: + sound_call .sub1 + sound_loop 3, .loop1 octave 3 note E_, 4 note D#, 4 @@ -72,9 +68,9 @@ Music_CinnabarMansion_branch_7ed50:: note G#, 4 note G_, 4 note D#, 4 - sound_loop 0, Music_CinnabarMansion_branch_7ed4e + sound_loop 0, .mainloop -Music_CinnabarMansion_branch_7ed6c:: +.sub1: octave 3 note E_, 4 note D#, 4 @@ -94,11 +90,10 @@ Music_CinnabarMansion_branch_7ed6c:: note A#, 4 sound_ret - Music_CinnabarMansion_Ch3:: note_type 12, 1, 1 - -Music_CinnabarMansion_branch_7ed80:: +.mainloop: +.loop1: octave 2 note B_, 2 rest 2 @@ -134,14 +129,13 @@ Music_CinnabarMansion_branch_7ed80:: rest 2 note D#, 2 rest 2 - sound_loop 8, Music_CinnabarMansion_branch_7ed80 + sound_loop 8, .loop1 note E_, 16 note D#, 16 note G_, 16 note G#, 8 note D#, 8 - sound_loop 0, Music_CinnabarMansion_branch_7ed80 - + sound_loop 0, .mainloop Music_CinnabarMansion_Ch4:: drum_speed 6 @@ -149,8 +143,7 @@ Music_CinnabarMansion_Ch4:: rest 16 rest 16 rest 16 - -Music_CinnabarMansion_branch_7edb5:: +.mainloop: drum_note 12, 2 drum_note 12, 2 drum_note 13, 4 @@ -169,4 +162,4 @@ Music_CinnabarMansion_branch_7edb5:: rest 10 rest 8 drum_note 14, 8 - sound_loop 0, Music_CinnabarMansion_branch_7edb5 + sound_loop 0, .mainloop diff --git a/audio/music/cities1.asm b/audio/music/cities1.asm index 00ca3b5f..f2c654a7 100644 --- a/audio/music/cities1.asm +++ b/audio/music/cities1.asm @@ -1,16 +1,14 @@ -Music_Cities1_branch_aa6f:: +Music_Cities1_Ch1_AlternateTempo:: tempo 232 - sound_loop 0, Music_Cities1_branch_aa79 + sound_loop 0, Music_Cities1_Ch1.body Music_Cities1_Ch1:: tempo 144 - -Music_Cities1_branch_aa79:: +.body: volume 7, 7 vibrato 8, 2, 4 duty_cycle 3 - -Music_Cities1_branch_aa80:: +.mainloop: note_type 12, 12, 5 octave 3 note G#, 4 @@ -39,7 +37,7 @@ Music_Cities1_branch_aa80:: octave 2 note B_, 4 note_type 12, 12, 5 - sound_call Music_Cities1_branch_ab7d + sound_call .sub1 octave 3 note D#, 6 note E_, 2 @@ -90,7 +88,7 @@ Music_Cities1_branch_aa80:: note B_, 2 note B_, 4 note_type 12, 12, 5 - sound_call Music_Cities1_branch_ab7d + sound_call .sub1 octave 3 note D#, 4 note D#, 2 @@ -114,7 +112,7 @@ Music_Cities1_branch_aa80:: note C#, 2 note E_, 4 note_type 12, 11, 3 - sound_call Music_Cities1_branch_ab8a + sound_call .sub2 note A_, 2 note B_, 2 note A_, 2 @@ -142,8 +140,7 @@ Music_Cities1_branch_aa80:: octave 2 note B_, 2 octave 3 - -Music_Cities1_branch_ab12:: +.loop1: note C#, 2 note D#, 2 note C#, 2 @@ -153,7 +150,7 @@ Music_Cities1_branch_ab12:: octave 3 note C#, 2 note D#, 2 - sound_loop 2, Music_Cities1_branch_ab12 + sound_loop 2, .loop1 note E_, 2 octave 2 note B_, 4 @@ -180,7 +177,7 @@ Music_Cities1_branch_ab12:: octave 2 note B_, 2 octave 3 - sound_call Music_Cities1_branch_ab8a + sound_call .sub2 note A_, 2 note E_, 2 note A_, 2 @@ -240,9 +237,9 @@ Music_Cities1_branch_ab12:: octave 3 note E_, 2 note F#, 2 - sound_loop 0, Music_Cities1_branch_aa80 + sound_loop 0, .mainloop -Music_Cities1_branch_ab7d:: +.sub1: octave 3 note F#, 2 note D#, 4 @@ -257,7 +254,7 @@ Music_Cities1_branch_ab7d:: note C#, 2 sound_ret -Music_Cities1_branch_ab8a:: +.sub2: note A_, 2 note E_, 2 note C#, 2 @@ -267,10 +264,10 @@ Music_Cities1_branch_ab8a:: note E_, 2 sound_ret - Music_Cities1_Ch2:: +.mainloop: vibrato 5, 1, 5 - sound_call Music_Cities1_branch_ac00 + sound_call .sub1 octave 4 note G#, 2 note_type 12, 12, 4 @@ -283,7 +280,7 @@ Music_Cities1_Ch2:: note E_, 6 note F#, 6 note G#, 4 - sound_call Music_Cities1_branch_ac00 + sound_call .sub1 octave 4 note G#, 2 note_type 12, 12, 4 @@ -357,9 +354,9 @@ Music_Cities1_Ch2:: note G#, 1 note_type 12, 10, 4 note A_, 1 - sound_loop 0, Music_Cities1_Ch2 + sound_loop 0, .mainloop -Music_Cities1_branch_ac00:: +.sub1: duty_cycle 2 note_type 12, 12, 3 octave 4 @@ -400,17 +397,15 @@ Music_Cities1_branch_ac00:: note F#, 2 sound_ret - Music_Cities1_Ch3:: note_type 12, 1, 1 toggle_perfect_pitch - -Music_Cities1_branch_ac35:: +.mainloop: vibrato 0, 0, 0 octave 4 - sound_call Music_Cities1_branch_acc5 - sound_call Music_Cities1_branch_acc5 - sound_call Music_Cities1_branch_acce + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 note G#, 2 note E_, 2 note F#, 2 @@ -419,7 +414,7 @@ Music_Cities1_branch_ac35:: note E_, 2 note F#, 2 note G#, 2 - sound_call Music_Cities1_branch_acc5 + sound_call .sub1 note B_, 2 note E_, 2 note F#, 2 @@ -428,8 +423,8 @@ Music_Cities1_branch_ac35:: note E_, 2 note F#, 2 note G#, 2 - sound_call Music_Cities1_branch_acc5 - sound_call Music_Cities1_branch_acce + sound_call .sub1 + sound_call .sub2 note G#, 2 note E_, 2 note F#, 2 @@ -530,9 +525,9 @@ Music_Cities1_branch_ac35:: note A_, 2 note G#, 2 note F#, 2 - sound_loop 0, Music_Cities1_branch_ac35 + sound_loop 0, .mainloop -Music_Cities1_branch_acc5:: +.sub1: rest 2 note E_, 2 note F#, 2 @@ -543,7 +538,7 @@ Music_Cities1_branch_acc5:: note G#, 2 sound_ret -Music_Cities1_branch_acce:: +.sub2: note A_, 2 note F#, 2 note G#, 2 @@ -578,27 +573,26 @@ Music_Cities1_branch_acce:: note F#, 2 sound_ret - Music_Cities1_Ch4:: +.mainloop: drum_speed 12 - sound_call Music_Cities1_branch_ad36 - -Music_Cities1_branch_acf3:: - sound_call Music_Cities1_branch_ad36 - sound_call Music_Cities1_branch_ad45 - sound_call Music_Cities1_branch_ad45 - sound_loop 2, Music_Cities1_branch_acf3 - sound_call Music_Cities1_branch_ad36 - sound_call Music_Cities1_branch_ad5f - sound_call Music_Cities1_branch_ad52 + sound_call .sub1 +.loop1: + sound_call .sub1 + sound_call .sub2 + sound_call .sub2 + sound_loop 2, .loop1 + sound_call .sub1 + sound_call .sub4 + sound_call .sub3 drum_note 6, 6 drum_note 6, 6 drum_note 7, 4 - sound_call Music_Cities1_branch_ad6e - sound_call Music_Cities1_branch_ad5f - sound_call Music_Cities1_branch_ad52 - sound_call Music_Cities1_branch_ad6e - sound_call Music_Cities1_branch_ad52 + sound_call .sub5 + sound_call .sub4 + sound_call .sub3 + sound_call .sub5 + sound_call .sub3 drum_note 6, 6 drum_note 6, 6 drum_note 7, 2 @@ -609,9 +603,9 @@ Music_Cities1_branch_acf3:: drum_note 6, 6 drum_note 8, 6 drum_note 8, 4 - sound_loop 0, Music_Cities1_Ch4 + sound_loop 0, .mainloop -Music_Cities1_branch_ad36:: +.sub1: drum_note 8, 6 drum_note 8, 6 drum_note 8, 4 @@ -621,7 +615,7 @@ Music_Cities1_branch_ad36:: drum_note 8, 2 sound_ret -Music_Cities1_branch_ad45:: +.sub2: drum_note 8, 6 drum_note 8, 6 drum_note 8, 4 @@ -630,7 +624,7 @@ Music_Cities1_branch_ad45:: drum_note 8, 4 sound_ret -Music_Cities1_branch_ad52:: +.sub3: drum_note 6, 6 drum_note 6, 6 drum_note 7, 4 @@ -639,7 +633,7 @@ Music_Cities1_branch_ad52:: drum_note 7, 4 sound_ret -Music_Cities1_branch_ad5f:: +.sub4: drum_note 6, 6 drum_note 6, 6 drum_note 7, 4 @@ -649,7 +643,7 @@ Music_Cities1_branch_ad5f:: drum_note 6, 2 sound_ret -Music_Cities1_branch_ad6e:: +.sub5: drum_note 6, 6 drum_note 6, 6 drum_note 7, 2 diff --git a/audio/music/cities2.asm b/audio/music/cities2.asm index 6397f965..dad0cebd 100644 --- a/audio/music/cities2.asm +++ b/audio/music/cities2.asm @@ -14,8 +14,7 @@ Music_Cities2_Ch1:: octave 2 note B_, 2 rest 14 - -Music_Cities2_branch_b51a:: +.mainloop: octave 3 note B_, 4 octave 4 @@ -91,8 +90,7 @@ Music_Cities2_branch_b51a:: note F#, 4 note E_, 2 rest 14 - sound_loop 0, Music_Cities2_branch_b51a - + sound_loop 0, .mainloop Music_Cities2_Ch2:: duty_cycle 3 @@ -123,8 +121,7 @@ Music_Cities2_Ch2:: note F#, 1 note G#, 1 note A_, 1 - -Music_Cities2_branch_b58b:: +.mainloop: note_type 12, 10, 6 note G#, 6 note_type 12, 12, 2 @@ -277,8 +274,7 @@ Music_Cities2_branch_b58b:: note F#, 1 note G#, 1 note A_, 1 - sound_loop 0, Music_Cities2_branch_b58b - + sound_loop 0, .mainloop Music_Cities2_Ch3:: note_type 12, 1, 1 @@ -292,8 +288,7 @@ Music_Cities2_Ch3:: note G#, 2 note E_, 2 note G#, 2 - -Music_Cities2_branch_b64c:: +.mainloop: note F#, 2 note A_, 2 note F#, 2 @@ -413,4 +408,4 @@ Music_Cities2_branch_b64c:: note G#, 2 note E_, 2 note G#, 2 - sound_loop 0, Music_Cities2_branch_b64c + sound_loop 0, .mainloop diff --git a/audio/music/credits.asm b/audio/music/credits.asm index b8a6d7dd..7fa036f9 100644 --- a/audio/music/credits.asm +++ b/audio/music/credits.asm @@ -283,7 +283,6 @@ Music_Credits_Ch1:: note A_, 8 sound_ret - Music_Credits_Ch2:: duty_cycle 3 vibrato 10, 2, 5 @@ -573,7 +572,6 @@ Music_Credits_Ch2:: note A_, 8 sound_ret - Music_Credits_Ch3:: note_type 12, 1, 0 octave 5 @@ -597,9 +595,9 @@ Music_Credits_Ch3:: note A_, 1 rest 15 rest 16 - sound_call Music_Credits_branch_7ffa4 - sound_call Music_Credits_branch_7ffae - sound_call Music_Credits_branch_7ffa4 + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 octave 4 note E_, 2 note A_, 2 @@ -609,13 +607,13 @@ Music_Credits_Ch3:: note F#, 2 note G_, 2 note A_, 2 - sound_call Music_Credits_branch_7ffa4 - sound_call Music_Credits_branch_7ffae - sound_call Music_Credits_branch_7ffa4 - sound_call Music_Credits_branch_7ffa4 - sound_call Music_Credits_branch_7ffb8 - sound_call Music_Credits_branch_7ffb8 - sound_call Music_Credits_branch_7ffc1 + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 + sound_call .sub1 + sound_call .sub3 + sound_call .sub3 + sound_call .sub4 octave 4 note A_, 2 octave 5 @@ -631,34 +629,34 @@ Music_Credits_Ch3:: octave 4 note B_, 2 note A_, 2 - sound_call Music_Credits_branch_7ffb8 - sound_call Music_Credits_branch_7ffb8 - sound_call Music_Credits_branch_7ffc1 - sound_call Music_Credits_branch_7ffc1 + sound_call .sub3 + sound_call .sub3 + sound_call .sub4 + sound_call .sub4 octave 4 note G_, 4 note A_, 4 note B_, 4 octave 5 note D_, 4 - sound_call Music_Credits_branch_7ffa4 - sound_call Music_Credits_branch_7ffa4 - sound_call Music_Credits_branch_7ffa4 - sound_call Music_Credits_branch_7ffa4 - sound_call Music_Credits_branch_7ffa4 - sound_call Music_Credits_branch_7ffa4 - sound_call Music_Credits_branch_7ffae - sound_call Music_Credits_branch_7ffae - sound_call Music_Credits_branch_7ffa4 + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 + sound_call .sub2 + sound_call .sub1 note E_, 4 note A_, 2 note E_, 4 note A_, 2 note E_, 2 note A_, 2 - sound_call Music_Credits_branch_7ffae - sound_call Music_Credits_branch_7ffae - sound_call Music_Credits_branch_7ffa4 + sound_call .sub2 + sound_call .sub2 + sound_call .sub1 note E_, 2 note A_, 2 note E_, 2 @@ -667,10 +665,10 @@ Music_Credits_Ch3:: note A_, 2 note G#, 2 note A_, 2 - sound_call Music_Credits_branch_7ffd2 - sound_call Music_Credits_branch_7ffd2 - sound_call Music_Credits_branch_7ffdb - sound_call Music_Credits_branch_7ffdb + sound_call .sub5 + sound_call .sub5 + sound_call .sub6 + sound_call .sub6 note F_, 2 note A_, 2 note F_, 2 @@ -687,8 +685,8 @@ Music_Credits_Ch3:: note D_, 2 note E_, 2 note F_, 2 - sound_call Music_Credits_branch_7ffb8 - sound_call Music_Credits_branch_7ffb8 + sound_call .sub3 + sound_call .sub3 note E_, 4 note A_, 4 note E_, 4 @@ -697,16 +695,16 @@ Music_Credits_Ch3:: note A_, 4 note E_, 4 note A_, 4 - sound_call Music_Credits_branch_7ffa4 - sound_call Music_Credits_branch_7ffa4 - sound_call Music_Credits_branch_7ffe4 - sound_call Music_Credits_branch_7ffe4 - sound_call Music_Credits_branch_7ffa4 - sound_call Music_Credits_branch_7ffa4 - sound_call Music_Credits_branch_7ffb8 - sound_call Music_Credits_branch_7ffb8 - sound_call Music_Credits_branch_7ffed - sound_call Music_Credits_branch_7ffed + sound_call .sub1 + sound_call .sub1 + sound_call .sub7 + sound_call .sub7 + sound_call .sub1 + sound_call .sub1 + sound_call .sub3 + sound_call .sub3 + sound_call .sub8 + sound_call .sub8 note A_, 1 rest 1 note A_, 1 @@ -717,7 +715,7 @@ Music_Credits_Ch3:: rest 7 sound_ret -Music_Credits_branch_7ffa4:: +.sub1: octave 4 note E_, 2 note A_, 2 @@ -729,7 +727,7 @@ Music_Credits_branch_7ffa4:: note A_, 2 sound_ret -Music_Credits_branch_7ffae:: +.sub2: octave 4 note D_, 2 note G_, 2 @@ -741,7 +739,7 @@ Music_Credits_branch_7ffae:: note G_, 2 sound_ret -Music_Credits_branch_7ffb8:: +.sub3: note G_, 2 note B_, 2 note G_, 2 @@ -752,7 +750,7 @@ Music_Credits_branch_7ffb8:: note B_, 2 sound_ret -Music_Credits_branch_7ffc1:: +.sub4: octave 4 note A_, 2 octave 5 @@ -771,7 +769,7 @@ Music_Credits_branch_7ffc1:: note C#, 2 sound_ret -Music_Credits_branch_7ffd2:: +.sub5: note D_, 2 note A_, 2 note D_, 2 @@ -782,7 +780,7 @@ Music_Credits_branch_7ffd2:: note A_, 2 sound_ret -Music_Credits_branch_7ffdb:: +.sub6: note E_, 2 note G#, 2 note E_, 2 @@ -793,7 +791,7 @@ Music_Credits_branch_7ffdb:: note G#, 2 sound_ret -Music_Credits_branch_7ffe4:: +.sub7: note E_, 2 note B_, 2 note E_, 2 @@ -804,7 +802,7 @@ Music_Credits_branch_7ffe4:: note B_, 2 sound_ret -Music_Credits_branch_7ffed:: +.sub8: note A_, 1 rest 1 note A_, 1 diff --git a/audio/music/defeatedgymleader.asm b/audio/music/defeatedgymleader.asm index 159bf42b..6a71afcc 100644 --- a/audio/music/defeatedgymleader.asm +++ b/audio/music/defeatedgymleader.asm @@ -19,8 +19,7 @@ Music_DefeatedGymLeader_Ch1:: note A_, 8 note_type 12, 10, 7 note A_, 8 - -Music_DefeatedGymLeader_branch_23ccc:: +.mainloop: note_type 12, 11, 2 octave 3 note A_, 2 @@ -159,8 +158,7 @@ Music_DefeatedGymLeader_branch_23ccc:: note_type 12, 10, 7 note G_, 8 note E_, 8 - sound_loop 0, Music_DefeatedGymLeader_branch_23ccc - + sound_loop 0, .mainloop Music_DefeatedGymLeader_Ch2:: duty_cycle 2 @@ -180,8 +178,7 @@ Music_DefeatedGymLeader_Ch2:: note F#, 8 note_type 12, 11, 7 note F#, 8 - -Music_DefeatedGymLeader_branch_23d84:: +.mainloop: note_type 12, 12, 2 octave 4 note D_, 2 @@ -349,8 +346,7 @@ Music_DefeatedGymLeader_branch_23d84:: note B_, 1 octave 4 note C#, 1 - sound_loop 0, Music_DefeatedGymLeader_branch_23d84 - + sound_loop 0, .mainloop Music_DefeatedGymLeader_Ch3:: note_type 12, 1, 0 @@ -369,8 +365,7 @@ Music_DefeatedGymLeader_Ch3:: octave 5 note D_, 1 note F#, 8 - -Music_DefeatedGymLeader_branch_23e65:: +.mainloop: octave 4 note F#, 1 rest 1 @@ -604,4 +599,4 @@ Music_DefeatedGymLeader_branch_23e65:: note A_, 2 note G_, 2 note E_, 2 - sound_loop 0, Music_DefeatedGymLeader_branch_23e65 + sound_loop 0, .mainloop diff --git a/audio/music/defeatedtrainer.asm b/audio/music/defeatedtrainer.asm index 158d755c..a035df11 100644 --- a/audio/music/defeatedtrainer.asm +++ b/audio/music/defeatedtrainer.asm @@ -20,8 +20,7 @@ Music_DefeatedTrainer_Ch1:: note F#, 12 duty_cycle 1 tempo 224 - -Music_DefeatedTrainer_branch_23a76:: +.mainloop: note_type 4, 6, 3 octave 3 note A_, 6 @@ -92,8 +91,7 @@ Music_DefeatedTrainer_branch_23a76:: note G_, 3 note A_, 3 note B_, 3 - sound_loop 0, Music_DefeatedTrainer_branch_23a76 - + sound_loop 0, .mainloop Music_DefeatedTrainer_Ch2:: duty_cycle 2 @@ -109,8 +107,7 @@ Music_DefeatedTrainer_Ch2:: note C#, 2 note_type 4, 12, 4 note D_, 12 - -Music_DefeatedTrainer_branch_23ad2:: +.mainloop: note_type 4, 8, 5 octave 4 note D_, 6 @@ -169,8 +166,7 @@ Music_DefeatedTrainer_branch_23ad2:: note E_, 12 note_type 4, 6, 7 note E_, 12 - sound_loop 0, Music_DefeatedTrainer_branch_23ad2 - + sound_loop 0, .mainloop Music_DefeatedTrainer_Ch3:: note_type 4, 1, 0 @@ -185,8 +181,7 @@ Music_DefeatedTrainer_Ch3:: note G_, 2 note A_, 12 note_type 4, 2, 1 - -Music_DefeatedTrainer_branch_23b24:: +.mainloop: note F#, 3 rest 3 note F#, 3 @@ -263,4 +258,4 @@ Music_DefeatedTrainer_branch_23b24:: note C#, 3 octave 4 note A_, 3 - sound_loop 0, Music_DefeatedTrainer_branch_23b24 + sound_loop 0, .mainloop diff --git a/audio/music/defeatedwildmon.asm b/audio/music/defeatedwildmon.asm index 364f548e..83b1c909 100644 --- a/audio/music/defeatedwildmon.asm +++ b/audio/music/defeatedwildmon.asm @@ -13,8 +13,7 @@ Music_DefeatedWildMon_Ch1:: note G#, 1 note F#, 1 note E_, 12 - -Music_DefeatedWildMon_branch_23b8b:: +.mainloop: note_type 12, 6, 2 note E_, 2 note F#, 2 @@ -64,8 +63,7 @@ Music_DefeatedWildMon_branch_23b8b:: note A#, 2 note A#, 4 note A_, 8 - sound_loop 0, Music_DefeatedWildMon_branch_23b8b - + sound_loop 0, .mainloop Music_DefeatedWildMon_Ch2:: execute_music @@ -78,8 +76,7 @@ Music_DefeatedWildMon_Ch2:: note A_, 1 note_type 12, 12, 7 note B_, 12 - -Music_DefeatedWildMon_branch_23bce:: +.mainloop: note_type 12, 8, 2 octave 3 note B_, 2 @@ -139,8 +136,7 @@ Music_DefeatedWildMon_branch_23bce:: note D_, 2 note D_, 4 note C_, 8 - sound_loop 0, Music_DefeatedWildMon_branch_23bce - + sound_loop 0, .mainloop Music_DefeatedWildMon_Ch3:: execute_music @@ -161,8 +157,7 @@ Music_DefeatedWildMon_Ch3:: rest 3 note E_, 1 rest 3 - -Music_DefeatedWildMon_branch_23c21:: +.mainloop: octave 4 note E_, 1 rest 1 @@ -299,4 +294,4 @@ Music_DefeatedWildMon_branch_23c21:: rest 3 octave 4 note D#, 4 - sound_loop 0, Music_DefeatedWildMon_branch_23c21 + sound_loop 0, .mainloop diff --git a/audio/music/dungeon1.asm b/audio/music/dungeon1.asm index 445576bb..24dc346f 100644 --- a/audio/music/dungeon1.asm +++ b/audio/music/dungeon1.asm @@ -8,14 +8,12 @@ Music_Dungeon1_Ch1:: rest 8 octave 4 note F#, 8 - -Music_Dungeon1_branch_7dee5:: +.mainloop: note_type 12, 11, 2 octave 3 - -Music_Dungeon1_branch_7dee8:: - sound_call Music_Dungeon1_branch_7dfaa - sound_loop 3, Music_Dungeon1_branch_7dee8 +.loop1: + sound_call .sub1 + sound_loop 3, .loop1 note E_, 1 note D#, 1 note B_, 1 @@ -32,23 +30,22 @@ Music_Dungeon1_branch_7dee8:: note G#, 1 note A_, 1 note A#, 1 - -Music_Dungeon1_branch_7deff:: - sound_call Music_Dungeon1_branch_7dfaa - sound_loop 4, Music_Dungeon1_branch_7deff - sound_call Music_Dungeon1_branch_7dfd5 +.loop2: + sound_call .sub1 + sound_loop 4, .loop2 + sound_call .sub4 octave 3 note G_, 1 note F#, 1 note E_, 1 note G_, 1 - sound_call Music_Dungeon1_branch_7dfd5 + sound_call .sub4 octave 3 note A_, 1 note G_, 1 note E_, 1 note A_, 1 - sound_call Music_Dungeon1_branch_7dfd5 + sound_call .sub4 octave 3 note B_, 1 note A_, 1 @@ -60,12 +57,12 @@ Music_Dungeon1_branch_7deff:: note E_, 4 note D#, 4 note_type 12, 12, 2 - sound_call Music_Dungeon1_branch_7dfc5 + sound_call .sub3 octave 3 note B_, 3 - sound_call Music_Dungeon1_branch_7dfc5 + sound_call .sub3 note C_, 3 - sound_call Music_Dungeon1_branch_7dfc5 + sound_call .sub3 note C#, 3 note_type 12, 12, 3 octave 3 @@ -124,12 +121,11 @@ Music_Dungeon1_branch_7deff:: note A#, 1 octave 3 note C#, 1 - -Music_Dungeon1_branch_7df6e:: +.loop3: rest 16 - sound_loop 8, Music_Dungeon1_branch_7df6e + sound_loop 8, .loop3 note_type 12, 12, 3 - sound_call Music_Dungeon1_branch_7dfbb + sound_call .sub2 note B_, 2 note G_, 2 octave 3 @@ -138,7 +134,7 @@ Music_Dungeon1_branch_7df6e:: note G_, 2 note A_, 4 note F#, 2 - sound_call Music_Dungeon1_branch_7dfbb + sound_call .sub2 note A#, 2 note G_, 2 note B_, 4 @@ -147,23 +143,23 @@ Music_Dungeon1_branch_7df6e:: note G_, 2 note D#, 2 note_type 12, 12, 2 - sound_call Music_Dungeon1_branch_7dfc5 + sound_call .sub3 octave 3 note B_, 3 - sound_call Music_Dungeon1_branch_7dfc5 + sound_call .sub3 note C_, 3 - sound_call Music_Dungeon1_branch_7dfc5 + sound_call .sub3 note C#, 3 note_type 12, 12, 7 octave 3 note F#, 8 note D#, 8 note_type 12, 12, 2 - sound_call Music_Dungeon1_branch_7dfaa - sound_call Music_Dungeon1_branch_7dfaa - sound_loop 0, Music_Dungeon1_branch_7dee5 + sound_call .sub1 + sound_call .sub1 + sound_loop 0, .mainloop -Music_Dungeon1_branch_7dfaa:: +.sub1: note E_, 1 note D#, 1 note B_, 1 @@ -182,7 +178,7 @@ Music_Dungeon1_branch_7dfaa:: note A#, 1 sound_ret -Music_Dungeon1_branch_7dfbb:: +.sub2: octave 2 note G_, 2 note A#, 4 @@ -194,7 +190,7 @@ Music_Dungeon1_branch_7dfbb:: note A#, 2 sound_ret -Music_Dungeon1_branch_7dfc5:: +.sub3: octave 3 note E_, 1 note E_, 1 @@ -212,7 +208,7 @@ Music_Dungeon1_branch_7dfc5:: note C_, 1 sound_ret -Music_Dungeon1_branch_7dfd5:: +.sub4: note E_, 1 note E_, 1 rest 4 @@ -223,7 +219,6 @@ Music_Dungeon1_branch_7dfd5:: rest 1 sound_ret - Music_Dungeon1_Ch2:: vibrato 11, 1, 5 duty_cycle 3 @@ -233,13 +228,11 @@ Music_Dungeon1_Ch2:: note_type 12, 4, -5 octave 5 note D_, 8 - -Music_Dungeon1_branch_7dfeb:: +.mainloop: note_type 12, 12, 2 - -Music_Dungeon1_branch_7dfed:: - sound_call Music_Dungeon1_branch_7e097 - sound_loop 3, Music_Dungeon1_branch_7dfed +.loop1: + sound_call .sub1 + sound_loop 3, .loop1 octave 2 note E_, 1 note E_, 1 @@ -258,18 +251,17 @@ Music_Dungeon1_branch_7dfed:: note F#, 1 note G_, 1 note D#, 1 - -Music_Dungeon1_branch_7e006:: - sound_call Music_Dungeon1_branch_7e097 - sound_loop 4, Music_Dungeon1_branch_7e006 +.loop2: + sound_call .sub1 + sound_loop 4, .loop2 rest 2 - sound_call Music_Dungeon1_branch_7e0ab + sound_call .sub2 octave 3 note C_, 4 - sound_call Music_Dungeon1_branch_7e0ab + sound_call .sub2 octave 3 note C#, 4 - sound_call Music_Dungeon1_branch_7e0ab + sound_call .sub2 octave 3 note D#, 4 note_type 12, 13, 3 @@ -280,13 +272,13 @@ Music_Dungeon1_branch_7e006:: octave 3 note B_, 4 note_type 12, 13, 2 - sound_call Music_Dungeon1_branch_7e0b5 + sound_call .sub3 octave 3 note F#, 4 - sound_call Music_Dungeon1_branch_7e0b5 + sound_call .sub3 octave 3 note G_, 4 - sound_call Music_Dungeon1_branch_7e0b5 + sound_call .sub3 octave 3 note A#, 4 note_type 12, 13, 3 @@ -308,24 +300,24 @@ Music_Dungeon1_branch_7e006:: note F#, 8 note G_, 8 note_type 12, 13, 2 - sound_call Music_Dungeon1_branch_7e0ba + sound_call .sub4 rest 10 note E_, 1 rest 1 - sound_call Music_Dungeon1_branch_7e0ba + sound_call .sub4 rest 12 - sound_call Music_Dungeon1_branch_7e0ba + sound_call .sub4 rest 12 - sound_call Music_Dungeon1_branch_7e0ba + sound_call .sub4 rest 14 note_type 12, 13, 3 - sound_call Music_Dungeon1_branch_7e0cd + sound_call .sub6 note D#, 4 - sound_call Music_Dungeon1_branch_7e0cd + sound_call .sub6 note D#, 2 rest 2 note_type 12, 13, 2 - sound_call Music_Dungeon1_branch_7e0c0 + sound_call .sub5 rest 2 octave 3 note F#, 4 @@ -345,7 +337,7 @@ Music_Dungeon1_branch_7e006:: rest 2 octave 3 note G_, 4 - sound_call Music_Dungeon1_branch_7e0c0 + sound_call .sub5 octave 3 note A#, 4 note_type 12, 13, 6 @@ -353,11 +345,11 @@ Music_Dungeon1_branch_7e006:: octave 4 note D#, 8 note_type 12, 13, 2 - sound_call Music_Dungeon1_branch_7e097 - sound_call Music_Dungeon1_branch_7e097 - sound_loop 0, Music_Dungeon1_branch_7dfeb + sound_call .sub1 + sound_call .sub1 + sound_loop 0, .mainloop -Music_Dungeon1_branch_7e097:: +.sub1: octave 2 note E_, 1 note E_, 1 @@ -379,7 +371,7 @@ Music_Dungeon1_branch_7e097:: note B_, 1 sound_ret -Music_Dungeon1_branch_7e0ab:: +.sub2: octave 2 note E_, 1 note E_, 1 @@ -391,14 +383,14 @@ Music_Dungeon1_branch_7e0ab:: rest 3 sound_ret -Music_Dungeon1_branch_7e0b5:: +.sub3: octave 2 note E_, 1 note E_, 1 rest 10 sound_ret -Music_Dungeon1_branch_7e0ba:: +.sub4: octave 1 note E_, 1 note G_, 1 @@ -406,7 +398,7 @@ Music_Dungeon1_branch_7e0ba:: note D#, 1 sound_ret -Music_Dungeon1_branch_7e0c0:: +.sub5: octave 2 note E_, 1 note E_, 1 @@ -421,7 +413,7 @@ Music_Dungeon1_branch_7e0c0:: note C_, 1 sound_ret -Music_Dungeon1_branch_7e0cd:: +.sub6: octave 3 note E_, 6 note G_, 6 @@ -438,7 +430,6 @@ Music_Dungeon1_branch_7e0cd:: note F#, 6 sound_ret - Music_Dungeon1_Ch3:: note_type 12, 1, 1 vibrato 8, 2, 6 @@ -446,10 +437,9 @@ Music_Dungeon1_Ch3:: octave 4 note D_, 1 note D#, 1 - -Music_Dungeon1_branch_7e0e5:: - sound_call Music_Dungeon1_branch_7e140 - sound_call Music_Dungeon1_branch_7e140 +.mainloop: + sound_call .sub1 + sound_call .sub1 octave 5 note E_, 2 rest 4 @@ -460,10 +450,10 @@ Music_Dungeon1_branch_7e0e5:: rest 1 octave 4 note F#, 4 - sound_call Music_Dungeon1_branch_7e154 + sound_call .sub2 octave 4 note G_, 4 - sound_call Music_Dungeon1_branch_7e154 + sound_call .sub2 octave 4 note A_, 4 note B_, 4 @@ -471,7 +461,7 @@ Music_Dungeon1_branch_7e0e5:: note G_, 4 note F#, 4 rest 6 - sound_call Music_Dungeon1_branch_7e177 + sound_call .sub5 note B_, 4 note A#, 4 note G_, 4 @@ -480,36 +470,36 @@ Music_Dungeon1_branch_7e0e5:: note F#, 4 note E_, 4 note D#, 4 - sound_call Music_Dungeon1_branch_7e15e + sound_call .sub3 rest 12 - sound_call Music_Dungeon1_branch_7e15e + sound_call .sub3 rest 12 - sound_call Music_Dungeon1_branch_7e15e + sound_call .sub3 rest 10 note E_, 1 rest 1 - sound_call Music_Dungeon1_branch_7e15e + sound_call .sub3 rest 12 - sound_call Music_Dungeon1_branch_7e15e + sound_call .sub3 rest 12 - sound_call Music_Dungeon1_branch_7e15e + sound_call .sub3 rest 10 note D_, 1 note D#, 1 - sound_call Music_Dungeon1_branch_7e164 - sound_call Music_Dungeon1_branch_7e164 + sound_call .sub4 + sound_call .sub4 note E_, 2 rest 4 - sound_call Music_Dungeon1_branch_7e177 + sound_call .sub5 note B_, 8 note F#, 6 note D_, 1 note D#, 1 rest 16 rest 16 - sound_loop 0, Music_Dungeon1_branch_7e0e5 + sound_loop 0, .mainloop -Music_Dungeon1_branch_7e140:: +.sub1: octave 5 note E_, 4 note B_, 4 @@ -531,7 +521,7 @@ Music_Dungeon1_branch_7e140:: note D#, 4 sound_ret -Music_Dungeon1_branch_7e154:: +.sub2: octave 6 note E_, 1 note E_, 1 @@ -543,7 +533,7 @@ Music_Dungeon1_branch_7e154:: rest 1 sound_ret -Music_Dungeon1_branch_7e15e:: +.sub3: octave 3 note E_, 1 note G_, 1 @@ -551,7 +541,7 @@ Music_Dungeon1_branch_7e15e:: note D#, 1 sound_ret -Music_Dungeon1_branch_7e164:: +.sub4: note E_, 4 note B_, 4 note A#, 4 @@ -572,7 +562,7 @@ Music_Dungeon1_branch_7e164:: note D#, 4 sound_ret -Music_Dungeon1_branch_7e177:: +.sub5: octave 4 note E_, 1 rest 3 @@ -593,79 +583,73 @@ Music_Dungeon1_branch_7e177:: note A#, 4 sound_ret - Music_Dungeon1_Ch4:: drum_speed 12 rest 14 drum_note 12, 1 drum_note 12, 1 - -Music_Dungeon1_branch_7e190:: - sound_call Music_Dungeon1_branch_7e1f1 - sound_loop 3, Music_Dungeon1_branch_7e190 +.mainloop: +.loop1: + sound_call .sub1 + sound_loop 3, .loop1 drum_note 13, 4 drum_note 12, 4 drum_note 13, 4 drum_note 12, 2 drum_note 12, 2 - -Music_Dungeon1_branch_7e1a1:: - sound_call Music_Dungeon1_branch_7e1f1 - sound_loop 3, Music_Dungeon1_branch_7e1a1 +.loop2: + sound_call .sub1 + sound_loop 3, .loop2 drum_note 13, 4 drum_note 12, 4 drum_note 13, 4 drum_note 13, 4 - -Music_Dungeon1_branch_7e1b0:: - sound_call Music_Dungeon1_branch_7e1fa - sound_loop 3, Music_Dungeon1_branch_7e1b0 - sound_call Music_Dungeon1_branch_7e202 - -Music_Dungeon1_branch_7e1ba:: - sound_call Music_Dungeon1_branch_7e1fa - sound_loop 3, Music_Dungeon1_branch_7e1ba - sound_call Music_Dungeon1_branch_7e202 +.loop3: + sound_call .sub2 + sound_loop 3, .loop3 + sound_call .sub3 +.loop4: + sound_call .sub2 + sound_loop 3, .loop4 + sound_call .sub3 drum_note 9, 4 drum_note 10, 4 drum_note 10, 4 rest 2 drum_note 9, 2 drum_note 13, 4 - -Music_Dungeon1_branch_7e1cf:: +.loop5: rest 16 - sound_loop 13, Music_Dungeon1_branch_7e1cf + sound_loop 13, .loop5 rest 12 - -Music_Dungeon1_branch_7e1d5:: - sound_call Music_Dungeon1_branch_7e1fa - sound_loop 3, Music_Dungeon1_branch_7e1d5 +.loop6: + sound_call .sub2 + sound_loop 3, .loop6 drum_note 12, 4 drum_note 12, 4 drum_note 12, 4 rest 2 drum_note 12, 1 drum_note 12, 1 - sound_call Music_Dungeon1_branch_7e1f1 - sound_call Music_Dungeon1_branch_7e1f1 - sound_loop 0, Music_Dungeon1_branch_7e190 + sound_call .sub1 + sound_call .sub1 + sound_loop 0, .mainloop -Music_Dungeon1_branch_7e1f1:: +.sub1: drum_note 13, 4 drum_note 12, 4 drum_note 13, 4 drum_note 12, 4 sound_ret -Music_Dungeon1_branch_7e1fa:: +.sub2: drum_note 12, 1 drum_note 12, 1 rest 10 drum_note 14, 4 sound_ret -Music_Dungeon1_branch_7e202:: +.sub3: drum_note 9, 4 drum_note 10, 4 drum_note 10, 4 diff --git a/audio/music/dungeon2.asm b/audio/music/dungeon2.asm index 2167bfd7..890f9cbe 100644 --- a/audio/music/dungeon2.asm +++ b/audio/music/dungeon2.asm @@ -4,8 +4,8 @@ Music_Dungeon2_Ch1:: duty_cycle 3 toggle_perfect_pitch vibrato 10, 1, 4 - -Music_Dungeon2_branch_7e892:: +.mainloop: +.loop1: note_type 12, 11, 2 octave 4 note E_, 4 @@ -51,7 +51,7 @@ Music_Dungeon2_branch_7e892:: note G_, 2 note A_, 4 note F#, 2 - sound_loop 2, Music_Dungeon2_branch_7e892 + sound_loop 2, .loop1 note_type 12, 1, -7 octave 3 note E_, 16 @@ -67,13 +67,12 @@ Music_Dungeon2_branch_7e892:: rest 16 rest 16 rest 16 - sound_loop 0, Music_Dungeon2_branch_7e892 - + sound_loop 0, .mainloop Music_Dungeon2_Ch2:: vibrato 11, 1, 5 - -Music_Dungeon2_branch_7e8db:: +.mainloop: +.loop1: duty_cycle 3 note_type 12, 12, 2 octave 3 @@ -110,7 +109,7 @@ Music_Dungeon2_branch_7e8db:: note G_, 4 note G_, 4 note F#, 4 - sound_loop 2, Music_Dungeon2_branch_7e8db + sound_loop 2, .loop1 octave 3 note E_, 2 note G_, 2 @@ -159,16 +158,15 @@ Music_Dungeon2_branch_7e8db:: note D_, 16 note C_, 16 note D_, 16 - sound_loop 0, Music_Dungeon2_branch_7e8db - + sound_loop 0, .mainloop Music_Dungeon2_Ch3:: note_type 12, 1, 3 vibrato 8, 2, 6 - -Music_Dungeon2_branch_7e940:: - sound_call Music_Dungeon2_branch_7e9d1 - sound_loop 16, Music_Dungeon2_branch_7e940 +.mainloop: +.loop1: + sound_call .sub2 + sound_loop 16, .loop1 note E_, 4 rest 4 rest 4 @@ -186,8 +184,7 @@ Music_Dungeon2_branch_7e940:: rest 4 rest 4 note A#, 4 - -Music_Dungeon2_branch_7e958:: +.loop2: octave 5 note E_, 2 rest 2 @@ -223,7 +220,7 @@ Music_Dungeon2_branch_7e958:: rest 2 note D#, 2 rest 2 - sound_loop 3, Music_Dungeon2_branch_7e958 + sound_loop 3, .loop2 octave 4 note E_, 4 note B_, 4 @@ -259,15 +256,17 @@ Music_Dungeon2_branch_7e958:: rest 16 rest 16 rest 16 - sound_call Music_Dungeon2_branch_7e9d1 - sound_call Music_Dungeon2_branch_7e9d1 - sound_call Music_Dungeon2_branch_7e9d1 - sound_call Music_Dungeon2_branch_7e9d1 - sound_call Music_Dungeon2_branch_7e9d1 - sound_call Music_Dungeon2_branch_7e9d1 - sound_call Music_Dungeon2_branch_7e9d1 - sound_call Music_Dungeon2_branch_7e9d1 - sound_loop 0, Music_Dungeon2_branch_7e940 + sound_call .sub2 + sound_call .sub2 + sound_call .sub2 + sound_call .sub2 + sound_call .sub2 + sound_call .sub2 + sound_call .sub2 + sound_call .sub2 + sound_loop 0, .mainloop + +.sub1: ; unreferenced octave 2 note G_, 2 note A#, 4 @@ -288,7 +287,7 @@ Music_Dungeon2_branch_7e958:: rest 2 sound_ret -Music_Dungeon2_branch_7e9d1:: +.sub2: octave 4 note E_, 2 rest 4 @@ -301,11 +300,9 @@ Music_Dungeon2_branch_7e9d1:: note F#, 4 sound_ret - Music_Dungeon2_Ch4:: drum_speed 12 - -Music_Dungeon2_branch_7e9dd:: +.mainloop: drum_note 12, 4 drum_note 13, 4 drum_note 12, 4 @@ -314,4 +311,4 @@ Music_Dungeon2_branch_7e9dd:: drum_note 13, 4 drum_note 11, 4 drum_note 9, 4 - sound_loop 0, Music_Dungeon2_branch_7e9dd + sound_loop 0, .mainloop diff --git a/audio/music/dungeon3.asm b/audio/music/dungeon3.asm index 81b2ead8..881bc82a 100644 --- a/audio/music/dungeon3.asm +++ b/audio/music/dungeon3.asm @@ -4,13 +4,11 @@ Music_Dungeon3_Ch1:: duty_cycle 3 toggle_perfect_pitch vibrato 8, 1, 4 - -Music_Dungeon3_branch_7e9fc:: +.mainloop: note_type 12, 12, 3 - -Music_Dungeon3_branch_7e9fe:: - sound_call Music_Dungeon3_branch_7eab2 - sound_loop 3, Music_Dungeon3_branch_7e9fe +.loop1: + sound_call .sub1 + sound_loop 3, .loop1 octave 2 note B_, 2 octave 3 @@ -23,14 +21,12 @@ Music_Dungeon3_branch_7e9fe:: note G_, 2 note D#, 2 note E_, 2 - -Music_Dungeon3_branch_7ea11:: - sound_call Music_Dungeon3_branch_7eac1 - sound_loop 4, Music_Dungeon3_branch_7ea11 - -Music_Dungeon3_branch_7ea18:: - sound_call Music_Dungeon3_branch_7eab2 - sound_loop 4, Music_Dungeon3_branch_7ea18 +.loop2: + sound_call .sub2 + sound_loop 4, .loop2 +.loop3: + sound_call .sub1 + sound_loop 4, .loop3 octave 4 note F_, 2 note F_, 2 @@ -44,7 +40,7 @@ Music_Dungeon3_branch_7ea18:: note D#, 2 note D_, 2 note D_, 2 - sound_call Music_Dungeon3_branch_7eafc + sound_call .sub7 octave 4 note D_, 2 note D_, 2 @@ -58,14 +54,12 @@ Music_Dungeon3_branch_7ea18:: note E_, 2 note F_, 2 note F_, 2 - -Music_Dungeon3_branch_7ea3c:: - sound_call Music_Dungeon3_branch_7eace - sound_loop 4, Music_Dungeon3_branch_7ea3c - -Music_Dungeon3_branch_7ea43:: - sound_call Music_Dungeon3_branch_7eadd - sound_loop 3, Music_Dungeon3_branch_7ea43 +.loop4: + sound_call .sub3 + sound_loop 4, .loop4 +.loop5: + sound_call .sub4 + sound_loop 3, .loop5 octave 3 note C#, 2 octave 2 @@ -130,8 +124,8 @@ Music_Dungeon3_branch_7ea43:: note E_, 2 octave 4 note C_, 2 - sound_call Music_Dungeon3_branch_7eaea - sound_call Music_Dungeon3_branch_7eaea + sound_call .sub5 + sound_call .sub5 octave 3 note G#, 2 note E_, 2 @@ -147,16 +141,16 @@ Music_Dungeon3_branch_7ea43:: note E_, 2 rest 16 rest 8 - sound_call Music_Dungeon3_branch_7eaf7 - sound_call Music_Dungeon3_branch_7eaf7 - sound_call Music_Dungeon3_branch_7eaf7 - sound_call Music_Dungeon3_branch_7eaf7 + sound_call .sub6 + sound_call .sub6 + sound_call .sub6 + sound_call .sub6 note D#, 2 rest 16 rest 16 - sound_loop 0, Music_Dungeon3_branch_7e9fc + sound_loop 0, .mainloop -Music_Dungeon3_branch_7eab2:: +.sub1: octave 2 note B_, 2 octave 3 @@ -173,7 +167,7 @@ Music_Dungeon3_branch_7eab2:: note D#, 2 sound_ret -Music_Dungeon3_branch_7eac1:: +.sub2: note E_, 2 note G#, 2 octave 4 @@ -188,7 +182,7 @@ Music_Dungeon3_branch_7eac1:: note G#, 2 sound_ret -Music_Dungeon3_branch_7eace:: +.sub3: octave 3 note D#, 2 octave 2 @@ -205,7 +199,7 @@ Music_Dungeon3_branch_7eace:: note B_, 2 sound_ret -Music_Dungeon3_branch_7eadd:: +.sub4: note A_, 2 note F_, 2 octave 3 @@ -220,7 +214,7 @@ Music_Dungeon3_branch_7eadd:: note F_, 2 sound_ret -Music_Dungeon3_branch_7eaea:: +.sub5: octave 3 note G#, 2 note E_, 2 @@ -235,14 +229,14 @@ Music_Dungeon3_branch_7eaea:: note C_, 2 sound_ret -Music_Dungeon3_branch_7eaf7:: +.sub6: note D#, 2 note G_, 2 note D#, 2 note C#, 6 sound_ret -Music_Dungeon3_branch_7eafc:: +.sub7: tempo 168 octave 1 note A#, 1 @@ -334,12 +328,10 @@ Music_Dungeon3_branch_7eafc:: tempo 160 sound_ret - Music_Dungeon3_Ch2:: vibrato 11, 1, 5 duty_cycle 3 - -Music_Dungeon3_branch_7eb6d:: +.mainloop: note_type 12, 13, 3 octave 4 note D#, 6 @@ -604,10 +596,10 @@ Music_Dungeon3_branch_7eb6d:: note B_, 2 octave 3 note D#, 2 - sound_loop 0, Music_Dungeon3_branch_7eb6d - + sound_loop 0, .mainloop Music_Dungeon3_Ch3:: +.mainloop: note_type 12, 1, 2 rest 16 rest 16 @@ -707,8 +699,7 @@ Music_Dungeon3_Ch3:: rest 16 rest 16 rest 10 - sound_loop 0, Music_Dungeon3_Ch3 - + sound_loop 0, .mainloop Music_Dungeon3_Ch4:: drum_speed 12 diff --git a/audio/music/finalbattle.asm b/audio/music/finalbattle.asm index 6dec6bbb..032c129e 100644 --- a/audio/music/finalbattle.asm +++ b/audio/music/finalbattle.asm @@ -103,8 +103,7 @@ Music_FinalBattle_Ch1:: note G#, 3 note_type 12, 11, 7 note D#, 4 - -Music_FinalBattle_branch_23429:: +.mainloop: note_type 12, 11, 7 octave 3 note E_, 4 @@ -331,8 +330,8 @@ Music_FinalBattle_branch_23429:: octave 4 note C#, 12 note_type 12, 4, 0 - sound_call Music_FinalBattle_branch_23710 - sound_call Music_FinalBattle_branch_23710 + sound_call Music_FinalBattle_Ch2.sub2 + sound_call Music_FinalBattle_Ch2.sub2 note_type 12, 11, 7 octave 3 note E_, 4 @@ -378,8 +377,7 @@ Music_FinalBattle_branch_23429:: note E_, 8 note_type 12, 11, 7 note E_, 8 - sound_loop 0, Music_FinalBattle_branch_23429 - + sound_loop 0, .mainloop Music_FinalBattle_Ch2:: duty_cycle 3 @@ -464,13 +462,13 @@ Music_FinalBattle_Ch2:: note E_, 3 note_type 12, 12, 2 note D#, 4 - sound_call Music_FinalBattle_branch_23704 - sound_call Music_FinalBattle_branch_23704 - sound_call Music_FinalBattle_branch_23704 - sound_call Music_FinalBattle_branch_23704 - sound_call Music_FinalBattle_branch_23704 - sound_call Music_FinalBattle_branch_23704 - sound_call Music_FinalBattle_branch_23704 + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 note_type 12, 12, 1 octave 4 note E_, 1 @@ -478,8 +476,7 @@ Music_FinalBattle_Ch2:: note_type 12, 4, -2 octave 3 note G#, 4 - -Music_FinalBattle_branch_235e6:: +.mainloop: note_type 12, 13, 7 octave 4 note E_, 8 @@ -671,9 +668,9 @@ Music_FinalBattle_branch_235e6:: note_type 12, 12, 7 note A_, 8 note_type 12, 12, 5 - sound_call Music_FinalBattle_branch_23710 + sound_call .sub2 note_type 12, 11, 1 - sound_call Music_FinalBattle_branch_23710 + sound_call .sub2 note_type 12, 13, 7 octave 4 note E_, 8 @@ -707,9 +704,9 @@ Music_FinalBattle_branch_235e6:: note E_, 8 note A#, 4 note B_, 12 - sound_loop 0, Music_FinalBattle_branch_235e6 + sound_loop 0, .mainloop -Music_FinalBattle_branch_23704:: +.sub1: octave 4 note E_, 1 note E_, 1 @@ -723,7 +720,7 @@ Music_FinalBattle_branch_23704:: note F_, 1 sound_ret -Music_FinalBattle_branch_23710:: +.sub2: octave 4 note D_, 2 note C#, 2 @@ -737,7 +734,6 @@ Music_FinalBattle_branch_23710:: note D_, 2 sound_ret - Music_FinalBattle_Ch3:: note_type 12, 1, 1 octave 4 @@ -835,8 +831,7 @@ Music_FinalBattle_Ch3:: note D#, 1 note E_, 1 note G_, 1 - -Music_FinalBattle_branch_2377d:: +.mainloop: octave 4 note E_, 1 octave 3 @@ -1081,8 +1076,8 @@ Music_FinalBattle_branch_2377d:: note C#, 2 note E_, 2 note C#, 2 - sound_call Music_FinalBattle_branch_2395b - sound_call Music_FinalBattle_branch_2395b + sound_call .sub1 + sound_call .sub1 octave 4 note G_, 2 octave 5 @@ -1116,8 +1111,8 @@ Music_FinalBattle_branch_2377d:: note F#, 1 note G_, 1 note G#, 1 - sound_call Music_FinalBattle_branch_2396c - sound_call Music_FinalBattle_branch_2396c + sound_call .sub2 + sound_call .sub2 octave 4 note A#, 2 octave 5 @@ -1303,9 +1298,9 @@ Music_FinalBattle_branch_2377d:: note E_, 2 note A_, 2 note B_, 4 - sound_loop 0, Music_FinalBattle_branch_2377d + sound_loop 0, .mainloop -Music_FinalBattle_branch_2395b:: +.sub1: octave 4 note F#, 2 octave 5 @@ -1324,7 +1319,7 @@ Music_FinalBattle_branch_2395b:: note C#, 2 sound_ret -Music_FinalBattle_branch_2396c:: +.sub2: octave 4 note A_, 2 octave 5 diff --git a/audio/music/gamecorner.asm b/audio/music/gamecorner.asm index f152d180..c0f8fc83 100644 --- a/audio/music/gamecorner.asm +++ b/audio/music/gamecorner.asm @@ -14,8 +14,7 @@ Music_GameCorner_Ch1:: note D#, 2 note C#, 2 note D#, 16 - -Music_GameCorner_branch_7e222:: +.mainloop: note_type 12, 11, 5 octave 3 note C#, 4 @@ -180,8 +179,7 @@ Music_GameCorner_branch_7e222:: note G#, 1 note G_, 1 note G#, 8 - sound_loop 0, Music_GameCorner_branch_7e222 - + sound_loop 0, .mainloop Music_GameCorner_Ch2:: duty_cycle 2 @@ -205,8 +203,7 @@ Music_GameCorner_Ch2:: note B_, 1 note A#, 1 note B_, 8 - -Music_GameCorner_branch_7e2fa:: +.mainloop: duty_cycle 2 note_type 12, 12, 7 octave 3 @@ -340,8 +337,7 @@ Music_GameCorner_branch_7e2fa:: note A_, 4 note F#, 4 note B_, 16 - sound_loop 0, Music_GameCorner_branch_7e2fa - + sound_loop 0, .mainloop Music_GameCorner_Ch3:: note_type 12, 1, 3 @@ -369,15 +365,14 @@ Music_GameCorner_Ch3:: rest 1 note D#, 1 rest 1 - -Music_GameCorner_branch_7e3a5:: - sound_call Music_GameCorner_branch_7e418 - sound_call Music_GameCorner_branch_7e42d - sound_call Music_GameCorner_branch_7e442 - sound_call Music_GameCorner_branch_7e457 - sound_call Music_GameCorner_branch_7e46c - sound_call Music_GameCorner_branch_7e481 - sound_call Music_GameCorner_branch_7e496 +.mainloop: + sound_call .sub1 + sound_call .sub2 + sound_call .sub3 + sound_call .sub4 + sound_call .sub5 + sound_call .sub6 + sound_call .sub7 note D#, 1 rest 1 note A_, 1 @@ -396,13 +391,13 @@ Music_GameCorner_branch_7e3a5:: rest 1 note F#, 1 rest 1 - sound_call Music_GameCorner_branch_7e418 - sound_call Music_GameCorner_branch_7e42d - sound_call Music_GameCorner_branch_7e442 - sound_call Music_GameCorner_branch_7e457 - sound_call Music_GameCorner_branch_7e46c - sound_call Music_GameCorner_branch_7e481 - sound_call Music_GameCorner_branch_7e496 + sound_call .sub1 + sound_call .sub2 + sound_call .sub3 + sound_call .sub4 + sound_call .sub5 + sound_call .sub6 + sound_call .sub7 note E_, 1 rest 3 octave 3 @@ -415,9 +410,9 @@ Music_GameCorner_branch_7e3a5:: rest 3 note B_, 1 rest 1 - sound_call Music_GameCorner_branch_7e46c - sound_call Music_GameCorner_branch_7e418 - sound_call Music_GameCorner_branch_7e4ab + sound_call .sub5 + sound_call .sub1 + sound_call .sub8 note E_, 1 rest 1 note G#, 1 @@ -436,13 +431,13 @@ Music_GameCorner_branch_7e3a5:: rest 1 note E_, 1 rest 1 - sound_call Music_GameCorner_branch_7e46c - sound_call Music_GameCorner_branch_7e418 - sound_call Music_GameCorner_branch_7e4ab - sound_call Music_GameCorner_branch_7e42d - sound_loop 0, Music_GameCorner_branch_7e3a5 + sound_call .sub5 + sound_call .sub1 + sound_call .sub8 + sound_call .sub2 + sound_loop 0, .mainloop -Music_GameCorner_branch_7e418:: +.sub1: note E_, 1 rest 1 note G#, 1 @@ -465,7 +460,7 @@ Music_GameCorner_branch_7e418:: rest 1 sound_ret -Music_GameCorner_branch_7e42d:: +.sub2: note E_, 1 rest 1 note G#, 1 @@ -488,7 +483,7 @@ Music_GameCorner_branch_7e42d:: rest 1 sound_ret -Music_GameCorner_branch_7e442:: +.sub3: note E_, 1 rest 1 note B_, 1 @@ -511,7 +506,7 @@ Music_GameCorner_branch_7e442:: rest 1 sound_ret -Music_GameCorner_branch_7e457:: +.sub4: note D#, 1 rest 1 note A_, 1 @@ -534,7 +529,7 @@ Music_GameCorner_branch_7e457:: rest 1 sound_ret -Music_GameCorner_branch_7e46c:: +.sub5: note D#, 1 rest 1 note F#, 1 @@ -557,7 +552,7 @@ Music_GameCorner_branch_7e46c:: rest 1 sound_ret -Music_GameCorner_branch_7e481:: +.sub6: note D#, 1 rest 1 note F#, 1 @@ -580,7 +575,7 @@ Music_GameCorner_branch_7e481:: rest 1 sound_ret -Music_GameCorner_branch_7e496:: +.sub7: note F#, 1 rest 1 note B_, 1 @@ -603,7 +598,7 @@ Music_GameCorner_branch_7e496:: rest 1 sound_ret -Music_GameCorner_branch_7e4ab:: +.sub8: note F#, 1 rest 1 note A_, 1 diff --git a/audio/music/gym.asm b/audio/music/gym.asm index 1ffc4930..da6a5bab 100644 --- a/audio/music/gym.asm +++ b/audio/music/gym.asm @@ -21,8 +21,7 @@ Music_Gym_Ch1:: note E_, 1 note F_, 4 note G_, 4 - -Music_Gym_branch_bcd8:: +.mainloop: note E_, 4 note F_, 2 note G_, 2 @@ -162,8 +161,7 @@ Music_Gym_branch_bcd8:: note A_, 2 note G_, 2 note A_, 2 - sound_loop 0, Music_Gym_branch_bcd8 - + sound_loop 0, .mainloop Music_Gym_Ch2:: duty_cycle 3 @@ -183,8 +181,7 @@ Music_Gym_Ch2:: note A_, 12 note_type 12, 12, 7 note B_, 4 - -Music_Gym_branch_bd82:: +.mainloop: octave 4 note C_, 12 octave 3 @@ -285,8 +282,7 @@ Music_Gym_branch_bd82:: note C_, 1 note D_, 1 note E_, 12 - sound_loop 0, Music_Gym_branch_bd82 - + sound_loop 0, .mainloop Music_Gym_Ch3:: note_type 12, 1, 1 @@ -296,23 +292,22 @@ Music_Gym_Ch3:: note G_, 2 note F_, 2 note D_, 2 - -Music_Gym_branch_be02:: - sound_call Music_Gym_branch_be3b - sound_call Music_Gym_branch_be44 - sound_call Music_Gym_branch_be3b - sound_call Music_Gym_branch_be44 - sound_call Music_Gym_branch_be3b - sound_call Music_Gym_branch_be44 - sound_call Music_Gym_branch_be3b - sound_call Music_Gym_branch_be44 - sound_call Music_Gym_branch_be3b - sound_call Music_Gym_branch_be4d - sound_call Music_Gym_branch_be3b - sound_call Music_Gym_branch_be4d - sound_call Music_Gym_branch_be3b - sound_call Music_Gym_branch_be4d - sound_call Music_Gym_branch_be3b +.mainloop: + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 + sound_call .sub3 + sound_call .sub1 + sound_call .sub3 + sound_call .sub1 + sound_call .sub3 + sound_call .sub1 note F_, 2 note A#, 2 note F_, 2 @@ -321,9 +316,9 @@ Music_Gym_branch_be02:: note A#, 2 note A_, 2 note F_, 2 - sound_loop 0, Music_Gym_branch_be02 + sound_loop 0, .mainloop -Music_Gym_branch_be3b:: +.sub1: note E_, 2 note G_, 2 note E_, 2 @@ -334,7 +329,7 @@ Music_Gym_branch_be3b:: note G_, 2 sound_ret -Music_Gym_branch_be44:: +.sub2: note D_, 2 note F_, 2 note D_, 2 @@ -345,7 +340,7 @@ Music_Gym_branch_be44:: note F_, 2 sound_ret -Music_Gym_branch_be4d:: +.sub3: note F_, 2 note A#, 2 note F_, 2 diff --git a/audio/music/gymleaderbattle.asm b/audio/music/gymleaderbattle.asm index 5befd665..1d7dae9a 100644 --- a/audio/music/gymleaderbattle.asm +++ b/audio/music/gymleaderbattle.asm @@ -56,8 +56,7 @@ Music_GymLeaderBattle_Ch1:: note F#, 1 rest 9 note A_, 6 - -Music_GymLeaderBattle_branch_223b0:: +.mainloop: note F#, 1 octave 3 note C#, 1 @@ -544,8 +543,7 @@ Music_GymLeaderBattle_branch_223b0:: note A_, 2 note G#, 4 note E_, 6 - sound_loop 0, Music_GymLeaderBattle_branch_223b0 - + sound_loop 0, .mainloop Music_GymLeaderBattle_Ch2:: duty_cycle 3 @@ -607,8 +605,7 @@ Music_GymLeaderBattle_Ch2:: rest 9 octave 4 note C#, 6 - -Music_GymLeaderBattle_branch_225e0:: +.mainloop: note_type 12, 12, 5 note D#, 4 note C#, 4 @@ -845,8 +842,7 @@ Music_GymLeaderBattle_branch_225e0:: note_type 12, 12, 3 octave 4 note A_, 6 - sound_loop 0, Music_GymLeaderBattle_branch_225e0 - + sound_loop 0, .mainloop Music_GymLeaderBattle_Ch3:: vibrato 0, 2, 0 @@ -1039,8 +1035,7 @@ Music_GymLeaderBattle_Ch3:: octave 4 note C#, 6 note_type 12, 1, 4 - -Music_GymLeaderBattle_branch_227b1:: +.mainloop: octave 3 note B_, 2 octave 4 @@ -1397,4 +1392,4 @@ Music_GymLeaderBattle_branch_227b1:: note B_, 2 octave 4 note G_, 6 - sound_loop 0, Music_GymLeaderBattle_branch_227b1 + sound_loop 0, .mainloop diff --git a/audio/music/halloffame.asm b/audio/music/halloffame.asm index 80dafaa6..f568b2e2 100644 --- a/audio/music/halloffame.asm +++ b/audio/music/halloffame.asm @@ -14,8 +14,8 @@ Music_HallOfFame_Ch1:: note E_, 1 note F_, 1 note F#, 1 - -Music_HallOfFame_branch_7fbc5:: +.mainloop: +.loop1: note_type 12, 8, 0 octave 4 note C_, 16 @@ -23,19 +23,17 @@ Music_HallOfFame_branch_7fbc5:: note F#, 16 note_type 12, 6, 0 note F_, 16 - sound_loop 3, Music_HallOfFame_branch_7fbc5 + sound_loop 3, .loop1 rest 16 rest 16 rest 16 rest 16 - sound_loop 0, Music_HallOfFame_branch_7fbc5 - + sound_loop 0, .mainloop Music_HallOfFame_Ch2:: vibrato 8, 2, 5 duty_cycle 3 - -Music_HallOfFame_branch_7fbdf:: +.mainloop: note_type 12, 12, 4 octave 3 note G_, 2 @@ -60,13 +58,12 @@ Music_HallOfFame_branch_7fbdf:: note A#, 4 note A_, 4 note F_, 2 - sound_loop 0, Music_HallOfFame_branch_7fbdf - + sound_loop 0, .mainloop Music_HallOfFame_Ch3:: +.mainloop: note_type 12, 1, 2 - -Music_HallOfFame_branch_7fbfe:: +.loop1: octave 4 note D_, 2 note G_, 2 @@ -76,7 +73,7 @@ Music_HallOfFame_branch_7fbfe:: note G_, 2 note D_, 2 note G_, 2 - sound_loop 12, Music_HallOfFame_branch_7fbfe + sound_loop 12, .loop1 note D_, 4 note G_, 4 note D_, 4 @@ -93,4 +90,4 @@ Music_HallOfFame_branch_7fbfe:: note G_, 4 note E_, 4 note G_, 4 - sound_loop 0, Music_HallOfFame_Ch3 + sound_loop 0, .mainloop diff --git a/audio/music/indigoplateau.asm b/audio/music/indigoplateau.asm index cc3c2cef..c93fd859 100644 --- a/audio/music/indigoplateau.asm +++ b/audio/music/indigoplateau.asm @@ -12,25 +12,24 @@ Music_IndigoPlateau_Ch1:: note A_, 4 note_type 12, 10, 4 note A#, 4 - -Music_IndigoPlateau_branch_a605:: - sound_call Music_IndigoPlateau_branch_a659 +.mainloop: + sound_call .sub1 note_type 12, 11, 4 octave 3 note D_, 4 - sound_call Music_IndigoPlateau_branch_a659 + sound_call .sub1 note_type 12, 11, 4 octave 3 note D#, 4 - sound_call Music_IndigoPlateau_branch_a659 + sound_call .sub1 note_type 12, 11, 4 octave 3 note D_, 4 - sound_call Music_IndigoPlateau_branch_a659 + sound_call .sub1 note_type 12, 10, 0 octave 2 note A#, 4 - sound_call Music_IndigoPlateau_branch_a659 + sound_call .sub1 note_type 12, 11, 4 octave 3 note D_, 4 @@ -71,9 +70,9 @@ Music_IndigoPlateau_branch_a605:: note_type 12, 4, -6 octave 2 note A#, 8 - sound_loop 0, Music_IndigoPlateau_branch_a605 + sound_loop 0, .mainloop -Music_IndigoPlateau_branch_a659:: +.sub1: note_type 12, 11, 2 octave 2 note A_, 4 @@ -85,7 +84,6 @@ Music_IndigoPlateau_branch_a659:: note A_, 4 sound_ret - Music_IndigoPlateau_Ch2:: duty_cycle 3 vibrato 8, 2, 5 @@ -97,27 +95,26 @@ Music_IndigoPlateau_Ch2:: note D_, 4 note_type 12, 5, -2 note D#, 4 - -Music_IndigoPlateau_branch_a673:: - sound_call Music_IndigoPlateau_branch_a6af +.mainloop: + sound_call .sub1 note_type 12, 12, 5 note A_, 4 - sound_call Music_IndigoPlateau_branch_a6af + sound_call .sub1 note_type 12, 12, 5 note A#, 4 - sound_call Music_IndigoPlateau_branch_a6af + sound_call .sub1 note_type 12, 12, 5 note A_, 4 - sound_call Music_IndigoPlateau_branch_a6af + sound_call .sub1 note_type 12, 12, 7 note C#, 4 - sound_call Music_IndigoPlateau_branch_a6af + sound_call .sub1 note_type 12, 12, 5 note A_, 4 - sound_call Music_IndigoPlateau_branch_a6af + sound_call .sub1 note_type 12, 12, 5 note A#, 4 - sound_call Music_IndigoPlateau_branch_a6af + sound_call .sub1 note_type 12, 12, 5 octave 4 note C_, 2 @@ -132,9 +129,9 @@ Music_IndigoPlateau_branch_a673:: note_type 12, 4, -5 octave 4 note D#, 8 - sound_loop 0, Music_IndigoPlateau_branch_a673 + sound_loop 0, .mainloop -Music_IndigoPlateau_branch_a6af:: +.sub1: note_type 12, 12, 2 octave 3 note D_, 4 @@ -146,7 +143,6 @@ Music_IndigoPlateau_branch_a6af:: note D_, 4 sound_ret - Music_IndigoPlateau_Ch3:: note_type 12, 1, 0 octave 4 @@ -159,11 +155,10 @@ Music_IndigoPlateau_Ch3:: note D_, 2 rest 2 note D#, 4 - -Music_IndigoPlateau_branch_a6c6:: - sound_call Music_IndigoPlateau_branch_a6fe - sound_call Music_IndigoPlateau_branch_a6fe - sound_call Music_IndigoPlateau_branch_a6fe +.mainloop: + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 note D_, 2 rest 2 note D_, 2 @@ -179,8 +174,8 @@ Music_IndigoPlateau_branch_a6c6:: note D_, 2 rest 2 note F#, 4 - sound_call Music_IndigoPlateau_branch_a6fe - sound_call Music_IndigoPlateau_branch_a6fe + sound_call .sub1 + sound_call .sub1 note D_, 2 rest 2 note D_, 2 @@ -203,9 +198,9 @@ Music_IndigoPlateau_branch_a6c6:: note D_, 8 note A#, 8 note D#, 8 - sound_loop 0, Music_IndigoPlateau_branch_a6c6 + sound_loop 0, .mainloop -Music_IndigoPlateau_branch_a6fe:: +.sub1: octave 4 note D_, 2 rest 2 @@ -224,7 +219,6 @@ Music_IndigoPlateau_branch_a6fe:: note A_, 4 sound_ret - Music_IndigoPlateau_Ch4:: drum_speed 6 drum_note 17, 16 @@ -239,22 +233,21 @@ Music_IndigoPlateau_Ch4:: drum_note 18, 1 drum_note 18, 1 drum_note 18, 1 - -Music_IndigoPlateau_branch_a728:: - sound_call Music_IndigoPlateau_branch_a791 - sound_call Music_IndigoPlateau_branch_a77e - sound_call Music_IndigoPlateau_branch_a791 - sound_call Music_IndigoPlateau_branch_a7a8 - sound_call Music_IndigoPlateau_branch_a791 - sound_call Music_IndigoPlateau_branch_a77e - sound_call Music_IndigoPlateau_branch_a791 - sound_call Music_IndigoPlateau_branch_a7a8 - sound_call Music_IndigoPlateau_branch_a791 - sound_call Music_IndigoPlateau_branch_a77e - sound_call Music_IndigoPlateau_branch_a791 - sound_call Music_IndigoPlateau_branch_a7a8 - sound_call Music_IndigoPlateau_branch_a77e - sound_call Music_IndigoPlateau_branch_a7a8 +.mainloop: + sound_call .sub2 + sound_call .sub1 + sound_call .sub2 + sound_call .sub3 + sound_call .sub2 + sound_call .sub1 + sound_call .sub2 + sound_call .sub3 + sound_call .sub2 + sound_call .sub1 + sound_call .sub2 + sound_call .sub3 + sound_call .sub1 + sound_call .sub3 drum_note 17, 16 drum_note 17, 8 drum_note 18, 8 @@ -275,9 +268,9 @@ Music_IndigoPlateau_branch_a728:: drum_note 17, 1 drum_note 17, 1 drum_note 17, 1 - sound_loop 0, Music_IndigoPlateau_branch_a728 + sound_loop 0, .mainloop -Music_IndigoPlateau_branch_a77e:: +.sub1: drum_note 17, 4 drum_note 18, 4 drum_note 19, 4 @@ -289,7 +282,7 @@ Music_IndigoPlateau_branch_a77e:: drum_note 18, 2 sound_ret -Music_IndigoPlateau_branch_a791:: +.sub2: drum_note 17, 4 drum_note 18, 4 drum_note 19, 4 @@ -303,7 +296,7 @@ Music_IndigoPlateau_branch_a791:: drum_note 18, 1 sound_ret -Music_IndigoPlateau_branch_a7a8:: +.sub3: drum_note 17, 4 drum_note 18, 4 drum_note 17, 4 diff --git a/audio/music/introbattle.asm b/audio/music/introbattle.asm index 681631f6..0bd844eb 100644 --- a/audio/music/introbattle.asm +++ b/audio/music/introbattle.asm @@ -89,7 +89,6 @@ Music_IntroBattle_Ch1:: note D_, 16 sound_ret - Music_IntroBattle_Ch2:: duty_cycle 3 vibrato 8, 2, 5 @@ -164,7 +163,6 @@ Music_IntroBattle_Ch2:: note D_, 16 sound_ret - Music_IntroBattle_Ch3:: note_type 12, 1, 0 rest 8 @@ -228,7 +226,6 @@ Music_IntroBattle_Ch3:: rest 15 sound_ret - Music_IntroBattle_Ch4:: drum_speed 6 drum_note 19, 1 diff --git a/audio/music/jigglypuffsong.asm b/audio/music/jigglypuffsong.asm index d8995fbd..bd6a9771 100644 --- a/audio/music/jigglypuffsong.asm +++ b/audio/music/jigglypuffsong.asm @@ -20,7 +20,6 @@ Music_JigglypuffSong_Ch1:: note E_, 10 sound_ret - Music_JigglypuffSong_Ch2:: vibrato 5, 1, 5 duty_cycle 2 diff --git a/audio/music/lavender.asm b/audio/music/lavender.asm index 70fff2e5..5822ff3e 100644 --- a/audio/music/lavender.asm +++ b/audio/music/lavender.asm @@ -10,8 +10,7 @@ Music_Lavender_Ch1:: rest 16 rest 16 note_type 12, 10, 7 - -Music_Lavender_branch_bb6b:: +.mainloop: octave 3 note G_, 8 note G_, 8 @@ -59,22 +58,19 @@ Music_Lavender_branch_bb6b:: rest 16 rest 16 rest 16 - sound_loop 0, Music_Lavender_branch_bb6b - + sound_loop 0, .mainloop Music_Lavender_Ch2:: vibrato 0, 3, 4 duty_cycle 3 note_type 12, 9, 1 - -Music_Lavender_branch_bba5:: +.mainloop: octave 5 note C_, 4 note G_, 4 note B_, 4 note F#, 4 - sound_loop 0, Music_Lavender_branch_bba5 - + sound_loop 0, .mainloop Music_Lavender_Ch3:: vibrato 4, 1, 1 @@ -84,8 +80,7 @@ Music_Lavender_Ch3:: rest 16 rest 16 note_type 12, 2, 5 - -Music_Lavender_branch_bbb9:: +.mainloop: octave 4 note E_, 16 note D_, 16 @@ -183,8 +178,7 @@ Music_Lavender_branch_bbb9:: note G_, 4 note F#, 4 note B_, 4 - sound_loop 0, Music_Lavender_branch_bbb9 - + sound_loop 0, .mainloop Music_Lavender_Ch4:: drum_speed 12 @@ -192,8 +186,7 @@ Music_Lavender_Ch4:: rest 16 rest 16 rest 16 - -Music_Lavender_branch_bc26:: +.mainloop: drum_note 7, 8 drum_note 7, 8 - sound_loop 0, Music_Lavender_branch_bc26 + sound_loop 0, .mainloop diff --git a/audio/music/meeteviltrainer.asm b/audio/music/meeteviltrainer.asm index eb7b5944..3e465720 100644 --- a/audio/music/meeteviltrainer.asm +++ b/audio/music/meeteviltrainer.asm @@ -10,16 +10,14 @@ Music_MeetEvilTrainer_Ch1:: note C#, 2 note_type 12, 4, -7 note D_, 4 - -Music_MeetEvilTrainer_branch_7f6ae:: +.mainloop: note_type 12, 10, 1 note D_, 4 note D_, 4 note D_, 4 note_type 12, 7, 0 note D_, 4 - sound_loop 0, Music_MeetEvilTrainer_branch_7f6ae - + sound_loop 0, .mainloop Music_MeetEvilTrainer_Ch2:: duty_cycle 1 @@ -28,8 +26,7 @@ Music_MeetEvilTrainer_Ch2:: note B_, 2 note A#, 2 note B_, 8 - -Music_MeetEvilTrainer_branch_7f6c2:: +.mainloop: note_type 12, 12, 2 octave 4 note D#, 2 @@ -57,8 +54,7 @@ Music_MeetEvilTrainer_branch_7f6c2:: note_type 12, 3, -7 note A#, 4 note_type 12, 12, 2 - sound_loop 0, Music_MeetEvilTrainer_branch_7f6c2 - + sound_loop 0, .mainloop Music_MeetEvilTrainer_Ch3:: note_type 12, 1, 0 @@ -68,8 +64,7 @@ Music_MeetEvilTrainer_Ch3:: rest 1 note F_, 1 rest 1 - -Music_MeetEvilTrainer_branch_7f6ee:: +.mainloop: note F#, 1 rest 3 note F#, 1 @@ -77,4 +72,4 @@ Music_MeetEvilTrainer_branch_7f6ee:: note F#, 1 rest 3 note A#, 4 - sound_loop 0, Music_MeetEvilTrainer_branch_7f6ee + sound_loop 0, .mainloop diff --git a/audio/music/meetfemaletrainer.asm b/audio/music/meetfemaletrainer.asm index c76483e5..876c3441 100644 --- a/audio/music/meetfemaletrainer.asm +++ b/audio/music/meetfemaletrainer.asm @@ -12,19 +12,18 @@ Music_MeetFemaleTrainer_Ch1:: note C#, 2 note C_, 2 note_type 12, 8, 1 - -Music_MeetFemaleTrainer_branch_7f70c:: +.mainloop: +.loop1: octave 3 note E_, 4 - sound_loop 12, Music_MeetFemaleTrainer_branch_7f70c + sound_loop 12, .loop1 note E_, 4 octave 2 note B_, 4 note B_, 4 octave 3 note E_, 4 - sound_loop 0, Music_MeetFemaleTrainer_branch_7f70c - + sound_loop 0, .mainloop Music_MeetFemaleTrainer_Ch2:: duty_cycle 2 @@ -34,8 +33,7 @@ Music_MeetFemaleTrainer_Ch2:: note_type 12, 12, 7 octave 4 note B_, 12 - -Music_MeetFemaleTrainer_branch_7f726:: +.mainloop: note_type 12, 12, 2 octave 3 note B_, 4 @@ -68,8 +66,7 @@ Music_MeetFemaleTrainer_branch_7f726:: note F#, 2 note G#, 2 note A_, 2 - sound_loop 0, Music_MeetFemaleTrainer_branch_7f726 - + sound_loop 0, .mainloop Music_MeetFemaleTrainer_Ch3:: note_type 12, 1, 0 @@ -82,9 +79,8 @@ Music_MeetFemaleTrainer_Ch3:: rest 1 note A_, 1 rest 1 - -Music_MeetFemaleTrainer_branch_7f756:: - sound_call Music_MeetFemaleTrainer_branch_7f770 +.mainloop: + sound_call .sub1 note G#, 1 rest 3 note E_, 1 @@ -93,7 +89,7 @@ Music_MeetFemaleTrainer_branch_7f756:: rest 3 note E_, 1 rest 3 - sound_call Music_MeetFemaleTrainer_branch_7f770 + sound_call .sub1 note G#, 1 rest 3 note E_, 1 @@ -102,9 +98,9 @@ Music_MeetFemaleTrainer_branch_7f756:: rest 3 note B_, 1 rest 3 - sound_loop 0, Music_MeetFemaleTrainer_branch_7f756 + sound_loop 0, .mainloop -Music_MeetFemaleTrainer_branch_7f770:: +.sub1: note G#, 1 rest 3 note E_, 1 diff --git a/audio/music/meetjessiejames.asm b/audio/music/meetjessiejames.asm index d1f9f795..89426774 100644 --- a/audio/music/meetjessiejames.asm +++ b/audio/music/meetjessiejames.asm @@ -17,8 +17,7 @@ Music_MeetJessieJames_Ch1:: note_type 12, 11, 6 note D#, 12 note C_, 4 - -Music_MeetJessieJames_branch_83187:: +.mainloop: note_type 12, 11, 2 octave 4 note D_, 16 @@ -74,8 +73,7 @@ Music_MeetJessieJames_branch_83187:: note B_, 2 note_type 12, 11, 4 note A#, 4 - sound_loop 0, Music_MeetJessieJames_branch_83187 - + sound_loop 0, .mainloop Music_MeetJessieJames_Ch2:: duty_cycle 3 @@ -96,8 +94,7 @@ Music_MeetJessieJames_Ch2:: note A_, 12 octave 4 note C#, 4 - -Music_MeetJessieJames_branch_831df:: +.mainloop: note_type 12, 12, 2 octave 3 note C#, 1 @@ -161,8 +158,7 @@ Music_MeetJessieJames_branch_831df:: note F_, 4 note_type 12, 12, 5 note D#, 8 - sound_loop 0, Music_MeetJessieJames_branch_831df - + sound_loop 0, .mainloop Music_MeetJessieJames_Ch3:: note_type 12, 1, 0 @@ -175,8 +171,7 @@ Music_MeetJessieJames_Ch3:: octave 4 note C_, 2 note D#, 2 - -Music_MeetJessieJames_branch_83235:: +.mainloop: note D_, 1 rest 1 note A_, 1 @@ -305,4 +300,4 @@ Music_MeetJessieJames_branch_83235:: rest 1 note E_, 1 rest 1 - sound_loop 0, Music_MeetJessieJames_branch_83235 + sound_loop 0, .mainloop diff --git a/audio/music/meetmaletrainer.asm b/audio/music/meetmaletrainer.asm index a2786052..79775d6d 100644 --- a/audio/music/meetmaletrainer.asm +++ b/audio/music/meetmaletrainer.asm @@ -12,8 +12,7 @@ Music_MeetMaleTrainer_Ch1:: note E_, 1 note F_, 12 rest 16 - -Music_MeetMaleTrainer_branch_7f78f:: +.mainloop: octave 3 note B_, 4 note A_, 4 @@ -29,8 +28,7 @@ Music_MeetMaleTrainer_branch_7f78f:: octave 4 note D_, 8 note E_, 16 - sound_loop 0, Music_MeetMaleTrainer_branch_7f78f - + sound_loop 0, .mainloop Music_MeetMaleTrainer_Ch2:: duty_cycle 3 @@ -48,8 +46,7 @@ Music_MeetMaleTrainer_Ch2:: rest 3 note E_, 1 rest 9 - -Music_MeetMaleTrainer_branch_7f7b5:: +.mainloop: note_type 12, 12, 4 octave 4 note E_, 6 @@ -72,8 +69,7 @@ Music_MeetMaleTrainer_branch_7f7b5:: note F#, 8 octave 4 note C#, 8 - sound_loop 0, Music_MeetMaleTrainer_branch_7f7b5 - + sound_loop 0, .mainloop Music_MeetMaleTrainer_Ch3:: note_type 12, 1, 0 @@ -99,8 +95,7 @@ Music_MeetMaleTrainer_Ch3:: rest 1 note F#, 1 rest 1 - -Music_MeetMaleTrainer_branch_7f7ea:: +.mainloop: note E_, 1 rest 1 note B_, 1 @@ -187,4 +182,4 @@ Music_MeetMaleTrainer_branch_7f7ea:: rest 1 note D#, 1 rest 1 - sound_loop 0, Music_MeetMaleTrainer_branch_7f7ea + sound_loop 0, .mainloop diff --git a/audio/music/meetprofoak.asm b/audio/music/meetprofoak.asm index 24c6741a..f8cf4715 100644 --- a/audio/music/meetprofoak.asm +++ b/audio/music/meetprofoak.asm @@ -37,8 +37,7 @@ Music_MeetProfOak_Ch1:: note D#, 4 note F#, 2 note F#, 4 - -Music_MeetProfOak_branch_af85:: +.mainloop: note F#, 6 note E_, 4 note A_, 2 @@ -71,8 +70,7 @@ Music_MeetProfOak_branch_af85:: note E_, 4 note G#, 2 note G#, 4 - sound_loop 0, Music_MeetProfOak_branch_af85 - + sound_loop 0, .mainloop Music_MeetProfOak_Ch2:: vibrato 8, 1, 1 @@ -154,8 +152,7 @@ Music_MeetProfOak_Ch2:: note B_, 2 note B_, 4 note_type 12, 11, 5 - -Music_MeetProfOak_branch_b005:: +.mainloop: octave 4 note C#, 6 octave 3 @@ -205,8 +202,7 @@ Music_MeetProfOak_branch_b005:: note E_, 1 note_type 12, 11, 7 note G#, 16 - sound_loop 0, Music_MeetProfOak_branch_b005 - + sound_loop 0, .mainloop Music_MeetProfOak_Ch3:: note_type 12, 1, 2 @@ -335,8 +331,8 @@ Music_MeetProfOak_Ch3:: rest 1 note G#, 1 rest 1 - -Music_MeetProfOak_branch_b0bc:: +.mainloop: +.loop1: octave 4 note A_, 1 rest 1 @@ -361,9 +357,8 @@ Music_MeetProfOak_branch_b0bc:: octave 5 note C#, 1 rest 1 - sound_loop 2, Music_MeetProfOak_branch_b0bc - -Music_MeetProfOak_branch_b0d8:: + sound_loop 2, .loop1 +.loop2: octave 4 note G#, 1 rest 1 @@ -381,9 +376,8 @@ Music_MeetProfOak_branch_b0d8:: rest 1 note B_, 1 rest 1 - sound_loop 2, Music_MeetProfOak_branch_b0d8 - -Music_MeetProfOak_branch_b0ed:: + sound_loop 2, .loop2 +.loop3: note F#, 1 rest 1 note A_, 1 @@ -400,9 +394,8 @@ Music_MeetProfOak_branch_b0ed:: rest 1 note A_, 1 rest 1 - sound_loop 2, Music_MeetProfOak_branch_b0ed - -Music_MeetProfOak_branch_b101:: + sound_loop 2, .loop3 +.loop4: note G#, 1 rest 1 note B_, 1 @@ -419,5 +412,5 @@ Music_MeetProfOak_branch_b101:: rest 1 note B_, 1 rest 1 - sound_loop 2, Music_MeetProfOak_branch_b101 - sound_loop 0, Music_MeetProfOak_branch_b0bc + sound_loop 2, .loop4 + sound_loop 0, .mainloop diff --git a/audio/music/meetrival.asm b/audio/music/meetrival.asm index 958db7be..32dfe153 100644 --- a/audio/music/meetrival.asm +++ b/audio/music/meetrival.asm @@ -1,11 +1,10 @@ -Music_MeetRival_branch_b119:: +Music_MeetRival_Ch1_AlternateTempo:: tempo 100 - sound_loop 0, Music_MeetRival_branch_b123 + sound_loop 0, Music_MeetRival_Ch1.body Music_MeetRival_Ch1:: tempo 112 - -Music_MeetRival_branch_b123:: +.body: volume 7, 7 duty_cycle 3 vibrato 6, 3, 4 @@ -30,8 +29,7 @@ Music_MeetRival_branch_b123:: note A_, 2 note G_, 2 note A_, 2 - -Music_MeetRival_branch_b140:: +.mainloop: note B_, 4 note A#, 2 note A_, 4 @@ -117,16 +115,15 @@ Music_MeetRival_branch_b140:: note A_, 2 note G_, 2 note A_, 2 - sound_loop 0, Music_MeetRival_branch_b140 + sound_loop 0, .mainloop -Music_MeetRival_branch_b19b:: +Music_MeetRival_Ch1_AlternateStartAndTempo:: tempo 100 - sound_loop 0, Music_MeetRival_branch_b1a5 + sound_loop 0, Music_MeetRival_Ch1_AlternateStart.body -Music_MeetRival_branch_b1a2:: +Music_MeetRival_Ch1_AlternateStart:: tempo 112 - -Music_MeetRival_branch_b1a5:: +.body: volume 7, 7 duty_cycle 3 vibrato 6, 3, 4 @@ -140,8 +137,7 @@ Music_MeetRival_branch_b1a5:: note A_, 2 note G_, 2 note A_, 2 - sound_loop 0, Music_MeetRival_branch_b140 - + sound_loop 0, Music_MeetRival_Ch1.mainloop Music_MeetRival_Ch2:: duty_cycle 3 @@ -169,8 +165,7 @@ Music_MeetRival_Ch2:: note D_, 2 note F_, 2 note F#, 2 - -Music_MeetRival_branch_b1d8:: +.mainloop: note_type 12, 12, 7 note G_, 4 note D_, 2 @@ -228,9 +223,9 @@ Music_MeetRival_branch_b1d8:: note D_, 2 note F_, 2 note F#, 2 - sound_loop 0, Music_MeetRival_branch_b1d8 + sound_loop 0, .mainloop -Music_MeetRival_branch_b21d:: +Music_MeetRival_Ch2_AlternateStart:: duty_cycle 3 vibrato 10, 2, 6 note_type 12, 12, 7 @@ -245,8 +240,7 @@ Music_MeetRival_branch_b21d:: note D_, 2 note F_, 2 note F#, 2 - sound_loop 0, Music_MeetRival_branch_b1d8 - + sound_loop 0, Music_MeetRival_Ch2.mainloop Music_MeetRival_Ch3:: note_type 12, 1, 4 @@ -272,8 +266,7 @@ Music_MeetRival_Ch3:: rest 1 note G_, 1 rest 1 - -Music_MeetRival_branch_b24b:: +.mainloop: note G_, 2 octave 5 note D_, 2 @@ -376,9 +369,9 @@ Music_MeetRival_branch_b24b:: rest 2 octave 5 note D_, 2 - sound_loop 0, Music_MeetRival_branch_b24b + sound_loop 0, .mainloop -Music_MeetRival_branch_b2b5:: +Music_MeetRival_Ch3_AlternateStart:: note_type 12, 1, 4 octave 4 note G_, 1 @@ -393,4 +386,4 @@ Music_MeetRival_branch_b2b5:: rest 1 note G_, 1 rest 1 - sound_loop 0, Music_MeetRival_branch_b24b + sound_loop 0, Music_MeetRival_Ch3.mainloop diff --git a/audio/music/museumguy.asm b/audio/music/museumguy.asm index 60ebd553..1577d466 100644 --- a/audio/music/museumguy.asm +++ b/audio/music/museumguy.asm @@ -21,39 +21,37 @@ Music_MuseumGuy_Ch1:: note E_, 1 note G#, 1 note B_, 10 - sound_call Music_MuseumGuy_branch_ade7 - sound_call Music_MuseumGuy_branch_adec - sound_call Music_MuseumGuy_branch_ade7 + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 note E_, 4 note E_, 4 note E_, 2 note E_, 6 - -Music_MuseumGuy_branch_add6:: - sound_call Music_MuseumGuy_branch_ade7 - sound_call Music_MuseumGuy_branch_adec - sound_call Music_MuseumGuy_branch_ade7 +.mainloop: + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 note E_, 4 note E_, 4 note E_, 2 note E_, 6 - sound_loop 0, Music_MuseumGuy_branch_add6 + sound_loop 0, .mainloop -Music_MuseumGuy_branch_ade7:: +.sub1: note E_, 2 note E_, 6 note F#, 2 note F#, 6 sound_ret -Music_MuseumGuy_branch_adec:: +.sub2: note E_, 2 note E_, 6 note D_, 2 note D_, 6 sound_ret - Music_MuseumGuy_Ch2:: duty_cycle 2 note_type 12, 12, 1 @@ -106,8 +104,7 @@ Music_MuseumGuy_Ch2:: note A_, 2 note A_, 2 note A_, 4 - -Music_MuseumGuy_branch_ae26:: +.mainloop: octave 3 note A_, 2 octave 4 @@ -162,8 +159,7 @@ Music_MuseumGuy_branch_ae26:: note A_, 2 note A_, 2 note A_, 4 - sound_loop 0, Music_MuseumGuy_branch_ae26 - + sound_loop 0, .mainloop Music_MuseumGuy_Ch3:: note_type 12, 1, 0 @@ -175,7 +171,7 @@ Music_MuseumGuy_Ch3:: rest 3 note E_, 1 rest 9 - sound_call Music_MuseumGuy_branch_aeb8 + sound_call .sub1 note A_, 1 rest 1 note A_, 1 @@ -184,7 +180,7 @@ Music_MuseumGuy_Ch3:: rest 1 note G#, 1 rest 5 - sound_call Music_MuseumGuy_branch_aeb8 + sound_call .sub1 note B_, 1 rest 3 note G#, 1 @@ -193,9 +189,8 @@ Music_MuseumGuy_Ch3:: rest 1 note A_, 1 rest 3 - -Music_MuseumGuy_branch_ae8e:: - sound_call Music_MuseumGuy_branch_aec1 +.mainloop: + sound_call .sub2 rest 3 octave 6 note E_, 1 @@ -211,7 +206,7 @@ Music_MuseumGuy_branch_ae8e:: rest 1 note G#, 1 rest 3 - sound_call Music_MuseumGuy_branch_aec1 + sound_call .sub2 rest 1 octave 6 note E_, 1 @@ -229,9 +224,9 @@ Music_MuseumGuy_branch_ae8e:: rest 1 note A_, 1 rest 3 - sound_loop 0, Music_MuseumGuy_branch_ae8e + sound_loop 0, .mainloop -Music_MuseumGuy_branch_aeb8:: +.sub1: note A_, 1 rest 1 note A_, 1 @@ -242,7 +237,7 @@ Music_MuseumGuy_branch_aeb8:: rest 5 sound_ret -Music_MuseumGuy_branch_aec1:: +.sub2: octave 6 note C#, 1 rest 1 @@ -260,7 +255,6 @@ Music_MuseumGuy_branch_aec1:: note A_, 1 sound_ret - Music_MuseumGuy_Ch4:: drum_speed 12 rest 16 @@ -274,8 +268,7 @@ Music_MuseumGuy_Ch4:: drum_note 19, 1 drum_note 18, 1 drum_note 18, 1 - -Music_MuseumGuy_branch_aee1:: +.mainloop: drum_note 17, 4 drum_note 17, 6 drum_note 17, 2 @@ -334,4 +327,4 @@ Music_MuseumGuy_branch_aee1:: drum_note 19, 1 drum_note 18, 1 drum_note 18, 1 - sound_loop 0, Music_MuseumGuy_branch_aee1 + sound_loop 0, .mainloop diff --git a/audio/music/oakslab.asm b/audio/music/oakslab.asm index 5af9f9a9..fc9974fd 100644 --- a/audio/music/oakslab.asm +++ b/audio/music/oakslab.asm @@ -15,8 +15,7 @@ Music_OaksLab_Ch1:: note G#, 1 note A_, 1 note B_, 1 - -Music_OaksLab_branch_7eed0:: +.mainloop: octave 4 note C#, 4 octave 3 @@ -66,8 +65,7 @@ Music_OaksLab_branch_7eed0:: note E_, 4 note F#, 4 note G#, 4 - sound_loop 0, Music_OaksLab_branch_7eed0 - + sound_loop 0, .mainloop Music_OaksLab_Ch2:: duty_cycle 3 @@ -83,8 +81,7 @@ Music_OaksLab_Ch2:: note E_, 1 note F#, 1 note G#, 1 - -Music_OaksLab_branch_7ef16:: +.mainloop: note A_, 6 note G#, 1 note F#, 1 @@ -141,8 +138,7 @@ Music_OaksLab_branch_7ef16:: rest 1 note F#, 1 rest 1 - sound_loop 0, Music_OaksLab_branch_7ef16 - + sound_loop 0, .mainloop Music_OaksLab_Ch3:: note_type 12, 1, 1 @@ -154,8 +150,7 @@ Music_OaksLab_Ch3:: rest 1 note E_, 1 rest 1 - -Music_OaksLab_branch_7ef5c:: +.mainloop: note C#, 1 rest 1 note A_, 1 @@ -390,4 +385,4 @@ Music_OaksLab_branch_7ef5c:: rest 3 note E_, 1 rest 3 - sound_loop 0, Music_OaksLab_branch_7ef5c + sound_loop 0, .mainloop diff --git a/audio/music/pallettown.asm b/audio/music/pallettown.asm index 26e5710f..9d1aff7a 100644 --- a/audio/music/pallettown.asm +++ b/audio/music/pallettown.asm @@ -3,8 +3,7 @@ Music_PalletTown_Ch1:: volume 7, 7 duty_cycle 2 note_type 12, 12, 3 - -Music_PalletTown_branch_a7ce:: +.mainloop: octave 3 note B_, 4 octave 4 @@ -144,14 +143,13 @@ Music_PalletTown_branch_a7ce:: note D_, 2 note C_, 2 note D_, 2 - sound_loop 0, Music_PalletTown_branch_a7ce - sound_ret + sound_loop 0, .mainloop + sound_ret ; unused Music_PalletTown_Ch2:: duty_cycle 2 - -Music_PalletTown_branch_a861:: +.mainloop: note_type 12, 13, 3 octave 5 note D_, 2 @@ -258,15 +256,14 @@ Music_PalletTown_branch_a861:: note B_, 4 note B_, 8 note A_, 8 - sound_loop 0, Music_PalletTown_branch_a861 - sound_ret + sound_loop 0, .mainloop + sound_ret ; unused Music_PalletTown_Ch3:: vibrato 24, 2, 8 note_type 12, 1, 2 - -Music_PalletTown_branch_a8e3:: +.mainloop: octave 4 note G_, 6 note E_, 6 @@ -310,5 +307,6 @@ Music_PalletTown_branch_a8e3:: note E_, 8 note E_, 8 note F#, 8 - sound_loop 0, Music_PalletTown_branch_a8e3 - sound_ret + sound_loop 0, .mainloop + + sound_ret ; unused diff --git a/audio/music/pkmnhealed.asm b/audio/music/pkmnhealed.asm index 2fe9e4ce..cb858110 100644 --- a/audio/music/pkmnhealed.asm +++ b/audio/music/pkmnhealed.asm @@ -18,7 +18,6 @@ Music_PkmnHealed_Ch1:: note B_, 4 sound_ret - Music_PkmnHealed_Ch2:: duty_cycle 2 note_type 12, 12, 3 @@ -32,7 +31,6 @@ Music_PkmnHealed_Ch2:: note E_, 8 sound_ret - Music_PkmnHealed_Ch3:: note_type 12, 1, 0 octave 4 diff --git a/audio/music/pokecenter.asm b/audio/music/pokecenter.asm index a4a3f2bf..cdfa1188 100644 --- a/audio/music/pokecenter.asm +++ b/audio/music/pokecenter.asm @@ -4,8 +4,7 @@ Music_Pokecenter_Ch1:: duty_cycle 3 vibrato 10, 2, 2 toggle_perfect_pitch - -Music_Pokecenter_branch_be61:: +.mainloop: note_type 12, 10, 3 octave 3 note F#, 2 @@ -146,20 +145,18 @@ Music_Pokecenter_branch_be61:: note E_, 2 note F#, 2 note G_, 2 - sound_loop 0, Music_Pokecenter_branch_be61 - + sound_loop 0, .mainloop Music_Pokecenter_Ch2:: vibrato 8, 2, 5 - -Music_Pokecenter_branch_befc:: - sound_call Music_Pokecenter_branch_bf4e +.mainloop: + sound_call .sub1 duty_cycle 3 note_type 12, 10, 5 octave 3 note A_, 4 note E_, 4 - sound_call Music_Pokecenter_branch_bf60 + sound_call .sub2 note D_, 2 note F#, 6 duty_cycle 3 @@ -167,13 +164,13 @@ Music_Pokecenter_branch_befc:: octave 3 note A_, 4 note E_, 4 - sound_call Music_Pokecenter_branch_bf4e + sound_call .sub1 duty_cycle 3 note_type 12, 10, 5 octave 3 note A_, 4 note E_, 4 - sound_call Music_Pokecenter_branch_bf60 + sound_call .sub2 note D_, 8 duty_cycle 3 note_type 12, 10, 5 @@ -213,9 +210,9 @@ Music_Pokecenter_branch_befc:: note F#, 2 note E_, 2 note D_, 8 - sound_loop 0, Music_Pokecenter_branch_befc + sound_loop 0, .mainloop -Music_Pokecenter_branch_bf4e:: +.sub1: duty_cycle 2 note_type 12, 12, 2 octave 4 @@ -232,7 +229,7 @@ Music_Pokecenter_branch_bf4e:: note C#, 6 sound_ret -Music_Pokecenter_branch_bf60:: +.sub2: duty_cycle 2 note_type 12, 12, 2 octave 4 @@ -247,11 +244,9 @@ Music_Pokecenter_branch_bf60:: note C#, 2 sound_ret - Music_Pokecenter_Ch3:: note_type 12, 1, 0 - -Music_Pokecenter_branch_bf72:: +.mainloop: octave 4 note D_, 2 note F#, 2 @@ -261,8 +256,8 @@ Music_Pokecenter_branch_bf72:: note F#, 2 note G_, 2 note F#, 2 - sound_call Music_Pokecenter_branch_bfd9 - sound_call Music_Pokecenter_branch_bfe2 + sound_call .sub1 + sound_call .sub2 note F#, 2 note A_, 2 note F#, 2 @@ -279,8 +274,8 @@ Music_Pokecenter_branch_bf72:: note F#, 2 note G_, 2 note F#, 2 - sound_call Music_Pokecenter_branch_bfd9 - sound_call Music_Pokecenter_branch_bfe2 + sound_call .sub1 + sound_call .sub2 note D_, 2 note F#, 2 note D_, 2 @@ -289,7 +284,7 @@ Music_Pokecenter_branch_bf72:: note B_, 2 note A_, 2 note G_, 2 - sound_call Music_Pokecenter_branch_bfeb + sound_call .sub3 note G_, 2 note B_, 2 note G_, 2 @@ -314,7 +309,7 @@ Music_Pokecenter_branch_bf72:: note A_, 2 note G#, 2 note A_, 2 - sound_call Music_Pokecenter_branch_bfeb + sound_call .sub3 note G_, 2 note B_, 2 note G_, 2 @@ -339,9 +334,9 @@ Music_Pokecenter_branch_bf72:: note G_, 2 note F#, 2 note E_, 2 - sound_loop 0, Music_Pokecenter_branch_bf72 + sound_loop 0, .mainloop -Music_Pokecenter_branch_bfd9:: +.sub1: note E_, 2 note A_, 2 note E_, 2 @@ -352,7 +347,7 @@ Music_Pokecenter_branch_bfd9:: note A_, 2 sound_ret -Music_Pokecenter_branch_bfe2:: +.sub2: note E_, 2 note A_, 2 note E_, 2 @@ -363,7 +358,7 @@ Music_Pokecenter_branch_bfe2:: note A_, 2 sound_ret -Music_Pokecenter_branch_bfeb:: +.sub3: note F#, 2 note A_, 2 note F#, 2 diff --git a/audio/music/pokemontower.asm b/audio/music/pokemontower.asm index ef3a3b88..0126acad 100644 --- a/audio/music/pokemontower.asm +++ b/audio/music/pokemontower.asm @@ -8,8 +8,7 @@ Music_PokemonTower_Ch1:: rest 4 octave 4 note B_, 12 - -Music_PokemonTower_branch_7f05a:: +.mainloop: note_type 12, 11, 4 octave 4 note G_, 1 @@ -137,8 +136,7 @@ Music_PokemonTower_branch_7f05a:: octave 5 note C_, 16 note C_, 16 - sound_loop 0, Music_PokemonTower_branch_7f05a - + sound_loop 0, .mainloop Music_PokemonTower_Ch2:: vibrato 20, 3, 4 @@ -148,8 +146,7 @@ Music_PokemonTower_Ch2:: note C_, 12 octave 4 note E_, 4 - -Music_PokemonTower_branch_7f0ee:: +.mainloop: note_type 12, 12, 1 octave 5 note C_, 8 @@ -289,8 +286,7 @@ Music_PokemonTower_branch_7f0ee:: vibrato 0, 3, 4 note_type 12, 10, 7 note C_, 16 - sound_loop 0, Music_PokemonTower_branch_7f0ee - + sound_loop 0, .mainloop Music_PokemonTower_Ch3:: vibrato 4, 1, 1 @@ -298,8 +294,7 @@ Music_PokemonTower_Ch3:: rest 8 octave 5 note G_, 8 - -Music_PokemonTower_branch_7f1a2:: +.mainloop: note E_, 1 rest 7 note E_, 1 @@ -455,4 +450,4 @@ Music_PokemonTower_branch_7f1a2:: rest 1 note D#, 1 rest 1 - sound_loop 0, Music_PokemonTower_branch_7f1a2 + sound_loop 0, .mainloop diff --git a/audio/music/routes1.asm b/audio/music/routes1.asm index cdefb6ee..b4c8377d 100644 --- a/audio/music/routes1.asm +++ b/audio/music/routes1.asm @@ -4,8 +4,7 @@ Music_Routes1_Ch1:: vibrato 4, 2, 3 duty_cycle 2 toggle_perfect_pitch - -Music_Routes1_branch_9be9:: +.mainloop: note_type 12, 10, 1 rest 4 octave 4 @@ -102,22 +101,21 @@ Music_Routes1_branch_9be9:: octave 3 note A_, 2 note A_, 2 - sound_loop 0, Music_Routes1_branch_9be9 - sound_ret + sound_loop 0, .mainloop + sound_ret ; unused Music_Routes1_Ch2:: duty_cycle 2 - -Music_Routes1_branch_9c53:: +.mainloop: note_type 12, 13, 1 - sound_call Music_Routes1_branch_9c65 - sound_call Music_Routes1_branch_9c78 - sound_call Music_Routes1_branch_9c65 - sound_call Music_Routes1_branch_9c8d - sound_loop 0, Music_Routes1_branch_9c53 + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 + sound_call .sub3 + sound_loop 0, .mainloop -Music_Routes1_branch_9c65:: +.sub1: octave 4 note D_, 1 note E_, 1 @@ -138,7 +136,7 @@ Music_Routes1_branch_9c65:: note E_, 6 sound_ret -Music_Routes1_branch_9c78:: +.sub2: note C#, 1 note D_, 1 note E_, 2 @@ -161,7 +159,7 @@ Music_Routes1_branch_9c78:: note F#, 2 sound_ret -Music_Routes1_branch_9c8d:: +.sub3: note C#, 1 note D_, 1 note E_, 2 @@ -231,14 +229,13 @@ Music_Routes1_branch_9c8d:: note D_, 2 note D_, 2 sound_ret - sound_ret + sound_ret ; unused Music_Routes1_Ch3:: vibrato 8, 2, 5 note_type 12, 1, 3 - -Music_Routes1_branch_9cdd:: +.mainloop: rest 2 octave 4 note D_, 4 @@ -305,11 +302,12 @@ Music_Routes1_branch_9cdd:: note A_, 8 octave 4 note D_, 6 - sound_loop 0, Music_Routes1_branch_9cdd - sound_ret + sound_loop 0, .mainloop + sound_ret ; unused Music_Routes1_Ch4:: +.mainloop: drum_speed 12 rest 4 drum_note 15, 2 @@ -400,5 +398,6 @@ Music_Routes1_Ch4:: rest 2 drum_note 15, 2 drum_note 15, 2 - sound_loop 0, Music_Routes1_Ch4 - sound_ret + sound_loop 0, .mainloop + + sound_ret ; unused diff --git a/audio/music/routes2.asm b/audio/music/routes2.asm index e6782df3..d60d6cb3 100644 --- a/audio/music/routes2.asm +++ b/audio/music/routes2.asm @@ -3,8 +3,7 @@ Music_Routes2_Ch1:: volume 7, 7 vibrato 9, 2, 5 duty_cycle 1 - -Music_Routes2_branch_9dc3:: +.mainloop: note_type 12, 11, 2 octave 2 note B_, 4 @@ -138,15 +137,14 @@ Music_Routes2_branch_9dc3:: note B_, 2 octave 4 note E_, 2 - sound_loop 0, Music_Routes2_branch_9dc3 - sound_ret + sound_loop 0, .mainloop + sound_ret ; unused Music_Routes2_Ch2:: vibrato 8, 2, 6 duty_cycle 3 - -Music_Routes2_branch_9e54:: +.mainloop: note_type 12, 13, 4 octave 4 note E_, 6 @@ -212,14 +210,13 @@ Music_Routes2_branch_9e54:: note A_, 1 note G#, 8 rest 4 - sound_loop 0, Music_Routes2_branch_9e54 - sound_ret + sound_loop 0, .mainloop + sound_ret ; unused Music_Routes2_Ch3:: vibrato 9, 2, 8 - -Music_Routes2_branch_9e9e:: +.mainloop: note_type 12, 1, 1 octave 3 note E_, 2 @@ -320,11 +317,12 @@ Music_Routes2_branch_9e9e:: rest 2 note E_, 2 rest 2 - sound_loop 0, Music_Routes2_branch_9e9e - sound_ret + sound_loop 0, .mainloop + sound_ret ; unused Music_Routes2_Ch4:: +.mainloop: drum_speed 12 drum_note 3, 2 rest 2 @@ -421,5 +419,6 @@ Music_Routes2_Ch4:: rest 3 drum_note 3, 3 rest 3 - sound_loop 0, Music_Routes2_Ch4 - sound_ret + sound_loop 0, .mainloop + + sound_ret ; unused diff --git a/audio/music/routes3.asm b/audio/music/routes3.asm index 26a41590..d7140c6c 100644 --- a/audio/music/routes3.asm +++ b/audio/music/routes3.asm @@ -14,8 +14,7 @@ Music_Routes3_Ch1:: note E_, 1 rest 16 rest 15 - -Music_Routes3_branch_9fc3:: +.mainloop: note_type 12, 11, 5 note E_, 6 note D_, 1 @@ -74,8 +73,7 @@ Music_Routes3_branch_9fc3:: note_type 8, 9, 0 note F_, 12 note G_, 12 - sound_loop 0, Music_Routes3_branch_9fc3 - + sound_loop 0, .mainloop Music_Routes3_Ch2:: vibrato 8, 2, 3 @@ -91,8 +89,7 @@ Music_Routes3_Ch2:: note C_, 1 rest 15 rest 16 - -Music_Routes3_branch_a01a:: +.mainloop: note_type 12, 12, 7 duty_cycle 2 octave 4 @@ -175,8 +172,7 @@ Music_Routes3_branch_a01a:: octave 3 note A_, 8 note B_, 8 - sound_loop 0, Music_Routes3_branch_a01a - + sound_loop 0, .mainloop Music_Routes3_Ch3:: vibrato 4, 1, 0 @@ -212,8 +208,7 @@ Music_Routes3_Ch3:: note G_, 2 rest 2 note G_, 8 - -Music_Routes3_branch_a0a3:: +.mainloop: note_type 12, 1, 2 note E_, 1 rest 1 @@ -351,8 +346,7 @@ Music_Routes3_branch_a0a3:: note F_, 1 rest 1 note A_, 4 - sound_loop 0, Music_Routes3_branch_a0a3 - + sound_loop 0, .mainloop Music_Routes3_Ch4:: drum_speed 6 @@ -392,8 +386,7 @@ Music_Routes3_Ch4:: drum_note 19, 1 drum_note 18, 1 drum_note 18, 1 - -Music_Routes3_branch_a17a:: +.mainloop: drum_note 17, 12 drum_note 17, 2 drum_note 18, 2 @@ -512,4 +505,4 @@ Music_Routes3_branch_a17a:: drum_note 18, 1 drum_note 18, 1 drum_note 18, 1 - sound_loop 0, Music_Routes3_branch_a17a + sound_loop 0, .mainloop diff --git a/audio/music/routes4.asm b/audio/music/routes4.asm index 50679f54..98e1455a 100644 --- a/audio/music/routes4.asm +++ b/audio/music/routes4.asm @@ -21,8 +21,7 @@ Music_Routes4_Ch1:: note E_, 1 note F#, 1 note B_, 1 - -Music_Routes4_branch_a28a:: +.mainloop: note_type 12, 11, 7 note B_, 6 note E_, 2 @@ -135,8 +134,7 @@ Music_Routes4_branch_a28a:: note F#, 3 note G#, 3 note A_, 3 - sound_loop 0, Music_Routes4_branch_a28a - + sound_loop 0, .mainloop Music_Routes4_Ch2:: vibrato 12, 2, 4 @@ -163,8 +161,7 @@ Music_Routes4_Ch2:: note B_, 1 octave 4 note D#, 1 - -Music_Routes4_branch_a325:: +.mainloop: note_type 12, 12, 7 note E_, 6 octave 3 @@ -285,8 +282,7 @@ Music_Routes4_branch_a325:: note E_, 8 note_type 12, 10, 7 note E_, 10 - sound_loop 0, Music_Routes4_branch_a325 - + sound_loop 0, .mainloop Music_Routes4_Ch3:: note_type 12, 1, 0 @@ -307,8 +303,7 @@ Music_Routes4_Ch3:: rest 3 note D#, 1 rest 3 - -Music_Routes4_branch_a3d7:: +.mainloop: note E_, 1 rest 3 note E_, 1 @@ -503,8 +498,7 @@ Music_Routes4_branch_a3d7:: rest 3 note D#, 1 rest 1 - sound_loop 0, Music_Routes4_branch_a3d7 - + sound_loop 0, .mainloop Music_Routes4_Ch4:: drum_speed 12 @@ -514,8 +508,7 @@ Music_Routes4_Ch4:: drum_note 19, 1 drum_note 18, 1 drum_note 18, 1 - -Music_Routes4_branch_a4a8:: +.mainloop: drum_note 17, 4 drum_note 19, 1 drum_note 19, 1 @@ -678,4 +671,4 @@ Music_Routes4_branch_a4a8:: drum_note 17, 2 drum_note 17, 2 drum_note 17, 2 - sound_loop 0, Music_Routes4_branch_a4a8 + sound_loop 0, .mainloop diff --git a/audio/music/safarizone.asm b/audio/music/safarizone.asm index 0ca2f71a..505dd130 100644 --- a/audio/music/safarizone.asm +++ b/audio/music/safarizone.asm @@ -16,17 +16,16 @@ Music_SafariZone_Ch1:: note G_, 1 rest 4 duty_cycle 3 - -Music_SafariZone_branch_bc4f:: - sound_call Music_SafariZone_branch_bc5f +.mainloop: + sound_call .sub1 note_type 12, 10, 4 note F#, 4 - sound_call Music_SafariZone_branch_bc5f + sound_call .sub1 note_type 12, 10, 4 note F#, 4 - sound_loop 0, Music_SafariZone_branch_bc4f + sound_loop 0, .mainloop -Music_SafariZone_branch_bc5f:: +.sub1: note_type 12, 10, 2 octave 3 note C_, 4 @@ -38,7 +37,6 @@ Music_SafariZone_branch_bc5f:: note C_, 4 sound_ret - Music_SafariZone_Ch2:: duty_cycle 2 vibrato 8, 2, 5 @@ -50,17 +48,16 @@ Music_SafariZone_Ch2:: note D_, 1 rest 4 duty_cycle 3 - -Music_SafariZone_branch_bc79:: - sound_call Music_SafariZone_branch_bc89 +.mainloop: + sound_call .sub1 note_type 12, 11, 5 note A_, 4 - sound_call Music_SafariZone_branch_bc89 + sound_call .sub1 note_type 12, 11, 5 note B_, 4 - sound_loop 0, Music_SafariZone_branch_bc79 + sound_loop 0, .mainloop -Music_SafariZone_branch_bc89:: +.sub1: note_type 12, 11, 2 octave 3 note G_, 4 @@ -72,21 +69,19 @@ Music_SafariZone_branch_bc89:: note G_, 4 sound_ret - Music_SafariZone_Ch3:: note_type 12, 1, 0 rest 8 - -Music_SafariZone_branch_bc97:: - sound_call Music_SafariZone_branch_bca5 +.mainloop: + sound_call .sub1 octave 4 note A_, 4 - sound_call Music_SafariZone_branch_bca5 + sound_call .sub1 octave 4 note B_, 4 - sound_loop 0, Music_SafariZone_branch_bc97 + sound_loop 0, .mainloop -Music_SafariZone_branch_bca5:: +.sub1: octave 3 note A_, 2 rest 2 diff --git a/audio/music/silphco.asm b/audio/music/silphco.asm index 3c7512ba..9e4265f9 100644 --- a/audio/music/silphco.asm +++ b/audio/music/silphco.asm @@ -32,8 +32,7 @@ Music_SilphCo_Ch1:: rest 6 note B_, 2 rest 2 - -Music_SilphCo_branch_7f26d:: +.mainloop: note G_, 2 rest 2 note B_, 2 @@ -185,9 +184,9 @@ Music_SilphCo_branch_7f26d:: note A#, 2 note B_, 2 note A#, 2 - sound_call Music_SilphCo_branch_7f3f0 - sound_call Music_SilphCo_branch_7f3f0 - sound_call Music_SilphCo_branch_7f3f0 + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 rest 4 note C_, 2 rest 6 @@ -365,9 +364,9 @@ Music_SilphCo_branch_7f26d:: rest 6 note B_, 2 rest 2 - sound_loop 0, Music_SilphCo_branch_7f26d + sound_loop 0, .mainloop -Music_SilphCo_branch_7f3f0:: +.sub1: octave 2 note B_, 2 note A#, 2 @@ -394,7 +393,6 @@ Music_SilphCo_branch_7f3f0:: note C_, 2 sound_ret - Music_SilphCo_Ch2:: vibrato 10, 3, 2 duty_cycle 3 @@ -427,8 +425,7 @@ Music_SilphCo_Ch2:: rest 6 note G#, 2 rest 2 - -Music_SilphCo_branch_7f42e:: +.mainloop: note E_, 2 rest 2 note G_, 2 @@ -777,8 +774,7 @@ Music_SilphCo_branch_7f42e:: rest 6 note G#, 2 rest 2 - sound_loop 0, Music_SilphCo_branch_7f42e - + sound_loop 0, .mainloop Music_SilphCo_Ch3:: vibrato 8, 1, 1 @@ -789,8 +785,7 @@ Music_SilphCo_Ch3:: note D#, 4 note E_, 4 note F_, 4 - -Music_SilphCo_branch_7f5c9:: +.mainloop: note E_, 4 note D#, 4 note D_, 4 @@ -997,4 +992,4 @@ Music_SilphCo_branch_7f5c9:: note D#, 4 note E_, 4 note F_, 4 - sound_loop 0, Music_SilphCo_branch_7f5c9 + sound_loop 0, .mainloop diff --git a/audio/music/ssanne.asm b/audio/music/ssanne.asm index 4dae83bc..61f4237e 100644 --- a/audio/music/ssanne.asm +++ b/audio/music/ssanne.asm @@ -4,8 +4,7 @@ Music_SSAnne_Ch1:: duty_cycle 1 vibrato 8, 3, 4 toggle_perfect_pitch - -Music_SSAnne_branch_b3b2:: +.mainloop: note_type 12, 10, 4 rest 12 octave 3 @@ -104,14 +103,12 @@ Music_SSAnne_branch_b3b2:: rest 4 octave 3 note D_, 8 - sound_loop 0, Music_SSAnne_branch_b3b2 - + sound_loop 0, .mainloop Music_SSAnne_Ch2:: duty_cycle 0 vibrato 12, 2, 4 - -Music_SSAnne_branch_b41e:: +.mainloop: note_type 12, 12, 5 octave 3 note A_, 2 @@ -279,10 +276,10 @@ Music_SSAnne_branch_b41e:: note C#, 3 octave 3 note B_, 3 - sound_loop 0, Music_SSAnne_branch_b41e - + sound_loop 0, .mainloop Music_SSAnne_Ch3:: +.mainloop: note_type 12, 1, 3 rest 16 rest 12 @@ -335,4 +332,4 @@ Music_SSAnne_Ch3:: note F#, 8 note G#, 8 note B_, 8 - sound_loop 0, Music_SSAnne_Ch3 + sound_loop 0, .mainloop diff --git a/audio/music/surfing.asm b/audio/music/surfing.asm index 4765f391..03636ef1 100644 --- a/audio/music/surfing.asm +++ b/audio/music/surfing.asm @@ -15,8 +15,7 @@ Music_Surfing_Ch1:: note G#, 2 note F#, 2 note G#, 4 - -Music_Surfing_branch_7fa30:: +.mainloop: note_type 12, 11, 2 note E_, 2 note E_, 4 @@ -113,8 +112,7 @@ Music_Surfing_branch_7fa30:: note G#, 2 note F#, 2 note E_, 4 - sound_loop 0, Music_Surfing_branch_7fa30 - + sound_loop 0, .mainloop Music_Surfing_Ch2:: duty_cycle 3 @@ -131,8 +129,7 @@ Music_Surfing_Ch2:: note D_, 2 octave 3 note B_, 2 - -Music_Surfing_branch_7faae:: +.mainloop: note_type 12, 12, 6 octave 4 note E_, 6 @@ -200,8 +197,7 @@ Music_Surfing_branch_7faae:: note A_, 1 octave 5 note C#, 6 - sound_loop 0, Music_Surfing_branch_7faae - + sound_loop 0, .mainloop Music_Surfing_Ch3:: note_type 12, 1, 0 @@ -212,8 +208,7 @@ Music_Surfing_Ch3:: note E_, 2 note F#, 2 note G#, 2 - -Music_Surfing_branch_7fb03:: +.mainloop: octave 3 note A_, 2 octave 4 @@ -332,4 +327,4 @@ Music_Surfing_branch_7fb03:: note C#, 2 note D_, 2 note E_, 2 - sound_loop 0, Music_Surfing_branch_7fb03 + sound_loop 0, .mainloop diff --git a/audio/music/surfingpikachu.asm b/audio/music/surfingpikachu.asm index 8e161443..8203ebbe 100644 --- a/audio/music/surfingpikachu.asm +++ b/audio/music/surfingpikachu.asm @@ -34,8 +34,7 @@ Music_SurfingPikachu_Ch1:: note G#, 4 note G#, 4 note G#, 2 - -Music_SurfingPikachu_branch_82d1a:: +.mainloop: note_type 12, 11, 3 octave 3 note G#, 4 @@ -159,8 +158,7 @@ Music_SurfingPikachu_branch_82d1a:: note D#, 1 note E_, 8 duty_cycle 3 - sound_loop 0, Music_SurfingPikachu_branch_82d1a - + sound_loop 0, .mainloop Music_SurfingPikachu_Ch2:: duty_cycle 3 @@ -216,8 +214,7 @@ Music_SurfingPikachu_Ch2:: note B_, 4 note B_, 4 note B_, 2 - -Music_SurfingPikachu_branch_82de0:: +.mainloop: note_type 12, 12, 6 octave 4 note E_, 4 @@ -309,8 +306,7 @@ Music_SurfingPikachu_branch_82de0:: note B_, 1 octave 4 note C#, 1 - sound_loop 0, Music_SurfingPikachu_branch_82de0 - + sound_loop 0, .mainloop Music_SurfingPikachu_Ch3:: note_type 12, 1, 0 @@ -403,8 +399,7 @@ Music_SurfingPikachu_Ch3:: rest 1 note D#, 1 rest 1 - -Music_SurfingPikachu_branch_82ea0:: +.mainloop: note E_, 1 rest 1 note B_, 1 @@ -687,4 +682,4 @@ Music_SurfingPikachu_branch_82ea0:: rest 1 note D#, 1 rest 1 - sound_loop 0, Music_SurfingPikachu_branch_82ea0 + sound_loop 0, .mainloop diff --git a/audio/music/titlescreen.asm b/audio/music/titlescreen.asm index a70b2761..624fc064 100644 --- a/audio/music/titlescreen.asm +++ b/audio/music/titlescreen.asm @@ -25,11 +25,10 @@ Music_TitleScreen_Ch1:: note A_, 2 note A_, 2 note F#, 2 - -Music_TitleScreen_branch_7e4e2:: - sound_call Music_TitleScreen_branch_7e541 - sound_call Music_TitleScreen_branch_7e54a - sound_call Music_TitleScreen_branch_7e541 +.mainloop: + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 octave 3 note C_, 8 note_type 8, 12, 6 @@ -52,9 +51,9 @@ Music_TitleScreen_branch_7e4e2:: octave 3 note C_, 2 note D_, 2 - sound_call Music_TitleScreen_branch_7e541 - sound_call Music_TitleScreen_branch_7e54a - sound_call Music_TitleScreen_branch_7e541 + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 note C_, 6 note C_, 6 note E_, 4 @@ -82,21 +81,21 @@ Music_TitleScreen_branch_7e4e2:: octave 4 note C_, 4 note C#, 4 - sound_call Music_TitleScreen_branch_7e55c + sound_call .sub3 note_type 8, 11, 4 octave 4 note C_, 4 note C_, 4 note C#, 4 - sound_call Music_TitleScreen_branch_7e55c + sound_call .sub3 note_type 8, 11, 2 octave 3 note E_, 4 note E_, 4 note C#, 4 - sound_loop 0, Music_TitleScreen_branch_7e4e2 + sound_loop 0, .mainloop -Music_TitleScreen_branch_7e541:: +.sub1: note_type 12, 12, 6 octave 3 note D_, 6 @@ -106,7 +105,7 @@ Music_TitleScreen_branch_7e541:: note D_, 8 sound_ret -Music_TitleScreen_branch_7e54a:: +.sub2: note C_, 6 note F_, 6 note C_, 4 @@ -124,7 +123,7 @@ Music_TitleScreen_branch_7e54a:: note C_, 4 sound_ret -Music_TitleScreen_branch_7e55c:: +.sub3: note_type 12, 12, 1 note D_, 1 rest 1 @@ -153,7 +152,6 @@ Music_TitleScreen_branch_7e55c:: note D_, 1 sound_ret - Music_TitleScreen_Ch2:: vibrato 16, 4, 6 duty_cycle 1 @@ -178,18 +176,17 @@ Music_TitleScreen_Ch2:: note F_, 2 note F_, 2 note F#, 2 - -Music_TitleScreen_branch_7e594:: +.mainloop: vibrato 16, 4, 6 - sound_call Music_TitleScreen_branch_7e622 + sound_call .sub1 octave 2 note A_, 4 note F_, 4 - sound_call Music_TitleScreen_branch_7e62c + sound_call .sub2 octave 2 note A_, 8 note B_, 16 - sound_call Music_TitleScreen_branch_7e622 + sound_call .sub1 octave 2 note A_, 6 note F_, 2 @@ -208,11 +205,11 @@ Music_TitleScreen_branch_7e594:: note D_, 1 note F#, 1 note G_, 16 - sound_call Music_TitleScreen_branch_7e622 + sound_call .sub1 octave 2 note A_, 2 note F_, 6 - sound_call Music_TitleScreen_branch_7e62c + sound_call .sub2 octave 3 note C_, 2 octave 2 @@ -220,7 +217,7 @@ Music_TitleScreen_branch_7e594:: note B_, 6 note G_, 2 note F_, 8 - sound_call Music_TitleScreen_branch_7e622 + sound_call .sub1 note_type 8, 9, 5 octave 2 note G_, 4 @@ -262,7 +259,7 @@ Music_TitleScreen_branch_7e594:: octave 5 note C_, 4 note C#, 4 - sound_call Music_TitleScreen_branch_7e636 + sound_call .sub3 rest 3 note D_, 1 rest 3 @@ -272,7 +269,7 @@ Music_TitleScreen_branch_7e594:: note C_, 4 note C_, 4 note C#, 4 - sound_call Music_TitleScreen_branch_7e636 + sound_call .sub3 note D_, 1 rest 2 note D_, 1 @@ -284,9 +281,9 @@ Music_TitleScreen_branch_7e594:: note C_, 4 octave 4 note B_, 4 - sound_loop 0, Music_TitleScreen_branch_7e594 + sound_loop 0, .mainloop -Music_TitleScreen_branch_7e622:: +.sub1: note_type 12, 14, 7 octave 3 note G_, 6 @@ -296,7 +293,7 @@ Music_TitleScreen_branch_7e622:: note_type 12, 9, 5 sound_ret -Music_TitleScreen_branch_7e62c:: +.sub2: note_type 12, 14, 7 octave 4 note F_, 6 @@ -306,7 +303,7 @@ Music_TitleScreen_branch_7e62c:: note_type 12, 9, 5 sound_ret -Music_TitleScreen_branch_7e636:: +.sub3: note_type 12, 14, 1 note D_, 1 rest 2 @@ -320,7 +317,6 @@ Music_TitleScreen_branch_7e636:: note D_, 1 sound_ret - Music_TitleScreen_Ch3:: note_type 12, 1, 0 octave 3 @@ -347,41 +343,39 @@ Music_TitleScreen_Ch3:: note F_, 2 note F_, 2 note A_, 2 - -Music_TitleScreen_branch_7e65e:: - sound_call Music_TitleScreen_branch_7e6c9 - sound_call Music_TitleScreen_branch_7e6d0 - -Music_TitleScreen_branch_7e664:: - sound_call Music_TitleScreen_branch_7e6c9 - sound_call Music_TitleScreen_branch_7e6c9 - sound_call Music_TitleScreen_branch_7e6c9 - sound_call Music_TitleScreen_branch_7e6d0 - sound_loop 3, Music_TitleScreen_branch_7e664 - sound_call Music_TitleScreen_branch_7e6c9 +.mainloop: + sound_call .sub1 + sound_call .sub2 +.loop1: + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 + sound_loop 3, .loop1 + sound_call .sub1 note G_, 6 note D_, 3 note A_, 6 note F_, 3 note A_, 3 note F_, 3 - sound_call Music_TitleScreen_branch_7e6d7 + sound_call .sub3 note A#, 3 note F_, 3 - sound_call Music_TitleScreen_branch_7e6d7 + sound_call .sub3 note B_, 3 note G_, 3 - sound_call Music_TitleScreen_branch_7e6dc + sound_call .sub4 octave 4 note C_, 3 octave 3 note G_, 3 - sound_call Music_TitleScreen_branch_7e6dc + sound_call .sub4 octave 4 note C#, 3 octave 3 note A_, 3 - sound_call Music_TitleScreen_branch_7e6e5 + sound_call .sub5 octave 5 pitch_slide 1, 4, D_ note D_, 4 @@ -398,7 +392,7 @@ Music_TitleScreen_branch_7e664:: note C_, 4 note C_, 4 note C#, 4 - sound_call Music_TitleScreen_branch_7e6e5 + sound_call .sub5 octave 6 pitch_slide 1, 5, D_ note D_, 4 @@ -413,9 +407,9 @@ Music_TitleScreen_branch_7e664:: note C_, 4 octave 3 note B_, 4 - sound_loop 0, Music_TitleScreen_branch_7e65e + sound_loop 0, .mainloop -Music_TitleScreen_branch_7e6c9:: +.sub1: note G_, 6 note D_, 3 note G_, 6 @@ -424,7 +418,7 @@ Music_TitleScreen_branch_7e6c9:: note D_, 3 sound_ret -Music_TitleScreen_branch_7e6d0:: +.sub2: note F_, 6 note C_, 3 note F_, 6 @@ -433,14 +427,14 @@ Music_TitleScreen_branch_7e6d0:: note C_, 3 sound_ret -Music_TitleScreen_branch_7e6d7:: +.sub3: note A#, 6 note F_, 3 note A#, 6 note F_, 3 sound_ret -Music_TitleScreen_branch_7e6dc:: +.sub4: octave 4 note C_, 6 octave 3 @@ -451,14 +445,13 @@ Music_TitleScreen_branch_7e6dc:: note G_, 3 sound_ret -Music_TitleScreen_branch_7e6e5:: +.sub5: note_type 12, 1, 0 octave 4 note D_, 1 rest 5 sound_ret - Music_TitleScreen_Ch4:: drum_speed 6 rest 4 @@ -486,8 +479,7 @@ Music_TitleScreen_Ch4:: drum_note 3, 2 drum_note 2, 2 drum_note 1, 2 - -Music_TitleScreen_branch_7e716:: +.mainloop: drum_speed 12 drum_note 2, 1 rest 3 @@ -497,8 +489,8 @@ Music_TitleScreen_branch_7e716:: drum_note 2, 1 drum_note 3, 1 rest 3 - sound_call Music_TitleScreen_branch_7e834 - sound_call Music_TitleScreen_branch_7e834 + sound_call .sub1 + sound_call .sub1 drum_note 2, 1 rest 3 drum_note 2, 1 @@ -509,7 +501,7 @@ Music_TitleScreen_branch_7e716:: rest 1 drum_note 3, 1 drum_note 2, 1 - sound_call Music_TitleScreen_branch_7e842 + sound_call .sub2 drum_note 2, 1 rest 3 drum_note 2, 1 @@ -520,7 +512,7 @@ Music_TitleScreen_branch_7e716:: rest 1 drum_note 2, 1 rest 1 - sound_call Music_TitleScreen_branch_7e842 + sound_call .sub2 drum_note 2, 1 rest 3 drum_note 2, 1 @@ -535,8 +527,8 @@ Music_TitleScreen_branch_7e716:: drum_note 4, 1 drum_note 4, 1 drum_speed 12 - sound_call Music_TitleScreen_branch_7e834 - sound_call Music_TitleScreen_branch_7e842 + sound_call .sub1 + sound_call .sub2 drum_note 2, 1 rest 3 drum_note 2, 1 @@ -555,8 +547,8 @@ Music_TitleScreen_branch_7e716:: rest 1 drum_note 3, 1 drum_note 2, 1 - sound_call Music_TitleScreen_branch_7e834 - sound_call Music_TitleScreen_branch_7e842 + sound_call .sub1 + sound_call .sub2 drum_note 2, 1 rest 3 drum_note 2, 1 @@ -652,9 +644,9 @@ Music_TitleScreen_branch_7e716:: drum_note 2, 4 drum_note 3, 4 drum_note 2, 4 - sound_loop 0, Music_TitleScreen_branch_7e716 + sound_loop 0, .mainloop -Music_TitleScreen_branch_7e834:: +.sub1: drum_note 2, 1 rest 3 drum_note 2, 1 @@ -665,7 +657,7 @@ Music_TitleScreen_branch_7e834:: rest 3 sound_ret -Music_TitleScreen_branch_7e842:: +.sub2: drum_note 2, 1 rest 3 drum_note 2, 1 diff --git a/audio/music/trainerbattle.asm b/audio/music/trainerbattle.asm index ba5d6d1b..08df5fb5 100644 --- a/audio/music/trainerbattle.asm +++ b/audio/music/trainerbattle.asm @@ -65,8 +65,7 @@ Music_TrainerBattle_Ch1:: note F_, 6 note C_, 2 note C#, 2 - -Music_TrainerBattle_branch_22962:: +.mainloop: note_type 12, 11, 5 note D_, 2 note E_, 4 @@ -646,8 +645,7 @@ Music_TrainerBattle_branch_22962:: note G#, 1 note A_, 1 note A#, 1 - sound_loop 0, Music_TrainerBattle_branch_22962 - + sound_loop 0, .mainloop Music_TrainerBattle_Ch2:: duty_cycle 3 @@ -721,8 +719,7 @@ Music_TrainerBattle_Ch2:: note D_, 6 octave 4 note A_, 4 - -Music_TrainerBattle_branch_22bfc:: +.mainloop: note_type 12, 12, 7 octave 3 note B_, 6 @@ -950,8 +947,7 @@ Music_TrainerBattle_branch_22bfc:: note C_, 16 note E_, 8 note G_, 8 - sound_loop 0, Music_TrainerBattle_branch_22bfc - + sound_loop 0, .mainloop Music_TrainerBattle_Ch3:: vibrato 0, 2, 0 @@ -1091,8 +1087,7 @@ Music_TrainerBattle_Ch3:: note A#, 2 octave 3 note C_, 2 - -Music_TrainerBattle_branch_22d9c:: +.mainloop: octave 2 note A#, 1 note B_, 1 @@ -1854,4 +1849,4 @@ Music_TrainerBattle_branch_22d9c:: note E_, 2 note D_, 2 note C_, 2 - sound_loop 0, Music_TrainerBattle_branch_22d9c + sound_loop 0, .mainloop diff --git a/audio/music/unusedsong.asm b/audio/music/unusedsong.asm index a2291a2a..ce343441 100644 --- a/audio/music/unusedsong.asm +++ b/audio/music/unusedsong.asm @@ -2,8 +2,7 @@ Music_UnusedSong_Ch1:: tempo 144 volume 7, 7 vibrato 5, 1, 6 - -Music_UnusedSong_branch_a91b:: +.mainloop: note_type 12, 1, 0 octave 6 note E_, 1 @@ -178,17 +177,16 @@ Music_UnusedSong_branch_a91b:: rest 6 note B_, 2 rest 6 - sound_loop 0, Music_UnusedSong_branch_a91b - sound_ret + sound_loop 0, .mainloop + sound_ret ; unused Music_UnusedSong_Ch2:: tempo 144 volume 7, 7 toggle_perfect_pitch vibrato 6, 1, 5 - -Music_UnusedSong_branch_a9d8:: +.mainloop: note_type 12, 1, 0 octave 6 note E_, 1 @@ -334,5 +332,6 @@ Music_UnusedSong_branch_a9d8:: rest 6 note D#, 2 rest 6 - sound_loop 0, Music_UnusedSong_branch_a9d8 - sound_ret + sound_loop 0, .mainloop + + sound_ret ; unused diff --git a/audio/music/vermilion.asm b/audio/music/vermilion.asm index 2788cde9..ed0bc846 100644 --- a/audio/music/vermilion.asm +++ b/audio/music/vermilion.asm @@ -4,8 +4,7 @@ Music_Vermilion_Ch1:: duty_cycle 3 vibrato 12, 3, 4 toggle_perfect_pitch - -Music_Vermilion_branch_b9f6:: +.mainloop: note_type 12, 11, 5 octave 3 note E_, 4 @@ -108,14 +107,12 @@ Music_Vermilion_branch_b9f6:: note F#, 2 note G#, 2 note B_, 2 - sound_loop 0, Music_Vermilion_branch_b9f6 - + sound_loop 0, .mainloop Music_Vermilion_Ch2:: duty_cycle 3 vibrato 10, 2, 3 - -Music_Vermilion_branch_ba66:: +.mainloop: note_type 12, 12, 7 octave 3 note A_, 8 @@ -175,13 +172,11 @@ Music_Vermilion_branch_ba66:: note E_, 4 note F#, 8 note E_, 8 - sound_loop 0, Music_Vermilion_branch_ba66 - + sound_loop 0, .mainloop Music_Vermilion_Ch3:: note_type 12, 1, 0 - -Music_Vermilion_branch_baa8:: +.mainloop: octave 4 note A_, 2 note E_, 2 @@ -279,14 +274,13 @@ Music_Vermilion_branch_baa8:: note E_, 2 note G#, 2 note E_, 2 - sound_loop 0, Music_Vermilion_branch_baa8 - + sound_loop 0, .mainloop Music_Vermilion_Ch4:: drum_speed 12 - -Music_Vermilion_branch_bb0e:: - sound_call Music_Vermilion_branch_bb3f +.mainloop: +.loop1: + sound_call .sub1 drum_note 6, 2 drum_note 6, 1 drum_note 6, 1 @@ -300,14 +294,14 @@ Music_Vermilion_branch_bb0e:: drum_note 6, 1 drum_note 6, 1 drum_note 6, 1 - sound_loop 4, Music_Vermilion_branch_bb0e - sound_call Music_Vermilion_branch_bb3f - sound_call Music_Vermilion_branch_bb3f - sound_call Music_Vermilion_branch_bb3f - sound_call Music_Vermilion_branch_bb3f - sound_loop 0, Music_Vermilion_branch_bb0e + sound_loop 4, .loop1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_loop 0, .mainloop -Music_Vermilion_branch_bb3f:: +.sub1: drum_note 6, 2 drum_note 6, 1 drum_note 6, 1 diff --git a/audio/music/wildbattle.asm b/audio/music/wildbattle.asm index f7cfab14..c8ebf562 100644 --- a/audio/music/wildbattle.asm +++ b/audio/music/wildbattle.asm @@ -60,8 +60,7 @@ Music_WildBattle_Ch1:: note E_, 6 note D#, 10 note C#, 10 - -Music_WildBattle_branch_230e0:: +.mainloop: note_type 12, 11, 3 note C#, 1 note D_, 1 @@ -297,8 +296,7 @@ Music_WildBattle_branch_230e0:: note D#, 6 note_type 12, 10, 7 note C#, 8 - sound_loop 0, Music_WildBattle_branch_230e0 - + sound_loop 0, .mainloop Music_WildBattle_Ch2:: duty_cycle 3 @@ -371,8 +369,7 @@ Music_WildBattle_Ch2:: note G_, 6 note G_, 10 note G_, 10 - -Music_WildBattle_branch_23225:: +.mainloop: note_type 12, 12, 5 note G_, 6 note F#, 6 @@ -459,8 +456,7 @@ Music_WildBattle_branch_23225:: note G_, 6 note_type 12, 12, 7 note F_, 8 - sound_loop 0, Music_WildBattle_branch_23225 - + sound_loop 0, .mainloop Music_WildBattle_Ch3:: vibrato 0, 2, 0 @@ -497,8 +493,7 @@ Music_WildBattle_Ch3:: octave 3 note A#, 2 note B_, 2 - -Music_WildBattle_branch_232b5:: +.introloop: octave 4 note C_, 2 note G_, 2 @@ -530,9 +525,8 @@ Music_WildBattle_branch_232b5:: note A#, 2 note G#, 2 note F_, 2 - sound_loop 2, Music_WildBattle_branch_232b5 - -Music_WildBattle_branch_232d8:: + sound_loop 2, .introloop +.mainloop: note C_, 2 note G_, 2 note C_, 2 @@ -735,4 +729,4 @@ Music_WildBattle_branch_232d8:: note G#, 2 note C#, 2 note G#, 2 - sound_loop 0, Music_WildBattle_branch_232d8 + sound_loop 0, .mainloop diff --git a/audio/music/yellowunusedsong.asm b/audio/music/yellowunusedsong.asm index f1e4d18f..c129fa53 100644 --- a/audio/music/yellowunusedsong.asm +++ b/audio/music/yellowunusedsong.asm @@ -24,8 +24,7 @@ Music_YellowUnusedSong_Ch1:: note A_, 6 note G_, 6 note A_, 12 - -Music_YellowUnusedSong_branch_82fde:: +.mainloop: note A_, 6 note A_, 2 note A_, 2 @@ -72,8 +71,7 @@ Music_YellowUnusedSong_branch_82fde:: note A_, 6 note G_, 6 note A_, 12 - sound_loop 0, Music_YellowUnusedSong_branch_82fde - + sound_loop 0, .mainloop Music_YellowUnusedSong_Ch2:: duty_cycle 2 @@ -100,8 +98,7 @@ Music_YellowUnusedSong_Ch2:: note D_, 6 note A#, 6 note A_, 12 - -Music_YellowUnusedSong_branch_8302a:: +.mainloop: note D_, 6 note D_, 2 note D_, 2 @@ -158,8 +155,7 @@ Music_YellowUnusedSong_branch_8302a:: note D_, 6 note A#, 6 note A_, 12 - sound_loop 0, Music_YellowUnusedSong_branch_8302a - + sound_loop 0, .mainloop Music_YellowUnusedSong_Ch3:: note_type 12, 1, 0 @@ -172,8 +168,7 @@ Music_YellowUnusedSong_Ch3:: note D#, 8 note G_, 8 note A#, 8 - -Music_YellowUnusedSong_branch_83075:: +.mainloop: note A_, 8 note A#, 8 note G_, 8 @@ -199,8 +194,7 @@ Music_YellowUnusedSong_branch_83075:: note D#, 8 note G_, 8 note A#, 8 - sound_loop 0, Music_YellowUnusedSong_branch_83075 - + sound_loop 0, .mainloop Music_YellowUnusedSong_Ch4:: drum_speed 12 @@ -230,8 +224,7 @@ Music_YellowUnusedSong_Ch4:: drum_note 3, 2 drum_note 3, 4 drum_note 3, 4 - -Music_YellowUnusedSong_branch_830c3:: +.mainloop: drum_note 3, 4 drum_speed 8 drum_note 3, 2 @@ -323,4 +316,4 @@ Music_YellowUnusedSong_branch_830c3:: drum_note 3, 2 drum_note 3, 4 drum_note 3, 4 - sound_loop 0, Music_YellowUnusedSong_branch_830c3 + sound_loop 0, .mainloop |