Skip to content
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.

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

Dowsing #17

Merged
merged 9 commits into from
Sep 12, 2024
Merged

Dowsing #17

merged 9 commits into from
Sep 12, 2024

Conversation

robojumper
Copy link
Collaborator

@robojumper robojumper commented Jul 8, 2024

  • Create headers for the RELs
  • Give up on coming up with a reasonable theory regarding the getNode linked list stuff
  • Fix dTg_c?

include/toBeSorted/dowsing_target.h Outdated Show resolved Hide resolved
@@ -4,5 +4,17 @@ SPECIAL_ACTOR_PROFILE(TAG_MAP_INST, dTgMapInst_c, fProfile::TAG_MAP_INST, 0x021d

int dTgMapInst_c::create() {
field_0xfc = params & 0xff;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

for something like this, is it worth it to change the field to be something like params1_0xFF just so we know it can be linked to object parameters

Comment on lines +125 to +144
if (slot >= 8) {
return false;
}

if (slot == 6) {
return true;
}

if (slot == 0) {
return hasZeldaDowsing() || hasAnyTrialDowsing() || hasSacredWaterDowsing() || hasSandshipDowsing() ||
hasTadtoneDowsing() || hasPropellerDowsing() || hasWaterBasinDowsing();
} else if (slot == 2) {
return hasCrystalBallDowsing() || hasPumpkinDowsing() || hasNewPlantSpeciesDowsing() || hasKikwiDowsing() ||
hasKeyPieceDowsing() || hasDesertNodeDowsing() || hasPartyWheelDowsing();
} else if (StoryFlagManager::sInstance->getCounterOrFlag(DOWSING_TARGET_STORY_FLAGS[slot])) {
// TODO small instruction shuffle
return true;
}

return false;
Copy link
Collaborator

@elijah-thomas774 elijah-thomas774 Sep 12, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Havent tested, but can this not use the enum? or maybe a switch? nevermind,

@elijah-thomas774 elijah-thomas774 merged commit e2c4bb7 into zeldaret:main Sep 12, 2024
1 check passed
@robojumper robojumper deleted the dowsing branch September 12, 2024 20:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants