diff options
| author | dannye <33dannye@gmail.com> | 2021-05-06 22:01:12 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2021-05-06 22:01:12 -0500 |
| commit | 923dc914fc54e1067724f3b0f7236a64ab56f6af (patch) | |
| tree | af0a6513ac653faa46b4f9d1100470d890ce8085 | |
| parent | 5180818617b9347e25aa28d65cadbfc6e14f2238 (diff) | |
34 files changed, 2047 insertions, 2043 deletions
diff --git a/src/audio/music/azaleaandblackthorngym.asm b/src/audio/music/azaleaandblackthorngym.asm index 6eaf472..76628f6 100644 --- a/src/audio/music/azaleaandblackthorngym.asm +++ b/src/audio/music/azaleaandblackthorngym.asm @@ -5,44 +5,44 @@ Music_AzaleaAndBlackthornGym: ; 185d0a (61:5d0a) dw Music_AzaleaAndBlackthornGym_Ch4 Music_AzaleaAndBlackthornGym_Ch1: ; 185d12 (61:5d12) - musicda 119 - musice6 115 - musicdd + volume 119 + volume_envelope 115 + stereo_panning_both musicd6 14 musicd7 0 - musicde + duty_cycle_12_5 musice3 254 musicd4 55 musicd8 221 musice3 255 - musicec Music_AzaleaAndBlackthornGym_branch_185d64 + song_call Music_AzaleaAndBlackthornGym_branch_185d64 musice3 254 - musicec Music_AzaleaAndBlackthornGym_branch_185d64 + song_call Music_AzaleaAndBlackthornGym_branch_185d64 musice3 253 - musicec Music_AzaleaAndBlackthornGym_branch_185d64 + song_call Music_AzaleaAndBlackthornGym_branch_185d64 musice3 252 - musicec Music_AzaleaAndBlackthornGym_branch_185d64 + song_call Music_AzaleaAndBlackthornGym_branch_185d64 musice3 253 - musicec Music_AzaleaAndBlackthornGym_branch_185d64 + song_call Music_AzaleaAndBlackthornGym_branch_185d64 Music_AzaleaAndBlackthornGym_branch_185d3b: ; 185d3b (61:5d3b) musice3 254 - musicec Music_AzaleaAndBlackthornGym_branch_185d64 + song_call Music_AzaleaAndBlackthornGym_branch_185d64 musice3 255 - musicec Music_AzaleaAndBlackthornGym_branch_185d64 - musicec Music_AzaleaAndBlackthornGym_branch_185d64 + song_call Music_AzaleaAndBlackthornGym_branch_185d64 + song_call Music_AzaleaAndBlackthornGym_branch_185d64 musice3 0 - musicec Music_AzaleaAndBlackthornGym_branch_185da7 + song_call Music_AzaleaAndBlackthornGym_branch_185da7 musice3 254 - musicec Music_AzaleaAndBlackthornGym_branch_185d64 - musicec Music_AzaleaAndBlackthornGym_branch_185d64 - musicec Music_AzaleaAndBlackthornGym_branch_185d64 - musicec Music_AzaleaAndBlackthornGym_branch_185d64 - musicec Music_AzaleaAndBlackthornGym_branch_185d64 - musicec Music_AzaleaAndBlackthornGym_branch_185d64 - musice7 Music_AzaleaAndBlackthornGym_branch_185d3b + song_call Music_AzaleaAndBlackthornGym_branch_185d64 + song_call Music_AzaleaAndBlackthornGym_branch_185d64 + song_call Music_AzaleaAndBlackthornGym_branch_185d64 + song_call Music_AzaleaAndBlackthornGym_branch_185d64 + song_call Music_AzaleaAndBlackthornGym_branch_185d64 + song_call Music_AzaleaAndBlackthornGym_branch_185d64 + song_jump Music_AzaleaAndBlackthornGym_branch_185d3b Music_AzaleaAndBlackthornGym_branch_185d64: ; 185d64 (61:5d64) - musicde + duty_cycle_12_5 musicd8 219 music01 3 music8a 163 @@ -96,7 +96,7 @@ Music_AzaleaAndBlackthornGym_branch_185d64: ; 185d64 (61:5d64) music8a 165 music01 3 musicd2 - musiced + song_ret Music_AzaleaAndBlackthornGym_branch_185da7: ; 185da7 (61:5da7) music8a 163 @@ -292,22 +292,22 @@ Music_AzaleaAndBlackthornGym_branch_185da7: ; 185da7 (61:5da7) music8a 170 music01 6 musicd2 - musiced + song_ret Music_AzaleaAndBlackthornGym_Ch2: ; 185e6a (61:5e6a) - musicda 119 - musice6 115 - musicdd + volume 119 + volume_envelope 115 + stereo_panning_both musicd6 14 musicd7 0 - musice0 + duty_cycle_50 musicd4 55 musicd8 209 music01 48 musicd2 music01 48 musicd2 - musice0 + duty_cycle_50 musicd8 211 music01 3 music8a 175 @@ -350,7 +350,7 @@ Music_AzaleaAndBlackthornGym_Ch2: ; 185e6a (61:5e6a) musicd2 music01 6 music8a 175 - musicde + duty_cycle_12_5 musicd8 224 music01 3 music8a 187 @@ -383,7 +383,7 @@ Music_AzaleaAndBlackthornGym_Ch2: ; 185e6a (61:5e6a) musicd2 music01 18 music8a 194 - musice0 + duty_cycle_50 musicd8 227 music01 3 music8a 191 @@ -459,11 +459,11 @@ Music_AzaleaAndBlackthornGym_Ch2: ; 185e6a (61:5e6a) musicd2 Music_AzaleaAndBlackthornGym_branch_185f27: ; 185f27 (61:5f27) musicd4 55 - musicec Music_AzaleaAndBlackthornGym_branch_185f2f - musice7 Music_AzaleaAndBlackthornGym_branch_185f27 + song_call Music_AzaleaAndBlackthornGym_branch_185f2f + song_jump Music_AzaleaAndBlackthornGym_branch_185f27 Music_AzaleaAndBlackthornGym_branch_185f2f: ; 185f2f (61:5f2f) - musice0 + duty_cycle_50 musicd8 225 music8a 175 music01 3 @@ -503,7 +503,7 @@ Music_AzaleaAndBlackthornGym_branch_185f2f: ; 185f2f (61:5f2f) music8a 179 music01 3 musicd2 - musice0 + duty_cycle_50 musicd8 212 music01 6 music8a 175 @@ -524,7 +524,7 @@ Music_AzaleaAndBlackthornGym_branch_185f2f: ; 185f2f (61:5f2f) music8a 194 music01 9 musicd2 - musice0 + duty_cycle_50 music01 3 music8a 196 music01 9 @@ -544,7 +544,7 @@ Music_AzaleaAndBlackthornGym_branch_185f2f: ; 185f2f (61:5f2f) musicd8 57 music01 24 music8a 194 - musicde + duty_cycle_12_5 musicd8 212 music01 3 music8a 187 @@ -623,7 +623,7 @@ Music_AzaleaAndBlackthornGym_branch_185f2f: ; 185f2f (61:5f2f) music8a 148 music01 3 music8a 146 - musice0 + duty_cycle_50 music01 24 musicd2 musicd8 247 @@ -644,7 +644,7 @@ Music_AzaleaAndBlackthornGym_branch_185f2f: ; 185f2f (61:5f2f) music01 3 music8a 182 musicd8 57 - musice0 + duty_cycle_50 music01 24 music8a 175 music01 24 @@ -844,7 +844,7 @@ Music_AzaleaAndBlackthornGym_branch_185f2f: ; 185f2f (61:5f2f) music01 3 music8a 146 musicd8 247 - musice1 + duty_cycle_75 music01 3 music8a 175 music01 3 @@ -885,7 +885,7 @@ Music_AzaleaAndBlackthornGym_branch_185f2f: ; 185f2f (61:5f2f) music8a 179 music01 3 musicd2 - musice0 + duty_cycle_50 musicd8 57 music01 6 music8a 175 @@ -987,35 +987,35 @@ Music_AzaleaAndBlackthornGym_branch_185f2f: ; 185f2f (61:5f2f) music8a 163 music01 3 musicd2 - musiced + song_ret Music_AzaleaAndBlackthornGym_Ch3: ; 186158 (61:6158) - musicdd + stereo_panning_both musicd7 0 musicd4 57 - musice2 63 + wave 63 musicd4 55 - musicec Music_AzaleaAndBlackthornGym_branch_186193 - musicec Music_AzaleaAndBlackthornGym_branch_186193 - musicec Music_AzaleaAndBlackthornGym_branch_186193 - musicec Music_AzaleaAndBlackthornGym_branch_186193 - musicec Music_AzaleaAndBlackthornGym_branch_186193 + song_call Music_AzaleaAndBlackthornGym_branch_186193 + song_call Music_AzaleaAndBlackthornGym_branch_186193 + song_call Music_AzaleaAndBlackthornGym_branch_186193 + song_call Music_AzaleaAndBlackthornGym_branch_186193 + song_call Music_AzaleaAndBlackthornGym_branch_186193 Music_AzaleaAndBlackthornGym_branch_186170: ; 186170 (61:6170) - musicec Music_AzaleaAndBlackthornGym_branch_186193 - musicec Music_AzaleaAndBlackthornGym_branch_186193 - musicec Music_AzaleaAndBlackthornGym_branch_186193 - musice2 17 - musicec Music_AzaleaAndBlackthornGym_branch_1861da - musicec Music_AzaleaAndBlackthornGym_branch_186193 - musicec Music_AzaleaAndBlackthornGym_branch_186193 - musicec Music_AzaleaAndBlackthornGym_branch_186193 - musicec Music_AzaleaAndBlackthornGym_branch_186193 - musicec Music_AzaleaAndBlackthornGym_branch_186193 - musicec Music_AzaleaAndBlackthornGym_branch_186193 - musice7 Music_AzaleaAndBlackthornGym_branch_186170 + song_call Music_AzaleaAndBlackthornGym_branch_186193 + song_call Music_AzaleaAndBlackthornGym_branch_186193 + song_call Music_AzaleaAndBlackthornGym_branch_186193 + wave 17 + song_call Music_AzaleaAndBlackthornGym_branch_1861da + song_call Music_AzaleaAndBlackthornGym_branch_186193 + song_call Music_AzaleaAndBlackthornGym_branch_186193 + song_call Music_AzaleaAndBlackthornGym_branch_186193 + song_call Music_AzaleaAndBlackthornGym_branch_186193 + song_call Music_AzaleaAndBlackthornGym_branch_186193 + song_call Music_AzaleaAndBlackthornGym_branch_186193 + song_jump Music_AzaleaAndBlackthornGym_branch_186170 Music_AzaleaAndBlackthornGym_branch_186193: ; 186193 (61:6193) - musice2 61 + wave 61 musicd8 104 music01 5 music8a 167 @@ -1033,22 +1033,22 @@ Music_AzaleaAndBlackthornGym_branch_186193: ; 186193 (61:6193) music8a 168 music01 1 musicd2 - musice2 65 + wave 65 music01 3 music8a 168 music01 9 musicd2 - musice2 61 + wave 61 music01 5 music8a 168 music01 1 musicd2 - musice2 61 + wave 61 music01 5 music8a 170 music01 1 musicd2 - musice2 63 + wave 63 musicd8 103 music01 3 music8a 170 @@ -1059,13 +1059,13 @@ Music_AzaleaAndBlackthornGym_branch_186193: ; 186193 (61:6193) music8a 170 music01 1 musicd2 - musice2 61 + wave 61 musicd8 104 music01 5 music8a 168 music01 1 musicd2 - musice2 60 + wave 60 music01 3 music8a 168 music01 9 @@ -1074,10 +1074,10 @@ Music_AzaleaAndBlackthornGym_branch_186193: ; 186193 (61:6193) music8a 168 music01 1 musicd2 - musiced + song_ret Music_AzaleaAndBlackthornGym_branch_1861da: ; 1861da (61:61da) - musice2 62 + wave 62 music01 3 music8a 167 music01 2 @@ -1115,9 +1115,9 @@ Music_AzaleaAndBlackthornGym_branch_1861da: ; 1861da (61:61da) music01 45 musicd2 musicd8 27 - musice2 66 + wave 66 musicd7 0 - musice2 66 + wave 66 music01 24 music8a 172 music01 3 @@ -1130,12 +1130,12 @@ Music_AzaleaAndBlackthornGym_branch_1861da: ; 1861da (61:61da) music8a 156 music01 3 musicd2 - musice2 64 + wave 64 music8a 160 music01 3 musicd2 music8a 163 - musice2 66 + wave 66 music01 3 music8a 165 music01 3 @@ -1184,14 +1184,14 @@ Music_AzaleaAndBlackthornGym_branch_1861da: ; 1861da (61:61da) musicd2 music01 12 music8a 167 - musice2 64 + wave 64 music01 3 music8a 143 music01 3 musicd2 music01 12 music8a 155 - musice2 66 + wave 66 music01 12 music8a 172 music01 6 @@ -1204,7 +1204,7 @@ Music_AzaleaAndBlackthornGym_branch_1861da: ; 1861da (61:61da) music8a 172 music01 3 musicd2 - musice2 65 + wave 65 music01 6 music8a 174 music01 6 @@ -1222,7 +1222,7 @@ Music_AzaleaAndBlackthornGym_branch_1861da: ; 1861da (61:61da) music8a 183 music01 3 musicd2 - musice2 66 + wave 66 music01 12 music8a 165 music01 6 @@ -1241,7 +1241,7 @@ Music_AzaleaAndBlackthornGym_branch_1861da: ; 1861da (61:61da) music8a 163 music01 6 musicd2 - musice2 65 + wave 65 music01 18 musicd2 music01 6 @@ -1261,7 +1261,7 @@ Music_AzaleaAndBlackthornGym_branch_1861da: ; 1861da (61:61da) music8a 163 music01 6 musicd2 - musice2 66 + wave 66 music8a 175 music01 24 music8a 177 @@ -1285,11 +1285,11 @@ Music_AzaleaAndBlackthornGym_branch_1861da: ; 1861da (61:61da) musicd2 music01 48 musicd2 - musiced + song_ret ; unreferenced ? Music_AzaleaAndBlackthornGym_branch_1862b8: ; 186158 (61:6158) - musice2 62 + wave 62 music01 3 music8a 167 music01 2 @@ -1483,10 +1483,10 @@ Music_AzaleaAndBlackthornGym_branch_1862b8: ; 186158 (61:6158) music8a 194 music01 48 musicd2 - musiced + song_ret Music_AzaleaAndBlackthornGym_Ch4: ; 18637c (61:637c) - musicdd + stereo_panning_both music01 48 musicd2 music01 48 @@ -2245,4 +2245,4 @@ Music_AzaleaAndBlackthornGym_branch_186397: ; 186397 (61:6397) music6d 120 music01 6 music6d 125 - musice7 Music_AzaleaAndBlackthornGym_branch_186397 + song_jump Music_AzaleaAndBlackthornGym_branch_186397 diff --git a/src/audio/music/cleffaandigglybuffstheme.asm b/src/audio/music/cleffaandigglybuffstheme.asm index cf4a9d7..35ed69e 100644 --- a/src/audio/music/cleffaandigglybuffstheme.asm +++ b/src/audio/music/cleffaandigglybuffstheme.asm @@ -5,22 +5,22 @@ Music_CleffaAndIgglybuffsTheme: ; 18ca9f (63:4a9f) dw Music_CleffaAndIgglybuffsTheme_Ch4 Music_CleffaAndIgglybuffsTheme_Ch1: ; 18caa7 (63:4aa7) - musicda 119 - musice6 115 - musicdd - musicde + volume 119 + volume_envelope 115 + stereo_panning_both + duty_cycle_12_5 musicd4 55 - musicde + duty_cycle_12_5 musicd4 55 musicd8 36 musicd6 19 - musicec Music_CleffaAndIgglybuffsTheme_branch_18cac8 + song_call Music_CleffaAndIgglybuffsTheme_branch_18cac8 Music_CleffaAndIgglybuffsTheme_branch_18cab9: ; 18cab9 (63:4ab9) - musicec Music_CleffaAndIgglybuffsTheme_branch_18cad3 - musicec Music_CleffaAndIgglybuffsTheme_branch_18cb8e - musicec Music_CleffaAndIgglybuffsTheme_branch_18cc0a - musicec Music_CleffaAndIgglybuffsTheme_branch_18cc6a - musice7 Music_CleffaAndIgglybuffsTheme_branch_18cab9 + song_call Music_CleffaAndIgglybuffsTheme_branch_18cad3 + song_call Music_CleffaAndIgglybuffsTheme_branch_18cb8e + song_call Music_CleffaAndIgglybuffsTheme_branch_18cc0a + song_call Music_CleffaAndIgglybuffsTheme_branch_18cc6a + song_jump Music_CleffaAndIgglybuffsTheme_branch_18cab9 Music_CleffaAndIgglybuffsTheme_branch_18cac8: ; 18cac8 (63:4ac8) music01 36 @@ -33,7 +33,7 @@ Music_CleffaAndIgglybuffsTheme_branch_18cac8: ; 18cac8 (63:4ac8) music8a 172 music01 12 musicd3 - musiced + song_ret Music_CleffaAndIgglybuffsTheme_branch_18cad3: ; 18cad3 (63:4ad3) musicd8 113 @@ -216,7 +216,7 @@ Music_CleffaAndIgglybuffsTheme_branch_18cad3: ; 18cad3 (63:4ad3) musicd2 music01 48 musicd2 - musiced + song_ret Music_CleffaAndIgglybuffsTheme_branch_18cb8e: ; 18cb8e (63:4b8e) music01 12 @@ -342,7 +342,7 @@ Music_CleffaAndIgglybuffsTheme_branch_18cb8e: ; 18cb8e (63:4b8e) musicd2 music01 48 musicd2 - musiced + song_ret Music_CleffaAndIgglybuffsTheme_branch_18cc0a: ; 18cc0a (63:4c0a) music01 48 @@ -439,7 +439,7 @@ Music_CleffaAndIgglybuffsTheme_branch_18cc0a: ; 18cc0a (63:4c0a) musicd2 music01 48 musicd2 - musiced + song_ret Music_CleffaAndIgglybuffsTheme_branch_18cc6a: ; 18cc6a (63:4c6a) musice3 1 @@ -488,23 +488,23 @@ Music_CleffaAndIgglybuffsTheme_branch_18cc6a: ; 18cc6a (63:4c6a) music8a 172 music01 21 musicd2 - musiced + song_ret Music_CleffaAndIgglybuffsTheme_Ch2: ; 18cc9b (63:4c9b) - musicda 119 - musice6 115 - musicdd - musice1 + volume 119 + volume_envelope 115 + stereo_panning_both + duty_cycle_75 musicd4 55 musicd8 164 musicd6 19 - musicec Music_CleffaAndIgglybuffsTheme_branch_18ccb9 + song_call Music_CleffaAndIgglybuffsTheme_branch_18ccb9 Music_CleffaAndIgglybuffsTheme_branch_18ccaa: ; 18ccaa (63:4caa) - musicec Music_CleffaAndIgglybuffsTheme_branch_18ccd5 - musicec Music_CleffaAndIgglybuffsTheme_branch_18cda6 - musicec Music_CleffaAndIgglybuffsTheme_branch_18ce50 - musicec Music_CleffaAndIgglybuffsTheme_branch_18cf54 - musice7 Music_CleffaAndIgglybuffsTheme_branch_18ccaa + song_call Music_CleffaAndIgglybuffsTheme_branch_18ccd5 + song_call Music_CleffaAndIgglybuffsTheme_branch_18cda6 + song_call Music_CleffaAndIgglybuffsTheme_branch_18ce50 + song_call Music_CleffaAndIgglybuffsTheme_branch_18cf54 + song_jump Music_CleffaAndIgglybuffsTheme_branch_18ccaa Music_CleffaAndIgglybuffsTheme_branch_18ccb9: ; 18ccb9 (63:4cb9) musicd8 133 @@ -532,7 +532,7 @@ Music_CleffaAndIgglybuffsTheme_branch_18ccb9: ; 18ccb9 (63:4cb9) musicd8 48 music01 3 musicd2 - musiced + song_ret Music_CleffaAndIgglybuffsTheme_branch_18ccd5: ; 18ccd5 (63:4cd5) musicd8 48 @@ -731,7 +731,7 @@ Music_CleffaAndIgglybuffsTheme_branch_18ccd5: ; 18ccd5 (63:4cd5) music8a 187 music01 45 musicd3 - musiced + song_ret Music_CleffaAndIgglybuffsTheme_branch_18cda6: ; 18cda6 (63:4da6) musicd8 48 @@ -902,11 +902,11 @@ Music_CleffaAndIgglybuffsTheme_branch_18cda6: ; 18cda6 (63:4da6) music8a 195 music01 21 musicd2 - musiced + song_ret Music_CleffaAndIgglybuffsTheme_branch_18ce50: ; 18ce50 (63:4e50) musicd8 39 - musicde + duty_cycle_12_5 music01 3 music8a 180 music01 3 @@ -1155,10 +1155,10 @@ Music_CleffaAndIgglybuffsTheme_branch_18ce50: ; 18ce50 (63:4e50) music8a 159 music01 21 musicd3 - musiced + song_ret Music_CleffaAndIgglybuffsTheme_branch_18cf54: ; 18cf54 (63:4f54) - musicde + duty_cycle_12_5 musicd8 39 music01 3 music8a 187 @@ -1213,20 +1213,20 @@ Music_CleffaAndIgglybuffsTheme_branch_18cf54: ; 18cf54 (63:4f54) music8a 191 music01 21 musicd3 - musiced + song_ret Music_CleffaAndIgglybuffsTheme_Ch3: ; 18cf93 (63:4f93) - musicdd + stereo_panning_both musicd8 104 - musice2 62 + wave 62 musicd4 56 - musicec Music_CleffaAndIgglybuffsTheme_branch_18cfac + song_call Music_CleffaAndIgglybuffsTheme_branch_18cfac Music_CleffaAndIgglybuffsTheme_branch_18cf9d: ; 18cf9d (63:4f9d) - musicec Music_CleffaAndIgglybuffsTheme_branch_18cfb9 - musicec Music_CleffaAndIgglybuffsTheme_branch_18d068 - musicec Music_CleffaAndIgglybuffsTheme_branch_18d151 - musicec Music_CleffaAndIgglybuffsTheme_branch_18d24c - musice7 Music_CleffaAndIgglybuffsTheme_branch_18cf9d + song_call Music_CleffaAndIgglybuffsTheme_branch_18cfb9 + song_call Music_CleffaAndIgglybuffsTheme_branch_18d068 + song_call Music_CleffaAndIgglybuffsTheme_branch_18d151 + song_call Music_CleffaAndIgglybuffsTheme_branch_18d24c + song_jump Music_CleffaAndIgglybuffsTheme_branch_18cf9d Music_CleffaAndIgglybuffsTheme_branch_18cfac: ; 18cfac (63:4fac) music01 3 @@ -1241,7 +1241,7 @@ Music_CleffaAndIgglybuffsTheme_branch_18cfac: ; 18cfac (63:4fac) music8a 165 music01 12 musicd2 - musiced + song_ret Music_CleffaAndIgglybuffsTheme_branch_18cfb9: ; 18cfb9 (63:4fb9) musicd8 104 @@ -1331,7 +1331,7 @@ Music_CleffaAndIgglybuffsTheme_branch_18cfb9: ; 18cfb9 (63:4fb9) music01 9 musicd2 musicd8 104 - musice2 62 + wave 62 music01 12 music8a 166 music01 3 @@ -1411,30 +1411,30 @@ Music_CleffaAndIgglybuffsTheme_branch_18cfb9: ; 18cfb9 (63:4fb9) music8a 152 music01 3 musicd2 - musiced + song_ret Music_CleffaAndIgglybuffsTheme_branch_18d068: ; 18d068 (63:5068) musicd8 27 musicd5 - musice2 62 + wave 62 musicd8 109 music01 12 music8a 154 - musice2 65 + wave 65 music01 3 music8a 154 - musice2 67 + wave 67 music01 3 music8a 154 - musice2 69 + wave 69 music01 3 music8a 154 - musice2 71 + wave 71 music01 3 music8a 154 music01 12 musicd2 - musice2 62 + wave 62 musicd8 27 music01 12 music8a 147 @@ -1447,41 +1447,41 @@ Music_CleffaAndIgglybuffsTheme_branch_18d068: ; 18d068 (63:5068) musicd8 109 music01 3 music8a 156 - musice2 62 + wave 62 music01 3 music8a 156 - musice2 66 + wave 66 music01 3 music8a 156 - musice2 68 + wave 68 music01 3 music8a 156 music01 12 musicd2 musicd8 27 - musice2 62 + wave 62 music8a 154 music01 36 musicd2 musicd8 109 music01 12 music8a 164 - musice2 65 + wave 65 music01 3 music8a 164 - musice2 67 + wave 67 music01 3 music8a 164 - musice2 69 + wave 69 music01 3 music8a 164 - musice2 71 + wave 71 music01 3 music8a 164 music01 12 musicd2 musicd8 27 - musice2 62 + wave 62 music01 12 music8a 159 music01 12 @@ -1498,7 +1498,7 @@ Music_CleffaAndIgglybuffsTheme_branch_18d068: ; 18d068 (63:5068) music8a 152 music01 9 musicd2 - musice2 65 + wave 65 musicd4 59 music01 6 music8a 164 @@ -1510,38 +1510,38 @@ Music_CleffaAndIgglybuffsTheme_branch_18d068: ; 18d068 (63:5068) music8a 173 music01 3 musicd2 - musice2 63 + wave 63 music8a 171 music01 3 musicd2 music8a 168 music01 3 musicd2 - musice2 65 + wave 65 music8a 164 music01 3 musicd2 musicd8 27 musicd5 - musice2 62 + wave 62 musicd8 109 music01 12 music8a 154 - musice2 65 + wave 65 music01 3 music8a 154 - musice2 67 + wave 67 music01 3 music8a 154 - musice2 69 + wave 69 music01 3 music8a 154 - musice2 71 + wave 71 music01 3 music8a 154 music01 12 musicd2 - musice2 62 + wave 62 musicd8 27 music01 12 music8a 147 @@ -1554,19 +1554,19 @@ Music_CleffaAndIgglybuffsTheme_branch_18d068: ; 18d068 (63:5068) musicd8 109 music01 3 music8a 156 - musice2 62 + wave 62 music01 3 music8a 156 - musice2 66 + wave 66 music01 3 music8a 156 - musice2 68 + wave 68 music01 3 music8a 156 music01 12 musicd2 musicd8 27 - musice2 62 + wave 62 music8a 154 music01 36 musicd2 @@ -1602,12 +1602,12 @@ Music_CleffaAndIgglybuffsTheme_branch_18d068: ; 18d068 (63:5068) music8a 159 music01 21 musicd2 - musiced + song_ret Music_CleffaAndIgglybuffsTheme_branch_18d151: ; 18d151 (63:5151) musicd7 0 musicd8 27 - musice2 62 + wave 62 music01 3 music8a 166 music01 3 @@ -1848,11 +1848,11 @@ Music_CleffaAndIgglybuffsTheme_branch_18d151: ; 18d151 (63:5151) music8a 159 music01 39 musicd2 - musiced + song_ret Music_CleffaAndIgglybuffsTheme_branch_18d24c: ; 18d24c (63:524c) musicd8 27 - musice2 62 + wave 62 music01 12 music8a 164 music01 3 @@ -1937,17 +1937,17 @@ Music_CleffaAndIgglybuffsTheme_branch_18d24c: ; 18d24c (63:524c) music8a 165 music01 21 musicd2 - musiced + song_ret Music_CleffaAndIgglybuffsTheme_Ch4: ; 18d2a5 (63:52a5) - musicdd - musicec Music_CleffaAndIgglybuffsTheme_branch_18d2b8 + stereo_panning_both + song_call Music_CleffaAndIgglybuffsTheme_branch_18d2b8 Music_CleffaAndIgglybuffsTheme_branch_18d2a9: ; 18d2a9 (63:52a9) - musicec Music_CleffaAndIgglybuffsTheme_branch_18d2bf - musicec Music_CleffaAndIgglybuffsTheme_branch_18d355 - musicec Music_CleffaAndIgglybuffsTheme_branch_18d3ef - musicec Music_CleffaAndIgglybuffsTheme_branch_18d494 - musice7 Music_CleffaAndIgglybuffsTheme_branch_18d2a9 + song_call Music_CleffaAndIgglybuffsTheme_branch_18d2bf + song_call Music_CleffaAndIgglybuffsTheme_branch_18d355 + song_call Music_CleffaAndIgglybuffsTheme_branch_18d3ef + song_call Music_CleffaAndIgglybuffsTheme_branch_18d494 + song_jump Music_CleffaAndIgglybuffsTheme_branch_18d2a9 Music_CleffaAndIgglybuffsTheme_branch_18d2b8: ; 18d2b8 (63:52b8) music01 3 @@ -1956,7 +1956,7 @@ Music_CleffaAndIgglybuffsTheme_branch_18d2b8: ; 18d2b8 (63:52b8) musicd2 music01 24 musicd2 - musiced + song_ret Music_CleffaAndIgglybuffsTheme_branch_18d2bf: ; 18d2bf (63:52bf) music01 12 @@ -2108,7 +2108,7 @@ Music_CleffaAndIgglybuffsTheme_branch_18d2bf: ; 18d2bf (63:52bf) music6d 120 music01 45 musicd3 - musiced + song_ret Music_CleffaAndIgglybuffsTheme_branch_18d355: ; 18d355 (63:5355) music01 12 @@ -2264,7 +2264,7 @@ Music_CleffaAndIgglybuffsTheme_branch_18d355: ; 18d355 (63:5355) music6d 120 music01 3 music6d 120 - musiced + song_ret Music_CleffaAndIgglybuffsTheme_branch_18d3ef: ; 18d3ef (63:53ef) music01 3 @@ -2431,7 +2431,7 @@ Music_CleffaAndIgglybuffsTheme_branch_18d3ef: ; 18d3ef (63:53ef) music6d 120 music01 9 musicd3 - musiced + song_ret Music_CleffaAndIgglybuffsTheme_branch_18d494: ; 18d494 (63:5494) music01 12 @@ -2502,4 +2502,4 @@ Music_CleffaAndIgglybuffsTheme_branch_18d494: ; 18d494 (63:5494) music6d 120 music01 21 musicd3 - musiced + song_ret diff --git a/src/audio/music/credits.asm b/src/audio/music/credits.asm index 53a7947..e2b2093 100644 --- a/src/audio/music/credits.asm +++ b/src/audio/music/credits.asm @@ -5,23 +5,23 @@ Music_Credits: ; 1906ba (64:46ba) dw Music_Credits_Ch4 Music_Credits_Ch1: ; 1906c2 (64:46c2) - musicda 119 - musice6 115 - musicdd + volume 119 + volume_envelope 115 + stereo_panning_both musicd6 8 - musice0 + duty_cycle_50 musice3 0 musicd7 0 Music_Credits_branch_1906ce: ; 1906ce (64:46ce) - musicec Music_Credits_branch_1906e0 - musicec Music_Credits_branch_190716 - musicec Music_Credits_branch_19074e - musicec Music_Credits_branch_19079d - musicec Music_Credits_branch_1907fe - musice7 Music_Credits_branch_1906ce + song_call Music_Credits_branch_1906e0 + song_call Music_Credits_branch_190716 + song_call Music_Credits_branch_19074e + song_call Music_Credits_branch_19079d + song_call Music_Credits_branch_1907fe + song_jump Music_Credits_branch_1906ce Music_Credits_branch_1906e0: ; 1906e0 (64:46e0) - musice0 + duty_cycle_50 musicd8 49 music01 45 music8a 145 @@ -68,11 +68,11 @@ Music_Credits_branch_1906e0: ; 1906e0 (64:46e0) music8a 152 music01 30 music8a 157 - musiced + song_ret Music_Credits_branch_190716: ; 190716 (64:4716) musicd7 0 - musice0 + duty_cycle_50 musicd8 241 music01 42 music8a 145 @@ -124,7 +124,7 @@ Music_Credits_branch_190716: ; 190716 (64:4716) music8a 145 music01 6 music8a 152 - musiced + song_ret Music_Credits_branch_19074e: ; 19074e (64:474e) music01 12 @@ -204,7 +204,7 @@ Music_Credits_branch_19074e: ; 19074e (64:474e) music8a 157 music01 30 music8a 164 - musiced + song_ret Music_Credits_branch_19079d: ; 19079d (64:479d) musicd8 241 @@ -302,7 +302,7 @@ Music_Credits_branch_19079d: ; 19079d (64:479d) musicd2 music01 15 music8a 145 - musiced + song_ret Music_Credits_branch_1907fe: ; 1907fe (64:47fe) music01 6 @@ -401,24 +401,24 @@ Music_Credits_branch_1907fe: ; 1907fe (64:47fe) musicd2 music01 15 music8a 145 - musiced + song_ret Music_Credits_Ch2: ; 19085f (64:485f) - musicda 119 - musice6 115 - musicdd - musice0 + volume 119 + volume_envelope 115 + stereo_panning_both + duty_cycle_50 musice3 0 - musicde + duty_cycle_12_5 musicd5 Music_Credits_branch_190869: ; 190869 (64:4869) - musicec Music_Credits_branch_19087d + song_call Music_Credits_branch_19087d musicd4 55 - musicec Music_Credits_branch_1908b8 - musicec Music_Credits_branch_1909ae - musicec Music_Credits_branch_190aa3 - musicec Music_Credits_branch_190baf - musice7 Music_Credits_branch_190869 + song_call Music_Credits_branch_1908b8 + song_call Music_Credits_branch_1909ae + song_call Music_Credits_branch_190aa3 + song_call Music_Credits_branch_190baf + song_jump Music_Credits_branch_190869 Music_Credits_branch_19087d: ; 19087d (64:487d) musicd7 0 @@ -473,10 +473,10 @@ Music_Credits_branch_19087d: ; 19087d (64:487d) music8a 183 music01 3 musicd3 - musiced + song_ret Music_Credits_branch_1908b8: ; 1908b8 (64:48b8) - musicde + duty_cycle_12_5 musicd8 38 music01 6 music8a 164 @@ -715,7 +715,7 @@ Music_Credits_branch_1908b8: ; 1908b8 (64:48b8) music8a 192 music01 3 music8a 193 - musiced + song_ret Music_Credits_branch_1909ae: ; 1909ae (64:49ae) musicd8 39 @@ -956,10 +956,10 @@ Music_Credits_branch_1909ae: ; 1909ae (64:49ae) music8a 192 music01 3 music8a 193 - musiced + song_ret Music_Credits_branch_190aa3: ; 190aa3 (64:4aa3) - musicde + duty_cycle_12_5 musicd8 39 music01 3 music8a 169 @@ -1219,7 +1219,7 @@ Music_Credits_branch_190aa3: ; 190aa3 (64:4aa3) music8a 193 music01 3 music8a 186 - musiced + song_ret Music_Credits_branch_190baf: ; 190baf (64:4baf) music01 3 @@ -1445,25 +1445,25 @@ Music_Credits_branch_190baf: ; 190baf (64:4baf) music8a 181 music01 3 music8a 174 - musiced + song_ret Music_Credits_Ch3: ; 190c8f (64:4c8f) musice3 0 Music_Credits_branch_190c91: ; 190c91 (64:4c91) musicd7 12 musicd8 101 - musice2 30 - musicec Music_Credits_branch_190cb3 + wave 30 + song_call Music_Credits_branch_190cb3 musicd7 12 - musice2 29 + wave 29 musicd8 27 - musicec Music_Credits_branch_190d74 - musicec Music_Credits_branch_190df4 + song_call Music_Credits_branch_190d74 + song_call Music_Credits_branch_190df4 musicd7 244 - musice2 9 - musicec Music_Credits_branch_190e74 - musicec Music_Credits_branch_190ee2 - musice7 Music_Credits_branch_190c91 + wave 9 + song_call Music_Credits_branch_190e74 + song_call Music_Credits_branch_190ee2 + song_jump Music_Credits_branch_190c91 Music_Credits_branch_190cb3: ; 190cb3 (64:4cb3) music01 6 @@ -1658,7 +1658,7 @@ Music_Credits_branch_190cb3: ; 190cb3 (64:4cb3) music8a 188 music01 3 music8a 171 - musiced + song_ret Music_Credits_branch_190d74: ; 190d74 (64:4d74) music01 12 @@ -1788,7 +1788,7 @@ Music_Credits_branch_190d74: ; 190d74 (64:4d74) music8a 193 music01 3 musicd2 - musiced + song_ret Music_Credits_branch_190df4: ; 190df4 (64:4df4) music01 12 @@ -1918,7 +1918,7 @@ Music_Credits_branch_190df4: ; 190df4 (64:4df4) music8a 193 music01 3 musicd2 - musiced + song_ret Music_Credits_branch_190e74: ; 190e74 (64:4e74) music01 36 @@ -2030,7 +2030,7 @@ Music_Credits_branch_190e74: ; 190e74 (64:4e74) music8a 181 music01 3 musicd2 - musiced + song_ret Music_Credits_branch_190ee2: ; 190ee2 (64:4ee2) music01 3 @@ -2203,30 +2203,30 @@ Music_Credits_branch_190ee2: ; 190ee2 (64:4ee2) music8a 193 music01 3 musicd2 - musiced + song_ret Music_Credits_Ch4: ; 190f8d (64:4f8d) - musicdd + stereo_panning_both musicd6 8 Music_Credits_branch_190f90: ; 190f90 (64:4f90) - musicec Music_Credits_branch_190fb7 - musicec Music_Credits_branch_190fb7 - musicec Music_Credits_branch_190fb7 - musicec Music_Credits_branch_190fb7 - musicec Music_Credits_branch_190fb7 - musicec Music_Credits_branch_190fb7 - musicec Music_Credits_branch_190fb7 - musicec Music_Credits_branch_190fb7 - musicec Music_Credits_branch_19105b - musicec Music_Credits_branch_1910ee - musicec Music_Credits_branch_1911ed - musicec Music_Credits_branch_1912ee - musice7 Music_Credits_branch_190f90 + song_call Music_Credits_branch_190fb7 + song_call Music_Credits_branch_190fb7 + song_call Music_Credits_branch_190fb7 + song_call Music_Credits_branch_190fb7 + song_call Music_Credits_branch_190fb7 + song_call Music_Credits_branch_190fb7 + song_call Music_Credits_branch_190fb7 + song_call Music_Credits_branch_190fb7 + song_call Music_Credits_branch_19105b + song_call Music_Credits_branch_1910ee + song_call Music_Credits_branch_1911ed + song_call Music_Credits_branch_1912ee + song_jump Music_Credits_branch_190f90 Music_Credits_branch_190fb7: ; 190fb7 (64:4fb7) music01 48 musicd2 - musiced + song_ret ; unreferenced ? Music_Credits_branch_190fba: ; 190f8d (64:4f8d) @@ -2390,7 +2390,7 @@ Music_Credits_branch_190fba: ; 190f8d (64:4f8d) music6d 119 music01 3 music6d 121 - musiced + song_ret Music_Credits_branch_19105b: ; 19105b (64:505b) music01 3 @@ -2539,7 +2539,7 @@ Music_Credits_branch_19105b: ; 19105b (64:505b) music6d 126 music01 3 music6d 127 - musiced + song_ret Music_Credits_branch_1910ee: ; 1910ee (64:50ee) music01 3 @@ -2796,7 +2796,7 @@ Music_Credits_branch_1910ee: ; 1910ee (64:50ee) music6d 126 music01 3 music6d 126 - musiced + song_ret Music_Credits_branch_1911ed: ; 1911ed (64:51ed) music01 3 @@ -3055,7 +3055,7 @@ Music_Credits_branch_1911ed: ; 1911ed (64:51ed) music6d 126 music01 3 music6d 124 - musiced + song_ret Music_Credits_branch_1912ee: ; 1912ee (64:52ee) music01 3 @@ -3318,4 +3318,4 @@ Music_Credits_branch_1912ee: ; 1912ee (64:52ee) music6d 126 music01 3 music6d 126 - musiced + song_ret diff --git a/src/audio/music/ecruteakandcianwoodgym.asm b/src/audio/music/ecruteakandcianwoodgym.asm index e72de6a..5423aac 100644 --- a/src/audio/music/ecruteakandcianwoodgym.asm +++ b/src/audio/music/ecruteakandcianwoodgym.asm @@ -5,50 +5,50 @@ Music_EcruteakAndCianwoodGym: ; 188ce0 (62:4ce0) dw Music_EcruteakAndCianwoodGym_Ch4 Music_EcruteakAndCianwoodGym_Ch1: ; 188ce8 (62:4ce8) - musicda 119 - musice6 115 - musicdd + volume 119 + volume_envelope 115 + stereo_panning_both musicd6 14 musicd7 0 - musice1 + duty_cycle_75 musice3 0 musicd4 55 - musice1 - musicde + duty_cycle_75 + duty_cycle_12_5 musicd4 55 Music_EcruteakAndCianwoodGym_branch_188cfa: ; 188cfa (62:4cfa) - musicec Music_EcruteakAndCianwoodGym_branch_188d58 - musicec Music_EcruteakAndCianwoodGym_branch_188d58 - musicec Music_EcruteakAndCianwoodGym_branch_188d7b - musicec Music_EcruteakAndCianwoodGym_branch_188da4 - musicec Music_EcruteakAndCianwoodGym_branch_188dcd - musicec Music_EcruteakAndCianwoodGym_branch_188d58 - musicec Music_EcruteakAndCianwoodGym_branch_188d58 - musicec Music_EcruteakAndCianwoodGym_branch_188d7b - musicec Music_EcruteakAndCianwoodGym_branch_188df1 - musicec Music_EcruteakAndCianwoodGym_branch_188dcd - musicec Music_EcruteakAndCianwoodGym_branch_188e16 - musicec Music_EcruteakAndCianwoodGym_branch_188d58 - musicec Music_EcruteakAndCianwoodGym_branch_188d58 - musicec Music_EcruteakAndCianwoodGym_branch_188d7b - musicec Music_EcruteakAndCianwoodGym_branch_188dcd - musicec Music_EcruteakAndCianwoodGym_branch_188d58 - musicec Music_EcruteakAndCianwoodGym_branch_188d58 - musicec Music_EcruteakAndCianwoodGym_branch_188d7b - musicec Music_EcruteakAndCianwoodGym_branch_188da4 - musicec Music_EcruteakAndCianwoodGym_branch_188dcd + song_call Music_EcruteakAndCianwoodGym_branch_188d58 + song_call Music_EcruteakAndCianwoodGym_branch_188d58 + song_call Music_EcruteakAndCianwoodGym_branch_188d7b + song_call Music_EcruteakAndCianwoodGym_branch_188da4 + song_call Music_EcruteakAndCianwoodGym_branch_188dcd + song_call Music_EcruteakAndCianwoodGym_branch_188d58 + song_call Music_EcruteakAndCianwoodGym_branch_188d58 + song_call Music_EcruteakAndCianwoodGym_branch_188d7b + song_call Music_EcruteakAndCianwoodGym_branch_188df1 + song_call Music_EcruteakAndCianwoodGym_branch_188dcd + song_call Music_EcruteakAndCianwoodGym_branch_188e16 + song_call Music_EcruteakAndCianwoodGym_branch_188d58 + song_call Music_EcruteakAndCianwoodGym_branch_188d58 + song_call Music_EcruteakAndCianwoodGym_branch_188d7b + song_call Music_EcruteakAndCianwoodGym_branch_188dcd + song_call Music_EcruteakAndCianwoodGym_branch_188d58 + song_call Music_EcruteakAndCianwoodGym_branch_188d58 + song_call Music_EcruteakAndCianwoodGym_branch_188d7b + song_call Music_EcruteakAndCianwoodGym_branch_188da4 + song_call Music_EcruteakAndCianwoodGym_branch_188dcd musicd7 0 musice3 0 - musicec Music_EcruteakAndCianwoodGym_branch_188dcd - musicec Music_EcruteakAndCianwoodGym_branch_188d58 - musicec Music_EcruteakAndCianwoodGym_branch_188d7b - musicec Music_EcruteakAndCianwoodGym_branch_188da4 - musicec Music_EcruteakAndCianwoodGym_branch_188e33 - musicec Music_EcruteakAndCianwoodGym_branch_188d58 - musicec Music_EcruteakAndCianwoodGym_branch_188d7b - musicec Music_EcruteakAndCianwoodGym_branch_188da4 - musicec Music_EcruteakAndCianwoodGym_branch_188e75 - musice7 Music_EcruteakAndCianwoodGym_branch_188cfa + song_call Music_EcruteakAndCianwoodGym_branch_188dcd + song_call Music_EcruteakAndCianwoodGym_branch_188d58 + song_call Music_EcruteakAndCianwoodGym_branch_188d7b + song_call Music_EcruteakAndCianwoodGym_branch_188da4 + song_call Music_EcruteakAndCianwoodGym_branch_188e33 + song_call Music_EcruteakAndCianwoodGym_branch_188d58 + song_call Music_EcruteakAndCianwoodGym_branch_188d7b + song_call Music_EcruteakAndCianwoodGym_branch_188da4 + song_call Music_EcruteakAndCianwoodGym_branch_188e75 + song_jump Music_EcruteakAndCianwoodGym_branch_188cfa Music_EcruteakAndCianwoodGym_branch_188d58: ; 188d58 (62:4d58) musicd8 205 @@ -84,7 +84,7 @@ Music_EcruteakAndCianwoodGym_branch_188d58: ; 188d58 (62:4d58) music8a 194 music01 3 music8a 189 - musiced + song_ret Music_EcruteakAndCianwoodGym_branch_188d7b: ; 188d7b (62:4d7b) musicd8 205 @@ -123,7 +123,7 @@ Music_EcruteakAndCianwoodGym_branch_188d7b: ; 188d7b (62:4d7b) music8a 194 music01 3 music8a 189 - musiced + song_ret Music_EcruteakAndCianwoodGym_branch_188da4: ; 188da4 (62:4da4) musicd8 209 @@ -162,7 +162,7 @@ Music_EcruteakAndCianwoodGym_branch_188da4: ; 188da4 (62:4da4) music8a 194 music01 3 music8a 189 - musiced + song_ret Music_EcruteakAndCianwoodGym_branch_188dcd: ; 188dcd (62:4dcd) music01 3 @@ -200,7 +200,7 @@ Music_EcruteakAndCianwoodGym_branch_188dcd: ; 188dcd (62:4dcd) music8a 153 music01 15 musicd2 - musiced + song_ret Music_EcruteakAndCianwoodGym_branch_188df1: ; 188df1 (62:4df1) musicd8 209 @@ -234,7 +234,7 @@ Music_EcruteakAndCianwoodGym_branch_188df1: ; 188df1 (62:4df1) music8a 182 music01 3 music8a 182 - musiced + song_ret Music_EcruteakAndCianwoodGym_branch_188e16: ; 188e16 (62:4e16) musicd8 36 @@ -264,7 +264,7 @@ Music_EcruteakAndCianwoodGym_branch_188e16: ; 188e16 (62:4e16) music8a 194 music01 3 music8a 189 - musiced + song_ret Music_EcruteakAndCianwoodGym_branch_188e33: ; 188e33 (62:4e33) musicd8 205 @@ -331,7 +331,7 @@ Music_EcruteakAndCianwoodGym_branch_188e33: ; 188e33 (62:4e33) musicd2 music01 48 musicd2 - musiced + song_ret Music_EcruteakAndCianwoodGym_branch_188e75: ; 188e75 (62:4e75) musicd8 207 @@ -715,29 +715,29 @@ Music_EcruteakAndCianwoodGym_branch_188e75: ; 188e75 (62:4e75) music8a 194 music01 3 music8a 189 - musiced + song_ret Music_EcruteakAndCianwoodGym_Ch2: ; 188ff7 (62:4ff7) - musicda 119 - musice6 115 - musicdd + volume 119 + volume_envelope 115 + stereo_panning_both musicd6 14 musicd4 55 musicd4 55 musicd8 180 musicd7 0 - musice0 + duty_cycle_50 Music_EcruteakAndCianwoodGym_branch_189007: ; 189007 (62:5007) - musicec Music_EcruteakAndCianwoodGym_branch_189019 - musicec Music_EcruteakAndCianwoodGym_branch_18906e - musicec Music_EcruteakAndCianwoodGym_branch_1890b5 - musicec Music_EcruteakAndCianwoodGym_branch_18906e - musicec Music_EcruteakAndCianwoodGym_branch_1891a4 - musice7 Music_EcruteakAndCianwoodGym_branch_189007 + song_call Music_EcruteakAndCianwoodGym_branch_189019 + song_call Music_EcruteakAndCianwoodGym_branch_18906e + song_call Music_EcruteakAndCianwoodGym_branch_1890b5 + song_call Music_EcruteakAndCianwoodGym_branch_18906e + song_call Music_EcruteakAndCianwoodGym_branch_1891a4 + song_jump Music_EcruteakAndCianwoodGym_branch_189007 Music_EcruteakAndCianwoodGym_branch_189019: ; 189019 (62:5019) musicd8 36 - musicde + duty_cycle_12_5 music01 3 music8a 189 music01 3 @@ -807,7 +807,7 @@ Music_EcruteakAndCianwoodGym_branch_189019: ; 189019 (62:5019) musicd3 music8a 187 musicd8 36 - musicde + duty_cycle_12_5 music01 6 music8a 170 music01 6 @@ -818,11 +818,11 @@ Music_EcruteakAndCianwoodGym_branch_189019: ; 189019 (62:5019) music8a 182 music01 3 music8a 182 - musiced + song_ret Music_EcruteakAndCianwoodGym_branch_18906e: ; 18906e (62:506e) musicd8 192 - musice0 + duty_cycle_50 music01 18 music8a 172 music01 18 @@ -847,7 +847,7 @@ Music_EcruteakAndCianwoodGym_branch_18906e: ; 18906e (62:506e) music01 6 musicd2 musicd8 36 - musicde + duty_cycle_12_5 music8a 170 music01 6 music8a 182 @@ -858,7 +858,7 @@ Music_EcruteakAndCianwoodGym_branch_18906e: ; 18906e (62:506e) music01 3 music8a 182 musicd8 177 - musice0 + duty_cycle_50 music01 18 music8a 172 music01 18 @@ -884,7 +884,7 @@ Music_EcruteakAndCianwoodGym_branch_18906e: ; 18906e (62:506e) music8a 177 music01 4 musicd2 - musiced + song_ret Music_EcruteakAndCianwoodGym_branch_1890b5: ; 1890b5 (62:50b5) musicd8 177 @@ -942,7 +942,7 @@ Music_EcruteakAndCianwoodGym_branch_1890b5: ; 1890b5 (62:50b5) musicd2 music8a 187 musicd8 36 - musicde + duty_cycle_12_5 music01 6 music8a 170 music01 6 @@ -954,7 +954,7 @@ Music_EcruteakAndCianwoodGym_branch_1890b5: ; 1890b5 (62:50b5) music01 3 music8a 182 musicd8 194 - musicde + duty_cycle_12_5 music01 3 music8a 189 music01 3 @@ -1025,7 +1025,7 @@ Music_EcruteakAndCianwoodGym_branch_1890b5: ; 1890b5 (62:50b5) musicd2 music8a 177 musicd8 180 - musice0 + duty_cycle_50 music01 6 musicd2 music01 1 @@ -1075,7 +1075,7 @@ Music_EcruteakAndCianwoodGym_branch_1890b5: ; 1890b5 (62:50b5) music01 6 musicd3 musicd8 39 - musice0 + duty_cycle_50 music01 6 musicd2 music01 3 @@ -1120,7 +1120,7 @@ Music_EcruteakAndCianwoodGym_branch_1890b5: ; 1890b5 (62:50b5) musicd2 music01 48 musicd2 - musiced + song_ret Music_EcruteakAndCianwoodGym_branch_1891a4: ; 1891a4 (62:51a4) musicd4 59 @@ -1298,7 +1298,7 @@ Music_EcruteakAndCianwoodGym_branch_1891a4: ; 1891a4 (62:51a4) music01 3 music8a 170 musicd8 39 - musice0 + duty_cycle_50 music01 6 musicd2 music8a 157 @@ -1335,7 +1335,7 @@ Music_EcruteakAndCianwoodGym_branch_1891a4: ; 1891a4 (62:51a4) musicd2 music01 48 musicd2 - musice0 + duty_cycle_50 music01 18 musicd2 musicd4 59 @@ -1369,7 +1369,7 @@ Music_EcruteakAndCianwoodGym_branch_1891a4: ; 1891a4 (62:51a4) music01 9 music8a 167 musicd8 178 - musice0 + duty_cycle_50 music01 6 music8a 158 music01 6 @@ -1398,52 +1398,52 @@ Music_EcruteakAndCianwoodGym_branch_1891a4: ; 1891a4 (62:51a4) music8a 158 music01 6 music8a 146 - musiced + song_ret Music_EcruteakAndCianwoodGym_Ch3: ; 1892c7 (62:52c7) - musicdd + stereo_panning_both musicd8 104 musicd4 56 Music_EcruteakAndCianwoodGym_branch_1892cc: ; 1892cc (62:52cc) - musice2 59 + wave 59 musicd7 12 - musicec Music_EcruteakAndCianwoodGym_branch_18932d - musicec Music_EcruteakAndCianwoodGym_branch_18932d - musicec Music_EcruteakAndCianwoodGym_branch_18932d - musicec Music_EcruteakAndCianwoodGym_branch_18932d - musicec Music_EcruteakAndCianwoodGym_branch_18932d - musicec Music_EcruteakAndCianwoodGym_branch_18932d - musicec Music_EcruteakAndCianwoodGym_branch_18932d - musicec Music_EcruteakAndCianwoodGym_branch_18932d - musicec Music_EcruteakAndCianwoodGym_branch_18932d - musicec Music_EcruteakAndCianwoodGym_branch_18932d - musicec Music_EcruteakAndCianwoodGym_branch_18932d - musicec Music_EcruteakAndCianwoodGym_branch_18932d - musicec Music_EcruteakAndCianwoodGym_branch_18932d - musicec Music_EcruteakAndCianwoodGym_branch_18932d - musicec Music_EcruteakAndCianwoodGym_branch_18932d - musicec Music_EcruteakAndCianwoodGym_branch_18932d - musicec Music_EcruteakAndCianwoodGym_branch_18932d - musicec Music_EcruteakAndCianwoodGym_branch_18932d - musicec Music_EcruteakAndCianwoodGym_branch_18932d - musicec Music_EcruteakAndCianwoodGym_branch_18932d - musicec Music_EcruteakAndCianwoodGym_branch_18932d - musicec Music_EcruteakAndCianwoodGym_branch_18932d - musicec Music_EcruteakAndCianwoodGym_branch_18932d - musicec Music_EcruteakAndCianwoodGym_branch_18932d - musicec Music_EcruteakAndCianwoodGym_branch_18932d - musicec Music_EcruteakAndCianwoodGym_branch_18932d - musicec Music_EcruteakAndCianwoodGym_branch_18932d - musicec Music_EcruteakAndCianwoodGym_branch_18932d - musicec Music_EcruteakAndCianwoodGym_branch_18932d - musicec Music_EcruteakAndCianwoodGym_branch_18934c - musice7 Music_EcruteakAndCianwoodGym_branch_1892cc + song_call Music_EcruteakAndCianwoodGym_branch_18932d + song_call Music_EcruteakAndCianwoodGym_branch_18932d + song_call Music_EcruteakAndCianwoodGym_branch_18932d + song_call Music_EcruteakAndCianwoodGym_branch_18932d + song_call Music_EcruteakAndCianwoodGym_branch_18932d + song_call Music_EcruteakAndCianwoodGym_branch_18932d + song_call Music_EcruteakAndCianwoodGym_branch_18932d + song_call Music_EcruteakAndCianwoodGym_branch_18932d + song_call Music_EcruteakAndCianwoodGym_branch_18932d + song_call Music_EcruteakAndCianwoodGym_branch_18932d + song_call Music_EcruteakAndCianwoodGym_branch_18932d + song_call Music_EcruteakAndCianwoodGym_branch_18932d + song_call Music_EcruteakAndCianwoodGym_branch_18932d + song_call Music_EcruteakAndCianwoodGym_branch_18932d + song_call Music_EcruteakAndCianwoodGym_branch_18932d + song_call Music_EcruteakAndCianwoodGym_branch_18932d + song_call Music_EcruteakAndCianwoodGym_branch_18932d + song_call Music_EcruteakAndCianwoodGym_branch_18932d + song_call Music_EcruteakAndCianwoodGym_branch_18932d + song_call Music_EcruteakAndCianwoodGym_branch_18932d + song_call Music_EcruteakAndCianwoodGym_branch_18932d + song_call Music_EcruteakAndCianwoodGym_branch_18932d + song_call Music_EcruteakAndCianwoodGym_branch_18932d + song_call Music_EcruteakAndCianwoodGym_branch_18932d + song_call Music_EcruteakAndCianwoodGym_branch_18932d + song_call Music_EcruteakAndCianwoodGym_branch_18932d + song_call Music_EcruteakAndCianwoodGym_branch_18932d + song_call Music_EcruteakAndCianwoodGym_branch_18932d + song_call Music_EcruteakAndCianwoodGym_branch_18932d + song_call Music_EcruteakAndCianwoodGym_branch_18934c + song_jump Music_EcruteakAndCianwoodGym_branch_1892cc Music_EcruteakAndCianwoodGym_branch_18932d: ; 18932d (62:532d) - musice2 59 + wave 59 music01 6 music8a 146 - musice2 62 + wave 62 music01 6 music8a 158 music01 6 @@ -1456,16 +1456,16 @@ Music_EcruteakAndCianwoodGym_branch_18932d: ; 18932d (62:532d) music8a 146 music01 6 music8a 158 - musice2 61 + wave 61 music01 6 music8a 146 - musice2 60 + wave 60 music01 3 music8a 158 - musice2 59 + wave 59 music01 3 music8a 158 - musiced + song_ret Music_EcruteakAndCianwoodGym_branch_18934c: ; 18934c (62:534c) music01 6 @@ -1900,10 +1900,10 @@ Music_EcruteakAndCianwoodGym_branch_18934c: ; 18934c (62:534c) music8a 139 music01 9 music8a 143 - musice2 69 + wave 69 music01 6 music8a 158 - musice2 68 + wave 68 music01 6 music8a 165 music01 6 @@ -1916,7 +1916,7 @@ Music_EcruteakAndCianwoodGym_branch_18934c: ; 18934c (62:534c) music8a 158 music01 6 music8a 146 - musice2 67 + wave 67 music01 6 music8a 158 music01 6 @@ -1931,68 +1931,68 @@ Music_EcruteakAndCianwoodGym_branch_18934c: ; 18934c (62:534c) music8a 158 music01 6 music8a 146 - musiced + song_ret Music_EcruteakAndCianwoodGym_Ch4: ; 18951f (62:551f) - musicdd + stereo_panning_both musicd6 14 Music_EcruteakAndCianwoodGym_branch_189522: ; 189522 (62:5522) - musicec Music_EcruteakAndCianwoodGym_branch_1895c2 - musicec Music_EcruteakAndCianwoodGym_branch_1895c2 - musicec Music_EcruteakAndCianwoodGym_branch_1895c2 - musicec Music_EcruteakAndCianwoodGym_branch_1895c2 - musicec Music_EcruteakAndCianwoodGym_branch_1895c2 - musicec Music_EcruteakAndCianwoodGym_branch_1895d3 - musicec Music_EcruteakAndCianwoodGym_branch_1895c2 - musicec Music_EcruteakAndCianwoodGym_branch_1895c2 - musicec Music_EcruteakAndCianwoodGym_branch_1895c2 - musicec Music_EcruteakAndCianwoodGym_branch_1895c2 - musicec Music_EcruteakAndCianwoodGym_branch_1895c2 - musicec Music_EcruteakAndCianwoodGym_branch_1895d3 - musicec Music_EcruteakAndCianwoodGym_branch_1895c2 - musicec Music_EcruteakAndCianwoodGym_branch_1895c2 - musicec Music_EcruteakAndCianwoodGym_branch_1895c2 - musicec Music_EcruteakAndCianwoodGym_branch_1895e8 - musicec Music_EcruteakAndCianwoodGym_branch_1895c2 - musicec Music_EcruteakAndCianwoodGym_branch_1895d3 - musicec Music_EcruteakAndCianwoodGym_branch_1895c2 - musicec Music_EcruteakAndCianwoodGym_branch_1895c2 - musicec Music_EcruteakAndCianwoodGym_branch_1895c2 - musicec Music_EcruteakAndCianwoodGym_branch_1895c2 - musicec Music_EcruteakAndCianwoodGym_branch_1895c2 - musicec Music_EcruteakAndCianwoodGym_branch_1895e8 - musicec Music_EcruteakAndCianwoodGym_branch_1895c2 - musicec Music_EcruteakAndCianwoodGym_branch_1895d3 - musicec Music_EcruteakAndCianwoodGym_branch_1895c2 - musicec Music_EcruteakAndCianwoodGym_branch_1895c2 - musicec Music_EcruteakAndCianwoodGym_branch_1895c2 - musicec Music_EcruteakAndCianwoodGym_branch_1895c2 - musicec Music_EcruteakAndCianwoodGym_branch_1895c2 - musicec Music_EcruteakAndCianwoodGym_branch_1895d3 - musicec Music_EcruteakAndCianwoodGym_branch_1895c2 - musicec Music_EcruteakAndCianwoodGym_branch_1895c2 - musicec Music_EcruteakAndCianwoodGym_branch_1895c2 - musicec Music_EcruteakAndCianwoodGym_branch_1895e8 - musicec Music_EcruteakAndCianwoodGym_branch_1895c2 - musicec Music_EcruteakAndCianwoodGym_branch_1895c2 - musicec Music_EcruteakAndCianwoodGym_branch_1895c2 - musicec Music_EcruteakAndCianwoodGym_branch_1895d3 - musicec Music_EcruteakAndCianwoodGym_branch_1895c2 - musicec Music_EcruteakAndCianwoodGym_branch_1895c2 - musicec Music_EcruteakAndCianwoodGym_branch_1895c2 - musicec Music_EcruteakAndCianwoodGym_branch_1895c2 - musicec Music_EcruteakAndCianwoodGym_branch_1895c2 - musicec Music_EcruteakAndCianwoodGym_branch_1895c2 - musicec Music_EcruteakAndCianwoodGym_branch_1895c2 - musicec Music_EcruteakAndCianwoodGym_branch_1895fd - musicec Music_EcruteakAndCianwoodGym_branch_1895c2 - musicec Music_EcruteakAndCianwoodGym_branch_1895e8 + song_call Music_EcruteakAndCianwoodGym_branch_1895c2 + song_call Music_EcruteakAndCianwoodGym_branch_1895c2 + song_call Music_EcruteakAndCianwoodGym_branch_1895c2 + song_call Music_EcruteakAndCianwoodGym_branch_1895c2 + song_call Music_EcruteakAndCianwoodGym_branch_1895c2 + song_call Music_EcruteakAndCianwoodGym_branch_1895d3 + song_call Music_EcruteakAndCianwoodGym_branch_1895c2 + song_call Music_EcruteakAndCianwoodGym_branch_1895c2 + song_call Music_EcruteakAndCianwoodGym_branch_1895c2 + song_call Music_EcruteakAndCianwoodGym_branch_1895c2 + song_call Music_EcruteakAndCianwoodGym_branch_1895c2 + song_call Music_EcruteakAndCianwoodGym_branch_1895d3 + song_call Music_EcruteakAndCianwoodGym_branch_1895c2 + song_call Music_EcruteakAndCianwoodGym_branch_1895c2 + song_call Music_EcruteakAndCianwoodGym_branch_1895c2 + song_call Music_EcruteakAndCianwoodGym_branch_1895e8 + song_call Music_EcruteakAndCianwoodGym_branch_1895c2 + song_call Music_EcruteakAndCianwoodGym_branch_1895d3 + song_call Music_EcruteakAndCianwoodGym_branch_1895c2 + song_call Music_EcruteakAndCianwoodGym_branch_1895c2 + song_call Music_EcruteakAndCianwoodGym_branch_1895c2 + song_call Music_EcruteakAndCianwoodGym_branch_1895c2 + song_call Music_EcruteakAndCianwoodGym_branch_1895c2 + song_call Music_EcruteakAndCianwoodGym_branch_1895e8 + song_call Music_EcruteakAndCianwoodGym_branch_1895c2 + song_call Music_EcruteakAndCianwoodGym_branch_1895d3 + song_call Music_EcruteakAndCianwoodGym_branch_1895c2 + song_call Music_EcruteakAndCianwoodGym_branch_1895c2 + song_call Music_EcruteakAndCianwoodGym_branch_1895c2 + song_call Music_EcruteakAndCianwoodGym_branch_1895c2 + song_call Music_EcruteakAndCianwoodGym_branch_1895c2 + song_call Music_EcruteakAndCianwoodGym_branch_1895d3 + song_call Music_EcruteakAndCianwoodGym_branch_1895c2 + song_call Music_EcruteakAndCianwoodGym_branch_1895c2 + song_call Music_EcruteakAndCianwoodGym_branch_1895c2 + song_call Music_EcruteakAndCianwoodGym_branch_1895e8 + song_call Music_EcruteakAndCianwoodGym_branch_1895c2 + song_call Music_EcruteakAndCianwoodGym_branch_1895c2 + song_call Music_EcruteakAndCianwoodGym_branch_1895c2 + song_call Music_EcruteakAndCianwoodGym_branch_1895d3 + song_call Music_EcruteakAndCianwoodGym_branch_1895c2 + song_call Music_EcruteakAndCianwoodGym_branch_1895c2 + song_call Music_EcruteakAndCianwoodGym_branch_1895c2 + song_call Music_EcruteakAndCianwoodGym_branch_1895c2 + song_call Music_EcruteakAndCianwoodGym_branch_1895c2 + song_call Music_EcruteakAndCianwoodGym_branch_1895c2 + song_call Music_EcruteakAndCianwoodGym_branch_1895c2 + song_call Music_EcruteakAndCianwoodGym_branch_1895fd + song_call Music_EcruteakAndCianwoodGym_branch_1895c2 + song_call Music_EcruteakAndCianwoodGym_branch_1895e8 music01 48 musicd2 music01 48 musicd2 - musicec Music_EcruteakAndCianwoodGym_branch_189612 - musice7 Music_EcruteakAndCianwoodGym_branch_189522 + song_call Music_EcruteakAndCianwoodGym_branch_189612 + song_jump Music_EcruteakAndCianwoodGym_branch_189522 Music_EcruteakAndCianwoodGym_branch_1895c2: ; 1895c2 (62:55c2) music01 3 @@ -2011,7 +2011,7 @@ Music_EcruteakAndCianwoodGym_branch_1895c2: ; 1895c2 (62:55c2) music6d 112 music01 9 musicd2 - musiced + song_ret Music_EcruteakAndCianwoodGym_branch_1895d3: ; 1895d3 (62:55d3) music01 3 @@ -2034,7 +2034,7 @@ Music_EcruteakAndCianwoodGym_branch_1895d3: ; 1895d3 (62:55d3) music6d 120 music01 3 music6d 120 - musiced + song_ret Music_EcruteakAndCianwoodGym_branch_1895e8: ; 1895e8 (62:55e8) music01 3 @@ -2057,7 +2057,7 @@ Music_EcruteakAndCianwoodGym_branch_1895e8: ; 1895e8 (62:55e8) music6d 126 music01 3 music6d 126 - musiced + song_ret Music_EcruteakAndCianwoodGym_branch_1895fd: ; 1895fd (62:55fd) music01 3 @@ -2080,7 +2080,7 @@ Music_EcruteakAndCianwoodGym_branch_1895fd: ; 1895fd (62:55fd) musicd2 music01 3 music6d 126 - musiced + song_ret Music_EcruteakAndCianwoodGym_branch_189612: ; 189612 (62:5612) music01 36 @@ -2093,4 +2093,4 @@ Music_EcruteakAndCianwoodGym_branch_189612: ; 189612 (62:5612) music6d 112 music01 3 music6d 112 - musiced + song_ret diff --git a/src/audio/music/elekidandmagbystheme.asm b/src/audio/music/elekidandmagbystheme.asm index 1238a8b..6480c1f 100644 --- a/src/audio/music/elekidandmagbystheme.asm +++ b/src/audio/music/elekidandmagbystheme.asm @@ -5,21 +5,21 @@ Music_ElekidAndMagbysTheme: ; 18d4d9 (63:54d9) dw Music_ElekidAndMagbysTheme_Ch4 Music_ElekidAndMagbysTheme_Ch1: ; 18d4e1 (63:54e1) - musicda 119 - musice6 115 - musicdd - musice1 + volume 119 + volume_envelope 115 + stereo_panning_both + duty_cycle_75 musicd4 55 - musicde + duty_cycle_12_5 musicd4 55 musicd6 15 music01 12 musicd2 Music_ElekidAndMagbysTheme_branch_18d4f0: ; 18d4f0 (63:54f0) - musicec Music_ElekidAndMagbysTheme_branch_18d4fc - musicec Music_ElekidAndMagbysTheme_branch_18d564 - musicec Music_ElekidAndMagbysTheme_branch_18d5b7 - musice7 Music_ElekidAndMagbysTheme_branch_18d4f0 + song_call Music_ElekidAndMagbysTheme_branch_18d4fc + song_call Music_ElekidAndMagbysTheme_branch_18d564 + song_call Music_ElekidAndMagbysTheme_branch_18d5b7 + song_jump Music_ElekidAndMagbysTheme_branch_18d4f0 Music_ElekidAndMagbysTheme_branch_18d4fc: ; 18d4fc (63:54fc) music01 48 @@ -120,7 +120,7 @@ Music_ElekidAndMagbysTheme_branch_18d4fc: ; 18d4fc (63:54fc) music8a 176 music01 24 musicd2 - musiced + song_ret Music_ElekidAndMagbysTheme_branch_18d564: ; 18d564 (63:5564) musice3 2 @@ -204,7 +204,7 @@ Music_ElekidAndMagbysTheme_branch_18d564: ; 18d564 (63:5564) musicd2 music01 48 musicd2 - musiced + song_ret Music_ElekidAndMagbysTheme_branch_18d5b7: ; 18d5b7 (63:55b7) music01 3 @@ -367,26 +367,26 @@ Music_ElekidAndMagbysTheme_branch_18d5b7: ; 18d5b7 (63:55b7) music8a 176 music01 24 musicd2 - musiced + song_ret Music_ElekidAndMagbysTheme_Ch2: ; 18d658 (63:5658) - musicda 119 - musice6 115 - musicdd - musice0 + volume 119 + volume_envelope 115 + stereo_panning_both + duty_cycle_50 musicd4 55 musicd8 164 music01 12 musicd2 Music_ElekidAndMagbysTheme_branch_18d664: ; 18d664 (63:5664) - musicec Music_ElekidAndMagbysTheme_branch_18d670 - musicec Music_ElekidAndMagbysTheme_branch_18d748 - musicec Music_ElekidAndMagbysTheme_branch_18d7e6 - musice7 Music_ElekidAndMagbysTheme_branch_18d664 + song_call Music_ElekidAndMagbysTheme_branch_18d670 + song_call Music_ElekidAndMagbysTheme_branch_18d748 + song_call Music_ElekidAndMagbysTheme_branch_18d7e6 + song_jump Music_ElekidAndMagbysTheme_branch_18d664 Music_ElekidAndMagbysTheme_branch_18d670: ; 18d670 (63:5670) musicd8 211 - musicde + duty_cycle_12_5 music01 12 musicd2 music01 3 @@ -399,7 +399,7 @@ Music_ElekidAndMagbysTheme_branch_18d670: ; 18d670 (63:5670) music01 24 musicd2 musicd8 162 - musice0 + duty_cycle_50 music01 3 music8a 167 music01 9 @@ -448,7 +448,7 @@ Music_ElekidAndMagbysTheme_branch_18d670: ; 18d670 (63:5670) musicd2 musicd4 55 musicd8 210 - musicde + duty_cycle_12_5 music01 3 music8a 177 music01 3 @@ -479,7 +479,7 @@ Music_ElekidAndMagbysTheme_branch_18d670: ; 18d670 (63:5670) musicd2 musicd8 164 musicd4 59 - musicde + duty_cycle_12_5 music8a 177 music01 3 musicd2 @@ -518,7 +518,7 @@ Music_ElekidAndMagbysTheme_branch_18d670: ; 18d670 (63:5670) musicd2 musicd8 162 musicd4 55 - musice0 + duty_cycle_50 music01 6 music8a 152 music01 3 @@ -553,7 +553,7 @@ Music_ElekidAndMagbysTheme_branch_18d670: ; 18d670 (63:5670) music01 3 musicd3 musicd8 209 - musicde + duty_cycle_12_5 music8a 187 musicd8 206 music01 3 @@ -575,11 +575,11 @@ Music_ElekidAndMagbysTheme_branch_18d670: ; 18d670 (63:5670) music8a 148 music01 3 music8a 143 - musiced + song_ret Music_ElekidAndMagbysTheme_branch_18d748: ; 18d748 (63:5748) musicd8 163 - musice0 + duty_cycle_50 music01 3 music8a 167 music01 9 @@ -629,7 +629,7 @@ Music_ElekidAndMagbysTheme_branch_18d748: ; 18d748 (63:5748) musicd2 musicd4 55 musicd8 209 - musicde + duty_cycle_12_5 music01 3 music8a 177 music01 3 @@ -660,7 +660,7 @@ Music_ElekidAndMagbysTheme_branch_18d748: ; 18d748 (63:5748) musicd2 musicd8 164 musicd4 59 - musicde + duty_cycle_12_5 music8a 177 music01 3 musicd2 @@ -723,7 +723,7 @@ Music_ElekidAndMagbysTheme_branch_18d748: ; 18d748 (63:5748) music8a 184 music01 33 musicd2 - musiced + song_ret Music_ElekidAndMagbysTheme_branch_18d7e6: ; 18d7e6 (63:57e6) music01 3 @@ -789,7 +789,7 @@ Music_ElekidAndMagbysTheme_branch_18d7e6: ; 18d7e6 (63:57e6) musicd2 music01 18 music8a 184 - musice0 + duty_cycle_50 musicd8 177 music01 3 music8a 191 @@ -917,20 +917,20 @@ Music_ElekidAndMagbysTheme_branch_18d7e6: ; 18d7e6 (63:57e6) musicd3 music01 6 musicd2 - musiced + song_ret Music_ElekidAndMagbysTheme_Ch3: ; 18d8ab (63:58ab) - musicdd + stereo_panning_both musicd8 27 musicd7 0 - musice2 61 + wave 61 music01 12 musicd2 Music_ElekidAndMagbysTheme_branch_18d8b4: ; 18d8b4 (63:58b4) - musicec Music_ElekidAndMagbysTheme_branch_18d8c0 - musicec Music_ElekidAndMagbysTheme_branch_18d96c - musicec Music_ElekidAndMagbysTheme_branch_18d9ff - musice7 Music_ElekidAndMagbysTheme_branch_18d8b4 + song_call Music_ElekidAndMagbysTheme_branch_18d8c0 + song_call Music_ElekidAndMagbysTheme_branch_18d96c + song_call Music_ElekidAndMagbysTheme_branch_18d9ff + song_jump Music_ElekidAndMagbysTheme_branch_18d8b4 Music_ElekidAndMagbysTheme_branch_18d8c0: ; 18d8c0 (63:58c0) musicd4 59 @@ -1101,7 +1101,7 @@ Music_ElekidAndMagbysTheme_branch_18d8c0: ; 18d8c0 (63:58c0) music8a 155 music01 3 musicd2 - musiced + song_ret Music_ElekidAndMagbysTheme_branch_18d96c: ; 18d96c (63:596c) music01 3 @@ -1250,10 +1250,10 @@ Music_ElekidAndMagbysTheme_branch_18d96c: ; 18d96c (63:596c) music8a 160 music01 33 musicd2 - musiced + song_ret Music_ElekidAndMagbysTheme_branch_18d9ff: ; 18d9ff (63:59ff) - musice2 7 + wave 7 musicd8 104 musicd7 12 music01 3 @@ -1419,7 +1419,7 @@ Music_ElekidAndMagbysTheme_branch_18d9ff: ; 18d9ff (63:59ff) music01 48 musicd2 musicd8 27 - musice2 61 + wave 61 musicd7 0 music01 3 music8a 160 @@ -1464,10 +1464,10 @@ Music_ElekidAndMagbysTheme_branch_18d9ff: ; 18d9ff (63:59ff) music8a 160 music01 45 musicd2 - musiced + song_ret Music_ElekidAndMagbysTheme_Ch4: ; 18dad9 (63:5ad9) - musicdd + stereo_panning_both music01 3 music6d 126 music01 3 @@ -1477,10 +1477,10 @@ Music_ElekidAndMagbysTheme_Ch4: ; 18dad9 (63:5ad9) music01 3 music6d 127 Music_ElekidAndMagbysTheme_branch_18dae2: ; 18dae2 (63:5ae2) - musicec Music_ElekidAndMagbysTheme_branch_18daee - musicec Music_ElekidAndMagbysTheme_branch_18dc0d - musicec Music_ElekidAndMagbysTheme_branch_18dd0b - musice7 Music_ElekidAndMagbysTheme_branch_18dae2 + song_call Music_ElekidAndMagbysTheme_branch_18daee + song_call Music_ElekidAndMagbysTheme_branch_18dc0d + song_call Music_ElekidAndMagbysTheme_branch_18dd0b + song_jump Music_ElekidAndMagbysTheme_branch_18dae2 Music_ElekidAndMagbysTheme_branch_18daee: ; 18daee (63:5aee) music01 3 @@ -1769,7 +1769,7 @@ Music_ElekidAndMagbysTheme_branch_18daee: ; 18daee (63:5aee) music6d 121 music01 3 musicd3 - musiced + song_ret Music_ElekidAndMagbysTheme_branch_18dc0d: ; 18dc0d (63:5c0d) music01 3 @@ -2025,7 +2025,7 @@ Music_ElekidAndMagbysTheme_branch_18dc0d: ; 18dc0d (63:5c0d) music6d 127 music01 3 music6d 127 - musiced + song_ret Music_ElekidAndMagbysTheme_branch_18dd0b: ; 18dd0b (63:5d0b) music01 12 @@ -2234,4 +2234,4 @@ Music_ElekidAndMagbysTheme_branch_18dd0b: ; 18dd0b (63:5d0b) music6d 126 music01 21 musicd2 - musiced + song_ret diff --git a/src/audio/music/elitefour.asm b/src/audio/music/elitefour.asm index 80f5b91..48bfe5e 100644 --- a/src/audio/music/elitefour.asm +++ b/src/audio/music/elitefour.asm @@ -5,25 +5,25 @@ Music_EliteFour: ; 18961d (62:561d) dw Music_EliteFour_Ch4 Music_EliteFour_Ch1: ; 189625 (62:5625) - musicda 119 - musice6 115 - musicdd + volume 119 + volume_envelope 115 + stereo_panning_both musicd6 15 musicd7 3 - musice1 + duty_cycle_75 musice3 2 musicd4 55 musicd7 247 - musicec Music_EliteFour_branch_189645 + song_call Music_EliteFour_branch_189645 Music_EliteFour_branch_189638: ; 189638 (62:5638) musicd7 0 - musicec Music_EliteFour_branch_189673 + song_call Music_EliteFour_branch_189673 musicd7 3 - musicec Music_EliteFour_branch_1896cc - musice7 Music_EliteFour_branch_189638 + song_call Music_EliteFour_branch_1896cc + song_jump Music_EliteFour_branch_189638 Music_EliteFour_branch_189645: ; 189645 (62:5645) - musicde + duty_cycle_12_5 musicd4 55 musice3 2 musicd8 203 @@ -58,10 +58,10 @@ Music_EliteFour_branch_189645: ; 189645 (62:5645) musicd8 223 music01 6 music8a 156 - musiced + song_ret Music_EliteFour_branch_189673: ; 189673 (62:5673) - musicde + duty_cycle_12_5 musicd8 119 music01 48 musicd2 @@ -111,7 +111,7 @@ Music_EliteFour_branch_189673: ; 189673 (62:5673) music8a 187 music01 6 musicd2 - musiced + song_ret ; unreferenced ? Music_EliteFour_branch_1896a7: ; 189625 (62:5625) @@ -150,7 +150,7 @@ Music_EliteFour_branch_1896a7: ; 189625 (62:5625) music8a 187 music01 6 musicd2 - musiced + song_ret Music_EliteFour_branch_1896cc: ; 1896cc (62:56cc) musicd8 221 @@ -202,7 +202,7 @@ Music_EliteFour_branch_1896cc: ; 1896cc (62:56cc) music8a 176 music01 9 musicd2 - musice1 + duty_cycle_75 musicd8 199 music01 4 music8a 149 @@ -244,7 +244,7 @@ Music_EliteFour_branch_1896cc: ; 1896cc (62:56cc) musicd8 166 music01 2 music8a 182 - musice0 + duty_cycle_50 musicd8 119 music01 24 musicd2 @@ -288,29 +288,29 @@ Music_EliteFour_branch_1896cc: ; 1896cc (62:56cc) music8a 161 music01 12 musicd2 - musiced + song_ret Music_EliteFour_Ch2: ; 18975f (62:575f) - musicda 119 - musice6 115 - musicdd + volume 119 + volume_envelope 115 + stereo_panning_both musicd6 15 musicd4 55 musicd7 247 - musicec Music_EliteFour_branch_189784 + song_call Music_EliteFour_branch_189784 Music_EliteFour_branch_18976d: ; 18976d (62:576d) musicd7 0 - musicec Music_EliteFour_branch_1897ac + song_call Music_EliteFour_branch_1897ac musicd7 247 - musicec Music_EliteFour_branch_18980f + song_call Music_EliteFour_branch_18980f musicd7 3 - musicec Music_EliteFour_branch_189899 + song_call Music_EliteFour_branch_189899 musicd7 247 - musicec Music_EliteFour_branch_1898cc - musice7 Music_EliteFour_branch_18976d + song_call Music_EliteFour_branch_1898cc + song_jump Music_EliteFour_branch_18976d Music_EliteFour_branch_189784: ; 189784 (62:5784) - musice0 + duty_cycle_50 musicd4 55 musicd8 35 music01 3 @@ -346,10 +346,10 @@ Music_EliteFour_branch_189784: ; 189784 (62:5784) music01 3 music8a 184 musicd7 3 - musiced + song_ret Music_EliteFour_branch_1897ac: ; 1897ac (62:57ac) - musicde + duty_cycle_12_5 musicd8 48 music01 18 music8a 154 @@ -403,7 +403,7 @@ Music_EliteFour_branch_1897ac: ; 1897ac (62:57ac) music8a 190 music01 6 musicd2 - musiced + song_ret ; unreferenced ? Music_EliteFour_branch_1897e4: ; 18975f (62:575f) @@ -445,7 +445,7 @@ Music_EliteFour_branch_1897e4: ; 18975f (62:575f) music8a 184 music01 6 musicd2 - musiced + song_ret Music_EliteFour_branch_18980f: ; 18980f (62:580f) musicd8 196 @@ -559,7 +559,7 @@ Music_EliteFour_branch_18980f: ; 18980f (62:580f) music8a 155 music01 3 musicd2 - musiced + song_ret Music_EliteFour_branch_189899: ; 189899 (62:5899) musicd8 196 @@ -603,7 +603,7 @@ Music_EliteFour_branch_189899: ; 189899 (62:5899) musicd8 162 music01 3 music8a 182 - musiced + song_ret Music_EliteFour_branch_1898cc: ; 1898cc (62:58cc) music01 24 @@ -657,23 +657,23 @@ Music_EliteFour_branch_1898cc: ; 1898cc (62:58cc) music8a 165 music01 12 musicd2 - musiced + song_ret Music_EliteFour_Ch3: ; 189907 (62:5907) - musicdd + stereo_panning_both musicd4 55 musicd7 3 - musicec Music_EliteFour_branch_189919 + song_call Music_EliteFour_branch_189919 Music_EliteFour_branch_18990f: ; 18990f (62:590f) musicd8 104 musicd7 3 - musicec Music_EliteFour_branch_189946 - musice7 Music_EliteFour_branch_18990f + song_call Music_EliteFour_branch_189946 + song_jump Music_EliteFour_branch_18990f Music_EliteFour_branch_189919: ; 189919 (62:5919) - musice2 66 + wave 66 musicd8 27 - musice2 69 + wave 69 music01 3 music8a 172 music01 3 @@ -684,7 +684,7 @@ Music_EliteFour_branch_189919: ; 189919 (62:5919) music8a 171 music01 3 music8a 172 - musice2 68 + wave 68 music01 3 music8a 171 music01 3 @@ -693,7 +693,7 @@ Music_EliteFour_branch_189919: ; 189919 (62:5919) music8a 171 music01 3 music8a 172 - musice2 67 + wave 67 music01 3 music8a 171 music01 3 @@ -702,17 +702,17 @@ Music_EliteFour_branch_189919: ; 189919 (62:5919) music8a 171 music01 3 music8a 172 - musice2 66 + wave 66 music01 3 music8a 171 music01 3 music8a 170 music01 3 music8a 171 - musiced + song_ret Music_EliteFour_branch_189946: ; 189946 (62:5946) - musice2 9 + wave 9 musicd8 104 music01 3 music8a 151 @@ -908,7 +908,7 @@ Music_EliteFour_branch_189946: ; 189946 (62:5946) music01 3 musicd2 musicd8 27 - musice2 66 + wave 66 musicd7 15 music01 3 music8a 166 @@ -961,76 +961,76 @@ Music_EliteFour_branch_189946: ; 189946 (62:5946) music01 48 musicd2 musicd8 109 - musice2 67 + wave 67 music01 48 music8a 151 music01 12 musicd3 music01 3 music8a 151 - musice2 68 + wave 68 music01 3 music8a 151 - musice2 69 + wave 69 music01 3 music8a 151 - musice2 70 + wave 70 music01 3 music8a 151 - musice2 66 + wave 66 musicd8 27 music01 12 music8a 158 music01 12 musicd2 musicd8 109 - musice2 67 + wave 67 music01 48 music8a 151 music01 12 musicd3 music01 3 music8a 151 - musice2 68 + wave 68 music01 3 music8a 151 - musice2 69 + wave 69 music01 3 music8a 151 - musice2 70 + wave 70 music01 3 music8a 151 musicd8 27 - musice2 67 + wave 67 music01 12 music8a 158 music01 12 musicd2 musicd8 109 - musice2 68 + wave 68 music01 48 music8a 151 music01 12 musicd3 - musice2 67 + wave 67 music01 3 music8a 151 - musice2 68 + wave 68 music01 3 music8a 151 - musice2 69 + wave 69 music01 3 music8a 151 - musice2 70 + wave 70 music01 3 music8a 151 musicd8 27 - musice2 66 + wave 66 music01 12 music8a 158 music01 12 musicd2 - musice2 67 + wave 67 musicd8 109 music01 48 music8a 151 @@ -1038,17 +1038,17 @@ Music_EliteFour_branch_189946: ; 189946 (62:5946) musicd3 music01 3 music8a 151 - musice2 68 + wave 68 music01 3 music8a 151 - musice2 69 + wave 69 music01 3 music8a 151 - musice2 70 + wave 70 music01 3 music8a 151 musicd8 27 - musice2 67 + wave 67 music01 12 music8a 158 music01 3 @@ -1059,7 +1059,7 @@ Music_EliteFour_branch_189946: ; 189946 (62:5946) music8a 151 music01 3 music8a 146 - musice2 62 + wave 62 music01 6 music8a 139 music01 6 @@ -1101,14 +1101,14 @@ Music_EliteFour_branch_189946: ; 189946 (62:5946) music8a 139 music01 6 musicd2 - musiced + song_ret Music_EliteFour_Ch4: ; 189aef (62:5aef) - musicdd - musicec Music_EliteFour_branch_189af9 + stereo_panning_both + song_call Music_EliteFour_branch_189af9 Music_EliteFour_branch_189af3: ; 189af3 (62:5af3) - musicec Music_EliteFour_branch_189b15 - musice7 Music_EliteFour_branch_189af3 + song_call Music_EliteFour_branch_189b15 + song_jump Music_EliteFour_branch_189af3 Music_EliteFour_branch_189af9: ; 189af9 (62:5af9) music01 3 @@ -1138,7 +1138,7 @@ Music_EliteFour_branch_189af9: ; 189af9 (62:5af9) music8a 142 music01 3 musicd3 - musiced + song_ret Music_EliteFour_branch_189b15: ; 189b15 (62:5b15) music01 3 @@ -1762,4 +1762,4 @@ Music_EliteFour_branch_189b15: ; 189b15 (62:5b15) music6d 127 music01 3 music6d 127 - musiced + song_ret diff --git a/src/audio/music/elitefourdanger.asm b/src/audio/music/elitefourdanger.asm index 5b82040..96e6099 100644 --- a/src/audio/music/elitefourdanger.asm +++ b/src/audio/music/elitefourdanger.asm @@ -5,24 +5,24 @@ Music_EliteFourDanger: ; 18ddda (63:5dda) dw Music_EliteFourDanger_Ch4 Music_EliteFourDanger_Ch1: ; 18dde2 (63:5de2) - musicda 119 - musice6 115 - musicdd + volume 119 + volume_envelope 115 + stereo_panning_both musicd6 19 musice3 2 musicd4 55 musicd4 55 musicd8 36 - musicec Music_EliteFourDanger_branch_18deca + song_call Music_EliteFourDanger_branch_18deca Music_EliteFourDanger_branch_18ddf4: ; 18ddf4 (63:5df4) musicd7 0 musicd4 55 - musicec Music_EliteFourDanger_branch_18defc - musicec Music_EliteFourDanger_branch_18de09 + song_call Music_EliteFourDanger_branch_18defc + song_call Music_EliteFourDanger_branch_18de09 musice3 2 - musicec Music_EliteFourDanger_branch_18e000 - musicec Music_EliteFourDanger_branch_18e027 - musice7 Music_EliteFourDanger_branch_18ddf4 + song_call Music_EliteFourDanger_branch_18e000 + song_call Music_EliteFourDanger_branch_18e027 + song_jump Music_EliteFourDanger_branch_18ddf4 Music_EliteFourDanger_branch_18de09: ; 18de09 (63:5e09) music01 6 @@ -185,10 +185,10 @@ Music_EliteFourDanger_branch_18de09: ; 18de09 (63:5e09) musicd8 36 music01 3 music8a 172 - musiced + song_ret Music_EliteFourDanger_branch_18deca: ; 18deca (63:5eca) - musicde + duty_cycle_12_5 musicd8 119 musicd4 59 music01 18 @@ -209,11 +209,11 @@ Music_EliteFourDanger_branch_18deca: ; 18deca (63:5eca) musicd4 61 music01 6 music8a 159 - musiced + song_ret ; unreferenced ? Music_EliteFourDanger_branch_18dee4: ; 18dde2 (63:5de2) - musicde + duty_cycle_12_5 musicd8 119 musice3 3 music01 18 @@ -234,10 +234,10 @@ Music_EliteFourDanger_branch_18dee4: ; 18dde2 (63:5de2) music8a 170 music01 3 music8a 171 - musiced + song_ret Music_EliteFourDanger_branch_18defc: ; 18defc (63:5efc) - musicde + duty_cycle_12_5 musicd8 118 musice3 2 music01 24 @@ -294,7 +294,7 @@ Music_EliteFourDanger_branch_18defc: ; 18defc (63:5efc) music8a 175 music01 3 musicd3 - musice1 + duty_cycle_75 musicd8 36 musicd4 59 music01 6 @@ -312,7 +312,7 @@ Music_EliteFourDanger_branch_18defc: ; 18defc (63:5efc) musicd2 music01 12 music8a 179 - musiced + song_ret ; unreferenced ? Music_EliteFourDanger_branch_18df4d: ; 18dde2 (63:5de2) @@ -461,7 +461,7 @@ Music_EliteFourDanger_branch_18df4d: ; 18dde2 (63:5de2) musicd8 36 music01 3 music8a 172 - musiced + song_ret Music_EliteFourDanger_branch_18e000: ; 18e000 (63:6000) musicd8 118 @@ -501,7 +501,7 @@ Music_EliteFourDanger_branch_18e000: ; 18e000 (63:6000) music8a 172 music01 3 musicd3 - musiced + song_ret Music_EliteFourDanger_branch_18e027: ; 18e027 (63:6027) musicd8 118 @@ -568,36 +568,36 @@ Music_EliteFourDanger_branch_18e027: ; 18e027 (63:6027) music8a 182 music01 24 music8a 181 - musiced + song_ret Music_EliteFourDanger_Ch2: ; 18e069 (63:6069) - musicda 119 - musice6 115 - musicdd + volume 119 + volume_envelope 115 + stereo_panning_both musicd4 55 - musice0 + duty_cycle_50 musicd4 55 - musicde + duty_cycle_12_5 musicd4 55 musicd8 161 - musicec Music_EliteFourDanger_branch_18e15c + song_call Music_EliteFourDanger_branch_18e15c Music_EliteFourDanger_branch_18e07b: ; 18e07b (63:607b) - musicec Music_EliteFourDanger_branch_18e1a7 - musicec Music_EliteFourDanger_branch_18e08a - musicec Music_EliteFourDanger_branch_18e299 - musicec Music_EliteFourDanger_branch_18e2c0 - musice7 Music_EliteFourDanger_branch_18e07b + song_call Music_EliteFourDanger_branch_18e1a7 + song_call Music_EliteFourDanger_branch_18e08a + song_call Music_EliteFourDanger_branch_18e299 + song_call Music_EliteFourDanger_branch_18e2c0 + song_jump Music_EliteFourDanger_branch_18e07b Music_EliteFourDanger_branch_18e08a: ; 18e08a (63:608a) musicd8 52 - musice0 + duty_cycle_50 music01 18 music8a 162 music01 18 music8a 160 music01 12 music8a 162 - musice0 + duty_cycle_50 musicd8 178 musicd4 59 music01 9 @@ -613,7 +613,7 @@ Music_EliteFourDanger_branch_18e08a: ; 18e08a (63:608a) music8a 172 music01 6 music8a 174 - musice0 + duty_cycle_50 musicd8 52 music01 18 music8a 160 @@ -622,7 +622,7 @@ Music_EliteFourDanger_branch_18e08a: ; 18e08a (63:608a) music01 12 music8a 160 musicd8 178 - musice0 + duty_cycle_50 musicd4 59 music01 9 music8a 187 @@ -638,7 +638,7 @@ Music_EliteFourDanger_branch_18e08a: ; 18e08a (63:608a) music01 6 music8a 186 musicd8 52 - musice0 + duty_cycle_50 music01 45 music8a 174 music01 3 @@ -691,7 +691,7 @@ Music_EliteFourDanger_branch_18e08a: ; 18e08a (63:608a) musicd8 209 music01 3 music8a 178 - musiced + song_ret ; unreferenced ? Music_EliteFourDanger_branch_18e10a: ; 18e069 (63:6069) @@ -760,7 +760,7 @@ Music_EliteFourDanger_branch_18e10a: ; 18e069 (63:6069) music8a 171 music01 3 music8a 170 - musice0 + duty_cycle_50 musicd4 55 musicd8 52 musicd7 0 @@ -768,10 +768,10 @@ Music_EliteFourDanger_branch_18e10a: ; 18e069 (63:6069) music8a 170 music01 3 music8a 171 - musiced + song_ret Music_EliteFourDanger_branch_18e15c: ; 18e15c (63:615c) - musicde + duty_cycle_12_5 musicd4 55 musicd8 39 music01 3 @@ -834,17 +834,17 @@ Music_EliteFourDanger_branch_18e15c: ; 18e15c (63:615c) music8a 183 music01 3 music8a 195 - musice0 + duty_cycle_50 musicd4 55 musicd8 52 music01 3 music8a 170 music01 3 music8a 171 - musiced + song_ret Music_EliteFourDanger_branch_18e1a7: ; 18e1a7 (63:61a7) - musice0 + duty_cycle_50 musicd4 55 musicd8 52 music01 24 @@ -901,7 +901,7 @@ Music_EliteFourDanger_branch_18e1a7: ; 18e1a7 (63:61a7) music8a 175 music01 3 musicd3 - musicde + duty_cycle_12_5 musicd8 162 musicd4 59 music01 6 @@ -920,12 +920,12 @@ Music_EliteFourDanger_branch_18e1a7: ; 18e1a7 (63:61a7) musicd8 52 music01 12 music8a 179 - musiced + song_ret ; unreferenced ? Music_EliteFourDanger_branch_18e1fa: ; 18e069 (63:6069) musicd8 52 - musice0 + duty_cycle_50 music01 18 music8a 162 music01 18 @@ -949,7 +949,7 @@ Music_EliteFourDanger_branch_18e1fa: ; 18e069 (63:6069) music8a 162 music01 12 music8a 163 - musicde + duty_cycle_12_5 musicd8 210 music01 3 music8a 162 @@ -1046,7 +1046,7 @@ Music_EliteFourDanger_branch_18e1fa: ; 18e069 (63:6069) musicd8 209 music01 3 music8a 166 - musiced + song_ret Music_EliteFourDanger_branch_18e299: ; 18e299 (63:6299) musicd8 52 @@ -1086,7 +1086,7 @@ Music_EliteFourDanger_branch_18e299: ; 18e299 (63:6299) music8a 178 music01 3 musicd3 - musiced + song_ret Music_EliteFourDanger_branch_18e2c0: ; 18e2c0 (63:62c0) musicd8 52 @@ -1170,7 +1170,7 @@ Music_EliteFourDanger_branch_18e2c0: ; 18e2c0 (63:62c0) music8a 189 music01 18 music8a 188 - musice0 + duty_cycle_50 musicd4 55 musicd8 52 musicd7 0 @@ -1178,22 +1178,22 @@ Music_EliteFourDanger_branch_18e2c0: ; 18e2c0 (63:62c0) music8a 170 music01 3 music8a 171 - musiced + song_ret Music_EliteFourDanger_Ch3: ; 18e320 (63:6320) - musicdd + stereo_panning_both musicd7 12 musicd4 55 musicd8 27 - musice2 67 - musicec Music_EliteFourDanger_branch_18e3c6 + wave 67 + song_call Music_EliteFourDanger_branch_18e3c6 Music_EliteFourDanger_branch_18e32c: ; 18e32c (63:632c) musicd7 12 - musicec Music_EliteFourDanger_branch_18e426 - musicec Music_EliteFourDanger_branch_18e33d - musicec Music_EliteFourDanger_branch_18e5c6 - musicec Music_EliteFourDanger_branch_18e651 - musice7 Music_EliteFourDanger_branch_18e32c + song_call Music_EliteFourDanger_branch_18e426 + song_call Music_EliteFourDanger_branch_18e33d + song_call Music_EliteFourDanger_branch_18e5c6 + song_call Music_EliteFourDanger_branch_18e651 + song_jump Music_EliteFourDanger_branch_18e32c Music_EliteFourDanger_branch_18e33d: ; 18e33d (63:633d) music01 6 @@ -1332,7 +1332,7 @@ Music_EliteFourDanger_branch_18e33d: ; 18e33d (63:633d) music8a 157 music01 6 music8a 162 - musiced + song_ret Music_EliteFourDanger_branch_18e3c6: ; 18e3c6 (63:63c6) musicd7 244 @@ -1402,11 +1402,11 @@ Music_EliteFourDanger_branch_18e3c6: ; 18e3c6 (63:63c6) music8a 170 music01 3 music8a 171 - musiced + song_ret ; unreferenced ? Music_EliteFourDanger_branch_18e40d: ; 18e320 (63:6320) - musice2 64 + wave 64 musicd4 59 music01 18 music8a 144 @@ -1426,11 +1426,11 @@ Music_EliteFourDanger_branch_18e40d: ; 18e320 (63:6320) musicd4 61 music01 6 music8a 147 - musiced + song_ret Music_EliteFourDanger_branch_18e426: ; 18e426 (63:6426) musicd4 55 - musice2 63 + wave 63 music01 2 music8a 152 music01 1 @@ -1665,7 +1665,7 @@ Music_EliteFourDanger_branch_18e426: ; 18e426 (63:6426) music8a 159 music01 6 music8a 158 - musiced + song_ret ; unreferenced ? Music_EliteFourDanger_branch_18e515: ; 18e320 (63:6320) @@ -1839,7 +1839,7 @@ Music_EliteFourDanger_branch_18e515: ; 18e320 (63:6320) music8a 157 music01 6 music8a 162 - musiced + song_ret Music_EliteFourDanger_branch_18e5c6: ; 18e5c6 (63:65c6) music01 12 @@ -1974,7 +1974,7 @@ Music_EliteFourDanger_branch_18e5c6: ; 18e5c6 (63:65c6) music8a 169 music01 6 music8a 162 - musiced + song_ret Music_EliteFourDanger_branch_18e651: ; 18e651 (63:6651) music01 2 @@ -2214,17 +2214,17 @@ Music_EliteFourDanger_branch_18e651: ; 18e651 (63:6651) music8a 152 music01 3 musicd3 - musiced + song_ret Music_EliteFourDanger_Ch4: ; 18e740 (63:6740) - musicdd - musicec Music_EliteFourDanger_branch_18e812 + stereo_panning_both + song_call Music_EliteFourDanger_branch_18e812 Music_EliteFourDanger_branch_18e744: ; 18e744 (63:6744) - musicec Music_EliteFourDanger_branch_18e843 - musicec Music_EliteFourDanger_branch_18e753 - musicec Music_EliteFourDanger_branch_18e9e1 - musicec Music_EliteFourDanger_branch_18eae2 - musice7 Music_EliteFourDanger_branch_18e744 + song_call Music_EliteFourDanger_branch_18e843 + song_call Music_EliteFourDanger_branch_18e753 + song_call Music_EliteFourDanger_branch_18e9e1 + song_call Music_EliteFourDanger_branch_18eae2 + song_jump Music_EliteFourDanger_branch_18e744 Music_EliteFourDanger_branch_18e753: ; 18e753 (63:6753) music01 6 @@ -2417,7 +2417,7 @@ Music_EliteFourDanger_branch_18e753: ; 18e753 (63:6753) music6d 112 music01 3 music6d 120 - musiced + song_ret Music_EliteFourDanger_branch_18e812: ; 18e812 (63:6812) music01 6 @@ -2468,7 +2468,7 @@ Music_EliteFourDanger_branch_18e812: ; 18e812 (63:6812) music6d 127 music01 3 music6d 127 - musiced + song_ret Music_EliteFourDanger_branch_18e843: ; 18e843 (63:6843) music01 3 @@ -2725,7 +2725,7 @@ Music_EliteFourDanger_branch_18e843: ; 18e843 (63:6843) music6d 112 music01 3 music6d 120 - musiced + song_ret ; unreferenced ? Music_EliteFourDanger_branch_18e942: ; 18e740 (63:6740) @@ -2887,7 +2887,7 @@ Music_EliteFourDanger_branch_18e942: ; 18e740 (63:6740) music6d 127 music01 3 music6d 127 - musiced + song_ret Music_EliteFourDanger_branch_18e9e1: ; 18e9e1 (63:69e1) music01 3 @@ -3146,7 +3146,7 @@ Music_EliteFourDanger_branch_18e9e1: ; 18e9e1 (63:69e1) music6d 127 music01 3 music6d 127 - musiced + song_ret Music_EliteFourDanger_branch_18eae2: ; 18eae2 (63:6ae2) music01 6 @@ -3386,4 +3386,4 @@ Music_EliteFourDanger_branch_18eae2: ; 18eae2 (63:6ae2) music6d 126 music01 3 music6d 126 - musiced + song_ret diff --git a/src/audio/music/gameover.asm b/src/audio/music/gameover.asm index 82338cd..cde672f 100644 --- a/src/audio/music/gameover.asm +++ b/src/audio/music/gameover.asm @@ -5,20 +5,20 @@ Music_GameOver: ; 18a872 (62:6872) dw $0000 Music_GameOver_Ch1: ; 18a87a (62:687a) - musicda 119 - musice6 115 - musicdd + volume 119 + volume_envelope 115 + stereo_panning_both musicd6 6 musicd4 35 - musice0 + duty_cycle_50 musicd8 40 musicd7 0 musicd4 55 musicd2 music01 1 Music_GameOver_branch_18a88c: ; 18a88c (62:688c) - musicec Music_GameOver_branch_18a892 - musice7 Music_GameOver_branch_18a88c + song_call Music_GameOver_branch_18a892 + song_jump Music_GameOver_branch_18a88c Music_GameOver_branch_18a892: ; 18a892 (62:6892) musice3 0 @@ -80,19 +80,19 @@ Music_GameOver_branch_18a892: ; 18a892 (62:6892) musicd2 music01 6 musicd2 - musiced + song_ret Music_GameOver_Ch2: ; 18a8cf (62:68cf) - musicda 119 - musice6 115 - musicdd + volume 119 + volume_envelope 115 + stereo_panning_both musicd4 37 - musice0 + duty_cycle_50 musicd7 0 musice3 0 Music_GameOver_branch_18a8db: ; 18a8db (62:68db) - musicec Music_GameOver_branch_18a8e1 - musice7 Music_GameOver_branch_18a8db + song_call Music_GameOver_branch_18a8e1 + song_jump Music_GameOver_branch_18a8db Music_GameOver_branch_18a8e1: ; 18a8e1 (62:68e1) musicd8 43 @@ -168,18 +168,18 @@ Music_GameOver_branch_18a8e1: ; 18a8e1 (62:68e1) music8a 185 music01 6 music8a 173 - musiced + song_ret Music_GameOver_Ch3: ; 18a92e (62:692e) - musicdd - musice2 7 + stereo_panning_both + wave 7 musicd8 101 musicd7 0 musicd4 35 musice3 0 Music_GameOver_branch_18a939: ; 18a939 (62:6939) - musicec Music_GameOver_branch_18a93f - musice7 Music_GameOver_branch_18a939 + song_call Music_GameOver_branch_18a93f + song_jump Music_GameOver_branch_18a939 Music_GameOver_branch_18a93f: ; 18a93f (62:693f) music01 6 @@ -240,12 +240,12 @@ Music_GameOver_branch_18a93f: ; 18a93f (62:693f) music8a 185 music01 6 music8a 173 - musiced + song_ret ; unreferenced ? Music_GameOver_branch_18a97a: ; 18a92e (62:692e) - musicdd + stereo_panning_both Music_GameOver_branch_18a97b: ; 18a97b (62:697b) musicd2 music01 48 - musice7 Music_GameOver_branch_18a97b + song_jump Music_GameOver_branch_18a97b diff --git a/src/audio/music/goldenrodgym.asm b/src/audio/music/goldenrodgym.asm index 23f1c04..b426d31 100644 --- a/src/audio/music/goldenrodgym.asm +++ b/src/audio/music/goldenrodgym.asm @@ -5,12 +5,12 @@ Music_GoldenrodGym: ; 18400c (61:400c) dw Music_GoldenrodGym_Ch4 Music_GoldenrodGym_Ch1: ; 184014 (61:4014) - musicda 119 - musice6 115 - musicdd + volume 119 + volume_envelope 115 + stereo_panning_both musicd6 14 musicd7 0 - musice0 + duty_cycle_50 musice3 2 musicd4 55 musicd8 221 @@ -60,8 +60,8 @@ Music_GoldenrodGym_Ch1: ; 184014 (61:4014) music01 3 music8a 158 Music_GoldenrodGym_branch_184051: ; 184051 (61:4051) - musicec Music_GoldenrodGym_branch_184057 - musice7 Music_GoldenrodGym_branch_184051 + song_call Music_GoldenrodGym_branch_184057 + song_jump Music_GoldenrodGym_branch_184051 Music_GoldenrodGym_branch_184057: ; 184057 (61:4057) music01 48 @@ -455,15 +455,15 @@ Music_GoldenrodGym_branch_184057: ; 184057 (61:4057) musicd2 music01 48 musicd2 - musiced + song_ret Music_GoldenrodGym_Ch2: ; 1841df (61:41df) - musicda 119 - musice6 115 - musicdd + volume 119 + volume_envelope 115 + stereo_panning_both musicd6 14 musicd7 0 - musice0 + duty_cycle_50 musicd4 55 musicd8 161 music01 48 @@ -537,8 +537,8 @@ Music_GoldenrodGym_Ch2: ; 1841df (61:41df) music01 48 musicd2 Music_GoldenrodGym_branch_18423e: ; 18423e (61:423e) - musicec Music_GoldenrodGym_branch_184244 - musice7 Music_GoldenrodGym_branch_18423e + song_call Music_GoldenrodGym_branch_184244 + song_jump Music_GoldenrodGym_branch_18423e Music_GoldenrodGym_branch_184244: ; 184244 (61:4244) musicd8 165 @@ -683,7 +683,7 @@ Music_GoldenrodGym_branch_184244: ; 184244 (61:4244) music8a 187 musicd4 56 musicd8 209 - musice1 + duty_cycle_75 music01 3 music8a 182 music01 3 @@ -693,22 +693,22 @@ Music_GoldenrodGym_branch_184244: ; 184244 (61:4244) music01 6 musicd2 musicd8 164 - musice0 + duty_cycle_50 music01 9 music8a 191 music01 3 musicd2 musicd8 209 - musice1 + duty_cycle_75 music8a 182 music01 3 music8a 186 musicd8 164 - musice0 + duty_cycle_50 music01 3 music8a 187 musicd8 209 - musice1 + duty_cycle_75 music01 3 music8a 182 music01 3 @@ -716,11 +716,11 @@ Music_GoldenrodGym_branch_184244: ; 184244 (61:4244) music01 3 music8a 163 musicd8 165 - musice0 + duty_cycle_50 music01 3 music8a 186 musicd8 209 - musice1 + duty_cycle_75 music01 3 music8a 182 music01 3 @@ -730,11 +730,11 @@ Music_GoldenrodGym_branch_184244: ; 184244 (61:4244) music01 6 musicd2 musicd8 165 - musice0 + duty_cycle_50 music01 9 music8a 189 musicd8 207 - musice1 + duty_cycle_75 music01 3 music8a 165 music01 3 @@ -742,21 +742,21 @@ Music_GoldenrodGym_branch_184244: ; 184244 (61:4244) music01 3 music8a 174 musicd8 165 - musice0 + duty_cycle_50 music01 6 music8a 186 music01 6 musicd2 musicd8 165 - musice0 + duty_cycle_50 music01 3 music8a 184 musicd8 207 - musice1 + duty_cycle_75 music01 3 music8a 179 musicd8 207 - musice1 + duty_cycle_75 music01 3 music8a 172 music01 3 @@ -766,11 +766,11 @@ Music_GoldenrodGym_branch_184244: ; 184244 (61:4244) music01 3 music8a 172 musicd8 165 - musice0 + duty_cycle_50 music01 9 music8a 187 musicd8 207 - musice1 + duty_cycle_75 music01 3 music8a 160 music01 3 @@ -778,7 +778,7 @@ Music_GoldenrodGym_branch_184244: ; 184244 (61:4244) music01 3 music8a 172 musicd8 165 - musice0 + duty_cycle_50 music01 6 music8a 184 music01 6 @@ -883,7 +883,7 @@ Music_GoldenrodGym_branch_184244: ; 184244 (61:4244) music01 3 music8a 170 musicd8 207 - musice1 + duty_cycle_75 music01 3 music8a 151 musicd8 204 @@ -932,7 +932,7 @@ Music_GoldenrodGym_branch_184244: ; 184244 (61:4244) music01 3 music8a 163 musicd8 58 - musice0 + duty_cycle_50 music01 12 musicd2 musicd4 58 @@ -947,7 +947,7 @@ Music_GoldenrodGym_branch_184244: ; 184244 (61:4244) music01 3 music8a 170 musicd8 209 - musice1 + duty_cycle_75 musicd8 208 music01 3 music8a 151 @@ -997,7 +997,7 @@ Music_GoldenrodGym_branch_184244: ; 184244 (61:4244) music01 3 music8a 163 musicd8 58 - musice0 + duty_cycle_50 musicd4 58 music01 30 music8a 171 @@ -1010,7 +1010,7 @@ Music_GoldenrodGym_branch_184244: ; 184244 (61:4244) music01 3 music8a 173 musicd8 209 - musice1 + duty_cycle_75 music01 3 music8a 154 musicd8 206 @@ -1059,7 +1059,7 @@ Music_GoldenrodGym_branch_184244: ; 184244 (61:4244) music01 3 music8a 178 musicd8 58 - musice0 + duty_cycle_50 music01 12 musicd2 music01 9 @@ -1127,81 +1127,81 @@ Music_GoldenrodGym_branch_184244: ; 184244 (61:4244) music8a 151 music01 3 music8a 163 - musiced + song_ret Music_GoldenrodGym_Ch3: ; 1844f6 (61:44f6) - musicdd + stereo_panning_both musicd4 35 musicd7 0 - musice2 63 + wave 63 musicd8 101 music01 48 musicd2 music01 6 musicd2 - musice2 59 + wave 59 music01 3 music8a 158 music01 9 musicd2 musicd4 55 - musice2 66 + wave 66 music01 3 music8a 158 music01 9 musicd2 - musice2 66 + wave 66 music01 3 music8a 158 music01 9 musicd2 - musice2 63 + wave 63 music01 3 music8a 158 music01 3 musicd2 music01 6 musicd2 - musice2 63 + wave 63 music01 3 music8a 158 music01 9 musicd2 musicd4 55 - musice2 66 + wave 66 music01 3 music8a 158 music01 9 musicd2 - musice2 66 + wave 66 music01 3 music8a 158 music01 9 musicd2 - musice2 63 + wave 63 music01 3 music8a 158 music01 3 musicd2 music01 6 musicd2 - musice2 59 + wave 59 music01 3 music8a 158 music01 9 musicd2 musicd4 55 - musice2 64 + wave 64 music01 3 music8a 158 music01 9 musicd2 - musice2 64 + wave 64 music01 3 music8a 158 music01 9 musicd2 - musice2 61 + wave 61 music01 3 music8a 158 music01 3 @@ -1209,393 +1209,393 @@ Music_GoldenrodGym_Ch3: ; 1844f6 (61:44f6) music01 48 musicd2 Music_GoldenrodGym_branch_184557: ; 184557 (61:4557) - musicec Music_GoldenrodGym_branch_18455d - musice7 Music_GoldenrodGym_branch_184557 + song_call Music_GoldenrodGym_branch_18455d + song_jump Music_GoldenrodGym_branch_184557 Music_GoldenrodGym_branch_18455d: ; 18455d (61:455d) musicd4 55 - musice2 63 + wave 63 music01 3 music8a 151 - musice2 65 + wave 65 music01 3 music8a 163 - musice2 63 + wave 63 music01 3 music8a 175 - musice2 65 + wave 65 music01 3 music8a 163 - musice2 63 + wave 63 music01 3 music8a 151 - musice2 65 + wave 65 music01 3 music8a 163 - musice2 63 + wave 63 music01 3 music8a 163 - musice2 65 + wave 65 music01 3 music8a 175 - musice2 63 + wave 63 music01 3 music8a 151 - musice2 65 + wave 65 music01 3 music8a 174 - musice2 63 + wave 63 music01 3 music8a 162 - musice2 65 + wave 65 music01 3 music8a 151 - musice2 63 + wave 63 music01 3 music8a 162 - musice2 65 + wave 65 music01 3 music8a 151 - musice2 63 + wave 63 music01 3 music8a 174 - musice2 65 + wave 65 music01 3 music8a 162 - musice2 63 + wave 63 music01 3 music8a 148 - musice2 65 + wave 65 music01 3 music8a 160 - musice2 63 + wave 63 music01 3 music8a 172 - musice2 65 + wave 65 music01 3 music8a 160 - musice2 63 + wave 63 music01 3 music8a 148 - musice2 65 + wave 65 music01 3 music8a 160 - musice2 63 + wave 63 music01 3 music8a 160 - musice2 65 + wave 65 music01 3 music8a 172 - musice2 63 + wave 63 music01 3 music8a 158 - musice2 65 + wave 65 music01 3 music8a 158 - musice2 63 + wave 63 music01 3 music8a 170 - musice2 65 + wave 65 music01 3 music8a 158 - musice2 63 + wave 63 music01 3 music8a 170 - musice2 65 + wave 65 music01 3 music8a 153 - musice2 63 + wave 63 music01 3 music8a 158 - musice2 65 + wave 65 music01 3 music8a 170 - musice2 63 + wave 63 music01 3 music8a 156 - musice2 65 + wave 65 music01 3 music8a 156 - musice2 63 + wave 63 music01 3 music8a 168 - musice2 65 + wave 65 music01 3 music8a 156 - musice2 63 + wave 63 music01 3 music8a 168 - musice2 65 + wave 65 music01 3 music8a 156 - musice2 63 + wave 63 music01 3 music8a 156 - musice2 65 + wave 65 music01 3 music8a 168 - musice2 63 + wave 63 music01 3 music8a 153 - musice2 65 + wave 65 music01 3 music8a 165 - musice2 63 + wave 63 music01 3 music8a 153 - musice2 65 + wave 65 music01 3 music8a 148 - musice2 63 + wave 63 music01 3 music8a 153 - musice2 65 + wave 65 music01 3 music8a 153 - musice2 63 + wave 63 music01 3 music8a 165 - musice2 65 + wave 65 music01 3 music8a 153 - musice2 63 + wave 63 music01 3 music8a 153 - musice2 65 + wave 65 music01 3 music8a 158 - musice2 63 + wave 63 music01 3 music8a 170 - musice2 65 + wave 65 music01 3 music8a 158 - musice2 63 + wave 63 music01 3 music8a 153 - musice2 65 + wave 65 music01 3 music8a 158 - musice2 63 + wave 63 music01 3 music8a 158 - musice2 65 + wave 65 music01 3 music8a 170 - musice2 63 + wave 63 music01 3 music8a 158 - musice2 65 + wave 65 music01 3 music8a 170 - musice2 63 + wave 63 music01 3 music8a 158 - musice2 65 + wave 65 music01 3 music8a 170 - musice2 63 + wave 63 music01 3 music8a 170 - musice2 65 + wave 65 music01 3 music8a 153 - musice2 63 + wave 63 music01 3 music8a 158 - musice2 65 + wave 65 music01 3 music8a 170 - musice2 63 + wave 63 music01 3 music8a 151 - musice2 65 + wave 65 music01 3 music8a 163 - musice2 63 + wave 63 music01 3 music8a 175 - musice2 65 + wave 65 music01 3 music8a 163 - musice2 63 + wave 63 music01 3 music8a 151 - musice2 65 + wave 65 music01 3 music8a 163 - musice2 63 + wave 63 music01 3 music8a 163 - musice2 65 + wave 65 music01 3 music8a 175 - musice2 63 + wave 63 music01 3 music8a 151 - musice2 65 + wave 65 music01 3 music8a 174 - musice2 63 + wave 63 music01 3 music8a 162 - musice2 65 + wave 65 music01 3 music8a 151 - musice2 63 + wave 63 music01 3 music8a 162 - musice2 65 + wave 65 music01 3 music8a 151 - musice2 63 + wave 63 music01 3 music8a 174 - musice2 65 + wave 65 music01 3 music8a 162 - musice2 63 + wave 63 music01 3 music8a 148 - musice2 65 + wave 65 music01 3 music8a 160 - musice2 63 + wave 63 music01 3 music8a 172 - musice2 65 + wave 65 music01 3 music8a 160 - musice2 63 + wave 63 music01 3 music8a 148 - musice2 65 + wave 65 music01 3 music8a 160 - musice2 63 + wave 63 music01 3 music8a 160 - musice2 65 + wave 65 music01 3 music8a 172 - musice2 63 + wave 63 music01 3 music8a 158 - musice2 65 + wave 65 music01 3 music8a 158 - musice2 63 + wave 63 music01 3 music8a 170 - musice2 65 + wave 65 music01 3 music8a 158 - musice2 63 + wave 63 music01 3 music8a 170 - musice2 65 + wave 65 music01 3 music8a 153 - musice2 63 + wave 63 music01 3 music8a 158 - musice2 65 + wave 65 music01 3 music8a 170 - musice2 63 + wave 63 music01 3 music8a 156 - musice2 65 + wave 65 music01 3 music8a 156 - musice2 63 + wave 63 music01 3 music8a 168 - musice2 65 + wave 65 music01 3 music8a 156 - musice2 63 + wave 63 music01 3 music8a 163 - musice2 65 + wave 65 music01 3 music8a 156 - musice2 63 + wave 63 music01 3 music8a 156 - musice2 65 + wave 65 music01 3 music8a 168 - musice2 63 + wave 63 music01 3 music8a 153 - musice2 65 + wave 65 music01 3 music8a 165 - musice2 63 + wave 63 music01 3 music8a 153 - musice2 65 + wave 65 music01 3 music8a 153 - musice2 63 + wave 63 music01 3 music8a 165 - musice2 65 + wave 65 music01 3 music8a 153 - musice2 63 + wave 63 music01 3 music8a 153 - musice2 65 + wave 65 music01 3 music8a 165 - musice2 63 + wave 63 music01 3 music8a 170 - musice2 65 + wave 65 music01 3 music8a 170 - musice2 63 + wave 63 music01 3 music8a 158 - musice2 65 + wave 65 music01 3 music8a 170 - musice2 63 + wave 63 music01 3 music8a 170 - musice2 65 + wave 65 music01 3 music8a 158 - musice2 63 + wave 63 music01 3 music8a 170 - musice2 65 + wave 65 music01 3 music8a 158 - musice2 63 + wave 63 music01 3 music8a 158 - musice2 65 + wave 65 music01 3 music8a 158 - musice2 63 + wave 63 music01 3 music8a 153 - musice2 65 + wave 65 music01 3 music8a 158 - musice2 63 + wave 63 music01 3 music8a 158 - musice2 65 + wave 65 music01 3 music8a 153 - musice2 63 + wave 63 music01 3 music8a 158 - musice2 65 + wave 65 music01 3 music8a 170 music01 3 @@ -1674,52 +1674,52 @@ Music_GoldenrodGym_branch_18455d: ; 18455d (61:455d) music8a 160 music01 3 music8a 172 - musice2 63 + wave 63 music01 3 music8a 153 - musice2 65 + wave 65 music01 3 music8a 158 - musice2 63 + wave 63 music01 3 music8a 170 - musice2 65 + wave 65 music01 3 music8a 158 - musice2 63 + wave 63 music01 3 music8a 153 - musice2 65 + wave 65 music01 3 music8a 158 - musice2 63 + wave 63 music01 3 music8a 158 - musice2 65 + wave 65 music01 3 music8a 170 - musice2 63 + wave 63 music01 3 music8a 158 - musice2 65 + wave 65 music01 3 music8a 158 - musice2 63 + wave 63 music01 3 music8a 170 - musice2 65 + wave 65 music01 3 music8a 158 - musice2 63 + wave 63 music01 3 music8a 170 - musice2 65 + wave 65 music01 3 music8a 158 - musice2 63 + wave 63 music01 3 music8a 158 - musice2 65 + wave 65 music01 3 music8a 170 music01 3 @@ -1754,197 +1754,197 @@ Music_GoldenrodGym_branch_18455d: ; 18455d (61:455d) music8a 163 music01 3 music8a 170 - musice2 63 + wave 63 music01 3 music8a 162 - musice2 65 + wave 65 music01 3 music8a 162 - musice2 63 + wave 63 music01 3 music8a 151 - musice2 65 + wave 65 music01 3 music8a 162 - musice2 63 + wave 63 music01 3 music8a 162 - musice2 65 + wave 65 music01 3 music8a 157 - musice2 63 + wave 63 music01 3 music8a 162 - musice2 65 + wave 65 music01 3 music8a 162 - musice2 63 + wave 63 music01 3 music8a 151 - musice2 65 + wave 65 music01 3 music8a 162 - musice2 63 + wave 63 music01 3 music8a 174 - musice2 65 + wave 65 music01 3 music8a 162 - musice2 63 + wave 63 music01 3 music8a 162 - musice2 65 + wave 65 music01 3 music8a 151 - musice2 63 + wave 63 music01 3 music8a 162 - musice2 65 + wave 65 music01 3 music8a 162 - musice2 63 + wave 63 music01 3 music8a 160 - musice2 65 + wave 65 music01 3 music8a 160 - musice2 63 + wave 63 music01 3 music8a 155 - musice2 65 + wave 65 music01 3 music8a 160 - musice2 63 + wave 63 music01 3 music8a 172 - musice2 65 + wave 65 music01 3 music8a 160 - musice2 63 + wave 63 music01 3 music8a 155 - musice2 65 + wave 65 music01 3 music8a 160 - musice2 63 + wave 63 music01 3 music8a 156 - musice2 65 + wave 65 music01 3 music8a 168 - musice2 63 + wave 63 music01 3 music8a 156 - musice2 65 + wave 65 music01 3 music8a 168 - musice2 63 + wave 63 music01 3 music8a 168 - musice2 65 + wave 65 music01 3 music8a 156 - musice2 63 + wave 63 music01 3 music8a 168 - musice2 65 + wave 65 music01 3 music8a 168 - musice2 63 + wave 63 music01 3 music8a 170 - musice2 65 + wave 65 music01 3 music8a 170 - musice2 63 + wave 63 music01 3 music8a 158 - musice2 65 + wave 65 music01 3 music8a 170 - musice2 63 + wave 63 music01 3 music8a 158 - musice2 65 + wave 65 music01 3 music8a 170 - musice2 63 + wave 63 music01 3 music8a 158 - musice2 65 + wave 65 music01 3 music8a 158 - musice2 63 + wave 63 music01 3 music8a 153 - musice2 65 + wave 65 music01 3 music8a 158 - musice2 63 + wave 63 music01 3 musicd2 - musice2 65 + wave 65 music8a 158 - musice2 63 + wave 63 music01 3 music8a 158 - musice2 65 + wave 65 music01 3 music8a 170 - musice2 63 + wave 63 music01 3 music8a 158 - musice2 65 + wave 65 music01 3 music8a 158 - musice2 63 + wave 63 music01 6 musicd2 - musice2 65 + wave 65 music01 3 music8a 158 - musice2 63 + wave 63 music01 9 musicd2 - musice2 65 + wave 65 music01 3 music8a 158 - musice2 63 + wave 63 music01 9 musicd2 - musice2 65 + wave 65 music01 3 music8a 158 - musice2 63 + wave 63 music01 9 musicd2 - musice2 65 + wave 65 music01 3 music8a 165 music01 3 music8a 158 - musice2 63 + wave 63 music01 6 musicd2 - musice2 65 + wave 65 music01 9 music8a 151 - musice2 63 + wave 63 music01 3 musicd2 - musice2 65 + wave 65 music01 9 music8a 151 - musice2 63 + wave 63 music01 3 musicd2 - musice2 65 + wave 65 music01 9 music8a 151 - musice2 63 + wave 63 music01 3 musicd2 - musice2 65 + wave 65 music01 6 music8a 151 music01 3 @@ -2084,10 +2084,10 @@ Music_GoldenrodGym_branch_18455d: ; 18455d (61:455d) music8a 151 music01 45 musicd2 - musiced + song_ret Music_GoldenrodGym_Ch4: ; 184996 (61:4996) - musicdd + stereo_panning_both music01 3 music6d 120 music01 3 @@ -2976,4 +2976,4 @@ Music_GoldenrodGym_branch_184a24: ; 184a24 (61:4a24) musicd2 music01 48 musicd2 - musice7 Music_GoldenrodGym_branch_184a24 + song_jump Music_GoldenrodGym_branch_184a24 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 diff --git a/src/audio/music/gymvictory.asm b/src/audio/music/gymvictory.asm index e234a5d..3791553 100644 --- a/src/audio/music/gymvictory.asm +++ b/src/audio/music/gymvictory.asm @@ -5,15 +5,15 @@ Music_GymVictory: ; 188be2 (62:4be2) dw $0000 Music_GymVictory_Ch1: ; 188bea (62:4bea) - musicda 119 - musice6 115 - musicdd + volume 119 + volume_envelope 115 + stereo_panning_both musicd6 14 musicd7 0 - musice0 + duty_cycle_50 musicd4 55 musicd8 132 - musice0 + duty_cycle_50 musicd4 55 musicd8 209 music01 3 @@ -80,16 +80,16 @@ Music_GymVictory_Ch1: ; 188bea (62:4bea) musicd8 233 music01 8 music8a 195 - music00 + song_end Music_GymVictory_Ch2: ; 188c44 (62:4c44) - musicda 119 - musice6 115 - musicdd + volume 119 + volume_envelope 115 + stereo_panning_both musicd4 55 musicd8 129 musicd4 55 - musice0 + duty_cycle_50 musice3 2 music01 2 music8a 169 @@ -155,12 +155,12 @@ Music_GymVictory_Ch2: ; 188c44 (62:4c44) musice3 255 music01 24 music8a 183 - music00 + song_end Music_GymVictory_Ch3: ; 188c97 (62:4c97) - musicdd + stereo_panning_both musice3 1 - musice2 60 + wave 60 music01 3 musicd2 musicd8 103 @@ -225,5 +225,5 @@ Music_GymVictory_Ch3: ; 188c97 (62:4c97) musicd2 music01 16 musicd2 - music00 - music00 + song_end + song_end diff --git a/src/audio/music/herecomeslance.asm b/src/audio/music/herecomeslance.asm index e9a9c8f..75bae1a 100644 --- a/src/audio/music/herecomeslance.asm +++ b/src/audio/music/herecomeslance.asm @@ -5,16 +5,16 @@ Music_HereComesLance: ; 18ebd0 (63:6bd0) dw Music_HereComesLance_Ch4 Music_HereComesLance_Ch1: ; 18ebd8 (63:6bd8) - musicda 119 - musice6 115 - musicdd + volume 119 + volume_envelope 115 + stereo_panning_both musicd6 13 - musicde + duty_cycle_12_5 musice3 0 musicd4 55 Music_HereComesLance_branch_18ebe4: ; 18ebe4 (63:6be4) - musicec Music_HereComesLance_branch_18ebea - musice7 Music_HereComesLance_branch_18ebe4 + song_call Music_HereComesLance_branch_18ebea + song_jump Music_HereComesLance_branch_18ebe4 Music_HereComesLance_branch_18ebea: ; 18ebea (63:6bea) musicd8 36 @@ -151,19 +151,19 @@ Music_HereComesLance_branch_18ebea: ; 18ebea (63:6bea) music8a 172 music01 3 music8a 169 - musiced + song_ret Music_HereComesLance_Ch2: ; 18ec77 (63:6c77) - musicda 119 - musice6 115 - musicdd + volume 119 + volume_envelope 115 + stereo_panning_both musicd4 55 Music_HereComesLance_branch_18ec7e: ; 18ec7e (63:6c7e) - musicec Music_HereComesLance_branch_18ec84 - musice7 Music_HereComesLance_branch_18ec7e + song_call Music_HereComesLance_branch_18ec84 + song_jump Music_HereComesLance_branch_18ec7e Music_HereComesLance_branch_18ec84: ; 18ec84 (63:6c84) - musice0 + duty_cycle_50 musicd8 123 music01 45 music8a 188 @@ -181,49 +181,49 @@ Music_HereComesLance_branch_18ec84: ; 18ec84 (63:6c84) music8a 184 music01 12 musicd3 - musiced + song_ret Music_HereComesLance_Ch3: ; 18ec98 (63:6c98) - musicdd + stereo_panning_both musicd4 35 - musice2 65 + wave 65 musicd8 27 Music_HereComesLance_branch_18ec9f: ; 18ec9f (63:6c9f) - musicec Music_HereComesLance_branch_18eca5 - musice7 Music_HereComesLance_branch_18ec9f + song_call Music_HereComesLance_branch_18eca5 + song_jump Music_HereComesLance_branch_18ec9f Music_HereComesLance_branch_18eca5: ; 18eca5 (63:6ca5) - musice2 66 + wave 66 musicd4 59 music01 45 music8a 180 music01 3 musicd3 - musice2 67 + wave 67 musicd4 56 music01 45 music8a 174 music01 3 musicd3 - musice2 66 + wave 66 musicd4 59 music01 45 music8a 181 music01 3 musicd3 - musice2 63 + wave 63 musicd4 56 music01 36 music8a 178 music01 12 musicd3 - musiced + song_ret Music_HereComesLance_Ch4: ; 18ecc6 (63:6cc6) - musicdd + stereo_panning_both Music_HereComesLance_branch_18ecc7: ; 18ecc7 (63:6cc7) - musicec Music_HereComesLance_branch_18eccd - musice7 Music_HereComesLance_branch_18ecc7 + song_call Music_HereComesLance_branch_18eccd + song_jump Music_HereComesLance_branch_18ecc7 Music_HereComesLance_branch_18eccd: ; 18eccd (63:6ccd) music01 3 @@ -327,4 +327,4 @@ Music_HereComesLance_branch_18eccd: ; 18eccd (63:6ccd) music6d 127 music01 3 music6d 127 - musiced + song_ret diff --git a/src/audio/music/herecomestheelitefour.asm b/src/audio/music/herecomestheelitefour.asm index 078ac12..4c161d8 100644 --- a/src/audio/music/herecomestheelitefour.asm +++ b/src/audio/music/herecomestheelitefour.asm @@ -5,19 +5,19 @@ Music_HereComesTheEliteFour: ; 18c8d7 (63:48d7) dw Music_HereComesTheEliteFour_Ch4 Music_HereComesTheEliteFour_Ch1: ; 18c8df (63:48df) - musicda 119 - musice6 115 - musicdd + volume 119 + volume_envelope 115 + stereo_panning_both musicd6 15 musicd4 37 - musice0 + duty_cycle_50 musice3 255 musicd2 music01 3 musicd4 55 Music_HereComesTheEliteFour_branch_18c8ef: ; 18c8ef (63:48ef) - musicec Music_HereComesTheEliteFour_branch_18c8f5 - musice7 Music_HereComesTheEliteFour_branch_18c8ef + song_call Music_HereComesTheEliteFour_branch_18c8f5 + song_jump Music_HereComesTheEliteFour_branch_18c8ef Music_HereComesTheEliteFour_branch_18c8f5: ; 18c8f5 (63:48f5) musicd8 136 @@ -142,17 +142,17 @@ Music_HereComesTheEliteFour_branch_18c8f5: ; 18c8f5 (63:48f5) music8a 194 music01 6 musicd3 - musiced + song_ret Music_HereComesTheEliteFour_Ch2: ; 18c97d (63:497d) - musicda 119 - musice6 115 - musicdd - musice1 + volume 119 + volume_envelope 115 + stereo_panning_both + duty_cycle_75 musicd4 55 Music_HereComesTheEliteFour_branch_18c985: ; 18c985 (63:4985) - musicec Music_HereComesTheEliteFour_branch_18c98b - musice7 Music_HereComesTheEliteFour_branch_18c985 + song_call Music_HereComesTheEliteFour_branch_18c98b + song_jump Music_HereComesTheEliteFour_branch_18c985 Music_HereComesTheEliteFour_branch_18c98b: ; 18c98b (63:498b) musicd8 49 @@ -185,17 +185,17 @@ Music_HereComesTheEliteFour_branch_18c98b: ; 18c98b (63:498b) musicd2 music01 48 musicd2 - musiced + song_ret Music_HereComesTheEliteFour_Ch3: ; 18c9ac (63:49ac) - musicdd + stereo_panning_both musicd4 35 musicd7 12 - musice2 7 + wave 7 musicd8 104 Music_HereComesTheEliteFour_branch_18c9b5: ; 18c9b5 (63:49b5) - musicec Music_HereComesTheEliteFour_branch_18c9bb - musice7 Music_HereComesTheEliteFour_branch_18c9b5 + song_call Music_HereComesTheEliteFour_branch_18c9bb + song_jump Music_HereComesTheEliteFour_branch_18c9b5 Music_HereComesTheEliteFour_branch_18c9bb: ; 18c9bb (63:49bb) music01 6 @@ -307,13 +307,13 @@ Music_HereComesTheEliteFour_branch_18c9bb: ; 18c9bb (63:49bb) music8a 194 music01 6 musicd2 - musiced + song_ret Music_HereComesTheEliteFour_Ch4: ; 18ca29 (63:4a29) - musicdd + stereo_panning_both Music_HereComesTheEliteFour_branch_18ca2a: ; 18ca2a (63:4a2a) - musicec Music_HereComesTheEliteFour_branch_18ca30 - musice7 Music_HereComesTheEliteFour_branch_18ca2a + song_call Music_HereComesTheEliteFour_branch_18ca30 + song_jump Music_HereComesTheEliteFour_branch_18ca2a Music_HereComesTheEliteFour_branch_18ca30: ; 18ca30 (63:4a30) music01 3 @@ -426,4 +426,4 @@ Music_HereComesTheEliteFour_branch_18ca30: ; 18ca30 (63:4a30) music6d 122 music01 3 music6d 123 - musiced + song_ret diff --git a/src/audio/music/intro.asm b/src/audio/music/intro.asm index 5177457..f7cd5a8 100644 --- a/src/audio/music/intro.asm +++ b/src/audio/music/intro.asm @@ -5,32 +5,32 @@ Music_Intro: ; 18a980 (62:6980) dw Music_Intro_Ch4 Music_Intro_Ch1: ; 18a988 (62:6988) - musicda 119 - musice6 115 - musicdd - musice1 + volume 119 + volume_envelope 115 + stereo_panning_both + duty_cycle_75 musicd4 55 - musicde + duty_cycle_12_5 musicd4 55 musicd8 36 musicd6 17 - musicec Music_Intro_branch_18a9be - musicec Music_Intro_branch_18aa2e + song_call Music_Intro_branch_18a9be + song_call Music_Intro_branch_18aa2e musice3 2 - musicec Music_Intro_branch_18aa50 - musicec Music_Intro_branch_18aa61 + song_call Music_Intro_branch_18aa50 + song_call Music_Intro_branch_18aa61 musicd6 7 - musicec Music_Intro_branch_18aa74 + song_call Music_Intro_branch_18aa74 musicd6 5 - musicec Music_Intro_branch_18aa83 + song_call Music_Intro_branch_18aa83 music01 13 musicd3 musicd6 13 - musicec Music_Intro_branch_18aa87 + song_call Music_Intro_branch_18aa87 Music_Intro_branch_18a9b6: ; 18a9b6 (62:69b6) musice3 0 - musicec Music_Intro_branch_18ab74 - musice7 Music_Intro_branch_18a9b6 + song_call Music_Intro_branch_18ab74 + song_jump Music_Intro_branch_18a9b6 Music_Intro_branch_18a9be: ; 18a9be (62:69be) music01 48 @@ -41,7 +41,7 @@ Music_Intro_branch_18a9be: ; 18a9be (62:69be) musicd2 music01 24 musicd2 - musice0 + duty_cycle_50 musicd4 52 musicd8 209 musicd8 224 @@ -63,7 +63,7 @@ Music_Intro_branch_18a9be: ; 18a9be (62:69be) music01 6 musicd2 musicd4 55 - musicde + duty_cycle_12_5 musicd8 39 music01 6 music8a 176 @@ -96,7 +96,7 @@ Music_Intro_branch_18a9be: ; 18a9be (62:69be) music8a 176 music01 48 musicd2 - musice0 + duty_cycle_50 musicd4 52 musicd8 224 music01 6 @@ -130,12 +130,12 @@ Music_Intro_branch_18a9be: ; 18a9be (62:69be) musicd8 219 music01 3 music8a 155 - musiced + song_ret Music_Intro_branch_18aa2e: ; 18aa2e (62:6a2e) musicd4 55 musicd8 36 - musicde + duty_cycle_12_5 music01 6 music8a 176 music01 6 @@ -164,7 +164,7 @@ Music_Intro_branch_18aa2e: ; 18aa2e (62:6a2e) music8a 181 music01 6 music8a 176 - musiced + song_ret Music_Intro_branch_18aa50: ; 18aa50 (62:6a50) music01 6 @@ -183,7 +183,7 @@ Music_Intro_branch_18aa50: ; 18aa50 (62:6a50) music8a 183 music01 6 music8a 181 - musiced + song_ret Music_Intro_branch_18aa61: ; 18aa61 (62:6a61) musice3 0 @@ -203,7 +203,7 @@ Music_Intro_branch_18aa61: ; 18aa61 (62:6a61) music8a 181 music01 3 music8a 200 - musiced + song_ret Music_Intro_branch_18aa74: ; 18aa74 (62:6a74) music01 3 @@ -220,21 +220,21 @@ Music_Intro_branch_18aa74: ; 18aa74 (62:6a74) music8a 188 music01 3 music8a 193 - musiced + song_ret Music_Intro_branch_18aa83: ; 18aa83 (62:6a83) music01 3 music8a 188 - musiced + song_ret ; unreferenced ? Music_Intro_branch_18aa86: ; 18a988 (62:6988) - musiced + song_ret Music_Intro_branch_18aa87: ; 18aa87 (62:6a87) musicd5 musicd8 204 - musicde + duty_cycle_12_5 music01 1 music8a 183 musicd8 202 @@ -376,7 +376,7 @@ Music_Intro_branch_18aa87: ; 18aa87 (62:6a87) musicd8 203 music01 1 music8a 193 - musice0 + duty_cycle_50 musicd4 52 musicd8 224 music01 6 @@ -415,10 +415,10 @@ Music_Intro_branch_18aa87: ; 18aa87 (62:6a87) musicd5 music01 1 musicd2 - musiced + song_ret Music_Intro_branch_18ab74: ; 18ab74 (62:6b74) - musicde + duty_cycle_12_5 musicd4 55 musicd8 36 music01 3 @@ -525,7 +525,7 @@ Music_Intro_branch_18ab74: ; 18ab74 (62:6b74) music8a 164 music01 3 music8a 169 - musice0 + duty_cycle_50 musicd4 52 musicd8 224 music01 3 @@ -537,7 +537,7 @@ Music_Intro_branch_18ab74: ; 18ab74 (62:6b74) musicd8 219 music01 3 music8a 152 - musicde + duty_cycle_12_5 musicd4 55 musicd8 36 music8a 157 @@ -643,7 +643,7 @@ Music_Intro_branch_18ab74: ; 18ab74 (62:6b74) music8a 164 music01 3 music8a 169 - musice0 + duty_cycle_50 musicd4 52 musicd8 224 music01 3 @@ -654,7 +654,7 @@ Music_Intro_branch_18ab74: ; 18ab74 (62:6b74) music8a 159 music01 3 music8a 155 - musicde + duty_cycle_12_5 musicd4 55 musicd8 36 music8a 157 @@ -796,7 +796,7 @@ Music_Intro_branch_18ab74: ; 18ab74 (62:6b74) music8a 193 music01 3 musicd2 - musice0 + duty_cycle_50 musicd4 52 musicd8 224 music01 3 @@ -808,28 +808,28 @@ Music_Intro_branch_18ab74: ; 18ab74 (62:6b74) musicd8 219 music01 3 music8a 155 - musiced + song_ret Music_Intro_Ch2: ; 18ad09 (62:6d09) - musicda 119 - musice6 115 - musicdd + volume 119 + volume_envelope 115 + stereo_panning_both musice3 255 - musicec Music_Intro_branch_18af8a - musicec Music_Intro_branch_18b12d + song_call Music_Intro_branch_18af8a + song_call Music_Intro_branch_18b12d music01 13 musicd3 musice3 0 - musicec Music_Intro_branch_18ad23 + song_call Music_Intro_branch_18ad23 Music_Intro_branch_18ad1d: ; 18ad1d (62:6d1d) - musicec Music_Intro_branch_18ae8d - musice7 Music_Intro_branch_18ad1d + song_call Music_Intro_branch_18ae8d + song_jump Music_Intro_branch_18ad1d Music_Intro_branch_18ad23: ; 18ad23 (62:6d23) music01 6 musicd2 musicd8 202 - musicde + duty_cycle_12_5 music01 1 music8a 176 musicd8 201 @@ -1098,10 +1098,10 @@ Music_Intro_branch_18ad23: ; 18ad23 (62:6d23) musicd8 203 music01 1 music8a 181 - musiced + song_ret Music_Intro_branch_18ae8d: ; 18ae8d (62:6e8d) - musice0 + duty_cycle_50 music01 12 musicd2 musicd4 59 @@ -1320,7 +1320,7 @@ Music_Intro_branch_18ae8d: ; 18ae8d (62:6e8d) music8a 197 music01 3 musicd2 - musiced + song_ret Music_Intro_branch_18af8a: ; 18af8a (62:6f8a) musicd4 52 @@ -1510,7 +1510,7 @@ Music_Intro_branch_18af8a: ; 18af8a (62:6f8a) music8a 181 music01 3 musicd2 - musiced + song_ret ; unreferenced ? Music_Intro_branch_18b059: ; 18ad09 (62:6d09) @@ -1701,10 +1701,10 @@ Music_Intro_branch_18b059: ; 18ad09 (62:6d09) music8a 181 music01 3 musicd2 - musiced + song_ret Music_Intro_branch_18b12d: ; 18b12d (62:712d) - musice1 + duty_cycle_75 musice3 0 musicd8 36 music01 6 @@ -1768,11 +1768,11 @@ Music_Intro_branch_18b12d: ; 18b12d (62:712d) music01 6 music8a 188 musice3 0 - musiced + song_ret ; unreferenced ? Music_Intro_branch_18b171: ; 18ad09 (62:6d09) - musiced + song_ret ; unreferenced ? Music_Intro_branch_18b172: ; 18ad09 (62:6d09) @@ -1800,7 +1800,7 @@ Music_Intro_branch_18b172: ; 18ad09 (62:6d09) music8a 178 music01 3 musicd3 - musiced + song_ret ; unreferenced ? Music_Intro_branch_18b18b: ; 18ad09 (62:6d09) @@ -1960,7 +1960,7 @@ Music_Intro_branch_18b18b: ; 18ad09 (62:6d09) musicd2 music01 12 music8a 176 - musiced + song_ret ; unreferenced ? Music_Intro_branch_18b228: ; 18ad09 (62:6d09) @@ -2127,71 +2127,71 @@ Music_Intro_branch_18b228: ; 18ad09 (62:6d09) music8a 185 music01 6 music8a 186 - musiced + song_ret Music_Intro_Ch3: ; 18b2cc (62:72cc) - musicdd + stereo_panning_both musicd8 27 - musice2 72 + wave 72 musicd7 12 - musicec Music_Intro_branch_18b4b8 - musicec Music_Intro_branch_18b4f9 - musicec Music_Intro_branch_18b4b8 - musicec Music_Intro_branch_18b4f9 - musicec Music_Intro_branch_18b4b8 - musicec Music_Intro_branch_18b4f9 - musicec Music_Intro_branch_18b4b8 - musicec Music_Intro_branch_18b4f9 + song_call Music_Intro_branch_18b4b8 + song_call Music_Intro_branch_18b4f9 + song_call Music_Intro_branch_18b4b8 + song_call Music_Intro_branch_18b4f9 + song_call Music_Intro_branch_18b4b8 + song_call Music_Intro_branch_18b4f9 + song_call Music_Intro_branch_18b4b8 + song_call Music_Intro_branch_18b4f9 musicd7 12 musice3 0 - musice2 7 + wave 7 musicd8 104 - musicec Music_Intro_branch_18b53a + song_call Music_Intro_branch_18b53a music01 13 musicd2 musicd8 104 musicd7 24 - musicec Music_Intro_branch_18b305 + song_call Music_Intro_branch_18b305 Music_Intro_branch_18b2ff: ; 18b2ff (62:72ff) - musicec Music_Intro_branch_18b358 - musice7 Music_Intro_branch_18b2ff + song_call Music_Intro_branch_18b358 + song_jump Music_Intro_branch_18b2ff Music_Intro_branch_18b305: ; 18b305 (62:7305) music01 3 music8a 152 music01 3 music8a 157 - musice2 71 + wave 71 music01 3 music8a 161 music01 3 music8a 162 - musice2 70 + wave 70 music01 3 music8a 152 music01 3 music8a 157 - musice2 69 + wave 69 music01 3 music8a 161 music01 3 music8a 162 - musice2 68 + wave 68 music01 3 music8a 152 music01 3 music8a 157 - musice2 67 + wave 67 music01 3 music8a 161 music01 3 music8a 162 - musice2 66 + wave 66 music01 3 music8a 152 music01 3 music8a 157 - musice2 65 + wave 65 music01 3 music8a 161 music01 3 @@ -2200,7 +2200,7 @@ Music_Intro_branch_18b305: ; 18b305 (62:7305) music8a 152 music01 3 music8a 157 - musice2 64 + wave 64 music01 3 music8a 161 music01 3 @@ -2219,7 +2219,7 @@ Music_Intro_branch_18b305: ; 18b305 (62:7305) music8a 157 music01 3 music8a 161 - musice2 63 + wave 63 music01 3 music8a 162 music01 3 @@ -2230,13 +2230,13 @@ Music_Intro_branch_18b305: ; 18b305 (62:7305) music8a 161 music01 3 music8a 162 - musiced + song_ret Music_Intro_branch_18b358: ; 18b358 (62:7358) musice3 0 musicd7 12 musicd8 27 - musice2 62 + wave 62 music01 3 music8a 145 music01 3 @@ -2365,7 +2365,7 @@ Music_Intro_branch_18b358: ; 18b358 (62:7358) music8a 150 music01 6 musicd2 - musice2 7 + wave 7 musicd8 104 music01 3 music8a 169 @@ -2394,7 +2394,7 @@ Music_Intro_branch_18b358: ; 18b358 (62:7358) music8a 164 music01 3 musicd2 - musice2 62 + wave 62 musicd8 27 music01 6 music8a 150 @@ -2467,7 +2467,7 @@ Music_Intro_branch_18b358: ; 18b358 (62:7358) music8a 157 music01 3 musicd2 - musice2 7 + wave 7 musicd8 104 music8a 171 music01 3 @@ -2574,109 +2574,109 @@ Music_Intro_branch_18b358: ; 18b358 (62:7358) music8a 183 music01 3 musicd2 - musiced + song_ret Music_Intro_branch_18b4b8: ; 18b4b8 (62:74b8) - musice2 66 + wave 66 music01 3 music8a 145 - musice2 72 + wave 72 music01 3 music8a 145 - musice2 65 + wave 65 music01 3 music8a 145 - musice2 72 + wave 72 music01 3 music8a 145 - musice2 64 + wave 64 music01 3 music8a 145 - musice2 71 + wave 71 music01 3 music8a 145 - musice2 63 + wave 63 music01 3 music8a 145 - musice2 70 + wave 70 music01 3 music8a 145 - musice2 62 + wave 62 music01 3 music8a 145 - musice2 69 + wave 69 music01 3 music8a 145 - musice2 61 + wave 61 music01 3 music8a 145 - musice2 69 + wave 69 music01 3 music8a 145 - musice2 60 + wave 60 music01 3 music8a 145 - musice2 68 + wave 68 music01 3 music8a 145 - musice2 59 + wave 59 music01 3 music8a 145 - musice2 68 + wave 68 music01 3 music8a 145 - musiced + song_ret Music_Intro_branch_18b4f9: ; 18b4f9 (62:74f9) - musice2 59 + wave 59 music01 3 music8a 145 - musice2 72 + wave 72 music01 3 music8a 145 - musice2 60 + wave 60 music01 3 music8a 145 - musice2 72 + wave 72 music01 3 music8a 145 - musice2 61 + wave 61 music01 3 music8a 145 - musice2 71 + wave 71 music01 3 music8a 145 - musice2 62 + wave 62 music01 3 music8a 145 - musice2 70 + wave 70 music01 3 music8a 145 - musice2 63 + wave 63 music01 3 music8a 145 - musice2 69 + wave 69 music01 3 music8a 145 - musice2 63 + wave 63 music01 3 music8a 145 - musice2 69 + wave 69 music01 3 music8a 145 - musice2 63 + wave 63 music01 3 music8a 145 - musice2 68 + wave 68 music01 3 music8a 145 - musice2 67 + wave 67 music01 3 music8a 145 - musice2 68 + wave 68 music01 3 music8a 145 - musiced + song_ret Music_Intro_branch_18b53a: ; 18b53a (62:753a) musicd8 103 @@ -2757,11 +2757,11 @@ Music_Intro_branch_18b53a: ; 18b53a (62:753a) music8a 181 music01 3 music8a 188 - musiced + song_ret ; unreferenced ? Music_Intro_branch_18b58b: ; 18b2cc (62:72cc) - musiced + song_ret ; unreferenced ? Music_Intro_branch_18b58c: ; 18b2cc (62:72cc) @@ -2829,7 +2829,7 @@ Music_Intro_branch_18b58c: ; 18b2cc (62:72cc) music8a 193 music01 6 music8a 162 - musiced + song_ret ; unreferenced ? Music_Intro_branch_18b5cd: ; 18b2cc (62:72cc) @@ -2998,7 +2998,7 @@ Music_Intro_branch_18b5cd: ; 18b2cc (62:72cc) music8a 152 music01 6 music8a 152 - musiced + song_ret ; unreferenced ? Music_Intro_branch_18b673: ; 18b2cc (62:72cc) @@ -3220,19 +3220,19 @@ Music_Intro_branch_18b673: ; 18b2cc (62:72cc) music8a 145 music01 3 musicd2 - musiced + song_ret Music_Intro_Ch4: ; 18b74e (62:774e) - musicdd - musicec Music_Intro_branch_18b94f - musicec Music_Intro_branch_18b9d3 + stereo_panning_both + song_call Music_Intro_branch_18b94f + song_call Music_Intro_branch_18b9d3 music01 13 musicd2 - musicec Music_Intro_branch_18b762 + song_call Music_Intro_branch_18b762 Music_Intro_branch_18b75a: ; 18b75a (62:775a) musicd6 13 - musicec Music_Intro_branch_18b78e - musice7 Music_Intro_branch_18b75a + song_call Music_Intro_branch_18b78e + song_jump Music_Intro_branch_18b75a Music_Intro_branch_18b762: ; 18b762 (62:7762) music01 3 @@ -3278,7 +3278,7 @@ Music_Intro_branch_18b762: ; 18b762 (62:7762) music6d 127 music01 3 music6d 127 - musiced + song_ret Music_Intro_branch_18b78e: ; 18b78e (62:778e) music01 3 @@ -3729,7 +3729,7 @@ Music_Intro_branch_18b78e: ; 18b78e (62:778e) music6d 112 music01 3 music6d 127 - musiced + song_ret Music_Intro_branch_18b94f: ; 18b94f (62:794f) music01 6 @@ -3863,7 +3863,7 @@ Music_Intro_branch_18b94f: ; 18b94f (62:794f) music6d 127 music01 3 music6d 127 - musiced + song_ret Music_Intro_branch_18b9d3: ; 18b9d3 (62:79d3) music01 6 @@ -3888,4 +3888,4 @@ Music_Intro_branch_18b9d3: ; 18b9d3 (62:79d3) music6d 112 music01 42 musicd3 - musiced + song_ret diff --git a/src/audio/music/lance.asm b/src/audio/music/lance.asm index e4cab79..1ed9c06 100644 --- a/src/audio/music/lance.asm +++ b/src/audio/music/lance.asm @@ -5,35 +5,35 @@ Music_Lance: ; 189d83 (62:5d83) dw Music_Lance_Ch4 Music_Lance_Ch1: ; 189d8b (62:5d8b) - musicda 119 - musice6 115 - musicdd + volume 119 + volume_envelope 115 + stereo_panning_both musicd6 15 musicd7 0 - musice1 + duty_cycle_75 musice3 2 musicd4 55 - musicde + duty_cycle_12_5 musicd4 55 music01 12 musicd2 Music_Lance_branch_189d9e: ; 189d9e (62:5d9e) musicd8 180 - musicec Music_Lance_branch_189dc1 - musicec Music_Lance_branch_189dbe - musicec Music_Lance_branch_189dbe - musicec Music_Lance_branch_189dbe - musicec Music_Lance_branch_189dbe - musicec Music_Lance_branch_189dc1 - musicec Music_Lance_branch_189dbe - musicec Music_Lance_branch_189dbe - musicec Music_Lance_branch_189ea2 - musice7 Music_Lance_branch_189d9e + song_call Music_Lance_branch_189dc1 + song_call Music_Lance_branch_189dbe + song_call Music_Lance_branch_189dbe + song_call Music_Lance_branch_189dbe + song_call Music_Lance_branch_189dbe + song_call Music_Lance_branch_189dc1 + song_call Music_Lance_branch_189dbe + song_call Music_Lance_branch_189dbe + song_call Music_Lance_branch_189ea2 + song_jump Music_Lance_branch_189d9e Music_Lance_branch_189dbe: ; 189dbe (62:5dbe) music01 48 musicd2 - musiced + song_ret Music_Lance_branch_189dc1: ; 189dc1 (62:5dc1) music01 6 @@ -251,7 +251,7 @@ Music_Lance_branch_189dc1: ; 189dc1 (62:5dc1) music8a 163 music01 6 music8a 165 - musiced + song_ret Music_Lance_branch_189ea2: ; 189ea2 (62:5ea2) music01 15 @@ -516,15 +516,15 @@ Music_Lance_branch_189ea2: ; 189ea2 (62:5ea2) musicd2 music01 48 musicd2 - musiced + song_ret Music_Lance_Ch2: ; 189fb3 (62:5fb3) - musicda 119 - musice6 115 - musicdd + volume 119 + volume_envelope 115 + stereo_panning_both musicd4 55 musicd7 0 - musice0 + duty_cycle_50 musicd4 55 musicd8 180 music01 3 @@ -538,16 +538,16 @@ Music_Lance_Ch2: ; 189fb3 (62:5fb3) Music_Lance_branch_189fc9: ; 189fc9 (62:5fc9) musicd4 55 musicd8 180 - musicec Music_Lance_branch_189fdf - musicec Music_Lance_branch_18a0b6 - musicec Music_Lance_branch_189fdf - musicec Music_Lance_branch_18a0ca - musicec Music_Lance_branch_18a0b6 - musice7 Music_Lance_branch_189fc9 + song_call Music_Lance_branch_189fdf + song_call Music_Lance_branch_18a0b6 + song_call Music_Lance_branch_189fdf + song_call Music_Lance_branch_18a0ca + song_call Music_Lance_branch_18a0b6 + song_jump Music_Lance_branch_189fc9 Music_Lance_branch_189fdf: ; 189fdf (62:5fdf) musicd4 55 - musice0 + duty_cycle_50 music01 6 music8a 177 music01 3 @@ -745,7 +745,7 @@ Music_Lance_branch_189fdf: ; 189fdf (62:5fdf) music8a 168 music01 6 music8a 170 - musiced + song_ret Music_Lance_branch_18a0b6: ; 18a0b6 (62:60b6) music01 48 @@ -754,7 +754,7 @@ Music_Lance_branch_18a0b6: ; 18a0b6 (62:60b6) musicd2 music01 48 musicd2 - musice0 + duty_cycle_50 music01 36 musicd2 musicd4 55 @@ -766,10 +766,10 @@ Music_Lance_branch_18a0b6: ; 18a0b6 (62:60b6) music8a 174 music01 3 music8a 175 - musiced + song_ret Music_Lance_branch_18a0ca: ; 18a0ca (62:60ca) - musice1 + duty_cycle_75 musicd4 55 musicd8 180 music01 3 @@ -831,7 +831,7 @@ Music_Lance_branch_18a0ca: ; 18a0ca (62:60ca) music01 3 music8a 175 musicd8 182 - musice0 + duty_cycle_50 music01 15 music8a 172 music01 3 @@ -857,7 +857,7 @@ Music_Lance_branch_18a0ca: ; 18a0ca (62:60ca) music8a 176 music01 6 musicd2 - musice1 + duty_cycle_75 musicd8 179 music8a 189 music01 6 @@ -893,7 +893,7 @@ Music_Lance_branch_18a0ca: ; 18a0ca (62:60ca) music8a 186 musicd8 182 musicd4 55 - musice0 + duty_cycle_50 music01 15 music8a 174 music01 3 @@ -918,7 +918,7 @@ Music_Lance_branch_18a0ca: ; 18a0ca (62:60ca) music8a 178 music01 6 musicd2 - musice0 + duty_cycle_50 musicd8 180 music01 6 musicd2 @@ -997,7 +997,7 @@ Music_Lance_branch_18a0ca: ; 18a0ca (62:60ca) musicd2 musicd4 55 musicd8 223 - musicde + duty_cycle_12_5 music01 3 musicd2 music01 3 @@ -1131,27 +1131,27 @@ Music_Lance_branch_18a0ca: ; 18a0ca (62:60ca) music8a 163 music01 6 music8a 165 - musiced + song_ret Music_Lance_Ch3: ; 18a25d (62:625d) - musicdd + stereo_panning_both musice3 255 musicd8 27 - musice2 64 + wave 64 musicd7 12 musicd4 55 music01 12 musicd2 Music_Lance_branch_18a26a: ; 18a26a (62:626a) - musicec Music_Lance_branch_18a285 - musicec Music_Lance_branch_18a285 - musicec Music_Lance_branch_18a2d4 - musicec Music_Lance_branch_18a285 - musicec Music_Lance_branch_18a285 - musicec Music_Lance_branch_18a31f - musicec Music_Lance_branch_18a285 - musicec Music_Lance_branch_18a2d4 - musice7 Music_Lance_branch_18a26a + song_call Music_Lance_branch_18a285 + song_call Music_Lance_branch_18a285 + song_call Music_Lance_branch_18a2d4 + song_call Music_Lance_branch_18a285 + song_call Music_Lance_branch_18a285 + song_call Music_Lance_branch_18a31f + song_call Music_Lance_branch_18a285 + song_call Music_Lance_branch_18a2d4 + song_jump Music_Lance_branch_18a26a Music_Lance_branch_18a285: ; 18a285 (62:6285) music01 6 @@ -1232,7 +1232,7 @@ Music_Lance_branch_18a285: ; 18a285 (62:6285) music8a 144 music01 6 music8a 146 - musiced + song_ret Music_Lance_branch_18a2d4: ; 18a2d4 (62:62d4) music01 6 @@ -1309,7 +1309,7 @@ Music_Lance_branch_18a2d4: ; 18a2d4 (62:62d4) music8a 142 music01 3 musicd2 - musiced + song_ret Music_Lance_branch_18a31f: ; 18a31f (62:631f) music01 6 @@ -1613,10 +1613,10 @@ Music_Lance_branch_18a31f: ; 18a31f (62:631f) music8a 148 music01 1 musicd2 - musiced + song_ret Music_Lance_Ch4: ; 18a44d (62:644d) - musicdd + stereo_panning_both music01 3 music6d 126 music01 3 @@ -1626,8 +1626,8 @@ Music_Lance_Ch4: ; 18a44d (62:644d) music01 3 musicd3 Music_Lance_branch_18a456: ; 18a456 (62:6456) - musicec Music_Lance_branch_18a45c - musice7 Music_Lance_branch_18a456 + song_call Music_Lance_branch_18a45c + song_jump Music_Lance_branch_18a456 Music_Lance_branch_18a45c: ; 18a45c (62:645c) music01 3 @@ -2675,4 +2675,4 @@ Music_Lance_branch_18a45c: ; 18a45c (62:645c) music6d 127 music01 3 music6d 127 - musiced + song_ret diff --git a/src/audio/music/lancedanger.asm b/src/audio/music/lancedanger.asm index 8858c07..cbb6da3 100644 --- a/src/audio/music/lancedanger.asm +++ b/src/audio/music/lancedanger.asm @@ -5,24 +5,24 @@ Music_LanceDanger: ; 1913f3 (64:53f3) dw Music_LanceDanger_Ch4 Music_LanceDanger_Ch1: ; 1913fb (64:53fb) - musicda 119 - musice6 115 - musicdd + volume 119 + volume_envelope 115 + stereo_panning_both musicd6 20 musicd7 0 - musicde + duty_cycle_12_5 musice3 2 musicd8 221 - musicec Music_LanceDanger_branch_19141b + song_call Music_LanceDanger_branch_19141b Music_LanceDanger_branch_19140c: ; 19140c (64:540c) - musicec Music_LanceDanger_branch_191463 - musicec Music_LanceDanger_branch_1914e7 - musicec Music_LanceDanger_branch_191566 - musicec Music_LanceDanger_branch_19160b - musice7 Music_LanceDanger_branch_19140c + song_call Music_LanceDanger_branch_191463 + song_call Music_LanceDanger_branch_1914e7 + song_call Music_LanceDanger_branch_191566 + song_call Music_LanceDanger_branch_19160b + song_jump Music_LanceDanger_branch_19140c Music_LanceDanger_branch_19141b: ; 19141b (64:541b) - musicde + duty_cycle_12_5 musicd8 38 music01 48 musicd2 @@ -92,7 +92,7 @@ Music_LanceDanger_branch_19141b: ; 19141b (64:541b) music8a 166 music01 3 music8a 164 - musiced + song_ret Music_LanceDanger_branch_191463: ; 191463 (64:5463) music01 6 @@ -224,7 +224,7 @@ Music_LanceDanger_branch_191463: ; 191463 (64:5463) music8a 163 music01 12 music8a 162 - musiced + song_ret Music_LanceDanger_branch_1914e7: ; 1914e7 (64:54e7) music01 6 @@ -351,7 +351,7 @@ Music_LanceDanger_branch_1914e7: ; 1914e7 (64:54e7) music8a 163 music01 12 music8a 162 - musiced + song_ret Music_LanceDanger_branch_191566: ; 191566 (64:5566) music01 6 @@ -518,7 +518,7 @@ Music_LanceDanger_branch_191566: ; 191566 (64:5566) music8a 197 music01 2 music8a 203 - musiced + song_ret Music_LanceDanger_branch_19160b: ; 19160b (64:560b) musicd8 120 @@ -612,28 +612,28 @@ Music_LanceDanger_branch_19160b: ; 19160b (64:560b) music8a 171 music01 12 music8a 169 - musiced + song_ret Music_LanceDanger_Ch2: ; 191669 (64:5669) - musicda 119 - musice6 115 - musicdd + volume 119 + volume_envelope 115 + stereo_panning_both musicd4 55 musice3 2 musicd4 55 - musicec Music_LanceDanger_branch_191686 + song_call Music_LanceDanger_branch_191686 Music_LanceDanger_branch_191677: ; 191677 (64:5677) - musicec Music_LanceDanger_branch_19174d - musicec Music_LanceDanger_branch_191924 - musicec Music_LanceDanger_branch_19198b - musicec Music_LanceDanger_branch_1919fe - musice7 Music_LanceDanger_branch_191677 + song_call Music_LanceDanger_branch_19174d + song_call Music_LanceDanger_branch_191924 + song_call Music_LanceDanger_branch_19198b + song_call Music_LanceDanger_branch_1919fe + song_jump Music_LanceDanger_branch_191677 Music_LanceDanger_branch_191686: ; 191686 (64:5686) - musice0 + duty_cycle_50 musicd8 207 musicd7 244 - musicde + duty_cycle_12_5 musicd8 39 music01 3 music8a 183 @@ -794,7 +794,7 @@ Music_LanceDanger_branch_191686: ; 191686 (64:5686) music8a 174 music01 3 music8a 172 - musiced + song_ret Music_LanceDanger_branch_19174d: ; 19174d (64:574d) musicd8 236 @@ -971,7 +971,7 @@ Music_LanceDanger_branch_19174d: ; 19174d (64:574d) music8a 150 music01 1 musicd2 - musice0 + duty_cycle_50 musicd7 0 musicd8 176 music01 2 @@ -999,7 +999,7 @@ Music_LanceDanger_branch_19174d: ; 19174d (64:574d) musicd4 55 music01 12 music8a 160 - musicde + duty_cycle_12_5 musicd7 0 musicd8 236 music01 6 @@ -1175,7 +1175,7 @@ Music_LanceDanger_branch_19174d: ; 19174d (64:574d) music01 1 musicd2 musicd7 0 - musice0 + duty_cycle_50 musicd8 180 music01 6 music8a 157 @@ -1187,10 +1187,10 @@ Music_LanceDanger_branch_19174d: ; 19174d (64:574d) music8a 163 music01 12 music8a 162 - musiced + song_ret Music_LanceDanger_branch_191924: ; 191924 (64:5924) - musice0 + duty_cycle_50 musicd7 0 musice3 0 musicd8 165 @@ -1278,10 +1278,10 @@ Music_LanceDanger_branch_191924: ; 191924 (64:5924) musicd4 55 music01 12 music8a 162 - musiced + song_ret Music_LanceDanger_branch_19198b: ; 19198b (64:598b) - musicde + duty_cycle_12_5 musicd7 0 musice3 0 musicd8 48 @@ -1300,7 +1300,7 @@ Music_LanceDanger_branch_19198b: ; 19198b (64:598b) music01 3 musicd2 music8a 192 - musicde + duty_cycle_12_5 musicd8 240 music01 3 music8a 185 @@ -1332,7 +1332,7 @@ Music_LanceDanger_branch_19198b: ; 19198b (64:598b) music8a 161 music01 3 music8a 156 - musicde + duty_cycle_12_5 musicd7 0 musice3 0 musicd8 165 @@ -1351,7 +1351,7 @@ Music_LanceDanger_branch_19198b: ; 19198b (64:598b) music01 3 musicd2 music8a 161 - musicde + duty_cycle_12_5 musicd8 240 music01 3 music8a 168 @@ -1383,10 +1383,10 @@ Music_LanceDanger_branch_19198b: ; 19198b (64:598b) music8a 197 music01 3 music8a 203 - musiced + song_ret Music_LanceDanger_branch_1919fe: ; 1919fe (64:59fe) - musice0 + duty_cycle_50 musicd8 165 music01 18 music8a 185 @@ -1467,7 +1467,7 @@ Music_LanceDanger_branch_1919fe: ; 1919fe (64:59fe) music8a 190 music01 6 music8a 192 - musicde + duty_cycle_12_5 musicd8 209 music01 3 music8a 188 @@ -1541,23 +1541,23 @@ Music_LanceDanger_branch_1919fe: ; 1919fe (64:59fe) musicd8 165 music01 12 music8a 174 - musiced + song_ret Music_LanceDanger_Ch3: ; 191aac (64:5aac) - musicdd + stereo_panning_both musicd8 27 musicd7 12 musicd4 55 - musicec Music_LanceDanger_branch_191ac5 + song_call Music_LanceDanger_branch_191ac5 Music_LanceDanger_branch_191ab6: ; 191ab6 (64:5ab6) - musicec Music_LanceDanger_branch_191b16 - musicec Music_LanceDanger_branch_191c40 - musicec Music_LanceDanger_branch_191db2 - musicec Music_LanceDanger_branch_191f83 - musice7 Music_LanceDanger_branch_191ab6 + song_call Music_LanceDanger_branch_191b16 + song_call Music_LanceDanger_branch_191c40 + song_call Music_LanceDanger_branch_191db2 + song_call Music_LanceDanger_branch_191f83 + song_jump Music_LanceDanger_branch_191ab6 Music_LanceDanger_branch_191ac5: ; 191ac5 (64:5ac5) - musice2 61 + wave 61 musicd8 27 music01 6 music8a 142 @@ -1627,10 +1627,10 @@ Music_LanceDanger_branch_191ac5: ; 191ac5 (64:5ac5) music8a 145 music01 6 music8a 147 - musiced + song_ret Music_LanceDanger_branch_191b16: ; 191b16 (64:5b16) - musice2 63 + wave 63 music01 6 music8a 161 music01 2 @@ -1926,13 +1926,13 @@ Music_LanceDanger_branch_191b16: ; 191b16 (64:5b16) music8a 158 music01 12 music8a 157 - musiced + song_ret Music_LanceDanger_branch_191c40: ; 191c40 (64:5c40) - musice2 64 + wave 64 music01 6 music8a 161 - musice2 62 + wave 62 music01 2 music8a 149 music01 1 @@ -1967,10 +1967,10 @@ Music_LanceDanger_branch_191c40: ; 191c40 (64:5c40) music8a 149 music01 1 musicd2 - musice2 64 + wave 64 music01 6 music8a 162 - musice2 62 + wave 62 music01 2 music8a 150 music01 1 @@ -1979,7 +1979,7 @@ Music_LanceDanger_branch_191c40: ; 191c40 (64:5c40) music8a 150 music01 1 musicd2 - musice2 64 + wave 64 music01 6 music8a 161 music01 2 @@ -2016,10 +2016,10 @@ Music_LanceDanger_branch_191c40: ; 191c40 (64:5c40) music8a 149 music01 1 musicd2 - musice2 64 + wave 64 music01 6 music8a 160 - musice2 62 + wave 62 music01 2 music8a 148 music01 1 @@ -2028,10 +2028,10 @@ Music_LanceDanger_branch_191c40: ; 191c40 (64:5c40) music8a 148 music01 1 musicd2 - musice2 64 + wave 64 music01 6 music8a 161 - musice2 62 + wave 62 music01 2 music8a 149 music01 1 @@ -2048,10 +2048,10 @@ Music_LanceDanger_branch_191c40: ; 191c40 (64:5c40) music8a 149 music01 1 musicd2 - musice2 64 + wave 64 music01 6 music8a 161 - musice2 62 + wave 62 music01 2 music8a 149 music01 1 @@ -2068,10 +2068,10 @@ Music_LanceDanger_branch_191c40: ; 191c40 (64:5c40) music8a 149 music01 1 musicd2 - musice2 64 + wave 64 music01 6 music8a 162 - musice2 62 + wave 62 music01 2 music8a 150 music01 1 @@ -2103,10 +2103,10 @@ Music_LanceDanger_branch_191c40: ; 191c40 (64:5c40) music8a 157 music01 12 music8a 155 - musice2 64 + wave 64 music01 6 music8a 161 - musice2 62 + wave 62 music01 2 music8a 149 music01 1 @@ -2123,10 +2123,10 @@ Music_LanceDanger_branch_191c40: ; 191c40 (64:5c40) music8a 149 music01 1 musicd2 - musice2 64 + wave 64 music01 6 music8a 161 - musice2 62 + wave 62 music01 2 music8a 149 music01 1 @@ -2143,10 +2143,10 @@ Music_LanceDanger_branch_191c40: ; 191c40 (64:5c40) music8a 149 music01 1 musicd2 - musice2 64 + wave 64 music01 6 music8a 162 - musice2 62 + wave 62 music01 2 music8a 150 music01 1 @@ -2155,10 +2155,10 @@ Music_LanceDanger_branch_191c40: ; 191c40 (64:5c40) music8a 150 music01 1 musicd2 - musice2 64 + wave 64 music01 6 music8a 161 - musice2 62 + wave 62 music01 2 music8a 149 music01 1 @@ -2175,10 +2175,10 @@ Music_LanceDanger_branch_191c40: ; 191c40 (64:5c40) music8a 149 music01 1 musicd2 - musice2 64 + wave 64 music01 6 music8a 161 - musice2 62 + wave 62 music01 2 music8a 149 music01 1 @@ -2195,10 +2195,10 @@ Music_LanceDanger_branch_191c40: ; 191c40 (64:5c40) music8a 149 music01 1 musicd2 - musice2 64 + wave 64 music01 6 music8a 160 - musice2 62 + wave 62 music01 2 music8a 148 music01 1 @@ -2207,10 +2207,10 @@ Music_LanceDanger_branch_191c40: ; 191c40 (64:5c40) music8a 148 music01 1 musicd2 - musice2 64 + wave 64 music01 6 music8a 161 - musice2 62 + wave 62 music01 2 music8a 149 music01 1 @@ -2227,10 +2227,10 @@ Music_LanceDanger_branch_191c40: ; 191c40 (64:5c40) music8a 149 music01 1 musicd2 - musice2 64 + wave 64 music01 6 music8a 161 - musice2 62 + wave 62 music01 2 music8a 149 music01 1 @@ -2247,10 +2247,10 @@ Music_LanceDanger_branch_191c40: ; 191c40 (64:5c40) music8a 149 music01 1 musicd2 - musice2 64 + wave 64 music01 6 music8a 162 - musice2 62 + wave 62 music01 2 music8a 150 music01 1 @@ -2267,13 +2267,13 @@ Music_LanceDanger_branch_191c40: ; 191c40 (64:5c40) music8a 158 music01 12 music8a 157 - musiced + song_ret Music_LanceDanger_branch_191db2: ; 191db2 (64:5db2) - musice2 62 + wave 62 music01 6 music8a 168 - musice2 62 + wave 62 music01 2 music8a 156 music01 1 @@ -2290,10 +2290,10 @@ Music_LanceDanger_branch_191db2: ; 191db2 (64:5db2) music8a 156 music01 1 musicd2 - musice2 62 + wave 62 music01 6 music8a 168 - musice2 62 + wave 62 music01 2 music8a 156 music01 1 @@ -2310,10 +2310,10 @@ Music_LanceDanger_branch_191db2: ; 191db2 (64:5db2) music8a 156 music01 1 musicd2 - musice2 62 + wave 62 music01 6 music8a 169 - musice2 62 + wave 62 music01 2 music8a 157 music01 1 @@ -2322,10 +2322,10 @@ Music_LanceDanger_branch_191db2: ; 191db2 (64:5db2) music8a 157 music01 1 musicd2 - musice2 62 + wave 62 music01 6 music8a 168 - musice2 62 + wave 62 music01 2 music8a 156 music01 1 @@ -2342,10 +2342,10 @@ Music_LanceDanger_branch_191db2: ; 191db2 (64:5db2) music8a 156 music01 1 musicd2 - musice2 62 + wave 62 music01 6 music8a 168 - musice2 62 + wave 62 music01 2 music8a 156 music01 1 @@ -2362,10 +2362,10 @@ Music_LanceDanger_branch_191db2: ; 191db2 (64:5db2) music8a 156 music01 1 musicd2 - musice2 62 + wave 62 music01 6 music8a 167 - musice2 62 + wave 62 music01 2 music8a 155 music01 1 @@ -2374,10 +2374,10 @@ Music_LanceDanger_branch_191db2: ; 191db2 (64:5db2) music8a 155 music01 1 musicd2 - musice2 62 + wave 62 music01 6 music8a 168 - musice2 62 + wave 62 music01 2 music8a 156 music01 1 @@ -2394,10 +2394,10 @@ Music_LanceDanger_branch_191db2: ; 191db2 (64:5db2) music8a 156 music01 1 musicd2 - musice2 62 + wave 62 music01 6 music8a 168 - musice2 62 + wave 62 music01 2 music8a 156 music01 1 @@ -2414,10 +2414,10 @@ Music_LanceDanger_branch_191db2: ; 191db2 (64:5db2) music8a 156 music01 1 musicd2 - musice2 62 + wave 62 music01 6 music8a 169 - musice2 62 + wave 62 music01 2 music8a 157 music01 1 @@ -2426,10 +2426,10 @@ Music_LanceDanger_branch_191db2: ; 191db2 (64:5db2) music8a 157 music01 1 musicd2 - musice2 62 + wave 62 music01 6 music8a 168 - musice2 62 + wave 62 music01 2 music8a 156 music01 1 @@ -2446,10 +2446,10 @@ Music_LanceDanger_branch_191db2: ; 191db2 (64:5db2) music8a 156 music01 1 musicd2 - musice2 62 + wave 62 music01 6 music8a 168 - musice2 62 + wave 62 music01 2 music8a 156 music01 1 @@ -2466,10 +2466,10 @@ Music_LanceDanger_branch_191db2: ; 191db2 (64:5db2) music8a 156 music01 1 musicd2 - musice2 62 + wave 62 music01 6 music8a 167 - musice2 62 + wave 62 music01 2 music8a 155 music01 1 @@ -2478,10 +2478,10 @@ Music_LanceDanger_branch_191db2: ; 191db2 (64:5db2) music8a 155 music01 1 musicd2 - musice2 62 + wave 62 music01 6 music8a 168 - musice2 62 + wave 62 music01 2 music8a 156 music01 1 @@ -2498,10 +2498,10 @@ Music_LanceDanger_branch_191db2: ; 191db2 (64:5db2) music8a 156 music01 1 musicd2 - musice2 62 + wave 62 music01 6 music8a 168 - musice2 62 + wave 62 music01 2 music8a 156 music01 1 @@ -2518,10 +2518,10 @@ Music_LanceDanger_branch_191db2: ; 191db2 (64:5db2) music8a 156 music01 1 musicd2 - musice2 62 + wave 62 music01 6 music8a 169 - musice2 62 + wave 62 music01 2 music8a 157 music01 1 @@ -2530,10 +2530,10 @@ Music_LanceDanger_branch_191db2: ; 191db2 (64:5db2) music8a 157 music01 1 musicd2 - musice2 62 + wave 62 music01 6 music8a 168 - musice2 62 + wave 62 music01 2 music8a 156 music01 1 @@ -2550,10 +2550,10 @@ Music_LanceDanger_branch_191db2: ; 191db2 (64:5db2) music8a 156 music01 1 musicd2 - musice2 62 + wave 62 music01 6 music8a 168 - musice2 62 + wave 62 music01 2 music8a 156 music01 1 @@ -2570,10 +2570,10 @@ Music_LanceDanger_branch_191db2: ; 191db2 (64:5db2) music8a 156 music01 1 musicd2 - musice2 62 + wave 62 music01 6 music8a 167 - musice2 62 + wave 62 music01 2 music8a 155 music01 1 @@ -2582,10 +2582,10 @@ Music_LanceDanger_branch_191db2: ; 191db2 (64:5db2) music8a 155 music01 1 musicd2 - musice2 62 + wave 62 music01 6 music8a 168 - musice2 62 + wave 62 music01 2 music8a 156 music01 1 @@ -2602,10 +2602,10 @@ Music_LanceDanger_branch_191db2: ; 191db2 (64:5db2) music8a 156 music01 1 musicd2 - musice2 62 + wave 62 music01 6 music8a 168 - musice2 62 + wave 62 music01 2 music8a 156 music01 1 @@ -2622,10 +2622,10 @@ Music_LanceDanger_branch_191db2: ; 191db2 (64:5db2) music8a 156 music01 1 musicd2 - musice2 62 + wave 62 music01 6 music8a 169 - musice2 62 + wave 62 music01 2 music8a 157 music01 1 @@ -2634,10 +2634,10 @@ Music_LanceDanger_branch_191db2: ; 191db2 (64:5db2) music8a 157 music01 1 musicd2 - musice2 62 + wave 62 music01 6 music8a 168 - musice2 62 + wave 62 music01 2 music8a 156 music01 1 @@ -2654,10 +2654,10 @@ Music_LanceDanger_branch_191db2: ; 191db2 (64:5db2) music8a 156 music01 1 musicd2 - musice2 62 + wave 62 music01 6 music8a 168 - musice2 62 + wave 62 music01 2 music8a 156 music01 1 @@ -2674,10 +2674,10 @@ Music_LanceDanger_branch_191db2: ; 191db2 (64:5db2) music8a 156 music01 1 musicd2 - musice2 62 + wave 62 music01 6 music8a 167 - musice2 62 + wave 62 music01 2 music8a 155 music01 1 @@ -2686,7 +2686,7 @@ Music_LanceDanger_branch_191db2: ; 191db2 (64:5db2) music8a 155 music01 1 musicd2 - musiced + song_ret Music_LanceDanger_branch_191f83: ; 191f83 (64:5f83) music01 3 @@ -2856,7 +2856,7 @@ Music_LanceDanger_branch_191f83: ; 191f83 (64:5f83) music8a 159 music01 6 music8a 171 - musice2 64 + wave 64 musicd8 104 music01 3 music8a 176 @@ -2917,18 +2917,18 @@ Music_LanceDanger_branch_191f83: ; 191f83 (64:5f83) musicd8 27 music01 11 music8a 162 - musiced + song_ret Music_LanceDanger_Ch4: ; 19206b (64:606b) - musicdd + stereo_panning_both musicd6 20 - musicec Music_LanceDanger_branch_192080 + song_call Music_LanceDanger_branch_192080 Music_LanceDanger_branch_192071: ; 192071 (64:6071) - musicec Music_LanceDanger_branch_1920d1 - musicec Music_LanceDanger_branch_192162 - musicec Music_LanceDanger_branch_1921fb - musicec Music_LanceDanger_branch_19228c - musice7 Music_LanceDanger_branch_192071 + song_call Music_LanceDanger_branch_1920d1 + song_call Music_LanceDanger_branch_192162 + song_call Music_LanceDanger_branch_1921fb + song_call Music_LanceDanger_branch_19228c + song_jump Music_LanceDanger_branch_192071 Music_LanceDanger_branch_192080: ; 192080 (64:6080) music01 6 @@ -3011,7 +3011,7 @@ Music_LanceDanger_branch_192080: ; 192080 (64:6080) music6d 127 music01 3 music6d 127 - musiced + song_ret Music_LanceDanger_branch_1920d1: ; 1920d1 (64:60d1) music01 6 @@ -3158,7 +3158,7 @@ Music_LanceDanger_branch_1920d1: ; 1920d1 (64:60d1) music6d 127 music01 3 music6d 127 - musiced + song_ret Music_LanceDanger_branch_192162: ; 192162 (64:6162) music01 6 @@ -3313,7 +3313,7 @@ Music_LanceDanger_branch_192162: ; 192162 (64:6162) music6d 127 music01 3 music6d 127 - musiced + song_ret Music_LanceDanger_branch_1921fb: ; 1921fb (64:61fb) music01 6 @@ -3460,7 +3460,7 @@ Music_LanceDanger_branch_1921fb: ; 1921fb (64:61fb) music6d 127 music01 3 music6d 127 - musiced + song_ret Music_LanceDanger_branch_19228c: ; 19228c (64:628c) music01 6 @@ -3635,4 +3635,4 @@ Music_LanceDanger_branch_19228c: ; 19228c (64:628c) music6d 127 music01 3 music6d 127 - musiced + song_ret diff --git a/src/audio/music/lineclearvictory.asm b/src/audio/music/lineclearvictory.asm index eac7470..1b56970 100644 --- a/src/audio/music/lineclearvictory.asm +++ b/src/audio/music/lineclearvictory.asm @@ -5,13 +5,13 @@ Music_LineClearVictory: ; 192564 (64:6564) dw Music_LineClearVictory_Ch4 Music_LineClearVictory_Ch1: ; 19256c (64:656c) - musicda 119 - musice6 115 - musicdd + volume 119 + volume_envelope 115 + stereo_panning_both musicd6 23 musicd7 0 musicd4 55 - musicde + duty_cycle_12_5 musicd4 56 musicd8 179 music01 3 @@ -64,15 +64,15 @@ Music_LineClearVictory_Ch1: ; 19256c (64:656c) music8a 161 music01 1 musicd2 - music00 + song_end Music_LineClearVictory_Ch2: ; 1925b1 (64:65b1) - musicda 119 - musice6 115 - musicdd + volume 119 + volume_envelope 115 + stereo_panning_both musicd8 162 musicd4 49 - musice0 + duty_cycle_50 music01 2 musicd2 music01 3 @@ -107,14 +107,14 @@ Music_LineClearVictory_Ch2: ; 1925b1 (64:65b1) musicd2 music01 1 musicd2 - music00 + song_end Music_LineClearVictory_Ch3: ; 1925e0 (64:65e0) - musicdd + stereo_panning_both musice3 0 musicd4 49 musicd8 109 - musice2 34 + wave 34 music01 3 music8a 173 music01 9 @@ -135,7 +135,7 @@ Music_LineClearVictory_Ch3: ; 1925e0 (64:65e0) music8a 185 music01 1 musicd2 - music00 + song_end Music_LineClearVictory_Ch4: ; 1925fe (64:65fe) music01 3 @@ -203,4 +203,4 @@ Music_LineClearVictory_Ch4: ; 1925fe (64:65fe) music6d 127 music01 1 musicd2 - music00 + song_end 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 diff --git a/src/audio/music/mainmenu.asm b/src/audio/music/mainmenu.asm index 7f5feb2..d12845e 100644 --- a/src/audio/music/mainmenu.asm +++ b/src/audio/music/mainmenu.asm @@ -5,33 +5,33 @@ Music_MainMenu: ; 186f53 (61:6f53) dw Music_MainMenu_Ch4 Music_MainMenu_Ch1: ; 186f5b (61:6f5b) - musicda 119 - musice6 115 - musicdd + volume 119 + volume_envelope 115 + stereo_panning_both musicd6 17 musicd7 0 - musicde + duty_cycle_12_5 musice3 2 musicd4 55 musicd8 221 music01 24 musicd2 Music_MainMenu_branch_186f6d: ; 186f6d (61:6f6d) - musicec Music_MainMenu_branch_186f91 - musicec Music_MainMenu_branch_186fc7 - musicec Music_MainMenu_branch_186f91 - musicec Music_MainMenu_branch_187001 - musicec Music_MainMenu_branch_187043 - musicec Music_MainMenu_branch_187064 - musicec Music_MainMenu_branch_187043 - musicec Music_MainMenu_branch_187064 - musicec Music_MainMenu_branch_187043 - musicec Music_MainMenu_branch_187064 - musicec Music_MainMenu_branch_187084 - musice7 Music_MainMenu_branch_186f6d + song_call Music_MainMenu_branch_186f91 + song_call Music_MainMenu_branch_186fc7 + song_call Music_MainMenu_branch_186f91 + song_call Music_MainMenu_branch_187001 + song_call Music_MainMenu_branch_187043 + song_call Music_MainMenu_branch_187064 + song_call Music_MainMenu_branch_187043 + song_call Music_MainMenu_branch_187064 + song_call Music_MainMenu_branch_187043 + song_call Music_MainMenu_branch_187064 + song_call Music_MainMenu_branch_187084 + song_jump Music_MainMenu_branch_186f6d Music_MainMenu_branch_186f91: ; 186f91 (61:6f91) - musicde + duty_cycle_12_5 musicd7 0 musicd4 55 musicd8 222 @@ -60,7 +60,7 @@ Music_MainMenu_branch_186f91: ; 186f91 (61:6f91) music8a 183 music01 15 musicd2 - musice0 + duty_cycle_50 musicd4 52 musicd8 224 musicd7 246 @@ -78,10 +78,10 @@ Music_MainMenu_branch_186f91: ; 186f91 (61:6f91) musicd2 music01 3 musicd2 - musiced + song_ret Music_MainMenu_branch_186fc7: ; 186fc7 (61:6fc7) - musicde + duty_cycle_12_5 musicd7 0 musicd4 55 musicd8 223 @@ -114,7 +114,7 @@ Music_MainMenu_branch_186fc7: ; 186fc7 (61:6fc7) music8a 180 music01 15 musicd2 - musice0 + duty_cycle_50 musicd4 52 musicd8 224 musicd7 246 @@ -132,10 +132,10 @@ Music_MainMenu_branch_186fc7: ; 186fc7 (61:6fc7) musicd2 music01 6 musicd2 - musiced + song_ret Music_MainMenu_branch_187001: ; 187001 (61:7001) - musice0 + duty_cycle_50 musicd7 244 musicd4 55 musicd8 182 @@ -167,7 +167,7 @@ Music_MainMenu_branch_187001: ; 187001 (61:7001) music01 12 music8a 183 musicd7 0 - musice0 + duty_cycle_50 musicd4 52 musicd8 236 musicd7 246 @@ -185,16 +185,16 @@ Music_MainMenu_branch_187001: ; 187001 (61:7001) musicd2 music01 6 musicd2 - musiced + song_ret ; unreferenced ? Music_MainMenu_branch_18703c: ; 186f5b (61:6f5b) - musicde + duty_cycle_12_5 musicd7 0 musicd4 55 musicd8 208 Music_MainMenu_branch_187043: ; 187043 (61:7043) - musicde + duty_cycle_12_5 musicd7 0 musicd4 55 musicd8 222 @@ -212,7 +212,7 @@ Music_MainMenu_branch_187043: ; 187043 (61:7043) music8a 208 music01 3 musicd2 - musice0 + duty_cycle_50 musicd4 52 musicd8 239 musicd7 246 @@ -220,10 +220,10 @@ Music_MainMenu_branch_187043: ; 187043 (61:7043) music8a 176 music01 3 musicd2 - musiced + song_ret Music_MainMenu_branch_187064: ; 187064 (61:7064) - musicde + duty_cycle_12_5 musicd7 0 musicd4 55 musicd8 222 @@ -240,7 +240,7 @@ Music_MainMenu_branch_187064: ; 187064 (61:7064) music8a 208 music01 3 musicd2 - musice0 + duty_cycle_50 musicd4 52 musicd8 239 musicd7 246 @@ -248,10 +248,10 @@ Music_MainMenu_branch_187064: ; 187064 (61:7064) music8a 171 music01 3 musicd2 - musiced + song_ret Music_MainMenu_branch_187084: ; 187084 (61:7084) - musicde + duty_cycle_12_5 musicd7 0 musicd4 55 musicd8 222 @@ -271,7 +271,7 @@ Music_MainMenu_branch_187084: ; 187084 (61:7084) music8a 208 music01 3 musicd2 - musice0 + duty_cycle_50 musicd4 52 musicd8 239 musicd7 246 @@ -279,7 +279,7 @@ Music_MainMenu_branch_187084: ; 187084 (61:7084) music8a 176 music01 3 musicd2 - musice1 + duty_cycle_75 musicd7 244 musicd4 55 musicd8 222 @@ -309,25 +309,25 @@ Music_MainMenu_branch_187084: ; 187084 (61:7084) music8a 190 music01 2 music8a 192 - musiced + song_ret Music_MainMenu_Ch2: ; 1870c8 (61:70c8) - musicda 119 - musice6 115 - musicdd + volume 119 + volume_envelope 115 + stereo_panning_both musicd7 0 - musice0 + duty_cycle_50 musicd4 55 musicd6 17 music01 24 musicd2 Music_MainMenu_branch_1870d6: ; 1870d6 (61:70d6) - musicec Music_MainMenu_branch_1870df - musicec Music_MainMenu_branch_1872d0 - musice7 Music_MainMenu_branch_1870d6 + song_call Music_MainMenu_branch_1870df + song_call Music_MainMenu_branch_1872d0 + song_jump Music_MainMenu_branch_1870d6 Music_MainMenu_branch_1870df: ; 1870df (61:70df) - musice0 + duty_cycle_50 musicd7 0 musicd4 55 musicd8 179 @@ -363,7 +363,7 @@ Music_MainMenu_branch_1870df: ; 1870df (61:70df) music01 3 musicd2 musicd8 36 - musice0 + duty_cycle_50 musicd2 music01 3 musicd2 @@ -383,7 +383,7 @@ Music_MainMenu_branch_1870df: ; 1870df (61:70df) music01 3 music8a 195 musicd8 179 - musice0 + duty_cycle_50 music01 3 music8a 175 music01 3 @@ -416,7 +416,7 @@ Music_MainMenu_branch_1870df: ; 1870df (61:70df) music01 3 musicd2 musicd8 36 - musicde + duty_cycle_12_5 musicd2 music01 3 musicd2 @@ -435,7 +435,7 @@ Music_MainMenu_branch_1870df: ; 1870df (61:70df) music8a 200 music01 3 music8a 195 - musice0 + duty_cycle_50 musicd8 179 music01 3 music8a 176 @@ -468,7 +468,7 @@ Music_MainMenu_branch_1870df: ; 1870df (61:70df) music01 6 musicd2 musicd8 36 - musice0 + duty_cycle_50 musicd2 music01 3 musicd2 @@ -487,7 +487,7 @@ Music_MainMenu_branch_1870df: ; 1870df (61:70df) music8a 200 music01 3 music8a 195 - musice0 + duty_cycle_50 musicd8 179 music01 3 music8a 175 @@ -519,11 +519,11 @@ Music_MainMenu_branch_1870df: ; 1870df (61:70df) musicd4 56 music01 24 music8a 176 - musiced + song_ret ; unreferenced ? Music_MainMenu_branch_1871ac: ; 1870c8 (61:70c8) - musice0 + duty_cycle_50 musicd7 0 musicd4 55 musicd8 179 @@ -552,7 +552,7 @@ Music_MainMenu_branch_1871ac: ; 1870c8 (61:70c8) music01 6 music8a 175 musicd8 222 - musice1 + duty_cycle_75 music01 3 music8a 175 music01 3 @@ -624,12 +624,12 @@ Music_MainMenu_branch_1871ac: ; 1870c8 (61:70c8) musicd8 202 music01 1 music8a 195 - musiced + song_ret ; unreferenced ? Music_MainMenu_branch_18722b: ; 1870c8 (61:70c8) musicd7 0 - musice0 + duty_cycle_50 musicd8 179 music01 3 music8a 178 @@ -656,7 +656,7 @@ Music_MainMenu_branch_18722b: ; 1870c8 (61:70c8) music01 6 music8a 180 musicd8 222 - musice1 + duty_cycle_75 music01 3 music8a 180 music01 3 @@ -728,11 +728,11 @@ Music_MainMenu_branch_18722b: ; 1870c8 (61:70c8) musicd8 202 music01 1 music8a 195 - musiced + song_ret ; unreferenced ? Music_MainMenu_branch_1872a8: ; 1870c8 (61:70c8) - musice0 + duty_cycle_50 musicd4 55 musicd7 244 musicd8 11 @@ -765,7 +765,7 @@ Music_MainMenu_branch_1872a8: ; 1870c8 (61:70c8) musicd4 56 music01 24 music8a 188 - musiced + song_ret Music_MainMenu_branch_1872d0: ; 1872d0 (61:72d0) musicd7 244 @@ -918,7 +918,7 @@ Music_MainMenu_branch_1872d0: ; 1872d0 (61:72d0) music8a 181 music01 3 musicd2 - musice0 + duty_cycle_50 musicd8 11 music8a 183 music01 3 @@ -947,10 +947,10 @@ Music_MainMenu_branch_1872d0: ; 1872d0 (61:72d0) music8a 187 music01 3 music8a 188 - musiced + song_ret Music_MainMenu_Ch3: ; 187388 (61:7388) - musicdd + stereo_panning_both musice3 0 musicd8 104 musicd4 56 @@ -958,9 +958,9 @@ Music_MainMenu_Ch3: ; 187388 (61:7388) musicd2 Music_MainMenu_branch_187391: ; 187391 (61:7391) musicd7 12 - musice2 60 - musicec Music_MainMenu_branch_18739b - musice7 Music_MainMenu_branch_187391 + wave 60 + song_call Music_MainMenu_branch_18739b + song_jump Music_MainMenu_branch_187391 Music_MainMenu_branch_18739b: ; 18739b (61:739b) music01 3 @@ -1292,10 +1292,10 @@ Music_MainMenu_branch_18739b: ; 18739b (61:739b) music8a 147 music01 6 music8a 152 - musiced + song_ret Music_MainMenu_Ch4: ; 1874e5 (61:74e5) - musicdd + stereo_panning_both music01 6 music6d 126 music01 6 @@ -1573,4 +1573,4 @@ Music_MainMenu_branch_1874f6: ; 1874f6 (61:74f6) music6d 127 music01 3 music6d 127 - musice7 Music_MainMenu_branch_1874f6 + song_jump Music_MainMenu_branch_1874f6 diff --git a/src/audio/music/mainmenucopy.asm b/src/audio/music/mainmenucopy.asm index ce100fc..aa62f4f 100644 --- a/src/audio/music/mainmenucopy.asm +++ b/src/audio/music/mainmenucopy.asm @@ -5,12 +5,12 @@ Music_MainMenuCopy: ; 190000 (64:4000) dw Music_MainMenuCopy_Ch4 Music_MainMenuCopy_Ch1: ; 190008 (64:4008) - musicda 119 - musice6 115 - musicdd + volume 119 + volume_envelope 115 + stereo_panning_both musicd6 17 musicd7 0 - musicde + duty_cycle_12_5 musice3 2 musicd4 55 musicd8 221 @@ -21,21 +21,21 @@ Music_MainMenuCopy_Ch1: ; 190008 (64:4008) music01 24 musicd2 Music_MainMenuCopy_branch_19001e: ; 19001e (64:401e) - musicec Music_MainMenuCopy_branch_190042 - musicec Music_MainMenuCopy_branch_190078 - musicec Music_MainMenuCopy_branch_190042 - musicec Music_MainMenuCopy_branch_1900b2 - musicec Music_MainMenuCopy_branch_1900f4 - musicec Music_MainMenuCopy_branch_190115 - musicec Music_MainMenuCopy_branch_1900f4 - musicec Music_MainMenuCopy_branch_190115 - musicec Music_MainMenuCopy_branch_1900f4 - musicec Music_MainMenuCopy_branch_190115 - musicec Music_MainMenuCopy_branch_190135 - musice7 Music_MainMenuCopy_branch_19001e + song_call Music_MainMenuCopy_branch_190042 + song_call Music_MainMenuCopy_branch_190078 + song_call Music_MainMenuCopy_branch_190042 + song_call Music_MainMenuCopy_branch_1900b2 + song_call Music_MainMenuCopy_branch_1900f4 + song_call Music_MainMenuCopy_branch_190115 + song_call Music_MainMenuCopy_branch_1900f4 + song_call Music_MainMenuCopy_branch_190115 + song_call Music_MainMenuCopy_branch_1900f4 + song_call Music_MainMenuCopy_branch_190115 + song_call Music_MainMenuCopy_branch_190135 + song_jump Music_MainMenuCopy_branch_19001e Music_MainMenuCopy_branch_190042: ; 190042 (64:4042) - musicde + duty_cycle_12_5 musicd7 0 musicd4 55 musicd8 222 @@ -64,7 +64,7 @@ Music_MainMenuCopy_branch_190042: ; 190042 (64:4042) music8a 183 music01 15 musicd2 - musice0 + duty_cycle_50 musicd4 52 musicd8 224 musicd7 246 @@ -82,10 +82,10 @@ Music_MainMenuCopy_branch_190042: ; 190042 (64:4042) musicd2 music01 3 musicd2 - musiced + song_ret Music_MainMenuCopy_branch_190078: ; 190078 (64:4078) - musicde + duty_cycle_12_5 musicd7 0 musicd4 55 musicd8 223 @@ -118,7 +118,7 @@ Music_MainMenuCopy_branch_190078: ; 190078 (64:4078) music8a 180 music01 15 musicd2 - musice0 + duty_cycle_50 musicd4 52 musicd8 224 musicd7 246 @@ -136,10 +136,10 @@ Music_MainMenuCopy_branch_190078: ; 190078 (64:4078) musicd2 music01 6 musicd2 - musiced + song_ret Music_MainMenuCopy_branch_1900b2: ; 1900b2 (64:40b2) - musice0 + duty_cycle_50 musicd7 244 musicd4 55 musicd8 182 @@ -171,7 +171,7 @@ Music_MainMenuCopy_branch_1900b2: ; 1900b2 (64:40b2) music01 12 music8a 183 musicd7 0 - musice0 + duty_cycle_50 musicd4 52 musicd8 236 musicd7 246 @@ -189,16 +189,16 @@ Music_MainMenuCopy_branch_1900b2: ; 1900b2 (64:40b2) musicd2 music01 6 musicd2 - musiced + song_ret ; unreferenced ? Music_MainMenuCopy_branch_1900ed: ; 190008 (64:4008) - musicde + duty_cycle_12_5 musicd7 0 musicd4 55 musicd8 208 Music_MainMenuCopy_branch_1900f4: ; 1900f4 (64:40f4) - musicde + duty_cycle_12_5 musicd7 0 musicd4 55 musicd8 222 @@ -216,7 +216,7 @@ Music_MainMenuCopy_branch_1900f4: ; 1900f4 (64:40f4) music8a 208 music01 3 musicd2 - musice0 + duty_cycle_50 musicd4 52 musicd8 239 musicd7 246 @@ -224,10 +224,10 @@ Music_MainMenuCopy_branch_1900f4: ; 1900f4 (64:40f4) music8a 176 music01 3 musicd2 - musiced + song_ret Music_MainMenuCopy_branch_190115: ; 190115 (64:4115) - musicde + duty_cycle_12_5 musicd7 0 musicd4 55 musicd8 222 @@ -244,7 +244,7 @@ Music_MainMenuCopy_branch_190115: ; 190115 (64:4115) music8a 208 music01 3 musicd2 - musice0 + duty_cycle_50 musicd4 52 musicd8 239 musicd7 246 @@ -252,10 +252,10 @@ Music_MainMenuCopy_branch_190115: ; 190115 (64:4115) music8a 171 music01 3 musicd2 - musiced + song_ret Music_MainMenuCopy_branch_190135: ; 190135 (64:4135) - musicde + duty_cycle_12_5 musicd7 0 musicd4 55 musicd8 222 @@ -275,7 +275,7 @@ Music_MainMenuCopy_branch_190135: ; 190135 (64:4135) music8a 208 music01 3 musicd2 - musice0 + duty_cycle_50 musicd4 52 musicd8 239 musicd7 246 @@ -283,7 +283,7 @@ Music_MainMenuCopy_branch_190135: ; 190135 (64:4135) music8a 176 music01 3 musicd2 - musice1 + duty_cycle_75 musicd7 244 musicd4 55 musicd8 222 @@ -313,14 +313,14 @@ Music_MainMenuCopy_branch_190135: ; 190135 (64:4135) music8a 190 music01 2 music8a 192 - musiced + song_ret Music_MainMenuCopy_Ch2: ; 190179 (64:4179) - musicda 119 - musice6 115 - musicdd + volume 119 + volume_envelope 115 + stereo_panning_both musicd7 0 - musice0 + duty_cycle_50 musicd4 55 musicd6 17 music01 48 @@ -330,12 +330,12 @@ Music_MainMenuCopy_Ch2: ; 190179 (64:4179) music01 24 musicd2 Music_MainMenuCopy_branch_19018b: ; 19018b (64:418b) - musicec Music_MainMenuCopy_branch_190194 - musicec Music_MainMenuCopy_branch_190385 - musice7 Music_MainMenuCopy_branch_19018b + song_call Music_MainMenuCopy_branch_190194 + song_call Music_MainMenuCopy_branch_190385 + song_jump Music_MainMenuCopy_branch_19018b Music_MainMenuCopy_branch_190194: ; 190194 (64:4194) - musice0 + duty_cycle_50 musicd7 0 musicd4 55 musicd8 179 @@ -371,7 +371,7 @@ Music_MainMenuCopy_branch_190194: ; 190194 (64:4194) music01 3 musicd2 musicd8 36 - musice0 + duty_cycle_50 musicd2 music01 3 musicd2 @@ -391,7 +391,7 @@ Music_MainMenuCopy_branch_190194: ; 190194 (64:4194) music01 3 music8a 195 musicd8 179 - musice0 + duty_cycle_50 music01 3 music8a 175 music01 3 @@ -424,7 +424,7 @@ Music_MainMenuCopy_branch_190194: ; 190194 (64:4194) music01 3 musicd2 musicd8 36 - musicde + duty_cycle_12_5 musicd2 music01 3 musicd2 @@ -443,7 +443,7 @@ Music_MainMenuCopy_branch_190194: ; 190194 (64:4194) music8a 200 music01 3 music8a 195 - musice0 + duty_cycle_50 musicd8 179 music01 3 music8a 176 @@ -476,7 +476,7 @@ Music_MainMenuCopy_branch_190194: ; 190194 (64:4194) music01 6 musicd2 musicd8 36 - musice0 + duty_cycle_50 musicd2 music01 3 musicd2 @@ -495,7 +495,7 @@ Music_MainMenuCopy_branch_190194: ; 190194 (64:4194) music8a 200 music01 3 music8a 195 - musice0 + duty_cycle_50 musicd8 179 music01 3 music8a 175 @@ -527,11 +527,11 @@ Music_MainMenuCopy_branch_190194: ; 190194 (64:4194) musicd4 56 music01 24 music8a 176 - musiced + song_ret ; unreferenced ? Music_MainMenuCopy_branch_190261: ; 190179 (64:4179) - musice0 + duty_cycle_50 musicd7 0 musicd4 55 musicd8 179 @@ -560,7 +560,7 @@ Music_MainMenuCopy_branch_190261: ; 190179 (64:4179) music01 6 music8a 175 musicd8 222 - musice1 + duty_cycle_75 music01 3 music8a 175 music01 3 @@ -632,12 +632,12 @@ Music_MainMenuCopy_branch_190261: ; 190179 (64:4179) musicd8 202 music01 1 music8a 195 - musiced + song_ret ; unreferenced ? Music_MainMenuCopy_branch_1902e0: ; 190179 (64:4179) musicd7 0 - musice0 + duty_cycle_50 musicd8 179 music01 3 music8a 178 @@ -664,7 +664,7 @@ Music_MainMenuCopy_branch_1902e0: ; 190179 (64:4179) music01 6 music8a 180 musicd8 222 - musice1 + duty_cycle_75 music01 3 music8a 180 music01 3 @@ -736,11 +736,11 @@ Music_MainMenuCopy_branch_1902e0: ; 190179 (64:4179) musicd8 202 music01 1 music8a 195 - musiced + song_ret ; unreferenced ? Music_MainMenuCopy_branch_19035d: ; 190179 (64:4179) - musice0 + duty_cycle_50 musicd4 55 musicd7 244 musicd8 11 @@ -773,7 +773,7 @@ Music_MainMenuCopy_branch_19035d: ; 190179 (64:4179) musicd4 56 music01 24 music8a 188 - musiced + song_ret Music_MainMenuCopy_branch_190385: ; 190385 (64:4385) musicd7 244 @@ -926,7 +926,7 @@ Music_MainMenuCopy_branch_190385: ; 190385 (64:4385) music8a 181 music01 3 musicd2 - musice0 + duty_cycle_50 musicd8 11 music8a 183 music01 3 @@ -955,10 +955,10 @@ Music_MainMenuCopy_branch_190385: ; 190385 (64:4385) music8a 187 music01 3 music8a 188 - musiced + song_ret Music_MainMenuCopy_Ch3: ; 19043d (64:443d) - musicdd + stereo_panning_both musice3 0 musicd8 104 musicd4 56 @@ -970,9 +970,9 @@ Music_MainMenuCopy_Ch3: ; 19043d (64:443d) musicd2 Music_MainMenuCopy_branch_19044a: ; 19044a (64:444a) musicd7 12 - musice2 60 - musicec Music_MainMenuCopy_branch_190454 - musice7 Music_MainMenuCopy_branch_19044a + wave 60 + song_call Music_MainMenuCopy_branch_190454 + song_jump Music_MainMenuCopy_branch_19044a Music_MainMenuCopy_branch_190454: ; 190454 (64:4454) music01 3 @@ -1304,14 +1304,14 @@ Music_MainMenuCopy_branch_190454: ; 190454 (64:4454) music8a 147 music01 6 music8a 152 - musiced + song_ret Music_MainMenuCopy_Ch4: ; 19059e (64:459e) music01 48 musicd2 music01 24 musicd2 - musicdd + stereo_panning_both music01 6 music6d 126 music01 6 @@ -1589,4 +1589,4 @@ Music_MainMenuCopy_branch_1905b3: ; 1905b3 (64:45b3) music6d 127 music01 3 music6d 127 - musice7 Music_MainMenuCopy_branch_1905b3 + song_jump Music_MainMenuCopy_branch_1905b3 diff --git a/src/audio/music/none.asm b/src/audio/music/none.asm index 667f69b..5213d54 100644 --- a/src/audio/music/none.asm +++ b/src/audio/music/none.asm @@ -1,17 +1,17 @@ -Music_None:: ; 184000 (61:4000) +Music_None: ; 184000 (61:4000) dw Music_None_Ch1 dw Music_None_Ch2 dw Music_None_Ch3 dw Music_None_Ch4 -Music_None_Ch1:: ; 184008 (61:4008) - INCBIN "baserom.gbc",$184008,$184009 - $184008 +Music_None_Ch1: ; 184008 (61:4008) + song_end -Music_None_Ch2:: ; 184009 (61:4009) - INCBIN "baserom.gbc",$184009,$18400a - $184009 +Music_None_Ch2: ; 184009 (61:4009) + song_end -Music_None_Ch3:: ; 18400a (61:400a) - INCBIN "baserom.gbc",$18400a,$18400b - $18400a +Music_None_Ch3: ; 18400a (61:400a) + song_end -Music_None_Ch4:: ; 18400b (61:400b) - INCBIN "baserom.gbc",$18400b,$18400c - $18400b +Music_None_Ch4: ; 18400b (61:400b) + song_end diff --git a/src/audio/music/paneldepon1.asm b/src/audio/music/paneldepon1.asm index 38cd6dd..48a768f 100644 --- a/src/audio/music/paneldepon1.asm +++ b/src/audio/music/paneldepon1.asm @@ -5,11 +5,11 @@ Music_PanelDePon1: ; 91365 (24:5365) dw Music_PanelDePon1_Ch4 Music_PanelDePon1_Ch1: ; 9136d (24:536d) - musicda 119 - musice6 115 - musicdd + volume 119 + volume_envelope 115 + stereo_panning_both musicd6 19 - musice0 + duty_cycle_50 musicd7 7 musice3 7 musicd4 50 @@ -30,14 +30,14 @@ Music_PanelDePon1_Ch1: ; 9136d (24:536d) musice3 2 musicd7 5 musicd8 97 - musice0 + duty_cycle_50 music01 24 music8a 169 Music_PanelDePon1_branch_91394: ; 91394 (24:5394) musicd7 249 musicd4 37 musicd8 78 - musice0 + duty_cycle_50 musicd7 5 music01 6 music8a 174 @@ -193,7 +193,7 @@ Music_PanelDePon1_branch_91394: ; 91394 (24:5394) music01 9 musicd2 musicd8 45 - musicde + duty_cycle_12_5 music01 3 music8a 181 music01 3 @@ -212,24 +212,24 @@ Music_PanelDePon1_branch_91394: ; 91394 (24:5394) music8a 181 music01 6 music8a 186 - musice7 Music_PanelDePon1_branch_91394 + song_jump Music_PanelDePon1_branch_91394 ; unreferenced ? Music_PanelDePon1_branch_91464: ; 9136d (24:536d) musicd8 77 - musice0 + duty_cycle_50 music01 1 music8a 169 music8a 168 music8a 166 - musiced + song_ret Music_PanelDePon1_Ch2: ; 9146c (24:546c) - musicda 119 - musice6 115 - musicdd + volume 119 + volume_envelope 115 + stereo_panning_both musicd6 18 - musice0 + duty_cycle_50 musicd8 75 musicd7 7 musicd4 50 @@ -254,7 +254,7 @@ Music_PanelDePon1_Ch2: ; 9146c (24:546c) music8a 169 Music_PanelDePon1_branch_91490: ; 91490 (24:5490) musicd7 249 - musice1 + duty_cycle_75 musicd5 musicd8 124 music01 3 @@ -385,13 +385,13 @@ Music_PanelDePon1_branch_91490: ; 91490 (24:5490) musicd8 97 music01 24 music8a 181 - musice7 Music_PanelDePon1_branch_91490 + song_jump Music_PanelDePon1_branch_91490 Music_PanelDePon1_Ch3: ; 9151a (24:551a) - musicdd + stereo_panning_both musicd4 45 musicd8 109 - musice2 34 + wave 34 musicd7 17 music01 24 musicd2 @@ -546,10 +546,10 @@ Music_PanelDePon1_branch_91527: ; 91527 (24:5527) music8a 149 music01 3 musicd2 - musice7 Music_PanelDePon1_branch_91527 + song_jump Music_PanelDePon1_branch_91527 Music_PanelDePon1_Ch4: ; 915bf (24:55bf) - musicdd + stereo_panning_both music01 3 music6d 126 music01 3 @@ -579,15 +579,15 @@ Music_PanelDePon1_Ch4: ; 915bf (24:55bf) music01 3 music6d 126 Music_PanelDePon1_branch_915dc: ; 915dc (24:55dc) - musicec Music_PanelDePon1_branch_915f7 - musicec Music_PanelDePon1_branch_91629 - musicec Music_PanelDePon1_branch_9160f - musicec Music_PanelDePon1_branch_91629 - musicec Music_PanelDePon1_branch_9160f - musicec Music_PanelDePon1_branch_91629 - musicec Music_PanelDePon1_branch_9160f - musicec Music_PanelDePon1_branch_91642 - musice7 Music_PanelDePon1_branch_915dc + song_call Music_PanelDePon1_branch_915f7 + song_call Music_PanelDePon1_branch_91629 + song_call Music_PanelDePon1_branch_9160f + song_call Music_PanelDePon1_branch_91629 + song_call Music_PanelDePon1_branch_9160f + song_call Music_PanelDePon1_branch_91629 + song_call Music_PanelDePon1_branch_9160f + song_call Music_PanelDePon1_branch_91642 + song_jump Music_PanelDePon1_branch_915dc Music_PanelDePon1_branch_915f7: ; 915f7 (24:55f7) music01 6 @@ -613,7 +613,7 @@ Music_PanelDePon1_branch_915f7: ; 915f7 (24:55f7) music6d 121 music6d 120 music6d 119 - musiced + song_ret Music_PanelDePon1_branch_9160f: ; 9160f (24:560f) music01 3 @@ -641,7 +641,7 @@ Music_PanelDePon1_branch_9160f: ; 9160f (24:560f) music6d 121 music6d 120 music6d 119 - musiced + song_ret Music_PanelDePon1_branch_91629: ; 91629 (24:5629) music01 3 @@ -668,7 +668,7 @@ Music_PanelDePon1_branch_91629: ; 91629 (24:5629) music6d 121 music6d 121 music6d 119 - musiced + song_ret Music_PanelDePon1_branch_91642: ; 91642 (24:5642) music01 3 @@ -699,4 +699,4 @@ Music_PanelDePon1_branch_91642: ; 91642 (24:5642) music6d 126 music01 3 music6d 127 - musiced + song_ret diff --git a/src/audio/music/paneldepon2.asm b/src/audio/music/paneldepon2.asm index 5d8ecda..0905f0e 100644 --- a/src/audio/music/paneldepon2.asm +++ b/src/audio/music/paneldepon2.asm @@ -7,7 +7,7 @@ Music_PanelDePon2: ; 180000 (60:4000) Music_PanelDePon2_Ch1: ; 180008 (60:4008) musicd6 21 musicd4 37 - musice0 + duty_cycle_50 musicd7 12 musicd8 114 music01 6 @@ -53,17 +53,17 @@ Music_PanelDePon2_Ch1: ; 180008 (60:4008) music01 8 musicd2 Music_PanelDePon2_branch_18003c: ; 18003c (60:403c) - musicec Music_PanelDePon2_branch_18004b - musicec Music_PanelDePon2_branch_18004b - musicec Music_PanelDePon2_branch_180077 - musicec Music_PanelDePon2_branch_1800af - musice7 Music_PanelDePon2_branch_18003c + song_call Music_PanelDePon2_branch_18004b + song_call Music_PanelDePon2_branch_18004b + song_call Music_PanelDePon2_branch_180077 + song_call Music_PanelDePon2_branch_1800af + song_jump Music_PanelDePon2_branch_18003c Music_PanelDePon2_branch_18004b: ; 18004b (60:404b) musicd8 113 musicd7 0 musice3 0 - musice0 + duty_cycle_50 music01 18 music8a 179 music01 24 @@ -77,7 +77,7 @@ Music_PanelDePon2_branch_18004b: ; 18004b (60:404b) music01 12 music8a 186 musicd7 12 - musicde + duty_cycle_12_5 music01 6 music8a 179 music8a 183 @@ -98,10 +98,10 @@ Music_PanelDePon2_branch_18004b: ; 18004b (60:404b) music01 6 music8a 181 music8a 179 - musiced + song_ret Music_PanelDePon2_branch_180077: ; 180077 (60:4077) - musice0 + duty_cycle_50 musicd8 118 musice3 0 music01 18 @@ -122,7 +122,7 @@ Music_PanelDePon2_branch_180077: ; 180077 (60:4077) music01 48 musicd3 musicd7 12 - musicde + duty_cycle_12_5 music01 6 music8a 171 music01 12 @@ -153,11 +153,11 @@ Music_PanelDePon2_branch_180077: ; 180077 (60:4077) music8a 174 music01 18 music8a 174 - musiced + song_ret Music_PanelDePon2_branch_1800af: ; 1800af (60:40af) musicd7 0 - musice0 + duty_cycle_50 musice3 1 music01 6 music8a 167 @@ -378,14 +378,14 @@ Music_PanelDePon2_branch_1800af: ; 1800af (60:40af) music8a 167 music01 12 music8a 167 - musiced + song_ret Music_PanelDePon2_Ch2: ; 180191 (60:4191) - musice6 119 - musicdd + volume_envelope 119 + stereo_panning_both musicd4 37 musicd6 21 - musice0 + duty_cycle_50 musicd8 114 musicd7 0 music01 48 @@ -402,7 +402,7 @@ Music_PanelDePon2_Ch2: ; 180191 (60:4191) music8a 179 music01 24 musicd3 - musice0 + duty_cycle_50 musicd7 0 music01 6 music8a 179 @@ -415,7 +415,7 @@ Music_PanelDePon2_Ch2: ; 180191 (60:4191) music01 8 musicd2 Music_PanelDePon2_branch_1801ba: ; 1801ba (60:41ba) - musice0 + duty_cycle_50 musicd7 12 musicd8 118 music01 6 @@ -476,7 +476,7 @@ Music_PanelDePon2_branch_1801ba: ; 1801ba (60:41ba) music8a 166 music01 12 music8a 167 - musicde + duty_cycle_12_5 music01 18 music8a 159 music01 18 @@ -520,14 +520,14 @@ Music_PanelDePon2_branch_1801ba: ; 1801ba (60:41ba) music8a 157 music01 24 musicd3 - musicdf + duty_cycle_25 musicd7 24 music01 6 music8a 167 music01 18 music8a 167 musicd7 12 - musice0 + duty_cycle_50 musicd8 118 music01 18 music8a 159 @@ -563,7 +563,7 @@ Music_PanelDePon2_branch_1801ba: ; 1801ba (60:41ba) music8a 157 music01 24 music8a 155 - musicde + duty_cycle_12_5 music01 6 music8a 172 music01 12 @@ -572,7 +572,7 @@ Music_PanelDePon2_branch_1801ba: ; 1801ba (60:41ba) music8a 172 music01 48 music8a 171 - musice0 + duty_cycle_50 music01 18 music8a 155 music01 18 @@ -591,7 +591,7 @@ Music_PanelDePon2_branch_1801ba: ; 1801ba (60:41ba) music8a 157 music01 24 musicd2 - musicdf + duty_cycle_25 musicd7 12 music01 6 music8a 159 @@ -632,7 +632,7 @@ Music_PanelDePon2_branch_1801ba: ; 1801ba (60:41ba) music01 18 music8a 162 musicd8 114 - musice0 + duty_cycle_50 musicd7 12 music01 18 music8a 155 @@ -666,7 +666,7 @@ Music_PanelDePon2_branch_1801ba: ; 1801ba (60:41ba) music8a 159 music01 12 music8a 157 - musicde + duty_cycle_12_5 music01 6 music8a 155 music8a 155 @@ -736,10 +736,10 @@ Music_PanelDePon2_branch_1801ba: ; 1801ba (60:41ba) music8a 171 music01 12 music8a 171 - musice7 Music_PanelDePon2_branch_1801ba + song_jump Music_PanelDePon2_branch_1801ba Music_PanelDePon2_Ch3: ; 180307 (60:4307) - musice2 25 + wave 25 musicd8 20 musicd7 24 musice3 3 @@ -782,7 +782,7 @@ Music_PanelDePon2_Ch3: ; 180307 (60:4307) Music_PanelDePon2_branch_180333: ; 180333 (60:4333) musice3 0 musicd7 12 - musice2 15 + wave 15 music01 6 music8a 155 musicd2 @@ -1160,10 +1160,10 @@ Music_PanelDePon2_branch_180333: ; 180333 (60:4333) music8a 143 music8a 143 musicd2 - musice7 Music_PanelDePon2_branch_180333 + song_jump Music_PanelDePon2_branch_180333 Music_PanelDePon2_Ch4: ; 1804b5 (60:44b5) - musicdd + stereo_panning_both music01 6 music6d 119 music6d 123 @@ -1201,13 +1201,13 @@ Music_PanelDePon2_Ch4: ; 1804b5 (60:44b5) music6d 126 music6d 127 Music_PanelDePon2_branch_1804da: ; 1804da (60:44da) - musicec Music_PanelDePon2_branch_1804ef - musicec Music_PanelDePon2_branch_1804ef - musicec Music_PanelDePon2_branch_1804ef - musicec Music_PanelDePon2_branch_1804ef - musicec Music_PanelDePon2_branch_1804ef - musicec Music_PanelDePon2_branch_18053b - musice7 Music_PanelDePon2_branch_1804da + song_call Music_PanelDePon2_branch_1804ef + song_call Music_PanelDePon2_branch_1804ef + song_call Music_PanelDePon2_branch_1804ef + song_call Music_PanelDePon2_branch_1804ef + song_call Music_PanelDePon2_branch_1804ef + song_call Music_PanelDePon2_branch_18053b + song_jump Music_PanelDePon2_branch_1804da Music_PanelDePon2_branch_1804ef: ; 1804ef (60:44ef) music01 6 @@ -1285,7 +1285,7 @@ Music_PanelDePon2_branch_1804ef: ; 1804ef (60:44ef) music6d 127 music6d 126 music6d 127 - musiced + song_ret Music_PanelDePon2_branch_18053b: ; 18053b (60:453b) music01 6 @@ -1345,4 +1345,4 @@ Music_PanelDePon2_branch_18053b: ; 18053b (60:453b) music6d 127 music6d 126 music6d 127 - musiced + song_ret diff --git a/src/audio/music/paneldepon3.asm b/src/audio/music/paneldepon3.asm index 4078e38..387dbdd 100644 --- a/src/audio/music/paneldepon3.asm +++ b/src/audio/music/paneldepon3.asm @@ -5,24 +5,24 @@ Music_PanelDePon3: ; 8f689 (23:7689) dw Music_PanelDePon3_Ch4 Music_PanelDePon3_Ch1: ; 8f691 (23:7691) - musicda 119 - musice6 115 - musicdd + volume 119 + volume_envelope 115 + stereo_panning_both musicd6 25 musicd4 37 - musice1 + duty_cycle_75 musicd7 0 musicd8 113 Music_PanelDePon3_branch_8f69f: ; 8f69f (23:769f) - musicec Music_PanelDePon3_branch_8f6ba - musicec Music_PanelDePon3_branch_8f6ba - musicec Music_PanelDePon3_branch_8f6ba - musicec Music_PanelDePon3_branch_8f6ba - musicec Music_PanelDePon3_branch_8f6ba - musicec Music_PanelDePon3_branch_8f6ba - musicec Music_PanelDePon3_branch_8f6ba - musicec Music_PanelDePon3_branch_8f6db - musice7 Music_PanelDePon3_branch_8f69f + song_call Music_PanelDePon3_branch_8f6ba + song_call Music_PanelDePon3_branch_8f6ba + song_call Music_PanelDePon3_branch_8f6ba + song_call Music_PanelDePon3_branch_8f6ba + song_call Music_PanelDePon3_branch_8f6ba + song_call Music_PanelDePon3_branch_8f6ba + song_call Music_PanelDePon3_branch_8f6ba + song_call Music_PanelDePon3_branch_8f6db + song_jump Music_PanelDePon3_branch_8f69f Music_PanelDePon3_branch_8f6ba: ; 8f6ba (23:76ba) music01 2 @@ -57,7 +57,7 @@ Music_PanelDePon3_branch_8f6ba: ; 8f6ba (23:76ba) music8a 175 music01 4 musicd2 - musiced + song_ret Music_PanelDePon3_branch_8f6db: ; 8f6db (23:76db) music01 2 @@ -92,21 +92,21 @@ Music_PanelDePon3_branch_8f6db: ; 8f6db (23:76db) music8a 174 music01 4 musicd2 - musiced + song_ret Music_PanelDePon3_Ch2: ; 8f6fc (23:76fc) - musicda 119 - musice6 115 - musicdd + volume 119 + volume_envelope 115 + stereo_panning_both musicd6 25 musicd4 37 - musice0 + duty_cycle_50 musicd7 0 musicd8 118 Music_PanelDePon3_branch_8f70a: ; 8f70a (23:770a) musicd4 37 - musicec Music_PanelDePon3_branch_8f712 - musice7 Music_PanelDePon3_branch_8f70a + song_call Music_PanelDePon3_branch_8f712 + song_jump Music_PanelDePon3_branch_8f70a Music_PanelDePon3_branch_8f712: ; 8f712 (23:7712) music01 15 @@ -126,14 +126,14 @@ Music_PanelDePon3_branch_8f712: ; 8f712 (23:7712) musicd3 music01 48 musicd3 - musiced + song_ret Music_PanelDePon3_Ch3: ; 8f725 (23:7725) - musicdd + stereo_panning_both musicd4 35 musicd6 25 musicd7 12 - musice2 28 + wave 28 musicd8 107 music01 6 music8a 155 @@ -165,8 +165,8 @@ Music_PanelDePon3_Ch3: ; 8f725 (23:7725) music01 6 music8a 155 Music_PanelDePon3_branch_8f74d: ; 8f74d (23:774d) - musicec Music_PanelDePon3_branch_8f753 - musice7 Music_PanelDePon3_branch_8f74d + song_call Music_PanelDePon3_branch_8f753 + song_jump Music_PanelDePon3_branch_8f74d Music_PanelDePon3_branch_8f753: ; 8f753 (23:7753) music01 6 @@ -198,20 +198,20 @@ Music_PanelDePon3_branch_8f753: ; 8f753 (23:7753) music8a 151 music01 6 music8a 155 - musiced + song_ret Music_PanelDePon3_Ch4: ; 8f771 (23:7771) - musicdd + stereo_panning_both Music_PanelDePon3_branch_8f772: ; 8f772 (23:7772) - musicec Music_PanelDePon3_branch_8f78d - musicec Music_PanelDePon3_branch_8f78d - musicec Music_PanelDePon3_branch_8f78d - musicec Music_PanelDePon3_branch_8f78d - musicec Music_PanelDePon3_branch_8f78d - musicec Music_PanelDePon3_branch_8f78d - musicec Music_PanelDePon3_branch_8f78d - musicec Music_PanelDePon3_branch_8f797 - musice7 Music_PanelDePon3_branch_8f772 + song_call Music_PanelDePon3_branch_8f78d + song_call Music_PanelDePon3_branch_8f78d + song_call Music_PanelDePon3_branch_8f78d + song_call Music_PanelDePon3_branch_8f78d + song_call Music_PanelDePon3_branch_8f78d + song_call Music_PanelDePon3_branch_8f78d + song_call Music_PanelDePon3_branch_8f78d + song_call Music_PanelDePon3_branch_8f797 + song_jump Music_PanelDePon3_branch_8f772 Music_PanelDePon3_branch_8f78d: ; 8f78d (23:778d) music01 6 @@ -223,7 +223,7 @@ Music_PanelDePon3_branch_8f78d: ; 8f78d (23:778d) music6d 120 music6d 126 music6d 119 - musiced + song_ret Music_PanelDePon3_branch_8f797: ; 8f797 (23:7797) music01 12 @@ -238,4 +238,4 @@ Music_PanelDePon3_branch_8f797: ; 8f797 (23:7797) music6d 127 music6d 126 music6d 127 - musiced + song_ret diff --git a/src/audio/music/roundcleared.asm b/src/audio/music/roundcleared.asm index bd3019e..f636840 100644 --- a/src/audio/music/roundcleared.asm +++ b/src/audio/music/roundcleared.asm @@ -5,24 +5,24 @@ Music_RoundCleared: ; 187940 (61:7940) dw Music_RoundCleared_Ch4 Music_RoundCleared_Ch1: ; 187948 (61:7948) - musicda 119 - musice6 115 - musicdd + volume 119 + volume_envelope 115 + stereo_panning_both musicd6 16 musicd7 0 - musicde + duty_cycle_12_5 musice3 2 musicd8 221 - musicec Music_RoundCleared_branch_187963 + song_call Music_RoundCleared_branch_187963 music01 24 musicd2 Music_RoundCleared_branch_18795b: ; 18795b (61:795b) musicd6 15 - musicec Music_RoundCleared_branch_187996 - musice7 Music_RoundCleared_branch_18795b + song_call Music_RoundCleared_branch_187996 + song_jump Music_RoundCleared_branch_18795b Music_RoundCleared_branch_187963: ; 187963 (61:7963) - musicde + duty_cycle_12_5 musicd8 179 musicd4 55 musicd7 0 @@ -67,10 +67,10 @@ Music_RoundCleared_branch_187963: ; 187963 (61:7963) music8a 193 music01 6 musicd2 - musiced + song_ret Music_RoundCleared_branch_187996: ; 187996 (61:7996) - musicde + duty_cycle_12_5 musicd7 0 musicd4 55 musicd8 34 @@ -229,24 +229,24 @@ Music_RoundCleared_branch_187996: ; 187996 (61:7996) music8a 208 music01 6 musicd2 - musiced + song_ret Music_RoundCleared_Ch2: ; 187a39 (61:7a39) - musicda 119 - musice6 115 - musicdd - musice0 + volume 119 + volume_envelope 115 + stereo_panning_both + duty_cycle_50 musicd4 55 - musicec Music_RoundCleared_branch_187a4c + song_call Music_RoundCleared_branch_187a4c music01 24 musicd2 Music_RoundCleared_branch_187a46: ; 187a46 (61:7a46) - musicec Music_RoundCleared_branch_187a72 - musice7 Music_RoundCleared_branch_187a46 + song_call Music_RoundCleared_branch_187a72 + song_jump Music_RoundCleared_branch_187a46 Music_RoundCleared_branch_187a4c: ; 187a4c (61:7a4c) musicd7 0 - musice0 + duty_cycle_50 musicd8 175 musicd4 55 music01 3 @@ -278,10 +278,10 @@ Music_RoundCleared_branch_187a4c: ; 187a4c (61:7a4c) musicd8 46 music01 27 music8a 188 - musiced + song_ret Music_RoundCleared_branch_187a72: ; 187a72 (61:7a72) - musice0 + duty_cycle_50 musicd7 0 musicd4 55 musicd8 36 @@ -305,7 +305,7 @@ Music_RoundCleared_branch_187a72: ; 187a72 (61:7a72) music8a 174 music01 9 musicd2 - musicde + duty_cycle_12_5 music01 3 music8a 181 music01 6 @@ -318,7 +318,7 @@ Music_RoundCleared_branch_187a72: ; 187a72 (61:7a72) music8a 169 music01 9 musicd3 - musice0 + duty_cycle_50 musicd4 59 musicd8 166 music01 6 @@ -351,7 +351,7 @@ Music_RoundCleared_branch_187a72: ; 187a72 (61:7a72) music8a 174 music01 9 musicd2 - musicde + duty_cycle_12_5 music01 3 music8a 181 music01 6 @@ -364,7 +364,7 @@ Music_RoundCleared_branch_187a72: ; 187a72 (61:7a72) music8a 181 music01 9 musicd3 - musice0 + duty_cycle_50 musicd8 166 musicd4 59 music01 3 @@ -445,7 +445,7 @@ Music_RoundCleared_branch_187a72: ; 187a72 (61:7a72) music8a 185 music01 9 musicd2 - musicde + duty_cycle_12_5 music01 3 music8a 198 music01 3 @@ -458,20 +458,20 @@ Music_RoundCleared_branch_187a72: ; 187a72 (61:7a72) music8a 195 music01 6 music8a 193 - musiced + song_ret Music_RoundCleared_Ch3: ; 187b31 (61:7b31) - musicdd + stereo_panning_both musice3 0 musicd8 27 musicd7 12 musicd4 56 - musicec Music_RoundCleared_branch_187b45 + song_call Music_RoundCleared_branch_187b45 music01 24 musicd2 Music_RoundCleared_branch_187b3f: ; 187b3f (61:7b3f) - musicec Music_RoundCleared_branch_187b5c - musice7 Music_RoundCleared_branch_187b3f + song_call Music_RoundCleared_branch_187b5c + song_jump Music_RoundCleared_branch_187b3f Music_RoundCleared_branch_187b45: ; 187b45 (61:7b45) music01 3 @@ -496,11 +496,11 @@ Music_RoundCleared_branch_187b45: ; 187b45 (61:7b45) musicd3 music01 6 musicd2 - musiced + song_ret Music_RoundCleared_branch_187b5c: ; 187b5c (61:7b5c) musicd7 12 - musice2 64 + wave 64 music01 3 music8a 145 music01 9 @@ -657,17 +657,17 @@ Music_RoundCleared_branch_187b5c: ; 187b5c (61:7b5c) musicd2 music01 12 music8a 161 - musiced + song_ret Music_RoundCleared_Ch4: ; 187bfd (61:7bfd) - musicdd + stereo_panning_both musicd6 16 - musicec Music_RoundCleared_branch_187c0b + song_call Music_RoundCleared_branch_187c0b music01 24 musicd2 Music_RoundCleared_branch_187c05: ; 187c05 (61:7c05) - musicec Music_RoundCleared_branch_187c22 - musice7 Music_RoundCleared_branch_187c05 + song_call Music_RoundCleared_branch_187c22 + song_jump Music_RoundCleared_branch_187c05 Music_RoundCleared_branch_187c0b: ; 187c0b (61:7c0b) music01 3 @@ -692,7 +692,7 @@ Music_RoundCleared_branch_187c0b: ; 187c0b (61:7c0b) musicd3 music01 36 musicd3 - musiced + song_ret Music_RoundCleared_branch_187c22: ; 187c22 (61:7c22) music01 6 @@ -829,4 +829,4 @@ Music_RoundCleared_branch_187c22: ; 187c22 (61:7c22) music6d 125 music01 6 music6d 112 - musiced + song_ret diff --git a/src/audio/music/secrettrainer.asm b/src/audio/music/secrettrainer.asm index 1d69683..b83bbba 100644 --- a/src/audio/music/secrettrainer.asm +++ b/src/audio/music/secrettrainer.asm @@ -5,21 +5,21 @@ Music_SecretTrainer: ; 18fae0 (63:7ae0) dw Music_SecretTrainer_Ch4 Music_SecretTrainer_Ch1: ; 18fae8 (63:7ae8) - musicda 119 - musice6 115 - musicdd + volume 119 + volume_envelope 115 + stereo_panning_both musicd6 17 musicd7 0 - musicde + duty_cycle_12_5 musice3 2 musicd8 221 - musicec Music_SecretTrainer_branch_18faff + song_call Music_SecretTrainer_branch_18faff Music_SecretTrainer_branch_18faf9: ; 18faf9 (63:7af9) - musicec Music_SecretTrainer_branch_18fb11 - musice7 Music_SecretTrainer_branch_18faf9 + song_call Music_SecretTrainer_branch_18fb11 + song_jump Music_SecretTrainer_branch_18faf9 Music_SecretTrainer_branch_18faff: ; 18faff (63:7aff) - musicde + duty_cycle_12_5 musicd8 205 musicd4 55 musicd8 39 @@ -33,7 +33,7 @@ Music_SecretTrainer_branch_18faff: ; 18faff (63:7aff) music8a 149 music01 3 music8a 161 - musiced + song_ret Music_SecretTrainer_branch_18fb11: ; 18fb11 (63:7b11) musicd8 39 @@ -121,24 +121,24 @@ Music_SecretTrainer_branch_18fb11: ; 18fb11 (63:7b11) music8a 162 music01 9 musicd2 - musiced + song_ret Music_SecretTrainer_Ch2: ; 18fb68 (63:7b68) - 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_SecretTrainer_branch_18fb7e + song_call Music_SecretTrainer_branch_18fb7e Music_SecretTrainer_branch_18fb78: ; 18fb78 (63:7b78) - musicec Music_SecretTrainer_branch_18fb94 - musice7 Music_SecretTrainer_branch_18fb78 + song_call Music_SecretTrainer_branch_18fb94 + song_jump Music_SecretTrainer_branch_18fb78 Music_SecretTrainer_branch_18fb7e: ; 18fb7e (63:7b7e) - musice1 + duty_cycle_75 musicd4 55 musicd8 39 music01 3 @@ -157,10 +157,10 @@ Music_SecretTrainer_branch_18fb7e: ; 18fb7e (63:7b7e) music8a 167 music01 3 music8a 165 - musiced + song_ret Music_SecretTrainer_branch_18fb94: ; 18fb94 (63:7b94) - musice0 + duty_cycle_50 musicd8 180 music01 3 music8a 178 @@ -211,34 +211,34 @@ Music_SecretTrainer_branch_18fb94: ; 18fb94 (63:7b94) music8a 176 music01 3 music8a 177 - musiced + song_ret Music_SecretTrainer_Ch3: ; 18fbce (63:7bce) - musicdd + stereo_panning_both musice3 0 musicd8 27 musicd7 12 - musice2 61 + wave 61 musicd4 55 - musicec Music_SecretTrainer_branch_18fbe2 + song_call Music_SecretTrainer_branch_18fbe2 Music_SecretTrainer_branch_18fbdc: ; 18fbdc (63:7bdc) - musicec Music_SecretTrainer_branch_18fbe7 - musice7 Music_SecretTrainer_branch_18fbdc + song_call Music_SecretTrainer_branch_18fbe7 + song_jump Music_SecretTrainer_branch_18fbdc Music_SecretTrainer_branch_18fbe2: ; 18fbe2 (63:7be2) music01 48 musicd2 music01 12 musicd2 - musiced + song_ret Music_SecretTrainer_branch_18fbe7: ; 18fbe7 (63:7be7) - musice2 61 + wave 61 music01 3 music8a 166 music01 9 musicd2 - musice2 63 + wave 63 music01 3 music8a 166 music01 9 @@ -251,12 +251,12 @@ Music_SecretTrainer_branch_18fbe7: ; 18fbe7 (63:7be7) music8a 166 music01 9 musicd2 - musice2 61 + wave 61 music01 3 music8a 167 music01 9 musicd2 - musice2 63 + wave 63 music01 3 music8a 167 music01 9 @@ -269,12 +269,12 @@ Music_SecretTrainer_branch_18fbe7: ; 18fbe7 (63:7be7) music8a 167 music01 9 musicd2 - musice2 61 + wave 61 music01 3 music8a 169 music01 9 musicd2 - musice2 63 + wave 63 music01 3 music8a 169 music01 9 @@ -287,12 +287,12 @@ Music_SecretTrainer_branch_18fbe7: ; 18fbe7 (63:7be7) music8a 169 music01 9 musicd2 - musice2 61 + wave 61 music01 3 music8a 167 music01 9 musicd2 - musice2 63 + wave 63 music01 3 music8a 167 music01 9 @@ -307,21 +307,21 @@ Music_SecretTrainer_branch_18fbe7: ; 18fbe7 (63:7be7) musicd3 music01 6 musicd2 - musiced + song_ret Music_SecretTrainer_Ch4: ; 18fc3a (63:7c3a) - musicdd - musicec Music_SecretTrainer_branch_18fc44 + stereo_panning_both + song_call Music_SecretTrainer_branch_18fc44 Music_SecretTrainer_branch_18fc3e: ; 18fc3e (63:7c3e) - musicec Music_SecretTrainer_branch_18fc49 - musice7 Music_SecretTrainer_branch_18fc3e + song_call Music_SecretTrainer_branch_18fc49 + song_jump Music_SecretTrainer_branch_18fc3e Music_SecretTrainer_branch_18fc44: ; 18fc44 (63:7c44) music01 48 musicd2 music01 12 musicd2 - musiced + song_ret Music_SecretTrainer_branch_18fc49: ; 18fc49 (63:7c49) music01 3 @@ -404,4 +404,4 @@ Music_SecretTrainer_branch_18fc49: ; 18fc49 (63:7c49) music6d 126 music01 3 music6d 127 - musiced + song_ret diff --git a/src/audio/music/secrettrainervictory.asm b/src/audio/music/secrettrainervictory.asm index cc9a537..b622dc6 100644 --- a/src/audio/music/secrettrainervictory.asm +++ b/src/audio/music/secrettrainervictory.asm @@ -5,13 +5,13 @@ Music_SecretTrainerVictory: ; 18f986 (63:7986) dw $0000 Music_SecretTrainerVictory_Ch1: ; 18f98e (63:798e) - musicda 119 - musice6 115 - musicdd + volume 119 + volume_envelope 115 + stereo_panning_both musicd6 30 musicd7 0 musicd4 55 - musicde + duty_cycle_12_5 musicd4 55 musicd8 180 music01 6 @@ -66,7 +66,7 @@ Music_SecretTrainerVictory_Ch1: ; 18f98e (63:798e) musicd2 music01 1 musicd2 - music00 + song_end ; unreferenced ? Music_SecretTrainerVictory_branch_18f9d3: ; 18f98e (63:798e) @@ -117,17 +117,17 @@ Music_SecretTrainerVictory_branch_18f9d3: ; 18f98e (63:798e) musicd3 music01 1 musicd2 - music00 + song_end Music_SecretTrainerVictory_Ch2: ; 18fa03 (63:7a03) - musicda 119 - musice6 115 - musicdd + volume 119 + volume_envelope 115 + stereo_panning_both musicd6 30 musicd4 49 musicd8 162 musicd4 49 - musicde + duty_cycle_12_5 music01 2 musicd2 music01 4 @@ -235,15 +235,15 @@ Music_SecretTrainerVictory_Ch2: ; 18fa03 (63:7a03) musicd3 music01 1 musicd2 - music00 + song_end Music_SecretTrainerVictory_Ch3: ; 18fa83 (63:7a83) - musicdd + stereo_panning_both musicd6 30 musice3 0 musicd4 49 musicd8 109 - musice2 34 + wave 34 music01 6 music8a 182 music01 12 @@ -323,5 +323,5 @@ Music_SecretTrainerVictory_Ch3: ; 18fa83 (63:7a83) musicd3 music01 1 musicd2 - music00 - music00 + song_end + song_end diff --git a/src/audio/music/titlescreen.asm b/src/audio/music/titlescreen.asm index 687456d..ccacc13 100644 --- a/src/audio/music/titlescreen.asm +++ b/src/audio/music/titlescreen.asm @@ -5,20 +5,20 @@ Music_TitleScreen: ; 18c000 (63:4000) dw Music_TitleScreen_Ch4 Music_TitleScreen_Ch1: ; 18c008 (63:4008) - musicda 119 - musice6 115 - musicdd - musice1 + volume 119 + volume_envelope 115 + stereo_panning_both + duty_cycle_75 musicd4 55 - musicde + duty_cycle_12_5 musicd4 55 musicd6 13 musice3 1 - musicec Music_TitleScreen_branch_18c022 + song_call Music_TitleScreen_branch_18c022 Music_TitleScreen_branch_18c01a: ; 18c01a (63:401a) musice3 0 - musicec Music_TitleScreen_branch_18c10e - musice7 Music_TitleScreen_branch_18c01a + song_call Music_TitleScreen_branch_18c10e + song_jump Music_TitleScreen_branch_18c01a Music_TitleScreen_branch_18c022: ; 18c022 (63:4022) musicd5 @@ -164,7 +164,7 @@ Music_TitleScreen_branch_18c022: ; 18c022 (63:4022) musicd8 203 music01 1 music8a 193 - musice0 + duty_cycle_50 musicd4 52 musicd8 224 music01 6 @@ -203,10 +203,10 @@ Music_TitleScreen_branch_18c022: ; 18c022 (63:4022) musicd5 music01 1 musicd2 - musiced + song_ret Music_TitleScreen_branch_18c10e: ; 18c10e (63:410e) - musicde + duty_cycle_12_5 musicd4 55 musicd8 36 music01 3 @@ -313,7 +313,7 @@ Music_TitleScreen_branch_18c10e: ; 18c10e (63:410e) music8a 164 music01 3 music8a 169 - musice0 + duty_cycle_50 musicd4 52 musicd8 224 music01 3 @@ -325,7 +325,7 @@ Music_TitleScreen_branch_18c10e: ; 18c10e (63:410e) musicd8 219 music01 3 music8a 152 - musicde + duty_cycle_12_5 musicd4 55 musicd8 36 music8a 157 @@ -431,7 +431,7 @@ Music_TitleScreen_branch_18c10e: ; 18c10e (63:410e) music8a 164 music01 3 music8a 169 - musice0 + duty_cycle_50 musicd4 52 musicd8 224 music01 3 @@ -442,7 +442,7 @@ Music_TitleScreen_branch_18c10e: ; 18c10e (63:410e) music8a 159 music01 3 music8a 155 - musicde + duty_cycle_12_5 musicd4 55 musicd8 36 music8a 157 @@ -584,7 +584,7 @@ Music_TitleScreen_branch_18c10e: ; 18c10e (63:410e) music8a 193 music01 3 musicd2 - musice0 + duty_cycle_50 musicd4 52 musicd8 224 music01 3 @@ -596,24 +596,24 @@ Music_TitleScreen_branch_18c10e: ; 18c10e (63:410e) musicd8 219 music01 3 music8a 155 - musiced + song_ret Music_TitleScreen_Ch2: ; 18c2a3 (63:42a3) - musicda 119 - musice6 115 - musicdd - musice1 + volume 119 + volume_envelope 115 + stereo_panning_both + duty_cycle_75 musicd8 39 - musicec Music_TitleScreen_branch_18c2b4 + song_call Music_TitleScreen_branch_18c2b4 Music_TitleScreen_branch_18c2ae: ; 18c2ae (63:42ae) - musicec Music_TitleScreen_branch_18c41e - musice7 Music_TitleScreen_branch_18c2ae + song_call Music_TitleScreen_branch_18c41e + song_jump Music_TitleScreen_branch_18c2ae Music_TitleScreen_branch_18c2b4: ; 18c2b4 (63:42b4) music01 6 musicd2 musicd8 202 - musicde + duty_cycle_12_5 music01 1 music8a 176 musicd8 201 @@ -882,10 +882,10 @@ Music_TitleScreen_branch_18c2b4: ; 18c2b4 (63:42b4) musicd8 203 music01 1 music8a 181 - musiced + song_ret Music_TitleScreen_branch_18c41e: ; 18c41e (63:441e) - musice0 + duty_cycle_50 music01 12 musicd2 musicd4 59 @@ -1104,55 +1104,55 @@ Music_TitleScreen_branch_18c41e: ; 18c41e (63:441e) music8a 197 music01 3 musicd2 - musiced + song_ret Music_TitleScreen_Ch3: ; 18c51b (63:451b) - musicdd + stereo_panning_both musicd8 27 - musice2 7 + wave 7 musicd8 104 musicd7 24 - musicec Music_TitleScreen_branch_18c52d + song_call Music_TitleScreen_branch_18c52d Music_TitleScreen_branch_18c527: ; 18c527 (63:4527) - musicec Music_TitleScreen_branch_18c580 - musice7 Music_TitleScreen_branch_18c527 + song_call Music_TitleScreen_branch_18c580 + song_jump Music_TitleScreen_branch_18c527 Music_TitleScreen_branch_18c52d: ; 18c52d (63:452d) music01 3 music8a 152 music01 3 music8a 157 - musice2 71 + wave 71 music01 3 music8a 161 music01 3 music8a 162 - musice2 70 + wave 70 music01 3 music8a 152 music01 3 music8a 157 - musice2 69 + wave 69 music01 3 music8a 161 music01 3 music8a 162 - musice2 68 + wave 68 music01 3 music8a 152 music01 3 music8a 157 - musice2 67 + wave 67 music01 3 music8a 161 music01 3 music8a 162 - musice2 66 + wave 66 music01 3 music8a 152 music01 3 music8a 157 - musice2 65 + wave 65 music01 3 music8a 161 music01 3 @@ -1161,7 +1161,7 @@ Music_TitleScreen_branch_18c52d: ; 18c52d (63:452d) music8a 152 music01 3 music8a 157 - musice2 64 + wave 64 music01 3 music8a 161 music01 3 @@ -1180,7 +1180,7 @@ Music_TitleScreen_branch_18c52d: ; 18c52d (63:452d) music8a 157 music01 3 music8a 161 - musice2 63 + wave 63 music01 3 music8a 162 music01 3 @@ -1191,13 +1191,13 @@ Music_TitleScreen_branch_18c52d: ; 18c52d (63:452d) music8a 161 music01 3 music8a 162 - musiced + song_ret Music_TitleScreen_branch_18c580: ; 18c580 (63:4580) musice3 0 musicd7 12 musicd8 27 - musice2 62 + wave 62 music01 3 music8a 145 music01 3 @@ -1326,7 +1326,7 @@ Music_TitleScreen_branch_18c580: ; 18c580 (63:4580) music8a 150 music01 6 musicd2 - musice2 7 + wave 7 musicd8 104 music01 3 music8a 169 @@ -1355,7 +1355,7 @@ Music_TitleScreen_branch_18c580: ; 18c580 (63:4580) music8a 164 music01 3 musicd2 - musice2 62 + wave 62 musicd8 27 music01 6 music8a 150 @@ -1428,7 +1428,7 @@ Music_TitleScreen_branch_18c580: ; 18c580 (63:4580) music8a 157 music01 3 musicd2 - musice2 7 + wave 7 musicd8 104 music8a 171 music01 3 @@ -1535,14 +1535,14 @@ Music_TitleScreen_branch_18c580: ; 18c580 (63:4580) music8a 183 music01 3 musicd2 - musiced + song_ret Music_TitleScreen_Ch4: ; 18c6e0 (63:46e0) - musicdd - musicec Music_TitleScreen_branch_18c6ea + stereo_panning_both + song_call Music_TitleScreen_branch_18c6ea Music_TitleScreen_branch_18c6e4: ; 18c6e4 (63:46e4) - musicec Music_TitleScreen_branch_18c716 - musice7 Music_TitleScreen_branch_18c6e4 + song_call Music_TitleScreen_branch_18c716 + song_jump Music_TitleScreen_branch_18c6e4 Music_TitleScreen_branch_18c6ea: ; 18c6ea (63:46ea) music01 3 @@ -1588,7 +1588,7 @@ Music_TitleScreen_branch_18c6ea: ; 18c6ea (63:46ea) music6d 127 music01 3 music6d 127 - musiced + song_ret Music_TitleScreen_branch_18c716: ; 18c716 (63:4716) music01 3 @@ -2039,4 +2039,4 @@ Music_TitleScreen_branch_18c716: ; 18c716 (63:4716) music6d 112 music01 3 music6d 127 - musiced + song_ret diff --git a/src/audio/music/travellingtothegyms.asm b/src/audio/music/travellingtothegyms.asm index 7231564..2446ab0 100644 --- a/src/audio/music/travellingtothegyms.asm +++ b/src/audio/music/travellingtothegyms.asm @@ -5,23 +5,23 @@ Music_TravellingToTheGyms: ; 1875fd (61:75fd) dw $0000 Music_TravellingToTheGyms_Ch1: ; 187605 (61:7605) - musicda 119 - musice6 115 - musicdd + volume 119 + volume_envelope 115 + stereo_panning_both musicd6 19 musicd7 0 - musice1 + duty_cycle_75 musice3 2 musicd4 55 musicd8 221 music01 12 musicd2 Music_TravellingToTheGyms_branch_187617: ; 187617 (61:7617) - musicec Music_TravellingToTheGyms_branch_18761d - musice7 Music_TravellingToTheGyms_branch_187617 + song_call Music_TravellingToTheGyms_branch_18761d + song_jump Music_TravellingToTheGyms_branch_187617 Music_TravellingToTheGyms_branch_18761d: ; 18761d (61:761d) - musicde + duty_cycle_12_5 musicd4 55 musicd8 35 music01 12 @@ -211,14 +211,14 @@ Music_TravellingToTheGyms_branch_18761d: ; 18761d (61:761d) music8a 176 music01 24 musicd2 - musiced + song_ret Music_TravellingToTheGyms_Ch2: ; 1876de (61:76de) - musicda 119 - musice6 115 - musicdd + volume 119 + volume_envelope 115 + stereo_panning_both musicd7 0 - musice0 + duty_cycle_50 musicd6 19 musicd4 55 musicd8 31 @@ -228,8 +228,8 @@ Music_TravellingToTheGyms_Ch2: ; 1876de (61:76de) music01 6 music8a 174 Music_TravellingToTheGyms_branch_1876f2: ; 1876f2 (61:76f2) - musicec Music_TravellingToTheGyms_branch_1876f8 - musice7 Music_TravellingToTheGyms_branch_1876f2 + song_call Music_TravellingToTheGyms_branch_1876f8 + song_jump Music_TravellingToTheGyms_branch_1876f2 Music_TravellingToTheGyms_branch_1876f8: ; 1876f8 (61:76f8) music01 6 @@ -375,9 +375,9 @@ Music_TravellingToTheGyms_branch_1876f8: ; 1876f8 (61:76f8) music8a 179 music01 6 musicd2 - musicde + duty_cycle_12_5 musicd8 206 - musice1 + duty_cycle_75 musicd8 31 music01 12 music8a 203 @@ -387,9 +387,9 @@ Music_TravellingToTheGyms_branch_1876f8: ; 1876f8 (61:76f8) music8a 200 music01 12 musicd3 - musicde + duty_cycle_12_5 musicd8 206 - musice1 + duty_cycle_75 musicd8 31 music01 12 music8a 196 @@ -407,7 +407,7 @@ Music_TravellingToTheGyms_branch_1876f8: ; 1876f8 (61:76f8) music8a 193 music01 6 musicd3 - musice0 + duty_cycle_50 musicd8 31 music8a 174 music01 3 @@ -478,10 +478,10 @@ Music_TravellingToTheGyms_branch_1876f8: ; 1876f8 (61:76f8) music8a 172 music01 6 music8a 174 - musiced + song_ret Music_TravellingToTheGyms_Ch3: ; 187802 (61:7802) - musicdd + stereo_panning_both musice3 0 musicd8 104 musicd4 56 @@ -489,9 +489,9 @@ Music_TravellingToTheGyms_Ch3: ; 187802 (61:7802) musicd2 Music_TravellingToTheGyms_branch_18780b: ; 18780b (61:780b) musicd7 12 - musice2 59 - musicec Music_TravellingToTheGyms_branch_187817 - musice7 Music_TravellingToTheGyms_branch_18780b + wave 59 + song_call Music_TravellingToTheGyms_branch_187817 + song_jump Music_TravellingToTheGyms_branch_18780b ; unreferenced ? Music_TravellingToTheGyms_branch_187815: ; 187802 (61:7802) @@ -784,11 +784,11 @@ Music_TravellingToTheGyms_branch_187817: ; 187817 (61:7817) musicd2 music01 12 music8a 143 - musiced + song_ret ; unreferenced ? Music_TravellingToTheGyms_branch_187936: ; 187802 (61:7802) - musicdd + stereo_panning_both music01 12 musicd2 Music_TravellingToTheGyms_branch_187939: ; 187939 (61:7939) @@ -796,4 +796,4 @@ Music_TravellingToTheGyms_branch_187939: ; 187939 (61:7939) music6d 120 music01 6 music6d 122 - musice7 Music_TravellingToTheGyms_branch_187939 + song_jump Music_TravellingToTheGyms_branch_187939 diff --git a/src/audio/music/unusedsong1.asm b/src/audio/music/unusedsong1.asm index 89c15b4..fc93bcc 100644 --- a/src/audio/music/unusedsong1.asm +++ b/src/audio/music/unusedsong1.asm @@ -5,12 +5,12 @@ Music_UnusedSong1: ; 1856af (61:56af) dw Music_UnusedSong1_Ch4 Music_UnusedSong1_Ch1: ; 1856b7 (61:56b7) - musicda 119 - musice6 115 - musicdd + volume 119 + volume_envelope 115 + stereo_panning_both musicd6 18 musicd7 0 - musicde + duty_cycle_12_5 musice3 2 musicd4 55 musicd8 220 @@ -26,8 +26,8 @@ Music_UnusedSong1_Ch1: ; 1856b7 (61:56b7) music8a 184 Music_UnusedSong1_branch_1856d1: ; 1856d1 (61:56d1) musicd4 55 - musicec Music_UnusedSong1_branch_1856d9 - musice7 Music_UnusedSong1_branch_1856d1 + song_call Music_UnusedSong1_branch_1856d9 + song_jump Music_UnusedSong1_branch_1856d1 Music_UnusedSong1_branch_1856d9: ; 1856d9 (61:56d9) music01 1 @@ -353,15 +353,15 @@ Music_UnusedSong1_branch_1856d9: ; 1856d9 (61:56d9) musicd2 music01 47 music8a 173 - musiced + song_ret Music_UnusedSong1_Ch2: ; 18581d (61:581d) - musicda 119 - musice6 115 - musicdd + volume 119 + volume_envelope 115 + stereo_panning_both musicd6 20 musicd7 0 - musice0 + duty_cycle_50 musicd4 55 musicd8 160 musicd4 58 @@ -382,13 +382,13 @@ Music_UnusedSong1_Ch2: ; 18581d (61:581d) music8a 184 Music_UnusedSong1_branch_18583e: ; 18583e (61:583e) musicd4 55 - musicde - musicec Music_UnusedSong1_branch_185847 - musice7 Music_UnusedSong1_branch_18583e + duty_cycle_12_5 + song_call Music_UnusedSong1_branch_185847 + song_jump Music_UnusedSong1_branch_18583e Music_UnusedSong1_branch_185847: ; 185847 (61:5847) musicd8 166 - musice0 + duty_cycle_50 musicd4 58 music01 6 music8a 190 @@ -427,7 +427,7 @@ Music_UnusedSong1_branch_185847: ; 185847 (61:5847) music8a 183 music01 6 music8a 184 - musicde + duty_cycle_12_5 music01 3 music8a 190 music01 3 @@ -450,7 +450,7 @@ Music_UnusedSong1_branch_185847: ; 185847 (61:5847) music8a 190 music01 3 musicd2 - musice0 + duty_cycle_50 musicd4 58 music01 18 music8a 186 @@ -497,7 +497,7 @@ Music_UnusedSong1_branch_185847: ; 185847 (61:5847) music8a 183 music01 6 music8a 184 - musicde + duty_cycle_12_5 music01 3 music8a 190 music01 3 @@ -520,7 +520,7 @@ Music_UnusedSong1_branch_185847: ; 185847 (61:5847) music8a 190 music01 3 musicd2 - musice0 + duty_cycle_50 musicd4 58 music01 18 music8a 186 @@ -626,7 +626,7 @@ Music_UnusedSong1_branch_185847: ; 185847 (61:5847) music01 3 music8a 170 musicd8 55 - musice1 + duty_cycle_75 music01 2 musicd2 music01 18 @@ -667,13 +667,13 @@ Music_UnusedSong1_branch_185847: ; 185847 (61:5847) musicd4 61 music01 8 music8a 173 - musiced + song_ret Music_UnusedSong1_Ch3: ; 18596e (61:596e) - musicdd + stereo_panning_both musicd4 35 musicd7 12 - musice2 63 + wave 63 musicd8 27 musicd4 58 music01 6 @@ -690,8 +690,8 @@ Music_UnusedSong1_Ch3: ; 18596e (61:596e) music8a 142 Music_UnusedSong1_branch_185986: ; 185986 (61:5986) musicd5 - musicec Music_UnusedSong1_branch_18598d - musice7 Music_UnusedSong1_branch_185986 + song_call Music_UnusedSong1_branch_18598d + song_jump Music_UnusedSong1_branch_185986 Music_UnusedSong1_branch_18598d: ; 18598d (61:598d) music01 6 @@ -1060,10 +1060,10 @@ Music_UnusedSong1_branch_18598d: ; 18598d (61:598d) music8a 156 music01 3 musicd2 - musiced + song_ret Music_UnusedSong1_Ch4: ; 185afc (61:5afc) - musicdd + stereo_panning_both music01 6 music6d 124 music01 3 @@ -1587,4 +1587,4 @@ Music_UnusedSong1_branch_185b0b: ; 185b0b (61:5b0b) music6d 124 music01 3 music6d 124 - musice7 Music_UnusedSong1_branch_185b0b + song_jump Music_UnusedSong1_branch_185b0b diff --git a/src/audio/music/unusedsong2.asm b/src/audio/music/unusedsong2.asm index 974c63e..d9d739c 100644 --- a/src/audio/music/unusedsong2.asm +++ b/src/audio/music/unusedsong2.asm @@ -5,12 +5,12 @@ Music_UnusedSong2: ; 184d11 (61:4d11) dw Music_UnusedSong2_Ch4 Music_UnusedSong2_Ch1: ; 184d19 (61:4d19) - musicda 119 - musice6 115 - musicdd + volume 119 + volume_envelope 115 + stereo_panning_both musicd6 18 musicd7 0 - musicde + duty_cycle_12_5 musice3 2 musicd4 55 musicd8 220 @@ -26,8 +26,8 @@ Music_UnusedSong2_Ch1: ; 184d19 (61:4d19) music8a 184 Music_UnusedSong2_branch_184d33: ; 184d33 (61:4d33) musicd4 55 - musicec Music_UnusedSong2_branch_184d3b - musice7 Music_UnusedSong2_branch_184d33 + song_call Music_UnusedSong2_branch_184d3b + song_jump Music_UnusedSong2_branch_184d33 Music_UnusedSong2_branch_184d3b: ; 184d3b (61:4d3b) music01 1 @@ -545,15 +545,15 @@ Music_UnusedSong2_branch_184d3b: ; 184d3b (61:4d3b) musicd2 music01 47 music8a 168 - musiced + song_ret Music_UnusedSong2_Ch2: ; 184f3f (61:4f3f) - musicda 119 - musice6 115 - musicdd + volume 119 + volume_envelope 115 + stereo_panning_both musicd6 20 musicd7 0 - musice0 + duty_cycle_50 musicd4 55 musicd8 160 musicd4 58 @@ -575,11 +575,11 @@ Music_UnusedSong2_Ch2: ; 184f3f (61:4f3f) Music_UnusedSong2_branch_184f60: ; 184f60 (61:4f60) musicd8 221 musicd4 55 - musicde - musicec Music_UnusedSong2_branch_184f6f - musice0 - musicec Music_UnusedSong2_branch_185047 - musice7 Music_UnusedSong2_branch_184f60 + duty_cycle_12_5 + song_call Music_UnusedSong2_branch_184f6f + duty_cycle_50 + song_call Music_UnusedSong2_branch_185047 + song_jump Music_UnusedSong2_branch_184f60 Music_UnusedSong2_branch_184f6f: ; 184f6f (61:4f6f) musicd8 221 @@ -788,11 +788,11 @@ Music_UnusedSong2_branch_184f6f: ; 184f6f (61:4f6f) music8a 185 music01 3 musicd2 - musiced + song_ret Music_UnusedSong2_branch_185047: ; 185047 (61:5047) musicd7 12 - musice0 + duty_cycle_50 musicd8 166 musicd4 58 music01 18 @@ -956,7 +956,7 @@ Music_UnusedSong2_branch_185047: ; 185047 (61:5047) music01 3 music8a 170 musicd8 55 - musice1 + duty_cycle_75 music01 2 musicd2 music01 18 @@ -997,13 +997,13 @@ Music_UnusedSong2_branch_185047: ; 185047 (61:5047) musicd4 61 music01 8 music8a 173 - musiced + song_ret Music_UnusedSong2_Ch3: ; 18512e (61:512e) - musicdd + stereo_panning_both musicd4 35 musicd7 12 - musice2 63 + wave 63 musicd8 27 musicd4 58 music01 6 @@ -1020,12 +1020,12 @@ Music_UnusedSong2_Ch3: ; 18512e (61:512e) music8a 142 Music_UnusedSong2_branch_185146: ; 185146 (61:5146) musicd5 - musicec Music_UnusedSong2_branch_18514d - musice7 Music_UnusedSong2_branch_185146 + song_call Music_UnusedSong2_branch_18514d + song_jump Music_UnusedSong2_branch_185146 Music_UnusedSong2_branch_18514d: ; 18514d (61:514d) musicd7 24 - musice2 63 + wave 63 musicd8 27 musicd4 58 music01 12 @@ -1240,7 +1240,7 @@ Music_UnusedSong2_branch_18514d: ; 18514d (61:514d) music8a 153 music01 3 musicd2 - musice2 62 + wave 62 musicd7 12 musicd8 27 music01 6 @@ -1609,10 +1609,10 @@ Music_UnusedSong2_branch_18514d: ; 18514d (61:514d) music8a 156 music01 3 musicd2 - musiced + song_ret Music_UnusedSong2_Ch4: ; 1853a4 (61:53a4) - musicdd + stereo_panning_both music01 6 music6d 124 music01 3 @@ -2389,4 +2389,4 @@ Music_UnusedSong2_branch_1853b3: ; 1853b3 (61:53b3) music6d 124 music01 3 music6d 124 - musice7 Music_UnusedSong2_branch_1853b3 + song_jump Music_UnusedSong2_branch_1853b3 diff --git a/src/audio/music/unusedsong3.asm b/src/audio/music/unusedsong3.asm index c9ec9ee..1e8a820 100644 --- a/src/audio/music/unusedsong3.asm +++ b/src/audio/music/unusedsong3.asm @@ -5,16 +5,16 @@ Music_UnusedSong3: ; 192339 (64:6339) dw $0000 Music_UnusedSong3_Ch1: ; 192341 (64:6341) - musicda 119 - musice6 115 - musicdd + volume 119 + volume_envelope 115 + stereo_panning_both musicd6 9 - musicde + duty_cycle_12_5 musicd7 0 musicd4 55 Music_UnusedSong3_branch_19234d: ; 19234d (64:634d) - musicec Music_UnusedSong3_branch_192358 - musice7 Music_UnusedSong3_branch_19234d + song_call Music_UnusedSong3_branch_192358 + song_jump Music_UnusedSong3_branch_19234d ; unreferenced ? Music_UnusedSong3_branch_192353: ; 192341 (64:6341) @@ -22,7 +22,7 @@ Music_UnusedSong3_branch_192353: ; 192341 (64:6341) musicd2 music01 48 musicd2 - musiced + song_ret Music_UnusedSong3_branch_192358: ; 192358 (64:6358) musice3 1 @@ -220,24 +220,24 @@ Music_UnusedSong3_branch_192358: ; 192358 (64:6358) music8a 195 music01 12 music8a 193 - musiced + song_ret Music_UnusedSong3_Ch2: ; 192430 (64:6430) - musicda 119 - musice6 115 - musicdd + volume 119 + volume_envelope 115 + stereo_panning_both musicd6 9 musicd7 244 musice3 0 Music_UnusedSong3_branch_19243b: ; 19243b (64:643b) - musicec Music_UnusedSong3_branch_19245d - musice7 Music_UnusedSong3_branch_19243b + song_call Music_UnusedSong3_branch_19245d + song_jump Music_UnusedSong3_branch_19243b ; unreferenced ? Music_UnusedSong3_branch_192441: ; 192430 (64:6430) music01 1 musicd2 - musicde + duty_cycle_12_5 music01 1 music8a 197 music01 5 @@ -262,12 +262,12 @@ Music_UnusedSong3_branch_192441: ; 192430 (64:6430) music8a 198 music01 3 musicd2 - musiced + song_ret Music_UnusedSong3_branch_19245d: ; 19245d (64:645d) musicd8 43 musicd4 55 - musicde + duty_cycle_12_5 musicd7 0 music01 12 musicd2 @@ -343,13 +343,13 @@ Music_UnusedSong3_branch_19245d: ; 19245d (64:645d) music8a 193 music01 12 music8a 193 - musiced + song_ret Music_UnusedSong3_Ch3: ; 1924af (64:64af) - musicdd + stereo_panning_both Music_UnusedSong3_branch_1924b0: ; 1924b0 (64:64b0) - musicec Music_UnusedSong3_branch_1924d1 - musice7 Music_UnusedSong3_branch_1924b0 + song_call Music_UnusedSong3_branch_1924d1 + song_jump Music_UnusedSong3_branch_1924b0 ; unreferenced ? Music_UnusedSong3_branch_1924b6: ; 1924af (64:64af) @@ -378,11 +378,11 @@ Music_UnusedSong3_branch_1924b6: ; 1924af (64:64af) music8a 198 music01 3 musicd2 - musiced + song_ret Music_UnusedSong3_branch_1924d1: ; 1924d1 (64:64d1) musicd7 0 - musice2 8 + wave 8 musicd8 102 music01 2 music8a 173 @@ -518,12 +518,12 @@ Music_UnusedSong3_branch_1924d1: ; 1924d1 (64:64d1) music8a 181 music01 6 music8a 176 - musiced + song_ret ; unreferenced ? Music_UnusedSong3_branch_19255e: ; 1924af (64:64af) - musicdd + stereo_panning_both Music_UnusedSong3_branch_19255f: ; 19255f (64:655f) musicd2 music01 48 - musice7 Music_UnusedSong3_branch_19255f + song_jump Music_UnusedSong3_branch_19255f diff --git a/src/audio/music/violetandolivinegym.asm b/src/audio/music/violetandolivinegym.asm index 31390f4..8de7329 100644 --- a/src/audio/music/violetandolivinegym.asm +++ b/src/audio/music/violetandolivinegym.asm @@ -5,12 +5,12 @@ Music_VioletAndOlivineGym: ; 186675 (61:6675) dw Music_VioletAndOlivineGym_Ch4 Music_VioletAndOlivineGym_Ch1: ; 18667d (61:667d) - musicda 119 - musice6 115 - musicdd + volume 119 + volume_envelope 115 + stereo_panning_both musicd6 10 musicd7 0 - musicde + duty_cycle_12_5 musice3 254 musicd4 55 musicd8 221 @@ -123,8 +123,8 @@ Music_VioletAndOlivineGym_Ch1: ; 18667d (61:667d) music01 6 music8a 148 Music_VioletAndOlivineGym_branch_1866fa: ; 1866fa (61:66fa) - musicec Music_VioletAndOlivineGym_branch_186700 - musice7 Music_VioletAndOlivineGym_branch_1866fa + song_call Music_VioletAndOlivineGym_branch_186700 + song_jump Music_VioletAndOlivineGym_branch_1866fa Music_VioletAndOlivineGym_branch_186700: ; 186700 (61:6700) musicd8 207 @@ -535,14 +535,14 @@ Music_VioletAndOlivineGym_branch_186700: ; 186700 (61:6700) music8a 165 music01 27 musicd2 - musiced + song_ret Music_VioletAndOlivineGym_Ch2: ; 18689b (61:689b) - musicda 119 - musice6 115 - musicdd + volume 119 + volume_envelope 115 + stereo_panning_both musicd7 0 - musice0 + duty_cycle_50 musicd4 55 musicd8 11 musicd8 178 @@ -652,12 +652,12 @@ Music_VioletAndOlivineGym_Ch2: ; 18689b (61:689b) music01 3 musicd2 Music_VioletAndOlivineGym_branch_18691e: ; 18691e (61:691e) - musicec Music_VioletAndOlivineGym_branch_186924 - musice7 Music_VioletAndOlivineGym_branch_18691e + song_call Music_VioletAndOlivineGym_branch_186924 + song_jump Music_VioletAndOlivineGym_branch_18691e Music_VioletAndOlivineGym_branch_186924: ; 186924 (61:6924) musicd8 42 - musicde + duty_cycle_12_5 music01 6 musicd2 music01 1 @@ -720,7 +720,7 @@ Music_VioletAndOlivineGym_branch_186924: ; 186924 (61:6924) music01 3 music8a 177 musicd8 206 - musicde + duty_cycle_12_5 musicd4 58 music01 6 music8a 178 @@ -741,7 +741,7 @@ Music_VioletAndOlivineGym_branch_186924: ; 186924 (61:6924) music01 12 musicd2 musicd8 178 - musice0 + duty_cycle_50 musicd7 0 music01 3 music8a 165 @@ -821,7 +821,7 @@ Music_VioletAndOlivineGym_branch_186924: ; 186924 (61:6924) music01 4 musicd2 musicd8 42 - musicde + duty_cycle_12_5 music01 6 musicd2 music01 1 @@ -895,7 +895,7 @@ Music_VioletAndOlivineGym_branch_186924: ; 186924 (61:6924) music01 21 musicd2 musicd8 178 - musice0 + duty_cycle_50 music01 3 music8a 165 music01 3 @@ -961,7 +961,7 @@ Music_VioletAndOlivineGym_branch_186924: ; 186924 (61:6924) music01 12 music8a 165 musicd8 206 - musice0 + duty_cycle_50 musicd7 12 music01 3 music8a 173 @@ -986,7 +986,7 @@ Music_VioletAndOlivineGym_branch_186924: ; 186924 (61:6924) music01 3 musicd2 musicd8 178 - musice0 + duty_cycle_50 musicd7 0 music8a 161 music01 3 @@ -1079,7 +1079,7 @@ Music_VioletAndOlivineGym_branch_186924: ; 186924 (61:6924) music01 3 musicd2 musicd8 42 - musicde + duty_cycle_12_5 music01 6 musicd2 music01 1 @@ -1152,12 +1152,12 @@ Music_VioletAndOlivineGym_branch_186924: ; 186924 (61:6924) music8a 173 music01 27 musicd2 - musiced + song_ret Music_VioletAndOlivineGym_Ch3: ; 186b2c (61:6b2c) - musicdd + stereo_panning_both musicd8 27 - musice2 62 + wave 62 music01 6 musicd2 music01 2 @@ -1212,7 +1212,7 @@ Music_VioletAndOlivineGym_Ch3: ; 186b2c (61:6b2c) music8a 160 music01 13 musicd2 - musice2 4 + wave 4 musicd8 103 musice3 2 musicd7 24 @@ -1231,11 +1231,11 @@ Music_VioletAndOlivineGym_Ch3: ; 186b2c (61:6b2c) music01 6 music8a 148 Music_VioletAndOlivineGym_branch_186b7d: ; 186b7d (61:6b7d) - musicec Music_VioletAndOlivineGym_branch_186b83 - musice7 Music_VioletAndOlivineGym_branch_186b7d + song_call Music_VioletAndOlivineGym_branch_186b83 + song_jump Music_VioletAndOlivineGym_branch_186b7d Music_VioletAndOlivineGym_branch_186b83: ; 186b83 (61:6b83) - musice2 62 + wave 62 musicd8 27 musice3 0 musicd7 0 @@ -1294,7 +1294,7 @@ Music_VioletAndOlivineGym_branch_186b83: ; 186b83 (61:6b83) music01 4 musicd2 musicd7 12 - musice2 68 + wave 68 musicd4 58 music01 6 music8a 175 @@ -1326,7 +1326,7 @@ Music_VioletAndOlivineGym_branch_186b83: ; 186b83 (61:6b83) music01 18 musicd2 musicd7 12 - musice2 65 + wave 65 musicd8 27 music01 6 music8a 149 @@ -1714,14 +1714,14 @@ Music_VioletAndOlivineGym_branch_186b83: ; 186b83 (61:6b83) musicd2 music01 6 music8a 144 - musiced + song_ret Music_VioletAndOlivineGym_Ch4: ; 186d6f (61:6d6f) - musicdd - musicec Music_VioletAndOlivineGym_branch_186d79 + stereo_panning_both + song_call Music_VioletAndOlivineGym_branch_186d79 Music_VioletAndOlivineGym_branch_186d73: ; 186d73 (61:6d73) - musicec Music_VioletAndOlivineGym_branch_186d82 - musice7 Music_VioletAndOlivineGym_branch_186d73 + song_call Music_VioletAndOlivineGym_branch_186d82 + song_jump Music_VioletAndOlivineGym_branch_186d73 Music_VioletAndOlivineGym_branch_186d79: ; 186d79 (61:6d79) music01 48 @@ -1732,7 +1732,7 @@ Music_VioletAndOlivineGym_branch_186d79: ; 186d79 (61:6d79) musicd2 music01 48 musicd2 - musiced + song_ret Music_VioletAndOlivineGym_branch_186d82: ; 186d82 (61:6d82) music01 2 @@ -2130,7 +2130,7 @@ Music_VioletAndOlivineGym_branch_186d82: ; 186d82 (61:6d82) music6d 119 music01 1 musicd2 - musiced + song_ret ; unreferenced ? Music_VioletAndOlivineGym_branch_186f0e: ; 186d6f (61:6d6f) @@ -2202,4 +2202,4 @@ Music_VioletAndOlivineGym_branch_186f0e: ; 186d6f (61:6d6f) music6d 127 music01 3 music6d 127 - musiced + song_ret diff --git a/src/macros/audio_macros.asm b/src/macros/audio_macros.asm index a7e2609..4211dda 100644 --- a/src/macros/audio_macros.asm +++ b/src/macros/audio_macros.asm @@ -1,4 +1,4 @@ -music00: MACRO +song_end: MACRO db $00 ENDM @@ -24,7 +24,7 @@ ENDM musicd4: MACRO db $d4 - db \1 + db \1 ; PointerTable_83401 ID ENDM musicd5: MACRO @@ -43,7 +43,7 @@ ENDM musicd8: MACRO db $d8 - db \1 + db \1 ; PointerTable_82230 ID ENDM ; unused ? @@ -51,44 +51,48 @@ musicd9: MACRO db $d9 ENDM -musicda: MACRO +volume: MACRO db $da db \1 ENDM ; unused ? -musicdb: MACRO +stereo_panning_right: MACRO db $db ENDM ; unused ? -musicdc: MACRO +stereo_panning_left: MACRO db $dc ENDM -musicdd: MACRO +stereo_panning_both: MACRO db $dd ENDM -musicde: MACRO +; duty cycle +duty_cycle_12_5: MACRO db $de ENDM -musicdf: MACRO +; duty cycle +duty_cycle_25: MACRO db $df ENDM -musice0: MACRO +; duty cycle +duty_cycle_50: MACRO db $e0 ENDM -musice1: MACRO +; duty cycle +duty_cycle_75: MACRO db $e1 ENDM -musice2: MACRO +wave: MACRO db $e2 - db \1 + db \1 ; DataTable_82f71 ID ENDM musice3: MACRO @@ -108,22 +112,22 @@ musice5: MACRO db \1 ENDM -musice6: MACRO +volume_envelope: MACRO db $e6 db \1 ENDM -musice7: MACRO +song_jump: MACRO db $e7 dw \1 ENDM -musicec: MACRO +song_call: MACRO db $ec dw \1 ENDM -musiced: MACRO +song_ret: MACRO db $ed ENDM |