diff options
| author | U-Daniel-PC\Daniel <corrnondacqb@yahoo.com> | 2015-06-04 23:17:30 -0500 |
|---|---|---|
| committer | U-Daniel-PC\Daniel <corrnondacqb@yahoo.com> | 2015-06-04 23:17:30 -0500 |
| commit | b0b1f88b9466f0414e4a6c782b5348f46768c8c4 (patch) | |
| tree | 3ed8d12b5328b4f655d96351b3959f262fb2d72a /audio/headers/musicheaders02.asm | |
| parent | EOL Windows->UNIX (diff) | |
| parent | Merge pull request #96 from dannye/master (diff) | |
| download | pokeyellow-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/musicheaders02.asm')
| -rwxr-xr-x[-rw-r--r--] | audio/headers/musicheaders02.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/audio/headers/musicheaders02.asm b/audio/headers/musicheaders02.asm index dd5b4b5b..82342c81 100644..100755 --- a/audio/headers/musicheaders02.asm +++ b/audio/headers/musicheaders02.asm @@ -183,4 +183,4 @@ Music_IndigoPlateau:: ; 82f1 (2:42f1) db CH3 dw Music_IndigoPlateau_Ch4 -; 0x82fd
\ No newline at end of file +; 0x82fd |