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 | |
| 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')
| -rwxr-xr-x[-rw-r--r--] | audio/headers/musicheaders02.asm | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | audio/headers/musicheaders08.asm | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | audio/headers/musicheaders1f.asm | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | audio/headers/sfxheaders02.asm | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | audio/headers/sfxheaders08.asm | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | audio/headers/sfxheaders1f.asm | 2 |
6 files changed, 6 insertions, 6 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 diff --git a/audio/headers/musicheaders08.asm b/audio/headers/musicheaders08.asm index b4ef7375..85cf2825 100644..100755 --- a/audio/headers/musicheaders08.asm +++ b/audio/headers/musicheaders08.asm @@ -54,4 +54,4 @@ Music_DefeatedGymLeader:: ; 202f4 (8:42f4) db CH2 dw Music_DefeatedGymLeader_Ch3 -; 202fd
\ No newline at end of file +; 202fd diff --git a/audio/headers/musicheaders1f.asm b/audio/headers/musicheaders1f.asm index beb70cf4..97b81d45 100644..100755 --- a/audio/headers/musicheaders1f.asm +++ b/audio/headers/musicheaders1f.asm @@ -157,4 +157,4 @@ Music_MeetMaleTrainer:: ; 7c2f4 (1f:42f4) db CH2 dw Music_MeetMaleTrainer_Ch3 -; 0x7c2fd
\ No newline at end of file +; 0x7c2fd 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 diff --git a/audio/headers/sfxheaders08.asm b/audio/headers/sfxheaders08.asm index 547c8d4a..6ee61953 100644..100755 --- a/audio/headers/sfxheaders08.asm +++ b/audio/headers/sfxheaders08.asm @@ -705,4 +705,4 @@ SFX_08_77:: ; 202bb (8:42bb) db CH4 dw SFX_08_77_Ch1 -; 0x202be
\ No newline at end of file +; 0x202be 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 |