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/sfx_pointers.asm | |
| parent | 17a4d0540acc00e3f5ad260009115eb36e72b7d2 (diff) | |
| parent | 2d73d040d16a7836f935a7a6cb2a311aed2ca5a2 (diff) | |
Merge branch 'master' into the-diffening
Diffstat (limited to 'audio/sfx_pointers.asm')
| -rw-r--r-- | audio/sfx_pointers.asm | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/audio/sfx_pointers.asm b/audio/sfx_pointers.asm index 9cbe1d0eb..0e066c60a 100644 --- a/audio/sfx_pointers.asm +++ b/audio/sfx_pointers.asm @@ -1,6 +1,5 @@ -SFX: ; e927c +SFX: ; entries correspond to SFX_* constants - dba Sfx_DexFanfare5079 dba Sfx_Item dba Sfx_CaughtMon @@ -191,9 +190,7 @@ SFX: ; e927c dba Sfx_2Boops dba Sfx_GlassTing dba Sfx_GlassTing2 - -; Crystal adds the following SFX: - +; new to Crystal dba Sfx_IntroUnown1 dba Sfx_IntroUnown2 dba Sfx_IntroUnown3 @@ -207,8 +204,7 @@ SFX: ; e927c dba Sfx_IntroSuicune4 dba Sfx_GameFreakPresents dba Sfx_Tingle - dba Sfx_UnknownCB + dba Sfx_IntroWhoosh dba Sfx_TwoPcBeeps dba Sfx_4NoteDitty dba Sfx_Twinkle -; e94e9 |