Merge branch 'master' of https://github.com/dannye/pokered-crysaudio

constants/audio_constants.asm

@@ -1,68 +0,0 @@
-; pitch
-; Audio[1|2|3]_Pitches indexes (see audio/notes.asm)
-	const_def
-	const C_ ; 0
-	const C# ; 1
-	const D_ ; 2
-	const D# ; 3
-	const E_ ; 4
-	const F_ ; 5
-	const F# ; 6
-	const G_ ; 7
-	const G# ; 8
-	const A_ ; 9
-	const A# ; A
-	const B_ ; B
-DEF NUM_NOTES EQU const_value
-
-; channel
-; Audio[1|2|3]_HWChannelBaseAddresses, Audio[1|2|3]_HWChannelDisableMasks,
-; and Audio[1|2|3]_HWChannelEnableMasks indexes (see audio/engine_[1|2|3].asm)
-	const_def
-	const CHAN1 ; 0
-	const CHAN2 ; 1
-	const CHAN3 ; 2
-	const CHAN4 ; 3
-DEF NUM_MUSIC_CHANS EQU const_value
-	const CHAN5 ; 4
-	const CHAN6 ; 5
-	const CHAN7 ; 6
-	const CHAN8 ; 7
-DEF NUM_NOISE_CHANS EQU const_value - NUM_MUSIC_CHANS
-DEF NUM_CHANNELS EQU const_value
-
-; HW sound channel register base addresses
-DEF HW_CH1_BASE EQU LOW(rNR10)
-DEF HW_CH2_BASE EQU LOW(rNR21) - 1
-DEF HW_CH3_BASE EQU LOW(rNR30)
-DEF HW_CH4_BASE EQU LOW(rNR41) - 1
-
-; HW sound channel enable bit masks
-DEF HW_CH1_ENABLE_MASK EQU %00010001
-DEF HW_CH2_ENABLE_MASK EQU %00100010
-DEF HW_CH3_ENABLE_MASK EQU %01000100
-DEF HW_CH4_ENABLE_MASK EQU %10001000
-
-; HW sound channel disable bit masks
-DEF HW_CH1_DISABLE_MASK EQU (~HW_CH1_ENABLE_MASK & $ff)
-DEF HW_CH2_DISABLE_MASK EQU (~HW_CH2_ENABLE_MASK & $ff)
-DEF HW_CH3_DISABLE_MASK EQU (~HW_CH3_ENABLE_MASK & $ff)
-DEF HW_CH4_DISABLE_MASK EQU (~HW_CH4_ENABLE_MASK & $ff)
-
-	const_def 1
-	const REG_DUTY_SOUND_LEN  ; 1
-	const REG_VOLUME_ENVELOPE ; 2
-	const REG_FREQUENCY_LO    ; 3
-
-; wChannelFlags1 constants
-	const_def
-	const BIT_PERFECT_PITCH          ; 0 ; controlled by toggle_perfect_pitch command
-	const BIT_SOUND_CALL             ; 1 ; if in sound call
-	const BIT_NOISE_OR_SFX           ; 2 ; if channel is the music noise channel or an SFX channel
-	const BIT_VIBRATO_DIRECTION      ; 3 ; if the pitch is above or below normal (cycles)
-	const BIT_PITCH_SLIDE_ON         ; 4 ; if pitch slide is active
-	const BIT_PITCH_SLIDE_DECREASING ; 5 ; if the pitch slide frequency is decreasing (instead of increasing)
-	const BIT_ROTATE_DUTY_CYCLE      ; 6 ; if rotating duty cycle
-
-; wChannelFlags2 constant (only has one flag)
-DEF BIT_EXECUTE_MUSIC EQU 0 ; if in execute music

constants/hardware_constants.asm

@@ -61,6 +61,7 @@ DEF rNR11             EQU $ff11 ; Channel 1 Sound length/Wave pattern duty (R/W)
 DEF rNR12             EQU $ff12 ; Channel 1 Volume Envelope (R/W)
 DEF rNR13             EQU $ff13 ; Channel 1 Frequency lo (Write Only)
 DEF rNR14             EQU $ff14 ; Channel 1 Frequency hi (R/W)
+DEF rNR20             EQU $ff15 ; Channel 2 Sweep register (R/W)
 DEF rNR21             EQU $ff16 ; Channel 2 Sound Length/Wave Pattern Duty (R/W)
 DEF rNR22             EQU $ff17 ; Channel 2 Volume Envelope (R/W)
 DEF rNR23             EQU $ff18 ; Channel 2 Frequency lo data (W)
@@ -70,6 +71,7 @@ DEF rNR31             EQU $ff1b ; Channel 3 Sound Length
 DEF rNR32             EQU $ff1c ; Channel 3 Select output level (R/W)
 DEF rNR33             EQU $ff1d ; Channel 3 Frequency's lower data (W)
 DEF rNR34             EQU $ff1e ; Channel 3 Frequency's higher data (R/W)
+DEF rNR40             EQU $ff1f ; Channel 4 Sweep register (R/W)
 DEF rNR41             EQU $ff20 ; Channel 4 Sound Length (R/W)
 DEF rNR42             EQU $ff21 ; Channel 4 Volume Envelope (R/W)
 DEF rNR43             EQU $ff22 ; Channel 4 Polynomial Counter (R/W)

constants/music_constants.asm

@@ -1,244 +1,222 @@
 ; Song ids are calculated by address to save space.
 ; SFX_Headers_(1|2|3) indexes (see audio/headers/*.asm)
 
-MACRO music_const
-	DEF \1 EQUS "((\2 - SFX_Headers_1) / 3)"
-ENDM
+;MACRO music_const
+;	DEF \1 EQUS "((\2 - SFX_Headers_1) / 3)"
+;ENDM
 
-	; AUDIO_1
-	music_const MUSIC_PALLET_TOWN,         Music_PalletTown
-	music_const MUSIC_POKECENTER,          Music_Pokecenter
-	music_const MUSIC_GYM,                 Music_Gym
-	music_const MUSIC_CITIES1,             Music_Cities1
-	music_const MUSIC_CITIES2,             Music_Cities2
-	music_const MUSIC_CELADON,             Music_Celadon
-	music_const MUSIC_CINNABAR,            Music_Cinnabar
-	music_const MUSIC_VERMILION,           Music_Vermilion
-	music_const MUSIC_LAVENDER,            Music_Lavender
-	music_const MUSIC_SS_ANNE,             Music_SSAnne
-	music_const MUSIC_MEET_PROF_OAK,       Music_MeetProfOak
-	music_const MUSIC_MEET_RIVAL,          Music_MeetRival
-	music_const MUSIC_MUSEUM_GUY,          Music_MuseumGuy
-	music_const MUSIC_SAFARI_ZONE,         Music_SafariZone
-	music_const MUSIC_PKMN_HEALED,         Music_PkmnHealed
-	music_const MUSIC_ROUTES1,             Music_Routes1
-	music_const MUSIC_ROUTES2,             Music_Routes2
-	music_const MUSIC_ROUTES3,             Music_Routes3
-	music_const MUSIC_ROUTES4,             Music_Routes4
-	music_const MUSIC_INDIGO_PLATEAU,      Music_IndigoPlateau
+	const_def 1
 
-	; AUDIO_2
-	music_const MUSIC_GYM_LEADER_BATTLE,   Music_GymLeaderBattle
-	music_const MUSIC_TRAINER_BATTLE,      Music_TrainerBattle
-	music_const MUSIC_WILD_BATTLE,         Music_WildBattle
-	music_const MUSIC_FINAL_BATTLE,        Music_FinalBattle
-	music_const MUSIC_DEFEATED_TRAINER,    Music_DefeatedTrainer
-	music_const MUSIC_DEFEATED_WILD_MON,   Music_DefeatedWildMon
-	music_const MUSIC_DEFEATED_GYM_LEADER, Music_DefeatedGymLeader
+	const MUSIC_PALLET_TOWN
+	const MUSIC_POKECENTER
+	const MUSIC_GYM
+	const MUSIC_CITIES1
+	const MUSIC_CITIES2
+	const MUSIC_CELADON
+	const MUSIC_CINNABAR
+	const MUSIC_VERMILION
+	const MUSIC_LAVENDER
+	const MUSIC_SS_ANNE
+	const MUSIC_MEET_PROF_OAK
+	const MUSIC_MEET_RIVAL
+	const MUSIC_MUSEUM_GUY
+	const MUSIC_SAFARI_ZONE
+	const MUSIC_PKMN_HEALED
+	const MUSIC_ROUTES1
+	const MUSIC_ROUTES2
+	const MUSIC_ROUTES3
+	const MUSIC_ROUTES4
+	const MUSIC_INDIGO_PLATEAU
+	
+	const MUSIC_GYM_LEADER_BATTLE
+	const MUSIC_TRAINER_BATTLE
+	const MUSIC_WILD_BATTLE
+	const MUSIC_FINAL_BATTLE
+	const MUSIC_DEFEATED_TRAINER
+	const MUSIC_DEFEATED_WILD_MON
+	const MUSIC_DEFEATED_GYM_LEADER
+	
+	const MUSIC_TITLE_SCREEN
+	const MUSIC_CREDITS
+	const MUSIC_HALL_OF_FAME
+	const MUSIC_OAKS_LAB
+	const MUSIC_JIGGLYPUFF_SONG
+	const MUSIC_BIKE_RIDING
+	const MUSIC_SURFING
+	const MUSIC_GAME_CORNER
+	const MUSIC_INTRO_BATTLE
+	const MUSIC_DUNGEON1
+	const MUSIC_DUNGEON2
+	const MUSIC_DUNGEON3
+	const MUSIC_CINNABAR_MANSION
+	const MUSIC_POKEMON_TOWER
+	const MUSIC_SILPH_CO
+	const MUSIC_MEET_EVIL_TRAINER
+	const MUSIC_MEET_FEMALE_TRAINER
+	const MUSIC_MEET_MALE_TRAINER
 
-	; AUDIO_3
-	music_const MUSIC_TITLE_SCREEN,        Music_TitleScreen
-	music_const MUSIC_CREDITS,             Music_Credits
-	music_const MUSIC_HALL_OF_FAME,        Music_HallOfFame
-	music_const MUSIC_OAKS_LAB,            Music_OaksLab
-	music_const MUSIC_JIGGLYPUFF_SONG,     Music_JigglypuffSong
-	music_const MUSIC_BIKE_RIDING,         Music_BikeRiding
-	music_const MUSIC_SURFING,             Music_Surfing
-	music_const MUSIC_GAME_CORNER,         Music_GameCorner
-	music_const MUSIC_INTRO_BATTLE,        Music_IntroBattle
-	music_const MUSIC_DUNGEON1,            Music_Dungeon1
-	music_const MUSIC_DUNGEON2,            Music_Dungeon2
-	music_const MUSIC_DUNGEON3,            Music_Dungeon3
-	music_const MUSIC_CINNABAR_MANSION,    Music_CinnabarMansion
-	music_const MUSIC_POKEMON_TOWER,       Music_PokemonTower
-	music_const MUSIC_SILPH_CO,            Music_SilphCo
-	music_const MUSIC_MEET_EVIL_TRAINER,   Music_MeetEvilTrainer
-	music_const MUSIC_MEET_FEMALE_TRAINER, Music_MeetFemaleTrainer
-	music_const MUSIC_MEET_MALE_TRAINER,   Music_MeetMaleTrainer
+	const NUM_SONGS
 
-	; AUDIO_1 AUDIO_2 AUDIO_3
-DEF NOISE_INSTRUMENTS_START EQUS "SFX_NOISE_INSTRUMENT01"
-	music_const SFX_NOISE_INSTRUMENT01, SFX_Noise_Instrument01_1
-	music_const SFX_NOISE_INSTRUMENT02, SFX_Noise_Instrument02_1
-	music_const SFX_NOISE_INSTRUMENT03, SFX_Noise_Instrument03_1
-	music_const SFX_NOISE_INSTRUMENT04, SFX_Noise_Instrument04_1
-	music_const SFX_NOISE_INSTRUMENT05, SFX_Noise_Instrument05_1
-	music_const SFX_NOISE_INSTRUMENT06, SFX_Noise_Instrument06_1
-	music_const SFX_NOISE_INSTRUMENT07, SFX_Noise_Instrument07_1
-	music_const SFX_NOISE_INSTRUMENT08, SFX_Noise_Instrument08_1
-	music_const SFX_NOISE_INSTRUMENT09, SFX_Noise_Instrument09_1
-	music_const SFX_NOISE_INSTRUMENT10, SFX_Noise_Instrument10_1
-	music_const SFX_NOISE_INSTRUMENT11, SFX_Noise_Instrument11_1
-	music_const SFX_NOISE_INSTRUMENT12, SFX_Noise_Instrument12_1
-	music_const SFX_NOISE_INSTRUMENT13, SFX_Noise_Instrument13_1
-	music_const SFX_NOISE_INSTRUMENT14, SFX_Noise_Instrument14_1
-	music_const SFX_NOISE_INSTRUMENT15, SFX_Noise_Instrument15_1
-	music_const SFX_NOISE_INSTRUMENT16, SFX_Noise_Instrument16_1
-	music_const SFX_NOISE_INSTRUMENT17, SFX_Noise_Instrument17_1
-	music_const SFX_NOISE_INSTRUMENT18, SFX_Noise_Instrument18_1
-	music_const SFX_NOISE_INSTRUMENT19, SFX_Noise_Instrument19_1
-DEF NOISE_INSTRUMENTS_END EQUS "SFX_NOISE_INSTRUMENT19 + 1"
+	const_def
 
-DEF CRY_SFX_START EQUS "SFX_CRY_00"
-	music_const SFX_CRY_00,             SFX_Cry00_1
-	music_const SFX_CRY_01,             SFX_Cry01_1
-	music_const SFX_CRY_02,             SFX_Cry02_1
-	music_const SFX_CRY_03,             SFX_Cry03_1
-	music_const SFX_CRY_04,             SFX_Cry04_1
-	music_const SFX_CRY_05,             SFX_Cry05_1
-	music_const SFX_CRY_06,             SFX_Cry06_1
-	music_const SFX_CRY_07,             SFX_Cry07_1
-	music_const SFX_CRY_08,             SFX_Cry08_1
-	music_const SFX_CRY_09,             SFX_Cry09_1
-	music_const SFX_CRY_0A,             SFX_Cry0A_1
-	music_const SFX_CRY_0B,             SFX_Cry0B_1
-	music_const SFX_CRY_0C,             SFX_Cry0C_1
-	music_const SFX_CRY_0D,             SFX_Cry0D_1
-	music_const SFX_CRY_0E,             SFX_Cry0E_1
-	music_const SFX_CRY_0F,             SFX_Cry0F_1
-	music_const SFX_CRY_10,             SFX_Cry10_1
-	music_const SFX_CRY_11,             SFX_Cry11_1
-	music_const SFX_CRY_12,             SFX_Cry12_1
-	music_const SFX_CRY_13,             SFX_Cry13_1
-	music_const SFX_CRY_14,             SFX_Cry14_1
-	music_const SFX_CRY_15,             SFX_Cry15_1
-	music_const SFX_CRY_16,             SFX_Cry16_1
-	music_const SFX_CRY_17,             SFX_Cry17_1
-	music_const SFX_CRY_18,             SFX_Cry18_1
-	music_const SFX_CRY_19,             SFX_Cry19_1
-	music_const SFX_CRY_1A,             SFX_Cry1A_1
-	music_const SFX_CRY_1B,             SFX_Cry1B_1
-	music_const SFX_CRY_1C,             SFX_Cry1C_1
-	music_const SFX_CRY_1D,             SFX_Cry1D_1
-	music_const SFX_CRY_1E,             SFX_Cry1E_1
-	music_const SFX_CRY_1F,             SFX_Cry1F_1
-	music_const SFX_CRY_20,             SFX_Cry20_1
-	music_const SFX_CRY_21,             SFX_Cry21_1
-	music_const SFX_CRY_22,             SFX_Cry22_1
-	music_const SFX_CRY_23,             SFX_Cry23_1
-	music_const SFX_CRY_24,             SFX_Cry24_1
-	music_const SFX_CRY_25,             SFX_Cry25_1
-DEF CRY_SFX_END EQUS "SFX_CRY_25 + 3"
+	const SFX_CRY_00
+	const SFX_CRY_01
+	const SFX_CRY_02
+	const SFX_CRY_03
+	const SFX_CRY_04
+	const SFX_CRY_05
+	const SFX_CRY_06
+	const SFX_CRY_07
+	const SFX_CRY_08
+	const SFX_CRY_09
+	const SFX_CRY_0A
+	const SFX_CRY_0B
+	const SFX_CRY_0C
+	const SFX_CRY_0D
+	const SFX_CRY_0E
+	const SFX_CRY_0F
+	const SFX_CRY_10
+	const SFX_CRY_11
+	const SFX_CRY_12
+	const SFX_CRY_13
+	const SFX_CRY_14
+	const SFX_CRY_15
+	const SFX_CRY_16
+	const SFX_CRY_17
+	const SFX_CRY_18
+	const SFX_CRY_19
+	const SFX_CRY_1A
+	const SFX_CRY_1B
+	const SFX_CRY_1C
+	const SFX_CRY_1D
+	const SFX_CRY_1E
+	const SFX_CRY_1F
+	const SFX_CRY_20
+	const SFX_CRY_21
+	const SFX_CRY_22
+	const SFX_CRY_23
+	const SFX_CRY_24
+	const SFX_CRY_25
 
-	music_const SFX_GET_ITEM_2,         SFX_Get_Item2_1
-	music_const SFX_TINK,               SFX_Tink_1
-	music_const SFX_HEAL_HP,            SFX_Heal_HP_1
-	music_const SFX_HEAL_AILMENT,       SFX_Heal_Ailment_1
-	music_const SFX_START_MENU,         SFX_Start_Menu_1
-	music_const SFX_PRESS_AB,           SFX_Press_AB_1
+	const_def 1
 
 	; AUDIO_1 AUDIO_3
-	music_const SFX_GET_ITEM_1,         SFX_Get_Item1_1
+	const SFX_GET_ITEM_1
 
-	music_const SFX_POKEDEX_RATING,     SFX_Pokedex_Rating_1
-	music_const SFX_GET_KEY_ITEM,       SFX_Get_Key_Item_1
-	music_const SFX_POISONED,           SFX_Poisoned_1
-	music_const SFX_TRADE_MACHINE,      SFX_Trade_Machine_1
-	music_const SFX_TURN_ON_PC,         SFX_Turn_On_PC_1
-	music_const SFX_TURN_OFF_PC,        SFX_Turn_Off_PC_1
-	music_const SFX_ENTER_PC,           SFX_Enter_PC_1
-	music_const SFX_SHRINK,             SFX_Shrink_1
-	music_const SFX_SWITCH,             SFX_Switch_1
-	music_const SFX_HEALING_MACHINE,    SFX_Healing_Machine_1
-	music_const SFX_TELEPORT_EXIT_1,    SFX_Teleport_Exit1_1
-	music_const SFX_TELEPORT_ENTER_1,   SFX_Teleport_Enter1_1
-	music_const SFX_TELEPORT_EXIT_2,    SFX_Teleport_Exit2_1
-	music_const SFX_LEDGE,              SFX_Ledge_1
-	music_const SFX_TELEPORT_ENTER_2,   SFX_Teleport_Enter2_1
-	music_const SFX_FLY,                SFX_Fly_1
-	music_const SFX_DENIED,             SFX_Denied_1
-	music_const SFX_ARROW_TILES,        SFX_Arrow_Tiles_1
-	music_const SFX_PUSH_BOULDER,       SFX_Push_Boulder_1
-	music_const SFX_SS_ANNE_HORN,       SFX_SS_Anne_Horn_1
-	music_const SFX_WITHDRAW_DEPOSIT,   SFX_Withdraw_Deposit_1
-	music_const SFX_CUT,                SFX_Cut_1
-	music_const SFX_GO_INSIDE,          SFX_Go_Inside_1
-	music_const SFX_SWAP,               SFX_Swap_1
-	music_const SFX_59,                 SFX_59_1 ; unused, sounds similar to SFX_SLOTS_STOP_WHEEL
-	music_const SFX_PURCHASE,           SFX_Purchase_1
-	music_const SFX_COLLISION,          SFX_Collision_1
-	music_const SFX_GO_OUTSIDE,         SFX_Go_Outside_1
-	music_const SFX_SAVE,               SFX_Save_1
+	; AUDIO_1 AUDIO_2 AUDIO_3
+	const SFX_GET_ITEM_2
+	const SFX_TINK
+	const SFX_HEAL_HP
+	const SFX_HEAL_AILMENT
+	const SFX_START_MENU
+	const SFX_PRESS_AB
+
+	; AUDIO_1 AUDIO_3
+	const SFX_POKEDEX_RATING
+	const SFX_GET_KEY_ITEM
+	const SFX_POISONED
+	const SFX_TRADE_MACHINE
+	const SFX_TURN_ON_PC
+	const SFX_TURN_OFF_PC
+	const SFX_ENTER_PC
+	const SFX_SHRINK
+	const SFX_SWITCH
+	const SFX_HEALING_MACHINE
+	const SFX_TELEPORT_EXIT_1
+	const SFX_TELEPORT_ENTER_1
+	const SFX_TELEPORT_EXIT_2
+	const SFX_LEDGE
+	const SFX_TELEPORT_ENTER_2
+	const SFX_FLY
+	const SFX_DENIED
+	const SFX_ARROW_TILES
+	const SFX_PUSH_BOULDER
+	const SFX_SS_ANNE_HORN
+	const SFX_WITHDRAW_DEPOSIT
+	const SFX_CUT
+	const SFX_GO_INSIDE
+	const SFX_SWAP
+	const SFX_59
+	const SFX_PURCHASE
+	const SFX_COLLISION
+	const SFX_GO_OUTSIDE
+	const SFX_SAVE
 
 	; AUDIO_1
-	music_const SFX_POKEFLUTE,          SFX_Pokeflute
-	music_const SFX_SAFARI_ZONE_PA,     SFX_Safari_Zone_PA
-DEF MAX_SFX_ID_1 EQUS "SFX_SAFARI_ZONE_PA"
+	const SFX_POKEFLUTE
+	const SFX_SAFARI_ZONE_PA
 
 	; AUDIO_2
-	music_const SFX_LEVEL_UP,           SFX_Level_Up
+	const SFX_LEVEL_UP
 
-	music_const SFX_BALL_TOSS,          SFX_Ball_Toss
-	music_const SFX_BALL_POOF,          SFX_Ball_Poof
-	music_const SFX_FAINT_THUD,         SFX_Faint_Thud
-	music_const SFX_RUN,                SFX_Run
-	music_const SFX_DEX_PAGE_ADDED,     SFX_Dex_Page_Added
-	music_const SFX_CAUGHT_MON,         SFX_Caught_Mon
-
-DEF BATTLE_SFX_START EQUS "SFX_PECK"
-	music_const SFX_PECK,               SFX_Peck
-	music_const SFX_FAINT_FALL,         SFX_Faint_Fall
-	music_const SFX_BATTLE_09,          SFX_Battle_09
-	music_const SFX_POUND,              SFX_Pound
-	music_const SFX_BATTLE_0B,          SFX_Battle_0B
-	music_const SFX_BATTLE_0C,          SFX_Battle_0C
-	music_const SFX_BATTLE_0D,          SFX_Battle_0D
-	music_const SFX_BATTLE_0E,          SFX_Battle_0E
-	music_const SFX_BATTLE_0F,          SFX_Battle_0F
-	music_const SFX_DAMAGE,             SFX_Damage
-	music_const SFX_NOT_VERY_EFFECTIVE, SFX_Not_Very_Effective
-	music_const SFX_BATTLE_12,          SFX_Battle_12
-	music_const SFX_BATTLE_13,          SFX_Battle_13
-	music_const SFX_BATTLE_14,          SFX_Battle_14
-	music_const SFX_VINE_WHIP,          SFX_Vine_Whip
-	music_const SFX_BATTLE_16,          SFX_Battle_16 ; unused?
-	music_const SFX_BATTLE_17,          SFX_Battle_17
-	music_const SFX_BATTLE_18,          SFX_Battle_18
-	music_const SFX_BATTLE_19,          SFX_Battle_19
-	music_const SFX_SUPER_EFFECTIVE,    SFX_Super_Effective
-	music_const SFX_BATTLE_1B,          SFX_Battle_1B
-	music_const SFX_BATTLE_1C,          SFX_Battle_1C
-	music_const SFX_DOUBLESLAP,         SFX_Doubleslap
-	music_const SFX_BATTLE_1E,          SFX_Battle_1E
-	music_const SFX_HORN_DRILL,         SFX_Horn_Drill
-	music_const SFX_BATTLE_20,          SFX_Battle_20
-	music_const SFX_BATTLE_21,          SFX_Battle_21
-	music_const SFX_BATTLE_22,          SFX_Battle_22
-	music_const SFX_BATTLE_23,          SFX_Battle_23
-	music_const SFX_BATTLE_24,          SFX_Battle_24
-	music_const SFX_BATTLE_25,          SFX_Battle_25
-	music_const SFX_BATTLE_26,          SFX_Battle_26
-	music_const SFX_BATTLE_27,          SFX_Battle_27
-	music_const SFX_BATTLE_28,          SFX_Battle_28
-	music_const SFX_BATTLE_29,          SFX_Battle_29
-	music_const SFX_BATTLE_2A,          SFX_Battle_2A
-	music_const SFX_BATTLE_2B,          SFX_Battle_2B
-	music_const SFX_BATTLE_2C,          SFX_Battle_2C
-	music_const SFX_PSYBEAM,            SFX_Psybeam
-	music_const SFX_BATTLE_2E,          SFX_Battle_2E
-	music_const SFX_BATTLE_2F,          SFX_Battle_2F
-	music_const SFX_PSYCHIC_M,          SFX_Psychic_M
-	music_const SFX_BATTLE_31,          SFX_Battle_31
-	music_const SFX_BATTLE_32,          SFX_Battle_32
-	music_const SFX_BATTLE_33,          SFX_Battle_33
-	music_const SFX_BATTLE_34,          SFX_Battle_34
-	music_const SFX_BATTLE_35,          SFX_Battle_35
-	music_const SFX_BATTLE_36,          SFX_Battle_36
-	music_const SFX_SILPH_SCOPE,        SFX_Silph_Scope
-DEF BATTLE_SFX_END   EQUS "SFX_SILPH_SCOPE + 1"
-DEF MAX_SFX_ID_2 EQUS "SFX_SILPH_SCOPE"
+	const SFX_BALL_TOSS
+	const SFX_BALL_POOF
+	const SFX_FAINT_THUD
+	const SFX_RUN
+	const SFX_DEX_PAGE_ADDED
+	const SFX_CAUGHT_MON
+	const SFX_PECK
+	const SFX_FAINT_FALL
+	const SFX_BATTLE_09
+	const SFX_POUND
+	const SFX_BATTLE_0B
+	const SFX_BATTLE_0C
+	const SFX_BATTLE_0D
+	const SFX_BATTLE_0E
+	const SFX_BATTLE_0F
+	const SFX_DAMAGE
+	const SFX_NOT_VERY_EFFECTIVE
+	const SFX_BATTLE_12
+	const SFX_BATTLE_13
+	const SFX_BATTLE_14
+	const SFX_VINE_WHIP
+	const SFX_BATTLE_16
+	const SFX_BATTLE_17
+	const SFX_BATTLE_18
+	const SFX_BATTLE_19
+	const SFX_SUPER_EFFECTIVE
+	const SFX_BATTLE_1B
+	const SFX_BATTLE_1C
+	const SFX_DOUBLESLAP
+	const SFX_BATTLE_1E
+	const SFX_HORN_DRILL
+	const SFX_BATTLE_20
+	const SFX_BATTLE_21
+	const SFX_BATTLE_22
+	const SFX_BATTLE_23
+	const SFX_BATTLE_24
+	const SFX_BATTLE_25
+	const SFX_BATTLE_26
+	const SFX_BATTLE_27
+	const SFX_BATTLE_28
+	const SFX_BATTLE_29
+	const SFX_BATTLE_2A
+	const SFX_BATTLE_2B
+	const SFX_BATTLE_2C
+	const SFX_PSYBEAM
+	const SFX_BATTLE_2E
+	const SFX_BATTLE_2F
+	const SFX_PSYCHIC_M
+	const SFX_BATTLE_31
+	const SFX_BATTLE_32
+	const SFX_BATTLE_33
+	const SFX_BATTLE_34
+	const SFX_BATTLE_35
+	const SFX_BATTLE_36
+	const SFX_SILPH_SCOPE
 
 	; AUDIO_3
-	music_const SFX_INTRO_LUNGE,        SFX_Intro_Lunge
-	music_const SFX_INTRO_HIP,          SFX_Intro_Hip
-	music_const SFX_INTRO_HOP,          SFX_Intro_Hop
-	music_const SFX_INTRO_RAISE,        SFX_Intro_Raise
-	music_const SFX_INTRO_CRASH,        SFX_Intro_Crash
-	music_const SFX_INTRO_WHOOSH,       SFX_Intro_Whoosh
-	music_const SFX_SLOTS_STOP_WHEEL,   SFX_Slots_Stop_Wheel
-	music_const SFX_SLOTS_REWARD,       SFX_Slots_Reward
-	music_const SFX_SLOTS_NEW_SPIN,     SFX_Slots_New_Spin
-	music_const SFX_SHOOTING_STAR,      SFX_Shooting_Star
-DEF MAX_SFX_ID_3 EQUS "SFX_SHOOTING_STAR"
+	const SFX_INTRO_LUNGE
+	const SFX_INTRO_HIP
+	const SFX_INTRO_HOP
+	const SFX_INTRO_RAISE
+	const SFX_INTRO_CRASH
+	const SFX_INTRO_WHOOSH
+	const SFX_SLOTS_STOP_WHEEL
+	const SFX_SLOTS_REWARD
+	const SFX_SLOTS_NEW_SPIN
+	const SFX_SHOOTING_STAR
+
+	const SFX_POKEFLUTE_IN_BATTLE
 
 DEF SFX_STOP_ALL_MUSIC EQU $ff