diff options
| author | dannye <corrnondacqb@yahoo.com> | 2016-07-27 19:30:57 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2016-07-27 19:30:57 -0500 |
| commit | 84c7985e67b0838fce04e49a0916aa5a873131b3 (patch) | |
| tree | 491367de9c6a0039cf73ad359bb58b640e509084 | |
| parent | 70dde9d96b0e3025c72ae29783e94c56fa5cbe1c (diff) | |
Fix sound effect channel numbering
mostly so that sound effects that only use the noise channel are
labelled 'Ch7' instead of 'Ch1'
327 files changed, 1274 insertions, 1274 deletions
@@ -162,7 +162,7 @@ INCLUDE "audio/sfx/ball_poof.asm" INCLUDE "audio/sfx/faint_thud.asm" INCLUDE "audio/sfx/run.asm" INCLUDE "audio/sfx/dex_page_added.asm" -INCLUDE "audio/sfx/pokeflute_ch3.asm" +INCLUDE "audio/sfx/pokeflute_ch6.asm" INCLUDE "audio/sfx/peck.asm" INCLUDE "audio/sfx/faint_fall.asm" INCLUDE "audio/sfx/battle_09.asm" @@ -543,11 +543,11 @@ Music_PokeFluteInBattle:: call PlaySoundWaitForCurrent ; then immediately overwrtie the channel pointers ld hl, wChannelCommandPointers + CH4 * 2 - ld de, SFX_08_PokeFlute_Ch1 + ld de, SFX_08_PokeFlute_Ch4 call Audio2_OverwriteChannelPointer - ld de, SFX_08_PokeFlute_Ch2 + ld de, SFX_08_PokeFlute_Ch5 call Audio2_OverwriteChannelPointer - ld de, SFX_08_PokeFlute_Ch3 + ld de, SFX_08_PokeFlute_Ch6 Audio2_OverwriteChannelPointer: ld a, e @@ -632,7 +632,7 @@ INCLUDE "audio/music/pokecenter.asm" SECTION "Music 2", ROMX, BANK[AUDIO_2] -INCLUDE "audio/sfx/pokeflute_ch1_ch2.asm" +INCLUDE "audio/sfx/pokeflute_ch4_ch5.asm" INCLUDE "audio/sfx/unused2_2.asm" INCLUDE "audio/music/gymleaderbattle.asm" INCLUDE "audio/music/trainerbattle.asm" diff --git a/audio/headers/sfxheaders1.asm b/audio/headers/sfxheaders1.asm index 57c62e1c..9234211a 100644 --- a/audio/headers/sfxheaders1.asm +++ b/audio/headers/sfxheaders1.asm @@ -3,560 +3,560 @@ SFX_Headers_1:: SFX_Snare1_1:: db CH7 - dw SFX_Snare1_1_Ch1 + dw SFX_Snare1_1_Ch7 SFX_Snare2_1:: db CH7 - dw SFX_Snare2_1_Ch1 + dw SFX_Snare2_1_Ch7 SFX_Snare3_1:: db CH7 - dw SFX_Snare3_1_Ch1 + dw SFX_Snare3_1_Ch7 SFX_Snare4_1:: db CH7 - dw SFX_Snare4_1_Ch1 + dw SFX_Snare4_1_Ch7 SFX_Snare5_1:: db CH7 - dw SFX_Snare5_1_Ch1 + dw SFX_Snare5_1_Ch7 SFX_Triangle1_1:: db CH7 - dw SFX_Triangle1_1_Ch1 + dw SFX_Triangle1_1_Ch7 SFX_Triangle2_1:: db CH7 - dw SFX_Triangle2_1_Ch1 + dw SFX_Triangle2_1_Ch7 SFX_Snare6_1:: db CH7 - dw SFX_Snare6_1_Ch1 + dw SFX_Snare6_1_Ch7 SFX_Snare7_1:: db CH7 - dw SFX_Snare7_1_Ch1 + dw SFX_Snare7_1_Ch7 SFX_Snare8_1:: db CH7 - dw SFX_Snare8_1_Ch1 + dw SFX_Snare8_1_Ch7 SFX_Snare9_1:: db CH7 - dw SFX_Snare9_1_Ch1 + dw SFX_Snare9_1_Ch7 SFX_Cymbal1_1:: db CH7 - dw SFX_Cymbal1_1_Ch1 + dw SFX_Cymbal1_1_Ch7 SFX_Cymbal2_1:: db CH7 - dw SFX_Cymbal2_1_Ch1 + dw SFX_Cymbal2_1_Ch7 SFX_Cymbal3_1:: db CH7 - dw SFX_Cymbal3_1_Ch1 + dw SFX_Cymbal3_1_Ch7 SFX_Muted_Snare1_1:: db CH7 - dw SFX_Muted_Snare1_1_Ch1 + dw SFX_Muted_Snare1_1_Ch7 SFX_Triangle3_1:: db CH7 - dw SFX_Triangle3_1_Ch1 + dw SFX_Triangle3_1_Ch7 SFX_Muted_Snare2_1:: db CH7 - dw SFX_Muted_Snare2_1_Ch1 + dw SFX_Muted_Snare2_1_Ch7 SFX_Muted_Snare3_1:: db CH7 - dw SFX_Muted_Snare3_1_Ch1 + dw SFX_Muted_Snare3_1_Ch7 SFX_Muted_Snare4_1:: db CH7 - dw SFX_Muted_Snare4_1_Ch1 + dw SFX_Muted_Snare4_1_Ch7 SFX_Cry00_1:: db ( $80 | CH4 ) - dw SFX_Cry00_1_Ch1 + dw SFX_Cry00_1_Ch4 db CH5 - dw SFX_Cry00_1_Ch2 + dw SFX_Cry00_1_Ch5 db CH7 - dw SFX_Cry00_1_Ch3 + dw SFX_Cry00_1_Ch7 SFX_Cry01_1:: db ( $80 | CH4 ) - dw SFX_Cry01_1_Ch1 + dw SFX_Cry01_1_Ch4 db CH5 - dw SFX_Cry01_1_Ch2 + dw SFX_Cry01_1_Ch5 db CH7 - dw SFX_Cry01_1_Ch3 + dw SFX_Cry01_1_Ch7 SFX_Cry02_1:: db ( $80 | CH4 ) - dw SFX_Cry02_1_Ch1 + dw SFX_Cry02_1_Ch4 db CH5 - dw SFX_Cry02_1_Ch2 + dw SFX_Cry02_1_Ch5 db CH7 - dw SFX_Cry02_1_Ch3 + dw SFX_Cry02_1_Ch7 SFX_Cry03_1:: db ( $80 | CH4 ) - dw SFX_Cry03_1_Ch1 + dw SFX_Cry03_1_Ch4 db CH5 - dw SFX_Cry03_1_Ch2 + dw SFX_Cry03_1_Ch5 db CH7 - dw SFX_Cry03_1_Ch3 + dw SFX_Cry03_1_Ch7 SFX_Cry04_1:: db ( $80 | CH4 ) - dw SFX_Cry04_1_Ch1 + dw SFX_Cry04_1_Ch4 db CH5 - dw SFX_Cry04_1_Ch2 + dw SFX_Cry04_1_Ch5 db CH7 - dw SFX_Cry04_1_Ch3 + dw SFX_Cry04_1_Ch7 SFX_Cry05_1:: db ( $80 | CH4 ) - dw SFX_Cry05_1_Ch1 + dw SFX_Cry05_1_Ch4 db CH5 - dw SFX_Cry05_1_Ch2 + dw SFX_Cry05_1_Ch5 db CH7 - dw SFX_Cry05_1_Ch3 + dw SFX_Cry05_1_Ch7 SFX_Cry06_1:: db ( $80 | CH4 ) - dw SFX_Cry06_1_Ch1 + dw SFX_Cry06_1_Ch4 db CH5 - dw SFX_Cry06_1_Ch2 + dw SFX_Cry06_1_Ch5 db CH7 - dw SFX_Cry06_1_Ch3 + dw SFX_Cry06_1_Ch7 SFX_Cry07_1:: db ( $80 | CH4 ) - dw SFX_Cry07_1_Ch1 + dw SFX_Cry07_1_Ch4 db CH5 - dw SFX_Cry07_1_Ch2 + dw SFX_Cry07_1_Ch5 db CH7 - dw SFX_Cry07_1_Ch3 + dw SFX_Cry07_1_Ch7 SFX_Cry08_1:: db ( $80 | CH4 ) - dw SFX_Cry08_1_Ch1 + dw SFX_Cry08_1_Ch4 db CH5 - dw SFX_Cry08_1_Ch2 + dw SFX_Cry08_1_Ch5 db CH7 - dw SFX_Cry08_1_Ch3 + dw SFX_Cry08_1_Ch7 SFX_Cry09_1:: db ( $80 | CH4 ) - dw SFX_Cry09_1_Ch1 + dw SFX_Cry09_1_Ch4 db CH5 - dw SFX_Cry09_1_Ch2 + dw SFX_Cry09_1_Ch5 db CH7 - dw SFX_Cry09_1_Ch3 + dw SFX_Cry09_1_Ch7 SFX_Cry0A_1:: db ( $80 | CH4 ) - dw SFX_Cry0A_1_Ch1 + dw SFX_Cry0A_1_Ch4 db CH5 - dw SFX_Cry0A_1_Ch2 + dw SFX_Cry0A_1_Ch5 db CH7 - dw SFX_Cry0A_1_Ch3 + dw SFX_Cry0A_1_Ch7 SFX_Cry0B_1:: db ( $80 | CH4 ) - dw SFX_Cry0B_1_Ch1 + dw SFX_Cry0B_1_Ch4 db CH5 - dw SFX_Cry0B_1_Ch2 + dw SFX_Cry0B_1_Ch5 db CH7 - dw SFX_Cry0B_1_Ch3 + dw SFX_Cry0B_1_Ch7 SFX_Cry0C_1:: db ( $80 | CH4 ) - dw SFX_Cry0C_1_Ch1 + dw SFX_Cry0C_1_Ch4 db CH5 - dw SFX_Cry0C_1_Ch2 + dw SFX_Cry0C_1_Ch5 db CH7 - dw SFX_Cry0C_1_Ch3 + dw SFX_Cry0C_1_Ch7 SFX_Cry0D_1:: db ( $80 | CH4 ) - dw SFX_Cry0D_1_Ch1 + dw SFX_Cry0D_1_Ch4 db CH5 - dw SFX_Cry0D_1_Ch2 + dw SFX_Cry0D_1_Ch5 db CH7 - dw SFX_Cry0D_1_Ch3 + dw SFX_Cry0D_1_Ch7 SFX_Cry0E_1:: db ( $80 | CH4 ) - dw SFX_Cry0E_1_Ch1 + dw SFX_Cry0E_1_Ch4 db CH5 - dw SFX_Cry0E_1_Ch2 + dw SFX_Cry0E_1_Ch5 db CH7 - dw SFX_Cry0E_1_Ch3 + dw SFX_Cry0E_1_Ch7 SFX_Cry0F_1:: db ( $80 | CH4 ) - dw SFX_Cry0F_1_Ch1 + dw SFX_Cry0F_1_Ch4 db CH5 - dw SFX_Cry0F_1_Ch2 + dw SFX_Cry0F_1_Ch5 db CH7 - dw SFX_Cry0F_1_Ch3 + dw SFX_Cry0F_1_Ch7 SFX_Cry10_1:: db ( $80 | CH4 ) - dw SFX_Cry10_1_Ch1 + dw SFX_Cry10_1_Ch4 db CH5 - dw SFX_Cry10_1_Ch2 + dw SFX_Cry10_1_Ch5 db CH7 - dw SFX_Cry10_1_Ch3 + dw SFX_Cry10_1_Ch7 SFX_Cry11_1:: db ( $80 | CH4 ) - dw SFX_Cry11_1_Ch1 + dw SFX_Cry11_1_Ch4 db CH5 - dw SFX_Cry11_1_Ch2 + dw SFX_Cry11_1_Ch5 db CH7 - dw SFX_Cry11_1_Ch3 + dw SFX_Cry11_1_Ch7 SFX_Cry12_1:: db ( $80 | CH4 ) - dw SFX_Cry12_1_Ch1 + dw SFX_Cry12_1_Ch4 db CH5 - dw SFX_Cry12_1_Ch2 + dw SFX_Cry12_1_Ch5 db CH7 - dw SFX_Cry12_1_Ch3 + dw SFX_Cry12_1_Ch7 SFX_Cry13_1:: db ( $80 | CH4 ) - dw SFX_Cry13_1_Ch1 + dw SFX_Cry13_1_Ch4 db CH5 - dw SFX_Cry13_1_Ch2 + dw SFX_Cry13_1_Ch5 db CH7 - dw SFX_Cry13_1_Ch3 + dw SFX_Cry13_1_Ch7 SFX_Cry14_1:: db ( $80 | CH4 ) - dw SFX_Cry14_1_Ch1 + dw SFX_Cry14_1_Ch4 db CH5 - dw SFX_Cry14_1_Ch2 + dw SFX_Cry14_1_Ch5 db CH7 - dw SFX_Cry14_1_Ch3 + dw SFX_Cry14_1_Ch7 SFX_Cry15_1:: db ( $80 | CH4 ) - dw SFX_Cry15_1_Ch1 + dw SFX_Cry15_1_Ch4 db CH5 - dw SFX_Cry15_1_Ch2 + dw SFX_Cry15_1_Ch5 db CH7 - dw SFX_Cry15_1_Ch3 + dw SFX_Cry15_1_Ch7 SFX_Cry16_1:: db ( $80 | CH4 ) - dw SFX_Cry16_1_Ch1 + dw SFX_Cry16_1_Ch4 db CH5 - dw SFX_Cry16_1_Ch2 + dw SFX_Cry16_1_Ch5 db CH7 - dw SFX_Cry16_1_Ch3 + dw SFX_Cry16_1_Ch7 SFX_Cry17_1:: db ( $80 | CH4 ) - dw SFX_Cry17_1_Ch1 + dw SFX_Cry17_1_Ch4 db CH5 - dw SFX_Cry17_1_Ch2 + dw SFX_Cry17_1_Ch5 db CH7 - dw SFX_Cry17_1_Ch3 + dw SFX_Cry17_1_Ch7 SFX_Cry18_1:: db ( $80 | CH4 ) - dw SFX_Cry18_1_Ch1 + dw SFX_Cry18_1_Ch4 db CH5 - dw SFX_Cry18_1_Ch2 + dw SFX_Cry18_1_Ch5 db CH7 - dw SFX_Cry18_1_Ch3 + dw SFX_Cry18_1_Ch7 SFX_Cry19_1:: db ( $80 | CH4 ) - dw SFX_Cry19_1_Ch1 + dw SFX_Cry19_1_Ch4 db CH5 - dw SFX_Cry19_1_Ch2 + dw SFX_Cry19_1_Ch5 db CH7 - dw SFX_Cry19_1_Ch3 + dw SFX_Cry19_1_Ch7 SFX_Cry1A_1:: db ( $80 | CH4 ) - dw SFX_Cry1A_1_Ch1 + dw SFX_Cry1A_1_Ch4 db CH5 - dw SFX_Cry1A_1_Ch2 + dw SFX_Cry1A_1_Ch5 db CH7 - dw SFX_Cry1A_1_Ch3 + dw SFX_Cry1A_1_Ch7 SFX_Cry1B_1:: db ( $80 | CH4 ) - dw SFX_Cry1B_1_Ch1 + dw SFX_Cry1B_1_Ch4 db CH5 - dw SFX_Cry1B_1_Ch2 + dw SFX_Cry1B_1_Ch5 db CH7 - dw SFX_Cry1B_1_Ch3 + dw SFX_Cry1B_1_Ch7 SFX_Cry1C_1:: db ( $80 | CH4 ) - dw SFX_Cry1C_1_Ch1 + dw SFX_Cry1C_1_Ch4 db CH5 - dw SFX_Cry1C_1_Ch2 + dw SFX_Cry1C_1_Ch5 db CH7 - dw SFX_Cry1C_1_Ch3 + dw SFX_Cry1C_1_Ch7 SFX_Cry1D_1:: db ( $80 | CH4 ) - dw SFX_Cry1D_1_Ch1 + dw SFX_Cry1D_1_Ch4 db CH5 - dw SFX_Cry1D_1_Ch2 + dw SFX_Cry1D_1_Ch5 db CH7 - dw SFX_Cry1D_1_Ch3 + dw SFX_Cry1D_1_Ch7 SFX_Cry1E_1:: db ( $80 | CH4 ) - dw SFX_Cry1E_1_Ch1 + dw SFX_Cry1E_1_Ch4 db CH5 - dw SFX_Cry1E_1_Ch2 + dw SFX_Cry1E_1_Ch5 db CH7 - dw SFX_Cry1E_1_Ch3 + dw SFX_Cry1E_1_Ch7 SFX_Cry1F_1:: db ( $80 | CH4 ) - dw SFX_Cry1F_1_Ch1 + dw SFX_Cry1F_1_Ch4 db CH5 - dw SFX_Cry1F_1_Ch2 + dw SFX_Cry1F_1_Ch5 db CH7 - dw SFX_Cry1F_1_Ch3 + dw SFX_Cry1F_1_Ch7 SFX_Cry20_1:: db ( $80 | CH4 ) - dw SFX_Cry20_1_Ch1 + dw SFX_Cry20_1_Ch4 db CH5 - dw SFX_Cry20_1_Ch2 + dw SFX_Cry20_1_Ch5 db CH7 - dw SFX_Cry20_1_Ch3 + dw SFX_Cry20_1_Ch7 SFX_Cry21_1:: db ( $80 | CH4 ) - dw SFX_Cry21_1_Ch1 + dw SFX_Cry21_1_Ch4 db CH5 - dw SFX_Cry21_1_Ch2 + dw SFX_Cry21_1_Ch5 db CH7 - dw SFX_Cry21_1_Ch3 + dw SFX_Cry21_1_Ch7 SFX_Cry22_1:: db ( $80 | CH4 ) - dw SFX_Cry22_1_Ch1 + dw SFX_Cry22_1_Ch4 db CH5 - dw SFX_Cry22_1_Ch2 + dw SFX_Cry22_1_Ch5 db CH7 - dw SFX_Cry22_1_Ch3 + dw SFX_Cry22_1_Ch7 SFX_Cry23_1:: db ( $80 | CH4 ) - dw SFX_Cry23_1_Ch1 + dw SFX_Cry23_1_Ch4 db CH5 - dw SFX_Cry23_1_Ch2 + dw SFX_Cry23_1_Ch5 db CH7 - dw SFX_Cry23_1_Ch3 + dw SFX_Cry23_1_Ch7 SFX_Cry24_1:: db ( $80 | CH4 ) - dw SFX_Cry24_1_Ch1 + dw SFX_Cry24_1_Ch4 db CH5 - dw SFX_Cry24_1_Ch2 + dw SFX_Cry24_1_Ch5 db CH7 - dw SFX_Cry24_1_Ch3 + dw SFX_Cry24_1_Ch7 SFX_Cry25_1:: db ( $80 | CH4 ) - dw SFX_Cry25_1_Ch1 + dw SFX_Cry25_1_Ch4 db CH5 - dw SFX_Cry25_1_Ch2 + dw SFX_Cry25_1_Ch5 db CH7 - dw SFX_Cry25_1_Ch3 + dw SFX_Cry25_1_Ch7 SFX_Get_Item1_1:: db ( $80 | CH4 ) - dw SFX_Get_Item1_1_Ch1 + dw SFX_Get_Item1_1_Ch4 db CH5 - dw SFX_Get_Item1_1_Ch2 + dw SFX_Get_Item1_1_Ch5 db CH6 - dw SFX_Get_Item1_1_Ch3 + dw SFX_Get_Item1_1_Ch6 SFX_Get_Item2_1:: db ( $80 | CH4 ) - dw SFX_Get_Item2_1_Ch1 + dw SFX_Get_Item2_1_Ch4 db CH5 - dw SFX_Get_Item2_1_Ch2 + dw SFX_Get_Item2_1_Ch5 db CH6 - dw SFX_Get_Item2_1_Ch3 + dw SFX_Get_Item2_1_Ch6 SFX_Tink_1:: db CH4 - dw SFX_Tink_1_Ch1 + dw SFX_Tink_1_Ch4 SFX_Heal_HP_1:: db CH4 - dw SFX_Heal_HP_1_Ch1 + dw SFX_Heal_HP_1_Ch4 SFX_Heal_Ailment_1:: db CH4 - dw SFX_Heal_Ailment_1_Ch1 + dw SFX_Heal_Ailment_1_Ch4 SFX_Start_Menu_1:: db CH7 - dw SFX_Start_Menu_1_Ch1 + dw SFX_Start_Menu_1_Ch7 SFX_Press_AB_1:: db CH4 - dw SFX_Press_AB_1_Ch1 + dw SFX_Press_AB_1_Ch4 SFX_Pokedex_Rating_1:: db ( $80 | CH4 ) - dw SFX_Pokedex_Rating_1_Ch1 + dw SFX_Pokedex_Rating_1_Ch4 db CH5 - dw SFX_Pokedex_Rating_1_Ch2 + dw SFX_Pokedex_Rating_1_Ch5 db CH6 - dw SFX_Pokedex_Rating_1_Ch3 + dw SFX_Pokedex_Rating_1_Ch6 SFX_Get_Key_Item_1:: db ( $80 | CH4 ) - dw SFX_Get_Key_Item_1_Ch1 + dw SFX_Get_Key_Item_1_Ch4 db CH5 - dw SFX_Get_Key_Item_1_Ch2 + dw SFX_Get_Key_Item_1_Ch5 db CH6 - dw SFX_Get_Key_Item_1_Ch3 + dw SFX_Get_Key_Item_1_Ch6 SFX_Poisoned_1:: db CH4 - dw SFX_Poisoned_1_Ch1 + dw SFX_Poisoned_1_Ch4 SFX_Trade_Machine_1:: db CH4 - dw SFX_Trade_Machine_1_Ch1 + dw SFX_Trade_Machine_1_Ch4 SFX_Turn_On_PC_1:: db CH4 - dw SFX_Turn_On_PC_1_Ch1 + dw SFX_Turn_On_PC_1_Ch4 SFX_Turn_Off_PC_1:: db CH4 - dw SFX_Turn_Off_PC_1_Ch1 + dw SFX_Turn_Off_PC_1_Ch4 SFX_Enter_PC_1:: db CH4 - dw SFX_Enter_PC_1_Ch1 + dw SFX_Enter_PC_1_Ch4 SFX_Shrink_1:: db CH4 - dw SFX_Shrink_1_Ch1 + dw SFX_Shrink_1_Ch4 SFX_Switch_1:: db CH4 - dw SFX_Switch_1_Ch1 + dw SFX_Switch_1_Ch4 SFX_Healing_Machine_1:: db CH4 - dw SFX_Healing_Machine_1_Ch1 + dw SFX_Healing_Machine_1_Ch4 SFX_Teleport_Exit1_1:: db CH4 - dw SFX_Teleport_Exit1_1_Ch1 + dw SFX_Teleport_Exit1_1_Ch4 SFX_Teleport_Enter1_1:: db CH4 - dw SFX_Teleport_Enter1_1_Ch1 + dw SFX_Teleport_Enter1_1_Ch4 SFX_Teleport_Exit2_1:: db CH4 - dw SFX_Teleport_Exit2_1_Ch1 + dw SFX_Teleport_Exit2_1_Ch4 SFX_Ledge_1:: db CH4 - dw SFX_Ledge_1_Ch1 + dw SFX_Ledge_1_Ch4 SFX_Teleport_Enter2_1:: db CH7 - dw SFX_Teleport_Enter2_1_Ch1 + dw SFX_Teleport_Enter2_1_Ch7 SFX_Fly_1:: db CH7 - dw SFX_Fly_1_Ch1 + dw SFX_Fly_1_Ch7 SFX_Denied_1:: db ( $40 | CH4 ) - dw SFX_Denied_1_Ch1 + dw SFX_Denied_1_Ch4 db CH5 - dw SFX_Denied_1_Ch2 + dw SFX_Denied_1_Ch5 SFX_Arrow_Tiles_1:: db CH4 - dw SFX_Arrow_Tiles_1_Ch1 + dw SFX_Arrow_Tiles_1_Ch4 SFX_Push_Boulder_1:: db CH7 - dw SFX_Push_Boulder_1_Ch1 + dw SFX_Push_Boulder_1_Ch7 SFX_SS_Anne_Horn_1:: db ( $40 | CH4 ) - dw SFX_SS_Anne_Horn_1_Ch1 + dw SFX_SS_Anne_Horn_1_Ch4 db CH5 - dw SFX_SS_Anne_Horn_1_Ch2 + dw SFX_SS_Anne_Horn_1_Ch5 SFX_Withdraw_Deposit_1:: db CH4 - dw SFX_Withdraw_Deposit_1_Ch1 + dw SFX_Withdraw_Deposit_1_Ch4 SFX_Cut_1:: db CH7 - dw SFX_Cut_1_Ch1 + dw SFX_Cut_1_Ch7 SFX_Go_Inside_1:: db CH7 - dw SFX_Go_Inside_1_Ch1 + dw SFX_Go_Inside_1_Ch7 SFX_Swap_1:: db ( $40 | CH4 ) - dw SFX_Swap_1_Ch1 + dw SFX_Swap_1_Ch4 db CH5 - dw SFX_Swap_1_Ch2 + dw SFX_Swap_1_Ch5 SFX_59_1:: db ( $40 | CH4 ) - dw SFX_59_1_Ch1 + dw SFX_59_1_Ch4 db CH5 - dw SFX_59_1_Ch2 + dw SFX_59_1_Ch5 SFX_Purchase_1:: db ( $40 | CH4 ) - dw SFX_Purchase_1_Ch1 + dw SFX_Purchase_1_Ch4 db CH5 - dw SFX_Purchase_1_Ch2 + dw SFX_Purchase_1_Ch5 SFX_Collision_1:: db CH4 - dw SFX_Collision_1_Ch1 + dw SFX_Collision_1_Ch4 SFX_Go_Outside_1:: db CH7 - dw SFX_Go_Outside_1_Ch1 + dw SFX_Go_Outside_1_Ch7 SFX_Save_1:: db ( $40 | CH4 ) - dw SFX_Save_1_Ch1 + dw SFX_Save_1_Ch4 db CH5 - dw SFX_Save_1_Ch2 + dw SFX_Save_1_Ch5 SFX_Pokeflute:: db CH2 - dw SFX_Pokeflute_Ch1 + dw SFX_Pokeflute_Ch2 SFX_Safari_Zone_PA:: db CH4 - dw SFX_Safari_Zone_PA_Ch1 + dw SFX_Safari_Zone_PA_Ch4 diff --git a/audio/headers/sfxheaders2.asm b/audio/headers/sfxheaders2.asm index 1b6f8a5c..f54f37f8 100644 --- a/audio/headers/sfxheaders2.asm +++ b/audio/headers/sfxheaders2.asm @@ -3,704 +3,704 @@ SFX_Headers_2:: SFX_Snare1_2:: db CH7 - dw SFX_Snare1_2_Ch1 + dw SFX_Snare1_2_Ch7 SFX_Snare2_2:: db CH7 - dw SFX_Snare2_2_Ch1 + dw SFX_Snare2_2_Ch7 SFX_Snare3_2:: db CH7 - dw SFX_Snare3_2_Ch1 + dw SFX_Snare3_2_Ch7 SFX_Snare4_2:: db CH7 - dw SFX_Snare4_2_Ch1 + dw SFX_Snare4_2_Ch7 SFX_Snare5_2:: db CH7 - dw SFX_Snare5_2_Ch1 + dw SFX_Snare5_2_Ch7 SFX_Triangle1_2:: db CH7 - dw SFX_Triangle1_2_Ch1 + dw SFX_Triangle1_2_Ch7 SFX_Triangle2_2:: db CH7 - dw SFX_Triangle2_2_Ch1 + dw SFX_Triangle2_2_Ch7 SFX_Snare6_2:: db CH7 - dw SFX_Snare6_2_Ch1 + dw SFX_Snare6_2_Ch7 SFX_Snare7_2:: db CH7 - dw SFX_Snare7_2_Ch1 + dw SFX_Snare7_2_Ch7 SFX_Snare8_2:: db CH7 - dw SFX_Snare8_2_Ch1 + dw SFX_Snare8_2_Ch7 SFX_Snare9_2:: db CH7 - dw SFX_Snare9_2_Ch1 + dw SFX_Snare9_2_Ch7 SFX_Cymbal1_2:: db CH7 - dw SFX_Cymbal1_2_Ch1 + dw SFX_Cymbal1_2_Ch7 SFX_Cymbal2_2:: db CH7 - dw SFX_Cymbal2_2_Ch1 + dw SFX_Cymbal2_2_Ch7 SFX_Cymbal3_2:: db CH7 - dw SFX_Cymbal3_2_Ch1 + dw SFX_Cymbal3_2_Ch7 SFX_Muted_Snare1_2:: db CH7 - dw SFX_Muted_Snare1_2_Ch1 + dw SFX_Muted_Snare1_2_Ch7 SFX_Triangle3_2:: db CH7 - dw SFX_Triangle3_2_Ch1 + dw SFX_Triangle3_2_Ch7 SFX_Muted_Snare2_2:: db CH7 - dw SFX_Muted_Snare2_2_Ch1 + dw SFX_Muted_Snare2_2_Ch7 SFX_Muted_Snare3_2:: db CH7 - dw SFX_Muted_Snare3_2_Ch1 + dw SFX_Muted_Snare3_2_Ch7 SFX_Muted_Snare4_2:: db CH7 - dw SFX_Muted_Snare4_2_Ch1 + dw SFX_Muted_Snare4_2_Ch7 SFX_Cry00_2:: db ( $80 | CH4 ) - dw SFX_Cry00_2_Ch1 + dw SFX_Cry00_2_Ch4 db CH5 - dw SFX_Cry00_2_Ch2 + dw SFX_Cry00_2_Ch5 db CH7 - dw SFX_Cry00_2_Ch3 + dw SFX_Cry00_2_Ch7 SFX_Cry01_2:: db ( $80 | CH4 ) - dw SFX_Cry01_2_Ch1 + dw SFX_Cry01_2_Ch4 db CH5 - dw SFX_Cry01_2_Ch2 + dw SFX_Cry01_2_Ch5 db CH7 - dw SFX_Cry01_2_Ch3 + dw SFX_Cry01_2_Ch7 SFX_Cry02_2:: db ( $80 | CH4 ) - dw SFX_Cry02_2_Ch1 + dw SFX_Cry02_2_Ch4 db CH5 - dw SFX_Cry02_2_Ch2 + dw SFX_Cry02_2_Ch5 db CH7 - dw SFX_Cry02_2_Ch3 + dw SFX_Cry02_2_Ch7 SFX_Cry03_2:: db ( $80 | CH4 ) - dw SFX_Cry03_2_Ch1 + dw SFX_Cry03_2_Ch4 db CH5 - dw SFX_Cry03_2_Ch2 + dw SFX_Cry03_2_Ch5 db CH7 - dw SFX_Cry03_2_Ch3 + dw SFX_Cry03_2_Ch7 SFX_Cry04_2:: db ( $80 | CH4 ) - dw SFX_Cry04_2_Ch1 + dw SFX_Cry04_2_Ch4 db CH5 - dw SFX_Cry04_2_Ch2 + dw SFX_Cry04_2_Ch5 db CH7 - dw SFX_Cry04_2_Ch3 + dw SFX_Cry04_2_Ch7 SFX_Cry05_2:: db ( $80 | CH4 ) - dw SFX_Cry05_2_Ch1 + dw SFX_Cry05_2_Ch4 db CH5 - dw SFX_Cry05_2_Ch2 + dw SFX_Cry05_2_Ch5 db CH7 - dw SFX_Cry05_2_Ch3 + dw SFX_Cry05_2_Ch7 SFX_Cry06_2:: db ( $80 | CH4 ) - dw SFX_Cry06_2_Ch1 + dw SFX_Cry06_2_Ch4 db CH5 - dw SFX_Cry06_2_Ch2 + dw SFX_Cry06_2_Ch5 db CH7 - dw SFX_Cry06_2_Ch3 + dw SFX_Cry06_2_Ch7 SFX_Cry07_2:: db ( $80 | CH4 ) - dw SFX_Cry07_2_Ch1 + dw SFX_Cry07_2_Ch4 db CH5 - dw SFX_Cry07_2_Ch2 + dw SFX_Cry07_2_Ch5 db CH7 - dw SFX_Cry07_2_Ch3 + dw SFX_Cry07_2_Ch7 SFX_Cry08_2:: db ( $80 | CH4 ) - dw SFX_Cry08_2_Ch1 + dw SFX_Cry08_2_Ch4 db CH5 - dw SFX_Cry08_2_Ch2 + dw SFX_Cry08_2_Ch5 db CH7 - dw SFX_Cry08_2_Ch3 + dw SFX_Cry08_2_Ch7 SFX_Cry09_2:: db ( $80 | CH4 ) - dw SFX_Cry09_2_Ch1 + dw SFX_Cry09_2_Ch4 db CH5 - dw SFX_Cry09_2_Ch2 + dw SFX_Cry09_2_Ch5 db CH7 - dw SFX_Cry09_2_Ch3 + dw SFX_Cry09_2_Ch7 SFX_Cry0A_2:: db ( $80 | CH4 ) - dw SFX_Cry0A_2_Ch1 + dw SFX_Cry0A_2_Ch4 db CH5 - dw SFX_Cry0A_2_Ch2 + dw SFX_Cry0A_2_Ch5 db CH7 - dw SFX_Cry0A_2_Ch3 + dw SFX_Cry0A_2_Ch7 SFX_Cry0B_2:: db ( $80 | CH4 ) - dw SFX_Cry0B_2_Ch1 + dw SFX_Cry0B_2_Ch4 db CH5 - dw SFX_Cry0B_2_Ch2 + dw SFX_Cry0B_2_Ch5 db CH7 - dw SFX_Cry0B_2_Ch3 + dw SFX_Cry0B_2_Ch7 SFX_Cry0C_2:: db ( $80 | CH4 ) - dw SFX_Cry0C_2_Ch1 + dw SFX_Cry0C_2_Ch4 db CH5 - dw SFX_Cry0C_2_Ch2 + dw SFX_Cry0C_2_Ch5 db CH7 - dw SFX_Cry0C_2_Ch3 + dw SFX_Cry0C_2_Ch7 SFX_Cry0D_2:: db ( $80 | CH4 ) - dw SFX_Cry0D_2_Ch1 + dw SFX_Cry0D_2_Ch4 db CH5 - dw SFX_Cry0D_2_Ch2 + dw SFX_Cry0D_2_Ch5 db CH7 - dw SFX_Cry0D_2_Ch3 + dw SFX_Cry0D_2_Ch7 SFX_Cry0E_2:: db ( $80 | CH4 ) - dw SFX_Cry0E_2_Ch1 + dw SFX_Cry0E_2_Ch4 db CH5 - dw SFX_Cry0E_2_Ch2 + dw SFX_Cry0E_2_Ch5 db CH7 - dw SFX_Cry0E_2_Ch3 + dw SFX_Cry0E_2_Ch7 SFX_Cry0F_2:: db ( $80 | CH4 ) - dw SFX_Cry0F_2_Ch1 + dw SFX_Cry0F_2_Ch4 db CH5 - dw SFX_Cry0F_2_Ch2 + dw SFX_Cry0F_2_Ch5 db CH7 - dw SFX_Cry0F_2_Ch3 + dw SFX_Cry0F_2_Ch7 SFX_Cry10_2:: db ( $80 | CH4 ) - dw SFX_Cry10_2_Ch1 + dw SFX_Cry10_2_Ch4 db CH5 - dw SFX_Cry10_2_Ch2 + dw SFX_Cry10_2_Ch5 db CH7 - dw SFX_Cry10_2_Ch3 + dw SFX_Cry10_2_Ch7 SFX_Cry11_2:: db ( $80 | CH4 ) - dw SFX_Cry11_2_Ch1 + dw SFX_Cry11_2_Ch4 db CH5 - dw SFX_Cry11_2_Ch2 + dw SFX_Cry11_2_Ch5 db CH7 - dw SFX_Cry11_2_Ch3 + dw SFX_Cry11_2_Ch7 SFX_Cry12_2:: db ( $80 | CH4 ) - dw SFX_Cry12_2_Ch1 + dw SFX_Cry12_2_Ch4 db CH5 - dw SFX_Cry12_2_Ch2 + dw SFX_Cry12_2_Ch5 db CH7 - dw SFX_Cry12_2_Ch3 + dw SFX_Cry12_2_Ch7 SFX_Cry13_2:: db ( $80 | CH4 ) - dw SFX_Cry13_2_Ch1 + dw SFX_Cry13_2_Ch4 db CH5 - dw SFX_Cry13_2_Ch2 + dw SFX_Cry13_2_Ch5 db CH7 - dw SFX_Cry13_2_Ch3 + dw SFX_Cry13_2_Ch7 SFX_Cry14_2:: db ( $80 | CH4 ) - dw SFX_Cry14_2_Ch1 + dw SFX_Cry14_2_Ch4 db CH5 - dw SFX_Cry14_2_Ch2 + dw SFX_Cry14_2_Ch5 db CH7 - dw SFX_Cry14_2_Ch3 + dw SFX_Cry14_2_Ch7 SFX_Cry15_2:: db ( $80 | CH4 ) - dw SFX_Cry15_2_Ch1 + dw SFX_Cry15_2_Ch4 db CH5 - dw SFX_Cry15_2_Ch2 + dw SFX_Cry15_2_Ch5 db CH7 - dw SFX_Cry15_2_Ch3 + dw SFX_Cry15_2_Ch7 SFX_Cry16_2:: db ( $80 | CH4 ) - dw SFX_Cry16_2_Ch1 + dw SFX_Cry16_2_Ch4 db CH5 - dw SFX_Cry16_2_Ch2 + dw SFX_Cry16_2_Ch5 db CH7 - dw SFX_Cry16_2_Ch3 + dw SFX_Cry16_2_Ch7 SFX_Cry17_2:: db ( $80 | CH4 ) - dw SFX_Cry17_2_Ch1 + dw SFX_Cry17_2_Ch4 db CH5 - dw SFX_Cry17_2_Ch2 + dw SFX_Cry17_2_Ch5 db CH7 - dw SFX_Cry17_2_Ch3 + dw SFX_Cry17_2_Ch7 SFX_Cry18_2:: db ( $80 | CH4 ) - dw SFX_Cry18_2_Ch1 + dw SFX_Cry18_2_Ch4 db CH5 - dw SFX_Cry18_2_Ch2 + dw SFX_Cry18_2_Ch5 db CH7 - dw SFX_Cry18_2_Ch3 + dw SFX_Cry18_2_Ch7 SFX_Cry19_2:: db ( $80 | CH4 ) - dw SFX_Cry19_2_Ch1 + dw SFX_Cry19_2_Ch4 db CH5 - dw SFX_Cry19_2_Ch2 + dw SFX_Cry19_2_Ch5 db CH7 - dw SFX_Cry19_2_Ch3 + dw SFX_Cry19_2_Ch7 SFX_Cry1A_2:: db ( $80 | CH4 ) - dw SFX_Cry1A_2_Ch1 + dw SFX_Cry1A_2_Ch4 db CH5 - dw SFX_Cry1A_2_Ch2 + dw SFX_Cry1A_2_Ch5 db CH7 - dw SFX_Cry1A_2_Ch3 + dw SFX_Cry1A_2_Ch7 SFX_Cry1B_2:: db ( $80 | CH4 ) - dw SFX_Cry1B_2_Ch1 + dw SFX_Cry1B_2_Ch4 db CH5 - dw SFX_Cry1B_2_Ch2 + dw SFX_Cry1B_2_Ch5 db CH7 - dw SFX_Cry1B_2_Ch3 + dw SFX_Cry1B_2_Ch7 SFX_Cry1C_2:: db ( $80 | CH4 ) - dw SFX_Cry1C_2_Ch1 + dw SFX_Cry1C_2_Ch4 db CH5 - dw SFX_Cry1C_2_Ch2 + dw SFX_Cry1C_2_Ch5 db CH7 - dw SFX_Cry1C_2_Ch3 + dw SFX_Cry1C_2_Ch7 SFX_Cry1D_2:: db ( $80 | CH4 ) - dw SFX_Cry1D_2_Ch1 + dw SFX_Cry1D_2_Ch4 db CH5 - dw SFX_Cry1D_2_Ch2 + dw SFX_Cry1D_2_Ch5 db CH7 - dw SFX_Cry1D_2_Ch3 + dw SFX_Cry1D_2_Ch7 SFX_Cry1E_2:: db ( $80 | CH4 ) - dw SFX_Cry1E_2_Ch1 + dw SFX_Cry1E_2_Ch4 db CH5 - dw SFX_Cry1E_2_Ch2 + dw SFX_Cry1E_2_Ch5 db CH7 - dw SFX_Cry1E_2_Ch3 + dw SFX_Cry1E_2_Ch7 SFX_Cry1F_2:: db ( $80 | CH4 ) - dw SFX_Cry1F_2_Ch1 + dw SFX_Cry1F_2_Ch4 db CH5 - dw SFX_Cry1F_2_Ch2 + dw SFX_Cry1F_2_Ch5 db CH7 - dw SFX_Cry1F_2_Ch3 + dw SFX_Cry1F_2_Ch7 SFX_Cry20_2:: db ( $80 | CH4 ) - dw SFX_Cry20_2_Ch1 + dw SFX_Cry20_2_Ch4 db CH5 - dw SFX_Cry20_2_Ch2 + dw SFX_Cry20_2_Ch5 db CH7 - dw SFX_Cry20_2_Ch3 + dw SFX_Cry20_2_Ch7 SFX_Cry21_2:: db ( $80 | CH4 ) - dw SFX_Cry21_2_Ch1 + dw SFX_Cry21_2_Ch4 db CH5 - dw SFX_Cry21_2_Ch2 + dw SFX_Cry21_2_Ch5 db CH7 - dw SFX_Cry21_2_Ch3 + dw SFX_Cry21_2_Ch7 SFX_Cry22_2:: db ( $80 | CH4 ) - dw SFX_Cry22_2_Ch1 + dw SFX_Cry22_2_Ch4 db CH5 - dw SFX_Cry22_2_Ch2 + dw SFX_Cry22_2_Ch5 db CH7 - dw SFX_Cry22_2_Ch3 + dw SFX_Cry22_2_Ch7 SFX_Cry23_2:: db ( $80 | CH4 ) - dw SFX_Cry23_2_Ch1 + dw SFX_Cry23_2_Ch4 db CH5 - dw SFX_Cry23_2_Ch2 + dw SFX_Cry23_2_Ch5 db CH7 - dw SFX_Cry23_2_Ch3 + dw SFX_Cry23_2_Ch7 SFX_Cry24_2:: db ( $80 | CH4 ) - dw SFX_Cry24_2_Ch1 + dw SFX_Cry24_2_Ch4 db CH5 - dw SFX_Cry24_2_Ch2 + dw SFX_Cry24_2_Ch5 db CH7 - dw SFX_Cry24_2_Ch3 + dw SFX_Cry24_2_Ch7 SFX_Cry25_2:: db ( $80 | CH4 ) - dw SFX_Cry25_2_Ch1 + dw SFX_Cry25_2_Ch4 db CH5 - dw SFX_Cry25_2_Ch2 + dw SFX_Cry25_2_Ch5 db CH7 - dw SFX_Cry25_2_Ch3 + dw SFX_Cry25_2_Ch7 SFX_Level_Up:: db ( $80 | CH4 ) - dw SFX_Level_Up_Ch1 + dw SFX_Level_Up_Ch4 db CH5 - dw SFX_Level_Up_Ch2 + dw SFX_Level_Up_Ch5 db CH6 - dw SFX_Level_Up_Ch3 + dw SFX_Level_Up_Ch6 SFX_Get_Item2_2:: db ( $80 | CH4 ) - dw SFX_Get_Item2_2_Ch1 + dw SFX_Get_Item2_2_Ch4 db CH5 - dw SFX_Get_Item2_2_Ch2 + dw SFX_Get_Item2_2_Ch5 db CH6 - dw SFX_Get_Item2_2_Ch3 + dw SFX_Get_Item2_2_Ch6 SFX_Tink_2:: db CH4 - dw SFX_Tink_2_Ch1 + dw SFX_Tink_2_Ch4 SFX_Heal_HP_2:: db CH4 - dw SFX_Heal_HP_2_Ch1 + dw SFX_Heal_HP_2_Ch4 SFX_Heal_Ailment_2:: db CH4 - dw SFX_Heal_Ailment_2_Ch1 + dw SFX_Heal_Ailment_2_Ch4 SFX_Start_Menu_2:: db CH7 - dw SFX_Start_Menu_2_Ch1 + dw SFX_Start_Menu_2_Ch7 SFX_Press_AB_2:: db CH4 - dw SFX_Press_AB_2_Ch1 + dw SFX_Press_AB_2_Ch4 SFX_Ball_Toss:: db ( $40 | CH4 ) - dw SFX_Ball_Toss_Ch1 + dw SFX_Ball_Toss_Ch4 db CH5 - dw SFX_Ball_Toss_Ch2 + dw SFX_Ball_Toss_Ch5 SFX_Ball_Poof:: db ( $40 | CH4 ) - dw SFX_Ball_Poof_Ch1 + dw SFX_Ball_Poof_Ch4 db CH7 - dw SFX_Ball_Poof_Ch2 + dw SFX_Ball_Poof_Ch7 SFX_Faint_Thud:: db ( $40 | CH4 ) - dw SFX_Faint_Thud_Ch1 + dw SFX_Faint_Thud_Ch4 db CH7 - dw SFX_Faint_Thud_Ch2 + dw SFX_Faint_Thud_Ch7 SFX_Run:: db CH7 - dw SFX_Run_Ch1 + dw SFX_Run_Ch7 SFX_Dex_Page_Added:: db ( $40 | CH4 ) - dw SFX_Dex_Page_Added_Ch1 + dw SFX_Dex_Page_Added_Ch4 db CH5 - dw SFX_Dex_Page_Added_Ch2 + dw SFX_Dex_Page_Added_Ch5 SFX_Caught_Mon:: db ( $80 | CH4 ) - dw SFX_Caught_Mon_Ch1 + dw SFX_Caught_Mon_Ch4 db CH5 - dw SFX_Caught_Mon_Ch2 + dw SFX_Caught_Mon_Ch5 db CH6 - dw SFX_Caught_Mon_Ch3 + dw SFX_Caught_Mon_Ch6 SFX_Peck:: db CH7 - dw SFX_Peck_Ch1 + dw SFX_Peck_Ch7 SFX_Faint_Fall:: db CH4 - dw SFX_Faint_Fall_Ch1 + dw SFX_Faint_Fall_Ch4 SFX_Battle_09:: db CH4 - dw SFX_Battle_09_Ch1 + dw SFX_Battle_09_Ch4 SFX_Pound:: db CH7 - dw SFX_Pound_Ch1 + dw SFX_Pound_Ch7 SFX_Battle_0B:: db CH7 - dw SFX_Battle_0B_Ch1 + dw SFX_Battle_0B_Ch7 SFX_Battle_0C:: db CH7 - dw SFX_Battle_0C_Ch1 + dw SFX_Battle_0C_Ch7 SFX_Battle_0D:: db CH7 - dw SFX_Battle_0D_Ch1 + dw SFX_Battle_0D_Ch7 SFX_Battle_0E:: db CH7 - dw SFX_Battle_0E_Ch1 + dw SFX_Battle_0E_Ch7 SFX_Battle_0F:: db CH7 - dw SFX_Battle_0F_Ch1 + dw SFX_Battle_0F_Ch7 SFX_Damage:: db CH7 - dw SFX_Damage_Ch1 + dw SFX_Damage_Ch7 SFX_Not_Very_Effective:: db CH7 - dw SFX_Not_Very_Effective_Ch1 + dw SFX_Not_Very_Effective_Ch7 SFX_Battle_12:: db CH7 - dw SFX_Battle_12_Ch1 + dw SFX_Battle_12_Ch7 SFX_Battle_13:: db CH7 - dw SFX_Battle_13_Ch1 + dw SFX_Battle_13_Ch7 SFX_Battle_14:: db CH7 - dw SFX_Battle_14_Ch1 + dw SFX_Battle_14_Ch7 SFX_Vine_Whip:: db CH7 - dw SFX_Vine_Whip_Ch1 + dw SFX_Vine_Whip_Ch7 SFX_Battle_16:: db CH7 - dw SFX_Battle_16_Ch1 + dw SFX_Battle_16_Ch7 SFX_Battle_17:: db CH7 - dw SFX_Battle_17_Ch1 + dw SFX_Battle_17_Ch7 SFX_Battle_18:: db CH7 - dw SFX_Battle_18_Ch1 + dw SFX_Battle_18_Ch7 SFX_Battle_19:: db CH7 - dw SFX_Battle_19_Ch1 + dw SFX_Battle_19_Ch7 SFX_Super_Effective:: db CH7 - dw SFX_Super_Effective_Ch1 + dw SFX_Super_Effective_Ch7 SFX_Battle_1B:: db CH7 - dw SFX_Battle_1B_Ch1 + dw SFX_Battle_1B_Ch7 SFX_Battle_1C:: db CH7 - dw SFX_Battle_1C_Ch1 + dw SFX_Battle_1C_Ch7 SFX_Doubleslap:: db CH7 - dw SFX_Doubleslap_Ch1 + dw SFX_Doubleslap_Ch7 SFX_Battle_1E:: db ( $40 | CH4 ) - dw SFX_Battle_1E_Ch1 + dw SFX_Battle_1E_Ch4 db CH7 - dw SFX_Battle_1E_Ch2 + dw SFX_Battle_1E_Ch7 SFX_Horn_Drill:: db CH7 - dw SFX_Horn_Drill_Ch1 + dw SFX_Horn_Drill_Ch7 SFX_Battle_20:: db CH7 - dw SFX_Battle_20_Ch1 + dw SFX_Battle_20_Ch7 SFX_Battle_21:: db CH7 - dw SFX_Battle_21_Ch1 + dw SFX_Battle_21_Ch7 SFX_Battle_22:: db CH7 - dw SFX_Battle_22_Ch1 + dw SFX_Battle_22_Ch7 SFX_Battle_23:: db CH7 - dw SFX_Battle_23_Ch1 + dw SFX_Battle_23_Ch7 SFX_Battle_24:: db ( $40 | CH4 ) - dw SFX_Battle_24_Ch1 + dw SFX_Battle_24_Ch4 db CH7 - dw SFX_Battle_24_Ch2 + dw SFX_Battle_24_Ch7 SFX_Battle_25:: db CH7 - dw SFX_Battle_25_Ch1 + dw SFX_Battle_25_Ch7 SFX_Battle_26:: db CH7 - dw SFX_Battle_26_Ch1 + dw SFX_Battle_26_Ch7 SFX_Battle_27:: db ( $80 | CH4 ) - dw SFX_Battle_27_Ch1 + dw SFX_Battle_27_Ch4 db CH5 - dw SFX_Battle_27_Ch2 + dw SFX_Battle_27_Ch5 db CH7 - dw SFX_Battle_27_Ch3 + dw SFX_Battle_27_Ch7 SFX_Battle_28:: db ( $80 | CH4 ) - dw SFX_Battle_28_Ch1 + dw SFX_Battle_28_Ch4 db CH5 - dw SFX_Battle_28_Ch2 + dw SFX_Battle_28_Ch5 db CH7 - dw SFX_Battle_28_Ch3 + dw SFX_Battle_28_Ch7 SFX_Battle_29:: db ( $40 | CH4 ) - dw SFX_Battle_29_Ch1 + dw SFX_Battle_29_Ch4 db CH7 - dw SFX_Battle_29_Ch2 + dw SFX_Battle_29_Ch7 SFX_Battle_2A:: db ( $80 | CH4 ) - dw SFX_Battle_2A_Ch1 + dw SFX_Battle_2A_Ch4 db CH5 - dw SFX_Battle_2A_Ch2 + dw SFX_Battle_2A_Ch5 db CH7 - dw SFX_Battle_2A_Ch3 + dw SFX_Battle_2A_Ch7 SFX_Battle_2B:: db ( $40 | CH4 ) - dw SFX_Battle_2B_Ch1 + dw SFX_Battle_2B_Ch4 db CH7 - dw SFX_Battle_2B_Ch2 + dw SFX_Battle_2B_Ch7 SFX_Battle_2C:: db ( $80 | CH4 ) - dw SFX_Battle_2C_Ch1 + dw SFX_Battle_2C_Ch4 db CH5 - dw SFX_Battle_2C_Ch2 + dw SFX_Battle_2C_Ch5 db CH7 - dw SFX_Battle_2C_Ch3 + dw SFX_Battle_2C_Ch7 SFX_Psybeam:: db ( $80 | CH4 ) - dw SFX_Psybeam_Ch1 + dw SFX_Psybeam_Ch4 db CH5 - dw SFX_Psybeam_Ch2 + dw SFX_Psybeam_Ch5 db CH7 - dw SFX_Psybeam_Ch3 + dw SFX_Psybeam_Ch7 SFX_Battle_2E:: db ( $80 | CH4 ) - dw SFX_Battle_2E_Ch1 + dw SFX_Battle_2E_Ch4 db CH5 - dw SFX_Battle_2E_Ch2 + dw SFX_Battle_2E_Ch5 db CH7 - dw SFX_Battle_2E_Ch3 + dw SFX_Battle_2E_Ch7 SFX_Battle_2F:: db ( $80 | CH4 ) - dw SFX_Battle_2F_Ch1 + dw SFX_Battle_2F_Ch4 db CH5 - dw SFX_Battle_2F_Ch2 + dw SFX_Battle_2F_Ch5 db CH7 - dw SFX_Battle_2F_Ch3 + dw SFX_Battle_2F_Ch7 SFX_Psychic_M:: db ( $80 | CH4 ) - dw SFX_Psychic_M_Ch1 + dw SFX_Psychic_M_Ch4 db CH5 - dw SFX_Psychic_M_Ch2 + dw SFX_Psychic_M_Ch5 db CH7 - dw SFX_Psychic_M_Ch3 + dw SFX_Psychic_M_Ch7 SFX_Battle_31:: db ( $40 | CH4 ) - dw SFX_Battle_31_Ch1 + dw SFX_Battle_31_Ch4 db CH5 - dw SFX_Battle_31_Ch2 + dw SFX_Battle_31_Ch5 SFX_Battle_32:: db ( $40 | CH4 ) - dw SFX_Battle_32_Ch1 + dw SFX_Battle_32_Ch4 db CH5 - dw SFX_Battle_32_Ch2 + dw SFX_Battle_32_Ch5 SFX_Battle_33:: db ( $40 | CH4 ) - dw SFX_Battle_33_Ch1 + dw SFX_Battle_33_Ch4 db CH5 - dw SFX_Battle_33_Ch2 + dw SFX_Battle_33_Ch5 SFX_Battle_34:: db ( $80 | CH4 ) - dw SFX_Battle_34_Ch1 + dw SFX_Battle_34_Ch4 db CH5 - dw SFX_Battle_34_Ch2 + dw SFX_Battle_34_Ch5 db CH7 - dw SFX_Battle_34_Ch3 + dw SFX_Battle_34_Ch7 SFX_Battle_35:: db ( $40 | CH4 ) - dw SFX_Battle_35_Ch1 + dw SFX_Battle_35_Ch4 db CH5 - dw SFX_Battle_35_Ch2 + dw SFX_Battle_35_Ch5 SFX_Battle_36:: db ( $80 | CH4 ) - dw SFX_Battle_36_Ch1 + dw SFX_Battle_36_Ch4 db CH5 - dw SFX_Battle_36_Ch2 + dw SFX_Battle_36_Ch5 db CH7 - dw SFX_Battle_36_Ch3 + dw SFX_Battle_36_Ch7 SFX_Silph_Scope:: db CH4 - dw SFX_Silph_Scope_Ch1 + dw SFX_Silph_Scope_Ch4 diff --git a/audio/headers/sfxheaders3.asm b/audio/headers/sfxheaders3.asm index 0472afa6..a49a6728 100644 --- a/audio/headers/sfxheaders3.asm +++ b/audio/headers/sfxheaders3.asm @@ -3,594 +3,594 @@ SFX_Headers_3:: SFX_Snare1_3:: db CH7 - dw SFX_Snare1_3_Ch1 + dw SFX_Snare1_3_Ch7 SFX_Snare2_3:: db CH7 - dw SFX_Snare2_3_Ch1 + dw SFX_Snare2_3_Ch7 SFX_Snare3_3:: db CH7 - dw SFX_Snare3_3_Ch1 + dw SFX_Snare3_3_Ch7 SFX_Snare4_3:: db CH7 - dw SFX_Snare4_3_Ch1 + dw SFX_Snare4_3_Ch7 SFX_Snare5_3:: db CH7 - dw SFX_Snare5_3_Ch1 + dw SFX_Snare5_3_Ch7 SFX_Triangle1_3:: db CH7 - dw SFX_Triangle1_3_Ch1 + dw SFX_Triangle1_3_Ch7 SFX_Triangle2_3:: db CH7 - dw SFX_Triangle2_3_Ch1 + dw SFX_Triangle2_3_Ch7 SFX_Snare6_3:: db CH7 - dw SFX_Snare6_3_Ch1 + dw SFX_Snare6_3_Ch7 SFX_Snare7_3:: db CH7 - dw SFX_Snare7_3_Ch1 + dw SFX_Snare7_3_Ch7 SFX_Snare8_3:: db CH7 - dw SFX_Snare8_3_Ch1 + dw SFX_Snare8_3_Ch7 SFX_Snare9_3:: db CH7 - dw SFX_Snare9_3_Ch1 + dw SFX_Snare9_3_Ch7 SFX_Cymbal1_3:: db CH7 - dw SFX_Cymbal1_3_Ch1 + dw SFX_Cymbal1_3_Ch7 SFX_Cymbal2_3:: db CH7 - dw SFX_Cymbal2_3_Ch1 + dw SFX_Cymbal2_3_Ch7 SFX_Cymbal3_3:: db CH7 - dw SFX_Cymbal3_3_Ch1 + dw SFX_Cymbal3_3_Ch7 SFX_Muted_Snare1_3:: db CH7 - dw SFX_Muted_Snare1_3_Ch1 + dw SFX_Muted_Snare1_3_Ch7 SFX_Triangle3_3:: db CH7 - dw SFX_Triangle3_3_Ch1 + dw SFX_Triangle3_3_Ch7 SFX_Muted_Snare2_3:: db CH7 - dw SFX_Muted_Snare2_3_Ch1 + dw SFX_Muted_Snare2_3_Ch7 SFX_Muted_Snare3_3:: db CH7 - dw SFX_Muted_Snare3_3_Ch1 + dw SFX_Muted_Snare3_3_Ch7 SFX_Muted_Snare4_3:: db CH7 - dw SFX_Muted_Snare4_3_Ch1 + dw SFX_Muted_Snare4_3_Ch7 SFX_Cry00_3:: db ( $80 | CH4 ) - dw SFX_Cry00_3_Ch1 + dw SFX_Cry00_3_Ch4 db CH5 - dw SFX_Cry00_3_Ch2 + dw SFX_Cry00_3_Ch5 db CH7 - dw SFX_Cry00_3_Ch3 + dw SFX_Cry00_3_Ch7 SFX_Cry01_3:: db ( $80 | CH4 ) - dw SFX_Cry01_3_Ch1 + dw SFX_Cry01_3_Ch4 db CH5 - dw SFX_Cry01_3_Ch2 + dw SFX_Cry01_3_Ch5 db CH7 - dw SFX_Cry01_3_Ch3 + dw SFX_Cry01_3_Ch7 SFX_Cry02_3:: db ( $80 | CH4 ) - dw SFX_Cry02_3_Ch1 + dw SFX_Cry02_3_Ch4 db CH5 - dw SFX_Cry02_3_Ch2 + dw SFX_Cry02_3_Ch5 db CH7 - dw SFX_Cry02_3_Ch3 + dw SFX_Cry02_3_Ch7 SFX_Cry03_3:: db ( $80 | CH4 ) - dw SFX_Cry03_3_Ch1 + dw SFX_Cry03_3_Ch4 db CH5 - dw SFX_Cry03_3_Ch2 + dw SFX_Cry03_3_Ch5 db CH7 - dw SFX_Cry03_3_Ch3 + dw SFX_Cry03_3_Ch7 SFX_Cry04_3:: db ( $80 | CH4 ) - dw SFX_Cry04_3_Ch1 + dw SFX_Cry04_3_Ch4 db CH5 - dw SFX_Cry04_3_Ch2 + dw SFX_Cry04_3_Ch5 db CH7 - dw SFX_Cry04_3_Ch3 + dw SFX_Cry04_3_Ch7 SFX_Cry05_3:: db ( $80 | CH4 ) - dw SFX_Cry05_3_Ch1 + dw SFX_Cry05_3_Ch4 db CH5 - dw SFX_Cry05_3_Ch2 + dw SFX_Cry05_3_Ch5 db CH7 - dw SFX_Cry05_3_Ch3 + dw SFX_Cry05_3_Ch7 SFX_Cry06_3:: db ( $80 | CH4 ) - dw SFX_Cry06_3_Ch1 + dw SFX_Cry06_3_Ch4 db CH5 - dw SFX_Cry06_3_Ch2 + dw SFX_Cry06_3_Ch5 db CH7 - dw SFX_Cry06_3_Ch3 + dw SFX_Cry06_3_Ch7 SFX_Cry07_3:: db ( $80 | CH4 ) - dw SFX_Cry07_3_Ch1 + dw SFX_Cry07_3_Ch4 db CH5 - dw SFX_Cry07_3_Ch2 + dw SFX_Cry07_3_Ch5 db CH7 - dw SFX_Cry07_3_Ch3 + dw SFX_Cry07_3_Ch7 SFX_Cry08_3:: db ( $80 | CH4 ) - dw SFX_Cry08_3_Ch1 + dw SFX_Cry08_3_Ch4 db CH5 - dw SFX_Cry08_3_Ch2 + dw SFX_Cry08_3_Ch5 db CH7 - dw SFX_Cry08_3_Ch3 + dw SFX_Cry08_3_Ch7 SFX_Cry09_3:: db ( $80 | CH4 ) - dw SFX_Cry09_3_Ch1 + dw SFX_Cry09_3_Ch4 db CH5 - dw SFX_Cry09_3_Ch2 + dw SFX_Cry09_3_Ch5 db CH7 - dw SFX_Cry09_3_Ch3 + dw SFX_Cry09_3_Ch7 SFX_Cry0A_3:: db ( $80 | CH4 ) - dw SFX_Cry0A_3_Ch1 + dw SFX_Cry0A_3_Ch4 db CH5 - dw SFX_Cry0A_3_Ch2 + dw SFX_Cry0A_3_Ch5 db CH7 - dw SFX_Cry0A_3_Ch3 + dw SFX_Cry0A_3_Ch7 SFX_Cry0B_3:: db ( $80 | CH4 ) - dw SFX_Cry0B_3_Ch1 + dw SFX_Cry0B_3_Ch4 db CH5 - dw SFX_Cry0B_3_Ch2 + dw SFX_Cry0B_3_Ch5 db CH7 - dw SFX_Cry0B_3_Ch3 + dw SFX_Cry0B_3_Ch7 SFX_Cry0C_3:: db ( $80 | CH4 ) - dw SFX_Cry0C_3_Ch1 + dw SFX_Cry0C_3_Ch4 db CH5 - dw SFX_Cry0C_3_Ch2 + dw SFX_Cry0C_3_Ch5 db CH7 - dw SFX_Cry0C_3_Ch3 + dw SFX_Cry0C_3_Ch7 SFX_Cry0D_3:: db ( $80 | CH4 ) - dw SFX_Cry0D_3_Ch1 + dw SFX_Cry0D_3_Ch4 db CH5 - dw SFX_Cry0D_3_Ch2 + dw SFX_Cry0D_3_Ch5 db CH7 - dw SFX_Cry0D_3_Ch3 + dw SFX_Cry0D_3_Ch7 SFX_Cry0E_3:: db ( $80 | CH4 ) - dw SFX_Cry0E_3_Ch1 + dw SFX_Cry0E_3_Ch4 db CH5 - dw SFX_Cry0E_3_Ch2 + dw SFX_Cry0E_3_Ch5 db CH7 - dw SFX_Cry0E_3_Ch3 + dw SFX_Cry0E_3_Ch7 SFX_Cry0F_3:: db ( $80 | CH4 ) - dw SFX_Cry0F_3_Ch1 + dw SFX_Cry0F_3_Ch4 db CH5 - dw SFX_Cry0F_3_Ch2 + dw SFX_Cry0F_3_Ch5 db CH7 - dw SFX_Cry0F_3_Ch3 + dw SFX_Cry0F_3_Ch7 SFX_Cry10_3:: db ( $80 | CH4 ) - dw SFX_Cry10_3_Ch1 + dw SFX_Cry10_3_Ch4 db CH5 - dw SFX_Cry10_3_Ch2 + dw SFX_Cry10_3_Ch5 db CH7 - dw SFX_Cry10_3_Ch3 + dw SFX_Cry10_3_Ch7 SFX_Cry11_3:: db ( $80 | CH4 ) - dw SFX_Cry11_3_Ch1 + dw SFX_Cry11_3_Ch4 db CH5 - dw SFX_Cry11_3_Ch2 + dw SFX_Cry11_3_Ch5 db CH7 - dw SFX_Cry11_3_Ch3 + dw SFX_Cry11_3_Ch7 SFX_Cry12_3:: db ( $80 | CH4 ) - dw SFX_Cry12_3_Ch1 + dw SFX_Cry12_3_Ch4 db CH5 - dw SFX_Cry12_3_Ch2 + dw SFX_Cry12_3_Ch5 db CH7 - dw SFX_Cry12_3_Ch3 + dw SFX_Cry12_3_Ch7 SFX_Cry13_3:: db ( $80 | CH4 ) - dw SFX_Cry13_3_Ch1 + dw SFX_Cry13_3_Ch4 db CH5 - dw SFX_Cry13_3_Ch2 + dw SFX_Cry13_3_Ch5 db CH7 - dw SFX_Cry13_3_Ch3 + dw SFX_Cry13_3_Ch7 SFX_Cry14_3:: db ( $80 | CH4 ) - dw SFX_Cry14_3_Ch1 + dw SFX_Cry14_3_Ch4 db CH5 - dw SFX_Cry14_3_Ch2 + dw SFX_Cry14_3_Ch5 db CH7 - dw SFX_Cry14_3_Ch3 + dw SFX_Cry14_3_Ch7 SFX_Cry15_3:: db ( $80 | CH4 ) - dw SFX_Cry15_3_Ch1 + dw SFX_Cry15_3_Ch4 db CH5 - dw SFX_Cry15_3_Ch2 + dw SFX_Cry15_3_Ch5 db CH7 - dw SFX_Cry15_3_Ch3 + dw SFX_Cry15_3_Ch7 SFX_Cry16_3:: db ( $80 | CH4 ) - dw SFX_Cry16_3_Ch1 + dw SFX_Cry16_3_Ch4 db CH5 - dw SFX_Cry16_3_Ch2 + dw SFX_Cry16_3_Ch5 db CH7 - dw SFX_Cry16_3_Ch3 + dw SFX_Cry16_3_Ch7 SFX_Cry17_3:: db ( $80 | CH4 ) - dw SFX_Cry17_3_Ch1 + dw SFX_Cry17_3_Ch4 db CH5 - dw SFX_Cry17_3_Ch2 + dw SFX_Cry17_3_Ch5 db CH7 - dw SFX_Cry17_3_Ch3 + dw SFX_Cry17_3_Ch7 SFX_Cry18_3:: db ( $80 | CH4 ) - dw SFX_Cry18_3_Ch1 + dw SFX_Cry18_3_Ch4 db CH5 - dw SFX_Cry18_3_Ch2 + dw SFX_Cry18_3_Ch5 db CH7 - dw SFX_Cry18_3_Ch3 + dw SFX_Cry18_3_Ch7 SFX_Cry19_3:: db ( $80 | CH4 ) - dw SFX_Cry19_3_Ch1 + dw SFX_Cry19_3_Ch4 db CH5 - dw SFX_Cry19_3_Ch2 + dw SFX_Cry19_3_Ch5 db CH7 - dw SFX_Cry19_3_Ch3 + dw SFX_Cry19_3_Ch7 SFX_Cry1A_3:: db ( $80 | CH4 ) - dw SFX_Cry1A_3_Ch1 + dw SFX_Cry1A_3_Ch4 db CH5 - dw SFX_Cry1A_3_Ch2 + dw SFX_Cry1A_3_Ch5 db CH7 - dw SFX_Cry1A_3_Ch3 + dw SFX_Cry1A_3_Ch7 SFX_Cry1B_3:: db ( $80 | CH4 ) - dw SFX_Cry1B_3_Ch1 + dw SFX_Cry1B_3_Ch4 db CH5 - dw SFX_Cry1B_3_Ch2 + dw SFX_Cry1B_3_Ch5 db CH7 - dw SFX_Cry1B_3_Ch3 + dw SFX_Cry1B_3_Ch7 SFX_Cry1C_3:: db ( $80 | CH4 ) - dw SFX_Cry1C_3_Ch1 + dw SFX_Cry1C_3_Ch4 db CH5 - dw SFX_Cry1C_3_Ch2 + dw SFX_Cry1C_3_Ch5 db CH7 - dw SFX_Cry1C_3_Ch3 + dw SFX_Cry1C_3_Ch7 SFX_Cry1D_3:: db ( $80 | CH4 ) - dw SFX_Cry1D_3_Ch1 + dw SFX_Cry1D_3_Ch4 db CH5 - dw SFX_Cry1D_3_Ch2 + dw SFX_Cry1D_3_Ch5 db CH7 - dw SFX_Cry1D_3_Ch3 + dw SFX_Cry1D_3_Ch7 SFX_Cry1E_3:: db ( $80 | CH4 ) - dw SFX_Cry1E_3_Ch1 + dw SFX_Cry1E_3_Ch4 db CH5 - dw SFX_Cry1E_3_Ch2 + dw SFX_Cry1E_3_Ch5 db CH7 - dw SFX_Cry1E_3_Ch3 + dw SFX_Cry1E_3_Ch7 SFX_Cry1F_3:: db ( $80 | CH4 ) - dw SFX_Cry1F_3_Ch1 + dw SFX_Cry1F_3_Ch4 db CH5 - dw SFX_Cry1F_3_Ch2 + dw SFX_Cry1F_3_Ch5 db CH7 - dw SFX_Cry1F_3_Ch3 + dw SFX_Cry1F_3_Ch7 SFX_Cry20_3:: db ( $80 | CH4 ) - dw SFX_Cry20_3_Ch1 + dw SFX_Cry20_3_Ch4 db CH5 - dw SFX_Cry20_3_Ch2 + dw SFX_Cry20_3_Ch5 db CH7 - dw SFX_Cry20_3_Ch3 + dw SFX_Cry20_3_Ch7 SFX_Cry21_3:: db ( $80 | CH4 ) - dw SFX_Cry21_3_Ch1 + dw SFX_Cry21_3_Ch4 db CH5 - dw SFX_Cry21_3_Ch2 + dw SFX_Cry21_3_Ch5 db CH7 - dw SFX_Cry21_3_Ch3 + dw SFX_Cry21_3_Ch7 SFX_Cry22_3:: db ( $80 | CH4 ) - dw SFX_Cry22_3_Ch1 + dw SFX_Cry22_3_Ch4 db CH5 - dw SFX_Cry22_3_Ch2 + dw SFX_Cry22_3_Ch5 db CH7 - dw SFX_Cry22_3_Ch3 + dw SFX_Cry22_3_Ch7 SFX_Cry23_3:: db ( $80 | CH4 ) - dw SFX_Cry23_3_Ch1 + dw SFX_Cry23_3_Ch4 db CH5 - dw SFX_Cry23_3_Ch2 + dw SFX_Cry23_3_Ch5 db CH7 - dw SFX_Cry23_3_Ch3 + dw SFX_Cry23_3_Ch7 SFX_Cry24_3:: db ( $80 | CH4 ) - dw SFX_Cry24_3_Ch1 + dw SFX_Cry24_3_Ch4 db CH5 - dw SFX_Cry24_3_Ch2 + dw SFX_Cry24_3_Ch5 db CH7 - dw SFX_Cry24_3_Ch3 + dw SFX_Cry24_3_Ch7 SFX_Cry25_3:: db ( $80 | CH4 ) - dw SFX_Cry25_3_Ch1 + dw SFX_Cry25_3_Ch4 db CH5 - dw SFX_Cry25_3_Ch2 + dw SFX_Cry25_3_Ch5 db CH7 - dw SFX_Cry25_3_Ch3 + dw SFX_Cry25_3_Ch7 SFX_Get_Item1_3:: db ( $80 | CH4 ) - dw SFX_Get_Item1_3_Ch1 + dw SFX_Get_Item1_3_Ch4 db CH5 - dw SFX_Get_Item1_3_Ch2 + dw SFX_Get_Item1_3_Ch5 db CH6 - dw SFX_Get_Item1_3_Ch3 + dw SFX_Get_Item1_3_Ch6 SFX_Get_Item2_3:: db ( $80 | CH4 ) - dw SFX_Get_Item2_3_Ch1 + dw SFX_Get_Item2_3_Ch4 db CH5 - dw SFX_Get_Item2_3_Ch2 + dw SFX_Get_Item2_3_Ch5 db CH6 - dw SFX_Get_Item2_3_Ch3 + dw SFX_Get_Item2_3_Ch6 SFX_Tink_3:: db CH4 - dw SFX_Tink_3_Ch1 + dw SFX_Tink_3_Ch4 SFX_Heal_HP_3:: db CH4 - dw SFX_Heal_HP_3_Ch1 + dw SFX_Heal_HP_3_Ch4 SFX_Heal_Ailment_3:: db CH4 - dw SFX_Heal_Ailment_3_Ch1 + dw SFX_Heal_Ailment_3_Ch4 SFX_Start_Menu_3:: db CH7 - dw SFX_Start_Menu_3_Ch1 + dw SFX_Start_Menu_3_Ch7 SFX_Press_AB_3:: db CH4 - dw SFX_Press_AB_3_Ch1 + dw SFX_Press_AB_3_Ch4 SFX_Pokedex_Rating_3:: db ( $80 | CH4 ) - dw SFX_Pokedex_Rating_3_Ch1 + dw SFX_Pokedex_Rating_3_Ch4 db CH5 - dw SFX_Pokedex_Rating_3_Ch2 + dw SFX_Pokedex_Rating_3_Ch5 db CH6 - dw SFX_Pokedex_Rating_3_Ch3 + dw SFX_Pokedex_Rating_3_Ch6 SFX_Get_Key_Item_3:: db ( $80 | CH4 ) - dw SFX_Get_Key_Item_3_Ch1 + dw SFX_Get_Key_Item_3_Ch4 db CH5 - dw SFX_Get_Key_Item_3_Ch2 + dw SFX_Get_Key_Item_3_Ch5 db CH6 - dw SFX_Get_Key_Item_3_Ch3 + dw SFX_Get_Key_Item_3_Ch6 SFX_Poisoned_3:: db CH4 - dw SFX_Poisoned_3_Ch1 + dw SFX_Poisoned_3_Ch4 SFX_Trade_Machine_3:: db CH4 - dw SFX_Trade_Machine_3_Ch1 + dw SFX_Trade_Machine_3_Ch4 SFX_Turn_On_PC_3:: db CH4 - dw SFX_Turn_On_PC_3_Ch1 + dw SFX_Turn_On_PC_3_Ch4 SFX_Turn_Off_PC_3:: db CH4 - dw SFX_Turn_Off_PC_3_Ch1 + dw SFX_Turn_Off_PC_3_Ch4 SFX_Enter_PC_3:: db CH4 - dw SFX_Enter_PC_3_Ch1 + dw SFX_Enter_PC_3_Ch4 SFX_Shrink_3:: db CH4 - dw SFX_Shrink_3_Ch1 + dw SFX_Shrink_3_Ch4 SFX_Switch_3:: db CH4 - dw SFX_Switch_3_Ch1 + dw SFX_Switch_3_Ch4 SFX_Healing_Machine_3:: db CH4 - dw SFX_Healing_Machine_3_Ch1 + dw SFX_Healing_Machine_3_Ch4 SFX_Teleport_Exit1_3:: db CH4 - dw SFX_Teleport_Exit1_3_Ch1 + dw SFX_Teleport_Exit1_3_Ch4 SFX_Teleport_Enter1_3:: db CH4 - dw SFX_Teleport_Enter1_3_Ch1 + dw SFX_Teleport_Enter1_3_Ch4 SFX_Teleport_Exit2_3:: db CH4 - dw SFX_Teleport_Exit2_3_Ch1 + dw SFX_Teleport_Exit2_3_Ch4 SFX_Ledge_3:: db CH4 - dw SFX_Ledge_3_Ch1 + dw SFX_Ledge_3_Ch4 SFX_Teleport_Enter2_3:: db CH7 - dw SFX_Teleport_Enter2_3_Ch1 + dw SFX_Teleport_Enter2_3_Ch7 SFX_Fly_3:: db CH7 - dw SFX_Fly_3_Ch1 + dw SFX_Fly_3_Ch7 SFX_Denied_3:: db ( $40 | CH4 ) - dw SFX_Denied_3_Ch1 + dw SFX_Denied_3_Ch4 db CH5 - dw SFX_Denied_3_Ch2 + dw SFX_Denied_3_Ch5 SFX_Arrow_Tiles_3:: db CH4 - dw SFX_Arrow_Tiles_3_Ch1 + dw SFX_Arrow_Tiles_3_Ch4 SFX_Push_Boulder_3:: db CH7 - dw SFX_Push_Boulder_3_Ch1 + dw SFX_Push_Boulder_3_Ch7 SFX_SS_Anne_Horn_3:: db ( $40 | CH4 ) - dw SFX_SS_Anne_Horn_3_Ch1 + dw SFX_SS_Anne_Horn_3_Ch4 db CH5 - dw SFX_SS_Anne_Horn_3_Ch2 + dw SFX_SS_Anne_Horn_3_Ch5 SFX_Withdraw_Deposit_3:: db CH4 - dw SFX_Withdraw_Deposit_3_Ch1 + dw SFX_Withdraw_Deposit_3_Ch4 SFX_Cut_3:: db CH7 - dw SFX_Cut_3_Ch1 + dw SFX_Cut_3_Ch7 SFX_Go_Inside_3:: db CH7 - dw SFX_Go_Inside_3_Ch1 + dw SFX_Go_Inside_3_Ch7 SFX_Swap_3:: db ( $40 | CH4 ) - dw SFX_Swap_3_Ch1 + dw SFX_Swap_3_Ch4 db CH5 - dw SFX_Swap_3_Ch2 + dw SFX_Swap_3_Ch5 SFX_59_3:: db ( $40 | CH4 ) - dw SFX_59_3_Ch1 + dw SFX_59_3_Ch4 db CH5 - dw SFX_59_3_Ch2 + dw SFX_59_3_Ch5 SFX_Purchase_3:: db ( $40 | CH4 ) - dw SFX_Purchase_3_Ch1 + dw SFX_Purchase_3_Ch4 db CH5 - dw SFX_Purchase_3_Ch2 + dw SFX_Purchase_3_Ch5 SFX_Collision_3:: db CH4 - dw SFX_Collision_3_Ch1 + dw SFX_Collision_3_Ch4 SFX_Go_Outside_3:: db CH7 - dw SFX_Go_Outside_3_Ch1 + dw SFX_Go_Outside_3_Ch7 SFX_Save_3:: db ( $40 | CH4 ) - dw SFX_Save_3_Ch1 + dw SFX_Save_3_Ch4 db CH5 - dw SFX_Save_3_Ch2 + dw SFX_Save_3_Ch5 SFX_Intro_Lunge:: db CH7 - dw SFX_Intro_Lunge_Ch1 + dw SFX_Intro_Lunge_Ch7 SFX_Intro_Hip:: db CH4 - dw SFX_Intro_Hip_Ch1 + dw SFX_Intro_Hip_Ch4 SFX_Intro_Hop:: db CH4 - dw SFX_Intro_Hop_Ch1 + dw SFX_Intro_Hop_Ch4 SFX_Intro_Raise:: db CH7 - dw SFX_Intro_Raise_Ch1 + dw SFX_Intro_Raise_Ch7 SFX_Intro_Crash:: db CH7 - dw SFX_Intro_Crash_Ch1 + dw SFX_Intro_Crash_Ch7 SFX_Intro_Whoosh:: db CH7 - dw SFX_Intro_Whoosh_Ch1 + dw SFX_Intro_Whoosh_Ch7 SFX_Slots_Stop_Wheel:: db CH4 - dw SFX_Slots_Stop_Wheel_Ch1 + dw SFX_Slots_Stop_Wheel_Ch4 SFX_Slots_Reward:: db CH4 - dw SFX_Slots_Reward_Ch1 + dw SFX_Slots_Reward_Ch4 SFX_Slots_New_Spin:: db ( $40 | CH4 ) - dw SFX_Slots_New_Spin_Ch1 + dw SFX_Slots_New_Spin_Ch4 db CH5 - dw SFX_Slots_New_Spin_Ch2 + dw SFX_Slots_New_Spin_Ch5 SFX_Shooting_Star:: db CH4 - dw SFX_Shooting_Star_Ch1 + dw SFX_Shooting_Star_Ch4 diff --git a/audio/sfx/59_1.asm b/audio/sfx/59_1.asm index c14be83e..f36f9e1e 100644 --- a/audio/sfx/59_1.asm +++ b/audio/sfx/59_1.asm @@ -1,10 +1,10 @@ -SFX_59_1_Ch1: +SFX_59_1_Ch4: duty 2 unknownsfx0x20 4, 241, 128, 7 endchannel -SFX_59_1_Ch2: +SFX_59_1_Ch5: duty 2 unknownsfx0x20 1, 8, 0, 0 unknownsfx0x20 4, 161, 97, 7 diff --git a/audio/sfx/59_3.asm b/audio/sfx/59_3.asm index 3b817f2f..559318ba 100644 --- a/audio/sfx/59_3.asm +++ b/audio/sfx/59_3.asm @@ -1,10 +1,10 @@ -SFX_59_3_Ch1: +SFX_59_3_Ch4: duty 2 unknownsfx0x20 4, 241, 128, 7 endchannel -SFX_59_3_Ch2: +SFX_59_3_Ch5: duty 2 unknownsfx0x20 1, 8, 0, 0 unknownsfx0x20 4, 161, 97, 7 diff --git a/audio/sfx/arrow_tiles_1.asm b/audio/sfx/arrow_tiles_1.asm index 6c3959c9..c9ef1564 100644 --- a/audio/sfx/arrow_tiles_1.asm +++ b/audio/sfx/arrow_tiles_1.asm @@ -1,4 +1,4 @@ -SFX_Arrow_Tiles_1_Ch1: +SFX_Arrow_Tiles_1_Ch4: duty 0 unknownsfx0x10 23 unknownsfx0x20 15, 210, 0, 7 diff --git a/audio/sfx/arrow_tiles_3.asm b/audio/sfx/arrow_tiles_3.asm index 8ff79858..f88b9c83 100644 --- a/audio/sfx/arrow_tiles_3.asm +++ b/audio/sfx/arrow_tiles_3.asm @@ -1,4 +1,4 @@ -SFX_Arrow_Tiles_3_Ch1: +SFX_Arrow_Tiles_3_Ch4: duty 0 unknownsfx0x10 23 unknownsfx0x20 15, 210, 0, 7 diff --git a/audio/sfx/ball_poof.asm b/audio/sfx/ball_poof.asm index 6cd9701b..7068c66c 100644 --- a/audio/sfx/ball_poof.asm +++ b/audio/sfx/ball_poof.asm @@ -1,4 +1,4 @@ -SFX_Ball_Poof_Ch1: +SFX_Ball_Poof_Ch4: duty 2 unknownsfx0x10 22 unknownsfx0x20 15, 242, 0, 4 @@ -6,6 +6,6 @@ SFX_Ball_Poof_Ch1: endchannel -SFX_Ball_Poof_Ch2: +SFX_Ball_Poof_Ch7: unknownnoise0x20 15, 162, 34 endchannel diff --git a/audio/sfx/ball_toss.asm b/audio/sfx/ball_toss.asm index 49176db3..e9beac77 100644 --- a/audio/sfx/ball_toss.asm +++ b/audio/sfx/ball_toss.asm @@ -1,11 +1,11 @@ -SFX_Ball_Toss_Ch1: +SFX_Ball_Toss_Ch4: duty 2 unknownsfx0x10 47 unknownsfx0x20 15, 242, 128, 7 endchannel -SFX_Ball_Toss_Ch2: +SFX_Ball_Toss_Ch5: duty 2 unknownsfx0x20 15, 194, 130, 7 endchannel diff --git a/audio/sfx/battle_09.asm b/audio/sfx/battle_09.asm index 8b92fc50..11f156cb 100644 --- a/audio/sfx/battle_09.asm +++ b/audio/sfx/battle_09.asm @@ -1,4 +1,4 @@ -SFX_Battle_09_Ch1: +SFX_Battle_09_Ch4: duty 1 unknownsfx0x10 151 unknownsfx0x20 15, 242, 0, 5 diff --git a/audio/sfx/battle_0b.asm b/audio/sfx/battle_0b.asm index 27909666..d6feba8e 100644 --- a/audio/sfx/battle_0b.asm +++ b/audio/sfx/battle_0b.asm @@ -1,3 +1,3 @@ -SFX_Battle_0B_Ch1: +SFX_Battle_0B_Ch7: unknownnoise0x20 8, 241, 84 endchannel diff --git a/audio/sfx/battle_0c.asm b/audio/sfx/battle_0c.asm index 7aa009ba..f193fc20 100644 --- a/audio/sfx/battle_0c.asm +++ b/audio/sfx/battle_0c.asm @@ -1,4 +1,4 @@ -SFX_Battle_0C_Ch1: +SFX_Battle_0C_Ch7: unknownnoise0x20 15, 143, 17 unknownnoise0x20 4, 255, 18 unknownnoise0x20 10, 241, 85 diff --git a/audio/sfx/battle_0d.asm b/audio/sfx/battle_0d.asm index 1b69e13f..f9d423ad 100644 --- a/audio/sfx/battle_0d.asm +++ b/audio/sfx/battle_0d.asm @@ -1,4 +1,4 @@ -SFX_Battle_0D_Ch1: +SFX_Battle_0D_Ch7: unknownnoise0x20 15, 143, 52 unknownnoise0x20 8, 242, 53 unknownnoise0x20 10, 241, 85 diff --git a/audio/sfx/battle_0e.asm b/audio/sfx/battle_0e.asm index ff60cb9e..92a660b2 100644 --- a/audio/sfx/battle_0e.asm +++ b/audio/sfx/battle_0e.asm @@ -1,4 +1,4 @@ -SFX_Battle_0E_Ch1: +SFX_Battle_0E_Ch7: unknownnoise0x20 15, 159, 35 unknownnoise0x20 8, 241, 33 endchannel diff --git a/audio/sfx/battle_0f.asm b/audio/sfx/battle_0f.asm index 3827a5a6..846a9053 100644 --- a/audio/sfx/battle_0f.asm +++ b/audio/sfx/battle_0f.asm @@ -1,4 +1,4 @@ -SFX_Battle_0F_Ch1: +SFX_Battle_0F_Ch7: unknownnoise0x20 2, 225, 75 unknownnoise0x20 10, 241, 68 unknownnoise0x20 2, 225, 58 diff --git a/audio/sfx/battle_12.asm b/audio/sfx/battle_12.asm index 7d301053..77be75c0 100644 --- a/audio/sfx/battle_12.asm +++ b/audio/sfx/battle_12.asm @@ -1,6 +1,6 @@ -SFX_Battle_12_Ch1: +SFX_Battle_12_Ch7: unknownnoise0x20 8, 79, 35 unknownnoise0x20 4, 196, 34 unknownnoise0x20 6, 242, 35 - loopchannel 4, SFX_Battle_12_Ch1 + loopchannel 4, SFX_Battle_12_Ch7 endchannel diff --git a/audio/sfx/battle_13.asm b/audio/sfx/battle_13.asm index 89b8c555..81e1a0ef 100644 --- a/audio/sfx/battle_13.asm +++ b/audio/sfx/battle_13.asm @@ -1,4 +1,4 @@ -SFX_Battle_13_Ch1: +SFX_Battle_13_Ch7: unknownnoise0x20 8, 79, 51 unknownnoise0x20 4, 196, 34 unknownnoise0x20 6, 242, 35 diff --git a/audio/sfx/battle_14.asm b/audio/sfx/battle_14.asm index acc064f7..8cecfb37 100644 --- a/audio/sfx/battle_14.asm +++ b/audio/sfx/battle_14.asm @@ -1,4 +1,4 @@ -SFX_Battle_14_Ch1: +SFX_Battle_14_Ch7: unknownnoise0x20 8, 255, 50 unknownnoise0x20 8, 244, 67 unknownnoise0x20 8, 242, 84 diff --git a/audio/sfx/battle_16.asm b/audio/sfx/battle_16.asm index 3aa31247..dcc7014d 100644 --- a/audio/sfx/battle_16.asm +++ b/audio/sfx/battle_16.asm @@ -1,4 +1,4 @@ -SFX_Battle_16_Ch1: +SFX_Battle_16_Ch7: unknownnoise0x20 1, 148, 35 unknownnoise0x20 1, 180, 34 unknownnoise0x20 8, 241, 68 diff --git a/audio/sfx/battle_17.asm b/audio/sfx/battle_17.asm index 2ff4bd6d..82bb2117 100644 --- a/audio/sfx/battle_17.asm +++ b/audio/sfx/battle_17.asm @@ -1,4 +1,4 @@ -SFX_Battle_17_Ch1: +SFX_Battle_17_Ch7: unknownnoise0x20 2, 148, 51 unknownnoise0x20 4, 180, 34 unknownnoise0x20 4, 241, 68 diff --git a/audio/sfx/battle_18.asm b/audio/sfx/battle_18.asm index 81fa2178..14aac5c1 100644 --- a/audio/sfx/battle_18.asm +++ b/audio/sfx/battle_18.asm @@ -1,4 +1,4 @@ -SFX_Battle_18_Ch1: +SFX_Battle_18_Ch7: unknownnoise0x20 4, 255, 85 unknownnoise0x20 8, 241, 101 endchannel diff --git a/audio/sfx/battle_19.asm b/audio/sfx/battle_19.asm index 9981f5e4..6bc1804d 100644 --- a/audio/sfx/battle_19.asm +++ b/audio/sfx/battle_19.asm @@ -1,4 +1,4 @@ -SFX_Battle_19_Ch1: +SFX_Battle_19_Ch7: unknownnoise0x20 2, 132, 67 unknownnoise0x20 2, 196, 34 unknownnoise0x20 8, 242, 52 diff --git a/audio/sfx/battle_1b.asm b/audio/sfx/battle_1b.asm index 9f89e449..a4d8992b 100644 --- a/audio/sfx/battle_1b.asm +++ b/audio/sfx/battle_1b.asm @@ -1,4 +1,4 @@ -SFX_Battle_1B_Ch1: +SFX_Battle_1B_Ch7: unknownnoise0x20 2, 241, 34 unknownnoise0x20 15, 242, 18 endchannel diff --git a/audio/sfx/battle_1c.asm b/audio/sfx/battle_1c.asm index 3827b34c..05cdd091 100644 --- a/audio/sfx/battle_1c.asm +++ b/audio/sfx/battle_1c.asm @@ -1,4 +1,4 @@ -SFX_Battle_1C_Ch1: +SFX_Battle_1C_Ch7: unknownnoise0x20 2, 194, 1 unknownnoise0x20 15, 244, 1 unknownnoise0x20 15, 242, 1 diff --git a/audio/sfx/battle_1e.asm b/audio/sfx/battle_1e.asm index f4e9bdc8..8d3f4745 100644 --- a/audio/sfx/battle_1e.asm +++ b/audio/sfx/battle_1e.asm @@ -1,4 +1,4 @@ -SFX_Battle_1E_Ch1: +SFX_Battle_1E_Ch4: duty 0 unknownsfx0x10 58 unknownsfx0x20 4, 242, 0, 2 @@ -8,7 +8,7 @@ SFX_Battle_1E_Ch1: endchannel -SFX_Battle_1E_Ch2: +SFX_Battle_1E_Ch7: unknownnoise0x20 0, 209, 66 unknownnoise0x20 4, 161, 50 unknownnoise0x20 0, 209, 34 diff --git a/audio/sfx/battle_20.asm b/audio/sfx/battle_20.asm index e8a4d9f3..f7413e63 100644 --- a/audio/sfx/battle_20.asm +++ b/audio/sfx/battle_20.asm @@ -1,4 +1,4 @@ -SFX_Battle_20_Ch1: +SFX_Battle_20_Ch7: unknownnoise0x20 12, 241, 84 unknownnoise0x20 8, 241, 100 endchannel diff --git a/audio/sfx/battle_21.asm b/audio/sfx/battle_21.asm index b59f5833..a6b63a6c 100644 --- a/audio/sfx/battle_21.asm +++ b/audio/sfx/battle_21.asm @@ -1,4 +1,4 @@ -SFX_Battle_21_Ch1: +SFX_Battle_21_Ch7: unknownnoise0x20 2, 241, 51 unknownnoise0x20 2, 193, 50 unknownnoise0x20 2, 161, 49 diff --git a/audio/sfx/battle_22.asm b/audio/sfx/battle_22.asm index 66cd218d..6a20c3ae 100644 --- a/audio/sfx/battle_22.asm +++ b/audio/sfx/battle_22.asm @@ -1,4 +1,4 @@ -SFX_Battle_22_Ch1: +SFX_Battle_22_Ch7: unknownnoise0x20 2, 210, 50 unknownnoise0x20 15, 242, 67 endchannel diff --git a/audio/sfx/battle_23.asm b/audio/sfx/battle_23.asm index 7203dcf2..e532cf08 100644 --- a/audio/sfx/battle_23.asm +++ b/audio/sfx/battle_23.asm @@ -1,4 +1,4 @@ -SFX_Battle_23_Ch1: +SFX_Battle_23_Ch7: unknownnoise0x20 2, 242, 67 unknownnoise0x20 4, 181, 50 unknownnoise0x20 9, 134, 49 diff --git a/audio/sfx/battle_24.asm b/audio/sfx/battle_24.asm index 7c81b40b..46e9d29f 100644 --- a/audio/sfx/battle_24.asm +++ b/audio/sfx/battle_24.asm @@ -1,4 +1,4 @@ -SFX_Battle_24_Ch1: +SFX_Battle_24_Ch4: duty 1 unknownsfx0x10 151 unknownsfx0x20 15, 242, 0, 7 @@ -6,7 +6,7 @@ SFX_Battle_24_Ch1: endchannel -SFX_Battle_24_Ch2: +SFX_Battle_24_Ch7: unknownnoise0x20 15, 63, 34 unknownnoise0x20 15, 242, 33 endchannel diff --git a/audio/sfx/battle_25.asm b/audio/sfx/battle_25.asm index b1f4fc54..3a46e505 100644 --- a/audio/sfx/battle_25.asm +++ b/audio/sfx/battle_25.asm @@ -1,4 +1,4 @@ -SFX_Battle_25_Ch1: +SFX_Battle_25_Ch7: unknownnoise0x20 15, 79, 65 unknownnoise0x20 8, 143, 65 unknownnoise0x20 8, 207, 65 diff --git a/audio/sfx/battle_26.asm b/audio/sfx/battle_26.asm index c656264b..ce1ac2f9 100644 --- a/audio/sfx/battle_26.asm +++ b/audio/sfx/battle_26.asm @@ -1,4 +1,4 @@ -SFX_Battle_26_Ch1: +SFX_Battle_26_Ch7: unknownnoise0x20 10, 255, 80 unknownnoise0x20 15, 255, 81 unknownnoise0x20 8, 242, 81 diff --git a/audio/sfx/battle_27.asm b/audio/sfx/battle_27.asm index af86c33f..1e662c29 100644 --- a/audio/sfx/battle_27.asm +++ b/audio/sfx/battle_27.asm @@ -1,4 +1,4 @@ -SFX_Battle_27_Ch1: +SFX_Battle_27_Ch4: duty 2 unknownsfx0x20 15, 63, 192, 7 @@ -9,7 +9,7 @@ SFX_Battle_27_branch_2062a: endchannel -SFX_Battle_27_Ch2: +SFX_Battle_27_Ch5: dutycycle 179 unknownsfx0x20 15, 47, 200, 7 @@ -20,8 +20,8 @@ SFX_Battle_27_branch_2063d: endchannel -SFX_Battle_27_Ch3: +SFX_Battle_27_Ch7: unknownnoise0x20 3, 151, 18 unknownnoise0x20 3, 161, 17 - loopchannel 10, SFX_Battle_27_Ch3 + loopchannel 10, SFX_Battle_27_Ch7 endchannel diff --git a/audio/sfx/battle_28.asm b/audio/sfx/battle_28.asm index 1c974e85..298ddb7a 100644 --- a/audio/sfx/battle_28.asm +++ b/audio/sfx/battle_28.asm @@ -1,21 +1,21 @@ -SFX_Battle_28_Ch1: +SFX_Battle_28_Ch4: duty 0 unknownsfx0x20 0, 241, 192, 7 unknownsfx0x20 0, 241, 0, 7 - loopchannel 12, SFX_Battle_28_Ch1 + loopchannel 12, SFX_Battle_28_Ch4 endchannel -SFX_Battle_28_Ch2: +SFX_Battle_28_Ch5: dutycycle 179 unknownsfx0x20 0, 225, 193, 7 unknownsfx0x20 0, 225, 1, 7 - loopchannel 12, SFX_Battle_28_Ch2 + loopchannel 12, SFX_Battle_28_Ch5 endchannel -SFX_Battle_28_Ch3: +SFX_Battle_28_Ch7: unknownnoise0x20 1, 209, 73 unknownnoise0x20 1, 209, 41 - loopchannel 6, SFX_Battle_28_Ch3 + loopchannel 6, SFX_Battle_28_Ch7 endchannel diff --git a/audio/sfx/battle_29.asm b/audio/sfx/battle_29.asm index d0abb3cb..e36c18dc 100644 --- a/audio/sfx/battle_29.asm +++ b/audio/sfx/battle_29.asm @@ -1,17 +1,17 @@ -SFX_Battle_29_Ch1: +SFX_Battle_29_Ch4: dutycycle 201 unknownsfx0x20 11, 243, 32, 1 unknownsfx0x20 9, 211, 80, 1 - loopchannel 5, SFX_Battle_29_Ch1 + loopchannel 5, SFX_Battle_29_Ch4 unknownsfx0x20 8, 227, 48, 1 unknownsfx0x20 15, 194, 16, 1 endchannel -SFX_Battle_29_Ch2: +SFX_Battle_29_Ch7: unknownnoise0x20 10, 243, 53 unknownnoise0x20 14, 246, 69 - loopchannel 4, SFX_Battle_29_Ch2 + loopchannel 4, SFX_Battle_29_Ch7 unknownnoise0x20 12, 244, 188 unknownnoise0x20 12, 245, 156 unknownnoise0x20 15, 244, 172 diff --git a/audio/sfx/battle_2a.asm b/audio/sfx/battle_2a.asm index ab01bf85..710a45f1 100644 --- a/audio/sfx/battle_2a.asm +++ b/audio/sfx/battle_2a.asm @@ -1,28 +1,28 @@ -SFX_Battle_2A_Ch1: +SFX_Battle_2A_Ch4: dutycycle 57 unknownsfx0x20 4, 244, 0, 6 unknownsfx0x20 3, 196, 0, 5 unknownsfx0x20 5, 181, 0, 6 unknownsfx0x20 13, 226, 192, 6 - loopchannel 3, SFX_Battle_2A_Ch1 + loopchannel 3, SFX_Battle_2A_Ch4 unknownsfx0x20 8, 209, 0, 6 endchannel -SFX_Battle_2A_Ch2: +SFX_Battle_2A_Ch5: dutycycle 141 unknownsfx0x20 5, 228, 224, 5 unknownsfx0x20 4, 180, 224, 4 unknownsfx0x20 6, 165, 232, 5 unknownsfx0x20 14, 209, 160, 6 - loopchannel 3, SFX_Battle_2A_Ch2 + loopchannel 3, SFX_Battle_2A_Ch5 endchannel -SFX_Battle_2A_Ch3: +SFX_Battle_2A_Ch7: unknownnoise0x20 5, 195, 51 unknownnoise0x20 3, 146, 67 unknownnoise0x20 10, 181, 51 unknownnoise0x20 15, 195, 50 - loopchannel 2, SFX_Battle_2A_Ch3 + loopchannel 2, SFX_Battle_2A_Ch7 endchannel diff --git a/audio/sfx/battle_2b.asm b/audio/sfx/battle_2b.asm index 6eddfa76..da57c7a7 100644 --- a/audio/sfx/battle_2b.asm +++ b/audio/sfx/battle_2b.asm @@ -1,21 +1,21 @@ -SFX_Battle_2B_Ch1: +SFX_Battle_2B_Ch4: dutycycle 210 unknownsfx0x20 3, 129, 0, 3 unknownsfx0x20 3, 193, 0, 4 unknownsfx0x20 3, 241, 0, 5 unknownsfx0x20 3, 177, 0, 4 unknownsfx0x20 3, 113, 0, 3 - loopchannel 5, SFX_Battle_2B_Ch1 + loopchannel 5, SFX_Battle_2B_Ch4 unknownsfx0x20 8, 129, 0, 4 endchannel -SFX_Battle_2B_Ch2: +SFX_Battle_2B_Ch7: unknownnoise0x20 3, 98, 34 unknownnoise0x20 3, 162, 50 unknownnoise0x20 3, 210, 51 unknownnoise0x20 3, 146, 35 unknownnoise0x20 3, 82, 18 - loopchannel 5, SFX_Battle_2B_Ch2 + loopchannel 5, SFX_Battle_2B_Ch7 unknownnoise0x20 8, 129, 18 endchannel diff --git a/audio/sfx/battle_2c.asm b/audio/sfx/battle_2c.asm index 9cd9bd16..2f8bdc49 100644 --- a/audio/sfx/battle_2c.asm +++ b/audio/sfx/battle_2c.asm @@ -1,25 +1,25 @@ -SFX_Battle_2C_Ch1: +SFX_Battle_2C_Ch4: dutycycle 57 unknownsfx0x20 15, 244, 0, 5 unknownsfx0x20 15, 196, 0, 4 unknownsfx0x20 15, 226, 192, 5 - loopchannel 3, SFX_Battle_2C_Ch1 + loopchannel 3, SFX_Battle_2C_Ch4 endchannel -SFX_Battle_2C_Ch2: +SFX_Battle_2C_Ch5: dutycycle 141 unknownsfx0x20 7, 228, 48, 4 unknownsfx0x20 15, 180, 48, 3 unknownsfx0x20 15, 162, 56, 4 - loopchannel 4, SFX_Battle_2C_Ch2 + loopchannel 4, SFX_Battle_2C_Ch5 endchannel -SFX_Battle_2C_Ch3: +SFX_Battle_2C_Ch7: unknownnoise0x20 9, 244, 68 unknownnoise0x20 9, 242, 67 unknownnoise0x20 15, 244, 66 unknownnoise0x20 15, 244, 65 - loopchannel 3, SFX_Battle_2C_Ch3 + loopchannel 3, SFX_Battle_2C_Ch7 endchannel diff --git a/audio/sfx/battle_2e.asm b/audio/sfx/battle_2e.asm index a0841ccf..20c86033 100644 --- a/audio/sfx/battle_2e.asm +++ b/audio/sfx/battle_2e.asm @@ -1,27 +1,27 @@ -SFX_Battle_2E_Ch1: +SFX_Battle_2E_Ch4: duty 0 unknownsfx0x20 2, 241, 0, 2 unknownsfx0x20 3, 241, 0, 7 unknownsfx0x20 4, 241, 0, 5 unknownsfx0x20 5, 241, 240, 7 - loopchannel 8, SFX_Battle_2E_Ch1 + loopchannel 8, SFX_Battle_2E_Ch4 endchannel -SFX_Battle_2E_Ch2: +SFX_Battle_2E_Ch5: dutycycle 179 unknownsfx0x20 2, 225, 2, 3 unknownsfx0x20 3, 225, 242, 7 unknownsfx0x20 4, 225, 2, 6 unknownsfx0x20 5, 225, 2, 7 - loopchannel 8, SFX_Battle_2E_Ch2 + loopchannel 8, SFX_Battle_2E_Ch5 endchannel -SFX_Battle_2E_Ch3: +SFX_Battle_2E_Ch7: unknownnoise0x20 2, 211, 16 unknownnoise0x20 3, 211, 17 unknownnoise0x20 2, 210, 16 unknownnoise0x20 5, 210, 18 - loopchannel 9, SFX_Battle_2E_Ch3 + loopchannel 9, SFX_Battle_2E_Ch7 endchannel diff --git a/audio/sfx/battle_2f.asm b/audio/sfx/battle_2f.asm index ad607993..fb4c7a14 100644 --- a/audio/sfx/battle_2f.asm +++ b/audio/sfx/battle_2f.asm @@ -1,21 +1,21 @@ -SFX_Battle_2F_Ch1: +SFX_Battle_2F_Ch4: dutycycle 43 unknownsfx0x20 3, 241, 240, 7 unknownsfx0x20 4, 242, 0, 2 - loopchannel 8, SFX_Battle_2F_Ch1 + loopchannel 8, SFX_Battle_2F_Ch4 endchannel -SFX_Battle_2F_Ch2: +SFX_Battle_2F_Ch5: dutycycle 179 unknownsfx0x20 4, 226, 2, 2 unknownsfx0x20 4, 225, 226, 7 - loopchannel 9, SFX_Battle_2F_Ch2 + loopchannel 9, SFX_Battle_2F_Ch5 endchannel -SFX_Battle_2F_Ch3: +SFX_Battle_2F_Ch7: unknownnoise0x20 4, 255, 67 unknownnoise0x20 4, 242, 68 - loopchannel 9, SFX_Battle_2F_Ch3 + loopchannel 9, SFX_Battle_2F_Ch7 endchannel diff --git a/audio/sfx/battle_31.asm b/audio/sfx/battle_31.asm index c88cc476..cc1169eb 100644 --- a/audio/sfx/battle_31.asm +++ b/audio/sfx/battle_31.asm @@ -1,4 +1,4 @@ -SFX_Battle_31_Ch1: +SFX_Battle_31_Ch4: duty 2 unknownsfx0x20 15, 255, 224, 7 unknownsfx0x20 15, 255, 224, 7 @@ -8,7 +8,7 @@ SFX_Battle_31_Ch1: endchannel -SFX_Battle_31_Ch2: +SFX_Battle_31_Ch5: duty 3 unknownsfx0x20 15, 255, 226, 7 unknownsfx0x20 15, 255, 225, 7 diff --git a/audio/sfx/battle_32.asm b/audio/sfx/battle_32.asm index a85d4334..c7bff4b2 100644 --- a/audio/sfx/battle_32.asm +++ b/audio/sfx/battle_32.asm @@ -1,4 +1,4 @@ -SFX_Battle_32_Ch1: +SFX_Battle_32_Ch4: duty 2 unknownsfx0x10 175 unknownsfx0x20 8, 241, 0, 7 @@ -6,7 +6,7 @@ SFX_Battle_32_Ch1: endchannel -SFX_Battle_32_Ch2: +SFX_Battle_32_Ch5: duty 3 unknownsfx0x20 8, 241, 1, 7 endchannel diff --git a/audio/sfx/battle_33.asm b/audio/sfx/battle_33.asm index 25b1ee42..c92b5482 100644 --- a/audio/sfx/battle_33.asm +++ b/audio/sfx/battle_33.asm @@ -1,4 +1,4 @@ -SFX_Battle_33_Ch1: +SFX_Battle_33_Ch4: duty 2 unknownsfx0x20 6, 241, 0, 5 unknownsfx0x20 6, 241, 128, 5 @@ -8,7 +8,7 @@ SFX_Battle_33_Ch1: endchannel -SFX_Battle_33_Ch2: +SFX_Battle_33_Ch5: duty 3 unknownsfx0x20 6, 225, 16, 5 unknownsfx0x20 6, 225, 144, 5 diff --git a/audio/sfx/battle_34.asm b/audio/sfx/battle_34.asm index 14718916..38576ecb 100644 --- a/audio/sfx/battle_34.asm +++ b/audio/sfx/battle_34.asm @@ -1,4 +1,4 @@ -SFX_Battle_34_Ch1: +SFX_Battle_34_Ch4: dutycycle 237 unknownsfx0x20 8, 255, 248, 3 unknownsfx0x20 15, 255, 0, 4 @@ -6,7 +6,7 @@ SFX_Battle_34_Ch1: endchannel -SFX_Battle_34_Ch2: +SFX_Battle_34_Ch5: dutycycle 180 unknownsfx0x20 8, 239, 192, 3 unknownsfx0x20 15, 239, 192, 3 @@ -14,7 +14,7 @@ SFX_Battle_34_Ch2: endchannel -SFX_Battle_34_Ch3: +SFX_Battle_34_Ch7: unknownnoise0x20 4, 255, 81 unknownnoise0x20 8, 255, 84 unknownnoise0x20 15, 255, 85 diff --git a/audio/sfx/battle_35.asm b/audio/sfx/battle_35.asm index 2fe57bc4..7ce3afb4 100644 --- a/audio/sfx/battle_35.asm +++ b/audio/sfx/battle_35.asm @@ -1,4 +1,4 @@ -SFX_Battle_35_Ch1: +SFX_Battle_35_Ch4: executemusic vibrato 10, 2, 4 duty 2 @@ -13,7 +13,7 @@ SFX_Battle_35_Ch1: endchannel -SFX_Battle_35_Ch2: +SFX_Battle_35_Ch5: executemusic vibrato 10, 2, 3 duty 2 diff --git a/audio/sfx/battle_36.asm b/audio/sfx/battle_36.asm index dcf9c56e..df23fb37 100644 --- a/audio/sfx/battle_36.asm +++ b/audio/sfx/battle_36.asm @@ -1,4 +1,4 @@ -SFX_Battle_36_Ch1: +SFX_Battle_36_Ch4: duty 0 unknownsfx0x20 2, 241, 128, 7 unknownsfx0x20 2, 241, 0, 7 @@ -20,7 +20,7 @@ SFX_Battle_36_branch_20930: endchannel -SFX_Battle_36_Ch2: +SFX_Battle_36_Ch5: dutycycle 179 unknownsfx0x20 2, 241, 129, 7 unknownsfx0x20 2, 241, 1, 7 @@ -40,8 +40,8 @@ SFX_Battle_36_Ch2: endchannel -SFX_Battle_36_Ch3: +SFX_Battle_36_Ch7: unknownnoise0x20 1, 209, 73 unknownnoise0x20 1, 209, 41 - loopchannel 26, SFX_Battle_36_Ch3 + loopchannel 26, SFX_Battle_36_Ch7 endchannel diff --git a/audio/sfx/caught_mon.asm b/audio/sfx/caught_mon.asm index d4f3e858..b844a54a 100644 --- a/audio/sfx/caught_mon.asm +++ b/audio/sfx/caught_mon.asm @@ -1,4 +1,4 @@ -SFX_Caught_Mon_Ch1: +SFX_Caught_Mon_Ch4: executemusic tempo 256 volume 7, 7 @@ -22,7 +22,7 @@ SFX_Caught_Mon_Ch1: endchannel -SFX_Caught_Mon_Ch2: +SFX_Caught_Mon_Ch5: executemusic duty 2 notetype 6, 12, 2 @@ -44,7 +44,7 @@ SFX_Caught_Mon_Ch2: endchannel -SFX_Caught_Mon_Ch3: +SFX_Caught_Mon_Ch6: executemusic notetype 6, 1, 0 octave 4 diff --git a/audio/sfx/collision_1.asm b/audio/sfx/collision_1.asm index 7a45bdf4..241a5e68 100644 --- a/audio/sfx/collision_1.asm +++ b/audio/sfx/collision_1.asm @@ -1,4 +1,4 @@ -SFX_Collision_1_Ch1: +SFX_Collision_1_Ch4: duty 2 unknownsfx0x10 90 unknownsfx0x20 15, 241, 0, 3 diff --git a/audio/sfx/collision_3.asm b/audio/sfx/collision_3.asm index 601670d5..649792eb 100644 --- a/audio/sfx/collision_3.asm +++ b/audio/sfx/collision_3.asm @@ -1,4 +1,4 @@ -SFX_Collision_3_Ch1: +SFX_Collision_3_Ch4: duty 2 unknownsfx0x10 90 unknownsfx0x20 15, 241, 0, 3 diff --git a/audio/sfx/cry00_1.asm b/audio/sfx/cry00_1.asm index 4fc82294..98920dfc 100644 --- a/audio/sfx/cry00_1.asm +++ b/audio/sfx/cry00_1.asm @@ -1,4 +1,4 @@ -SFX_Cry00_1_Ch1: +SFX_Cry00_1_Ch4: dutycycle 245 unknownsfx0x20 4, 243, 24, 7 unknownsfx0x20 15, 229, 152, 7 @@ -6,7 +6,7 @@ SFX_Cry00_1_Ch1: endchannel -SFX_Cry00_1_Ch2: +SFX_Cry00_1_Ch5: dutycycle 160 unknownsfx0x20 5, 179, 8, 7 unknownsfx0x20 15, 197, 136, 7 @@ -14,7 +14,7 @@ SFX_Cry00_1_Ch2: endchannel -SFX_Cry00_1_Ch3: +SFX_Cry00_1_Ch7: unknownnoise0x20 3, 161, 28 unknownnoise0x20 14, 148, 44 unknownnoise0x20 8, 129, 28 diff --git a/audio/sfx/cry00_2.asm b/audio/sfx/cry00_2.asm index ccce6943..17a9207e 100644 --- a/audio/sfx/cry00_2.asm +++ b/audio/sfx/cry00_2.asm @@ -1,4 +1,4 @@ -SFX_Cry00_2_Ch1: +SFX_Cry00_2_Ch4: dutycycle 245 unknownsfx0x20 4, 243, 24, 7 unknownsfx0x20 15, 229, 152, 7 @@ -6,7 +6,7 @@ SFX_Cry00_2_Ch1: endchannel -SFX_Cry00_2_Ch2: +SFX_Cry00_2_Ch5: dutycycle 160 unknownsfx0x20 5, 179, 8, 7 unknownsfx0x20 15, 197, 136, 7 @@ -14,7 +14,7 @@ SFX_Cry00_2_Ch2: endchannel -SFX_Cry00_2_Ch3: +SFX_Cry00_2_Ch7: unknownnoise0x20 3, 161, 28 unknownnoise0x20 14, 148, 44 unknownnoise0x20 8, 129, 28 diff --git a/audio/sfx/cry00_3.asm b/audio/sfx/cry00_3.asm index 9b8b6fda..81ad7edf 100644 --- a/audio/sfx/cry00_3.asm +++ b/audio/sfx/cry00_3.asm @@ -1,4 +1,4 @@ -SFX_Cry00_3_Ch1: +SFX_Cry00_3_Ch4: dutycycle 245 unknownsfx0x20 4, 243, 24, 7 unknownsfx0x20 15, 229, 152, 7 @@ -6,7 +6,7 @@ SFX_Cry00_3_Ch1: endchannel -SFX_Cry00_3_Ch2: +SFX_Cry00_3_Ch5: dutycycle 160 unknownsfx0x20 5, 179, 8, 7 unknownsfx0x20 15, 197, 136, 7 @@ -14,7 +14,7 @@ SFX_Cry00_3_Ch2: endchannel -SFX_Cry00_3_Ch3: +SFX_Cry00_3_Ch7: unknownnoise0x20 3, 161, 28 unknownnoise0x20 14, 148, 44 unknownnoise0x20 8, 129, 28 diff --git a/audio/sfx/cry01_1.asm b/audio/sfx/cry01_1.asm index d684af6f..392adbe3 100644 --- a/audio/sfx/cry01_1.asm +++ b/audio/sfx/cry01_1.asm @@ -1,4 +1,4 @@ -SFX_Cry01_1_Ch1: +SFX_Cry01_1_Ch4: dutycycle 160 unknownsfx0x20 4, 243, 0, 6 unknownsfx0x20 8, 213, 96, 7 @@ -7,7 +7,7 @@ SFX_Cry01_1_Ch1: endchannel -SFX_Cry01_1_Ch2: +SFX_Cry01_1_Ch5: dutycycle 90 unknownsfx0x20 5, 179, 241, 6 unknownsfx0x20 7, 197, 82, 7 @@ -16,7 +16,7 @@ SFX_Cry01_1_Ch2: endchannel -SFX_Cry01_1_Ch3: +SFX_Cry01_1_Ch7: unknownnoise0x20 3, 162, 60 unknownnoise0x20 12, 148, 44 unknownnoise0x20 3, 130, 28 diff --git a/audio/sfx/cry01_2.asm b/audio/sfx/cry01_2.asm index 0e1030e1..a7397fd8 100644 --- a/audio/sfx/cry01_2.asm +++ b/audio/sfx/cry01_2.asm @@ -1,4 +1,4 @@ -SFX_Cry01_2_Ch1: +SFX_Cry01_2_Ch4: dutycycle 160 unknownsfx0x20 4, 243, 0, 6 unknownsfx0x20 8, 213, 96, 7 @@ -7,7 +7,7 @@ SFX_Cry01_2_Ch1: endchannel -SFX_Cry01_2_Ch2: +SFX_Cry01_2_Ch5: dutycycle 90 unknownsfx0x20 5, 179, 241, 6 unknownsfx0x20 7, 197, 82, 7 @@ -16,7 +16,7 @@ SFX_Cry01_2_Ch2: endchannel -SFX_Cry01_2_Ch3: +SFX_Cry01_2_Ch7: unknownnoise0x20 3, 162, 60 unknownnoise0x20 12, 148, 44 unknownnoise0x20 3, 130, 28 diff --git a/audio/sfx/cry01_3.asm b/audio/sfx/cry01_3.asm index be084d7e..19235f9e 100644 --- a/audio/sfx/cry01_3.asm +++ b/audio/sfx/cry01_3.asm @@ -1,4 +1,4 @@ -SFX_Cry01_3_Ch1: +SFX_Cry01_3_Ch4: dutycycle 160 unknownsfx0x20 4, 243, 0, 6 unknownsfx0x20 8, 213, 96, 7 @@ -7,7 +7,7 @@ SFX_Cry01_3_Ch1: endchannel -SFX_Cry01_3_Ch2: +SFX_Cry01_3_Ch5: dutycycle 90 unknownsfx0x20 5, 179, 241, 6 unknownsfx0x20 7, 197, 82, 7 @@ -16,7 +16,7 @@ SFX_Cry01_3_Ch2: endchannel -SFX_Cry01_3_Ch3: +SFX_Cry01_3_Ch7: unknownnoise0x20 3, 162, 60 unknownnoise0x20 12, 148, 44 unknownnoise0x20 3, 130, 28 diff --git a/audio/sfx/cry02_1.asm b/audio/sfx/cry02_1.asm index d4b520c9..62834724 100644 --- a/audio/sfx/cry02_1.asm +++ b/audio/sfx/cry02_1.asm @@ -1,4 +1,4 @@ -SFX_Cry02_1_Ch1: +SFX_Cry02_1_Ch4: duty 0 unknownsfx0x20 8, 245, 128, 4 unknownsfx0x20 2, 225, 224, 5 @@ -6,12 +6,12 @@ SFX_Cry02_1_Ch1: endchannel -SFX_Cry02_1_Ch2: +SFX_Cry02_1_Ch5: dutycycle 165 unknownsfx0x20 7, 149, 65, 4 unknownsfx0x20 2, 129, 33, 5 unknownsfx0x20 8, 97, 26, 5 -SFX_Cry02_1_Ch3: +SFX_Cry02_1_Ch7: endchannel diff --git a/audio/sfx/cry02_2.asm b/audio/sfx/cry02_2.asm index 526e8c48..ae40372a 100644 --- a/audio/sfx/cry02_2.asm +++ b/audio/sfx/cry02_2.asm @@ -1,4 +1,4 @@ -SFX_Cry02_2_Ch1: +SFX_Cry02_2_Ch4: duty 0 unknownsfx0x20 8, 245, 128, 4 unknownsfx0x20 2, 225, 224, 5 @@ -6,12 +6,12 @@ SFX_Cry02_2_Ch1: endchannel -SFX_Cry02_2_Ch2: +SFX_Cry02_2_Ch5: dutycycle 165 unknownsfx0x20 7, 149, 65, 4 unknownsfx0x20 2, 129, 33, 5 unknownsfx0x20 8, 97, 26, 5 -SFX_Cry02_2_Ch3: +SFX_Cry02_2_Ch7: endchannel diff --git a/audio/sfx/cry02_3.asm b/audio/sfx/cry02_3.asm index 2366ff97..32be5608 100644 --- a/audio/sfx/cry02_3.asm +++ b/audio/sfx/cry02_3.asm @@ -1,4 +1,4 @@ -SFX_Cry02_3_Ch1: +SFX_Cry02_3_Ch4: duty 0 unknownsfx0x20 8, 245, 128, 4 unknownsfx0x20 2, 225, 224, 5 @@ -6,12 +6,12 @@ SFX_Cry02_3_Ch1: endchannel -SFX_Cry02_3_Ch2: +SFX_Cry02_3_Ch5: dutycycle 165 unknownsfx0x20 7, 149, 65, 4 unknownsfx0x20 2, 129, 33, 5 unknownsfx0x20 8, 97, 26, 5 -SFX_Cry02_3_Ch3: +SFX_Cry02_3_Ch7: endchannel diff --git a/audio/sfx/cry03_1.asm b/audio/sfx/cry03_1.asm index 72ea5d38..706d2325 100644 --- a/audio/sfx/cry03_1.asm +++ b/audio/sfx/cry03_1.asm @@ -1,4 +1,4 @@ -SFX_Cry03_1_Ch1: +SFX_Cry03_1_Ch4: dutycycle 240 unknownsfx0x20 4, 247, 8, 6 unknownsfx0x20 6, 230, 0, 6 @@ -10,7 +10,7 @@ SFX_Cry03_1_Ch1: endchannel -SFX_Cry03_1_Ch2: +SFX_Cry03_1_Ch5: dutycycle 10 unknownsfx0x20 4, 199, 4, 5 unknownsfx0x20 6, 166, 2, 5 @@ -22,7 +22,7 @@ SFX_Cry03_1_Ch2: endchannel -SFX_Cry03_1_Ch3: +SFX_Cry03_1_Ch7: unknownnoise0x20 12, 228, 76 unknownnoise0x20 10, 199, 92 unknownnoise0x20 12, 182, 76 diff --git a/audio/sfx/cry03_2.asm b/audio/sfx/cry03_2.asm index de043909..89e98ae4 100644 --- a/audio/sfx/cry03_2.asm +++ b/audio/sfx/cry03_2.asm @@ -1,4 +1,4 @@ -SFX_Cry03_2_Ch1: +SFX_Cry03_2_Ch4: dutycycle 240 unknownsfx0x20 4, 247, 8, 6 unknownsfx0x20 6, 230, 0, 6 @@ -10,7 +10,7 @@ SFX_Cry03_2_Ch1: endchannel -SFX_Cry03_2_Ch2: +SFX_Cry03_2_Ch5: dutycycle 10 unknownsfx0x20 4, 199, 4, 5 unknownsfx0x20 6, 166, 2, 5 @@ -22,7 +22,7 @@ SFX_Cry03_2_Ch2: endchannel -SFX_Cry03_2_Ch3: +SFX_Cry03_2_Ch7: unknownnoise0x20 12, 228, 76 unknownnoise0x20 10, 199, 92 unknownnoise0x20 12, 182, 76 diff --git a/audio/sfx/cry03_3.asm b/audio/sfx/cry03_3.asm index 467745f9..d472d37b 100644 --- a/audio/sfx/cry03_3.asm +++ b/audio/sfx/cry03_3.asm @@ -1,4 +1,4 @@ -SFX_Cry03_3_Ch1: +SFX_Cry03_3_Ch4: dutycycle 240 unknownsfx0x20 4, 247, 8, 6 unknownsfx0x20 6, 230, 0, 6 @@ -10,7 +10,7 @@ SFX_Cry03_3_Ch1: endchannel -SFX_Cry03_3_Ch2: +SFX_Cry03_3_Ch5: dutycycle 10 unknownsfx0x20 4, 199, 4, 5 unknownsfx0x20 6, 166, 2, 5 @@ -22,7 +22,7 @@ SFX_Cry03_3_Ch2: endchannel -SFX_Cry03_3_Ch3: +SFX_Cry03_3_Ch7: unknownnoise0x20 12, 228, 76 unknownnoise0x20 10, 199, 92 unknownnoise0x20 12, 182, 76 diff --git a/audio/sfx/cry04_1.asm b/audio/sfx/cry04_1.asm index 2c34f1c6..d1bb26c6 100644 --- a/audio/sfx/cry04_1.asm +++ b/audio/sfx/cry04_1.asm @@ -1,4 +1,4 @@ -SFX_Cry04_1_Ch1: +SFX_Cry04_1_Ch4: dutycycle 240 unknownsfx0x20 4, 247, 160, 6 unknownsfx0x20 8, 230, 164, 6 @@ -10,7 +10,7 @@ SFX_Cry04_1_Ch1: endchannel -SFX_Cry04_1_Ch2: +SFX_Cry04_1_Ch5: dutycycle 90 unknownsfx0x20 4, 231, 1, 6 unknownsfx0x20 8, 214, 3, 6 @@ -22,7 +22,7 @@ SFX_Cry04_1_Ch2: endchannel -SFX_Cry04_1_Ch3: +SFX_Cry04_1_Ch7: unknownnoise0x20 7, 214, 92 unknownnoise0x20 8, 230, 76 unknownnoise0x20 4, 212, 92 diff --git a/audio/sfx/cry04_2.asm b/audio/sfx/cry04_2.asm index 38bfbf63..aa5baf29 100644 --- a/audio/sfx/cry04_2.asm +++ b/audio/sfx/cry04_2.asm @@ -1,4 +1,4 @@ -SFX_Cry04_2_Ch1: +SFX_Cry04_2_Ch4: dutycycle 240 unknownsfx0x20 4, 247, 160, 6 unknownsfx0x20 8, 230, 164, 6 @@ -10,7 +10,7 @@ SFX_Cry04_2_Ch1: endchannel -SFX_Cry04_2_Ch2: +SFX_Cry04_2_Ch5: dutycycle 90 unknownsfx0x20 4, 231, 1, 6 unknownsfx0x20 8, 214, 3, 6 @@ -22,7 +22,7 @@ SFX_Cry04_2_Ch2: endchannel -SFX_Cry04_2_Ch3: +SFX_Cry04_2_Ch7: unknownnoise0x20 7, 214, 92 unknownnoise0x20 8, 230, 76 unknownnoise0x20 4, 212, 92 diff --git a/audio/sfx/cry04_3.asm b/audio/sfx/cry04_3.asm index bd73c271..b4d9cf2e 100644 --- a/audio/sfx/cry04_3.asm +++ b/audio/sfx/cry04_3.asm @@ -1,4 +1,4 @@ -SFX_Cry04_3_Ch1: +SFX_Cry04_3_Ch4: dutycycle 240 unknownsfx0x20 4, 247, 160, 6 unknownsfx0x20 8, 230, 164, 6 @@ -10,7 +10,7 @@ SFX_Cry04_3_Ch1: endchannel -SFX_Cry04_3_Ch2: +SFX_Cry04_3_Ch5: dutycycle 90 unknownsfx0x20 4, 231, 1, 6 unknownsfx0x20 8, 214, 3, 6 @@ -22,7 +22,7 @@ SFX_Cry04_3_Ch2: endchannel -SFX_Cry04_3_Ch3: +SFX_Cry04_3_Ch7: unknownnoise0x20 7, 214, 92 unknownnoise0x20 8, 230, 76 unknownnoise0x20 4, 212, 92 diff --git a/audio/sfx/cry05_1.asm b/audio/sfx/cry05_1.asm index 8de5bf02..dc68e77d 100644 --- a/audio/sfx/cry05_1.asm +++ b/audio/sfx/cry05_1.asm @@ -1,4 +1,4 @@ -SFX_Cry05_1_Ch1: +SFX_Cry05_1_Ch4: dutycycle 10 unknownsfx0x20 6, 226, 0, 5 unknownsfx0x20 6, 227, 128, 5 @@ -7,7 +7,7 @@ SFX_Cry05_1_Ch1: endchannel -SFX_Cry05_1_Ch2: +SFX_Cry05_1_Ch5: dutycycle 245 unknownsfx0x20 6, 226, 130, 4 unknownsfx0x20 6, 211, 1, 5 @@ -15,5 +15,5 @@ SFX_Cry05_1_Ch2: unknownsfx0x20 8, 129, 193, 4 -SFX_Cry05_1_Ch3: +SFX_Cry05_1_Ch7: endchannel diff --git a/audio/sfx/cry05_2.asm b/audio/sfx/cry05_2.asm index 28879677..f7e09dcc 100644 --- a/audio/sfx/cry05_2.asm +++ b/audio/sfx/cry05_2.asm @@ -1,4 +1,4 @@ -SFX_Cry05_2_Ch1: +SFX_Cry05_2_Ch4: dutycycle 10 unknownsfx0x20 6, 226, 0, 5 unknownsfx0x20 6, 227, 128, 5 @@ -7,7 +7,7 @@ SFX_Cry05_2_Ch1: endchannel -SFX_Cry05_2_Ch2: +SFX_Cry05_2_Ch5: dutycycle 245 unknownsfx0x20 6, 226, 130, 4 unknownsfx0x20 6, 211, 1, 5 @@ -15,5 +15,5 @@ SFX_Cry05_2_Ch2: unknownsfx0x20 8, 129, 193, 4 -SFX_Cry05_2_Ch3: +SFX_Cry05_2_Ch7: endchannel diff --git a/audio/sfx/cry05_3.asm b/audio/sfx/cry05_3.asm index 261492af..2e8839c9 100644 --- a/audio/sfx/cry05_3.asm +++ b/audio/sfx/cry05_3.asm @@ -1,4 +1,4 @@ -SFX_Cry05_3_Ch1: +SFX_Cry05_3_Ch4: dutycycle 10 unknownsfx0x20 6, 226, 0, 5 unknownsfx0x20 6, 227, 128, 5 @@ -7,7 +7,7 @@ SFX_Cry05_3_Ch1: endchannel -SFX_Cry05_3_Ch2: +SFX_Cry05_3_Ch5: dutycycle 245 unknownsfx0x20 6, 226, 130, 4 unknownsfx0x20 6, 211, 1, 5 @@ -15,5 +15,5 @@ SFX_Cry05_3_Ch2: unknownsfx0x20 8, 129, 193, 4 -SFX_Cry05_3_Ch3: +SFX_Cry05_3_Ch7: endchannel diff --git a/audio/sfx/cry06_1.asm b/audio/sfx/cry06_1.asm index e171b025..d3b051c8 100644 --- a/audio/sfx/cry06_1.asm +++ b/audio/sfx/cry06_1.asm @@ -1,4 +1,4 @@ -SFX_Cry06_1_Ch1: +SFX_Cry06_1_Ch4: dutycycle 250 unknownsfx0x20 6, 131, 71, 2 unknownsfx0x20 15, 98, 38, 2 @@ -8,11 +8,11 @@ SFX_Cry06_1_Ch1: unknownsfx0x20 15, 66, 7, 2 -SFX_Cry06_1_Ch2: +SFX_Cry06_1_Ch5: endchannel -SFX_Cry06_1_Ch3: +SFX_Cry06_1_Ch7: unknownnoise0x20 8, 212, 140 unknownnoise0x20 4, 226, 156 unknownnoise0x20 15, 198, 140 diff --git a/audio/sfx/cry06_2.asm b/audio/sfx/cry06_2.asm index 5e6e9e6a..6a46246c 100644 --- a/audio/sfx/cry06_2.asm +++ b/audio/sfx/cry06_2.asm @@ -1,4 +1,4 @@ -SFX_Cry06_2_Ch1: +SFX_Cry06_2_Ch4: dutycycle 250 unknownsfx0x20 6, 131, 71, 2 unknownsfx0x20 15, 98, 38, 2 @@ -8,11 +8,11 @@ SFX_Cry06_2_Ch1: unknownsfx0x20 15, 66, 7, 2 -SFX_Cry06_2_Ch2: +SFX_Cry06_2_Ch5: endchannel -SFX_Cry06_2_Ch3: +SFX_Cry06_2_Ch7: unknownnoise0x20 8, 212, 140 unknownnoise0x20 4, 226, 156 unknownnoise0x20 15, 198, 140 diff --git a/audio/sfx/cry06_3.asm b/audio/sfx/cry06_3.asm index 5d2994f1..692cd1cf 100644 --- a/audio/sfx/cry06_3.asm +++ b/audio/sfx/cry06_3.asm @@ -1,4 +1,4 @@ -SFX_Cry06_3_Ch1: +SFX_Cry06_3_Ch4: dutycycle 250 unknownsfx0x20 6, 131, 71, 2 unknownsfx0x20 15, 98, 38, 2 @@ -8,11 +8,11 @@ SFX_Cry06_3_Ch1: unknownsfx0x20 15, 66, 7, 2 -SFX_Cry06_3_Ch2: +SFX_Cry06_3_Ch5: endchannel -SFX_Cry06_3_Ch3: +SFX_Cry06_3_Ch7: unknownnoise0x20 8, 212, 140 unknownnoise0x20 4, 226, 156 unknownnoise0x20 15, 198, 140 diff --git a/audio/sfx/cry07_1.asm b/audio/sfx/cry07_1.asm index e48a50a2..2eebb7f9 100644 --- a/audio/sfx/cry07_1.asm +++ b/audio/sfx/cry07_1.asm @@ -1,4 +1,4 @@ -SFX_Cry07_1_Ch1: +SFX_Cry07_1_Ch4: dutycycle 240 unknownsfx0x20 4, 243, 224, 6 unknownsfx0x20 15, 228, 64, 6 @@ -6,7 +6,7 @@ SFX_Cry07_1_Ch1: endchannel -SFX_Cry07_1_Ch2: +SFX_Cry07_1_Ch5: dutycycle 10 unknownsfx0x20 3, 195, 131, 6 unknownsfx0x20 14, 180, 2, 6 @@ -14,7 +14,7 @@ SFX_Cry07_1_Ch2: endchannel -SFX_Cry07_1_Ch3: +SFX_Cry07_1_Ch7: unknownnoise0x20 4, 211, 92 unknownnoise0x20 15, 230, 76 unknownnoise0x20 8, 177, 92 diff --git a/audio/sfx/cry07_2.asm b/audio/sfx/cry07_2.asm index ab902a30..e0381424 100644 --- a/audio/sfx/cry07_2.asm +++ b/audio/sfx/cry07_2.asm @@ -1,4 +1,4 @@ -SFX_Cry07_2_Ch1: +SFX_Cry07_2_Ch4: dutycycle 240 unknownsfx0x20 4, 243, 224, 6 unknownsfx0x20 15, 228, 64, 6 @@ -6,7 +6,7 @@ SFX_Cry07_2_Ch1: endchannel -SFX_Cry07_2_Ch2: +SFX_Cry07_2_Ch5: dutycycle 10 unknownsfx0x20 3, 195, 131, 6 unknownsfx0x20 14, 180, 2, 6 @@ -14,7 +14,7 @@ SFX_Cry07_2_Ch2: endchannel -SFX_Cry07_2_Ch3: +SFX_Cry07_2_Ch7: unknownnoise0x20 4, 211, 92 unknownnoise0x20 15, 230, 76 unknownnoise0x20 8, 177, 92 diff --git a/audio/sfx/cry07_3.asm b/audio/sfx/cry07_3.asm index 40fad544..92a401a9 100644 --- a/audio/sfx/cry07_3.asm +++ b/audio/sfx/cry07_3.asm @@ -1,4 +1,4 @@ -SFX_Cry07_3_Ch1: +SFX_Cry07_3_Ch4: dutycycle 240 unknownsfx0x20 4, 243, 224, 6 unknownsfx0x20 15, 228, 64, 6 @@ -6,7 +6,7 @@ SFX_Cry07_3_Ch1: endchannel -SFX_Cry07_3_Ch2: +SFX_Cry07_3_Ch5: dutycycle 10 unknownsfx0x20 3, 195, 131, 6 unknownsfx0x20 14, 180, 2, 6 @@ -14,7 +14,7 @@ SFX_Cry07_3_Ch2: endchannel -SFX_Cry07_3_Ch3: +SFX_Cry07_3_Ch7: unknownnoise0x20 4, 211, 92 unknownnoise0x20 15, 230, 76 unknownnoise0x20 8, 177, 92 diff --git a/audio/sfx/cry08_1.asm b/audio/sfx/cry08_1.asm index 6ec5ca3c..91901faa 100644 --- a/audio/sfx/cry08_1.asm +++ b/audio/sfx/cry08_1.asm @@ -1,4 +1,4 @@ -SFX_Cry08_1_Ch1: +SFX_Cry08_1_Ch4: dutycycle 240 unknownsfx0x20 15, 246, 101, 5 unknownsfx0x20 10, 228, 124, 5 @@ -7,7 +7,7 @@ SFX_Cry08_1_Ch1: endchannel -SFX_Cry08_1_Ch2: +SFX_Cry08_1_Ch5: dutycycle 90 unknownsfx0x20 14, 214, 3, 5 unknownsfx0x20 9, 180, 27, 5 @@ -16,7 +16,7 @@ SFX_Cry08_1_Ch2: endchannel -SFX_Cry08_1_Ch3: +SFX_Cry08_1_Ch7: unknownnoise0x20 12, 230, 76 unknownnoise0x20 11, 215, 92 unknownnoise0x20 15, 194, 76 diff --git a/audio/sfx/cry08_2.asm b/audio/sfx/cry08_2.asm index 9c154b1c..45d12f38 100644 --- a/audio/sfx/cry08_2.asm +++ b/audio/sfx/cry08_2.asm @@ -1,4 +1,4 @@ -SFX_Cry08_2_Ch1: +SFX_Cry08_2_Ch4: dutycycle 240 unknownsfx0x20 15, 246, 101, 5 unknownsfx0x20 10, 228, 124, 5 @@ -7,7 +7,7 @@ SFX_Cry08_2_Ch1: endchannel -SFX_Cry08_2_Ch2: +SFX_Cry08_2_Ch5: dutycycle 90 unknownsfx0x20 14, 214, 3, 5 unknownsfx0x20 9, 180, 27, 5 @@ -16,7 +16,7 @@ SFX_Cry08_2_Ch2: endchannel -SFX_Cry08_2_Ch3: +SFX_Cry08_2_Ch7: unknownnoise0x20 12, 230, 76 unknownnoise0x20 11, 215, 92 unknownnoise0x20 15, 194, 76 diff --git a/audio/sfx/cry08_3.asm b/audio/sfx/cry08_3.asm index 95fea40e..8f1ec3fb 100644 --- a/audio/sfx/cry08_3.asm +++ b/audio/sfx/cry08_3.asm @@ -1,4 +1,4 @@ -SFX_Cry08_3_Ch1: +SFX_Cry08_3_Ch4: dutycycle 240 unknownsfx0x20 15, 246, 101, 5 unknownsfx0x20 10, 228, 124, 5 @@ -7,7 +7,7 @@ SFX_Cry08_3_Ch1: endchannel -SFX_Cry08_3_Ch2: +SFX_Cry08_3_Ch5: dutycycle 90 unknownsfx0x20 14, 214, 3, 5 unknownsfx0x20 9, 180, 27, 5 @@ -16,7 +16,7 @@ SFX_Cry08_3_Ch2: endchannel -SFX_Cry08_3_Ch3: +SFX_Cry08_3_Ch7: unknownnoise0x20 12, 230, 76 unknownnoise0x20 11, 215, 92 unknownnoise0x20 15, 194, 76 diff --git a/audio/sfx/cry09_1.asm b/audio/sfx/cry09_1.asm index 46aae33c..11b4ab55 100644 --- a/audio/sfx/cry09_1.asm +++ b/audio/sfx/cry09_1.asm @@ -1,4 +1,4 @@ -SFX_Cry09_1_Ch1: +SFX_Cry09_1_Ch4: dutycycle 240 unknownsfx0x20 15, 247, 160, 7 unknownsfx0x20 6, 230, 163, 7 @@ -10,7 +10,7 @@ SFX_Cry09_1_Ch1: endchannel -SFX_Cry09_1_Ch2: +SFX_Cry09_1_Ch5: dutycycle 5 unknownsfx0x20 2, 8, 0, 0 unknownsfx0x20 15, 167, 161, 6 @@ -23,7 +23,7 @@ SFX_Cry09_1_Ch2: endchannel -SFX_Cry09_1_Ch3: +SFX_Cry09_1_Ch7: unknownnoise0x20 2, 242, 60 unknownnoise0x20 8, 228, 62 unknownnoise0x20 15, 215, 60 diff --git a/audio/sfx/cry09_2.asm b/audio/sfx/cry09_2.asm index 8ce97609..ac4b1f74 100644 --- a/audio/sfx/cry09_2.asm +++ b/audio/sfx/cry09_2.asm @@ -1,4 +1,4 @@ -SFX_Cry09_2_Ch1: +SFX_Cry09_2_Ch4: dutycycle 240 unknownsfx0x20 15, 247, 160, 7 unknownsfx0x20 6, 230, 163, 7 @@ -10,7 +10,7 @@ SFX_Cry09_2_Ch1: endchannel -SFX_Cry09_2_Ch2: +SFX_Cry09_2_Ch5: dutycycle 5 unknownsfx0x20 2, 8, 0, 0 unknownsfx0x20 15, 167, 161, 6 @@ -23,7 +23,7 @@ SFX_Cry09_2_Ch2: endchannel -SFX_Cry09_2_Ch3: +SFX_Cry09_2_Ch7: unknownnoise0x20 2, 242, 60 unknownnoise0x20 8, 228, 62 unknownnoise0x20 15, 215, 60 diff --git a/audio/sfx/cry09_3.asm b/audio/sfx/cry09_3.asm index a6b40dde..1d3856cc 100644 --- a/audio/sfx/cry09_3.asm +++ b/audio/sfx/cry09_3.asm @@ -1,4 +1,4 @@ -SFX_Cry09_3_Ch1: +SFX_Cry09_3_Ch4: dutycycle 240 unknownsfx0x20 15, 247, 160, 7 unknownsfx0x20 6, 230, 163, 7 @@ -10,7 +10,7 @@ SFX_Cry09_3_Ch1: endchannel -SFX_Cry09_3_Ch2: +SFX_Cry09_3_Ch5: dutycycle 5 unknownsfx0x20 2, 8, 0, 0 unknownsfx0x20 15, 167, 161, 6 @@ -23,7 +23,7 @@ SFX_Cry09_3_Ch2: endchannel -SFX_Cry09_3_Ch3: +SFX_Cry09_3_Ch7: unknownnoise0x20 2, 242, 60 unknownnoise0x20 8, 228, 62 unknownnoise0x20 15, 215, 60 diff --git a/audio/sfx/cry0a_1.asm b/audio/sfx/cry0a_1.asm index 4264e858..051a5d73 100644 --- a/audio/sfx/cry0a_1.asm +++ b/audio/sfx/cry0a_1.asm @@ -1,4 +1,4 @@ -SFX_Cry0A_1_Ch1: +SFX_Cry0A_1_Ch4: dutycycle 240 unknownsfx0x20 8, 247, 224, 6 unknownsfx0x20 6, 230, 229, 6 @@ -10,7 +10,7 @@ SFX_Cry0A_1_Ch1: endchannel -SFX_Cry0A_1_Ch2: +SFX_Cry0A_1_Ch5: dutycycle 5 unknownsfx0x20 3, 8, 0, 0 unknownsfx0x20 8, 167, 161, 6 @@ -23,7 +23,7 @@ SFX_Cry0A_1_Ch2: endchannel -SFX_Cry0A_1_Ch3: +SFX_Cry0A_1_Ch7: unknownnoise0x20 2, 242, 60 unknownnoise0x20 8, 228, 62 unknownnoise0x20 8, 215, 60 diff --git a/audio/sfx/cry0a_2.asm b/audio/sfx/cry0a_2.asm index 42a8e603..d7fdd264 100644 --- a/audio/sfx/cry0a_2.asm +++ b/audio/sfx/cry0a_2.asm @@ -1,4 +1,4 @@ -SFX_Cry0A_2_Ch1: +SFX_Cry0A_2_Ch4: dutycycle 240 unknownsfx0x20 8, 247, 224, 6 unknownsfx0x20 6, 230, 229, 6 @@ -10,7 +10,7 @@ SFX_Cry0A_2_Ch1: endchannel -SFX_Cry0A_2_Ch2: +SFX_Cry0A_2_Ch5: dutycycle 5 unknownsfx0x20 3, 8, 0, 0 unknownsfx0x20 8, 167, 161, 6 @@ -23,7 +23,7 @@ SFX_Cry0A_2_Ch2: endchannel -SFX_Cry0A_2_Ch3: +SFX_Cry0A_2_Ch7: unknownnoise0x20 2, 242, 60 unknownnoise0x20 8, 228, 62 unknownnoise0x20 8, 215, 60 diff --git a/audio/sfx/cry0a_3.asm b/audio/sfx/cry0a_3.asm index f8576fa1..e16287c4 100644 --- a/audio/sfx/cry0a_3.asm +++ b/audio/sfx/cry0a_3.asm @@ -1,4 +1,4 @@ -SFX_Cry0A_3_Ch1: +SFX_Cry0A_3_Ch4: dutycycle 240 unknownsfx0x20 8, 247, 224, 6 unknownsfx0x20 6, 230, 229, 6 @@ -10,7 +10,7 @@ SFX_Cry0A_3_Ch1: endchannel -SFX_Cry0A_3_Ch2: +SFX_Cry0A_3_Ch5: dutycycle 5 unknownsfx0x20 3, 8, 0, 0 unknownsfx0x20 8, 167, 161, 6 @@ -23,7 +23,7 @@ SFX_Cry0A_3_Ch2: endchannel -SFX_Cry0A_3_Ch3: +SFX_Cry0A_3_Ch7: unknownnoise0x20 2, 242, 60 unknownnoise0x20 8, 228, 62 unknownnoise0x20 8, 215, 60 diff --git a/audio/sfx/cry0b_1.asm b/audio/sfx/cry0b_1.asm index d0da6c2e..5ee9b81c 100644 --- a/audio/sfx/cry0b_1.asm +++ b/audio/sfx/cry0b_1.asm @@ -1,4 +1,4 @@ -SFX_Cry0B_1_Ch1: +SFX_Cry0B_1_Ch4: dutycycle 204 unknownsfx0x20 4, 241, 0, 7 unknownsfx0x20 4, 225, 128, 7 @@ -13,7 +13,7 @@ SFX_Cry0B_1_Ch1: endchannel -SFX_Cry0B_1_Ch2: +SFX_Cry0B_1_Ch5: dutycycle 68 unknownsfx0x20 12, 8, 0, 0 unknownsfx0x20 4, 241, 1, 7 @@ -25,7 +25,7 @@ SFX_Cry0B_1_Ch2: endchannel -SFX_Cry0B_1_Ch3: +SFX_Cry0B_1_Ch7: unknownnoise0x20 15, 8, 0 unknownnoise0x20 4, 8, 0 unknownnoise0x20 4, 209, 76 diff --git a/audio/sfx/cry0b_2.asm b/audio/sfx/cry0b_2.asm index 0fe7840a..f762ea02 100644 --- a/audio/sfx/cry0b_2.asm +++ b/audio/sfx/cry0b_2.asm @@ -1,4 +1,4 @@ -SFX_Cry0B_2_Ch1: +SFX_Cry0B_2_Ch4: dutycycle 204 unknownsfx0x20 4, 241, 0, 7 unknownsfx0x20 4, 225, 128, 7 @@ -13,7 +13,7 @@ SFX_Cry0B_2_Ch1: endchannel -SFX_Cry0B_2_Ch2: +SFX_Cry0B_2_Ch5: dutycycle 68 unknownsfx0x20 12, 8, 0, 0 unknownsfx0x20 4, 241, 1, 7 @@ -25,7 +25,7 @@ SFX_Cry0B_2_Ch2: endchannel -SFX_Cry0B_2_Ch3: +SFX_Cry0B_2_Ch7: unknownnoise0x20 15, 8, 0 unknownnoise0x20 4, 8, 0 unknownnoise0x20 4, 209, 76 diff --git a/audio/sfx/cry0b_3.asm b/audio/sfx/cry0b_3.asm index ff761b85..22420974 100644 --- a/audio/sfx/cry0b_3.asm +++ b/audio/sfx/cry0b_3.asm @@ -1,4 +1,4 @@ -SFX_Cry0B_3_Ch1: +SFX_Cry0B_3_Ch4: dutycycle 204 unknownsfx0x20 4, 241, 0, 7 unknownsfx0x20 4, 225, 128, 7 @@ -13,7 +13,7 @@ SFX_Cry0B_3_Ch1: endchannel -SFX_Cry0B_3_Ch2: +SFX_Cry0B_3_Ch5: dutycycle 68 unknownsfx0x20 12, 8, 0, 0 unknownsfx0x20 4, 241, 1, 7 @@ -25,7 +25,7 @@ SFX_Cry0B_3_Ch2: endchannel -SFX_Cry0B_3_Ch3: +SFX_Cry0B_3_Ch7: unknownnoise0x20 15, 8, 0 unknownnoise0x20 4, 8, 0 unknownnoise0x20 4, 209, 76 diff --git a/audio/sfx/cry0c_1.asm b/audio/sfx/cry0c_1.asm index 4ff72662..dfbf0283 100644 --- a/audio/sfx/cry0c_1.asm +++ b/audio/sfx/cry0c_1.asm @@ -1,4 +1,4 @@ -SFX_Cry0C_1_Ch1: +SFX_Cry0C_1_Ch4: dutycycle 204 unknownsfx0x20 8, 245, 0, 6 unknownsfx0x20 2, 210, 56, 6 @@ -12,7 +12,7 @@ SFX_Cry0C_1_Ch1: endchannel -SFX_Cry0C_1_Ch2: +SFX_Cry0C_1_Ch5: dutycycle 68 unknownsfx0x20 12, 195, 192, 5 unknownsfx0x20 3, 177, 249, 5 @@ -25,5 +25,5 @@ SFX_Cry0C_1_Ch2: unknownsfx0x20 8, 145, 225, 5 -SFX_Cry0C_1_Ch3: +SFX_Cry0C_1_Ch7: endchannel diff --git a/audio/sfx/cry0c_2.asm b/audio/sfx/cry0c_2.asm index 8fb925da..11e0d06a 100644 --- a/audio/sfx/cry0c_2.asm +++ b/audio/sfx/cry0c_2.asm @@ -1,4 +1,4 @@ -SFX_Cry0C_2_Ch1: +SFX_Cry0C_2_Ch4: dutycycle 204 unknownsfx0x20 8, 245, 0, 6 unknownsfx0x20 2, 210, 56, 6 @@ -12,7 +12,7 @@ SFX_Cry0C_2_Ch1: endchannel -SFX_Cry0C_2_Ch2: +SFX_Cry0C_2_Ch5: dutycycle 68 unknownsfx0x20 12, 195, 192, 5 unknownsfx0x20 3, 177, 249, 5 @@ -25,5 +25,5 @@ SFX_Cry0C_2_Ch2: unknownsfx0x20 8, 145, 225, 5 -SFX_Cry0C_2_Ch3: +SFX_Cry0C_2_Ch7: endchannel diff --git a/audio/sfx/cry0c_3.asm b/audio/sfx/cry0c_3.asm index 149b585d..6fc798f2 100644 --- a/audio/sfx/cry0c_3.asm +++ b/audio/sfx/cry0c_3.asm @@ -1,4 +1,4 @@ -SFX_Cry0C_3_Ch1: +SFX_Cry0C_3_Ch4: dutycycle 204 unknownsfx0x20 8, 245, 0, 6 unknownsfx0x20 2, 210, 56, 6 @@ -12,7 +12,7 @@ SFX_Cry0C_3_Ch1: endchannel -SFX_Cry0C_3_Ch2: +SFX_Cry0C_3_Ch5: dutycycle 68 unknownsfx0x20 12, 195, 192, 5 unknownsfx0x20 3, 177, 249, 5 @@ -25,5 +25,5 @@ SFX_Cry0C_3_Ch2: unknownsfx0x20 8, 145, 225, 5 -SFX_Cry0C_3_Ch3: +SFX_Cry0C_3_Ch7: endchannel diff --git a/audio/sfx/cry0d_1.asm b/audio/sfx/cry0d_1.asm index dccccb4e..2864fa01 100644 --- a/audio/sfx/cry0d_1.asm +++ b/audio/sfx/cry0d_1.asm @@ -1,4 +1,4 @@ -SFX_Cry0D_1_Ch1: +SFX_Cry0D_1_Ch4: dutycycle 136 unknownsfx0x20 5, 242, 80, 6 unknownsfx0x20 9, 209, 96, 6 @@ -6,11 +6,11 @@ SFX_Cry0D_1_Ch1: unknownsfx0x20 9, 193, 34, 6 unknownsfx0x20 5, 242, 16, 6 unknownsfx0x20 6, 209, 32, 6 - loopchannel 2, SFX_Cry0D_1_Ch1 + loopchannel 2, SFX_Cry0D_1_Ch4 endchannel -SFX_Cry0D_1_Ch2: +SFX_Cry0D_1_Ch5: dutycycle 64 unknownsfx0x20 4, 8, 0, 0 unknownsfx0x20 5, 242, 81, 6 @@ -26,7 +26,7 @@ SFX_Cry0D_1_Ch2: endchannel -SFX_Cry0D_1_Ch3: +SFX_Cry0D_1_Ch7: unknownnoise0x20 6, 210, 28 unknownnoise0x20 9, 177, 44 unknownnoise0x20 8, 194, 44 diff --git a/audio/sfx/cry0d_2.asm b/audio/sfx/cry0d_2.asm index 718364dd..ef4a0eb6 100644 --- a/audio/sfx/cry0d_2.asm +++ b/audio/sfx/cry0d_2.asm @@ -1,4 +1,4 @@ -SFX_Cry0D_2_Ch1: +SFX_Cry0D_2_Ch4: dutycycle 136 unknownsfx0x20 5, 242, 80, 6 unknownsfx0x20 9, 209, 96, 6 @@ -6,11 +6,11 @@ SFX_Cry0D_2_Ch1: unknownsfx0x20 9, 193, 34, 6 unknownsfx0x20 5, 242, 16, 6 unknownsfx0x20 6, 209, 32, 6 - loopchannel 2, SFX_Cry0D_2_Ch1 + loopchannel 2, SFX_Cry0D_2_Ch4 endchannel -SFX_Cry0D_2_Ch2: +SFX_Cry0D_2_Ch5: dutycycle 64 unknownsfx0x20 4, 8, 0, 0 unknownsfx0x20 5, 242, 81, 6 @@ -26,7 +26,7 @@ SFX_Cry0D_2_Ch2: endchannel -SFX_Cry0D_2_Ch3: +SFX_Cry0D_2_Ch7: unknownnoise0x20 6, 210, 28 unknownnoise0x20 9, 177, 44 unknownnoise0x20 8, 194, 44 diff --git a/audio/sfx/cry0d_3.asm b/audio/sfx/cry0d_3.asm index ce26e7e5..1fbc40b5 100644 --- a/audio/sfx/cry0d_3.asm +++ b/audio/sfx/cry0d_3.asm @@ -1,4 +1,4 @@ -SFX_Cry0D_3_Ch1: +SFX_Cry0D_3_Ch4: dutycycle 136 unknownsfx0x20 5, 242, 80, 6 unknownsfx0x20 9, 209, 96, 6 @@ -6,11 +6,11 @@ SFX_Cry0D_3_Ch1: unknownsfx0x20 9, 193, 34, 6 unknownsfx0x20 5, 242, 16, 6 unknownsfx0x20 6, 209, 32, 6 - loopchannel 2, SFX_Cry0D_3_Ch1 + loopchannel 2, SFX_Cry0D_3_Ch4 endchannel -SFX_Cry0D_3_Ch2: +SFX_Cry0D_3_Ch5: dutycycle 64 unknownsfx0x20 4, 8, 0, 0 unknownsfx0x20 5, 242, 81, 6 @@ -26,7 +26,7 @@ SFX_Cry0D_3_Ch2: endchannel -SFX_Cry0D_3_Ch3: +SFX_Cry0D_3_Ch7: unknownnoise0x20 6, 210, 28 unknownnoise0x20 9, 177, 44 unknownnoise0x20 8, 194, 44 diff --git a/audio/sfx/cry0e_1.asm b/audio/sfx/cry0e_1.asm index c30aaf20..37cabb7c 100644 --- a/audio/sfx/cry0e_1.asm +++ b/audio/sfx/cry0e_1.asm @@ -1,4 +1,4 @@ -SFX_Cry0E_1_Ch1: +SFX_Cry0E_1_Ch4: dutycycle 165 unknownsfx0x20 4, 225, 0, 7 unknownsfx0x20 4, 242, 128, 7 @@ -7,7 +7,7 @@ SFX_Cry0E_1_Ch1: endchannel -SFX_Cry0E_1_Ch2: +SFX_Cry0E_1_Ch5: dutycycle 10 unknownsfx0x20 4, 177, 225, 6 unknownsfx0x20 3, 194, 225, 6 @@ -16,7 +16,7 @@ SFX_Cry0E_1_Ch2: endchannel -SFX_Cry0E_1_Ch3: +SFX_Cry0E_1_Ch7: unknownnoise0x20 2, 97, 50 unknownnoise0x20 2, 97, 33 unknownnoise0x20 8, 97, 17 diff --git a/audio/sfx/cry0e_2.asm b/audio/sfx/cry0e_2.asm index 194fb04b..5f6f481f 100644 --- a/audio/sfx/cry0e_2.asm +++ b/audio/sfx/cry0e_2.asm @@ -1,4 +1,4 @@ -SFX_Cry0E_2_Ch1: +SFX_Cry0E_2_Ch4: dutycycle 165 unknownsfx0x20 4, 225, 0, 7 unknownsfx0x20 4, 242, 128, 7 @@ -7,7 +7,7 @@ SFX_Cry0E_2_Ch1: endchannel -SFX_Cry0E_2_Ch2: +SFX_Cry0E_2_Ch5: dutycycle 10 unknownsfx0x20 4, 177, 225, 6 unknownsfx0x20 3, 194, 225, 6 @@ -16,7 +16,7 @@ SFX_Cry0E_2_Ch2: endchannel -SFX_Cry0E_2_Ch3: +SFX_Cry0E_2_Ch7: unknownnoise0x20 2, 97, 50 unknownnoise0x20 2, 97, 33 unknownnoise0x20 8, 97, 17 diff --git a/audio/sfx/cry0e_3.asm b/audio/sfx/cry0e_3.asm index 062e8970..13cf9405 100644 --- a/audio/sfx/cry0e_3.asm +++ b/audio/sfx/cry0e_3.asm @@ -1,4 +1,4 @@ -SFX_Cry0E_3_Ch1: +SFX_Cry0E_3_Ch4: dutycycle 165 unknownsfx0x20 4, 225, 0, 7 unknownsfx0x20 4, 242, 128, 7 @@ -7,7 +7,7 @@ SFX_Cry0E_3_Ch1: endchannel -SFX_Cry0E_3_Ch2: +SFX_Cry0E_3_Ch5: dutycycle 10 unknownsfx0x20 4, 177, 225, 6 unknownsfx0x20 3, 194, 225, 6 @@ -16,7 +16,7 @@ SFX_Cry0E_3_Ch2: endchannel -SFX_Cry0E_3_Ch3: +SFX_Cry0E_3_Ch7: unknownnoise0x20 2, 97, 50 unknownnoise0x20 2, 97, 33 unknownnoise0x20 8, 97, 17 diff --git a/audio/sfx/cry0f_1.asm b/audio/sfx/cry0f_1.asm index 1646d4b5..81abdc09 100644 --- a/audio/sfx/cry0f_1.asm +++ b/audio/sfx/cry0f_1.asm @@ -1,4 +1,4 @@ -SFX_Cry0F_1_Ch1: +SFX_Cry0F_1_Ch4: dutycycle 241 unknownsfx0x20 4, 247, 192, 7 unknownsfx0x20 12, 230, 194, 7 @@ -9,7 +9,7 @@ SFX_Cry0F_1_Ch1: endchannel -SFX_Cry0F_1_Ch2: +SFX_Cry0F_1_Ch5: dutycycle 204 unknownsfx0x20 3, 199, 129, 7 unknownsfx0x20 12, 182, 128, 7 @@ -20,7 +20,7 @@ SFX_Cry0F_1_Ch2: endchannel -SFX_Cry0F_1_Ch3: +SFX_Cry0F_1_Ch7: unknownnoise0x20 3, 228, 60 unknownnoise0x20 12, 214, 44 unknownnoise0x20 4, 228, 60 diff --git a/audio/sfx/cry0f_2.asm b/audio/sfx/cry0f_2.asm index 6058e7cc..112b9e8b 100644 --- a/audio/sfx/cry0f_2.asm +++ b/audio/sfx/cry0f_2.asm @@ -1,4 +1,4 @@ -SFX_Cry0F_2_Ch1: +SFX_Cry0F_2_Ch4: dutycycle 241 unknownsfx0x20 4, 247, 192, 7 unknownsfx0x20 12, 230, 194, 7 @@ -9,7 +9,7 @@ SFX_Cry0F_2_Ch1: endchannel -SFX_Cry0F_2_Ch2: +SFX_Cry0F_2_Ch5: dutycycle 204 unknownsfx0x20 3, 199, 129, 7 unknownsfx0x20 12, 182, 128, 7 @@ -20,7 +20,7 @@ SFX_Cry0F_2_Ch2: endchannel -SFX_Cry0F_2_Ch3: +SFX_Cry0F_2_Ch7: unknownnoise0x20 3, 228, 60 unknownnoise0x20 12, 214, 44 unknownnoise0x20 4, 228, 60 diff --git a/audio/sfx/cry0f_3.asm b/audio/sfx/cry0f_3.asm index 113f5ed1..08abd131 100644 --- a/audio/sfx/cry0f_3.asm +++ b/audio/sfx/cry0f_3.asm @@ -1,4 +1,4 @@ -SFX_Cry0F_3_Ch1: +SFX_Cry0F_3_Ch4: dutycycle 241 unknownsfx0x20 4, 247, 192, 7 unknownsfx0x20 12, 230, 194, 7 @@ -9,7 +9,7 @@ SFX_Cry0F_3_Ch1: endchannel -SFX_Cry0F_3_Ch2: +SFX_Cry0F_3_Ch5: dutycycle 204 unknownsfx0x20 3, 199, 129, 7 unknownsfx0x20 12, 182, 128, 7 @@ -20,7 +20,7 @@ SFX_Cry0F_3_Ch2: endchannel -SFX_Cry0F_3_Ch3: +SFX_Cry0F_3_Ch7: unknownnoise0x20 3, 228, 60 unknownnoise0x20 12, 214, 44 unknownnoise0x20 4, 228, 60 diff --git a/audio/sfx/cry10_1.asm b/audio/sfx/cry10_1.asm index 5199b973..eef13d3d 100644 --- a/audio/sfx/cry10_1.asm +++ b/audio/sfx/cry10_1.asm @@ -1,4 +1,4 @@ -SFX_Cry10_1_Ch1: +SFX_Cry10_1_Ch4: dutycycle 201 unknownsfx0x20 8, 247, 128, 6 unknownsfx0x20 2, 247, 96, 6 @@ -11,7 +11,7 @@ SFX_Cry10_1_Ch1: endchannel -SFX_Cry10_1_Ch2: +SFX_Cry10_1_Ch5: dutycycle 121 unknownsfx0x20 10, 231, 130, 6 unknownsfx0x20 2, 231, 98, 6 @@ -24,7 +24,7 @@ SFX_Cry10_1_Ch2: endchannel -SFX_Cry10_1_Ch3: +SFX_Cry10_1_Ch7: unknownnoise0x20 4, 116, 33 unknownnoise0x20 4, 116, 16 unknownnoise0x20 4, 113, 32 diff --git a/audio/sfx/cry10_2.asm b/audio/sfx/cry10_2.asm index 789c61b1..dd468979 100644 --- a/audio/sfx/cry10_2.asm +++ b/audio/sfx/cry10_2.asm @@ -1,4 +1,4 @@ -SFX_Cry10_2_Ch1: +SFX_Cry10_2_Ch4: dutycycle 201 unknownsfx0x20 8, 247, 128, 6 unknownsfx0x20 2, 247, 96, 6 @@ -11,7 +11,7 @@ SFX_Cry10_2_Ch1: endchannel -SFX_Cry10_2_Ch2: +SFX_Cry10_2_Ch5: dutycycle 121 unknownsfx0x20 10, 231, 130, 6 unknownsfx0x20 2, 231, 98, 6 @@ -24,7 +24,7 @@ SFX_Cry10_2_Ch2: endchannel -SFX_Cry10_2_Ch3: +SFX_Cry10_2_Ch7: unknownnoise0x20 4, 116, 33 unknownnoise0x20 4, 116, 16 unknownnoise0x20 4, 113, 32 diff --git a/audio/sfx/cry10_3.asm b/audio/sfx/cry10_3.asm index 83980fc7..e9a5200d 100644 --- a/audio/sfx/cry10_3.asm +++ b/audio/sfx/cry10_3.asm @@ -1,4 +1,4 @@ -SFX_Cry10_3_Ch1: +SFX_Cry10_3_Ch4: dutycycle 201 unknownsfx0x20 8, 247, 128, 6 unknownsfx0x20 2, 247, 96, 6 @@ -11,7 +11,7 @@ SFX_Cry10_3_Ch1: endchannel -SFX_Cry10_3_Ch2: +SFX_Cry10_3_Ch5: dutycycle 121 unknownsfx0x20 10, 231, 130, 6 unknownsfx0x20 2, 231, 98, 6 @@ -24,7 +24,7 @@ SFX_Cry10_3_Ch2: endchannel -SFX_Cry10_3_Ch3: +SFX_Cry10_3_Ch7: unknownnoise0x20 4, 116, 33 unknownnoise0x20 4, 116, 16 unknownnoise0x20 4, 113, 32 diff --git a/audio/sfx/cry11_1.asm b/audio/sfx/cry11_1.asm index d7e0b0f9..f7c314ef 100644 --- a/audio/sfx/cry11_1.asm +++ b/audio/sfx/cry11_1.asm @@ -1,4 +1,4 @@ -SFX_Cry11_1_Ch1: +SFX_Cry11_1_Ch4: dutycycle 240 unknownsfx0x20 6, 247, 160, 7 unknownsfx0x20 8, 230, 164, 7 @@ -10,7 +10,7 @@ SFX_Cry11_1_Ch1: endchannel -SFX_Cry11_1_Ch2: +SFX_Cry11_1_Ch5: dutycycle 10 unknownsfx0x20 4, 8, 0, 0 unknownsfx0x20 6, 167, 65, 7 @@ -23,7 +23,7 @@ SFX_Cry11_1_Ch2: endchannel -SFX_Cry11_1_Ch3: +SFX_Cry11_1_Ch7: unknownnoise0x20 2, 242, 76 unknownnoise0x20 6, 230, 58 unknownnoise0x20 4, 215, 58 diff --git a/audio/sfx/cry11_2.asm b/audio/sfx/cry11_2.asm index f46580eb..0009a0ec 100644 --- a/audio/sfx/cry11_2.asm +++ b/audio/sfx/cry11_2.asm @@ -1,4 +1,4 @@ -SFX_Cry11_2_Ch1: +SFX_Cry11_2_Ch4: dutycycle 240 unknownsfx0x20 6, 247, 160, 7 unknownsfx0x20 8, 230, 164, 7 @@ -10,7 +10,7 @@ SFX_Cry11_2_Ch1: endchannel -SFX_Cry11_2_Ch2: +SFX_Cry11_2_Ch5: dutycycle 10 unknownsfx0x20 4, 8, 0, 0 unknownsfx0x20 6, 167, 65, 7 @@ -23,7 +23,7 @@ SFX_Cry11_2_Ch2: endchannel -SFX_Cry11_2_Ch3: +SFX_Cry11_2_Ch7: unknownnoise0x20 2, 242, 76 unknownnoise0x20 6, 230, 58 unknownnoise0x20 4, 215, 58 diff --git a/audio/sfx/cry11_3.asm b/audio/sfx/cry11_3.asm index c07e01a5..a8af19f6 100644 --- a/audio/sfx/cry11_3.asm +++ b/audio/sfx/cry11_3.asm @@ -1,4 +1,4 @@ -SFX_Cry11_3_Ch1: +SFX_Cry11_3_Ch4: dutycycle 240 unknownsfx0x20 6, 247, 160, 7 unknownsfx0x20 8, 230, 164, 7 @@ -10,7 +10,7 @@ SFX_Cry11_3_Ch1: endchannel -SFX_Cry11_3_Ch2: +SFX_Cry11_3_Ch5: dutycycle 10 unknownsfx0x20 4, 8, 0, 0 unknownsfx0x20 6, 167, 65, 7 @@ -23,7 +23,7 @@ SFX_Cry11_3_Ch2: endchannel -SFX_Cry11_3_Ch3: +SFX_Cry11_3_Ch7: unknownnoise0x20 2, 242, 76 unknownnoise0x20 6, 230, 58 unknownnoise0x20 4, 215, 58 diff --git a/audio/sfx/cry12_1.asm b/audio/sfx/cry12_1.asm index 62956626..29d93eff 100644 --- a/audio/sfx/cry12_1.asm +++ b/audio/sfx/cry12_1.asm @@ -1,4 +1,4 @@ -SFX_Cry12_1_Ch1: +SFX_Cry12_1_Ch4: dutycycle 165 unknownsfx0x20 12, 242, 64, 4 unknownsfx0x20 15, 227, 160, 4 @@ -7,7 +7,7 @@ SFX_Cry12_1_Ch1: endchannel -SFX_Cry12_1_Ch2: +SFX_Cry12_1_Ch5: dutycycle 238 unknownsfx0x20 11, 210, 56, 4 unknownsfx0x20 14, 198, 152, 4 @@ -16,7 +16,7 @@ SFX_Cry12_1_Ch2: endchannel -SFX_Cry12_1_Ch3: +SFX_Cry12_1_Ch7: unknownnoise0x20 10, 230, 108 unknownnoise0x20 15, 210, 92 unknownnoise0x20 3, 194, 108 diff --git a/audio/sfx/cry12_2.asm b/audio/sfx/cry12_2.asm index 4acb8911..90f373c0 100644 --- a/audio/sfx/cry12_2.asm +++ b/audio/sfx/cry12_2.asm @@ -1,4 +1,4 @@ -SFX_Cry12_2_Ch1: +SFX_Cry12_2_Ch4: dutycycle 165 unknownsfx0x20 12, 242, 64, 4 unknownsfx0x20 15, 227, 160, 4 @@ -7,7 +7,7 @@ SFX_Cry12_2_Ch1: endchannel -SFX_Cry12_2_Ch2: +SFX_Cry12_2_Ch5: dutycycle 238 unknownsfx0x20 11, 210, 56, 4 unknownsfx0x20 14, 198, 152, 4 @@ -16,7 +16,7 @@ SFX_Cry12_2_Ch2: endchannel -SFX_Cry12_2_Ch3: +SFX_Cry12_2_Ch7: unknownnoise0x20 10, 230, 108 unknownnoise0x20 15, 210, 92 unknownnoise0x20 3, 194, 108 diff --git a/audio/sfx/cry12_3.asm b/audio/sfx/cry12_3.asm index bb433ac9..f2c012ae 100644 --- a/audio/sfx/cry12_3.asm +++ b/audio/sfx/cry12_3.asm @@ -1,4 +1,4 @@ -SFX_Cry12_3_Ch1: +SFX_Cry12_3_Ch4: dutycycle 165 unknownsfx0x20 12, 242, 64, 4 unknownsfx0x20 15, 227, 160, 4 @@ -7,7 +7,7 @@ SFX_Cry12_3_Ch1: endchannel -SFX_Cry12_3_Ch2: +SFX_Cry12_3_Ch5: dutycycle 238 unknownsfx0x20 11, 210, 56, 4 unknownsfx0x20 14, 198, 152, 4 @@ -16,7 +16,7 @@ SFX_Cry12_3_Ch2: endchannel -SFX_Cry12_3_Ch3: +SFX_Cry12_3_Ch7: unknownnoise0x20 10, 230, 108 unknownnoise0x20 15, 210, 92 unknownnoise0x20 3, 194, 108 diff --git a/audio/sfx/cry13_1.asm b/audio/sfx/cry13_1.asm index 7f9ef226..703db728 100644 --- a/audio/sfx/cry13_1.asm +++ b/audio/sfx/cry13_1.asm @@ -1,4 +1,4 @@ -SFX_Cry13_1_Ch1: +SFX_Cry13_1_Ch4: dutycycle 51 unknownsfx0x20 15, 246, 192, 5 unknownsfx0x20 8, 227, 188, 5 @@ -9,7 +9,7 @@ SFX_Cry13_1_Ch1: endchannel -SFX_Cry13_1_Ch2: +SFX_Cry13_1_Ch5: dutycycle 153 unknownsfx0x20 14, 198, 177, 4 unknownsfx0x20 7, 195, 173, 4 @@ -20,7 +20,7 @@ SFX_Cry13_1_Ch2: endchannel -SFX_Cry13_1_Ch3: +SFX_Cry13_1_Ch7: unknownnoise0x20 10, 230, 92 unknownnoise0x20 10, 214, 108 unknownnoise0x20 4, 194, 76 diff --git a/audio/sfx/cry13_2.asm b/audio/sfx/cry13_2.asm index 35d723dd..7d75853c 100644 --- a/audio/sfx/cry13_2.asm +++ b/audio/sfx/cry13_2.asm @@ -1,4 +1,4 @@ -SFX_Cry13_2_Ch1: +SFX_Cry13_2_Ch4: dutycycle 51 unknownsfx0x20 15, 246, 192, 5 unknownsfx0x20 8, 227, 188, 5 @@ -9,7 +9,7 @@ SFX_Cry13_2_Ch1: endchannel -SFX_Cry13_2_Ch2: +SFX_Cry13_2_Ch5: dutycycle 153 unknownsfx0x20 14, 198, 177, 4 unknownsfx0x20 7, 195, 173, 4 @@ -20,7 +20,7 @@ SFX_Cry13_2_Ch2: endchannel -SFX_Cry13_2_Ch3: +SFX_Cry13_2_Ch7: unknownnoise0x20 10, 230, 92 unknownnoise0x20 10, 214, 108 unknownnoise0x20 4, 194, 76 diff --git a/audio/sfx/cry13_3.asm b/audio/sfx/cry13_3.asm index a298e5ff..53296f1a 100644 --- a/audio/sfx/cry13_3.asm +++ b/audio/sfx/cry13_3.asm @@ -1,4 +1,4 @@ -SFX_Cry13_3_Ch1: +SFX_Cry13_3_Ch4: dutycycle 51 unknownsfx0x20 15, 246, 192, 5 unknownsfx0x20 8, 227, 188, 5 @@ -9,7 +9,7 @@ SFX_Cry13_3_Ch1: endchannel -SFX_Cry13_3_Ch2: +SFX_Cry13_3_Ch5: dutycycle 153 unknownsfx0x20 14, 198, 177, 4 unknownsfx0x20 7, 195, 173, 4 @@ -20,7 +20,7 @@ SFX_Cry13_3_Ch2: endchannel -SFX_Cry13_3_Ch3: +SFX_Cry13_3_Ch7: unknownnoise0x20 10, 230, 92 unknownnoise0x20 10, 214, 108 unknownnoise0x20 4, 194, 76 diff --git a/audio/sfx/cry14_1.asm b/audio/sfx/cry14_1.asm index b3cb43b9..fa8964de 100644 --- a/audio/sfx/cry14_1.asm +++ b/audio/sfx/cry14_1.asm @@ -1,4 +1,4 @@ -SFX_Cry14_1_Ch1: +SFX_Cry14_1_Ch4: dutycycle 240 unknownsfx0x20 8, 228, 144, 7 unknownsfx0x20 15, 245, 192, 7 @@ -6,7 +6,7 @@ SFX_Cry14_1_Ch1: endchannel -SFX_Cry14_1_Ch2: +SFX_Cry14_1_Ch5: dutycycle 165 unknownsfx0x20 10, 196, 113, 7 unknownsfx0x20 15, 182, 162, 7 @@ -14,7 +14,7 @@ SFX_Cry14_1_Ch2: endchannel -SFX_Cry14_1_Ch3: +SFX_Cry14_1_Ch7: unknownnoise0x20 8, 228, 76 unknownnoise0x20 14, 196, 60 unknownnoise0x20 8, 209, 44 diff --git a/audio/sfx/cry14_2.asm b/audio/sfx/cry14_2.asm index d243bcbd..1f70dca8 100644 --- a/audio/sfx/cry14_2.asm +++ b/audio/sfx/cry14_2.asm @@ -1,4 +1,4 @@ -SFX_Cry14_2_Ch1: +SFX_Cry14_2_Ch4: dutycycle 240 unknownsfx0x20 8, 228, 144, 7 unknownsfx0x20 15, 245, 192, 7 @@ -6,7 +6,7 @@ SFX_Cry14_2_Ch1: endchannel -SFX_Cry14_2_Ch2: +SFX_Cry14_2_Ch5: dutycycle 165 unknownsfx0x20 10, 196, 113, 7 unknownsfx0x20 15, 182, 162, 7 @@ -14,7 +14,7 @@ SFX_Cry14_2_Ch2: endchannel -SFX_Cry14_2_Ch3: +SFX_Cry14_2_Ch7: unknownnoise0x20 8, 228, 76 unknownnoise0x20 14, 196, 60 unknownnoise0x20 8, 209, 44 diff --git a/audio/sfx/cry14_3.asm b/audio/sfx/cry14_3.asm index b1a32bc4..3bab2100 100644 --- a/audio/sfx/cry14_3.asm +++ b/audio/sfx/cry14_3.asm @@ -1,4 +1,4 @@ -SFX_Cry14_3_Ch1: +SFX_Cry14_3_Ch4: dutycycle 240 unknownsfx0x20 8, 228, 144, 7 unknownsfx0x20 15, 245, 192, 7 @@ -6,7 +6,7 @@ SFX_Cry14_3_Ch1: endchannel -SFX_Cry14_3_Ch2: +SFX_Cry14_3_Ch5: dutycycle 165 unknownsfx0x20 10, 196, 113, 7 unknownsfx0x20 15, 182, 162, 7 @@ -14,7 +14,7 @@ SFX_Cry14_3_Ch2: endchannel -SFX_Cry14_3_Ch3: +SFX_Cry14_3_Ch7: unknownnoise0x20 8, 228, 76 unknownnoise0x20 14, 196, 60 unknownnoise0x20 8, 209, 44 diff --git a/audio/sfx/cry15_1.asm b/audio/sfx/cry15_1.asm index 4ebd4963..0220ad4f 100644 --- a/audio/sfx/cry15_1.asm +++ b/audio/sfx/cry15_1.asm @@ -1,4 +1,4 @@ -SFX_Cry15_1_Ch1: +SFX_Cry15_1_Ch4: dutycycle 240 unknownsfx0x20 4, 243, 128, 7 unknownsfx0x20 15, 231, 0, 7 @@ -9,7 +9,7 @@ SFX_Cry15_1_Ch1: endchannel -SFX_Cry15_1_Ch2: +SFX_Cry15_1_Ch5: dutycycle 90 unknownsfx0x20 6, 195, 1, 7 unknownsfx0x20 14, 183, 129, 6 @@ -20,7 +20,7 @@ SFX_Cry15_1_Ch2: endchannel -SFX_Cry15_1_Ch3: +SFX_Cry15_1_Ch7: unknownnoise0x20 6, 227, 92 unknownnoise0x20 14, 214, 76 unknownnoise0x20 6, 198, 60 diff --git a/audio/sfx/cry15_2.asm b/audio/sfx/cry15_2.asm index 77807203..2ebd7ab0 100644 --- a/audio/sfx/cry15_2.asm +++ b/audio/sfx/cry15_2.asm @@ -1,4 +1,4 @@ -SFX_Cry15_2_Ch1: +SFX_Cry15_2_Ch4: dutycycle 240 unknownsfx0x20 4, 243, 128, 7 unknownsfx0x20 15, 231, 0, 7 @@ -9,7 +9,7 @@ SFX_Cry15_2_Ch1: endchannel -SFX_Cry15_2_Ch2: +SFX_Cry15_2_Ch5: dutycycle 90 unknownsfx0x20 6, 195, 1, 7 unknownsfx0x20 14, 183, 129, 6 @@ -20,7 +20,7 @@ SFX_Cry15_2_Ch2: endchannel -SFX_Cry15_2_Ch3: +SFX_Cry15_2_Ch7: unknownnoise0x20 6, 227, 92 unknownnoise0x20 14, 214, 76 unknownnoise0x20 6, 198, 60 diff --git a/audio/sfx/cry15_3.asm b/audio/sfx/cry15_3.asm index 2c24d658..39ba7a74 100644 --- a/audio/sfx/cry15_3.asm +++ b/audio/sfx/cry15_3.asm @@ -1,4 +1,4 @@ -SFX_Cry15_3_Ch1: +SFX_Cry15_3_Ch4: dutycycle 240 unknownsfx0x20 4, 243, 128, 7 unknownsfx0x20 15, 231, 0, 7 @@ -9,7 +9,7 @@ SFX_Cry15_3_Ch1: endchannel -SFX_Cry15_3_Ch2: +SFX_Cry15_3_Ch5: dutycycle 90 unknownsfx0x20 6, 195, 1, 7 unknownsfx0x20 14, 183, 129, 6 @@ -20,7 +20,7 @@ SFX_Cry15_3_Ch2: endchannel -SFX_Cry15_3_Ch3: +SFX_Cry15_3_Ch7: unknownnoise0x20 6, 227, 92 unknownnoise0x20 14, 214, 76 unknownnoise0x20 6, 198, 60 diff --git a/audio/sfx/cry16_1.asm b/audio/sfx/cry16_1.asm index 8a7ee4c1..34d6f6d9 100644 --- a/audio/sfx/cry16_1.asm +++ b/audio/sfx/cry16_1.asm @@ -1,4 +1,4 @@ -SFX_Cry16_1_Ch1: +SFX_Cry16_1_Ch4: dutycycle 240 unknownsfx0x20 15, 215, 128, 7 unknownsfx0x20 4, 230, 160, 7 @@ -6,7 +6,7 @@ SFX_Cry16_1_Ch1: endchannel -SFX_Cry16_1_Ch2: +SFX_Cry16_1_Ch5: dutycycle 90 unknownsfx0x20 15, 199, 83, 7 unknownsfx0x20 5, 182, 114, 7 @@ -14,7 +14,7 @@ SFX_Cry16_1_Ch2: endchannel -SFX_Cry16_1_Ch3: +SFX_Cry16_1_Ch7: unknownnoise0x20 13, 246, 76 unknownnoise0x20 4, 230, 60 unknownnoise0x20 15, 242, 76 diff --git a/audio/sfx/cry16_2.asm b/audio/sfx/cry16_2.asm index 46729c2a..8948cd29 100644 --- a/audio/sfx/cry16_2.asm +++ b/audio/sfx/cry16_2.asm @@ -1,4 +1,4 @@ -SFX_Cry16_2_Ch1: +SFX_Cry16_2_Ch4: dutycycle 240 unknownsfx0x20 15, 215, 128, 7 unknownsfx0x20 4, 230, 160, 7 @@ -6,7 +6,7 @@ SFX_Cry16_2_Ch1: endchannel -SFX_Cry16_2_Ch2: +SFX_Cry16_2_Ch5: dutycycle 90 unknownsfx0x20 15, 199, 83, 7 unknownsfx0x20 5, 182, 114, 7 @@ -14,7 +14,7 @@ SFX_Cry16_2_Ch2: endchannel -SFX_Cry16_2_Ch3: +SFX_Cry16_2_Ch7: unknownnoise0x20 13, 246, 76 unknownnoise0x20 4, 230, 60 unknownnoise0x20 15, 242, 76 diff --git a/audio/sfx/cry16_3.asm b/audio/sfx/cry16_3.asm index a94ac495..026ee67b 100644 --- a/audio/sfx/cry16_3.asm +++ b/audio/sfx/cry16_3.asm @@ -1,4 +1,4 @@ -SFX_Cry16_3_Ch1: +SFX_Cry16_3_Ch4: dutycycle 240 unknownsfx0x20 15, 215, 128, 7 unknownsfx0x20 4, 230, 160, 7 @@ -6,7 +6,7 @@ SFX_Cry16_3_Ch1: endchannel -SFX_Cry16_3_Ch2: +SFX_Cry16_3_Ch5: dutycycle 90 unknownsfx0x20 15, 199, 83, 7 unknownsfx0x20 5, 182, 114, 7 @@ -14,7 +14,7 @@ SFX_Cry16_3_Ch2: endchannel -SFX_Cry16_3_Ch3: +SFX_Cry16_3_Ch7: unknownnoise0x20 13, 246, 76 unknownnoise0x20 4, 230, 60 unknownnoise0x20 15, 242, 76 diff --git a/audio/sfx/cry17_1.asm b/audio/sfx/cry17_1.asm index ddf0967d..97dec764 100644 --- a/audio/sfx/cry17_1.asm +++ b/audio/sfx/cry17_1.asm @@ -1,4 +1,4 @@ -SFX_Cry17_1_Ch1: +SFX_Cry17_1_Ch4: dutycycle 15 unknownsfx0x20 15, 247, 0, 5 unknownsfx0x20 15, 231, 8, 5 @@ -7,7 +7,7 @@ SFX_Cry17_1_Ch1: endchannel -SFX_Cry17_1_Ch2: +SFX_Cry17_1_Ch5: dutycycle 68 unknownsfx0x20 14, 215, 129, 4 unknownsfx0x20 14, 199, 137, 4 @@ -16,7 +16,7 @@ SFX_Cry17_1_Ch2: endchannel -SFX_Cry17_1_Ch3: +SFX_Cry17_1_Ch7: unknownnoise0x20 14, 247, 124 unknownnoise0x20 12, 246, 108 unknownnoise0x20 9, 228, 124 diff --git a/audio/sfx/cry17_2.asm b/audio/sfx/cry17_2.asm index f2528875..a6ab03a2 100644 --- a/audio/sfx/cry17_2.asm +++ b/audio/sfx/cry17_2.asm @@ -1,4 +1,4 @@ -SFX_Cry17_2_Ch1: +SFX_Cry17_2_Ch4: dutycycle 15 unknownsfx0x20 15, 247, 0, 5 unknownsfx0x20 15, 231, 8, 5 @@ -7,7 +7,7 @@ SFX_Cry17_2_Ch1: endchannel -SFX_Cry17_2_Ch2: +SFX_Cry17_2_Ch5: dutycycle 68 unknownsfx0x20 14, 215, 129, 4 unknownsfx0x20 14, 199, 137, 4 @@ -16,7 +16,7 @@ SFX_Cry17_2_Ch2: endchannel -SFX_Cry17_2_Ch3: +SFX_Cry17_2_Ch7: unknownnoise0x20 14, 247, 124 unknownnoise0x20 12, 246, 108 unknownnoise0x20 9, 228, 124 diff --git a/audio/sfx/cry17_3.asm b/audio/sfx/cry17_3.asm index f180a3b8..53555206 100644 --- a/audio/sfx/cry17_3.asm +++ b/audio/sfx/cry17_3.asm @@ -1,4 +1,4 @@ -SFX_Cry17_3_Ch1: +SFX_Cry17_3_Ch4: dutycycle 15 unknownsfx0x20 15, 247, 0, 5 unknownsfx0x20 15, 231, 8, 5 @@ -7,7 +7,7 @@ SFX_Cry17_3_Ch1: endchannel -SFX_Cry17_3_Ch2: +SFX_Cry17_3_Ch5: dutycycle 68 unknownsfx0x20 14, 215, 129, 4 unknownsfx0x20 14, 199, 137, 4 @@ -16,7 +16,7 @@ SFX_Cry17_3_Ch2: endchannel -SFX_Cry17_3_Ch3: +SFX_Cry17_3_Ch7: unknownnoise0x20 14, 247, 124 unknownnoise0x20 12, 246, 108 unknownnoise0x20 9, 228, 124 diff --git a/audio/sfx/cry18_1.asm b/audio/sfx/cry18_1.asm index c28bf7f4..8cb3283f 100644 --- a/audio/sfx/cry18_1.asm +++ b/audio/sfx/cry18_1.asm @@ -1,4 +1,4 @@ -SFX_Cry18_1_Ch1: +SFX_Cry18_1_Ch4: dutycycle 80 unknownsfx0x20 10, 245, 128, 6 unknownsfx0x20 3, 226, 160, 6 @@ -11,7 +11,7 @@ SFX_Cry18_1_Ch1: endchannel -SFX_Cry18_1_Ch2: +SFX_Cry18_1_Ch5: dutycycle 15 unknownsfx0x20 9, 213, 49, 6 unknownsfx0x20 3, 210, 82, 6 @@ -24,7 +24,7 @@ SFX_Cry18_1_Ch2: endchannel -SFX_Cry18_1_Ch3: +SFX_Cry18_1_Ch7: unknownnoise0x20 6, 227, 76 unknownnoise0x20 4, 195, 60 unknownnoise0x20 5, 212, 60 diff --git a/audio/sfx/cry18_2.asm b/audio/sfx/cry18_2.asm index 1c3c26b9..01dacd5f 100644 --- a/audio/sfx/cry18_2.asm +++ b/audio/sfx/cry18_2.asm @@ -1,4 +1,4 @@ -SFX_Cry18_2_Ch1: +SFX_Cry18_2_Ch4: dutycycle 80 unknownsfx0x20 10, 245, 128, 6 unknownsfx0x20 3, 226, 160, 6 @@ -11,7 +11,7 @@ SFX_Cry18_2_Ch1: endchannel -SFX_Cry18_2_Ch2: +SFX_Cry18_2_Ch5: dutycycle 15 unknownsfx0x20 9, 213, 49, 6 unknownsfx0x20 3, 210, 82, 6 @@ -24,7 +24,7 @@ SFX_Cry18_2_Ch2: endchannel -SFX_Cry18_2_Ch3: +SFX_Cry18_2_Ch7: unknownnoise0x20 6, 227, 76 unknownnoise0x20 4, 195, 60 unknownnoise0x20 5, 212, 60 diff --git a/audio/sfx/cry18_3.asm b/audio/sfx/cry18_3.asm index ceeda42f..23d2d6a6 100644 --- a/audio/sfx/cry18_3.asm +++ b/audio/sfx/cry18_3.asm @@ -1,4 +1,4 @@ -SFX_Cry18_3_Ch1: +SFX_Cry18_3_Ch4: dutycycle 80 unknownsfx0x20 10, 245, 128, 6 unknownsfx0x20 3, 226, 160, 6 @@ -11,7 +11,7 @@ SFX_Cry18_3_Ch1: endchannel -SFX_Cry18_3_Ch2: +SFX_Cry18_3_Ch5: dutycycle 15 unknownsfx0x20 9, 213, 49, 6 unknownsfx0x20 3, 210, 82, 6 @@ -24,7 +24,7 @@ SFX_Cry18_3_Ch2: endchannel -SFX_Cry18_3_Ch3: +SFX_Cry18_3_Ch7: unknownnoise0x20 6, 227, 76 unknownnoise0x20 4, 195, 60 unknownnoise0x20 5, 212, 60 diff --git a/audio/sfx/cry19_1.asm b/audio/sfx/cry19_1.asm index 4b5b4ed0..2e6790e5 100644 --- a/audio/sfx/cry19_1.asm +++ b/audio/sfx/cry19_1.asm @@ -1,4 +1,4 @@ -SFX_Cry19_1_Ch1: +SFX_Cry19_1_Ch4: dutycycle 27 unknownsfx0x20 7, 210, 64, 7 unknownsfx0x20 15, 229, 96, 7 @@ -6,7 +6,7 @@ SFX_Cry19_1_Ch1: endchannel -SFX_Cry19_1_Ch2: +SFX_Cry19_1_Ch5: dutycycle 129 unknownsfx0x20 2, 194, 1, 7 unknownsfx0x20 4, 194, 8, 7 @@ -14,5 +14,5 @@ SFX_Cry19_1_Ch2: unknownsfx0x20 15, 162, 1, 7 -SFX_Cry19_1_Ch3: +SFX_Cry19_1_Ch7: endchannel diff --git a/audio/sfx/cry19_2.asm b/audio/sfx/cry19_2.asm index 9c9557a9..f412ec14 100644 --- a/audio/sfx/cry19_2.asm +++ b/audio/sfx/cry19_2.asm @@ -1,4 +1,4 @@ -SFX_Cry19_2_Ch1: +SFX_Cry19_2_Ch4: dutycycle 27 unknownsfx0x20 7, 210, 64, 7 unknownsfx0x20 15, 229, 96, 7 @@ -6,7 +6,7 @@ SFX_Cry19_2_Ch1: endchannel -SFX_Cry19_2_Ch2: +SFX_Cry19_2_Ch5: dutycycle 129 unknownsfx0x20 2, 194, 1, 7 unknownsfx0x20 4, 194, 8, 7 @@ -14,5 +14,5 @@ SFX_Cry19_2_Ch2: unknownsfx0x20 15, 162, 1, 7 -SFX_Cry19_2_Ch3: +SFX_Cry19_2_Ch7: endchannel diff --git a/audio/sfx/cry19_3.asm b/audio/sfx/cry19_3.asm index 71eccbf8..2baff05e 100644 --- a/audio/sfx/cry19_3.asm +++ b/audio/sfx/cry19_3.asm @@ -1,4 +1,4 @@ -SFX_Cry19_3_Ch1: +SFX_Cry19_3_Ch4: dutycycle 27 unknownsfx0x20 7, 210, 64, 7 unknownsfx0x20 15, 229, 96, 7 @@ -6,7 +6,7 @@ SFX_Cry19_3_Ch1: endchannel -SFX_Cry19_3_Ch2: +SFX_Cry19_3_Ch5: dutycycle 129 unknownsfx0x20 2, 194, 1, 7 unknownsfx0x20 4, 194, 8, 7 @@ -14,5 +14,5 @@ SFX_Cry19_3_Ch2: unknownsfx0x20 15, 162, 1, 7 -SFX_Cry19_3_Ch3: +SFX_Cry19_3_Ch7: endchannel diff --git a/audio/sfx/cry1a_1.asm b/audio/sfx/cry1a_1.asm index 7f8911c7..5d03596e 100644 --- a/audio/sfx/cry1a_1.asm +++ b/audio/sfx/cry1a_1.asm @@ -1,4 +1,4 @@ -SFX_Cry1A_1_Ch1: +SFX_Cry1A_1_Ch4: dutycycle 240 unknownsfx0x20 6, 247, 64, 7 unknownsfx0x20 12, 230, 68, 7 @@ -9,7 +9,7 @@ SFX_Cry1A_1_Ch1: endchannel -SFX_Cry1A_1_Ch2: +SFX_Cry1A_1_Ch5: dutycycle 10 unknownsfx0x20 6, 199, 1, 7 unknownsfx0x20 11, 182, 2, 7 @@ -20,7 +20,7 @@ SFX_Cry1A_1_Ch2: endchannel -SFX_Cry1A_1_Ch3: +SFX_Cry1A_1_Ch7: unknownnoise0x20 3, 226, 60 unknownnoise0x20 8, 214, 76 unknownnoise0x20 5, 212, 60 diff --git a/audio/sfx/cry1a_2.asm b/audio/sfx/cry1a_2.asm index da54ff6e..4dcf2a42 100644 --- a/audio/sfx/cry1a_2.asm +++ b/audio/sfx/cry1a_2.asm @@ -1,4 +1,4 @@ -SFX_Cry1A_2_Ch1: +SFX_Cry1A_2_Ch4: dutycycle 240 unknownsfx0x20 6, 247, 64, 7 unknownsfx0x20 12, 230, 68, 7 @@ -9,7 +9,7 @@ SFX_Cry1A_2_Ch1: endchannel -SFX_Cry1A_2_Ch2: +SFX_Cry1A_2_Ch5: dutycycle 10 unknownsfx0x20 6, 199, 1, 7 unknownsfx0x20 11, 182, 2, 7 @@ -20,7 +20,7 @@ SFX_Cry1A_2_Ch2: endchannel -SFX_Cry1A_2_Ch3: +SFX_Cry1A_2_Ch7: unknownnoise0x20 3, 226, 60 unknownnoise0x20 8, 214, 76 unknownnoise0x20 5, 212, 60 diff --git a/audio/sfx/cry1a_3.asm b/audio/sfx/cry1a_3.asm index d16cf035..274ce438 100644 --- a/audio/sfx/cry1a_3.asm +++ b/audio/sfx/cry1a_3.asm @@ -1,4 +1,4 @@ -SFX_Cry1A_3_Ch1: +SFX_Cry1A_3_Ch4: dutycycle 240 unknownsfx0x20 6, 247, 64, 7 unknownsfx0x20 12, 230, 68, 7 @@ -9,7 +9,7 @@ SFX_Cry1A_3_Ch1: endchannel -SFX_Cry1A_3_Ch2: +SFX_Cry1A_3_Ch5: dutycycle 10 unknownsfx0x20 6, 199, 1, 7 unknownsfx0x20 11, 182, 2, 7 @@ -20,7 +20,7 @@ SFX_Cry1A_3_Ch2: endchannel -SFX_Cry1A_3_Ch3: +SFX_Cry1A_3_Ch7: unknownnoise0x20 3, 226, 60 unknownnoise0x20 8, 214, 76 unknownnoise0x20 5, 212, 60 diff --git a/audio/sfx/cry1b_1.asm b/audio/sfx/cry1b_1.asm index f6f03c98..562239c7 100644 --- a/audio/sfx/cry1b_1.asm +++ b/audio/sfx/cry1b_1.asm @@ -1,4 +1,4 @@ -SFX_Cry1B_1_Ch1: +SFX_Cry1B_1_Ch4: dutycycle 240 unknownsfx0x20 6, 247, 192, 6 unknownsfx0x20 15, 231, 0, 7 @@ -8,7 +8,7 @@ SFX_Cry1B_1_Ch1: endchannel -SFX_Cry1B_1_Ch2: +SFX_Cry1B_1_Ch5: dutycycle 10 unknownsfx0x20 7, 230, 129, 6 unknownsfx0x20 14, 213, 193, 6 @@ -18,7 +18,7 @@ SFX_Cry1B_1_Ch2: endchannel -SFX_Cry1B_1_Ch3: +SFX_Cry1B_1_Ch7: unknownnoise0x20 10, 166, 60 unknownnoise0x20 14, 148, 44 unknownnoise0x20 5, 163, 60 diff --git a/audio/sfx/cry1b_2.asm b/audio/sfx/cry1b_2.asm index fe96943d..45bb41a2 100644 --- a/audio/sfx/cry1b_2.asm +++ b/audio/sfx/cry1b_2.asm @@ -1,4 +1,4 @@ -SFX_Cry1B_2_Ch1: +SFX_Cry1B_2_Ch4: dutycycle 240 unknownsfx0x20 6, 247, 192, 6 unknownsfx0x20 15, 231, 0, 7 @@ -8,7 +8,7 @@ SFX_Cry1B_2_Ch1: endchannel -SFX_Cry1B_2_Ch2: +SFX_Cry1B_2_Ch5: dutycycle 10 unknownsfx0x20 7, 230, 129, 6 unknownsfx0x20 14, 213, 193, 6 @@ -18,7 +18,7 @@ SFX_Cry1B_2_Ch2: endchannel -SFX_Cry1B_2_Ch3: +SFX_Cry1B_2_Ch7: unknownnoise0x20 10, 166, 60 unknownnoise0x20 14, 148, 44 unknownnoise0x20 5, 163, 60 diff --git a/audio/sfx/cry1b_3.asm b/audio/sfx/cry1b_3.asm index 8a034b1e..e6e31b00 100644 --- a/audio/sfx/cry1b_3.asm +++ b/audio/sfx/cry1b_3.asm @@ -1,4 +1,4 @@ -SFX_Cry1B_3_Ch1: +SFX_Cry1B_3_Ch4: dutycycle 240 unknownsfx0x20 6, 247, 192, 6 unknownsfx0x20 15, 231, 0, 7 @@ -8,7 +8,7 @@ SFX_Cry1B_3_Ch1: endchannel -SFX_Cry1B_3_Ch2: +SFX_Cry1B_3_Ch5: dutycycle 10 unknownsfx0x20 7, 230, 129, 6 unknownsfx0x20 14, 213, 193, 6 @@ -18,7 +18,7 @@ SFX_Cry1B_3_Ch2: endchannel -SFX_Cry1B_3_Ch3: +SFX_Cry1B_3_Ch7: unknownnoise0x20 10, 166, 60 unknownnoise0x20 14, 148, 44 unknownnoise0x20 5, 163, 60 diff --git a/audio/sfx/cry1c_1.asm b/audio/sfx/cry1c_1.asm index 1561353e..332b7da8 100644 --- a/audio/sfx/cry1c_1.asm +++ b/audio/sfx/cry1c_1.asm @@ -1,4 +1,4 @@ -SFX_Cry1C_1_Ch1: +SFX_Cry1C_1_Ch4: dutycycle 245 unknownsfx0x20 7, 214, 225, 7 unknownsfx0x20 6, 198, 226, 7 @@ -11,7 +11,7 @@ SFX_Cry1C_1_Ch1: endchannel -SFX_Cry1C_1_Ch2: +SFX_Cry1C_1_Ch5: dutycycle 68 unknownsfx0x20 6, 195, 201, 7 unknownsfx0x20 6, 179, 199, 7 @@ -22,7 +22,7 @@ SFX_Cry1C_1_Ch2: endchannel -SFX_Cry1C_1_Ch3: +SFX_Cry1C_1_Ch7: unknownnoise0x20 13, 25, 124 unknownnoise0x20 13, 247, 140 unknownnoise0x20 12, 214, 124 diff --git a/audio/sfx/cry1c_2.asm b/audio/sfx/cry1c_2.asm index c589a24d..aee95be5 100644 --- a/audio/sfx/cry1c_2.asm +++ b/audio/sfx/cry1c_2.asm @@ -1,4 +1,4 @@ -SFX_Cry1C_2_Ch1: +SFX_Cry1C_2_Ch4: dutycycle 245 unknownsfx0x20 7, 214, 225, 7 unknownsfx0x20 6, 198, 226, 7 @@ -11,7 +11,7 @@ SFX_Cry1C_2_Ch1: endchannel -SFX_Cry1C_2_Ch2: +SFX_Cry1C_2_Ch5: dutycycle 68 unknownsfx0x20 6, 195, 201, 7 unknownsfx0x20 6, 179, 199, 7 @@ -22,7 +22,7 @@ SFX_Cry1C_2_Ch2: endchannel -SFX_Cry1C_2_Ch3: +SFX_Cry1C_2_Ch7: unknownnoise0x20 13, 25, 124 unknownnoise0x20 13, 247, 140 unknownnoise0x20 12, 214, 124 diff --git a/audio/sfx/cry1c_3.asm b/audio/sfx/cry1c_3.asm index 930e3368..13e687f6 100644 --- a/audio/sfx/cry1c_3.asm +++ b/audio/sfx/cry1c_3.asm @@ -1,4 +1,4 @@ -SFX_Cry1C_3_Ch1: +SFX_Cry1C_3_Ch4: dutycycle 245 unknownsfx0x20 7, 214, 225, 7 unknownsfx0x20 6, 198, 226, 7 @@ -11,7 +11,7 @@ SFX_Cry1C_3_Ch1: endchannel -SFX_Cry1C_3_Ch2: +SFX_Cry1C_3_Ch5: dutycycle 68 unknownsfx0x20 6, 195, 201, 7 unknownsfx0x20 6, 179, 199, 7 @@ -22,7 +22,7 @@ SFX_Cry1C_3_Ch2: endchannel -SFX_Cry1C_3_Ch3: +SFX_Cry1C_3_Ch7: unknownnoise0x20 13, 25, 124 unknownnoise0x20 13, 247, 140 unknownnoise0x20 12, 214, 124 diff --git a/audio/sfx/cry1d_1.asm b/audio/sfx/cry1d_1.asm index 6b8b3f79..4e7b6308 100644 --- a/audio/sfx/cry1d_1.asm +++ b/audio/sfx/cry1d_1.asm @@ -1,4 +1,4 @@ -SFX_Cry1D_1_Ch1: +SFX_Cry1D_1_Ch4: dutycycle 244 unknownsfx0x20 15, 240, 5, 7 unknownsfx0x20 10, 224, 0, 7 @@ -9,7 +9,7 @@ SFX_Cry1D_1_Ch1: endchannel -SFX_Cry1D_1_Ch2: +SFX_Cry1D_1_Ch5: dutycycle 34 unknownsfx0x20 15, 176, 195, 6 unknownsfx0x20 10, 160, 193, 6 @@ -20,7 +20,7 @@ SFX_Cry1D_1_Ch2: endchannel -SFX_Cry1D_1_Ch3: +SFX_Cry1D_1_Ch7: unknownnoise0x20 6, 230, 76 unknownnoise0x20 15, 214, 60 unknownnoise0x20 10, 197, 74 diff --git a/audio/sfx/cry1d_2.asm b/audio/sfx/cry1d_2.asm index 31fccb8d..9ee56bf8 100644 --- a/audio/sfx/cry1d_2.asm +++ b/audio/sfx/cry1d_2.asm @@ -1,4 +1,4 @@ -SFX_Cry1D_2_Ch1: +SFX_Cry1D_2_Ch4: dutycycle 244 unknownsfx0x20 15, 240, 5, 7 unknownsfx0x20 10, 224, 0, 7 @@ -9,7 +9,7 @@ SFX_Cry1D_2_Ch1: endchannel -SFX_Cry1D_2_Ch2: +SFX_Cry1D_2_Ch5: dutycycle 34 unknownsfx0x20 15, 176, 195, 6 unknownsfx0x20 10, 160, 193, 6 @@ -20,7 +20,7 @@ SFX_Cry1D_2_Ch2: endchannel -SFX_Cry1D_2_Ch3: +SFX_Cry1D_2_Ch7: unknownnoise0x20 6, 230, 76 unknownnoise0x20 15, 214, 60 unknownnoise0x20 10, 197, 74 diff --git a/audio/sfx/cry1d_3.asm b/audio/sfx/cry1d_3.asm index fbbe9ca5..e2e5fae3 100644 --- a/audio/sfx/cry1d_3.asm +++ b/audio/sfx/cry1d_3.asm @@ -1,4 +1,4 @@ -SFX_Cry1D_3_Ch1: +SFX_Cry1D_3_Ch4: dutycycle 244 unknownsfx0x20 15, 240, 5, 7 unknownsfx0x20 10, 224, 0, 7 @@ -9,7 +9,7 @@ SFX_Cry1D_3_Ch1: endchannel -SFX_Cry1D_3_Ch2: +SFX_Cry1D_3_Ch5: dutycycle 34 unknownsfx0x20 15, 176, 195, 6 unknownsfx0x20 10, 160, 193, 6 @@ -20,7 +20,7 @@ SFX_Cry1D_3_Ch2: endchannel -SFX_Cry1D_3_Ch3: +SFX_Cry1D_3_Ch7: unknownnoise0x20 6, 230, 76 unknownnoise0x20 15, 214, 60 unknownnoise0x20 10, 197, 74 diff --git a/audio/sfx/cry1e_1.asm b/audio/sfx/cry1e_1.asm index 9501a06a..56d97001 100644 --- a/audio/sfx/cry1e_1.asm +++ b/audio/sfx/cry1e_1.asm @@ -1,4 +1,4 @@ -SFX_Cry1E_1_Ch1: +SFX_Cry1E_1_Ch4: dutycycle 240 unknownsfx0x20 6, 242, 0, 6 unknownsfx0x20 6, 226, 64, 6 @@ -11,7 +11,7 @@ SFX_Cry1E_1_Ch1: endchannel -SFX_Cry1E_1_Ch2: +SFX_Cry1E_1_Ch5: dutycycle 17 unknownsfx0x20 3, 8, 1, 0 unknownsfx0x20 6, 194, 193, 5 @@ -25,7 +25,7 @@ SFX_Cry1E_1_Ch2: endchannel -SFX_Cry1E_1_Ch3: +SFX_Cry1E_1_Ch7: unknownnoise0x20 6, 8, 1 unknownnoise0x20 5, 226, 92 unknownnoise0x20 5, 194, 76 diff --git a/audio/sfx/cry1e_2.asm b/audio/sfx/cry1e_2.asm index fe112101..7ed25afe 100644 --- a/audio/sfx/cry1e_2.asm +++ b/audio/sfx/cry1e_2.asm @@ -1,4 +1,4 @@ -SFX_Cry1E_2_Ch1: +SFX_Cry1E_2_Ch4: dutycycle 240 unknownsfx0x20 6, 242, 0, 6 unknownsfx0x20 6, 226, 64, 6 @@ -11,7 +11,7 @@ SFX_Cry1E_2_Ch1: endchannel -SFX_Cry1E_2_Ch2: +SFX_Cry1E_2_Ch5: dutycycle 17 unknownsfx0x20 3, 8, 1, 0 unknownsfx0x20 6, 194, 193, 5 @@ -25,7 +25,7 @@ SFX_Cry1E_2_Ch2: endchannel -SFX_Cry1E_2_Ch3: +SFX_Cry1E_2_Ch7: unknownnoise0x20 6, 8, 1 unknownnoise0x20 5, 226, 92 unknownnoise0x20 5, 194, 76 diff --git a/audio/sfx/cry1e_3.asm b/audio/sfx/cry1e_3.asm index f5bdbe08..82dbdfcc 100644 --- a/audio/sfx/cry1e_3.asm +++ b/audio/sfx/cry1e_3.asm @@ -1,4 +1,4 @@ -SFX_Cry1E_3_Ch1: +SFX_Cry1E_3_Ch4: dutycycle 240 unknownsfx0x20 6, 242, 0, 6 unknownsfx0x20 6, 226, 64, 6 @@ -11,7 +11,7 @@ SFX_Cry1E_3_Ch1: endchannel -SFX_Cry1E_3_Ch2: +SFX_Cry1E_3_Ch5: dutycycle 17 unknownsfx0x20 3, 8, 1, 0 unknownsfx0x20 6, 194, 193, 5 @@ -25,7 +25,7 @@ SFX_Cry1E_3_Ch2: endchannel -SFX_Cry1E_3_Ch3: +SFX_Cry1E_3_Ch7: unknownnoise0x20 6, 8, 1 unknownnoise0x20 5, 226, 92 unknownnoise0x20 5, 194, 76 diff --git a/audio/sfx/cry1f_1.asm b/audio/sfx/cry1f_1.asm index 28b91c61..a38bd975 100644 --- a/audio/sfx/cry1f_1.asm +++ b/audio/sfx/cry1f_1.asm @@ -1,4 +1,4 @@ -SFX_Cry1F_1_Ch1: +SFX_Cry1F_1_Ch4: dutycycle 165 unknownsfx0x20 3, 244, 65, 6 unknownsfx0x20 13, 214, 33, 7 @@ -7,7 +7,7 @@ SFX_Cry1F_1_Ch1: endchannel -SFX_Cry1F_1_Ch2: +SFX_Cry1F_1_Ch5: dutycycle 204 unknownsfx0x20 4, 244, 128, 5 unknownsfx0x20 14, 230, 224, 6 @@ -16,7 +16,7 @@ SFX_Cry1F_1_Ch2: endchannel -SFX_Cry1F_1_Ch3: +SFX_Cry1F_1_Ch7: unknownnoise0x20 5, 196, 70 unknownnoise0x20 13, 165, 68 unknownnoise0x20 8, 196, 69 diff --git a/audio/sfx/cry1f_2.asm b/audio/sfx/cry1f_2.asm index 9691654f..3d261bb2 100644 --- a/audio/sfx/cry1f_2.asm +++ b/audio/sfx/cry1f_2.asm @@ -1,4 +1,4 @@ -SFX_Cry1F_2_Ch1: +SFX_Cry1F_2_Ch4: dutycycle 165 unknownsfx0x20 3, 244, 65, 6 unknownsfx0x20 13, 214, 33, 7 @@ -7,7 +7,7 @@ SFX_Cry1F_2_Ch1: endchannel -SFX_Cry1F_2_Ch2: +SFX_Cry1F_2_Ch5: dutycycle 204 unknownsfx0x20 4, 244, 128, 5 unknownsfx0x20 14, 230, 224, 6 @@ -16,7 +16,7 @@ SFX_Cry1F_2_Ch2: endchannel -SFX_Cry1F_2_Ch3: +SFX_Cry1F_2_Ch7: unknownnoise0x20 5, 196, 70 unknownnoise0x20 13, 165, 68 unknownnoise0x20 8, 196, 69 diff --git a/audio/sfx/cry1f_3.asm b/audio/sfx/cry1f_3.asm index 3c50327b..2bdfe24b 100644 --- a/audio/sfx/cry1f_3.asm +++ b/audio/sfx/cry1f_3.asm @@ -1,4 +1,4 @@ -SFX_Cry1F_3_Ch1: +SFX_Cry1F_3_Ch4: dutycycle 165 unknownsfx0x20 3, 244, 65, 6 unknownsfx0x20 13, 214, 33, 7 @@ -7,7 +7,7 @@ SFX_Cry1F_3_Ch1: endchannel -SFX_Cry1F_3_Ch2: +SFX_Cry1F_3_Ch5: dutycycle 204 unknownsfx0x20 4, 244, 128, 5 unknownsfx0x20 14, 230, 224, 6 @@ -16,7 +16,7 @@ SFX_Cry1F_3_Ch2: endchannel -SFX_Cry1F_3_Ch3: +SFX_Cry1F_3_Ch7: unknownnoise0x20 5, 196, 70 unknownnoise0x20 13, 165, 68 unknownnoise0x20 8, 196, 69 diff --git a/audio/sfx/cry20_1.asm b/audio/sfx/cry20_1.asm index 0e9ffb00..14ec6942 100644 --- a/audio/sfx/cry20_1.asm +++ b/audio/sfx/cry20_1.asm @@ -1,4 +1,4 @@ -SFX_Cry20_1_Ch1: +SFX_Cry20_1_Ch4: dutycycle 240 unknownsfx0x20 13, 241, 17, 5 unknownsfx0x20 13, 225, 21, 5 @@ -7,7 +7,7 @@ SFX_Cry20_1_Ch1: endchannel -SFX_Cry20_1_Ch2: +SFX_Cry20_1_Ch5: dutycycle 21 unknownsfx0x20 12, 225, 12, 5 unknownsfx0x20 12, 209, 16, 5 @@ -16,7 +16,7 @@ SFX_Cry20_1_Ch2: endchannel -SFX_Cry20_1_Ch3: +SFX_Cry20_1_Ch7: unknownnoise0x20 14, 242, 101 unknownnoise0x20 13, 226, 85 unknownnoise0x20 14, 210, 86 diff --git a/audio/sfx/cry20_2.asm b/audio/sfx/cry20_2.asm index 91891b4f..bcbf27a6 100644 --- a/audio/sfx/cry20_2.asm +++ b/audio/sfx/cry20_2.asm @@ -1,4 +1,4 @@ -SFX_Cry20_2_Ch1: +SFX_Cry20_2_Ch4: dutycycle 240 unknownsfx0x20 13, 241, 17, 5 unknownsfx0x20 13, 225, 21, 5 @@ -7,7 +7,7 @@ SFX_Cry20_2_Ch1: endchannel -SFX_Cry20_2_Ch2: +SFX_Cry20_2_Ch5: dutycycle 21 unknownsfx0x20 12, 225, 12, 5 unknownsfx0x20 12, 209, 16, 5 @@ -16,7 +16,7 @@ SFX_Cry20_2_Ch2: endchannel -SFX_Cry20_2_Ch3: +SFX_Cry20_2_Ch7: unknownnoise0x20 14, 242, 101 unknownnoise0x20 13, 226, 85 unknownnoise0x20 14, 210, 86 diff --git a/audio/sfx/cry20_3.asm b/audio/sfx/cry20_3.asm index 1fae1bb3..12e42d7f 100644 --- a/audio/sfx/cry20_3.asm +++ b/audio/sfx/cry20_3.asm @@ -1,4 +1,4 @@ -SFX_Cry20_3_Ch1: +SFX_Cry20_3_Ch4: dutycycle 240 unknownsfx0x20 13, 241, 17, 5 unknownsfx0x20 13, 225, 21, 5 @@ -7,7 +7,7 @@ SFX_Cry20_3_Ch1: endchannel -SFX_Cry20_3_Ch2: +SFX_Cry20_3_Ch5: dutycycle 21 unknownsfx0x20 12, 225, 12, 5 unknownsfx0x20 12, 209, 16, 5 @@ -16,7 +16,7 @@ SFX_Cry20_3_Ch2: endchannel -SFX_Cry20_3_Ch3: +SFX_Cry20_3_Ch7: unknownnoise0x20 14, 242, 101 unknownnoise0x20 13, 226, 85 unknownnoise0x20 14, 210, 86 diff --git a/audio/sfx/cry21_1.asm b/audio/sfx/cry21_1.asm index 17d1e16c..c08704d7 100644 --- a/audio/sfx/cry21_1.asm +++ b/audio/sfx/cry21_1.asm @@ -1,4 +1,4 @@ -SFX_Cry21_1_Ch1: +SFX_Cry21_1_Ch4: dutycycle 27 unknownsfx0x20 3, 243, 100, 5 unknownsfx0x20 2, 226, 68, 5 @@ -11,7 +11,7 @@ SFX_Cry21_1_Ch1: endchannel -SFX_Cry21_1_Ch2: +SFX_Cry21_1_Ch5: dutycycle 204 unknownsfx0x20 3, 211, 96, 5 unknownsfx0x20 2, 194, 64, 5 @@ -23,5 +23,5 @@ SFX_Cry21_1_Ch2: unknownsfx0x20 8, 193, 0, 5 -SFX_Cry21_1_Ch3: +SFX_Cry21_1_Ch7: endchannel diff --git a/audio/sfx/cry21_2.asm b/audio/sfx/cry21_2.asm index 14856fc9..b8f68dbd 100644 --- a/audio/sfx/cry21_2.asm +++ b/audio/sfx/cry21_2.asm @@ -1,4 +1,4 @@ -SFX_Cry21_2_Ch1: +SFX_Cry21_2_Ch4: dutycycle 27 unknownsfx0x20 3, 243, 100, 5 unknownsfx0x20 2, 226, 68, 5 @@ -11,7 +11,7 @@ SFX_Cry21_2_Ch1: endchannel -SFX_Cry21_2_Ch2: +SFX_Cry21_2_Ch5: dutycycle 204 unknownsfx0x20 3, 211, 96, 5 unknownsfx0x20 2, 194, 64, 5 @@ -23,5 +23,5 @@ SFX_Cry21_2_Ch2: unknownsfx0x20 8, 193, 0, 5 -SFX_Cry21_2_Ch3: +SFX_Cry21_2_Ch7: endchannel diff --git a/audio/sfx/cry21_3.asm b/audio/sfx/cry21_3.asm index 40cbf7f2..4a549af9 100644 --- a/audio/sfx/cry21_3.asm +++ b/audio/sfx/cry21_3.asm @@ -1,4 +1,4 @@ -SFX_Cry21_3_Ch1: +SFX_Cry21_3_Ch4: dutycycle 27 unknownsfx0x20 3, 243, 100, 5 unknownsfx0x20 2, 226, 68, 5 @@ -11,7 +11,7 @@ SFX_Cry21_3_Ch1: endchannel -SFX_Cry21_3_Ch2: +SFX_Cry21_3_Ch5: dutycycle 204 unknownsfx0x20 3, 211, 96, 5 unknownsfx0x20 2, 194, 64, 5 @@ -23,5 +23,5 @@ SFX_Cry21_3_Ch2: unknownsfx0x20 8, 193, 0, 5 -SFX_Cry21_3_Ch3: +SFX_Cry21_3_Ch7: endchannel diff --git a/audio/sfx/cry22_1.asm b/audio/sfx/cry22_1.asm index fb0c6b23..0da8dbd2 100644 --- a/audio/sfx/cry22_1.asm +++ b/audio/sfx/cry22_1.asm @@ -1,4 +1,4 @@ -SFX_Cry22_1_Ch1: +SFX_Cry22_1_Ch4: dutycycle 17 unknownsfx0x20 2, 61, 129, 3 unknownsfx0x20 7, 245, 1, 6 @@ -7,7 +7,7 @@ SFX_Cry22_1_Ch1: endchannel -SFX_Cry22_1_Ch2: +SFX_Cry22_1_Ch5: dutycycle 238 unknownsfx0x20 2, 62, 176, 5 unknownsfx0x20 7, 213, 93, 7 @@ -16,7 +16,7 @@ SFX_Cry22_1_Ch2: endchannel -SFX_Cry22_1_Ch3: +SFX_Cry22_1_Ch7: unknownnoise0x20 2, 146, 73 unknownnoise0x20 7, 181, 41 unknownnoise0x20 1, 162, 57 diff --git a/audio/sfx/cry22_2.asm b/audio/sfx/cry22_2.asm index 7653234e..d7456dbc 100644 --- a/audio/sfx/cry22_2.asm +++ b/audio/sfx/cry22_2.asm @@ -1,4 +1,4 @@ -SFX_Cry22_2_Ch1: +SFX_Cry22_2_Ch4: dutycycle 17 unknownsfx0x20 2, 61, 129, 3 unknownsfx0x20 7, 245, 1, 6 @@ -7,7 +7,7 @@ SFX_Cry22_2_Ch1: endchannel -SFX_Cry22_2_Ch2: +SFX_Cry22_2_Ch5: dutycycle 238 unknownsfx0x20 2, 62, 176, 5 unknownsfx0x20 7, 213, 93, 7 @@ -16,7 +16,7 @@ SFX_Cry22_2_Ch2: endchannel -SFX_Cry22_2_Ch3: +SFX_Cry22_2_Ch7: unknownnoise0x20 2, 146, 73 unknownnoise0x20 7, 181, 41 unknownnoise0x20 1, 162, 57 diff --git a/audio/sfx/cry22_3.asm b/audio/sfx/cry22_3.asm index 96fae832..927c174c 100644 --- a/audio/sfx/cry22_3.asm +++ b/audio/sfx/cry22_3.asm @@ -1,4 +1,4 @@ -SFX_Cry22_3_Ch1: +SFX_Cry22_3_Ch4: dutycycle 17 unknownsfx0x20 2, 61, 129, 3 unknownsfx0x20 7, 245, 1, 6 @@ -7,7 +7,7 @@ SFX_Cry22_3_Ch1: endchannel -SFX_Cry22_3_Ch2: +SFX_Cry22_3_Ch5: dutycycle 238 unknownsfx0x20 2, 62, 176, 5 unknownsfx0x20 7, 213, 93, 7 @@ -16,7 +16,7 @@ SFX_Cry22_3_Ch2: endchannel -SFX_Cry22_3_Ch3: +SFX_Cry22_3_Ch7: unknownnoise0x20 2, 146, 73 unknownnoise0x20 7, 181, 41 unknownnoise0x20 1, 162, 57 diff --git a/audio/sfx/cry23_1.asm b/audio/sfx/cry23_1.asm index 4aaa3bfa..cc0587d7 100644 --- a/audio/sfx/cry23_1.asm +++ b/audio/sfx/cry23_1.asm @@ -1,4 +1,4 @@ -SFX_Cry23_1_Ch1: +SFX_Cry23_1_Ch4: dutycycle 240 unknownsfx0x20 15, 247, 192, 7 unknownsfx0x20 6, 228, 193, 7 @@ -8,7 +8,7 @@ SFX_Cry23_1_Ch1: endchannel -SFX_Cry23_1_Ch2: +SFX_Cry23_1_Ch5: dutycycle 95 unknownsfx0x20 15, 151, 129, 7 unknownsfx0x20 6, 132, 128, 7 @@ -17,7 +17,7 @@ SFX_Cry23_1_Ch2: endchannel -SFX_Cry23_1_Ch3: +SFX_Cry23_1_Ch7: unknownnoise0x20 3, 242, 60 unknownnoise0x20 13, 230, 44 unknownnoise0x20 15, 215, 60 diff --git a/audio/sfx/cry23_2.asm b/audio/sfx/cry23_2.asm index 644b14cf..5d130aa5 100644 --- a/audio/sfx/cry23_2.asm +++ b/audio/sfx/cry23_2.asm @@ -1,4 +1,4 @@ -SFX_Cry23_2_Ch1: +SFX_Cry23_2_Ch4: dutycycle 240 unknownsfx0x20 15, 247, 192, 7 unknownsfx0x20 6, 228, 193, 7 @@ -8,7 +8,7 @@ SFX_Cry23_2_Ch1: endchannel -SFX_Cry23_2_Ch2: +SFX_Cry23_2_Ch5: dutycycle 95 unknownsfx0x20 15, 151, 129, 7 unknownsfx0x20 6, 132, 128, 7 @@ -17,7 +17,7 @@ SFX_Cry23_2_Ch2: endchannel -SFX_Cry23_2_Ch3: +SFX_Cry23_2_Ch7: unknownnoise0x20 3, 242, 60 unknownnoise0x20 13, 230, 44 unknownnoise0x20 15, 215, 60 diff --git a/audio/sfx/cry23_3.asm b/audio/sfx/cry23_3.asm index d86dfcd4..8ada0c63 100644 --- a/audio/sfx/cry23_3.asm +++ b/audio/sfx/cry23_3.asm @@ -1,4 +1,4 @@ -SFX_Cry23_3_Ch1: +SFX_Cry23_3_Ch4: dutycycle 240 unknownsfx0x20 15, 247, 192, 7 unknownsfx0x20 6, 228, 193, 7 @@ -8,7 +8,7 @@ SFX_Cry23_3_Ch1: endchannel -SFX_Cry23_3_Ch2: +SFX_Cry23_3_Ch5: dutycycle 95 unknownsfx0x20 15, 151, 129, 7 unknownsfx0x20 6, 132, 128, 7 @@ -17,7 +17,7 @@ SFX_Cry23_3_Ch2: endchannel -SFX_Cry23_3_Ch3: +SFX_Cry23_3_Ch7: unknownnoise0x20 3, 242, 60 unknownnoise0x20 13, 230, 44 unknownnoise0x20 15, 215, 60 diff --git a/audio/sfx/cry24_1.asm b/audio/sfx/cry24_1.asm index a94803c1..f79dc72c 100644 --- a/audio/sfx/cry24_1.asm +++ b/audio/sfx/cry24_1.asm @@ -1,4 +1,4 @@ -SFX_Cry24_1_Ch1: +SFX_Cry24_1_Ch4: dutycycle 240 unknownsfx0x20 15, 247, 128, 6 unknownsfx0x20 10, 230, 132, 6 @@ -11,7 +11,7 @@ SFX_Cry24_1_Ch1: endchannel -SFX_Cry24_1_Ch2: +SFX_Cry24_1_Ch5: dutycycle 5 unknownsfx0x20 15, 183, 65, 6 unknownsfx0x20 10, 150, 66, 6 @@ -24,7 +24,7 @@ SFX_Cry24_1_Ch2: endchannel -SFX_Cry24_1_Ch3: +SFX_Cry24_1_Ch7: unknownnoise0x20 15, 228, 60 unknownnoise0x20 10, 199, 76 unknownnoise0x20 10, 199, 60 diff --git a/audio/sfx/cry24_2.asm b/audio/sfx/cry24_2.asm index cc8b2f87..aede2b95 100644 --- a/audio/sfx/cry24_2.asm +++ b/audio/sfx/cry24_2.asm @@ -1,4 +1,4 @@ -SFX_Cry24_2_Ch1: +SFX_Cry24_2_Ch4: dutycycle 240 unknownsfx0x20 15, 247, 128, 6 unknownsfx0x20 10, 230, 132, 6 @@ -11,7 +11,7 @@ SFX_Cry24_2_Ch1: endchannel -SFX_Cry24_2_Ch2: +SFX_Cry24_2_Ch5: dutycycle 5 unknownsfx0x20 15, 183, 65, 6 unknownsfx0x20 10, 150, 66, 6 @@ -24,7 +24,7 @@ SFX_Cry24_2_Ch2: endchannel -SFX_Cry24_2_Ch3: +SFX_Cry24_2_Ch7: unknownnoise0x20 15, 228, 60 unknownnoise0x20 10, 199, 76 unknownnoise0x20 10, 199, 60 diff --git a/audio/sfx/cry24_3.asm b/audio/sfx/cry24_3.asm index 37926146..cad3ada1 100644 --- a/audio/sfx/cry24_3.asm +++ b/audio/sfx/cry24_3.asm @@ -1,4 +1,4 @@ -SFX_Cry24_3_Ch1: +SFX_Cry24_3_Ch4: dutycycle 240 unknownsfx0x20 15, 247, 128, 6 unknownsfx0x20 10, 230, 132, 6 @@ -11,7 +11,7 @@ SFX_Cry24_3_Ch1: endchannel -SFX_Cry24_3_Ch2: +SFX_Cry24_3_Ch5: dutycycle 5 unknownsfx0x20 15, 183, 65, 6 unknownsfx0x20 10, 150, 66, 6 @@ -24,7 +24,7 @@ SFX_Cry24_3_Ch2: endchannel -SFX_Cry24_3_Ch3: +SFX_Cry24_3_Ch7: unknownnoise0x20 15, 228, 60 unknownnoise0x20 10, 199, 76 unknownnoise0x20 10, 199, 60 diff --git a/audio/sfx/cry25_1.asm b/audio/sfx/cry25_1.asm index d54b8d6c..f3ae46ae 100644 --- a/audio/sfx/cry25_1.asm +++ b/audio/sfx/cry25_1.asm @@ -1,4 +1,4 @@ -SFX_Cry25_1_Ch1: +SFX_Cry25_1_Ch4: dutycycle 165 unknownsfx0x20 6, 244, 64, 7 unknownsfx0x20 15, 227, 48, 7 @@ -8,7 +8,7 @@ SFX_Cry25_1_Ch1: endchannel -SFX_Cry25_1_Ch2: +SFX_Cry25_1_Ch5: dutycycle 119 unknownsfx0x20 6, 195, 18, 7 unknownsfx0x20 15, 179, 4, 7 @@ -18,7 +18,7 @@ SFX_Cry25_1_Ch2: endchannel -SFX_Cry25_1_Ch3: +SFX_Cry25_1_Ch7: unknownnoise0x20 8, 214, 44 unknownnoise0x20 12, 198, 60 unknownnoise0x20 10, 182, 44 diff --git a/audio/sfx/cry25_2.asm b/audio/sfx/cry25_2.asm index 48e4d057..9b976b4e 100644 --- a/audio/sfx/cry25_2.asm +++ b/audio/sfx/cry25_2.asm @@ -1,4 +1,4 @@ -SFX_Cry25_2_Ch1: +SFX_Cry25_2_Ch4: dutycycle 165 unknownsfx0x20 6, 244, 64, 7 unknownsfx0x20 15, 227, 48, 7 @@ -8,7 +8,7 @@ SFX_Cry25_2_Ch1: endchannel -SFX_Cry25_2_Ch2: +SFX_Cry25_2_Ch5: dutycycle 119 unknownsfx0x20 6, 195, 18, 7 unknownsfx0x20 15, 179, 4, 7 @@ -18,7 +18,7 @@ SFX_Cry25_2_Ch2: endchannel -SFX_Cry25_2_Ch3: +SFX_Cry25_2_Ch7: unknownnoise0x20 8, 214, 44 unknownnoise0x20 12, 198, 60 unknownnoise0x20 10, 182, 44 diff --git a/audio/sfx/cry25_3.asm b/audio/sfx/cry25_3.asm index f08c6a00..e76feb9e 100644 --- a/audio/sfx/cry25_3.asm +++ b/audio/sfx/cry25_3.asm @@ -1,4 +1,4 @@ -SFX_Cry25_3_Ch1: +SFX_Cry25_3_Ch4: dutycycle 165 unknownsfx0x20 6, 244, 64, 7 unknownsfx0x20 15, 227, 48, 7 @@ -8,7 +8,7 @@ SFX_Cry25_3_Ch1: endchannel -SFX_Cry25_3_Ch2: +SFX_Cry25_3_Ch5: dutycycle 119 unknownsfx0x20 6, 195, 18, 7 unknownsfx0x20 15, 179, 4, 7 @@ -18,7 +18,7 @@ SFX_Cry25_3_Ch2: endchannel -SFX_Cry25_3_Ch3: +SFX_Cry25_3_Ch7: unknownnoise0x20 8, 214, 44 unknownnoise0x20 12, 198, 60 unknownnoise0x20 10, 182, 44 diff --git a/audio/sfx/cut_1.asm b/audio/sfx/cut_1.asm index a42cd660..73510fd7 100644 --- a/audio/sfx/cut_1.asm +++ b/audio/sfx/cut_1.asm @@ -1,4 +1,4 @@ -SFX_Cut_1_Ch1: +SFX_Cut_1_Ch7: unknownnoise0x20 2, 247, 36 unknownnoise0x20 2, 247, 52 unknownnoise0x20 4, 247, 68 diff --git a/audio/sfx/cut_3.asm b/audio/sfx/cut_3.asm index 12c2366e..6e7d8951 100644 --- a/audio/sfx/cut_3.asm +++ b/audio/sfx/cut_3.asm @@ -1,4 +1,4 @@ -SFX_Cut_3_Ch1: +SFX_Cut_3_Ch7: unknownnoise0x20 2, 247, 36 unknownnoise0x20 2, 247, 52 unknownnoise0x20 4, 247, 68 diff --git a/audio/sfx/cymbal1_1.asm b/audio/sfx/cymbal1_1.asm index 3f3c6d8b..35cae4df 100644 --- a/audio/sfx/cymbal1_1.asm +++ b/audio/sfx/cymbal1_1.asm @@ -1,3 +1,3 @@ -SFX_Cymbal1_1_Ch1: +SFX_Cymbal1_1_Ch7: unknownnoise0x20 0, 161, 16 endchannel diff --git a/audio/sfx/cymbal1_2.asm b/audio/sfx/cymbal1_2.asm index bb1e3e3e..bffe7690 100644 --- a/audio/sfx/cymbal1_2.asm +++ b/audio/sfx/cymbal1_2.asm @@ -1,3 +1,3 @@ -SFX_Cymbal1_2_Ch1: +SFX_Cymbal1_2_Ch7: unknownnoise0x20 0, 161, 16 endchannel diff --git a/audio/sfx/cymbal1_3.asm b/audio/sfx/cymbal1_3.asm index 9587977f..0f03f455 100644 --- a/audio/sfx/cymbal1_3.asm +++ b/audio/sfx/cymbal1_3.asm @@ -1,3 +1,3 @@ -SFX_Cymbal1_3_Ch1: +SFX_Cymbal1_3_Ch7: unknownnoise0x20 0, 161, 16 endchannel diff --git a/audio/sfx/cymbal2_1.asm b/audio/sfx/cymbal2_1.asm index 2ec3fc86..ce19bb6b 100644 --- a/audio/sfx/cymbal2_1.asm +++ b/audio/sfx/cymbal2_1.asm @@ -1,3 +1,3 @@ -SFX_Cymbal2_1_Ch1: +SFX_Cymbal2_1_Ch7: unknownnoise0x20 0, 162, 17 endchannel diff --git a/audio/sfx/cymbal2_2.asm b/audio/sfx/cymbal2_2.asm index 8b27a0de..f45dec5b 100644 --- a/audio/sfx/cymbal2_2.asm +++ b/audio/sfx/cymbal2_2.asm @@ -1,3 +1,3 @@ -SFX_Cymbal2_2_Ch1: +SFX_Cymbal2_2_Ch7: unknownnoise0x20 0, 162, 17 endchannel diff --git a/audio/sfx/cymbal2_3.asm b/audio/sfx/cymbal2_3.asm index 642a336a..2d2ebf1c 100644 --- a/audio/sfx/cymbal2_3.asm +++ b/audio/sfx/cymbal2_3.asm @@ -1,3 +1,3 @@ -SFX_Cymbal2_3_Ch1: +SFX_Cymbal2_3_Ch7: unknownnoise0x20 0, 162, 17 endchannel diff --git a/audio/sfx/cymbal3_1.asm b/audio/sfx/cymbal3_1.asm index 3fd225e2..98f3977d 100644 --- a/audio/sfx/cymbal3_1.asm +++ b/audio/sfx/cymbal3_1.asm @@ -1,3 +1,3 @@ -SFX_Cymbal3_1_Ch1: +SFX_Cymbal3_1_Ch7: unknownnoise0x20 0, 162, 80 endchannel diff --git a/audio/sfx/cymbal3_2.asm b/audio/sfx/cymbal3_2.asm index 1435b5ed..2a2cb997 100644 --- a/audio/sfx/cymbal3_2.asm +++ b/audio/sfx/cymbal3_2.asm @@ -1,3 +1,3 @@ -SFX_Cymbal3_2_Ch1: +SFX_Cymbal3_2_Ch7: unknownnoise0x20 0, 162, 80 endchannel diff --git a/audio/sfx/cymbal3_3.asm b/audio/sfx/cymbal3_3.asm index b45fb03d..60b96278 100644 --- a/audio/sfx/cymbal3_3.asm +++ b/audio/sfx/cymbal3_3.asm @@ -1,3 +1,3 @@ -SFX_Cymbal3_3_Ch1: +SFX_Cymbal3_3_Ch7: unknownnoise0x20 0, 162, 80 endchannel diff --git a/audio/sfx/damage.asm b/audio/sfx/damage.asm index ea2727d8..452fd5ed 100644 --- a/audio/sfx/damage.asm +++ b/audio/sfx/damage.asm @@ -1,4 +1,4 @@ -SFX_Damage_Ch1: +SFX_Damage_Ch7: unknownnoise0x20 2, 244, 68 unknownnoise0x20 2, 244, 20 unknownnoise0x20 15, 241, 50 diff --git a/audio/sfx/denied_1.asm b/audio/sfx/denied_1.asm index d954308a..e7d5a8ca 100644 --- a/audio/sfx/denied_1.asm +++ b/audio/sfx/denied_1.asm @@ -1,4 +1,4 @@ -SFX_Denied_1_Ch1: +SFX_Denied_1_Ch4: duty 3 unknownsfx0x10 90 unknownsfx0x20 4, 240, 0, 5 @@ -9,7 +9,7 @@ SFX_Denied_1_Ch1: endchannel -SFX_Denied_1_Ch2: +SFX_Denied_1_Ch5: duty 3 unknownsfx0x20 4, 240, 1, 4 unknownsfx0x20 4, 0, 0, 0 diff --git a/audio/sfx/denied_3.asm b/audio/sfx/denied_3.asm index ca82a739..cf3b2a20 100644 --- a/audio/sfx/denied_3.asm +++ b/audio/sfx/denied_3.asm @@ -1,4 +1,4 @@ -SFX_Denied_3_Ch1: +SFX_Denied_3_Ch4: duty 3 unknownsfx0x10 90 unknownsfx0x20 4, 240, 0, 5 @@ -9,7 +9,7 @@ SFX_Denied_3_Ch1: endchannel -SFX_Denied_3_Ch2: +SFX_Denied_3_Ch5: duty 3 unknownsfx0x20 4, 240, 1, 4 unknownsfx0x20 4, 0, 0, 0 diff --git a/audio/sfx/dex_page_added.asm b/audio/sfx/dex_page_added.asm index 6e3a0dcf..08180071 100644 --- a/audio/sfx/dex_page_added.asm +++ b/audio/sfx/dex_page_added.asm @@ -1,4 +1,4 @@ -SFX_Dex_Page_Added_Ch1: +SFX_Dex_Page_Added_Ch4: duty 2 unknownsfx0x10 68 unknownsfx0x20 15, 240, 240, 4 @@ -8,7 +8,7 @@ SFX_Dex_Page_Added_Ch1: endchannel -SFX_Dex_Page_Added_Ch2: +SFX_Dex_Page_Added_Ch5: duty 2 unknownsfx0x20 15, 146, 0, 6 unknownsfx0x20 15, 146, 130, 7 diff --git a/audio/sfx/doubleslap.asm b/audio/sfx/doubleslap.asm index 5cae0a4b..4e71ac36 100644 --- a/audio/sfx/doubleslap.asm +++ b/audio/sfx/doubleslap.asm @@ -1,4 +1,4 @@ -SFX_Doubleslap_Ch1: +SFX_Doubleslap_Ch7: unknownnoise0x20 8, 241, 50 unknownnoise0x20 8, 241, 51 endchannel diff --git a/audio/sfx/enter_pc_1.asm b/audio/sfx/enter_pc_1.asm index b2450ced..338c32ab 100644 --- a/audio/sfx/enter_pc_1.asm +++ b/audio/sfx/enter_pc_1.asm @@ -1,4 +1,4 @@ -SFX_Enter_PC_1_Ch1: +SFX_Enter_PC_1_Ch4: duty 2 unknownsfx0x20 6, 240, 0, 7 unknownsfx0x20 4, 0, 0, 0 diff --git a/audio/sfx/enter_pc_3.asm b/audio/sfx/enter_pc_3.asm index 061068ce..f34ed9d0 100644 --- a/audio/sfx/enter_pc_3.asm +++ b/audio/sfx/enter_pc_3.asm @@ -1,4 +1,4 @@ -SFX_Enter_PC_3_Ch1: +SFX_Enter_PC_3_Ch4: duty 2 unknownsfx0x20 4, 240, 0, 7 unknownsfx0x20 4, 0, 0, 0 diff --git a/audio/sfx/faint_fall.asm b/audio/sfx/faint_fall.asm index cd1b2cdc..cd403485 100644 --- a/audio/sfx/faint_fall.asm +++ b/audio/sfx/faint_fall.asm @@ -1,4 +1,4 @@ -SFX_Faint_Fall_Ch1: +SFX_Faint_Fall_Ch4: duty 1 unknownsfx0x10 175 unknownsfx0x20 15, 242, 128, 7 diff --git a/audio/sfx/faint_thud.asm b/audio/sfx/faint_thud.asm index 7b6ec0a0..479efab3 100644 --- a/audio/sfx/faint_thud.asm +++ b/audio/sfx/faint_thud.asm @@ -1,10 +1,10 @@ -SFX_Faint_Thud_Ch1: +SFX_Faint_Thud_Ch4: unknownsfx0x20 15, 209, 0, 2 unknownsfx0x10 8 endchannel -SFX_Faint_Thud_Ch2: +SFX_Faint_Thud_Ch7: unknownnoise0x20 4, 245, 51 unknownnoise0x20 8, 244, 34 unknownnoise0x20 15, 242, 33 diff --git a/audio/sfx/fly_1.asm b/audio/sfx/fly_1.asm index 2b487bc2..ededef48 100644 --- a/audio/sfx/fly_1.asm +++ b/audio/sfx/fly_1.asm @@ -1,4 +1,4 @@ -SFX_Fly_1_Ch1: +SFX_Fly_1_Ch7: unknownnoise0x20 2, 241, 18 unknownnoise0x20 2, 0, 0 unknownnoise0x20 2, 161, 18 diff --git a/audio/sfx/fly_3.asm b/audio/sfx/fly_3.asm index c081030d..084c8b4c 100644 --- a/audio/sfx/fly_3.asm +++ b/audio/sfx/fly_3.asm @@ -1,4 +1,4 @@ -SFX_Fly_3_Ch1: +SFX_Fly_3_Ch7: unknownnoise0x20 2, 241, 18 unknownnoise0x20 2, 0, 0 unknownnoise0x20 2, 161, 18 diff --git a/audio/sfx/get_item1_1.asm b/audio/sfx/get_item1_1.asm index ba428722..2cf5e8c9 100644 --- a/audio/sfx/get_item1_1.asm +++ b/audio/sfx/get_item1_1.asm @@ -1,4 +1,4 @@ -SFX_Get_Item1_1_Ch1: +SFX_Get_Item1_1_Ch4: executemusic tempo 256 volume 7, 7 @@ -16,7 +16,7 @@ SFX_Get_Item1_1_Ch1: endchannel -SFX_Get_Item1_1_Ch2: +SFX_Get_Item1_1_Ch5: executemusic vibrato 8, 2, 7 duty 2 @@ -30,7 +30,7 @@ SFX_Get_Item1_1_Ch2: endchannel -SFX_Get_Item1_1_Ch3: +SFX_Get_Item1_1_Ch6: executemusic notetype 4, 1, 0 octave 4 diff --git a/audio/sfx/get_item1_3.asm b/audio/sfx/get_item1_3.asm index b30ce40c..6c4c01b5 100644 --- a/audio/sfx/get_item1_3.asm +++ b/audio/sfx/get_item1_3.asm @@ -1,4 +1,4 @@ -SFX_Get_Item1_3_Ch1: +SFX_Get_Item1_3_Ch4: executemusic tempo 256 volume 7, 7 @@ -16,7 +16,7 @@ SFX_Get_Item1_3_Ch1: endchannel -SFX_Get_Item1_3_Ch2: +SFX_Get_Item1_3_Ch5: executemusic vibrato 8, 2, 7 duty 2 @@ -30,7 +30,7 @@ SFX_Get_Item1_3_Ch2: endchannel -SFX_Get_Item1_3_Ch3: +SFX_Get_Item1_3_Ch6: executemusic notetype 4, 1, 0 octave 4 diff --git a/audio/sfx/get_item2_1.asm b/audio/sfx/get_item2_1.asm index 67bb7bb8..01e66269 100644 --- a/audio/sfx/get_item2_1.asm +++ b/audio/sfx/get_item2_1.asm @@ -1,4 +1,4 @@ -SFX_Get_Item2_1_Ch1: +SFX_Get_Item2_1_Ch4: executemusic tempo 256 volume 7, 7 @@ -25,7 +25,7 @@ SFX_Get_Item2_1_Ch1: endchannel -SFX_Get_Item2_1_Ch2: +SFX_Get_Item2_1_Ch5: executemusic vibrato 8, 2, 7 duty 2 @@ -46,7 +46,7 @@ SFX_Get_Item2_1_Ch2: endchannel -SFX_Get_Item2_1_Ch3: +SFX_Get_Item2_1_Ch6: executemusic notetype 5, 1, 0 octave 5 diff --git a/audio/sfx/get_item2_2.asm b/audio/sfx/get_item2_2.asm index 292a74f6..27c5864d 100644 --- a/audio/sfx/get_item2_2.asm +++ b/audio/sfx/get_item2_2.asm @@ -1,4 +1,4 @@ -SFX_Get_Item2_2_Ch1: +SFX_Get_Item2_2_Ch4: executemusic tempo 256 volume 7, 7 @@ -25,7 +25,7 @@ SFX_Get_Item2_2_Ch1: endchannel -SFX_Get_Item2_2_Ch2: +SFX_Get_Item2_2_Ch5: executemusic vibrato 8, 2, 7 duty 2 @@ -46,7 +46,7 @@ SFX_Get_Item2_2_Ch2: endchannel -SFX_Get_Item2_2_Ch3: +SFX_Get_Item2_2_Ch6: executemusic notetype 5, 1, 0 octave 5 diff --git a/audio/sfx/get_item2_3.asm b/audio/sfx/get_item2_3.asm index 1a833741..42d74e8e 100644 --- a/audio/sfx/get_item2_3.asm +++ b/audio/sfx/get_item2_3.asm @@ -1,4 +1,4 @@ -SFX_Get_Item2_3_Ch1: +SFX_Get_Item2_3_Ch4: executemusic tempo 256 volume 7, 7 @@ -25,7 +25,7 @@ SFX_Get_Item2_3_Ch1: endchannel -SFX_Get_Item2_3_Ch2: +SFX_Get_Item2_3_Ch5: executemusic vibrato 8, 2, 7 duty 2 @@ -46,7 +46,7 @@ SFX_Get_Item2_3_Ch2: endchannel -SFX_Get_Item2_3_Ch3: +SFX_Get_Item2_3_Ch6: executemusic notetype 5, 1, 0 octave 5 diff --git a/audio/sfx/get_key_item_1.asm b/audio/sfx/get_key_item_1.asm index c8da1745..b2ae3d57 100644 --- a/audio/sfx/get_key_item_1.asm +++ b/audio/sfx/get_key_item_1.asm @@ -1,4 +1,4 @@ -SFX_Get_Key_Item_1_Ch1: +SFX_Get_Key_Item_1_Ch4: executemusic tempo 256 volume 7, 7 @@ -23,7 +23,7 @@ SFX_Get_Key_Item_1_Ch1: endchannel -SFX_Get_Key_Item_1_Ch2: +SFX_Get_Key_Item_1_Ch5: executemusic vibrato 4, 2, 3 duty 2 @@ -47,7 +47,7 @@ SFX_Get_Key_Item_1_Ch2: endchannel -SFX_Get_Key_Item_1_Ch3: +SFX_Get_Key_Item_1_Ch6: executemusic notetype 5, 1, 0 octave 4 diff --git a/audio/sfx/get_key_item_3.asm b/audio/sfx/get_key_item_3.asm index e6a50929..aebae361 100644 --- a/audio/sfx/get_key_item_3.asm +++ b/audio/sfx/get_key_item_3.asm @@ -1,4 +1,4 @@ -SFX_Get_Key_Item_3_Ch1: +SFX_Get_Key_Item_3_Ch4: executemusic tempo 256 volume 7, 7 @@ -23,7 +23,7 @@ SFX_Get_Key_Item_3_Ch1: endchannel -SFX_Get_Key_Item_3_Ch2: +SFX_Get_Key_Item_3_Ch5: executemusic vibrato 4, 2, 3 duty 2 @@ -47,7 +47,7 @@ SFX_Get_Key_Item_3_Ch2: endchannel -SFX_Get_Key_Item_3_Ch3: +SFX_Get_Key_Item_3_Ch6: executemusic notetype 5, 1, 0 octave 4 diff --git a/audio/sfx/go_inside_1.asm b/audio/sfx/go_inside_1.asm index 5da5be86..aa523774 100644 --- a/audio/sfx/go_inside_1.asm +++ b/audio/sfx/go_inside_1.asm @@ -1,4 +1,4 @@ -SFX_Go_Inside_1_Ch1: +SFX_Go_Inside_1_Ch7: unknownnoise0x20 9, 241, 68 unknownnoise0x20 8, 209, 67 endchannel diff --git a/audio/sfx/go_inside_3.asm b/audio/sfx/go_inside_3.asm index 460b3b4a..9939ba6d 100644 --- a/audio/sfx/go_inside_3.asm +++ b/audio/sfx/go_inside_3.asm @@ -1,4 +1,4 @@ -SFX_Go_Inside_3_Ch1: +SFX_Go_Inside_3_Ch7: unknownnoise0x20 9, 241, 68 unknownnoise0x20 8, 209, 67 endchannel diff --git a/audio/sfx/go_outside_1.asm b/audio/sfx/go_outside_1.asm index 2038d299..c60bb592 100644 --- a/audio/sfx/go_outside_1.asm +++ b/audio/sfx/go_outside_1.asm @@ -1,4 +1,4 @@ -SFX_Go_Outside_1_Ch1: +SFX_Go_Outside_1_Ch7: unknownnoise0x20 2, 241, 84 unknownnoise0x20 12, 113, 35 unknownnoise0x20 2, 177, 84 diff --git a/audio/sfx/go_outside_3.asm b/audio/sfx/go_outside_3.asm index d45b8410..30b9884c 100644 --- a/audio/sfx/go_outside_3.asm +++ b/audio/sfx/go_outside_3.asm @@ -1,4 +1,4 @@ -SFX_Go_Outside_3_Ch1: +SFX_Go_Outside_3_Ch7: unknownnoise0x20 2, 241, 84 unknownnoise0x20 12, 113, 35 unknownnoise0x20 2, 177, 84 diff --git a/audio/sfx/heal_ailment_1.asm b/audio/sfx/heal_ailment_1.asm index 3a292b82..ca703c09 100644 --- a/audio/sfx/heal_ailment_1.asm +++ b/audio/sfx/heal_ailment_1.asm @@ -1,4 +1,4 @@ -SFX_Heal_Ailment_1_Ch1: +SFX_Heal_Ailment_1_Ch4: duty 2 unknownsfx0x10 20 unknownsfx0x20 4, 242, 0, 6 diff --git a/audio/sfx/heal_ailment_2.asm b/audio/sfx/heal_ailment_2.asm index 25e1bbe0..b06abe62 100644 --- a/audio/sfx/heal_ailment_2.asm +++ b/audio/sfx/heal_ailment_2.asm @@ -1,4 +1,4 @@ -SFX_Heal_Ailment_2_Ch1: +SFX_Heal_Ailment_2_Ch4: duty 2 unknownsfx0x10 20 unknownsfx0x20 4, 242, 0, 6 diff --git a/audio/sfx/heal_ailment_3.asm b/audio/sfx/heal_ailment_3.asm index 2719358f..c13d74fd 100644 --- a/audio/sfx/heal_ailment_3.asm +++ b/audio/sfx/heal_ailment_3.asm @@ -1,4 +1,4 @@ -SFX_Heal_Ailment_3_Ch1: +SFX_Heal_Ailment_3_Ch4: duty 2 unknownsfx0x10 20 unknownsfx0x20 4, 242, 0, 6 diff --git a/audio/sfx/heal_hp_1.asm b/audio/sfx/heal_hp_1.asm index a23db490..75400957 100644 --- a/audio/sfx/heal_hp_1.asm +++ b/audio/sfx/heal_hp_1.asm @@ -1,4 +1,4 @@ -SFX_Heal_HP_1_Ch1: +SFX_Heal_HP_1_Ch4: duty 2 unknownsfx0x10 23 unknownsfx0x20 15, 240, 240, 4 diff --git a/audio/sfx/heal_hp_2.asm b/audio/sfx/heal_hp_2.asm index f21f6712..182937cd 100644 --- a/audio/sfx/heal_hp_2.asm +++ b/audio/sfx/heal_hp_2.asm @@ -1,4 +1,4 @@ -SFX_Heal_HP_2_Ch1: +SFX_Heal_HP_2_Ch4: duty 2 unknownsfx0x10 23 unknownsfx0x20 15, 240, 240, 4 diff --git a/audio/sfx/heal_hp_3.asm b/audio/sfx/heal_hp_3.asm index 96ff391b..c238013a 100644 --- a/audio/sfx/heal_hp_3.asm +++ b/audio/sfx/heal_hp_3.asm @@ -1,4 +1,4 @@ -SFX_Heal_HP_3_Ch1: +SFX_Heal_HP_3_Ch4: duty 2 unknownsfx0x10 23 unknownsfx0x20 15, 240, 240, 4 diff --git a/audio/sfx/healing_machine_1.asm b/audio/sfx/healing_machine_1.asm index ecb7c09c..ebaee990 100644 --- a/audio/sfx/healing_machine_1.asm +++ b/audio/sfx/healing_machine_1.asm @@ -1,4 +1,4 @@ -SFX_Healing_Machine_1_Ch1: +SFX_Healing_Machine_1_Ch4: duty 2 unknownsfx0x10 44 unknownsfx0x20 4, 242, 0, 5 diff --git a/audio/sfx/healing_machine_3.asm b/audio/sfx/healing_machine_3.asm index ec73e139..ac11fee4 100644 --- a/audio/sfx/healing_machine_3.asm +++ b/audio/sfx/healing_machine_3.asm @@ -1,4 +1,4 @@ -SFX_Healing_Machine_3_Ch1: +SFX_Healing_Machine_3_Ch4: duty 2 unknownsfx0x10 44 unknownsfx0x20 4, 242, 0, 5 diff --git a/audio/sfx/horn_drill.asm b/audio/sfx/horn_drill.asm index b1af527b..12ca5da6 100644 --- a/audio/sfx/horn_drill.asm +++ b/audio/sfx/horn_drill.asm @@ -1,4 +1,4 @@ -SFX_Horn_Drill_Ch1: +SFX_Horn_Drill_Ch7: unknownnoise0x20 3, 146, 49 unknownnoise0x20 3, 178, 50 unknownnoise0x20 3, 194, 51 diff --git a/audio/sfx/intro_crash.asm b/audio/sfx/intro_crash.asm index 69d6ff9b..82c58356 100644 --- a/audio/sfx/intro_crash.asm +++ b/audio/sfx/intro_crash.asm @@ -1,4 +1,4 @@ -SFX_Intro_Crash_Ch1: +SFX_Intro_Crash_Ch7: unknownnoise0x20 2, 210, 50 unknownnoise0x20 15, 242, 67 endchannel diff --git a/audio/sfx/intro_hip.asm b/audio/sfx/intro_hip.asm index 3d6de9d6..0d450e21 100644 --- a/audio/sfx/intro_hip.asm +++ b/audio/sfx/intro_hip.asm @@ -1,4 +1,4 @@ -SFX_Intro_Hip_Ch1: +SFX_Intro_Hip_Ch4: duty 2 unknownsfx0x10 38 unknownsfx0x20 12, 194, 64, 7 diff --git a/audio/sfx/intro_hop.asm b/audio/sfx/intro_hop.asm index 8e077c67..1bd9faec 100644 --- a/audio/sfx/intro_hop.asm +++ b/audio/sfx/intro_hop.asm @@ -1,4 +1,4 @@ -SFX_Intro_Hop_Ch1: +SFX_Intro_Hop_Ch4: duty 2 unknownsfx0x10 38 unknownsfx0x20 12, 194, 128, 6 diff --git a/audio/sfx/intro_lunge.asm b/audio/sfx/intro_lunge.asm index cb7570de..bb534a70 100644 --- a/audio/sfx/intro_lunge.asm +++ b/audio/sfx/intro_lunge.asm @@ -1,4 +1,4 @@ -SFX_Intro_Lunge_Ch1: +SFX_Intro_Lunge_Ch7: unknownnoise0x20 6, 32, 16 unknownnoise0x20 6, 47, 64 unknownnoise0x20 6, 79, 65 diff --git a/audio/sfx/intro_raise.asm b/audio/sfx/intro_raise.asm index 0088228f..060ef09a 100644 --- a/audio/sfx/intro_raise.asm +++ b/audio/sfx/intro_raise.asm @@ -1,4 +1,4 @@ -SFX_Intro_Raise_Ch1: +SFX_Intro_Raise_Ch7: unknownnoise0x20 2, 111, 33 unknownnoise0x20 2, 175, 49 unknownnoise0x20 15, 242, 65 diff --git a/audio/sfx/intro_whoosh.asm b/audio/sfx/intro_whoosh.asm index 5609bfc0..e874e773 100644 --- a/audio/sfx/intro_whoosh.asm +++ b/audio/sfx/intro_whoosh.asm @@ -1,4 +1,4 @@ -SFX_Intro_Whoosh_Ch1: +SFX_Intro_Whoosh_Ch7: unknownnoise0x20 4, 44, 32 unknownnoise0x20 3, 160, 32 unknownnoise0x20 3, 176, 33 diff --git a/audio/sfx/ledge_1.asm b/audio/sfx/ledge_1.asm index 72aa087e..26acaf1b 100644 --- a/audio/sfx/ledge_1.asm +++ b/audio/sfx/ledge_1.asm @@ -1,4 +1,4 @@ -SFX_Ledge_1_Ch1: +SFX_Ledge_1_Ch4: duty 2 unknownsfx0x10 149 unknownsfx0x20 15, 242, 0, 4 diff --git a/audio/sfx/ledge_3.asm b/audio/sfx/ledge_3.asm index a554282e..623e56ce 100644 --- a/audio/sfx/ledge_3.asm +++ b/audio/sfx/ledge_3.asm @@ -1,4 +1,4 @@ -SFX_Ledge_3_Ch1: +SFX_Ledge_3_Ch4: duty 2 unknownsfx0x10 149 unknownsfx0x20 15, 242, 0, 4 diff --git a/audio/sfx/level_up.asm b/audio/sfx/level_up.asm index f0890eab..5b3da83d 100644 --- a/audio/sfx/level_up.asm +++ b/audio/sfx/level_up.asm @@ -1,4 +1,4 @@ -SFX_Level_Up_Ch1: +SFX_Level_Up_Ch4: executemusic tempo 256 volume 7, 7 @@ -20,7 +20,7 @@ SFX_Level_Up_Ch1: endchannel -SFX_Level_Up_Ch2: +SFX_Level_Up_Ch5: executemusic vibrato 4, 2, 2 duty 2 @@ -40,7 +40,7 @@ SFX_Level_Up_Ch2: endchannel -SFX_Level_Up_Ch3: +SFX_Level_Up_Ch6: executemusic notetype 6, 1, 0 octave 5 diff --git a/audio/sfx/muted_snare1_1.asm b/audio/sfx/muted_snare1_1.asm index b29a5b87..4b205470 100644 --- a/audio/sfx/muted_snare1_1.asm +++ b/audio/sfx/muted_snare1_1.asm @@ -1,4 +1,4 @@ -SFX_Muted_Snare1_1_Ch1: +SFX_Muted_Snare1_1_Ch7: unknownnoise0x20 0, 161, 24 unknownnoise0x20 0, 49, 51 endchannel diff --git a/audio/sfx/muted_snare1_2.asm b/audio/sfx/muted_snare1_2.asm index a7f5467f..d530bd89 100644 --- a/audio/sfx/muted_snare1_2.asm +++ b/audio/sfx/muted_snare1_2.asm @@ -1,4 +1,4 @@ -SFX_Muted_Snare1_2_Ch1: +SFX_Muted_Snare1_2_Ch7: unknownnoise0x20 0, 161, 24 unknownnoise0x20 0, 49, 51 endchannel diff --git a/audio/sfx/muted_snare1_3.asm b/audio/sfx/muted_snare1_3.asm index 136018ef..8b5c2c6d 100644 --- a/audio/sfx/muted_snare1_3.asm +++ b/audio/sfx/muted_snare1_3.asm @@ -1,4 +1,4 @@ -SFX_Muted_Snare1_3_Ch1: +SFX_Muted_Snare1_3_Ch7: unknownnoise0x20 0, 161, 24 unknownnoise0x20 0, 49, 51 endchannel diff --git a/audio/sfx/muted_snare2_1.asm b/audio/sfx/muted_snare2_1.asm index 9ad52c27..4e15e386 100644 --- a/audio/sfx/muted_snare2_1.asm +++ b/audio/sfx/muted_snare2_1.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare2_1_Ch1: +SFX_Muted_Snare2_1_Ch7: unknownnoise0x20 0, 145, 34 endchannel diff --git a/audio/sfx/muted_snare2_2.asm b/audio/sfx/muted_snare2_2.asm index 20670ec8..5107fb77 100644 --- a/audio/sfx/muted_snare2_2.asm +++ b/audio/sfx/muted_snare2_2.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare2_2_Ch1: +SFX_Muted_Snare2_2_Ch7: unknownnoise0x20 0, 145, 34 endchannel diff --git a/audio/sfx/muted_snare2_3.asm b/audio/sfx/muted_snare2_3.asm index 007d462d..043c870d 100644 --- a/audio/sfx/muted_snare2_3.asm +++ b/audio/sfx/muted_snare2_3.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare2_3_Ch1: +SFX_Muted_Snare2_3_Ch7: unknownnoise0x20 0, 145, 34 endchannel diff --git a/audio/sfx/muted_snare3_1.asm b/audio/sfx/muted_snare3_1.asm index 8db6b874..d0c689a4 100644 --- a/audio/sfx/muted_snare3_1.asm +++ b/audio/sfx/muted_snare3_1.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare3_1_Ch1: +SFX_Muted_Snare3_1_Ch7: unknownnoise0x20 0, 113, 34 endchannel diff --git a/audio/sfx/muted_snare3_2.asm b/audio/sfx/muted_snare3_2.asm index 013ea9ab..3e470ae6 100644 --- a/audio/sfx/muted_snare3_2.asm +++ b/audio/sfx/muted_snare3_2.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare3_2_Ch1: +SFX_Muted_Snare3_2_Ch7: unknownnoise0x20 0, 113, 34 endchannel diff --git a/audio/sfx/muted_snare3_3.asm b/audio/sfx/muted_snare3_3.asm index 038a66db..c8749577 100644 --- a/audio/sfx/muted_snare3_3.asm +++ b/audio/sfx/muted_snare3_3.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare3_3_Ch1: +SFX_Muted_Snare3_3_Ch7: unknownnoise0x20 0, 113, 34 endchannel diff --git a/audio/sfx/muted_snare4_1.asm b/audio/sfx/muted_snare4_1.asm index 99429995..ebe2ee1d 100644 --- a/audio/sfx/muted_snare4_1.asm +++ b/audio/sfx/muted_snare4_1.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare4_1_Ch1: +SFX_Muted_Snare4_1_Ch7: unknownnoise0x20 0, 97, 34 endchannel diff --git a/audio/sfx/muted_snare4_2.asm b/audio/sfx/muted_snare4_2.asm index 11ee3218..bdbe4d11 100644 --- a/audio/sfx/muted_snare4_2.asm +++ b/audio/sfx/muted_snare4_2.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare4_2_Ch1: +SFX_Muted_Snare4_2_Ch7: unknownnoise0x20 0, 97, 34 endchannel diff --git a/audio/sfx/muted_snare4_3.asm b/audio/sfx/muted_snare4_3.asm index 86223813..59d72218 100644 --- a/audio/sfx/muted_snare4_3.asm +++ b/audio/sfx/muted_snare4_3.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare4_3_Ch1: +SFX_Muted_Snare4_3_Ch7: unknownnoise0x20 0, 97, 34 endchannel diff --git a/audio/sfx/not_very_effective.asm b/audio/sfx/not_very_effective.asm index 8a4c521e..3f74c515 100644 --- a/audio/sfx/not_very_effective.asm +++ b/audio/sfx/not_very_effective.asm @@ -1,4 +1,4 @@ -SFX_Not_Very_Effective_Ch1: +SFX_Not_Very_Effective_Ch7: unknownnoise0x20 4, 143, 85 unknownnoise0x20 2, 244, 68 unknownnoise0x20 8, 244, 34 diff --git a/audio/sfx/peck.asm b/audio/sfx/peck.asm index c474e9b3..cca7ecaa 100644 --- a/audio/sfx/peck.asm +++ b/audio/sfx/peck.asm @@ -1,3 +1,3 @@ -SFX_Peck_Ch1: +SFX_Peck_Ch7: unknownnoise0x20 2, 161, 18 endchannel diff --git a/audio/sfx/poisoned_1.asm b/audio/sfx/poisoned_1.asm index bfd619fd..73068b86 100644 --- a/audio/sfx/poisoned_1.asm +++ b/audio/sfx/poisoned_1.asm @@ -1,8 +1,8 @@ -SFX_Poisoned_1_Ch1: +SFX_Poisoned_1_Ch4: duty 0 unknownsfx0x10 20 unknownsfx0x20 4, 242, 0, 6 - loopchannel 4, SFX_Poisoned_1_Ch1 + loopchannel 4, SFX_Poisoned_1_Ch4 unknownsfx0x20 15, 243, 0, 6 unknownsfx0x10 8 endchannel diff --git a/audio/sfx/poisoned_3.asm b/audio/sfx/poisoned_3.asm index b972ca92..7dc973bc 100644 --- a/audio/sfx/poisoned_3.asm +++ b/audio/sfx/poisoned_3.asm @@ -1,8 +1,8 @@ -SFX_Poisoned_3_Ch1: +SFX_Poisoned_3_Ch4: duty 0 unknownsfx0x10 20 unknownsfx0x20 4, 242, 0, 6 - loopchannel 4, SFX_Poisoned_3_Ch1 + loopchannel 4, SFX_Poisoned_3_Ch4 unknownsfx0x20 15, 243, 0, 6 unknownsfx0x10 8 endchannel diff --git a/audio/sfx/pokedex_rating_1.asm b/audio/sfx/pokedex_rating_1.asm index eccf0ee5..1e0f95f5 100644 --- a/audio/sfx/pokedex_rating_1.asm +++ b/audio/sfx/pokedex_rating_1.asm @@ -1,4 +1,4 @@ -SFX_Pokedex_Rating_1_Ch1: +SFX_Pokedex_Rating_1_Ch4: executemusic tempo 256 volume 7, 7 @@ -21,7 +21,7 @@ SFX_Pokedex_Rating_1_Ch1: endchannel -SFX_Pokedex_Rating_1_Ch2: +SFX_Pokedex_Rating_1_Ch5: executemusic duty 2 notetype 5, 12, 2 @@ -44,7 +44,7 @@ SFX_Pokedex_Rating_1_Ch2: endchannel -SFX_Pokedex_Rating_1_Ch3: +SFX_Pokedex_Rating_1_Ch6: executemusic notetype 5, 1, 0 octave 5 diff --git a/audio/sfx/pokedex_rating_3.asm b/audio/sfx/pokedex_rating_3.asm index ec82888e..01ac0e1c 100644 --- a/audio/sfx/pokedex_rating_3.asm +++ b/audio/sfx/pokedex_rating_3.asm @@ -1,4 +1,4 @@ -SFX_Pokedex_Rating_3_Ch1: +SFX_Pokedex_Rating_3_Ch4: executemusic tempo 256 volume 7, 7 @@ -21,7 +21,7 @@ SFX_Pokedex_Rating_3_Ch1: endchannel -SFX_Pokedex_Rating_3_Ch2: +SFX_Pokedex_Rating_3_Ch5: executemusic duty 2 notetype 5, 12, 2 @@ -44,7 +44,7 @@ SFX_Pokedex_Rating_3_Ch2: endchannel -SFX_Pokedex_Rating_3_Ch3: +SFX_Pokedex_Rating_3_Ch6: executemusic notetype 5, 1, 0 octave 5 diff --git a/audio/sfx/pokeflute.asm b/audio/sfx/pokeflute.asm index cf61a6ee..272c114f 100644 --- a/audio/sfx/pokeflute.asm +++ b/audio/sfx/pokeflute.asm @@ -1,4 +1,4 @@ -SFX_Pokeflute_Ch1: +SFX_Pokeflute_Ch2: vibrato 16, 1, 4 notetype 12, 1, 0 octave 5 diff --git a/audio/sfx/pokeflute_ch1_ch2.asm b/audio/sfx/pokeflute_ch4_ch5.asm index 84631bca..146488d8 100755 --- a/audio/sfx/pokeflute_ch1_ch2.asm +++ b/audio/sfx/pokeflute_ch4_ch5.asm @@ -1,8 +1,8 @@ -SFX_08_PokeFlute_Ch1: +SFX_08_PokeFlute_Ch4: tempo 256 -SFX_08_PokeFlute_Ch2: +SFX_08_PokeFlute_Ch5: executemusic notetype 8, 0, 0 rest 5 diff --git a/audio/sfx/pokeflute_ch3.asm b/audio/sfx/pokeflute_ch6.asm index 3c883462..4d4e5bae 100755 --- a/audio/sfx/pokeflute_ch3.asm +++ b/audio/sfx/pokeflute_ch6.asm @@ -1,4 +1,4 @@ -SFX_08_PokeFlute_Ch3: +SFX_08_PokeFlute_Ch6: executemusic vibrato 16, 1, 4 notetype 8, 1, 0 diff --git a/audio/sfx/pound.asm b/audio/sfx/pound.asm index f70f6725..fc6d292e 100644 --- a/audio/sfx/pound.asm +++ b/audio/sfx/pound.asm @@ -1,3 +1,3 @@ -SFX_Pound_Ch1: +SFX_Pound_Ch7: unknownnoise0x20 2, 161, 34 endchannel diff --git a/audio/sfx/press_ab_1.asm b/audio/sfx/press_ab_1.asm index f68a6384..95edbf4a 100644 --- a/audio/sfx/press_ab_1.asm +++ b/audio/sfx/press_ab_1.asm @@ -1,4 +1,4 @@ -SFX_Press_AB_1_Ch1: +SFX_Press_AB_1_Ch4: duty 2 unknownsfx0x20 0, 145, 192, 7 unknownsfx0x20 0, 129, 208, 7 diff --git a/audio/sfx/press_ab_2.asm b/audio/sfx/press_ab_2.asm index 83b5ccd6..0d8faa46 100644 --- a/audio/sfx/press_ab_2.asm +++ b/audio/sfx/press_ab_2.asm @@ -1,4 +1,4 @@ -SFX_Press_AB_2_Ch1: +SFX_Press_AB_2_Ch4: duty 2 unknownsfx0x20 0, 145, 192, 7 unknownsfx0x20 0, 129, 208, 7 diff --git a/audio/sfx/press_ab_3.asm b/audio/sfx/press_ab_3.asm index 167c0fb1..0f11fc34 100644 --- a/audio/sfx/press_ab_3.asm +++ b/audio/sfx/press_ab_3.asm @@ -1,4 +1,4 @@ -SFX_Press_AB_3_Ch1: +SFX_Press_AB_3_Ch4: duty 2 unknownsfx0x20 0, 145, 192, 7 unknownsfx0x20 0, 129, 208, 7 diff --git a/audio/sfx/psybeam.asm b/audio/sfx/psybeam.asm index 893d4334..12a1b6fc 100644 --- a/audio/sfx/psybeam.asm +++ b/audio/sfx/psybeam.asm @@ -1,25 +1,25 @@ -SFX_Psybeam_Ch1: +SFX_Psybeam_Ch4: dutycycle 161 unknownsfx0x20 10, 241, 64, 6 unknownsfx0x20 10, 243, 128, 6 unknownsfx0x20 10, 242, 32, 6 - loopchannel 4, SFX_Psybeam_Ch1 + loopchannel 4, SFX_Psybeam_Ch4 unknownsfx0x20 10, 241, 64, 6 endchannel -SFX_Psybeam_Ch2: +SFX_Psybeam_Ch5: dutycycle 179 unknownsfx0x20 10, 243, 113, 5 unknownsfx0x20 7, 227, 49, 5 unknownsfx0x20 10, 241, 81, 5 - loopchannel 4, SFX_Psybeam_Ch2 + loopchannel 4, SFX_Psybeam_Ch5 unknownsfx0x20 10, 241, 113, 5 endchannel -SFX_Psybeam_Ch3: +SFX_Psybeam_Ch7: unknownnoise0x20 2, 209, 74 unknownnoise0x20 2, 210, 42 - loopchannel 21, SFX_Psybeam_Ch3 + loopchannel 21, SFX_Psybeam_Ch7 endchannel diff --git a/audio/sfx/psychic_m.asm b/audio/sfx/psychic_m.asm index abaa8345..2bbde2f1 100644 --- a/audio/sfx/psychic_m.asm +++ b/audio/sfx/psychic_m.asm @@ -1,4 +1,4 @@ -SFX_Psychic_M_Ch1: +SFX_Psychic_M_Ch4: duty 2 unknownsfx0x10 247 unknownsfx0x20 8, 196, 189, 7 @@ -11,7 +11,7 @@ SFX_Psychic_M_Ch1: endchannel -SFX_Psychic_M_Ch2: +SFX_Psychic_M_Ch5: duty 2 unknownsfx0x20 8, 196, 112, 7 unknownsfx0x20 8, 196, 97, 7 @@ -22,7 +22,7 @@ SFX_Psychic_M_Ch2: endchannel -SFX_Psychic_M_Ch3: +SFX_Psychic_M_Ch7: unknownnoise0x20 15, 63, 20 unknownnoise0x20 15, 207, 19 unknownnoise0x20 15, 207, 18 diff --git a/audio/sfx/purchase_1.asm b/audio/sfx/purchase_1.asm index 767035ea..1c9490a2 100644 --- a/audio/sfx/purchase_1.asm +++ b/audio/sfx/purchase_1.asm @@ -1,11 +1,11 @@ -SFX_Purchase_1_Ch1: +SFX_Purchase_1_Ch4: duty 2 unknownsfx0x20 4, 225, 0, 7 unknownsfx0x20 8, 242, 224, 7 endchannel -SFX_Purchase_1_Ch2: +SFX_Purchase_1_Ch5: duty 2 unknownsfx0x20 1, 8, 0, 0 unknownsfx0x20 4, 145, 193, 6 diff --git a/audio/sfx/purchase_3.asm b/audio/sfx/purchase_3.asm index 65a22527..78929c27 100644 --- a/audio/sfx/purchase_3.asm +++ b/audio/sfx/purchase_3.asm @@ -1,11 +1,11 @@ -SFX_Purchase_3_Ch1: +SFX_Purchase_3_Ch4: duty 2 unknownsfx0x20 4, 225, 0, 7 unknownsfx0x20 8, 242, 224, 7 endchannel -SFX_Purchase_3_Ch2: +SFX_Purchase_3_Ch5: duty 2 unknownsfx0x20 1, 8, 0, 0 unknownsfx0x20 4, 145, 193, 6 diff --git a/audio/sfx/push_boulder_1.asm b/audio/sfx/push_boulder_1.asm index cf43bbcf..86035278 100644 --- a/audio/sfx/push_boulder_1.asm +++ b/audio/sfx/push_boulder_1.asm @@ -1,4 +1,4 @@ -SFX_Push_Boulder_1_Ch1: +SFX_Push_Boulder_1_Ch7: unknownnoise0x20 4, 162, 35 unknownnoise0x20 8, 241, 52 unknownnoise0x20 15, 0, 0 diff --git a/audio/sfx/push_boulder_3.asm b/audio/sfx/push_boulder_3.asm index 9f536964..ecaeb768 100644 --- a/audio/sfx/push_boulder_3.asm +++ b/audio/sfx/push_boulder_3.asm @@ -1,4 +1,4 @@ -SFX_Push_Boulder_3_Ch1: +SFX_Push_Boulder_3_Ch7: unknownnoise0x20 4, 162, 35 unknownnoise0x20 8, 241, 52 unknownnoise0x20 15, 0, 0 diff --git a/audio/sfx/run.asm b/audio/sfx/run.asm index 656d3d01..81d01467 100644 --- a/audio/sfx/run.asm +++ b/audio/sfx/run.asm @@ -1,4 +1,4 @@ -SFX_Run_Ch1: +SFX_Run_Ch7: unknownnoise0x20 2, 97, 35 unknownnoise0x20 2, 161, 51 unknownnoise0x20 2, 193, 51 diff --git a/audio/sfx/safari_zone_pa.asm b/audio/sfx/safari_zone_pa.asm index d385feb3..f898def0 100644 --- a/audio/sfx/safari_zone_pa.asm +++ b/audio/sfx/safari_zone_pa.asm @@ -1,4 +1,4 @@ -SFX_Safari_Zone_PA_Ch1: +SFX_Safari_Zone_PA_Ch4: duty 2 unknownsfx0x20 15, 243, 48, 7 unknownsfx0x20 8, 101, 48, 7 diff --git a/audio/sfx/save_1.asm b/audio/sfx/save_1.asm index 13cb46e5..afb1f13a 100644 --- a/audio/sfx/save_1.asm +++ b/audio/sfx/save_1.asm @@ -1,4 +1,4 @@ -SFX_Save_1_Ch1: +SFX_Save_1_Ch4: duty 2 unknownsfx0x20 4, 244, 0, 7 unknownsfx0x20 2, 228, 0, 6 @@ -10,7 +10,7 @@ SFX_Save_1_Ch1: endchannel -SFX_Save_1_Ch2: +SFX_Save_1_Ch5: duty 2 unknownsfx0x20 4, 8, 0, 0 unknownsfx0x20 2, 212, 1, 7 diff --git a/audio/sfx/save_3.asm b/audio/sfx/save_3.asm index ad049ec6..083e77c8 100644 --- a/audio/sfx/save_3.asm +++ b/audio/sfx/save_3.asm @@ -1,4 +1,4 @@ -SFX_Save_3_Ch1: +SFX_Save_3_Ch4: duty 2 IF DEF(_RED) unknownsfx0x20 4, 244, 0, 7 @@ -16,7 +16,7 @@ ENDC endchannel -SFX_Save_3_Ch2: +SFX_Save_3_Ch5: duty 2 IF DEF(_RED) unknownsfx0x20 4, 8, 0, 0 diff --git a/audio/sfx/shooting_star.asm b/audio/sfx/shooting_star.asm index f8b8e285..f9b03feb 100644 --- a/audio/sfx/shooting_star.asm +++ b/audio/sfx/shooting_star.asm @@ -1,4 +1,4 @@ -SFX_Shooting_Star_Ch1: +SFX_Shooting_Star_Ch4: dutycycle 228 unknownsfx0x10 47 unknownsfx0x20 4, 64, 224, 7 diff --git a/audio/sfx/shrink_1.asm b/audio/sfx/shrink_1.asm index d69d60de..54731535 100644 --- a/audio/sfx/shrink_1.asm +++ b/audio/sfx/shrink_1.asm @@ -1,4 +1,4 @@ -SFX_Shrink_1_Ch1: +SFX_Shrink_1_Ch4: duty 1 unknownsfx0x10 23 unknownsfx0x20 15, 215, 0, 6 diff --git a/audio/sfx/shrink_3.asm b/audio/sfx/shrink_3.asm index e5c4b7af..b03cbe55 100644 --- a/audio/sfx/shrink_3.asm +++ b/audio/sfx/shrink_3.asm @@ -1,4 +1,4 @@ -SFX_Shrink_3_Ch1: +SFX_Shrink_3_Ch4: duty 1 unknownsfx0x10 23 unknownsfx0x20 15, 215, 0, 6 diff --git a/audio/sfx/silph_scope.asm b/audio/sfx/silph_scope.asm index ad789af2..ee238262 100644 --- a/audio/sfx/silph_scope.asm +++ b/audio/sfx/silph_scope.asm @@ -1,4 +1,4 @@ -SFX_Silph_Scope_Ch1: +SFX_Silph_Scope_Ch4: duty 0 unknownsfx0x20 0, 210, 0, 7 unknownsfx0x20 0, 210, 64, 7 diff --git a/audio/sfx/slots_new_spin.asm b/audio/sfx/slots_new_spin.asm index d29529e9..ae1a6d90 100644 --- a/audio/sfx/slots_new_spin.asm +++ b/audio/sfx/slots_new_spin.asm @@ -1,4 +1,4 @@ -SFX_Slots_New_Spin_Ch1: +SFX_Slots_New_Spin_Ch4: duty 3 unknownsfx0x20 5, 225, 0, 7 unknownsfx0x20 2, 225, 128, 7 @@ -6,7 +6,7 @@ SFX_Slots_New_Spin_Ch1: endchannel -SFX_Slots_New_Spin_Ch2: +SFX_Slots_New_Spin_Ch5: duty 2 unknownsfx0x20 4, 193, 193, 6 unknownsfx0x20 2, 193, 65, 7 diff --git a/audio/sfx/slots_reward.asm b/audio/sfx/slots_reward.asm index d7833f55..6923ac71 100644 --- a/audio/sfx/slots_reward.asm +++ b/audio/sfx/slots_reward.asm @@ -1,4 +1,4 @@ -SFX_Slots_Reward_Ch1: +SFX_Slots_Reward_Ch4: duty 2 unknownsfx0x20 2, 241, 0, 7 unknownsfx0x20 8, 129, 224, 7 diff --git a/audio/sfx/slots_stop_wheel.asm b/audio/sfx/slots_stop_wheel.asm index 00641a5e..85d73daf 100644 --- a/audio/sfx/slots_stop_wheel.asm +++ b/audio/sfx/slots_stop_wheel.asm @@ -1,4 +1,4 @@ -SFX_Slots_Stop_Wheel_Ch1: +SFX_Slots_Stop_Wheel_Ch4: duty 2 unknownsfx0x20 1, 242, 160, 6 unknownsfx0x20 1, 242, 224, 6 diff --git a/audio/sfx/snare1_1.asm b/audio/sfx/snare1_1.asm index 9f7b4138..aae0ef28 100644 --- a/audio/sfx/snare1_1.asm +++ b/audio/sfx/snare1_1.asm @@ -1,3 +1,3 @@ -SFX_Snare1_1_Ch1: +SFX_Snare1_1_Ch7: unknownnoise0x20 0, 193, 51 endchannel diff --git a/audio/sfx/snare1_2.asm b/audio/sfx/snare1_2.asm index 55fdf84a..e5013081 100644 --- a/audio/sfx/snare1_2.asm +++ b/audio/sfx/snare1_2.asm @@ -1,3 +1,3 @@ -SFX_Snare1_2_Ch1: +SFX_Snare1_2_Ch7: unknownnoise0x20 0, 193, 51 endchannel diff --git a/audio/sfx/snare1_3.asm b/audio/sfx/snare1_3.asm index cab603c1..4ffffa7f 100644 --- a/audio/sfx/snare1_3.asm +++ b/audio/sfx/snare1_3.asm @@ -1,3 +1,3 @@ -SFX_Snare1_3_Ch1: +SFX_Snare1_3_Ch7: unknownnoise0x20 0, 193, 51 endchannel diff --git a/audio/sfx/snare2_1.asm b/audio/sfx/snare2_1.asm index e40facb5..286e397a 100644 --- a/audio/sfx/snare2_1.asm +++ b/audio/sfx/snare2_1.asm @@ -1,3 +1,3 @@ -SFX_Snare2_1_Ch1: +SFX_Snare2_1_Ch7: unknownnoise0x20 0, 177, 51 endchannel diff --git a/audio/sfx/snare2_2.asm b/audio/sfx/snare2_2.asm index 82deb096..a3718612 100644 --- a/audio/sfx/snare2_2.asm +++ b/audio/sfx/snare2_2.asm @@ -1,3 +1,3 @@ -SFX_Snare2_2_Ch1: +SFX_Snare2_2_Ch7: unknownnoise0x20 0, 177, 51 endchannel diff --git a/audio/sfx/snare2_3.asm b/audio/sfx/snare2_3.asm index fb5e1672..67f8c7fb 100644 --- a/audio/sfx/snare2_3.asm +++ b/audio/sfx/snare2_3.asm @@ -1,3 +1,3 @@ -SFX_Snare2_3_Ch1: +SFX_Snare2_3_Ch7: unknownnoise0x20 0, 177, 51 endchannel diff --git a/audio/sfx/snare3_1.asm b/audio/sfx/snare3_1.asm index c2b20add..686b4561 100644 --- a/audio/sfx/snare3_1.asm +++ b/audio/sfx/snare3_1.asm @@ -1,3 +1,3 @@ -SFX_Snare3_1_Ch1: +SFX_Snare3_1_Ch7: unknownnoise0x20 0, 161, 51 endchannel diff --git a/audio/sfx/snare3_2.asm b/audio/sfx/snare3_2.asm index 16f87fc5..f8236d40 100644 --- a/audio/sfx/snare3_2.asm +++ b/audio/sfx/snare3_2.asm @@ -1,3 +1,3 @@ -SFX_Snare3_2_Ch1: +SFX_Snare3_2_Ch7: unknownnoise0x20 0, 161, 51 endchannel diff --git a/audio/sfx/snare3_3.asm b/audio/sfx/snare3_3.asm index 6b9a006f..3b52bac9 100644 --- a/audio/sfx/snare3_3.asm +++ b/audio/sfx/snare3_3.asm @@ -1,3 +1,3 @@ -SFX_Snare3_3_Ch1: +SFX_Snare3_3_Ch7: unknownnoise0x20 0, 161, 51 endchannel diff --git a/audio/sfx/snare4_1.asm b/audio/sfx/snare4_1.asm index 2796410c..35d58dba 100644 --- a/audio/sfx/snare4_1.asm +++ b/audio/sfx/snare4_1.asm @@ -1,3 +1,3 @@ -SFX_Snare4_1_Ch1: +SFX_Snare4_1_Ch7: unknownnoise0x20 0, 129, 51 endchannel diff --git a/audio/sfx/snare4_2.asm b/audio/sfx/snare4_2.asm index 920321ab..713f8996 100644 --- a/audio/sfx/snare4_2.asm +++ b/audio/sfx/snare4_2.asm @@ -1,3 +1,3 @@ -SFX_Snare4_2_Ch1: +SFX_Snare4_2_Ch7: unknownnoise0x20 0, 129, 51 endchannel diff --git a/audio/sfx/snare4_3.asm b/audio/sfx/snare4_3.asm index a47c332c..231193e1 100644 --- a/audio/sfx/snare4_3.asm +++ b/audio/sfx/snare4_3.asm @@ -1,3 +1,3 @@ -SFX_Snare4_3_Ch1: +SFX_Snare4_3_Ch7: unknownnoise0x20 0, 129, 51 endchannel diff --git a/audio/sfx/snare5_1.asm b/audio/sfx/snare5_1.asm index dd4eab3a..54106d58 100644 --- a/audio/sfx/snare5_1.asm +++ b/audio/sfx/snare5_1.asm @@ -1,4 +1,4 @@ -SFX_Snare5_1_Ch1: +SFX_Snare5_1_Ch7: unknownnoise0x20 7, 132, 55 unknownnoise0x20 6, 132, 54 unknownnoise0x20 5, 131, 53 diff --git a/audio/sfx/snare5_2.asm b/audio/sfx/snare5_2.asm index fad74021..f7f55eb5 100644 --- a/audio/sfx/snare5_2.asm +++ b/audio/sfx/snare5_2.asm @@ -1,4 +1,4 @@ -SFX_Snare5_2_Ch1: +SFX_Snare5_2_Ch7: unknownnoise0x20 7, 132, 55 unknownnoise0x20 6, 132, 54 unknownnoise0x20 5, 131, 53 diff --git a/audio/sfx/snare5_3.asm b/audio/sfx/snare5_3.asm index d0ca1d91..76dc3966 100644 --- a/audio/sfx/snare5_3.asm +++ b/audio/sfx/snare5_3.asm @@ -1,4 +1,4 @@ -SFX_Snare5_3_Ch1: +SFX_Snare5_3_Ch7: unknownnoise0x20 7, 132, 55 unknownnoise0x20 6, 132, 54 unknownnoise0x20 5, 131, 53 diff --git a/audio/sfx/snare6_1.asm b/audio/sfx/snare6_1.asm index 74bf01c7..97c0241d 100644 --- a/audio/sfx/snare6_1.asm +++ b/audio/sfx/snare6_1.asm @@ -1,3 +1,3 @@ -SFX_Snare6_1_Ch1: +SFX_Snare6_1_Ch7: unknownnoise0x20 0, 129, 16 endchannel diff --git a/audio/sfx/snare6_2.asm b/audio/sfx/snare6_2.asm index 0a96680e..797d5518 100644 --- a/audio/sfx/snare6_2.asm +++ b/audio/sfx/snare6_2.asm @@ -1,3 +1,3 @@ -SFX_Snare6_2_Ch1: +SFX_Snare6_2_Ch7: unknownnoise0x20 0, 129, 16 endchannel diff --git a/audio/sfx/snare6_3.asm b/audio/sfx/snare6_3.asm index f3130931..28fc695a 100644 --- a/audio/sfx/snare6_3.asm +++ b/audio/sfx/snare6_3.asm @@ -1,3 +1,3 @@ -SFX_Snare6_3_Ch1: +SFX_Snare6_3_Ch7: unknownnoise0x20 0, 129, 16 endchannel diff --git a/audio/sfx/snare7_1.asm b/audio/sfx/snare7_1.asm index ef8f80ab..1b54eefa 100644 --- a/audio/sfx/snare7_1.asm +++ b/audio/sfx/snare7_1.asm @@ -1,3 +1,3 @@ -SFX_Snare7_1_Ch1: +SFX_Snare7_1_Ch7: unknownnoise0x20 0, 130, 35 endchannel diff --git a/audio/sfx/snare7_2.asm b/audio/sfx/snare7_2.asm index 5e266b12..e480f87f 100644 --- a/audio/sfx/snare7_2.asm +++ b/audio/sfx/snare7_2.asm @@ -1,3 +1,3 @@ -SFX_Snare7_2_Ch1: +SFX_Snare7_2_Ch7: unknownnoise0x20 0, 130, 35 endchannel diff --git a/audio/sfx/snare7_3.asm b/audio/sfx/snare7_3.asm index 26db3703..b57dfc13 100644 --- a/audio/sfx/snare7_3.asm +++ b/audio/sfx/snare7_3.asm @@ -1,3 +1,3 @@ -SFX_Snare7_3_Ch1: +SFX_Snare7_3_Ch7: unknownnoise0x20 0, 130, 35 endchannel diff --git a/audio/sfx/snare8_1.asm b/audio/sfx/snare8_1.asm index 5f624177..1a0f74a3 100644 --- a/audio/sfx/snare8_1.asm +++ b/audio/sfx/snare8_1.asm @@ -1,3 +1,3 @@ -SFX_Snare8_1_Ch1: +SFX_Snare8_1_Ch7: unknownnoise0x20 0, 130, 37 endchannel diff --git a/audio/sfx/snare8_2.asm b/audio/sfx/snare8_2.asm index cf5d5654..87619598 100644 --- a/audio/sfx/snare8_2.asm +++ b/audio/sfx/snare8_2.asm @@ -1,3 +1,3 @@ -SFX_Snare8_2_Ch1: +SFX_Snare8_2_Ch7: unknownnoise0x20 0, 130, 37 endchannel diff --git a/audio/sfx/snare8_3.asm b/audio/sfx/snare8_3.asm index 7da0e415..54076c8e 100644 --- a/audio/sfx/snare8_3.asm +++ b/audio/sfx/snare8_3.asm @@ -1,3 +1,3 @@ -SFX_Snare8_3_Ch1: +SFX_Snare8_3_Ch7: unknownnoise0x20 0, 130, 37 endchannel diff --git a/audio/sfx/snare9_1.asm b/audio/sfx/snare9_1.asm index c511cdaf..6923bb09 100644 --- a/audio/sfx/snare9_1.asm +++ b/audio/sfx/snare9_1.asm @@ -1,3 +1,3 @@ -SFX_Snare9_1_Ch1: +SFX_Snare9_1_Ch7: unknownnoise0x20 0, 130, 38 endchannel diff --git a/audio/sfx/snare9_2.asm b/audio/sfx/snare9_2.asm index db9aecf9..308ae7f6 100644 --- a/audio/sfx/snare9_2.asm +++ b/audio/sfx/snare9_2.asm @@ -1,3 +1,3 @@ -SFX_Snare9_2_Ch1: +SFX_Snare9_2_Ch7: unknownnoise0x20 0, 130, 38 endchannel diff --git a/audio/sfx/snare9_3.asm b/audio/sfx/snare9_3.asm index 18df2e46..ffbdc454 100644 --- a/audio/sfx/snare9_3.asm +++ b/audio/sfx/snare9_3.asm @@ -1,3 +1,3 @@ -SFX_Snare9_3_Ch1: +SFX_Snare9_3_Ch7: unknownnoise0x20 0, 130, 38 endchannel diff --git a/audio/sfx/ss_anne_horn_1.asm b/audio/sfx/ss_anne_horn_1.asm index 66c95262..38407f24 100644 --- a/audio/sfx/ss_anne_horn_1.asm +++ b/audio/sfx/ss_anne_horn_1.asm @@ -1,4 +1,4 @@ -SFX_SS_Anne_Horn_1_Ch1: +SFX_SS_Anne_Horn_1_Ch4: duty 2 unknownsfx0x20 15, 240, 0, 5 unknownsfx0x20 4, 0, 0, 0 @@ -10,7 +10,7 @@ SFX_SS_Anne_Horn_1_Ch1: endchannel -SFX_SS_Anne_Horn_1_Ch2: +SFX_SS_Anne_Horn_1_Ch5: duty 3 unknownsfx0x20 15, 240, 130, 4 unknownsfx0x20 4, 0, 0, 0 diff --git a/audio/sfx/ss_anne_horn_3.asm b/audio/sfx/ss_anne_horn_3.asm index 070f111c..3162f664 100644 --- a/audio/sfx/ss_anne_horn_3.asm +++ b/audio/sfx/ss_anne_horn_3.asm @@ -1,4 +1,4 @@ -SFX_SS_Anne_Horn_3_Ch1: +SFX_SS_Anne_Horn_3_Ch4: duty 2 unknownsfx0x20 15, 240, 0, 5 unknownsfx0x20 4, 0, 0, 0 @@ -10,7 +10,7 @@ SFX_SS_Anne_Horn_3_Ch1: endchannel -SFX_SS_Anne_Horn_3_Ch2: +SFX_SS_Anne_Horn_3_Ch5: duty 3 unknownsfx0x20 15, 240, 130, 4 unknownsfx0x20 4, 0, 0, 0 diff --git a/audio/sfx/start_menu_1.asm b/audio/sfx/start_menu_1.asm index f509326c..3a979b44 100644 --- a/audio/sfx/start_menu_1.asm +++ b/audio/sfx/start_menu_1.asm @@ -1,4 +1,4 @@ -SFX_Start_Menu_1_Ch1: +SFX_Start_Menu_1_Ch7: unknownnoise0x20 1, 226, 51 unknownnoise0x20 8, 225, 34 endchannel diff --git a/audio/sfx/start_menu_2.asm b/audio/sfx/start_menu_2.asm index 92bb7558..2706f555 100644 --- a/audio/sfx/start_menu_2.asm +++ b/audio/sfx/start_menu_2.asm @@ -1,4 +1,4 @@ -SFX_Start_Menu_2_Ch1: +SFX_Start_Menu_2_Ch7: unknownnoise0x20 1, 226, 51 unknownnoise0x20 8, 225, 34 endchannel diff --git a/audio/sfx/start_menu_3.asm b/audio/sfx/start_menu_3.asm index 74c82cf3..4b16cea4 100644 --- a/audio/sfx/start_menu_3.asm +++ b/audio/sfx/start_menu_3.asm @@ -1,4 +1,4 @@ -SFX_Start_Menu_3_Ch1: +SFX_Start_Menu_3_Ch7: unknownnoise0x20 1, 226, 51 unknownnoise0x20 8, 225, 34 endchannel diff --git a/audio/sfx/super_effective.asm b/audio/sfx/super_effective.asm index 70d7014a..63ba35e8 100644 --- a/audio/sfx/super_effective.asm +++ b/audio/sfx/super_effective.asm @@ -1,4 +1,4 @@ -SFX_Super_Effective_Ch1: +SFX_Super_Effective_Ch7: unknownnoise0x20 4, 241, 52 unknownnoise0x20 15, 242, 100 endchannel diff --git a/audio/sfx/swap_1.asm b/audio/sfx/swap_1.asm index 782dd3fb..95a31fcd 100644 --- a/audio/sfx/swap_1.asm +++ b/audio/sfx/swap_1.asm @@ -1,10 +1,10 @@ -SFX_Swap_1_Ch1: +SFX_Swap_1_Ch4: duty 2 unknownsfx0x20 8, 225, 64, 7 endchannel -SFX_Swap_1_Ch2: +SFX_Swap_1_Ch5: duty 2 unknownsfx0x20 2, 8, 0, 0 unknownsfx0x20 8, 177, 65, 7 diff --git a/audio/sfx/swap_3.asm b/audio/sfx/swap_3.asm index 4fc1db1d..6ed97d7d 100644 --- a/audio/sfx/swap_3.asm +++ b/audio/sfx/swap_3.asm @@ -1,10 +1,10 @@ -SFX_Swap_3_Ch1: +SFX_Swap_3_Ch4: duty 2 unknownsfx0x20 8, 225, 64, 7 endchannel -SFX_Swap_3_Ch2: +SFX_Swap_3_Ch5: duty 2 unknownsfx0x20 2, 8, 0, 0 unknownsfx0x20 8, 177, 65, 7 diff --git a/audio/sfx/switch_1.asm b/audio/sfx/switch_1.asm index ac9fb680..ee15dc20 100644 --- a/audio/sfx/switch_1.asm +++ b/audio/sfx/switch_1.asm @@ -1,4 +1,4 @@ -SFX_Switch_1_Ch1: +SFX_Switch_1_Ch4: duty 2 unknownsfx0x20 4, 0, 0, 0 unknownsfx0x20 2, 241, 128, 6 diff --git a/audio/sfx/switch_3.asm b/audio/sfx/switch_3.asm index 81b68d26..d98a7f29 100644 --- a/audio/sfx/switch_3.asm +++ b/audio/sfx/switch_3.asm @@ -1,4 +1,4 @@ -SFX_Switch_3_Ch1: +SFX_Switch_3_Ch4: duty 2 unknownsfx0x20 4, 0, 0, 0 unknownsfx0x20 2, 241, 128, 6 diff --git a/audio/sfx/teleport_enter1_1.asm b/audio/sfx/teleport_enter1_1.asm index 0522ee16..60c87cab 100644 --- a/audio/sfx/teleport_enter1_1.asm +++ b/audio/sfx/teleport_enter1_1.asm @@ -1,4 +1,4 @@ -SFX_Teleport_Enter1_1_Ch1: +SFX_Teleport_Enter1_1_Ch4: duty 1 unknownsfx0x10 23 unknownsfx0x20 15, 215, 0, 7 diff --git a/audio/sfx/teleport_enter1_3.asm b/audio/sfx/teleport_enter1_3.asm index 6518e416..d3dab8b4 100644 --- a/audio/sfx/teleport_enter1_3.asm +++ b/audio/sfx/teleport_enter1_3.asm @@ -1,4 +1,4 @@ -SFX_Teleport_Enter1_3_Ch1: +SFX_Teleport_Enter1_3_Ch4: duty 1 unknownsfx0x10 23 unknownsfx0x20 15, 215, 0, 7 diff --git a/audio/sfx/teleport_enter2_1.asm b/audio/sfx/teleport_enter2_1.asm index 338c1c30..53eb3335 100644 --- a/audio/sfx/teleport_enter2_1.asm +++ b/audio/sfx/teleport_enter2_1.asm @@ -1,4 +1,4 @@ -SFX_Teleport_Enter2_1_Ch1: +SFX_Teleport_Enter2_1_Ch7: unknownnoise0x20 2, 241, 50 unknownnoise0x20 2, 0, 0 unknownnoise0x20 2, 241, 34 diff --git a/audio/sfx/teleport_enter2_3.asm b/audio/sfx/teleport_enter2_3.asm index f6cd103c..8b7c7894 100644 --- a/audio/sfx/teleport_enter2_3.asm +++ b/audio/sfx/teleport_enter2_3.asm @@ -1,4 +1,4 @@ -SFX_Teleport_Enter2_3_Ch1: +SFX_Teleport_Enter2_3_Ch7: unknownnoise0x20 2, 241, 50 unknownnoise0x20 2, 0, 0 unknownnoise0x20 2, 241, 34 diff --git a/audio/sfx/teleport_exit1_1.asm b/audio/sfx/teleport_exit1_1.asm index f916d539..084c116f 100644 --- a/audio/sfx/teleport_exit1_1.asm +++ b/audio/sfx/teleport_exit1_1.asm @@ -1,4 +1,4 @@ -SFX_Teleport_Exit1_1_Ch1: +SFX_Teleport_Exit1_1_Ch4: duty 1 unknownsfx0x10 23 unknownsfx0x20 15, 215, 0, 5 diff --git a/audio/sfx/teleport_exit1_3.asm b/audio/sfx/teleport_exit1_3.asm index 67739bd1..b3a26af8 100644 --- a/audio/sfx/teleport_exit1_3.asm +++ b/audio/sfx/teleport_exit1_3.asm @@ -1,4 +1,4 @@ -SFX_Teleport_Exit1_3_Ch1: +SFX_Teleport_Exit1_3_Ch4: duty 1 unknownsfx0x10 23 unknownsfx0x20 15, 215, 0, 5 diff --git a/audio/sfx/teleport_exit2_1.asm b/audio/sfx/teleport_exit2_1.asm index 1e1de5a5..4b168bb9 100644 --- a/audio/sfx/teleport_exit2_1.asm +++ b/audio/sfx/teleport_exit2_1.asm @@ -1,4 +1,4 @@ -SFX_Teleport_Exit2_1_Ch1: +SFX_Teleport_Exit2_1_Ch4: duty 1 unknownsfx0x10 22 unknownsfx0x20 15, 210, 0, 5 diff --git a/audio/sfx/teleport_exit2_3.asm b/audio/sfx/teleport_exit2_3.asm index 928e486e..171e59d8 100644 --- a/audio/sfx/teleport_exit2_3.asm +++ b/audio/sfx/teleport_exit2_3.asm @@ -1,4 +1,4 @@ -SFX_Teleport_Exit2_3_Ch1: +SFX_Teleport_Exit2_3_Ch4: duty 1 unknownsfx0x10 22 unknownsfx0x20 15, 210, 0, 5 diff --git a/audio/sfx/tink_1.asm b/audio/sfx/tink_1.asm index e6eff9ac..c1f5f00c 100644 --- a/audio/sfx/tink_1.asm +++ b/audio/sfx/tink_1.asm @@ -1,4 +1,4 @@ -SFX_Tink_1_Ch1: +SFX_Tink_1_Ch4: duty 2 unknownsfx0x10 58 unknownsfx0x20 4, 242, 0, 2 diff --git a/audio/sfx/tink_2.asm b/audio/sfx/tink_2.asm index fa06cf19..bab45323 100644 --- a/audio/sfx/tink_2.asm +++ b/audio/sfx/tink_2.asm @@ -1,4 +1,4 @@ -SFX_Tink_2_Ch1: +SFX_Tink_2_Ch4: duty 2 unknownsfx0x10 58 unknownsfx0x20 4, 242, 0, 2 diff --git a/audio/sfx/tink_3.asm b/audio/sfx/tink_3.asm index d786d289..a9cf73ec 100644 --- a/audio/sfx/tink_3.asm +++ b/audio/sfx/tink_3.asm @@ -1,4 +1,4 @@ -SFX_Tink_3_Ch1: +SFX_Tink_3_Ch4: duty 2 unknownsfx0x10 58 unknownsfx0x20 4, 242, 0, 2 diff --git a/audio/sfx/trade_machine_1.asm b/audio/sfx/trade_machine_1.asm index 87993851..2f67936b 100644 --- a/audio/sfx/trade_machine_1.asm +++ b/audio/sfx/trade_machine_1.asm @@ -1,4 +1,4 @@ -SFX_Trade_Machine_1_Ch1: +SFX_Trade_Machine_1_Ch4: duty 2 unknownsfx0x10 21 unknownsfx0x20 15, 240, 240, 4 diff --git a/audio/sfx/trade_machine_3.asm b/audio/sfx/trade_machine_3.asm index 6b70d5da..b590455e 100644 --- a/audio/sfx/trade_machine_3.asm +++ b/audio/sfx/trade_machine_3.asm @@ -1,4 +1,4 @@ -SFX_Trade_Machine_3_Ch1: +SFX_Trade_Machine_3_Ch4: duty 2 unknownsfx0x10 21 unknownsfx0x20 15, 240, 240, 4 diff --git a/audio/sfx/triangle1_1.asm b/audio/sfx/triangle1_1.asm index 94b61fe1..957dc63f 100644 --- a/audio/sfx/triangle1_1.asm +++ b/audio/sfx/triangle1_1.asm @@ -1,3 +1,3 @@ -SFX_Triangle1_1_Ch1: +SFX_Triangle1_1_Ch7: unknownnoise0x20 0, 81, 42 endchannel diff --git a/audio/sfx/triangle1_2.asm b/audio/sfx/triangle1_2.asm index 1c9c1d29..535448cd 100644 --- a/audio/sfx/triangle1_2.asm +++ b/audio/sfx/triangle1_2.asm @@ -1,3 +1,3 @@ -SFX_Triangle1_2_Ch1: +SFX_Triangle1_2_Ch7: unknownnoise0x20 0, 81, 42 endchannel diff --git a/audio/sfx/triangle1_3.asm b/audio/sfx/triangle1_3.asm index b900da7c..a13d00ea 100644 --- a/audio/sfx/triangle1_3.asm +++ b/audio/sfx/triangle1_3.asm @@ -1,3 +1,3 @@ -SFX_Triangle1_3_Ch1: +SFX_Triangle1_3_Ch7: unknownnoise0x20 0, 81, 42 endchannel diff --git a/audio/sfx/triangle2_1.asm b/audio/sfx/triangle2_1.asm index 0f648237..09ba8a67 100644 --- a/audio/sfx/triangle2_1.asm +++ b/audio/sfx/triangle2_1.asm @@ -1,4 +1,4 @@ -SFX_Triangle2_1_Ch1: +SFX_Triangle2_1_Ch7: unknownnoise0x20 1, 65, 43 unknownnoise0x20 0, 97, 42 endchannel diff --git a/audio/sfx/triangle2_2.asm b/audio/sfx/triangle2_2.asm index cbc2a642..6512648a 100644 --- a/audio/sfx/triangle2_2.asm +++ b/audio/sfx/triangle2_2.asm @@ -1,4 +1,4 @@ -SFX_Triangle2_2_Ch1: +SFX_Triangle2_2_Ch7: unknownnoise0x20 1, 65, 43 unknownnoise0x20 0, 97, 42 endchannel diff --git a/audio/sfx/triangle2_3.asm b/audio/sfx/triangle2_3.asm index 44fc95dd..b0612aba 100644 --- a/audio/sfx/triangle2_3.asm +++ b/audio/sfx/triangle2_3.asm @@ -1,4 +1,4 @@ -SFX_Triangle2_3_Ch1: +SFX_Triangle2_3_Ch7: unknownnoise0x20 1, 65, 43 unknownnoise0x20 0, 97, 42 endchannel diff --git a/audio/sfx/triangle3_1.asm b/audio/sfx/triangle3_1.asm index f5622bd7..9fd3952f 100644 --- a/audio/sfx/triangle3_1.asm +++ b/audio/sfx/triangle3_1.asm @@ -1,4 +1,4 @@ -SFX_Triangle3_1_Ch1: +SFX_Triangle3_1_Ch7: unknownnoise0x20 2, 145, 40 unknownnoise0x20 0, 113, 24 endchannel diff --git a/audio/sfx/triangle3_2.asm b/audio/sfx/triangle3_2.asm index 8b0b76e5..38b3198b 100644 --- a/audio/sfx/triangle3_2.asm +++ b/audio/sfx/triangle3_2.asm @@ -1,4 +1,4 @@ -SFX_Triangle3_2_Ch1: +SFX_Triangle3_2_Ch7: unknownnoise0x20 2, 145, 40 unknownnoise0x20 0, 113, 24 endchannel diff --git a/audio/sfx/triangle3_3.asm b/audio/sfx/triangle3_3.asm index d40779fb..138c8fac 100644 --- a/audio/sfx/triangle3_3.asm +++ b/audio/sfx/triangle3_3.asm @@ -1,4 +1,4 @@ -SFX_Triangle3_3_Ch1: +SFX_Triangle3_3_Ch7: unknownnoise0x20 2, 145, 40 unknownnoise0x20 0, 113, 24 endchannel diff --git a/audio/sfx/turn_off_pc_1.asm b/audio/sfx/turn_off_pc_1.asm index ca29a4cc..6b2561fe 100644 --- a/audio/sfx/turn_off_pc_1.asm +++ b/audio/sfx/turn_off_pc_1.asm @@ -1,4 +1,4 @@ -SFX_Turn_Off_PC_1_Ch1: +SFX_Turn_Off_PC_1_Ch4: duty 2 unknownsfx0x20 4, 240, 0, 6 unknownsfx0x20 4, 240, 0, 4 diff --git a/audio/sfx/turn_off_pc_3.asm b/audio/sfx/turn_off_pc_3.asm index 2ae0787b..cf6d95cd 100644 --- a/audio/sfx/turn_off_pc_3.asm +++ b/audio/sfx/turn_off_pc_3.asm @@ -1,4 +1,4 @@ -SFX_Turn_Off_PC_3_Ch1: +SFX_Turn_Off_PC_3_Ch4: duty 2 unknownsfx0x20 4, 240, 0, 6 unknownsfx0x20 4, 240, 0, 4 diff --git a/audio/sfx/turn_on_pc_1.asm b/audio/sfx/turn_on_pc_1.asm index 22433707..dede7c3e 100644 --- a/audio/sfx/turn_on_pc_1.asm +++ b/audio/sfx/turn_on_pc_1.asm @@ -1,4 +1,4 @@ -SFX_Turn_On_PC_1_Ch1: +SFX_Turn_On_PC_1_Ch4: duty 2 unknownsfx0x20 15, 242, 192, 7 unknownsfx0x20 15, 0, 0, 0 diff --git a/audio/sfx/turn_on_pc_3.asm b/audio/sfx/turn_on_pc_3.asm index d97dc1c7..1ed54d3c 100644 --- a/audio/sfx/turn_on_pc_3.asm +++ b/audio/sfx/turn_on_pc_3.asm @@ -1,4 +1,4 @@ -SFX_Turn_On_PC_3_Ch1: +SFX_Turn_On_PC_3_Ch4: duty 2 unknownsfx0x20 15, 242, 192, 7 unknownsfx0x20 15, 0, 0, 0 diff --git a/audio/sfx/unused2_2.asm b/audio/sfx/unused2_2.asm index 7e0350d4..36c10ba3 100755 --- a/audio/sfx/unused2_2.asm +++ b/audio/sfx/unused2_2.asm @@ -1,4 +1,4 @@ -SFX_08_unused2_Ch1: +SFX_08_unused2_Ch4: executemusic tempo 256 volume 7, 7 @@ -17,7 +17,7 @@ SFX_08_unused2_Ch1: endchannel -SFX_08_unused2_Ch2: +SFX_08_unused2_Ch5: executemusic vibrato 8, 2, 7 duty 2 @@ -33,7 +33,7 @@ SFX_08_unused2_Ch2: endchannel -SFX_08_unused2_Ch3: +SFX_08_unused2_Ch6: executemusic notetype 6, 1, 0 octave 4 diff --git a/audio/sfx/unused_1.asm b/audio/sfx/unused_1.asm index d0bbfd59..21d54fb1 100755 --- a/audio/sfx/unused_1.asm +++ b/audio/sfx/unused_1.asm @@ -1,4 +1,4 @@ -SFX_02_unused_Ch1: +SFX_02_unused_Ch4: dutycycle 240 unknownsfx0x20 15, 224, 128, 7 unknownsfx0x20 15, 240, 132, 7 @@ -9,7 +9,7 @@ SFX_02_unused_Ch1: endchannel -SFX_02_unused_Ch2: +SFX_02_unused_Ch5: dutycycle 5 unknownsfx0x20 15, 160, 65, 7 unknownsfx0x20 15, 176, 67, 7 @@ -20,7 +20,7 @@ SFX_02_unused_Ch2: endchannel -SFX_02_unused_Ch3: +SFX_02_unused_Ch7: unknownnoise0x20 2, 242, 76 unknownnoise0x20 6, 224, 58 unknownnoise0x20 15, 208, 58 diff --git a/audio/sfx/unused_2.asm b/audio/sfx/unused_2.asm index fd491b71..20de851f 100755 --- a/audio/sfx/unused_2.asm +++ b/audio/sfx/unused_2.asm @@ -1,4 +1,4 @@ -SFX_08_unused_Ch1: +SFX_08_unused_Ch4: dutycycle 240 unknownsfx0x20 15, 224, 128, 7 unknownsfx0x20 15, 240, 132, 7 @@ -9,7 +9,7 @@ SFX_08_unused_Ch1: endchannel -SFX_08_unused_Ch2: +SFX_08_unused_Ch5: dutycycle 5 unknownsfx0x20 15, 160, 65, 7 unknownsfx0x20 15, 176, 67, 7 @@ -20,7 +20,7 @@ SFX_08_unused_Ch2: endchannel -SFX_08_unused_Ch3: +SFX_08_unused_Ch7: unknownnoise0x20 2, 242, 76 unknownnoise0x20 6, 224, 58 unknownnoise0x20 15, 208, 58 diff --git a/audio/sfx/unused_3.asm b/audio/sfx/unused_3.asm index b00e55f5..d4a30539 100755 --- a/audio/sfx/unused_3.asm +++ b/audio/sfx/unused_3.asm @@ -1,4 +1,4 @@ -SFX_1f_unused_Ch1: +SFX_1f_unused_Ch4: dutycycle 240 unknownsfx0x20 15, 224, 128, 7 unknownsfx0x20 15, 240, 132, 7 @@ -9,7 +9,7 @@ SFX_1f_unused_Ch1: endchannel -SFX_1f_unused_Ch2: +SFX_1f_unused_Ch5: dutycycle 5 unknownsfx0x20 15, 160, 65, 7 unknownsfx0x20 15, 176, 67, 7 @@ -20,7 +20,7 @@ SFX_1f_unused_Ch2: endchannel -SFX_1f_unused_Ch3: +SFX_1f_unused_Ch7: unknownnoise0x20 2, 242, 76 unknownnoise0x20 6, 224, 58 unknownnoise0x20 15, 208, 58 diff --git a/audio/sfx/vine_whip.asm b/audio/sfx/vine_whip.asm index a8445131..ad0bd40b 100644 --- a/audio/sfx/vine_whip.asm +++ b/audio/sfx/vine_whip.asm @@ -1,4 +1,4 @@ -SFX_Vine_Whip_Ch1: +SFX_Vine_Whip_Ch7: unknownnoise0x20 1, 194, 51 unknownnoise0x20 2, 242, 33 unknownnoise0x20 1, 226, 51 diff --git a/audio/sfx/withdraw_deposit_1.asm b/audio/sfx/withdraw_deposit_1.asm index 59827ceb..d7a2f54d 100644 --- a/audio/sfx/withdraw_deposit_1.asm +++ b/audio/sfx/withdraw_deposit_1.asm @@ -1,4 +1,4 @@ -SFX_Withdraw_Deposit_1_Ch1: +SFX_Withdraw_Deposit_1_Ch4: duty 1 unknownsfx0x10 58 unknownsfx0x20 4, 242, 0, 5 diff --git a/audio/sfx/withdraw_deposit_3.asm b/audio/sfx/withdraw_deposit_3.asm index 0add48e1..1fd1fe3e 100644 --- a/audio/sfx/withdraw_deposit_3.asm +++ b/audio/sfx/withdraw_deposit_3.asm @@ -1,4 +1,4 @@ -SFX_Withdraw_Deposit_3_Ch1: +SFX_Withdraw_Deposit_3_Ch4: duty 1 unknownsfx0x10 58 unknownsfx0x20 4, 242, 0, 5 |