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

don't spawn blocking mido after we've already shown him the sword/shield #675

Merged
merged 1 commit into from
Jul 14, 2022
Merged
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion soh/src/overlays/actors/ovl_En_Md/z_en_md.c
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,10 @@ u8 EnMd_ShouldSpawn(EnMd* this, GlobalContext* globalCtx) {
if (globalCtx->sceneNum == SCENE_SPOT04) {
if (gSaveContext.n64ddFlag) {
// if we have beaten deku tree or have open forest turned on
if (gSaveContext.dungeonsDone[1] || GetRandoSettingValue(RSK_FOREST) == 1) {
// or have already shown mido we have an equipped sword/shield
if (gSaveContext.dungeonsDone[1] ||
GetRandoSettingValue(RSK_FOREST) == 1 ||
gSaveContext.eventChkInf[0] & 0x10) {
return 0;
}
return 1;
Expand Down