1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-06 22:30:15 +00:00

[ntsc-1.0/1.1] Match audio and loose ends (#2293)

* Match ntsc-1.0/1.1 loose ends

* Revert audioseq_padding

* Fix spelling
This commit is contained in:
cadmic 2024-11-11 14:50:56 -08:00 committed by GitHub
parent 0d04f51e8e
commit d886ebe711
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 34 additions and 5 deletions

View file

@ -2408,7 +2408,11 @@ CHAN_0EDC:
.layer LAYER_1029
/* 0x1029 [0xC6 0x2F ] */ instr SF0_INST_47
#if OOT_VERSION < PAL_1_0
/* 0x102B [0xCB 0x66 0x4C 0xF0 ] */ env ENVELOPE_664C, 240
#else
/* 0x102B [0xCB 0x66 0x4C 0xFF ] */ env ENVELOPE_664C, 255
#endif
/* 0x102F [0x7E 0x0C 0x6C ] */ notedv PITCH_B5, FRAMERATE_CONST(12, 15), 108
/* 0x1032 [0xFF ] */ end

View file

@ -603,7 +603,9 @@ LAYER_0452:
/* 0x046C [0xE9 0x0E ] */ notepri 0, 14
/* 0x046E [0xE5 0x01 ] */ reverbidx 1
/* 0x0470 [0xD4 0x28 ] */ reverb 40
#if OOT_VERSION >= PAL_1_0
/* 0x0472 [0xC6 0x00 ] */ font Soundfont_0_ID
#endif
/* 0x0474 [0xFC 0x01 0x56 ] */ call CHAN_0156
/* 0x0477 [0xFD 0x60 ] */ delay 96
/* 0x0479 [0xFC 0x01 0x56 ] */ call CHAN_0156
@ -1147,7 +1149,7 @@ ENVELOPE_08BA:
point 20, 20000
hang
#if !OOT_PAL_N64
#if OOT_VERSION == NTSC_1_2 || PLATFORM_GC
.filter FILTER_0932
filter 0, 0, 0, 0, 0, 0, 0, 0