diff options
104 files changed, 2788 insertions, 2740 deletions
diff --git a/audio/music/aftertherivalfight.asm b/audio/music/aftertherivalfight.asm index 49a713715..6ca23b0d1 100644 --- a/audio/music/aftertherivalfight.asm +++ b/audio/music/aftertherivalfight.asm @@ -22,7 +22,7 @@ Music_AfterTheRivalFight_Ch1: note G#, 2 note G#, 2 note G#, 2 - sound_loop 0, Music_AfterTheRivalFight_branch_f4fb1 + sound_loop 0, Music_LookRival_Ch1.mainloop Music_AfterTheRivalFight_Ch2: duty_cycle 1 @@ -37,7 +37,7 @@ Music_AfterTheRivalFight_Ch2: note G#, 2 note G#, 2 note G#, 2 - sound_loop 0, Music_AfterTheRivalFight_branch_f502e + sound_loop 0, Music_LookRival_Ch2.mainloop Music_AfterTheRivalFight_Ch3: note_type 12, 2, 8 @@ -50,7 +50,7 @@ Music_AfterTheRivalFight_Ch3: note F#, 2 note F_, 2 note D#, 2 - sound_loop 0, Music_AfterTheRivalFight_branch_f509d + sound_loop 0, Music_LookRival_Ch3.mainloop Music_AfterTheRivalFight_Ch4: toggle_noise 3 @@ -62,4 +62,4 @@ Music_AfterTheRivalFight_Ch4: drum_note 3, 2 drum_note 3, 2 drum_note 3, 2 - sound_loop 0, Music_AfterTheRivalFight_branch_f5118 + sound_loop 0, Music_LookRival_Ch4.mainloop diff --git a/audio/music/azaleatown.asm b/audio/music/azaleatown.asm index 4570ba3e0..d895469d5 100644 --- a/audio/music/azaleatown.asm +++ b/audio/music/azaleatown.asm @@ -12,7 +12,7 @@ Music_AzaleaTown_Ch1: stereo_panning FALSE, TRUE note_type 12, 10, 1 rest 2 -Music_AzaleaTown_branch_f5801: +.introloop: volume_envelope 10, 1 octave 3 note F_, 2 @@ -26,9 +26,9 @@ Music_AzaleaTown_branch_f5801: note F_, 2 note F_, 2 note F_, 2 - sound_loop 2, Music_AzaleaTown_branch_f5801 -Music_AzaleaTown_branch_f5816: - sound_call Music_AzaleaTown_branch_f588c + sound_loop 2, .introloop +.mainloop: + sound_call .sub1 stereo_panning TRUE, FALSE volume_envelope 10, 4 note G#, 2 @@ -43,7 +43,7 @@ Music_AzaleaTown_branch_f5816: note D#, 2 rest 2 stereo_panning FALSE, TRUE - sound_call Music_AzaleaTown_branch_f588c + sound_call .sub1 stereo_panning TRUE, FALSE note_type 6, 10, 4 note D#, 4 @@ -56,7 +56,7 @@ Music_AzaleaTown_branch_f5816: note A#, 4 note F#, 4 stereo_panning FALSE, TRUE - sound_call Music_AzaleaTown_branch_f5912 + sound_call .sub2 volume_envelope 10, 3 note A#, 4 octave 4 @@ -69,7 +69,7 @@ Music_AzaleaTown_branch_f5816: note C#, 4 note A_, 2 rest 14 - sound_call Music_AzaleaTown_branch_f5912 + sound_call .sub2 volume_envelope 10, 3 octave 4 note C_, 1 @@ -118,9 +118,9 @@ Music_AzaleaTown_branch_f5816: octave 3 note G#, 14 rest 2 - sound_loop 0, Music_AzaleaTown_branch_f5816 + sound_loop 0, .mainloop -Music_AzaleaTown_branch_f588c: +.sub1: note_type 12, 10, 1 octave 4 note F_, 2 @@ -219,7 +219,7 @@ Music_AzaleaTown_branch_f588c: note C#, 2 sound_ret -Music_AzaleaTown_branch_f5912: +.sub2: volume_envelope 6, 1 note G#, 8 note G#, 8 @@ -265,8 +265,8 @@ Music_AzaleaTown_Ch2: duty_cycle 1 octave 5 note C_, 1 -Music_AzaleaTown_branch_f5952: - sound_call Music_AzaleaTown_branch_f59c7 +.mainloop: + sound_call .sub1 note C#, 4 note C_, 2 note C#, 1 @@ -277,7 +277,7 @@ Music_AzaleaTown_branch_f5952: duty_cycle 1 octave 5 note C_, 1 - sound_call Music_AzaleaTown_branch_f59c7 + sound_call .sub1 rest 2 note C#, 2 note C_, 2 @@ -362,9 +362,9 @@ Music_AzaleaTown_branch_f5952: note G#, 2 octave 5 note C_, 2 - sound_loop 0, Music_AzaleaTown_branch_f5952 + sound_loop 0, .mainloop -Music_AzaleaTown_branch_f59c7: +.sub1: note C#, 4 octave 4 note G#, 2 @@ -441,15 +441,15 @@ Music_AzaleaTown_Ch3: note C#, 1 rest 1 note G#, 4 -Music_AzaleaTown_branch_f5a24: - sound_call Music_AzaleaTown_branch_f5a86 +.mainloop: + sound_call .sub1 note G#, 4 note D#, 2 - sound_call Music_AzaleaTown_branch_f5a86 + sound_call .sub1 note G#, 2 rest 2 note F#, 2 - sound_call Music_AzaleaTown_branch_f5acf + sound_call .sub2 note A#, 1 rest 1 octave 4 @@ -463,7 +463,7 @@ Music_AzaleaTown_branch_f5a24: rest 3 note F_, 1 rest 1 - sound_call Music_AzaleaTown_branch_f5acf + sound_call .sub2 octave 2 note A#, 2 octave 3 @@ -528,9 +528,9 @@ Music_AzaleaTown_branch_f5a24: note B_, 1 octave 3 note C_, 1 - sound_loop 0, Music_AzaleaTown_branch_f5a24 + sound_loop 0, .mainloop -Music_AzaleaTown_branch_f5a86: +.sub1: note C#, 1 rest 5 note C#, 1 @@ -603,7 +603,7 @@ Music_AzaleaTown_branch_f5a86: rest 1 sound_ret -Music_AzaleaTown_branch_f5acf: +.sub2: volume_envelope 3, 5 octave 3 note F_, 1 @@ -629,7 +629,7 @@ Music_AzaleaTown_Ch4: toggle_noise 3 drum_speed 12 drum_note 6, 2 -Music_AzaleaTown_branch_f5aea: +.mainloop: drum_note 4, 2 drum_note 7, 2 drum_note 3, 2 @@ -651,4 +651,4 @@ Music_AzaleaTown_branch_f5aea: drum_note 4, 2 drum_note 3, 2 drum_note 7, 2 - sound_loop 0, Music_AzaleaTown_branch_f5aea + sound_loop 0, .mainloop diff --git a/audio/music/battletowerlobby.asm b/audio/music/battletowerlobby.asm index 53287f833..50e127fdc 100644 --- a/audio/music/battletowerlobby.asm +++ b/audio/music/battletowerlobby.asm @@ -13,7 +13,7 @@ Music_BattleTowerLobby_Ch1: vibrato 8, 2, 2 stereo_panning TRUE, FALSE note_type 12, 7, 2 -Music_BattleTowerLobby_branch_1794a9: +.mainloop: note_type 12, 7, 2 octave 3 note G#, 2 @@ -115,14 +115,14 @@ Music_BattleTowerLobby_branch_1794a9: note_type 12, 7, 5 octave 2 note B_, 4 - sound_loop 0, Music_BattleTowerLobby_branch_1794a9 + sound_loop 0, .mainloop Music_BattleTowerLobby_Ch2: duty_cycle 2 vibrato 16, 3, 4 stereo_panning FALSE, TRUE note_type 12, 8, 2 -Music_BattleTowerLobby_branch_179544: +.mainloop: note_type 12, 8, 2 octave 4 note E_, 2 @@ -199,11 +199,11 @@ Music_BattleTowerLobby_branch_179544: note B_, 1 octave 4 note D#, 1 - sound_loop 0, Music_BattleTowerLobby_branch_179544 + sound_loop 0, .mainloop Music_BattleTowerLobby_Ch3: note_type 12, 1, 1 -Music_BattleTowerLobby_branch_1795b1: +.mainloop: octave 2 note B_, 2 octave 3 @@ -295,15 +295,15 @@ Music_BattleTowerLobby_branch_1795b1: note E_, 2 note D#, 2 note F#, 2 - sound_loop 0, Music_BattleTowerLobby_branch_1795b1 + sound_loop 0, .mainloop Music_BattleTowerLobby_Ch4: toggle_noise 0 -Music_BattleTowerLobby_branch_179612: +.mainloop: drum_speed 12 rest 2 drum_note 6, 4 drum_note 6, 4 drum_note 6, 2 drum_note 6, 4 - sound_loop 0, Music_BattleTowerLobby_branch_179612 + sound_loop 0, .mainloop diff --git a/audio/music/battletowertheme.asm b/audio/music/battletowertheme.asm index 1fe07dcb3..4aa262045 100644 --- a/audio/music/battletowertheme.asm +++ b/audio/music/battletowertheme.asm @@ -12,7 +12,7 @@ Music_BattleTowerTheme_Ch1: vibrato 18, 3, 4 stereo_panning FALSE, TRUE note_type 6, 9, 4 -Music_BattleTowerTheme_branch_1788a5: +.mainloop: rest 16 rest 16 rest 12 @@ -22,7 +22,7 @@ Music_BattleTowerTheme_branch_1788a5: note C_, 2 note E_, 2 note G_, 4 - sound_call Music_BattleTowerTheme_branch_17895e + sound_call .sub1 note G_, 2 rest 2 note C_, 4 @@ -40,7 +40,7 @@ Music_BattleTowerTheme_branch_1788a5: octave 3 note G_, 2 note E_, 2 - sound_call Music_BattleTowerTheme_branch_17895e + sound_call .sub1 note G_, 2 rest 2 octave 2 @@ -184,9 +184,9 @@ Music_BattleTowerTheme_branch_1788a5: rest 1 note E_, 4 rest 12 - sound_loop 0, Music_BattleTowerTheme_branch_1788a5 + sound_loop 0, .mainloop -Music_BattleTowerTheme_branch_17895e: +.sub1: volume_envelope 9, 4 note A_, 2 rest 2 @@ -204,7 +204,7 @@ Music_BattleTowerTheme_branch_17895e: Music_BattleTowerTheme_Ch2: vibrato 18, 3, 4 -Music_BattleTowerTheme_branch_178970: +.mainloop: duty_cycle 3 note_type 6, 11, 8 octave 3 @@ -246,14 +246,14 @@ Music_BattleTowerTheme_branch_178970: octave 4 note C_, 2 note E_, 4 - sound_call Music_BattleTowerTheme_branch_178a15 + sound_call .sub1 note A#, 4 rest 2 note F_, 2 note_type 12, 11, 7 note C_, 12 note_type 6, 11, 7 - sound_call Music_BattleTowerTheme_branch_178a15 + sound_call .sub1 note_type 12, 11, 7 note A#, 2 rest 1 @@ -342,9 +342,9 @@ Music_BattleTowerTheme_branch_178970: note C_, 2 note D_, 2 note E_, 4 - sound_loop 0, Music_BattleTowerTheme_branch_178970 + sound_loop 0, .mainloop -Music_BattleTowerTheme_branch_178a15: +.sub1: note F_, 2 rest 2 note F_, 8 @@ -360,9 +360,9 @@ Music_BattleTowerTheme_branch_178a15: Music_BattleTowerTheme_Ch3: vibrato 18, 3, 4 note_type 6, 1, 6 -Music_BattleTowerTheme_branch_178a26: +.mainloop: stereo_panning TRUE, TRUE - sound_call Music_BattleTowerTheme_branch_178afe + sound_call .sub1 note C_, 2 rest 2 note F_, 4 @@ -377,7 +377,7 @@ Music_BattleTowerTheme_branch_178a26: rest 4 stereo_panning TRUE, FALSE note C_, 8 - sound_call Music_BattleTowerTheme_branch_178afe + sound_call .sub1 note C_, 2 rest 2 note F_, 4 @@ -391,7 +391,7 @@ Music_BattleTowerTheme_branch_178a26: rest 4 note C_, 2 rest 2 - sound_call Music_BattleTowerTheme_branch_178afe + sound_call .sub1 octave 2 note A#, 2 rest 2 @@ -564,9 +564,9 @@ Music_BattleTowerTheme_branch_178a26: rest 1 note G_, 4 rest 12 - sound_loop 0, Music_BattleTowerTheme_branch_178a26 + sound_loop 0, .mainloop -Music_BattleTowerTheme_branch_178afe: +.sub1: octave 3 note C_, 2 rest 2 @@ -586,8 +586,8 @@ Music_BattleTowerTheme_branch_178afe: Music_BattleTowerTheme_Ch4: toggle_noise 3 drum_speed 12 -Music_BattleTowerTheme_branch_178b11: - sound_call Music_BattleTowerTheme_branch_178b58 +.mainloop: + sound_call .sub1 drum_note 3, 2 drum_note 3, 4 drum_note 3, 1 @@ -597,20 +597,20 @@ Music_BattleTowerTheme_branch_178b11: drum_note 2, 1 drum_note 3, 1 drum_note 2, 1 -Music_BattleTowerTheme_branch_178b1d: - sound_call Music_BattleTowerTheme_branch_178b58 - sound_call Music_BattleTowerTheme_branch_178b61 - sound_loop 2, Music_BattleTowerTheme_branch_178b1d - sound_call Music_BattleTowerTheme_branch_178b6c - sound_call Music_BattleTowerTheme_branch_178b61 - sound_call Music_BattleTowerTheme_branch_178b6c +.loop1: + sound_call .sub1 + sound_call .sub2 + sound_loop 2, .loop1 + sound_call .sub3 + sound_call .sub2 + sound_call .sub3 drum_note 3, 2 drum_note 3, 4 drum_note 3, 1 drum_note 3, 1 drum_note 3, 8 -Music_BattleTowerTheme_branch_178b35: - sound_call Music_BattleTowerTheme_branch_178b76 +.loop2: + sound_call .sub4 drum_note 3, 2 drum_note 3, 2 drum_note 3, 2 @@ -622,8 +622,8 @@ Music_BattleTowerTheme_branch_178b35: drum_note 2, 1 drum_note 3, 1 drum_note 2, 1 - sound_loop 3, Music_BattleTowerTheme_branch_178b35 - sound_call Music_BattleTowerTheme_branch_178b76 + sound_loop 3, .loop2 + sound_call .sub4 drum_note 3, 2 drum_note 3, 2 drum_note 3, 2 @@ -634,9 +634,9 @@ Music_BattleTowerTheme_branch_178b35: drum_note 2, 1 drum_note 3, 1 drum_note 2, 1 - sound_loop 0, Music_BattleTowerTheme_branch_178b11 + sound_loop 0, .mainloop -Music_BattleTowerTheme_branch_178b58: +.sub1: drum_note 3, 2 drum_note 3, 4 drum_note 3, 1 @@ -647,7 +647,7 @@ Music_BattleTowerTheme_branch_178b58: drum_note 3, 1 sound_ret -Music_BattleTowerTheme_branch_178b61: +.sub2: drum_note 3, 2 drum_note 3, 4 drum_note 3, 1 @@ -660,7 +660,7 @@ Music_BattleTowerTheme_branch_178b61: drum_note 2, 1 sound_ret -Music_BattleTowerTheme_branch_178b6c: +.sub3: drum_note 3, 2 drum_note 3, 4 drum_note 3, 1 @@ -672,7 +672,7 @@ Music_BattleTowerTheme_branch_178b6c: drum_note 3, 1 sound_ret -Music_BattleTowerTheme_branch_178b76: +.sub4: drum_note 3, 2 drum_note 2, 2 drum_note 3, 2 diff --git a/audio/music/bicycle.asm b/audio/music/bicycle.asm index 236f67b11..0cf69d06e 100644 --- a/audio/music/bicycle.asm +++ b/audio/music/bicycle.asm @@ -23,7 +23,7 @@ Music_Bicycle_Ch1: note A_, 8 volume_envelope 11, 2 note F#, 2 -Music_Bicycle_branch_ee144: +.mainloop: stereo_panning FALSE, TRUE volume_envelope 11, 2 note G_, 2 @@ -168,7 +168,7 @@ Music_Bicycle_branch_ee144: note G_, 2 note G#, 2 note A_, 2 - sound_loop 0, Music_Bicycle_branch_ee144 + sound_loop 0, .mainloop Music_Bicycle_Ch2: duty_cycle 2 @@ -194,7 +194,7 @@ Music_Bicycle_Ch2: octave 3 note B_, 2 note A_, 2 -Music_Bicycle_branch_ee1fd: +.mainloop: stereo_panning TRUE, TRUE duty_cycle 2 volume_envelope 12, 3 @@ -254,7 +254,7 @@ Music_Bicycle_branch_ee1fd: volume_envelope 12, 7 note F#, 8 stereo_panning FALSE, TRUE - sound_call Music_Bicycle_branch_ee263 + sound_call .sub1 note F#, 4 volume_envelope 12, 3 note A_, 2 @@ -263,7 +263,7 @@ Music_Bicycle_branch_ee1fd: note F_, 2 note F#, 4 volume_envelope 12, 7 - sound_call Music_Bicycle_branch_ee263 + sound_call .sub1 note F#, 4 volume_envelope 12, 3 note A_, 2 @@ -271,9 +271,9 @@ Music_Bicycle_branch_ee1fd: note A_, 2 note G_, 2 note F#, 4 - sound_loop 0, Music_Bicycle_branch_ee1fd + sound_loop 0, .mainloop -Music_Bicycle_branch_ee263: +.sub1: note G_, 6 note B_, 6 note G_, 4 @@ -302,8 +302,8 @@ Music_Bicycle_Ch3: octave 3 note A_, 1 rest 1 -Music_Bicycle_branch_ee27f: - sound_call Music_Bicycle_branch_ee333 +.mainloop: + sound_call .sub1 note E_, 1 rest 1 note G_, 1 @@ -354,7 +354,7 @@ Music_Bicycle_branch_ee27f: rest 1 note F#, 1 rest 1 - sound_call Music_Bicycle_branch_ee333 + sound_call .sub1 note E_, 1 rest 1 note G_, 1 @@ -405,7 +405,7 @@ Music_Bicycle_branch_ee27f: rest 1 note A_, 1 rest 1 -Music_Bicycle_branch_ee2e9: +.loop1: note G_, 1 rest 1 note B_, 1 @@ -472,10 +472,10 @@ Music_Bicycle_branch_ee2e9: rest 1 note A_, 1 rest 1 - sound_loop 2, Music_Bicycle_branch_ee2e9 - sound_loop 0, Music_Bicycle_branch_ee27f + sound_loop 2, .loop1 + sound_loop 0, .mainloop -Music_Bicycle_branch_ee333: +.sub1: octave 3 note G_, 1 rest 1 @@ -500,16 +500,16 @@ Music_Bicycle_Ch4: drum_speed 12 rest 16 rest 16 -Music_Bicycle_branch_ee34b: +.mainloop: rest 2 -Music_Bicycle_branch_ee34c: +.loop1: stereo_panning TRUE, FALSE drum_note 6, 4 - sound_loop 12, Music_Bicycle_branch_ee34c + sound_loop 12, .loop1 drum_note 6, 4 drum_note 6, 4 stereo_panning TRUE, TRUE drum_note 6, 2 drum_note 6, 2 drum_note 6, 2 - sound_loop 0, Music_Bicycle_branch_ee34b + sound_loop 0, .mainloop diff --git a/audio/music/buenaspassword.asm b/audio/music/buenaspassword.asm index 7a0a29161..b5bc7de3c 100644 --- a/audio/music/buenaspassword.asm +++ b/audio/music/buenaspassword.asm @@ -11,7 +11,7 @@ Music_BuenasPassword_Ch1: pitch_offset 1 note_type 12, 11, 3 rest 8 -Music_BuenasPassword_branch_17816b: +.mainloop: stereo_panning TRUE, TRUE rest 16 rest 16 @@ -38,15 +38,15 @@ Music_BuenasPassword_branch_17816b: note G#, 2 rest 12 duty_cycle 2 - sound_call Music_BuenasPassword_branch_178204 + sound_call .sub1 stereo_panning TRUE, TRUE - sound_call Music_BuenasPassword_branch_1782df - sound_call Music_BuenasPassword_branch_178222 - sound_call Music_BuenasPassword_branch_178204 + sound_call Music_BuenasPassword_Ch2.sub3 + sound_call .sub2 + sound_call .sub1 stereo_panning TRUE, TRUE - sound_call Music_BuenasPassword_branch_1782df - sound_call Music_BuenasPassword_branch_178222 - sound_call Music_BuenasPassword_branch_178204 + sound_call Music_BuenasPassword_Ch2.sub3 + sound_call .sub2 + sound_call .sub1 duty_cycle 1 note C#, 2 rest 2 @@ -137,9 +137,9 @@ Music_BuenasPassword_branch_17816b: rest 1 note G_, 1 rest 1 - sound_loop 0, Music_BuenasPassword_branch_17816b + sound_loop 0, .mainloop -Music_BuenasPassword_branch_178204: +.sub1: stereo_panning FALSE, TRUE note_type 6, 8, 4 octave 4 @@ -162,7 +162,7 @@ Music_BuenasPassword_branch_178204: note_type 12, 8, 4 sound_ret -Music_BuenasPassword_branch_178222: +.sub2: octave 3 note D#, 1 rest 1 @@ -186,25 +186,25 @@ Music_BuenasPassword_Ch2: rest 7 octave 3 note F#, 1 -Music_BuenasPassword_branch_17823c: +.mainloop: stereo_panning TRUE, TRUE - sound_call Music_BuenasPassword_branch_1782df - sound_call Music_BuenasPassword_branch_1782a4 + sound_call .sub3 + sound_call .sub1 stereo_panning TRUE, TRUE - sound_call Music_BuenasPassword_branch_1782cc + sound_call .sub2 octave 3 note B_, 2 note A#, 2 note B_, 2 note G#, 16 - sound_call Music_BuenasPassword_branch_1782a4 + sound_call .sub1 stereo_panning TRUE, TRUE - sound_call Music_BuenasPassword_branch_1782cc + sound_call .sub2 note B_, 2 note A#, 2 note B_, 2 note G#, 16 - sound_call Music_BuenasPassword_branch_1782a4 + sound_call .sub1 note F#, 2 rest 2 note G#, 2 @@ -270,9 +270,9 @@ Music_BuenasPassword_branch_17823c: note G_, 1 rest 1 volume_envelope 10, 5 - sound_loop 0, Music_BuenasPassword_branch_17823c + sound_loop 0, .mainloop -Music_BuenasPassword_branch_1782a4: +.sub1: octave 3 note G#, 1 rest 1 @@ -305,7 +305,7 @@ Music_BuenasPassword_branch_1782a4: note_type 12, 10, 5 sound_ret -Music_BuenasPassword_branch_1782cc: +.sub2: octave 4 note G#, 2 rest 2 @@ -326,7 +326,7 @@ Music_BuenasPassword_branch_1782cc: rest 2 sound_ret -Music_BuenasPassword_branch_1782df: +.sub3: octave 3 note G#, 1 rest 1 @@ -381,10 +381,11 @@ Music_BuenasPassword_branch_1782df: Music_BuenasPassword_Ch3: note_type 12, 1, 4 rest 8 -Music_BuenasPassword_branch_178315: - sound_call Music_BuenasPassword_branch_1783a7 - sound_call Music_BuenasPassword_branch_1783a7 - sound_call Music_BuenasPassword_branch_1783a7 +.mainloop: +.loop1: + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 octave 2 note G#, 1 rest 1 @@ -401,7 +402,7 @@ Music_BuenasPassword_branch_178315: note B_, 1 rest 1 note G#, 4 - sound_loop 3, Music_BuenasPassword_branch_178315 + sound_loop 3, .loop1 note F#, 1 rest 1 note A#, 1 @@ -473,7 +474,7 @@ Music_BuenasPassword_branch_178315: note D#, 1 rest 1 note G_, 2 - sound_call Music_BuenasPassword_branch_1783bc + sound_call .sub2 octave 3 note C#, 1 rest 1 @@ -493,7 +494,7 @@ Music_BuenasPassword_branch_178315: rest 1 octave 3 note C#, 2 - sound_call Music_BuenasPassword_branch_1783bc + sound_call .sub2 note G#, 1 rest 1 note G#, 1 @@ -511,9 +512,9 @@ Music_BuenasPassword_branch_178315: rest 1 note G_, 1 rest 1 - sound_loop 0, Music_BuenasPassword_branch_178315 + sound_loop 0, .mainloop -Music_BuenasPassword_branch_1783a7: +.sub1: octave 2 note G#, 1 rest 1 @@ -536,7 +537,7 @@ Music_BuenasPassword_branch_1783a7: note C#, 1 sound_ret -Music_BuenasPassword_branch_1783bc: +.sub2: octave 2 note G#, 1 rest 1 @@ -566,15 +567,16 @@ Music_BuenasPassword_Ch4: drum_note 3, 2 drum_note 3, 1 drum_note 3, 1 -Music_BuenasPassword_branch_1783d9: - sound_call Music_BuenasPassword_branch_17840c - sound_call Music_BuenasPassword_branch_17840c - sound_call Music_BuenasPassword_branch_17840c - sound_call Music_BuenasPassword_branch_178424 - sound_loop 4, Music_BuenasPassword_branch_1783d9 - sound_call Music_BuenasPassword_branch_17840c - sound_call Music_BuenasPassword_branch_17840c - sound_call Music_BuenasPassword_branch_17840c +.mainloop: +.loop1: + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 + sound_loop 4, .loop1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 stereo_panning TRUE, TRUE drum_note 4, 2 stereo_panning TRUE, FALSE @@ -591,9 +593,9 @@ Music_BuenasPassword_branch_1783d9: drum_note 3, 2 drum_note 3, 1 drum_note 3, 1 - sound_loop 0, Music_BuenasPassword_branch_1783d9 + sound_loop 0, .mainloop -Music_BuenasPassword_branch_17840c: +.sub1: stereo_panning TRUE, TRUE drum_note 4, 2 stereo_panning TRUE, FALSE @@ -612,7 +614,7 @@ Music_BuenasPassword_branch_17840c: drum_note 8, 2 sound_ret -Music_BuenasPassword_branch_178424: +.sub2: stereo_panning TRUE, TRUE drum_note 4, 2 stereo_panning TRUE, FALSE diff --git a/audio/music/bugcatchingcontest.asm b/audio/music/bugcatchingcontest.asm index 4ce5dd933..cdc1dbd23 100644 --- a/audio/music/bugcatchingcontest.asm +++ b/audio/music/bugcatchingcontest.asm @@ -38,17 +38,17 @@ Music_BugCatchingContest_Ch1: rest 1 note E_, 1 note E_, 1 -Music_BugCatchingContest_branch_f7c4b: +.mainloop: note_type 12, 11, 1 -Music_BugCatchingContest_branch_f7c4e: +.loop1: rest 2 octave 2 note A_, 2 - sound_loop 4, Music_BugCatchingContest_branch_f7c4e -Music_BugCatchingContest_branch_f7c55: + sound_loop 4, .loop1 +.loop2: rest 2 note B_, 2 - sound_loop 8, Music_BugCatchingContest_branch_f7c55 + sound_loop 8, .loop2 volume_envelope 11, 4 duty_cycle 1 octave 3 @@ -61,11 +61,11 @@ Music_BugCatchingContest_branch_f7c55: note E_, 1 volume_envelope 11, 1 duty_cycle 2 -Music_BugCatchingContest_branch_f7c6b: +.loop3: rest 2 octave 2 note A_, 2 - sound_loop 4, Music_BugCatchingContest_branch_f7c6b + sound_loop 4, .loop3 rest 2 note B_, 2 rest 2 @@ -91,11 +91,11 @@ Music_BugCatchingContest_branch_f7c6b: note E_, 4 rest 4 note E_, 4 -Music_BugCatchingContest_branch_f7c8e: +.loop4: rest 4 octave 2 note A_, 4 - sound_loop 3, Music_BugCatchingContest_branch_f7c8e + sound_loop 3, .loop4 volume_envelope 10, 7 octave 4 note F#, 4 @@ -186,7 +186,7 @@ Music_BugCatchingContest_branch_f7c8e: rest 2 note E_, 2 note E_, 2 - sound_loop 0, Music_BugCatchingContest_branch_f7c4b + sound_loop 0, .mainloop Music_BugCatchingContest_Ch2: stereo_panning TRUE, FALSE @@ -194,7 +194,7 @@ Music_BugCatchingContest_Ch2: duty_cycle 1 note_type 12, 12, 7 rest 8 -Music_BugCatchingContest_branch_f7cff: +.loop5: octave 4 note A_, 1 rest 1 @@ -202,10 +202,10 @@ Music_BugCatchingContest_branch_f7cff: rest 1 note A_, 1 note A_, 1 - sound_loop 4, Music_BugCatchingContest_branch_f7cff -Music_BugCatchingContest_branch_f7d0a: + sound_loop 4, .loop5 +.mainloop: duty_cycle 0 - sound_call Music_BugCatchingContest_branch_f7d8e + sound_call .sub1 octave 2 note E_, 2 octave 3 @@ -246,7 +246,7 @@ Music_BugCatchingContest_branch_f7d0a: octave 3 note E_, 1 rest 1 - sound_call Music_BugCatchingContest_branch_f7d8e + sound_call .sub1 octave 2 note E_, 2 octave 3 @@ -326,9 +326,9 @@ Music_BugCatchingContest_branch_f7d0a: note A_, 1 rest 3 note A_, 10 - sound_loop 0, Music_BugCatchingContest_branch_f7d0a + sound_loop 0, .mainloop -Music_BugCatchingContest_branch_f7d8e: +.sub1: octave 2 note D_, 2 octave 3 @@ -402,7 +402,7 @@ Music_BugCatchingContest_Ch3: rest 1 note C#, 1 note C#, 1 -Music_BugCatchingContest_branch_f7dda: +.mainloop: note_type 12, 1, 4 note F#, 5 rest 1 @@ -583,7 +583,7 @@ Music_BugCatchingContest_branch_f7dda: rest 2 note C#, 2 note C#, 2 - sound_loop 0, Music_BugCatchingContest_branch_f7dda + sound_loop 0, .mainloop Music_BugCatchingContest_Ch4: toggle_noise 4 @@ -602,8 +602,9 @@ Music_BugCatchingContest_Ch4: drum_note 2, 1 drum_note 5, 2 drum_note 5, 2 - sound_call Music_BugCatchingContest_branch_f7ee2 -Music_BugCatchingContest_branch_f7eaf: + sound_call Music_BugCatchingContest_Ch4.sub1 +.mainloop: +.loop1: drum_note 3, 4 drum_note 3, 4 drum_note 3, 2 @@ -632,7 +633,7 @@ Music_BugCatchingContest_branch_f7eaf: drum_note 2, 1 drum_note 2, 1 drum_note 2, 1 - sound_loop 5, Music_BugCatchingContest_branch_f7eaf + sound_loop 5, .loop1 drum_note 3, 4 drum_note 3, 4 drum_note 3, 2 @@ -645,10 +646,10 @@ Music_BugCatchingContest_branch_f7eaf: drum_note 3, 2 drum_note 3, 2 drum_note 3, 2 - sound_call Music_BugCatchingContest_branch_f7ee2 - sound_loop 0, Music_BugCatchingContest_branch_f7eaf + sound_call .sub1 + sound_loop 0, .mainloop -Music_BugCatchingContest_branch_f7ee2: +.sub1: drum_note 3, 4 drum_note 12, 8 drum_note 3, 2 diff --git a/audio/music/burnedtower.asm b/audio/music/burnedtower.asm index 24d6ed4fa..742a769bd 100644 --- a/audio/music/burnedtower.asm +++ b/audio/music/burnedtower.asm @@ -27,7 +27,7 @@ Music_BurnedTower_Ch1: note D_, 2 volume_envelope 8, 0 note C#, 6 -Music_BurnedTower_branch_f6ac8: +.loop1: volume_envelope 9, 1 octave 2 note A_, 4 @@ -35,9 +35,9 @@ Music_BurnedTower_branch_f6ac8: note A_, 2 volume_envelope 8, 0 note A#, 6 - sound_loop 2, Music_BurnedTower_branch_f6ac8 + sound_loop 2, .loop1 tempo 150 -Music_BurnedTower_branch_f6ad8: +.mainloop: volume_envelope 11, 1 octave 2 note A_, 4 @@ -87,7 +87,7 @@ Music_BurnedTower_branch_f6ad8: note E_, 2 volume_envelope 10, 0 note D#, 6 -Music_BurnedTower_branch_f6b17: +.loop2: volume_envelope 11, 1 octave 2 note B_, 4 @@ -96,18 +96,18 @@ Music_BurnedTower_branch_f6b17: volume_envelope 10, 0 octave 3 note C_, 6 - sound_loop 2, Music_BurnedTower_branch_f6b17 - sound_loop 0, Music_BurnedTower_branch_f6ad8 + sound_loop 2, .loop2 + sound_loop 0, .mainloop Music_BurnedTower_Ch2: duty_cycle 2 vibrato 32, 8, 2 pitch_offset 2 note_type 12, 7, 0 - sound_call Music_BurnedTower_branch_f6b8e + sound_call .sub1 volume_envelope 12, 5 -Music_BurnedTower_branch_f6b39: - sound_call Music_BurnedTower_branch_f6b8e +.mainloop: + sound_call .sub1 volume_envelope 12, 1 duty_cycle 3 rest 2 @@ -168,9 +168,9 @@ Music_BurnedTower_branch_f6b39: note E_, 4 volume_envelope 11, 7 note F#, 16 - sound_loop 0, Music_BurnedTower_branch_f6b39 + sound_loop 0, .mainloop -Music_BurnedTower_branch_f6b8e: +.sub1: octave 3 note E_, 4 note D_, 2 @@ -201,7 +201,8 @@ Music_BurnedTower_Ch3: rest 12 octave 3 note D#, 4 -Music_BurnedTower_branch_f6bad: +.mainloop: +.loop1: octave 2 note A_, 2 octave 3 @@ -220,8 +221,8 @@ Music_BurnedTower_branch_f6bad: rest 2 note E_, 2 note D#, 4 - sound_loop 4, Music_BurnedTower_branch_f6bad -Music_BurnedTower_branch_f6bc3: + sound_loop 4, .loop1 +.loop2: octave 2 note B_, 2 octave 3 @@ -240,21 +241,21 @@ Music_BurnedTower_branch_f6bc3: rest 2 note F#, 2 note F_, 4 - sound_loop 2, Music_BurnedTower_branch_f6bc3 - sound_loop 0, Music_BurnedTower_branch_f6bad + sound_loop 2, .loop2 + sound_loop 0, .mainloop Music_BurnedTower_Ch4: toggle_noise 0 drum_speed 12 -Music_BurnedTower_branch_f6be1: +.loop1: rest 16 - sound_loop 4, Music_BurnedTower_branch_f6be1 + sound_loop 4, .loop1 rest 2 -Music_BurnedTower_branch_f6be7: +.mainloop: stereo_panning TRUE, FALSE drum_note 8, 2 drum_note 9, 2 drum_note 8, 4 drum_note 9, 2 drum_note 8, 4 - sound_loop 0, Music_BurnedTower_branch_f6be7 + sound_loop 0, .mainloop diff --git a/audio/music/celadoncity.asm b/audio/music/celadoncity.asm index 39eadaf18..21d565b93 100644 --- a/audio/music/celadoncity.asm +++ b/audio/music/celadoncity.asm @@ -8,7 +8,7 @@ Music_CeladonCity_Ch1: tempo 146 volume 7, 7 pitch_offset 1 -Music_CeladonCity_branch_f436c: +.mainloop: stereo_panning FALSE, TRUE note_type 12, 10, 6 octave 3 @@ -19,8 +19,8 @@ Music_CeladonCity_branch_f436c: note D_, 3 note E_, 2 note F#, 2 - sound_call Music_CeladonCity_branch_f43cc -Music_CeladonCity_branch_f437d: + sound_call .sub1 +.loop1: note D_, 2 note F#, 1 note A_, 1 @@ -28,7 +28,7 @@ Music_CeladonCity_branch_f437d: note F#, 1 note A_, 1 note F#, 1 - sound_loop 3, Music_CeladonCity_branch_f437d + sound_loop 3, .loop1 note D_, 2 note G_, 1 note B_, 1 @@ -38,7 +38,7 @@ Music_CeladonCity_branch_f437d: octave 3 note B_, 1 note G_, 1 - sound_call Music_CeladonCity_branch_f43cc + sound_call .sub1 note D_, 1 note C#, 1 note D_, 1 @@ -52,8 +52,8 @@ Music_CeladonCity_branch_f437d: note F#, 2 note E_, 2 note F#, 16 - sound_call Music_CeladonCity_branch_f43e1 - sound_call Music_CeladonCity_branch_f43fe + sound_call .sub2 + sound_call .sub3 octave 2 note B_, 2 note A#, 1 @@ -73,8 +73,8 @@ Music_CeladonCity_branch_f437d: octave 3 note B_, 1 note A_, 1 - sound_call Music_CeladonCity_branch_f43e1 - sound_call Music_CeladonCity_branch_f43fe + sound_call .sub2 + sound_call .sub3 note D_, 2 note C#, 1 note D_, 1 @@ -83,9 +83,10 @@ Music_CeladonCity_branch_f437d: note A_, 1 note G_, 1 note A_, 8 - sound_loop 0, Music_CeladonCity_branch_f436c + sound_loop 0, .mainloop -Music_CeladonCity_branch_f43cc: +.sub1: +.sub1loop1: note D_, 2 note G_, 1 note B_, 1 @@ -93,7 +94,7 @@ Music_CeladonCity_branch_f43cc: note G_, 1 note B_, 1 note G_, 1 - sound_loop 3, Music_CeladonCity_branch_f43cc + sound_loop 3, .sub1loop1 note D_, 2 note F#, 1 note A_, 1 @@ -105,13 +106,14 @@ Music_CeladonCity_branch_f43cc: note A_, 1 sound_ret -Music_CeladonCity_branch_f43e1: +.sub2: +.sub2loop1 octave 2 note G_, 2 note B_, 1 octave 3 note D_, 1 - sound_loop 4, Music_CeladonCity_branch_f43e1 + sound_loop 4, .sub2loop1 note C_, 2 octave 2 note B_, 1 @@ -133,11 +135,12 @@ Music_CeladonCity_branch_f43e1: note B_, 1 sound_ret -Music_CeladonCity_branch_f43fe: +.sub3: +.sub3loop1: note D_, 2 note F#, 1 note A_, 1 - sound_loop 4, Music_CeladonCity_branch_f43fe + sound_loop 4, .sub3loop1 sound_ret Music_CeladonCity_Ch2: @@ -155,8 +158,8 @@ Music_CeladonCity_Ch2: note F#, 1 note G_, 1 note A_, 8 -Music_CeladonCity_branch_f441a: - sound_call Music_CeladonCity_branch_f4463 +.mainloop: + sound_call .sub1 note A_, 4 note F#, 4 note A_, 2 @@ -169,7 +172,7 @@ Music_CeladonCity_branch_f441a: note B_, 2 note G_, 4 note B_, 4 - sound_call Music_CeladonCity_branch_f4463 + sound_call .sub1 volume_envelope 12, 1 note A_, 2 note G_, 2 @@ -190,7 +193,7 @@ Music_CeladonCity_branch_f441a: volume_envelope 10, 2 octave 1 note F#, 2 - sound_call Music_CeladonCity_branch_f4474 + sound_call .sub2 octave 1 note G_, 3 note B_, 1 @@ -200,7 +203,7 @@ Music_CeladonCity_branch_f441a: octave 1 note A_, 6 note F#, 2 - sound_call Music_CeladonCity_branch_f4474 + sound_call .sub2 octave 1 note A_, 3 octave 2 @@ -213,9 +216,9 @@ Music_CeladonCity_branch_f441a: note A_, 1 octave 5 note D_, 16 - sound_loop 0, Music_CeladonCity_branch_f441a + sound_loop 0, .mainloop -Music_CeladonCity_branch_f4463: +.sub1: volume_envelope 11, 2 octave 4 note B_, 4 @@ -233,7 +236,7 @@ Music_CeladonCity_branch_f4463: note A_, 8 sound_ret -Music_CeladonCity_branch_f4474: +.sub2: note G_, 3 note B_, 1 octave 2 @@ -267,7 +270,7 @@ Music_CeladonCity_branch_f4474: Music_CeladonCity_Ch3: vibrato 18, 2, 4 -Music_CeladonCity_branch_f4495: +.mainloop: note_type 12, 2, 5 octave 3 note A_, 2 @@ -275,14 +278,14 @@ Music_CeladonCity_branch_f4495: note F#, 2 rest 2 note D_, 8 - sound_call Music_CeladonCity_branch_f44fd -Music_CeladonCity_branch_f44a1: + sound_call .sub1 +.loop1: octave 2 note A_, 2 rest 2 octave 3 note D_, 4 - sound_loop 3, Music_CeladonCity_branch_f44a1 + sound_loop 3, .loop1 octave 2 note G_, 1 rest 1 @@ -292,7 +295,7 @@ Music_CeladonCity_branch_f44a1: note D_, 3 octave 2 note F#, 1 - sound_call Music_CeladonCity_branch_f44fd + sound_call .sub1 note A_, 1 rest 1 octave 3 @@ -315,7 +318,7 @@ Music_CeladonCity_branch_f44a1: note A_, 2 rest 6 volume_envelope 1, 0 - sound_call Music_CeladonCity_branch_f4510 + sound_call .sub2 octave 5 note E_, 2 rest 2 @@ -336,7 +339,7 @@ Music_CeladonCity_branch_f44a1: note E_, 2 note D_, 4 rest 4 - sound_call Music_CeladonCity_branch_f4510 + sound_call .sub2 octave 5 note E_, 2 rest 2 @@ -355,15 +358,16 @@ Music_CeladonCity_branch_f44a1: note E_, 2 note D_, 2 rest 6 - sound_loop 0, Music_CeladonCity_branch_f4495 + sound_loop 0, .mainloop -Music_CeladonCity_branch_f44fd: +.sub1: +.sub1loop1: octave 2 note G_, 2 rest 2 octave 3 note D_, 4 - sound_loop 3, Music_CeladonCity_branch_f44fd + sound_loop 3, .sub1loop1 octave 2 note A_, 1 rest 1 @@ -375,7 +379,7 @@ Music_CeladonCity_branch_f44fd: note G#, 1 sound_ret -Music_CeladonCity_branch_f4510: +.sub2: octave 5 note D_, 8 note C_, 2 diff --git a/audio/music/championbattle.asm b/audio/music/championbattle.asm index f21aa7402..218a71e2d 100644 --- a/audio/music/championbattle.asm +++ b/audio/music/championbattle.asm @@ -18,22 +18,22 @@ Music_ChampionBattle_Ch1: note A#, 4 volume_envelope 11, 7 note B_, 4 -Music_ChampionBattle_branch_ea9e2: - sound_call Music_ChampionBattle_branch_eaaee +.loop1: + sound_call .sub1 octave 3 note D#, 4 - sound_loop 2, Music_ChampionBattle_branch_ea9e2 - sound_call Music_ChampionBattle_branch_eaaee + sound_loop 2, .loop1 + sound_call .sub1 octave 3 note E_, 4 -Music_ChampionBattle_branch_ea9f0: - sound_call Music_ChampionBattle_branch_eaafc - sound_loop 3, Music_ChampionBattle_branch_ea9f0 - sound_call Music_ChampionBattle_branch_eab06 -Music_ChampionBattle_branch_ea9fa: - sound_call Music_ChampionBattle_branch_eaafc - sound_loop 7, Music_ChampionBattle_branch_ea9fa - sound_call Music_ChampionBattle_branch_eab06 +.loop2: + sound_call .sub2 + sound_loop 3, .loop2 + sound_call .sub3 +.loop3: + sound_call .sub2 + sound_loop 7, .loop3 + sound_call .sub3 volume_envelope 11, 2 note A#, 2 note A#, 2 @@ -73,25 +73,25 @@ Music_ChampionBattle_branch_ea9fa: octave 4 note C_, 1 note C#, 1 -Music_ChampionBattle_branch_eaa35: - sound_call Music_ChampionBattle_branch_eab0f +.mainloop: + sound_call .sub4 note E_, 2 note E_, 2 volume_envelope 11, 7 note F#, 4 -Music_ChampionBattle_branch_eaa3d: +.loop4: volume_envelope 11, 2 note E_, 2 note E_, 2 volume_envelope 11, 7 note G#, 4 - sound_loop 2, Music_ChampionBattle_branch_eaa3d + sound_loop 2, .loop4 volume_envelope 11, 2 note E_, 2 note E_, 2 volume_envelope 11, 7 note B_, 4 - sound_call Music_ChampionBattle_branch_eab0f + sound_call .sub4 note E_, 2 note E_, 2 volume_envelope 11, 7 @@ -112,10 +112,10 @@ Music_ChampionBattle_branch_eaa3d: volume_envelope 11, 7 octave 4 note E_, 4 - sound_call Music_ChampionBattle_branch_eab24 + sound_call .sub5 note B_, 4 note G#, 4 - sound_call Music_ChampionBattle_branch_eab24 + sound_call .sub5 octave 4 note D_, 4 note D_, 4 @@ -167,7 +167,7 @@ Music_ChampionBattle_branch_eaa3d: volume_envelope 9, 0 note D#, 16 note C#, 16 -Music_ChampionBattle_branch_eaab1: +.loop5: volume_envelope 11, 2 octave 2 note A#, 2 @@ -175,14 +175,14 @@ Music_ChampionBattle_branch_eaab1: volume_envelope 11, 7 octave 3 note D#, 4 - sound_loop 4, Music_ChampionBattle_branch_eaab1 -Music_ChampionBattle_branch_eaabe: + sound_loop 4, .loop5 +.loop6: volume_envelope 11, 2 note C_, 2 note C_, 2 volume_envelope 11, 7 note D#, 4 - sound_loop 2, Music_ChampionBattle_branch_eaabe + sound_loop 2, .loop6 volume_envelope 11, 2 note C_, 2 note C_, 2 @@ -193,22 +193,22 @@ Music_ChampionBattle_branch_eaabe: note C_, 2 volume_envelope 11, 7 note G#, 4 - sound_call Music_ChampionBattle_branch_eab31 + sound_call .sub6 octave 3 note D#, 2 note D#, 2 volume_envelope 11, 7 note B_, 4 - sound_call Music_ChampionBattle_branch_eab31 + sound_call .sub6 octave 3 note D#, 2 note D#, 2 volume_envelope 11, 7 octave 4 note D_, 4 - sound_loop 0, Music_ChampionBattle_branch_eaa35 + sound_loop 0, .mainloop -Music_ChampionBattle_branch_eaaee: +.sub1: volume_envelope 11, 2 octave 2 note A#, 2 @@ -222,7 +222,7 @@ Music_ChampionBattle_branch_eaaee: volume_envelope 11, 7 sound_ret -Music_ChampionBattle_branch_eaafc: +.sub2: volume_envelope 11, 2 octave 2 note A#, 2 @@ -232,7 +232,7 @@ Music_ChampionBattle_branch_eaafc: note D#, 4 sound_ret -Music_ChampionBattle_branch_eab06: +.sub3: volume_envelope 11, 2 octave 2 note A#, 2 @@ -241,7 +241,7 @@ Music_ChampionBattle_branch_eab06: note B_, 4 sound_ret -Music_ChampionBattle_branch_eab0f: +.sub4: volume_envelope 11, 5 octave 3 note D#, 2 @@ -262,7 +262,7 @@ Music_ChampionBattle_branch_eab0f: volume_envelope 11, 2 sound_ret -Music_ChampionBattle_branch_eab24: +.sub5: volume_envelope 11, 2 octave 3 note A#, 2 @@ -275,7 +275,7 @@ Music_ChampionBattle_branch_eab24: volume_envelope 11, 7 sound_ret -Music_ChampionBattle_branch_eab31: +.sub6: volume_envelope 11, 2 note D#, 2 note D#, 2 @@ -307,18 +307,18 @@ Music_ChampionBattle_Ch2: note D#, 4 volume_envelope 12, 7 note D_, 4 - sound_call Music_ChampionBattle_branch_eac4f + sound_call .sub1 note A#, 4 - sound_call Music_ChampionBattle_branch_eac4f + sound_call .sub1 note B_, 4 - sound_call Music_ChampionBattle_branch_eac4f + sound_call .sub1 octave 4 note C#, 4 - sound_call Music_ChampionBattle_branch_eac5c + sound_call .sub2 note D_, 4 - sound_call Music_ChampionBattle_branch_eac5c + sound_call .sub2 note F_, 4 - sound_call Music_ChampionBattle_branch_eac5c + sound_call .sub2 note D_, 4 volume_envelope 12, 2 note D#, 2 @@ -350,7 +350,7 @@ Music_ChampionBattle_Ch2: note E_, 8 volume_envelope 3, -4 note E_, 8 -Music_ChampionBattle_branch_eab9d: +.mainloop: volume_envelope 12, 5 note D#, 6 octave 3 @@ -398,10 +398,10 @@ Music_ChampionBattle_branch_eab9d: note G#, 8 note E_, 8 note B_, 8 - sound_call Music_ChampionBattle_branch_eac79 + sound_call .sub3 note E_, 4 note E_, 4 - sound_call Music_ChampionBattle_branch_eac79 + sound_call .sub3 note F#, 4 note F#, 4 volume_envelope 12, 7 @@ -418,7 +418,7 @@ Music_ChampionBattle_branch_eab9d: note F_, 16 note F#, 16 volume_envelope 12, 4 -Music_ChampionBattle_branch_eabef: +.loop1: octave 5 note D#, 4 note D_, 4 @@ -431,7 +431,7 @@ Music_ChampionBattle_branch_eabef: octave 4 note B_, 4 note B_, 4 - sound_loop 2, Music_ChampionBattle_branch_eabef + sound_loop 2, .loop1 volume_envelope 11, 0 octave 3 note D#, 16 @@ -490,9 +490,9 @@ Music_ChampionBattle_branch_eabef: note E_, 8 note F#, 8 note G#, 8 - sound_loop 0, Music_ChampionBattle_branch_eab9d + sound_loop 0, .mainloop -Music_ChampionBattle_branch_eac4f: +.sub1: volume_envelope 12, 2 note D#, 2 note D#, 6 @@ -505,7 +505,7 @@ Music_ChampionBattle_branch_eac4f: volume_envelope 12, 7 sound_ret -Music_ChampionBattle_branch_eac5c: +.sub2: volume_envelope 12, 2 octave 3 note D#, 2 @@ -528,7 +528,7 @@ Music_ChampionBattle_branch_eac5c: volume_envelope 12, 7 sound_ret -Music_ChampionBattle_branch_eac79: +.sub3: volume_envelope 12, 1 note D#, 2 note D#, 4 @@ -542,22 +542,22 @@ Music_ChampionBattle_branch_eac79: Music_ChampionBattle_Ch3: note_type 12, 1, 4 -Music_ChampionBattle_branch_eac88: +.loop1: octave 3 note D#, 1 rest 7 - sound_loop 3, Music_ChampionBattle_branch_eac88 + sound_loop 3, .loop1 note D#, 1 rest 3 note E_, 4 - sound_call Music_ChampionBattle_branch_ead61 - sound_call Music_ChampionBattle_branch_ead61 - sound_call Music_ChampionBattle_branch_ead61 - sound_call Music_ChampionBattle_branch_ead6f + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 note D_, 4 - sound_call Music_ChampionBattle_branch_ead6f + sound_call .sub2 note A_, 4 - sound_call Music_ChampionBattle_branch_ead6f + sound_call .sub2 note D_, 4 note D#, 1 rest 1 @@ -590,14 +590,15 @@ Music_ChampionBattle_branch_eac88: note A#, 2 note F_, 2 note A_, 2 -Music_ChampionBattle_branch_eacc6: +.mainloop: +.loop2: note D#, 2 note A#, 2 - sound_loop 8, Music_ChampionBattle_branch_eacc6 -Music_ChampionBattle_branch_eaccc: + sound_loop 8, .loop2 +.loop3: note E_, 2 note B_, 2 - sound_loop 5, Music_ChampionBattle_branch_eaccc + sound_loop 5, .loop3 note E_, 2 octave 4 note C_, 2 @@ -606,15 +607,15 @@ Music_ChampionBattle_branch_eaccc: note B_, 2 note G_, 2 note A_, 2 -Music_ChampionBattle_branch_eacda: +.loop4: note D#, 2 note A#, 2 - sound_loop 8, Music_ChampionBattle_branch_eacda -Music_ChampionBattle_branch_eace0: + sound_loop 8, .loop4 +.loop5: note E_, 2 note B_, 2 - sound_loop 8, Music_ChampionBattle_branch_eace0 - sound_call Music_ChampionBattle_branch_ead83 + sound_loop 8, .loop5 + sound_call .sub3 octave 3 note D#, 2 note E_, 2 @@ -625,7 +626,7 @@ Music_ChampionBattle_branch_eace0: note D_, 2 note C#, 2 note C_, 2 - sound_call Music_ChampionBattle_branch_ead83 + sound_call .sub3 octave 3 note D#, 2 note A#, 2 @@ -641,11 +642,11 @@ Music_ChampionBattle_branch_eace0: note D#, 8 note B_, 8 note D#, 8 -Music_ChampionBattle_branch_ead05: +.loop6: note D#, 2 note F#, 2 - sound_loop 16, Music_ChampionBattle_branch_ead05 - sound_call Music_ChampionBattle_branch_ead8e + sound_loop 16, .loop6 + sound_call .sub4 octave 3 note E_, 2 note B_, 2 @@ -658,16 +659,16 @@ Music_ChampionBattle_branch_ead05: octave 4 note D#, 2 note E_, 2 - sound_call Music_ChampionBattle_branch_ead8e -Music_ChampionBattle_branch_ead1d: + sound_call .sub4 +.loop7: octave 3 note E_, 2 note B_, 2 - sound_loop 4, Music_ChampionBattle_branch_ead1d -Music_ChampionBattle_branch_ead24: + sound_loop 4, .loop7 +.loop8: note D#, 2 note A#, 2 - sound_loop 5, Music_ChampionBattle_branch_ead24 + sound_loop 5, .loop8 note B_, 2 octave 4 note D#, 2 @@ -676,10 +677,10 @@ Music_ChampionBattle_branch_ead24: rest 2 note D#, 2 rest 2 -Music_ChampionBattle_branch_ead32: +.loop9: note E_, 2 note B_, 2 - sound_loop 5, Music_ChampionBattle_branch_ead32 + sound_loop 5, .loop9 octave 4 note C#, 2 note E_, 2 @@ -688,37 +689,38 @@ Music_ChampionBattle_branch_ead32: rest 2 note E_, 2 rest 2 -Music_ChampionBattle_branch_ead40: +.loop10: note D#, 2 note G#, 2 - sound_loop 8, Music_ChampionBattle_branch_ead40 -Music_ChampionBattle_branch_ead46: + sound_loop 8, .loop10 +.loop11: note D#, 2 note A#, 2 - sound_loop 7, Music_ChampionBattle_branch_ead46 + sound_loop 7, .loop11 note B_, 2 note A#, 2 -Music_ChampionBattle_branch_ead4e: +.loop12: octave 3 note D#, 2 note A#, 2 octave 4 note D_, 2 note D#, 2 - sound_loop 7, Music_ChampionBattle_branch_ead4e + sound_loop 7, .loop12 note C#, 2 octave 3 note B_, 2 note A#, 2 note G#, 2 - sound_loop 0, Music_ChampionBattle_branch_eacc6 + sound_loop 0, .mainloop -Music_ChampionBattle_branch_ead61: +.sub1: +.sub1loop1: note D#, 1 rest 1 note D#, 1 rest 5 - sound_loop 3, Music_ChampionBattle_branch_ead61 + sound_loop 3, .sub1loop1 note D#, 1 rest 1 note D#, 1 @@ -726,7 +728,7 @@ Music_ChampionBattle_branch_ead61: note B_, 4 sound_ret -Music_ChampionBattle_branch_ead6f: +.sub2: note D#, 1 rest 1 note D#, 1 @@ -748,7 +750,7 @@ Music_ChampionBattle_branch_ead6f: rest 1 sound_ret -Music_ChampionBattle_branch_ead83: +.sub3: octave 3 note D#, 2 note F#, 2 @@ -761,7 +763,7 @@ Music_ChampionBattle_branch_ead83: note C_, 2 sound_ret -Music_ChampionBattle_branch_ead8e: +.sub4: octave 3 note E_, 2 note B_, 2 diff --git a/audio/music/cherrygrovecity.asm b/audio/music/cherrygrovecity.asm index 57e954d67..f0d4bda83 100644 --- a/audio/music/cherrygrovecity.asm +++ b/audio/music/cherrygrovecity.asm @@ -18,7 +18,7 @@ Music_CherrygroveCity_Ch1: note C_, 2 note D_, 2 note E_, 2 -Music_CherrygroveCity_branch_f5b26: +.mainloop: note A_, 4 note G#, 2 note A_, 2 @@ -91,7 +91,7 @@ Music_CherrygroveCity_branch_f5b26: note A_, 4 octave 3 note C_, 4 - sound_loop 0, Music_CherrygroveCity_branch_f5b26 + sound_loop 0, .mainloop Music_CherrygroveCity_Ch2: duty_cycle 3 @@ -107,7 +107,7 @@ Music_CherrygroveCity_Ch2: note G_, 2 note A_, 2 note A#, 2 -Music_CherrygroveCity_branch_f5b87: +.mainloop: volume_envelope 12, 6 octave 4 note C_, 6 @@ -171,7 +171,7 @@ Music_CherrygroveCity_branch_f5b87: note F_, 8 volume_envelope 10, 7 note F_, 8 - sound_loop 0, Music_CherrygroveCity_branch_f5b87 + sound_loop 0, .mainloop Music_CherrygroveCity_Ch3: note_type 12, 1, 6 @@ -184,7 +184,7 @@ Music_CherrygroveCity_Ch3: note G_, 2 note F_, 2 note E_, 2 -Music_CherrygroveCity_branch_f5be4: +.mainloop: note A_, 2 note F_, 2 note A_, 2 @@ -281,13 +281,13 @@ Music_CherrygroveCity_branch_f5be4: note A_, 2 note F_, 2 note A_, 2 - sound_loop 0, Music_CherrygroveCity_branch_f5be4 + sound_loop 0, .mainloop Music_CherrygroveCity_Ch4: toggle_noise 3 drum_speed 12 rest 16 -Music_CherrygroveCity_branch_f5c4d: +.mainloop: drum_note 2, 2 rest 2 drum_note 8, 2 @@ -303,4 +303,4 @@ Music_CherrygroveCity_branch_f5c4d: drum_note 7, 4 drum_note 2, 2 drum_note 8, 2 - sound_loop 0, Music_CherrygroveCity_branch_f5c4d + sound_loop 0, .mainloop diff --git a/audio/music/clair.asm b/audio/music/clair.asm index dda547797..502bcdd62 100644 --- a/audio/music/clair.asm +++ b/audio/music/clair.asm @@ -13,7 +13,7 @@ Music_Clair_Ch1: stereo_panning FALSE, TRUE note_type 12, 9, 3 duty_cycle 3 -Music_Clair_branch_1faab: +.loop1: octave 4 note F_, 1 note F#, 1 @@ -21,7 +21,7 @@ Music_Clair_branch_1faab: rest 1 note C#, 1 rest 1 - sound_loop 2, Music_Clair_branch_1faab + sound_loop 2, .loop1 octave 3 note B_, 1 rest 1 @@ -37,9 +37,9 @@ Music_Clair_branch_1faab: note D#, 4 note F_, 4 note G_, 4 -Music_Clair_branch_1fac9: +.mainloop: volume_envelope 9, 3 - sound_call Music_Clair_branch_1fb12 + sound_call .sub1 octave 2 note B_, 1 octave 3 @@ -53,7 +53,7 @@ Music_Clair_branch_1fac9: octave 2 note A#, 1 note G_, 1 - sound_call Music_Clair_branch_1fb12 + sound_call .sub1 note D#, 1 note C#, 1 note D#, 2 @@ -65,7 +65,7 @@ Music_Clair_branch_1fac9: note A#, 1 octave 5 note D#, 1 - sound_call Music_Clair_branch_1fb2e + sound_call .sub2 duty_cycle 3 note G#, 3 note F_, 2 @@ -79,7 +79,7 @@ Music_Clair_branch_1fac9: note A#, 1 octave 5 note D#, 1 - sound_call Music_Clair_branch_1fb2e + sound_call .sub2 duty_cycle 3 note D#, 3 note C#, 2 @@ -94,9 +94,9 @@ Music_Clair_branch_1fac9: note B_, 1 octave 4 note D#, 1 - sound_loop 0, Music_Clair_branch_1fac9 + sound_loop 0, .mainloop -Music_Clair_branch_1fb12: +.sub1: duty_cycle 3 stereo_panning TRUE, TRUE octave 3 @@ -122,7 +122,7 @@ Music_Clair_branch_1fb12: rest 1 sound_ret -Music_Clair_branch_1fb2e: +.sub2: octave 4 note F#, 1 note D#, 1 @@ -147,7 +147,7 @@ Music_Clair_Ch2: duty_cycle 3 vibrato 18, 3, 4 note_type 6, 11, 7 -Music_Clair_branch_1fb49: +.loop1: octave 3 note A#, 2 note B_, 2 @@ -155,7 +155,7 @@ Music_Clair_branch_1fb49: rest 2 note G#, 2 rest 2 - sound_loop 2, Music_Clair_branch_1fb49 + sound_loop 2, .loop1 note F_, 2 rest 2 note C#, 2 @@ -186,8 +186,8 @@ Music_Clair_branch_1fb49: note G_, 2 note A#, 2 volume_envelope 11, 7 -Music_Clair_branch_1fb77: - sound_call Music_Clair_branch_1fba6 +.mainloop: + sound_call .sub1 note F#, 2 rest 4 note D#, 12 @@ -205,7 +205,7 @@ Music_Clair_branch_1fb77: note A#, 16 rest 4 transpose 0, 12 - sound_call Music_Clair_branch_1fba6 + sound_call .sub1 transpose 0, 0 octave 5 note F#, 2 @@ -224,9 +224,9 @@ Music_Clair_branch_1fb77: rest 2 note G#, 16 rest 4 - sound_loop 0, Music_Clair_branch_1fb77 + sound_loop 0, .mainloop -Music_Clair_branch_1fba6: +.sub1: octave 4 note F#, 2 rest 4 @@ -269,8 +269,8 @@ Music_Clair_Ch3: note A#, 4 note G#, 4 note G_, 4 -Music_Clair_branch_1fbd1: - sound_call Music_Clair_branch_1fc3c +.mainloop: + sound_call .sub1 octave 2 note C#, 2 rest 1 @@ -281,7 +281,7 @@ Music_Clair_branch_1fbd1: note D#, 2 note A#, 2 note D#, 2 - sound_call Music_Clair_branch_1fc3c + sound_call .sub1 octave 2 note G#, 2 rest 1 @@ -369,9 +369,9 @@ Music_Clair_branch_1fbd1: note G#, 1 octave 1 note G#, 1 - sound_loop 0, Music_Clair_branch_1fbd1 + sound_loop 0, .mainloop -Music_Clair_branch_1fc3c: +.sub1: octave 1 note G#, 2 rest 1 @@ -404,16 +404,16 @@ Music_Clair_Ch4: drum_note 3, 2 drum_note 3, 1 drum_note 3, 1 -Music_Clair_branch_1fc5e: +.mainloop: stereo_panning TRUE, TRUE - sound_call Music_Clair_branch_1fc6e + sound_call .sub1 drum_note 8, 1 stereo_panning TRUE, TRUE - sound_call Music_Clair_branch_1fc6e + sound_call .sub1 drum_note 7, 1 - sound_loop 0, Music_Clair_branch_1fc5e + sound_loop 0, .mainloop -Music_Clair_branch_1fc6e: +.sub1: drum_note 4, 2 stereo_panning TRUE, FALSE drum_note 8, 2 diff --git a/audio/music/contestresults.asm b/audio/music/contestresults.asm index 3703dfd42..28575eeb6 100644 --- a/audio/music/contestresults.asm +++ b/audio/music/contestresults.asm @@ -9,7 +9,7 @@ Music_ContestResults_Ch1: tempo 144 volume 7, 7 note_type 12, 5, 1 -Music_ContestResults_branch_efb52: +.mainloop: rest 2 octave 2 note G_, 1 @@ -47,11 +47,11 @@ Music_ContestResults_branch_efb52: rest 3 note G_, 1 rest 1 - sound_loop 0, Music_ContestResults_branch_efb52 + sound_loop 0, .mainloop Music_ContestResults_Ch2: note_type 12, 6, 1 -Music_ContestResults_branch_efb7e: +.mainloop: octave 2 note C_, 2 octave 3 @@ -92,7 +92,7 @@ Music_ContestResults_branch_efb7e: octave 3 note F_, 1 rest 1 -Music_ContestResults_branch_efba6: +.loop1: octave 2 note D_, 2 octave 3 @@ -103,7 +103,7 @@ Music_ContestResults_branch_efba6: octave 3 note F_, 1 rest 1 - sound_loop 2, Music_ContestResults_branch_efba6 + sound_loop 2, .loop1 octave 2 note G_, 2 octave 3 @@ -124,12 +124,12 @@ Music_ContestResults_branch_efba6: octave 3 note D_, 1 rest 1 - sound_loop 0, Music_ContestResults_branch_efb7e + sound_loop 0, .mainloop Music_ContestResults_Ch3: vibrato 8, 2, 4 note_type 12, 2, 3 -Music_ContestResults_branch_efbd2: +.mainloop: octave 4 note E_, 5 rest 1 @@ -149,12 +149,12 @@ Music_ContestResults_branch_efbd2: note B_, 4 note A_, 8 note G_, 8 - sound_loop 0, Music_ContestResults_branch_efbd2 + sound_loop 0, .mainloop Music_ContestResults_Ch4: toggle_noise 4 drum_speed 6 -Music_ContestResults_branch_efbed: +.mainloop: drum_note 2, 4 drum_note 2, 4 drum_note 2, 2 @@ -171,4 +171,4 @@ Music_ContestResults_branch_efbed: drum_note 8, 1 drum_note 8, 1 drum_note 8, 1 - sound_loop 0, Music_ContestResults_branch_efbed + sound_loop 0, .mainloop diff --git a/audio/music/credits.asm b/audio/music/credits.asm index e4c2b05d1..ee2cff02a 100644 --- a/audio/music/credits.asm +++ b/audio/music/credits.asm @@ -22,7 +22,7 @@ Music_Credits_Ch1: octave 4 note C_, 7 note D_, 8 - sound_call Music_Credits_branch_1f483 + sound_call .sub1 rest 4 octave 3 note B_, 2 @@ -53,10 +53,10 @@ Music_Credits_Ch1: octave 3 rest 1 volume_envelope 10, 7 - sound_call Music_Credits_branch_1f483 - sound_call Music_Credits_branch_1f4ed + sound_call .sub1 + sound_call .sub2 volume_envelope 9, 7 - sound_call Music_Credits_branch_1f4f8 + sound_call .sub3 octave 3 note B_, 2 octave 4 @@ -118,8 +118,8 @@ Music_Credits_Ch1: note C_, 2 octave 3 note B_, 2 - sound_call Music_Credits_branch_1f4f8 - sound_call Music_Credits_branch_1f559 + sound_call .sub3 + sound_call .sub4 note B_, 1 octave 4 note C_, 7 @@ -143,10 +143,10 @@ Music_Credits_Ch1: octave 3 rest 1 transpose 0, 2 - sound_call Music_Credits_branch_1f483 - sound_call Music_Credits_branch_1f4ed - sound_call Music_Credits_branch_1f4f8 - sound_call Music_Credits_branch_1f559 + sound_call .sub1 + sound_call .sub2 + sound_call .sub3 + sound_call .sub4 transpose 0, 0 octave 3 note A_, 12 @@ -154,7 +154,7 @@ Music_Credits_Ch1: note D_, 1 note D_, 1 note D_, 1 - sound_call Music_Credits_branch_1f582 + sound_call .sub5 octave 3 note B_, 6 note A_, 6 @@ -165,7 +165,7 @@ Music_Credits_Ch1: note A_, 6 octave 4 note C#, 6 - sound_call Music_Credits_branch_1f582 + sound_call .sub5 tempo 143 octave 4 note D_, 6 @@ -181,12 +181,12 @@ Music_Credits_Ch1: octave 5 note C#, 6 note_type 12, 10, 7 -Music_Credits_branch_1f407: +.loop1: octave 3 note A_, 1 octave 4 note D_, 1 - sound_loop 6, Music_Credits_branch_1f407 + sound_loop 6, .loop1 note_type 8, 10, 7 note G_, 1 rest 1 @@ -281,7 +281,7 @@ Music_Credits_branch_1f407: rest 16 sound_ret -Music_Credits_branch_1f483: +.sub1: note C_, 16 note F#, 1 note G_, 3 @@ -389,7 +389,7 @@ Music_Credits_branch_1f483: rest 1 sound_ret -Music_Credits_branch_1f4ed: +.sub2: octave 4 note C_, 4 octave 3 @@ -402,7 +402,7 @@ Music_Credits_branch_1f4ed: note D#, 4 sound_ret -Music_Credits_branch_1f4f8: +.sub3: octave 3 note A_, 2 octave 4 @@ -501,7 +501,7 @@ Music_Credits_branch_1f4f8: note F_, 2 sound_ret -Music_Credits_branch_1f559: +.sub4: octave 3 note A_, 2 octave 4 @@ -544,7 +544,7 @@ Music_Credits_branch_1f559: note A_, 2 sound_ret -Music_Credits_branch_1f582: +.sub5: rest 6 octave 3 note D_, 6 @@ -571,7 +571,7 @@ Music_Credits_Ch2: note G_, 4 note F_, 4 note_type 6, 12, 7 - sound_call Music_Credits_branch_1f6cb + sound_call .sub1 octave 1 note G_, 2 rest 2 @@ -597,9 +597,9 @@ Music_Credits_Ch2: note D_, 1 note C#, 1 volume_envelope 12, 7 - sound_call Music_Credits_branch_1f6cb - sound_call Music_Credits_branch_1f73f - sound_call Music_Credits_branch_1f748 + sound_call .sub1 + sound_call .sub2 + sound_call .sub3 octave 4 note B_, 1 octave 5 @@ -627,7 +627,7 @@ Music_Credits_Ch2: octave 4 note A_, 2 note E_, 2 - sound_call Music_Credits_branch_1f748 + sound_call .sub3 octave 4 note B_, 1 octave 5 @@ -659,9 +659,9 @@ Music_Credits_Ch2: note G_, 4 note_type 6, 12, 7 transpose 0, 2 - sound_call Music_Credits_branch_1f6cb - sound_call Music_Credits_branch_1f73f - sound_call Music_Credits_branch_1f748 + sound_call .sub1 + sound_call .sub2 + sound_call .sub3 transpose 0, 0 octave 5 note C#, 1 @@ -717,13 +717,13 @@ Music_Credits_Ch2: octave 2 note F#, 1 rest 1 -Music_Credits_branch_1f657: +.loop1: octave 1 note G_, 2 octave 2 note G_, 1 rest 1 - sound_loop 4, Music_Credits_branch_1f657 + sound_loop 4, .loop1 octave 1 note A_, 1 octave 2 @@ -813,7 +813,7 @@ Music_Credits_branch_1f657: rest 16 sound_ret -Music_Credits_branch_1f6cb: +.sub1: octave 2 note C_, 4 volume_envelope 11, 1 @@ -925,7 +925,7 @@ Music_Credits_branch_1f6cb: note C_, 2 sound_ret -Music_Credits_branch_1f73f: +.sub2: octave 1 note G_, 4 rest 4 @@ -936,7 +936,7 @@ Music_Credits_branch_1f73f: note F#, 8 sound_ret -Music_Credits_branch_1f748: +.sub3: octave 4 note A_, 8 note B_, 8 @@ -1018,7 +1018,7 @@ Music_Credits_Ch3: note D#, 1 note E_, 7 note F_, 8 - sound_call Music_Credits_branch_1f8aa + sound_call .sub1 octave 4 note G_, 1 rest 1 @@ -1038,10 +1038,10 @@ Music_Credits_Ch3: note E_, 4 rest 4 note F_, 4 - sound_call Music_Credits_branch_1f8aa - sound_call Music_Credits_branch_1f8db - sound_call Music_Credits_branch_1f8e7 - sound_call Music_Credits_branch_1f934 + sound_call .sub1 + sound_call .sub2 + sound_call .sub3 + sound_call .sub4 octave 2 note G_, 4 rest 2 @@ -1107,9 +1107,9 @@ Music_Credits_Ch3: note F#, 4 octave 3 note E_, 4 - sound_call Music_Credits_branch_1f8e7 - sound_call Music_Credits_branch_1f934 - sound_call Music_Credits_branch_1f94b + sound_call .sub3 + sound_call .sub4 + sound_call .sub5 octave 5 note D#, 1 note E_, 7 @@ -1130,13 +1130,13 @@ Music_Credits_Ch3: note F#, 7 note G_, 8 transpose 0, 2 - sound_call Music_Credits_branch_1f8aa - sound_call Music_Credits_branch_1f8db + sound_call .sub1 + sound_call .sub2 transpose 1, 2 - sound_call Music_Credits_branch_1f8e7 + sound_call .sub3 transpose 0, 2 - sound_call Music_Credits_branch_1f934 - sound_call Music_Credits_branch_1f94b + sound_call .sub4 + sound_call .sub5 transpose 0, 0 octave 6 note C#, 2 @@ -1229,7 +1229,7 @@ Music_Credits_Ch3: rest 16 sound_ret -Music_Credits_branch_1f8aa: +.sub1: note G_, 16 octave 6 note C#, 1 @@ -1270,7 +1270,7 @@ Music_Credits_branch_1f8aa: note D_, 16 sound_ret -Music_Credits_branch_1f8db: +.sub2: note_type 6, 1, 4 note F#, 1 note G_, 3 @@ -1282,7 +1282,7 @@ Music_Credits_branch_1f8db: note G#, 8 sound_ret -Music_Credits_branch_1f8e7: +.sub3: octave 3 note F_, 4 rest 2 @@ -1361,7 +1361,7 @@ Music_Credits_branch_1f8e7: note G#, 2 sound_ret -Music_Credits_branch_1f934: +.sub4: octave 2 note F_, 4 rest 2 @@ -1386,7 +1386,7 @@ Music_Credits_branch_1f934: note F_, 2 sound_ret -Music_Credits_branch_1f94b: +.sub5: octave 2 note F#, 4 rest 2 @@ -1456,15 +1456,15 @@ Music_Credits_Ch4: drum_note 8, 1 drum_note 11, 4 drum_note 11, 4 - sound_call Music_Credits_branch_1fa4d - sound_call Music_Credits_branch_1fa4d - sound_call Music_Credits_branch_1fa4d - sound_call Music_Credits_branch_1fa6d - sound_call Music_Credits_branch_1fa4d - sound_call Music_Credits_branch_1fa4d - sound_call Music_Credits_branch_1fa4d - sound_call Music_Credits_branch_1fa6d -Music_Credits_branch_1f9a8: + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 +.loop1: drum_note 11, 2 drum_note 8, 1 drum_note 8, 1 @@ -1476,7 +1476,7 @@ Music_Credits_branch_1f9a8: drum_note 8, 1 drum_note 3, 2 drum_note 7, 2 - sound_loop 7, Music_Credits_branch_1f9a8 + sound_loop 7, .loop1 drum_note 9, 1 drum_note 8, 1 drum_note 3, 1 @@ -1492,7 +1492,7 @@ Music_Credits_branch_1f9a8: drum_note 2, 1 drum_note 3, 1 drum_note 3, 1 -Music_Credits_branch_1f9c6: +.loop2: drum_note 11, 2 drum_note 8, 1 drum_note 8, 1 @@ -1504,7 +1504,7 @@ Music_Credits_branch_1f9c6: drum_note 8, 1 drum_note 3, 2 drum_note 7, 2 - sound_loop 7, Music_Credits_branch_1f9c6 + sound_loop 7, .loop2 drum_note 9, 1 drum_note 8, 1 drum_note 7, 2 @@ -1522,11 +1522,11 @@ Music_Credits_branch_1f9c6: drum_note 12, 2 drum_note 11, 4 drum_note 11, 4 - sound_call Music_Credits_branch_1fa4d - sound_call Music_Credits_branch_1fa4d - sound_call Music_Credits_branch_1fa4d - sound_call Music_Credits_branch_1fa6d -Music_Credits_branch_1f9f2: + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 +.loop3: drum_note 11, 2 drum_note 8, 1 drum_note 8, 1 @@ -1538,7 +1538,7 @@ Music_Credits_branch_1f9f2: drum_note 8, 1 drum_note 3, 2 drum_note 7, 2 - sound_loop 7, Music_Credits_branch_1f9f2 + sound_loop 7, .loop3 drum_note 9, 1 drum_note 8, 1 drum_note 7, 2 @@ -1606,7 +1606,7 @@ Music_Credits_branch_1f9f2: rest 16 sound_ret -Music_Credits_branch_1fa4d: +.sub1: drum_note 9, 1 drum_note 8, 1 drum_note 8, 1 @@ -1640,7 +1640,7 @@ Music_Credits_branch_1fa4d: drum_note 7, 2 sound_ret -Music_Credits_branch_1fa6d: +.sub2: drum_note 9, 1 drum_note 8, 1 drum_note 8, 1 diff --git a/audio/music/dancinghall.asm b/audio/music/dancinghall.asm index e4d341437..3b477cc6f 100644 --- a/audio/music/dancinghall.asm +++ b/audio/music/dancinghall.asm @@ -4,7 +4,7 @@ Music_DancingHall: channel 2, Music_DancingHall_Ch2 channel 3, Music_DancingHall_Ch3 - db $3 + db $3 ; unused Music_DancingHall_Ch1: tempo 208 @@ -13,11 +13,11 @@ Music_DancingHall_Ch1: note_type 6, 11, 7 rest 3 duty_cycle 0 -Music_DancingHall_branch_ef9d3: +.mainloop: note_type 12, 11, 7 - sound_call Music_DancingHall_branch_efa17 + sound_call .sub1 rest 16 - sound_call Music_DancingHall_branch_efa17 + sound_call .sub1 rest 16 rest 16 rest 16 @@ -63,9 +63,9 @@ Music_DancingHall_branch_ef9d3: note A_, 1 rest 1 note F_, 2 - sound_loop 0, Music_DancingHall_branch_ef9d3 + sound_loop 0, .mainloop -Music_DancingHall_branch_efa17: +.sub1: octave 3 note B_, 1 rest 1 @@ -94,10 +94,10 @@ Music_DancingHall_Ch2: duty_cycle 0 vibrato 16, 2, 4 rest 3 -Music_DancingHall_branch_efa37: +.mainloop: note_type 6, 10, 2 - sound_call Music_DancingHall_branch_efa7a - sound_call Music_DancingHall_branch_efa7a + sound_call .sub1 + sound_call .sub1 volume_envelope 10, 7 octave 2 note D_, 16 @@ -141,9 +141,9 @@ Music_DancingHall_branch_efa37: note E_, 1 rest 1 note D_, 2 - sound_loop 0, Music_DancingHall_branch_efa37 + sound_loop 0, .mainloop -Music_DancingHall_branch_efa7a: +.sub1: volume_envelope 10, 1 octave 4 note E_, 4 @@ -229,7 +229,7 @@ Music_DancingHall_Ch3: note B_, 1 octave 6 note D_, 1 -Music_DancingHall_branch_efae3: +.mainloop: note E_, 13 note D_, 1 note E_, 1 @@ -303,4 +303,4 @@ Music_DancingHall_branch_efae3: note B_, 1 octave 6 note D_, 1 - sound_loop 0, Music_DancingHall_branch_efae3 + sound_loop 0, .mainloop diff --git a/audio/music/darkcave.asm b/audio/music/darkcave.asm index 7410b3806..08206b249 100644 --- a/audio/music/darkcave.asm +++ b/audio/music/darkcave.asm @@ -13,18 +13,19 @@ Music_DarkCave_Ch1: vibrato 17, 1, 5 stereo_panning TRUE, FALSE note_type 12, 10, 7 -Music_DarkCave_branch_ea2dc: +.loop1: rest 16 - sound_loop 4, Music_DarkCave_branch_ea2dc + sound_loop 4, .loop1 octave 3 note D#, 16 note D_, 16 note C#, 16 note C_, 16 volume_envelope 10, 3 -Music_DarkCave_branch_ea2e8: - sound_call Music_DarkCave_branch_ea333 - sound_loop 3, Music_DarkCave_branch_ea2e8 +.mainloop: +.loop2: + sound_call .sub1 + sound_loop 3, .loop2 volume_envelope 11, 7 note G#, 8 note D#, 8 @@ -43,9 +44,9 @@ Music_DarkCave_branch_ea2e8: note D#, 8 note C_, 8 volume_envelope 10, 3 -Music_DarkCave_branch_ea303: - sound_call Music_DarkCave_branch_ea333 - sound_loop 2, Music_DarkCave_branch_ea303 +.loop3: + sound_call .sub1 + sound_loop 2, .loop3 rest 16 rest 8 volume_envelope 11, 7 @@ -74,12 +75,12 @@ Music_DarkCave_branch_ea303: note G_, 2 note G#, 4 volume_envelope 10, 3 -Music_DarkCave_branch_ea328: - sound_call Music_DarkCave_branch_ea333 - sound_loop 2, Music_DarkCave_branch_ea328 - sound_loop 0, Music_DarkCave_branch_ea2e8 +.loop4: + sound_call .sub1 + sound_loop 2, .loop4 + sound_loop 0, .mainloop -Music_DarkCave_branch_ea333: +.sub1: octave 4 note D#, 2 octave 3 @@ -141,17 +142,18 @@ Music_DarkCave_Ch2: vibrato 18, 3, 6 stereo_panning FALSE, TRUE note_type 12, 10, 7 -Music_DarkCave_branch_ea374: +.loop1: rest 16 - sound_loop 4, Music_DarkCave_branch_ea374 + sound_loop 4, .loop1 octave 3 note G_, 16 note A#, 16 note F_, 16 note G_, 16 -Music_DarkCave_branch_ea37e: +.mainloop: +.loop2: rest 16 - sound_loop 4, Music_DarkCave_branch_ea37e + sound_loop 4, .loop2 rest 8 stereo_panning TRUE, TRUE volume_envelope 12, 7 @@ -344,17 +346,18 @@ Music_DarkCave_branch_ea37e: note D_, 16 note F_, 16 note D#, 16 - sound_loop 0, Music_DarkCave_branch_ea37e + sound_loop 0, .mainloop Music_DarkCave_Ch3: note_type 12, 2, 7 -Music_DarkCave_branch_ea471: - sound_call Music_DarkCave_branch_ea4ce - sound_loop 2, Music_DarkCave_branch_ea471 -Music_DarkCave_branch_ea478: - sound_call Music_DarkCave_branch_ea4ce - sound_loop 7, Music_DarkCave_branch_ea478 - sound_call Music_DarkCave_branch_ea4c3 +.loop1: + sound_call .sub3 + sound_loop 2, .loop1 +.mainloop: +.loop2: + sound_call .sub3 + sound_loop 7, .loop2 + sound_call .sub2 octave 3 note C_, 4 note G_, 2 @@ -365,7 +368,7 @@ Music_DarkCave_branch_ea478: rest 2 octave 2 note A#, 12 - sound_call Music_DarkCave_branch_ea4c3 + sound_call .sub2 octave 3 note C_, 4 note G_, 2 @@ -380,11 +383,11 @@ Music_DarkCave_branch_ea478: note C#, 2 note C_, 2 note C#, 4 - sound_call Music_DarkCave_branch_ea4a7 - sound_call Music_DarkCave_branch_ea4a7 - sound_loop 0, Music_DarkCave_branch_ea478 + sound_call .sub1 + sound_call .sub1 + sound_loop 0, .mainloop -Music_DarkCave_branch_ea4a7: +.sub1: octave 3 note C_, 4 note G_, 2 @@ -414,7 +417,7 @@ Music_DarkCave_branch_ea4a7: note C#, 4 sound_ret -Music_DarkCave_branch_ea4c3: +.sub2: octave 3 note C_, 4 note G_, 2 @@ -427,7 +430,7 @@ Music_DarkCave_branch_ea4c3: note A#, 12 sound_ret -Music_DarkCave_branch_ea4ce: +.sub3: octave 2 note C_, 4 note G_, 2 @@ -460,7 +463,7 @@ Music_DarkCave_branch_ea4ce: Music_DarkCave_Ch4: toggle_noise 3 drum_speed 12 -Music_DarkCave_branch_ea4ee: +.mainloop: stereo_panning TRUE, TRUE drum_note 4, 8 drum_note 4, 8 @@ -481,4 +484,4 @@ Music_DarkCave_branch_ea4ee: stereo_panning TRUE, FALSE drum_note 2, 2 drum_note 2, 2 - sound_loop 0, Music_DarkCave_branch_ea4ee + sound_loop 0, .mainloop diff --git a/audio/music/dragonsden.asm b/audio/music/dragonsden.asm index c77a98d1f..ccde8f98d 100644 --- a/audio/music/dragonsden.asm +++ b/audio/music/dragonsden.asm @@ -12,21 +12,21 @@ Music_DragonsDen_Ch1: pitch_offset 4 stereo_panning TRUE, FALSE note_type 12, 8, 0 -Music_DragonsDen_branch_eed03: - sound_call Music_DragonsDen_branch_eed1e +.mainloop: + sound_call .sub1 rest 16 - sound_call Music_DragonsDen_branch_eed2d + sound_call .sub2 rest 2 - sound_call Music_DragonsDen_branch_eed2d + sound_call .sub2 rest 2 - sound_call Music_DragonsDen_branch_eed2d + sound_call .sub2 rest 2 - sound_call Music_DragonsDen_branch_eed2d + sound_call .sub2 rest 10 note_type 12, 11, 7 - sound_loop 0, Music_DragonsDen_branch_eed03 + sound_loop 0, .mainloop -Music_DragonsDen_branch_eed1e: +.sub1: octave 3 note A#, 12 note A_, 4 @@ -43,7 +43,7 @@ Music_DragonsDen_branch_eed1e: note G#, 16 sound_ret -Music_DragonsDen_branch_eed2d: +.sub2: volume_envelope 11, 1 rest 2 octave 4 @@ -64,18 +64,18 @@ Music_DragonsDen_Ch2: pitch_offset 4 stereo_panning FALSE, TRUE note_type 12, 9, 0 -Music_DragonsDen_branch_eed46: - sound_call Music_DragonsDen_branch_eed5e +.mainloop: + sound_call .sub1 rest 16 - sound_call Music_DragonsDen_branch_eed6b - sound_call Music_DragonsDen_branch_eed6b - sound_call Music_DragonsDen_branch_eed6b - sound_call Music_DragonsDen_branch_eed6b + sound_call .sub2 + sound_call .sub2 + sound_call .sub2 + sound_call .sub2 rest 16 note_type 12, 12, 7 - sound_loop 0, Music_DragonsDen_branch_eed46 + sound_loop 0, .mainloop -Music_DragonsDen_branch_eed5e: +.sub1: octave 4 note D#, 12 note D_, 4 @@ -90,19 +90,21 @@ Music_DragonsDen_branch_eed5e: note C#, 16 sound_ret -Music_DragonsDen_branch_eed6b: +.sub2: volume_envelope 12, 1 -Music_DragonsDen_branch_eed6d: +.sub2loop1: octave 5 note C#, 4 octave 4 note G#, 4 note G#, 4 note G#, 4 - sound_loop 2, Music_DragonsDen_branch_eed6d + sound_loop 2, .sub2loop1 sound_ret Music_DragonsDen_Ch3: +.mainloop: +.loop1: note_type 12, 1, 4 octave 4 note C#, 2 @@ -126,10 +128,10 @@ Music_DragonsDen_Ch3: note G#, 1 octave 4 note C#, 1 - sound_loop 15, Music_DragonsDen_Ch3 + sound_loop 15, .loop1 rest 16 note_type 6, 2, 7 -Music_DragonsDen_branch_eed99: +.loop2: octave 3 note C#, 4 octave 2 @@ -152,15 +154,15 @@ Music_DragonsDen_branch_eed99: note G#, 2 octave 3 note C#, 2 - sound_loop 16, Music_DragonsDen_branch_eed99 - sound_loop 0, Music_DragonsDen_Ch3 + sound_loop 16, .loop2 + sound_loop 0, .mainloop Music_DragonsDen_Ch4: toggle_noise 0 drum_speed 12 rest 16 rest 16 -Music_DragonsDen_branch_eedbd: +.mainloop: stereo_panning TRUE, FALSE drum_note 6, 4 stereo_panning FALSE, TRUE @@ -168,4 +170,4 @@ Music_DragonsDen_branch_eedbd: drum_note 7, 4 stereo_panning TRUE, FALSE drum_note 7, 4 - sound_loop 0, Music_DragonsDen_branch_eedbd + sound_loop 0, .mainloop diff --git a/audio/music/ecruteakcity.asm b/audio/music/ecruteakcity.asm index 5ca09f2f1..96d8ee932 100644 --- a/audio/music/ecruteakcity.asm +++ b/audio/music/ecruteakcity.asm @@ -10,7 +10,7 @@ Music_EcruteakCity_Ch1: stereo_panning FALSE, TRUE vibrato 18, 2, 5 duty_cycle 2 -Music_EcruteakCity_branch_ef2e5: +.mainloop: note_type 12, 5, 7 rest 10 octave 4 @@ -73,7 +73,7 @@ Music_EcruteakCity_branch_ef2e5: note G_, 4 rest 8 volume_envelope 5, 2 - sound_call Music_EcruteakCity_branch_ef37f + sound_call .sub1 note D_, 2 octave 4 note B_, 2 @@ -95,7 +95,7 @@ Music_EcruteakCity_branch_ef2e5: note B_, 2 note A_, 2 note B_, 2 - sound_call Music_EcruteakCity_branch_ef391 + sound_call .sub2 volume_envelope 5, 2 note A#, 2 note G_, 2 @@ -116,7 +116,7 @@ Music_EcruteakCity_branch_ef2e5: note G_, 2 note E_, 2 note C#, 2 - sound_call Music_EcruteakCity_branch_ef37f + sound_call .sub1 note D_, 2 note C_, 2 octave 4 @@ -143,10 +143,10 @@ Music_EcruteakCity_branch_ef2e5: note G#, 2 octave 5 note C_, 2 - sound_call Music_EcruteakCity_branch_ef391 - sound_loop 0, Music_EcruteakCity_branch_ef2e5 + sound_call .sub2 + sound_loop 0, .mainloop -Music_EcruteakCity_branch_ef37f: +.sub1: octave 5 note E_, 2 note C_, 2 @@ -160,10 +160,10 @@ Music_EcruteakCity_branch_ef37f: note C_, 2 note E_, 2 note C_, 2 - sound_loop 2, Music_EcruteakCity_branch_ef37f + sound_loop 2, .sub1 sound_ret -Music_EcruteakCity_branch_ef391: +.sub2: octave 5 note D_, 2 octave 4 @@ -209,7 +209,7 @@ Music_EcruteakCity_branch_ef391: note C_, 2 octave 3 note A_, 2 -Music_EcruteakCity_branch_ef3be: +.sub2loop1: octave 4 note F_, 2 note A_, 2 @@ -224,8 +224,8 @@ Music_EcruteakCity_branch_ef3be: octave 5 note C_, 2 note F_, 2 - sound_loop 2, Music_EcruteakCity_branch_ef3be -Music_EcruteakCity_branch_ef3d0: + sound_loop 2, .sub2loop1 +.sub2loop2: octave 4 note G_, 2 note B_, 2 @@ -240,7 +240,7 @@ Music_EcruteakCity_branch_ef3d0: octave 5 note D_, 2 note G_, 2 - sound_loop 2, Music_EcruteakCity_branch_ef3d0 + sound_loop 2, .sub2loop2 volume_envelope 5, 0 duty_cycle 0 note E_, 16 @@ -252,7 +252,7 @@ Music_EcruteakCity_Ch2: vibrato 18, 2, 5 duty_cycle 3 stereo_panning TRUE, FALSE -Music_EcruteakCity_branch_ef3f2: +.mainloop: note_type 6, 6, 7 rest 16 rest 5 @@ -468,11 +468,11 @@ Music_EcruteakCity_branch_ef3f2: note C_, 2 note D_, 2 note E_, 16 - sound_loop 0, Music_EcruteakCity_branch_ef3f2 + sound_loop 0, .mainloop Music_EcruteakCity_Ch3: stereo_panning TRUE, TRUE -Music_EcruteakCity_branch_ef4e3: +.mainloop: vibrato 18, 2, 5 note_type 12, 2, 5 octave 3 @@ -575,7 +575,7 @@ Music_EcruteakCity_branch_ef4e3: note B_, 2 octave 4 note D_, 2 - sound_call Music_EcruteakCity_branch_ef569 + sound_call .sub1 octave 4 note C_, 8 note E_, 8 @@ -586,16 +586,16 @@ Music_EcruteakCity_branch_ef4e3: note E_, 8 note C#, 8 note_type 12, 2, 5 - sound_call Music_EcruteakCity_branch_ef569 + sound_call .sub1 octave 4 note C_, 8 octave 3 note G_, 8 note E_, 8 note D_, 8 - sound_loop 0, Music_EcruteakCity_branch_ef4e3 + sound_loop 0, .mainloop -Music_EcruteakCity_branch_ef569: +.sub1: octave 3 note F_, 4 rest 2 diff --git a/audio/music/elmslab.asm b/audio/music/elmslab.asm index b08b3a101..5980237de 100644 --- a/audio/music/elmslab.asm +++ b/audio/music/elmslab.asm @@ -34,7 +34,7 @@ Music_ElmsLab_Ch1: note A_, 4 note A_, 4 note A_, 2 -Music_ElmsLab_branch_ea075: +.mainloop: rest 2 note A_, 2 note G#, 2 @@ -181,7 +181,7 @@ Music_ElmsLab_branch_ea075: volume_envelope 11, 2 note F_, 2 note F_, 4 - sound_loop 0, Music_ElmsLab_branch_ea075 + sound_loop 0, .mainloop Music_ElmsLab_Ch2: duty_cycle 3 @@ -213,7 +213,7 @@ Music_ElmsLab_Ch2: note C_, 4 note C_, 2 stereo_panning TRUE, TRUE -Music_ElmsLab_branch_ea14f: +.mainloop: volume_envelope 12, 6 octave 4 note F_, 6 @@ -348,7 +348,7 @@ Music_ElmsLab_branch_ea14f: volume_envelope 12, 4 octave 3 note E_, 2 - sound_loop 0, Music_ElmsLab_branch_ea14f + sound_loop 0, .mainloop Music_ElmsLab_Ch3: stereo_panning FALSE, TRUE @@ -373,7 +373,7 @@ Music_ElmsLab_Ch3: note C_, 2 note D_, 2 note E_, 2 -Music_ElmsLab_branch_ea216: +.mainloop: note F_, 2 note A_, 2 note C_, 2 @@ -525,7 +525,7 @@ Music_ElmsLab_branch_ea216: note C_, 2 note F_, 2 note A_, 2 - sound_loop 0, Music_ElmsLab_branch_ea216 + sound_loop 0, .mainloop Music_ElmsLab_Ch4: stereo_panning TRUE, FALSE @@ -533,6 +533,6 @@ Music_ElmsLab_Ch4: drum_speed 12 rest 16 rest 2 -Music_ElmsLab_branch_ea2b9: +.mainloop: drum_note 8, 4 - sound_loop 0, Music_ElmsLab_branch_ea2b9 + sound_loop 0, .mainloop diff --git a/audio/music/evolution.asm b/audio/music/evolution.asm index b7aaee855..4fc585014 100644 --- a/audio/music/evolution.asm +++ b/audio/music/evolution.asm @@ -24,23 +24,24 @@ Music_Evolution_Ch1: rest 4 duty_cycle 3 stereo_panning FALSE, TRUE -Music_Evolution_branch_f0713: - sound_call Music_Evolution_branch_f0737 +.mainloop: +.loop1: + sound_call .sub1 note_type 12, 10, 4 note F#, 4 - sound_call Music_Evolution_branch_f0737 + sound_call .sub1 note_type 12, 10, 4 note F#, 4 - sound_loop 2, Music_Evolution_branch_f0713 - sound_call Music_Evolution_branch_f0743 + sound_loop 2, .loop1 + sound_call .sub2 note_type 12, 10, 4 note G#, 4 - sound_call Music_Evolution_branch_f0743 + sound_call .sub2 note_type 12, 10, 4 note G#, 4 - sound_loop 0, Music_Evolution_branch_f0713 + sound_loop 0, .mainloop -Music_Evolution_branch_f0737: +.sub1: note_type 12, 10, 2 octave 3 note C_, 4 @@ -52,7 +53,7 @@ Music_Evolution_branch_f0737: note C_, 4 sound_ret -Music_Evolution_branch_f0743: +.sub2: note_type 12, 10, 2 octave 3 note D_, 4 @@ -76,25 +77,26 @@ Music_Evolution_Ch2: rest 4 duty_cycle 3 stereo_panning TRUE, FALSE -Music_Evolution_branch_f0761: - sound_call Music_Evolution_branch_f0787 +.mainloop: +.loop1: + sound_call .sub1 note_type 12, 11, 5 note A_, 4 - sound_call Music_Evolution_branch_f0787 + sound_call .sub1 note_type 12, 11, 5 note B_, 4 - sound_loop 2, Music_Evolution_branch_f0761 - sound_call Music_Evolution_branch_f0793 + sound_loop 2, .loop1 + sound_call .sub2 note_type 12, 11, 5 note B_, 4 - sound_call Music_Evolution_branch_f0793 + sound_call .sub2 note_type 12, 11, 5 octave 4 note C#, 4 octave 3 - sound_loop 0, Music_Evolution_branch_f0761 + sound_loop 0, .mainloop -Music_Evolution_branch_f0787: +.sub1: note_type 12, 11, 2 octave 3 note G_, 4 @@ -106,7 +108,7 @@ Music_Evolution_branch_f0787: note G_, 4 sound_ret -Music_Evolution_branch_f0793: +.sub2: note_type 12, 11, 2 octave 3 note A_, 4 @@ -121,23 +123,24 @@ Music_Evolution_branch_f0793: Music_Evolution_Ch3: note_type 12, 1, 6 rest 8 -Music_Evolution_branch_f07a3: - sound_call Music_Evolution_branch_f07bf +.mainloop: +.loop1: + sound_call .sub1 octave 3 note A_, 4 - sound_call Music_Evolution_branch_f07bf + sound_call .sub1 octave 3 note B_, 4 - sound_loop 2, Music_Evolution_branch_f07a3 - sound_call Music_Evolution_branch_f07d5 + sound_loop 2, .loop1 + sound_call .sub2 octave 3 note B_, 4 - sound_call Music_Evolution_branch_f07d5 + sound_call .sub2 octave 4 note C#, 4 - sound_loop 0, Music_Evolution_branch_f07a3 + sound_loop 0, .mainloop -Music_Evolution_branch_f07bf: +.sub1: octave 2 note A_, 2 rest 2 @@ -161,7 +164,7 @@ Music_Evolution_branch_f07bf: rest 2 sound_ret -Music_Evolution_branch_f07d5: +.sub2: octave 2 note B_, 2 rest 2 @@ -189,7 +192,7 @@ Music_Evolution_Ch4: toggle_noise 5 drum_speed 12 rest 8 -Music_Evolution_branch_f07f0: +.mainloop: stereo_panning TRUE, FALSE drum_note 11, 6 drum_note 11, 4 @@ -197,4 +200,4 @@ Music_Evolution_branch_f07f0: drum_note 5, 2 drum_note 5, 2 drum_note 5, 2 - sound_loop 0, Music_Evolution_branch_f07f0 + sound_loop 0, .mainloop diff --git a/audio/music/gamecorner.asm b/audio/music/gamecorner.asm index 2ed1b35fb..3f580e3fe 100644 --- a/audio/music/gamecorner.asm +++ b/audio/music/gamecorner.asm @@ -11,25 +11,25 @@ Music_GameCorner_Ch1: stereo_panning FALSE, TRUE note_type 12, 9, 1 rest 8 -Music_GameCorner_branch_edd84: +.mainloop: volume_envelope 9, 1 rest 16 rest 16 rest 16 rest 16 - sound_call Music_GameCorner_branch_ede03 - sound_call Music_GameCorner_branch_ede03 - sound_call Music_GameCorner_branch_ede03 - sound_call Music_GameCorner_branch_ede13 + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 rest 16 rest 16 rest 16 rest 16 rest 16 - sound_call Music_GameCorner_branch_ede03 - sound_call Music_GameCorner_branch_ede03 - sound_call Music_GameCorner_branch_ede03 - sound_call Music_GameCorner_branch_ede13 + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 octave 3 rest 2 note G#, 3 @@ -39,23 +39,23 @@ Music_GameCorner_branch_edd84: note G#, 2 note G_, 2 volume_envelope 7, 1 -Music_GameCorner_branch_eddb1: +.loop1: octave 4 note G#, 1 octave 5 note C_, 1 note F_, 1 note C_, 1 - sound_loop 4, Music_GameCorner_branch_eddb1 -Music_GameCorner_branch_eddbb: + sound_loop 4, .loop1 +.loop2: octave 4 note A#, 1 octave 5 note D_, 1 note G_, 1 note D_, 1 - sound_loop 4, Music_GameCorner_branch_eddbb -Music_GameCorner_branch_eddc5: + sound_loop 4, .loop2 +.loop3: octave 4 note D#, 1 note G_, 1 @@ -63,8 +63,8 @@ Music_GameCorner_branch_eddc5: note C_, 1 octave 4 note G_, 1 - sound_loop 4, Music_GameCorner_branch_eddc5 -Music_GameCorner_branch_eddd0: + sound_loop 4, .loop3 +.loop4: octave 4 note F_, 1 note A_, 1 @@ -72,40 +72,40 @@ Music_GameCorner_branch_eddd0: note C_, 1 octave 4 note A_, 1 - sound_loop 4, Music_GameCorner_branch_eddd0 -Music_GameCorner_branch_edddb: + sound_loop 4, .loop4 +.loop5: octave 4 note G#, 1 octave 5 note C_, 1 note F_, 1 note C_, 1 - sound_loop 4, Music_GameCorner_branch_edddb -Music_GameCorner_branch_edde5: + sound_loop 4, .loop5 +.loop6: octave 4 note A#, 1 octave 5 note D_, 1 note G_, 1 note D_, 1 - sound_loop 4, Music_GameCorner_branch_edde5 -Music_GameCorner_branch_eddef: + sound_loop 4, .loop6 +.loop7: octave 4 note B_, 1 octave 5 note D_, 1 note G_, 1 note D_, 1 - sound_loop 4, Music_GameCorner_branch_eddef + sound_loop 4, .loop7 octave 3 note D_, 1 note D_, 1 note D_, 3 note F_, 2 note F_, 9 - sound_loop 0, Music_GameCorner_branch_edd84 + sound_loop 0, .mainloop -Music_GameCorner_branch_ede03: +.sub1: rest 2 octave 4 note A#, 3 @@ -123,7 +123,7 @@ Music_GameCorner_branch_ede03: note A#, 3 sound_ret -Music_GameCorner_branch_ede13: +.sub2: rest 2 octave 4 note A#, 3 @@ -139,10 +139,10 @@ Music_GameCorner_Ch2: vibrato 8, 2, 4 note_type 12, 10, 1 rest 8 -Music_GameCorner_branch_ede25: +.mainloop: volume_envelope 9, 2 duty_cycle 1 - sound_call Music_GameCorner_branch_ede75 + sound_call .sub1 octave 1 note F_, 2 octave 3 @@ -158,7 +158,7 @@ Music_GameCorner_branch_ede25: note A#, 1 octave 4 note C_, 3 - sound_call Music_GameCorner_branch_ede75 + sound_call .sub1 octave 4 note F_, 2 note D#, 2 @@ -203,9 +203,9 @@ Music_GameCorner_branch_ede25: note A#, 2 note A#, 9 volume_envelope 10, 4 - sound_loop 0, Music_GameCorner_branch_ede25 + sound_loop 0, .mainloop -Music_GameCorner_branch_ede75: +.sub1: octave 1 note C_, 2 octave 3 @@ -320,28 +320,28 @@ Music_GameCorner_Ch3: vibrato 8, 2, 2 note_type 12, 1, 4 rest 8 -Music_GameCorner_branch_edeef: +.mainloop: stereo_panning TRUE, TRUE note_type 12, 1, 4 - sound_call Music_GameCorner_branch_edfdd - sound_call Music_GameCorner_branch_edff8 + sound_call .sub1 + sound_call .sub2 octave 4 note G_, 1 note A_, 3 - sound_call Music_GameCorner_branch_edfdd - sound_call Music_GameCorner_branch_edff8 + sound_call .sub1 + sound_call .sub2 octave 4 note A#, 1 octave 5 note C_, 3 stereo_panning TRUE, FALSE - sound_call Music_GameCorner_branch_edfdd - sound_call Music_GameCorner_branch_ee00c - sound_call Music_GameCorner_branch_edfdd - sound_call Music_GameCorner_branch_ee024 - sound_call Music_GameCorner_branch_edfdd - sound_call Music_GameCorner_branch_ee00c - sound_call Music_GameCorner_branch_edfdd + sound_call .sub1 + sound_call .sub3 + sound_call .sub1 + sound_call .sub4 + sound_call .sub1 + sound_call .sub3 + sound_call .sub1 stereo_panning TRUE, TRUE octave 2 note F_, 1 @@ -364,25 +364,25 @@ Music_GameCorner_branch_edeef: note D#, 1 note F_, 1 rest 2 - sound_call Music_GameCorner_branch_edfdd - sound_call Music_GameCorner_branch_edff8 + sound_call .sub1 + sound_call .sub2 octave 4 note G_, 1 note A_, 3 - sound_call Music_GameCorner_branch_edfdd - sound_call Music_GameCorner_branch_edff8 + sound_call .sub1 + sound_call .sub2 octave 4 note A#, 1 octave 5 note C_, 3 stereo_panning TRUE, FALSE - sound_call Music_GameCorner_branch_edfdd - sound_call Music_GameCorner_branch_ee00c - sound_call Music_GameCorner_branch_edfdd - sound_call Music_GameCorner_branch_ee024 - sound_call Music_GameCorner_branch_edfdd - sound_call Music_GameCorner_branch_ee00c - sound_call Music_GameCorner_branch_edfdd + sound_call .sub1 + sound_call .sub3 + sound_call .sub1 + sound_call .sub4 + sound_call .sub1 + sound_call .sub3 + sound_call .sub1 octave 2 note F_, 1 octave 3 @@ -410,7 +410,7 @@ Music_GameCorner_branch_edeef: note A#, 1 rest 1 volume_envelope 1, 5 - sound_call Music_GameCorner_branch_ee03f + sound_call .sub5 octave 2 note C_, 2 rest 1 @@ -455,7 +455,7 @@ Music_GameCorner_branch_edeef: rest 1 octave 3 note F_, 1 - sound_call Music_GameCorner_branch_ee03f + sound_call .sub5 octave 2 note G_, 2 rest 1 @@ -498,9 +498,9 @@ Music_GameCorner_branch_edeef: note F_, 1 note E_, 1 note D_, 1 - sound_loop 0, Music_GameCorner_branch_edeef + sound_loop 0, .mainloop -Music_GameCorner_branch_edfdd: +.sub1: octave 2 note C_, 1 octave 3 @@ -529,7 +529,7 @@ Music_GameCorner_branch_edfdd: note A_, 2 sound_ret -Music_GameCorner_branch_edff8: +.sub2: octave 2 note C_, 1 octave 3 @@ -551,7 +551,7 @@ Music_GameCorner_branch_edff8: rest 1 sound_ret -Music_GameCorner_branch_ee00c: +.sub3: octave 2 note F_, 1 octave 3 @@ -577,7 +577,7 @@ Music_GameCorner_branch_ee00c: note D_, 3 sound_ret -Music_GameCorner_branch_ee024: +.sub4: octave 2 note F_, 1 octave 3 @@ -606,7 +606,7 @@ Music_GameCorner_branch_ee024: rest 1 sound_ret -Music_GameCorner_branch_ee03f: +.sub5: octave 2 note F_, 2 rest 1 @@ -669,9 +669,9 @@ Music_GameCorner_Ch4: drum_note 3, 2 drum_note 3, 1 drum_note 3, 1 -Music_GameCorner_branch_ee07f: - sound_call Music_GameCorner_branch_ee106 -Music_GameCorner_branch_ee082: +.mainloop: + sound_call .sub1 +.loop1: drum_note 11, 2 drum_note 7, 2 drum_note 3, 2 @@ -680,9 +680,9 @@ Music_GameCorner_branch_ee082: drum_note 7, 2 drum_note 3, 2 drum_note 7, 2 - sound_loop 6, Music_GameCorner_branch_ee082 - sound_call Music_GameCorner_branch_ee10f -Music_GameCorner_branch_ee091: + sound_loop 6, .loop1 + sound_call .sub2 +.loop2: drum_note 11, 2 drum_note 7, 2 drum_note 3, 2 @@ -691,13 +691,13 @@ Music_GameCorner_branch_ee091: drum_note 7, 2 drum_note 3, 2 drum_note 7, 2 - sound_loop 3, Music_GameCorner_branch_ee091 + sound_loop 3, .loop2 rest 12 drum_note 3, 1 drum_note 3, 1 drum_note 7, 2 - sound_call Music_GameCorner_branch_ee106 -Music_GameCorner_branch_ee0a4: + sound_call .sub1 +.loop3: drum_note 11, 2 drum_note 7, 2 drum_note 3, 2 @@ -706,9 +706,9 @@ Music_GameCorner_branch_ee0a4: drum_note 7, 2 drum_note 3, 2 drum_note 7, 2 - sound_loop 6, Music_GameCorner_branch_ee0a4 - sound_call Music_GameCorner_branch_ee10f -Music_GameCorner_branch_ee0b3: + sound_loop 6, .loop3 + sound_call .sub2 +.loop4: drum_note 11, 2 drum_note 7, 2 drum_note 3, 2 @@ -717,7 +717,7 @@ Music_GameCorner_branch_ee0b3: drum_note 7, 2 drum_note 3, 2 drum_note 7, 2 - sound_loop 3, Music_GameCorner_branch_ee0b3 + sound_loop 3, .loop4 drum_note 11, 2 drum_note 7, 2 drum_note 3, 2 @@ -728,7 +728,7 @@ Music_GameCorner_branch_ee0b3: drum_note 3, 1 drum_note 3, 1 drum_note 3, 1 -Music_GameCorner_branch_ee0c9: +.loop5: drum_note 11, 2 drum_note 7, 1 drum_note 4, 1 @@ -742,7 +742,7 @@ Music_GameCorner_branch_ee0c9: drum_note 4, 1 drum_note 3, 2 drum_note 7, 2 - sound_loop 3, Music_GameCorner_branch_ee0c9 + sound_loop 3, .loop5 drum_note 11, 2 drum_note 7, 1 drum_note 4, 1 @@ -757,7 +757,7 @@ Music_GameCorner_branch_ee0c9: drum_note 3, 2 drum_note 3, 1 drum_note 3, 1 -Music_GameCorner_branch_ee0e8: +.loop6: drum_note 11, 2 drum_note 7, 1 drum_note 4, 1 @@ -771,7 +771,7 @@ Music_GameCorner_branch_ee0e8: drum_note 4, 1 drum_note 3, 2 drum_note 7, 2 - sound_loop 3, Music_GameCorner_branch_ee0e8 + sound_loop 3, .loop6 drum_note 3, 1 drum_note 3, 1 drum_note 3, 2 @@ -781,9 +781,9 @@ Music_GameCorner_branch_ee0e8: drum_note 3, 1 drum_note 3, 1 drum_note 4, 2 - sound_loop 0, Music_GameCorner_branch_ee07f + sound_loop 0, .mainloop -Music_GameCorner_branch_ee106: +.sub1: drum_note 1, 2 drum_note 7, 2 drum_note 3, 2 @@ -794,7 +794,7 @@ Music_GameCorner_branch_ee106: drum_note 7, 2 sound_ret -Music_GameCorner_branch_ee10f: +.sub2: drum_note 11, 2 drum_note 7, 2 drum_note 3, 2 diff --git a/audio/music/goldenrodcity.asm b/audio/music/goldenrodcity.asm index b3bae13a9..bb2bf6312 100644 --- a/audio/music/goldenrodcity.asm +++ b/audio/music/goldenrodcity.asm @@ -14,9 +14,9 @@ Music_GoldenrodCity_Ch1: rest 16 rest 16 rest 16 -Music_GoldenrodCity_branch_eb46d: +.mainloop: duty_cycle 0 - sound_call Music_GoldenrodCity_branch_eb4a9 + sound_call .sub1 octave 3 note G#, 1 octave 4 @@ -30,14 +30,14 @@ Music_GoldenrodCity_branch_eb46d: note C_, 1 volume_envelope 7, 1 duty_cycle 0 - sound_call Music_GoldenrodCity_branch_eb4d1 + sound_call .sub2 volume_envelope 7, 7 note D#, 2 note F_, 2 note F#, 2 note G#, 4 volume_envelope 7, 1 - sound_call Music_GoldenrodCity_branch_eb4d1 + sound_call .sub2 note D#, 1 note F#, 1 volume_envelope 7, 7 @@ -49,15 +49,15 @@ Music_GoldenrodCity_branch_eb46d: note D#, 2 duty_cycle 2 volume_envelope 9, 7 - sound_call Music_GoldenrodCity_branch_eb4a9 + sound_call .sub1 note C_, 4 octave 3 note G#, 2 octave 4 note C_, 2 - sound_loop 0, Music_GoldenrodCity_branch_eb46d + sound_loop 0, .mainloop -Music_GoldenrodCity_branch_eb4a9: +.sub1: octave 4 note C#, 2 octave 3 @@ -99,7 +99,7 @@ Music_GoldenrodCity_branch_eb4a9: note C#, 2 sound_ret -Music_GoldenrodCity_branch_eb4d1: +.sub2: octave 4 note F_, 1 note C#, 1 @@ -178,16 +178,16 @@ Music_GoldenrodCity_Ch2: vibrato 18, 2, 3 duty_cycle 2 note_type 12, 9, 7 -Music_GoldenrodCity_branch_eb523: +.mainloop: volume_envelope 9, 7 - sound_call Music_GoldenrodCity_branch_eb555 + sound_call .sub1 octave 4 note F_, 2 note F#, 2 note G#, 2 note F_, 2 note D#, 8 - sound_call Music_GoldenrodCity_branch_eb555 + sound_call .sub1 note G#, 2 note A#, 2 octave 5 @@ -196,7 +196,7 @@ Music_GoldenrodCity_branch_eb523: note D#, 8 duty_cycle 2 volume_envelope 7, 7 - sound_call Music_GoldenrodCity_branch_eb572 + sound_call .sub2 octave 4 note G#, 2 note A#, 2 @@ -205,16 +205,16 @@ Music_GoldenrodCity_branch_eb523: note C_, 4 duty_cycle 3 volume_envelope 7, 7 - sound_call Music_GoldenrodCity_branch_eb572 + sound_call .sub2 note F_, 2 note D#, 2 note C#, 2 note C_, 2 octave 4 note G#, 2 - sound_loop 0, Music_GoldenrodCity_branch_eb523 + sound_loop 0, .mainloop -Music_GoldenrodCity_branch_eb555: +.sub1: octave 4 note F_, 4 note C#, 4 @@ -244,7 +244,7 @@ Music_GoldenrodCity_branch_eb555: duty_cycle 1 sound_ret -Music_GoldenrodCity_branch_eb572: +.sub2: note C#, 6 note F_, 6 note C#, 4 @@ -268,10 +268,10 @@ Music_GoldenrodCity_Ch3: stereo_panning TRUE, TRUE vibrato 8, 2, 3 note_type 12, 2, 5 -Music_GoldenrodCity_branch_eb58c: - sound_call Music_GoldenrodCity_branch_eb5aa - sound_call Music_GoldenrodCity_branch_eb5aa - sound_call Music_GoldenrodCity_branch_eb5d2 +.mainloop: + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 rest 3 octave 3 note C_, 1 @@ -279,7 +279,7 @@ Music_GoldenrodCity_branch_eb58c: note G_, 1 note G#, 1 note D#, 2 - sound_call Music_GoldenrodCity_branch_eb5d2 + sound_call .sub2 rest 1 octave 3 note G#, 2 @@ -287,9 +287,9 @@ Music_GoldenrodCity_branch_eb58c: note D#, 2 octave 2 note G#, 2 - sound_loop 0, Music_GoldenrodCity_branch_eb58c + sound_loop 0, .mainloop -Music_GoldenrodCity_branch_eb5aa: +.sub1: octave 3 note C#, 4 rest 2 @@ -331,7 +331,7 @@ Music_GoldenrodCity_branch_eb5aa: rest 1 sound_ret -Music_GoldenrodCity_branch_eb5d2: +.sub2: note C#, 1 rest 1 octave 4 @@ -397,7 +397,8 @@ Music_GoldenrodCity_Ch4: drum_note 3, 1 drum_note 3, 1 drum_note 7, 2 -Music_GoldenrodCity_branch_eb613: +.mainloop: +.loop1: drum_note 4, 2 drum_note 7, 2 drum_note 3, 2 @@ -406,39 +407,39 @@ Music_GoldenrodCity_branch_eb613: drum_note 7, 2 drum_note 3, 2 drum_note 7, 2 - sound_loop 3, Music_GoldenrodCity_branch_eb613 - sound_call Music_GoldenrodCity_branch_eb663 - sound_call Music_GoldenrodCity_branch_eb66d + sound_loop 3, .loop1 + sound_call .sub1 + sound_call .sub2 drum_note 8, 1 drum_note 8, 1 drum_note 7, 2 - sound_call Music_GoldenrodCity_branch_eb66d + sound_call .sub2 drum_note 3, 2 drum_note 7, 2 - sound_call Music_GoldenrodCity_branch_eb66d + sound_call .sub2 drum_note 3, 1 drum_note 3, 1 drum_note 7, 2 - sound_call Music_GoldenrodCity_branch_eb66d + sound_call .sub2 drum_note 3, 2 drum_note 3, 1 drum_note 3, 1 - sound_call Music_GoldenrodCity_branch_eb66d + sound_call .sub2 drum_note 8, 1 drum_note 8, 1 drum_note 7, 2 - sound_call Music_GoldenrodCity_branch_eb66d + sound_call .sub2 drum_note 3, 2 drum_note 7, 2 - sound_call Music_GoldenrodCity_branch_eb66d + sound_call .sub2 drum_note 3, 1 drum_note 3, 1 drum_note 7, 2 - sound_call Music_GoldenrodCity_branch_eb66d + sound_call .sub2 drum_note 3, 2 drum_note 3, 1 drum_note 3, 1 -Music_GoldenrodCity_branch_eb650: +.loop2: drum_note 4, 2 drum_note 7, 2 drum_note 3, 2 @@ -447,11 +448,11 @@ Music_GoldenrodCity_branch_eb650: drum_note 7, 2 drum_note 3, 2 drum_note 7, 2 - sound_loop 3, Music_GoldenrodCity_branch_eb650 - sound_call Music_GoldenrodCity_branch_eb663 - sound_loop 0, Music_GoldenrodCity_branch_eb613 + sound_loop 3, .loop2 + sound_call .sub1 + sound_loop 0, .mainloop -Music_GoldenrodCity_branch_eb663: +.sub1: drum_note 4, 2 drum_note 7, 2 drum_note 3, 2 @@ -463,7 +464,7 @@ Music_GoldenrodCity_branch_eb663: drum_note 7, 2 sound_ret -Music_GoldenrodCity_branch_eb66d: +.sub2: drum_note 4, 2 drum_note 3, 1 drum_note 4, 3 diff --git a/audio/music/goldsilveropening2.asm b/audio/music/goldsilveropening2.asm index 5800f6621..13714b395 100644 --- a/audio/music/goldsilveropening2.asm +++ b/audio/music/goldsilveropening2.asm @@ -14,7 +14,7 @@ Music_GoldSilverOpening2_Ch1: note_type 12, 3, -5 octave 3 note D#, 8 -Music_GoldSilverOpening2_branch_f7325: +.loop1: note_type 12, 12, 1 octave 3 note D_, 2 @@ -30,7 +30,7 @@ Music_GoldSilverOpening2_branch_f7325: note F_, 4 note D#, 4 note C_, 2 - sound_loop 2, Music_GoldSilverOpening2_branch_f7325 + sound_loop 2, .loop1 volume_envelope 12, 1 note D_, 2 note D_, 2 @@ -195,7 +195,7 @@ Music_GoldSilverOpening2_Ch4: drum_note 3, 2 drum_note 3, 2 drum_speed 12 -Music_GoldSilverOpening2_branch_f73f8: +.loop1: drum_note 3, 2 drum_note 3, 2 drum_note 3, 2 @@ -213,6 +213,6 @@ Music_GoldSilverOpening2_branch_f73f8: drum_note 4, 2 drum_note 4, 2 drum_speed 12 - sound_loop 4, Music_GoldSilverOpening2_branch_f73f8 + sound_loop 4, .loop1 drum_note 1, 16 sound_ret diff --git a/audio/music/gym.asm b/audio/music/gym.asm index e39bebe89..774e471a6 100644 --- a/audio/music/gym.asm +++ b/audio/music/gym.asm @@ -12,7 +12,7 @@ Music_Gym_Ch1: vibrato 18, 2, 4 duty_cycle 1 note_type 12, 11, 7 -Music_Gym_branch_f48c9: +.mainloop: octave 4 note F#, 2 octave 2 @@ -188,12 +188,12 @@ Music_Gym_branch_f48c9: note G_, 1 note F#, 1 note E_, 1 - sound_loop 0, Music_Gym_branch_f48c9 + sound_loop 0, .mainloop Music_Gym_Ch2: duty_cycle 1 stereo_panning TRUE, FALSE -Music_Gym_branch_f4980: +.mainloop: note_type 12, 12, 3 octave 2 note D_, 2 @@ -227,12 +227,12 @@ Music_Gym_branch_f4980: octave 3 note C_, 1 note C#, 1 - sound_call Music_Gym_branch_f49e9 + sound_call .sub1 octave 3 note E_, 2 note C_, 1 note C#, 1 - sound_call Music_Gym_branch_f49e9 + sound_call .sub1 octave 3 note C_, 1 note E_, 1 @@ -240,7 +240,7 @@ Music_Gym_branch_f4980: octave 4 note C_, 1 volume_envelope 13, 2 - sound_call Music_Gym_branch_f4a15 + sound_call .sub2 octave 1 note F#, 1 note B_, 1 @@ -261,7 +261,7 @@ Music_Gym_branch_f4980: octave 2 note G_, 2 note E_, 2 - sound_call Music_Gym_branch_f4a15 + sound_call .sub2 octave 1 note G_, 1 octave 2 @@ -284,9 +284,9 @@ Music_Gym_branch_f4980: octave 2 note F#, 2 note D_, 2 - sound_loop 0, Music_Gym_branch_f4980 + sound_loop 0, .mainloop -Music_Gym_branch_f49e9: +.sub1: octave 3 note D_, 3 octave 2 @@ -332,7 +332,7 @@ Music_Gym_branch_f49e9: note C_, 2 sound_ret -Music_Gym_branch_f4a15: +.sub2: octave 2 note D_, 4 note D_, 2 @@ -371,7 +371,7 @@ Music_Gym_branch_f4a15: Music_Gym_Ch3: vibrato 20, 2, 3 stereo_panning TRUE, TRUE -Music_Gym_branch_f4a3c: +.mainloop: note_type 12, 1, 4 octave 6 note D_, 2 @@ -454,7 +454,7 @@ Music_Gym_branch_f4a3c: octave 5 note B_, 4 volume_envelope 1, 3 - sound_call Music_Gym_branch_f4ab3 + sound_call .sub1 rest 2 note A_, 2 octave 6 @@ -467,7 +467,7 @@ Music_Gym_branch_f4a3c: note A#, 4 note A_, 4 note G_, 4 - sound_call Music_Gym_branch_f4ab3 + sound_call .sub1 note A_, 1 rest 1 note A_, 1 @@ -480,9 +480,9 @@ Music_Gym_branch_f4a3c: note E_, 1 note F#, 8 note E_, 4 - sound_loop 0, Music_Gym_branch_f4a3c + sound_loop 0, .mainloop -Music_Gym_branch_f4ab3: +.sub1: octave 5 note A_, 6 octave 6 @@ -504,7 +504,7 @@ Music_Gym_branch_f4ab3: Music_Gym_Ch4: toggle_noise 4 -Music_Gym_branch_f4ac7: +.mainloop: drum_speed 12 drum_note 3, 2 drum_note 2, 1 @@ -529,7 +529,7 @@ Music_Gym_branch_f4ac7: drum_note 3, 1 drum_note 3, 1 drum_speed 6 -Music_Gym_branch_f4ae1: +.loop1: drum_note 3, 6 drum_note 3, 6 drum_note 3, 4 @@ -551,8 +551,8 @@ Music_Gym_branch_f4ae1: drum_note 3, 2 drum_note 3, 4 drum_note 12, 8 - sound_loop 4, Music_Gym_branch_f4ae1 -Music_Gym_branch_f4afa: + sound_loop 4, .loop1 +.loop2: drum_note 4, 4 drum_note 7, 4 drum_note 3, 4 @@ -563,5 +563,5 @@ Music_Gym_branch_f4afa: drum_note 4, 4 drum_note 3, 4 drum_note 7, 4 - sound_loop 8, Music_Gym_branch_f4afa - sound_loop 0, Music_Gym_branch_f4ac7 + sound_loop 8, .loop2 + sound_loop 0, .mainloop diff --git a/audio/music/gymleadervictory.asm b/audio/music/gymleadervictory.asm index d396a403a..4f53ea85a 100644 --- a/audio/music/gymleadervictory.asm +++ b/audio/music/gymleadervictory.asm @@ -27,17 +27,18 @@ Music_GymLeaderVictory_Ch1: octave 5 note D_, 8 stereo_panning FALSE, TRUE -Music_GymLeaderVictory_branch_f4658: +.mainloop: +.loop1: duty_cycle 1 - sound_call Music_GymLeaderVictory_branch_f4689 + sound_call .sub1 octave 4 note C#, 4 note E_, 4 - sound_call Music_GymLeaderVictory_branch_f4689 + sound_call .sub1 note F#, 8 - sound_loop 2, Music_GymLeaderVictory_branch_f4658 + sound_loop 2, .loop1 duty_cycle 2 - sound_call Music_GymLeaderVictory_branch_f46a0 + sound_call .sub2 note A_, 4 note G_, 4 note F#, 6 @@ -48,7 +49,7 @@ Music_GymLeaderVictory_branch_f4658: note D_, 8 note C#, 8 duty_cycle 3 - sound_call Music_GymLeaderVictory_branch_f46a0 + sound_call .sub2 note C#, 4 note E_, 4 note G_, 6 @@ -58,9 +59,9 @@ Music_GymLeaderVictory_branch_f4658: note G_, 2 volume_envelope 8, 7 note F#, 16 - sound_loop 0, Music_GymLeaderVictory_branch_f4658 + sound_loop 0, .mainloop -Music_GymLeaderVictory_branch_f4689: +.sub1: volume_envelope 9, 1 octave 3 note F#, 2 @@ -84,7 +85,7 @@ Music_GymLeaderVictory_branch_f4689: note D_, 1 sound_ret -Music_GymLeaderVictory_branch_f46a0: +.sub2: volume_envelope 8, 7 octave 3 note F#, 14 @@ -129,25 +130,25 @@ Music_GymLeaderVictory_Ch2: octave 5 note D_, 1 note F#, 16 -Music_GymLeaderVictory_branch_f46d0: +.mainloop: duty_cycle 3 volume_envelope 10, 1 - sound_call Music_GymLeaderVictory_branch_f4711 + sound_call .sub1 note A_, 4 note A_, 4 - sound_call Music_GymLeaderVictory_branch_f4711 + sound_call .sub1 note D_, 6 duty_cycle 2 note B_, 1 octave 5 note C#, 1 - sound_call Music_GymLeaderVictory_branch_f4711 + sound_call .sub1 note A_, 4 note A_, 4 - sound_call Music_GymLeaderVictory_branch_f4711 + sound_call .sub1 note D_, 8 duty_cycle 3 - sound_call Music_GymLeaderVictory_branch_f4720 + sound_call .sub2 note F#, 4 note E_, 4 note D_, 14 @@ -156,7 +157,7 @@ Music_GymLeaderVictory_branch_f46d0: volume_envelope 10, 7 note A_, 16 duty_cycle 2 - sound_call Music_GymLeaderVictory_branch_f4720 + sound_call .sub2 octave 4 note A_, 4 octave 5 @@ -171,9 +172,9 @@ Music_GymLeaderVictory_branch_f46d0: note B_, 1 octave 5 note C#, 1 - sound_loop 0, Music_GymLeaderVictory_branch_f46d0 + sound_loop 0, .mainloop -Music_GymLeaderVictory_branch_f4711: +.sub1: octave 5 note D_, 2 note C#, 2 @@ -190,7 +191,7 @@ Music_GymLeaderVictory_branch_f4711: note F#, 2 sound_ret -Music_GymLeaderVictory_branch_f4720: +.sub2: volume_envelope 9, 8 note A_, 6 note F#, 1 @@ -225,7 +226,8 @@ Music_GymLeaderVictory_Ch3: octave 3 note C#, 2 stereo_panning TRUE, FALSE -Music_GymLeaderVictory_branch_f4744: +.mainloop: +.loop1: note D_, 2 rest 4 octave 2 @@ -257,8 +259,8 @@ Music_GymLeaderVictory_branch_f4744: octave 3 note D_, 2 rest 6 - sound_loop 2, Music_GymLeaderVictory_branch_f4744 - sound_call Music_GymLeaderVictory_branch_f479e + sound_loop 2, .loop1 + sound_call .sub1 octave 3 note D_, 2 rest 2 @@ -283,7 +285,7 @@ Music_GymLeaderVictory_branch_f4744: note C#, 2 octave 2 note A_, 2 - sound_call Music_GymLeaderVictory_branch_f479e + sound_call .sub1 octave 3 note D_, 2 rest 2 @@ -305,9 +307,9 @@ Music_GymLeaderVictory_branch_f4744: note B_, 2 octave 3 note C#, 2 - sound_loop 0, Music_GymLeaderVictory_branch_f4744 + sound_loop 0, .mainloop -Music_GymLeaderVictory_branch_f479e: +.sub1: octave 3 note D_, 2 rest 2 @@ -385,12 +387,12 @@ Music_GymLeaderVictory_Ch4: drum_speed 12 drum_note 12, 16 drum_note 12, 16 -Music_GymLeaderVictory_branch_f47eb: - sound_call Music_GymLeaderVictory_branch_f480b +.mainloop: + sound_call .sub1 drum_note 4, 6 drum_note 4, 2 drum_note 4, 8 - sound_call Music_GymLeaderVictory_branch_f480b + sound_call .sub1 drum_note 4, 6 drum_note 4, 2 drum_note 4, 4 @@ -398,7 +400,7 @@ Music_GymLeaderVictory_branch_f47eb: drum_note 2, 1 drum_note 2, 1 drum_note 2, 1 -Music_GymLeaderVictory_branch_f47fb: +.loop1: drum_note 4, 2 drum_note 8, 2 drum_note 3, 2 @@ -407,14 +409,15 @@ Music_GymLeaderVictory_branch_f47fb: drum_note 4, 2 drum_note 3, 2 drum_note 8, 2 - sound_loop 16, Music_GymLeaderVictory_branch_f47fb - sound_loop 0, Music_GymLeaderVictory_branch_f47eb + sound_loop 16, .loop1 + sound_loop 0, .mainloop -Music_GymLeaderVictory_branch_f480b: +.sub1: +.sub1loop1: drum_note 4, 6 drum_note 4, 2 drum_note 4, 4 drum_note 3, 2 drum_note 4, 2 - sound_loop 3, Music_GymLeaderVictory_branch_f480b + sound_loop 3, .sub1loop1 sound_ret diff --git a/audio/music/halloffame.asm b/audio/music/halloffame.asm index 8bbdf27f7..1786773db 100644 --- a/audio/music/halloffame.asm +++ b/audio/music/halloffame.asm @@ -22,7 +22,8 @@ Music_HallOfFame_Ch1: note E_, 1 note F_, 1 note F#, 1 -Music_HallOfFame_branch_f05e6: +.mainloop: +.loop1: volume_envelope 9, 7 octave 4 note C_, 8 @@ -40,17 +41,17 @@ Music_HallOfFame_branch_f05e6: note F_, 8 volume_envelope 5, 7 note F_, 8 - sound_loop 3, Music_HallOfFame_branch_f05e6 + sound_loop 3, .loop1 rest 16 rest 16 rest 16 rest 16 - sound_loop 0, Music_HallOfFame_branch_f05e6 + sound_loop 0, .mainloop Music_HallOfFame_Ch2: vibrato 8, 2, 5 duty_cycle 3 -Music_HallOfFame_branch_f0610: +.mainloop: note_type 12, 12, 4 octave 3 note G_, 2 @@ -75,11 +76,12 @@ Music_HallOfFame_branch_f0610: note A#, 4 note A_, 4 note F_, 2 - sound_loop 0, Music_HallOfFame_branch_f0610 + sound_loop 0, .mainloop Music_HallOfFame_Ch3: +.mainloop: note_type 12, 2, 8 -Music_HallOfFame_branch_f0631: +.loop1: octave 3 note D_, 2 note G_, 2 @@ -116,7 +118,7 @@ Music_HallOfFame_branch_f0631: note F_, 2 note C_, 2 note F_, 2 - sound_loop 3, Music_HallOfFame_branch_f0631 + sound_loop 3, .loop1 note D_, 4 note G_, 4 note D_, 4 @@ -133,7 +135,7 @@ Music_HallOfFame_branch_f0631: note G_, 4 note E_, 4 note G_, 4 - sound_loop 0, Music_HallOfFame_Ch3 + sound_loop 0, .mainloop Music_HallOfFame_Ch4: toggle_noise 5 @@ -143,7 +145,7 @@ Music_HallOfFame_Ch4: rest 16 rest 16 drum_speed 6 -Music_HallOfFame_branch_f0677: +.mainloop: stereo_panning FALSE, TRUE drum_note 11, 4 drum_note 11, 8 @@ -169,4 +171,4 @@ Music_HallOfFame_branch_f0677: drum_note 11, 1 drum_note 11, 1 drum_note 11, 1 - sound_loop 0, Music_HallOfFame_branch_f0677 + sound_loop 0, .mainloop diff --git a/audio/music/indigoplateau.asm b/audio/music/indigoplateau.asm index 5fef0247f..371b970d4 100644 --- a/audio/music/indigoplateau.asm +++ b/audio/music/indigoplateau.asm @@ -11,21 +11,21 @@ Music_IndigoPlateau_Ch1: duty_cycle 3 pitch_offset 2 stereo_panning FALSE, TRUE -Music_IndigoPlateau_branch_ee86a: - sound_call Music_IndigoPlateau_branch_ee881 +.mainloop: + sound_call .sub1 octave 3 note D_, 4 - sound_call Music_IndigoPlateau_branch_ee881 + sound_call .sub1 octave 3 note D#, 4 - sound_call Music_IndigoPlateau_branch_ee881 + sound_call .sub1 octave 3 note D#, 4 - sound_call Music_IndigoPlateau_branch_ee881 + sound_call .sub1 note A#, 4 - sound_loop 0, Music_IndigoPlateau_branch_ee86a + sound_loop 0, .mainloop -Music_IndigoPlateau_branch_ee881: +.sub1: note_type 12, 11, 6 octave 2 note A_, 4 @@ -44,14 +44,14 @@ Music_IndigoPlateau_Ch2: duty_cycle 3 vibrato 16, 2, 2 stereo_panning TRUE, FALSE -Music_IndigoPlateau_branch_ee899: - sound_call Music_IndigoPlateau_branch_ee8e9 +.mainloop: + sound_call .sub1 note A_, 4 - sound_call Music_IndigoPlateau_branch_ee8e9 + sound_call .sub1 note A#, 4 - sound_call Music_IndigoPlateau_branch_ee8e9 + sound_call .sub1 note A_, 4 - sound_call Music_IndigoPlateau_branch_ee8e9 + sound_call .sub1 note C#, 4 volume_envelope 12, 7 note A_, 6 @@ -61,7 +61,7 @@ Music_IndigoPlateau_branch_ee899: note A_, 8 volume_envelope 11, 0 note A_, 4 - sound_call Music_IndigoPlateau_branch_ee8e9 + sound_call .sub1 note A#, 4 volume_envelope 12, 7 octave 4 @@ -72,7 +72,7 @@ Music_IndigoPlateau_branch_ee899: volume_envelope 11, 0 octave 3 note A_, 4 - sound_call Music_IndigoPlateau_branch_ee8e9 + sound_call .sub1 note C#, 4 volume_envelope 12, 7 octave 4 @@ -84,7 +84,7 @@ Music_IndigoPlateau_branch_ee899: note F#, 8 volume_envelope 11, 0 note A_, 4 - sound_call Music_IndigoPlateau_branch_ee8e9 + sound_call .sub1 note A#, 4 volume_envelope 12, 7 octave 4 @@ -95,11 +95,11 @@ Music_IndigoPlateau_branch_ee899: volume_envelope 11, 0 octave 3 note A_, 4 - sound_call Music_IndigoPlateau_branch_ee8e9 + sound_call .sub1 note C#, 4 - sound_loop 0, Music_IndigoPlateau_branch_ee899 + sound_loop 0, .mainloop -Music_IndigoPlateau_branch_ee8e9: +.sub1: note_type 12, 12, 6 octave 3 note D_, 4 @@ -116,22 +116,22 @@ Music_IndigoPlateau_branch_ee8e9: Music_IndigoPlateau_Ch3: note_type 12, 1, -1 -Music_IndigoPlateau_branch_ee8fd: - sound_call Music_IndigoPlateau_branch_ee915 +.mainloop: + sound_call .sub1 octave 3 note A_, 4 - sound_call Music_IndigoPlateau_branch_ee915 + sound_call .sub1 octave 3 note A_, 4 - sound_call Music_IndigoPlateau_branch_ee915 + sound_call .sub1 octave 3 note A_, 4 - sound_call Music_IndigoPlateau_branch_ee915 + sound_call .sub1 octave 3 note F#, 4 - sound_loop 0, Music_IndigoPlateau_branch_ee8fd + sound_loop 0, .mainloop -Music_IndigoPlateau_branch_ee915: +.sub1: octave 3 note D_, 1 rest 3 @@ -152,7 +152,7 @@ Music_IndigoPlateau_Ch4: stereo_panning TRUE, FALSE toggle_noise 0 drum_speed 12 -Music_IndigoPlateau_branch_ee92a: +.mainloop: drum_note 4, 4 drum_note 3, 2 drum_note 4, 2 @@ -180,4 +180,4 @@ Music_IndigoPlateau_branch_ee92a: drum_note 3, 2 drum_note 3, 2 drum_note 2, 4 - sound_loop 0, Music_IndigoPlateau_branch_ee92a + sound_loop 0, .mainloop diff --git a/audio/music/johtogymbattle.asm b/audio/music/johtogymbattle.asm index f03339111..fadf4d83e 100644 --- a/audio/music/johtogymbattle.asm +++ b/audio/music/johtogymbattle.asm @@ -11,21 +11,21 @@ Music_JohtoGymBattle_Ch1: pitch_offset 2 vibrato 18, 1, 5 note_type 12, 11, 2 -Music_JohtoGymBattle_branch_ea526: +.loop1: octave 3 note A#, 1 note A_, 1 note G#, 1 note A_, 1 - sound_loop 4, Music_JohtoGymBattle_branch_ea526 -Music_JohtoGymBattle_branch_ea52f: + sound_loop 4, .loop1 +.loop2: note C#, 1 note C_, 1 octave 2 note A#, 1 octave 3 note C_, 1 - sound_loop 3, Music_JohtoGymBattle_branch_ea52f + sound_loop 3, .loop2 volume_envelope 4, -3 note C#, 4 volume_envelope 11, 2 @@ -58,7 +58,7 @@ Music_JohtoGymBattle_branch_ea52f: octave 3 note G#, 2 note F_, 2 -Music_JohtoGymBattle_branch_ea55d: +.mainloop: volume_envelope 11, 5 note D_, 6 note G_, 6 @@ -285,26 +285,26 @@ Music_JohtoGymBattle_branch_ea55d: octave 3 note D#, 2 note F#, 2 - sound_loop 0, Music_JohtoGymBattle_branch_ea55d + sound_loop 0, .mainloop Music_JohtoGymBattle_Ch2: duty_cycle 3 vibrato 8, 3, 6 pitch_offset 1 note_type 12, 12, 2 -Music_JohtoGymBattle_branch_ea66a: +.loop1: octave 4 note F#, 1 note F_, 1 note E_, 1 note A#, 1 - sound_loop 4, Music_JohtoGymBattle_branch_ea66a -Music_JohtoGymBattle_branch_ea673: + sound_loop 4, .loop1 +.loop2: note F#, 1 note F_, 1 note F#, 1 note A#, 1 - sound_loop 4, Music_JohtoGymBattle_branch_ea673 + sound_loop 4, .loop2 note A_, 6 octave 3 note A#, 6 @@ -396,7 +396,7 @@ Music_JohtoGymBattle_branch_ea673: octave 3 note G#, 1 note A_, 1 -Music_JohtoGymBattle_branch_ea6ee: +.mainloop: volume_envelope 12, 7 note A#, 8 volume_envelope 12, 4 @@ -611,7 +611,7 @@ Music_JohtoGymBattle_branch_ea6ee: octave 3 note B_, 16 note G_, 16 - sound_loop 0, Music_JohtoGymBattle_branch_ea6ee + sound_loop 0, .mainloop Music_JohtoGymBattle_Ch3: note_type 12, 1, -1 @@ -648,7 +648,7 @@ Music_JohtoGymBattle_Ch3: note F_, 2 note G_, 2 note G#, 4 - sound_call Music_JohtoGymBattle_branch_ea952 + sound_call .sub1 note G_, 2 note D_, 2 note F_, 2 @@ -664,7 +664,7 @@ Music_JohtoGymBattle_Ch3: note G#, 2 note D#, 2 note F#, 4 - sound_call Music_JohtoGymBattle_branch_ea952 + sound_call .sub1 note G_, 2 note D_, 2 note F_, 2 @@ -683,10 +683,10 @@ Music_JohtoGymBattle_Ch3: octave 3 note A#, 2 note G#, 2 -Music_JohtoGymBattle_branch_ea83f: - sound_call Music_JohtoGymBattle_branch_ea963 - sound_call Music_JohtoGymBattle_branch_ea963 - sound_call Music_JohtoGymBattle_branch_ea96a +.mainloop: + sound_call .sub2 + sound_call .sub2 + sound_call .sub3 note C#, 2 note G#, 2 note C#, 2 @@ -695,7 +695,7 @@ Music_JohtoGymBattle_branch_ea83f: note A#, 2 note A_, 2 note G#, 2 - sound_call Music_JohtoGymBattle_branch_ea963 + sound_call .sub2 note D_, 2 note G_, 2 note D_, 2 @@ -704,8 +704,8 @@ Music_JohtoGymBattle_branch_ea83f: note G_, 2 note G#, 2 note G_, 2 - sound_call Music_JohtoGymBattle_branch_ea96a - sound_call Music_JohtoGymBattle_branch_ea96a + sound_call .sub3 + sound_call .sub3 note C_, 2 note G_, 2 note A#, 2 @@ -714,14 +714,14 @@ Music_JohtoGymBattle_branch_ea83f: note F_, 2 note G_, 2 note A#, 2 - sound_call Music_JohtoGymBattle_branch_ea971 - sound_call Music_JohtoGymBattle_branch_ea96a - sound_call Music_JohtoGymBattle_branch_ea978 + sound_call .sub4 + sound_call .sub3 + sound_call .sub5 octave 3 note G_, 2 note G#, 2 note F_, 2 - sound_call Music_JohtoGymBattle_branch_ea971 + sound_call .sub4 note C_, 2 note G_, 2 note C_, 2 @@ -730,13 +730,13 @@ Music_JohtoGymBattle_branch_ea83f: note E_, 2 note F_, 2 note G_, 2 - sound_call Music_JohtoGymBattle_branch_ea96a - sound_call Music_JohtoGymBattle_branch_ea978 + sound_call .sub3 + sound_call .sub5 octave 3 note C_, 2 note C#, 2 note G#, 2 - sound_call Music_JohtoGymBattle_branch_ea971 + sound_call .sub4 note C_, 2 note G_, 2 note C_, 2 @@ -745,15 +745,15 @@ Music_JohtoGymBattle_branch_ea83f: note E_, 2 note F_, 2 note G_, 2 - sound_call Music_JohtoGymBattle_branch_ea96a - sound_call Music_JohtoGymBattle_branch_ea978 + sound_call .sub3 + sound_call .sub5 octave 3 note F_, 2 octave 2 note A#, 2 octave 3 note G#, 2 - sound_call Music_JohtoGymBattle_branch_ea971 + sound_call .sub4 note C_, 2 note G_, 2 note C_, 2 @@ -764,12 +764,12 @@ Music_JohtoGymBattle_branch_ea83f: note G_, 2 note F_, 2 note G_, 2 - sound_call Music_JohtoGymBattle_branch_ea983 + sound_call .sub6 rest 2 - sound_call Music_JohtoGymBattle_branch_ea990 + sound_call .sub7 octave 4 note C#, 2 - sound_call Music_JohtoGymBattle_branch_ea99c + sound_call .sub8 rest 2 note D#, 2 note A#, 2 @@ -784,11 +784,11 @@ Music_JohtoGymBattle_branch_ea83f: note D#, 2 octave 4 note D#, 2 - sound_call Music_JohtoGymBattle_branch_ea983 + sound_call .sub6 note G_, 2 - sound_call Music_JohtoGymBattle_branch_ea990 + sound_call .sub7 note G#, 2 - sound_call Music_JohtoGymBattle_branch_ea99c + sound_call .sub8 note A_, 2 octave 4 note D#, 2 @@ -802,7 +802,7 @@ Music_JohtoGymBattle_branch_ea83f: octave 4 note D#, 2 note D_, 4 - sound_call Music_JohtoGymBattle_branch_ea9a9 + sound_call .sub9 note D#, 2 note G#, 2 note D#, 2 @@ -813,7 +813,7 @@ Music_JohtoGymBattle_branch_ea83f: note A_, 2 note D#, 2 note G#, 2 - sound_call Music_JohtoGymBattle_branch_ea9a9 + sound_call .sub9 note D#, 2 note G#, 2 note D#, 2 @@ -822,7 +822,7 @@ Music_JohtoGymBattle_branch_ea83f: note A_, 2 note G#, 2 note F#, 2 - sound_call Music_JohtoGymBattle_branch_ea9b1 + sound_call .sub10 note C#, 2 note F#, 2 note C#, 2 @@ -833,7 +833,7 @@ Music_JohtoGymBattle_branch_ea83f: note A_, 2 note C#, 2 note G_, 2 - sound_call Music_JohtoGymBattle_branch_ea9b1 + sound_call .sub10 note C#, 2 note F#, 2 note C#, 2 @@ -842,7 +842,7 @@ Music_JohtoGymBattle_branch_ea83f: note D#, 2 note E_, 2 note A_, 2 - sound_call Music_JohtoGymBattle_branch_ea9a9 + sound_call .sub9 note D#, 2 note G#, 2 note D#, 2 @@ -879,7 +879,7 @@ Music_JohtoGymBattle_branch_ea83f: note F#, 2 note E_, 2 note F#, 2 - sound_call Music_JohtoGymBattle_branch_ea9b8 + sound_call .sub11 note F_, 2 note C_, 2 note D#, 2 @@ -888,7 +888,7 @@ Music_JohtoGymBattle_branch_ea83f: note D#, 2 note C#, 2 note D#, 2 - sound_call Music_JohtoGymBattle_branch_ea9b8 + sound_call .sub11 note F_, 2 note C_, 2 note D#, 2 @@ -897,9 +897,9 @@ Music_JohtoGymBattle_branch_ea83f: note F#, 2 note F_, 2 note D#, 2 - sound_loop 0, Music_JohtoGymBattle_branch_ea83f + sound_loop 0, .mainloop -Music_JohtoGymBattle_branch_ea952: +.sub1: note G_, 2 note D_, 2 note F_, 2 @@ -918,25 +918,28 @@ Music_JohtoGymBattle_branch_ea952: note F_, 2 sound_ret -Music_JohtoGymBattle_branch_ea963: +.sub2: +.sub2loop1: note D_, 2 note G_, 2 - sound_loop 4, Music_JohtoGymBattle_branch_ea963 + sound_loop 4, .sub2loop1 sound_ret -Music_JohtoGymBattle_branch_ea96a: +.sub3: +.sub3loop1: note C#, 2 note G#, 2 - sound_loop 4, Music_JohtoGymBattle_branch_ea96a + sound_loop 4, .sub3loop1 sound_ret -Music_JohtoGymBattle_branch_ea971: +.sub4: +.sub4loop1: note C_, 2 note G_, 2 - sound_loop 4, Music_JohtoGymBattle_branch_ea971 + sound_loop 4, .sub4loop1 sound_ret -Music_JohtoGymBattle_branch_ea978: +.sub5: octave 2 note A#, 2 octave 3 @@ -949,7 +952,7 @@ Music_JohtoGymBattle_branch_ea978: note A#, 2 sound_ret -Music_JohtoGymBattle_branch_ea983: +.sub6: octave 3 note C_, 2 note G_, 2 @@ -964,7 +967,7 @@ Music_JohtoGymBattle_branch_ea983: note C_, 2 sound_ret -Music_JohtoGymBattle_branch_ea990: +.sub7: note C#, 2 note G#, 2 octave 4 @@ -978,7 +981,7 @@ Music_JohtoGymBattle_branch_ea990: note C#, 2 sound_ret -Music_JohtoGymBattle_branch_ea99c: +.sub8: octave 3 note D_, 2 note A_, 2 @@ -993,20 +996,22 @@ Music_JohtoGymBattle_branch_ea99c: note D_, 2 sound_ret -Music_JohtoGymBattle_branch_ea9a9: +.sub9: +.sub9loop1: octave 3 note D#, 2 note G#, 2 - sound_loop 4, Music_JohtoGymBattle_branch_ea9a9 + sound_loop 4, .sub9loop1 sound_ret -Music_JohtoGymBattle_branch_ea9b1: +.sub10: +.sub10loop1: note C#, 2 note F#, 2 - sound_loop 4, Music_JohtoGymBattle_branch_ea9b1 + sound_loop 4, .sub10loop1 sound_ret -Music_JohtoGymBattle_branch_ea9b8: +.sub11: note F_, 2 note C_, 2 note D#, 2 diff --git a/audio/music/johtotrainerbattle.asm b/audio/music/johtotrainerbattle.asm index a75dfba48..cb512bcbc 100644 --- a/audio/music/johtotrainerbattle.asm +++ b/audio/music/johtotrainerbattle.asm @@ -86,9 +86,9 @@ Music_JohtoTrainerBattle_Ch1: note F_, 6 volume_envelope 11, 7 note G_, 4 -Music_JohtoTrainerBattle_branch_f6102: +.mainloop: volume_envelope 11, 4 - sound_call Music_JohtoTrainerBattle_branch_f629f + sound_call .sub1 volume_envelope 11, 7 note A#, 4 volume_envelope 11, 3 @@ -120,7 +120,7 @@ Music_JohtoTrainerBattle_branch_f6102: note E_, 2 note D_, 2 note C_, 2 - sound_call Music_JohtoTrainerBattle_branch_f629f + sound_call .sub1 volume_envelope 11, 7 note F_, 4 note E_, 2 @@ -243,7 +243,7 @@ Music_JohtoTrainerBattle_branch_f6102: volume_envelope 10, 7 note D#, 12 rest 16 -Music_JohtoTrainerBattle_branch_f61bd: +.loop1: volume_envelope 11, 7 note F_, 8 volume_envelope 11, 4 @@ -266,7 +266,7 @@ Music_JohtoTrainerBattle_branch_f61bd: note D#, 2 note F_, 4 note F_, 4 - sound_loop 2, Music_JohtoTrainerBattle_branch_f61bd + sound_loop 2, .loop1 volume_envelope 11, 7 note F_, 8 volume_envelope 11, 4 @@ -412,7 +412,7 @@ Music_JohtoTrainerBattle_branch_f61bd: volume_envelope 10, 7 note F_, 8 volume_envelope 11, 3 - sound_call Music_JohtoTrainerBattle_branch_f629f + sound_call .sub1 note F_, 4 note E_, 2 note F_, 2 @@ -427,9 +427,9 @@ Music_JohtoTrainerBattle_branch_f61bd: note F_, 10 volume_envelope 10, 7 note F_, 6 - sound_loop 0, Music_JohtoTrainerBattle_branch_f6102 + sound_loop 0, .mainloop -Music_JohtoTrainerBattle_branch_f629f: +.sub1: octave 3 note E_, 2 note D_, 2 @@ -497,10 +497,10 @@ Music_JohtoTrainerBattle_Ch2: volume_envelope 12, 2 octave 4 note A_, 6 - sound_call Music_JohtoTrainerBattle_branch_f649a + sound_call .sub1 volume_envelope 12, 2 note A_, 6 - sound_call Music_JohtoTrainerBattle_branch_f649a + sound_call .sub1 volume_envelope 12, 2 octave 5 note C_, 6 @@ -545,13 +545,13 @@ Music_JohtoTrainerBattle_Ch2: note E_, 2 volume_envelope 12, 7 note B_, 4 -Music_JohtoTrainerBattle_branch_f632a: - sound_call Music_JohtoTrainerBattle_branch_f64a3 +.mainloop: + sound_call .sub2 volume_envelope 3, -6 note A#, 8 volume_envelope 12, 7 note A#, 8 - sound_call Music_JohtoTrainerBattle_branch_f64a3 + sound_call .sub2 volume_envelope 12, 4 note D_, 4 octave 3 @@ -582,7 +582,7 @@ Music_JohtoTrainerBattle_branch_f632a: note A_, 16 volume_envelope 11, 7 note A_, 16 -Music_JohtoTrainerBattle_branch_f635a: +.loop1: volume_envelope 12, 3 octave 3 note A_, 2 @@ -594,7 +594,7 @@ Music_JohtoTrainerBattle_branch_f635a: note A_, 2 note G_, 2 note A#, 2 - sound_loop 3, Music_JohtoTrainerBattle_branch_f635a + sound_loop 3, .loop1 note A_, 2 octave 4 note D_, 2 @@ -605,7 +605,7 @@ Music_JohtoTrainerBattle_branch_f635a: note G_, 2 note A_, 2 note A#, 2 -Music_JohtoTrainerBattle_branch_f6376: +.loop2: note G_, 2 note F_, 2 note G_, 2 @@ -615,7 +615,7 @@ Music_JohtoTrainerBattle_branch_f6376: note G_, 2 note F_, 2 note G#, 2 - sound_loop 3, Music_JohtoTrainerBattle_branch_f6376 + sound_loop 3, .loop2 note F_, 2 octave 4 note C_, 2 @@ -676,14 +676,14 @@ Music_JohtoTrainerBattle_branch_f6376: volume_envelope 11, 7 note D#, 8 volume_envelope 6, 2 - sound_call Music_JohtoTrainerBattle_branch_f64b6 + sound_call .sub3 volume_envelope 8, 2 - sound_call Music_JohtoTrainerBattle_branch_f64b6 + sound_call .sub3 volume_envelope 9, 2 - sound_call Music_JohtoTrainerBattle_branch_f64b6 + sound_call .sub3 volume_envelope 10, 2 - sound_call Music_JohtoTrainerBattle_branch_f64b6 -Music_JohtoTrainerBattle_branch_f63dd: + sound_call .sub3 +.loop3: octave 4 note D#, 2 octave 3 @@ -700,18 +700,18 @@ Music_JohtoTrainerBattle_branch_f63dd: note G_, 2 octave 3 note A#, 2 - sound_loop 8, Music_JohtoTrainerBattle_branch_f63dd - sound_call Music_JohtoTrainerBattle_branch_f64be + sound_loop 8, .loop3 + sound_call .sub4 octave 3 note A#, 2 volume_envelope 12, 7 octave 4 note C_, 8 - sound_call Music_JohtoTrainerBattle_branch_f64be + sound_call .sub4 note G_, 2 volume_envelope 12, 7 note F_, 8 - sound_call Music_JohtoTrainerBattle_branch_f64be + sound_call .sub4 octave 3 note A#, 2 volume_envelope 11, 0 @@ -744,7 +744,7 @@ Music_JohtoTrainerBattle_branch_f63dd: note G_, 6 volume_envelope 4, -4 note G#, 4 - sound_call Music_JohtoTrainerBattle_branch_f64d2 + sound_call .sub5 volume_envelope 11, 0 note F_, 8 volume_envelope 11, 7 @@ -753,7 +753,7 @@ Music_JohtoTrainerBattle_branch_f63dd: note G#, 8 volume_envelope 11, 7 note G#, 8 - sound_call Music_JohtoTrainerBattle_branch_f64d2 + sound_call .sub5 volume_envelope 11, 0 note C#, 8 volume_envelope 11, 7 @@ -815,7 +815,7 @@ Music_JohtoTrainerBattle_branch_f63dd: note A#, 8 volume_envelope 11, 7 note A#, 8 - sound_call Music_JohtoTrainerBattle_branch_f64a3 + sound_call .sub2 volume_envelope 12, 7 note D_, 4 octave 3 @@ -826,9 +826,9 @@ Music_JohtoTrainerBattle_branch_f63dd: note E_, 2 note D_, 2 note F_, 2 - sound_loop 0, Music_JohtoTrainerBattle_branch_f632a + sound_loop 0, .mainloop -Music_JohtoTrainerBattle_branch_f649a: +.sub1: octave 3 note A_, 6 note A_, 4 @@ -838,7 +838,7 @@ Music_JohtoTrainerBattle_branch_f649a: note A#, 4 sound_ret -Music_JohtoTrainerBattle_branch_f64a3: +.sub2: volume_envelope 12, 7 octave 3 note A_, 6 @@ -856,7 +856,7 @@ Music_JohtoTrainerBattle_branch_f64a3: note F_, 8 sound_ret -Music_JohtoTrainerBattle_branch_f64b6: +.sub3: octave 3 note A#, 2 note D#, 2 @@ -866,7 +866,7 @@ Music_JohtoTrainerBattle_branch_f64b6: note D#, 2 sound_ret -Music_JohtoTrainerBattle_branch_f64be: +.sub4: volume_envelope 12, 7 octave 4 note F_, 4 @@ -886,7 +886,7 @@ Music_JohtoTrainerBattle_branch_f64be: note F_, 2 sound_ret -Music_JohtoTrainerBattle_branch_f64d2: +.sub5: volume_envelope 12, 7 octave 4 note D#, 6 @@ -933,7 +933,7 @@ Music_JohtoTrainerBattle_Ch3: note A#, 2 note A_, 2 note G#, 2 -Music_JohtoTrainerBattle_branch_f6501: +.loop1: note A_, 2 note E_, 2 note F#, 2 @@ -942,7 +942,7 @@ Music_JohtoTrainerBattle_branch_f6501: note F#, 2 note G_, 2 note E_, 2 - sound_loop 3, Music_JohtoTrainerBattle_branch_f6501 + sound_loop 3, .loop1 note A_, 2 note E_, 2 note F#, 2 @@ -951,7 +951,7 @@ Music_JohtoTrainerBattle_branch_f6501: note F#, 2 note G_, 2 note G#, 2 - sound_call Music_JohtoTrainerBattle_branch_f6676 + sound_call .sub1 octave 4 note C_, 2 octave 3 @@ -964,7 +964,7 @@ Music_JohtoTrainerBattle_branch_f6501: note C_, 2 octave 3 note A#, 2 - sound_call Music_JohtoTrainerBattle_branch_f6676 + sound_call .sub1 octave 4 note C_, 2 octave 3 @@ -975,16 +975,16 @@ Music_JohtoTrainerBattle_branch_f6501: note A_, 2 note A#, 2 note G_, 2 -Music_JohtoTrainerBattle_branch_f6531: - sound_call Music_JohtoTrainerBattle_branch_f6681 +.mainloop: + sound_call .sub2 note E_, 2 - sound_call Music_JohtoTrainerBattle_branch_f6692 - sound_call Music_JohtoTrainerBattle_branch_f6692 - sound_call Music_JohtoTrainerBattle_branch_f6681 + sound_call .sub3 + sound_call .sub3 + sound_call .sub2 note A_, 2 - sound_call Music_JohtoTrainerBattle_branch_f6692 - sound_call Music_JohtoTrainerBattle_branch_f6692 - sound_call Music_JohtoTrainerBattle_branch_f669d + sound_call .sub3 + sound_call .sub3 + sound_call .sub4 note E_, 2 note A_, 2 note E_, 2 @@ -993,7 +993,7 @@ Music_JohtoTrainerBattle_branch_f6531: note D_, 2 note E_, 2 note F_, 2 - sound_call Music_JohtoTrainerBattle_branch_f669d + sound_call .sub4 note E_, 2 octave 4 note F_, 2 @@ -1004,7 +1004,7 @@ Music_JohtoTrainerBattle_branch_f6531: note G#, 2 note A_, 2 note A#, 2 - sound_call Music_JohtoTrainerBattle_branch_f66a5 + sound_call .sub5 note D_, 2 note A_, 2 note D_, 2 @@ -1013,7 +1013,7 @@ Music_JohtoTrainerBattle_branch_f6531: note A_, 2 note G_, 2 note A_, 2 - sound_call Music_JohtoTrainerBattle_branch_f66a5 + sound_call .sub5 note D_, 2 octave 4 note D_, 2 @@ -1024,7 +1024,7 @@ Music_JohtoTrainerBattle_branch_f6531: note G_, 2 note A_, 2 note A#, 2 - sound_call Music_JohtoTrainerBattle_branch_f66ac + sound_call .sub6 note C_, 2 note G_, 2 note C_, 2 @@ -1033,7 +1033,7 @@ Music_JohtoTrainerBattle_branch_f6531: note G_, 2 note F_, 2 note G_, 2 - sound_call Music_JohtoTrainerBattle_branch_f66ac + sound_call .sub6 note C_, 2 octave 4 note C_, 2 @@ -1048,7 +1048,7 @@ Music_JohtoTrainerBattle_branch_f6531: note F_, 8 note E_, 8 note D#, 8 -Music_JohtoTrainerBattle_branch_f6591: +.loop2: octave 3 note D#, 2 note A#, 2 @@ -1059,8 +1059,8 @@ Music_JohtoTrainerBattle_branch_f6591: note A_, 2 octave 4 note C_, 2 - sound_loop 2, Music_JohtoTrainerBattle_branch_f6591 - sound_call Music_JohtoTrainerBattle_branch_f66ac + sound_loop 2, .loop2 + sound_call .sub6 note C_, 2 octave 4 note C_, 2 @@ -1071,42 +1071,42 @@ Music_JohtoTrainerBattle_branch_f6591: note F_, 2 note D#, 2 note G_, 2 -Music_JohtoTrainerBattle_branch_f65ac: +.loop3: note C#, 2 note G#, 2 - sound_loop 7, Music_JohtoTrainerBattle_branch_f65ac + sound_loop 7, .loop3 note B_, 2 note A_, 2 -Music_JohtoTrainerBattle_branch_f65b4: +.loop4: note D_, 2 note A_, 2 - sound_loop 5, Music_JohtoTrainerBattle_branch_f65b4 + sound_loop 5, .loop4 note B_, 2 note A_, 2 note G#, 2 note F#, 2 note G#, 2 note A_, 2 -Music_JohtoTrainerBattle_branch_f65c0: +.loop5: note A#, 4 note D#, 4 - sound_loop 4, Music_JohtoTrainerBattle_branch_f65c0 -Music_JohtoTrainerBattle_branch_f65c6: + sound_loop 4, .loop5 +.loop6: octave 4 note G_, 4 octave 3 note A#, 4 - sound_loop 4, Music_JohtoTrainerBattle_branch_f65c6 -Music_JohtoTrainerBattle_branch_f65ce: - sound_call Music_JohtoTrainerBattle_branch_f66b4 + sound_loop 4, .loop6 +.loop7: + sound_call .sub7 note D#, 2 note F_, 8 - sound_call Music_JohtoTrainerBattle_branch_f66b4 + sound_call .sub7 octave 4 note C_, 2 octave 3 note A#, 8 - sound_loop 2, Music_JohtoTrainerBattle_branch_f65ce + sound_loop 2, .loop7 octave 4 note C#, 8 note C_, 8 @@ -1171,28 +1171,28 @@ Music_JohtoTrainerBattle_branch_f65ce: note C_, 2 octave 3 note A#, 2 -Music_JohtoTrainerBattle_branch_f661e: +.loop8: note D#, 2 note A#, 2 - sound_loop 8, Music_JohtoTrainerBattle_branch_f661e -Music_JohtoTrainerBattle_branch_f6624: + sound_loop 8, .loop8 +.loop9: note C#, 2 note G#, 2 - sound_loop 6, Music_JohtoTrainerBattle_branch_f6624 + sound_loop 6, .loop9 note C#, 2 octave 4 note C_, 2 octave 3 note A#, 2 note G#, 2 -Music_JohtoTrainerBattle_branch_f6630: +.loop10: note D#, 2 note A#, 2 - sound_loop 8, Music_JohtoTrainerBattle_branch_f6630 -Music_JohtoTrainerBattle_branch_f6636: + sound_loop 8, .loop10 +.loop11: note C#, 2 note G#, 2 - sound_loop 4, Music_JohtoTrainerBattle_branch_f6636 + sound_loop 4, .loop11 note C#, 2 octave 4 note C#, 2 @@ -1247,9 +1247,9 @@ Music_JohtoTrainerBattle_branch_f6636: note A#, 2 octave 4 note D_, 2 - sound_loop 0, Music_JohtoTrainerBattle_branch_f6531 + sound_loop 0, .mainloop -Music_JohtoTrainerBattle_branch_f6676: +.sub1: octave 4 note C_, 2 octave 3 @@ -1262,7 +1262,7 @@ Music_JohtoTrainerBattle_branch_f6676: note G_, 2 sound_ret -Music_JohtoTrainerBattle_branch_f6681: +.sub2: octave 3 note E_, 2 note A_, 2 @@ -1281,7 +1281,7 @@ Music_JohtoTrainerBattle_branch_f6681: note G_, 2 sound_ret -Music_JohtoTrainerBattle_branch_f6692: +.sub3: octave 3 note F_, 2 note A#, 2 @@ -1294,27 +1294,30 @@ Music_JohtoTrainerBattle_branch_f6692: note D_, 2 sound_ret -Music_JohtoTrainerBattle_branch_f669d: +.sub4: +.sub4loop1: octave 3 note E_, 2 note A_, 2 - sound_loop 4, Music_JohtoTrainerBattle_branch_f669d + sound_loop 4, .sub4loop1 sound_ret -Music_JohtoTrainerBattle_branch_f66a5: +.sub5: +.sub5loop1: note D_, 2 note A_, 2 - sound_loop 4, Music_JohtoTrainerBattle_branch_f66a5 + sound_loop 4, .sub5loop1 sound_ret -Music_JohtoTrainerBattle_branch_f66ac: +.sub6: +.sub6loop1: octave 3 note C_, 2 note G_, 2 - sound_loop 4, Music_JohtoTrainerBattle_branch_f66ac + sound_loop 4, .sub6loop1 sound_ret -Music_JohtoTrainerBattle_branch_f66b4: +.sub7: note A#, 4 note D#, 2 note A#, 2 diff --git a/audio/music/johtowildbattle.asm b/audio/music/johtowildbattle.asm index f062e04ad..7377810ef 100644 --- a/audio/music/johtowildbattle.asm +++ b/audio/music/johtowildbattle.asm @@ -10,7 +10,7 @@ Music_JohtoWildBattle_Ch1: duty_cycle 3 pitch_offset 2 vibrato 18, 1, 5 -Music_JohtoWildBattleNight_branch_f5ddb: +.body: note_type 12, 11, 2 octave 4 note C_, 1 @@ -87,7 +87,7 @@ Music_JohtoWildBattleNight_branch_f5ddb: note D_, 4 volume_envelope 6, -7 note D#, 8 -Music_JohtoWildBattle_branch_f5e2d: +.mainloop: volume_envelope 11, 6 octave 3 note D_, 6 @@ -199,17 +199,17 @@ Music_JohtoWildBattle_branch_f5e2d: note D_, 4 note F#, 4 note G_, 16 - sound_loop 0, Music_JohtoWildBattle_branch_f5e2d + sound_loop 0, .mainloop Music_JohtoWildBattle_Ch2: duty_cycle 3 vibrato 8, 3, 6 pitch_offset 1 - sound_call Music_JohtoWildBattle_branch_f5f5d + sound_call .sub1 note_type 12, 12, 2 octave 4 note G_, 6 -Music_JohtoWildBattleNight_branch_f5eb2: +.body: octave 3 note D_, 6 note G_, 4 @@ -238,7 +238,7 @@ Music_JohtoWildBattleNight_branch_f5eb2: note G_, 4 volume_envelope 6, -7 note G#, 8 -Music_JohtoWildBattle_branch_f5ed1: +.mainloop: volume_envelope 12, 4 octave 3 note G_, 6 @@ -361,10 +361,9 @@ Music_JohtoWildBattle_branch_f5ed1: note G_, 4 note A#, 4 note B_, 16 - sound_loop 0, Music_JohtoWildBattle_branch_f5ed1 + sound_loop 0, .mainloop -Music_JohtoWildBattle_branch_f5f5d: -Music_JohtoWildBattleNight_branch_f5f5d: +.sub1: note_type 12, 12, 2 octave 4 note F_, 1 @@ -418,7 +417,7 @@ Music_JohtoWildBattleNight_branch_f5f5d: Music_JohtoWildBattle_Ch3: note_type 12, 1, 4 -Music_JohtoWildBattleNight_branch_f5f94: +.body: octave 4 note G_, 2 octave 5 @@ -458,7 +457,7 @@ Music_JohtoWildBattleNight_branch_f5f94: note E_, 2 note F_, 2 note G_, 2 - sound_call Music_JohtoWildBattle_branch_f6055 + sound_call .sub1 note D#, 2 note G#, 2 note D#, 2 @@ -467,15 +466,15 @@ Music_JohtoWildBattleNight_branch_f5f94: note D#, 2 note G_, 2 note F_, 2 -Music_JohtoWildBattle_branch_f5fc6: +.loop1: note D_, 2 note G_, 2 - sound_loop 6, Music_JohtoWildBattle_branch_f5fc6 + sound_loop 6, .loop1 note D_, 2 note E_, 2 note F_, 2 note G_, 2 - sound_call Music_JohtoWildBattle_branch_f6055 + sound_call .sub1 note F_, 2 note F_, 2 note G_, 2 @@ -484,30 +483,31 @@ Music_JohtoWildBattle_branch_f5fc6: note G_, 2 note F_, 2 note D#, 2 -Music_JohtoWildBattle_branch_f5fdb: +.mainloop: +.loop2: note D_, 2 note G_, 2 - sound_loop 7, Music_JohtoWildBattle_branch_f5fdb + sound_loop 7, .loop2 note F#, 4 - sound_call Music_JohtoWildBattle_branch_f6055 - sound_call Music_JohtoWildBattle_branch_f6055 -Music_JohtoWildBattle_branch_f5fe8: + sound_call .sub1 + sound_call .sub1 +.loop3: note D_, 2 note G_, 2 - sound_loop 7, Music_JohtoWildBattle_branch_f5fe8 + sound_loop 7, .loop3 note D_, 2 note A_, 2 -Music_JohtoWildBattle_branch_f5ff0: +.loop4: note C_, 2 note F_, 2 - sound_loop 5, Music_JohtoWildBattle_branch_f5ff0 + sound_loop 5, .loop4 note E_, 2 note D_, 2 note C_, 2 note D_, 2 note E_, 2 note F_, 2 - sound_call Music_JohtoWildBattle_branch_f6055 + sound_call .sub1 note D#, 2 note G#, 2 note D#, 2 @@ -515,11 +515,11 @@ Music_JohtoWildBattle_branch_f5ff0: note D#, 2 note G#, 2 note G_, 4 -Music_JohtoWildBattle_branch_f6006: +.loop5: note E_, 2 note A_, 2 - sound_loop 8, Music_JohtoWildBattle_branch_f6006 - sound_call Music_JohtoWildBattle_branch_f6055 + sound_loop 8, .loop5 + sound_call .sub1 note D#, 2 note G#, 2 note D#, 2 @@ -544,42 +544,43 @@ Music_JohtoWildBattle_branch_f6006: note F#, 2 note F_, 2 note D#, 2 -Music_JohtoWildBattle_branch_f6027: +.loop6: note D_, 2 note G_, 2 - sound_loop 8, Music_JohtoWildBattle_branch_f6027 -Music_JohtoWildBattle_branch_f602d: + sound_loop 8, .loop6 +.loop7: note C_, 2 note F_, 2 - sound_loop 7, Music_JohtoWildBattle_branch_f602d + sound_loop 7, .loop7 note E_, 2 note C_, 2 note D_, 4 note G_, 4 note D_, 4 note G_, 4 -Music_JohtoWildBattle_branch_f6039: +.loop8: note D_, 2 note G_, 2 - sound_loop 12, Music_JohtoWildBattle_branch_f6039 -Music_JohtoWildBattle_branch_f603f: + sound_loop 12, .loop8 +.loop9: note C_, 2 note E_, 2 - sound_loop 7, Music_JohtoWildBattle_branch_f603f + sound_loop 7, .loop9 note F_, 2 note F#, 2 -Music_JohtoWildBattle_branch_f6047: +.loop10: note D_, 2 note G_, 2 - sound_loop 6, Music_JohtoWildBattle_branch_f6047 + sound_loop 6, .loop10 note A_, 2 note G_, 2 note F#, 2 note E_, 2 - sound_loop 0, Music_JohtoWildBattle_branch_f5fdb + sound_loop 0, .mainloop -Music_JohtoWildBattle_branch_f6055: +.sub1: +.sub1loop1: note D#, 2 note G#, 2 - sound_loop 4, Music_JohtoWildBattle_branch_f6055 + sound_loop 4, .sub1loop1 sound_ret diff --git a/audio/music/johtowildbattlenight.asm b/audio/music/johtowildbattlenight.asm index 5e03f66bf..efba350db 100644 --- a/audio/music/johtowildbattlenight.asm +++ b/audio/music/johtowildbattlenight.asm @@ -10,20 +10,20 @@ Music_JohtoWildBattleNight_Ch1: duty_cycle 3 pitch_offset 2 vibrato 16, 2, 5 - sound_loop 0, Music_JohtoWildBattleNight_branch_f5ddb + sound_loop 0, Music_JohtoWildBattle_Ch1.body Music_JohtoWildBattleNight_Ch2: duty_cycle 3 vibrato 32, 3, 6 pitch_offset 1 - sound_call Music_JohtoWildBattleNight_branch_f5f5d + sound_call Music_JohtoWildBattle_Ch2.sub1 note_type 12, 12, 2 octave 4 note G_, 6 pitch_offset 1 duty_cycle 2 - sound_loop 0, Music_JohtoWildBattleNight_branch_f5eb2 + sound_loop 0, Music_JohtoWildBattle_Ch2.body Music_JohtoWildBattleNight_Ch3: note_type 12, 1, 1 - sound_loop 0, Music_JohtoWildBattleNight_branch_f5f94 + sound_loop 0, Music_JohtoWildBattle_Ch3.body diff --git a/audio/music/kantogymbattle.asm b/audio/music/kantogymbattle.asm index 03c131c09..b70f43447 100644 --- a/audio/music/kantogymbattle.asm +++ b/audio/music/kantogymbattle.asm @@ -86,8 +86,8 @@ Music_KantoGymBattle_Ch1: note E_, 4 note E_, 4 note E_, 2 -Music_KantoGymBattle_branch_ec78b: - sound_call Music_KantoGymBattle_branch_ec832 +.mainloop: + sound_call .sub1 octave 2 note A#, 2 volume_envelope 11, 7 @@ -96,7 +96,7 @@ Music_KantoGymBattle_branch_ec78b: octave 3 note D#, 10 note E_, 6 - sound_call Music_KantoGymBattle_branch_ec832 + sound_call .sub1 note D#, 2 volume_envelope 11, 7 note C#, 8 @@ -228,9 +228,9 @@ Music_KantoGymBattle_branch_ec78b: volume_envelope 4, -4 octave 3 note D_, 4 - sound_loop 0, Music_KantoGymBattle_branch_ec78b + sound_loop 0, .mainloop -Music_KantoGymBattle_branch_ec832: +.sub1: volume_envelope 11, 5 note D#, 2 octave 2 @@ -257,16 +257,16 @@ Music_KantoGymBattle_Ch2: vibrato 8, 3, 6 pitch_offset 1 note_type 12, 12, 2 -Music_KantoGymBattle_branch_ec852: +.loop1: octave 4 note A#, 1 note G#, 1 note A#, 1 octave 5 note D#, 1 - sound_loop 8, Music_KantoGymBattle_branch_ec852 + sound_loop 8, .loop1 octave 3 -Music_KantoGymBattle_branch_ec85d: +.loop2: volume_envelope 12, 2 note D#, 2 note D#, 2 @@ -313,14 +313,14 @@ Music_KantoGymBattle_branch_ec85d: note B_, 2 volume_envelope 12, 2 octave 4 - sound_loop 2, Music_KantoGymBattle_branch_ec85d -Music_KantoGymBattle_branch_ec894: - sound_call Music_KantoGymBattle_branch_ec907 + sound_loop 2, .loop2 +.mainloop: + sound_call .sub1 note E_, 8 note G#, 8 note B_, 10 note G#, 6 - sound_call Music_KantoGymBattle_branch_ec907 + sound_call .sub1 note E_, 8 note G#, 8 note B_, 10 @@ -402,9 +402,9 @@ Music_KantoGymBattle_branch_ec894: note A#, 6 octave 3 note A_, 4 - sound_loop 0, Music_KantoGymBattle_branch_ec894 + sound_loop 0, .mainloop -Music_KantoGymBattle_branch_ec907: +.sub1: duty_cycle 2 volume_envelope 13, 1 octave 3 @@ -440,14 +440,14 @@ Music_KantoGymBattle_Ch3: octave 2 note E_, 1 rest 1 -Music_KantoGymBattle_branch_ec934: +.loop1: note B_, 3 rest 1 - sound_loop 6, Music_KantoGymBattle_branch_ec934 + sound_loop 6, .loop1 note B_, 2 note G#, 2 note B_, 2 -Music_KantoGymBattle_branch_ec93d: +.loop2: note D#, 1 rest 1 note D#, 1 @@ -484,16 +484,17 @@ Music_KantoGymBattle_branch_ec93d: note D#, 1 rest 1 note E_, 2 - sound_loop 2, Music_KantoGymBattle_branch_ec93d -Music_KantoGymBattle_branch_ec965: + sound_loop 2, .loop2 +.mainloop: +.loop3: octave 2 note D#, 2 note A#, 2 - sound_loop 8, Music_KantoGymBattle_branch_ec965 -Music_KantoGymBattle_branch_ec96c: + sound_loop 8, .loop3 +.loop4: note E_, 2 note B_, 2 - sound_loop 4, Music_KantoGymBattle_branch_ec96c + sound_loop 4, .loop4 octave 1 note B_, 2 octave 2 @@ -507,22 +508,22 @@ Music_KantoGymBattle_branch_ec96c: note E_, 2 octave 2 note B_, 2 -Music_KantoGymBattle_branch_ec97f: +.loop5: octave 2 note F#, 2 octave 3 note C#, 2 - sound_loop 8, Music_KantoGymBattle_branch_ec97f -Music_KantoGymBattle_branch_ec987: + sound_loop 8, .loop5 +.loop6: octave 2 note E_, 2 note B_, 2 - sound_loop 7, Music_KantoGymBattle_branch_ec987 + sound_loop 7, .loop6 octave 3 note E_, 2 octave 2 note B_, 2 -Music_KantoGymBattle_branch_ec992: +.loop7: note D#, 1 rest 1 note D#, 1 @@ -541,11 +542,11 @@ Music_KantoGymBattle_branch_ec992: note D#, 1 rest 1 note E_, 2 - sound_loop 2, Music_KantoGymBattle_branch_ec992 -Music_KantoGymBattle_branch_ec9a8: + sound_loop 2, .loop7 +.loop8: note D#, 2 note A#, 2 - sound_loop 7, Music_KantoGymBattle_branch_ec9a8 + sound_loop 7, .loop8 octave 3 note C#, 2 octave 2 @@ -559,17 +560,17 @@ Music_KantoGymBattle_branch_ec9a8: note B_, 2 octave 3 note E_, 2 -Music_KantoGymBattle_branch_ec9bb: +.loop9: octave 2 note E_, 2 note B_, 2 - sound_loop 5, Music_KantoGymBattle_branch_ec9bb -Music_KantoGymBattle_branch_ec9c2: + sound_loop 5, .loop9 +.loop10: octave 2 note F#, 2 octave 3 note C#, 2 - sound_loop 7, Music_KantoGymBattle_branch_ec9c2 + sound_loop 7, .loop10 octave 2 note A#, 2 octave 3 @@ -584,19 +585,19 @@ Music_KantoGymBattle_branch_ec9c2: note F#, 2 note E_, 2 note C#, 2 -Music_KantoGymBattle_branch_ec9d8: +.loop11: octave 2 note D#, 2 note A#, 2 - sound_loop 4, Music_KantoGymBattle_branch_ec9d8 -Music_KantoGymBattle_branch_ec9df: + sound_loop 4, .loop11 +.loop12: note C#, 2 note G#, 2 - sound_loop 8, Music_KantoGymBattle_branch_ec9df -Music_KantoGymBattle_branch_ec9e5: + sound_loop 8, .loop12 +.loop13: note D#, 2 note A#, 2 - sound_loop 4, Music_KantoGymBattle_branch_ec9e5 + sound_loop 4, .loop13 octave 3 note D#, 2 octave 2 @@ -608,4 +609,4 @@ Music_KantoGymBattle_branch_ec9e5: octave 3 note D#, 2 note F_, 2 - sound_loop 0, Music_KantoGymBattle_branch_ec965 + sound_loop 0, .mainloop diff --git a/audio/music/kantotrainerbattle.asm b/audio/music/kantotrainerbattle.asm index 203961e56..d40ab0f3b 100644 --- a/audio/music/kantotrainerbattle.asm +++ b/audio/music/kantotrainerbattle.asm @@ -4,7 +4,7 @@ Music_KantoTrainerBattle: channel 2, Music_KantoTrainerBattle_Ch2 channel 3, Music_KantoTrainerBattle_Ch3 - db $3 + db $3 ; unused Music_KantoTrainerBattle_Ch1: tempo 114 @@ -127,7 +127,7 @@ Music_KantoTrainerBattle_Ch1: note D#, 2 note F_, 2 note F#, 2 -Music_KantoTrainerBattle_branch_eca88: +.mainloop: note_type 12, 11, 7 note D#, 4 rest 2 @@ -463,7 +463,7 @@ Music_KantoTrainerBattle_branch_eca88: volume_envelope 11, 7 octave 4 note D_, 4 - sound_loop 0, Music_KantoTrainerBattle_branch_eca88 + sound_loop 0, .mainloop Music_KantoTrainerBattle_Ch2: transpose 1, 11 @@ -484,13 +484,13 @@ Music_KantoTrainerBattle_Ch2: note F#, 1 duty_cycle 3 volume_envelope 6, 2 -Music_KantoTrainerBattle_branch_ecc04: +.loop1: octave 3 note G_, 1 note G#, 1 note G_, 1 note F#, 1 - sound_loop 14, Music_KantoTrainerBattle_branch_ecc04 + sound_loop 14, .loop1 note G_, 1 note G#, 1 note G_, 1 @@ -541,7 +541,7 @@ Music_KantoTrainerBattle_branch_ecc04: octave 3 note D_, 1 note F_, 1 -Music_KantoTrainerBattle_branch_ecc41: +.mainloop: note_type 12, 13, 7 octave 2 note C_, 1 @@ -915,7 +915,7 @@ Music_KantoTrainerBattle_branch_ecc41: volume_envelope 13, 7 octave 3 note B_, 4 - sound_loop 0, Music_KantoTrainerBattle_branch_ecc41 + sound_loop 0, .mainloop Music_KantoTrainerBattle_Ch3: transpose 1, 11 @@ -1048,7 +1048,7 @@ Music_KantoTrainerBattle_Ch3: note G_, 2 note A#, 2 note B_, 2 -Music_KantoTrainerBattle_branch_ece5a: +.mainloop: note_type 12, 1, 4 octave 6 note C_, 4 @@ -1534,4 +1534,4 @@ Music_KantoTrainerBattle_branch_ece5a: volume_envelope 1, 4 octave 5 note G_, 4 - sound_loop 0, Music_KantoTrainerBattle_branch_ece5a + sound_loop 0, .mainloop diff --git a/audio/music/kantowildbattle.asm b/audio/music/kantowildbattle.asm index a5dc40d66..481fcc389 100644 --- a/audio/music/kantowildbattle.asm +++ b/audio/music/kantowildbattle.asm @@ -4,7 +4,7 @@ Music_KantoWildBattle: channel 2, Music_KantoWildBattle_Ch2 channel 3, Music_KantoWildBattle_Ch3 - db $3 + db $3 ; unused Music_KantoWildBattle_Ch1: tempo 112 @@ -25,15 +25,15 @@ Music_KantoWildBattle_Ch1: note G_, 1 note F#, 1 note F_, 1 -Music_KantoWildBattle_branch_ed091: +.mainloop: note_type 12, 11, 7 - sound_call Music_KantoWildBattle_branch_ed18a + sound_call .sub1 octave 4 note F_, 4 note C#, 4 octave 3 note B_, 8 - sound_call Music_KantoWildBattle_branch_ed18a + sound_call .sub1 rest 8 note G_, 1 note B_, 1 @@ -208,41 +208,41 @@ Music_KantoWildBattle_branch_ed091: note D#, 1 rest 5 note C#, 8 -Music_KantoWildBattle_branch_ed15b: +.loop1: volume_envelope 11, 1 octave 3 note C_, 1 note D#, 1 note D_, 1 note C#, 1 - sound_loop 8, Music_KantoWildBattle_branch_ed15b -Music_KantoWildBattle_branch_ed166: + sound_loop 8, .loop1 +.loop2: note C#, 1 note F_, 1 note E_, 1 note D#, 1 - sound_loop 8, Music_KantoWildBattle_branch_ed166 -Music_KantoWildBattle_branch_ed16e: + sound_loop 8, .loop2 +.loop3: note C_, 1 note D#, 1 note D_, 1 note C#, 1 - sound_loop 16, Music_KantoWildBattle_branch_ed16e -Music_KantoWildBattle_branch_ed176: + sound_loop 16, .loop3 +.loop4: note C#, 1 note E_, 1 note D#, 1 note D_, 1 - sound_loop 8, Music_KantoWildBattle_branch_ed176 -Music_KantoWildBattle_branch_ed17e: + sound_loop 8, .loop4 +.loop5: note C_, 1 note D#, 1 note D_, 1 note C#, 1 - sound_loop 8, Music_KantoWildBattle_branch_ed17e - sound_loop 0, Music_KantoWildBattle_branch_ed091 + sound_loop 8, .loop5 + sound_loop 0, .mainloop -Music_KantoWildBattle_branch_ed18a: +.sub1: octave 4 note C_, 1 rest 5 @@ -302,9 +302,9 @@ Music_KantoWildBattle_Ch2: note D#, 1 note D_, 1 note C#, 1 -Music_KantoWildBattle_branch_ed1c8: +.mainloop: note_type 12, 11, 7 - sound_call Music_KantoWildBattle_branch_ed2c6 + sound_call .sub1 octave 2 note F_, 2 octave 1 @@ -312,7 +312,7 @@ Music_KantoWildBattle_branch_ed1c8: rest 1 octave 2 note G_, 2 - sound_call Music_KantoWildBattle_branch_ed2c6 + sound_call .sub1 octave 2 note G_, 1 rest 1 @@ -323,22 +323,22 @@ Music_KantoWildBattle_branch_ed1c8: note F_, 1 note F#, 1 note_type 6, 11, 7 - sound_call Music_KantoWildBattle_branch_ed307 - sound_call Music_KantoWildBattle_branch_ed307 + sound_call .sub2 + sound_call .sub2 transpose 0, 1 - sound_call Music_KantoWildBattle_branch_ed307 - sound_call Music_KantoWildBattle_branch_ed307 + sound_call .sub2 + sound_call .sub2 transpose 0, 0 - sound_call Music_KantoWildBattle_branch_ed307 - sound_call Music_KantoWildBattle_branch_ed307 - sound_call Music_KantoWildBattle_branch_ed307 - sound_call Music_KantoWildBattle_branch_ed307 + sound_call .sub2 + sound_call .sub2 + sound_call .sub2 + sound_call .sub2 transpose 0, 1 - sound_call Music_KantoWildBattle_branch_ed307 - sound_call Music_KantoWildBattle_branch_ed307 + sound_call .sub2 + sound_call .sub2 transpose 0, 0 - sound_call Music_KantoWildBattle_branch_ed307 - sound_call Music_KantoWildBattle_branch_ed307 + sound_call .sub2 + sound_call .sub2 rest 16 octave 3 note A#, 16 @@ -382,11 +382,11 @@ Music_KantoWildBattle_branch_ed1c8: note B_, 1 note G#, 1 note_type 6, 11, 7 - sound_call Music_KantoWildBattle_branch_ed31b + sound_call .sub3 transpose 0, 1 - sound_call Music_KantoWildBattle_branch_ed31b + sound_call .sub3 transpose 0, 0 - sound_call Music_KantoWildBattle_branch_ed340 + sound_call .sub4 octave 2 note C_, 2 rest 2 @@ -445,12 +445,12 @@ Music_KantoWildBattle_branch_ed1c8: octave 2 note C#, 2 rest 2 - sound_call Music_KantoWildBattle_branch_ed340 - sound_call Music_KantoWildBattle_branch_ed354 - sound_call Music_KantoWildBattle_branch_ed340 - sound_call Music_KantoWildBattle_branch_ed354 + sound_call .sub4 + sound_call .sub5 + sound_call .sub4 + sound_call .sub5 transpose 0, 1 - sound_call Music_KantoWildBattle_branch_ed340 + sound_call .sub4 transpose 0, 0 note C#, 2 rest 2 @@ -471,7 +471,7 @@ Music_KantoWildBattle_branch_ed1c8: octave 2 note C#, 2 rest 2 - sound_call Music_KantoWildBattle_branch_ed340 + sound_call .sub4 note C_, 2 rest 2 octave 3 @@ -491,9 +491,9 @@ Music_KantoWildBattle_branch_ed1c8: octave 2 note C_, 2 rest 2 - sound_loop 0, Music_KantoWildBattle_branch_ed1c8 + sound_loop 0, .mainloop -Music_KantoWildBattle_branch_ed2c6: +.sub1: octave 2 note C_, 1 rest 2 @@ -560,7 +560,7 @@ Music_KantoWildBattle_branch_ed2c6: note G_, 2 sound_ret -Music_KantoWildBattle_branch_ed307: +.sub2: octave 2 note C_, 2 rest 4 @@ -582,7 +582,7 @@ Music_KantoWildBattle_branch_ed307: note C_, 4 sound_ret -Music_KantoWildBattle_branch_ed31b: +.sub3: octave 2 note C_, 2 rest 4 @@ -621,7 +621,7 @@ Music_KantoWildBattle_branch_ed31b: note C_, 2 sound_ret -Music_KantoWildBattle_branch_ed340: +.sub4: octave 3 note G_, 4 octave 2 @@ -643,7 +643,7 @@ Music_KantoWildBattle_branch_ed340: rest 2 sound_ret -Music_KantoWildBattle_branch_ed354: +.sub5: note C_, 2 rest 2 octave 3 @@ -716,7 +716,7 @@ Music_KantoWildBattle_Ch3: note G_, 1 octave 4 note G_, 1 -Music_KantoWildBattle_branch_ed39e: +.mainloop: note_type 12, 1, 4 octave 5 note G_, 1 @@ -1214,4 +1214,4 @@ Music_KantoWildBattle_branch_ed39e: note G#, 16 note G_, 16 note G_, 16 - sound_loop 0, Music_KantoWildBattle_branch_ed39e + sound_loop 0, .mainloop diff --git a/audio/music/lakeofrage.asm b/audio/music/lakeofrage.asm index b446ee2af..dbc121c35 100644 --- a/audio/music/lakeofrage.asm +++ b/audio/music/lakeofrage.asm @@ -19,7 +19,7 @@ Music_LakeOfRage_Ch1: note D_, 6 note D_, 6 note E_, 4 -Music_LakeOfRage_branch_ee6e9: +.mainloop: volume_envelope 11, 5 note F#, 6 note E_, 6 @@ -92,7 +92,7 @@ Music_LakeOfRage_branch_ee6e9: note D_, 6 volume_envelope 10, 7 note D_, 6 - sound_loop 0, Music_LakeOfRage_branch_ee6e9 + sound_loop 0, .mainloop Music_LakeOfRage_Ch2: duty_cycle 3 @@ -107,7 +107,7 @@ Music_LakeOfRage_Ch2: note A_, 8 volume_envelope 10, 7 note A_, 8 -Music_LakeOfRage_branch_ee75e: +.mainloop: note_type 8, 12, 7 octave 4 note D_, 16 @@ -181,7 +181,7 @@ Music_LakeOfRage_branch_ee75e: note F#, 4 note_type 12, 12, 7 note A_, 16 - sound_loop 0, Music_LakeOfRage_branch_ee75e + sound_loop 0, .mainloop Music_LakeOfRage_Ch3: stereo_panning FALSE, TRUE @@ -196,7 +196,7 @@ Music_LakeOfRage_Ch3: note F#, 4 rest 2 note E_, 4 -Music_LakeOfRage_branch_ee7d0: +.mainloop: octave 3 note D_, 4 octave 2 @@ -294,13 +294,13 @@ Music_LakeOfRage_branch_ee7d0: note D_, 2 octave 2 note A_, 2 - sound_loop 0, Music_LakeOfRage_branch_ee7d0 + sound_loop 0, .mainloop Music_LakeOfRage_Ch4: stereo_panning TRUE, FALSE toggle_noise 3 drum_speed 12 -Music_LakeOfRage_branch_ee83b: +.mainloop: drum_note 3, 2 drum_note 3, 1 drum_note 3, 1 @@ -320,4 +320,4 @@ Music_LakeOfRage_branch_ee83b: drum_note 3, 1 drum_note 3, 1 drum_note 3, 1 - sound_loop 0, Music_LakeOfRage_branch_ee83b + sound_loop 0, .mainloop diff --git a/audio/music/lakeofragerocketradio.asm b/audio/music/lakeofragerocketradio.asm index 7f9d387e6..7e34e3677 100644 --- a/audio/music/lakeofragerocketradio.asm +++ b/audio/music/lakeofragerocketradio.asm @@ -11,7 +11,7 @@ Music_LakeOfRageRocketRadio_Ch1: pitch_offset 4376 vibrato 0, 15, 0 stereo_panning TRUE, FALSE -Music_LakeOfRageRocketRadio_branch_ef5c9: +.mainloop: note_type 12, 10, 7 octave 7 note G_, 4 @@ -19,7 +19,7 @@ Music_LakeOfRageRocketRadio_branch_ef5c9: note G_, 4 note F#, 4 rest 16 - sound_loop 0, Music_LakeOfRageRocketRadio_branch_ef5c9 + sound_loop 0, .mainloop Music_LakeOfRageRocketRadio_Ch2: duty_cycle 1 @@ -27,10 +27,10 @@ Music_LakeOfRageRocketRadio_Ch2: note_type 12, 10, 7 rest 2 stereo_panning FALSE, TRUE - sound_loop 0, Music_LakeOfRageRocketRadio_branch_ef5c9 + sound_loop 0, Music_LakeOfRageRocketRadio_Ch1.mainloop Music_LakeOfRageRocketRadio_Ch3: note_type 12, 2, 6 vibrato 16, 4, 4 rest 4 - sound_loop 0, Music_LakeOfRageRocketRadio_branch_ef5c9 + sound_loop 0, Music_LakeOfRageRocketRadio_Ch1.mainloop diff --git a/audio/music/lavendertown.asm b/audio/music/lavendertown.asm index 5456f70d8..bd904e619 100644 --- a/audio/music/lavendertown.asm +++ b/audio/music/lavendertown.asm @@ -4,7 +4,7 @@ Music_LavenderTown: channel 2, Music_LavenderTown_Ch2 channel 3, Music_LavenderTown_Ch3 - db $3 + db $3 ; unused Music_LavenderTown_Ch1: tempo 160 @@ -17,8 +17,8 @@ Music_LavenderTown_Ch1: rest 16 rest 16 rest 16 -Music_LavenderTown_branch_ef74c: - sound_call Music_LavenderTown_branch_ef7fd +.mainloop: + sound_call .sub1 volume_envelope 9, 3 octave 5 note D_, 2 @@ -36,7 +36,7 @@ Music_LavenderTown_branch_ef74c: note A_, 2 volume_envelope 4, 3 note A_, 2 - sound_call Music_LavenderTown_branch_ef87f + sound_call .sub2 volume_envelope 9, 3 volume_envelope 9, 3 note F_, 2 @@ -55,7 +55,7 @@ Music_LavenderTown_branch_ef74c: note G_, 2 volume_envelope 4, 3 note G_, 2 - sound_call Music_LavenderTown_branch_ef7fd + sound_call .sub1 volume_envelope 9, 3 octave 5 note D_, 2 @@ -73,7 +73,7 @@ Music_LavenderTown_branch_ef74c: note G_, 2 volume_envelope 4, 3 note G_, 2 - sound_call Music_LavenderTown_branch_ef87f + sound_call .sub2 volume_envelope 9, 3 octave 6 note C_, 2 @@ -103,7 +103,7 @@ Music_LavenderTown_branch_ef74c: octave 3 note A_, 2 note F_, 2 -Music_LavenderTown_branch_ef7ca: +.loop1: octave 3 note C_, 2 note E_, 2 @@ -125,7 +125,7 @@ Music_LavenderTown_branch_ef7ca: octave 3 note A_, 2 note F_, 2 - sound_loop 2, Music_LavenderTown_branch_ef7ca + sound_loop 2, .loop1 note F#, 2 note A_, 2 octave 4 @@ -148,9 +148,9 @@ Music_LavenderTown_branch_ef7ca: octave 3 note B_, 8 note B_, 8 - sound_loop 0, Music_LavenderTown_branch_ef74c + sound_loop 0, .mainloop -Music_LavenderTown_branch_ef7fd: +.sub1: volume_envelope 8, 3 octave 5 note C_, 2 @@ -242,7 +242,7 @@ Music_LavenderTown_branch_ef7fd: note F_, 2 sound_ret -Music_LavenderTown_branch_ef87f: +.sub2: volume_envelope 9, 3 octave 5 note G_, 2 @@ -266,7 +266,7 @@ Music_LavenderTown_Ch2: duty_cycle 1 vibrato 8, 2, 4 stereo_panning TRUE, TRUE -Music_LavenderTown_branch_ef8a0: +.loop1: note_type 12, 10, 3 octave 5 note C_, 2 @@ -284,7 +284,7 @@ Music_LavenderTown_branch_ef8a0: note F#, 2 volume_envelope 6, 3 note F#, 2 - sound_loop 3, Music_LavenderTown_branch_ef8a0 + sound_loop 3, .loop1 volume_envelope 10, 3 note C_, 2 volume_envelope 6, 3 @@ -302,9 +302,9 @@ Music_LavenderTown_branch_ef8a0: note D_, 2 volume_envelope 6, 3 note D_, 2 -Music_LavenderTown_branch_ef8d7: +.mainloop: volume_envelope 11, 5 - sound_call Music_LavenderTown_branch_ef915 + sound_call .sub1 octave 2 note F#, 4 octave 3 @@ -322,7 +322,7 @@ Music_LavenderTown_branch_ef8d7: octave 2 note B_, 4 note G_, 4 - sound_call Music_LavenderTown_branch_ef915 + sound_call .sub1 octave 2 note G_, 4 octave 3 @@ -354,9 +354,9 @@ Music_LavenderTown_branch_ef8d7: note D_, 1 note F_, 1 note G_, 6 - sound_loop 0, Music_LavenderTown_branch_ef8d7 + sound_loop 0, .mainloop -Music_LavenderTown_branch_ef915: +.sub1: octave 2 note C_, 4 note G_, 4 @@ -398,7 +398,7 @@ Music_LavenderTown_Ch3: octave 5 note E_, 4 note F_, 4 -Music_LavenderTown_branch_ef941: +.mainloop: volume_envelope 1, 2 octave 5 note G_, 4 @@ -512,4 +512,4 @@ Music_LavenderTown_branch_ef941: note B_, 12 note E_, 2 note F_, 2 - sound_loop 0, Music_LavenderTown_branch_ef941 + sound_loop 0, .mainloop diff --git a/audio/music/lighthouse.asm b/audio/music/lighthouse.asm index 892e28945..2cc3b451f 100644 --- a/audio/music/lighthouse.asm +++ b/audio/music/lighthouse.asm @@ -12,7 +12,7 @@ Music_Lighthouse_Ch1: pitch_offset 4 vibrato 8, 4, 5 stereo_panning FALSE, TRUE -Music_Lighthouse_branch_ee584: +.mainloop: note_type 12, 11, 3 octave 3 note C#, 8 @@ -127,13 +127,13 @@ Music_Lighthouse_branch_ee584: note B_, 2 note A_, 2 note G#, 8 - sound_loop 0, Music_Lighthouse_branch_ee584 + sound_loop 0, .mainloop Music_Lighthouse_Ch2: duty_cycle 3 pitch_offset 2 vibrato 16, 4, 5 -Music_Lighthouse_branch_ee604: +.mainloop: note_type 12, 12, 5 octave 3 note G#, 12 @@ -209,12 +209,12 @@ Music_Lighthouse_branch_ee604: note D#, 2 note C#, 2 note C_, 8 - sound_loop 0, Music_Lighthouse_branch_ee604 + sound_loop 0, .mainloop Music_Lighthouse_Ch3: note_type 12, 1, -1 stereo_panning TRUE, FALSE -Music_Lighthouse_branch_ee65b: +.mainloop: octave 2 note G#, 2 rest 2 @@ -224,7 +224,7 @@ Music_Lighthouse_branch_ee65b: rest 2 note G_, 2 rest 2 -Music_Lighthouse_branch_ee664: +.loop1: note G#, 2 rest 2 note D#, 2 @@ -233,7 +233,7 @@ Music_Lighthouse_branch_ee664: rest 2 note A_, 2 rest 2 - sound_loop 2, Music_Lighthouse_branch_ee664 + sound_loop 2, .loop1 note G#, 2 rest 2 note D#, 2 @@ -253,7 +253,7 @@ Music_Lighthouse_branch_ee664: octave 3 note C_, 2 rest 2 -Music_Lighthouse_branch_ee683: +.loop2: note C#, 2 rest 2 octave 2 @@ -264,7 +264,7 @@ Music_Lighthouse_branch_ee683: octave 3 note D_, 2 rest 2 - sound_loop 2, Music_Lighthouse_branch_ee683 + sound_loop 2, .loop2 note C#, 2 rest 2 octave 2 @@ -275,7 +275,7 @@ Music_Lighthouse_branch_ee683: octave 3 note D#, 2 note F#, 2 -Music_Lighthouse_branch_ee69b: +.loop3: note E_, 2 rest 2 octave 2 @@ -286,13 +286,13 @@ Music_Lighthouse_branch_ee69b: rest 2 note F_, 2 rest 2 - sound_loop 8, Music_Lighthouse_branch_ee69b - sound_loop 0, Music_Lighthouse_branch_ee65b + sound_loop 8, .loop3 + sound_loop 0, .mainloop Music_Lighthouse_Ch4: toggle_noise 0 drum_speed 12 -Music_Lighthouse_branch_ee6b1: +.mainloop: stereo_panning FALSE, TRUE drum_note 9, 4 drum_note 6, 2 @@ -307,4 +307,4 @@ Music_Lighthouse_branch_ee6b1: drum_note 6, 4 drum_note 9, 2 drum_note 10, 2 - sound_loop 0, Music_Lighthouse_branch_ee6b1 + sound_loop 0, .mainloop diff --git a/audio/music/lookbeauty.asm b/audio/music/lookbeauty.asm index 186e31d58..c710d7c85 100644 --- a/audio/music/lookbeauty.asm +++ b/audio/music/lookbeauty.asm @@ -17,7 +17,7 @@ Music_LookBeauty_Ch1: octave 4 note C_, 8 duty_cycle 3 -Music_LookBeauty_branch_eee5f: +.mainloop: rest 4 octave 3 note D_, 1 @@ -75,7 +75,7 @@ Music_LookBeauty_branch_eee5f: note A_, 1 octave 4 note C_, 1 - sound_loop 0, Music_LookBeauty_branch_eee5f + sound_loop 0, .mainloop Music_LookBeauty_Ch2: stereo_panning TRUE, FALSE @@ -112,7 +112,7 @@ Music_LookBeauty_Ch2: note F#, 1 rest 1 duty_cycle 3 -Music_LookBeauty_branch_eeec5: +.mainloop: note_type 12, 12, 7 note G_, 16 note A_, 8 @@ -152,7 +152,7 @@ Music_LookBeauty_branch_eeec5: rest 14 note F#, 8 note A_, 8 - sound_loop 0, Music_LookBeauty_branch_eeec5 + sound_loop 0, .mainloop Music_LookBeauty_Ch3: stereo_panning TRUE, TRUE @@ -171,7 +171,7 @@ Music_LookBeauty_Ch3: octave 3 note D_, 7 note F#, 1 -Music_LookBeauty_branch_eef0f: +.mainloop: note G_, 4 octave 4 note B_, 1 @@ -292,21 +292,21 @@ Music_LookBeauty_branch_eef0f: rest 7 octave 3 note D_, 8 - sound_loop 0, Music_LookBeauty_branch_eef0f + sound_loop 0, .mainloop Music_LookBeauty_Ch4: toggle_noise 3 drum_speed 12 rest 16 rest 16 -Music_LookBeauty_branch_eef91: - sound_call Music_LookBeauty_branch_eefa1 - sound_call Music_LookBeauty_branch_eefa1 - sound_call Music_LookBeauty_branch_eefa1 - sound_call Music_LookBeauty_branch_eefa1 - sound_loop 0, Music_LookBeauty_branch_eef91 +.mainloop: + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_loop 0, .mainloop -Music_LookBeauty_branch_eefa1: +.sub1: drum_note 7, 2 drum_note 8, 2 drum_note 3, 2 diff --git a/audio/music/lookhiker.asm b/audio/music/lookhiker.asm index 4c08a643b..913aecea1 100644 --- a/audio/music/lookhiker.asm +++ b/audio/music/lookhiker.asm @@ -17,7 +17,7 @@ Music_LookHiker_Ch1: note F#, 2 note F_, 2 note F#, 8 -Music_LookHiker_branch_f7433: +.mainloop: note D_, 2 note D#, 2 note E_, 2 @@ -30,7 +30,7 @@ Music_LookHiker_branch_f7433: rest 2 note F#, 2 rest 6 - sound_loop 0, Music_LookHiker_branch_f7433 + sound_loop 0, .mainloop Music_LookHiker_Ch2: duty_cycle 0 @@ -49,7 +49,7 @@ Music_LookHiker_Ch2: note F#, 1 note D_, 1 volume_envelope 10, 1 -Music_LookHiker_branch_f7457: +.mainloop: octave 1 note B_, 1 note B_, 2 @@ -66,7 +66,7 @@ Music_LookHiker_branch_f7457: note D_, 1 note F#, 1 note D_, 1 - sound_loop 0, Music_LookHiker_branch_f7457 + sound_loop 0, .mainloop Music_LookHiker_Ch3: vibrato 18, 2, 4 @@ -76,21 +76,21 @@ Music_LookHiker_Ch3: note B_, 2 note A#, 2 note B_, 8 -Music_LookHiker_branch_f7477: +.mainloop: octave 5 note D#, 2 note D_, 2 note C#, 2 note C_, 2 - sound_call Music_LookHiker_branch_f748a + sound_call .sub1 note G_, 2 note G#, 2 note A_, 2 note A#, 2 - sound_call Music_LookHiker_branch_f748a - sound_loop 0, Music_LookHiker_branch_f7477 + sound_call .sub1 + sound_loop 0, .mainloop -Music_LookHiker_branch_f748a: +.sub1: octave 4 note B_, 2 rest 4 @@ -107,9 +107,9 @@ Music_LookHiker_Ch4: drum_speed 12 drum_note 6, 4 rest 16 -Music_LookHiker_branch_f749a: +.mainloop: drum_note 4, 2 drum_note 8, 2 drum_note 3, 2 drum_note 8, 2 - sound_loop 0, Music_LookHiker_branch_f749a + sound_loop 0, .mainloop diff --git a/audio/music/lookkimonogirl.asm b/audio/music/lookkimonogirl.asm index 656c50ec6..fd125b9ff 100644 --- a/audio/music/lookkimonogirl.asm +++ b/audio/music/lookkimonogirl.asm @@ -4,7 +4,7 @@ Music_LookKimonoGirl: channel 2, Music_LookKimonoGirl_Ch2 channel 3, Music_LookKimonoGirl_Ch3 - db $3 + db $3 ; unused Music_LookKimonoGirl_Ch1: tempo 160 @@ -13,17 +13,17 @@ Music_LookKimonoGirl_Ch1: duty_cycle 1 note_type 6, 8, 7 pitch_offset 1 - sound_call Music_LookKimonoGirl_branch_f7aa8 + sound_call Music_LookKimonoGirl_Ch2.sub2 pitch_offset 0 -Music_LookKimonoGirl_branch_f79d7: +.mainloop: note_type 12, 11, 2 - sound_call Music_LookKimonoGirl_branch_f7a13 - sound_call Music_LookKimonoGirl_branch_f7a13 - sound_call Music_LookKimonoGirl_branch_f7a34 - sound_call Music_LookKimonoGirl_branch_f7a34 - sound_call Music_LookKimonoGirl_branch_f7a13 - sound_call Music_LookKimonoGirl_branch_f7a13 - sound_call Music_LookKimonoGirl_branch_f7a34 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 + sound_call .sub2 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 volume_envelope 11, 4 octave 3 note E_, 1 @@ -48,9 +48,9 @@ Music_LookKimonoGirl_branch_f79d7: volume_envelope 5, 4 octave 3 note A_, 1 - sound_loop 0, Music_LookKimonoGirl_branch_f79d7 + sound_loop 0, .mainloop -Music_LookKimonoGirl_branch_f7a13: +.sub1: volume_envelope 11, 4 octave 2 note F_, 1 @@ -77,7 +77,7 @@ Music_LookKimonoGirl_branch_f7a13: note D_, 1 sound_ret -Music_LookKimonoGirl_branch_f7a34: +.sub2: volume_envelope 11, 4 octave 2 note E_, 1 @@ -108,8 +108,8 @@ Music_LookKimonoGirl_Ch2: duty_cycle 0 note_type 6, 10, 7 stereo_panning TRUE, FALSE - sound_call Music_LookKimonoGirl_branch_f7aa8 -Music_LookKimonoGirl_branch_f7a5f: + sound_call .sub2 +.mainloop: duty_cycle 3 note_type 12, 9, 1 octave 5 @@ -131,7 +131,7 @@ Music_LookKimonoGirl_branch_f7a5f: note A_, 1 note E_, 1 note D_, 1 - sound_call Music_LookKimonoGirl_branch_f7a94 + sound_call .sub1 octave 5 note F_, 1 note D_, 1 @@ -151,10 +151,10 @@ Music_LookKimonoGirl_branch_f7a5f: note A_, 1 note E_, 1 note D_, 1 - sound_call Music_LookKimonoGirl_branch_f7a94 - sound_loop 0, Music_LookKimonoGirl_branch_f7a5f + sound_call .sub1 + sound_loop 0, .mainloop -Music_LookKimonoGirl_branch_f7a94: +.sub1: octave 5 note B_, 1 note A_, 1 @@ -176,7 +176,7 @@ Music_LookKimonoGirl_branch_f7a94: note E_, 1 sound_ret -Music_LookKimonoGirl_branch_f7aa8: +.sub2: octave 4 note E_, 1 octave 5 @@ -227,7 +227,7 @@ Music_LookKimonoGirl_Ch3: octave 5 note D_, 2 note E_, 2 -Music_LookKimonoGirl_branch_f7aec: +.mainloop: octave 5 note D_, 4 note E_, 4 @@ -263,4 +263,4 @@ Music_LookKimonoGirl_branch_f7aec: note E_, 2 note D_, 8 note E_, 8 - sound_loop 0, Music_LookKimonoGirl_branch_f7aec + sound_loop 0, .mainloop diff --git a/audio/music/looklass.asm b/audio/music/looklass.asm index 0ce7ff899..05c487a77 100644 --- a/audio/music/looklass.asm +++ b/audio/music/looklass.asm @@ -18,7 +18,7 @@ Music_LookLass_Ch1: note B_, 14 stereo_panning FALSE, TRUE duty_cycle 0 -Music_LookLass_branch_ed7bd: +.mainloop: volume_envelope 10, 2 octave 3 note E_, 4 @@ -28,14 +28,14 @@ Music_LookLass_branch_ed7bd: note E_, 2 volume_envelope 10, 3 note B_, 2 - sound_loop 0, Music_LookLass_branch_ed7bd + sound_loop 0, .mainloop Music_LookLass_Ch2: stereo_panning TRUE, FALSE duty_cycle 0 note_type 12, 8, 3 rest 16 -Music_LookLass_branch_ed7d5: +.mainloop: volume_envelope 9, 2 octave 2 note B_, 4 @@ -46,7 +46,7 @@ Music_LookLass_branch_ed7d5: volume_envelope 9, 3 octave 3 note G#, 2 - sound_loop 0, Music_LookLass_branch_ed7d5 + sound_loop 0, .mainloop Music_LookLass_Ch3: note_type 12, 1, 0 @@ -56,7 +56,7 @@ Music_LookLass_Ch3: note D#, 2 note C#, 2 note C_, 2 -Music_LookLass_branch_ed7ef: +.mainloop: octave 5 note B_, 2 rest 2 @@ -96,13 +96,13 @@ Music_LookLass_branch_ed7ef: note F#, 2 note G#, 2 note A_, 2 - sound_loop 0, Music_LookLass_branch_ed7ef + sound_loop 0, .mainloop Music_LookLass_Ch4: toggle_noise 4 drum_speed 12 drum_note 1, 16 -Music_LookLass_branch_ed81f: +.mainloop: drum_speed 6 drum_note 3, 8 drum_note 2, 8 @@ -112,4 +112,4 @@ Music_LookLass_branch_ed81f: drum_note 2, 1 drum_note 2, 1 drum_note 2, 1 - sound_loop 0, Music_LookLass_branch_ed81f + sound_loop 0, .mainloop diff --git a/audio/music/lookmysticalman.asm b/audio/music/lookmysticalman.asm index f998562b7..c75fba029 100644 --- a/audio/music/lookmysticalman.asm +++ b/audio/music/lookmysticalman.asm @@ -13,7 +13,7 @@ Music_LookMysticalMan_Ch1: stereo_panning FALSE, TRUE note_type 12, 11, 3 rest 8 -Music_LookMysticalMan_branch_178458: +.mainloop: duty_cycle 3 note_type 6, 9, 6 octave 3 @@ -61,7 +61,7 @@ Music_LookMysticalMan_branch_178458: rest 4 note C#, 4 duty_cycle 2 - sound_call Music_LookMysticalMan_branch_1784f9 + sound_call .sub1 octave 4 note C#, 2 rest 2 @@ -76,7 +76,7 @@ Music_LookMysticalMan_branch_178458: note F#, 4 rest 4 note E_, 4 - sound_call Music_LookMysticalMan_branch_1784f9 + sound_call .sub1 octave 4 note C#, 2 rest 2 @@ -94,14 +94,14 @@ Music_LookMysticalMan_branch_178458: note A#, 6 duty_cycle 2 volume_envelope 7, 2 -Music_LookMysticalMan_branch_1784b4: +.loop1: octave 5 note D_, 2 octave 4 note B_, 2 note F#, 2 note D_, 2 - sound_loop 4, Music_LookMysticalMan_branch_1784b4 + sound_loop 4, .loop1 octave 5 note D_, 2 octave 4 @@ -124,7 +124,7 @@ Music_LookMysticalMan_branch_1784b4: note D_, 2 note F#, 2 note B_, 2 -Music_LookMysticalMan_branch_1784d4: +.loop2: octave 5 note D_, 2 octave 4 @@ -132,7 +132,7 @@ Music_LookMysticalMan_branch_1784d4: note E_, 2 octave 3 note B_, 2 - sound_loop 4, Music_LookMysticalMan_branch_1784d4 + sound_loop 4, .loop2 octave 5 note C#, 2 octave 4 @@ -155,9 +155,9 @@ Music_LookMysticalMan_branch_1784d4: note E_, 2 note F#, 2 note A#, 2 - sound_loop 0, Music_LookMysticalMan_branch_178458 + sound_loop 0, .mainloop -Music_LookMysticalMan_branch_1784f9: +.sub1: note D_, 16 octave 4 note D_, 2 @@ -197,7 +197,7 @@ Music_LookMysticalMan_Ch2: vibrato 10, 3, 4 note_type 12, 11, 3 rest 8 -Music_LookMysticalMan_branch_178523: +.mainloop: stereo_panning TRUE, FALSE note_type 6, 11, 8 octave 3 @@ -253,22 +253,22 @@ Music_LookMysticalMan_branch_178523: note F#, 4 rest 4 note E_, 4 - sound_call Music_LookMysticalMan_branch_17859a + sound_call .sub1 note F#, 2 rest 2 note E_, 2 rest 2 note D_, 2 note E_, 6 - sound_call Music_LookMysticalMan_branch_1785c8 - sound_call Music_LookMysticalMan_branch_17859a + sound_call .sub2 + sound_call .sub1 note F#, 2 rest 2 note F#, 2 rest 2 note E_, 2 note D_, 6 - sound_call Music_LookMysticalMan_branch_1785c8 + sound_call .sub2 note_type 12, 11, 7 note B_, 2 rest 2 @@ -294,9 +294,9 @@ Music_LookMysticalMan_branch_178523: rest 1 note A#, 16 rest 2 - sound_loop 0, Music_LookMysticalMan_branch_178523 + sound_loop 0, .mainloop -Music_LookMysticalMan_branch_17859a: +.sub1: note B_, 2 rest 2 octave 4 @@ -341,7 +341,7 @@ Music_LookMysticalMan_branch_17859a: note E_, 6 sound_ret -Music_LookMysticalMan_branch_1785c8: +.sub2: note C#, 8 volume_envelope 8, 8 note C_, 1 @@ -361,7 +361,7 @@ Music_LookMysticalMan_branch_1785c8: Music_LookMysticalMan_Ch3: note_type 6, 1, 6 rest 16 -Music_LookMysticalMan_branch_1785df: +.mainloop: octave 2 note B_, 4 octave 3 @@ -416,7 +416,7 @@ Music_LookMysticalMan_branch_1785df: note A_, 2 octave 3 note E_, 2 -Music_LookMysticalMan_branch_178615: +.loop1: octave 2 note F#, 4 note A#, 2 @@ -470,7 +470,7 @@ Music_LookMysticalMan_branch_178615: note C#, 2 octave 2 note E_, 6 - sound_loop 2, Music_LookMysticalMan_branch_178615 + sound_loop 2, .loop1 note F#, 4 note A#, 2 rest 2 @@ -531,7 +531,7 @@ Music_LookMysticalMan_branch_178615: octave 2 note B_, 8 note A#, 4 - sound_loop 0, Music_LookMysticalMan_branch_1785df + sound_loop 0, .mainloop Music_LookMysticalMan_Ch4: toggle_noise 3 @@ -541,15 +541,16 @@ Music_LookMysticalMan_Ch4: drum_note 3, 2 drum_note 3, 1 drum_note 3, 1 -Music_LookMysticalMan_branch_178697: - sound_call Music_LookMysticalMan_branch_1786d3 - sound_call Music_LookMysticalMan_branch_1786d9 - sound_call Music_LookMysticalMan_branch_1786d3 - sound_call Music_LookMysticalMan_branch_1786df - sound_loop 2, Music_LookMysticalMan_branch_178697 - sound_call Music_LookMysticalMan_branch_1786d3 - sound_call Music_LookMysticalMan_branch_1786d9 - sound_call Music_LookMysticalMan_branch_1786d3 +.mainloop: +.loop1: + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 + sound_call .sub3 + sound_loop 2, .loop1 + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 drum_note 3, 2 drum_note 4, 2 drum_note 3, 2 @@ -560,7 +561,7 @@ Music_LookMysticalMan_branch_178697: drum_note 3, 2 drum_note 3, 1 drum_note 3, 1 -Music_LookMysticalMan_branch_1786ba: +.loop2: drum_note 3, 2 drum_note 4, 2 drum_note 3, 3 @@ -578,10 +579,10 @@ Music_LookMysticalMan_branch_1786ba: drum_note 3, 2 drum_note 3, 1 drum_note 3, 1 - sound_loop 2, Music_LookMysticalMan_branch_1786ba - sound_loop 0, Music_LookMysticalMan_branch_178697 + sound_loop 2, .loop2 + sound_loop 0, .mainloop -Music_LookMysticalMan_branch_1786d3: +.sub1: drum_note 4, 4 drum_note 3, 3 drum_note 4, 3 @@ -589,7 +590,7 @@ Music_LookMysticalMan_branch_1786d3: drum_note 3, 4 sound_ret -Music_LookMysticalMan_branch_1786d9: +.sub2: drum_note 4, 4 drum_note 3, 3 drum_note 3, 3 @@ -597,7 +598,7 @@ Music_LookMysticalMan_branch_1786d9: drum_note 3, 4 sound_ret -Music_LookMysticalMan_branch_1786df: +.sub3: drum_note 4, 4 drum_note 3, 2 drum_note 4, 1 diff --git a/audio/music/lookofficer.asm b/audio/music/lookofficer.asm index 071afcf6f..e069badc5 100644 --- a/audio/music/lookofficer.asm +++ b/audio/music/lookofficer.asm @@ -21,7 +21,7 @@ Music_LookOfficer_Ch1: volume_envelope 2, -7 octave 3 note B_, 16 -Music_LookOfficer_branch_ed852: +.mainloop: volume_envelope 8, 2 rest 4 note B_, 6 @@ -33,7 +33,7 @@ Music_LookOfficer_branch_ed852: volume_envelope 2, -7 note A#, 16 note A_, 16 - sound_loop 0, Music_LookOfficer_branch_ed852 + sound_loop 0, .mainloop Music_LookOfficer_Ch2: vibrato 18, 3, 4 @@ -60,7 +60,8 @@ Music_LookOfficer_Ch2: note B_, 2 octave 2 note D#, 2 -Music_LookOfficer_branch_ed882: +.mainloop: +.loop1: note E_, 2 note G#, 2 octave 3 @@ -71,14 +72,14 @@ Music_LookOfficer_branch_ed882: note B_, 2 note E_, 2 note G#, 2 - sound_loop 2, Music_LookOfficer_branch_ed882 + sound_loop 2, .loop1 transpose 0, 1 - sound_call Music_LookOfficer_branch_ed89e + sound_call .sub1 transpose 0, 0 - sound_call Music_LookOfficer_branch_ed89e - sound_loop 0, Music_LookOfficer_branch_ed882 + sound_call .sub1 + sound_loop 0, .mainloop -Music_LookOfficer_branch_ed89e: +.sub1: octave 1 note A_, 2 octave 2 @@ -117,7 +118,7 @@ Music_LookOfficer_Ch3: note C#, 2 rest 1 note D#, 2 -Music_LookOfficer_branch_ed8c8: +.mainloop: note E_, 6 note D#, 6 note C#, 4 @@ -135,4 +136,4 @@ Music_LookOfficer_branch_ed8c8: note D_, 8 note E_, 8 note C#, 8 - sound_loop 0, Music_LookOfficer_branch_ed8c8 + sound_loop 0, .mainloop diff --git a/audio/music/lookpokemaniac.asm b/audio/music/lookpokemaniac.asm index 5323a3d29..4fb44fd73 100644 --- a/audio/music/lookpokemaniac.asm +++ b/audio/music/lookpokemaniac.asm @@ -12,21 +12,22 @@ Music_LookPokemaniac_Ch1: pitch_offset 2 note_type 12, 11, 3 rest 8 -Music_LookPokemaniac_branch_ebdfb: +.mainloop: +.loop1: rest 4 octave 3 note A#, 1 rest 3 note A#, 1 rest 3 - sound_loop 4, Music_LookPokemaniac_branch_ebdfb + sound_loop 4, .loop1 rest 4 note G_, 1 rest 3 note G_, 1 rest 3 - sound_loop 4, Music_LookPokemaniac_branch_ebdfb - sound_loop 0, Music_LookPokemaniac_branch_ebdfb + sound_loop 4, .loop1 + sound_loop 0, .mainloop Music_LookPokemaniac_Ch2: stereo_panning TRUE, TRUE @@ -40,7 +41,8 @@ Music_LookPokemaniac_Ch2: note C_, 1 octave 1 note A_, 4 -Music_LookPokemaniac_branch_ebe24: +.mainloop: +.loop1: octave 2 note C_, 2 rest 2 @@ -57,8 +59,8 @@ Music_LookPokemaniac_branch_ebe24: rest 3 note D#, 1 rest 3 - sound_loop 2, Music_LookPokemaniac_branch_ebe24 -Music_LookPokemaniac_branch_ebe38: + sound_loop 2, .loop1 +.loop2: octave 1 note A_, 2 rest 2 @@ -76,8 +78,8 @@ Music_LookPokemaniac_branch_ebe38: octave 3 note C_, 1 rest 3 - sound_loop 2, Music_LookPokemaniac_branch_ebe38 - sound_loop 0, Music_LookPokemaniac_branch_ebe24 + sound_loop 2, .loop2 + sound_loop 0, .mainloop Music_LookPokemaniac_Ch3: stereo_panning TRUE, FALSE @@ -91,14 +93,14 @@ Music_LookPokemaniac_Ch3: octave 5 note C_, 4 volume_envelope 1, 0 -Music_LookPokemaniac_branch_ebe62: - sound_call Music_LookPokemaniac_branch_ebe70 +.mainloop: + sound_call .sub1 volume_envelope 1, 4 - sound_call Music_LookPokemaniac_branch_ebe70 + sound_call .sub1 volume_envelope 1, 0 - sound_loop 0, Music_LookPokemaniac_branch_ebe62 + sound_loop 0, .mainloop -Music_LookPokemaniac_branch_ebe70: +.sub1: note A#, 6 note A_, 2 note G#, 2 diff --git a/audio/music/lookrival.asm b/audio/music/lookrival.asm index de0df0ebf..d4b98ebec 100644 --- a/audio/music/lookrival.asm +++ b/audio/music/lookrival.asm @@ -34,8 +34,7 @@ Music_LookRival_Ch1: note G#, 8 volume_envelope 10, 6 note F#, 8 -Music_LookRival_branch_f4fb1: -Music_AfterTheRivalFight_branch_f4fb1: +.mainloop: volume_envelope 11, 5 note F_, 4 note D#, 2 @@ -99,7 +98,7 @@ Music_AfterTheRivalFight_branch_f4fb1: note G#, 8 note F_, 6 note C_, 2 -Music_LookRival_branch_f4ff7: +.loop1: volume_envelope 11, 2 note F_, 6 volume_envelope 11, 7 @@ -107,14 +106,14 @@ Music_LookRival_branch_f4ff7: note F#, 2 note F_, 2 note D#, 2 - sound_loop 3, Music_LookRival_branch_f4ff7 + sound_loop 3, .loop1 volume_envelope 11, 2 note F_, 2 note G#, 4 volume_envelope 11, 7 note G#, 6 note F#, 4 - sound_loop 0, Music_LookRival_branch_f4fb1 + sound_loop 0, .mainloop Music_LookRival_Ch2: duty_cycle 3 @@ -137,8 +136,7 @@ Music_LookRival_Ch2: note D#, 10 volume_envelope 11, 7 note D#, 16 -Music_LookRival_branch_f502e: -Music_AfterTheRivalFight_branch_f502e: +.mainloop: volume_envelope 12, 7 note C_, 12 volume_envelope 12, 4 @@ -191,19 +189,19 @@ Music_AfterTheRivalFight_branch_f502e: note D#, 1 note D_, 1 note D#, 2 -Music_LookRival_branch_f5070: +.loop1: volume_envelope 12, 2 note C_, 6 volume_envelope 12, 7 note D#, 6 volume_envelope 12, 2 note F_, 4 - sound_loop 3, Music_LookRival_branch_f5070 + sound_loop 3, .loop1 note C_, 2 note D#, 4 volume_envelope 12, 7 note D#, 10 - sound_loop 0, Music_LookRival_branch_f502e + sound_loop 0, .mainloop Music_LookRival_Ch3: note_type 12, 2, 8 @@ -227,17 +225,17 @@ Music_LookRival_Ch3: note C_, 2 note D#, 2 note F#, 2 -Music_LookRival_branch_f509d: -Music_AfterTheRivalFight_branch_f509d: - sound_call Music_LookRival_branch_f50ef - sound_loop 3, Music_LookRival_branch_f509d +.mainloop: +.loop1: + sound_call .sub1 + sound_loop 3, .loop1 note F_, 4 note C_, 2 note D#, 4 note G#, 2 note G_, 2 note F#, 2 - sound_call Music_LookRival_branch_f50f7 + sound_call .sub2 note A#, 2 note F_, 2 note G_, 2 @@ -246,7 +244,7 @@ Music_AfterTheRivalFight_branch_f509d: note G_, 2 note G#, 1 note A_, 1 - sound_call Music_LookRival_branch_f50ff + sound_call .sub3 note A#, 2 note F_, 2 note G_, 2 @@ -271,10 +269,10 @@ Music_AfterTheRivalFight_branch_f509d: note A_, 2 note A#, 1 note A_, 1 - sound_call Music_LookRival_branch_f50f7 - sound_call Music_LookRival_branch_f50ff - sound_call Music_LookRival_branch_f50ef - sound_call Music_LookRival_branch_f50ef + sound_call .sub2 + sound_call .sub3 + sound_call .sub1 + sound_call .sub1 note F_, 2 note C_, 2 note D_, 2 @@ -290,9 +288,9 @@ Music_AfterTheRivalFight_branch_f509d: note C_, 2 note F#, 2 note E_, 2 - sound_loop 0, Music_LookRival_branch_f509d + sound_loop 0, .mainloop -Music_LookRival_branch_f50ef: +.sub1: note F_, 2 note C_, 2 note D_, 2 @@ -302,7 +300,7 @@ Music_LookRival_branch_f50ef: note D#, 2 sound_ret -Music_LookRival_branch_f50f7: +.sub2: note A#, 2 note F_, 2 note G_, 2 @@ -312,7 +310,7 @@ Music_LookRival_branch_f50f7: note G#, 2 sound_ret -Music_LookRival_branch_f50ff: +.sub3: note A#, 4 note F_, 2 note G#, 4 @@ -337,8 +335,7 @@ Music_LookRival_Ch4: drum_note 3, 2 drum_note 3, 2 drum_note 3, 2 -Music_LookRival_branch_f5118: -Music_AfterTheRivalFight_branch_f5118: +.mainloop: drum_note 4, 4 drum_note 3, 2 drum_note 4, 4 @@ -350,4 +347,4 @@ Music_AfterTheRivalFight_branch_f5118: drum_note 4, 2 drum_note 3, 2 drum_note 3, 2 - sound_loop 0, Music_LookRival_branch_f5118 + sound_loop 0, .mainloop diff --git a/audio/music/lookrocket.asm b/audio/music/lookrocket.asm index 6c91a7b45..db1c60110 100644 --- a/audio/music/lookrocket.asm +++ b/audio/music/lookrocket.asm @@ -16,26 +16,25 @@ Music_LookRocket_Ch1: octave 4 note C_, 1 note D_, 1 - sound_call Music_LookRocket_branch_f74e6 + sound_call .sub1 duty_cycle 1 -Music_LookRocket_branch_f74c7: +.mainloop: volume_envelope 10, 8 - sound_call Music_LookRocket_branch_f74f7 - sound_call Music_LookRocket_branch_f758a + sound_call .sub2 + sound_call Music_LookRocket_Ch2.sub5 octave 4 note F#, 1 rest 1 volume_envelope 5, 3 - sound_call Music_LookRocket_branch_f750c + sound_call .sub3 volume_envelope 12, 3 - sound_call Music_LookRocket_branch_f750c + sound_call .sub3 volume_envelope 14, 3 - sound_call Music_LookRocket_branch_f750c + sound_call .sub3 rest 16 - sound_loop 0, Music_LookRocket_branch_f74c7 + sound_loop 0, .mainloop -Music_LookRocket_branch_f74e6: -Music_RocketTheme_branch_f74e6: +.sub1: note D#, 1 rest 1 note D_, 1 @@ -54,8 +53,7 @@ Music_RocketTheme_branch_f74e6: note G#, 1 sound_ret -Music_LookRocket_branch_f74f7: -Music_RocketTheme_branch_f74f7: +.sub2: rest 2 octave 3 note D#, 1 @@ -78,8 +76,7 @@ Music_RocketTheme_branch_f74f7: rest 1 sound_ret -Music_LookRocket_branch_f750c: -Music_RocketTheme_branch_f750c: +.sub3: rest 2 octave 2 note B_, 1 @@ -98,25 +95,24 @@ Music_LookRocket_Ch2: octave 5 note C_, 1 note D_, 1 - sound_call Music_LookRocket_branch_f7547 -Music_LookRocket_branch_f7526: + sound_call .sub1 +.mainloop: volume_envelope 11, 7 - sound_call Music_LookRocket_branch_f758a + sound_call .sub5 octave 5 note C_, 1 rest 1 - sound_call Music_LookRocket_branch_f7554 + sound_call .sub2 volume_envelope 5, 3 - sound_call Music_LookRocket_branch_f7568 + sound_call .sub3 volume_envelope 12, 3 - sound_call Music_LookRocket_branch_f7568 + sound_call .sub3 volume_envelope 14, 3 - sound_call Music_LookRocket_branch_f7568 - sound_call Music_LookRocket_branch_f756f - sound_loop 0, Music_LookRocket_branch_f7526 + sound_call .sub3 + sound_call .sub4 + sound_loop 0, .mainloop -Music_LookRocket_branch_f7547: -Music_RocketTheme_branch_f7547: +.sub1: note D#, 1 rest 1 note D_, 1 @@ -130,8 +126,7 @@ Music_RocketTheme_branch_f7547: duty_cycle 0 sound_ret -Music_LookRocket_branch_f7554: -Music_RocketTheme_branch_f7554: +.sub2: rest 2 octave 4 note D#, 1 @@ -153,8 +148,7 @@ Music_RocketTheme_branch_f7554: rest 1 sound_ret -Music_LookRocket_branch_f7568: -Music_RocketTheme_branch_f7568: +.sub3: rest 2 octave 3 note F_, 1 @@ -163,8 +157,7 @@ Music_RocketTheme_branch_f7568: rest 5 sound_ret -Music_LookRocket_branch_f756f: -Music_RocketTheme_branch_f756f: +.sub4: volume_envelope 6, 3 note G#, 1 note F_, 1 @@ -189,8 +182,7 @@ Music_RocketTheme_branch_f756f: note D_, 1 sound_ret -Music_LookRocket_branch_f758a: -Music_RocketTheme_branch_f758a: +.sub5: octave 3 rest 2 note G_, 1 @@ -211,20 +203,19 @@ Music_LookRocket_Ch3: note_type 12, 1, 4 stereo_panning TRUE, FALSE rest 2 - sound_call Music_LookRocket_branch_f75bf -Music_LookRocket_branch_f75a5: - sound_call Music_LookRocket_branch_f75fe - sound_call Music_LookRocket_branch_f75fe + sound_call .sub1 +.mainloop: + sound_call .sub4 + sound_call .sub4 volume_envelope 2, 4 - sound_call Music_LookRocket_branch_f7623 + sound_call .sub5 volume_envelope 1, 4 - sound_call Music_LookRocket_branch_f75cc - sound_call Music_LookRocket_branch_f7623 - sound_call Music_LookRocket_branch_f75e1 - sound_loop 0, Music_LookRocket_branch_f75a5 + sound_call .sub2 + sound_call .sub5 + sound_call .sub3 + sound_loop 0, .mainloop -Music_LookRocket_branch_f75bf: -Music_RocketTheme_branch_f75bf: +.sub1: octave 3 note F_, 1 rest 1 @@ -239,8 +230,7 @@ Music_RocketTheme_branch_f75bf: note D_, 6 sound_ret -Music_LookRocket_branch_f75cc: -Music_RocketTheme_branch_f75cc: +.sub2: octave 2 note G#, 1 rest 1 @@ -263,8 +253,7 @@ Music_RocketTheme_branch_f75cc: rest 1 sound_ret -Music_LookRocket_branch_f75e1: -Music_RocketTheme_branch_f75e1: +.sub3: volume_envelope 2, 4 octave 2 note G#, 1 @@ -293,8 +282,7 @@ Music_RocketTheme_branch_f75e1: rest 1 sound_ret -Music_LookRocket_branch_f75fe: -Music_RocketTheme_branch_f75fe: +.sub4: note C_, 1 rest 1 octave 4 @@ -333,8 +321,7 @@ Music_RocketTheme_branch_f75fe: rest 1 sound_ret -Music_LookRocket_branch_f7623: -Music_RocketTheme_branch_f7623: +.sub5: octave 2 note G#, 1 rest 1 @@ -361,20 +348,19 @@ Music_LookRocket_Ch4: toggle_noise 3 drum_speed 12 rest 2 - sound_call Music_LookRocket_branch_f765c -Music_LookRocket_branch_f7640: - sound_call Music_LookRocket_branch_f7664 - sound_call Music_LookRocket_branch_f7664 - sound_call Music_LookRocket_branch_f7664 - sound_call Music_LookRocket_branch_f7664 - sound_call Music_LookRocket_branch_f7664 - sound_call Music_LookRocket_branch_f7664 - sound_call Music_LookRocket_branch_f7664 - sound_call Music_LookRocket_branch_f765c - sound_loop 0, Music_LookRocket_branch_f7640 + sound_call .sub1 +.mainloop: + sound_call .sub2 + sound_call .sub2 + sound_call .sub2 + sound_call .sub2 + sound_call .sub2 + sound_call .sub2 + sound_call .sub2 + sound_call .sub1 + sound_loop 0, .mainloop -Music_LookRocket_branch_f765c: -Music_RocketTheme_branch_f765c: +.sub1: drum_note 1, 8 drum_note 3, 2 drum_note 4, 2 @@ -384,8 +370,7 @@ Music_RocketTheme_branch_f765c: drum_note 3, 1 sound_ret -Music_LookRocket_branch_f7664: -Music_RocketTheme_branch_f7664: +.sub2: drum_note 4, 2 drum_note 7, 2 drum_note 3, 2 diff --git a/audio/music/looksage.asm b/audio/music/looksage.asm index 381f7a362..1fa147ef3 100644 --- a/audio/music/looksage.asm +++ b/audio/music/looksage.asm @@ -11,7 +11,7 @@ Music_LookSage_Ch1: note_type 12, 11, 3 rest 2 rest 16 - sound_call Music_LookSage_branch_ee3fa + sound_call .sub1 volume_envelope 11, 3 octave 3 note D_, 2 @@ -29,7 +29,7 @@ Music_LookSage_Ch1: note F_, 2 volume_envelope 9, 3 note F_, 2 -Music_LookSage_branch_ee38e: +.mainloop: volume_envelope 11, 3 note D_, 2 volume_envelope 9, 3 @@ -99,10 +99,10 @@ Music_LookSage_branch_ee38e: note B_, 2 volume_envelope 9, 3 note B_, 2 - sound_call Music_LookSage_branch_ee3fa - sound_loop 0, Music_LookSage_branch_ee38e + sound_call .sub1 + sound_loop 0, .mainloop -Music_LookSage_branch_ee3fa: +.sub1: volume_envelope 11, 3 octave 2 note E_, 2 @@ -142,7 +142,7 @@ Music_LookSage_Ch3: note E_, 14 note G_, 1 note G#, 1 -Music_LookSage_branch_ee430: +.mainloop: note A_, 12 note B_, 4 note D_, 9 @@ -176,4 +176,4 @@ Music_LookSage_branch_ee430: note E_, 14 note G_, 1 note G#, 1 - sound_loop 0, Music_LookSage_branch_ee430 + sound_loop 0, .mainloop diff --git a/audio/music/lookyoungster.asm b/audio/music/lookyoungster.asm index 91966cc68..3dcf302cf 100644 --- a/audio/music/lookyoungster.asm +++ b/audio/music/lookyoungster.asm @@ -25,7 +25,7 @@ Music_LookYoungster_Ch1: rest 2 note C_, 6 volume_envelope 11, 3 -Music_LookYoungster_branch_f66ea: +.mainloop: rest 2 octave 3 note G_, 1 @@ -58,7 +58,7 @@ Music_LookYoungster_branch_f66ea: note C_, 1 rest 1 rest 16 - sound_loop 0, Music_LookYoungster_branch_f66ea + sound_loop 0, .mainloop sound_ret Music_LookYoungster_Ch2: @@ -82,7 +82,7 @@ Music_LookYoungster_Ch2: note F_, 4 rest 2 note F#, 6 -Music_LookYoungster_branch_f672f: +.mainloop: duty_cycle 3 volume_envelope 11, 3 rest 2 @@ -155,7 +155,7 @@ Music_LookYoungster_branch_f672f: octave 4 note C_, 1 rest 1 - sound_loop 0, Music_LookYoungster_branch_f672f + sound_loop 0, .mainloop sound_ret Music_LookYoungster_Ch3: @@ -194,7 +194,7 @@ Music_LookYoungster_Ch3: rest 2 note G#, 6 volume_envelope 2, 5 -Music_LookYoungster_branch_f67ae: +.mainloop: octave 2 note G_, 1 rest 1 @@ -289,5 +289,5 @@ Music_LookYoungster_branch_f67ae: rest 1 note G#, 1 rest 1 - sound_loop 0, Music_LookYoungster_branch_f67ae + sound_loop 0, .mainloop sound_ret diff --git a/audio/music/magnettrain.asm b/audio/music/magnettrain.asm index c6f4c04b5..f0c49d597 100644 --- a/audio/music/magnettrain.asm +++ b/audio/music/magnettrain.asm @@ -240,14 +240,13 @@ Music_MagnetTrain_Ch4: drum_note 11, 4 drum_note 3, 2 drum_note 3, 2 - sound_call Music_MagnetTrain_branch_ef71e - sound_call Music_MagnetTrain_branch_ef71e + sound_call .sub2 + sound_call .sub2 drum_speed 12 drum_note 12, 16 sound_ret -; unused -Music_MagnetTrain_branch_ef711: +.sub1: ; unused drum_note 9, 1 drum_note 8, 1 drum_note 8, 1 @@ -262,7 +261,7 @@ Music_MagnetTrain_branch_ef711: drum_note 8, 1 sound_ret -Music_MagnetTrain_branch_ef71e: +.sub2: drum_note 9, 2 drum_note 8, 2 drum_note 8, 2 diff --git a/audio/music/mainmenu.asm b/audio/music/mainmenu.asm index 00822cb34..71f9c7ae9 100644 --- a/audio/music/mainmenu.asm +++ b/audio/music/mainmenu.asm @@ -15,7 +15,8 @@ Music_MainMenu_Ch1: note_type 12, 0, -7 octave 3 note D_, 8 -Music_MainMenu_branch_f791d: +.mainloop: +.loop1: note_type 12, 9, 2 octave 3 note C#, 6 @@ -24,7 +25,7 @@ Music_MainMenu_branch_f791d: note C#, 2 note C#, 2 note C#, 4 - sound_loop 2, Music_MainMenu_branch_f791d + sound_loop 2, .loop1 note D#, 6 note D#, 1 note D#, 1 @@ -40,7 +41,7 @@ Music_MainMenu_branch_f791d: note_type 12, 9, 4 octave 3 note C_, 4 - sound_loop 0, Music_MainMenu_branch_f791d + sound_loop 0, .mainloop Music_MainMenu_Ch2: duty_cycle 3 @@ -48,7 +49,8 @@ Music_MainMenu_Ch2: note_type 12, 0, -7 octave 3 note G_, 8 -Music_MainMenu_branch_f7949: +.mainloop: +.loop1: note_type 12, 10, 2 note F#, 6 note F#, 1 @@ -56,7 +58,7 @@ Music_MainMenu_branch_f7949: note F#, 2 note F#, 2 note F#, 4 - sound_loop 2, Music_MainMenu_branch_f7949 + sound_loop 2, .loop1 note G#, 6 note G#, 1 note G#, 1 @@ -70,13 +72,14 @@ Music_MainMenu_branch_f7949: note E_, 2 note_type 12, 10, 4 note F_, 4 - sound_loop 0, Music_MainMenu_branch_f7949 + sound_loop 0, .mainloop Music_MainMenu_Ch3: stereo_panning TRUE, FALSE note_type 12, 2, 5 rest 8 -Music_MainMenu_branch_f796f: +.mainloop: +.loop1: octave 2 note F#, 1 rest 5 @@ -88,7 +91,7 @@ Music_MainMenu_branch_f796f: rest 1 note F#, 1 rest 3 - sound_loop 2, Music_MainMenu_branch_f796f + sound_loop 2, .loop1 note G#, 1 rest 5 note G#, 1 @@ -109,7 +112,7 @@ Music_MainMenu_branch_f796f: rest 1 note F_, 1 rest 3 - sound_loop 0, Music_MainMenu_branch_f796f + sound_loop 0, .mainloop Music_MainMenu_Ch4: stereo_panning FALSE, TRUE @@ -124,7 +127,7 @@ Music_MainMenu_Ch4: drum_note 3, 1 drum_note 3, 1 drum_note 3, 1 -Music_MainMenu_branch_f79a5: +.mainloop: drum_note 3, 6 drum_note 3, 1 drum_note 3, 1 @@ -140,4 +143,4 @@ Music_MainMenu_branch_f79a5: drum_note 4, 1 drum_note 3, 1 drum_note 3, 1 - sound_loop 0, Music_MainMenu_branch_f79a5 + sound_loop 0, .mainloop diff --git a/audio/music/mobileadapter.asm b/audio/music/mobileadapter.asm index d13f8ec7a..0c36649a7 100644 --- a/audio/music/mobileadapter.asm +++ b/audio/music/mobileadapter.asm @@ -23,8 +23,8 @@ Music_MobileAdapter_Ch1: note D_, 1 rest 1 note C#, 4 -Music_MobileAdapter_branch_1fcad: - sound_call Music_MobileAdapter_branch_1fd39 +.mainloop: + sound_call .sub1 note D_, 1 note C#, 1 note D_, 2 @@ -38,7 +38,7 @@ Music_MobileAdapter_branch_1fcad: note D_, 1 note C#, 1 note D_, 2 - sound_call Music_MobileAdapter_branch_1fd39 + sound_call .sub1 note D_, 1 note C#, 1 octave 3 @@ -145,10 +145,10 @@ Music_MobileAdapter_branch_1fcad: octave 3 note D_, 4 volume_envelope 7, 7 - sound_call Music_MobileAdapter_branch_1ff09 - sound_loop 0, Music_MobileAdapter_branch_1fcad + sound_call Music_MobileAdapter_Ch3.sub5 + sound_loop 0, .mainloop -Music_MobileAdapter_branch_1fd39: +.sub1: volume_envelope 9, 4 octave 4 note F#, 1 @@ -214,8 +214,8 @@ Music_MobileAdapter_Ch2: octave 4 note D_, 1 note F#, 1 -Music_MobileAdapter_branch_1fd80: - sound_call Music_MobileAdapter_branch_1fdfe +.mainloop: + sound_call .sub1 note A_, 4 note G_, 4 note A_, 4 @@ -224,7 +224,7 @@ Music_MobileAdapter_branch_1fd80: rest 2 note D_, 1 note F#, 1 - sound_call Music_MobileAdapter_branch_1fdfe + sound_call .sub1 octave 5 note C#, 4 octave 4 @@ -307,23 +307,23 @@ Music_MobileAdapter_branch_1fd80: note D_, 16 duty_cycle 1 volume_envelope 7, 1 - sound_call Music_MobileAdapter_branch_1fe16 + sound_call .sub2 octave 4 note E_, 1 note A_, 1 octave 5 note C#, 1 note E_, 1 - sound_call Music_MobileAdapter_branch_1fe16 + sound_call .sub2 rest 2 duty_cycle 2 volume_envelope 11, 4 octave 4 note D_, 1 note F#, 1 - sound_loop 0, Music_MobileAdapter_branch_1fd80 + sound_loop 0, .mainloop -Music_MobileAdapter_branch_1fdfe: +.sub1: note A_, 1 rest 1 note A_, 1 @@ -349,7 +349,7 @@ Music_MobileAdapter_branch_1fdfe: note B_, 2 sound_ret -Music_MobileAdapter_branch_1fe16: +.sub2: octave 5 note F#, 1 note D_, 1 @@ -407,10 +407,10 @@ Music_MobileAdapter_Ch3: note E_, 1 rest 1 note A_, 4 -Music_MobileAdapter_branch_1fe4f: - sound_call Music_MobileAdapter_branch_1fecf - sound_call Music_MobileAdapter_branch_1fee3 - sound_call Music_MobileAdapter_branch_1feee +.mainloop: + sound_call .sub1 + sound_call .sub2 + sound_call .sub3 note D_, 1 rest 1 octave 2 @@ -421,16 +421,16 @@ Music_MobileAdapter_branch_1fe4f: octave 3 note C#, 1 rest 1 - sound_call Music_MobileAdapter_branch_1fecf - sound_call Music_MobileAdapter_branch_1fee3 - sound_call Music_MobileAdapter_branch_1feee + sound_call .sub1 + sound_call .sub2 + sound_call .sub3 note D_, 2 octave 2 note A_, 2 octave 3 note D_, 4 - sound_call Music_MobileAdapter_branch_1fee3 - sound_call Music_MobileAdapter_branch_1fef7 + sound_call .sub2 + sound_call .sub4 note B_, 1 rest 1 octave 3 @@ -453,7 +453,7 @@ Music_MobileAdapter_branch_1fe4f: rest 1 note B_, 1 rest 1 - sound_call Music_MobileAdapter_branch_1fef7 + sound_call .sub4 octave 3 note D_, 1 rest 1 @@ -495,7 +495,7 @@ Music_MobileAdapter_branch_1fe4f: octave 3 note G_, 1 rest 1 - sound_call Music_MobileAdapter_branch_1fee3 + sound_call .sub2 note D_, 1 rest 1 note A_, 1 @@ -509,37 +509,39 @@ Music_MobileAdapter_branch_1fe4f: note A_, 2 octave 3 note D_, 4 - sound_call Music_MobileAdapter_branch_1ff09 - sound_loop 0, Music_MobileAdapter_branch_1fe4f + sound_call .sub5 + sound_loop 0, .mainloop -Music_MobileAdapter_branch_1fecf: +.sub1: +.sub1loop1: octave 3 note D_, 1 rest 1 note A_, 1 rest 1 - sound_loop 4, Music_MobileAdapter_branch_1fecf -Music_MobileAdapter_branch_1fed8: + sound_loop 4, .sub1loop1 +.sub1loop2: octave 2 note G_, 1 rest 1 octave 3 note D_, 1 rest 1 - sound_loop 4, Music_MobileAdapter_branch_1fed8 + sound_loop 4, .sub1loop2 sound_ret -Music_MobileAdapter_branch_1fee3: +.sub2: +.sub2loop1: octave 2 note A_, 1 rest 1 octave 3 note E_, 1 rest 1 - sound_loop 4, Music_MobileAdapter_branch_1fee3 + sound_loop 4, .sub2loop1 sound_ret -Music_MobileAdapter_branch_1feee: +.sub3: note D_, 1 rest 1 note A_, 1 @@ -550,7 +552,7 @@ Music_MobileAdapter_branch_1feee: rest 1 sound_ret -Music_MobileAdapter_branch_1fef7: +.sub4: octave 2 note A_, 1 rest 1 @@ -570,7 +572,8 @@ Music_MobileAdapter_branch_1fef7: note A_, 4 sound_ret -Music_MobileAdapter_branch_1ff09: +.sub5: +.sub5loop1: octave 2 note A_, 1 rest 1 @@ -601,7 +604,7 @@ Music_MobileAdapter_branch_1ff09: octave 2 note A_, 2 rest 6 - sound_loop 2, Music_MobileAdapter_branch_1ff09 + sound_loop 2, .sub5loop1 sound_ret Music_MobileAdapter_Ch4: @@ -614,10 +617,10 @@ Music_MobileAdapter_Ch4: drum_note 3, 2 drum_note 3, 1 drum_note 3, 1 -Music_MobileAdapter_branch_1ff38: - sound_call Music_MobileAdapter_branch_1ff60 - sound_call Music_MobileAdapter_branch_1ff60 -Music_MobileAdapter_branch_1ff3e: +.mainloop: + sound_call .sub1 + sound_call .sub1 +.loop1: rest 4 drum_note 3, 8 drum_note 3, 8 @@ -625,11 +628,11 @@ Music_MobileAdapter_branch_1ff3e: drum_note 3, 1 drum_note 3, 3 drum_note 3, 4 - sound_loop 2, Music_MobileAdapter_branch_1ff3e -Music_MobileAdapter_branch_1ff49: + sound_loop 2, .loop1 +.loop2: rest 4 drum_note 3, 4 - sound_loop 11, Music_MobileAdapter_branch_1ff49 + sound_loop 11, .loop2 rest 2 drum_note 3, 2 drum_note 3, 2 @@ -643,12 +646,13 @@ Music_MobileAdapter_branch_1ff49: drum_note 3, 2 drum_note 3, 1 drum_note 3, 1 - sound_loop 0, Music_MobileAdapter_branch_1ff38 + sound_loop 0, .mainloop -Music_MobileAdapter_branch_1ff60: +.sub1: +.sub1loop1: rest 4 drum_note 3, 4 - sound_loop 7, Music_MobileAdapter_branch_1ff60 + sound_loop 7, .sub1loop1 rest 2 drum_note 3, 2 drum_note 3, 2 diff --git a/audio/music/mobileadaptermenu.asm b/audio/music/mobileadaptermenu.asm index 0f8fdb339..4312422f3 100644 --- a/audio/music/mobileadaptermenu.asm +++ b/audio/music/mobileadaptermenu.asm @@ -12,9 +12,9 @@ Music_MobileAdapterMenu_Ch1: duty_cycle 2 note_type 12, 6, 6 rest 2 -Music_MobileAdapterMenu_branch_178038: - sound_call Music_MobileAdapterMenu_branch_178057 - sound_call Music_MobileAdapterMenu_branch_178076 +.mainloop: + sound_call .sub1 + sound_call .sub2 octave 3 note F#, 4 note B_, 4 @@ -22,7 +22,7 @@ Music_MobileAdapterMenu_branch_178038: note B_, 1 rest 1 note D#, 4 - sound_call Music_MobileAdapterMenu_branch_178076 + sound_call .sub2 octave 3 note F#, 2 octave 2 @@ -31,10 +31,10 @@ Music_MobileAdapterMenu_branch_178038: note D#, 3 note E_, 1 note D#, 8 - sound_call Music_MobileAdapterMenu_branch_178057 - sound_loop 0, Music_MobileAdapterMenu_branch_178038 + sound_call .sub1 + sound_loop 0, .mainloop -Music_MobileAdapterMenu_branch_178057: +.sub1: octave 3 note G#, 7 octave 4 @@ -67,7 +67,7 @@ Music_MobileAdapterMenu_branch_178057: note G#, 8 sound_ret -Music_MobileAdapterMenu_branch_178076: +.sub2: note E_, 1 rest 1 note A_, 1 @@ -90,16 +90,16 @@ Music_MobileAdapterMenu_Ch2: octave 4 note E_, 1 note G#, 1 -Music_MobileAdapterMenu_branch_17808e: - sound_call Music_MobileAdapterMenu_branch_1780ae +.mainloop: + sound_call .sub1 note E_, 8 - sound_call Music_MobileAdapterMenu_branch_1780d7 + sound_call .sub2 note D#, 2 note C#, 2 note D#, 3 note E_, 1 note F#, 8 - sound_call Music_MobileAdapterMenu_branch_1780d7 + sound_call .sub2 note D#, 2 note E_, 2 note F#, 3 @@ -107,13 +107,13 @@ Music_MobileAdapterMenu_branch_17808e: note F#, 6 note E_, 1 note G#, 1 - sound_call Music_MobileAdapterMenu_branch_1780ae + sound_call .sub1 note E_, 6 note E_, 1 note G#, 1 - sound_loop 0, Music_MobileAdapterMenu_branch_17808e + sound_loop 0, .mainloop -Music_MobileAdapterMenu_branch_1780ae: +.sub1: octave 4 note B_, 1 rest 1 @@ -156,7 +156,7 @@ Music_MobileAdapterMenu_branch_1780ae: note D#, 1 sound_ret -Music_MobileAdapterMenu_branch_1780d7: +.sub2: note A_, 1 rest 1 note A_, 1 @@ -173,12 +173,12 @@ Music_MobileAdapterMenu_Ch3: vibrato 8, 3, 4 note_type 12, 2, 5 rest 2 -Music_MobileAdapterMenu_branch_1780e9: - sound_call Music_MobileAdapterMenu_branch_178119 +.mainloop: + sound_call .sub1 octave 2 note B_, 1 note G#, 1 - sound_call Music_MobileAdapterMenu_branch_178146 + sound_call .sub2 octave 2 note B_, 2 rest 2 @@ -193,7 +193,7 @@ Music_MobileAdapterMenu_branch_1780e9: note B_, 2 note F#, 1 note G#, 1 - sound_call Music_MobileAdapterMenu_branch_178146 + sound_call .sub2 octave 2 note B_, 2 rest 2 @@ -208,11 +208,11 @@ Music_MobileAdapterMenu_branch_1780e9: note D#, 1 rest 1 note F#, 4 - sound_call Music_MobileAdapterMenu_branch_178119 + sound_call .sub1 rest 2 - sound_loop 0, Music_MobileAdapterMenu_branch_1780e9 + sound_loop 0, .mainloop -Music_MobileAdapterMenu_branch_178119: +.sub1: octave 3 note E_, 2 rest 2 @@ -257,7 +257,7 @@ Music_MobileAdapterMenu_branch_178119: volume_envelope 2, 5 sound_ret -Music_MobileAdapterMenu_branch_178146: +.sub2: note A_, 2 rest 2 octave 3 diff --git a/audio/music/mobilecenter.asm b/audio/music/mobilecenter.asm index cd632eeda..71c516993 100644 --- a/audio/music/mobilecenter.asm +++ b/audio/music/mobilecenter.asm @@ -20,7 +20,7 @@ Music_MobileCenter_Ch1: note G_, 2 note A_, 2 note B_, 4 -Music_MobileCenter_branch_179642: +.mainloop: octave 3 note E_, 2 note C_, 2 @@ -155,7 +155,7 @@ Music_MobileCenter_branch_179642: note D_, 2 note E_, 2 note F_, 2 - sound_loop 0, Music_MobileCenter_branch_179642 + sound_loop 0, .mainloop Music_MobileCenter_Ch2: note_type 12, 12, 2 @@ -165,7 +165,7 @@ Music_MobileCenter_Ch2: note G_, 2 note A_, 2 note B_, 2 -Music_MobileCenter_branch_1796d6: +.mainloop: octave 2 note C_, 2 note E_, 2 @@ -323,7 +323,7 @@ Music_MobileCenter_branch_1796d6: note F_, 2 note E_, 2 note D_, 2 - sound_loop 0, Music_MobileCenter_branch_1796d6 + sound_loop 0, .mainloop Music_MobileCenter_Ch3: note_type 12, 2, 4 @@ -337,7 +337,7 @@ Music_MobileCenter_Ch3: note C_, 2 note D_, 4 note_type 12, 2, 5 -Music_MobileCenter_branch_179788: +.mainloop: note C_, 2 octave 4 note G_, 2 @@ -449,7 +449,7 @@ Music_MobileCenter_branch_179788: note D_, 2 note C_, 8 vibrato 16, 3, 4 - sound_loop 0, Music_MobileCenter_branch_179788 + sound_loop 0, .mainloop Music_MobileCenter_Ch4: toggle_noise 3 @@ -461,7 +461,8 @@ Music_MobileCenter_Ch4: drum_note 2, 1 drum_note 2, 1 drum_note 2, 1 -Music_MobileCenter_branch_179813: +.mainloop: +.loop1: drum_note 10, 2 drum_note 2, 2 drum_note 2, 2 @@ -470,7 +471,7 @@ Music_MobileCenter_branch_179813: drum_note 2, 2 drum_note 3, 2 drum_note 2, 2 - sound_loop 3, Music_MobileCenter_branch_179813 + sound_loop 3, .loop1 drum_note 10, 2 drum_note 2, 2 drum_note 2, 2 @@ -481,4 +482,4 @@ Music_MobileCenter_branch_179813: drum_note 2, 1 drum_note 2, 1 drum_note 2, 1 - sound_loop 0, Music_MobileCenter_branch_179813 + sound_loop 0, .mainloop diff --git a/audio/music/mom.asm b/audio/music/mom.asm index 208d2e4ec..9828c5d87 100644 --- a/audio/music/mom.asm +++ b/audio/music/mom.asm @@ -17,7 +17,7 @@ Music_Mom_Ch2: note G#, 1 note A_, 1 note B_, 8 -Music_Mom_branch_f6c0e: +.mainloop: note_type 12, 11, 1 rest 4 octave 3 @@ -30,7 +30,7 @@ Music_Mom_branch_f6c0e: note E_, 4 note A#, 2 note B_, 2 - sound_loop 0, Music_Mom_branch_f6c0e + sound_loop 0, .mainloop Music_Mom_Ch3: stereo_panning TRUE, FALSE @@ -43,7 +43,7 @@ Music_Mom_Ch3: note G#, 1 note E_, 8 volume_envelope 2, 3 -Music_Mom_branch_f6c2e: +.mainloop: octave 2 note A_, 2 rest 6 @@ -75,13 +75,13 @@ Music_Mom_branch_f6c2e: note C#, 4 note D_, 2 rest 2 - sound_loop 0, Music_Mom_branch_f6c2e + sound_loop 0, .mainloop Music_Mom_Ch4: toggle_noise 3 drum_speed 12 rest 6 -Music_Mom_branch_f6c56: +.mainloop: drum_note 4, 1 rest 1 drum_note 7, 2 @@ -106,4 +106,4 @@ Music_Mom_branch_f6c56: drum_note 3, 2 drum_note 4, 1 rest 1 - sound_loop 0, Music_Mom_branch_f6c56 + sound_loop 0, .mainloop diff --git a/audio/music/mtmoon.asm b/audio/music/mtmoon.asm index d895e1d37..4fedde564 100644 --- a/audio/music/mtmoon.asm +++ b/audio/music/mtmoon.asm @@ -14,14 +14,14 @@ Music_MtMoon_Ch1: stereo_panning TRUE, FALSE note_type 12, 4, 5 rest 2 - sound_loop 0, Music_MtMoon_branch_edb56 + sound_loop 0, Music_MtMoon_Ch2.mainloop Music_MtMoon_Ch2: vibrato 11, 1, 5 duty_cycle 2 note_type 12, 8, 4 stereo_panning FALSE, TRUE -Music_MtMoon_branch_edb56: +.mainloop: octave 4 note D#, 6 note C#, 6 @@ -70,11 +70,12 @@ Music_MtMoon_branch_edb56: note E_, 6 note F#, 6 note E_, 4 - sound_loop 0, Music_MtMoon_branch_edb56 + sound_loop 0, .mainloop Music_MtMoon_Ch3: +.mainloop: note_type 12, 2, 8 -Music_MtMoon_branch_edb8d: +.loop1: octave 2 note B_, 2 octave 3 @@ -89,7 +90,7 @@ Music_MtMoon_branch_edb8d: note B_, 2 octave 3 note D#, 2 - sound_loop 3, Music_MtMoon_branch_edb8d + sound_loop 3, .loop1 octave 2 note B_, 2 octave 3 @@ -102,7 +103,7 @@ Music_MtMoon_branch_edb8d: note G_, 2 note D#, 2 note E_, 2 -Music_MtMoon_branch_edbab: +.loop2: note E_, 2 note G#, 2 octave 4 @@ -115,13 +116,13 @@ Music_MtMoon_branch_edbab: octave 3 note E_, 2 note G#, 2 - sound_loop 4, Music_MtMoon_branch_edbab - sound_loop 0, Music_MtMoon_Ch3 + sound_loop 4, .loop2 + sound_loop 0, .mainloop Music_MtMoon_Ch4: toggle_noise 5 drum_speed 12 -Music_MtMoon_branch_edbc3: +.mainloop: stereo_panning FALSE, TRUE drum_note 11, 4 drum_note 11, 8 @@ -135,4 +136,4 @@ Music_MtMoon_branch_edbc3: drum_note 11, 4 stereo_panning TRUE, FALSE drum_note 11, 8 - sound_loop 0, Music_MtMoon_branch_edbc3 + sound_loop 0, .mainloop diff --git a/audio/music/mtmoonsquare.asm b/audio/music/mtmoonsquare.asm index 3c3d6a85b..0b0dc03c6 100644 --- a/audio/music/mtmoonsquare.asm +++ b/audio/music/mtmoonsquare.asm @@ -9,9 +9,9 @@ Music_MtMoonSquare_Ch1: duty_cycle 2 pitch_offset 1 rest 1 -Music_MtMoonSquare_branch_f4826: +.mainloop: note_type 12, 4, 4 -Music_MtMoonSquare_branch_f4829: +.loop1: octave 4 note D_, 2 note E_, 2 @@ -20,8 +20,8 @@ Music_MtMoonSquare_branch_f4829: note A_, 2 octave 5 note D_, 4 - sound_loop 2, Music_MtMoonSquare_branch_f4829 -Music_MtMoonSquare_branch_f4835: + sound_loop 2, .loop1 +.loop2: octave 4 note E_, 2 note F#, 2 @@ -30,8 +30,8 @@ Music_MtMoonSquare_branch_f4835: note B_, 2 octave 5 note E_, 4 - sound_loop 2, Music_MtMoonSquare_branch_f4835 -Music_MtMoonSquare_branch_f4841: + sound_loop 2, .loop2 +.loop3: octave 4 note C#, 2 note D_, 2 @@ -40,8 +40,8 @@ Music_MtMoonSquare_branch_f4841: note G_, 2 octave 5 note C#, 4 - sound_loop 2, Music_MtMoonSquare_branch_f4841 -Music_MtMoonSquare_branch_f484d: + sound_loop 2, .loop3 +.loop4: octave 4 note D_, 2 note E_, 2 @@ -50,15 +50,15 @@ Music_MtMoonSquare_branch_f484d: note A_, 2 octave 5 note D_, 4 - sound_loop 2, Music_MtMoonSquare_branch_f484d - sound_loop 0, Music_MtMoonSquare_branch_f4826 + sound_loop 2, .loop4 + sound_loop 0, .mainloop Music_MtMoonSquare_Ch2: duty_cycle 2 vibrato 24, 2, 4 -Music_MtMoonSquare_branch_f4862: +.mainloop: note_type 12, 8, 2 -Music_MtMoonSquare_branch_f4865: +.loop1: octave 4 note D_, 2 note E_, 2 @@ -68,9 +68,9 @@ Music_MtMoonSquare_branch_f4865: octave 5 note D_, 4 note_type 12, 6, 2 - sound_loop 2, Music_MtMoonSquare_branch_f4865 + sound_loop 2, .loop1 note_type 12, 8, 2 -Music_MtMoonSquare_branch_f4877: +.loop2: octave 4 note E_, 2 note F#, 2 @@ -80,9 +80,9 @@ Music_MtMoonSquare_branch_f4877: octave 5 note E_, 4 note_type 12, 6, 2 - sound_loop 2, Music_MtMoonSquare_branch_f4877 + sound_loop 2, .loop2 note_type 12, 8, 2 -Music_MtMoonSquare_branch_f4889: +.loop3: octave 4 note C#, 2 note D_, 2 @@ -92,9 +92,9 @@ Music_MtMoonSquare_branch_f4889: octave 5 note C#, 4 note_type 12, 6, 2 - sound_loop 2, Music_MtMoonSquare_branch_f4889 + sound_loop 2, .loop3 note_type 12, 8, 2 -Music_MtMoonSquare_branch_f489b: +.loop4: octave 4 note D_, 2 note E_, 2 @@ -104,5 +104,5 @@ Music_MtMoonSquare_branch_f489b: octave 5 note D_, 4 note_type 12, 6, 2 - sound_loop 2, Music_MtMoonSquare_branch_f489b - sound_loop 0, Music_MtMoonSquare_branch_f4862 + sound_loop 2, .loop4 + sound_loop 0, .mainloop diff --git a/audio/music/nationalpark.asm b/audio/music/nationalpark.asm index 82b52b2d4..254efa83a 100644 --- a/audio/music/nationalpark.asm +++ b/audio/music/nationalpark.asm @@ -13,11 +13,11 @@ Music_NationalPark_Ch1: duty_cycle 1 note_type 12, 7, 7 rest 2 -Music_NationalPark_branch_f5504: - sound_call Music_NationalPark_branch_f554a - sound_call Music_NationalPark_branch_f554a +.mainloop: + sound_call .sub1 + sound_call .sub1 note_type 6, 6, 7 - sound_call Music_NationalPark_branch_f563a + sound_call .sub2 note_type 12, 7, 7 rest 16 octave 2 @@ -45,7 +45,7 @@ Music_NationalPark_branch_f5504: rest 3 note D_, 1 rest 1 - sound_call Music_NationalPark_branch_f563a + sound_call .sub2 volume_envelope 7, 7 octave 3 note E_, 1 @@ -61,9 +61,9 @@ Music_NationalPark_branch_f5504: note D_, 7 note_type 12, 7, 7 rest 4 - sound_loop 0, Music_NationalPark_branch_f5504 + sound_loop 0, .mainloop -Music_NationalPark_branch_f554a: +.sub1: octave 2 note G#, 6 octave 3 @@ -270,7 +270,7 @@ Music_NationalPark_branch_f554a: note A#, 2 sound_ret -Music_NationalPark_branch_f563a: +.sub2: rest 16 rest 3 octave 4 @@ -302,12 +302,12 @@ Music_NationalPark_Ch2: note_type 12, 10, 7 rest 2 stereo_panning TRUE, FALSE -Music_NationalPark_branch_f565d: +.mainloop: note_type 12, 10, 7 - sound_call Music_NationalPark_branch_f56b8 + sound_call .sub1 octave 3 note D_, 8 - sound_call Music_NationalPark_branch_f56b8 + sound_call .sub1 rest 2 volume_envelope 10, 7 octave 4 @@ -315,7 +315,7 @@ Music_NationalPark_branch_f565d: note F#, 2 note F_, 2 note_type 6, 10, 7 - sound_call Music_NationalPark_branch_f56f5 + sound_call .sub2 octave 3 note B_, 1 octave 4 @@ -347,7 +347,7 @@ Music_NationalPark_branch_f565d: note G#, 1 rest 1 volume_envelope 10, 7 - sound_call Music_NationalPark_branch_f56f5 + sound_call .sub2 octave 3 note B_, 1 octave 4 @@ -369,9 +369,9 @@ Music_NationalPark_branch_f565d: octave 2 note D#, 2 note D_, 2 - sound_loop 0, Music_NationalPark_branch_f565d + sound_loop 0, .mainloop -Music_NationalPark_branch_f56b8: +.sub1: octave 2 note C#, 6 note G#, 2 @@ -434,7 +434,7 @@ Music_NationalPark_branch_f56b8: note F_, 2 sound_ret -Music_NationalPark_branch_f56f5: +.sub2: octave 4 note E_, 1 note F_, 5 @@ -485,25 +485,25 @@ Music_NationalPark_Ch3: note G#, 1 note A#, 1 stereo_panning TRUE, TRUE -Music_NationalPark_branch_f572e: - sound_call Music_NationalPark_branch_f5756 +.mainloop: + sound_call .sub1 octave 5 note A#, 14 octave 4 note G#, 1 note A#, 1 - sound_call Music_NationalPark_branch_f5756 + sound_call .sub1 octave 5 note A#, 8 octave 4 note D_, 8 volume_envelope 1, 5 - sound_call Music_NationalPark_branch_f578f + sound_call .sub2 octave 4 note D_, 1 octave 3 note F_, 3 - sound_call Music_NationalPark_branch_f578f + sound_call .sub2 octave 4 note D_, 1 octave 3 @@ -512,9 +512,9 @@ Music_NationalPark_branch_f572e: octave 4 note G#, 1 note A#, 1 - sound_loop 0, Music_NationalPark_branch_f572e + sound_loop 0, .mainloop -Music_NationalPark_branch_f5756: +.sub1: octave 5 note C_, 16 note C#, 14 @@ -573,7 +573,7 @@ Music_NationalPark_branch_f5756: note C_, 2 sound_ret -Music_NationalPark_branch_f578f: +.sub2: octave 2 note F#, 3 octave 3 @@ -620,16 +620,17 @@ Music_NationalPark_Ch4: toggle_noise 3 drum_speed 12 rest 2 -Music_NationalPark_branch_f57bd: +.mainloop: +.loop1: rest 16 - sound_loop 23, Music_NationalPark_branch_f57bd + sound_loop 23, .loop1 rest 8 drum_note 11, 2 drum_note 3, 2 drum_note 11, 1 drum_note 3, 1 drum_note 12, 2 -Music_NationalPark_branch_f57c8: +.loop2: drum_note 11, 2 drum_note 8, 1 drum_note 8, 1 @@ -641,7 +642,7 @@ Music_NationalPark_branch_f57c8: drum_note 8, 1 drum_note 3, 2 drum_note 12, 2 - sound_loop 7, Music_NationalPark_branch_f57c8 + sound_loop 7, .loop2 drum_note 11, 2 drum_note 8, 1 drum_note 8, 1 @@ -655,4 +656,4 @@ Music_NationalPark_branch_f57c8: drum_note 3, 1 drum_note 11, 1 drum_note 4, 1 - sound_loop 0, Music_NationalPark_branch_f57bd + sound_loop 0, .mainloop diff --git a/audio/music/newbarktown.asm b/audio/music/newbarktown.asm index 767545728..261f141f8 100644 --- a/audio/music/newbarktown.asm +++ b/audio/music/newbarktown.asm @@ -4,7 +4,7 @@ Music_NewBarkTown: channel 2, Music_NewBarkTown_Ch2 channel 3, Music_NewBarkTown_Ch3 - db $3 + db $3 ; unused Music_NewBarkTown_Ch1: tempo 187 @@ -13,9 +13,9 @@ Music_NewBarkTown_Ch1: vibrato 18, 2, 3 note_type 12, 8, 7 rest 4 -Music_NewBarkTown_branch_eb2eb: +.mainloop: duty_cycle 0 - sound_call Music_NewBarkTown_branch_eb349 + sound_call .sub1 octave 3 note C#, 1 rest 1 @@ -38,7 +38,7 @@ Music_NewBarkTown_branch_eb2eb: note G_, 1 duty_cycle 0 volume_envelope 8, 7 - sound_call Music_NewBarkTown_branch_eb349 + sound_call .sub1 octave 3 note C#, 1 rest 1 @@ -64,9 +64,9 @@ Music_NewBarkTown_branch_eb2eb: note A_, 1 duty_cycle 1 volume_envelope 5, -6 - sound_call Music_NewBarkTown_branch_eb37c - sound_call Music_NewBarkTown_branch_eb37c - sound_call Music_NewBarkTown_branch_eb37c + sound_call .sub2 + sound_call .sub2 + sound_call .sub2 octave 2 note G_, 2 note B_, 2 @@ -84,9 +84,9 @@ Music_NewBarkTown_branch_eb2eb: note A_, 4 note B_, 2 volume_envelope 8, 7 - sound_loop 0, Music_NewBarkTown_branch_eb2eb + sound_loop 0, .mainloop -Music_NewBarkTown_branch_eb349: +.sub1: octave 3 note F#, 1 rest 1 @@ -139,7 +139,7 @@ Music_NewBarkTown_branch_eb349: rest 1 sound_ret -Music_NewBarkTown_branch_eb37c: +.sub2: octave 2 note G_, 2 note B_, 2 @@ -163,12 +163,12 @@ Music_NewBarkTown_Ch2: vibrato 18, 2, 3 note_type 6, 10, 7 rest 8 -Music_NewBarkTown_branch_eb396: +.mainloop: duty_cycle 2 note_type 6, 10, 7 - sound_call Music_NewBarkTown_branch_eb3bf - sound_call Music_NewBarkTown_branch_eb3bf - sound_call Music_NewBarkTown_branch_eb3f2 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 volume_envelope 8, 7 octave 5 note B_, 6 @@ -177,7 +177,7 @@ Music_NewBarkTown_branch_eb396: octave 6 note D_, 4 note C#, 16 - sound_call Music_NewBarkTown_branch_eb3f2 + sound_call .sub2 volume_envelope 8, 7 octave 5 note B_, 6 @@ -186,9 +186,9 @@ Music_NewBarkTown_branch_eb396: octave 6 note D_, 4 note E_, 16 - sound_loop 0, Music_NewBarkTown_branch_eb396 + sound_loop 0, .mainloop -Music_NewBarkTown_branch_eb3bf: +.sub1: octave 2 note D_, 4 rest 8 @@ -241,7 +241,7 @@ Music_NewBarkTown_branch_eb3bf: note C#, 4 sound_ret -Music_NewBarkTown_branch_eb3f2: +.sub2: note_type 6, 9, 7 duty_cycle 2 octave 4 @@ -258,7 +258,7 @@ Music_NewBarkTown_Ch3: octave 5 note D_, 2 note E_, 2 -Music_NewBarkTown_branch_eb408: +.mainloop: vibrato 22, 2, 3 note F#, 4 note A_, 4 @@ -322,4 +322,4 @@ Music_NewBarkTown_branch_eb408: octave 5 note D_, 1 note E_, 1 - sound_loop 0, Music_NewBarkTown_branch_eb408 + sound_loop 0, .mainloop diff --git a/audio/music/pallettown.asm b/audio/music/pallettown.asm index 1836ca61c..3196bc27c 100644 --- a/audio/music/pallettown.asm +++ b/audio/music/pallettown.asm @@ -10,7 +10,7 @@ Music_PalletTown_Ch1: vibrato 18, 2, 4 pitch_offset 1 stereo_panning FALSE, TRUE -Music_PalletTown_branch_f4b22: +.mainloop: duty_cycle 2 note_type 12, 7, 8 octave 3 @@ -60,7 +60,7 @@ Music_PalletTown_branch_f4b22: note B_, 8 volume_envelope 7, 7 note B_, 8 -Music_PalletTown_branch_f4b59: +.loop1: duty_cycle 3 volume_envelope 9, 2 note G_, 2 @@ -83,7 +83,7 @@ Music_PalletTown_branch_f4b59: note C_, 2 octave 3 note B_, 2 - sound_loop 2, Music_PalletTown_branch_f4b59 + sound_loop 2, .loop1 volume_envelope 3, -7 octave 4 note C_, 4 @@ -117,13 +117,13 @@ Music_PalletTown_branch_f4b59: note G_, 1 volume_envelope 1, -7 note F#, 8 - sound_loop 0, Music_PalletTown_branch_f4b22 + sound_loop 0, .mainloop Music_PalletTown_Ch2: vibrato 18, 4, 4 duty_cycle 2 stereo_panning TRUE, FALSE -Music_PalletTown_branch_f4ba8: +.mainloop: note_type 12, 8, 8 octave 1 note G_, 2 @@ -183,7 +183,7 @@ Music_PalletTown_branch_f4ba8: octave 3 note C_, 2 note D_, 2 -Music_PalletTown_branch_f4be5: +.loop1: volume_envelope 10, 2 octave 3 note E_, 2 @@ -207,7 +207,7 @@ Music_PalletTown_branch_f4be5: note G_, 3 note D_, 2 note G_, 4 - sound_loop 2, Music_PalletTown_branch_f4be5 + sound_loop 2, .loop1 note C_, 2 octave 3 note E_, 4 @@ -242,11 +242,11 @@ Music_PalletTown_branch_f4be5: octave 1 note B_, 2 note A_, 2 - sound_loop 0, Music_PalletTown_branch_f4ba8 + sound_loop 0, .mainloop Music_PalletTown_Ch3: vibrato 20, 2, 4 -Music_PalletTown_branch_f4c2d: +.mainloop: note_type 12, 1, 0 octave 6 note D_, 2 @@ -355,4 +355,4 @@ Music_PalletTown_branch_f4c2d: rest 1 note B_, 8 note A_, 8 - sound_loop 0, Music_PalletTown_branch_f4c2d + sound_loop 0, .mainloop diff --git a/audio/music/pokeflutechannel.asm b/audio/music/pokeflutechannel.asm index 06a1bb6af..46d164c2f 100644 --- a/audio/music/pokeflutechannel.asm +++ b/audio/music/pokeflutechannel.asm @@ -30,7 +30,7 @@ Music_PokeFluteChannel_Ch1: octave 2 note G_, 4 note A_, 8 -Music_PokeFluteChannel_branch_f7b40: +.mainloop: octave 3 note E_, 2 note G_, 2 @@ -67,7 +67,7 @@ Music_PokeFluteChannel_branch_f7b40: octave 2 note G_, 4 note A_, 8 - sound_loop 0, Music_PokeFluteChannel_branch_f7b40 + sound_loop 0, .mainloop Music_PokeFluteChannel_Ch2: stereo_panning FALSE, TRUE @@ -106,7 +106,7 @@ Music_PokeFluteChannel_Ch2: octave 2 note E_, 2 note G_, 2 -Music_PokeFluteChannel_branch_f7b94: +.mainloop: octave 3 note C_, 2 note E_, 2 @@ -168,14 +168,14 @@ Music_PokeFluteChannel_branch_f7b94: octave 2 note E_, 2 note G_, 2 - sound_loop 0, Music_PokeFluteChannel_branch_f7b94 + sound_loop 0, .mainloop Music_PokeFluteChannel_Ch3: vibrato 16, 1, 4 note_type 12, 1, 0 - sound_call Music_PokeFluteChannel_branch_f7c05 - sound_call Music_PokeFluteChannel_branch_f7c05 -Music_PokeFluteChannel_branch_f7be1: + sound_call .sub1 + sound_call .sub1 +.mainloop: rest 4 octave 4 note C_, 2 @@ -205,10 +205,10 @@ Music_PokeFluteChannel_branch_f7be1: note F#, 2 note G_, 8 rest 4 - sound_call Music_PokeFluteChannel_branch_f7c05 - sound_loop 0, Music_PokeFluteChannel_branch_f7be1 + sound_call .sub1 + sound_loop 0, .mainloop -Music_PokeFluteChannel_branch_f7c05: +.sub1: octave 5 note E_, 2 note F_, 2 diff --git a/audio/music/pokemoncenter.asm b/audio/music/pokemoncenter.asm index 8867f5886..a5687ca83 100644 --- a/audio/music/pokemoncenter.asm +++ b/audio/music/pokemoncenter.asm @@ -11,7 +11,7 @@ Music_PokemonCenter_Ch1: duty_cycle 2 vibrato 10, 1, 4 pitch_offset 1 -Music_PokemonCenter_branch_ed5df: +.mainloop: stereo_panning FALSE, TRUE note_type 12, 8, 3 octave 3 @@ -148,20 +148,20 @@ Music_PokemonCenter_branch_ed5df: note E_, 2 note F#, 2 note G_, 2 - sound_loop 0, Music_PokemonCenter_branch_ed5df + sound_loop 0, .mainloop Music_PokemonCenter_Ch2: vibrato 16, 2, 5 -Music_PokemonCenter_branch_ed674: +.mainloop: stereo_panning TRUE, TRUE - sound_call Music_PokemonCenter_branch_ed6d1 + sound_call .sub1 stereo_panning FALSE, TRUE note_type 12, 10, 5 octave 3 note A_, 4 note E_, 4 stereo_panning TRUE, TRUE - sound_call Music_PokemonCenter_branch_ed6e4 + sound_call .sub2 note D_, 2 note F#, 6 stereo_panning FALSE, TRUE @@ -170,14 +170,14 @@ Music_PokemonCenter_branch_ed674: note A_, 4 note E_, 4 stereo_panning TRUE, TRUE - sound_call Music_PokemonCenter_branch_ed6d1 + sound_call .sub1 stereo_panning FALSE, TRUE note_type 12, 10, 5 octave 3 note A_, 4 note E_, 4 stereo_panning TRUE, TRUE - sound_call Music_PokemonCenter_branch_ed6e4 + sound_call .sub2 note D_, 8 stereo_panning FALSE, TRUE note_type 12, 10, 5 @@ -216,9 +216,9 @@ Music_PokemonCenter_branch_ed674: note F#, 2 note E_, 2 note D_, 8 - sound_loop 0, Music_PokemonCenter_branch_ed674 + sound_loop 0, .mainloop -Music_PokemonCenter_branch_ed6d1: +.sub1: duty_cycle 2 note_type 12, 12, 2 octave 4 @@ -235,7 +235,7 @@ Music_PokemonCenter_branch_ed6d1: note C#, 6 sound_ret -Music_PokemonCenter_branch_ed6e4: +.sub2: note_type 12, 12, 2 octave 4 note C#, 2 @@ -251,7 +251,7 @@ Music_PokemonCenter_branch_ed6e4: Music_PokemonCenter_Ch3: note_type 12, 2, 8 -Music_PokemonCenter_branch_ed6f6: +.mainloop: stereo_panning TRUE, FALSE octave 3 note D_, 1 @@ -264,8 +264,8 @@ Music_PokemonCenter_branch_ed6f6: rest 1 note F#, 1 rest 1 - sound_call Music_PokemonCenter_branch_ed76f - sound_call Music_PokemonCenter_branch_ed778 + sound_call .sub1 + sound_call .sub2 note F#, 1 rest 5 note A_, 1 @@ -286,8 +286,8 @@ Music_PokemonCenter_branch_ed6f6: rest 1 note F#, 1 rest 1 - sound_call Music_PokemonCenter_branch_ed76f - sound_call Music_PokemonCenter_branch_ed778 + sound_call .sub1 + sound_call .sub2 note D_, 1 rest 5 note F#, 1 @@ -299,7 +299,7 @@ Music_PokemonCenter_branch_ed6f6: note G_, 1 rest 1 stereo_panning TRUE, TRUE - sound_call Music_PokemonCenter_branch_ed783 + sound_call .sub3 note G_, 1 rest 5 note B_, 1 @@ -328,7 +328,7 @@ Music_PokemonCenter_branch_ed6f6: rest 1 note A_, 1 rest 1 - sound_call Music_PokemonCenter_branch_ed783 + sound_call .sub3 note G_, 1 rest 5 note B_, 1 @@ -355,9 +355,9 @@ Music_PokemonCenter_branch_ed6f6: rest 1 note E_, 1 rest 1 - sound_loop 0, Music_PokemonCenter_branch_ed6f6 + sound_loop 0, .mainloop -Music_PokemonCenter_branch_ed76f: +.sub1: note E_, 1 rest 5 note A_, 1 @@ -368,7 +368,7 @@ Music_PokemonCenter_branch_ed76f: rest 1 sound_ret -Music_PokemonCenter_branch_ed778: +.sub2: note E_, 1 rest 5 note A_, 1 @@ -381,7 +381,7 @@ Music_PokemonCenter_branch_ed778: rest 1 sound_ret -Music_PokemonCenter_branch_ed783: +.sub3: note F#, 1 rest 5 note A_, 1 @@ -396,10 +396,10 @@ Music_PokemonCenter_Ch4: toggle_noise 3 drum_speed 12 stereo_panning TRUE, TRUE -Music_PokemonCenter_branch_ed792: +.mainloop: drum_note 8, 6 drum_note 8, 4 drum_note 8, 2 drum_note 8, 2 drum_note 8, 2 - sound_loop 0, Music_PokemonCenter_branch_ed792 + sound_loop 0, .mainloop diff --git a/audio/music/pokemonchannel.asm b/audio/music/pokemonchannel.asm index 97947c144..234832341 100644 --- a/audio/music/pokemonchannel.asm +++ b/audio/music/pokemonchannel.asm @@ -204,7 +204,7 @@ Music_PokemonChannel_Ch3: Music_PokemonChannel_Ch4: toggle_noise 3 drum_speed 12 -Music_PokemonChannel_branch_ee54d: +.loop1: drum_note 11, 3 drum_note 11, 1 drum_note 3, 2 @@ -213,7 +213,7 @@ Music_PokemonChannel_branch_ee54d: drum_note 3, 2 drum_note 11, 1 drum_note 3, 1 - sound_loop 2, Music_PokemonChannel_branch_ee54d + sound_loop 2, .loop1 drum_note 9, 2 drum_note 11, 2 drum_note 9, 1 diff --git a/audio/music/pokemonlullaby.asm b/audio/music/pokemonlullaby.asm index 919ddff9a..277a5d6f5 100644 --- a/audio/music/pokemonlullaby.asm +++ b/audio/music/pokemonlullaby.asm @@ -9,7 +9,7 @@ Music_PokemonLullaby_Ch1: volume 7, 7 duty_cycle 3 pitch_offset 1 -Music_PokemonLullaby_branch_f6d8c: +.mainloop: note_type 12, 10, 7 octave 3 note G_, 16 @@ -52,13 +52,13 @@ Music_PokemonLullaby_branch_f6d8c: note C_, 8 octave 3 note B_, 8 - sound_loop 0, Music_PokemonLullaby_branch_f6d8c + sound_loop 0, .mainloop Music_PokemonLullaby_Ch2: vibrato 16, 1, 4 duty_cycle 0 note_type 12, 11, 4 -Music_PokemonLullaby_branch_f6dcc: +.mainloop: rest 16 rest 10 octave 4 @@ -102,11 +102,11 @@ Music_PokemonLullaby_branch_f6dcc: note D#, 2 note E_, 16 rest 14 - sound_loop 0, Music_PokemonLullaby_branch_f6dcc + sound_loop 0, .mainloop Music_PokemonLullaby_Ch3: note_type 12, 1, 1 -Music_PokemonLullaby_branch_f6e06: +.mainloop: stereo_panning TRUE, FALSE octave 4 note C_, 2 @@ -130,4 +130,4 @@ Music_PokemonLullaby_branch_f6e06: octave 4 note B_, 2 note A_, 2 - sound_loop 0, Music_PokemonLullaby_branch_f6e06 + sound_loop 0, .mainloop diff --git a/audio/music/pokemonmarch.asm b/audio/music/pokemonmarch.asm index 41e4d122f..80acde980 100644 --- a/audio/music/pokemonmarch.asm +++ b/audio/music/pokemonmarch.asm @@ -21,53 +21,53 @@ Music_PokemonMarch_Ch1: volume_envelope 10, 2 note D_, 4 note_type 8, 10, 2 -Music_PokemonMarch_branch_f6e4c: - sound_call Music_PokemonMarch_branch_f6eae +.mainloop: + sound_call .sub1 note D#, 2 note C_, 2 note D#, 2 note C_, 2 - sound_call Music_PokemonMarch_branch_f6eae + sound_call .sub1 note D#, 2 note C_, 2 note D#, 2 note G_, 2 - sound_call Music_PokemonMarch_branch_f6eae + sound_call .sub1 note C_, 2 note C_, 2 note D#, 2 note C_, 2 - sound_call Music_PokemonMarch_branch_f6eae + sound_call .sub1 note D#, 2 note C_, 2 note C#, 2 note D#, 2 - sound_call Music_PokemonMarch_branch_f6eb8 + sound_call .sub2 note F_, 2 note D_, 2 note F_, 2 note D_, 2 - sound_call Music_PokemonMarch_branch_f6eb8 + sound_call .sub2 note F_, 2 note D_, 2 note F_, 2 note A_, 2 - sound_call Music_PokemonMarch_branch_f6eb8 + sound_call .sub2 note D_, 2 note D_, 2 note F_, 2 note D_, 2 - sound_call Music_PokemonMarch_branch_f6eb8 + sound_call .sub2 note F_, 2 note D_, 2 note F_, 2 note G_, 2 - sound_call Music_PokemonMarch_branch_f6eb8 + sound_call .sub2 note F_, 2 note D_, 2 note F_, 2 note D_, 2 - sound_call Music_PokemonMarch_branch_f6eae + sound_call .sub1 note D#, 2 note C_, 2 note D#, 2 @@ -96,9 +96,9 @@ Music_PokemonMarch_branch_f6e4c: note F_, 2 note G_, 4 note A#, 2 - sound_loop 0, Music_PokemonMarch_branch_f6e4c + sound_loop 0, .mainloop -Music_PokemonMarch_branch_f6eae: +.sub1: rest 4 octave 3 note D#, 1 @@ -110,7 +110,7 @@ Music_PokemonMarch_branch_f6eae: rest 2 sound_ret -Music_PokemonMarch_branch_f6eb8: +.sub2: rest 4 note F_, 1 note E_, 1 @@ -130,7 +130,7 @@ Music_PokemonMarch_Ch2: note G_, 4 note G_, 4 note G_, 4 -Music_PokemonMarch_branch_f6ece: +.mainloop: note_type 12, 11, 7 octave 3 note G#, 12 @@ -230,23 +230,23 @@ Music_PokemonMarch_branch_f6ece: note F#, 1 note G_, 1 rest 5 - sound_loop 0, Music_PokemonMarch_branch_f6ece + sound_loop 0, .mainloop Music_PokemonMarch_Ch3: stereo_panning FALSE, TRUE note_type 12, 1, 6 rest 16 note_type 8, 1, 6 -Music_PokemonMarch_branch_f6f56: - sound_call Music_PokemonMarch_branch_f6fe8 +.mainloop: + sound_call .sub1 rest 2 octave 4 note D#, 2 - sound_call Music_PokemonMarch_branch_f6fe8 + sound_call .sub1 octave 4 note G#, 2 note D#, 2 - sound_call Music_PokemonMarch_branch_f6fe8 + sound_call .sub1 rest 2 octave 4 note D#, 2 @@ -269,7 +269,7 @@ Music_PokemonMarch_branch_f6f56: note D#, 2 note G_, 2 note G#, 2 -Music_PokemonMarch_branch_f6f7b: +.loop1: octave 3 note A#, 2 rest 2 @@ -291,7 +291,7 @@ Music_PokemonMarch_branch_f6f7b: octave 4 note F_, 2 rest 1 - sound_loop 3, Music_PokemonMarch_branch_f6f7b + sound_loop 3, .loop1 octave 3 note A#, 2 rest 2 @@ -372,9 +372,9 @@ Music_PokemonMarch_branch_f6f7b: note F_, 2 rest 2 note G#, 2 - sound_loop 0, Music_PokemonMarch_branch_f6f56 + sound_loop 0, .mainloop -Music_PokemonMarch_branch_f6fe8: +.sub1: octave 3 note G#, 2 rest 2 @@ -398,9 +398,9 @@ Music_PokemonMarch_Ch4: stereo_panning TRUE, FALSE toggle_noise 5 drum_speed 8 - sound_call Music_PokemonMarch_branch_f704c -Music_PokemonMarch_branch_f7003: - sound_call Music_PokemonMarch_branch_f7042 + sound_call .sub2 +.mainloop: + sound_call .sub1 drum_note 1, 4 drum_note 1, 2 drum_note 1, 4 @@ -413,14 +413,14 @@ Music_PokemonMarch_branch_f7003: drum_note 2, 1 drum_note 2, 1 drum_speed 8 - sound_call Music_PokemonMarch_branch_f7042 - sound_call Music_PokemonMarch_branch_f704c - sound_call Music_PokemonMarch_branch_f7042 - sound_call Music_PokemonMarch_branch_f704c - sound_call Music_PokemonMarch_branch_f7042 - sound_call Music_PokemonMarch_branch_f704c - sound_call Music_PokemonMarch_branch_f7042 - sound_call Music_PokemonMarch_branch_f704c + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 + sound_call .sub2 drum_note 2, 4 drum_note 2, 2 drum_note 2, 4 @@ -433,10 +433,10 @@ Music_PokemonMarch_branch_f7003: drum_note 3, 1 drum_note 3, 1 drum_speed 8 - sound_call Music_PokemonMarch_branch_f704c - sound_loop 0, Music_PokemonMarch_branch_f7003 + sound_call .sub2 + sound_loop 0, .mainloop -Music_PokemonMarch_branch_f7042: +.sub1: drum_note 1, 4 drum_note 1, 2 drum_note 1, 4 @@ -448,7 +448,7 @@ Music_PokemonMarch_branch_f7042: drum_note 2, 2 sound_ret -Music_PokemonMarch_branch_f704c: +.sub2: drum_note 1, 4 drum_note 1, 2 drum_note 1, 4 diff --git a/audio/music/postcredits.asm b/audio/music/postcredits.asm index 9eec07d15..d352a5fca 100644 --- a/audio/music/postcredits.asm +++ b/audio/music/postcredits.asm @@ -3,7 +3,7 @@ Music_PostCredits: channel 1, Music_PostCredits_Ch1 channel 2, Music_PostCredits_Ch2 - db $2 + db $2 ; unused Music_PostCredits_Ch1: tempo 271 @@ -12,7 +12,7 @@ Music_PostCredits_Ch1: duty_cycle 2 note_type 12, 9, 3 rest 8 -Music_PostCredits_branch_cfdb2: +.mainloop: octave 3 note C_, 2 note E_, 2 @@ -129,7 +129,7 @@ Music_PostCredits_branch_cfdb2: note D_, 2 octave 2 note G_, 2 - sound_loop 0, Music_PostCredits_branch_cfdb2 + sound_loop 0, .mainloop Music_PostCredits_Ch2: transpose 0, 3 @@ -143,7 +143,7 @@ Music_PostCredits_Ch2: note F_, 2 volume_envelope 7, 3 note F_, 2 -Music_PostCredits_branch_cfe5a: +.mainloop: volume_envelope 10, 3 note G_, 2 volume_envelope 7, 3 @@ -262,4 +262,4 @@ Music_PostCredits_branch_cfe5a: volume_envelope 10, 3 note E_, 2 note F_, 2 - sound_loop 0, Music_PostCredits_branch_cfe5a + sound_loop 0, .mainloop diff --git a/audio/music/printer.asm b/audio/music/printer.asm index b61451789..18ceb4e0f 100644 --- a/audio/music/printer.asm +++ b/audio/music/printer.asm @@ -34,7 +34,7 @@ Music_Printer_Ch3: rest 1 note F#, 1 rest 1 -Music_Printer_branch_f0823: +.mainloop: note E_, 1 rest 1 note B_, 1 @@ -317,4 +317,4 @@ Music_Printer_branch_f0823: rest 1 note D#, 1 rest 1 - sound_loop 0, Music_Printer_branch_f0823 + sound_loop 0, .mainloop diff --git a/audio/music/profoak.asm b/audio/music/profoak.asm index 20d82d421..d9fdca7a1 100644 --- a/audio/music/profoak.asm +++ b/audio/music/profoak.asm @@ -22,27 +22,27 @@ Music_ProfOak_Ch1: note G#, 8 volume_envelope 9, 7 note G#, 8 -Music_ProfOak_branch_f4e10: +.loop1: volume_envelope 9, 1 - sound_call Music_ProfOak_branch_f4e42 - sound_call Music_ProfOak_branch_f4e42 - sound_call Music_ProfOak_branch_f4e4d - sound_call Music_ProfOak_branch_f4e4d - sound_loop 2, Music_ProfOak_branch_f4e10 -Music_ProfOak_branch_f4e22: - sound_call Music_ProfOak_branch_f4e58 - sound_call Music_ProfOak_branch_f4e58 - sound_call Music_ProfOak_branch_f4e6c - sound_call Music_ProfOak_branch_f4e6c + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 + sound_call .sub2 + sound_loop 2, .loop1 +.mainloop: + sound_call .sub3 + sound_call .sub3 + sound_call .sub4 + sound_call .sub4 transpose 0, 2 - sound_call Music_ProfOak_branch_f4e58 - sound_call Music_ProfOak_branch_f4e58 + sound_call .sub3 + sound_call .sub3 transpose 0, 0 - sound_call Music_ProfOak_branch_f4e6c - sound_call Music_ProfOak_branch_f4e6c - sound_loop 0, Music_ProfOak_branch_f4e22 + sound_call .sub4 + sound_call .sub4 + sound_loop 0, .mainloop -Music_ProfOak_branch_f4e42: +.sub1: octave 2 note B_, 2 octave 3 @@ -55,7 +55,7 @@ Music_ProfOak_branch_f4e42: note E_, 2 sound_ret -Music_ProfOak_branch_f4e4d: +.sub2: octave 2 note B_, 2 octave 3 @@ -68,7 +68,7 @@ Music_ProfOak_branch_f4e4d: note D#, 2 sound_ret -Music_ProfOak_branch_f4e58: +.sub3: octave 2 note A_, 2 octave 3 @@ -86,7 +86,7 @@ Music_ProfOak_branch_f4e58: volume_envelope 9, 1 sound_ret -Music_ProfOak_branch_f4e6c: +.sub4: octave 2 note B_, 1 octave 3 @@ -116,7 +116,7 @@ Music_ProfOak_Ch2: volume_envelope 10, 7 note B_, 10 duty_cycle 2 -Music_ProfOak_branch_f4e92: +.loop1: volume_envelope 11, 2 octave 3 note B_, 2 @@ -151,10 +151,10 @@ Music_ProfOak_branch_f4e92: note A_, 4 note B_, 2 note B_, 4 - sound_loop 2, Music_ProfOak_branch_f4e92 + sound_loop 2, .loop1 rest 6 volume_envelope 11, 4 -Music_ProfOak_branch_f4ebf: +.mainloop: note C#, 6 octave 3 note A_, 1 @@ -202,7 +202,7 @@ Music_ProfOak_branch_f4ebf: octave 4 note E_, 1 note G#, 16 - sound_loop 0, Music_ProfOak_branch_f4ebf + sound_loop 0, .mainloop Music_ProfOak_Ch3: stereo_panning FALSE, TRUE @@ -223,27 +223,27 @@ Music_ProfOak_Ch3: note B_, 1 rest 1 note E_, 2 - sound_call Music_ProfOak_branch_f4f3d -Music_ProfOak_branch_f4f0d: - sound_call Music_ProfOak_branch_f4f3d - sound_call Music_ProfOak_branch_f4f3d - sound_call Music_ProfOak_branch_f4f4c - sound_call Music_ProfOak_branch_f4f4c - sound_loop 2, Music_ProfOak_branch_f4f0d -Music_ProfOak_branch_f4f1d: - sound_call Music_ProfOak_branch_f4f5a - sound_call Music_ProfOak_branch_f4f5a - sound_call Music_ProfOak_branch_f4f69 - sound_call Music_ProfOak_branch_f4f69 + sound_call .sub1 +.loop1: + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 + sound_call .sub2 + sound_loop 2, .loop1 +.mainloop: + sound_call .sub3 + sound_call .sub3 + sound_call .sub4 + sound_call .sub4 transpose 0, 2 - sound_call Music_ProfOak_branch_f4f5a - sound_call Music_ProfOak_branch_f4f5a + sound_call .sub3 + sound_call .sub3 transpose 0, 0 - sound_call Music_ProfOak_branch_f4f69 - sound_call Music_ProfOak_branch_f4f69 - sound_loop 0, Music_ProfOak_branch_f4f1d + sound_call .sub4 + sound_call .sub4 + sound_loop 0, .mainloop -Music_ProfOak_branch_f4f3d: +.sub1: note E_, 2 rest 2 octave 4 @@ -260,7 +260,7 @@ Music_ProfOak_branch_f4f3d: note E_, 2 sound_ret -Music_ProfOak_branch_f4f4c: +.sub2: octave 2 note B_, 2 rest 2 @@ -276,7 +276,7 @@ Music_ProfOak_branch_f4f4c: note D#, 2 sound_ret -Music_ProfOak_branch_f4f5a: +.sub3: octave 2 note A_, 2 rest 2 @@ -293,7 +293,7 @@ Music_ProfOak_branch_f4f5a: note C#, 2 sound_ret -Music_ProfOak_branch_f4f69: +.sub4: octave 2 note G#, 2 rest 2 diff --git a/audio/music/profoakspokemontalk.asm b/audio/music/profoakspokemontalk.asm index 938579a96..7ee5f3796 100644 --- a/audio/music/profoakspokemontalk.asm +++ b/audio/music/profoakspokemontalk.asm @@ -4,7 +4,7 @@ Music_ProfOaksPokemonTalk: channel 2, Music_ProfOaksPokemonTalk_Ch2 channel 3, Music_ProfOaksPokemonTalk_Ch3 - db $3 + db $3 ; unused Music_ProfOaksPokemonTalk_Ch1: tempo 164 @@ -24,7 +24,7 @@ Music_ProfOaksPokemonTalk_Ch1: note D#, 1 note E_, 1 note F#, 1 -Music_ProfOaksPokemonTalk_branch_f4cc3: +.mainloop: note D#, 6 note C#, 1 octave 3 @@ -131,7 +131,7 @@ Music_ProfOaksPokemonTalk_branch_f4cc3: rest 1 note F#, 1 rest 1 - sound_loop 0, Music_ProfOaksPokemonTalk_branch_f4cc3 + sound_loop 0, .mainloop Music_ProfOaksPokemonTalk_Ch2: vibrato 8, 2, 4 @@ -156,7 +156,7 @@ Music_ProfOaksPokemonTalk_Ch2: note F#, 1 note G#, 1 note A#, 1 -Music_ProfOaksPokemonTalk_branch_f4d4d: +.mainloop: note B_, 6 note A#, 1 note G#, 1 @@ -206,7 +206,7 @@ Music_ProfOaksPokemonTalk_branch_f4d4d: rest 1 note A#, 1 rest 1 - sound_loop 0, Music_ProfOaksPokemonTalk_branch_f4d4d + sound_loop 0, .mainloop Music_ProfOaksPokemonTalk_Ch3: vibrato 6, 3, 8 @@ -223,7 +223,7 @@ Music_ProfOaksPokemonTalk_Ch3: note C#, 1 octave 2 note A#, 1 -Music_ProfOaksPokemonTalk_branch_f4d95: +.mainloop: note B_, 6 octave 3 note D#, 1 @@ -305,4 +305,4 @@ Music_ProfOaksPokemonTalk_branch_f4d95: octave 2 note A#, 1 rest 1 - sound_loop 0, Music_ProfOaksPokemonTalk_branch_f4d95 + sound_loop 0, .mainloop diff --git a/audio/music/rivalbattle.asm b/audio/music/rivalbattle.asm index 525d138af..655164c42 100644 --- a/audio/music/rivalbattle.asm +++ b/audio/music/rivalbattle.asm @@ -23,7 +23,7 @@ Music_RivalBattle_Ch1: volume_envelope 11, 7 note C#, 6 note E_, 4 -Music_RivalBattle_branch_e9777: +.loop1: volume_envelope 11, 2 octave 2 note A#, 6 @@ -32,7 +32,7 @@ Music_RivalBattle_branch_e9777: note C#, 6 volume_envelope 11, 2 note D#, 4 - sound_loop 3, Music_RivalBattle_branch_e9777 + sound_loop 3, .loop1 volume_envelope 11, 2 octave 2 note A#, 2 @@ -40,7 +40,7 @@ Music_RivalBattle_branch_e9777: note C#, 4 volume_envelope 11, 7 note C#, 10 -Music_RivalBattle_branch_e978f: +.loop2: volume_envelope 11, 2 octave 3 note G#, 6 @@ -49,14 +49,14 @@ Music_RivalBattle_branch_e978f: volume_envelope 11, 2 octave 4 note C#, 4 - sound_loop 3, Music_RivalBattle_branch_e978f + sound_loop 3, .loop2 volume_envelope 11, 2 octave 3 note G#, 2 note B_, 4 volume_envelope 4, -5 note B_, 10 -Music_RivalBattle_branch_e97a6: +.mainloop: volume_envelope 11, 7 note A#, 6 note F#, 6 @@ -179,7 +179,7 @@ Music_RivalBattle_branch_e97a6: note E_, 2 note D#, 2 note C#, 2 -Music_RivalBattle_branch_e9837: +.loop3: octave 3 note A#, 2 note E_, 2 @@ -204,7 +204,7 @@ Music_RivalBattle_branch_e9837: note A#, 2 octave 4 note D#, 2 - sound_loop 2, Music_RivalBattle_branch_e9837 + sound_loop 2, .loop3 volume_envelope 9, 4 octave 3 note D#, 8 @@ -284,7 +284,7 @@ Music_RivalBattle_branch_e9837: note B_, 6 octave 3 note C#, 10 - sound_loop 0, Music_RivalBattle_branch_e97a6 + sound_loop 0, .mainloop Music_RivalBattle_Ch2: duty_cycle 3 @@ -336,14 +336,14 @@ Music_RivalBattle_Ch2: note F#, 6 volume_envelope 12, 2 note G#, 4 -Music_RivalBattle_branch_e98ea: +.loop1: volume_envelope 12, 2 note D#, 6 volume_envelope 12, 7 note F#, 6 volume_envelope 12, 2 note G#, 4 - sound_loop 2, Music_RivalBattle_branch_e98ea + sound_loop 2, .loop1 volume_envelope 12, 2 note D#, 2 note F#, 4 @@ -353,14 +353,14 @@ Music_RivalBattle_branch_e98ea: note B_, 1 octave 4 note C_, 1 -Music_RivalBattle_branch_e9903: +.loop2: volume_envelope 12, 2 note C#, 6 volume_envelope 12, 7 note E_, 6 volume_envelope 12, 2 note F#, 4 - sound_loop 3, Music_RivalBattle_branch_e9903 + sound_loop 3, .loop2 volume_envelope 12, 2 note C#, 2 note E_, 4 @@ -368,13 +368,13 @@ Music_RivalBattle_branch_e9903: note E_, 4 volume_envelope 11, 7 note E_, 6 -Music_RivalBattle_branch_e991a: - sound_call Music_RivalBattle_branch_e99e0 +.mainloop: + sound_call .sub1 volume_envelope 11, 0 note G#, 8 volume_envelope 11, 7 note G#, 8 - sound_call Music_RivalBattle_branch_e99e0 + sound_call .sub1 volume_envelope 4, -6 note G#, 8 volume_envelope 11, 7 @@ -473,7 +473,7 @@ Music_RivalBattle_branch_e991a: note G#, 8 volume_envelope 12, 7 note F_, 8 -Music_RivalBattle_branch_e99a6: +.loop3: volume_envelope 12, 2 octave 3 note A#, 6 @@ -482,7 +482,7 @@ Music_RivalBattle_branch_e99a6: note C#, 6 volume_envelope 12, 2 note D#, 4 - sound_loop 3, Music_RivalBattle_branch_e99a6 + sound_loop 3, .loop3 volume_envelope 12, 2 octave 3 note A#, 2 @@ -492,7 +492,7 @@ Music_RivalBattle_branch_e99a6: note C#, 6 volume_envelope 9, -2 note C#, 4 -Music_RivalBattle_branch_e99c1: +.loop4: volume_envelope 12, 2 octave 3 note G#, 6 @@ -501,7 +501,7 @@ Music_RivalBattle_branch_e99c1: volume_envelope 12, 2 octave 4 note C#, 4 - sound_loop 3, Music_RivalBattle_branch_e99c1 + sound_loop 3, .loop4 volume_envelope 12, 2 octave 3 note G#, 2 @@ -511,9 +511,9 @@ Music_RivalBattle_branch_e99c1: volume_envelope 6, -2 octave 4 note D_, 4 - sound_loop 0, Music_RivalBattle_branch_e991a + sound_loop 0, .mainloop -Music_RivalBattle_branch_e99e0: +.sub1: volume_envelope 12, 7 note D#, 10 volume_envelope 12, 4 @@ -551,7 +551,7 @@ Music_RivalBattle_Ch3: octave 3 note C#, 2 note D_, 2 -Music_RivalBattle_branch_e9a0c: +.loop1: note D#, 2 note C#, 2 note D#, 2 @@ -559,8 +559,8 @@ Music_RivalBattle_branch_e9a0c: note E_, 2 note D#, 2 note C#, 2 - sound_loop 4, Music_RivalBattle_branch_e9a0c -Music_RivalBattle_branch_e9a17: + sound_loop 4, .loop1 +.loop2: octave 3 note C#, 2 octave 2 @@ -572,7 +572,7 @@ Music_RivalBattle_branch_e9a17: note C#, 2 octave 2 note B_, 2 - sound_loop 3, Music_RivalBattle_branch_e9a17 + sound_loop 3, .loop2 octave 3 note C#, 2 note E_, 2 @@ -583,8 +583,8 @@ Music_RivalBattle_branch_e9a17: note C_, 2 note C#, 2 note D_, 2 -Music_RivalBattle_branch_e9a30: - sound_call Music_RivalBattle_branch_e9b47 +.mainloop: + sound_call .sub1 octave 2 note A#, 2 octave 4 @@ -601,7 +601,7 @@ Music_RivalBattle_branch_e9a30: note A#, 2 octave 3 note G#, 2 - sound_call Music_RivalBattle_branch_e9b50 + sound_call .sub2 note C#, 2 note G#, 2 octave 4 @@ -612,7 +612,7 @@ Music_RivalBattle_branch_e9a30: note C_, 2 octave 2 note B_, 2 - sound_call Music_RivalBattle_branch_e9b47 + sound_call .sub1 octave 2 note A#, 2 octave 3 @@ -629,20 +629,20 @@ Music_RivalBattle_branch_e9a30: note A#, 2 octave 3 note F_, 2 - sound_call Music_RivalBattle_branch_e9b50 -Music_RivalBattle_branch_e9a66: + sound_call .sub2 +.loop3: note C#, 2 note G#, 2 - sound_loop 4, Music_RivalBattle_branch_e9a66 - sound_call Music_RivalBattle_branch_e9b5c + sound_loop 4, .loop3 + sound_call .sub3 note G#, 2 note F#, 2 -Music_RivalBattle_branch_e9a71: +.loop4: octave 2 note A#, 2 octave 3 note F_, 2 - sound_loop 4, Music_RivalBattle_branch_e9a71 + sound_loop 4, .loop4 octave 2 note A#, 2 octave 3 @@ -657,17 +657,17 @@ Music_RivalBattle_branch_e9a71: note F#, 2 note F_, 2 note D#, 2 - sound_call Music_RivalBattle_branch_e9b5c + sound_call .sub3 octave 2 note B_, 2 octave 3 note D_, 2 - sound_call Music_RivalBattle_branch_e9b65 + sound_call .sub4 octave 3 note D#, 2 octave 4 note D#, 2 - sound_call Music_RivalBattle_branch_e9b65 + sound_call .sub4 octave 3 note D#, 2 note A#, 2 @@ -695,34 +695,34 @@ Music_RivalBattle_branch_e9a71: note F#, 2 note G_, 2 note G#, 2 -Music_RivalBattle_branch_e9ab3: +.loop5: note D#, 2 note A#, 2 - sound_loop 4, Music_RivalBattle_branch_e9ab3 -Music_RivalBattle_branch_e9ab9: + sound_loop 4, .loop5 +.loop6: note D#, 2 note A_, 2 - sound_loop 4, Music_RivalBattle_branch_e9ab9 -Music_RivalBattle_branch_e9abf: + sound_loop 4, .loop6 +.loop7: note D#, 2 note G#, 2 - sound_loop 4, Music_RivalBattle_branch_e9abf -Music_RivalBattle_branch_e9ac5: + sound_loop 4, .loop7 +.loop8: note D#, 2 note G_, 2 - sound_loop 12, Music_RivalBattle_branch_e9ac5 -Music_RivalBattle_branch_e9acb: + sound_loop 12, .loop8 +.loop9: octave 2 note B_, 2 octave 3 note D#, 2 - sound_loop 4, Music_RivalBattle_branch_e9acb -Music_RivalBattle_branch_e9ad3: + sound_loop 4, .loop9 +.loop10: octave 2 note B_, 2 octave 3 note F#, 2 - sound_loop 4, Music_RivalBattle_branch_e9ad3 + sound_loop 4, .loop10 note D#, 2 note G_, 2 note A#, 2 @@ -776,40 +776,40 @@ Music_RivalBattle_branch_e9ad3: note C#, 8 note D#, 8 note F_, 8 -Music_RivalBattle_branch_e9b10: +.loop11: octave 2 note A#, 2 octave 3 note D#, 2 - sound_loop 7, Music_RivalBattle_branch_e9b10 + sound_loop 7, .loop11 note E_, 2 note D#, 2 -Music_RivalBattle_branch_e9b1a: +.loop12: octave 2 note A#, 2 octave 3 note D#, 2 - sound_loop 6, Music_RivalBattle_branch_e9b1a + sound_loop 6, .loop12 octave 2 note A#, 2 octave 3 note F#, 2 note F_, 2 note E_, 2 -Music_RivalBattle_branch_e9b28: +.loop13: octave 2 note G#, 2 octave 3 note C#, 2 - sound_loop 7, Music_RivalBattle_branch_e9b28 + sound_loop 7, .loop13 note D_, 2 note C#, 2 -Music_RivalBattle_branch_e9b32: +.loop14: octave 2 note G#, 2 octave 3 note C#, 2 - sound_loop 4, Music_RivalBattle_branch_e9b32 + sound_loop 4, .loop14 octave 2 note B_, 2 note G#, 2 @@ -819,17 +819,18 @@ Music_RivalBattle_branch_e9b32: note E_, 2 note D#, 2 note D_, 2 - sound_loop 0, Music_RivalBattle_branch_e9a30 + sound_loop 0, .mainloop -Music_RivalBattle_branch_e9b47: +.sub1: +.sub1loop1: octave 2 note A#, 2 octave 3 note D#, 2 - sound_loop 4, Music_RivalBattle_branch_e9b47 + sound_loop 4, .sub1loop1 sound_ret -Music_RivalBattle_branch_e9b50: +.sub2: note C#, 2 note G#, 2 octave 4 @@ -843,19 +844,21 @@ Music_RivalBattle_branch_e9b50: note G#, 2 sound_ret -Music_RivalBattle_branch_e9b5c: +.sub3: +.sub3loop1: octave 2 note B_, 2 octave 3 note F#, 2 - sound_loop 7, Music_RivalBattle_branch_e9b5c + sound_loop 7, .sub3loop1 sound_ret -Music_RivalBattle_branch_e9b65: +.sub4: +.sub4loop1: octave 3 note D#, 2 note A#, 2 octave 4 note D#, 2 - sound_loop 2, Music_RivalBattle_branch_e9b65 + sound_loop 2, .sub4loop1 sound_ret diff --git a/audio/music/rocketbattle.asm b/audio/music/rocketbattle.asm index a1d7fe636..b95f2a89d 100644 --- a/audio/music/rocketbattle.asm +++ b/audio/music/rocketbattle.asm @@ -48,7 +48,7 @@ Music_RocketBattle_Ch1: note C_, 1 octave 2 note B_, 1 -Music_RocketBattle_branch_e9bad: +.loop1: volume_envelope 11, 2 octave 3 note C_, 6 @@ -56,13 +56,13 @@ Music_RocketBattle_branch_e9bad: note E_, 2 volume_envelope 11, 7 note D_, 4 - sound_loop 3, Music_RocketBattle_branch_e9bad + sound_loop 3, .loop1 volume_envelope 11, 2 note C_, 6 note C_, 6 volume_envelope 11, 7 note D_, 4 -Music_RocketBattle_branch_e9bc1: +.loop2: volume_envelope 11, 2 octave 4 note E_, 6 @@ -70,7 +70,7 @@ Music_RocketBattle_branch_e9bc1: note G_, 2 volume_envelope 11, 7 note F_, 4 - sound_loop 3, Music_RocketBattle_branch_e9bc1 + sound_loop 3, .loop2 volume_envelope 11, 2 note E_, 6 note E_, 4 @@ -116,7 +116,7 @@ Music_RocketBattle_branch_e9bc1: note D#, 2 note D_, 2 note F_, 2 -Music_RocketBattle_branch_e9c02: +.mainloop: octave 4 note E_, 2 octave 3 @@ -291,14 +291,14 @@ Music_RocketBattle_branch_e9c02: volume_envelope 11, 7 note A#, 2 note G_, 4 -Music_RocketBattle_branch_e9cc5: +.loop3: volume_envelope 11, 2 note F_, 6 note F_, 4 volume_envelope 11, 7 note A_, 2 note G_, 4 - sound_loop 2, Music_RocketBattle_branch_e9cc5 + sound_loop 2, .loop3 volume_envelope 11, 2 note F_, 6 octave 4 @@ -388,7 +388,7 @@ Music_RocketBattle_branch_e9cc5: note D#, 2 note D_, 2 note F_, 2 - sound_loop 0, Music_RocketBattle_branch_e9c02 + sound_loop 0, .mainloop Music_RocketBattle_Ch2: duty_cycle 3 @@ -437,7 +437,7 @@ Music_RocketBattle_Ch2: note G#, 1 note A_, 1 note G#, 1 -Music_RocketBattle_branch_e9d7b: +.loop1: volume_envelope 12, 2 octave 3 note A_, 6 @@ -447,13 +447,13 @@ Music_RocketBattle_branch_e9d7b: volume_envelope 12, 7 octave 3 note A#, 4 - sound_loop 3, Music_RocketBattle_branch_e9d7b + sound_loop 3, .loop1 volume_envelope 12, 2 note A_, 6 note A_, 6 volume_envelope 4, -2 note G#, 4 -Music_RocketBattle_branch_e9d91: +.loop2: volume_envelope 12, 2 octave 4 note A_, 6 @@ -463,20 +463,20 @@ Music_RocketBattle_branch_e9d91: volume_envelope 12, 7 octave 4 note A#, 4 - sound_loop 3, Music_RocketBattle_branch_e9d91 + sound_loop 3, .loop2 volume_envelope 12, 2 note A_, 6 note A_, 4 volume_envelope 12, 7 note G_, 2 note G#, 4 - sound_call Music_RocketBattle_branch_e9ea0 + sound_call .sub1 volume_envelope 11, 0 note F_, 16 volume_envelope 11, 7 note F_, 16 -Music_RocketBattle_branch_e9db1: - sound_call Music_RocketBattle_branch_e9ea0 +.mainloop: + sound_call .sub1 volume_envelope 11, 0 note F_, 8 volume_envelope 11, 7 @@ -604,7 +604,7 @@ Music_RocketBattle_branch_e9db1: note G_, 1 note G#, 1 note A_, 8 -Music_RocketBattle_branch_e9e5a: +.loop3: volume_envelope 12, 2 octave 3 note A#, 6 @@ -613,7 +613,7 @@ Music_RocketBattle_branch_e9e5a: octave 4 note D_, 2 note C_, 4 - sound_loop 3, Music_RocketBattle_branch_e9e5a + sound_loop 3, .loop3 volume_envelope 12, 2 octave 3 note A#, 6 @@ -655,9 +655,9 @@ Music_RocketBattle_branch_e9e5a: note A#, 8 volume_envelope 12, 7 note A#, 8 - sound_loop 0, Music_RocketBattle_branch_e9db1 + sound_loop 0, .mainloop -Music_RocketBattle_branch_e9ea0: +.sub1: volume_envelope 12, 6 octave 4 note A_, 6 @@ -701,9 +701,9 @@ Music_RocketBattle_Ch3: octave 2 note B_, 2 note A#, 2 -Music_RocketBattle_branch_e9ecc: - sound_call Music_RocketBattle_branch_e9fe6 - sound_loop 3, Music_RocketBattle_branch_e9ecc +.loop1: + sound_call .sub1 + sound_loop 3, .loop1 octave 2 note A_, 2 octave 3 @@ -716,9 +716,9 @@ Music_RocketBattle_branch_e9ecc: note F_, 2 note E_, 2 note D_, 2 -Music_RocketBattle_branch_e9edf: - sound_call Music_RocketBattle_branch_e9fe6 - sound_loop 3, Music_RocketBattle_branch_e9edf +.loop2: + sound_call .sub1 + sound_loop 3, .loop2 octave 2 note A_, 2 octave 3 @@ -732,14 +732,14 @@ Music_RocketBattle_branch_e9edf: note G_, 2 note A_, 2 note A#, 2 - sound_call Music_RocketBattle_branch_e9ff3 - sound_call Music_RocketBattle_branch_ea010 + sound_call .sub2 + sound_call .sub3 octave 3 note F_, 2 - sound_call Music_RocketBattle_branch_ea01d -Music_RocketBattle_branch_e9efe: - sound_call Music_RocketBattle_branch_e9ff3 - sound_call Music_RocketBattle_branch_ea010 + sound_call .sub4 +.mainloop: + sound_call .sub2 + sound_call .sub3 octave 3 note A#, 2 octave 2 @@ -756,7 +756,7 @@ Music_RocketBattle_branch_e9efe: note F_, 2 note E_, 2 note D_, 2 - sound_call Music_RocketBattle_branch_ea02a + sound_call .sub5 octave 2 note A_, 2 octave 3 @@ -771,12 +771,12 @@ Music_RocketBattle_branch_e9efe: note A_, 2 octave 3 note E_, 2 -Music_RocketBattle_branch_e9f25: +.loop3: octave 2 note A#, 2 octave 3 note F_, 2 - sound_loop 5, Music_RocketBattle_branch_e9f25 + sound_loop 5, .loop3 note A#, 2 octave 2 note A#, 2 @@ -787,7 +787,7 @@ Music_RocketBattle_branch_e9f25: note A#, 2 octave 3 note A#, 2 - sound_call Music_RocketBattle_branch_ea02a + sound_call .sub5 octave 2 note A_, 2 octave 3 @@ -802,9 +802,9 @@ Music_RocketBattle_branch_e9f25: note F_, 2 note E_, 2 note D_, 2 - sound_call Music_RocketBattle_branch_ea02a - sound_call Music_RocketBattle_branch_ea02a -Music_RocketBattle_branch_e9f4e: + sound_call .sub5 + sound_call .sub5 +.loop4: octave 2 note A_, 2 octave 3 @@ -817,7 +817,7 @@ Music_RocketBattle_branch_e9f4e: note D_, 2 note G_, 2 note F_, 2 - sound_loop 7, Music_RocketBattle_branch_e9f4e + sound_loop 7, .loop4 octave 2 note A_, 2 octave 3 @@ -830,12 +830,12 @@ Music_RocketBattle_branch_e9f4e: note A_, 2 note G_, 2 note F_, 2 -Music_RocketBattle_branch_e9f6a: +.loop5: octave 2 note A#, 2 octave 3 note F_, 2 - sound_loop 4, Music_RocketBattle_branch_e9f6a + sound_loop 4, .loop5 octave 2 note A#, 2 octave 3 @@ -846,12 +846,12 @@ Music_RocketBattle_branch_e9f6a: note D_, 2 note C#, 2 note D_, 2 -Music_RocketBattle_branch_e9f7c: +.loop6: octave 2 note A_, 2 octave 3 note E_, 2 - sound_loop 13, Music_RocketBattle_branch_e9f7c + sound_loop 13, .loop6 octave 2 note A_, 2 octave 3 @@ -860,12 +860,12 @@ Music_RocketBattle_branch_e9f7c: note C_, 2 octave 2 note A#, 2 -Music_RocketBattle_branch_e9f8c: +.loop7: octave 2 note A_, 2 octave 3 note E_, 2 - sound_loop 4, Music_RocketBattle_branch_e9f8c + sound_loop 4, .loop7 octave 2 note A_, 2 octave 4 @@ -876,20 +876,20 @@ Music_RocketBattle_branch_e9f8c: note A_, 2 note G_, 2 note A#, 2 -Music_RocketBattle_branch_e9f9e: +.loop8: octave 2 note A#, 2 octave 3 note F_, 2 - sound_loop 7, Music_RocketBattle_branch_e9f9e + sound_loop 7, .loop8 note E_, 2 note F_, 2 -Music_RocketBattle_branch_e9fa8: +.loop9: octave 2 note A#, 2 octave 3 note F_, 2 - sound_loop 5, Music_RocketBattle_branch_e9fa8 + sound_loop 5, .loop9 octave 3 note A#, 2 octave 4 @@ -898,13 +898,13 @@ Music_RocketBattle_branch_e9fa8: octave 3 note A#, 2 note G_, 2 - sound_call Music_RocketBattle_branch_ea033 + sound_call .sub6 octave 3 note E_, 2 - sound_call Music_RocketBattle_branch_ea010 + sound_call .sub3 octave 3 note F_, 2 - sound_call Music_RocketBattle_branch_ea033 + sound_call .sub6 octave 3 note A_, 2 octave 2 @@ -923,14 +923,14 @@ Music_RocketBattle_branch_e9fa8: note A_, 2 octave 3 note E_, 2 - sound_call Music_RocketBattle_branch_e9ff3 - sound_call Music_RocketBattle_branch_ea010 + sound_call .sub2 + sound_call .sub3 octave 3 note F_, 2 - sound_call Music_RocketBattle_branch_ea01d - sound_loop 0, Music_RocketBattle_branch_e9efe + sound_call .sub4 + sound_loop 0, .mainloop -Music_RocketBattle_branch_e9fe6: +.sub1: octave 2 note A_, 2 octave 3 @@ -945,7 +945,7 @@ Music_RocketBattle_branch_e9fe6: note F_, 2 sound_ret -Music_RocketBattle_branch_e9ff3: +.sub2: octave 2 note A_, 2 octave 3 @@ -976,7 +976,7 @@ Music_RocketBattle_branch_e9ff3: note D_, 2 sound_ret -Music_RocketBattle_branch_ea010: +.sub3: octave 2 note A#, 2 octave 3 @@ -991,7 +991,7 @@ Music_RocketBattle_branch_ea010: note A#, 2 sound_ret -Music_RocketBattle_branch_ea01d: +.sub4: octave 2 note A#, 2 octave 3 @@ -1006,15 +1006,16 @@ Music_RocketBattle_branch_ea01d: note F_, 2 sound_ret -Music_RocketBattle_branch_ea02a: +.sub5: +.sub5loop1: octave 2 note A_, 2 octave 3 note E_, 2 - sound_loop 4, Music_RocketBattle_branch_ea02a + sound_loop 4, .sub5loop1 sound_ret -Music_RocketBattle_branch_ea033: +.sub6: octave 2 note A_, 2 octave 3 diff --git a/audio/music/rockethideout.asm b/audio/music/rockethideout.asm index f01bbd224..850eb29d8 100644 --- a/audio/music/rockethideout.asm +++ b/audio/music/rockethideout.asm @@ -13,10 +13,11 @@ Music_RocketHideout_Ch1: vibrato 16, 4, 4 note_type 12, 11, 3 stereo_panning TRUE, FALSE -Music_RocketHideout_branch_eeb93: +.mainloop: +.loop1 rest 16 - sound_loop 4, Music_RocketHideout_branch_eeb93 -Music_RocketHideout_branch_eeb98: + sound_loop 4, .loop1 +.loop2: octave 2 note D#, 2 rest 2 @@ -27,7 +28,7 @@ Music_RocketHideout_branch_eeb98: note A#, 4 note A_, 2 rest 8 - sound_loop 2, Music_RocketHideout_branch_eeb98 + sound_loop 2, .loop2 octave 3 note A#, 2 note A_, 2 @@ -114,10 +115,10 @@ Music_RocketHideout_branch_eeb98: rest 16 note A_, 16 volume_envelope 11, 3 -Music_RocketHideout_branch_eebfe: +.loop3: rest 16 - sound_loop 4, Music_RocketHideout_branch_eebfe - sound_loop 0, Music_RocketHideout_branch_eeb93 + sound_loop 4, .loop3 + sound_loop 0, .mainloop Music_RocketHideout_Ch2: duty_cycle 3 @@ -125,7 +126,7 @@ Music_RocketHideout_Ch2: vibrato 0, 15, 0 note_type 12, 12, 4 stereo_panning FALSE, TRUE -Music_RocketHideout_branch_eec14: +.mainloop: octave 2 note D#, 2 rest 2 @@ -219,11 +220,12 @@ Music_RocketHideout_branch_eec14: note G#, 4 note G_, 2 rest 8 - sound_loop 0, Music_RocketHideout_branch_eec14 + sound_loop 0, .mainloop Music_RocketHideout_Ch3: note_type 12, 1, -1 -Music_RocketHideout_branch_eec7c: +.mainloop: +.loop1: octave 2 note D#, 2 rest 2 @@ -234,8 +236,8 @@ Music_RocketHideout_branch_eec7c: note A#, 4 note A_, 2 rest 8 - sound_loop 6, Music_RocketHideout_branch_eec7c -Music_RocketHideout_branch_eec8a: + sound_loop 6, .loop1 +.loop2: note F_, 2 rest 2 octave 3 @@ -249,8 +251,8 @@ Music_RocketHideout_branch_eec8a: octave 2 note B_, 2 rest 8 - sound_loop 2, Music_RocketHideout_branch_eec8a -Music_RocketHideout_branch_eec9b: + sound_loop 2, .loop2 +.loop3: note C#, 2 rest 2 note G#, 4 @@ -258,8 +260,8 @@ Music_RocketHideout_branch_eec9b: rest 6 octave 3 note C#, 16 - sound_loop 2, Music_RocketHideout_branch_eec9b -Music_RocketHideout_branch_eeca6: + sound_loop 2, .loop3 +.loop4: octave 2 note C#, 2 rest 2 @@ -270,8 +272,8 @@ Music_RocketHideout_branch_eeca6: note G#, 4 note G_, 2 rest 8 - sound_loop 2, Music_RocketHideout_branch_eeca6 - sound_loop 0, Music_RocketHideout_branch_eec7c + sound_loop 2, .loop4 + sound_loop 0, .mainloop Music_RocketHideout_Ch4: toggle_noise 0 @@ -283,19 +285,19 @@ Music_RocketHideout_Ch4: drum_note 3, 1 drum_note 4, 1 drum_note 4, 1 - sound_call Music_RocketHideout_branch_eecdb -Music_RocketHideout_branch_eecc7: - sound_call Music_RocketHideout_branch_eecdb + sound_call .sub1 +.mainloop: + sound_call .sub1 drum_note 5, 4 - sound_call Music_RocketHideout_branch_eecdb + sound_call .sub1 drum_note 6, 4 - sound_call Music_RocketHideout_branch_eecdb + sound_call .sub1 drum_note 11, 4 - sound_call Music_RocketHideout_branch_eecdb + sound_call .sub1 drum_note 7, 4 - sound_loop 0, Music_RocketHideout_branch_eecc7 + sound_loop 0, .mainloop -Music_RocketHideout_branch_eecdb: +.sub1: stereo_panning TRUE, FALSE drum_note 4, 1 drum_note 4, 1 diff --git a/audio/music/rockettheme.asm b/audio/music/rockettheme.asm index 6dd3dabff..6b37371c4 100644 --- a/audio/music/rockettheme.asm +++ b/audio/music/rockettheme.asm @@ -15,28 +15,28 @@ Music_RocketTheme_Ch1: octave 4 note C_, 1 note D_, 1 -Music_RocketTheme_branch_f768b: +.mainloop: duty_cycle 3 note_type 12, 10, 8 - sound_call Music_RocketTheme_branch_f74e6 + sound_call Music_LookRocket_Ch1.sub1 duty_cycle 1 volume_envelope 10, 8 - sound_call Music_RocketTheme_branch_f74f7 - sound_call Music_RocketTheme_branch_f758a + sound_call Music_LookRocket_Ch1.sub2 + sound_call Music_LookRocket_Ch2.sub5 octave 4 note F#, 1 rest 1 volume_envelope 5, 3 - sound_call Music_RocketTheme_branch_f750c + sound_call Music_LookRocket_Ch1.sub3 volume_envelope 12, 3 - sound_call Music_RocketTheme_branch_f750c + sound_call Music_LookRocket_Ch1.sub3 volume_envelope 14, 3 - sound_call Music_RocketTheme_branch_f750c + sound_call Music_LookRocket_Ch1.sub3 rest 16 duty_cycle 0 note_type 6, 11, 3 vibrato 6, 6, 4 - sound_call Music_RocketTheme_branch_f7727 + sound_call .sub1 octave 4 note F_, 1 note F#, 3 @@ -61,7 +61,7 @@ Music_RocketTheme_branch_f768b: rest 4 note D#, 2 note F#, 2 - sound_call Music_RocketTheme_branch_f7727 + sound_call .sub1 octave 3 note F#, 1 note G_, 3 @@ -87,13 +87,13 @@ Music_RocketTheme_branch_f768b: note E_, 2 note D#, 2 note D_, 2 -Music_RocketTheme_branch_f76ef: +.loop1: rest 4 note F_, 2 rest 14 note F#, 2 rest 10 - sound_loop 3, Music_RocketTheme_branch_f76ef + sound_loop 3, .loop1 rest 4 note F_, 2 rest 14 @@ -103,33 +103,33 @@ Music_RocketTheme_branch_f76ef: rest 2 note D#, 2 note C_, 2 -Music_RocketTheme_branch_f7701: +.loop2: note F#, 2 note A_, 2 - sound_loop 4, Music_RocketTheme_branch_f7701 -Music_RocketTheme_branch_f7707: + sound_loop 4, .loop2 +.loop3: note G_, 2 note A#, 2 - sound_loop 4, Music_RocketTheme_branch_f7707 -Music_RocketTheme_branch_f770d: + sound_loop 4, .loop3 +.loop4: note G#, 2 note B_, 2 - sound_loop 4, Music_RocketTheme_branch_f770d -Music_RocketTheme_branch_f7713: + sound_loop 4, .loop4 +.loop5: octave 3 note A_, 2 octave 4 note C_, 2 - sound_loop 4, Music_RocketTheme_branch_f7713 + sound_loop 4, .loop5 note_type 12, 11, 3 rest 16 rest 12 note F_, 2 note C_, 1 note D_, 1 - sound_loop 0, Music_RocketTheme_branch_f768b + sound_loop 0, .mainloop -Music_RocketTheme_branch_f7727: +.sub1: rest 7 note B_, 1 octave 4 @@ -162,24 +162,24 @@ Music_RocketTheme_Ch2: octave 5 note C_, 1 note D_, 1 -Music_RocketTheme_branch_f774b: +.mainloop: note_type 12, 11, 7 - sound_call Music_RocketTheme_branch_f7547 + sound_call Music_LookRocket_Ch2.sub1 volume_envelope 11, 7 - sound_call Music_RocketTheme_branch_f758a + sound_call Music_LookRocket_Ch2.sub5 octave 5 note C_, 1 rest 1 - sound_call Music_RocketTheme_branch_f7554 + sound_call Music_LookRocket_Ch2.sub2 volume_envelope 5, 3 - sound_call Music_RocketTheme_branch_f7568 + sound_call Music_LookRocket_Ch2.sub3 volume_envelope 12, 3 - sound_call Music_RocketTheme_branch_f7568 + sound_call Music_LookRocket_Ch2.sub3 volume_envelope 14, 3 - sound_call Music_RocketTheme_branch_f7568 - sound_call Music_RocketTheme_branch_f756f + sound_call Music_LookRocket_Ch2.sub3 + sound_call Music_LookRocket_Ch2.sub4 vibrato 6, 6, 4 - sound_call Music_RocketTheme_branch_f7800 + sound_call .sub1 octave 4 note A_, 1 vibrato 0, 0, 0 @@ -195,7 +195,7 @@ Music_RocketTheme_branch_f774b: octave 5 note C_, 1 note D_, 1 - sound_call Music_RocketTheme_branch_f7800 + sound_call .sub1 note B_, 1 vibrato 0, 0, 0 volume_envelope 11, 8 @@ -213,7 +213,7 @@ Music_RocketTheme_branch_f774b: note G#, 1 note G_, 1 note_type 6, 11, 7 - sound_call Music_RocketTheme_branch_f781c + sound_call .sub2 octave 4 note D_, 1 note D#, 9 @@ -224,7 +224,7 @@ Music_RocketTheme_branch_f774b: rest 2 note F#, 2 rest 2 - sound_call Music_RocketTheme_branch_f781c + sound_call .sub2 octave 3 note B_, 2 rest 2 @@ -288,9 +288,9 @@ Music_RocketTheme_branch_f774b: octave 5 note C_, 2 note D_, 2 - sound_loop 0, Music_RocketTheme_branch_f774b + sound_loop 0, .mainloop -Music_RocketTheme_branch_f7800: +.sub1: note_type 6, 11, 7 rest 7 octave 4 @@ -318,7 +318,7 @@ Music_RocketTheme_branch_f7800: rest 2 sound_ret -Music_RocketTheme_branch_f781c: +.sub2: octave 3 note B_, 1 octave 4 @@ -335,25 +335,25 @@ Music_RocketTheme_Ch3: vibrato 4, 2, 2 note_type 12, 1, 4 rest 2 -Music_RocketTheme_branch_f782f: +.mainloop: note_type 12, 1, 4 - sound_call Music_RocketTheme_branch_f75bf - sound_call Music_RocketTheme_branch_f75fe - sound_call Music_RocketTheme_branch_f75fe + sound_call Music_LookRocket_Ch3.sub1 + sound_call Music_LookRocket_Ch3.sub4 + sound_call Music_LookRocket_Ch3.sub4 volume_envelope 2, 4 - sound_call Music_RocketTheme_branch_f7623 + sound_call Music_LookRocket_Ch3.sub5 volume_envelope 1, 4 - sound_call Music_RocketTheme_branch_f75cc - sound_call Music_RocketTheme_branch_f7623 - sound_call Music_RocketTheme_branch_f75e1 - sound_call Music_RocketTheme_branch_f75fe - sound_call Music_RocketTheme_branch_f75fe - sound_call Music_RocketTheme_branch_f75fe - sound_call Music_RocketTheme_branch_f75fe - sound_call Music_RocketTheme_branch_f7623 - sound_call Music_RocketTheme_branch_f75cc - sound_call Music_RocketTheme_branch_f7623 - sound_call Music_RocketTheme_branch_f75cc + sound_call Music_LookRocket_Ch3.sub2 + sound_call Music_LookRocket_Ch3.sub5 + sound_call Music_LookRocket_Ch3.sub3 + sound_call Music_LookRocket_Ch3.sub4 + sound_call Music_LookRocket_Ch3.sub4 + sound_call Music_LookRocket_Ch3.sub4 + sound_call Music_LookRocket_Ch3.sub4 + sound_call Music_LookRocket_Ch3.sub5 + sound_call Music_LookRocket_Ch3.sub2 + sound_call Music_LookRocket_Ch3.sub5 + sound_call Music_LookRocket_Ch3.sub2 octave 3 note C_, 1 rest 1 @@ -441,23 +441,23 @@ Music_RocketTheme_branch_f782f: octave 4 note G#, 1 rest 1 - sound_loop 0, Music_RocketTheme_branch_f782f + sound_loop 0, .mainloop Music_RocketTheme_Ch4: toggle_noise 3 drum_speed 12 rest 2 -Music_RocketTheme_branch_f78c3: - sound_call Music_RocketTheme_branch_f765c - sound_call Music_RocketTheme_branch_f7664 - sound_call Music_RocketTheme_branch_f7664 - sound_call Music_RocketTheme_branch_f7664 - sound_call Music_RocketTheme_branch_f7664 - sound_call Music_RocketTheme_branch_f7664 - sound_call Music_RocketTheme_branch_f7664 - sound_call Music_RocketTheme_branch_f7664 - sound_call Music_RocketTheme_branch_f765c -Music_RocketTheme_branch_f78de: +.mainloop: + sound_call Music_LookRocket_Ch4.sub1 + sound_call Music_LookRocket_Ch4.sub2 + sound_call Music_LookRocket_Ch4.sub2 + sound_call Music_LookRocket_Ch4.sub2 + sound_call Music_LookRocket_Ch4.sub2 + sound_call Music_LookRocket_Ch4.sub2 + sound_call Music_LookRocket_Ch4.sub2 + sound_call Music_LookRocket_Ch4.sub2 + sound_call Music_LookRocket_Ch4.sub1 +.loop1: drum_note 11, 2 drum_note 7, 2 drum_note 3, 2 @@ -466,10 +466,10 @@ Music_RocketTheme_branch_f78de: drum_note 7, 2 drum_note 3, 2 drum_note 7, 2 - sound_loop 11, Music_RocketTheme_branch_f78de - sound_call Music_RocketTheme_branch_f7664 - sound_call Music_RocketTheme_branch_f7664 - sound_call Music_RocketTheme_branch_f7664 - sound_call Music_RocketTheme_branch_f765c - sound_call Music_RocketTheme_branch_f765c - sound_loop 0, Music_RocketTheme_branch_f78c3 + sound_loop 11, .loop1 + sound_call Music_LookRocket_Ch4.sub2 + sound_call Music_LookRocket_Ch4.sub2 + sound_call Music_LookRocket_Ch4.sub2 + sound_call Music_LookRocket_Ch4.sub1 + sound_call Music_LookRocket_Ch4.sub1 + sound_loop 0, .mainloop diff --git a/audio/music/route1.asm b/audio/music/route1.asm index 15961f020..0ae4c8a55 100644 --- a/audio/music/route1.asm +++ b/audio/music/route1.asm @@ -4,7 +4,7 @@ Music_Route1: channel 2, Music_Route1_Ch2 channel 3, Music_Route1_Ch3 - db $3 + db $3 ; unused Music_Route1_Ch1: stereo_panning FALSE, TRUE @@ -60,7 +60,7 @@ Music_Route1_Ch1: note D_, 2 volume_envelope 8, 3 rest 2 -Music_Route1_branch_ec04a: +.mainloop: volume_envelope 8, 3 rest 2 octave 4 @@ -202,7 +202,7 @@ Music_Route1_branch_ec04a: note D_, 2 note D_, 2 rest 2 - sound_loop 0, Music_Route1_branch_ec04a + sound_loop 0, .mainloop Music_Route1_Ch2: stereo_panning TRUE, FALSE @@ -212,14 +212,14 @@ Music_Route1_Ch2: octave 4 note F#, 1 note G_, 1 - sound_call Music_Route1_branch_ec198 + sound_call .sub2 octave 3 note A_, 2 note A_, 2 octave 4 note F#, 1 note G_, 1 - sound_call Music_Route1_branch_ec1aa + sound_call .sub3 note C#, 2 note E_, 2 note D_, 2 @@ -231,9 +231,9 @@ Music_Route1_Ch2: note D_, 1 note E_, 1 duty_cycle 2 -Music_Route1_branch_ec112: +.mainloop: volume_envelope 8, 2 - sound_call Music_Route1_branch_ec188 + sound_call .sub1 volume_envelope 8, 1 octave 3 note A_, 2 @@ -263,7 +263,7 @@ Music_Route1_branch_ec112: note F#, 2 note D_, 1 note E_, 1 - sound_call Music_Route1_branch_ec188 + sound_call .sub1 volume_envelope 8, 1 note A_, 2 note A_, 2 @@ -299,11 +299,11 @@ Music_Route1_branch_ec112: octave 4 note F#, 1 note G_, 1 - sound_call Music_Route1_branch_ec198 + sound_call .sub2 rest 4 note F#, 1 note G_, 1 - sound_call Music_Route1_branch_ec1aa + sound_call .sub3 note_type 8, 9, 2 note C#, 1 note D_, 1 @@ -321,9 +321,9 @@ Music_Route1_branch_ec112: octave 4 note D_, 1 note E_, 1 - sound_loop 0, Music_Route1_branch_ec112 + sound_loop 0, .mainloop -Music_Route1_branch_ec188: +.sub1: note F#, 2 note F#, 2 note F#, 2 @@ -341,7 +341,7 @@ Music_Route1_branch_ec188: note E_, 2 sound_ret -Music_Route1_branch_ec198: +.sub2: note A_, 2 note A_, 2 note F#, 2 @@ -361,7 +361,7 @@ Music_Route1_branch_ec198: note E_, 2 sound_ret -Music_Route1_branch_ec1aa: +.sub3: note A_, 2 note A_, 2 note F#, 2 @@ -457,7 +457,7 @@ Music_Route1_Ch3: rest 1 note A_, 1 rest 3 -Music_Route1_branch_ec20c: +.mainloop: octave 3 note D_, 1 rest 1 @@ -644,4 +644,4 @@ Music_Route1_branch_ec20c: rest 1 note A_, 1 rest 3 - sound_loop 0, Music_Route1_branch_ec20c + sound_loop 0, .mainloop diff --git a/audio/music/route12.asm b/audio/music/route12.asm index eb617efab..2e7fc75f5 100644 --- a/audio/music/route12.asm +++ b/audio/music/route12.asm @@ -29,12 +29,12 @@ Music_Route12_Ch1: note E_, 1 volume_envelope 9, 7 note D#, 12 -Music_Route12_branch_ec535: +.mainloop: duty_cycle 2 volume_envelope 9, 6 - sound_call Music_Route12_branch_ec5b1 - sound_call Music_Route12_branch_ec5bf - sound_call Music_Route12_branch_ec5b1 + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 note E_, 1 rest 2 note F#, 1 @@ -42,9 +42,9 @@ Music_Route12_branch_ec535: note B_, 4 octave 4 note D#, 4 - sound_call Music_Route12_branch_ec5b1 - sound_call Music_Route12_branch_ec5bf - sound_call Music_Route12_branch_ec5b1 + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 volume_envelope 9, 2 octave 4 note E_, 1 @@ -115,7 +115,7 @@ Music_Route12_branch_ec535: note F#, 8 note D#, 4 note F#, 4 -Music_Route12_branch_ec59b: +.loop1: volume_envelope 9, 7 note G#, 1 note A_, 1 @@ -129,10 +129,10 @@ Music_Route12_branch_ec59b: note E_, 1 note F#, 1 note G#, 4 - sound_loop 2, Music_Route12_branch_ec59b - sound_loop 0, Music_Route12_branch_ec535 + sound_loop 2, .loop1 + sound_loop 0, .mainloop -Music_Route12_branch_ec5b1: +.sub1: octave 3 note G#, 1 rest 1 @@ -148,7 +148,7 @@ Music_Route12_branch_ec5b1: note G#, 4 sound_ret -Music_Route12_branch_ec5bf: +.sub2: note A_, 1 rest 1 note F#, 1 @@ -183,10 +183,10 @@ Music_Route12_Ch2: note B_, 1 octave 4 note D#, 1 -Music_Route12_branch_ec5e5: +.mainloop: duty_cycle 3 volume_envelope 11, 7 - sound_call Music_Route12_branch_ec647 + sound_call .sub1 note F#, 1 note A_, 1 note G#, 1 @@ -208,7 +208,7 @@ Music_Route12_branch_ec5e5: note D#, 4 note F#, 4 duty_cycle 3 - sound_call Music_Route12_branch_ec647 + sound_call .sub1 note A_, 1 octave 5 note C#, 1 @@ -260,9 +260,9 @@ Music_Route12_branch_ec5e5: note E_, 10 volume_envelope 10, 4 note E_, 6 - sound_loop 0, Music_Route12_branch_ec5e5 + sound_loop 0, .mainloop -Music_Route12_branch_ec647: +.sub1: octave 4 note E_, 6 volume_envelope 11, 1 @@ -296,8 +296,8 @@ Music_Route12_Ch3: note F#, 2 rest 2 note D#, 4 -Music_Route12_branch_ec66c: - sound_call Music_Route12_branch_ec6b4 +.mainloop: + sound_call .sub1 note F#, 1 rest 1 note E_, 1 @@ -307,7 +307,7 @@ Music_Route12_branch_ec66c: note F#, 4 octave 2 note B_, 4 - sound_call Music_Route12_branch_ec6b4 + sound_call .sub1 note E_, 1 rest 1 note B_, 1 @@ -348,7 +348,7 @@ Music_Route12_branch_ec66c: note E_, 8 note F#, 4 note D#, 4 -Music_Route12_branch_ec6a3: +.loop1: note E_, 1 rest 1 note E_, 1 @@ -358,10 +358,10 @@ Music_Route12_branch_ec6a3: note G#, 4 note E_, 3 rest 1 - sound_loop 2, Music_Route12_branch_ec6a3 - sound_loop 0, Music_Route12_branch_ec66c + sound_loop 2, .loop1 + sound_loop 0, .mainloop -Music_Route12_branch_ec6b4: +.sub1: octave 3 note E_, 1 rest 1 @@ -402,16 +402,17 @@ Music_Route12_Ch4: drum_note 2, 1 drum_note 3, 4 drum_speed 6 - sound_call Music_Route12_branch_ec717 -Music_Route12_branch_ec6e1: + sound_call .sub1 +.mainloop: +.loop1: drum_note 3, 4 drum_note 3, 8 drum_note 2, 2 drum_note 2, 2 drum_note 3, 8 - sound_call Music_Route12_branch_ec717 - sound_loop 8, Music_Route12_branch_ec6e1 -Music_Route12_branch_ec6ed: + sound_call .sub1 + sound_loop 8, .loop1 +.loop2: drum_speed 12 drum_note 12, 10 drum_note 3, 1 @@ -423,23 +424,23 @@ Music_Route12_branch_ec6ed: drum_note 2, 1 drum_note 2, 1 drum_note 3, 4 - sound_loop 2, Music_Route12_branch_ec6ed + sound_loop 2, .loop2 drum_note 12, 16 drum_speed 6 - sound_call Music_Route12_branch_ec717 - sound_call Music_Route12_branch_ec717 + sound_call .sub1 + sound_call .sub1 drum_note 12, 16 -Music_Route12_branch_ec707: +.loop3: drum_note 3, 4 drum_note 3, 8 drum_note 2, 2 drum_note 2, 2 drum_note 3, 8 - sound_call Music_Route12_branch_ec717 - sound_loop 2, Music_Route12_branch_ec707 - sound_loop 0, Music_Route12_branch_ec6e1 + sound_call .sub1 + sound_loop 2, .loop3 + sound_loop 0, .mainloop -Music_Route12_branch_ec717: +.sub1: drum_note 2, 1 drum_note 2, 1 drum_note 2, 1 diff --git a/audio/music/route2.asm b/audio/music/route2.asm index 1acfd172f..a4594e069 100644 --- a/audio/music/route2.asm +++ b/audio/music/route2.asm @@ -13,8 +13,8 @@ Music_Route2_Ch1: note_type 12, 11, 1 rest 16 rest 16 - sound_call Music_Route2_branch_ed931 -Music_Route2_branch_ed8fb: + sound_call .sub1 +.mainloop: volume_envelope 11, 1 octave 3 note B_, 4 @@ -26,10 +26,10 @@ Music_Route2_branch_ed8fb: note E_, 4 note E_, 4 note E_, 4 - sound_call Music_Route2_branch_ed931 - sound_call Music_Route2_branch_ed940 - sound_call Music_Route2_branch_ed940 - sound_call Music_Route2_branch_ed971 + sound_call .sub1 + sound_call .sub2 + sound_call .sub2 + sound_call .sub3 octave 3 note G_, 2 octave 4 @@ -43,7 +43,7 @@ Music_Route2_branch_ed8fb: octave 3 note B_, 2 note G_, 2 - sound_call Music_Route2_branch_ed971 + sound_call .sub3 note G_, 2 octave 4 note C_, 2 @@ -54,9 +54,9 @@ Music_Route2_branch_ed8fb: octave 3 note B_, 2 note G_, 2 - sound_loop 0, Music_Route2_branch_ed8fb + sound_loop 0, .mainloop -Music_Route2_branch_ed931: +.sub1: octave 4 note C_, 4 note C_, 4 @@ -71,7 +71,7 @@ Music_Route2_branch_ed931: volume_envelope 11, 1 sound_ret -Music_Route2_branch_ed940: +.sub2: octave 2 note B_, 2 octave 3 @@ -120,7 +120,7 @@ Music_Route2_branch_ed940: volume_envelope 11, 1 sound_ret -Music_Route2_branch_ed971: +.sub3: note B_, 2 note G_, 2 note B_, 2 @@ -163,19 +163,19 @@ Music_Route2_Ch2: stereo_panning TRUE, TRUE vibrato 8, 2, 4 note_type 12, 11, 2 - sound_call Music_Route2_branch_ed9ba -Music_Route2_branch_ed9a1: + sound_call .sub1 +.mainloop: volume_envelope 11, 2 - sound_call Music_Route2_branch_ed9ba + sound_call .sub1 duty_cycle 2 volume_envelope 11, 5 - sound_call Music_Route2_branch_ed9dc - sound_call Music_Route2_branch_ed9dc - sound_call Music_Route2_branch_eda02 - sound_call Music_Route2_branch_eda02 - sound_loop 0, Music_Route2_branch_ed9a1 + sound_call .sub2 + sound_call .sub2 + sound_call .sub3 + sound_call .sub3 + sound_loop 0, .mainloop -Music_Route2_branch_ed9ba: +.sub1: octave 4 note E_, 4 note E_, 4 @@ -209,7 +209,7 @@ Music_Route2_branch_ed9ba: volume_envelope 11, 2 sound_ret -Music_Route2_branch_ed9dc: +.sub2: octave 2 note C_, 4 rest 2 @@ -249,7 +249,7 @@ Music_Route2_branch_ed9dc: note D_, 4 sound_ret -Music_Route2_branch_eda02: +.sub3: octave 2 note E_, 4 rest 2 @@ -315,10 +315,10 @@ Music_Route2_Ch3: rest 3 note E_, 1 rest 3 - sound_call Music_Route2_branch_eda9e + sound_call .sub1 octave 3 note D_, 4 -Music_Route2_branch_eda4b: +.mainloop: note_type 12, 1, 5 octave 3 note C_, 4 @@ -341,23 +341,23 @@ Music_Route2_branch_eda4b: rest 2 note G_, 1 rest 1 - sound_call Music_Route2_branch_eda9e + sound_call .sub1 octave 3 note D_, 2 volume_envelope 1, 0 octave 6 note C_, 1 note D_, 1 - sound_call Music_Route2_branch_edaaf + sound_call .sub2 rest 4 note G_, 8 note F_, 2 note G_, 2 note_type 12, 1, 0 - sound_call Music_Route2_branch_edaaf + sound_call .sub2 rest 16 volume_envelope 2, 5 - sound_call Music_Route2_branch_edacb + sound_call .sub3 rest 4 note D#, 1 note E_, 7 @@ -374,7 +374,7 @@ Music_Route2_branch_eda4b: octave 6 note A_, 4 note G_, 4 - sound_call Music_Route2_branch_edacb + sound_call .sub3 rest 4 note G#, 1 note A_, 7 @@ -382,9 +382,9 @@ Music_Route2_branch_eda4b: note F#, 1 note G_, 16 note G_, 15 - sound_loop 0, Music_Route2_branch_eda4b + sound_loop 0, .mainloop -Music_Route2_branch_eda9e: +.sub1: octave 3 note F_, 4 rest 2 @@ -403,7 +403,7 @@ Music_Route2_branch_eda9e: note F_, 4 sound_ret -Music_Route2_branch_edaaf: +.sub2: octave 6 note E_, 10 note D_, 2 @@ -431,7 +431,7 @@ Music_Route2_branch_edaaf: note D_, 4 sound_ret -Music_Route2_branch_edacb: +.sub3: octave 5 note B_, 16 rest 4 @@ -453,28 +453,29 @@ Music_Route2_branch_edacb: Music_Route2_Ch4: toggle_noise 5 drum_speed 12 -Music_Route2_branch_edae0: +.loop1: drum_note 10, 4 drum_note 10, 4 drum_note 10, 2 drum_note 12, 2 drum_note 10, 2 drum_note 12, 2 - sound_loop 3, Music_Route2_branch_edae0 + sound_loop 3, .loop1 drum_note 10, 4 drum_note 10, 4 drum_note 10, 2 drum_note 10, 2 drum_note 4, 4 -Music_Route2_branch_edaef: +.mainloop: +.loop2: drum_note 10, 4 drum_note 10, 4 drum_note 10, 2 drum_note 10, 2 drum_note 12, 2 drum_note 10, 2 - sound_loop 4, Music_Route2_branch_edaef -Music_Route2_branch_edaf9: + sound_loop 4, .loop2 +.loop3: drum_note 12, 4 drum_note 10, 2 drum_note 12, 2 @@ -482,34 +483,34 @@ Music_Route2_branch_edaf9: drum_note 12, 2 drum_note 10, 2 drum_note 12, 2 - sound_loop 7, Music_Route2_branch_edaf9 + sound_loop 7, .loop3 drum_note 12, 4 drum_note 10, 4 drum_note 10, 2 drum_note 10, 2 drum_note 4, 4 -Music_Route2_branch_edb09: +.loop4: drum_note 12, 4 drum_note 1, 4 drum_note 12, 2 drum_note 12, 2 drum_note 1, 4 - sound_loop 3, Music_Route2_branch_edb09 + sound_loop 3, .loop4 drum_note 12, 4 drum_note 1, 4 drum_note 2, 2 drum_note 1, 2 drum_note 2, 4 -Music_Route2_branch_edb17: +.loop5: drum_note 12, 4 drum_note 1, 4 drum_note 12, 2 drum_note 12, 2 drum_note 1, 4 - sound_loop 3, Music_Route2_branch_edb17 + sound_loop 3, .loop5 drum_note 12, 4 drum_note 1, 4 drum_note 3, 2 drum_note 3, 2 drum_note 4, 4 - sound_loop 0, Music_Route2_branch_edaef + sound_loop 0, .mainloop diff --git a/audio/music/route26.asm b/audio/music/route26.asm index d9a912c83..49cad4d32 100644 --- a/audio/music/route26.asm +++ b/audio/music/route26.asm @@ -27,7 +27,7 @@ Music_Route26_Ch1: octave 3 note G#, 2 note F#, 2 -Music_Route26_branch_eefe0: +.mainloop: duty_cycle 0 note_type 12, 10, 7 octave 3 @@ -193,7 +193,7 @@ Music_Route26_branch_eefe0: octave 2 note B_, 4 rest 4 - sound_loop 0, Music_Route26_branch_eefe0 + sound_loop 0, .mainloop Music_Route26_Ch2: stereo_panning TRUE, FALSE @@ -233,7 +233,7 @@ Music_Route26_Ch2: octave 2 note C_, 2 note D#, 2 -Music_Route26_branch_ef0ce: +.mainloop: duty_cycle 2 note_type 12, 12, 2 octave 2 @@ -254,7 +254,7 @@ Music_Route26_branch_ef0ce: note B_, 2 note B_, 2 note B_, 2 - sound_call Music_Route26_branch_ef14e + sound_call .sub1 note A_, 6 note A_, 1 octave 2 @@ -269,7 +269,7 @@ Music_Route26_branch_ef0ce: note B_, 2 note B_, 2 note_type 12, 12, 2 - sound_call Music_Route26_branch_ef14e + sound_call .sub1 volume_envelope 12, 7 octave 2 note F#, 4 @@ -282,14 +282,14 @@ Music_Route26_branch_ef0ce: note D#, 4 note D#, 4 note_type 8, 12, 2 -Music_Route26_branch_ef10e: +.loop1: octave 2 note G#, 2 note G#, 2 note G#, 2 octave 1 note G#, 6 - sound_loop 3, Music_Route26_branch_ef10e + sound_loop 3, .loop1 octave 2 note G#, 2 note G#, 2 @@ -337,9 +337,9 @@ Music_Route26_branch_ef10e: note C#, 1 note C_, 1 note D#, 1 - sound_loop 0, Music_Route26_branch_ef0ce + sound_loop 0, .mainloop -Music_Route26_branch_ef14e: +.sub1: note A#, 6 note A#, 1 octave 2 @@ -389,7 +389,7 @@ Music_Route26_Ch3: note F#, 2 note F_, 2 note D#, 2 -Music_Route26_branch_ef18a: +.mainloop: vibrato 24, 2, 3 note_type 12, 1, 4 octave 5 @@ -397,7 +397,7 @@ Music_Route26_branch_ef18a: rest 2 octave 4 note G#, 1 - sound_call Music_Route26_branch_ef22f + sound_call .sub1 vibrato 37, 1, 3 note C#, 1 rest 1 @@ -405,7 +405,7 @@ Music_Route26_branch_ef18a: note G#, 1 octave 5 note C#, 1 - sound_call Music_Route26_branch_ef22f + sound_call .sub1 note F_, 1 rest 1 note C#, 1 @@ -534,9 +534,9 @@ Music_Route26_branch_ef18a: note G#, 1 octave 3 note C_, 1 - sound_loop 0, Music_Route26_branch_ef18a + sound_loop 0, .mainloop -Music_Route26_branch_ef22f: +.sub1: octave 5 note F_, 8 note C#, 2 @@ -550,17 +550,17 @@ Music_Route26_branch_ef22f: Music_Route26_Ch4: toggle_noise 4 drum_speed 12 -Music_Route26_branch_ef23c: +.loop1: drum_note 12, 6 drum_note 3, 1 drum_note 3, 1 - sound_loop 3, Music_Route26_branch_ef23c - sound_call Music_Route26_branch_ef2b0 -Music_Route26_branch_ef246: + sound_loop 3, .loop1 + sound_call .sub3 +.mainloop: drum_speed 6 - sound_call Music_Route26_branch_ef29a - sound_call Music_Route26_branch_ef29a - sound_call Music_Route26_branch_ef2a8 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 drum_note 3, 12 drum_note 3, 2 drum_note 3, 2 @@ -572,21 +572,21 @@ Music_Route26_branch_ef246: drum_note 3, 2 drum_note 5, 2 drum_speed 6 - sound_call Music_Route26_branch_ef29a - sound_call Music_Route26_branch_ef29a + sound_call .sub1 + sound_call .sub1 drum_speed 8 -Music_Route26_branch_ef266: +.loop2: drum_note 3, 2 drum_note 3, 2 drum_note 3, 2 drum_note 12, 6 - sound_loop 4, Music_Route26_branch_ef266 + sound_loop 4, .loop2 drum_speed 6 - sound_call Music_Route26_branch_ef2a8 - sound_call Music_Route26_branch_ef2a8 - sound_call Music_Route26_branch_ef29a - sound_call Music_Route26_branch_ef2a8 -Music_Route26_branch_ef27c: + sound_call .sub2 + sound_call .sub2 + sound_call .sub1 + sound_call .sub2 +.loop3: drum_speed 6 drum_note 3, 1 drum_note 3, 1 @@ -601,13 +601,13 @@ Music_Route26_branch_ef27c: drum_note 3, 2 drum_note 3, 2 drum_note 12, 12 - sound_loop 2, Music_Route26_branch_ef27c + sound_loop 2, .loop3 drum_speed 12 drum_note 12, 16 - sound_call Music_Route26_branch_ef2b0 - sound_loop 0, Music_Route26_branch_ef246 + sound_call .sub3 + sound_loop 0, .mainloop -Music_Route26_branch_ef29a: +.sub1: drum_note 5, 12 drum_note 3, 2 drum_note 3, 2 @@ -623,7 +623,7 @@ Music_Route26_branch_ef29a: drum_note 2, 1 sound_ret -Music_Route26_branch_ef2a8: +.sub2: drum_note 5, 12 drum_note 3, 2 drum_note 3, 2 @@ -633,7 +633,7 @@ Music_Route26_branch_ef2a8: drum_note 3, 4 sound_ret -Music_Route26_branch_ef2b0: +.sub3: drum_speed 6 drum_note 2, 1 drum_note 2, 1 diff --git a/audio/music/route29.asm b/audio/music/route29.asm index ddded4be3..aaf323724 100644 --- a/audio/music/route29.asm +++ b/audio/music/route29.asm @@ -14,7 +14,7 @@ Music_Route29_Ch1: stereo_panning FALSE, TRUE note_type 12, 11, 2 rest 2 -Music_Route29_branch_f03a5: +.mainloop: rest 2 octave 4 note C_, 2 @@ -167,7 +167,7 @@ Music_Route29_branch_f03a5: note C_, 2 note G_, 2 note G_, 4 - sound_loop 0, Music_Route29_branch_f03a5 + sound_loop 0, .mainloop Music_Route29_Ch2: duty_cycle 3 @@ -176,8 +176,8 @@ Music_Route29_Ch2: octave 4 note C_, 1 note D_, 1 -Music_Route29_branch_f0458: - sound_call Music_Route29_branch_f04de +.mainloop: + sound_call .sub1 note F_, 1 note E_, 1 note D_, 2 @@ -192,7 +192,7 @@ Music_Route29_branch_f0458: octave 4 note C_, 1 note D_, 1 - sound_call Music_Route29_branch_f04de + sound_call .sub1 note F_, 1 note E_, 1 note D_, 2 @@ -299,9 +299,9 @@ Music_Route29_branch_f0458: octave 4 note C_, 1 note D_, 1 - sound_loop 0, Music_Route29_branch_f0458 + sound_loop 0, .mainloop -Music_Route29_branch_f04de: +.sub1: note E_, 2 note E_, 2 note G_, 2 @@ -337,7 +337,7 @@ Music_Route29_Ch3: note_type 12, 2, 5 vibrato 9, 2, 7 rest 2 -Music_Route29_branch_f0504: +.mainloop: rest 2 octave 3 note G_, 1 @@ -499,14 +499,14 @@ Music_Route29_branch_f0504: rest 1 note C_, 1 rest 3 - sound_loop 0, Music_Route29_branch_f0504 + sound_loop 0, .mainloop Music_Route29_Ch4: stereo_panning FALSE, TRUE toggle_noise 0 drum_speed 12 rest 2 -Music_Route29_branch_f05b0: +.mainloop: rest 2 drum_note 6, 2 drum_note 6, 6 @@ -518,4 +518,4 @@ Music_Route29_branch_f05b0: drum_note 6, 4 drum_note 6, 2 drum_note 6, 4 - sound_loop 0, Music_Route29_branch_f05b0 + sound_loop 0, .mainloop diff --git a/audio/music/route3.asm b/audio/music/route3.asm index 7dfb2d8e6..cb93d6e6e 100644 --- a/audio/music/route3.asm +++ b/audio/music/route3.asm @@ -46,8 +46,8 @@ Music_Route3_Ch1: note E_, 1 note F#, 1 note G#, 1 -Music_Route3_branch_ec307: - sound_call Music_Route3_branch_ec3a4 +.mainloop: + sound_call .sub1 note G_, 1 note D_, 1 octave 2 @@ -194,37 +194,38 @@ Music_Route3_branch_ec307: note B_, 1 octave 4 note D_, 1 - sound_loop 0, Music_Route3_branch_ec307 + sound_loop 0, .mainloop -Music_Route3_branch_ec3a4: +.sub1: +.sub1loop1: octave 3 note A_, 1 note E_, 1 note C#, 1 note E_, 1 - sound_loop 3, Music_Route3_branch_ec3a4 + sound_loop 3, .sub1loop1 note C#, 1 note E_, 1 note C#, 1 note E_, 1 -Music_Route3_branch_ec3b1: +.sub1loop2: note A_, 1 note E_, 1 note C#, 1 note E_, 1 - sound_loop 3, Music_Route3_branch_ec3b1 + sound_loop 3, .sub1loop2 note C#, 1 note E_, 1 note C#, 1 note E_, 1 -Music_Route3_branch_ec3bd: +.sub1loop3: note G_, 1 note D_, 1 octave 2 note B_, 1 octave 3 note D_, 1 - sound_loop 3, Music_Route3_branch_ec3bd + sound_loop 3, .sub1loop3 octave 2 note B_, 1 octave 3 @@ -264,9 +265,9 @@ Music_Route3_Ch2: note C#, 1 note E_, 1 note G#, 1 -Music_Route3_branch_ec3f5: +.mainloop: volume_envelope 7, -5 - sound_call Music_Route3_branch_ec443 + sound_call .sub1 note G_, 1 note B_, 10 volume_envelope 11, 7 @@ -275,7 +276,7 @@ Music_Route3_branch_ec3f5: rest 4 duty_cycle 3 note G#, 4 - sound_call Music_Route3_branch_ec443 + sound_call .sub1 note B_, 1 volume_envelope 7, -5 octave 5 @@ -325,9 +326,9 @@ Music_Route3_branch_ec3f5: note G#, 6 note F#, 1 note G#, 1 - sound_loop 0, Music_Route3_branch_ec3f5 + sound_loop 0, .mainloop -Music_Route3_branch_ec443: +.sub1: note A_, 6 note E_, 1 note A_, 1 @@ -379,15 +380,15 @@ Music_Route3_Ch3: note A_, 1 rest 1 note G#, 2 - sound_call Music_Route3_branch_ec4bd -Music_Route3_branch_ec47f: + sound_call .sub1 +.mainloop: volume_envelope 1, 4 - sound_call Music_Route3_branch_ec4bd - sound_call Music_Route3_branch_ec4bd - sound_call Music_Route3_branch_ec4ce - sound_call Music_Route3_branch_ec4bd - sound_call Music_Route3_branch_ec4bd - sound_call Music_Route3_branch_ec4ce + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 note A_, 2 octave 3 note C#, 2 @@ -426,9 +427,9 @@ Music_Route3_branch_ec47f: rest 2 note F#, 1 note G#, 1 - sound_loop 0, Music_Route3_branch_ec47f + sound_loop 0, .mainloop -Music_Route3_branch_ec4bd: +.sub1: octave 3 note A_, 1 rest 1 @@ -447,7 +448,7 @@ Music_Route3_branch_ec4bd: note G#, 2 sound_ret -Music_Route3_branch_ec4ce: +.sub2: octave 3 note G_, 1 rest 1 @@ -482,7 +483,7 @@ Music_Route3_Ch4: toggle_noise 4 drum_speed 12 rest 10 -Music_Route3_branch_ec4f0: +.mainloop: drum_speed 12 drum_note 3, 2 drum_note 3, 4 @@ -499,4 +500,4 @@ Music_Route3_branch_ec4f0: drum_note 2, 1 drum_note 2, 1 drum_note 2, 1 - sound_loop 0, Music_Route3_branch_ec4f0 + sound_loop 0, .mainloop diff --git a/audio/music/route30.asm b/audio/music/route30.asm index 5ff066e7f..a8f947db3 100644 --- a/audio/music/route30.asm +++ b/audio/music/route30.asm @@ -27,7 +27,7 @@ Music_Route30_Ch1: note D_, 2 volume_envelope 4, -6 note C_, 4 -Music_Route30_branch_efc2e: +.mainloop: volume_envelope 11, 6 note D_, 6 volume_envelope 11, 4 @@ -182,7 +182,7 @@ Music_Route30_branch_efc2e: note B_, 2 octave 4 note D_, 2 - sound_loop 0, Music_Route30_branch_efc2e + sound_loop 0, .mainloop Music_Route30_Ch2: duty_cycle 3 @@ -206,7 +206,7 @@ Music_Route30_Ch2: note E_, 1 note F_, 1 note F#, 1 -Music_Route30_branch_efcf6: +.mainloop: volume_envelope 12, 7 note G_, 10 octave 4 @@ -293,7 +293,7 @@ Music_Route30_branch_efcf6: volume_envelope 10, 7 octave 3 note F#, 2 - sound_loop 0, Music_Route30_branch_efcf6 + sound_loop 0, .mainloop Music_Route30_Ch3: note_type 12, 2, 7 @@ -320,7 +320,7 @@ Music_Route30_Ch3: rest 1 note G_, 1 rest 1 -Music_Route30_branch_efd79: +.mainloop: note G_, 1 rest 1 note B_, 2 @@ -574,33 +574,33 @@ Music_Route30_branch_efd79: rest 1 note G_, 1 rest 1 - sound_loop 0, Music_Route30_branch_efd79 + sound_loop 0, .mainloop Music_Route30_Ch4: toggle_noise 3 drum_speed 12 - sound_call Music_Route30_branch_efeb8 - sound_call Music_Route30_branch_efec1 -Music_Route30_branch_efe84: - sound_call Music_Route30_branch_efecd - sound_call Music_Route30_branch_efed7 - sound_call Music_Route30_branch_efed7 - sound_call Music_Route30_branch_efee1 - sound_call Music_Route30_branch_efed7 - sound_call Music_Route30_branch_efecd - sound_call Music_Route30_branch_efed7 - sound_call Music_Route30_branch_efee1 - sound_call Music_Route30_branch_efed7 - sound_call Music_Route30_branch_efed7 - sound_call Music_Route30_branch_efecd - sound_call Music_Route30_branch_efed7 - sound_call Music_Route30_branch_efed7 - sound_call Music_Route30_branch_efed7 - sound_call Music_Route30_branch_efecd - sound_call Music_Route30_branch_efee1 - sound_loop 0, Music_Route30_branch_efe84 + sound_call .sub1 + sound_call .sub2 +.mainloop: + sound_call .sub3 + sound_call .sub4 + sound_call .sub4 + sound_call .sub5 + sound_call .sub4 + sound_call .sub3 + sound_call .sub4 + sound_call .sub5 + sound_call .sub4 + sound_call .sub4 + sound_call .sub3 + sound_call .sub4 + sound_call .sub4 + sound_call .sub4 + sound_call .sub3 + sound_call .sub5 + sound_loop 0, .mainloop -Music_Route30_branch_efeb8: +.sub1: drum_note 3, 2 drum_note 7, 2 drum_note 7, 2 @@ -611,7 +611,7 @@ Music_Route30_branch_efeb8: drum_note 3, 4 sound_ret -Music_Route30_branch_efec1: +.sub2: drum_note 3, 2 drum_note 7, 2 drum_note 7, 2 @@ -625,7 +625,7 @@ Music_Route30_branch_efec1: drum_note 3, 1 sound_ret -Music_Route30_branch_efecd: +.sub3: drum_note 3, 2 drum_note 7, 2 drum_note 7, 2 @@ -637,7 +637,7 @@ Music_Route30_branch_efecd: drum_note 3, 2 sound_ret -Music_Route30_branch_efed7: +.sub4: drum_note 3, 2 drum_note 7, 2 drum_note 7, 2 @@ -649,7 +649,7 @@ Music_Route30_branch_efed7: drum_note 3, 2 sound_ret -Music_Route30_branch_efee1: +.sub5: drum_note 3, 2 drum_note 7, 2 drum_note 7, 2 diff --git a/audio/music/route36.asm b/audio/music/route36.asm index 806c11b73..ca954ad58 100644 --- a/audio/music/route36.asm +++ b/audio/music/route36.asm @@ -26,7 +26,7 @@ Music_Route36_Ch1: note A_, 1 volume_envelope 5, -5 note A#, 4 -Music_Route36_branch_e9517: +.mainloop: volume_envelope 11, 5 note F_, 4 note A_, 2 @@ -162,7 +162,7 @@ Music_Route36_branch_e9517: volume_envelope 11, 5 note D#, 2 note E_, 2 - sound_loop 0, Music_Route36_branch_e9517 + sound_loop 0, .mainloop Music_Route36_Ch2: duty_cycle 3 @@ -187,7 +187,7 @@ Music_Route36_Ch2: note F_, 8 octave 3 note G_, 4 -Music_Route36_branch_e95ce: +.mainloop: volume_envelope 12, 7 octave 4 note C_, 10 @@ -309,7 +309,7 @@ Music_Route36_branch_e95ce: note G_, 1 note A_, 1 note B_, 1 - sound_loop 0, Music_Route36_branch_e95ce + sound_loop 0, .mainloop Music_Route36_Ch3: note_type 12, 2, 5 @@ -335,7 +335,7 @@ Music_Route36_Ch3: octave 3 note D#, 2 note E_, 2 -Music_Route36_branch_e9684: +.mainloop: note F_, 4 note C_, 2 note F_, 4 @@ -465,31 +465,32 @@ Music_Route36_branch_e9684: note D_, 2 note D#, 2 note E_, 2 - sound_loop 0, Music_Route36_branch_e9684 + sound_loop 0, .mainloop Music_Route36_Ch4: toggle_noise 1 drum_speed 12 - sound_call Music_Route36_branch_e9734 - sound_call Music_Route36_branch_e9741 -Music_Route36_branch_e9713: - sound_call Music_Route36_branch_e9734 - sound_call Music_Route36_branch_e973b - sound_call Music_Route36_branch_e9734 - sound_call Music_Route36_branch_e9741 - sound_loop 2, Music_Route36_branch_e9713 -Music_Route36_branch_e9723: + sound_call .sub1 + sound_call .sub3 +.mainloop: +.loop1: + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 + sound_call .sub3 + sound_loop 2, .loop1 +.loop2: drum_note 11, 4 drum_note 10, 2 drum_note 6, 4 drum_note 12, 1 drum_note 12, 1 drum_note 10, 4 - sound_loop 11, Music_Route36_branch_e9723 - sound_call Music_Route36_branch_e9741 - sound_loop 0, Music_Route36_branch_e9713 + sound_loop 11, .loop2 + sound_call .sub3 + sound_loop 0, .mainloop -Music_Route36_branch_e9734: +.sub1: drum_note 10, 4 drum_note 10, 6 drum_note 11, 1 @@ -498,7 +499,7 @@ Music_Route36_branch_e9734: drum_note 11, 2 sound_ret -Music_Route36_branch_e973b: +.sub2: drum_note 10, 4 drum_note 10, 6 drum_note 12, 1 @@ -506,7 +507,7 @@ Music_Route36_branch_e973b: drum_note 10, 4 sound_ret -Music_Route36_branch_e9741: +.sub3: drum_note 10, 4 drum_note 10, 6 drum_note 11, 1 diff --git a/audio/music/route37.asm b/audio/music/route37.asm index af1c1b4ba..ec7f90068 100644 --- a/audio/music/route37.asm +++ b/audio/music/route37.asm @@ -14,7 +14,7 @@ Music_Route37_Ch1: note_type 12, 11, 3 rest 16 rest 16 -Music_Route37_branch_ee969: +.mainloop: volume_envelope 11, 3 rest 2 octave 2 @@ -68,37 +68,37 @@ Music_Route37_branch_ee969: note E_, 2 note D#, 4 stereo_panning FALSE, TRUE -Music_Route37_branch_ee9a5: - sound_call Music_Route37_branch_ee9da +.loop1: + sound_call .sub1 octave 3 note C#, 4 - sound_loop 2, Music_Route37_branch_ee9a5 - sound_call Music_Route37_branch_ee9e9 + sound_loop 2, .loop1 + sound_call .sub2 octave 3 note F#, 4 - sound_call Music_Route37_branch_ee9e9 + sound_call .sub2 octave 3 note F#, 4 - sound_call Music_Route37_branch_ee9da + sound_call .sub1 octave 3 note E_, 4 - sound_call Music_Route37_branch_ee9da + sound_call .sub1 octave 3 note G#, 4 - sound_call Music_Route37_branch_ee9e9 + sound_call .sub2 octave 4 note D#, 4 - sound_call Music_Route37_branch_ee9e9 + sound_call .sub2 octave 3 note F_, 4 stereo_panning TRUE, TRUE - sound_call Music_Route37_branch_ee9e9 + sound_call .sub2 rest 4 - sound_call Music_Route37_branch_ee9e9 + sound_call .sub2 rest 4 - sound_loop 0, Music_Route37_branch_ee969 + sound_loop 0, .mainloop -Music_Route37_branch_ee9da: +.sub1: volume_envelope 12, 2 octave 2 note A_, 2 @@ -113,7 +113,7 @@ Music_Route37_branch_ee9da: volume_envelope 11, 7 sound_ret -Music_Route37_branch_ee9e9: +.sub2: volume_envelope 12, 2 octave 2 note B_, 2 @@ -159,8 +159,8 @@ Music_Route37_Ch2: note B_, 1 volume_envelope 12, 2 note B_, 2 -Music_Route37_branch_eea24: - sound_call Music_Route37_branch_eeab7 +.mainloop: + sound_call .sub1 volume_envelope 12, 6 octave 4 note C#, 4 @@ -174,7 +174,7 @@ Music_Route37_branch_eea24: note F#, 8 volume_envelope 12, 7 note D#, 12 - sound_call Music_Route37_branch_eeab7 + sound_call .sub1 volume_envelope 12, 7 octave 4 note C#, 4 @@ -270,9 +270,9 @@ Music_Route37_branch_eea24: note F#, 1 volume_envelope 12, 2 note F#, 2 - sound_loop 0, Music_Route37_branch_eea24 + sound_loop 0, .mainloop -Music_Route37_branch_eeab7: +.sub1: volume_envelope 12, 7 octave 3 note F#, 4 @@ -289,13 +289,13 @@ Music_Route37_branch_eeab7: Music_Route37_Ch3: stereo_panning TRUE, FALSE note_type 12, 1, 4 -Music_Route37_branch_eeacc: +.loop1: octave 2 note F#, 2 rest 6 - sound_loop 4, Music_Route37_branch_eeacc -Music_Route37_branch_eead3: - sound_call Music_Route37_branch_eeb32 + sound_loop 4, .loop1 +.mainloop: + sound_call .sub1 note A_, 2 octave 3 note C#, 2 @@ -306,12 +306,12 @@ Music_Route37_branch_eead3: note A_, 2 note F#, 2 note E_, 2 -Music_Route37_branch_eeae0: +.loop2: note D#, 2 note F#, 2 - sound_loop 4, Music_Route37_branch_eeae0 - sound_call Music_Route37_branch_eeb32 - sound_call Music_Route37_branch_eeb32 + sound_loop 4, .loop2 + sound_call .sub1 + sound_call .sub1 note A_, 2 octave 3 note C#, 2 @@ -324,45 +324,45 @@ Music_Route37_branch_eeae0: note C#, 2 octave 2 note A_, 2 - sound_call Music_Route37_branch_eeb32 -Music_Route37_branch_eeafb: + sound_call .sub1 +.loop3: octave 2 note B_, 2 octave 3 note D#, 2 - sound_loop 4, Music_Route37_branch_eeafb -Music_Route37_branch_eeb03: + sound_loop 4, .loop3 +.loop4: octave 2 note A_, 2 octave 3 note C#, 2 - sound_loop 7, Music_Route37_branch_eeb03 + sound_loop 7, .loop4 note E_, 2 note C#, 2 - sound_call Music_Route37_branch_eeb3c -Music_Route37_branch_eeb10: + sound_call .sub2 +.loop5: octave 2 note B_, 2 octave 3 note F#, 2 - sound_loop 4, Music_Route37_branch_eeb10 -Music_Route37_branch_eeb18: + sound_loop 4, .loop5 +.loop6: octave 2 note A_, 2 octave 3 note C#, 2 - sound_loop 7, Music_Route37_branch_eeb18 + sound_loop 7, .loop6 note E_, 2 note C#, 2 - sound_call Music_Route37_branch_eeb3c - sound_call Music_Route37_branch_eeb32 -Music_Route37_branch_eeb28: + sound_call .sub2 + sound_call .sub1 +.loop7: note F#, 2 rest 6 - sound_loop 4, Music_Route37_branch_eeb28 - sound_loop 0, Music_Route37_branch_eead3 + sound_loop 4, .loop7 + sound_loop 0, .mainloop -Music_Route37_branch_eeb32: +.sub1: octave 2 note F#, 2 note B_, 2 @@ -374,7 +374,7 @@ Music_Route37_branch_eeb32: note B_, 2 sound_ret -Music_Route37_branch_eeb3c: +.sub2: octave 2 note B_, 2 octave 3 @@ -396,14 +396,14 @@ Music_Route37_branch_eeb3c: Music_Route37_Ch4: stereo_panning FALSE, TRUE toggle_noise 0 -Music_Route37_branch_eeb51: +.mainloop: drum_speed 12 - sound_call Music_Route37_branch_eeb6b + sound_call .sub1 drum_note 3, 1 drum_note 4, 1 drum_note 4, 1 drum_note 3, 1 - sound_call Music_Route37_branch_eeb6b + sound_call .sub1 drum_speed 6 drum_note 4, 1 drum_note 4, 1 @@ -413,9 +413,9 @@ Music_Route37_branch_eeb51: drum_note 3, 1 drum_note 3, 1 drum_note 3, 1 - sound_loop 0, Music_Route37_branch_eeb51 + sound_loop 0, .mainloop -Music_Route37_branch_eeb6b: +.sub1: drum_note 3, 2 drum_note 4, 1 drum_note 4, 1 diff --git a/audio/music/ruinsofalphinterior.asm b/audio/music/ruinsofalphinterior.asm index c2500e95d..7799b2c8d 100644 --- a/audio/music/ruinsofalphinterior.asm +++ b/audio/music/ruinsofalphinterior.asm @@ -11,14 +11,14 @@ Music_RuinsOfAlphInterior_Ch1: stereo_panning TRUE, FALSE note_type 12, 4, 4 rest 1 - sound_loop 0, Music_RuinsOfAlphInterior_branch_ebdc2 + sound_loop 0, Music_RuinsOfAlphInterior_Ch2.mainloop Music_RuinsOfAlphInterior_Ch2: pitch_offset 2 duty_cycle 0 stereo_panning FALSE, TRUE note_type 12, 10, 4 -Music_RuinsOfAlphInterior_branch_ebdc2: +.mainloop: octave 4 note C_, 4 octave 3 @@ -33,15 +33,15 @@ Music_RuinsOfAlphInterior_branch_ebdc2: note C_, 4 octave 3 note A#, 4 - sound_loop 0, Music_RuinsOfAlphInterior_branch_ebdc2 + sound_loop 0, .mainloop Music_RuinsOfAlphInterior_Ch3: note_type 12, 1, 0 -Music_RuinsOfAlphInterior_branch_ebdd7: +.mainloop: octave 2 note G#, 2 octave 3 note C#, 2 note E_, 2 rest 10 - sound_loop 0, Music_RuinsOfAlphInterior_branch_ebdd7 + sound_loop 0, .mainloop diff --git a/audio/music/ruinsofalphradio.asm b/audio/music/ruinsofalphradio.asm index ba2d3d0a5..3cf7c774c 100644 --- a/audio/music/ruinsofalphradio.asm +++ b/audio/music/ruinsofalphradio.asm @@ -11,22 +11,22 @@ Music_RuinsOfAlphRadio_Ch1: pitch_offset 280 vibrato 0, 15, 0 stereo_panning TRUE, FALSE -Music_RuinsOfAlphRadio_branch_eede3: +.mainloop: note_type 6, 7, 1 - sound_call Music_RuinsOfAlphRadio_branch_eee01 + sound_call .sub1 note_type 12, 10, 1 rest 16 rest 16 - sound_call Music_RuinsOfAlphRadio_branch_eee08 + sound_call .sub2 note_type 12, 10, 1 rest 16 rest 16 - sound_call Music_RuinsOfAlphRadio_branch_eee01 + sound_call .sub1 note_type 12, 10, 1 rest 16 - sound_loop 0, Music_RuinsOfAlphRadio_branch_eede3 + sound_loop 0, .mainloop -Music_RuinsOfAlphRadio_branch_eee01: +.sub1: octave 4 note G_, 1 note F#, 1 @@ -35,7 +35,7 @@ Music_RuinsOfAlphRadio_branch_eee01: note C_, 8 sound_ret -Music_RuinsOfAlphRadio_branch_eee08: +.sub2: octave 4 note G_, 1 note F#, 1 @@ -50,25 +50,25 @@ Music_RuinsOfAlphRadio_branch_eee08: Music_RuinsOfAlphRadio_Ch2: duty_cycle 1 vibrato 1, 14, 0 -Music_RuinsOfAlphRadio_branch_eee17: +.mainloop: stereo_panning FALSE, TRUE note_type 6, 8, 1 - sound_call Music_RuinsOfAlphRadio_branch_eee01 + sound_call Music_RuinsOfAlphRadio_Ch1.sub1 note_type 12, 10, 1 rest 16 rest 16 note_type 6, 8, 1 - sound_call Music_RuinsOfAlphRadio_branch_eee08 + sound_call Music_RuinsOfAlphRadio_Ch1.sub2 note_type 12, 10, 1 rest 16 - sound_loop 0, Music_RuinsOfAlphRadio_branch_eee17 + sound_loop 0, .mainloop Music_RuinsOfAlphRadio_Ch3: note_type 6, 2, 6 -Music_RuinsOfAlphRadio_branch_eee35: +.mainloop: octave 2 note C_, 1 note C#, 1 note C_, 1 rest 16 - sound_loop 0, Music_RuinsOfAlphRadio_branch_eee35 + sound_loop 0, .mainloop diff --git a/audio/music/showmearound.asm b/audio/music/showmearound.asm index 7caba50b8..8bf352080 100644 --- a/audio/music/showmearound.asm +++ b/audio/music/showmearound.asm @@ -28,18 +28,18 @@ Music_ShowMeAround_Ch1: note D_, 1 note E_, 1 note G#, 8 -Music_ShowMeAround_branch_edc01: +.mainloop: rest 16 rest 16 rest 16 rest 16 - sound_call Music_ShowMeAround_branch_edc98 - sound_call Music_ShowMeAround_branch_edc15 - sound_call Music_ShowMeAround_branch_edc98 - sound_call Music_ShowMeAround_branch_edc15 - sound_loop 0, Music_ShowMeAround_branch_edc01 + sound_call Music_ShowMeAround_Ch2.sub3 + sound_call .sub1 + sound_call Music_ShowMeAround_Ch2.sub3 + sound_call .sub1 + sound_loop 0, .mainloop -Music_ShowMeAround_branch_edc15: +.sub1: rest 4 octave 3 note C#, 1 @@ -84,10 +84,10 @@ Music_ShowMeAround_Ch2: note D_, 1 note E_, 8 duty_cycle 1 -Music_ShowMeAround_branch_edc44: - sound_call Music_ShowMeAround_branch_edc98 - sound_call Music_ShowMeAround_branch_edc98 - sound_call Music_ShowMeAround_branch_edc86 +.mainloop: + sound_call .sub3 + sound_call .sub3 + sound_call .sub1 note A_, 4 octave 3 note A_, 2 @@ -98,7 +98,7 @@ Music_ShowMeAround_branch_edc44: note C#, 2 octave 3 note B_, 4 - sound_call Music_ShowMeAround_branch_edc86 + sound_call .sub1 note A_, 2 note A_, 2 note G#, 2 @@ -108,7 +108,7 @@ Music_ShowMeAround_branch_edc44: note A_, 2 note A_, 2 note A_, 4 - sound_call Music_ShowMeAround_branch_edc8e + sound_call .sub2 note A_, 4 octave 5 note C#, 2 @@ -123,7 +123,7 @@ Music_ShowMeAround_branch_edc44: rest 1 note D#, 1 note E_, 1 - sound_call Music_ShowMeAround_branch_edc8e + sound_call .sub2 note A_, 2 octave 5 note E_, 2 @@ -135,9 +135,9 @@ Music_ShowMeAround_branch_edc44: note A_, 2 note A_, 2 note A_, 4 - sound_loop 0, Music_ShowMeAround_branch_edc44 + sound_loop 0, .mainloop -Music_ShowMeAround_branch_edc86: +.sub1: octave 3 note A_, 2 octave 4 @@ -147,7 +147,7 @@ Music_ShowMeAround_branch_edc86: note F#, 2 sound_ret -Music_ShowMeAround_branch_edc8e: +.sub2: octave 5 note C#, 2 octave 4 @@ -159,7 +159,7 @@ Music_ShowMeAround_branch_edc8e: note A_, 2 sound_ret -Music_ShowMeAround_branch_edc98: +.sub3: rest 4 octave 3 note C#, 1 @@ -220,16 +220,16 @@ Music_ShowMeAround_Ch3: note F_, 1 note E_, 2 volume_envelope 1, 4 -Music_ShowMeAround_branch_edcd9: - sound_call Music_ShowMeAround_branch_edcef - sound_call Music_ShowMeAround_branch_edcef - sound_call Music_ShowMeAround_branch_edcef - sound_call Music_ShowMeAround_branch_edd0f - sound_call Music_ShowMeAround_branch_edcef - sound_call Music_ShowMeAround_branch_edd0f - sound_loop 0, Music_ShowMeAround_branch_edcd9 +.mainloop: + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 + sound_call .sub2 + sound_loop 0, .mainloop -Music_ShowMeAround_branch_edcef: +.sub1: octave 2 note A_, 2 rest 6 @@ -263,7 +263,7 @@ Music_ShowMeAround_branch_edcef: rest 2 sound_ret -Music_ShowMeAround_branch_edd0f: +.sub2: octave 2 note A_, 2 rest 6 @@ -306,16 +306,16 @@ Music_ShowMeAround_Ch4: drum_note 3, 2 drum_note 4, 2 drum_note 7, 4 -Music_ShowMeAround_branch_edd39: - sound_call Music_ShowMeAround_branch_edd4f - sound_call Music_ShowMeAround_branch_edd4f - sound_call Music_ShowMeAround_branch_edd4f - sound_call Music_ShowMeAround_branch_edd5e - sound_call Music_ShowMeAround_branch_edd4f - sound_call Music_ShowMeAround_branch_edd5e - sound_loop 0, Music_ShowMeAround_branch_edd39 +.mainloop: + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 + sound_call .sub2 + sound_loop 0, .mainloop -Music_ShowMeAround_branch_edd4f: +.sub1: drum_note 4, 2 drum_note 7, 2 drum_note 3, 2 @@ -332,7 +332,7 @@ Music_ShowMeAround_branch_edd4f: drum_note 4, 2 sound_ret -Music_ShowMeAround_branch_edd5e: +.sub2: drum_note 4, 2 drum_note 7, 2 drum_note 3, 2 diff --git a/audio/music/sprouttower.asm b/audio/music/sprouttower.asm index b5728333f..c77e44264 100644 --- a/audio/music/sprouttower.asm +++ b/audio/music/sprouttower.asm @@ -15,7 +15,7 @@ Music_SproutTower_Ch1: note_type 12, 10, 3 rest 16 rest 16 -Music_SproutTower_branch_f6994: +.mainloop: rest 6 octave 3 note F_, 2 @@ -60,7 +60,7 @@ Music_SproutTower_branch_f6994: note F_, 4 note D#, 4 note D#, 4 - sound_loop 0, Music_SproutTower_branch_f6994 + sound_loop 0, .mainloop Music_SproutTower_Ch2: duty_cycle 3 @@ -76,7 +76,7 @@ Music_SproutTower_Ch2: note F_, 4 note D#, 4 note D#, 4 -Music_SproutTower_branch_f69dc: +.mainloop: volume_envelope 11, 5 octave 4 note C_, 4 @@ -137,7 +137,7 @@ Music_SproutTower_branch_f69dc: octave 4 note C_, 16 rest 16 - sound_loop 0, Music_SproutTower_branch_f69dc + sound_loop 0, .mainloop Music_SproutTower_Ch3: vibrato 20, 14, 8 @@ -160,7 +160,7 @@ Music_SproutTower_Ch3: rest 2 note F#, 2 stereo_panning TRUE, FALSE -Music_SproutTower_branch_f6a3e: +.mainloop: rest 4 note C_, 2 note F_, 2 @@ -217,13 +217,13 @@ Music_SproutTower_branch_f6a3e: note D#, 2 rest 2 note F_, 2 - sound_loop 0, Music_SproutTower_branch_f6a3e + sound_loop 0, .mainloop Music_SproutTower_Ch4: toggle_noise 0 drum_speed 12 rest 4 -Music_SproutTower_branch_f6a7f: +.mainloop: drum_note 7, 4 stereo_panning TRUE, FALSE drum_note 4, 4 @@ -240,4 +240,4 @@ Music_SproutTower_branch_f6a7f: drum_note 4, 2 stereo_panning TRUE, TRUE drum_note 7, 4 - sound_loop 0, Music_SproutTower_branch_f6a7f + sound_loop 0, .mainloop diff --git a/audio/music/ssaqua.asm b/audio/music/ssaqua.asm index 79a30149b..8d00d46d8 100644 --- a/audio/music/ssaqua.asm +++ b/audio/music/ssaqua.asm @@ -18,7 +18,7 @@ Music_SSAqua_Ch1: rest 1 note G_, 1 rest 1 -Music_SSAqua_branch_eadbc: +.mainloop: octave 2 note G_, 16 rest 8 @@ -43,7 +43,7 @@ Music_SSAqua_branch_eadbc: rest 8 duty_cycle 1 volume_envelope 6, 1 - sound_call Music_SSAqua_branch_eaff5 + sound_call Music_SSAqua_Ch2.sub4 octave 5 note G_, 1 octave 4 @@ -68,8 +68,8 @@ Music_SSAqua_branch_eadbc: note B_, 1 note A_, 1 note G_, 1 - sound_call Music_SSAqua_branch_eaff5 - sound_call Music_SSAqua_branch_eb03e + sound_call Music_SSAqua_Ch2.sub4 + sound_call Music_SSAqua_Ch2.sub5 rest 16 rest 16 rest 16 @@ -247,7 +247,7 @@ Music_SSAqua_branch_eadbc: note D_, 2 note F#, 2 note A_, 2 - sound_loop 0, Music_SSAqua_branch_eadbc + sound_loop 0, .mainloop Music_SSAqua_Ch2: stereo_panning TRUE, FALSE @@ -255,15 +255,15 @@ Music_SSAqua_Ch2: vibrato 8, 3, 3 note_type 12, 11, 7 rest 2 -Music_SSAqua_branch_eaed5: +.mainloop: note_type 12, 11, 7 duty_cycle 1 volume_envelope 6, 1 - sound_call Music_SSAqua_branch_eaff5 - sound_call Music_SSAqua_branch_eb03e + sound_call .sub4 + sound_call .sub5 duty_cycle 2 volume_envelope 13, 7 - sound_call Music_SSAqua_branch_eafe0 + sound_call .sub3 note B_, 1 rest 1 note G_, 1 @@ -276,7 +276,7 @@ Music_SSAqua_branch_eaed5: note C#, 1 note E_, 1 transpose 0, 12 - sound_call Music_SSAqua_branch_eafe0 + sound_call .sub3 transpose 0, 0 octave 3 note B_, 1 @@ -292,7 +292,7 @@ Music_SSAqua_branch_eaed5: note B_, 1 octave 4 note C_, 1 - sound_call Music_SSAqua_branch_eaf88 + sound_call .sub1 note G_, 4 rest 4 note G_, 8 @@ -312,7 +312,7 @@ Music_SSAqua_branch_eaed5: note B_, 1 octave 4 note C_, 1 - sound_call Music_SSAqua_branch_eaf88 + sound_call .sub1 note G_, 4 rest 4 note G_, 8 @@ -337,7 +337,7 @@ Music_SSAqua_branch_eaed5: duty_cycle 0 note B_, 2 note A_, 2 - sound_call Music_SSAqua_branch_eafd5 + sound_call .sub2 note_type 6, 11, 7 note G#, 1 note A_, 11 @@ -364,7 +364,7 @@ Music_SSAqua_branch_eaed5: note A#, 12 note B_, 2 note A_, 2 - sound_call Music_SSAqua_branch_eafd5 + sound_call .sub2 note_type 6, 11, 7 note G#, 1 note A_, 11 @@ -390,9 +390,9 @@ Music_SSAqua_branch_eaed5: note G_, 8 note A_, 8 rest 8 - sound_loop 0, Music_SSAqua_branch_eaed5 + sound_loop 0, .mainloop -Music_SSAqua_branch_eaf88: +.sub1: note D_, 6 octave 3 note B_, 1 @@ -467,7 +467,7 @@ Music_SSAqua_branch_eaf88: note F#, 2 sound_ret -Music_SSAqua_branch_eafd5: +.sub2: note_type 12, 11, 7 note B_, 10 note F#, 1 @@ -478,7 +478,7 @@ Music_SSAqua_branch_eafd5: rest 1 sound_ret -Music_SSAqua_branch_eafe0: +.sub3: octave 3 note D_, 10 note E_, 1 @@ -501,7 +501,7 @@ Music_SSAqua_branch_eafe0: rest 1 sound_ret -Music_SSAqua_branch_eaff5: +.sub4: octave 5 note G_, 1 note D_, 1 @@ -576,7 +576,7 @@ Music_SSAqua_branch_eaff5: note G_, 1 sound_ret -Music_SSAqua_branch_eb03e: +.sub5: octave 5 note G_, 1 octave 4 @@ -611,7 +611,7 @@ Music_SSAqua_Ch3: rest 1 note G_, 1 rest 1 -Music_SSAqua_branch_eb063: +.mainloop: note G_, 16 rest 8 note G_, 2 @@ -642,9 +642,9 @@ Music_SSAqua_branch_eb063: note B_, 1 octave 4 note E_, 1 - sound_call Music_SSAqua_branch_eb14d - sound_call Music_SSAqua_branch_eb14d -Music_SSAqua_branch_eb08d: + sound_call .sub1 + sound_call .sub1 +.loop1: note G_, 2 rest 2 octave 3 @@ -671,10 +671,10 @@ Music_SSAqua_branch_eb08d: octave 2 note G_, 1 rest 1 - sound_loop 4, Music_SSAqua_branch_eb08d - sound_call Music_SSAqua_branch_eb172 - sound_call Music_SSAqua_branch_eb172 - sound_call Music_SSAqua_branch_eb230 + sound_loop 4, .loop1 + sound_call .sub2 + sound_call .sub2 + sound_call .sub3 octave 3 note E_, 2 rest 2 @@ -747,7 +747,7 @@ Music_SSAqua_branch_eb08d: octave 4 note F#, 1 rest 3 - sound_call Music_SSAqua_branch_eb230 + sound_call .sub3 octave 3 note E_, 2 rest 2 @@ -822,9 +822,9 @@ Music_SSAqua_branch_eb08d: rest 1 note G_, 1 rest 1 - sound_loop 0, Music_SSAqua_branch_eb063 + sound_loop 0, .mainloop -Music_SSAqua_branch_eb14d: +.sub1: note_type 6, 1, 5 octave 2 note G_, 2 @@ -861,7 +861,7 @@ Music_SSAqua_branch_eb14d: rest 1 sound_ret -Music_SSAqua_branch_eb172: +.sub2: octave 2 note G_, 2 rest 2 @@ -1053,7 +1053,7 @@ Music_SSAqua_branch_eb172: rest 3 sound_ret -Music_SSAqua_branch_eb230: +.sub3: octave 2 note B_, 2 rest 2 @@ -1084,7 +1084,8 @@ Music_SSAqua_Ch4: toggle_noise 3 drum_speed 12 rest 2 -Music_SSAqua_branch_eb24e: +.mainloop: +.loop1: drum_note 9, 1 drum_note 8, 1 drum_note 8, 1 @@ -1101,34 +1102,34 @@ Music_SSAqua_branch_eb24e: drum_note 8, 1 drum_note 9, 1 drum_note 8, 1 - sound_loop 12, Music_SSAqua_branch_eb24e - sound_call Music_SSAqua_branch_eb2ae - sound_call Music_SSAqua_branch_eb2ae - sound_call Music_SSAqua_branch_eb2ae - sound_call Music_SSAqua_branch_eb2bb - sound_call Music_SSAqua_branch_eb2ae - sound_call Music_SSAqua_branch_eb2ae - sound_call Music_SSAqua_branch_eb2ae - sound_call Music_SSAqua_branch_eb2bb - sound_call Music_SSAqua_branch_eb2ae - sound_call Music_SSAqua_branch_eb2ae - sound_call Music_SSAqua_branch_eb2ae - sound_call Music_SSAqua_branch_eb2bb - sound_call Music_SSAqua_branch_eb2ae - sound_call Music_SSAqua_branch_eb2ae - sound_call Music_SSAqua_branch_eb2ae - sound_call Music_SSAqua_branch_eb2c7 - sound_call Music_SSAqua_branch_eb2ae - sound_call Music_SSAqua_branch_eb2ae - sound_call Music_SSAqua_branch_eb2ae - sound_call Music_SSAqua_branch_eb2bb - sound_call Music_SSAqua_branch_eb2ae - sound_call Music_SSAqua_branch_eb2ae - sound_call Music_SSAqua_branch_eb2ae - sound_call Music_SSAqua_branch_eb2c7 - sound_loop 0, Music_SSAqua_branch_eb24e + sound_loop 12, .loop1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub3 + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub3 + sound_loop 0, .mainloop -Music_SSAqua_branch_eb2ae: +.sub1: drum_note 11, 2 drum_note 8, 1 drum_note 8, 1 @@ -1143,7 +1144,7 @@ Music_SSAqua_branch_eb2ae: drum_note 8, 1 sound_ret -Music_SSAqua_branch_eb2bb: +.sub2: drum_note 11, 2 drum_note 8, 1 drum_note 8, 1 @@ -1157,7 +1158,7 @@ Music_SSAqua_branch_eb2bb: drum_note 7, 2 sound_ret -Music_SSAqua_branch_eb2c7: +.sub3: drum_note 11, 2 drum_note 8, 1 drum_note 8, 1 diff --git a/audio/music/successfulcapture.asm b/audio/music/successfulcapture.asm index ba9c08f36..2c4e355cf 100644 --- a/audio/music/successfulcapture.asm +++ b/audio/music/successfulcapture.asm @@ -10,14 +10,14 @@ Music_SuccessfulCapture_Ch1: duty_cycle 3 pitch_offset 1 note_type 12, 10, 1 - sound_jump Music_SuccessfulCapture_branch_f4536 + sound_jump Music_WildPokemonVictory_Ch1.body Music_SuccessfulCapture_Ch2: vibrato 18, 2, 4 note_type 12, 12, 1 duty_cycle 2 - sound_jump Music_SuccessfulCapture_branch_f4585 + sound_jump Music_WildPokemonVictory_Ch2.body Music_SuccessfulCapture_Ch3: note_type 12, 2, 5 - sound_jump Music_SuccessfulCapture_branch_f45cf + sound_jump Music_WildPokemonVictory_Ch3.body diff --git a/audio/music/suicunebattle.asm b/audio/music/suicunebattle.asm index 321fdcc84..041d307b4 100644 --- a/audio/music/suicunebattle.asm +++ b/audio/music/suicunebattle.asm @@ -95,7 +95,7 @@ Music_SuicuneBattle_Ch1: octave 3 note E_, 1 note G#, 1 -Music_SuicuneBattle_branch_178bfc: +.mainloop: note_type 12, 11, 4 octave 2 note A_, 2 @@ -510,7 +510,7 @@ Music_SuicuneBattle_branch_178bfc: note A_, 16 vibrato 18, 1, 5 duty_cycle 3 - sound_loop 0, Music_SuicuneBattle_branch_178bfc + sound_loop 0, .mainloop Music_SuicuneBattle_Ch2: duty_cycle 3 @@ -590,7 +590,7 @@ Music_SuicuneBattle_Ch2: note E_, 8 note E_, 8 note E_, 4 -Music_SuicuneBattle_branch_178e4e: +.mainloop: note_type 12, 12, 7 octave 3 note A_, 8 @@ -1185,7 +1185,7 @@ Music_SuicuneBattle_branch_178e4e: note E_, 2 note A_, 2 note B_, 2 - sound_loop 0, Music_SuicuneBattle_branch_178e4e + sound_loop 0, .mainloop Music_SuicuneBattle_Ch3: note_type 12, 1, 8 @@ -1280,7 +1280,7 @@ Music_SuicuneBattle_Ch3: note D_, 2 note E_, 2 note_type 12, 1, 6 -Music_SuicuneBattle_branch_179182: +.mainloop: octave 1 note A_, 2 octave 2 @@ -2054,4 +2054,4 @@ Music_SuicuneBattle_branch_179182: note E_, 2 note D_, 2 note E_, 2 - sound_loop 0, Music_SuicuneBattle_branch_179182 + sound_loop 0, .mainloop diff --git a/audio/music/surf.asm b/audio/music/surf.asm index 511f8b0a1..ac1faed58 100644 --- a/audio/music/surf.asm +++ b/audio/music/surf.asm @@ -4,14 +4,14 @@ Music_Surf: channel 2, Music_Surf_Ch2 channel 3, Music_Surf_Ch3 - db $3 + db $3 ; unused Music_Surf_Ch1: tempo 108 volume 7, 7 note_type 12, 10, 7 stereo_panning FALSE, TRUE -Music_Surf_branch_f519e: +.mainloop: duty_cycle 2 vibrato 16, 2, 4 volume_envelope 7, 3 @@ -69,11 +69,11 @@ Music_Surf_branch_f519e: octave 4 note D_, 2 duty_cycle 0 - sound_call Music_Surf_branch_f5233 + sound_call .sub1 duty_cycle 1 note_type 8, 10, 7 - sound_call Music_Surf_branch_f5233 - sound_call Music_Surf_branch_f5293 + sound_call .sub1 + sound_call .sub2 octave 4 note C_, 2 octave 3 @@ -88,7 +88,7 @@ Music_Surf_branch_f519e: note G_, 2 duty_cycle 1 note_type 6, 9, 7 - sound_call Music_Surf_branch_f5293 + sound_call .sub2 volume_envelope 10, 8 note G#, 6 note A_, 6 @@ -97,14 +97,14 @@ Music_Surf_branch_f519e: note D_, 3 volume_envelope 10, 8 duty_cycle 1 - sound_call Music_Surf_branch_f52d9 + sound_call .sub3 octave 3 note D#, 8 note G#, 8 note D#, 8 duty_cycle 3 note_type 8, 9, 8 - sound_call Music_Surf_branch_f52d9 + sound_call .sub3 note_type 12, 10, 7 octave 3 note D#, 12 @@ -118,9 +118,9 @@ Music_Surf_branch_f519e: note B_, 2 octave 3 note D#, 2 - sound_loop 0, Music_Surf_branch_f519e + sound_loop 0, .mainloop -Music_Surf_branch_f5233: +.sub1: note_type 12, 10, 7 octave 3 note D#, 4 @@ -214,7 +214,7 @@ Music_Surf_branch_f5233: note D_, 4 sound_ret -Music_Surf_branch_f5293: +.sub2: octave 4 note G#, 16 note D#, 4 @@ -280,7 +280,7 @@ Music_Surf_branch_f5293: note G_, 2 sound_ret -Music_Surf_branch_f52d9: +.sub3: octave 3 note A#, 3 note G_, 3 @@ -340,11 +340,12 @@ Music_Surf_branch_f52d9: sound_ret Music_Surf_Ch2: +.mainloop: note_type 12, 12, 2 stereo_panning TRUE, FALSE duty_cycle 2 vibrato 20, 2, 3 -Music_Surf_branch_f5321: +.loop1: octave 1 note A#, 4 octave 2 @@ -352,7 +353,7 @@ Music_Surf_branch_f5321: rest 3 note A#, 1 rest 3 - sound_loop 3, Music_Surf_branch_f5321 + sound_loop 3, .loop1 octave 1 note A#, 4 octave 2 @@ -360,7 +361,7 @@ Music_Surf_branch_f5321: rest 3 note A#, 1 rest 3 -Music_Surf_branch_f5333: +.loop2: note D#, 4 note G_, 2 note G#, 2 @@ -395,42 +396,42 @@ Music_Surf_branch_f5333: note B_, 4 note A#, 4 note G#, 4 - sound_loop 2, Music_Surf_branch_f5333 + sound_loop 2, .loop2 volume_envelope 12, 7 - sound_call Music_Surf_branch_f53b2 + sound_call .sub1 note D#, 4 note D_, 4 note C#, 4 - sound_call Music_Surf_branch_f53b2 + sound_call .sub1 note D_, 4 note D#, 4 octave 1 note A#, 4 note_type 6, 11, 8 - sound_call Music_Surf_branch_f53d6 + sound_call .sub2 duty_cycle 1 volume_envelope 11, 8 - sound_call Music_Surf_branch_f53e8 + sound_call .sub3 duty_cycle 2 - sound_call Music_Surf_branch_f53f3 + sound_call .sub4 duty_cycle 1 volume_envelope 11, 8 - sound_call Music_Surf_branch_f5404 + sound_call .sub5 octave 3 note B_, 16 octave 4 note C#, 8 transpose 0, 12 duty_cycle 3 - sound_call Music_Surf_branch_f53d6 + sound_call .sub2 volume_envelope 11, 8 duty_cycle 1 - sound_call Music_Surf_branch_f53e8 + sound_call .sub3 duty_cycle 3 - sound_call Music_Surf_branch_f53f3 + sound_call .sub4 volume_envelope 11, 8 duty_cycle 1 - sound_call Music_Surf_branch_f5404 + sound_call .sub5 transpose 0, 0 note_type 12, 11, 8 octave 4 @@ -442,9 +443,9 @@ Music_Surf_branch_f5333: note G#, 4 note A#, 4 note B_, 4 - sound_loop 0, Music_Surf_Ch2 + sound_loop 0, .mainloop -Music_Surf_branch_f53b2: +.sub1: octave 1 note G#, 4 octave 3 @@ -482,7 +483,7 @@ Music_Surf_branch_f53b2: note G_, 4 sound_ret -Music_Surf_branch_f53d6: +.sub2: octave 4 note F_, 4 note D#, 4 @@ -501,7 +502,7 @@ Music_Surf_branch_f53d6: note A_, 1 sound_ret -Music_Surf_branch_f53e8: +.sub3: note A#, 7 octave 4 note C_, 8 @@ -514,7 +515,7 @@ Music_Surf_branch_f53e8: note G_, 8 sound_ret -Music_Surf_branch_f53f3: +.sub4: note F#, 1 note G_, 3 note F_, 4 @@ -532,7 +533,7 @@ Music_Surf_branch_f53f3: note B_, 1 sound_ret -Music_Surf_branch_f5404: +.sub5: octave 4 note C_, 8 note G_, 4 @@ -543,6 +544,7 @@ Music_Surf_branch_f5404: sound_ret Music_Surf_Ch3: +.mainloop: stereo_panning TRUE, TRUE note_type 12, 1, 5 vibrato 22, 2, 3 @@ -662,7 +664,7 @@ Music_Surf_Ch3: octave 5 note A#, 4 volume_envelope 1, 5 - sound_call Music_Surf_branch_f54c8 + sound_call .sub1 octave 2 note B_, 4 octave 3 @@ -671,7 +673,7 @@ Music_Surf_Ch3: note G#, 4 note A#, 4 note B_, 4 - sound_call Music_Surf_branch_f54c8 + sound_call .sub1 octave 2 note B_, 4 octave 3 @@ -684,9 +686,9 @@ Music_Surf_Ch3: note D#, 8 octave 2 note B_, 4 - sound_loop 0, Music_Surf_Ch3 + sound_loop 0, .mainloop -Music_Surf_branch_f54c8: +.sub1: octave 3 note D#, 4 note G_, 1 diff --git a/audio/music/tintower.asm b/audio/music/tintower.asm index 1bc5d315b..75030677e 100644 --- a/audio/music/tintower.asm +++ b/audio/music/tintower.asm @@ -11,7 +11,7 @@ Music_TinTower_Ch1: duty_cycle 3 pitch_offset 4 vibrato 8, 4, 5 -Music_TinTower_branch_f682a: +.mainloop: stereo_panning TRUE, FALSE note_type 12, 10, 5 octave 3 @@ -94,15 +94,15 @@ Music_TinTower_branch_f682a: volume_envelope 10, 5 octave 3 note A#, 4 - sound_loop 0, Music_TinTower_branch_f682a + sound_loop 0, .mainloop Music_TinTower_Ch2: duty_cycle 3 pitch_offset 2 vibrato 24, 4, 4 -Music_TinTower_branch_f6893: +.mainloop: stereo_panning TRUE, TRUE -Music_TinTower_branch_f6895: +.loop1: note_type 12, 11, 5 octave 4 note C_, 4 @@ -133,7 +133,7 @@ Music_TinTower_branch_f6895: octave 4 note C_, 8 stereo_panning FALSE, TRUE - sound_loop 2, Music_TinTower_branch_f6895 + sound_loop 2, .loop1 volume_envelope 11, 2 octave 3 note C_, 4 @@ -183,11 +183,11 @@ Music_TinTower_branch_f6895: note C_, 6 volume_envelope 9, 5 note C#, 2 - sound_loop 0, Music_TinTower_branch_f6893 + sound_loop 0, .mainloop Music_TinTower_Ch3: note_type 12, 1, 4 -Music_TinTower_branch_f68fb: +.mainloop: rest 16 rest 16 rest 16 @@ -257,12 +257,12 @@ Music_TinTower_branch_f68fb: note C_, 1 rest 11 stereo_panning TRUE, TRUE - sound_loop 0, Music_TinTower_branch_f68fb + sound_loop 0, .mainloop Music_TinTower_Ch4: toggle_noise 0 drum_speed 12 -Music_TinTower_branch_f694c: +.mainloop: stereo_panning FALSE, TRUE drum_note 8, 2 stereo_panning TRUE, FALSE @@ -289,4 +289,4 @@ Music_TinTower_branch_f694c: drum_note 8, 2 drum_note 8, 2 drum_note 6, 2 - sound_loop 0, Music_TinTower_branch_f694c + sound_loop 0, .mainloop diff --git a/audio/music/titlescreen.asm b/audio/music/titlescreen.asm index db50db415..3c3bff5c6 100644 --- a/audio/music/titlescreen.asm +++ b/audio/music/titlescreen.asm @@ -195,17 +195,17 @@ Music_TitleScreen_Ch1: tempo 136 note C#, 6 tempo 134 - sound_call Music_TitleScreen_branch_eb96d + sound_call .sub1 octave 4 note C_, 4 note C_, 4 note C#, 4 - sound_call Music_TitleScreen_branch_eb96d + sound_call .sub1 octave 4 note C_, 4 note C_, 4 note C#, 4 - sound_call Music_TitleScreen_branch_eb96d + sound_call .sub1 octave 3 note E_, 4 note E_, 4 @@ -273,10 +273,10 @@ Music_TitleScreen_Ch1: rest 11 sound_ret -Music_TitleScreen_branch_eb96d: +.sub1: note_type 12, 12, 3 note D_, 1 -Music_TitleScreen_branch_eb971: +.sub1loop1: rest 1 octave 2 note D_, 1 @@ -284,7 +284,7 @@ Music_TitleScreen_branch_eb971: note A_, 1 octave 2 note D_, 1 - sound_loop 5, Music_TitleScreen_branch_eb971 + sound_loop 5, .sub1loop1 rest 1 note D_, 1 octave 1 @@ -480,11 +480,11 @@ Music_TitleScreen_Ch2: note C#, 4 pitch_offset 1 stereo_panning FALSE, TRUE - sound_call Music_TitleScreen_branch_ebae7 + sound_call .sub1 note C#, 4 - sound_call Music_TitleScreen_branch_ebae7 + sound_call .sub1 note C#, 4 - sound_call Music_TitleScreen_branch_ebae7 + sound_call .sub1 octave 4 note A_, 4 stereo_panning TRUE, TRUE @@ -555,17 +555,17 @@ Music_TitleScreen_Ch2: rest 11 sound_ret -Music_TitleScreen_branch_ebae7: +.sub1: note_type 12, 11, 2 note D_, 1 -Music_TitleScreen_branch_ebaeb: +.sub1loop1: octave 3 note A_, 1 octave 4 note D_, 1 note A_, 1 note D_, 1 - sound_loop 5, Music_TitleScreen_branch_ebaeb + sound_loop 5, .sub1loop1 octave 3 note A_, 1 octave 4 @@ -948,9 +948,9 @@ Music_TitleScreen_Ch4: drum_note 1, 1 drum_note 1, 1 drum_speed 12 - sound_call Music_TitleScreen_branch_ebd77 - sound_call Music_TitleScreen_branch_ebd81 - sound_call Music_TitleScreen_branch_ebd81 + sound_call .sub1 + sound_call .sub2 + sound_call .sub2 drum_note 1, 2 drum_note 4, 2 drum_note 1, 2 @@ -965,7 +965,7 @@ Music_TitleScreen_Ch4: drum_note 1, 1 drum_note 1, 1 drum_speed 12 - sound_call Music_TitleScreen_branch_ebd77 + sound_call .sub1 drum_note 1, 2 drum_note 4, 2 drum_note 1, 2 @@ -975,7 +975,7 @@ Music_TitleScreen_Ch4: drum_note 1, 1 drum_note 1, 2 drum_note 1, 2 - sound_call Music_TitleScreen_branch_ebd81 + sound_call .sub2 drum_note 1, 2 drum_note 4, 2 drum_note 1, 2 @@ -986,9 +986,9 @@ Music_TitleScreen_Ch4: drum_note 1, 2 drum_note 1, 1 drum_note 1, 1 - sound_call Music_TitleScreen_branch_ebd77 - sound_call Music_TitleScreen_branch_ebd81 - sound_call Music_TitleScreen_branch_ebd81 + sound_call .sub1 + sound_call .sub2 + sound_call .sub2 drum_note 1, 2 drum_note 4, 2 drum_note 1, 2 @@ -1003,8 +1003,8 @@ Music_TitleScreen_Ch4: drum_note 3, 1 drum_note 2, 1 drum_speed 12 - sound_call Music_TitleScreen_branch_ebd77 - sound_call Music_TitleScreen_branch_ebd81 + sound_call .sub1 + sound_call .sub2 drum_note 1, 2 drum_note 4, 2 drum_note 1, 2 @@ -1054,31 +1054,31 @@ Music_TitleScreen_Ch4: drum_note 2, 1 drum_note 1, 1 drum_note 1, 1 - sound_call Music_TitleScreen_branch_ebd8b - sound_call Music_TitleScreen_branch_ebd93 + sound_call .sub3 + sound_call .sub4 drum_note 2, 1 drum_note 3, 1 drum_note 3, 1 drum_note 2, 1 drum_speed 12 - sound_call Music_TitleScreen_branch_ebd8b - sound_call Music_TitleScreen_branch_ebd93 + sound_call .sub3 + sound_call .sub4 drum_note 3, 1 drum_note 3, 1 drum_note 2, 1 drum_note 2, 1 drum_speed 12 - sound_call Music_TitleScreen_branch_ebd8b - sound_call Music_TitleScreen_branch_ebd93 + sound_call .sub3 + sound_call .sub4 drum_note 2, 1 drum_note 2, 1 drum_note 2, 1 drum_note 2, 1 drum_speed 12 drum_note 9, 16 -Music_TitleScreen_branch_ebd40: +.loop1: rest 16 - sound_loop 6, Music_TitleScreen_branch_ebd40 + sound_loop 6, .loop1 rest 12 drum_speed 6 drum_note 3, 1 @@ -1125,7 +1125,7 @@ Music_TitleScreen_branch_ebd40: drum_note 12, 4 sound_ret -Music_TitleScreen_branch_ebd77: +.sub1: drum_note 1, 2 drum_note 4, 2 drum_note 1, 2 @@ -1137,7 +1137,7 @@ Music_TitleScreen_branch_ebd77: drum_note 4, 2 sound_ret -Music_TitleScreen_branch_ebd81: +.sub2: drum_note 1, 2 drum_note 4, 2 drum_note 1, 2 @@ -1149,14 +1149,15 @@ Music_TitleScreen_branch_ebd81: drum_note 4, 2 sound_ret -Music_TitleScreen_branch_ebd8b: +.sub3: +.sub3loop1: drum_note 1, 2 drum_note 1, 1 drum_note 1, 1 - sound_loop 4, Music_TitleScreen_branch_ebd8b + sound_loop 4, .sub3loop1 sound_ret -Music_TitleScreen_branch_ebd93: +.sub4: drum_note 1, 2 drum_note 1, 1 drum_note 1, 1 diff --git a/audio/music/trainervictory.asm b/audio/music/trainervictory.asm index 9bcf7fda8..e4b5f4e16 100644 --- a/audio/music/trainervictory.asm +++ b/audio/music/trainervictory.asm @@ -20,9 +20,10 @@ Music_TrainerVictory_Ch1: volume_envelope 11, 6 note A_, 12 stereo_panning FALSE, TRUE -Music_TrainerVictory_branch_ebecd: +.mainloop: +.loop1: volume_envelope 7, 2 - sound_call Music_TrainerVictory_branch_ebf11 + sound_call .sub1 volume_envelope 5, 1 note C#, 2 note E_, 2 @@ -38,8 +39,8 @@ Music_TrainerVictory_branch_ebecd: octave 4 note C#, 2 note E_, 6 - sound_loop 2, Music_TrainerVictory_branch_ebecd - sound_call Music_TrainerVictory_branch_ebf11 + sound_loop 2, .loop1 + sound_call .sub1 note A_, 2 rest 2 note F_, 2 @@ -48,31 +49,31 @@ Music_TrainerVictory_branch_ebecd: rest 2 note G_, 2 note A#, 6 -Music_TrainerVictory_branch_ebef2: +.loop2: volume_envelope 7, 2 octave 4 note D_, 2 note C#, 2 octave 3 note A_, 2 - sound_loop 3, Music_TrainerVictory_branch_ebef2 + sound_loop 3, .loop2 note F#, 2 note A_, 2 octave 4 note D_, 2 -Music_TrainerVictory_branch_ebf01: +.loop3: octave 4 note C#, 2 octave 3 note B_, 2 note A_, 2 - sound_loop 3, Music_TrainerVictory_branch_ebf01 + sound_loop 3, .loop3 note E_, 2 note F#, 2 note G_, 2 - sound_loop 0, Music_TrainerVictory_branch_ebecd + sound_loop 0, .mainloop -Music_TrainerVictory_branch_ebf11: +.sub1: octave 3 note F#, 2 rest 2 @@ -99,9 +100,10 @@ Music_TrainerVictory_Ch2: volume_envelope 13, 6 note D_, 12 stereo_panning TRUE, FALSE -Music_TrainerVictory_branch_ebf30: +.mainloop: +.loop1: note_type 8, 8, 2 - sound_call Music_TrainerVictory_branch_ebf56 + sound_call .sub1 note F#, 2 rest 2 note G_, 2 @@ -110,8 +112,8 @@ Music_TrainerVictory_branch_ebf30: rest 2 note F#, 2 note G_, 6 - sound_loop 2, Music_TrainerVictory_branch_ebf30 - sound_call Music_TrainerVictory_branch_ebf56 + sound_loop 2, .loop1 + sound_call .sub1 note F_, 2 rest 2 note C_, 2 @@ -123,9 +125,9 @@ Music_TrainerVictory_branch_ebf30: note_type 12, 8, 8 note F#, 16 note E_, 16 - sound_loop 0, Music_TrainerVictory_branch_ebf30 + sound_loop 0, .mainloop -Music_TrainerVictory_branch_ebf56: +.sub1: octave 4 note D_, 2 rest 2 @@ -156,8 +158,9 @@ Music_TrainerVictory_Ch3: note C#, 2 octave 2 note B_, 2 -Music_TrainerVictory_branch_ebf74: - sound_call Music_TrainerVictory_branch_ebfb1 +.mainloop: +.loop1: + sound_call .sub1 octave 3 note C#, 2 rest 2 @@ -172,8 +175,8 @@ Music_TrainerVictory_branch_ebf74: note A_, 1 rest 1 note A_, 6 - sound_loop 2, Music_TrainerVictory_branch_ebf74 - sound_call Music_TrainerVictory_branch_ebfb1 + sound_loop 2, .loop1 + sound_call .sub1 octave 3 note C_, 2 rest 2 @@ -207,9 +210,9 @@ Music_TrainerVictory_branch_ebf74: note G_, 2 note E_, 2 note C#, 2 - sound_loop 0, Music_TrainerVictory_branch_ebf74 + sound_loop 0, .mainloop -Music_TrainerVictory_branch_ebfb1: +.sub1: octave 2 note A_, 2 rest 2 diff --git a/audio/music/unioncave.asm b/audio/music/unioncave.asm index 858d88c77..d492b7dbf 100644 --- a/audio/music/unioncave.asm +++ b/audio/music/unioncave.asm @@ -12,12 +12,12 @@ Music_UnionCave_Ch1: pitch_offset 2 vibrato 24, 3, 4 stereo_panning FALSE, TRUE -Music_UnionCave_branch_f5c7b: +.mainloop: note_type 12, 11, 3 -Music_UnionCave_branch_f5c7e: - sound_call Music_UnionCave_branch_f5ccf - sound_loop 4, Music_UnionCave_branch_f5c7e -Music_UnionCave_branch_f5c85: +.loop1: + sound_call .sub1 + sound_loop 4, .loop1 +.loop2: octave 2 note G#, 2 octave 3 @@ -26,8 +26,8 @@ Music_UnionCave_branch_f5c85: note C#, 2 note E_, 2 note F_, 4 - sound_loop 8, Music_UnionCave_branch_f5c85 -Music_UnionCave_branch_f5c91: + sound_loop 8, .loop2 +.loop3: octave 2 note A_, 2 octave 3 @@ -36,7 +36,7 @@ Music_UnionCave_branch_f5c91: note D_, 2 note F_, 2 note F#, 4 - sound_loop 4, Music_UnionCave_branch_f5c91 + sound_loop 4, .loop3 rest 4 volume_envelope 8, 0 note F_, 16 @@ -55,17 +55,17 @@ Music_UnionCave_branch_f5c91: note A_, 8 volume_envelope 9, 5 pitch_offset 4 - sound_call Music_UnionCave_branch_f5ccf + sound_call .sub1 pitch_offset 8 - sound_call Music_UnionCave_branch_f5ccf + sound_call .sub1 pitch_offset 12 - sound_call Music_UnionCave_branch_f5ccf + sound_call .sub1 pitch_offset 16 - sound_call Music_UnionCave_branch_f5ccf + sound_call .sub1 pitch_offset 2 - sound_loop 0, Music_UnionCave_branch_f5c7b + sound_loop 0, .mainloop -Music_UnionCave_branch_f5ccf: +.sub1: octave 2 note G#, 2 octave 3 @@ -76,13 +76,13 @@ Music_UnionCave_branch_f5ccf: Music_UnionCave_Ch2: duty_cycle 3 vibrato 8, 2, 4 -Music_UnionCave_branch_f5cda: +.mainloop: note_type 12, 12, 4 - sound_call Music_UnionCave_branch_f5d34 + sound_call .sub1 volume_envelope 12, 5 - sound_call Music_UnionCave_branch_f5d34 + sound_call .sub1 volume_envelope 12, 7 - sound_call Music_UnionCave_branch_f5d34 + sound_call .sub1 volume_envelope 12, 4 note C#, 4 octave 3 @@ -124,17 +124,17 @@ Music_UnionCave_branch_f5cda: note A_, 16 volume_envelope 10, 5 vibrato 6, 4, 4 - sound_call Music_UnionCave_branch_f5d52 + sound_call .sub2 vibrato 4, 3, 3 - sound_call Music_UnionCave_branch_f5d52 + sound_call .sub2 vibrato 2, 2, 2 - sound_call Music_UnionCave_branch_f5d52 + sound_call .sub2 vibrato 1, 4, 1 - sound_call Music_UnionCave_branch_f5d52 + sound_call .sub2 vibrato 8, 2, 4 - sound_loop 0, Music_UnionCave_branch_f5cda + sound_loop 0, .mainloop -Music_UnionCave_branch_f5d34: +.sub1: octave 4 note C_, 4 octave 3 @@ -166,7 +166,7 @@ Music_UnionCave_branch_f5d34: note C_, 4 sound_ret -Music_UnionCave_branch_f5d52: +.sub2: octave 2 note G#, 2 octave 3 @@ -177,13 +177,14 @@ Music_UnionCave_branch_f5d52: Music_UnionCave_Ch3: note_type 12, 1, 6 stereo_panning TRUE, FALSE -Music_UnionCave_branch_f5d5d: +.mainloop: +.loop1: rest 16 - sound_loop 7, Music_UnionCave_branch_f5d5d + sound_loop 7, .loop1 rest 14 octave 4 note C_, 2 -Music_UnionCave_branch_f5d65: +.loop2: rest 2 octave 3 note E_, 2 @@ -194,8 +195,8 @@ Music_UnionCave_branch_f5d65: rest 2 octave 4 note C_, 2 - sound_loop 4, Music_UnionCave_branch_f5d65 -Music_UnionCave_branch_f5d73: + sound_loop 4, .loop2 +.loop3: rest 2 octave 3 note F_, 2 @@ -206,7 +207,7 @@ Music_UnionCave_branch_f5d73: rest 2 octave 4 note C#, 2 - sound_loop 4, Music_UnionCave_branch_f5d73 + sound_loop 4, .loop3 rest 4 note C_, 8 octave 3 @@ -219,7 +220,7 @@ Music_UnionCave_branch_f5d73: octave 3 note B_, 8 note A#, 8 -Music_UnionCave_branch_f5d8d: +.loop4: note A_, 4 note G_, 4 note A#, 2 @@ -228,19 +229,19 @@ Music_UnionCave_branch_f5d8d: octave 3 note A_, 2 note G_, 2 - sound_loop 3, Music_UnionCave_branch_f5d8d + sound_loop 3, .loop4 note A_, 4 note G_, 4 note A#, 8 -Music_UnionCave_branch_f5d9c: +.loop5: rest 16 - sound_loop 4, Music_UnionCave_branch_f5d9c - sound_loop 0, Music_UnionCave_branch_f5d5d + sound_loop 4, .loop5 + sound_loop 0, .mainloop Music_UnionCave_Ch4: toggle_noise 1 drum_speed 12 -Music_UnionCave_branch_f5da9: +.mainloop: stereo_panning TRUE, FALSE drum_note 5, 4 stereo_panning TRUE, TRUE @@ -255,5 +256,6 @@ Music_UnionCave_branch_f5da9: stereo_panning TRUE, FALSE drum_note 9, 4 rest 8 - sound_loop 0, Music_UnionCave_branch_f5da9 - sound_loop 0, Music_UnionCave_branch_f5da9 + sound_loop 0, .mainloop + + sound_loop 0, .mainloop ; unused diff --git a/audio/music/vermilioncity.asm b/audio/music/vermilioncity.asm index e5c4e6a93..26431ff32 100644 --- a/audio/music/vermilioncity.asm +++ b/audio/music/vermilioncity.asm @@ -4,7 +4,7 @@ Music_VermilionCity: channel 2, Music_VermilionCity_Ch2 channel 3, Music_VermilionCity_Ch3 - db $3 + db $3 ; unused Music_VermilionCity_Ch1: stereo_panning FALSE, TRUE @@ -30,20 +30,20 @@ Music_VermilionCity_Ch1: octave 5 note D_, 1 vibrato 16, 2, 3 -Music_VermilionCity_branch_eb6a0: +.mainloop: duty_cycle 1 note_type 12, 8, 5 - sound_call Music_VermilionCity_branch_eb6f9 + sound_call .sub1 note F_, 4 octave 4 note D_, 4 note C#, 4 note E_, 4 - sound_call Music_VermilionCity_branch_eb6f9 - sound_call Music_VermilionCity_branch_eb701 + sound_call .sub1 + sound_call .sub2 duty_cycle 2 note_type 12, 8, 5 - sound_call Music_VermilionCity_branch_eb6f9 + sound_call .sub1 note F_, 4 octave 4 note D_, 4 @@ -58,8 +58,8 @@ Music_VermilionCity_branch_eb6a0: note A_, 1 note E_, 1 note C_, 1 - sound_call Music_VermilionCity_branch_eb6f9 - sound_call Music_VermilionCity_branch_eb701 + sound_call .sub1 + sound_call .sub2 volume_envelope 9, 3 duty_cycle 0 rest 2 @@ -70,8 +70,8 @@ Music_VermilionCity_branch_eb6a0: note F#, 2 rest 2 note F#, 2 - sound_call Music_VermilionCity_branch_eb70c - sound_call Music_VermilionCity_branch_eb70c + sound_call .sub3 + sound_call .sub3 volume_envelope 8, 7 duty_cycle 2 octave 4 @@ -90,9 +90,9 @@ Music_VermilionCity_branch_eb6a0: note B_, 4 octave 3 note D_, 4 - sound_loop 0, Music_VermilionCity_branch_eb6a0 + sound_loop 0, .mainloop -Music_VermilionCity_branch_eb6f9: +.sub1: octave 3 note C#, 4 note E_, 4 @@ -102,7 +102,7 @@ Music_VermilionCity_branch_eb6f9: note G#, 2 sound_ret -Music_VermilionCity_branch_eb701: +.sub2: note D_, 2 note F_, 2 note A_, 2 @@ -115,7 +115,7 @@ Music_VermilionCity_branch_eb701: note E_, 2 sound_ret -Music_VermilionCity_branch_eb70c: +.sub3: rest 2 note F#, 2 note A_, 2 @@ -153,11 +153,11 @@ Music_VermilionCity_Ch2: note E_, 4 note F#, 4 note G#, 4 -Music_VermilionCity_branch_eb735: +.mainloop: note_type 12, 9, 7 - sound_call Music_VermilionCity_branch_eb768 + sound_call .sub1 note G#, 2 - sound_call Music_VermilionCity_branch_eb768 + sound_call .sub1 note E_, 2 volume_envelope 11, 7 octave 3 @@ -166,8 +166,8 @@ Music_VermilionCity_branch_eb735: note C#, 4 note D_, 4 note E_, 4 - sound_call Music_VermilionCity_branch_eb77e - sound_call Music_VermilionCity_branch_eb77e + sound_call .sub2 + sound_call .sub2 note F#, 6 note E_, 1 note F#, 1 @@ -186,9 +186,9 @@ Music_VermilionCity_branch_eb735: note_type 12, 8, 7 octave 5 note E_, 16 - sound_loop 0, Music_VermilionCity_branch_eb735 + sound_loop 0, .mainloop -Music_VermilionCity_branch_eb768: +.sub1: octave 1 note A_, 8 octave 2 @@ -212,7 +212,7 @@ Music_VermilionCity_branch_eb768: note A_, 2 sound_ret -Music_VermilionCity_branch_eb77e: +.sub2: note F#, 8 note B_, 8 note A_, 4 @@ -242,15 +242,15 @@ Music_VermilionCity_Ch3: note D_, 1 octave 2 note B_, 1 -Music_VermilionCity_branch_eb79e: +.mainloop: note_type 12, 2, 2 - sound_call Music_VermilionCity_branch_eb7de + sound_call .sub1 octave 5 note A_, 6 volume_envelope 2, 4 note E_, 1 note G#, 1 - sound_call Music_VermilionCity_branch_eb7de + sound_call .sub1 note A_, 8 volume_envelope 1, 4 octave 3 @@ -264,14 +264,14 @@ Music_VermilionCity_branch_eb79e: rest 4 note D_, 1 note D_, 1 - sound_call Music_VermilionCity_branch_eb7f5 + sound_call .sub2 octave 4 note D_, 2 octave 3 note D_, 2 rest 2 note D_, 2 - sound_call Music_VermilionCity_branch_eb7f5 + sound_call .sub2 volume_envelope 2, 5 octave 3 note E_, 8 @@ -289,9 +289,9 @@ Music_VermilionCity_branch_eb79e: octave 5 note E_, 1 note G#, 1 - sound_loop 0, Music_VermilionCity_branch_eb79e + sound_loop 0, .mainloop -Music_VermilionCity_branch_eb7de: +.sub1: octave 5 note A_, 8 octave 6 @@ -316,7 +316,7 @@ Music_VermilionCity_branch_eb7de: note B_, 1 sound_ret -Music_VermilionCity_branch_eb7f5: +.sub2: note A_, 1 rest 1 note A_, 2 diff --git a/audio/music/victoryroad.asm b/audio/music/victoryroad.asm index 4676522e3..ff602cee4 100644 --- a/audio/music/victoryroad.asm +++ b/audio/music/victoryroad.asm @@ -12,10 +12,11 @@ Music_VictoryRoad_Ch1: duty_cycle 3 pitch_offset 2 note_type 12, 11, 3 -Music_VictoryRoad_branch_f6c8d: - sound_call Music_VictoryRoad_branch_f6cb9 - sound_loop 6, Music_VictoryRoad_branch_f6c8d -Music_VictoryRoad_branch_f6c94: +.mainloop: +.loop1: + sound_call .sub1 + sound_loop 6, .loop1 +.loop2: volume_envelope 11, 2 octave 2 note A_, 1 @@ -36,13 +37,13 @@ Music_VictoryRoad_branch_f6c94: note A_, 1 octave 3 note G#, 3 - sound_loop 2, Music_VictoryRoad_branch_f6c94 -Music_VictoryRoad_branch_f6cae: - sound_call Music_VictoryRoad_branch_f6cb9 - sound_loop 2, Music_VictoryRoad_branch_f6cae - sound_loop 0, Music_VictoryRoad_branch_f6c8d + sound_loop 2, .loop2 +.loop3: + sound_call .sub1 + sound_loop 2, .loop3 + sound_loop 0, .mainloop -Music_VictoryRoad_branch_f6cb9: +.sub1: volume_envelope 11, 2 octave 2 note G_, 1 @@ -66,11 +67,11 @@ Music_VictoryRoad_branch_f6cb9: Music_VictoryRoad_Ch2: duty_cycle 3 vibrato 16, 2, 4 -Music_VictoryRoad_branch_f6cd3: +.mainloop: note_type 12, 12, 2 - sound_call Music_VictoryRoad_branch_f6d1e + sound_call .sub1 rest 2 - sound_call Music_VictoryRoad_branch_f6d1e + sound_call .sub1 rest 1 octave 4 note C_, 1 @@ -116,9 +117,9 @@ Music_VictoryRoad_branch_f6cd3: octave 5 note C#, 1 note D_, 16 - sound_loop 0, Music_VictoryRoad_branch_f6cd3 + sound_loop 0, .mainloop -Music_VictoryRoad_branch_f6d1e: +.sub1: octave 3 note E_, 1 rest 1 @@ -137,10 +138,11 @@ Music_VictoryRoad_branch_f6d1e: Music_VictoryRoad_Ch3: stereo_panning TRUE, FALSE note_type 12, 2, 8 -Music_VictoryRoad_branch_f6d31: - sound_call Music_VictoryRoad_branch_f6d52 - sound_loop 6, Music_VictoryRoad_branch_f6d31 -Music_VictoryRoad_branch_f6d38: +.mainloop: +.loop1: + sound_call .sub1 + sound_loop 6, .loop1 +.loop2: note D_, 1 rest 1 note B_, 1 @@ -152,13 +154,13 @@ Music_VictoryRoad_branch_f6d38: rest 2 note D_, 1 note B_, 3 - sound_loop 2, Music_VictoryRoad_branch_f6d38 -Music_VictoryRoad_branch_f6d47: - sound_call Music_VictoryRoad_branch_f6d52 - sound_loop 2, Music_VictoryRoad_branch_f6d47 - sound_loop 0, Music_VictoryRoad_branch_f6d31 + sound_loop 2, .loop2 +.loop3: + sound_call .sub1 + sound_loop 2, .loop3 + sound_loop 0, .mainloop -Music_VictoryRoad_branch_f6d52: +.sub1: octave 3 note C_, 1 rest 1 @@ -176,7 +178,7 @@ Music_VictoryRoad_branch_f6d52: Music_VictoryRoad_Ch4: toggle_noise 0 drum_speed 12 -Music_VictoryRoad_branch_f6d63: +.mainloop: drum_note 3, 2 drum_note 3, 2 drum_note 4, 1 @@ -195,4 +197,4 @@ Music_VictoryRoad_branch_f6d63: drum_note 4, 1 drum_note 3, 2 drum_note 4, 1 - sound_loop 0, Music_VictoryRoad_branch_f6d63 + sound_loop 0, .mainloop diff --git a/audio/music/violetcity.asm b/audio/music/violetcity.asm index 435ff34ef..44c1b7e34 100644 --- a/audio/music/violetcity.asm +++ b/audio/music/violetcity.asm @@ -65,7 +65,7 @@ Music_VioletCity_Ch1: octave 3 note C#, 12 rest 8 -Music_VioletCity_branch_f0056: +.mainloop: note_type 6, 9, 5 rest 4 octave 2 @@ -295,7 +295,7 @@ Music_VioletCity_branch_f0056: octave 4 note C#, 4 rest 4 - sound_loop 0, Music_VioletCity_branch_f0056 + sound_loop 0, .mainloop Music_VioletCity_Ch2: vibrato 18, 2, 4 @@ -348,7 +348,7 @@ Music_VioletCity_Ch2: rest 2 note D#, 1 note E_, 1 -Music_VioletCity_branch_f0199: +.mainloop: volume_envelope 11, 7 note F#, 4 rest 2 @@ -501,7 +501,7 @@ Music_VioletCity_branch_f0199: rest 2 note D#, 1 note E_, 1 - sound_loop 0, Music_VioletCity_branch_f0199 + sound_loop 0, .mainloop Music_VioletCity_Ch3: note_type 12, 2, 5 @@ -528,7 +528,7 @@ Music_VioletCity_Ch3: note F#, 2 octave 2 note A#, 2 -Music_VioletCity_branch_f0261: +.mainloop: note_type 12, 2, 5 note B_, 1 rest 5 @@ -624,7 +624,7 @@ Music_VioletCity_branch_f0261: note B_, 2 rest 2 note A_, 8 - sound_call Music_VioletCity_branch_f0311 + sound_call .sub1 note F#, 2 rest 10 note B_, 2 @@ -634,7 +634,7 @@ Music_VioletCity_branch_f0261: note A#, 8 note A_, 2 rest 2 - sound_call Music_VioletCity_branch_f0311 + sound_call .sub1 note F#, 2 rest 10 note B_, 2 @@ -689,9 +689,9 @@ Music_VioletCity_branch_f0261: rest 4 octave 2 note A#, 4 - sound_loop 0, Music_VioletCity_branch_f0261 + sound_loop 0, .mainloop -Music_VioletCity_branch_f0311: +.sub1: note G_, 2 rest 10 note G_, 2 @@ -716,35 +716,35 @@ Music_VioletCity_Ch4: drum_note 3, 2 drum_note 3, 4 drum_note 7, 4 - sound_call Music_VioletCity_branch_f036c - sound_call Music_VioletCity_branch_f036c - sound_call Music_VioletCity_branch_f036c + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 drum_note 3, 2 drum_note 4, 1 drum_note 4, 1 drum_note 3, 2 drum_note 1, 8 drum_note 4, 2 -Music_VioletCity_branch_f0338: - sound_call Music_VioletCity_branch_f037a - sound_call Music_VioletCity_branch_f037a - sound_call Music_VioletCity_branch_f037a - sound_call Music_VioletCity_branch_f037a - sound_call Music_VioletCity_branch_f037a - sound_call Music_VioletCity_branch_f037a - sound_call Music_VioletCity_branch_f037a - sound_call Music_VioletCity_branch_f037a - sound_call Music_VioletCity_branch_f037a - sound_call Music_VioletCity_branch_f037a - sound_call Music_VioletCity_branch_f037a - sound_call Music_VioletCity_branch_f037a - sound_call Music_VioletCity_branch_f037a - sound_call Music_VioletCity_branch_f037a - sound_call Music_VioletCity_branch_f037a - sound_call Music_VioletCity_branch_f037a - sound_loop 0, Music_VioletCity_branch_f0338 +.mainloop: + 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_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 -Music_VioletCity_branch_f036c: +.sub1: drum_note 3, 1 drum_note 3, 1 drum_note 4, 1 @@ -760,7 +760,7 @@ Music_VioletCity_branch_f036c: drum_note 8, 1 sound_ret -Music_VioletCity_branch_f037a: +.sub2: drum_note 4, 2 drum_note 8, 1 drum_note 8, 1 diff --git a/audio/music/viridiancity.asm b/audio/music/viridiancity.asm index 8009497df..6bc720068 100644 --- a/audio/music/viridiancity.asm +++ b/audio/music/viridiancity.asm @@ -42,13 +42,13 @@ Music_ViridianCity_Ch1: rest 4 note G_, 8 rest 4 -Music_ViridianCity_branch_f4039: - sound_call Music_ViridianCity_branch_f40c5 +.mainloop: + sound_call .sub1 rest 4 - sound_call Music_ViridianCity_branch_f40c5 + sound_call .sub1 octave 4 note C_, 4 - sound_call Music_ViridianCity_branch_f410f + sound_call .sub2 octave 4 note B_, 2 note G_, 2 @@ -118,7 +118,7 @@ Music_ViridianCity_branch_f4039: octave 3 note B_, 2 note A_, 2 - sound_call Music_ViridianCity_branch_f410f + sound_call .sub2 octave 4 note A_, 2 note G_, 2 @@ -169,9 +169,9 @@ Music_ViridianCity_branch_f4039: rest 3 note G_, 8 note A#, 4 - sound_loop 0, Music_ViridianCity_branch_f4039 + sound_loop 0, .mainloop -Music_ViridianCity_branch_f40c5: +.sub1: octave 3 note A_, 1 rest 3 @@ -247,7 +247,7 @@ Music_ViridianCity_branch_f40c5: note G_, 8 sound_ret -Music_ViridianCity_branch_f410f: +.sub2: octave 3 note B_, 2 note D_, 2 @@ -305,13 +305,13 @@ Music_ViridianCity_Ch2: rest 4 note E_, 8 rest 4 -Music_ViridianCity_branch_f414c: - sound_call Music_ViridianCity_branch_f41c0 +.mainloop: + sound_call .sub1 rest 4 - sound_call Music_ViridianCity_branch_f41c0 + sound_call .sub1 octave 2 note F#, 4 - sound_call Music_ViridianCity_branch_f4201 + sound_call .sub2 note G_, 4 rest 2 octave 3 @@ -324,7 +324,7 @@ Music_ViridianCity_branch_f414c: note D_, 4 octave 2 note B_, 2 - sound_call Music_ViridianCity_branch_f420b + sound_call .sub3 rest 2 note F#, 2 rest 2 @@ -333,7 +333,7 @@ Music_ViridianCity_branch_f414c: rest 1 note C#, 4 note C_, 4 - sound_call Music_ViridianCity_branch_f4215 + sound_call .sub4 note E_, 4 rest 2 note B_, 1 @@ -360,7 +360,7 @@ Music_ViridianCity_branch_f414c: octave 2 note A_, 2 note F#, 2 - sound_call Music_ViridianCity_branch_f4201 + sound_call .sub2 note G_, 4 rest 2 note B_, 1 @@ -369,7 +369,7 @@ Music_ViridianCity_branch_f414c: rest 1 note B_, 4 note G_, 2 - sound_call Music_ViridianCity_branch_f420b + sound_call .sub3 rest 2 note F#, 2 rest 2 @@ -380,7 +380,7 @@ Music_ViridianCity_branch_f414c: rest 2 octave 2 note D#, 2 - sound_call Music_ViridianCity_branch_f4215 + sound_call .sub4 note E_, 4 rest 2 note A#, 1 @@ -402,9 +402,9 @@ Music_ViridianCity_branch_f414c: note E_, 8 octave 1 note A_, 4 - sound_loop 0, Music_ViridianCity_branch_f414c + sound_loop 0, .mainloop -Music_ViridianCity_branch_f41c0: +.sub1: octave 2 note D_, 4 rest 2 @@ -471,7 +471,7 @@ Music_ViridianCity_branch_f41c0: note E_, 8 sound_ret -Music_ViridianCity_branch_f4201: +.sub2: note G_, 4 rest 2 octave 3 @@ -483,7 +483,7 @@ Music_ViridianCity_branch_f4201: note F#, 2 sound_ret -Music_ViridianCity_branch_f420b: +.sub3: note F#, 4 rest 2 octave 3 @@ -495,7 +495,7 @@ Music_ViridianCity_branch_f420b: note F_, 2 sound_ret -Music_ViridianCity_branch_f4215: +.sub4: octave 2 note E_, 4 rest 2 @@ -542,13 +542,13 @@ Music_ViridianCity_Ch3: note D_, 8 note F#, 2 note G_, 2 -Music_ViridianCity_branch_f4246: +.mainloop: volume_envelope 1, 3 - sound_call Music_ViridianCity_branch_f42a2 + sound_call .sub1 octave 5 note F#, 2 note G_, 2 - sound_call Music_ViridianCity_branch_f42a2 + sound_call .sub1 note E_, 4 vibrato 24, 2, 5 volume_envelope 2, 5 @@ -623,9 +623,9 @@ Music_ViridianCity_branch_f4246: rest 3 note D_, 8 note E_, 4 - sound_loop 0, Music_ViridianCity_branch_f4246 + sound_loop 0, .mainloop -Music_ViridianCity_branch_f42a2: +.sub1: octave 5 note A_, 2 rest 2 @@ -691,28 +691,28 @@ Music_ViridianCity_branch_f42a2: Music_ViridianCity_Ch4: toggle_noise 3 drum_speed 12 - sound_call Music_ViridianCity_branch_f431d - sound_call Music_ViridianCity_branch_f432c -Music_ViridianCity_branch_f42e9: - sound_call Music_ViridianCity_branch_f431d - sound_call Music_ViridianCity_branch_f431d - sound_call Music_ViridianCity_branch_f431d - sound_call Music_ViridianCity_branch_f432c - sound_call Music_ViridianCity_branch_f431d - sound_call Music_ViridianCity_branch_f431d - sound_call Music_ViridianCity_branch_f431d - sound_call Music_ViridianCity_branch_f432c - sound_call Music_ViridianCity_branch_f433b - sound_call Music_ViridianCity_branch_f434b - sound_call Music_ViridianCity_branch_f433b - sound_call Music_ViridianCity_branch_f433b - sound_call Music_ViridianCity_branch_f433b - sound_call Music_ViridianCity_branch_f434b - sound_call Music_ViridianCity_branch_f433b - sound_call Music_ViridianCity_branch_f433b - sound_loop 0, Music_ViridianCity_branch_f42e9 + sound_call .sub1 + sound_call .sub2 +.mainloop: + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 + sound_call .sub3 + sound_call .sub4 + sound_call .sub3 + sound_call .sub3 + sound_call .sub3 + sound_call .sub4 + sound_call .sub3 + sound_call .sub3 + sound_loop 0, .mainloop -Music_ViridianCity_branch_f431d: +.sub1: drum_note 5, 2 drum_note 5, 2 drum_note 3, 2 @@ -729,7 +729,7 @@ Music_ViridianCity_branch_f431d: drum_note 7, 2 sound_ret -Music_ViridianCity_branch_f432c: +.sub2: drum_note 5, 2 drum_note 5, 2 drum_note 3, 2 @@ -746,7 +746,7 @@ Music_ViridianCity_branch_f432c: drum_note 11, 2 sound_ret -Music_ViridianCity_branch_f433b: +.sub3: drum_note 4, 2 drum_note 7, 2 drum_note 3, 2 @@ -764,7 +764,7 @@ Music_ViridianCity_branch_f433b: drum_note 4, 2 sound_ret -Music_ViridianCity_branch_f434b: +.sub4: drum_note 4, 2 drum_note 7, 2 drum_note 3, 2 diff --git a/audio/music/wildpokemonvictory.asm b/audio/music/wildpokemonvictory.asm index bec963320..95159517f 100644 --- a/audio/music/wildpokemonvictory.asm +++ b/audio/music/wildpokemonvictory.asm @@ -17,32 +17,32 @@ Music_WildPokemonVictory_Ch1: note F#, 1 volume_envelope 11, 6 note E_, 12 -Music_SuccessfulCapture_branch_f4536: +.body: stereo_panning FALSE, TRUE -Music_WildPokemonVictory_branch_f4538: - sound_call Music_WildPokemonVictory_branch_f455c +.mainloop: + sound_call .sub1 note F#, 2 note F#, 2 note F#, 4 - sound_call Music_WildPokemonVictory_branch_f455c + sound_call .sub1 note G#, 4 volume_envelope 7, 8 octave 3 note G_, 4 transpose 0, 1 - sound_call Music_WildPokemonVictory_branch_f455c + sound_call .sub1 note F#, 2 note F#, 2 note F#, 4 - sound_call Music_WildPokemonVictory_branch_f455c + sound_call .sub1 note G#, 4 transpose 0, 0 volume_envelope 7, 8 octave 3 note F#, 4 - sound_loop 0, Music_WildPokemonVictory_branch_f4538 + sound_loop 0, .mainloop -Music_WildPokemonVictory_branch_f455c: +.sub1: volume_envelope 7, 1 octave 3 note G#, 1 @@ -79,15 +79,15 @@ Music_WildPokemonVictory_Ch2: note A_, 1 volume_envelope 13, 6 note B_, 12 -Music_SuccessfulCapture_branch_f4585: +.body: stereo_panning TRUE, FALSE -Music_WildPokemonVictory_branch_f4587: - sound_call Music_WildPokemonVictory_branch_f45b5 +.mainloop: + sound_call .sub1 octave 4 note B_, 2 note B_, 2 note B_, 4 - sound_call Music_WildPokemonVictory_branch_f45b5 + sound_call .sub1 octave 4 note B_, 4 volume_envelope 8, 1 @@ -96,12 +96,12 @@ Music_WildPokemonVictory_branch_f4587: note G_, 1 note A#, 1 transpose 0, 1 - sound_call Music_WildPokemonVictory_branch_f45b5 + sound_call .sub1 octave 4 note B_, 2 note B_, 2 note B_, 4 - sound_call Music_WildPokemonVictory_branch_f45b5 + sound_call .sub1 octave 4 note B_, 4 transpose 0, 0 @@ -112,9 +112,9 @@ Music_WildPokemonVictory_branch_f4587: note D#, 1 note F#, 1 note A_, 1 - sound_loop 0, Music_WildPokemonVictory_branch_f4587 + sound_loop 0, .mainloop -Music_WildPokemonVictory_branch_f45b5: +.sub1: volume_envelope 8, 1 octave 4 note B_, 2 @@ -140,34 +140,34 @@ Music_WildPokemonVictory_Ch3: rest 3 note E_, 1 rest 3 -Music_SuccessfulCapture_branch_f45cf: -Music_WildPokemonVictory_branch_f45cf: - sound_call Music_WildPokemonVictory_branch_f45f4 +.body: +.mainloop: + sound_call .sub1 note D#, 2 note C#, 2 octave 2 note B_, 2 rest 2 - sound_call Music_WildPokemonVictory_branch_f45f4 + sound_call .sub1 note E_, 2 rest 2 note C_, 4 transpose 0, 1 - sound_call Music_WildPokemonVictory_branch_f45f4 + sound_call .sub1 note D#, 2 note C#, 2 octave 2 note B_, 2 rest 2 - sound_call Music_WildPokemonVictory_branch_f45f4 + sound_call .sub1 note E_, 2 rest 2 transpose 0, 0 octave 2 note B_, 4 - sound_loop 0, Music_WildPokemonVictory_branch_f45cf + sound_loop 0, .mainloop -Music_WildPokemonVictory_branch_f45f4: +.sub1: volume_envelope 2, 5 octave 3 note E_, 2 diff --git a/data/moves/animations.asm b/data/moves/animations.asm index 3b069efed..51332de4f 100644 --- a/data/moves/animations.asm +++ b/data/moves/animations.asm @@ -481,7 +481,7 @@ BattleAnim_SendOutMon: BattleAnim_ReturnMon: anim_sound 0, 0, SFX_BALL_POOF -BattleAnim_BatonPass_branch_c9486: +.anim: anim_bgeffect ANIM_BG_RETURN_MON, $0, $1, $0 anim_wait 32 anim_ret @@ -679,7 +679,7 @@ BattleAnim_KarateChop: BattleAnim_Doubleslap: anim_1gfx ANIM_GFX_HIT - anim_if_param_equal $1, BattleAnim_Doubleslap_branch_c961b + anim_if_param_equal $1, .alternate anim_sound 0, 1, SFX_DOUBLESLAP anim_obj ANIM_OBJ_08, 144, 48, $0 anim_wait 6 @@ -687,7 +687,7 @@ BattleAnim_Doubleslap: anim_wait 8 anim_ret -BattleAnim_Doubleslap_branch_c961b: +.alternate: anim_sound 0, 1, SFX_DOUBLESLAP anim_obj ANIM_OBJ_08, 120, 48, $0 anim_wait 6 @@ -697,7 +697,7 @@ BattleAnim_Doubleslap_branch_c961b: BattleAnim_CometPunch: anim_1gfx ANIM_GFX_HIT - anim_if_param_equal $1, BattleAnim_CometPunch_branch_c9641 + anim_if_param_equal $1, .alternate anim_sound 0, 1, SFX_COMET_PUNCH anim_obj ANIM_OBJ_06, 144, 48, $0 anim_wait 6 @@ -705,7 +705,7 @@ BattleAnim_CometPunch: anim_wait 8 anim_ret -BattleAnim_CometPunch_branch_c9641: +.alternate: anim_sound 0, 1, SFX_COMET_PUNCH anim_obj ANIM_OBJ_06, 120, 64, $0 anim_wait 6 @@ -713,7 +713,6 @@ BattleAnim_CometPunch_branch_c9641: anim_wait 8 anim_ret -BattleAnim_Bide_branch_c9651: BattleAnim_MegaPunch: anim_1gfx ANIM_GFX_HIT anim_bgeffect ANIM_BG_1F, $40, $2, $0 @@ -750,7 +749,7 @@ BattleAnim_Stomp: BattleAnim_DoubleKick: anim_1gfx ANIM_GFX_HIT - anim_if_param_equal $1, BattleAnim_DoubleKick_branch_c96bd + anim_if_param_equal $1, .alternate anim_sound 0, 1, SFX_DOUBLE_KICK anim_obj ANIM_OBJ_07, 144, 48, $0 anim_wait 6 @@ -758,7 +757,7 @@ BattleAnim_DoubleKick: anim_wait 8 anim_ret -BattleAnim_DoubleKick_branch_c96bd: +.alternate: anim_sound 0, 1, SFX_DOUBLE_KICK anim_obj ANIM_OBJ_07, 120, 64, $0 anim_wait 6 @@ -768,7 +767,7 @@ BattleAnim_DoubleKick_branch_c96bd: BattleAnim_JumpKick: anim_1gfx ANIM_GFX_HIT - anim_if_param_equal $1, BattleAnim_JumpKick_branch_c96f1 + anim_if_param_equal $1, .alternate anim_sound 0, 1, SFX_JUMP_KICK anim_obj ANIM_OBJ_07, 112, 72, $0 anim_obj ANIM_OBJ_07, 100, 60, $0 @@ -780,7 +779,7 @@ BattleAnim_JumpKick: anim_wait 16 anim_ret -BattleAnim_JumpKick_branch_c96f1: +.alternate: anim_wait 8 anim_sound 0, 0, SFX_DOUBLE_KICK anim_obj ANIM_OBJ_04, 44, 88, $0 @@ -790,7 +789,7 @@ BattleAnim_JumpKick_branch_c96f1: BattleAnim_HiJumpKick: anim_1gfx ANIM_GFX_HIT anim_bgeffect ANIM_BG_1F, $40, $2, $0 - anim_if_param_equal $1, BattleAnim_HiJumpKick_branch_c971e + anim_if_param_equal $1, .alternate anim_wait 32 anim_sound 0, 1, SFX_JUMP_KICK anim_obj ANIM_OBJ_07, 112, 72, $0 @@ -801,7 +800,7 @@ BattleAnim_HiJumpKick: anim_wait 16 anim_ret -BattleAnim_HiJumpKick_branch_c971e: +.alternate: anim_wait 16 anim_sound 0, 0, SFX_DOUBLE_KICK anim_obj ANIM_OBJ_04, 44, 88, $0 @@ -882,7 +881,7 @@ BattleAnim_Ember: BattleAnim_FirePunch: anim_2gfx ANIM_GFX_HIT, ANIM_GFX_FIRE anim_obj ANIM_OBJ_0A, 136, 56, $43 - anim_call BattleAnim_FirePunch_branch_cbbcc + anim_call BattleAnimSub_Fire anim_wait 16 anim_ret @@ -978,7 +977,7 @@ BattleAnim_FireBlast: BattleAnim_IcePunch: anim_2gfx ANIM_GFX_HIT, ANIM_GFX_ICE anim_obj ANIM_OBJ_0A, 136, 56, $43 - anim_call BattleAnim_IcePunch_branch_cbbdf + anim_call BattleAnimSub_Ice anim_wait 32 anim_ret @@ -1231,7 +1230,7 @@ BattleAnim_Solarbeam: .FireSolarBeam anim_1gfx ANIM_GFX_BEAM anim_bgeffect ANIM_BG_06, $0, $2, $0 - anim_call BattleAnim_Solarbeam_branch_cbb39 + anim_call BattleAnimSub_Beam anim_wait 48 anim_ret @@ -1291,7 +1290,7 @@ BattleAnim_Thunder: anim_ret BattleAnim_RazorWind: - anim_if_param_equal $1, BattleAnim_RazorWind_branch_c9fb5 + anim_if_param_equal $1, BattleAnim_FocusEnergy anim_1gfx ANIM_GFX_WHIP anim_bgeffect ANIM_BG_06, $0, $1, $0 .loop @@ -1357,12 +1356,12 @@ BattleAnim_Selfdestruct: anim_1gfx ANIM_GFX_EXPLOSION anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $8, $24 anim_if_param_equal $1, .loop - anim_call BattleAnim_Selfdestruct_branch_cbb8f + anim_call BattleAnimSub_Explosion2 anim_wait 16 anim_ret .loop - anim_call BattleAnim_Selfdestruct_branch_cbb62 + anim_call BattleAnimSub_Explosion1 anim_wait 5 anim_bgeffect ANIM_BG_HIDE_MON, $0, $1, $0 anim_loop 2, .loop @@ -1374,12 +1373,12 @@ BattleAnim_Explosion: anim_bgeffect ANIM_BG_1F, $60, $4, $10 anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $8, $24 anim_if_param_equal $1, .loop - anim_call BattleAnim_Explosion_branch_cbb8f + anim_call BattleAnimSub_Explosion2 anim_wait 16 anim_ret .loop - anim_call BattleAnim_Explosion_branch_cbb62 + anim_call BattleAnimSub_Explosion1 anim_wait 5 anim_bgeffect ANIM_BG_HIDE_MON, $0, $1, $0 anim_loop 2, .loop @@ -1388,7 +1387,7 @@ BattleAnim_Explosion: BattleAnim_Acid: anim_1gfx ANIM_GFX_POISON - anim_call BattleAnim_Acid_branch_cbc35 + anim_call BattleAnimSub_Acid anim_wait 64 anim_ret @@ -1483,7 +1482,7 @@ BattleAnim_HyperBeam: anim_bgeffect ANIM_BG_1F, $30, $4, $10 anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $8, $40 anim_bgeffect ANIM_BG_06, $0, $2, $0 - anim_call BattleAnim_HyperBeam_branch_cbb39 + anim_call BattleAnimSub_Beam anim_wait 48 anim_ret @@ -1492,7 +1491,7 @@ BattleAnim_AuroraBeam: anim_bgeffect ANIM_BG_06, $0, $2, $0 anim_bgeffect ANIM_BG_ALTERNATE_HUES, $0, $2, $0 anim_wait 64 - anim_call BattleAnim_AuroraBeam_branch_cbb39 + anim_call BattleAnimSub_Beam anim_wait 48 anim_incobj 5 anim_wait 64 @@ -1517,7 +1516,7 @@ BattleAnim_Scratch: BattleAnim_FurySwipes: anim_1gfx ANIM_GFX_CUT - anim_if_param_equal $1, BattleAnim_FurySwipes_branch_c9dd9 + anim_if_param_equal $1, .alternate anim_sound 0, 1, SFX_SCRATCH anim_obj ANIM_OBJ_37, 144, 48, $0 anim_obj ANIM_OBJ_37, 140, 44, $0 @@ -1526,7 +1525,7 @@ BattleAnim_FurySwipes: anim_wait 32 anim_ret -BattleAnim_FurySwipes_branch_c9dd9: +.alternate: anim_sound 0, 1, SFX_SCRATCH anim_obj ANIM_OBJ_38, 120, 48, $0 anim_obj ANIM_OBJ_38, 124, 44, $0 @@ -1586,27 +1585,27 @@ BattleAnim_Teleport: anim_incbgeffect ANIM_BG_TELEPORT anim_call BattleAnim_ShowMon_0 anim_bgeffect ANIM_BG_06, $0, $1, $0 - anim_call BattleAnim_Teleport_branch_cbb12 + anim_call BattleAnimSub_WarpAway anim_wait 64 anim_ret BattleAnim_Fly: - anim_if_param_equal $1, BattleAnim_Fly_branch_c9e89 - anim_if_param_equal $2, BattleAnim_Fly_branch_c9e82 + anim_if_param_equal $1, .turn1 + anim_if_param_equal $2, .miss anim_1gfx ANIM_GFX_HIT anim_sound 0, 1, SFX_WING_ATTACK anim_obj ANIM_OBJ_01, 136, 56, $0 anim_wait 32 -BattleAnim_Fly_branch_c9e82: +.miss: anim_bgeffect ANIM_BG_SHOW_MON, $0, $1, $0 anim_wait 32 anim_ret -BattleAnim_Fly_branch_c9e89: +.turn1: anim_1gfx ANIM_GFX_SPEED anim_bgeffect ANIM_BG_06, $0, $1, $0 anim_bgeffect ANIM_BG_HIDE_MON, $0, $1, $0 - anim_call BattleAnim_Fly_branch_cbb12 + anim_call BattleAnimSub_WarpAway anim_wait 64 anim_ret @@ -1726,9 +1725,6 @@ BattleAnim_Softboiled: anim_ret BattleAnim_FocusEnergy: -BattleAnim_RazorWind_branch_c9fb5: -BattleAnim_SkullBash_branch_c9fb5: -BattleAnim_SkyAttack_branch_c9fb5: anim_1gfx ANIM_GFX_SPEED anim_call BattleAnim_TargetObj_1Row anim_bgeffect ANIM_BG_16, $0, $1, $40 @@ -1756,7 +1752,7 @@ BattleAnim_SkyAttack_branch_c9fb5: anim_ret BattleAnim_Bide: - anim_if_param_equal $0, BattleAnim_Bide_branch_c9651 + anim_if_param_equal $0, BattleAnim_MegaPunch anim_1gfx ANIM_GFX_HIT anim_call BattleAnim_TargetObj_1Row anim_sound 0, 0, SFX_ESCAPE_ROPE @@ -1844,7 +1840,7 @@ BattleAnim_Growl: anim_bgeffect ANIM_BG_06, $0, $2, $0 anim_cry $0 .loop - anim_call BattleAnim_Growl_branch_cbbbc + anim_call BattleAnimSub_Sound anim_wait 16 anim_loop 3, .loop anim_wait 9 @@ -1865,7 +1861,7 @@ BattleAnim_Roar: anim_bgeffect ANIM_BG_06, $0, $2, $0 anim_cry $1 .loop - anim_call BattleAnim_Roar_branch_cbbbc + anim_call BattleAnimSub_Sound anim_wait 16 anim_loop 3, .loop anim_wait 16 @@ -1919,7 +1915,7 @@ BattleAnim_ConfuseRay: BattleAnim_Leer: anim_1gfx ANIM_GFX_BEAM anim_bgeffect ANIM_BG_06, $0, $2, $0 - anim_call BattleAnim_Leer_branch_cbadc + anim_call BattleAnimSub_ShakeEnemy anim_wait 16 anim_ret @@ -2045,7 +2041,7 @@ BattleAnim_Dig: BattleAnim_SandAttack: anim_1gfx ANIM_GFX_SAND - anim_call BattleAnim_SandAttack_branch_cbc5b + anim_call BattleAnimSub_SandOrMud anim_ret BattleAnim_StringShot: @@ -2452,7 +2448,7 @@ BattleAnim_Crabhammer: anim_ret BattleAnim_SkullBash: - anim_if_param_equal $1, BattleAnim_SkullBash_branch_c9fb5 + anim_if_param_equal $1, BattleAnim_FocusEnergy anim_1gfx ANIM_GFX_HIT anim_bgeffect ANIM_BG_1F, $14, $2, $0 anim_wait 32 @@ -2552,9 +2548,9 @@ BattleAnim_Flash: BattleAnim_Substitute: anim_sound 0, 0, SFX_SURF - anim_if_param_equal $3, BattleAnim_Substitute_branch_ca77c - anim_if_param_equal $2, BattleAnim_Substitute_branch_ca76e - anim_if_param_equal $1, BattleAnim_Substitute_branch_ca760 + anim_if_param_equal $3, .dropsub2 + anim_if_param_equal $2, .raisesub + anim_if_param_equal $1, .dropsub anim_1gfx ANIM_GFX_SMOKE anim_bgeffect ANIM_BG_27, $0, $1, $0 anim_wait 48 @@ -2564,7 +2560,7 @@ BattleAnim_Substitute: anim_wait 32 anim_ret -BattleAnim_Substitute_branch_ca760: +.dropsub: anim_bgeffect ANIM_BG_27, $0, $1, $0 anim_wait 48 anim_dropsub @@ -2572,7 +2568,7 @@ BattleAnim_Substitute_branch_ca760: anim_wait 32 anim_ret -BattleAnim_Substitute_branch_ca76e: +.raisesub: anim_bgeffect ANIM_BG_27, $0, $1, $0 anim_wait 48 anim_raisesub @@ -2580,7 +2576,7 @@ BattleAnim_Substitute_branch_ca76e: anim_wait 32 anim_ret -BattleAnim_Substitute_branch_ca77c: +.dropsub2: anim_bgeffect ANIM_BG_HIDE_MON, $0, $1, $0 anim_wait 48 anim_dropsub @@ -2602,7 +2598,7 @@ BattleAnim_Minimize: anim_ret BattleAnim_SkyAttack: - anim_if_param_equal $1, BattleAnim_SkyAttack_branch_c9fb5 + anim_if_param_equal $1, BattleAnim_FocusEnergy anim_1gfx ANIM_GFX_SKY_ATTACK anim_bgeffect ANIM_BG_27, $0, $1, $0 anim_wait 32 @@ -2642,9 +2638,9 @@ BattleAnim_Lick: BattleAnim_TriAttack: anim_3gfx ANIM_GFX_FIRE, ANIM_GFX_ICE, ANIM_GFX_LIGHTNING - anim_call BattleAnim_TriAttack_branch_cbbcc + anim_call BattleAnimSub_Fire anim_wait 16 - anim_call BattleAnim_TriAttack_branch_cbbdf + anim_call BattleAnimSub_Ice anim_wait 16 anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $4, $4 anim_sound 0, 1, SFX_THUNDER @@ -2683,7 +2679,7 @@ BattleAnim_DreamEater: anim_bgp $1b anim_obp0 $27 anim_sound 6, 3, SFX_WATER_GUN - anim_call BattleAnim_DreamEater_branch_cbab3 + anim_call BattleAnimSub_Drain anim_wait 128 anim_wait 48 anim_ret @@ -2691,7 +2687,7 @@ BattleAnim_DreamEater: BattleAnim_LeechLife: anim_1gfx ANIM_GFX_BUBBLE anim_sound 6, 3, SFX_WATER_GUN - anim_call BattleAnim_LeechLife_branch_cbab3 + anim_call BattleAnimSub_Drain anim_wait 128 anim_wait 48 anim_ret @@ -2700,7 +2696,7 @@ BattleAnim_Harden: anim_1gfx ANIM_GFX_REFLECT anim_obp0 $0 anim_call BattleAnim_TargetObj_1Row - anim_call BattleAnim_Harden_branch_cbc43 + anim_call BattleAnimSub_Metallic anim_call BattleAnim_ShowMon_0 anim_ret @@ -2727,7 +2723,7 @@ BattleAnim_Glare: anim_1gfx ANIM_GFX_BEAM anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $8, $20 anim_bgeffect ANIM_BG_06, $0, $2, $0 - anim_call BattleAnim_Glare_branch_cbadc + anim_call BattleAnimSub_ShakeEnemy anim_wait 16 anim_ret @@ -2987,16 +2983,16 @@ BattleAnim_PsychicM: BattleAnim_Sludge: anim_1gfx ANIM_GFX_POISON - anim_call BattleAnim_Sludge_branch_cbc15 + anim_call BattleAnimSub_Sludge anim_wait 56 anim_ret BattleAnim_Toxic: anim_1gfx ANIM_GFX_POISON anim_bgeffect ANIM_BG_BLACK_HUES, $0, $8, $0 - anim_call BattleAnim_Toxic_branch_cbc35 + anim_call BattleAnimSub_Acid anim_wait 32 - anim_call BattleAnim_Toxic_branch_cbc15 + anim_call BattleAnimSub_Sludge anim_wait 64 anim_ret @@ -3118,8 +3114,8 @@ BattleAnim_Sketch: BattleAnim_TripleKick: anim_1gfx ANIM_GFX_HIT - anim_if_param_equal $1, BattleAnim_TripleKick_branch_cac95 - anim_if_param_equal $2, BattleAnim_TripleKick_branch_caca5 + anim_if_param_equal $1, .alternate1 + anim_if_param_equal $2, .alternate2 anim_sound 0, 1, SFX_MEGA_KICK anim_obj ANIM_OBJ_07, 144, 48, $0 anim_wait 6 @@ -3127,7 +3123,7 @@ BattleAnim_TripleKick: anim_wait 8 anim_ret -BattleAnim_TripleKick_branch_cac95: +.alternate1: anim_sound 0, 1, SFX_DOUBLE_KICK anim_obj ANIM_OBJ_07, 120, 64, $0 anim_wait 6 @@ -3135,7 +3131,7 @@ BattleAnim_TripleKick_branch_cac95: anim_wait 8 anim_ret -BattleAnim_TripleKick_branch_caca5: +.alternate2: anim_sound 0, 1, SFX_DOUBLE_KICK anim_obj ANIM_OBJ_07, 132, 32, $0 anim_wait 6 @@ -3225,7 +3221,7 @@ BattleAnim_Snore: anim_bgeffect ANIM_BG_1F, $60, $2, $0 anim_sound 0, 0, SFX_SNORE .loop - anim_call BattleAnim_Snore_branch_cbbbc + anim_call BattleAnimSub_Sound anim_wait 16 anim_loop 2, .loop anim_wait 8 @@ -3382,7 +3378,7 @@ BattleAnim_PowderSnow: anim_loop 2, .loop anim_bgeffect ANIM_BG_WHITE_HUES, $0, $8, $0 anim_wait 40 - anim_call BattleAnim_PowderSnow_branch_cbbdf + anim_call BattleAnimSub_Ice anim_wait 32 anim_ret @@ -3422,7 +3418,7 @@ BattleAnim_ScaryFace: anim_1gfx ANIM_GFX_BEAM anim_bgeffect ANIM_BG_ALTERNATE_HUES, $0, $2, $0 anim_bgeffect ANIM_BG_06, $0, $2, $0 - anim_call BattleAnim_ScaryFace_branch_cbadc + anim_call BattleAnimSub_ShakeEnemy anim_wait 64 anim_ret @@ -3503,14 +3499,14 @@ BattleAnim_SludgeBomb: anim_sound 6, 2, SFX_SLUDGE_BOMB anim_obj ANIM_OBJ_SLUDGE_BOMB, 64, 92, $10 anim_wait 36 - anim_call BattleAnim_SludgeBomb_branch_cbc15 + anim_call BattleAnimSub_Sludge anim_wait 64 anim_ret BattleAnim_MudSlap: anim_1gfx ANIM_GFX_SAND anim_obp0 $fc - anim_call BattleAnim_MudSlap_branch_cbc5b + anim_call BattleAnimSub_SandOrMud anim_ret BattleAnim_Octazooka: @@ -3574,13 +3570,13 @@ BattleAnim_DestinyBond: anim_1gfx ANIM_GFX_ANGELS anim_bgp $1b anim_obp0 $0 - anim_if_param_equal $1, BattleAnim_DestinyBond_branch_cb104 + anim_if_param_equal $1, .fainted anim_sound 6, 2, SFX_WHIRLWIND anim_obj ANIM_OBJ_DESTINY_BOND, 44, 120, $2 anim_wait 128 anim_ret -BattleAnim_DestinyBond_branch_cb104: +.fainted: anim_obj ANIM_OBJ_DESTINY_BOND, 132, 76, $0 anim_sound 0, 1, SFX_KINESIS anim_bgeffect ANIM_BG_RETURN_MON, $0, $0, $0 @@ -3703,7 +3699,7 @@ BattleAnim_GigaDrain: anim_call BattleAnim_TargetObj_1Row anim_bgeffect ANIM_BG_1C, $0, $0, $10 anim_sound 6, 3, SFX_GIGA_DRAIN - anim_call BattleAnim_GigaDrain_branch_cbab3 + anim_call BattleAnimSub_Drain anim_wait 48 anim_wait 128 anim_incbgeffect ANIM_BG_1C @@ -3860,7 +3856,7 @@ BattleAnim_SteelWing: anim_obp0 $0 anim_sound 0, 0, SFX_RAGE anim_call BattleAnim_TargetObj_1Row - anim_call BattleAnim_SteelWing_branch_cbc43 + anim_call BattleAnimSub_Metallic anim_call BattleAnim_ShowMon_0 anim_1gfx ANIM_GFX_HIT anim_resetobp0 @@ -3969,7 +3965,7 @@ BattleAnim_Present: anim_1gfx ANIM_GFX_EXPLOSION anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $8, $12 .loop - anim_call BattleAnim_Present_branch_cbb8f + anim_call BattleAnimSub_Explosion2 anim_wait 16 anim_jumpuntil .loop anim_ret @@ -4080,7 +4076,7 @@ BattleAnim_Dynamicpunch: anim_obj ANIM_OBJ_0A, 136, 56, $43 anim_wait 16 anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $8, $12 - anim_call BattleAnim_Dynamicpunch_branch_cbb8f + anim_call BattleAnimSub_Explosion2 anim_wait 16 anim_ret @@ -4110,7 +4106,7 @@ BattleAnim_BatonPass: anim_1gfx ANIM_GFX_MISC anim_obj ANIM_OBJ_BATON_PASS, 44, 104, $20 anim_sound 0, 0, SFX_BATON_PASS - anim_call BattleAnim_BatonPass_branch_c9486 + anim_call BattleAnim_ReturnMon.anim anim_wait 64 anim_ret @@ -4128,13 +4124,13 @@ BattleAnim_Encore: BattleAnim_Pursuit: anim_1gfx ANIM_GFX_HIT - anim_if_param_equal $1, BattleAnim_Pursuit_branch_cb62b + anim_if_param_equal $1, .pursued anim_sound 0, 1, SFX_COMET_PUNCH anim_obj ANIM_OBJ_01, 136, 56, $0 anim_wait 16 anim_ret -BattleAnim_Pursuit_branch_cb62b: +.pursued: anim_bgeffect ANIM_BG_HIDE_MON, $0, $0, $0 anim_wait 4 anim_call BattleAnim_UserObj_1Row @@ -4196,7 +4192,7 @@ BattleAnim_IronTail: anim_obp0 $0 anim_sound 0, 0, SFX_RAGE anim_call BattleAnim_TargetObj_1Row - anim_call BattleAnim_IronTail_branch_cbc43 + anim_call BattleAnimSub_Metallic anim_wait 4 anim_1gfx ANIM_GFX_HIT anim_resetobp0 @@ -4214,7 +4210,7 @@ BattleAnim_MetalClaw: anim_obp0 $0 anim_sound 0, 0, SFX_RAGE anim_call BattleAnim_TargetObj_1Row - anim_call BattleAnim_MetalClaw_branch_cbc43 + anim_call BattleAnimSub_Metallic anim_call BattleAnim_ShowMon_0 anim_1gfx ANIM_GFX_CUT anim_resetobp0 @@ -4257,11 +4253,11 @@ BattleAnim_MorningSun: anim_loop 5, .loop anim_wait 32 anim_if_param_equal 0, .zero - anim_call BattleAnim_MorningSun_branch_cbc6a + anim_call BattleAnimSub_Glimmer anim_ret .zero - anim_call BattleAnim_MorningSun_branch_cbc80 + anim_call BattleAnimSub_Glimmer2 anim_ret BattleAnim_Synthesis: @@ -4274,11 +4270,11 @@ BattleAnim_Synthesis: anim_incbgeffect ANIM_BG_18 anim_call BattleAnim_ShowMon_0 anim_if_param_equal $1, .one - anim_call BattleAnim_Synthesis_branch_cbc6a + anim_call BattleAnimSub_Glimmer anim_ret .one - anim_call BattleAnim_Synthesis_branch_cbc80 + anim_call BattleAnimSub_Glimmer2 anim_ret BattleAnim_Crunch: @@ -4310,11 +4306,11 @@ BattleAnim_Moonlight: anim_sound 0, 0, SFX_MOONLIGHT anim_wait 63 anim_if_param_equal $3, .three - anim_call BattleAnim_Moonlight_branch_cbc6a + anim_call BattleAnimSub_Glimmer anim_ret .three - anim_call BattleAnim_Moonlight_branch_cbc80 + anim_call BattleAnimSub_Glimmer2 anim_ret BattleAnim_HiddenPower: @@ -4598,9 +4594,7 @@ BattleAnim_BeatUp: anim_call BattleAnim_ShowMon_0 anim_ret -BattleAnim_DreamEater_branch_cbab3: -BattleAnim_GigaDrain_branch_cbab3: -BattleAnim_LeechLife_branch_cbab3: +BattleAnimSub_Drain: anim_obj ANIM_OBJ_71, 132, 44, $0 anim_obj ANIM_OBJ_71, 132, 44, $8 anim_obj ANIM_OBJ_71, 132, 44, $10 @@ -4611,9 +4605,7 @@ BattleAnim_LeechLife_branch_cbab3: anim_obj ANIM_OBJ_71, 132, 44, $38 anim_ret -BattleAnim_Glare_branch_cbadc: -BattleAnim_Leer_branch_cbadc: -BattleAnim_ScaryFace_branch_cbadc: +BattleAnimSub_ShakeEnemy: anim_sound 6, 2, SFX_LEER anim_obj ANIM_OBJ_4E, 72, 84, $0 anim_obj ANIM_OBJ_4E, 64, 80, $0 @@ -4627,8 +4619,7 @@ BattleAnim_ScaryFace_branch_cbadc: anim_obj ANIM_OBJ_4F, 122, 50, $0 anim_ret -BattleAnim_Fly_branch_cbb12: -BattleAnim_Teleport_branch_cbb12: +BattleAnimSub_WarpAway: anim_sound 0, 0, SFX_WARP_TO anim_obj ANIM_OBJ_44, 44, 108, $0 anim_obj ANIM_OBJ_44, 44, 100, $0 @@ -4639,9 +4630,7 @@ BattleAnim_Teleport_branch_cbb12: anim_obj ANIM_OBJ_44, 44, 60, $0 anim_ret -BattleAnim_AuroraBeam_branch_cbb39: -BattleAnim_HyperBeam_branch_cbb39: -BattleAnim_Solarbeam_branch_cbb39: +BattleAnimSub_Beam: anim_sound 0, 0, SFX_HYPER_BEAM anim_obj ANIM_OBJ_27, 64, 92, $0 anim_wait 4 @@ -4656,8 +4645,7 @@ BattleAnim_Solarbeam_branch_cbb39: anim_obj ANIM_OBJ_28, 126, 62, $0 anim_ret -BattleAnim_Explosion_branch_cbb62: -BattleAnim_Selfdestruct_branch_cbb62: +BattleAnimSub_Explosion1: anim_sound 0, 0, SFX_EGG_BOMB anim_obj ANIM_OBJ_17, 24, 64, $0 anim_wait 5 @@ -4674,10 +4662,7 @@ BattleAnim_Selfdestruct_branch_cbb62: anim_obj ANIM_OBJ_17, 40, 84, $0 anim_ret -BattleAnim_Dynamicpunch_branch_cbb8f: -BattleAnim_Explosion_branch_cbb8f: -BattleAnim_Present_branch_cbb8f: -BattleAnim_Selfdestruct_branch_cbb8f: +BattleAnimSub_Explosion2: anim_sound 0, 1, SFX_EGG_BOMB anim_obj ANIM_OBJ_17, 148, 32, $0 anim_wait 5 @@ -4694,16 +4679,13 @@ BattleAnim_Selfdestruct_branch_cbb8f: anim_obj ANIM_OBJ_17, 132, 52, $0 anim_ret -BattleAnim_Growl_branch_cbbbc: -BattleAnim_Roar_branch_cbbbc: -BattleAnim_Snore_branch_cbbbc: +BattleAnimSub_Sound: anim_obj ANIM_OBJ_4B, 64, 76, $0 anim_obj ANIM_OBJ_4B, 64, 88, $1 anim_obj ANIM_OBJ_4B, 64, 100, $2 anim_ret -BattleAnim_FirePunch_branch_cbbcc: -BattleAnim_TriAttack_branch_cbbcc: +BattleAnimSub_Fire: anim_sound 0, 1, SFX_EMBER .loop anim_obj ANIM_OBJ_BURNED, 136, 56, $10 @@ -4712,9 +4694,7 @@ BattleAnim_TriAttack_branch_cbbcc: anim_loop 4, .loop anim_ret -BattleAnim_IcePunch_branch_cbbdf: -BattleAnim_PowderSnow_branch_cbbdf: -BattleAnim_TriAttack_branch_cbbdf: +BattleAnimSub_Ice: anim_sound 0, 1, SFX_SHINE anim_obj ANIM_OBJ_12, 128, 42, $0 anim_wait 6 @@ -4734,9 +4714,7 @@ BattleAnim_TriAttack_branch_cbbdf: anim_obj ANIM_OBJ_12, 128, 70, $0 anim_ret -BattleAnim_SludgeBomb_branch_cbc15: -BattleAnim_Sludge_branch_cbc15: -BattleAnim_Toxic_branch_cbc15: +BattleAnimSub_Sludge: .loop anim_sound 0, 1, SFX_TOXIC anim_obj ANIM_OBJ_1A, 132, 72, $0 @@ -4750,8 +4728,7 @@ BattleAnim_Toxic_branch_cbc15: anim_loop 5, .loop anim_ret -BattleAnim_Acid_branch_cbc35: -BattleAnim_Toxic_branch_cbc35: +BattleAnimSub_Acid: .loop anim_sound 6, 2, SFX_BUBBLEBEAM anim_obj ANIM_OBJ_19, 64, 92, $10 @@ -4759,10 +4736,7 @@ BattleAnim_Toxic_branch_cbc35: anim_loop 8, .loop anim_ret -BattleAnim_Harden_branch_cbc43: -BattleAnim_IronTail_branch_cbc43: -BattleAnim_MetalClaw_branch_cbc43: -BattleAnim_SteelWing_branch_cbc43: +BattleAnimSub_Metallic: anim_sound 0, 0, SFX_SHINE anim_bgeffect ANIM_BG_17, $0, $1, $40 anim_wait 8 @@ -4773,8 +4747,7 @@ BattleAnim_SteelWing_branch_cbc43: anim_incbgeffect ANIM_BG_17 anim_ret -BattleAnim_MudSlap_branch_cbc5b: -BattleAnim_SandAttack_branch_cbc5b: +BattleAnimSub_SandOrMud: .loop anim_sound 6, 2, SFX_MENU anim_obj ANIM_OBJ_58, 64, 92, $4 @@ -4783,9 +4756,7 @@ BattleAnim_SandAttack_branch_cbc5b: anim_wait 32 anim_ret -BattleAnim_Moonlight_branch_cbc6a: -BattleAnim_MorningSun_branch_cbc6a: -BattleAnim_Synthesis_branch_cbc6a: +BattleAnimSub_Glimmer: anim_sound 0, 0, SFX_METRONOME anim_obj ANIM_OBJ_GLIMMER, 44, 64, $0 anim_wait 5 @@ -4795,9 +4766,7 @@ BattleAnim_Synthesis_branch_cbc6a: anim_wait 21 anim_ret -BattleAnim_Moonlight_branch_cbc80: -BattleAnim_MorningSun_branch_cbc80: -BattleAnim_Synthesis_branch_cbc80: +BattleAnimSub_Glimmer2: anim_sound 0, 0, SFX_METRONOME .loop anim_obj ANIM_OBJ_GLIMMER, 24, 64, $0 diff --git a/docs/bugs_and_glitches.md b/docs/bugs_and_glitches.md index 7a7d80250..8fdcf1ffb 100644 --- a/docs/bugs_and_glitches.md +++ b/docs/bugs_and_glitches.md @@ -68,6 +68,7 @@ Some fixes are mentioned as breaking compatibility with link battles. This can b - [Swimming NPCs aren't limited by their movement radius](#swimming-npcs-arent-limited-by-their-movement-radius) - [`CheckOwnMon` only checks the first five letters of OT names](#checkownmon-only-checks-the-first-five-letters-of-ot-names) - [Catching a Transformed Pokémon always catches a Ditto](#catching-a-transformed-pokémon-always-catches-a-ditto) +- [If your party and current PC box are full during the Dude's catching tutorial, his Poké Ball can't be used and may crash the game](#if-your-party-and-current-pc-box-are-full-during-the-dudes-catching-tutorial-his-poké-ball-cant-be-used-and-may-crash-the-game) - [Using a Park Ball in normal battles has a corrupt animation](#using-a-park-ball-in-normal-battles-has-a-corrupt-animation) - [`HELD_CATCH_CHANCE` has no effect](#held_catch_chance-has-no-effect) - [Only the first three evolution entries can have Stone compatibility reported correctly](#only-the-first-three-evolution-entries-can-have-stone-compatibility-reported-correctly) @@ -93,7 +94,7 @@ Some fixes are mentioned as breaking compatibility with link battles. This can b +HasAnyoneFainted: + call HasPlayerFainted -+ call nz, HasEnemyFainted ++ jp nz, HasEnemyFainted + ret + CheckFaint_PlayerThenEnemy: @@ -1881,6 +1882,33 @@ This bug can affect Mew or Pokémon other than Ditto that used Transform via Mir ``` +## If your party and current PC box are full during the Dude's catching tutorial, his Poké Ball can't be used and may crash the game +([Video](https://www.youtube.com/watch?v=A8zaTOkjKS4&t=407)) + +**Fix:** Edit `PokeBallEffect` in [engine/items/item_effects.asm](https://github.com/pret/pokecrystal/blob/master/engine/items/item_effects.asm): + +```diff + ld a, [wBattleMode] + dec a + jp nz, UseBallInTrainerBattle + ++ ld a, [wBattleType] ++ cp BATTLETYPE_TUTORIAL ++ jr z, .room_in_party ++ + ld a, [wPartyCount] + cp PARTY_LENGTH + jr nz, .room_in_party + + ld a, BANK(sBoxCount) + call GetSRAMBank + ld a, [sBoxCount] + cp MONS_PER_BOX + call CloseSRAM + jp z, Ball_BoxIsFullMessage +``` + + ## Using a Park Ball in normal battles has a corrupt animation ([Video](https://www.youtube.com/watch?v=v1ErZdLCIyU)) diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 4e62a4a91..dcf68fedc 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -6998,7 +6998,7 @@ GiveExperiencePoints: ld a, [wCurPartyMon] ld c, a ld b, CHECK_FLAG - ld d, FALSE + ld d, 0 predef SmallFarFlagAction ld a, c and a diff --git a/engine/pokegear/pokegear.asm b/engine/pokegear/pokegear.asm index a4262bf02..b4228f68a 100644 --- a/engine/pokegear/pokegear.asm +++ b/engine/pokegear/pokegear.asm @@ -6,6 +6,8 @@ const POKEGEARCARD_RADIO ; 3 NUM_POKEGEAR_CARDS EQU const_value +PHONE_DISPLAY_HEIGHT EQU 4 + ; PokegearJumptable.Jumptable indexes const_def const POKEGEARSTATE_CLOCKINIT ; 0 @@ -878,7 +880,7 @@ PokegearPhone_Joypad: ld [wPokegearPhoneSelectedPerson], a hlcoord 1, 4 ld a, [wPokegearPhoneCursorPosition] - ld bc, 20 * 2 + ld bc, SCREEN_WIDTH * 2 call AddNTimes ld [hl], "▷" call PokegearPhoneContactSubmenu @@ -982,7 +984,7 @@ PokegearPhone_GetDPad: .down ld hl, wPokegearPhoneCursorPosition ld a, [hl] - cp 3 + cp PHONE_DISPLAY_HEIGHT - 1 jr nc, .scroll_page_down inc [hl] jr .done_joypad_same_page @@ -990,7 +992,7 @@ PokegearPhone_GetDPad: .scroll_page_down ld hl, wPokegearPhoneScrollPosition ld a, [hl] - cp 6 + cp CONTACT_LIST_SIZE - PHONE_DISPLAY_HEIGHT ret nc inc [hl] jr .done_joypad_update_page @@ -1011,14 +1013,12 @@ PokegearPhone_GetDPad: PokegearPhone_UpdateCursor: ld a, " " - hlcoord 1, 4 - ld [hl], a - hlcoord 1, 6 - ld [hl], a - hlcoord 1, 8 - ld [hl], a - hlcoord 1, 10 +x = 4 +rept PHONE_DISPLAY_HEIGHT + hlcoord 1, x ld [hl], a +x = x + 2 +endr hlcoord 1, 4 ld a, [wPokegearPhoneCursorPosition] ld bc, 2 * SCREEN_WIDTH @@ -1028,10 +1028,10 @@ PokegearPhone_UpdateCursor: PokegearPhone_UpdateDisplayList: hlcoord 1, 3 - ld b, 9 + ld b, PHONE_DISPLAY_HEIGHT * 2 + 1 ld a, " " .row - ld c, 18 + ld c, SCREEN_WIDTH - 2 .col ld [hli], a dec c @@ -1042,7 +1042,7 @@ PokegearPhone_UpdateDisplayList: jr nz, .row ld a, [wPokegearPhoneScrollPosition] ld e, a - ld d, $0 + ld d, 0 ld hl, wPhoneList add hl, de xor a @@ -1064,7 +1064,7 @@ PokegearPhone_UpdateDisplayList: ld a, [wPokegearPhoneLoadNameBuffer] inc a ld [wPokegearPhoneLoadNameBuffer], a - cp 4 + cp PHONE_DISPLAY_HEIGHT jr c, .loop call PokegearPhone_UpdateCursor ret @@ -1463,15 +1463,15 @@ RadioChannels: ; entries correspond to constants/radio_constants.asm ; frequency value given here = 4 × ingame_frequency − 2 - dbw 16, .PKMNTalkAndPokedexShow - dbw 28, .PokemonMusic - dbw 32, .LuckyChannel - dbw 40, .BuenasPassword - dbw 52, .RuinsOfAlphRadio - dbw 64, .PlacesAndPeople - dbw 72, .LetsAllSing - dbw 78, .PokeFluteRadio - dbw 80, .EvolutionRadio + dbw 16, .PKMNTalkAndPokedexShow ; 04.5 + dbw 28, .PokemonMusic ; 07.5 + dbw 32, .LuckyChannel ; 08.5 + dbw 40, .BuenasPassword ; 10.5 + dbw 52, .RuinsOfAlphRadio ; 13.5 + dbw 64, .PlacesAndPeople ; 16.5 + dbw 72, .LetsAllSing ; 18.5 + dbw 78, .PokeFluteRadio ; 20.0 + dbw 80, .EvolutionRadio ; 20.5 db -1 .PKMNTalkAndPokedexShow: diff --git a/engine/smallflag.asm b/engine/smallflag.asm index 22819e5d5..04cbfcc23 100644 --- a/engine/smallflag.asm +++ b/engine/smallflag.asm @@ -33,9 +33,10 @@ SmallFarFlagAction: ; What are we doing to this flag? dec b - jr z, .set ; 1 + jr z, .set ; 1 = SET_FLAG dec b - jr z, .check ; 2 + jr z, .check ; 2 = CHECK_FLAG +; 0 = RESET_FLAG .reset ld a, c |