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

StartingNotebook #68

Merged
merged 3 commits into from
May 27, 2024
Merged

StartingNotebook #68

merged 3 commits into from
May 27, 2024

Conversation

Tacoman369
Copy link

May want to extra review this as im dumb and couldnt figure out how to point my fork to the commit thats currently being used on mm3d_randomizer, below are what i had added and are needed for the starting with bombers notebook option and spoiler log fixes.

Settings.h > Added following

u8 startingNotebook;

Savefile.cpp > added if statement into starting inventory section

//Notebook
if(gSettingsContext.startingNotebook > 0) {
saveData.inventory.collect_register.bombers_notebook = 1;
}

Spoiler_data.cpp(this whole file is ok actually0 > added two missing multilocation checks for the ranch map in snowhead

theres a lot of extra adds / removes because the main mm3d_randomizer points to a specific commit and im too dumb to get it to work right. important changes are as follows
Settings.h > Added u8 startingNotebook;

Savefile.cpp > added if statement into starting inventory section
//Notebook
    if(gSettingsContext.startingNotebook > 0) {
      saveData.inventory.collect_register.bombers_notebook = 1;
    }

Spoiler_data.cpp > added two missing multilocation checks for the ranch map in snowhead
@Tacoman369 Tacoman369 requested a review from PhlexPlexico May 27, 2024 20:42
Copy link

@PhlexPlexico PhlexPlexico left a comment

Choose a reason for hiding this comment

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

These were the only things you had mentioned that were not changed, please correct and we should be good :)

code/include/rnd/settings.h Show resolved Hide resolved
code/source/rnd/savefile.cpp Outdated Show resolved Hide resolved
code/source/rnd/savefile.cpp Outdated Show resolved Hide resolved
code/source/rnd/savefile.cpp Outdated Show resolved Hide resolved
@PhlexPlexico PhlexPlexico merged commit 09d5cff into Z3DR:dev May 27, 2024
1 check failed
PhlexPlexico added a commit that referenced this pull request May 28, 2024
PhlexPlexico added a commit that referenced this pull request May 28, 2024
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