mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-08-17 13:50:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixup remaining n64ddflag after IS_RANDO merge (#3240)

Browse Source
This commit is contained in:
Adam Bird
2023-09-29 16:28:16 -04:00
committed by GitHub
parent d63c9d1774
commit af19645a88
9 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/src/code/z_elf_message.c
+1 -1
View File
@@ -155,7 +155,7 @@ u16 ElfMessage_GetSariaText(PlayState* play) {
if (!LINK_IS_ADULT) {
if (Actor_FindNearby(play, &player->actor, ACTOR_EN_SA, 4, 800.0f) == NULL) {
if (gSaveContext.n64ddFlag && Randomizer_GetSettingValue(RSK_SARIA_HINT)) {
if (IS_RANDO && Randomizer_GetSettingValue(RSK_SARIA_HINT)) {
return 0x161;
}
msgs = sChildSariaMsgs;
soh/src/code/z_play.c
+2 -1
View File
@@ -2319,7 +2319,8 @@ void Play_PerformSave(PlayState* play) {
Save_SaveFile();
}
uint8_t triforceHuntCompleted =
gSaveContext.n64ddFlag && gSaveContext.triforcePiecesCollected == Randomizer_GetSettingValue(RSK_TRIFORCE_HUNT_PIECES_REQUIRED) &&
IS_RANDO &&
gSaveContext.triforcePiecesCollected == Randomizer_GetSettingValue(RSK_TRIFORCE_HUNT_PIECES_REQUIRED) &&
Randomizer_GetSettingValue(RSK_TRIFORCE_HUNT);
if (CVarGetInteger("gAutosave", AUTOSAVE_OFF) != AUTOSAVE_OFF || triforceHuntCompleted) {
Overlay_DisplayText(3.0f, "Game Saved");
soh/src/overlays/actors/ovl_En_Gb/z_en_gb.c
+2 -2
View File
@@ -338,8 +338,8 @@ void func_80A2FA50(EnGb* this, PlayState* play) {
Rupees_ChangeBy(50);
HIGH_SCORE(HS_POE_POINTS) += 100;
if (
(!gSaveContext.n64ddFlag && HIGH_SCORE(HS_POE_POINTS) != 1000) ||
(gSaveContext.n64ddFlag && (HIGH_SCORE(HS_POE_POINTS) != 1000 || Flags_GetRandomizerInf(RAND_INF_10_BIG_POES)))
(!IS_RANDO && HIGH_SCORE(HS_POE_POINTS) != 1000) ||
(IS_RANDO && (HIGH_SCORE(HS_POE_POINTS) != 1000 || Flags_GetRandomizerInf(RAND_INF_10_BIG_POES)))
) {
if (HIGH_SCORE(HS_POE_POINTS) > 1100) {
HIGH_SCORE(HS_POE_POINTS) = 1100;
soh/src/overlays/actors/ovl_En_Sa/z_en_sa.c
+1 -1
View File
@@ -146,7 +146,7 @@ u16 func_80AF55E0(PlayState* play, Actor* thisx) {
if (reaction != 0) {
return reaction;
}
if (gSaveContext.n64ddFlag && Randomizer_GetSettingValue(RSK_SARIA_HINT)) {
if (IS_RANDO && Randomizer_GetSettingValue(RSK_SARIA_HINT)) {
return 0x10AD;
}
if (CHECK_QUEST_ITEM(QUEST_SONG_SARIA)) {
soh/src/overlays/actors/ovl_En_Xc/z_en_xc.c
+4 -4
View File
@@ -425,7 +425,7 @@ void EnXc_RandoStand(EnXc* this, PlayState* play) {
this->action = SHEIK_ACTION_BLOCK_PEDESTAL;
this->drawMode = SHEIK_DRAW_DEFAULT;
this->unk_30C = 1;
if (!gSaveContext.n64ddFlag) {
if (!IS_RANDO) {
Actor_Kill(&this->actor);
}
}
@@ -2240,13 +2240,13 @@ void EnXc_SetupDialogueAction(EnXc* this, PlayState* play) {
this->action = SHEIK_ACTION_IN_DIALOGUE;
} else {
this->actor.flags |= ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY;
if (gSaveContext.n64ddFlag && gPlayState->sceneNum == SCENE_TEMPLE_OF_TIME) {
if (IS_RANDO && gPlayState->sceneNum == SCENE_TEMPLE_OF_TIME) {
if (!CHECK_DUNGEON_ITEM(DUNGEON_KEY_BOSS, SCENE_GANONS_TOWER)) {
this->actor.textId = TEXT_SHEIK_NEED_HOOK;
} else {
this->actor.textId = TEXT_SHEIK_HAVE_HOOK;
this->actor.textId = TEXT_SHEIK_HAVE_HOOK;
}
} else if (gSaveContext.n64ddFlag && gPlayState->sceneNum == SCENE_INSIDE_GANONS_CASTLE) {
} else if (IS_RANDO && gPlayState->sceneNum == SCENE_INSIDE_GANONS_CASTLE) {
if (CHECK_OWNED_EQUIP(EQUIP_SWORD, 1) && INV_CONTENT(ITEM_ARROW_LIGHT) == ITEM_ARROW_LIGHT &&
CUR_CAPACITY(UPG_QUIVER) >= 30 && gSaveContext.isMagicAcquired) {
this->actor.textId = TEXT_SHEIK_HAVE_HOOK;
soh/src/overlays/actors/ovl_Fishing/z_fishing.c
+4 -4
View File
@@ -5045,8 +5045,8 @@ void Fishing_HandleOwnerDialog(Fishing* this, PlayState* play) {
if (sLinkAge == 1) {
if (
(!gSaveContext.n64ddFlag && !(HIGH_SCORE(HS_FISHING) & 0x400)) ||
(gSaveContext.n64ddFlag && !Flags_GetRandomizerInf(RAND_INF_CHILD_FISHING))
(!IS_RANDO && !(HIGH_SCORE(HS_FISHING) & 0x400)) ||
(IS_RANDO && !Flags_GetRandomizerInf(RAND_INF_CHILD_FISHING))
) {
if (D_80B7E078 >= Fishing_GetMinimumRequiredScore()) {
HIGH_SCORE(HS_FISHING) |= 0x400;
@@ -5062,8 +5062,8 @@ void Fishing_HandleOwnerDialog(Fishing* this, PlayState* play) {
}
} else {
if (
(!gSaveContext.n64ddFlag && !(HIGH_SCORE(HS_FISHING) & 0x800)) ||
(gSaveContext.n64ddFlag && !Flags_GetRandomizerInf(RAND_INF_ADULT_FISHING))
(!IS_RANDO && !(HIGH_SCORE(HS_FISHING) & 0x800)) ||
(IS_RANDO && !Flags_GetRandomizerInf(RAND_INF_ADULT_FISHING))
) {
if (D_80B7E078 >= Fishing_GetMinimumRequiredScore()) {
HIGH_SCORE(HS_FISHING) |= 0x800;