Skip to content

Progressive lullaby #178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Tacoman369 merged 2 commits into from
Jul 14, 2026
Merged

Progressive lullaby #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
974f61d
Fix Starting Inventory Options
Tacoman369 Jul 14, 2026
9f55836
Update Z3DR
Tacoman369 Jul 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Z3DR
Open in desktop
Submodule Z3DR updated 1 files
+6 −1 code/source/rnd/savefile.cpp
7 changes: 3 additions & 4 deletions source/settings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,13 +136,13 @@ namespace Settings {
Option StartingEponasSong = Option::U8("Epona's Song", { "None", "Epona's Song" }, { "" });
Option StartingSongOfStorms = Option::U8("Song of Storms", { "None", "Song of Storms" }, { "" });
Option StartingSonataOfAwakening = Option::U8("Sonata of Awakening", { "None", "Sonata of A." }, { "" });
Option StartingGoronsLullaby = Option::U8("Gorons Lullaby", { "None", "Gorons Lullaby" }, { "" });
Option StartingGoronsLullaby = Option::U8("Gorons Lullaby", { "None", "Lullaby Intro", "Gorons Lullaby" }, { "" });
Option StartingNewWaveBossaNova = Option::U8("New Wave Bossa Nova", { "None", "New Wave Bossa Nova" }, { "" });
Option StartingElegyOfEmptiness = Option::U8("Elegy of Emptiness", { "None", "Elegy of Emptiness" }, { "" });
Option StartingSongOfHealing = Option::U8("Song of Healing", { "None", "Song of Healing" }, { "" }, OptionCategory::Setting);
Option StartingSongOfSoaring = Option::U8("Song of Soaring", { "None", "Song of Soaring" }, { "" });
Option StartingSongOfTime = Option::U8("Song of Time", { "None", "Song of Time" }, { "" });
Option StartingGoronIntro = Option::U8("Goron Lullaby Intro", { "None", "Lullaby Intro" }, { "" });
//Option StartingGoronIntro = Option::U8("Goron Lullaby Intro", { "None", "Lullaby Intro" }, { "" });
Option StartingUpgradesToggle = Option::U8("Equipment & Upgrades", { "All Off", "All On", "Choose" }, { "" });
Option StartingKokiriSword = Option::U8("Starting Sword", { "Kokiri Sword", "Razor Sword", "Gilded Sword", "None" }, { startingSwordKokiriDesc, startingSwordRazorDesc, startingSwordGildedDesc, startingSwordNoneDesc }, OptionCategory::Setting, (u8)StartingSwordSetting::STARTINGSWORD_KOKIRI);//1U = StartingSwordSetting::STARTINGSWORD_KOKIRI
Option StartingGreatFairySword = Option::U8("Great Fairy Sword", { "None", "G. F. S." }, { "" });
Expand Down Expand Up @@ -256,7 +256,6 @@ namespace Settings {
&StartingEponasSong,
&StartingSongOfStorms,
&StartingSonataOfAwakening,
&StartingGoronIntro,
&StartingGoronsLullaby,
&StartingNewWaveBossaNova,
&StartingElegyOfEmptiness,
Expand Down Expand Up @@ -836,7 +835,7 @@ namespace Settings {
ctx.startingSongOfSoaring = StartingSongOfSoaring.Value<u8>();
ctx.startingSongOfHealing = StartingSongOfHealing.Value<u8>();
ctx.startingSongOfTime = StartingSongOfTime.Value<u8>();
ctx.startingGoronIntro = StartingGoronIntro.Value<u8>();
//ctx.startingGoronIntro = StartingGoronIntro.Value<u8>();
//Upgrades
ctx.startingKokiriSword = StartingKokiriSword.Value<u8>();
ctx.startingShield = StartingShield.Value<u8>();
Expand Down