From 4c0365fa0ce7230ca5b840dc5553c4f85721594f Mon Sep 17 00:00:00 2001 From: aMannus Date: Sat, 4 Nov 2023 14:57:48 +0100 Subject: [PATCH] Remove old GBK stuff --- soh/include/z64save.h | 1 - soh/soh/Enhancements/randomizer/savefile.cpp | 1 - soh/soh/SaveManager.cpp | 6 ------ 3 files changed, 8 deletions(-) diff --git a/soh/include/z64save.h b/soh/include/z64save.h index 24ad694487b..9458f28c7bf 100644 --- a/soh/include/z64save.h +++ b/soh/include/z64save.h @@ -324,7 +324,6 @@ typedef struct { /* */ u16 randomizerInf[10]; /* */ u16 adultTradeItems; /* */ u8 triforcePiecesCollected; - /* */ u8 grantBossKey; // #endregion } SaveContext; // size = 0x1428 diff --git a/soh/soh/Enhancements/randomizer/savefile.cpp b/soh/soh/Enhancements/randomizer/savefile.cpp index fba89082a30..33278d0b757 100644 --- a/soh/soh/Enhancements/randomizer/savefile.cpp +++ b/soh/soh/Enhancements/randomizer/savefile.cpp @@ -444,7 +444,6 @@ extern "C" void Randomizer_InitSaveFile() { // Reset triforce pieces collected gSaveContext.triforcePiecesCollected = 0; - gSaveContext.grantBossKey = 0; SetStartingItems(); } diff --git a/soh/soh/SaveManager.cpp b/soh/soh/SaveManager.cpp index 478ab8d41fb..235a7bd5f78 100644 --- a/soh/soh/SaveManager.cpp +++ b/soh/soh/SaveManager.cpp @@ -138,8 +138,6 @@ void SaveManager::LoadRandomizerVersion1() { SaveManager::Instance->LoadData("triforcePiecesCollected", gSaveContext.triforcePiecesCollected); - SaveManager::Instance->LoadData("grantBossKey", gSaveContext.grantBossKey); - SaveManager::Instance->LoadData("pendingIceTrapCount", gSaveContext.pendingIceTrapCount); std::shared_ptr randomizer = OTRGlobals::Instance->gRandomizer; @@ -242,8 +240,6 @@ void SaveManager::LoadRandomizerVersion2() { SaveManager::Instance->LoadData("triforcePiecesCollected", gSaveContext.triforcePiecesCollected); - SaveManager::Instance->LoadData("grantBossKey", gSaveContext.grantBossKey); - SaveManager::Instance->LoadData("pendingIceTrapCount", gSaveContext.pendingIceTrapCount); std::shared_ptr randomizer = OTRGlobals::Instance->gRandomizer; @@ -333,8 +329,6 @@ void SaveManager::SaveRandomizer(SaveContext* saveContext, int sectionID, bool f SaveManager::Instance->SaveData("triforcePiecesCollected", saveContext->triforcePiecesCollected); - SaveManager::Instance->SaveData("grantBossKey", saveContext->grantBossKey); - SaveManager::Instance->SaveData("pendingIceTrapCount", saveContext->pendingIceTrapCount); std::shared_ptr randomizer = OTRGlobals::Instance->gRandomizer;