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/notes.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/notes.asm')
-rw-r--r-- | audio/notes.asm | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/audio/notes.asm b/audio/notes.asm index 543672a4a..eeb84959b 100644 --- a/audio/notes.asm +++ b/audio/notes.asm @@ -1,4 +1,4 @@ -FrequencyTable: ; e8d80 +FrequencyTable: dw 0 ; __ dw $f82c ; C_ dw $f89d ; C# @@ -24,4 +24,3 @@ FrequencyTable: ; e8d80 dw $fdac ; A_ dw $fdcd ; A# dw $fded ; B_ -; e8db2 |