diff options
author | Thomas Winwood <twwinwood@gmail.com> | 2018-07-21 02:06:31 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-21 02:06:31 +0100 |
commit | 23ef2f50a7b94c23b50e9e690a7482ac349c9ef3 (patch) | |
tree | 63c20c67efbdf8334c6e273f78065b83135e3886 /audio.asm | |
parent | 17a4d0540acc00e3f5ad260009115eb36e72b7d2 (diff) | |
parent | 2d73d040d16a7836f935a7a6cb2a311aed2ca5a2 (diff) |
Merge branch 'master' into the-diffening
Diffstat (limited to 'audio.asm')
-rw-r--r-- | audio.asm | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -11,7 +11,6 @@ INCLUDE "audio/cry_pointers.asm" INCLUDE "audio/sfx_pointers.asm" - SECTION "Songs 1", ROMX INCLUDE "audio/music/route36.asm" @@ -130,7 +129,6 @@ INCLUDE "audio/music/battletowerlobby.asm" INCLUDE "audio/music/mobilecenter.asm" - SECTION "Extra Songs 1", ROMX INCLUDE "audio/music/credits.asm" @@ -143,7 +141,6 @@ SECTION "Extra Songs 2", ROMX INCLUDE "audio/music/postcredits.asm" - SECTION "Sound Effects", ROMX INCLUDE "audio/sfx.asm" @@ -154,7 +151,6 @@ SECTION "Crystal Sound Effects", ROMX INCLUDE "audio/sfx_crystal.asm" - SECTION "Cries", ROMX INCLUDE "data/pokemon/cries.asm" |