diff options
Diffstat (limited to 'audio.asm')
-rw-r--r-- | audio.asm | 34 |
1 files changed, 15 insertions, 19 deletions
@@ -1,34 +1,30 @@ -AUDIO_1 EQU $2 -AUDIO_2 EQU $8 -AUDIO_3 EQU $1f - INCLUDE "constants.asm" -SECTION "Sound Effect Headers 1", ROMX, BANK[AUDIO_1] +SECTION "Sound Effect Headers 1", ROMX ; BANK $02 INCLUDE "audio/headers/sfxheaders1.asm" -SECTION "Sound Effect Headers 2", ROMX, BANK[AUDIO_2] +SECTION "Sound Effect Headers 2", ROMX ; BANK $08 INCLUDE "audio/headers/sfxheaders2.asm" -SECTION "Sound Effect Headers 3", ROMX, BANK[AUDIO_3] +SECTION "Sound Effect Headers 3", ROMX ; BANK $1f INCLUDE "audio/headers/sfxheaders3.asm" -SECTION "Music Headers 1", ROMX, BANK[AUDIO_1] +SECTION "Music Headers 1", ROMX ; BANK $02 INCLUDE "audio/headers/musicheaders1.asm" -SECTION "Music Headers 2", ROMX, BANK[AUDIO_2] +SECTION "Music Headers 2", ROMX ; BANK $08 INCLUDE "audio/headers/musicheaders2.asm" -SECTION "Music Headers 3", ROMX, BANK[AUDIO_3] +SECTION "Music Headers 3", ROMX ; BANK $1f INCLUDE "audio/headers/musicheaders3.asm" -SECTION "Sound Effects 1", ROMX, BANK[AUDIO_1] +SECTION "Sound Effects 1", ROMX ; BANK $02 INCLUDE "audio/sfx/snare1_1.asm" INCLUDE "audio/sfx/snare2_1.asm" @@ -127,7 +123,7 @@ 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 ; BANK $08 INCLUDE "audio/sfx/snare1_2.asm" INCLUDE "audio/sfx/snare2_2.asm" @@ -252,7 +248,7 @@ INCLUDE "audio/sfx/cry21_2.asm" INCLUDE "audio/sfx/cry22_2.asm" -SECTION "Sound Effects 3", ROMX, BANK[AUDIO_3] +SECTION "Sound Effects 3", ROMX ; BANK $1f INCLUDE "audio/sfx/snare1_3.asm" INCLUDE "audio/sfx/snare2_3.asm" @@ -360,7 +356,7 @@ INCLUDE "audio/sfx/cry22_3.asm" -SECTION "Audio Engine 1", ROMX, BANK[AUDIO_1] +SECTION "Audio Engine 1", ROMX ; BANK $02 PlayBattleMusic:: xor a @@ -453,7 +449,7 @@ Music_Cities1AlternateTempo:: jp Audio1_OverwriteChannelPointer -SECTION "Audio Engine 2", ROMX, BANK[AUDIO_2] +SECTION "Audio Engine 2", ROMX ; BANK $08 Music_DoLowHealthAlarm:: ld a, [wLowHealthAlarm] @@ -557,7 +553,7 @@ Audio2_OverwriteChannelPointer: ret -SECTION "Audio Engine 3", ROMX, BANK[AUDIO_3] +SECTION "Audio Engine 3", ROMX ; BANK $1f PlayPokedexRatingSfx:: ld a, [$ffdc] @@ -601,7 +597,7 @@ INCLUDE "audio/engine_3.asm" -SECTION "Music 1", ROMX, BANK[AUDIO_1] +SECTION "Music 1", ROMX ; BANK $02 INCLUDE "audio/music/pkmnhealed.asm" INCLUDE "audio/music/routes1.asm" @@ -630,7 +626,7 @@ INCLUDE "audio/music/gym.asm" INCLUDE "audio/music/pokecenter.asm" -SECTION "Music 2", ROMX, BANK[AUDIO_2] +SECTION "Music 2", ROMX ; BANK $08 INCLUDE "audio/sfx/pokeflute_ch4_ch5.asm" INCLUDE "audio/sfx/unused2_2.asm" @@ -646,7 +642,7 @@ INCLUDE "audio/music/defeatedwildmon.asm" INCLUDE "audio/music/defeatedgymleader.asm" -SECTION "Music 3", ROMX, BANK[AUDIO_3] +SECTION "Music 3", ROMX ; BANK $1f INCLUDE "audio/music/bikeriding.asm" INCLUDE "audio/music/dungeon1.asm" |