summaryrefslogtreecommitdiff
path: root/src/audio/music/gymbattledanger.asm
diff options
context:
space:
mode:
Diffstat (limited to 'src/audio/music/gymbattledanger.asm')
-rw-r--r--src/audio/music/gymbattledanger.asm188
1 files changed, 94 insertions, 94 deletions
diff --git a/src/audio/music/gymbattledanger.asm b/src/audio/music/gymbattledanger.asm
index 9035706..bf7672f 100644
--- a/src/audio/music/gymbattledanger.asm
+++ b/src/audio/music/gymbattledanger.asm
@@ -5,25 +5,25 @@ Music_GymBattleDanger: ; 18ed33 (63:6d33)
dw Music_GymBattleDanger_Ch4
Music_GymBattleDanger_Ch1: ; 18ed3b (63:6d3b)
- musicda 119
- musice6 115
- musicdd
+ volume 119
+ volume_envelope 115
+ stereo_panning_both
musicd6 19
musicd7 0
- musicde
+ duty_cycle_12_5
musice3 2
musicd8 221
- musicec Music_GymBattleDanger_branch_18ed5e
+ song_call Music_GymBattleDanger_branch_18ed5e
Music_GymBattleDanger_branch_18ed4c: ; 18ed4c (63:6d4c)
- musicec Music_GymBattleDanger_branch_18eda0
- musicec Music_GymBattleDanger_branch_18ee8f
- musicec Music_GymBattleDanger_branch_18eef9
- musicec Music_GymBattleDanger_branch_18ef85
- musicec Music_GymBattleDanger_branch_18efe1
- musice7 Music_GymBattleDanger_branch_18ed4c
+ song_call Music_GymBattleDanger_branch_18eda0
+ song_call Music_GymBattleDanger_branch_18ee8f
+ song_call Music_GymBattleDanger_branch_18eef9
+ song_call Music_GymBattleDanger_branch_18ef85
+ song_call Music_GymBattleDanger_branch_18efe1
+ song_jump Music_GymBattleDanger_branch_18ed4c
Music_GymBattleDanger_branch_18ed5e: ; 18ed5e (63:6d5e)
- musicde
+ duty_cycle_12_5
musicd8 205
musicd4 55
musicd8 36
@@ -85,11 +85,11 @@ Music_GymBattleDanger_branch_18ed5e: ; 18ed5e (63:6d5e)
music8a 181
music01 6
music8a 180
- musiced
+ song_ret
Music_GymBattleDanger_branch_18eda0: ; 18eda0 (63:6da0)
musicd8 205
- musicde
+ duty_cycle_12_5
musicd7 0
musice3 3
music01 2
@@ -252,7 +252,7 @@ Music_GymBattleDanger_branch_18eda0: ; 18eda0 (63:6da0)
music8a 153
music01 6
music8a 153
- musiced
+ song_ret
; unreferenced ?
Music_GymBattleDanger_branch_18ee48: ; 18ed3b (63:6d3b)
@@ -324,10 +324,10 @@ Music_GymBattleDanger_branch_18ee48: ; 18ed3b (63:6d3b)
music8a 160
music01 6
music8a 161
- musiced
+ song_ret
Music_GymBattleDanger_branch_18ee8f: ; 18ee8f (63:6e8f)
- musicde
+ duty_cycle_12_5
musice3 2
musicd7 0
musicd4 55
@@ -428,10 +428,10 @@ Music_GymBattleDanger_branch_18ee8f: ; 18ee8f (63:6e8f)
music8a 171
music01 3
music8a 166
- musiced
+ song_ret
Music_GymBattleDanger_branch_18eef9: ; 18eef9 (63:6ef9)
- musicde
+ duty_cycle_12_5
musicd7 0
musicd4 55
musicd8 34
@@ -567,10 +567,10 @@ Music_GymBattleDanger_branch_18eef9: ; 18eef9 (63:6ef9)
music8a 163
music01 6
music8a 175
- musiced
+ song_ret
Music_GymBattleDanger_branch_18ef85: ; 18ef85 (63:6f85)
- musicde
+ duty_cycle_12_5
musicd7 0
musicd4 55
musicd8 34
@@ -658,10 +658,10 @@ Music_GymBattleDanger_branch_18ef85: ; 18ef85 (63:6f85)
music8a 182
music01 6
musicd2
- musiced
+ song_ret
Music_GymBattleDanger_branch_18efe1: ; 18efe1 (63:6fe1)
- musicde
+ duty_cycle_12_5
musicd7 0
musicd4 55
musicd8 34
@@ -731,28 +731,28 @@ Music_GymBattleDanger_branch_18efe1: ; 18efe1 (63:6fe1)
musicd2
music01 48
musicd2
- musiced
+ song_ret
Music_GymBattleDanger_Ch2: ; 18f02b (63:702b)
- musicda 119
- musice6 115
- musicdd
- musice0
+ volume 119
+ volume_envelope 115
+ stereo_panning_both
+ duty_cycle_50
musicd4 55
- musice0
+ duty_cycle_50
musicd8 179
musicd4 55
- musicec Music_GymBattleDanger_branch_18f04d
+ song_call Music_GymBattleDanger_branch_18f04d
Music_GymBattleDanger_branch_18f03b: ; 18f03b (63:703b)
- musicec Music_GymBattleDanger_branch_18f093
- musicec Music_GymBattleDanger_branch_18f181
- musicec Music_GymBattleDanger_branch_18f1e3
- musicec Music_GymBattleDanger_branch_18f223
- musicec Music_GymBattleDanger_branch_18f25b
- musice7 Music_GymBattleDanger_branch_18f03b
+ song_call Music_GymBattleDanger_branch_18f093
+ song_call Music_GymBattleDanger_branch_18f181
+ song_call Music_GymBattleDanger_branch_18f1e3
+ song_call Music_GymBattleDanger_branch_18f223
+ song_call Music_GymBattleDanger_branch_18f25b
+ song_jump Music_GymBattleDanger_branch_18f03b
Music_GymBattleDanger_branch_18f04d: ; 18f04d (63:704d)
- musice1
+ duty_cycle_75
musicd4 55
musicd8 36
music01 3
@@ -816,11 +816,11 @@ Music_GymBattleDanger_branch_18f04d: ; 18f04d (63:704d)
music8a 181
music01 6
music8a 180
- musiced
+ song_ret
Music_GymBattleDanger_branch_18f093: ; 18f093 (63:7093)
musicd8 224
- musice0
+ duty_cycle_50
musicd7 0
music01 2
music8a 149
@@ -982,11 +982,11 @@ Music_GymBattleDanger_branch_18f093: ; 18f093 (63:7093)
music8a 153
music01 6
music8a 153
- musiced
+ song_ret
; unreferenced ?
Music_GymBattleDanger_branch_18f139: ; 18f02b (63:702b)
- musicde
+ duty_cycle_12_5
musicd8 36
musicd7 24
music01 6
@@ -1055,10 +1055,10 @@ Music_GymBattleDanger_branch_18f139: ; 18f02b (63:702b)
music8a 160
music01 6
music8a 161
- musiced
+ song_ret
Music_GymBattleDanger_branch_18f181: ; 18f181 (63:7181)
- musice0
+ duty_cycle_50
musicd7 0
musicd8 179
musicd4 58
@@ -1111,7 +1111,7 @@ Music_GymBattleDanger_branch_18f181: ; 18f181 (63:7181)
music01 3
music8a 171
musicd4 55
- musicde
+ duty_cycle_12_5
musicd8 39
music8a 183
music01 3
@@ -1144,7 +1144,7 @@ Music_GymBattleDanger_branch_18f181: ; 18f181 (63:7181)
music8a 171
music01 3
music8a 166
- musiced
+ song_ret
Music_GymBattleDanger_branch_18f1e3: ; 18f1e3 (63:71e3)
musicd8 47
@@ -1209,10 +1209,10 @@ Music_GymBattleDanger_branch_18f1e3: ; 18f1e3 (63:71e3)
music8a 176
music01 6
music8a 178
- musiced
+ song_ret
Music_GymBattleDanger_branch_18f223: ; 18f223 (63:7223)
- musicde
+ duty_cycle_12_5
musicd8 39
music01 6
music8a 180
@@ -1266,10 +1266,10 @@ Music_GymBattleDanger_branch_18f223: ; 18f223 (63:7223)
music8a 182
music01 3
musicd2
- musiced
+ song_ret
Music_GymBattleDanger_branch_18f25b: ; 18f25b (63:725b)
- musicde
+ duty_cycle_12_5
musicd8 39
musicd8 179
musicd4 58
@@ -1292,9 +1292,9 @@ Music_GymBattleDanger_branch_18f25b: ; 18f25b (63:725b)
music8a 180
music01 3
musicd2
- musicde
+ duty_cycle_12_5
musicd8 34
- musice0
+ duty_cycle_50
music8a 186
music01 3
musicd2
@@ -1355,25 +1355,25 @@ Music_GymBattleDanger_branch_18f25b: ; 18f25b (63:725b)
music8a 152
music01 12
music8a 154
- musiced
+ song_ret
Music_GymBattleDanger_Ch3: ; 18f2bd (63:72bd)
- musicdd
+ stereo_panning_both
musice3 0
musicd8 27
musicd7 12
musicd4 55
- musicec Music_GymBattleDanger_branch_18f2db
+ song_call Music_GymBattleDanger_branch_18f2db
Music_GymBattleDanger_branch_18f2c9: ; 18f2c9 (63:72c9)
- musicec Music_GymBattleDanger_branch_18f31e
- musicec Music_GymBattleDanger_branch_18f416
- musicec Music_GymBattleDanger_branch_18f4a3
- musicec Music_GymBattleDanger_branch_18f523
- musicec Music_GymBattleDanger_branch_18f5ba
- musice7 Music_GymBattleDanger_branch_18f2c9
+ song_call Music_GymBattleDanger_branch_18f31e
+ song_call Music_GymBattleDanger_branch_18f416
+ song_call Music_GymBattleDanger_branch_18f4a3
+ song_call Music_GymBattleDanger_branch_18f523
+ song_call Music_GymBattleDanger_branch_18f5ba
+ song_jump Music_GymBattleDanger_branch_18f2c9
Music_GymBattleDanger_branch_18f2db: ; 18f2db (63:72db)
- musice2 63
+ wave 63
music01 3
music8a 164
music01 3
@@ -1381,10 +1381,10 @@ Music_GymBattleDanger_branch_18f2db: ; 18f2db (63:72db)
music8a 164
music01 3
music8a 164
- musice2 67
+ wave 67
music01 6
music8a 176
- musice2 63
+ wave 63
music01 3
music8a 164
music01 3
@@ -1392,10 +1392,10 @@ Music_GymBattleDanger_branch_18f2db: ; 18f2db (63:72db)
music8a 164
music01 3
music8a 164
- musice2 67
+ wave 67
music01 6
music8a 177
- musice2 63
+ wave 63
music01 3
music8a 164
music01 3
@@ -1403,10 +1403,10 @@ Music_GymBattleDanger_branch_18f2db: ; 18f2db (63:72db)
music8a 164
music01 3
music8a 164
- musice2 67
+ wave 67
music01 6
music8a 178
- musice2 63
+ wave 63
music01 3
music8a 164
music01 3
@@ -1414,26 +1414,26 @@ Music_GymBattleDanger_branch_18f2db: ; 18f2db (63:72db)
music8a 164
music01 3
music8a 164
- musice2 67
+ wave 67
music01 6
music8a 179
- musice2 63
+ wave 63
music01 3
music8a 164
music01 3
musicd2
- musice2 67
+ wave 67
music01 6
music8a 182
music01 6
music8a 181
music01 6
music8a 180
- musiced
+ song_ret
Music_GymBattleDanger_branch_18f31e: ; 18f31e (63:731e)
musicd7 12
- musice2 63
+ wave 63
music01 3
music8a 149
music01 1
@@ -1594,11 +1594,11 @@ Music_GymBattleDanger_branch_18f31e: ; 18f31e (63:731e)
music8a 148
music01 5
music8a 148
- musiced
+ song_ret
; unreferenced ?
Music_GymBattleDanger_branch_18f3c3: ; 18f2bd (63:72bd)
- musice2 64
+ wave 64
music01 6
music8a 149
music01 3
@@ -1679,10 +1679,10 @@ Music_GymBattleDanger_branch_18f3c3: ; 18f2bd (63:72bd)
music8a 149
music01 3
musicd2
- musiced
+ song_ret
Music_GymBattleDanger_branch_18f416: ; 18f416 (63:7416)
- musice2 62
+ wave 62
musicd7 12
music01 6
music8a 149
@@ -1820,7 +1820,7 @@ Music_GymBattleDanger_branch_18f416: ; 18f416 (63:7416)
music8a 154
music01 6
music8a 154
- musiced
+ song_ret
Music_GymBattleDanger_branch_18f4a3: ; 18f4a3 (63:74a3)
music01 6
@@ -1950,7 +1950,7 @@ Music_GymBattleDanger_branch_18f4a3: ; 18f4a3 (63:74a3)
music8a 163
music01 6
music8a 175
- musiced
+ song_ret
Music_GymBattleDanger_branch_18f523: ; 18f523 (63:7523)
music01 3
@@ -2103,7 +2103,7 @@ Music_GymBattleDanger_branch_18f523: ; 18f523 (63:7523)
music8a 146
music01 3
music8a 158
- musiced
+ song_ret
Music_GymBattleDanger_branch_18f5ba: ; 18f5ba (63:75ba)
music01 18
@@ -2171,18 +2171,18 @@ Music_GymBattleDanger_branch_18f5ba: ; 18f5ba (63:75ba)
music8a 147
music01 12
music8a 149
- musiced
+ song_ret
Music_GymBattleDanger_Ch4: ; 18f5fc (63:75fc)
- musicdd
- musicec Music_GymBattleDanger_branch_18f612
+ stereo_panning_both
+ song_call Music_GymBattleDanger_branch_18f612
Music_GymBattleDanger_branch_18f600: ; 18f600 (63:7600)
- musicec Music_GymBattleDanger_branch_18f64d
- musicec Music_GymBattleDanger_branch_18f6c8
- musicec Music_GymBattleDanger_branch_18f7c8
- musicec Music_GymBattleDanger_branch_18f849
- musicec Music_GymBattleDanger_branch_18f909
- musice7 Music_GymBattleDanger_branch_18f600
+ song_call Music_GymBattleDanger_branch_18f64d
+ song_call Music_GymBattleDanger_branch_18f6c8
+ song_call Music_GymBattleDanger_branch_18f7c8
+ song_call Music_GymBattleDanger_branch_18f849
+ song_call Music_GymBattleDanger_branch_18f909
+ song_jump Music_GymBattleDanger_branch_18f600
Music_GymBattleDanger_branch_18f612: ; 18f612 (63:7612)
music01 3
music6d 126
@@ -2242,7 +2242,7 @@ Music_GymBattleDanger_branch_18f612: ; 18f612 (63:7612)
music6d 127
music01 3
music6d 127
- musiced
+ song_ret
Music_GymBattleDanger_branch_18f64d: ; 18f64d (63:764d)
music01 3
@@ -2367,7 +2367,7 @@ Music_GymBattleDanger_branch_18f64d: ; 18f64d (63:764d)
music6d 127
music01 3
music6d 127
- musiced
+ song_ret
Music_GymBattleDanger_branch_18f6c8: ; 18f6c8 (63:76c8)
music01 3
@@ -2625,7 +2625,7 @@ Music_GymBattleDanger_branch_18f6c8: ; 18f6c8 (63:76c8)
music6d 127
music01 3
music6d 127
- musiced
+ song_ret
Music_GymBattleDanger_branch_18f7c8: ; 18f7c8 (63:77c8)
music01 6
@@ -2756,7 +2756,7 @@ Music_GymBattleDanger_branch_18f7c8: ; 18f7c8 (63:77c8)
music6d 126
music01 6
music6d 120
- musiced
+ song_ret
Music_GymBattleDanger_branch_18f849: ; 18f849 (63:7849)
music01 3
@@ -2950,7 +2950,7 @@ Music_GymBattleDanger_branch_18f849: ; 18f849 (63:7849)
music6d 120
music01 3
music6d 120
- musiced
+ song_ret
Music_GymBattleDanger_branch_18f909: ; 18f909 (63:7909)
music01 3
@@ -3077,4 +3077,4 @@ Music_GymBattleDanger_branch_18f909: ; 18f909 (63:7909)
music6d 125
music01 12
music6d 125
- musiced
+ song_ret
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-05 19:25:33 +0000