From 6e37897449b8a58751c2e16c414284c10d1fde2a Mon Sep 17 00:00:00 2001 From: Christopher Leggett Date: Wed, 10 Aug 2022 20:28:44 -0400 Subject: [PATCH] Removes unused function override --- soh/CMakeLists.txt | 12 ++++++++++++ .../Enhancements/item-tables/ItemTableManager.cpp | 9 --------- soh/soh/Enhancements/item-tables/ItemTableManager.h | 1 - 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/soh/CMakeLists.txt b/soh/CMakeLists.txt index a902880f1..043c05a46 100644 --- a/soh/CMakeLists.txt +++ b/soh/CMakeLists.txt @@ -341,6 +341,18 @@ set(Source_Files__soh__Enhancements__randomizer__3drando__location_access ) source_group("Source Files\\soh\\Enhancements\\randomizer\\3drando\\location_access" FILES ${Source_Files__soh__Enhancements__randomizer__3drando__location_access}) +set(Source_Files__soh__Enhancements__custom_message + "soh/Enhancements/custom-message/CustomMessageManager.cpp" +) + +source_group("Source Files\\soh\\Enhancements\\custom-message" FILES ${Source_Files__soh__Enhancements__custom_message}) + +set(Source_Files__soh__Enhancements__item_tables + "soh/Enhancements/item-tables/ItemTableManager.cpp" +) + +source_group("Source Files\\soh\\Enhancements\\item-tables" FILES ${Source_Files__soh__Enhancements__item_tables}) + set(Source_Files__src__boot "src/boot/assert.c" "src/boot/boot_main.c" diff --git a/soh/soh/Enhancements/item-tables/ItemTableManager.cpp b/soh/soh/Enhancements/item-tables/ItemTableManager.cpp index 8e64c97ca..5202a81e5 100644 --- a/soh/soh/Enhancements/item-tables/ItemTableManager.cpp +++ b/soh/soh/Enhancements/item-tables/ItemTableManager.cpp @@ -12,15 +12,6 @@ bool ItemTableManager::AddItemTable(uint16_t tableID) { return itemTables.emplace(tableID, newItemTable).second; } -bool ItemTableManager::AddItemEntry(uint16_t tableID, uint16_t getItemID, uint16_t itemID, uint16_t objectID, int16_t drawID, uint16_t textID, uint16_t field, bool chestAnim) { - ItemTable* itemTable = RetrieveItemTable(tableID); - if (itemTable == nullptr) { - return false; - } - GetItemEntry getItemEntry = GET_ITEM(itemID, objectID, drawID, textID, field, chestAnim); - return itemTable->emplace(getItemID, getItemEntry).second; -} - bool ItemTableManager::AddItemEntry(uint16_t tableID, uint16_t getItemID, GetItemEntry getItemEntry) { ItemTable* itemTable = RetrieveItemTable(tableID); if (itemTable == nullptr) { diff --git a/soh/soh/Enhancements/item-tables/ItemTableManager.h b/soh/soh/Enhancements/item-tables/ItemTableManager.h index c80c64817..084b8cf1c 100644 --- a/soh/soh/Enhancements/item-tables/ItemTableManager.h +++ b/soh/soh/Enhancements/item-tables/ItemTableManager.h @@ -21,7 +21,6 @@ class ItemTableManager { ItemTableManager(); ~ItemTableManager(); bool AddItemTable(uint16_t tableID); - bool AddItemEntry(uint16_t tableID, uint16_t getItemID, uint16_t itemID, uint16_t objectID, int16_t drawID, uint16_t textID, uint16_t field, bool chestAnim); bool AddItemEntry(uint16_t tableID, uint16_t getItemID, GetItemEntry getItemEntry); GetItemEntry RetrieveItemEntry(uint16_t tableID, uint16_t itemID); bool ClearItemTable(uint16_t tableID);