mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-08 15:30:14 +00:00
Code Issues Projects Releases Wiki Activity

[PAL N64] Match handwritten audio sequences (#2210)

Browse source 
* [PAL N64] Match handwritten audio sequences

* Remove offset comments from PAL-only audio code

* Reorder includes
This commit is contained in:
cadmic 2024-09-21 04:30:52 -07:00 • committed by GitHub
parent a1a192b1a2
commit 5178011b64
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 268 additions and 234 deletions
Download patch file Download diff file Expand all files Collapse all files

197
assets/audio/sequences/seq_109.prg.seq
View file

@ -1,6 +1,7 @@
#include "aseq.h"
#include "Soundfont_1.h"
#include "Soundfont_0.h"
#include "versions.h"
.startseq Sequence_109
@ -53,8 +54,8 @@ CHAN_002D:
/* 0x0047 [0xC6 0x44 ] */ instr SF0_INST_68
/* 0x0049 [0xC2 0x18 ] */ transpose 24
/* 0x004B [0xCB 0x07 0x8A 0xE6 ] */ env ENVELOPE_078A, 230
/* 0x004F [0x70 0x81 0x0E 0x50 ] */ notedv PITCH_A4, 270, 80
/* 0x0053 [0x7C 0x81 0x2C 0x50 ] */ notedv PITCH_A5, 300, 80
/* 0x004F [0x70 0x81 0x0E 0x50 ] */ notedv PITCH_A4, FRAMERATE_CONST(270, 324), 80
/* 0x0053 [0x7C 0x81 0x2C 0x50 ] */ notedv PITCH_A5, FRAMERATE_CONST(300, 360), 80
/* 0x0057 [0xFF ] */ end
.layer LAYER_0058
@ -64,8 +65,8 @@ CHAN_002D:
/* 0x005E [0xC2 0x30 ] */ transpose 48
/* 0x0060 [0xCB 0x07 0x8A 0xB4 ] */ env ENVELOPE_078A, 180
/* 0x0064 [0xC7 0x81 0x38 0xFF ] */ portamento 0x81, PITCH_F5, 255
/* 0x0068 [0x78 0x80 0xFA 0x48 ] */ notedv PITCH_F5, 250, 72
/* 0x006C [0x7C 0x81 0x40 0x48 ] */ notedv PITCH_A5, 320, 72
/* 0x0068 [0x78 0x80 0xFA 0x48 ] */ notedv PITCH_F5, FRAMERATE_CONST(250, 300), 72
/* 0x006C [0x7C 0x81 0x40 0x48 ] */ notedv PITCH_A5, FRAMERATE_CONST(320, 384), 72
/* 0x0070 [0xFF ] */ end
.layer LAYER_0071
@ -73,7 +74,7 @@ CHAN_002D:
/* 0x0073 [0xC6 0x2E ] */ instr SF0_INST_46
/* 0x0075 [0xCB 0x07 0x8A 0xE6 ] */ env ENVELOPE_078A, 230
/* 0x0079 [0xC7 0x01 0x0F 0x85 0xC8] */ portamento 0x01, PITCH_C2, 1480
/* 0x007E [0x73 0x82 0x3A 0x40 ] */ notedv PITCH_C5, 570, 64
/* 0x007E [0x73 0x82 0x3A 0x40 ] */ notedv PITCH_C5, FRAMERATE_CONST(570, 684), 64
/* 0x0082 [0xFF ] */ end
.channel CHAN_0083
@ -91,7 +92,7 @@ CHAN_002D:
/* 0x0099 [0xC6 0x44 ] */ instr SF0_INST_68
/* 0x009B [0xCB 0x08 0xD2 0xDD ] */ env ENVELOPE_08D2, 221
/* 0x009F [0xC2 0x18 ] */ transpose 24
/* 0x00A1 [0x73 0x81 0x90 0x69 ] */ notedv PITCH_C5, 400, 105
/* 0x00A1 [0x73 0x81 0x90 0x69 ] */ notedv PITCH_C5, FRAMERATE_CONST(400, 480), 105
/* 0x00A5 [0xFF ] */ end
.layer LAYER_00A6
@ -99,17 +100,17 @@ CHAN_002D:
/* 0x00A8 [0xC6 0x45 ] */ instr SF0_INST_69
/* 0x00AA [0xCB 0x09 0x0A 0xE0 ] */ env ENVELOPE_090A, 224
/* 0x00AE [0xC7 0x81 0x03 0xFF ] */ portamento 0x81, PITCH_C1, 255
/* 0x00B2 [0x5F 0x81 0x2C 0x41 ] */ notedv PITCH_E3, 300, 65
/* 0x00B2 [0x5F 0x81 0x2C 0x41 ] */ notedv PITCH_E3, FRAMERATE_CONST(300, 360), 65
/* 0x00B6 [0xFF ] */ end
.layer LAYER_00B7
/* 0x00B7 [0xC6 0x08 ] */ instr SF0_INST_8
/* 0x00B9 [0xC7 0x81 0x18 0x19 ] */ portamento 0x81, PITCH_A2, 25
/* 0x00BD [0x5D 0x46 0x55 ] */ notedv PITCH_D3, 70, 85
/* 0x00C0 [0xC0 0x80 0xC8 ] */ ldelay 200
/* 0x00BD [0x5D 0x46 0x55 ] */ notedv PITCH_D3, FRAMERATE_CONST(70, 84), 85
/* 0x00C0 [0xC0 0x80 0xC8 ] */ ldelay FRAMERATE_CONST(200, 240)
/* 0x00C3 [0xCB 0x09 0x16 0xDD ] */ env ENVELOPE_0916, 221
/* 0x00C7 [0xC7 0x81 0x1B 0x19 ] */ portamento 0x81, PITCH_C3, 25
/* 0x00CB [0x60 0x80 0x96 0x55 ] */ notedv PITCH_F3, 150, 85
/* 0x00CB [0x60 0x80 0x96 0x55 ] */ notedv PITCH_F3, FRAMERATE_CONST(150, 180), 85
/* 0x00CF [0xFF ] */ end
.channel CHAN_00D0
@ -125,8 +126,8 @@ CHAN_002D:
/* 0x00E0 [0xC6 0x2C ] */ instr SF0_INST_44
/* 0x00E2 [0xCF 0xDD ] */ releaserate 221
/* 0x00E4 [0xC7 0x84 0x16 0x7F ] */ portamento 0x84, PITCH_G2, 127
/* 0x00E8 [0x70 0x60 0x55 ] */ notedv PITCH_A4, 96, 85
/* 0x00EB [0x72 0x7F 0x5F ] */ notedv PITCH_B4, 127, 95
/* 0x00E8 [0x70 0x60 0x55 ] */ notedv PITCH_A4, FRAMERATE_CONST(96, 115), 85
/* 0x00EB [0x72 0x7F 0x5F ] */ notedv PITCH_B4, FRAMERATE_CONST(127, 152), 95
/* 0x00EE [0xFF ] */ end
.layer LAYER_00EF
@ -140,11 +141,11 @@ CHAN_002D:
/* 0x00FB [0xCF 0xDD ] */ releaserate 221
LAYER_00FD:
/* 0x00FD [0xC7 0x85 0x2E 0xFF ] */ portamento 0x85, PITCH_G4, 255
/* 0x0101 [0x58 0x3C 0x5A ] */ notedv PITCH_A2, 60, 90
/* 0x0101 [0x58 0x3C 0x5A ] */ notedv PITCH_A2, FRAMERATE_CONST(60, 72), 90
/* 0x0104 [0xCB 0x07 0x12 0xDD ] */ env ENVELOPE_0712, 221
/* 0x0108 [0x64 0x24 0x5A ] */ notedv PITCH_A3, 36, 90
/* 0x0108 [0x64 0x24 0x5A ] */ notedv PITCH_A3, FRAMERATE_CONST(36, 43), 90
/* 0x010B [0xC7 0x85 0x33 0xFF ] */ portamento 0x85, PITCH_C5, 255
/* 0x010F [0x5B 0x7F 0x5A ] */ notedv PITCH_C3, 127, 90
/* 0x010F [0x5B 0x7F 0x5A ] */ notedv PITCH_C3, FRAMERATE_CONST(127, 152), 90
/* 0x0112 [0xFF ] */ end
.channel CHAN_0113
@ -156,19 +157,19 @@ LAYER_00FD:
/* 0x011A [0xC2 0x24 ] */ transpose 36
/* 0x011C [0xC6 0x2E ] */ instr SF0_INST_46
/* 0x011E [0xCB 0x08 0x7A 0xB4 ] */ env ENVELOPE_087A, 180
/* 0x0122 [0x6B 0x82 0x26 0x46 ] */ notedv PITCH_E4, 550, 70
/* 0x0122 [0x6B 0x82 0x26 0x46 ] */ notedv PITCH_E4, FRAMERATE_CONST(550, 660), 70
/* 0x0126 [0xFF ] */ end
.layer LAYER_0127
/* 0x0127 [0xC2 0x1E ] */ transpose 30
/* 0x0129 [0xC6 0x44 ] */ instr SF0_INST_68
/* 0x012B [0xCB 0x08 0x7A 0xDD ] */ env ENVELOPE_087A, 221
/* 0x012F [0x60 0x80 0x9B 0x64 ] */ notedv PITCH_F3, 155, 100
/* 0x0133 [0x6C 0x7F 0x64 ] */ notedv PITCH_F4, 127, 100
/* 0x012F [0x60 0x80 0x9B 0x64 ] */ notedv PITCH_F3, FRAMERATE_CONST(155, 186), 100
/* 0x0133 [0x6C 0x7F 0x64 ] */ notedv PITCH_F4, FRAMERATE_CONST(127, 152), 100
/* 0x0136 [0xC2 0x24 ] */ transpose 36
/* 0x0138 [0xC6 0x44 ] */ instr SF0_INST_68
/* 0x013A [0xCB 0x08 0x8A 0xDD ] */ env ENVELOPE_088A, 221
/* 0x013E [0x67 0x80 0xF8 0x64 ] */ notedv PITCH_C4, 248, 100
/* 0x013E [0x67 0x80 0xF8 0x64 ] */ notedv PITCH_C4, FRAMERATE_CONST(248, 288), 100
/* 0x0142 [0xFF ] */ end
.channel CHAN_0143
@ -178,7 +179,7 @@ LAYER_00FD:
/* 0x014C [0xFF ] */ end
.layer LAYER_014D
/* 0x014D [0xC0 0x81 0x90 ] */ ldelay 400
/* 0x014D [0xC0 0x81 0x90 ] */ ldelay FRAMERATE_CONST(400, 480)
/* 0x0150 [0xFF ] */ end
.channel CHAN_0151
@ -195,20 +196,20 @@ LAYER_00FD:
.layer LAYER_0165
/* 0x0165 [0xCB 0x07 0x8A 0xE7 ] */ env ENVELOPE_078A, 231
/* 0x0169 [0xC7 0x81 0x26 0xFF ] */ portamento 0x81, PITCH_B3, 255
/* 0x016D [0x60 0x82 0x4E 0x4B ] */ notedv PITCH_F3, 590, 75
/* 0x016D [0x60 0x82 0x4E 0x4B ] */ notedv PITCH_F3, FRAMERATE_CONST(590, 708), 75
/* 0x0171 [0xFF ] */ end
.layer LAYER_0172
/* 0x0172 [0xC0 0x81 0x5E ] */ ldelay 350
/* 0x0172 [0xC0 0x81 0x5E ] */ ldelay FRAMERATE_CONST(350, 420)
/* 0x0175 [0xCB 0x07 0x92 0xE7 ] */ env ENVELOPE_0792, 231
/* 0x0179 [0xC7 0x81 0x03 0xFF ] */ portamento 0x81, PITCH_C1, 255
/* 0x017D [0x5B 0x80 0xF0 0x64 ] */ notedv PITCH_C3, 240, 100
/* 0x017D [0x5B 0x80 0xF0 0x64 ] */ notedv PITCH_C3, FRAMERATE_CONST(240, 288), 100
/* 0x0181 [0xFF ] */ end
.layer LAYER_0182
/* 0x0182 [0xC6 0x4D ] */ instr SF0_INST_77
/* 0x0184 [0xCB 0x07 0x92 0xE7 ] */ env ENVELOPE_0792, 231
/* 0x0188 [0x63 0x82 0x08 0x5C ] */ notedv PITCH_AF3, 520, 92
/* 0x0188 [0x63 0x82 0x08 0x5C ] */ notedv PITCH_AF3, FRAMERATE_CONST(520, 624), 92
/* 0x018C [0xFF ] */ end
.channel CHAN_018D
@ -398,7 +399,7 @@ LAYER_02D0:
/* 0x02E7 [0xFF ] */ end
.layer LAYER_02E8
/* 0x02E8 [0xC0 0x87 0x50 ] */ ldelay 1872
/* 0x02E8 [0xC0 0x87 0x50 ] */ ldelay FRAMERATE_CONST(1872, 2247)
/* 0x02EB [0xFF ] */ end
.layer LAYER_02EC
@ -416,30 +417,30 @@ LAYER_02D0:
.channel CHAN_0300
/* 0x0300 [0xC6 0x01 ] */ font Soundfont_1_ID
/* 0x0302 [0x21 0x03 0x44 ] */ ldchan 1, CHAN_0344
/* 0x0305 [0xFD 0x81 0x02 ] */ delay 258
/* 0x0305 [0xFD 0x81 0x02 ] */ delay FRAMERATE_CONST(258, 310)
/* 0x0308 [0x88 0x03 0x12 ] */ ldlayer 0, LAYER_0312
/* 0x030B [0x89 0x03 0x2C ] */ ldlayer 1, LAYER_032C
/* 0x030E [0xFD 0x84 0x7E ] */ delay 1150
/* 0x030E [0xFD 0x84 0x7E ] */ delay FRAMERATE_CONST(1150, 1380)
/* 0x0311 [0xFF ] */ end
.layer LAYER_0312
/* 0x0312 [0xC6 0x03 ] */ instr SF1_INST_3
/* 0x0314 [0xCB 0x09 0x16 0xDD ] */ env ENVELOPE_0916, 221
/* 0x0318 [0x2D 0x64 0x5A 0x32 ] */ notedvg PITCH_GF4, 100, 90, 50
/* 0x0318 [0x2D 0x64 0x5A 0x32 ] */ notedvg PITCH_GF4, FRAMERATE_CONST(100, 120), 90, 50
/* 0x031C [0xC7 0x81 0x30 0xFF ] */ portamento 0x81, PITCH_A4, 255
/* 0x0320 [0x67 0x64 0x5A ] */ notedv PITCH_C4, 100, 90
/* 0x0320 [0x67 0x64 0x5A ] */ notedv PITCH_C4, FRAMERATE_CONST(100, 120), 90
/* 0x0323 [0xC7 0x81 0x32 0x64 ] */ portamento 0x81, PITCH_B4, 100
/* 0x0327 [0x4F 0x81 0xF4 0x5A ] */ notedv PITCH_C2, 500, 90
/* 0x0327 [0x4F 0x81 0xF4 0x5A ] */ notedv PITCH_C2, FRAMERATE_CONST(500, 600), 90
/* 0x032B [0xFF ] */ end
.layer LAYER_032C
/* 0x032C [0xC6 0x29 ] */ instr SF1_INST_41
/* 0x032E [0xCF 0xDD ] */ releaserate 221
/* 0x0330 [0x2B 0x64 0x5A 0x32 ] */ notedvg PITCH_E4, 100, 90, 50
/* 0x0330 [0x2B 0x64 0x5A 0x32 ] */ notedvg PITCH_E4, FRAMERATE_CONST(100, 120), 90, 50
/* 0x0334 [0xC7 0x81 0x2E 0xFF ] */ portamento 0x81, PITCH_G4, 255
/* 0x0338 [0x66 0x64 0x5A ] */ notedv PITCH_B3, 100, 90
/* 0x0338 [0x66 0x64 0x5A ] */ notedv PITCH_B3, FRAMERATE_CONST(100, 120), 90
/* 0x033B [0xC7 0x81 0x30 0x64 ] */ portamento 0x81, PITCH_A4, 100
/* 0x033F [0x4E 0x81 0xF4 0x5A ] */ notedv PITCH_B1, 500, 90
/* 0x033F [0x4E 0x81 0xF4 0x5A ] */ notedv PITCH_B1, FRAMERATE_CONST(500, 600), 90
/* 0x0343 [0xFF ] */ end
.channel CHAN_0344
@ -455,9 +456,9 @@ LAYER_02D0:
/* 0x0357 [0xD7 0x60 ] */ vibfreq 96
/* 0x0359 [0xD8 0x54 ] */ vibdepth 84
/* 0x035B [0xDB 0xF4 ] */ transpose -12
/* 0x035D [0xFD 0x81 0x02 ] */ delay 258
/* 0x035D [0xFD 0x81 0x02 ] */ delay FRAMERATE_CONST(258, 310)
/* 0x0360 [0xDB 0x04 ] */ transpose 4
/* 0x0362 [0xFD 0x84 0x7E ] */ delay 1150
/* 0x0362 [0xFD 0x84 0x7E ] */ delay FRAMERATE_CONST(1150, 1380)
CHAN_0365:
/* 0x0365 [0xFE ] */ delay1
/* 0x0366 [0x80 ] */ testlayer 0
@ -489,7 +490,7 @@ CHAN_0365:
/* 0x038E [0xC6 0x3C ] */ instr SF0_INST_60
/* 0x0390 [0xCB 0x07 0x8A 0xF1 ] */ env ENVELOPE_078A, 241
/* 0x0394 [0xC7 0x81 0x03 0xE0 ] */ portamento 0x81, PITCH_C1, 224
/* 0x0398 [0x72 0x80 0xC6 0x50 ] */ notedv PITCH_B4, 198, 80
/* 0x0398 [0x72 0x80 0xC6 0x50 ] */ notedv PITCH_B4, FRAMERATE_CONST(198, 238), 80
/* 0x039C [0xFF ] */ end
.layer LAYER_039D
@ -497,7 +498,7 @@ CHAN_0365:
/* 0x039F [0xCB 0x08 0x6E 0xDD ] */ env ENVELOPE_086E, 221
/* 0x03A3 [0xC2 0x0C ] */ transpose 12
/* 0x03A5 [0xC7 0x81 0x02 0xFF ] */ portamento 0x81, PITCH_B0, 255
/* 0x03A9 [0x7E 0x80 0xFA 0x55 ] */ notedv PITCH_B5, 250, 85
/* 0x03A9 [0x7E 0x80 0xFA 0x55 ] */ notedv PITCH_B5, FRAMERATE_CONST(250, 300), 85
/* 0x03AD [0xFF ] */ end
.channel CHAN_03AE
@ -515,12 +516,12 @@ CHAN_0365:
/* 0x03C5 [0xC6 0x46 ] */ instr SF0_INST_70
/* 0x03C7 [0xCB 0x06 0xCE 0xF5 ] */ env ENVELOPE_06CE, 245
/* 0x03CB [0xC7 0x82 0x1B 0xFF ] */ portamento 0x82, PITCH_C3, 255
/* 0x03CF [0x67 0x80 0x96 0x50 ] */ notedv PITCH_C4, 150, 80
/* 0x03D3 [0xC0 0x80 0x96 ] */ ldelay 150
/* 0x03CF [0x67 0x80 0x96 0x50 ] */ notedv PITCH_C4, FRAMERATE_CONST(150, 180), 80
/* 0x03D3 [0xC0 0x80 0x96 ] */ ldelay FRAMERATE_CONST(150, 180)
/* 0x03D6 [0xFF ] */ end
.layer LAYER_03D7
/* 0x03D7 [0x5B 0x64 0x55 ] */ notedv PITCH_C3, 100, 85
/* 0x03D7 [0x5B 0x64 0x55 ] */ notedv PITCH_C3, FRAMERATE_CONST(100, 120), 85
/* 0x03DA [0xFF ] */ end
.layer LAYER_03DB
@ -528,19 +529,21 @@ CHAN_0365:
/* 0x03DD [0xC6 0x0C ] */ instr SF0_INST_12
/* 0x03DF [0xCB 0x07 0x8A 0xC8 ] */ env ENVELOPE_078A, 200
/* 0x03E3 [0xC7 0x82 0x33 0xB4 ] */ portamento 0x82, PITCH_C5, 180
/* 0x03E7 [0x7E 0x80 0xB4 0x4B ] */ notedv PITCH_B5, 180, 75
/* 0x03E7 [0x7E 0x80 0xB4 0x4B ] */ notedv PITCH_B5, FRAMERATE_CONST(180, 216), 75
/* 0x03EB [0xFF ] */ end
.layer LAYER_03EC
/* 0x03EC [0xC6 0x2A ] */ instr SF0_INST_42
/* 0x03EE [0xC7 0x81 0x22 0xD0 ] */ portamento 0x81, PITCH_G3, 208
/* 0x03F2 [0x5D 0x80 0xF0 0x69 ] */ notedv PITCH_D3, 240, 105
/* 0x03F2 [0x5D 0x80 0xF0 0x69 ] */ notedv PITCH_D3, FRAMERATE_CONST(240, 288), 105
/* 0x03F6 [0xFF ] */ end
#if !OOT_PAL_N64
/* 0x03F7 [0xC6 0x27 ] */ instr SF0_INST_39
/* 0x03F9 [0xC7 0x81 0x0A 0x2C ] */ portamento 0x81, PITCH_G1, 44
/* 0x03FD [0x56 0x80 0x8C 0x4B ] */ notedv PITCH_G2, 140, 75
/* 0x03FD [0x56 0x80 0x8C 0x4B ] */ notedv PITCH_G2, FRAMERATE_CONST(140, 168), 75
/* 0x0401 [0xFF ] */ end
#endif
.channel CHAN_0402
/* 0x0402 [0xDC 0x30 ] */ panweight 48
@ -553,7 +556,7 @@ CHAN_0365:
/* 0x0414 [0x8B 0x04 0x3B ] */ ldlayer 3, LAYER_043B
/* 0x0417 [0xD7 0x14 ] */ vibfreq 20
/* 0x0419 [0xD8 0x46 ] */ vibdepth 70
/* 0x041B [0xFD 0x60 ] */ delay 96
/* 0x041B [0xFD 0x60 ] */ delay FRAMERATE_CONST(96, 115)
/* 0x041D [0xE1 0x14 0x96 0x3C ] */ vibfreqgrad 20, 150, 60
/* 0x0421 [0xD8 0x46 ] */ vibdepth 70
/* 0x0423 [0xFF ] */ end
@ -563,16 +566,16 @@ CHAN_0365:
/* 0x0426 [0xCB 0x07 0x8A 0xD3 ] */ env ENVELOPE_078A, 211
/* 0x042A [0xC4 ] */ legato
/* 0x042B [0xC7 0x85 0x03 0xFF ] */ portamento 0x85, PITCH_C1, 255
/* 0x042F [0x54 0x60 0x64 ] */ notedv PITCH_F2, 96, 100
/* 0x0432 [0x54 0x80 0xC8 0x64 ] */ notedv PITCH_F2, 200, 100
/* 0x0436 [0x60 0x81 0x2C 0x4A ] */ notedv PITCH_F3, 300, 74
/* 0x042F [0x54 0x60 0x64 ] */ notedv PITCH_F2, FRAMERATE_CONST(96, 115), 100
/* 0x0432 [0x54 0x80 0xC8 0x64 ] */ notedv PITCH_F2, FRAMERATE_CONST(200, 240), 100
/* 0x0436 [0x60 0x81 0x2C 0x4A ] */ notedv PITCH_F3, FRAMERATE_CONST(300, 360), 74
/* 0x043A [0xFF ] */ end
.layer LAYER_043B
/* 0x043B [0xC6 0x52 ] */ instr SF0_INST_82
/* 0x043D [0xC2 0x18 ] */ transpose 24
/* 0x043F [0xCA 0x58 ] */ notepan 88
/* 0x0441 [0xC0 0x04 ] */ ldelay 4
/* 0x0441 [0xC0 0x04 ] */ ldelay FRAMERATE_CONST(4, 5)
/* 0x0443 [0xF4 0x0D ] */ rjump LAYER_0452
.layer LAYER_0445
@ -588,9 +591,9 @@ LAYER_0452:
/* 0x0452 [0xCB 0x07 0x8A 0xD3 ] */ env ENVELOPE_078A, 211
/* 0x0456 [0xC4 ] */ legato
/* 0x0457 [0xC7 0x85 0x0F 0xFF ] */ portamento 0x85, PITCH_C2, 255
/* 0x045B [0x60 0x60 0x4A ] */ notedv PITCH_F3, 96, 74
/* 0x045E [0x60 0x80 0xC8 0x4A ] */ notedv PITCH_F3, 200, 74
/* 0x0462 [0x6C 0x81 0x2C 0x4A ] */ notedv PITCH_F4, 300, 74
/* 0x045B [0x60 0x60 0x4A ] */ notedv PITCH_F3, FRAMERATE_CONST(96, 115), 74
/* 0x045E [0x60 0x80 0xC8 0x4A ] */ notedv PITCH_F3, FRAMERATE_CONST(200, 240), 74
/* 0x0462 [0x6C 0x81 0x2C 0x4A ] */ notedv PITCH_F4, FRAMERATE_CONST(300, 360), 74
/* 0x0466 [0xFF ] */ end
.channel CHAN_0467
@ -606,23 +609,23 @@ LAYER_0452:
/* 0x0479 [0xFC 0x01 0x56 ] */ call CHAN_0156
/* 0x047C [0x89 0x04 0x86 ] */ ldlayer 1, LAYER_0486
/* 0x047F [0x8B 0x04 0x98 ] */ ldlayer 3, LAYER_0498
/* 0x0482 [0xFD 0x83 0xE8 ] */ delay 1000
/* 0x0482 [0xFD 0x83 0xE8 ] */ delay FRAMERATE_CONST(1000, 1200)
/* 0x0485 [0xFF ] */ end
.layer LAYER_0486
/* 0x0486 [0xC6 0x0C ] */ instr SF0_INST_12
/* 0x0488 [0xCB 0x07 0x8A 0xE7 ] */ env ENVELOPE_078A, 231
/* 0x048C [0xC0 0x80 0x96 ] */ ldelay 150
/* 0x048C [0xC0 0x80 0x96 ] */ ldelay FRAMERATE_CONST(150, 180)
/* 0x048F [0xC7 0x81 0x1B 0xFF ] */ portamento 0x81, PITCH_C3, 255
/* 0x0493 [0x73 0x81 0xB8 0x2D ] */ notedv PITCH_C5, 440, 45
/* 0x0493 [0x73 0x81 0xB8 0x2D ] */ notedv PITCH_C5, FRAMERATE_CONST(440, 528), 45
/* 0x0497 [0xFF ] */ end
.layer LAYER_0498
/* 0x0498 [0xC6 0x2F ] */ instr SF0_INST_47
/* 0x049A [0xCB 0x07 0x92 0xE7 ] */ env ENVELOPE_0792, 231
/* 0x049E [0xC0 0x80 0xDC ] */ ldelay 220
/* 0x049E [0xC0 0x80 0xDC ] */ ldelay FRAMERATE_CONST(220, 264)
/* 0x04A1 [0xC7 0x81 0x0F 0xFF ] */ portamento 0x81, PITCH_C2, 255
/* 0x04A5 [0x5B 0x81 0x72 0x6E ] */ notedv PITCH_C3, 370, 110
/* 0x04A5 [0x5B 0x81 0x72 0x6E ] */ notedv PITCH_C3, FRAMERATE_CONST(370, 444), 110
/* 0x04A9 [0xFF ] */ end
.channel CHAN_04AA
@ -647,7 +650,7 @@ LAYER_0452:
/* 0x04CE [0x89 0x04 0xDB ] */ ldlayer 1, LAYER_04DB
/* 0x04D1 [0x8A 0x05 0x14 ] */ ldlayer 2, LAYER_0514
/* 0x04D4 [0x8B 0x05 0x0E ] */ ldlayer 3, LAYER_050E
/* 0x04D7 [0xFD 0x93 0x88 ] */ delay 5000
/* 0x04D7 [0xFD 0x93 0x88 ] */ delay FRAMERATE_CONST(5000, 6000)
/* 0x04DA [0xFF ] */ end
.layer LAYER_04DB
@ -655,11 +658,11 @@ LAYER_0452:
/* 0x04DD [0xCB 0x07 0x92 0xDD ] */ env ENVELOPE_0792, 221
/* 0x04E1 [0xCD 0x14 ] */ stereo 1, 0, 1, 0, 0
/* 0x04E3 [0xCA 0x54 ] */ notepan 84
/* 0x04E5 [0x54 0x80 0x91 0x48 ] */ notedv PITCH_F2, 145, 72
/* 0x04E5 [0x54 0x80 0x91 0x48 ] */ notedv PITCH_F2, FRAMERATE_CONST(145, 174), 72
LAYER_04E9:
/* 0x04E9 [0x5D 0x5A 0x46 ] */ notedv PITCH_D3, 90, 70
/* 0x04EC [0x60 0x80 0xE1 0x4A ] */ notedv PITCH_F3, 225, 74
/* 0x04F0 [0x58 0x61 0x44 ] */ notedv PITCH_A2, 97, 68
/* 0x04E9 [0x5D 0x5A 0x46 ] */ notedv PITCH_D3, FRAMERATE_CONST(90, 108), 70
/* 0x04EC [0x60 0x80 0xE1 0x4A ] */ notedv PITCH_F3, FRAMERATE_CONST(225, 270), 74
/* 0x04F0 [0x58 0x61 0x44 ] */ notedv PITCH_A2, FRAMERATE_CONST(97, 116), 68
/* 0x04F3 [0xF4 0xF4 ] */ rjump LAYER_04E9
.layer LAYER_04F5
@ -667,11 +670,11 @@ LAYER_04E9:
/* 0x04F7 [0xCB 0x07 0x92 0xDD ] */ env ENVELOPE_0792, 221
/* 0x04FB [0xCD 0x14 ] */ stereo 1, 0, 1, 0, 0
/* 0x04FD [0xCA 0x2C ] */ notepan 44
/* 0x04FF [0x5D 0x81 0x0B 0x48 ] */ notedv PITCH_D3, 267, 72
/* 0x04FF [0x5D 0x81 0x0B 0x48 ] */ notedv PITCH_D3, FRAMERATE_CONST(267, 320), 72
LAYER_0503:
/* 0x0503 [0x5B 0x5E 0x28 ] */ notedv PITCH_C3, 94, 40
/* 0x0506 [0x5D 0x7C 0x2C ] */ notedv PITCH_D3, 124, 44
/* 0x0509 [0x5A 0x30 0x44 ] */ notedv PITCH_B2, 48, 68
/* 0x0503 [0x5B 0x5E 0x28 ] */ notedv PITCH_C3, FRAMERATE_CONST(94, 113), 40
/* 0x0506 [0x5D 0x7C 0x2C ] */ notedv PITCH_D3, FRAMERATE_CONST(124, 149), 44
/* 0x0509 [0x5A 0x30 0x44 ] */ notedv PITCH_B2, FRAMERATE_CONST(48, 58), 68
/* 0x050C [0xF4 0xF5 ] */ rjump LAYER_0503
.layer LAYER_050E
@ -683,13 +686,13 @@ LAYER_0503:
/* 0x0514 [0xC6 0x2F ] */ instr SF0_INST_47
/* 0x0516 [0xCB 0x07 0x1E 0xE6 ] */ env ENVELOPE_071E, 230
LAYER_051A:
/* 0x051A [0xC0 0x8A 0x82 ] */ ldelay 2690
/* 0x051A [0xC0 0x8A 0x82 ] */ ldelay FRAMERATE_CONST(2690, 2854)
/* 0x051D [0xC7 0x81 0x37 0x3C ] */ portamento 0x81, PITCH_E5, 60
/* 0x0521 [0x4F 0x80 0xC0 0x64 ] */ notedv PITCH_C2, 192, 100
/* 0x0521 [0x4F 0x80 0xC0 0x64 ] */ notedv PITCH_C2, FRAMERATE_CONST(192, 230), 100
/* 0x0525 [0xC7 0x81 0x3A 0x3C ] */ portamento 0x81, PITCH_G5, 60
/* 0x0529 [0x53 0x80 0xC0 0x64 ] */ notedv PITCH_E2, 192, 100
/* 0x0529 [0x53 0x80 0xC0 0x64 ] */ notedv PITCH_E2, FRAMERATE_CONST(192, 230), 100
/* 0x052D [0xC7 0x81 0x3E 0x2D ] */ portamento 0x81, PITCH_B5, 45
/* 0x0531 [0x56 0x81 0xF4 0x64 ] */ notedv PITCH_G2, 500, 100
/* 0x0531 [0x56 0x81 0xF4 0x64 ] */ notedv PITCH_G2, FRAMERATE_CONST(500, 600), 100
/* 0x0535 [0xFF ] */ end
.layer LAYER_0536
@ -698,7 +701,7 @@ LAYER_051A:
/* 0x053B [0xC5 ] */ nolegato
/* 0x053C [0xC8 ] */ noportamento
/* 0x053D [0xC6 0x41 ] */ instr SF0_INST_65
/* 0x053F [0xC0 0x14 ] */ ldelay 20
/* 0x053F [0xC0 0x14 ] */ ldelay FRAMERATE_CONST(20, 24)
/* 0x0541 [0xC2 0xFD ] */ transpose -3
/* 0x0543 [0xF4 0x44 ] */ rjump LAYER_0589
@ -707,7 +710,7 @@ LAYER_051A:
/* 0x0548 [0xC5 ] */ nolegato
/* 0x0549 [0xC8 ] */ noportamento
/* 0x054A [0xC6 0x4D ] */ instr SF0_INST_77
/* 0x054C [0xC0 0x0A ] */ ldelay 10
/* 0x054C [0xC0 0x0A ] */ ldelay FRAMERATE_CONST(10, 12)
/* 0x054E [0xC2 0x0A ] */ transpose 10
/* 0x0550 [0xF4 0x37 ] */ rjump LAYER_0589
@ -716,14 +719,14 @@ LAYER_051A:
/* 0x0554 [0xCB 0x07 0x92 0xD3 ] */ env ENVELOPE_0792, 211
/* 0x0558 [0xC4 ] */ legato
/* 0x0559 [0xC7 0x85 0x33 0xFF ] */ portamento 0x85, PITCH_C5, 255
/* 0x055D [0x77 0x80 0xC8 0x5A ] */ notedv PITCH_E5, 200, 90
/* 0x0561 [0x7A 0x89 0x79 0x50 ] */ notedv PITCH_G5, 2425, 80
/* 0x055D [0x77 0x80 0xC8 0x5A ] */ notedv PITCH_E5, FRAMERATE_CONST(200, 240), 90
/* 0x0561 [0x7A 0x89 0x79 0x50 ] */ notedv PITCH_G5, FRAMERATE_CONST(2425, 2910), 80
/* 0x0565 [0xFF ] */ end
.layer LAYER_0566
/* 0x0566 [0xC2 0x05 ] */ transpose 5
/* 0x0568 [0xFC 0x05 0x81 ] */ call LAYER_0581
/* 0x056B [0xC0 0x14 ] */ ldelay 20
/* 0x056B [0xC0 0x14 ] */ ldelay FRAMERATE_CONST(20, 24)
/* 0x056D [0xC6 0x4D ] */ instr SF0_INST_77
/* 0x056F [0xF4 0x18 ] */ rjump LAYER_0589
@ -737,15 +740,15 @@ LAYER_051A:
/* 0x057D [0xC7 0x81 0x11 0xFF ] */ portamento 0x81, PITCH_D2, 255
.layer LAYER_0581
/* 0x0581 [0xC6 0x36 ] */ instr SF0_INST_54
/* 0x0583 [0x58 0x8A 0x41 0x41 ] */ notedv PITCH_A2, 2625, 65
/* 0x0583 [0x58 0x8A 0x41 0x41 ] */ notedv PITCH_A2, FRAMERATE_CONST(2625, 2920), 65
/* 0x0587 [0xC5 ] */ nolegato
/* 0x0588 [0xFF ] */ end
LAYER_0589:
/* 0x0589 [0x5F 0x80 0xC0 0x78 ] */ notedv PITCH_E3, 192, 120
/* 0x058D [0x62 0x80 0xC0 0x78 ] */ notedv PITCH_G3, 192, 120
/* 0x0589 [0x5F 0x80 0xC0 0x78 ] */ notedv PITCH_E3, FRAMERATE_CONST(192, 230), 120
/* 0x058D [0x62 0x80 0xC0 0x78 ] */ notedv PITCH_G3, FRAMERATE_CONST(192, 230), 120
/* 0x0591 [0xCF 0xA0 ] */ releaserate 160
/* 0x0593 [0x64 0x80 0xC0 0x78 ] */ notedv PITCH_A3, 192, 120
/* 0x0593 [0x64 0x80 0xC0 0x78 ] */ notedv PITCH_A3, FRAMERATE_CONST(192, 230), 120
/* 0x0597 [0xFF ] */ end
.channel CHAN_0598
@ -773,22 +776,22 @@ LAYER_0589:
/* 0x05C9 [0x88 0x05 0xDA ] */ ldlayer 0, LAYER_05DA
/* 0x05CC [0x89 0x05 0xE0 ] */ ldlayer 1, LAYER_05E0
/* 0x05CF [0x21 0x05 0xE6 ] */ ldchan 1, CHAN_05E6
/* 0x05D2 [0xFD 0x87 0x08 ] */ delay 1800
/* 0x05D2 [0xFD 0x87 0x08 ] */ delay FRAMERATE_CONST(1800, 2160)
/* 0x05D5 [0x90 ] */ dellayer 0
/* 0x05D6 [0x91 ] */ dellayer 1
/* 0x05D7 [0xFD 0x64 ] */ delay 100
/* 0x05D7 [0xFD 0x64 ] */ delay FRAMERATE_CONST(100, 120)
/* 0x05D9 [0xFF ] */ end
.layer LAYER_05DA
/* 0x05DA [0xC4 ] */ legato
LAYER_05DB:
/* 0x05DB [0x43 0x64 0x50 ] */ notedv PITCH_C1, 100, 80
/* 0x05DB [0x43 0x64 0x50 ] */ notedv PITCH_C1, FRAMERATE_CONST(100, 120), 80
/* 0x05DE [0xF4 0xFB ] */ rjump LAYER_05DB
.layer LAYER_05E0
/* 0x05E0 [0xC4 ] */ legato
LAYER_05E1:
/* 0x05E1 [0x42 0x64 0x50 ] */ notedv PITCH_B0, 100, 80
/* 0x05E1 [0x42 0x64 0x50 ] */ notedv PITCH_B0, FRAMERATE_CONST(100, 120), 80
/* 0x05E4 [0xF4 0xFB ] */ rjump LAYER_05E1
.channel CHAN_05E6
@ -800,26 +803,26 @@ LAYER_05E1:
/* 0x05EF [0xD4 0x14 ] */ reverb 20
/* 0x05F1 [0xDF 0x64 ] */ vol 100
/* 0x05F3 [0xED 0x0F ] */ gain 15
/* 0x05F5 [0xFD 0x82 0x40 ] */ delay 576
/* 0x05F5 [0xFD 0x82 0x40 ] */ delay FRAMERATE_CONST(576, 691)
/* 0x05F8 [0x88 0x06 0x33 ] */ ldlayer 0, LAYER_0633
/* 0x05FB [0x89 0x06 0x2F ] */ ldlayer 1, LAYER_062F
/* 0x05FE [0x8A 0x06 0x3F ] */ ldlayer 2, LAYER_063F
/* 0x0601 [0xDF 0x4B ] */ vol 75
/* 0x0603 [0xFD 0x80 0xC8 ] */ delay 200
/* 0x0603 [0xFD 0x80 0xC8 ] */ delay FRAMERATE_CONST(200, 240)
/* 0x0606 [0x88 0x06 0x33 ] */ ldlayer 0, LAYER_0633
/* 0x0609 [0x89 0x06 0x2F ] */ ldlayer 1, LAYER_062F
/* 0x060C [0x8A 0x06 0x3F ] */ ldlayer 2, LAYER_063F
/* 0x060F [0xDF 0x6E ] */ vol 110
/* 0x0611 [0xFD 0x80 0x87 ] */ delay 135
/* 0x0611 [0xFD 0x80 0x87 ] */ delay FRAMERATE_CONST(135, 162)
/* 0x0614 [0x88 0x06 0x33 ] */ ldlayer 0, LAYER_0633
/* 0x0617 [0x89 0x06 0x2F ] */ ldlayer 1, LAYER_062F
/* 0x061A [0x8A 0x06 0x3F ] */ ldlayer 2, LAYER_063F
/* 0x061D [0xDF 0x5F ] */ vol 95
/* 0x061F [0xFD 0x81 0x56 ] */ delay 342
/* 0x061F [0xFD 0x81 0x56 ] */ delay FRAMERATE_CONST(342, 410)
/* 0x0622 [0x88 0x06 0x33 ] */ ldlayer 0, LAYER_0633
/* 0x0625 [0x89 0x06 0x2F ] */ ldlayer 1, LAYER_062F
/* 0x0628 [0x8A 0x06 0x3F ] */ ldlayer 2, LAYER_063F
/* 0x062B [0xFD 0x80 0xFA ] */ delay 250
/* 0x062B [0xFD 0x80 0xFA ] */ delay FRAMERATE_CONST(250, 300)
/* 0x062E [0xFF ] */ end
.layer LAYER_062F
@ -836,7 +839,7 @@ LAYER_0635:
.layer LAYER_063F
/* 0x063F [0xC6 0x46 ] */ instr SF0_INST_70
/* 0x0641 [0x62 0x32 0x32 ] */ notedv PITCH_G3, 50, 50
/* 0x0641 [0x62 0x32 0x32 ] */ notedv PITCH_G3, FRAMERATE_CONST(50, 60), 50
/* 0x0644 [0xFF ] */ end
.table TABLE_0646
@ -1105,13 +1108,29 @@ ENVELOPE_08BA:
.envelope ENVELOPE_08EA
point 140, 20000
point 2540, 10000
#if !OOT_PAL_N64
point 200, 32700
#else
point 160, 32700
#endif
point 720, 20000
point 240, 27000
point 20, 16000
point 940, 32700
hang
#if OOT_PAL_N64
.envelope ENVELOPE_090A_PAL
point 168, 20000
point 2488, 10000
point 240, 32700
point 864, 20000
point 288, 27000
point 24, 16000
point 1128, 32700
hang
#endif
.envelope ENVELOPE_090A
point 100, 20000
point 400, 32700
@ -1128,10 +1147,12 @@ ENVELOPE_08BA:
point 20, 20000
hang
#if !OOT_PAL_N64
.filter FILTER_0932
filter 0, 0, 0, 0, 0, 0, 0, 0
.filter FILTER_0942
filter 0, 0, 0, 0, 0, 0, 0, 0
#endif
.endseq Sequence_109