summaryrefslogtreecommitdiff
path: root/audio.asm
diff options
context:
space:
mode:
Diffstat (limited to 'audio.asm')
-rw-r--r--audio.asm406
1 files changed, 41 insertions, 365 deletions
diff --git a/audio.asm b/audio.asm
index 7d63e456..ec41b356 100644
--- a/audio.asm
+++ b/audio.asm
@@ -1,58 +1,32 @@
INCLUDE "charmap.asm"
-
-AUDIO_1 EQU $2
-AUDIO_2 EQU $8
-AUDIO_3 EQU $1f
-AUDIO_4 EQU $20
-
-PCM_1 EQU $21
-PCM_2 EQU $22
-PCM_3 EQU $23
-PCM_4 EQU $24
-PCM_5 EQU $25
-PCM_6 EQU $31
-PCM_7 EQU $32
-PCM_8 EQU $33
-PCM_9 EQU $34
-PCM_10 EQU $35
-PCM_11 EQU $36
-PCM_12 EQU $37
-PCM_13 EQU $38
-GLOBAL AUDIO_1, AUDIO_2, AUDIO_3, AUDIO_4
-GLOBAL PCM_1, PCM_2, PCM_3, PCM_4, PCM_5, PCM_6, PCM_7
-GLOBAL PCM_8, PCM_9, PCM_10, PCM_11, PCM_12, PCM_13
-
-
-
-
INCLUDE "constants.asm"
-SECTION "Sound Effect Headers 1", ROMX, BANK[AUDIO_1]
+SECTION "Sound Effect Headers 1", ROMX
INCLUDE "audio/headers/sfxheaders1.asm"
-SECTION "Sound Effect Headers 2", ROMX, BANK[AUDIO_2]
+SECTION "Sound Effect Headers 2", ROMX
INCLUDE "audio/headers/sfxheaders2.asm"
-SECTION "Sound Effect Headers 3", ROMX, BANK[AUDIO_3]
+SECTION "Sound Effect Headers 3", ROMX
INCLUDE "audio/headers/sfxheaders3.asm"
-SECTION "Sound Effect Headers 4", ROMX, BANK[AUDIO_4]
+SECTION "Sound Effect Headers 4", ROMX
INCLUDE "audio/headers/sfxheaders4.asm"
-SECTION "Music Headers 1", ROMX, BANK[AUDIO_1]
+SECTION "Music Headers 1", ROMX
INCLUDE "audio/headers/musicheaders1.asm"
-SECTION "Music Headers 2", ROMX, BANK[AUDIO_2]
+SECTION "Music Headers 2", ROMX
INCLUDE "audio/headers/musicheaders2.asm"
-SECTION "Music Headers 3", ROMX, BANK[AUDIO_3]
+SECTION "Music Headers 3", ROMX
INCLUDE "audio/headers/musicheaders3.asm"
-SECTION "Music Headers 4", ROMX, BANK[AUDIO_4]
+SECTION "Music Headers 4", ROMX
INCLUDE "audio/headers/musicheaders4.asm"
-SECTION "Sound Effects 1", ROMX, BANK[AUDIO_1]
+SECTION "Sound Effects 1", ROMX
INCLUDE "audio/sfx/snare1_1.asm"
INCLUDE "audio/sfx/snare2_1.asm"
@@ -148,7 +122,7 @@ INCLUDE "audio/sfx/cry20_1.asm"
INCLUDE "audio/sfx/cry21_1.asm"
INCLUDE "audio/sfx/cry22_1.asm"
-SECTION "Sound Effects 2", ROMX, BANK[AUDIO_2]
+SECTION "Sound Effects 2", ROMX
INCLUDE "audio/sfx/snare1_2.asm"
INCLUDE "audio/sfx/snare2_2.asm"
@@ -272,7 +246,7 @@ 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[AUDIO_3]
+SECTION "Sound Effects 3", ROMX
INCLUDE "audio/sfx/snare1_3.asm"
INCLUDE "audio/sfx/snare2_3.asm"
@@ -376,7 +350,8 @@ INCLUDE "audio/sfx/cry20_3.asm"
INCLUDE "audio/sfx/cry21_3.asm"
INCLUDE "audio/sfx/cry22_3.asm"
-SECTION "Sound Effects 4", ROMX, BANK[AUDIO_4]
+SECTION "Sound Effects 4", ROMX
+
INCLUDE "audio/sfx/snare1_4.asm"
INCLUDE "audio/sfx/snare2_4.asm"
INCLUDE "audio/sfx/snare3_4.asm"
@@ -450,7 +425,10 @@ INCLUDE "audio/sfx/unknown_80e5a.asm"
INCLUDE "audio/sfx/unknown_80e91.asm"
INCLUDE "audio/sfx/get_item2_4.asm"
-SECTION "Audio Engine 1", ROMX, BANK[AUDIO_1]
+
+SECTION "Audio Engine 1", ROMX
+
+AudioEngine1::
PlayBattleMusic::
xor a
@@ -458,11 +436,11 @@ PlayBattleMusic::
ld [wLowHealthAlarm], a
call StopAllMusic
call DelayFrame
- ld c, $8 ; BANK(Music_GymLeaderBattle)
+ ld c, BANK(Music_GymLeaderBattle)
ld a, [wGymLeaderNo]
and a
jr z, .notGymLeaderBattle
- ld a, $ea ; MUSIC_GYM_LEADER_BATTLE
+ ld a, MUSIC_GYM_LEADER_BATTLE
jr .playSong
.notGymLeaderBattle
ld a, [wCurOpponent]
@@ -472,16 +450,16 @@ PlayBattleMusic::
jr z, .finalBattle
cp OPP_LANCE
jr nz, .normalTrainerBattle
- ld a, $ea ; MUSIC_GYM_LEADER_BATTLE ; lance also plays gym leader theme
+ ld a, MUSIC_GYM_LEADER_BATTLE ; lance also plays gym leader theme
jr .playSong
.normalTrainerBattle
- ld a, $ed ; MUSIC_TRAINER_BATTLE
+ ld a, MUSIC_TRAINER_BATTLE
jr .playSong
.finalBattle
- ld a, $f3 ; MUSIC_FINAL_BATTLE
+ ld a, MUSIC_FINAL_BATTLE
jr .playSong
.wildBattle
- ld a, $f0 ; MUSIC_WILD_BATTLE
+ ld a, MUSIC_WILD_BATTLE
.playSong
jp PlayMusic
@@ -537,13 +515,15 @@ Music_Cities1AlternateTempo::
ld c, 100
call DelayFrames ; wait for the fade-out to finish
ld c, BANK(Music_Cities1)
- ld a, $c3 ; MUSIC_CITIES1
+ ld a, MUSIC_CITIES1
call PlayMusic
ld hl, wChannelCommandPointers
ld de, Music_Cities1_branch_aa6f
jp Audio1_OverwriteChannelPointer
-SECTION "Audio Engine 2", ROMX, BANK[AUDIO_2]
+SECTION "Audio Engine 2", ROMX
+
+AudioEngine2::
Music_DoLowHealthAlarm::
ld a, [wLowHealthAlarm]
@@ -625,7 +605,10 @@ INCLUDE "engine/menu/bills_pc.asm"
INCLUDE "audio/engine_2.asm"
-SECTION "Audio Engine 3", ROMX, BANK[AUDIO_3]
+
+SECTION "Audio Engine 3", ROMX
+
+AudioEngine3::
PlayPokedexRatingSfx::
ld a, [$ffdc]
@@ -662,10 +645,10 @@ PokedexRatingSfxPointers:
OwnedMonValues:
db 10, 40, 60, 90, 120, 150, $ff
-
INCLUDE "audio/engine_3.asm"
-SECTION "Audio Engine 4", ROMX, BANK[AUDIO_4]
+
+SECTION "Audio Engine 4", ROMX
SurfingPikachu1Graphics1:: INCBIN "gfx/surfing_pikachu_1a.2bpp"
SurfingPikachu1Graphics2:: INCBIN "gfx/surfing_pikachu_1b.2bpp"
@@ -673,7 +656,8 @@ SurfingPikachu1Graphics3:: INCBIN "gfx/surfing_pikachu_1c.t5.2bpp"
INCLUDE "audio/engine_4.asm"
-SECTION "Music 1", ROMX, BANK[AUDIO_1]
+
+SECTION "Music 1", ROMX
Audio1_WavePointers: INCLUDE "audio/wave_instruments.asm"
@@ -704,7 +688,7 @@ INCLUDE "audio/music/gym.asm"
INCLUDE "audio/music/pokecenter.asm"
-SECTION "Music 2", ROMX, BANK[AUDIO_2]
+SECTION "Music 2", ROMX
INCLUDE "audio/sfx/unused2_2.asm"
INCLUDE "audio/music/gymleaderbattle.asm"
@@ -719,7 +703,7 @@ INCLUDE "audio/music/defeatedwildmon.asm"
INCLUDE "audio/music/defeatedgymleader.asm"
-SECTION "Music 3", ROMX, BANK[AUDIO_3]
+SECTION "Music 3", ROMX
INCLUDE "audio/music/bikeriding.asm"
INCLUDE "audio/music/dungeon1.asm"
@@ -745,323 +729,15 @@ INCLUDE "audio/music/halloffame.asm"
INCLUDE "audio/music/credits.asm"
INCLUDE "audio/music/yellowintro.asm"
-SECTION "Music 4", ROMX, BANK[AUDIO_4]
+
+SECTION "Music 4", ROMX
+
INCLUDE "audio/music/surfingpikachu.asm"
INCLUDE "audio/music/yellowunusedsong.asm"
INCLUDE "audio/music/meetjessiejames.asm"
INCBIN "audio/unknown_832b9.bin"
-SECTION "Pikachu Cries 1",ROMX,BANK[PCM_1]
-PikachuCry1::
- dw (PikachuCry1_End - PikachuCry1) - 2 ; length of pcm data
- INCBIN "audio/pikachu_cries/pikachu_cry_1.pcm"
-PikachuCry1_End:
-
- db $77 ; unused
- ; Game Freak might have made a slight error, because all of
- ; the pcm data has one trailing byte that is never processed.
-
-PikachuCry2::
- dw (PikachuCry2_End - PikachuCry2) - 2 ; length of pcm data
- INCBIN "audio/pikachu_cries/pikachu_cry_2.pcm"
-PikachuCry2_End:
-
- db $77 ; unused
-
-PikachuCry3::
- dw (PikachuCry3_End - PikachuCry3) - 2 ; length of pcm data
- INCBIN "audio/pikachu_cries/pikachu_cry_3.pcm"
-PikachuCry3_End:
-
- db $03 ; unused
-
-PikachuCry4::
- dw (PikachuCry4_End - PikachuCry4) - 2 ; length of pcm data
- INCBIN "audio/pikachu_cries/pikachu_cry_4.pcm"
-PikachuCry4_End:
-
- db $e0 ; unused
-
-
-SECTION "Pikachu Cries 2",ROMX,BANK[PCM_2]
-PikachuCry5::
- dw (PikachuCry5_End - PikachuCry5) - 2 ; length of pcm data
- INCBIN "audio/pikachu_cries/pikachu_cry_5.pcm"
-PikachuCry5_End:
-
- db $77 ; unused
-
-PikachuCry6::
- dw (PikachuCry6_End - PikachuCry6) - 2 ; length of pcm data
- INCBIN "audio/pikachu_cries/pikachu_cry_6.pcm"
-PikachuCry6_End:
-
- db $77 ; unused
-
-PikachuCry7::
- dw (PikachuCry7_End - PikachuCry7) - 2 ; length of pcm data
- INCBIN "audio/pikachu_cries/pikachu_cry_7.pcm"
-PikachuCry7_End:
-
- db $ff ; unused
-
-
-SECTION "Pikachu Cries 3",ROMX,BANK[PCM_3]
-PikachuCry8::
- dw (PikachuCry8_End - PikachuCry8) - 2 ; length of pcm data
- INCBIN "audio/pikachu_cries/pikachu_cry_8.pcm"
-PikachuCry8_End:
-
- db $f7 ; unused
-
-PikachuCry9::
- dw (PikachuCry9_End - PikachuCry9) - 2 ; length of pcm data
- INCBIN "audio/pikachu_cries/pikachu_cry_9.pcm"
-PikachuCry9_End:
-
- db $f3 ; unused
-
-PikachuCry10::
- dw (PikachuCry10_End - PikachuCry10) - 2 ; length of pcm data
- INCBIN "audio/pikachu_cries/pikachu_cry_10.pcm"
-PikachuCry10_End:
-
- db $ff ; unused
-
-
-SECTION "Pikachu Cries 4",ROMX,BANK[PCM_4]
-PikachuCry11::
- dw (PikachuCry11_End - PikachuCry11) - 2 ; length of pcm data
- INCBIN "audio/pikachu_cries/pikachu_cry_11.pcm"
-PikachuCry11_End:
-
- db $77 ; unused
-
-PikachuCry12::
- dw (PikachuCry12_End - PikachuCry12) - 2 ; length of pcm data
- INCBIN "audio/pikachu_cries/pikachu_cry_12.pcm"
-PikachuCry12_End:
-
- db $ff ; unused
-
-PikachuCry13::
- dw (PikachuCry13_End - PikachuCry13) - 2 ; length of pcm data
- INCBIN "audio/pikachu_cries/pikachu_cry_13.pcm"
-PikachuCry13_End:
-
- db $f0 ; unused
-
-
-SECTION "Pikachu Cries 5",ROMX,BANK[PCM_5]
-PikachuCry14::
- dw (PikachuCry14_End - PikachuCry14) - 2 ; length of pcm data
- INCBIN "audio/pikachu_cries/pikachu_cry_14.pcm"
-PikachuCry14_End:
-
- db $fc ; unused
-
-PikachuCry15::
- dw (PikachuCry15_End - PikachuCry15) - 2 ; length of pcm data
- INCBIN "audio/pikachu_cries/pikachu_cry_15.pcm"
-PikachuCry15_End:
-
- db $77 ; unused
-
-SECTION "Pikachu Cries 6",ROMX,BANK[PCM_6]
-PikachuCry16::
- dw (PikachuCry16_End - PikachuCry16) - 2 ; length of pcm data
- INCBIN "audio/pikachu_cries/pikachu_cry_16.pcm"
-PikachuCry16_End:
-
- db $e7 ; unused
-
-PikachuCry18::
- dw (PikachuCry18_End - PikachuCry18) - 2 ; length of pcm data
- INCBIN "audio/pikachu_cries/pikachu_cry_18.pcm"
-PikachuCry18_End:
-
- db $00 ; unused
-
-PikachuCry22::
- dw (PikachuCry22_End - PikachuCry22) - 2 ; length of pcm data
- INCBIN "audio/pikachu_cries/pikachu_cry_22.pcm"
-PikachuCry22_End:
-
- db $7e ; unused
-
-
-SECTION "Pikachu Cries 7",ROMX,BANK[PCM_7]
-PikachuCry20::
- dw (PikachuCry20_End - PikachuCry20) - 2 ; length of pcm data
- INCBIN "audio/pikachu_cries/pikachu_cry_20.pcm"
-PikachuCry20_End:
-
- db $07 ; unused
-
-PikachuCry21::
- dw (PikachuCry21_End - PikachuCry21) - 2 ; length of pcm data
- INCBIN "audio/pikachu_cries/pikachu_cry_21.pcm"
-PikachuCry21_End:
-
- db $ff ; unused
-
-
-SECTION "Pikachu Cries 8",ROMX,BANK[PCM_8]
-PikachuCry19::
- dw (PikachuCry19_End - PikachuCry19) - 2 ; length of pcm data
- INCBIN "audio/pikachu_cries/pikachu_cry_19.pcm"
-PikachuCry19_End:
-
- db $06 ; unused
-
-PikachuCry24::
- dw (PikachuCry24_End - PikachuCry24) - 2 ; length of pcm data
- INCBIN "audio/pikachu_cries/pikachu_cry_24.pcm"
-PikachuCry24_End:
-
- db $e0 ; unused
-
-PikachuCry26::
- dw (PikachuCry26_End - PikachuCry26) - 2 ; length of pcm data
- INCBIN "audio/pikachu_cries/pikachu_cry_26.pcm"
-PikachuCry26_End:
-
-
-SECTION "Pikachu Cries 9",ROMX,BANK[PCM_9]
-PikachuCry17::
- dw (PikachuCry17_End - PikachuCry17) - 2 ; length of pcm data
- INCBIN "audio/pikachu_cries/pikachu_cry_17.pcm"
-PikachuCry17_End:
-
- db $00 ; unused
-
-PikachuCry23::
- dw (PikachuCry23_End - PikachuCry23) - 2 ; length of pcm data
- INCBIN "audio/pikachu_cries/pikachu_cry_23.pcm"
-PikachuCry23_End:
-
- db $00 ; unused
-
-PikachuCry25::
- dw (PikachuCry25_End - PikachuCry25) - 2 ; length of pcm data
- INCBIN "audio/pikachu_cries/pikachu_cry_25.pcm"
-PikachuCry25_End:
-
- db $03 ; unused
-
-
-SECTION "Pikachu Cries 10",ROMX,BANK[PCM_10]
-PikachuCry27::
- dw (PikachuCry27_End - PikachuCry27) - 2 ; length of pcm data
- INCBIN "audio/pikachu_cries/pikachu_cry_27.pcm"
-PikachuCry27_End:
-
- db $ff ; unused
-
-PikachuCry28::
- dw (PikachuCry28_End - PikachuCry28) - 2 ; length of pcm data
- INCBIN "audio/pikachu_cries/pikachu_cry_28.pcm"
-PikachuCry28_End:
-
- db $1b ; unused
-
-PikachuCry29::
- dw (PikachuCry29_End - PikachuCry29) - 2 ; length of pcm data
- INCBIN "audio/pikachu_cries/pikachu_cry_29.pcm"
-PikachuCry29_End:
-
- db $87 ; unused
-
-PikachuCry30::
- dw (PikachuCry30_End - PikachuCry30) - 2 ; length of pcm data
- INCBIN "audio/pikachu_cries/pikachu_cry_30.pcm"
-PikachuCry30_End:
-
- db $00 ; unused
-
-PikachuCry31::
- dw (PikachuCry31_End - PikachuCry31) - 2 ; length of pcm data
- INCBIN "audio/pikachu_cries/pikachu_cry_31.pcm"
-PikachuCry31_End:
-
-
-SECTION "Pikachu Cries 11",ROMX,BANK[PCM_11]
-PikachuCry32::
- dw (PikachuCry32_End - PikachuCry32) - 2 ; length of pcm data
- INCBIN "audio/pikachu_cries/pikachu_cry_32.pcm"
-PikachuCry32_End:
-
- db $ff ; unused
-
-PikachuCry33::
- dw (PikachuCry33_End - PikachuCry33) - 2 ; length of pcm data
- INCBIN "audio/pikachu_cries/pikachu_cry_33.pcm"
-PikachuCry33_End:
-
- db $1f ; unused
-
-PikachuCry34::
- dw (PikachuCry34_End - PikachuCry34) - 2 ; length of pcm data
- INCBIN "audio/pikachu_cries/pikachu_cry_34.pcm"
-PikachuCry34_End:
-
- db $01 ; unused
-
-PikachuCry41::
- dw (PikachuCry41_End - PikachuCry41) - 2 ; length of pcm data
- INCBIN "audio/pikachu_cries/pikachu_cry_41.pcm"
-PikachuCry41_End:
-
- db $9b ; unused
-
-
-SECTION "Pikachu Cries 12",ROMX,BANK[PCM_12]
-PikachuCry35::
- dw (PikachuCry35_End - PikachuCry35) - 2 ; length of pcm data
- INCBIN "audio/pikachu_cries/pikachu_cry_35.pcm"
-PikachuCry35_End:
-
- db $00 ; unused
-
-PikachuCry36::
- dw (PikachuCry36_End - PikachuCry36) - 2 ; length of pcm data
- INCBIN "audio/pikachu_cries/pikachu_cry_36.pcm"
-PikachuCry36_End:
-
- db $01 ; unused
-
-PikachuCry39::
- dw (PikachuCry39_End - PikachuCry39) - 2 ; length of pcm data
- INCBIN "audio/pikachu_cries/pikachu_cry_39.pcm"
-PikachuCry39_End:
-
- db $0f ; unused
-
-
-SECTION "Pikachu Cries 13",ROMX,BANK[PCM_13]
-PikachuCry37::
- dw (PikachuCry37_End - PikachuCry37) - 2 ; length of pcm data
- INCBIN "audio/pikachu_cries/pikachu_cry_37.pcm"
-PikachuCry37_End:
-
- db $3f ; unused
-
-PikachuCry38::
- dw (PikachuCry38_End - PikachuCry38) - 2 ; length of pcm data
- INCBIN "audio/pikachu_cries/pikachu_cry_38.pcm"
-PikachuCry38_End:
-
- db $ff ; unused
-
-PikachuCry40::
- dw (PikachuCry40_End - PikachuCry40) - 2 ; length of pcm data
- INCBIN "audio/pikachu_cries/pikachu_cry_40.pcm"
-PikachuCry40_End:
- db $ff ; unused
+INCLUDE "audio/pikachu_cries.asm"
-PikachuCry42::
- dw (PikachuCry42_End - PikachuCry42) - 2 ; length of pcm data
- INCBIN "audio/pikachu_cries/pikachu_cry_42.pcm"
-PikachuCry42_End: