ref: e2a70c9c43e1f219d57efdfacbfd8237cd10ca74
parent: ed11bfeca134277d6202857ef583e56c481aed1c
author: SatoMew <SatoMew@users.noreply.github.com>
date: Sat May 1 16:42:12 EDT 2021
Incorporate the suggested fixes
--- a/audio.asm
+++ b/audio.asm
@@ -80,7 +80,7 @@
INCLUDE "audio/sfx/ss_anne_horn_1.asm"
INCLUDE "audio/sfx/withdraw_deposit_1.asm"
INCLUDE "audio/sfx/safari_zone_pa.asm"
-INCLUDE "audio/sfx/unused_cry.asm"
+INCLUDE "audio/sfx/unused_cry_1.asm"
INCLUDE "audio/sfx/cry09_1.asm"
INCLUDE "audio/sfx/cry23_1.asm"
INCLUDE "audio/sfx/cry24_1.asm"
@@ -206,7 +206,7 @@
INCLUDE "audio/sfx/battle_34.asm"
INCLUDE "audio/sfx/battle_35.asm"
INCLUDE "audio/sfx/battle_36.asm"
-INCLUDE "audio/sfx/unused_cry_copy.asm"
+INCLUDE "audio/sfx/unused_cry_2.asm"
INCLUDE "audio/sfx/cry09_2.asm"
INCLUDE "audio/sfx/cry23_2.asm"
INCLUDE "audio/sfx/cry24_2.asm"
@@ -314,7 +314,7 @@
INCLUDE "audio/sfx/slots_reward.asm"
INCLUDE "audio/sfx/slots_new_spin.asm"
INCLUDE "audio/sfx/shooting_star.asm"
-INCLUDE "audio/sfx/unused_cry_copy2.asm"
+INCLUDE "audio/sfx/unused_cry_3.asm"
INCLUDE "audio/sfx/cry09_3.asm"
INCLUDE "audio/sfx/cry23_3.asm"
INCLUDE "audio/sfx/cry24_3.asm"
@@ -388,7 +388,7 @@
INCLUDE "audio/music/routes4.asm"
INCLUDE "audio/music/indigoplateau.asm"
INCLUDE "audio/music/pallettown.asm"
-INCLUDE "audio/music/unused_song.asm"
+INCLUDE "audio/music/unusedsong.asm"
INCLUDE "audio/music/cities1.asm"
INCLUDE "audio/sfx/get_item1_1.asm"
INCLUDE "audio/music/museumguy.asm"
--- a/audio/music/unused_song.asm
+++ /dev/null
@@ -1,338 +1,0 @@
-Music_UnusedSong_Ch1::
- tempo 144
- volume 7, 7
- vibrato 5, 1, 6
-
-Music_UnusedSong_branch_a91b::
- note_type 12, 1, 0
- octave 6
- note E_, 1
- rest 1
- octave 5
- note B_, 1
- rest 1
- octave 6
- note C#, 1
- rest 1
- octave 5
- note B_, 1
- octave 6
- note E_, 1
- rest 4
- note E_, 2
- rest 2
- note D#, 1
- rest 1
- octave 5
- note B_, 1
- rest 1
- octave 6
- note C#, 1
- rest 1
- octave 5
- note B_, 1
- octave 6
- note D#, 1
- rest 8
- note C#, 1
- rest 1
- note D#, 1
- rest 1
- note C#, 1
- octave 5
- note B_, 1
- rest 2
- octave 6
- note C#, 1
- rest 1
- note D#, 1
- rest 1
- note C#, 1
- octave 5
- note B_, 1
- rest 2
- octave 6
- note D#, 4
- note C#, 4
- note D#, 1
- note E_, 1
- rest 1
- note F#, 1
- rest 1
- octave 5
- note B_, 2
- rest 1
- octave 6
- note E_, 1
- rest 1
- octave 5
- note B_, 1
- rest 1
- octave 6
- note C#, 1
- rest 1
- octave 5
- note B_, 1
- octave 6
- note E_, 1
- rest 8
- note D#, 1
- rest 1
- octave 5
- note B_, 1
- rest 1
- octave 6
- note C#, 1
- rest 1
- octave 5
- note B_, 1
- octave 6
- note D#, 1
- rest 4
- octave 5
- note B_, 2
- rest 2
- octave 6
- note C#, 1
- rest 1
- note D#, 1
- rest 1
- note C#, 1
- octave 5
- note B_, 1
- rest 2
- octave 6
- note C#, 1
- rest 1
- note D#, 1
- rest 1
- note E_, 1
- note F#, 1
- rest 2
- note F#, 4
- note E_, 4
- note F#, 1
- note G#, 1
- rest 1
- note F#, 1
- rest 1
- note D#, 2
- rest 3
- octave 5
- note A_, 2
- rest 2
- note B_, 2
- rest 2
- octave 6
- note C#, 2
- rest 2
- note E_, 2
- note F#, 8
- rest 2
- note E_, 2
- note D#, 2
- note C#, 2
- rest 2
- octave 5
- note G#, 2
- rest 2
- note A_, 2
- rest 2
- note B_, 2
- rest 2
- octave 6
- note D#, 2
- note E_, 8
- rest 2
- note D#, 2
- note C#, 2
- note D#, 2
- octave 5
- note A_, 2
- note G#, 2
- note A_, 2
- note A#, 1
- note B_, 1
- rest 4
- note F#, 2
- rest 2
- note B_, 2
- note A#, 2
- note B_, 2
- octave 6
- note C_, 1
- note C#, 1
- rest 8
- octave 5
- note F#, 2
- note F_, 2
- note F#, 2
- note G#, 2
- note A_, 2
- octave 6
- note E_, 2
- note D#, 2
- note C#, 2
- octave 5
- note B_, 2
- rest 6
- note B_, 2
- rest 6
- sound_loop 0, Music_UnusedSong_branch_a91b
- sound_ret
-
-
-Music_UnusedSong_Ch2::
- tempo 144
- volume 7, 7
- toggle_perfect_pitch
- vibrato 6, 1, 5
-
-Music_UnusedSong_branch_a9d8::
- note_type 12, 1, 0
- octave 6
- note E_, 1
- rest 1
- note G#, 1
- rest 1
- note F#, 1
- rest 1
- note A_, 1
- note G#, 1
- rest 8
- note D#, 1
- rest 1
- note F#, 1
- rest 1
- note E_, 1
- rest 1
- note G#, 1
- note F#, 1
- rest 4
- octave 5
- note B_, 2
- rest 2
- octave 6
- note C#, 1
- rest 1
- note D#, 1
- rest 1
- note E_, 1
- note F#, 1
- rest 2
- note C#, 1
- rest 1
- note D#, 1
- rest 1
- note E_, 1
- note F#, 1
- rest 2
- note F#, 4
- note E_, 4
- note F#, 1
- note G#, 1
- rest 1
- note F#, 1
- rest 1
- note D#, 2
- rest 1
- note E_, 1
- rest 1
- note G#, 1
- rest 1
- note F#, 1
- rest 1
- note A_, 1
- note G#, 1
- rest 4
- note E_, 2
- rest 2
- note D#, 1
- rest 1
- note F#, 1
- rest 1
- note E_, 1
- rest 1
- note G#, 1
- note F#, 1
- rest 8
- note C#, 1
- rest 1
- note D#, 1
- rest 1
- note E_, 1
- note F#, 1
- rest 2
- note C#, 1
- rest 1
- note D#, 1
- rest 1
- note E_, 1
- note F#, 1
- rest 2
- note F#, 4
- note E_, 4
- note F#, 1
- note G#, 1
- rest 1
- note B_, 1
- rest 1
- note F#, 2
- rest 1
- note C#, 2
- rest 2
- note D#, 2
- rest 2
- note E_, 2
- rest 2
- note G#, 2
- rest 2
- note D#, 8
- rest 2
- note E_, 2
- note D#, 2
- note C#, 2
- octave 5
- note B_, 2
- rest 2
- octave 6
- note C#, 2
- rest 2
- note D#, 2
- rest 2
- note F#, 2
- rest 2
- note C#, 8
- rest 2
- note D#, 2
- note C#, 2
- octave 5
- note B_, 2
- note A_, 2
- note G#, 2
- note A_, 2
- note G#, 1
- note F#, 1
- rest 8
- note B_, 2
- note A#, 2
- note B_, 2
- note A_, 1
- note G#, 1
- rest 4
- note G#, 2
- rest 2
- note F#, 2
- note F_, 2
- note F#, 2
- note G#, 2
- note A_, 2
- note E_, 2
- note C#, 2
- note E_, 2
- note F#, 2
- rest 6
- note D#, 2
- rest 6
- sound_loop 0, Music_UnusedSong_branch_a9d8
- sound_ret
--- /dev/null
+++ b/audio/music/unusedsong.asm
@@ -1,0 +1,338 @@
+Music_UnusedSong_Ch1::
+ tempo 144
+ volume 7, 7
+ vibrato 5, 1, 6
+
+Music_UnusedSong_branch_a91b::
+ note_type 12, 1, 0
+ octave 6
+ note E_, 1
+ rest 1
+ octave 5
+ note B_, 1
+ rest 1
+ octave 6
+ note C#, 1
+ rest 1
+ octave 5
+ note B_, 1
+ octave 6
+ note E_, 1
+ rest 4
+ note E_, 2
+ rest 2
+ note D#, 1
+ rest 1
+ octave 5
+ note B_, 1
+ rest 1
+ octave 6
+ note C#, 1
+ rest 1
+ octave 5
+ note B_, 1
+ octave 6
+ note D#, 1
+ rest 8
+ note C#, 1
+ rest 1
+ note D#, 1
+ rest 1
+ note C#, 1
+ octave 5
+ note B_, 1
+ rest 2
+ octave 6
+ note C#, 1
+ rest 1
+ note D#, 1
+ rest 1
+ note C#, 1
+ octave 5
+ note B_, 1
+ rest 2
+ octave 6
+ note D#, 4
+ note C#, 4
+ note D#, 1
+ note E_, 1
+ rest 1
+ note F#, 1
+ rest 1
+ octave 5
+ note B_, 2
+ rest 1
+ octave 6
+ note E_, 1
+ rest 1
+ octave 5
+ note B_, 1
+ rest 1
+ octave 6
+ note C#, 1
+ rest 1
+ octave 5
+ note B_, 1
+ octave 6
+ note E_, 1
+ rest 8
+ note D#, 1
+ rest 1
+ octave 5
+ note B_, 1
+ rest 1
+ octave 6
+ note C#, 1
+ rest 1
+ octave 5
+ note B_, 1
+ octave 6
+ note D#, 1
+ rest 4
+ octave 5
+ note B_, 2
+ rest 2
+ octave 6
+ note C#, 1
+ rest 1
+ note D#, 1
+ rest 1
+ note C#, 1
+ octave 5
+ note B_, 1
+ rest 2
+ octave 6
+ note C#, 1
+ rest 1
+ note D#, 1
+ rest 1
+ note E_, 1
+ note F#, 1
+ rest 2
+ note F#, 4
+ note E_, 4
+ note F#, 1
+ note G#, 1
+ rest 1
+ note F#, 1
+ rest 1
+ note D#, 2
+ rest 3
+ octave 5
+ note A_, 2
+ rest 2
+ note B_, 2
+ rest 2
+ octave 6
+ note C#, 2
+ rest 2
+ note E_, 2
+ note F#, 8
+ rest 2
+ note E_, 2
+ note D#, 2
+ note C#, 2
+ rest 2
+ octave 5
+ note G#, 2
+ rest 2
+ note A_, 2
+ rest 2
+ note B_, 2
+ rest 2
+ octave 6
+ note D#, 2
+ note E_, 8
+ rest 2
+ note D#, 2
+ note C#, 2
+ note D#, 2
+ octave 5
+ note A_, 2
+ note G#, 2
+ note A_, 2
+ note A#, 1
+ note B_, 1
+ rest 4
+ note F#, 2
+ rest 2
+ note B_, 2
+ note A#, 2
+ note B_, 2
+ octave 6
+ note C_, 1
+ note C#, 1
+ rest 8
+ octave 5
+ note F#, 2
+ note F_, 2
+ note F#, 2
+ note G#, 2
+ note A_, 2
+ octave 6
+ note E_, 2
+ note D#, 2
+ note C#, 2
+ octave 5
+ note B_, 2
+ rest 6
+ note B_, 2
+ rest 6
+ sound_loop 0, Music_UnusedSong_branch_a91b
+ sound_ret
+
+
+Music_UnusedSong_Ch2::
+ tempo 144
+ volume 7, 7
+ toggle_perfect_pitch
+ vibrato 6, 1, 5
+
+Music_UnusedSong_branch_a9d8::
+ note_type 12, 1, 0
+ octave 6
+ note E_, 1
+ rest 1
+ note G#, 1
+ rest 1
+ note F#, 1
+ rest 1
+ note A_, 1
+ note G#, 1
+ rest 8
+ note D#, 1
+ rest 1
+ note F#, 1
+ rest 1
+ note E_, 1
+ rest 1
+ note G#, 1
+ note F#, 1
+ rest 4
+ octave 5
+ note B_, 2
+ rest 2
+ octave 6
+ note C#, 1
+ rest 1
+ note D#, 1
+ rest 1
+ note E_, 1
+ note F#, 1
+ rest 2
+ note C#, 1
+ rest 1
+ note D#, 1
+ rest 1
+ note E_, 1
+ note F#, 1
+ rest 2
+ note F#, 4
+ note E_, 4
+ note F#, 1
+ note G#, 1
+ rest 1
+ note F#, 1
+ rest 1
+ note D#, 2
+ rest 1
+ note E_, 1
+ rest 1
+ note G#, 1
+ rest 1
+ note F#, 1
+ rest 1
+ note A_, 1
+ note G#, 1
+ rest 4
+ note E_, 2
+ rest 2
+ note D#, 1
+ rest 1
+ note F#, 1
+ rest 1
+ note E_, 1
+ rest 1
+ note G#, 1
+ note F#, 1
+ rest 8
+ note C#, 1
+ rest 1
+ note D#, 1
+ rest 1
+ note E_, 1
+ note F#, 1
+ rest 2
+ note C#, 1
+ rest 1
+ note D#, 1
+ rest 1
+ note E_, 1
+ note F#, 1
+ rest 2
+ note F#, 4
+ note E_, 4
+ note F#, 1
+ note G#, 1
+ rest 1
+ note B_, 1
+ rest 1
+ note F#, 2
+ rest 1
+ note C#, 2
+ rest 2
+ note D#, 2
+ rest 2
+ note E_, 2
+ rest 2
+ note G#, 2
+ rest 2
+ note D#, 8
+ rest 2
+ note E_, 2
+ note D#, 2
+ note C#, 2
+ octave 5
+ note B_, 2
+ rest 2
+ octave 6
+ note C#, 2
+ rest 2
+ note D#, 2
+ rest 2
+ note F#, 2
+ rest 2
+ note C#, 8
+ rest 2
+ note D#, 2
+ note C#, 2
+ octave 5
+ note B_, 2
+ note A_, 2
+ note G#, 2
+ note A_, 2
+ note G#, 1
+ note F#, 1
+ rest 8
+ note B_, 2
+ note A#, 2
+ note B_, 2
+ note A_, 1
+ note G#, 1
+ rest 4
+ note G#, 2
+ rest 2
+ note F#, 2
+ note F_, 2
+ note F#, 2
+ note G#, 2
+ note A_, 2
+ note E_, 2
+ note C#, 2
+ note E_, 2
+ note F#, 2
+ rest 6
+ note D#, 2
+ rest 6
+ sound_loop 0, Music_UnusedSong_branch_a9d8
+ sound_ret
--- a/audio/sfx/unused_cry.asm
+++ /dev/null
@@ -1,32 +1,0 @@
-; This corresponds to Cry_Unused_Ch5 in pokegold and pokecrystal.
-SFX_UnusedCry_Ch5: ; unreferenced
- duty_cycle_pattern 3, 3, 0, 0
- square_note 15, 14, 0, 1920
- square_note 15, 15, 0, 1924
- square_note 15, 12, 3, 1504
- square_note 15, 12, 4, 1536
- square_note 10, 6, -4, 1920
- square_note 8, 7, 1, 1924
- sound_ret
-
-; This corresponds to Cry_Unused_Ch6 in pokegold and pokecrystal.
-SFX_UnusedCry_Ch6: ; unreferenced
- duty_cycle_pattern 0, 0, 1, 1
- square_note 15, 10, 0, 1857
- square_note 15, 11, 0, 1859
- square_note 15, 9, 3, 1457
- square_note 15, 9, 4, 1473
- square_note 10, 4, -4, 1857
- square_note 8, 3, 1, 1862
- sound_ret
-
-; This corresponds to Cry_Unused_Ch8 in pokegold and pokecrystal.
-SFX_UnusedCry_Ch8: ; unreferenced
- noise_note 2, 15, 2, 76
- noise_note 6, 14, 0, 58
- noise_note 15, 13, 0, 58
- noise_note 8, 13, 0, 44
- noise_note 6, 14, 6, 76
- noise_note 12, 7, -5, 76
- noise_note 15, 13, 3, 76
- sound_ret
--- /dev/null
+++ b/audio/sfx/unused_cry_1.asm
@@ -1,0 +1,30 @@
+; This corresponds to Cry_Unused_Ch5, Cry_Unused_Ch6, and Cry_Unused_Ch8 in pokegold and pokecrystal.
+SFX_UnusedCry_1_Ch5: ; unreferenced
+ duty_cycle_pattern 3, 3, 0, 0
+ square_note 15, 14, 0, 1920
+ square_note 15, 15, 0, 1924
+ square_note 15, 12, 3, 1504
+ square_note 15, 12, 4, 1536
+ square_note 10, 6, -4, 1920
+ square_note 8, 7, 1, 1924
+ sound_ret
+
+SFX_UnusedCry_1_Ch6: ; unreferenced
+ duty_cycle_pattern 0, 0, 1, 1
+ square_note 15, 10, 0, 1857
+ square_note 15, 11, 0, 1859
+ square_note 15, 9, 3, 1457
+ square_note 15, 9, 4, 1473
+ square_note 10, 4, -4, 1857
+ square_note 8, 3, 1, 1862
+ sound_ret
+
+SFX_UnusedCry_1_Ch8: ; unreferenced
+ noise_note 2, 15, 2, 76
+ noise_note 6, 14, 0, 58
+ noise_note 15, 13, 0, 58
+ noise_note 8, 13, 0, 44
+ noise_note 6, 14, 6, 76
+ noise_note 12, 7, -5, 76
+ noise_note 15, 13, 3, 76
+ sound_ret
--- /dev/null
+++ b/audio/sfx/unused_cry_2.asm
@@ -1,0 +1,30 @@
+; This corresponds to Cry_Unused_Ch5, Cry_Unused_Ch6, and Cry_Unused_Ch8 in pokegold and pokecrystal.
+SFX_UnusedCry_2_Ch5: ; unreferenced
+ duty_cycle_pattern 3, 3, 0, 0
+ square_note 15, 14, 0, 1920
+ square_note 15, 15, 0, 1924
+ square_note 15, 12, 3, 1504
+ square_note 15, 12, 4, 1536
+ square_note 10, 6, -4, 1920
+ square_note 8, 7, 1, 1924
+ sound_ret
+
+SFX_UnusedCry_2_Ch6: ; unreferenced
+ duty_cycle_pattern 0, 0, 1, 1
+ square_note 15, 10, 0, 1857
+ square_note 15, 11, 0, 1859
+ square_note 15, 9, 3, 1457
+ square_note 15, 9, 4, 1473
+ square_note 10, 4, -4, 1857
+ square_note 8, 3, 1, 1862
+ sound_ret
+
+SFX_UnusedCry_2_Ch8: ; unreferenced
+ noise_note 2, 15, 2, 76
+ noise_note 6, 14, 0, 58
+ noise_note 15, 13, 0, 58
+ noise_note 8, 13, 0, 44
+ noise_note 6, 14, 6, 76
+ noise_note 12, 7, -5, 76
+ noise_note 15, 13, 3, 76
+ sound_ret
--- /dev/null
+++ b/audio/sfx/unused_cry_3.asm
@@ -1,0 +1,30 @@
+; This corresponds to Cry_Unused_Ch5, Cry_Unused_Ch6, and Cry_Unused_Ch8 in pokegold and pokecrystal.
+SFX_UnusedCry_3_Ch5: ; unreferenced
+ duty_cycle_pattern 3, 3, 0, 0
+ square_note 15, 14, 0, 1920
+ square_note 15, 15, 0, 1924
+ square_note 15, 12, 3, 1504
+ square_note 15, 12, 4, 1536
+ square_note 10, 6, -4, 1920
+ square_note 8, 7, 1, 1924
+ sound_ret
+
+SFX_UnusedCry_3_Ch6: ; unreferenced
+ duty_cycle_pattern 0, 0, 1, 1
+ square_note 15, 10, 0, 1857
+ square_note 15, 11, 0, 1859
+ square_note 15, 9, 3, 1457
+ square_note 15, 9, 4, 1473
+ square_note 10, 4, -4, 1857
+ square_note 8, 3, 1, 1862
+ sound_ret
+
+SFX_UnusedCry_3_Ch8: ; unreferenced
+ noise_note 2, 15, 2, 76
+ noise_note 6, 14, 0, 58
+ noise_note 15, 13, 0, 58
+ noise_note 8, 13, 0, 44
+ noise_note 6, 14, 6, 76
+ noise_note 12, 7, -5, 76
+ noise_note 15, 13, 3, 76
+ sound_ret
--- a/audio/sfx/unused_cry_copy.asm
+++ /dev/null
@@ -1,32 +1,0 @@
-; This corresponds to Cry_Unused_Ch5 in pokegold and pokecrystal.
-SFX_UnusedCryCopy_Ch5: ; unreferenced
- duty_cycle_pattern 3, 3, 0, 0
- square_note 15, 14, 0, 1920
- square_note 15, 15, 0, 1924
- square_note 15, 12, 3, 1504
- square_note 15, 12, 4, 1536
- square_note 10, 6, -4, 1920
- square_note 8, 7, 1, 1924
- sound_ret
-
-; This corresponds to Cry_Unused_Ch6 in pokegold and pokecrystal.
-SFX_UnusedCryCopy_Ch6: ; unreferenced
- duty_cycle_pattern 0, 0, 1, 1
- square_note 15, 10, 0, 1857
- square_note 15, 11, 0, 1859
- square_note 15, 9, 3, 1457
- square_note 15, 9, 4, 1473
- square_note 10, 4, -4, 1857
- square_note 8, 3, 1, 1862
- sound_ret
-
-; This corresponds to Cry_Unused_Ch8 in pokegold and pokecrystal.
-SFX_UnusedCryCopy_Ch8: ; unreferenced
- noise_note 2, 15, 2, 76
- noise_note 6, 14, 0, 58
- noise_note 15, 13, 0, 58
- noise_note 8, 13, 0, 44
- noise_note 6, 14, 6, 76
- noise_note 12, 7, -5, 76
- noise_note 15, 13, 3, 76
- sound_ret
--- a/audio/sfx/unused_cry_copy2.asm
+++ /dev/null
@@ -1,32 +1,0 @@
-; This corresponds to Cry_Unused_Ch5 in pokegold and pokecrystal.
-SFX_UnusedCryCopy2_Ch5: ; unreferenced
- duty_cycle_pattern 3, 3, 0, 0
- square_note 15, 14, 0, 1920
- square_note 15, 15, 0, 1924
- square_note 15, 12, 3, 1504
- square_note 15, 12, 4, 1536
- square_note 10, 6, -4, 1920
- square_note 8, 7, 1, 1924
- sound_ret
-
-; This corresponds to Cry_Unused_Ch6 in pokegold and pokecrystal.
-SFX_UnusedCryCopy2_Ch6: ; unreferenced
- duty_cycle_pattern 0, 0, 1, 1
- square_note 15, 10, 0, 1857
- square_note 15, 11, 0, 1859
- square_note 15, 9, 3, 1457
- square_note 15, 9, 4, 1473
- square_note 10, 4, -4, 1857
- square_note 8, 3, 1, 1862
- sound_ret
-
-; This corresponds to Cry_Unused_Ch8 in pokegold and pokecrystal.
-SFX_UnusedCryCopy2_Ch8: ; unreferenced
- noise_note 2, 15, 2, 76
- noise_note 6, 14, 0, 58
- noise_note 15, 13, 0, 58
- noise_note 8, 13, 0, 44
- noise_note 6, 14, 6, 76
- noise_note 12, 7, -5, 76
- noise_note 15, 13, 3, 76
- sound_ret