diff options
| -rw-r--r-- | audio.asm | 8 | ||||
| -rw-r--r-- | audio/music/unused_song.asm (renamed from audio/music/unusedsong.asm) | 0 | ||||
| -rw-r--r-- | audio/sfx/unused_cry.asm (renamed from audio/sfx/unused_1.asm) | 11 | ||||
| -rw-r--r-- | audio/sfx/unused_cry_copy.asm (renamed from audio/sfx/unused_2.asm) | 11 | ||||
| -rw-r--r-- | audio/sfx/unused_cry_copy2.asm (renamed from audio/sfx/unused_3.asm) | 11 |
5 files changed, 22 insertions, 19 deletions
@@ -80,7 +80,7 @@ INCLUDE "audio/sfx/push_boulder_1.asm" 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_1.asm" +INCLUDE "audio/sfx/unused_cry.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_33.asm" INCLUDE "audio/sfx/battle_34.asm" INCLUDE "audio/sfx/battle_35.asm" INCLUDE "audio/sfx/battle_36.asm" -INCLUDE "audio/sfx/unused_2.asm" +INCLUDE "audio/sfx/unused_cry_copy.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_stop_wheel.asm" INCLUDE "audio/sfx/slots_reward.asm" INCLUDE "audio/sfx/slots_new_spin.asm" INCLUDE "audio/sfx/shooting_star.asm" -INCLUDE "audio/sfx/unused_3.asm" +INCLUDE "audio/sfx/unused_cry_copy2.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/routes3.asm" INCLUDE "audio/music/routes4.asm" INCLUDE "audio/music/indigoplateau.asm" INCLUDE "audio/music/pallettown.asm" -INCLUDE "audio/music/unusedsong.asm" +INCLUDE "audio/music/unused_song.asm" INCLUDE "audio/music/cities1.asm" INCLUDE "audio/sfx/get_item1_1.asm" INCLUDE "audio/music/museumguy.asm" diff --git a/audio/music/unusedsong.asm b/audio/music/unused_song.asm index a2291a2a..a2291a2a 100644 --- a/audio/music/unusedsong.asm +++ b/audio/music/unused_song.asm diff --git a/audio/sfx/unused_1.asm b/audio/sfx/unused_cry.asm index b7a8b4a0..e2046976 100644 --- a/audio/sfx/unused_1.asm +++ b/audio/sfx/unused_cry.asm @@ -1,4 +1,5 @@ -SFX_Unused_1_Ch5: +; 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 @@ -8,8 +9,8 @@ SFX_Unused_1_Ch5: square_note 8, 7, 1, 1924 sound_ret - -SFX_Unused_1_Ch6: +; 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 @@ -19,8 +20,8 @@ SFX_Unused_1_Ch6: square_note 8, 3, 1, 1862 sound_ret - -SFX_Unused_1_Ch8: +; 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 diff --git a/audio/sfx/unused_2.asm b/audio/sfx/unused_cry_copy.asm index 7a050ea4..01efa326 100644 --- a/audio/sfx/unused_2.asm +++ b/audio/sfx/unused_cry_copy.asm @@ -1,4 +1,5 @@ -SFX_Unused_2_Ch5: +; 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 @@ -8,8 +9,8 @@ SFX_Unused_2_Ch5: square_note 8, 7, 1, 1924 sound_ret - -SFX_Unused_2_Ch6: +; 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 @@ -19,8 +20,8 @@ SFX_Unused_2_Ch6: square_note 8, 3, 1, 1862 sound_ret - -SFX_Unused_2_Ch8: +; 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 diff --git a/audio/sfx/unused_3.asm b/audio/sfx/unused_cry_copy2.asm index a204fc10..955740de 100644 --- a/audio/sfx/unused_3.asm +++ b/audio/sfx/unused_cry_copy2.asm @@ -1,4 +1,5 @@ -SFX_Unused_3_Ch5: +; 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 @@ -8,8 +9,8 @@ SFX_Unused_3_Ch5: square_note 8, 7, 1, 1924 sound_ret - -SFX_Unused_3_Ch6: +; 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 @@ -19,8 +20,8 @@ SFX_Unused_3_Ch6: square_note 8, 3, 1, 1862 sound_ret - -SFX_Unused_3_Ch8: +; 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 |