From b55d6f4b7667402cacea881a095c14ff8cd5ce17 Mon Sep 17 00:00:00 2001 From: rozlette Date: Thu, 22 May 2025 21:31:47 -0500 Subject: [PATCH] merge fixups --- soh/soh/SaveManager.cpp | 30 +++++++++---------- .../misc/ovl_kaleido_scope/z_lmap_mark.c | 12 ++++---- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/soh/soh/SaveManager.cpp b/soh/soh/SaveManager.cpp index 14b617283..28017205a 100644 --- a/soh/soh/SaveManager.cpp +++ b/soh/soh/SaveManager.cpp @@ -2259,7 +2259,7 @@ void SaveManager::LoadBaseVersion5() { int isRando = 0; SaveManager::Instance->LoadData("n64ddFlag", isRando); if (isRando) { - gSaveContext.questId = QUEST_RANDOMIZER; + gSaveContext.ship.quest.id = QUEST_RANDOMIZER; } SaveManager::Instance->LoadData("healthCapacity", gSaveContext.healthCapacity); SaveManager::Instance->LoadData("health", gSaveContext.health); @@ -2399,31 +2399,31 @@ void SaveManager::LoadBaseVersion5() { SaveManager::Instance->LoadData("angle", gSaveContext.horseData.angle); }); - SaveManager::Instance->LoadArray("randomizerInf", ARRAY_COUNT(gSaveContext.randomizerInf), [](size_t i) { - SaveManager::Instance->LoadData("", gSaveContext.randomizerInf[i]); + SaveManager::Instance->LoadArray("randomizerInf", ARRAY_COUNT(gSaveContext.ship.randomizerInf), [](size_t i) { + SaveManager::Instance->LoadData("", gSaveContext.ship.randomizerInf[i]); }); int isMQ = 0; SaveManager::Instance->LoadData("isMasterQuest", isMQ); if (isMQ) { - gSaveContext.questId = QUEST_MASTER; + gSaveContext.ship.quest.id = QUEST_MASTER; } SaveManager::Instance->LoadStruct("backupFW", []() { SaveManager::Instance->LoadStruct("pos", []() { - SaveManager::Instance->LoadData("x", gSaveContext.backupFW.pos.x); - SaveManager::Instance->LoadData("y", gSaveContext.backupFW.pos.y); - SaveManager::Instance->LoadData("z", gSaveContext.backupFW.pos.z); + SaveManager::Instance->LoadData("x", gSaveContext.ship.backupFW.pos.x); + SaveManager::Instance->LoadData("y", gSaveContext.ship.backupFW.pos.y); + SaveManager::Instance->LoadData("z", gSaveContext.ship.backupFW.pos.z); }); - SaveManager::Instance->LoadData("yaw", gSaveContext.backupFW.yaw); - SaveManager::Instance->LoadData("playerParams", gSaveContext.backupFW.playerParams); - SaveManager::Instance->LoadData("entranceIndex", gSaveContext.backupFW.entranceIndex); - SaveManager::Instance->LoadData("roomIndex", gSaveContext.backupFW.roomIndex); - SaveManager::Instance->LoadData("set", gSaveContext.backupFW.set); - SaveManager::Instance->LoadData("tempSwchFlags", gSaveContext.backupFW.tempSwchFlags); - SaveManager::Instance->LoadData("tempCollectFlags", gSaveContext.backupFW.tempCollectFlags); + SaveManager::Instance->LoadData("yaw", gSaveContext.ship.backupFW.yaw); + SaveManager::Instance->LoadData("playerParams", gSaveContext.ship.backupFW.playerParams); + SaveManager::Instance->LoadData("entranceIndex", gSaveContext.ship.backupFW.entranceIndex); + SaveManager::Instance->LoadData("roomIndex", gSaveContext.ship.backupFW.roomIndex); + SaveManager::Instance->LoadData("set", gSaveContext.ship.backupFW.set); + SaveManager::Instance->LoadData("tempSwchFlags", gSaveContext.ship.backupFW.tempSwchFlags); + SaveManager::Instance->LoadData("tempCollectFlags", gSaveContext.ship.backupFW.tempCollectFlags); }); SaveManager::Instance->LoadData("dogParams", gSaveContext.dogParams); SaveManager::Instance->LoadData("filenameLanguage", gSaveContext.ship.filenameLanguage); - SaveManager::Instance->LoadData("maskMemory", gSaveContext.maskMemory); + SaveManager::Instance->LoadData("maskMemory", gSaveContext.ship.maskMemory); } void SaveManager::SaveBase(SaveContext* saveContext, int sectionID, bool fullSave) { diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.c index 301039dec..b319db42a 100644 --- a/soh/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.c +++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.c @@ -86,9 +86,9 @@ void PauseMapMark_DrawForDungeon(PlayState* play) { OPEN_DISPS(play->state.gfxCtx); - gDPPipeSync(POLY_KAL_DISP++); - gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 255, 255, 255, 255); - gDPSetEnvColor(POLY_KAL_DISP++, 0, 0, 0, 255); + gDPPipeSync(POLY_OPA_DISP++); + gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, 255); + gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 255); Matrix_Push(); @@ -120,11 +120,11 @@ void PauseMapMark_DrawForDungeon(PlayState* play) { Matrix_Translate(GREG(92) + floor->chestMarks[i].x + mirrorOffset, GREG(93) + floor->chestMarks[i].y, 0.0f, MTXMODE_APPLY); Matrix_Scale(1.0f, 1.0f, 1.0f, MTXMODE_APPLY); - gSPMatrix(POLY_KAL_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); Matrix_Pop(); - gSPVertex(POLY_KAL_DISP++, sMarkChestVtx, 4, 0); - gSP1Quadrangle(POLY_KAL_DISP++, 1, 3, 2, 0, 0); + gSPVertex(POLY_OPA_DISP++, sMarkChestVtx, 4, 0); + gSP1Quadrangle(POLY_OPA_DISP++, 1, 3, 2, 0, 0); } }