aboutsummaryrefslogtreecommitdiffstats
path: root/audio/headers/sfxheaders02.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/sfxheaders02.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/sfxheaders02.asm')
-rwxr-xr-x[-rw-r--r--]audio/headers/sfxheaders02.asm2
1 files changed, 1 insertions, 1 deletions
diff --git a/audio/headers/sfxheaders02.asm b/audio/headers/sfxheaders02.asm
index d1c185c0..22ccb1d7 100644..100755
--- a/audio/headers/sfxheaders02.asm
+++ b/audio/headers/sfxheaders02.asm
@@ -561,4 +561,4 @@ SFX_02_5f:: ; 822b (2:422b)
db CH4
dw SFX_02_5f_Ch1
-; 0x822e \ No newline at end of file
+; 0x822e