summaryrefslogtreecommitdiff
path: root/src/audio/music/mahoganygym.asm
diff options
context:
space:
mode:
Diffstat (limited to 'src/audio/music/mahoganygym.asm')
-rw-r--r--src/audio/music/mahoganygym.asm106
1 files changed, 53 insertions, 53 deletions
diff --git a/src/audio/music/mahoganygym.asm b/src/audio/music/mahoganygym.asm
index 265f4a2..e14d1a5 100644
--- a/src/audio/music/mahoganygym.asm
+++ b/src/audio/music/mahoganygym.asm
@@ -5,12 +5,12 @@ Music_MahoganyGym: ; 188000 (62:4000)
dw Music_MahoganyGym_Ch4
Music_MahoganyGym_Ch1: ; 188008 (62:4008)
- musicda 119
- musice6 115
- musicdd
+ volume 119
+ volume_envelope 115
+ stereo_panning_both
musicd6 14
musicd7 0
- musice1
+ duty_cycle_75
musicd4 55
musicd8 36
music01 30
@@ -22,14 +22,14 @@ Music_MahoganyGym_Ch1: ; 188008 (62:4008)
music01 6
music8a 166
Music_MahoganyGym_branch_18801e: ; 18801e (62:401e)
- musicec Music_MahoganyGym_branch_18802d
- musicec Music_MahoganyGym_branch_1880a2
- musicec Music_MahoganyGym_branch_18802d
- musicec Music_MahoganyGym_branch_1880b2
- musice7 Music_MahoganyGym_branch_18801e
+ song_call Music_MahoganyGym_branch_18802d
+ song_call Music_MahoganyGym_branch_1880a2
+ song_call Music_MahoganyGym_branch_18802d
+ song_call Music_MahoganyGym_branch_1880b2
+ song_jump Music_MahoganyGym_branch_18801e
Music_MahoganyGym_branch_18802d: ; 18802d (62:402d)
- musicde
+ duty_cycle_12_5
musicd4 55
musicd8 36
music01 12
@@ -143,7 +143,7 @@ Music_MahoganyGym_branch_18802d: ; 18802d (62:402d)
music8a 163
music01 6
musicd2
- musiced
+ song_ret
Music_MahoganyGym_branch_1880a2: ; 1880a2 (62:40a2)
music01 48
@@ -161,7 +161,7 @@ Music_MahoganyGym_branch_1880a2: ; 1880a2 (62:40a2)
music8a 174
music01 27
musicd2
- musiced
+ song_ret
Music_MahoganyGym_branch_1880b2: ; 1880b2 (62:40b2)
music01 12
@@ -432,15 +432,15 @@ Music_MahoganyGym_branch_1880b2: ; 1880b2 (62:40b2)
musicd2
music01 48
musicd2
- musiced
+ song_ret
Music_MahoganyGym_Ch2: ; 1881c7 (62:41c7)
- musicda 119
- musice6 115
- musicdd
+ volume 119
+ volume_envelope 115
+ stereo_panning_both
musicd6 14
musicd7 0
- musice0
+ duty_cycle_50
musicd4 55
musicd4 55
musicd8 32
@@ -461,11 +461,11 @@ Music_MahoganyGym_Ch2: ; 1881c7 (62:41c7)
music01 6
music8a 172
Music_MahoganyGym_branch_1881e7: ; 1881e7 (62:41e7)
- musicec Music_MahoganyGym_branch_1881f6
- musicec Music_MahoganyGym_branch_1882a0
- musicec Music_MahoganyGym_branch_1881f6
- musicec Music_MahoganyGym_branch_1882b2
- musice7 Music_MahoganyGym_branch_1881e7
+ song_call Music_MahoganyGym_branch_1881f6
+ song_call Music_MahoganyGym_branch_1882a0
+ song_call Music_MahoganyGym_branch_1881f6
+ song_call Music_MahoganyGym_branch_1882b2
+ song_jump Music_MahoganyGym_branch_1881e7
Music_MahoganyGym_branch_1881f6: ; 1881f6 (62:41f6)
musicd8 179
@@ -621,7 +621,7 @@ Music_MahoganyGym_branch_1881f6: ; 1881f6 (62:41f6)
music8a 169
music01 6
musicd3
- musiced
+ song_ret
Music_MahoganyGym_branch_1882a0: ; 1882a0 (62:42a0)
music01 48
@@ -640,7 +640,7 @@ Music_MahoganyGym_branch_1882a0: ; 1882a0 (62:42a0)
music8a 181
music01 27
musicd3
- musiced
+ song_ret
Music_MahoganyGym_branch_1882b2: ; 1882b2 (62:42b2)
musicd8 179
@@ -801,7 +801,7 @@ Music_MahoganyGym_branch_1882b2: ; 1882b2 (62:42b2)
music01 6
musicd2
musicd8 32
- musicde
+ duty_cycle_12_5
music01 3
music8a 176
music01 3
@@ -814,7 +814,7 @@ Music_MahoganyGym_branch_1882b2: ; 1882b2 (62:42b2)
music01 3
musicd3
musicd8 179
- musice0
+ duty_cycle_50
music01 6
music8a 164
music01 3
@@ -826,7 +826,7 @@ Music_MahoganyGym_branch_1882b2: ; 1882b2 (62:42b2)
music01 6
musicd2
musicd8 32
- musicde
+ duty_cycle_12_5
music01 3
music8a 176
music01 3
@@ -839,7 +839,7 @@ Music_MahoganyGym_branch_1882b2: ; 1882b2 (62:42b2)
music01 3
musicd3
musicd8 179
- musice0
+ duty_cycle_50
music01 6
music8a 171
music01 3
@@ -851,7 +851,7 @@ Music_MahoganyGym_branch_1882b2: ; 1882b2 (62:42b2)
music01 6
musicd2
musicd8 32
- musicde
+ duty_cycle_12_5
music01 3
music8a 176
music01 3
@@ -864,7 +864,7 @@ Music_MahoganyGym_branch_1882b2: ; 1882b2 (62:42b2)
music01 3
musicd3
musicd8 179
- musice0
+ duty_cycle_50
music01 6
music8a 176
music01 3
@@ -952,7 +952,7 @@ Music_MahoganyGym_branch_1882b2: ; 1882b2 (62:42b2)
music01 6
music8a 152
musicd8 31
- musice0
+ duty_cycle_50
music01 3
music8a 186
music01 3
@@ -960,7 +960,7 @@ Music_MahoganyGym_branch_1882b2: ; 1882b2 (62:42b2)
music01 6
music8a 198
musicd8 32
- musicde
+ duty_cycle_12_5
music01 3
music8a 186
music01 3
@@ -968,7 +968,7 @@ Music_MahoganyGym_branch_1882b2: ; 1882b2 (62:42b2)
music01 6
music8a 198
musicd8 179
- musice0
+ duty_cycle_50
music01 6
music8a 175
music01 6
@@ -996,14 +996,14 @@ Music_MahoganyGym_branch_1882b2: ; 1882b2 (62:42b2)
music01 3
musicd2
musicd8 31
- musice0
+ duty_cycle_50
music01 6
music8a 187
music01 3
music8a 187
music01 3
music8a 187
- musicde
+ duty_cycle_12_5
musicd8 32
music01 6
music8a 199
@@ -1016,7 +1016,7 @@ Music_MahoganyGym_branch_1882b2: ; 1882b2 (62:42b2)
music01 6
musicd2
musicd8 179
- musice0
+ duty_cycle_50
music01 3
music8a 163
music01 3
@@ -1034,13 +1034,13 @@ Music_MahoganyGym_branch_1882b2: ; 1882b2 (62:42b2)
music8a 175
music01 48
musicd2
- musiced
+ song_ret
Music_MahoganyGym_Ch3: ; 18844e (62:444e)
- musicdd
+ stereo_panning_both
musice3 0
musicd8 27
- musice2 63
+ wave 63
musicd4 55
musicd7 12
music01 12
@@ -1058,12 +1058,12 @@ Music_MahoganyGym_Ch3: ; 18844e (62:444e)
music01 6
music8a 142
Music_MahoganyGym_branch_188467: ; 188467 (62:4467)
- musicec Music_MahoganyGym_branch_188479
- musicec Music_MahoganyGym_branch_18853d
- musicec Music_MahoganyGym_branch_188479
- musicec Music_MahoganyGym_branch_188572
- musicec Music_MahoganyGym_branch_188581
- musice7 Music_MahoganyGym_branch_188467
+ song_call Music_MahoganyGym_branch_188479
+ song_call Music_MahoganyGym_branch_18853d
+ song_call Music_MahoganyGym_branch_188479
+ song_call Music_MahoganyGym_branch_188572
+ song_call Music_MahoganyGym_branch_188581
+ song_jump Music_MahoganyGym_branch_188467
Music_MahoganyGym_branch_188479: ; 188479 (62:4479)
music01 6
@@ -1261,7 +1261,7 @@ Music_MahoganyGym_branch_188479: ; 188479 (62:4479)
musicd2
music01 6
music8a 140
- musiced
+ song_ret
Music_MahoganyGym_branch_18853d: ; 18853d (62:453d)
music01 6
@@ -1316,7 +1316,7 @@ Music_MahoganyGym_branch_18853d: ; 18853d (62:453d)
music8a 138
music01 3
music8a 142
- musiced
+ song_ret
Music_MahoganyGym_branch_188572: ; 188572 (62:4572)
music01 6
@@ -1333,7 +1333,7 @@ Music_MahoganyGym_branch_188572: ; 188572 (62:4572)
music01 6
musicd2
music8a 151
- musiced
+ song_ret
Music_MahoganyGym_branch_188581: ; 188581 (62:4581)
music01 6
@@ -1692,15 +1692,15 @@ Music_MahoganyGym_branch_188581: ; 188581 (62:4581)
music8a 143
music01 3
music8a 139
- musiced
+ song_ret
Music_MahoganyGym_Ch4: ; 1886e6 (62:46e6)
music01 48
musicd2
Music_MahoganyGym_branch_1886e8: ; 1886e8 (62:46e8)
- musicdd
- musicec Music_MahoganyGym_branch_1886ef
- musice7 Music_MahoganyGym_branch_1886e8
+ stereo_panning_both
+ song_call Music_MahoganyGym_branch_1886ef
+ song_jump Music_MahoganyGym_branch_1886e8
Music_MahoganyGym_branch_1886ef: ; 1886ef (62:46ef)
music01 3
@@ -2969,4 +2969,4 @@ Music_MahoganyGym_branch_1886ef: ; 1886ef (62:46ef)
music6d 126
music01 3
music6d 127
- musiced
+ song_ret