Add jinjo saving support (finished) (#240)

* Add jinjo saving support

* Cleanup

* jinjo saving: Improve jiggy position lock, and update static vars on level change

* jinjo saving: Check if jiggy during actor search

* jinjo saving: Remove redundant var

* jinjo saving: Address an uncommon logic scenario that could confuse players, plus some cleanup

* jinjo saving: Cleanup

* jinjo saving: Account for the case where a save file already has the jinjo jiggy collected

Thanks iCloudius for pointing this out

Co-authored-by: iCloudius <102083937+Cloudydude@users.noreply.github.com>

* jinjo saving: Update UI for the same case

Co-authored-by: iCloudius <102083937+Cloudydude@users.noreply.github.com>

* jinjo saving: Extend "note saving" option in settings menu to control jinjo saving

* jinjo saving: Cleanup

* jinjo saving: Fix accidental regression preventing jiggy respawn

Thanks iCloudius for tracking it down.

Co-authored-by: iCloudius <102083937+Cloudydude@users.noreply.github.com>

* jinjo saving: Add bounds checks for jinjoIdx

And remove some old declarations that went unused after removing the patch for chjiggy_update

* jinjo saving: Add support for mods that save jinjos in Grunty's Lair, like Jiggies of Time

Thanks iCloudius for the suggestion

* jinjo saving: Prevent conflicts with Furnace Fun and credits when saving lair jinjos

* jinjo saving: Fix missing jinjo sfx

Thanks BoozemanDoorslam for the report! A bit surprised this wasn't picked up on sooner

---------

Co-authored-by: iCloudius <102083937+Cloudydude@users.noreply.github.com>
This commit is contained in:
wedarobi
2026-07-24 12:17:09 +10:00
committed by GitHub
parent 136cc733f9
commit 0e89ee2fe2
11 changed files with 936 additions and 12 deletions
+8 -3
View File
@@ -65,14 +65,19 @@ namespace banjo {
uint32_t get_analog_cam_sensitivity();
enum class NoteSavingMode {
On,
Both,
OnlyJinjos,
OnlyNotes,
Off,
OptionCount
};
NLOHMANN_JSON_SERIALIZE_ENUM(banjo::NoteSavingMode, {
{banjo::NoteSavingMode::On, "On"},
{banjo::NoteSavingMode::Off, "Off"}
// Keeping as "On" to preserve compatibility with previous configs before jinjo saving
{banjo::NoteSavingMode::Both, "On"},
{banjo::NoteSavingMode::OnlyJinjos, "Jinjos"},
{banjo::NoteSavingMode::OnlyNotes, "Notes"},
{banjo::NoteSavingMode::Off, "Off"}
});
NoteSavingMode get_note_saving_mode();