From a7dca30971a049a525e33bc43eaf2b18ce899c5e Mon Sep 17 00:00:00 2001 From: SatoMew Date: Sun, 29 Nov 2020 21:10:36 +0000 Subject: Identify what became GSC's Key Item fanfare --- audio/sfx/unreferenced_fanfare.asm | 57 ++++++++++++++++++++++++++++++++++++++ audio/sfx/unused2_2.asm | 56 ------------------------------------- 2 files changed, 57 insertions(+), 56 deletions(-) create mode 100644 audio/sfx/unreferenced_fanfare.asm delete mode 100644 audio/sfx/unused2_2.asm (limited to 'audio') diff --git a/audio/sfx/unreferenced_fanfare.asm b/audio/sfx/unreferenced_fanfare.asm new file mode 100644 index 00000000..ffd1ad3b --- /dev/null +++ b/audio/sfx/unreferenced_fanfare.asm @@ -0,0 +1,57 @@ +; This corresponds to SFX_KEY_ITEM in pokegold and pokecrystal. +SFX_Unused2_Ch5: + execute_music + tempo 256 + volume 7, 7 + vibrato 6, 2, 6 + duty_cycle 2 + toggle_perfect_pitch + note_type 6, 11, 1 + octave 3 + note G#, 2 + note G#, 2 + note_type 6, 11, 3 + note G#, 2 + note B_, 2 + octave 4 + note E_, 8 + sound_ret + + +SFX_Unused2_Ch6: + execute_music + vibrato 8, 2, 7 + duty_cycle 2 + note_type 6, 12, 1 + octave 4 + note E_, 2 + note E_, 1 + note E_, 1 + note_type 6, 12, 3 + note E_, 2 + note G#, 2 + note B_, 8 + sound_ret + + +SFX_Unused2_Ch7: + execute_music + note_type 6, 1, 0 + octave 4 + note B_, 1 + rest 1 + note_type 3, 1, 0 + note B_, 1 + rest 1 + note B_, 1 + rest 1 + note_type 6, 1, 0 + note B_, 1 + rest 1 + octave 5 + note E_, 1 + rest 1 + octave 4 + note B_, 4 + rest 4 + sound_ret diff --git a/audio/sfx/unused2_2.asm b/audio/sfx/unused2_2.asm deleted file mode 100644 index aa93f91c..00000000 --- a/audio/sfx/unused2_2.asm +++ /dev/null @@ -1,56 +0,0 @@ -SFX_Unused2_Ch5: - execute_music - tempo 256 - volume 7, 7 - vibrato 6, 2, 6 - duty_cycle 2 - toggle_perfect_pitch - note_type 6, 11, 1 - octave 3 - note G#, 2 - note G#, 2 - note_type 6, 11, 3 - note G#, 2 - note B_, 2 - octave 4 - note E_, 8 - sound_ret - - -SFX_Unused2_Ch6: - execute_music - vibrato 8, 2, 7 - duty_cycle 2 - note_type 6, 12, 1 - octave 4 - note E_, 2 - note E_, 1 - note E_, 1 - note_type 6, 12, 3 - note E_, 2 - note G#, 2 - note B_, 8 - sound_ret - - -SFX_Unused2_Ch7: - execute_music - note_type 6, 1, 0 - octave 4 - note B_, 1 - rest 1 - note_type 3, 1, 0 - note B_, 1 - rest 1 - note B_, 1 - rest 1 - note_type 6, 1, 0 - note B_, 1 - rest 1 - octave 5 - note E_, 1 - rest 1 - octave 4 - note B_, 4 - rest 4 - sound_ret -- cgit v1.2.3 From 330fa33236c100e019766d28752ca867420d00bd Mon Sep 17 00:00:00 2001 From: SatoMew Date: Mon, 30 Nov 2020 01:39:49 +0000 Subject: Rename the unreferenced fanfare's constants --- audio/sfx/unreferenced_fanfare.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'audio') diff --git a/audio/sfx/unreferenced_fanfare.asm b/audio/sfx/unreferenced_fanfare.asm index ffd1ad3b..0d383e2f 100644 --- a/audio/sfx/unreferenced_fanfare.asm +++ b/audio/sfx/unreferenced_fanfare.asm @@ -1,5 +1,5 @@ ; This corresponds to SFX_KEY_ITEM in pokegold and pokecrystal. -SFX_Unused2_Ch5: +SFX_UnreferencedFanfare_Ch5: execute_music tempo 256 volume 7, 7 @@ -18,7 +18,7 @@ SFX_Unused2_Ch5: sound_ret -SFX_Unused2_Ch6: +SFX_UnreferencedFanfare_Ch6: execute_music vibrato 8, 2, 7 duty_cycle 2 @@ -34,7 +34,7 @@ SFX_Unused2_Ch6: sound_ret -SFX_Unused2_Ch7: +SFX_UnreferencedFanfare_Ch7: execute_music note_type 6, 1, 0 octave 4 -- cgit v1.2.3 From f99446fccb6035edca0cb88b6680bab82480a771 Mon Sep 17 00:00:00 2001 From: SatoMew Date: Mon, 30 Nov 2020 20:09:51 +0000 Subject: Be consistent with the unused and unreferenced terminology --- audio/sfx/unreferenced_fanfare.asm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'audio') diff --git a/audio/sfx/unreferenced_fanfare.asm b/audio/sfx/unreferenced_fanfare.asm index 0d383e2f..d41bb080 100644 --- a/audio/sfx/unreferenced_fanfare.asm +++ b/audio/sfx/unreferenced_fanfare.asm @@ -1,5 +1,5 @@ ; This corresponds to SFX_KEY_ITEM in pokegold and pokecrystal. -SFX_UnreferencedFanfare_Ch5: +SFX_UnusedFanfare_Ch5: ; unreferenced execute_music tempo 256 volume 7, 7 @@ -17,8 +17,7 @@ SFX_UnreferencedFanfare_Ch5: note E_, 8 sound_ret - -SFX_UnreferencedFanfare_Ch6: +SFX_UnusedFanfare_Ch6: ; unreferenced execute_music vibrato 8, 2, 7 duty_cycle 2 @@ -33,8 +32,7 @@ SFX_UnreferencedFanfare_Ch6: note B_, 8 sound_ret - -SFX_UnreferencedFanfare_Ch7: +SFX_UnusedFanfare_Ch7: ; unreferenced execute_music note_type 6, 1, 0 octave 4 -- cgit v1.2.3 From 6989cdb8c693ed4c4d8c4c3794253ca1f1626ed6 Mon Sep 17 00:00:00 2001 From: SatoMew Date: Mon, 30 Nov 2020 21:17:38 +0000 Subject: And extend this principle to the filename as well --- audio/sfx/unreferenced_fanfare.asm | 55 -------------------------------------- audio/sfx/unused_fanfare.asm | 55 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 55 deletions(-) delete mode 100644 audio/sfx/unreferenced_fanfare.asm create mode 100644 audio/sfx/unused_fanfare.asm (limited to 'audio') diff --git a/audio/sfx/unreferenced_fanfare.asm b/audio/sfx/unreferenced_fanfare.asm deleted file mode 100644 index d41bb080..00000000 --- a/audio/sfx/unreferenced_fanfare.asm +++ /dev/null @@ -1,55 +0,0 @@ -; This corresponds to SFX_KEY_ITEM in pokegold and pokecrystal. -SFX_UnusedFanfare_Ch5: ; unreferenced - execute_music - tempo 256 - volume 7, 7 - vibrato 6, 2, 6 - duty_cycle 2 - toggle_perfect_pitch - note_type 6, 11, 1 - octave 3 - note G#, 2 - note G#, 2 - note_type 6, 11, 3 - note G#, 2 - note B_, 2 - octave 4 - note E_, 8 - sound_ret - -SFX_UnusedFanfare_Ch6: ; unreferenced - execute_music - vibrato 8, 2, 7 - duty_cycle 2 - note_type 6, 12, 1 - octave 4 - note E_, 2 - note E_, 1 - note E_, 1 - note_type 6, 12, 3 - note E_, 2 - note G#, 2 - note B_, 8 - sound_ret - -SFX_UnusedFanfare_Ch7: ; unreferenced - execute_music - note_type 6, 1, 0 - octave 4 - note B_, 1 - rest 1 - note_type 3, 1, 0 - note B_, 1 - rest 1 - note B_, 1 - rest 1 - note_type 6, 1, 0 - note B_, 1 - rest 1 - octave 5 - note E_, 1 - rest 1 - octave 4 - note B_, 4 - rest 4 - sound_ret diff --git a/audio/sfx/unused_fanfare.asm b/audio/sfx/unused_fanfare.asm new file mode 100644 index 00000000..d41bb080 --- /dev/null +++ b/audio/sfx/unused_fanfare.asm @@ -0,0 +1,55 @@ +; This corresponds to SFX_KEY_ITEM in pokegold and pokecrystal. +SFX_UnusedFanfare_Ch5: ; unreferenced + execute_music + tempo 256 + volume 7, 7 + vibrato 6, 2, 6 + duty_cycle 2 + toggle_perfect_pitch + note_type 6, 11, 1 + octave 3 + note G#, 2 + note G#, 2 + note_type 6, 11, 3 + note G#, 2 + note B_, 2 + octave 4 + note E_, 8 + sound_ret + +SFX_UnusedFanfare_Ch6: ; unreferenced + execute_music + vibrato 8, 2, 7 + duty_cycle 2 + note_type 6, 12, 1 + octave 4 + note E_, 2 + note E_, 1 + note E_, 1 + note_type 6, 12, 3 + note E_, 2 + note G#, 2 + note B_, 8 + sound_ret + +SFX_UnusedFanfare_Ch7: ; unreferenced + execute_music + note_type 6, 1, 0 + octave 4 + note B_, 1 + rest 1 + note_type 3, 1, 0 + note B_, 1 + rest 1 + note B_, 1 + rest 1 + note_type 6, 1, 0 + note B_, 1 + rest 1 + octave 5 + note E_, 1 + rest 1 + octave 4 + note B_, 4 + rest 4 + sound_ret -- cgit v1.2.3