Skip to content

Commit 850e1f8

Browse files
CPColinCPColin
authored
Merge pull request #715 from Phiggle/main
Even more Etecoons jingles
2 parents 113eb47 + ddb4580 commit 850e1f8

File tree

2 files changed

+313
-0
lines changed

2 files changed

+313
-0
lines changed

‎src/TrackerCouncil.Smz3.Data/Options/Config.cs‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,16 +170,32 @@ public enum EtecoonsJingle
170170
Vanilla,
171171
[Description("Ace Attorney: Blue Badger Theme")]
172172
BlueBadger,
173+
[Description("Battletoads: Victory")]
174+
BattletoadsWin,
175+
[Description("Castlevania: Vampire Killer")]
176+
VampireKiller,
173177
[Description("Final Fantasy: Victory")]
174178
FFVictory,
175179
[Description("King's Quest V: Town Theme")]
176180
KQVTown,
181+
[Description("Kirby: Fanfare")]
182+
KirbyWin,
183+
[Description("Kirby: Fanfare (buffed)")]
184+
BuffedKirbyWin,
185+
[Description("Mega Man series: Boss Intro")]
186+
MegaManBossSelected,
187+
[Description("Metal Gear Solid: Game Over")]
188+
SNAAAKE,
189+
[Description("Pizza Tower: It's Pizza Time!")]
190+
PizzaTime,
177191
[Description("Shadowgate: Hall of Mirrors (GitCY Theme)")]
178192
Shadowgate,
179193
[Description("Sonic the Hedgehog 2: Special Stage")]
180194
Sonic2Bonus,
181195
[Description("Super Mario Bros. 1")]
182196
SMB1,
197+
[Description("Super Metroid: Prologue")]
198+
ThemeOfSuperMetroid,
183199
[Description("Yoshi's Island: Castle & Fortress")]
184200
YICastle,
185201
[Description("Zelda: Manbo's Mambo")]

‎src/TrackerCouncil.Smz3.SeedGenerator/FileData/Patches/EtecoonsJinglePatch.cs‎

Lines changed: 297 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -540,6 +540,303 @@ public List<byte> ToBytes()
540540
]
541541
}
542542
}
543+
},
544+
{
545+
EtecoonsJingle.SNAAAKE, new Jingle
546+
{
547+
Voice1 = new Voice
548+
{
549+
Notes =
550+
[
551+
new Note { Value = NoteValue.B5, Duration = 0x04, Volume = 0x70, },
552+
new Note { Value = NoteValue.As5, Duration = 0x04, Volume = 0x6C, },
553+
new Note { Value = NoteValue.A5, Duration = 0x04, Volume = 0x68, },
554+
new Note { Value = NoteValue.Gs5, Duration = 0x04, Volume = 0x64, },
555+
new Note { Value = NoteValue.G5, Duration = 0x04, Volume = 0x60, },
556+
new Note { Value = NoteValue.Fs5, Duration = 0x04, Volume = 0x5C, },
557+
new Note { Value = NoteValue.F5, Duration = 0x04, Volume = 0x58, },
558+
new Note { Value = NoteValue.E5, Duration = 0x04, Volume = 0x54, },
559+
new Note { Value = NoteValue.Ds5, Duration = 0x04, Volume = 0x50, },
560+
new Note { Value = NoteValue.D5, Duration = 0x04, Volume = 0x4C, },
561+
new Note { Value = NoteValue.Cs5, Duration = 0x04, Volume = 0x48, },
562+
new Note { Value = NoteValue.C5, Duration = 0x04, Volume = 0x44, },
563+
564+
new Note { Value = NoteValue.D4, Duration = 0x12, Volume = 0x70, },
565+
new Note { Value = NoteValue.D4, Duration = 0x12, Volume = 0x70, },
566+
new Note { Value = NoteValue.Ds4, Duration = 0x0C, Volume = 0x70, },
567+
new Note { Value = NoteValue.D4, Duration = 0x0C, Volume = 0x70, },
568+
new Note { Value = NoteValue.C4, Duration = 0x24, Volume = 0x70, },
569+
570+
new Note { Value = NoteValue.F4, Duration = 0x12, Volume = 0x70, },
571+
new Note { Value = NoteValue.F4, Duration = 0x12, Volume = 0x70, },
572+
new Note { Value = NoteValue.G4, Duration = 0x18, Volume = 0x70, }
573+
]
574+
},
575+
Voice2 = new Voice
576+
{
577+
Notes =
578+
[
579+
new Note { Value = NoteValue.G2, Duration = 0xA0, Volume = 0x01, },
580+
//this note just lets enough time pass
581+
582+
new Note { Value = NoteValue.C4, Duration = 0x12, Volume = 0x70, },
583+
new Note { Value = NoteValue.C4, Duration = 0x12, Volume = 0x70, },
584+
new Note { Value = NoteValue.D4, Duration = 0x18, Volume = 0x70, }
585+
]
586+
}
587+
}
588+
},
589+
{
590+
EtecoonsJingle.BattletoadsWin, new Jingle
591+
{
592+
Voice1 = new Voice
593+
{
594+
Notes =
595+
[
596+
new Note { Value = NoteValue.G4, Duration = 0x04, Volume = 0x70, },
597+
new Note { Value = NoteValue.A4, Duration = 0x0C, Volume = 0x70, },
598+
new Note { Value = NoteValue.Fs4, Duration = 0x08, Volume = 0x70, },
599+
new Note { Value = NoteValue.E4, Duration = 0x08, Volume = 0x70, },
600+
new Note { Value = NoteValue.Fs4, Duration = 0x10, Volume = 0x70, },
601+
new Note { Value = NoteValue.E4, Duration = 0x08, Volume = 0x70, },
602+
new Note { Value = NoteValue.Cs4, Duration = 0x08, Volume = 0x70, },
603+
604+
new Note { Value = NoteValue.D4, Duration = 0x04, Volume = 0x70, },
605+
new Note { Value = NoteValue.E4, Duration = 0x0C, Volume = 0x70, },
606+
new Note { Value = NoteValue.Cs4, Duration = 0x08, Volume = 0x70, },
607+
new Note { Value = NoteValue.B3, Duration = 0x08, Volume = 0x70, },
608+
new Note { Value = NoteValue.Cs4, Duration = 0x10, Volume = 0x70, },
609+
new Note { Value = NoteValue.B3, Duration = 0x08, Volume = 0x70, },
610+
611+
new Note { Value = NoteValue.E3, Duration = 0x10, Volume = 0x90, },
612+
new Note { Value = NoteValue.Fs3, Duration = 0x10, Volume = 0x90, }
613+
]
614+
},
615+
Voice2 = new Voice
616+
{
617+
Notes =
618+
[
619+
new Note { Value = NoteValue.G4, Duration = 0x80, Volume = 0x01, },
620+
//this note just lets enough time pass
621+
622+
new Note { Value = NoteValue.B2, Duration = 0x10, Volume = 0x80, },
623+
new Note { Value = NoteValue.Cs3, Duration = 0x10, Volume = 0x80, }
624+
]
625+
}
626+
}
627+
},
628+
{
629+
EtecoonsJingle.PizzaTime, new Jingle
630+
{
631+
Voice1 = new Voice
632+
{
633+
Notes =
634+
[
635+
new Note { Value = NoteValue.C5, Duration = 0x10, Volume = 0x70 },
636+
new Note { Value = NoteValue.G4, Duration = 0x10, Volume = 0x70 },
637+
new Note { Value = NoteValue.As4, Duration = 0x20, Volume = 0x70 },
638+
639+
new Note { Value = NoteValue.C5, Duration = 0x10, Volume = 0x70 },
640+
new Note { Value = NoteValue.G4, Duration = 0x10, Volume = 0x70 },
641+
new Note { Value = NoteValue.As4, Duration = 0x20, Volume = 0x70 },
642+
643+
new Note { Value = NoteValue.C5, Duration = 0x08, Volume = 0x70 },
644+
new Note { Value = NoteValue.D5, Duration = 0x08, Volume = 0x70 },
645+
new Note { Value = NoteValue.C5, Duration = 0x08, Volume = 0x70 },
646+
new Note { Value = NoteValue.D5, Duration = 0x08, Volume = 0x70 },
647+
new Note { Value = NoteValue.C5, Duration = 0x08, Volume = 0x70 },
648+
new Note { Value = NoteValue.As4, Duration = 0x08, Volume = 0x70 },
649+
new Note { Value = NoteValue.G4, Duration = 0x08, Volume = 0x70 },
650+
new Note { Value = NoteValue.Fs4, Duration = 0x08, Volume = 0x70 },
651+
new Note { Value = NoteValue.G4, Duration = 0x20, Volume = 0x70 }
652+
]
653+
}
654+
}
655+
},
656+
{
657+
EtecoonsJingle.KirbyWin, new Jingle
658+
{
659+
Voice1 = new Voice
660+
{
661+
Notes =
662+
[
663+
new Note { Value = NoteValue.A3, Duration = 0x08, Volume = 0x70 },
664+
new Note { Value = NoteValue.G3, Duration = 0x08, Volume = 0x70 },
665+
new Note { Value = NoteValue.A3, Duration = 0x08, Volume = 0x70 },
666+
new Note { Value = NoteValue.B3, Duration = 0x08, Volume = 0x70 },
667+
new Note { Value = NoteValue.A3, Duration = 0x08, Volume = 0x70 },
668+
new Note { Value = NoteValue.B3, Duration = 0x08, Volume = 0x70 },
669+
new Note { Value = NoteValue.C4, Duration = 0x10, Volume = 0x70 },
670+
new Note { Value = NoteValue.G3, Duration = 0x08, Volume = 0x70 },
671+
new Note { Value = NoteValue.E3, Duration = 0x10, Volume = 0x70 },
672+
new Note { Value = NoteValue.G4, Duration = 0x08, Volume = 0x70 },
673+
new Note { Value = NoteValue.F4, Duration = 0x10, Volume = 0x70 },
674+
new Note { Value = NoteValue.E4, Duration = 0x08, Volume = 0x70 },
675+
new Note { Value = NoteValue.D4, Duration = 0x10, Volume = 0x70 },
676+
new Note { Value = NoteValue.E4, Duration = 0x08, Volume = 0x70 },
677+
new Note { Value = NoteValue.C4, Duration = 0x18, Volume = 0x70 },
678+
new Note { Value = NoteValue.C5, Duration = 0x18, Volume = 0x70 }
679+
]
680+
}
681+
}
682+
},
683+
{
684+
EtecoonsJingle.BuffedKirbyWin, new Jingle
685+
{
686+
Voice1 = new Voice
687+
{
688+
Notes =
689+
[
690+
new Note { Value = NoteValue.A2, Duration = 0x08, Volume = 0x90 },
691+
new Note { Value = NoteValue.G2, Duration = 0x08, Volume = 0x90 },
692+
new Note { Value = NoteValue.A2, Duration = 0x08, Volume = 0x90 },
693+
new Note { Value = NoteValue.B2, Duration = 0x08, Volume = 0x90 },
694+
new Note { Value = NoteValue.A2, Duration = 0x08, Volume = 0x90 },
695+
new Note { Value = NoteValue.B2, Duration = 0x08, Volume = 0x90 },
696+
new Note { Value = NoteValue.C3, Duration = 0x10, Volume = 0x90 },
697+
new Note { Value = NoteValue.G2, Duration = 0x08, Volume = 0x90 },
698+
new Note { Value = NoteValue.E2, Duration = 0x10, Volume = 0x90 },
699+
new Note { Value = NoteValue.G3, Duration = 0x08, Volume = 0x90 },
700+
new Note { Value = NoteValue.F3, Duration = 0x10, Volume = 0x90 },
701+
new Note { Value = NoteValue.E3, Duration = 0x08, Volume = 0x90 },
702+
new Note { Value = NoteValue.D3, Duration = 0x10, Volume = 0x90 },
703+
new Note { Value = NoteValue.E3, Duration = 0x08, Volume = 0x90 },
704+
new Note { Value = NoteValue.C3, Duration = 0x18, Volume = 0x90 },
705+
new Note { Value = NoteValue.C4, Duration = 0x18, Volume = 0x90 }
706+
]
707+
}
708+
}
709+
},
710+
{
711+
EtecoonsJingle.VampireKiller, new Jingle
712+
{
713+
Voice1 = new Voice
714+
{
715+
Notes =
716+
[
717+
new Note { Value = NoteValue.A4, Duration = 0x08, Volume = 0x70, Pan = 0x08, },
718+
new Note { Value = NoteValue.A4, Duration = 0x10, Volume = 0x70, Pan = 0x08, },
719+
new Note { Value = NoteValue.G4, Duration = 0x10, Volume = 0x70, Pan = 0x08, },
720+
new Note { Value = NoteValue.Fs4, Duration = 0x30, Volume = 0x70, Pan = 0x08, },
721+
722+
new Note { Value = NoteValue.A3, Duration = 0x10, Volume = 0x70, Pan = 0x08, },
723+
new Note { Value = NoteValue.B3, Duration = 0x08, Volume = 0x70, Pan = 0x08, },
724+
new Note { Value = NoteValue.C4, Duration = 0x08, Volume = 0x70, Pan = 0x08, },
725+
new Note { Value = NoteValue.D4, Duration = 0x08, Volume = 0x70, Pan = 0x08, },
726+
new Note { Value = NoteValue.E4, Duration = 0x18, Volume = 0x70, Pan = 0x08, },
727+
new Note { Value = NoteValue.D3, Duration = 0x18, Volume = 0x70, Pan = 0x08, },
728+
new Note { Value = NoteValue.E4, Duration = 0x10, Volume = 0x70, Pan = 0x08, },
729+
new Note { Value = NoteValue.D4, Duration = 0x08, Volume = 0x70, Pan = 0x08, },
730+
new Note { Value = NoteValue.G4, Duration = 0x28, Volume = 0x70, Pan = 0x08, }
731+
]
732+
},
733+
Voice2 = new Voice
734+
{
735+
Notes =
736+
[
737+
new Note { Value = NoteValue.A3, Duration = 0x18, Volume = 0x60, Pan = 0x0B, },
738+
new Note { Value = NoteValue.A3, Duration = 0x28, Volume = 0x60, Pan = 0x0B, },
739+
740+
new Note { Value = NoteValue.A3, Duration = 0x18, Volume = 0x60, Pan = 0x0B, },
741+
new Note { Value = NoteValue.A3, Duration = 0x28, Volume = 0x60, Pan = 0x0B, },
742+
743+
new Note { Value = NoteValue.F3, Duration = 0x18, Volume = 0x60, Pan = 0x0B, },
744+
new Note { Value = NoteValue.F3, Duration = 0x28, Volume = 0x60, Pan = 0x0B, },
745+
746+
new Note { Value = NoteValue.G3, Duration = 0x40, Volume = 0x60, Pan = 0x0B, }
747+
]
748+
}
749+
}
750+
},
751+
{
752+
EtecoonsJingle.MegaManBossSelected, new Jingle
753+
{
754+
Voice1 = new Voice
755+
{
756+
Notes =
757+
[
758+
new Note { Value = NoteValue.F4, Duration = 0x07, Volume = 0x70, Pan = 0x08, },
759+
new Note { Value = NoteValue.F4, Duration = 0x0D, Volume = 0x70, Pan = 0x08, },
760+
new Note { Value = NoteValue.F4, Duration = 0x23, Volume = 0x70, Pan = 0x08, },
761+
762+
new Note { Value = NoteValue.Gs4, Duration = 0x07, Volume = 0x70, Pan = 0x08, },
763+
new Note { Value = NoteValue.Gs4, Duration = 0x0D, Volume = 0x70, Pan = 0x08, },
764+
new Note { Value = NoteValue.Gs4, Duration = 0x23, Volume = 0x70, Pan = 0x08, },
765+
766+
new Note { Value = NoteValue.A4, Duration = 0x0D, Volume = 0x70, Pan = 0x08, },
767+
new Note { Value = NoteValue.G4, Duration = 0x0D, Volume = 0x70, Pan = 0x08, },
768+
new Note { Value = NoteValue.F4, Duration = 0x07, Volume = 0x70, Pan = 0x08, },
769+
new Note { Value = NoteValue.G4, Duration = 0x07, Volume = 0x70, Pan = 0x08, },
770+
new Note { Value = NoteValue.Gs4, Duration = 0x07, Volume = 0x70, Pan = 0x08, },
771+
772+
new Note { Value = NoteValue.A4, Duration = 0x04, Volume = 0x70, Pan = 0x08, },
773+
new Note { Value = NoteValue.As4, Duration = 0x04, Volume = 0x70, Pan = 0x08, },
774+
new Note { Value = NoteValue.A4, Duration = 0x04, Volume = 0x70, Pan = 0x08, },
775+
new Note { Value = NoteValue.As4, Duration = 0x04, Volume = 0x70, Pan = 0x08, },
776+
new Note { Value = NoteValue.A4, Duration = 0x28, Volume = 0x70, Pan = 0x08, }
777+
]
778+
},
779+
Voice2 = new Voice
780+
{
781+
Notes =
782+
[
783+
new Note { Value = NoteValue.B3, Duration = 0x07, Volume = 0x60, Pan = 0x0B, },
784+
new Note { Value = NoteValue.B3, Duration = 0x0D, Volume = 0x60, Pan = 0x0B, },
785+
new Note { Value = NoteValue.B3, Duration = 0x23, Volume = 0x60, Pan = 0x0B, },
786+
787+
new Note { Value = NoteValue.E4, Duration = 0x07, Volume = 0x60, Pan = 0x0B, },
788+
new Note { Value = NoteValue.E4, Duration = 0x0D, Volume = 0x60, Pan = 0x0B, },
789+
new Note { Value = NoteValue.E4, Duration = 0x23, Volume = 0x60, Pan = 0x0B, },
790+
791+
new Note { Value = NoteValue.A3, Duration = 0x31, Volume = 0x60, Pan = 0x0B, },
792+
new Note { Value = NoteValue.A3, Duration = 0x31, Volume = 0x60, Pan = 0x0B, }
793+
]
794+
}
795+
}
796+
},
797+
{
798+
EtecoonsJingle.ThemeOfSuperMetroid, new Jingle
799+
{
800+
Voice1 = new Voice
801+
{
802+
Notes =
803+
[
804+
new Note { Value = NoteValue.E4, Duration = 0x10, Volume = 0x70, Pan = 0x08, },
805+
new Note { Value = NoteValue.B3, Duration = 0x08, Volume = 0x70, Pan = 0x08, },
806+
new Note { Value = NoteValue.E4, Duration = 0x08, Volume = 0x70, Pan = 0x08, },
807+
new Note { Value = NoteValue.B4, Duration = 0x30, Volume = 0x70, Pan = 0x08, },
808+
809+
new Note { Value = NoteValue.A4, Duration = 0x10, Volume = 0x70, Pan = 0x08, },
810+
new Note { Value = NoteValue.Fs4, Duration = 0x10, Volume = 0x70, Pan = 0x08, },
811+
new Note { Value = NoteValue.A4, Duration = 0x10, Volume = 0x70, Pan = 0x08, },
812+
813+
new Note { Value = NoteValue.Fs4, Duration = 0x18, Volume = 0x70, Pan = 0x08, },
814+
new Note { Value = NoteValue.D4, Duration = 0x08, Volume = 0x70, Pan = 0x08, },
815+
new Note { Value = NoteValue.B3, Duration = 0x40, Volume = 0x70, Pan = 0x08, }
816+
]
817+
},
818+
Voice2 = new Voice
819+
{
820+
Notes =
821+
[
822+
new Note { Value = NoteValue.E3, Duration = 0x10, Volume = 0x70, Pan = 0x0B, },
823+
new Note { Value = NoteValue.G3, Duration = 0x10, Volume = 0x70, Pan = 0x0B, },
824+
new Note { Value = NoteValue.Fs3, Duration = 0x10, Volume = 0x70, Pan = 0x0B, },
825+
new Note { Value = NoteValue.A3, Duration = 0x10, Volume = 0x70, Pan = 0x0B, },
826+
new Note { Value = NoteValue.G3, Duration = 0x10, Volume = 0x70, Pan = 0x0B, },
827+
new Note { Value = NoteValue.C4, Duration = 0x10, Volume = 0x70, Pan = 0x0B, },
828+
new Note { Value = NoteValue.B3, Duration = 0x10, Volume = 0x70, Pan = 0x0B, },
829+
new Note { Value = NoteValue.D3, Duration = 0x20, Volume = 0x70, Pan = 0x0B, },
830+
831+
new Note { Value = NoteValue.G3, Duration = 0x10, Volume = 0x70, Pan = 0x0B, },
832+
new Note { Value = NoteValue.Fs3, Duration = 0x10, Volume = 0x70, Pan = 0x0B, },
833+
new Note { Value = NoteValue.A3, Duration = 0x10, Volume = 0x70, Pan = 0x0B, },
834+
new Note { Value = NoteValue.G3, Duration = 0x10, Volume = 0x70, Pan = 0x0B, },
835+
new Note { Value = NoteValue.C4, Duration = 0x10, Volume = 0x70, Pan = 0x0B, },
836+
new Note { Value = NoteValue.B3, Duration = 0x10, Volume = 0x70, Pan = 0x0B, }
837+
]
838+
}
839+
}
543840
}
544841
};
545842

0 commit comments

Comments
 (0)