summaryrefslogtreecommitdiff
path: root/audio.asm
diff options
context:
space:
mode:
authorsurskitty <surskitty@gmail.com>2017-12-12 00:50:55 -0500
committersurskitty <surskitty@gmail.com>2017-12-12 00:50:55 -0500
commit096afdcdaca0714612f3670a3c4a670f312c1c3f (patch)
tree0c0bedcd311ab83262e31cf6d9d4c37257143acc /audio.asm
parent98128cd4d8457948e7136a16e08bacff0bc3529d (diff)
parentf6942b9a136b2ee3b25159ebc4d54509a42c5266 (diff)
Merge branch 'master' of github.com:pret/pokecrystal
Diffstat (limited to 'audio.asm')
-rw-r--r--audio.asm11
1 files changed, 1 insertions, 10 deletions
diff --git a/audio.asm b/audio.asm
index 203684d69..452fed76d 100644
--- a/audio.asm
+++ b/audio.asm
@@ -4,19 +4,10 @@ INCLUDE "includes.asm"
SECTION "Audio", ROMX
INCLUDE "audio/engine.asm"
-
-; What music plays when a trainer notices you
-INCLUDE "audio/trainer_encounters.asm"
-
-Music:
+INCLUDE "trainers/encounter_music.asm"
INCLUDE "audio/music_pointers.asm"
-
INCLUDE "audio/music/nothing.asm"
-
-Cries:
INCLUDE "audio/cry_pointers.asm"
-
-SFX:
INCLUDE "audio/sfx_pointers.asm"