diff options
| author | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2014-02-01 08:46:53 -0500 |
|---|---|---|
| committer | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2014-02-01 08:46:53 -0500 |
| commit | ed4ac6d55156f7dab8e609f4086db270264ce594 (patch) | |
| tree | 20bf3f15d294c7e95d6f2be94cd913d7d6896cc6 /music/defeatedwildmon.asm | |
| parent | 71d31fee0ec5c9f58963f20d53e5cf7114370a2f (diff) | |
| parent | b48435bb260e87bd27cc954eb5f2473c4f80c8f4 (diff) | |
Merge branch 'master' of https://github.com/iimarckus/pokered
Conflicts:
main.asm
Diffstat (limited to 'music/defeatedwildmon.asm')
| -rw-r--r-- | music/defeatedwildmon.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/music/defeatedwildmon.asm b/music/defeatedwildmon.asm index ac4b875a..c56c6471 100644 --- a/music/defeatedwildmon.asm +++ b/music/defeatedwildmon.asm @@ -1,4 +1,4 @@ -Music_DefeatedWildMon_Ch1: ; 23b74 (8:7b74) +Music_DefeatedWildMon_Ch1:: ; 23b74 (8:7b74) tempo 0, 112 stereopanning 119 executemusic @@ -14,7 +14,7 @@ Music_DefeatedWildMon_Ch1: ; 23b74 (8:7b74) note F#, 1 note E_, 12 -Music_DefeatedWildMon_branch_23b8b: +Music_DefeatedWildMon_branch_23b8b:: notetype 12, 6, 2 note E_, 2 note F#, 2 @@ -67,7 +67,7 @@ Music_DefeatedWildMon_branch_23b8b: loopchannel 0, Music_DefeatedWildMon_branch_23b8b -Music_DefeatedWildMon_Ch2: ; 23bc1 (8:7bc1) +Music_DefeatedWildMon_Ch2:: ; 23bc1 (8:7bc1) executemusic duty 2 notetype 12, 12, 3 @@ -79,7 +79,7 @@ Music_DefeatedWildMon_Ch2: ; 23bc1 (8:7bc1) notetype 12, 12, 7 note B_, 12 -Music_DefeatedWildMon_branch_23bce: +Music_DefeatedWildMon_branch_23bce:: notetype 12, 8, 2 octave 3 note B_, 2 @@ -142,7 +142,7 @@ Music_DefeatedWildMon_branch_23bce: loopchannel 0, Music_DefeatedWildMon_branch_23bce -Music_DefeatedWildMon_Ch3: ; 23c0e (8:7c0e) +Music_DefeatedWildMon_Ch3:: ; 23c0e (8:7c0e) executemusic notetype 12, 2, 0 octave 5 @@ -162,7 +162,7 @@ Music_DefeatedWildMon_Ch3: ; 23c0e (8:7c0e) note E_, 1 rest 3 -Music_DefeatedWildMon_branch_23c21: +Music_DefeatedWildMon_branch_23c21:: octave 4 note E_, 1 rest 1 |