ref: 84c7985e67b0838fce04e49a0916aa5a873131b3
parent: 70dde9d96b0e3025c72ae29783e94c56fa5cbe1c
author: dannye <corrnondacqb@yahoo.com>
date: Wed Jul 27 15:30:57 EDT 2016
Fix sound effect channel numbering mostly so that sound effects that only use the noise channel are labelled 'Ch7' instead of 'Ch1'
--- a/audio.asm
+++ b/audio.asm
@@ -162,7 +162,7 @@
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 @@
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 @@
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"
--- a/audio/headers/sfxheaders1.asm
+++ b/audio/headers/sfxheaders1.asm
@@ -3,560 +3,560 @@
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
--- a/audio/headers/sfxheaders2.asm
+++ b/audio/headers/sfxheaders2.asm
@@ -3,704 +3,704 @@
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
--- a/audio/headers/sfxheaders3.asm
+++ b/audio/headers/sfxheaders3.asm
@@ -3,594 +3,594 @@
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
--- 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
--- 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
--- 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
--- 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
--- 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 @@
endchannel
-SFX_Ball_Poof_Ch2:
+SFX_Ball_Poof_Ch7:
unknownnoise0x20 15, 162, 34
endchannel
--- a/audio/sfx/ball_toss.asm
+++ b/audio/sfx/ball_toss.asm
@@ -1,4 +1,4 @@
-SFX_Ball_Toss_Ch1:
+SFX_Ball_Toss_Ch4:
duty 2
unknownsfx0x10 47
unknownsfx0x20 15, 242, 128, 7
@@ -5,7 +5,7 @@
endchannel
-SFX_Ball_Toss_Ch2:
+SFX_Ball_Toss_Ch5:
duty 2
unknownsfx0x20 15, 194, 130, 7
endchannel
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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 @@
endchannel
-SFX_Battle_1E_Ch2:
+SFX_Battle_1E_Ch7:
unknownnoise0x20 0, 209, 66
unknownnoise0x20 4, 161, 50
unknownnoise0x20 0, 209, 34
--- 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
--- 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
--- 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
--- 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
--- 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 @@
endchannel
-SFX_Battle_24_Ch2:
+SFX_Battle_24_Ch7:
unknownnoise0x20 15, 63, 34
unknownnoise0x20 15, 242, 33
endchannel
--- 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
--- 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
--- 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 @@
endchannel
-SFX_Battle_27_Ch2:
+SFX_Battle_27_Ch5:
dutycycle 179
unknownsfx0x20 15, 47, 200, 7
@@ -20,8 +20,8 @@
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
--- 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
--- 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
--- 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
--- a/audio/sfx/battle_2b.asm
+++ b/audio/sfx/battle_2b.asm
@@ -1,4 +1,4 @@
-SFX_Battle_2B_Ch1:
+SFX_Battle_2B_Ch4:
dutycycle 210
unknownsfx0x20 3, 129, 0, 3
unknownsfx0x20 3, 193, 0, 4
@@ -5,17 +5,17 @@
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
--- 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
--- 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
--- 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
--- 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 @@
endchannel
-SFX_Battle_31_Ch2:
+SFX_Battle_31_Ch5:
duty 3
unknownsfx0x20 15, 255, 226, 7
unknownsfx0x20 15, 255, 225, 7
--- 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 @@
endchannel
-SFX_Battle_32_Ch2:
+SFX_Battle_32_Ch5:
duty 3
unknownsfx0x20 8, 241, 1, 7
endchannel
--- 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 @@
endchannel
-SFX_Battle_33_Ch2:
+SFX_Battle_33_Ch5:
duty 3
unknownsfx0x20 6, 225, 16, 5
unknownsfx0x20 6, 225, 144, 5
--- 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 @@
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 @@
endchannel
-SFX_Battle_34_Ch3:
+SFX_Battle_34_Ch7:
unknownnoise0x20 4, 255, 81
unknownnoise0x20 8, 255, 84
unknownnoise0x20 15, 255, 85
--- 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 @@
endchannel
-SFX_Battle_35_Ch2:
+SFX_Battle_35_Ch5:
executemusic
vibrato 10, 2, 3
duty 2
--- 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 @@
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 @@
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
--- 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 @@
endchannel
-SFX_Caught_Mon_Ch2:
+SFX_Caught_Mon_Ch5:
executemusic
duty 2
notetype 6, 12, 2
@@ -44,7 +44,7 @@
endchannel
-SFX_Caught_Mon_Ch3:
+SFX_Caught_Mon_Ch6:
executemusic
notetype 6, 1, 0
octave 4
--- 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
--- 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
--- 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 @@
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 @@
endchannel
-SFX_Cry00_1_Ch3:
+SFX_Cry00_1_Ch7:
unknownnoise0x20 3, 161, 28
unknownnoise0x20 14, 148, 44
unknownnoise0x20 8, 129, 28
--- 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 @@
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 @@
endchannel
-SFX_Cry00_2_Ch3:
+SFX_Cry00_2_Ch7:
unknownnoise0x20 3, 161, 28
unknownnoise0x20 14, 148, 44
unknownnoise0x20 8, 129, 28
--- 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 @@
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 @@
endchannel
-SFX_Cry00_3_Ch3:
+SFX_Cry00_3_Ch7:
unknownnoise0x20 3, 161, 28
unknownnoise0x20 14, 148, 44
unknownnoise0x20 8, 129, 28
--- 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 @@
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 @@
endchannel
-SFX_Cry01_1_Ch3:
+SFX_Cry01_1_Ch7:
unknownnoise0x20 3, 162, 60
unknownnoise0x20 12, 148, 44
unknownnoise0x20 3, 130, 28
--- 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 @@
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 @@
endchannel
-SFX_Cry01_2_Ch3:
+SFX_Cry01_2_Ch7:
unknownnoise0x20 3, 162, 60
unknownnoise0x20 12, 148, 44
unknownnoise0x20 3, 130, 28
--- 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 @@
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 @@
endchannel
-SFX_Cry01_3_Ch3:
+SFX_Cry01_3_Ch7:
unknownnoise0x20 3, 162, 60
unknownnoise0x20 12, 148, 44
unknownnoise0x20 3, 130, 28
--- 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,7 +6,7 @@
endchannel
-SFX_Cry02_1_Ch2:
+SFX_Cry02_1_Ch5:
dutycycle 165
unknownsfx0x20 7, 149, 65, 4
unknownsfx0x20 2, 129, 33, 5
@@ -13,5 +13,5 @@
unknownsfx0x20 8, 97, 26, 5
-SFX_Cry02_1_Ch3:
+SFX_Cry02_1_Ch7:
endchannel
--- 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,7 +6,7 @@
endchannel
-SFX_Cry02_2_Ch2:
+SFX_Cry02_2_Ch5:
dutycycle 165
unknownsfx0x20 7, 149, 65, 4
unknownsfx0x20 2, 129, 33, 5
@@ -13,5 +13,5 @@
unknownsfx0x20 8, 97, 26, 5
-SFX_Cry02_2_Ch3:
+SFX_Cry02_2_Ch7:
endchannel
--- 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,7 +6,7 @@
endchannel
-SFX_Cry02_3_Ch2:
+SFX_Cry02_3_Ch5:
dutycycle 165
unknownsfx0x20 7, 149, 65, 4
unknownsfx0x20 2, 129, 33, 5
@@ -13,5 +13,5 @@
unknownsfx0x20 8, 97, 26, 5
-SFX_Cry02_3_Ch3:
+SFX_Cry02_3_Ch7:
endchannel
--- 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 @@
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 @@
endchannel
-SFX_Cry03_1_Ch3:
+SFX_Cry03_1_Ch7:
unknownnoise0x20 12, 228, 76
unknownnoise0x20 10, 199, 92
unknownnoise0x20 12, 182, 76
--- 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 @@
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 @@
endchannel
-SFX_Cry03_2_Ch3:
+SFX_Cry03_2_Ch7:
unknownnoise0x20 12, 228, 76
unknownnoise0x20 10, 199, 92
unknownnoise0x20 12, 182, 76
--- 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 @@
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 @@
endchannel
-SFX_Cry03_3_Ch3:
+SFX_Cry03_3_Ch7:
unknownnoise0x20 12, 228, 76
unknownnoise0x20 10, 199, 92
unknownnoise0x20 12, 182, 76
--- 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 @@
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 @@
endchannel
-SFX_Cry04_1_Ch3:
+SFX_Cry04_1_Ch7:
unknownnoise0x20 7, 214, 92
unknownnoise0x20 8, 230, 76
unknownnoise0x20 4, 212, 92
--- 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 @@
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 @@
endchannel
-SFX_Cry04_2_Ch3:
+SFX_Cry04_2_Ch7:
unknownnoise0x20 7, 214, 92
unknownnoise0x20 8, 230, 76
unknownnoise0x20 4, 212, 92
--- 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 @@
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 @@
endchannel
-SFX_Cry04_3_Ch3:
+SFX_Cry04_3_Ch7:
unknownnoise0x20 7, 214, 92
unknownnoise0x20 8, 230, 76
unknownnoise0x20 4, 212, 92
--- 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 @@
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 @@
unknownsfx0x20 8, 129, 193, 4
-SFX_Cry05_1_Ch3:
+SFX_Cry05_1_Ch7:
endchannel
--- 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 @@
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 @@
unknownsfx0x20 8, 129, 193, 4
-SFX_Cry05_2_Ch3:
+SFX_Cry05_2_Ch7:
endchannel
--- 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 @@
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 @@
unknownsfx0x20 8, 129, 193, 4
-SFX_Cry05_3_Ch3:
+SFX_Cry05_3_Ch7:
endchannel
--- 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 @@
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
--- 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 @@
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
--- 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 @@
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
--- 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 @@
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 @@
endchannel
-SFX_Cry07_1_Ch3:
+SFX_Cry07_1_Ch7:
unknownnoise0x20 4, 211, 92
unknownnoise0x20 15, 230, 76
unknownnoise0x20 8, 177, 92
--- 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 @@
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 @@
endchannel
-SFX_Cry07_2_Ch3:
+SFX_Cry07_2_Ch7:
unknownnoise0x20 4, 211, 92
unknownnoise0x20 15, 230, 76
unknownnoise0x20 8, 177, 92
--- 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 @@
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 @@
endchannel
-SFX_Cry07_3_Ch3:
+SFX_Cry07_3_Ch7:
unknownnoise0x20 4, 211, 92
unknownnoise0x20 15, 230, 76
unknownnoise0x20 8, 177, 92
--- 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 @@
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 @@
endchannel
-SFX_Cry08_1_Ch3:
+SFX_Cry08_1_Ch7:
unknownnoise0x20 12, 230, 76
unknownnoise0x20 11, 215, 92
unknownnoise0x20 15, 194, 76
--- 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 @@
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 @@
endchannel
-SFX_Cry08_2_Ch3:
+SFX_Cry08_2_Ch7:
unknownnoise0x20 12, 230, 76
unknownnoise0x20 11, 215, 92
unknownnoise0x20 15, 194, 76
--- 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 @@
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 @@
endchannel
-SFX_Cry08_3_Ch3:
+SFX_Cry08_3_Ch7:
unknownnoise0x20 12, 230, 76
unknownnoise0x20 11, 215, 92
unknownnoise0x20 15, 194, 76
--- 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 @@
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 @@
endchannel
-SFX_Cry09_1_Ch3:
+SFX_Cry09_1_Ch7:
unknownnoise0x20 2, 242, 60
unknownnoise0x20 8, 228, 62
unknownnoise0x20 15, 215, 60
--- 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 @@
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 @@
endchannel
-SFX_Cry09_2_Ch3:
+SFX_Cry09_2_Ch7:
unknownnoise0x20 2, 242, 60
unknownnoise0x20 8, 228, 62
unknownnoise0x20 15, 215, 60
--- 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 @@
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 @@
endchannel
-SFX_Cry09_3_Ch3:
+SFX_Cry09_3_Ch7:
unknownnoise0x20 2, 242, 60
unknownnoise0x20 8, 228, 62
unknownnoise0x20 15, 215, 60
--- 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 @@
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 @@
endchannel
-SFX_Cry0A_1_Ch3:
+SFX_Cry0A_1_Ch7:
unknownnoise0x20 2, 242, 60
unknownnoise0x20 8, 228, 62
unknownnoise0x20 8, 215, 60
--- 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 @@
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 @@
endchannel
-SFX_Cry0A_2_Ch3:
+SFX_Cry0A_2_Ch7:
unknownnoise0x20 2, 242, 60
unknownnoise0x20 8, 228, 62
unknownnoise0x20 8, 215, 60
--- 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 @@
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 @@
endchannel
-SFX_Cry0A_3_Ch3:
+SFX_Cry0A_3_Ch7:
unknownnoise0x20 2, 242, 60
unknownnoise0x20 8, 228, 62
unknownnoise0x20 8, 215, 60
--- 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 @@
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 @@
endchannel
-SFX_Cry0B_1_Ch3:
+SFX_Cry0B_1_Ch7:
unknownnoise0x20 15, 8, 0
unknownnoise0x20 4, 8, 0
unknownnoise0x20 4, 209, 76
--- 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 @@
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 @@
endchannel
-SFX_Cry0B_2_Ch3:
+SFX_Cry0B_2_Ch7:
unknownnoise0x20 15, 8, 0
unknownnoise0x20 4, 8, 0
unknownnoise0x20 4, 209, 76
--- 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 @@
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 @@
endchannel
-SFX_Cry0B_3_Ch3:
+SFX_Cry0B_3_Ch7:
unknownnoise0x20 15, 8, 0
unknownnoise0x20 4, 8, 0
unknownnoise0x20 4, 209, 76
--- 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 @@
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 @@
unknownsfx0x20 8, 145, 225, 5
-SFX_Cry0C_1_Ch3:
+SFX_Cry0C_1_Ch7:
endchannel
--- 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 @@
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 @@
unknownsfx0x20 8, 145, 225, 5
-SFX_Cry0C_2_Ch3:
+SFX_Cry0C_2_Ch7:
endchannel
--- 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 @@
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 @@
unknownsfx0x20 8, 145, 225, 5
-SFX_Cry0C_3_Ch3:
+SFX_Cry0C_3_Ch7:
endchannel
--- 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 @@
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 @@
endchannel
-SFX_Cry0D_1_Ch3:
+SFX_Cry0D_1_Ch7:
unknownnoise0x20 6, 210, 28
unknownnoise0x20 9, 177, 44
unknownnoise0x20 8, 194, 44
--- 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 @@
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 @@
endchannel
-SFX_Cry0D_2_Ch3:
+SFX_Cry0D_2_Ch7:
unknownnoise0x20 6, 210, 28
unknownnoise0x20 9, 177, 44
unknownnoise0x20 8, 194, 44
--- 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 @@
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 @@
endchannel
-SFX_Cry0D_3_Ch3:
+SFX_Cry0D_3_Ch7:
unknownnoise0x20 6, 210, 28
unknownnoise0x20 9, 177, 44
unknownnoise0x20 8, 194, 44
--- 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 @@
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 @@
endchannel
-SFX_Cry0E_1_Ch3:
+SFX_Cry0E_1_Ch7:
unknownnoise0x20 2, 97, 50
unknownnoise0x20 2, 97, 33
unknownnoise0x20 8, 97, 17
--- 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 @@
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 @@
endchannel
-SFX_Cry0E_2_Ch3:
+SFX_Cry0E_2_Ch7:
unknownnoise0x20 2, 97, 50
unknownnoise0x20 2, 97, 33
unknownnoise0x20 8, 97, 17
--- 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 @@
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 @@
endchannel
-SFX_Cry0E_3_Ch3:
+SFX_Cry0E_3_Ch7:
unknownnoise0x20 2, 97, 50
unknownnoise0x20 2, 97, 33
unknownnoise0x20 8, 97, 17
--- 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 @@
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 @@
endchannel
-SFX_Cry0F_1_Ch3:
+SFX_Cry0F_1_Ch7:
unknownnoise0x20 3, 228, 60
unknownnoise0x20 12, 214, 44
unknownnoise0x20 4, 228, 60
--- 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 @@
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 @@
endchannel
-SFX_Cry0F_2_Ch3:
+SFX_Cry0F_2_Ch7:
unknownnoise0x20 3, 228, 60
unknownnoise0x20 12, 214, 44
unknownnoise0x20 4, 228, 60
--- 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 @@
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 @@
endchannel
-SFX_Cry0F_3_Ch3:
+SFX_Cry0F_3_Ch7:
unknownnoise0x20 3, 228, 60
unknownnoise0x20 12, 214, 44
unknownnoise0x20 4, 228, 60
--- 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 @@
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 @@
endchannel
-SFX_Cry10_1_Ch3:
+SFX_Cry10_1_Ch7:
unknownnoise0x20 4, 116, 33
unknownnoise0x20 4, 116, 16
unknownnoise0x20 4, 113, 32
--- 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 @@
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 @@
endchannel
-SFX_Cry10_2_Ch3:
+SFX_Cry10_2_Ch7:
unknownnoise0x20 4, 116, 33
unknownnoise0x20 4, 116, 16
unknownnoise0x20 4, 113, 32
--- 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 @@
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 @@
endchannel
-SFX_Cry10_3_Ch3:
+SFX_Cry10_3_Ch7:
unknownnoise0x20 4, 116, 33
unknownnoise0x20 4, 116, 16
unknownnoise0x20 4, 113, 32
--- 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 @@
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 @@
endchannel
-SFX_Cry11_1_Ch3:
+SFX_Cry11_1_Ch7:
unknownnoise0x20 2, 242, 76
unknownnoise0x20 6, 230, 58
unknownnoise0x20 4, 215, 58
--- 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 @@
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 @@
endchannel
-SFX_Cry11_2_Ch3:
+SFX_Cry11_2_Ch7:
unknownnoise0x20 2, 242, 76
unknownnoise0x20 6, 230, 58
unknownnoise0x20 4, 215, 58
--- 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 @@
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 @@
endchannel
-SFX_Cry11_3_Ch3:
+SFX_Cry11_3_Ch7:
unknownnoise0x20 2, 242, 76
unknownnoise0x20 6, 230, 58
unknownnoise0x20 4, 215, 58
--- 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 @@
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 @@
endchannel
-SFX_Cry12_1_Ch3:
+SFX_Cry12_1_Ch7:
unknownnoise0x20 10, 230, 108
unknownnoise0x20 15, 210, 92
unknownnoise0x20 3, 194, 108
--- 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 @@
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 @@
endchannel
-SFX_Cry12_2_Ch3:
+SFX_Cry12_2_Ch7:
unknownnoise0x20 10, 230, 108
unknownnoise0x20 15, 210, 92
unknownnoise0x20 3, 194, 108
--- 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 @@
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 @@
endchannel
-SFX_Cry12_3_Ch3:
+SFX_Cry12_3_Ch7:
unknownnoise0x20 10, 230, 108
unknownnoise0x20 15, 210, 92
unknownnoise0x20 3, 194, 108
--- 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 @@
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 @@
endchannel
-SFX_Cry13_1_Ch3:
+SFX_Cry13_1_Ch7:
unknownnoise0x20 10, 230, 92
unknownnoise0x20 10, 214, 108
unknownnoise0x20 4, 194, 76
--- 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 @@
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 @@
endchannel
-SFX_Cry13_2_Ch3:
+SFX_Cry13_2_Ch7:
unknownnoise0x20 10, 230, 92
unknownnoise0x20 10, 214, 108
unknownnoise0x20 4, 194, 76
--- 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 @@
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 @@
endchannel
-SFX_Cry13_3_Ch3:
+SFX_Cry13_3_Ch7:
unknownnoise0x20 10, 230, 92
unknownnoise0x20 10, 214, 108
unknownnoise0x20 4, 194, 76
--- 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 @@
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 @@
endchannel
-SFX_Cry14_1_Ch3:
+SFX_Cry14_1_Ch7:
unknownnoise0x20 8, 228, 76
unknownnoise0x20 14, 196, 60
unknownnoise0x20 8, 209, 44
--- 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 @@
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 @@
endchannel
-SFX_Cry14_2_Ch3:
+SFX_Cry14_2_Ch7:
unknownnoise0x20 8, 228, 76
unknownnoise0x20 14, 196, 60
unknownnoise0x20 8, 209, 44
--- 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 @@
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 @@
endchannel
-SFX_Cry14_3_Ch3:
+SFX_Cry14_3_Ch7:
unknownnoise0x20 8, 228, 76
unknownnoise0x20 14, 196, 60
unknownnoise0x20 8, 209, 44
--- 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 @@
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 @@
endchannel
-SFX_Cry15_1_Ch3:
+SFX_Cry15_1_Ch7:
unknownnoise0x20 6, 227, 92
unknownnoise0x20 14, 214, 76
unknownnoise0x20 6, 198, 60
--- 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 @@
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 @@
endchannel
-SFX_Cry15_2_Ch3:
+SFX_Cry15_2_Ch7:
unknownnoise0x20 6, 227, 92
unknownnoise0x20 14, 214, 76
unknownnoise0x20 6, 198, 60
--- 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 @@
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 @@
endchannel
-SFX_Cry15_3_Ch3:
+SFX_Cry15_3_Ch7:
unknownnoise0x20 6, 227, 92
unknownnoise0x20 14, 214, 76
unknownnoise0x20 6, 198, 60
--- 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 @@
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 @@
endchannel
-SFX_Cry16_1_Ch3:
+SFX_Cry16_1_Ch7:
unknownnoise0x20 13, 246, 76
unknownnoise0x20 4, 230, 60
unknownnoise0x20 15, 242, 76
--- 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 @@
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 @@
endchannel
-SFX_Cry16_2_Ch3:
+SFX_Cry16_2_Ch7:
unknownnoise0x20 13, 246, 76
unknownnoise0x20 4, 230, 60
unknownnoise0x20 15, 242, 76
--- 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 @@
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 @@
endchannel
-SFX_Cry16_3_Ch3:
+SFX_Cry16_3_Ch7:
unknownnoise0x20 13, 246, 76
unknownnoise0x20 4, 230, 60
unknownnoise0x20 15, 242, 76
--- 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 @@
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 @@
endchannel
-SFX_Cry17_1_Ch3:
+SFX_Cry17_1_Ch7:
unknownnoise0x20 14, 247, 124
unknownnoise0x20 12, 246, 108
unknownnoise0x20 9, 228, 124
--- 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 @@
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 @@
endchannel
-SFX_Cry17_2_Ch3:
+SFX_Cry17_2_Ch7:
unknownnoise0x20 14, 247, 124
unknownnoise0x20 12, 246, 108
unknownnoise0x20 9, 228, 124
--- 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 @@
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 @@
endchannel
-SFX_Cry17_3_Ch3:
+SFX_Cry17_3_Ch7:
unknownnoise0x20 14, 247, 124
unknownnoise0x20 12, 246, 108
unknownnoise0x20 9, 228, 124
--- 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 @@
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 @@
endchannel
-SFX_Cry18_1_Ch3:
+SFX_Cry18_1_Ch7:
unknownnoise0x20 6, 227, 76
unknownnoise0x20 4, 195, 60
unknownnoise0x20 5, 212, 60
--- 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 @@
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 @@
endchannel
-SFX_Cry18_2_Ch3:
+SFX_Cry18_2_Ch7:
unknownnoise0x20 6, 227, 76
unknownnoise0x20 4, 195, 60
unknownnoise0x20 5, 212, 60
--- 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 @@
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 @@
endchannel
-SFX_Cry18_3_Ch3:
+SFX_Cry18_3_Ch7:
unknownnoise0x20 6, 227, 76
unknownnoise0x20 4, 195, 60
unknownnoise0x20 5, 212, 60
--- 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 @@
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 @@
unknownsfx0x20 15, 162, 1, 7
-SFX_Cry19_1_Ch3:
+SFX_Cry19_1_Ch7:
endchannel
--- 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 @@
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 @@
unknownsfx0x20 15, 162, 1, 7
-SFX_Cry19_2_Ch3:
+SFX_Cry19_2_Ch7:
endchannel
--- 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 @@
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 @@
unknownsfx0x20 15, 162, 1, 7
-SFX_Cry19_3_Ch3:
+SFX_Cry19_3_Ch7:
endchannel
--- 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 @@
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 @@
endchannel
-SFX_Cry1A_1_Ch3:
+SFX_Cry1A_1_Ch7:
unknownnoise0x20 3, 226, 60
unknownnoise0x20 8, 214, 76
unknownnoise0x20 5, 212, 60
--- 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 @@
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 @@
endchannel
-SFX_Cry1A_2_Ch3:
+SFX_Cry1A_2_Ch7:
unknownnoise0x20 3, 226, 60
unknownnoise0x20 8, 214, 76
unknownnoise0x20 5, 212, 60
--- 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 @@
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 @@
endchannel
-SFX_Cry1A_3_Ch3:
+SFX_Cry1A_3_Ch7:
unknownnoise0x20 3, 226, 60
unknownnoise0x20 8, 214, 76
unknownnoise0x20 5, 212, 60
--- 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 @@
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 @@
endchannel
-SFX_Cry1B_1_Ch3:
+SFX_Cry1B_1_Ch7:
unknownnoise0x20 10, 166, 60
unknownnoise0x20 14, 148, 44
unknownnoise0x20 5, 163, 60
--- 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 @@
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 @@
endchannel
-SFX_Cry1B_2_Ch3:
+SFX_Cry1B_2_Ch7:
unknownnoise0x20 10, 166, 60
unknownnoise0x20 14, 148, 44
unknownnoise0x20 5, 163, 60
--- 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 @@
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 @@
endchannel
-SFX_Cry1B_3_Ch3:
+SFX_Cry1B_3_Ch7:
unknownnoise0x20 10, 166, 60
unknownnoise0x20 14, 148, 44
unknownnoise0x20 5, 163, 60
--- 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 @@
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 @@
endchannel
-SFX_Cry1C_1_Ch3:
+SFX_Cry1C_1_Ch7:
unknownnoise0x20 13, 25, 124
unknownnoise0x20 13, 247, 140
unknownnoise0x20 12, 214, 124
--- 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 @@
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 @@
endchannel
-SFX_Cry1C_2_Ch3:
+SFX_Cry1C_2_Ch7:
unknownnoise0x20 13, 25, 124
unknownnoise0x20 13, 247, 140
unknownnoise0x20 12, 214, 124
--- 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 @@
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 @@
endchannel
-SFX_Cry1C_3_Ch3:
+SFX_Cry1C_3_Ch7:
unknownnoise0x20 13, 25, 124
unknownnoise0x20 13, 247, 140
unknownnoise0x20 12, 214, 124
--- 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 @@
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 @@
endchannel
-SFX_Cry1D_1_Ch3:
+SFX_Cry1D_1_Ch7:
unknownnoise0x20 6, 230, 76
unknownnoise0x20 15, 214, 60
unknownnoise0x20 10, 197, 74
--- 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 @@
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 @@
endchannel
-SFX_Cry1D_2_Ch3:
+SFX_Cry1D_2_Ch7:
unknownnoise0x20 6, 230, 76
unknownnoise0x20 15, 214, 60
unknownnoise0x20 10, 197, 74
--- 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 @@
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 @@
endchannel
-SFX_Cry1D_3_Ch3:
+SFX_Cry1D_3_Ch7:
unknownnoise0x20 6, 230, 76
unknownnoise0x20 15, 214, 60
unknownnoise0x20 10, 197, 74
--- 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 @@
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 @@
endchannel
-SFX_Cry1E_1_Ch3:
+SFX_Cry1E_1_Ch7:
unknownnoise0x20 6, 8, 1
unknownnoise0x20 5, 226, 92
unknownnoise0x20 5, 194, 76
--- 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 @@
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 @@
endchannel
-SFX_Cry1E_2_Ch3:
+SFX_Cry1E_2_Ch7:
unknownnoise0x20 6, 8, 1
unknownnoise0x20 5, 226, 92
unknownnoise0x20 5, 194, 76
--- 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 @@
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 @@
endchannel
-SFX_Cry1E_3_Ch3:
+SFX_Cry1E_3_Ch7:
unknownnoise0x20 6, 8, 1
unknownnoise0x20 5, 226, 92
unknownnoise0x20 5, 194, 76
--- 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 @@
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 @@
endchannel
-SFX_Cry1F_1_Ch3:
+SFX_Cry1F_1_Ch7:
unknownnoise0x20 5, 196, 70
unknownnoise0x20 13, 165, 68
unknownnoise0x20 8, 196, 69
--- 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 @@
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 @@
endchannel
-SFX_Cry1F_2_Ch3:
+SFX_Cry1F_2_Ch7:
unknownnoise0x20 5, 196, 70
unknownnoise0x20 13, 165, 68
unknownnoise0x20 8, 196, 69
--- 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 @@
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 @@
endchannel
-SFX_Cry1F_3_Ch3:
+SFX_Cry1F_3_Ch7:
unknownnoise0x20 5, 196, 70
unknownnoise0x20 13, 165, 68
unknownnoise0x20 8, 196, 69
--- 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 @@
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 @@
endchannel
-SFX_Cry20_1_Ch3:
+SFX_Cry20_1_Ch7:
unknownnoise0x20 14, 242, 101
unknownnoise0x20 13, 226, 85
unknownnoise0x20 14, 210, 86
--- 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 @@
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 @@
endchannel
-SFX_Cry20_2_Ch3:
+SFX_Cry20_2_Ch7:
unknownnoise0x20 14, 242, 101
unknownnoise0x20 13, 226, 85
unknownnoise0x20 14, 210, 86
--- 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 @@
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 @@
endchannel
-SFX_Cry20_3_Ch3:
+SFX_Cry20_3_Ch7:
unknownnoise0x20 14, 242, 101
unknownnoise0x20 13, 226, 85
unknownnoise0x20 14, 210, 86
--- 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 @@
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 @@
unknownsfx0x20 8, 193, 0, 5
-SFX_Cry21_1_Ch3:
+SFX_Cry21_1_Ch7:
endchannel
--- 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 @@
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 @@
unknownsfx0x20 8, 193, 0, 5
-SFX_Cry21_2_Ch3:
+SFX_Cry21_2_Ch7:
endchannel
--- 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 @@
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 @@
unknownsfx0x20 8, 193, 0, 5
-SFX_Cry21_3_Ch3:
+SFX_Cry21_3_Ch7:
endchannel
--- 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 @@
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 @@
endchannel
-SFX_Cry22_1_Ch3:
+SFX_Cry22_1_Ch7:
unknownnoise0x20 2, 146, 73
unknownnoise0x20 7, 181, 41
unknownnoise0x20 1, 162, 57
--- 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 @@
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 @@
endchannel
-SFX_Cry22_2_Ch3:
+SFX_Cry22_2_Ch7:
unknownnoise0x20 2, 146, 73
unknownnoise0x20 7, 181, 41
unknownnoise0x20 1, 162, 57
--- 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 @@
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 @@
endchannel
-SFX_Cry22_3_Ch3:
+SFX_Cry22_3_Ch7:
unknownnoise0x20 2, 146, 73
unknownnoise0x20 7, 181, 41
unknownnoise0x20 1, 162, 57
--- 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 @@
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 @@
endchannel
-SFX_Cry23_1_Ch3:
+SFX_Cry23_1_Ch7:
unknownnoise0x20 3, 242, 60
unknownnoise0x20 13, 230, 44
unknownnoise0x20 15, 215, 60
--- 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 @@
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 @@
endchannel
-SFX_Cry23_2_Ch3:
+SFX_Cry23_2_Ch7:
unknownnoise0x20 3, 242, 60
unknownnoise0x20 13, 230, 44
unknownnoise0x20 15, 215, 60
--- 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 @@
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 @@
endchannel
-SFX_Cry23_3_Ch3:
+SFX_Cry23_3_Ch7:
unknownnoise0x20 3, 242, 60
unknownnoise0x20 13, 230, 44
unknownnoise0x20 15, 215, 60
--- 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 @@
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 @@
endchannel
-SFX_Cry24_1_Ch3:
+SFX_Cry24_1_Ch7:
unknownnoise0x20 15, 228, 60
unknownnoise0x20 10, 199, 76
unknownnoise0x20 10, 199, 60
--- 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 @@
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 @@
endchannel
-SFX_Cry24_2_Ch3:
+SFX_Cry24_2_Ch7:
unknownnoise0x20 15, 228, 60
unknownnoise0x20 10, 199, 76
unknownnoise0x20 10, 199, 60
--- 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 @@
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 @@
endchannel
-SFX_Cry24_3_Ch3:
+SFX_Cry24_3_Ch7:
unknownnoise0x20 15, 228, 60
unknownnoise0x20 10, 199, 76
unknownnoise0x20 10, 199, 60
--- 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 @@
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 @@
endchannel
-SFX_Cry25_1_Ch3:
+SFX_Cry25_1_Ch7:
unknownnoise0x20 8, 214, 44
unknownnoise0x20 12, 198, 60
unknownnoise0x20 10, 182, 44
--- 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 @@
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 @@
endchannel
-SFX_Cry25_2_Ch3:
+SFX_Cry25_2_Ch7:
unknownnoise0x20 8, 214, 44
unknownnoise0x20 12, 198, 60
unknownnoise0x20 10, 182, 44
--- 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 @@
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 @@
endchannel
-SFX_Cry25_3_Ch3:
+SFX_Cry25_3_Ch7:
unknownnoise0x20 8, 214, 44
unknownnoise0x20 12, 198, 60
unknownnoise0x20 10, 182, 44
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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 @@
endchannel
-SFX_Denied_1_Ch2:
+SFX_Denied_1_Ch5:
duty 3
unknownsfx0x20 4, 240, 1, 4
unknownsfx0x20 4, 0, 0, 0
--- 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 @@
endchannel
-SFX_Denied_3_Ch2:
+SFX_Denied_3_Ch5:
duty 3
unknownsfx0x20 4, 240, 1, 4
unknownsfx0x20 4, 0, 0, 0
--- 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 @@
endchannel
-SFX_Dex_Page_Added_Ch2:
+SFX_Dex_Page_Added_Ch5:
duty 2
unknownsfx0x20 15, 146, 0, 6
unknownsfx0x20 15, 146, 130, 7
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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 @@
endchannel
-SFX_Get_Item1_1_Ch2:
+SFX_Get_Item1_1_Ch5:
executemusic
vibrato 8, 2, 7
duty 2
@@ -30,7 +30,7 @@
endchannel
-SFX_Get_Item1_1_Ch3:
+SFX_Get_Item1_1_Ch6:
executemusic
notetype 4, 1, 0
octave 4
--- 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 @@
endchannel
-SFX_Get_Item1_3_Ch2:
+SFX_Get_Item1_3_Ch5:
executemusic
vibrato 8, 2, 7
duty 2
@@ -30,7 +30,7 @@
endchannel
-SFX_Get_Item1_3_Ch3:
+SFX_Get_Item1_3_Ch6:
executemusic
notetype 4, 1, 0
octave 4
--- 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 @@
endchannel
-SFX_Get_Item2_1_Ch2:
+SFX_Get_Item2_1_Ch5:
executemusic
vibrato 8, 2, 7
duty 2
@@ -46,7 +46,7 @@
endchannel
-SFX_Get_Item2_1_Ch3:
+SFX_Get_Item2_1_Ch6:
executemusic
notetype 5, 1, 0
octave 5
--- 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 @@
endchannel
-SFX_Get_Item2_2_Ch2:
+SFX_Get_Item2_2_Ch5:
executemusic
vibrato 8, 2, 7
duty 2
@@ -46,7 +46,7 @@
endchannel
-SFX_Get_Item2_2_Ch3:
+SFX_Get_Item2_2_Ch6:
executemusic
notetype 5, 1, 0
octave 5
--- 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 @@
endchannel
-SFX_Get_Item2_3_Ch2:
+SFX_Get_Item2_3_Ch5:
executemusic
vibrato 8, 2, 7
duty 2
@@ -46,7 +46,7 @@
endchannel
-SFX_Get_Item2_3_Ch3:
+SFX_Get_Item2_3_Ch6:
executemusic
notetype 5, 1, 0
octave 5
--- 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 @@
endchannel
-SFX_Get_Key_Item_1_Ch2:
+SFX_Get_Key_Item_1_Ch5:
executemusic
vibrato 4, 2, 3
duty 2
@@ -47,7 +47,7 @@
endchannel
-SFX_Get_Key_Item_1_Ch3:
+SFX_Get_Key_Item_1_Ch6:
executemusic
notetype 5, 1, 0
octave 4
--- 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 @@
endchannel
-SFX_Get_Key_Item_3_Ch2:
+SFX_Get_Key_Item_3_Ch5:
executemusic
vibrato 4, 2, 3
duty 2
@@ -47,7 +47,7 @@
endchannel
-SFX_Get_Key_Item_3_Ch3:
+SFX_Get_Key_Item_3_Ch6:
executemusic
notetype 5, 1, 0
octave 4
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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 @@
endchannel
-SFX_Level_Up_Ch2:
+SFX_Level_Up_Ch5:
executemusic
vibrato 4, 2, 2
duty 2
@@ -40,7 +40,7 @@
endchannel
-SFX_Level_Up_Ch3:
+SFX_Level_Up_Ch6:
executemusic
notetype 6, 1, 0
octave 5
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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 @@
endchannel
-SFX_Pokedex_Rating_1_Ch2:
+SFX_Pokedex_Rating_1_Ch5:
executemusic
duty 2
notetype 5, 12, 2
@@ -44,7 +44,7 @@
endchannel
-SFX_Pokedex_Rating_1_Ch3:
+SFX_Pokedex_Rating_1_Ch6:
executemusic
notetype 5, 1, 0
octave 5
--- 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 @@
endchannel
-SFX_Pokedex_Rating_3_Ch2:
+SFX_Pokedex_Rating_3_Ch5:
executemusic
duty 2
notetype 5, 12, 2
@@ -44,7 +44,7 @@
endchannel
-SFX_Pokedex_Rating_3_Ch3:
+SFX_Pokedex_Rating_3_Ch6:
executemusic
notetype 5, 1, 0
octave 5
--- 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
--- a/audio/sfx/pokeflute_ch1_ch2.asm
+++ /dev/null
@@ -1,14 +1,0 @@
-SFX_08_PokeFlute_Ch1:
- tempo 256
-
-
-SFX_08_PokeFlute_Ch2:
- executemusic
- notetype 8, 0, 0
- rest 5
- rest 7
- rest 5
- rest 5
- rest 5
- rest 5
- endchannel
--- a/audio/sfx/pokeflute_ch3.asm
+++ /dev/null
@@ -1,13 +1,0 @@
-SFX_08_PokeFlute_Ch3:
- executemusic
- vibrato 16, 1, 4
- notetype 8, 1, 0
- octave 5
- E_ 3
- F_ 3
- G_ 7
- A_ 3
- G_ 3
- octave 6
- C_ 13
- endchannel
--- /dev/null
+++ b/audio/sfx/pokeflute_ch4_ch5.asm
@@ -1,0 +1,14 @@
+SFX_08_PokeFlute_Ch4:
+ tempo 256
+
+
+SFX_08_PokeFlute_Ch5:
+ executemusic
+ notetype 8, 0, 0
+ rest 5
+ rest 7
+ rest 5
+ rest 5
+ rest 5
+ rest 5
+ endchannel
--- /dev/null
+++ b/audio/sfx/pokeflute_ch6.asm
@@ -1,0 +1,13 @@
+SFX_08_PokeFlute_Ch6:
+ executemusic
+ vibrato 16, 1, 4
+ notetype 8, 1, 0
+ octave 5
+ E_ 3
+ F_ 3
+ G_ 7
+ A_ 3
+ G_ 3
+ octave 6
+ C_ 13
+ endchannel
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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 @@
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 @@
endchannel
-SFX_Psychic_M_Ch3:
+SFX_Psychic_M_Ch7:
unknownnoise0x20 15, 63, 20
unknownnoise0x20 15, 207, 19
unknownnoise0x20 15, 207, 18
--- a/audio/sfx/purchase_1.asm
+++ b/audio/sfx/purchase_1.asm
@@ -1,4 +1,4 @@
-SFX_Purchase_1_Ch1:
+SFX_Purchase_1_Ch4:
duty 2
unknownsfx0x20 4, 225, 0, 7
unknownsfx0x20 8, 242, 224, 7
@@ -5,7 +5,7 @@
endchannel
-SFX_Purchase_1_Ch2:
+SFX_Purchase_1_Ch5:
duty 2
unknownsfx0x20 1, 8, 0, 0
unknownsfx0x20 4, 145, 193, 6
--- a/audio/sfx/purchase_3.asm
+++ b/audio/sfx/purchase_3.asm
@@ -1,4 +1,4 @@
-SFX_Purchase_3_Ch1:
+SFX_Purchase_3_Ch4:
duty 2
unknownsfx0x20 4, 225, 0, 7
unknownsfx0x20 8, 242, 224, 7
@@ -5,7 +5,7 @@
endchannel
-SFX_Purchase_3_Ch2:
+SFX_Purchase_3_Ch5:
duty 2
unknownsfx0x20 1, 8, 0, 0
unknownsfx0x20 4, 145, 193, 6
--- 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
--- 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
--- 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
--- 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
--- 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 @@
endchannel
-SFX_Save_1_Ch2:
+SFX_Save_1_Ch5:
duty 2
unknownsfx0x20 4, 8, 0, 0
unknownsfx0x20 2, 212, 1, 7
--- 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 @@
endchannel
-SFX_Save_3_Ch2:
+SFX_Save_3_Ch5:
duty 2
IF DEF(_RED)
unknownsfx0x20 4, 8, 0, 0
--- 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
--- 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
--- 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
--- 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
--- 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 @@
endchannel
-SFX_Slots_New_Spin_Ch2:
+SFX_Slots_New_Spin_Ch5:
duty 2
unknownsfx0x20 4, 193, 193, 6
unknownsfx0x20 2, 193, 65, 7
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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 @@
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
--- 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 @@
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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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 @@
endchannel
-SFX_08_unused2_Ch2:
+SFX_08_unused2_Ch5:
executemusic
vibrato 8, 2, 7
duty 2
@@ -33,7 +33,7 @@
endchannel
-SFX_08_unused2_Ch3:
+SFX_08_unused2_Ch6:
executemusic
notetype 6, 1, 0
octave 4
--- 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 @@
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 @@
endchannel
-SFX_02_unused_Ch3:
+SFX_02_unused_Ch7:
unknownnoise0x20 2, 242, 76
unknownnoise0x20 6, 224, 58
unknownnoise0x20 15, 208, 58
--- 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 @@
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 @@
endchannel
-SFX_08_unused_Ch3:
+SFX_08_unused_Ch7:
unknownnoise0x20 2, 242, 76
unknownnoise0x20 6, 224, 58
unknownnoise0x20 15, 208, 58
--- 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 @@
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 @@
endchannel
-SFX_1f_unused_Ch3:
+SFX_1f_unused_Ch7:
unknownnoise0x20 2, 242, 76
unknownnoise0x20 6, 224, 58
unknownnoise0x20 15, 208, 58
--- 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
--- 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
--- 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