World 5 music fixed to be accurate

There was supposed to be a warbly effect but it wasn't working so I had to make it smoother. It's back to how it was supposed to be.
NovaSquirrel · Jun 4, 2018 · 81bbcb9 · 81bbcb9
1 parent a8a16ec
commit 81bbcb9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/music/musicseq.pently b/music/musicseq.pently
@@ -1394,7 +1394,8 @@ instrument Triangle_Choir
   pitch 0 0 4 4 7 7 12 12 
 
 instrument Triangle_Short
-  volume 15 15 15 0
+#  volume 15 15 15 0
+  volume 15 0 0 15
 
 instrument Super_Major_Arp
   volume 6 6 6 6 6 6 6 6 

diff --git a/src/musicseq.s b/src/musicseq.s
@@ -150,7 +150,8 @@ instdef PI_Minor_Boss_Rhythm_Guitar, 0, 1, 0, 0, PIDAT_Minor_Boss_Rhythm_Guitar,
 instdef PI_Miniboss_Flute, 2, 0, 0, 0, PIDAT_Miniboss_Flute, 20
 instdef PI_Harp, 3, 0, 0, 0, PIDAT_Harp, 20
 instdef PI_Triangle_Choir, 2, 15, 0, 0, PIDAT_Triangle_Choir, 7
-instdef PI_Triangle_Short, 2, 0, 0, 0, PIDAT_Triangle_Short, 3
+;instdef PI_Triangle_Short, 2, 0, 0, 0, PIDAT_Triangle_Short, 3
+instdef PI_Triangle_Short, 2, 15, 0, 0, PIDAT_Triangle_Short, 3
 instdef PI_Super_Major_Arp, 0, 6, 0, 0, PIDAT_Super_Major_Arp, 7
 PIDAT_Tribal_Noise_1_26_4:
 .byte 143,2,138,4,133,3,130,7,129,7,129,7
@@ -210,8 +211,9 @@ PIDAT_Harp:
 .byte 209,209
 PIDAT_Triangle_Choir:
 .byte 159,159,143,4,143,4,143,7,143,7,143,12
-PIDAT_Triangle_Short = PIDAT_Cave_Triangle + 2
-;.byte 159,143,208,143,208
+;PIDAT_Triangle_Short = PIDAT_Cave_Triangle + 2
+PIDAT_Triangle_Short:
+.byte 159,144,144
 PIDAT_Super_Major_Arp:
 .byte 150,134,12,134,24,70,4,70,16,70,28,6,7
 pently_drums:  ; 22 entries, 44 bytes

diff --git a/src/pentlysound.s b/src/pentlysound.s
@@ -332,9 +332,12 @@ notnoise:
     sta $4002,x
     lda periodTableHi,y
   .endif
+  cpx #8
+  beq always_write_high_period
   cmp ch_lastfreqhi,x
   beq no_change_to_hi_period
   sta ch_lastfreqhi,x
+always_write_high_period:
   sta $4003,x
 no_change_to_hi_period: