diff options
| author | klektron <klektron@users.noreply.github.com> | 2021-01-03 17:31:10 +0100 |
|---|---|---|
| committer | klektron <klektron@users.noreply.github.com> | 2021-01-03 17:31:10 +0100 |
| commit | 779c7ddaa2613e41ce86e10893ee1b94ecc5b899 (patch) | |
| tree | 286b04873ddce3f576d02a4ad58c843686fb80df /audio | |
| parent | a20ca92534f9cc6922f40e5f736a22862754db4b (diff) | |
| parent | 21908ba30a8bae5c5e1c86b1164402ec95da0220 (diff) | |
Merge last changes from pret
Diffstat (limited to 'audio')
| -rw-r--r--[-rwxr-xr-x] | audio/headers/musicheaders1.asm | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | audio/headers/musicheaders2.asm | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | audio/headers/musicheaders3.asm | 0 | ||||
| -rw-r--r-- | audio/sfx/unused_fanfare.asm (renamed from audio/sfx/unused2_2.asm) | 9 |
4 files changed, 4 insertions, 5 deletions
diff --git a/audio/headers/musicheaders1.asm b/audio/headers/musicheaders1.asm index ef85eae6..ef85eae6 100755..100644 --- a/audio/headers/musicheaders1.asm +++ b/audio/headers/musicheaders1.asm diff --git a/audio/headers/musicheaders2.asm b/audio/headers/musicheaders2.asm index d6cca9a9..d6cca9a9 100755..100644 --- a/audio/headers/musicheaders2.asm +++ b/audio/headers/musicheaders2.asm diff --git a/audio/headers/musicheaders3.asm b/audio/headers/musicheaders3.asm index ca21b419..ca21b419 100755..100644 --- a/audio/headers/musicheaders3.asm +++ b/audio/headers/musicheaders3.asm diff --git a/audio/sfx/unused2_2.asm b/audio/sfx/unused_fanfare.asm index aa93f91c..d41bb080 100644 --- a/audio/sfx/unused2_2.asm +++ b/audio/sfx/unused_fanfare.asm @@ -1,4 +1,5 @@ -SFX_Unused2_Ch5: +; This corresponds to SFX_KEY_ITEM in pokegold and pokecrystal. +SFX_UnusedFanfare_Ch5: ; unreferenced execute_music tempo 256 volume 7, 7 @@ -16,8 +17,7 @@ SFX_Unused2_Ch5: note E_, 8 sound_ret - -SFX_Unused2_Ch6: +SFX_UnusedFanfare_Ch6: ; unreferenced execute_music vibrato 8, 2, 7 duty_cycle 2 @@ -32,8 +32,7 @@ SFX_Unused2_Ch6: note B_, 8 sound_ret - -SFX_Unused2_Ch7: +SFX_UnusedFanfare_Ch7: ; unreferenced execute_music note_type 6, 1, 0 octave 4 |