diff options
author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-06-24 21:23:51 -0400 |
---|---|---|
committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-06-24 21:23:51 -0400 |
commit | e2fb7acac0e3c1d598021b52fc2583dd983321bc (patch) | |
tree | ea5922596ce167e5b0485ea3bacd65f43339ca60 /audio/sfx_pointers.asm | |
parent | 1a888f22004aec967d2b6049ede7e04b1815f956 (diff) | |
parent | 364854623267a8a39242243b0cdf80144e868642 (diff) |
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
# engine/items/mart.asm
Diffstat (limited to 'audio/sfx_pointers.asm')
-rw-r--r-- | audio/sfx_pointers.asm | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/audio/sfx_pointers.asm b/audio/sfx_pointers.asm index 9cbe1d0eb..c607e9cae 100644 --- a/audio/sfx_pointers.asm +++ b/audio/sfx_pointers.asm @@ -1,4 +1,4 @@ -SFX: ; e927c +SFX: ; entries correspond to SFX_* constants dba Sfx_DexFanfare5079 @@ -211,4 +211,3 @@ SFX: ; e927c dba Sfx_TwoPcBeeps dba Sfx_4NoteDitty dba Sfx_Twinkle -; e94e9 |