aboutsummaryrefslogtreecommitdiffstats
path: root/audio/headers/sfxheaders1f.asm
diff options
context:
space:
mode:
authorU-Daniel-PC\Daniel <corrnondacqb@yahoo.com>2015-06-04 23:17:30 -0500
committerU-Daniel-PC\Daniel <corrnondacqb@yahoo.com>2015-06-04 23:17:30 -0500
commitb0b1f88b9466f0414e4a6c782b5348f46768c8c4 (patch)
tree3ed8d12b5328b4f655d96351b3959f262fb2d72a /audio/headers/sfxheaders1f.asm
parentEOL Windows->UNIX (diff)
parentMerge pull request #96 from dannye/master (diff)
downloadpokeyellow-b0b1f88b9466f0414e4a6c782b5348f46768c8c4.tar.gz
pokeyellow-b0b1f88b9466f0414e4a6c782b5348f46768c8c4.tar.xz
pokeyellow-b0b1f88b9466f0414e4a6c782b5348f46768c8c4.zip
Merge branch 'master' of https://github.com/iimarckus/pokered
Conflicts: wram.asm
Diffstat (limited to 'audio/headers/sfxheaders1f.asm')
-rwxr-xr-x[-rw-r--r--]audio/headers/sfxheaders1f.asm2
1 files changed, 1 insertions, 1 deletions
diff --git a/audio/headers/sfxheaders1f.asm b/audio/headers/sfxheaders1f.asm
index 4db63a59..aa127123 100644..100755
--- a/audio/headers/sfxheaders1f.asm
+++ b/audio/headers/sfxheaders1f.asm
@@ -595,4 +595,4 @@ SFX_1f_67:: ; 7c246 (1f:4246)
db CH4
dw SFX_1f_67_Ch1
-; 0x7c249 \ No newline at end of file
+; 0x7c249