diff options
Diffstat (limited to 'audio.asm')
| -rw-r--r-- | audio.asm | 207 |
1 files changed, 109 insertions, 98 deletions
@@ -1,11 +1,10 @@ -INCLUDE "charmap.asm" INCLUDE "constants.asm" -SECTION "Sound Effect Headers 1", ROMX ; BANK $2 +SECTION "Sound Effect Headers 1", ROMX ; BANK $02 INCLUDE "audio/headers/sfxheaders1.asm" -SECTION "Sound Effect Headers 2", ROMX ; BANK $8 +SECTION "Sound Effect Headers 2", ROMX ; BANK $08 INCLUDE "audio/headers/sfxheaders2.asm" SECTION "Sound Effect Headers 3", ROMX ; BANK $1f @@ -14,10 +13,11 @@ INCLUDE "audio/headers/sfxheaders3.asm" SECTION "Sound Effect Headers 4", ROMX ; BANK $20 INCLUDE "audio/headers/sfxheaders4.asm" -SECTION "Music Headers 1", ROMX ; BANK $2 + +SECTION "Music Headers 1", ROMX ; BANK $02 INCLUDE "audio/headers/musicheaders1.asm" -SECTION "Music Headers 2", ROMX ; BANK $8 +SECTION "Music Headers 2", ROMX ; BANK $08 INCLUDE "audio/headers/musicheaders2.asm" SECTION "Music Headers 3", ROMX ; BANK $1f @@ -26,28 +26,31 @@ INCLUDE "audio/headers/musicheaders3.asm" SECTION "Music Headers 4", ROMX ; BANK $20 INCLUDE "audio/headers/musicheaders4.asm" -SECTION "Sound Effects 1", ROMX ; BANK $2 - -INCLUDE "audio/sfx/snare1_1.asm" -INCLUDE "audio/sfx/snare2_1.asm" -INCLUDE "audio/sfx/snare3_1.asm" -INCLUDE "audio/sfx/snare4_1.asm" -INCLUDE "audio/sfx/snare5_1.asm" -INCLUDE "audio/sfx/triangle1_1.asm" -INCLUDE "audio/sfx/triangle2_1.asm" -INCLUDE "audio/sfx/snare6_1.asm" -INCLUDE "audio/sfx/snare7_1.asm" -INCLUDE "audio/sfx/snare8_1.asm" -INCLUDE "audio/sfx/snare9_1.asm" -INCLUDE "audio/sfx/cymbal1_1.asm" -INCLUDE "audio/sfx/cymbal2_1.asm" -INCLUDE "audio/sfx/cymbal3_1.asm" -INCLUDE "audio/sfx/muted_snare1_1.asm" -INCLUDE "audio/sfx/triangle3_1.asm" -INCLUDE "audio/sfx/muted_snare2_1.asm" -INCLUDE "audio/sfx/muted_snare3_1.asm" -INCLUDE "audio/sfx/muted_snare4_1.asm" + +SECTION "Sound Effects 1", ROMX ; BANK $02 + +INCLUDE "audio/sfx/noise_instrument01_1.asm" +INCLUDE "audio/sfx/noise_instrument02_1.asm" +INCLUDE "audio/sfx/noise_instrument03_1.asm" +INCLUDE "audio/sfx/noise_instrument04_1.asm" +INCLUDE "audio/sfx/noise_instrument05_1.asm" +INCLUDE "audio/sfx/noise_instrument06_1.asm" +INCLUDE "audio/sfx/noise_instrument07_1.asm" +INCLUDE "audio/sfx/noise_instrument08_1.asm" +INCLUDE "audio/sfx/noise_instrument09_1.asm" +INCLUDE "audio/sfx/noise_instrument10_1.asm" +INCLUDE "audio/sfx/noise_instrument11_1.asm" +INCLUDE "audio/sfx/noise_instrument12_1.asm" +INCLUDE "audio/sfx/noise_instrument13_1.asm" +INCLUDE "audio/sfx/noise_instrument14_1.asm" +INCLUDE "audio/sfx/noise_instrument15_1.asm" +INCLUDE "audio/sfx/noise_instrument16_1.asm" +INCLUDE "audio/sfx/noise_instrument17_1.asm" +INCLUDE "audio/sfx/noise_instrument18_1.asm" +INCLUDE "audio/sfx/noise_instrument19_1.asm" + ; Audio1_WavePointers: INCLUDE "audio/wave_instruments.asm" + INCLUDE "audio/sfx/start_menu_1.asm" INCLUDE "audio/sfx/pokeflute.asm" INCLUDE "audio/sfx/cut_1.asm" @@ -122,28 +125,31 @@ INCLUDE "audio/sfx/cry20_1.asm" INCLUDE "audio/sfx/cry21_1.asm" INCLUDE "audio/sfx/cry22_1.asm" -SECTION "Sound Effects 2", ROMX ; BANK $8 - -INCLUDE "audio/sfx/snare1_2.asm" -INCLUDE "audio/sfx/snare2_2.asm" -INCLUDE "audio/sfx/snare3_2.asm" -INCLUDE "audio/sfx/snare4_2.asm" -INCLUDE "audio/sfx/snare5_2.asm" -INCLUDE "audio/sfx/triangle1_2.asm" -INCLUDE "audio/sfx/triangle2_2.asm" -INCLUDE "audio/sfx/snare6_2.asm" -INCLUDE "audio/sfx/snare7_2.asm" -INCLUDE "audio/sfx/snare8_2.asm" -INCLUDE "audio/sfx/snare9_2.asm" -INCLUDE "audio/sfx/cymbal1_2.asm" -INCLUDE "audio/sfx/cymbal2_2.asm" -INCLUDE "audio/sfx/cymbal3_2.asm" -INCLUDE "audio/sfx/muted_snare1_2.asm" -INCLUDE "audio/sfx/triangle3_2.asm" -INCLUDE "audio/sfx/muted_snare2_2.asm" -INCLUDE "audio/sfx/muted_snare3_2.asm" -INCLUDE "audio/sfx/muted_snare4_2.asm" + +SECTION "Sound Effects 2", ROMX ; BANK $08 + +INCLUDE "audio/sfx/noise_instrument01_2.asm" +INCLUDE "audio/sfx/noise_instrument02_2.asm" +INCLUDE "audio/sfx/noise_instrument03_2.asm" +INCLUDE "audio/sfx/noise_instrument04_2.asm" +INCLUDE "audio/sfx/noise_instrument05_2.asm" +INCLUDE "audio/sfx/noise_instrument06_2.asm" +INCLUDE "audio/sfx/noise_instrument07_2.asm" +INCLUDE "audio/sfx/noise_instrument08_2.asm" +INCLUDE "audio/sfx/noise_instrument09_2.asm" +INCLUDE "audio/sfx/noise_instrument10_2.asm" +INCLUDE "audio/sfx/noise_instrument11_2.asm" +INCLUDE "audio/sfx/noise_instrument12_2.asm" +INCLUDE "audio/sfx/noise_instrument13_2.asm" +INCLUDE "audio/sfx/noise_instrument14_2.asm" +INCLUDE "audio/sfx/noise_instrument15_2.asm" +INCLUDE "audio/sfx/noise_instrument16_2.asm" +INCLUDE "audio/sfx/noise_instrument17_2.asm" +INCLUDE "audio/sfx/noise_instrument18_2.asm" +INCLUDE "audio/sfx/noise_instrument19_2.asm" + ; Audio2_WavePointers: INCLUDE "audio/wave_instruments.asm" + INCLUDE "audio/sfx/press_ab_2.asm" INCLUDE "audio/sfx/start_menu_2.asm" INCLUDE "audio/sfx/tink_2.asm" @@ -156,7 +162,7 @@ INCLUDE "audio/sfx/faint_thud.asm" INCLUDE "audio/sfx/run.asm" INCLUDE "audio/sfx/dex_page_added.asm" INCLUDE "audio/sfx/swap_2.asm" ; added in yellow -INCLUDE "audio/sfx/pokeflute_ch3.asm" +INCLUDE "audio/sfx/pokeflute_ch7.asm" INCLUDE "audio/sfx/peck.asm" INCLUDE "audio/sfx/faint_fall.asm" INCLUDE "audio/sfx/battle_09.asm" @@ -244,30 +250,32 @@ INCLUDE "audio/sfx/cry1f_2.asm" INCLUDE "audio/sfx/cry20_2.asm" INCLUDE "audio/sfx/cry21_2.asm" INCLUDE "audio/sfx/cry22_2.asm" -; Audio2_WavePointers: INCLUDE "audio/wave_instruments.asm" + SECTION "Sound Effects 3", ROMX ; BANK $1f -INCLUDE "audio/sfx/snare1_3.asm" -INCLUDE "audio/sfx/snare2_3.asm" -INCLUDE "audio/sfx/snare3_3.asm" -INCLUDE "audio/sfx/snare4_3.asm" -INCLUDE "audio/sfx/snare5_3.asm" -INCLUDE "audio/sfx/triangle1_3.asm" -INCLUDE "audio/sfx/triangle2_3.asm" -INCLUDE "audio/sfx/snare6_3.asm" -INCLUDE "audio/sfx/snare7_3.asm" -INCLUDE "audio/sfx/snare8_3.asm" -INCLUDE "audio/sfx/snare9_3.asm" -INCLUDE "audio/sfx/cymbal1_3.asm" -INCLUDE "audio/sfx/cymbal2_3.asm" -INCLUDE "audio/sfx/cymbal3_3.asm" -INCLUDE "audio/sfx/muted_snare1_3.asm" -INCLUDE "audio/sfx/triangle3_3.asm" -INCLUDE "audio/sfx/muted_snare2_3.asm" -INCLUDE "audio/sfx/muted_snare3_3.asm" -INCLUDE "audio/sfx/muted_snare4_3.asm" +INCLUDE "audio/sfx/noise_instrument01_3.asm" +INCLUDE "audio/sfx/noise_instrument02_3.asm" +INCLUDE "audio/sfx/noise_instrument03_3.asm" +INCLUDE "audio/sfx/noise_instrument04_3.asm" +INCLUDE "audio/sfx/noise_instrument05_3.asm" +INCLUDE "audio/sfx/noise_instrument06_3.asm" +INCLUDE "audio/sfx/noise_instrument07_3.asm" +INCLUDE "audio/sfx/noise_instrument08_3.asm" +INCLUDE "audio/sfx/noise_instrument09_3.asm" +INCLUDE "audio/sfx/noise_instrument10_3.asm" +INCLUDE "audio/sfx/noise_instrument11_3.asm" +INCLUDE "audio/sfx/noise_instrument12_3.asm" +INCLUDE "audio/sfx/noise_instrument13_3.asm" +INCLUDE "audio/sfx/noise_instrument14_3.asm" +INCLUDE "audio/sfx/noise_instrument15_3.asm" +INCLUDE "audio/sfx/noise_instrument16_3.asm" +INCLUDE "audio/sfx/noise_instrument17_3.asm" +INCLUDE "audio/sfx/noise_instrument18_3.asm" +INCLUDE "audio/sfx/noise_instrument19_3.asm" + ; Audio3_WavePointers: INCLUDE "audio/wave_instruments.asm" + INCLUDE "audio/sfx/start_menu_3.asm" INCLUDE "audio/sfx/cut_3.asm" INCLUDE "audio/sfx/go_inside_3.asm" @@ -350,31 +358,33 @@ INCLUDE "audio/sfx/cry20_3.asm" INCLUDE "audio/sfx/cry21_3.asm" INCLUDE "audio/sfx/cry22_3.asm" + SECTION "Sound Effects 4", ROMX ; BANK $20 -INCLUDE "audio/sfx/snare1_4.asm" -INCLUDE "audio/sfx/snare2_4.asm" -INCLUDE "audio/sfx/snare3_4.asm" -INCLUDE "audio/sfx/snare4_4.asm" -INCLUDE "audio/sfx/snare5_4.asm" -INCLUDE "audio/sfx/triangle1_4.asm" -INCLUDE "audio/sfx/triangle2_4.asm" -INCLUDE "audio/sfx/snare6_4.asm" -INCLUDE "audio/sfx/snare7_4.asm" -INCLUDE "audio/sfx/snare8_4.asm" -INCLUDE "audio/sfx/snare9_4.asm" -INCLUDE "audio/sfx/cymbal1_4.asm" -INCLUDE "audio/sfx/cymbal2_4.asm" -INCLUDE "audio/sfx/cymbal3_4.asm" -INCLUDE "audio/sfx/muted_snare1_4.asm" -INCLUDE "audio/sfx/triangle3_4.asm" -INCLUDE "audio/sfx/muted_snare2_4.asm" -INCLUDE "audio/sfx/muted_snare3_4.asm" -INCLUDE "audio/sfx/muted_snare4_4.asm" +INCLUDE "audio/sfx/noise_instrument01_4.asm" +INCLUDE "audio/sfx/noise_instrument02_4.asm" +INCLUDE "audio/sfx/noise_instrument03_4.asm" +INCLUDE "audio/sfx/noise_instrument04_4.asm" +INCLUDE "audio/sfx/noise_instrument05_4.asm" +INCLUDE "audio/sfx/noise_instrument06_4.asm" +INCLUDE "audio/sfx/noise_instrument07_4.asm" +INCLUDE "audio/sfx/noise_instrument08_4.asm" +INCLUDE "audio/sfx/noise_instrument09_4.asm" +INCLUDE "audio/sfx/noise_instrument10_4.asm" +INCLUDE "audio/sfx/noise_instrument11_4.asm" +INCLUDE "audio/sfx/noise_instrument12_4.asm" +INCLUDE "audio/sfx/noise_instrument13_4.asm" +INCLUDE "audio/sfx/noise_instrument14_4.asm" +INCLUDE "audio/sfx/noise_instrument15_4.asm" +INCLUDE "audio/sfx/noise_instrument16_4.asm" +INCLUDE "audio/sfx/noise_instrument17_4.asm" +INCLUDE "audio/sfx/noise_instrument18_4.asm" +INCLUDE "audio/sfx/noise_instrument19_4.asm" + INCLUDE "audio/sfx/surfing_add_points.asm" INCLUDE "audio/sfx/unknown_80263.asm" INCLUDE "audio/sfx/unknown_8026a.asm" -INCLUDE "audio/sfx/heal_ailment_4.asm" +INCLUDE "audio/sfx/unknown_8027f.asm" INCLUDE "audio/sfx/tink_4.asm" INCLUDE "audio/sfx/surfing_jump.asm" INCLUDE "audio/sfx/surfing_flip.asm" @@ -383,6 +393,7 @@ INCLUDE "audio/sfx/surfing_crash.asm" INCLUDE "audio/sfx/surfing_land.asm" INCLUDE "audio/sfx/get_item2_4_2.asm" INCLUDE "audio/sfx/unknown_80337.asm" +INCLUDE "audio/sfx/unknown_80383.asm" INCLUDE "audio/sfx/unknown_803da.asm" INCLUDE "audio/sfx/unknown_80411.asm" INCLUDE "audio/sfx/unknown_80467.asm" @@ -421,12 +432,12 @@ INCLUDE "audio/sfx/unknown_80c6e.asm" INCLUDE "audio/sfx/unknown_80ca1.asm" INCLUDE "audio/sfx/unknown_80ce7.asm" INCLUDE "audio/music/printer.asm" -INCLUDE "audio/sfx/unknown_80e5a.asm" +INCLUDE "audio/sfx/get_item1_4.asm" INCLUDE "audio/sfx/unknown_80e91.asm" INCLUDE "audio/sfx/get_item2_4.asm" -SECTION "Audio Engine 1", ROMX ; BANK $2 +SECTION "Audio Engine 1", ROMX ; BANK $02 AudioEngine1:: @@ -444,7 +455,7 @@ PlayBattleMusic:: jr .playSong .notGymLeaderBattle ld a, [wCurOpponent] - cp 200 + cp OPP_ID_OFFSET jr c, .wildBattle cp OPP_SONY3 jr z, .finalBattle @@ -521,7 +532,8 @@ Music_Cities1AlternateTempo:: ld de, Music_Cities1_branch_aa6f jp Audio1_OverwriteChannelPointer -SECTION "Audio Engine 2", ROMX ; BANK $8 + +SECTION "Audio Engine 2", ROMX ; BANK $08 AudioEngine2:: @@ -547,7 +559,7 @@ Music_DoLowHealthAlarm:: .asm_2138a ld a, $86 - ld [wChannelSoundIDs + CH4], a ;disable sound channel? + ld [wChannelSoundIDs + Ch5], a ;disable sound channel? ld a, [wLowHealthAlarm] and $7f ;decrement alarm timer. dec a @@ -561,7 +573,7 @@ Music_DoLowHealthAlarm:: .disableAlarm xor a ld [wLowHealthAlarm], a ;disable alarm - ld [wChannelSoundIDs + CH4], a ;re-enable sound channel? + ld [wChannelSoundIDs + Ch5], a ;re-enable sound channel? ld de, .toneDataSilence jr .playTone @@ -657,7 +669,7 @@ SurfingPikachu1Graphics3:: INCBIN "gfx/surfing_pikachu_1c.2bpp" INCLUDE "audio/engine_4.asm" -SECTION "Music 1", ROMX ; BANK $2 +SECTION "Music 1", ROMX ; BANK $02 Audio1_WavePointers: INCLUDE "audio/wave_instruments.asm" @@ -688,7 +700,7 @@ INCLUDE "audio/music/gym.asm" INCLUDE "audio/music/pokecenter.asm" -SECTION "Music 2", ROMX ; BANK $8 +SECTION "Music 2", ROMX ; BANK $08 INCLUDE "audio/sfx/unused2_2.asm" INCLUDE "audio/music/gymleaderbattle.asm" @@ -738,6 +750,5 @@ INCLUDE "audio/music/meetjessiejames.asm" INCBIN "audio/unknown_832b9.bin" -; cries are in a different banks +; cries are in different banks INCLUDE "audio/pikachu_cries.asm" - |