From 2bb9bf4fee393bb43be8a69a70a46189258249be Mon Sep 17 00:00:00 2001 From: Aetias Date: Fri, 30 May 2025 18:44:47 +0200 Subject: [PATCH] Add adventure and item flags --- include/Item/Item.hpp | 4 ++-- include/Save/AdventureFlags.hpp | 19 +++++++++++++++++++ src/00_Core/Item/ItemManager.cpp | 6 +++--- 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/include/Item/Item.hpp b/include/Item/Item.hpp index 4d70c9f1..cea5c551 100644 --- a/include/Item/Item.hpp +++ b/include/Item/Item.hpp @@ -50,7 +50,7 @@ enum ItemFlag_ { /* 0x2d */ ItemFlag_SwordsmansScroll = 45, /* 0x2e */ ItemFlag_CycloneSlate = 46, - /* 0x2f */ ItemFlag_Unk_47 = 47, + /* 0x2f */ ItemFlag_BigCatchLure = 47, /* 0x60 */ ItemFlag_TreasureChart1 = 96, /* 0x61 */ ItemFlag_TreasureChart2 = 97, @@ -224,7 +224,7 @@ enum ItemId_ { /* 0x7d */ ItemId_Unk_125 = 125, /* 0x7e */ ItemId_Unk_126 = 126, /* 0x7f */ ItemId_CycloneSlate = 127, - /* 0x80 */ ItemId_Unk_128 = 128, + /* 0x80 */ ItemId_BigCatchLure = 128, /* 0x81 */ ItemId_Rupoor10 = 129, /* 0x82 */ ItemId_Rupoor50 = 130, /* 0x83 */ ItemId_Unk_131 = 131, diff --git a/include/Save/AdventureFlags.hpp b/include/Save/AdventureFlags.hpp index 0484fba8..39d2e409 100644 --- a/include/Save/AdventureFlags.hpp +++ b/include/Save/AdventureFlags.hpp @@ -23,6 +23,10 @@ enum AdventureFlag_ { /* 0x30 */ AdventureFlag_Cannon = 48, + /* 0x33 */ AdventureFlag_RegalNecklace = 51, + + /* 0x7a */ AdventureFlag_CourageCrest = 122, + /* 0x7d */ AdventureFlag_Azurine = 125, /* 0x7e */ AdventureFlag_Crimsonine = 126, /* 0x7f */ AdventureFlag_Aquanine = 127, @@ -30,11 +34,26 @@ enum AdventureFlag_ { /* 0x8c */ AdventureFlag_SalvageArm = 140, + /* 0xa2 */ AdvantureFlag_HerosNewClothes = 162, + /* 0xa3 */ AdvantureFlag_Kaleidoscope = 163, + /* 0xa4 */ AdventureFlag_GuardNotebook = 164, + + /* 0xa7 */ AdventureFlag_WoodHeart = 167, + + /* 0xb6 */ AdventureFlag_SpawnFinalPhantoms = 182, + /* 0x126 */ AdventureFlag_ReceivedGoldenChimney = 294, /* 0x127 */ AdventureFlag_ReceivedGoldenHandrail = 295, /* 0x128 */ AdventureFlag_ReceivedGoldenCannon = 296, /* 0x129 */ AdventureFlag_ReceivedGoldenHull = 297, + /* 0x137 */ AdventureFlag_FrogGlyph_MercayIsland = 311, + /* 0x138 */ AdventureFlag_FrogGlyph_MolidaIsland = 312, + /* 0x139 */ AdventureFlag_FrogGlyph_BannanIsland = 313, + /* 0x13a */ AdventureFlag_FrogGlyph_DeeEssIsland = 314, + /* 0x13b */ AdventureFlag_FrogGlyph_IsleOfFrost = 315, + /* 0x13c */ AdventureFlag_FrogGlyph_NorthEast = 316, + /* 0x187 */ AdventureFlag_COUNT = 391, }; diff --git a/src/00_Core/Item/ItemManager.cpp b/src/00_Core/Item/ItemManager.cpp index 4b2e7b44..3c77b0ab 100644 --- a/src/00_Core/Item/ItemManager.cpp +++ b/src/00_Core/Item/ItemManager.cpp @@ -461,7 +461,7 @@ static char *sItemModelNames2[8] = { [ItemId_SandOfHours - ItemId_SwordsmanScroll] = "sand_m", }; static char *sItemModelNames3[9] = { - [ItemId_CycloneSlate - ItemId_CycloneSlate] = "compass", [ItemId_Unk_128 - ItemId_CycloneSlate] = "lure", + [ItemId_CycloneSlate - ItemId_CycloneSlate] = "compass", [ItemId_BigCatchLure - ItemId_CycloneSlate] = "lure", [ItemId_Rupoor10 - ItemId_CycloneSlate] = "rupee_bb", [ItemId_Rupoor50 - ItemId_CycloneSlate] = "rupee_bb", [ItemId_Unk_131 - ItemId_CycloneSlate] = NULL, [ItemId_Unk_132 - ItemId_CycloneSlate] = NULL, [ItemId_Unk_133 - ItemId_CycloneSlate] = NULL, [ItemId_Unk_134 - ItemId_CycloneSlate] = NULL, @@ -778,8 +778,8 @@ THUMB void ItemManager::GiveItem(ItemId id) { SET_FLAG(mItemFlags.flags, ItemFlag_CycloneSlate); } break; - case ItemId_Unk_128: { - SET_FLAG(mItemFlags.flags, ItemFlag_Unk_47); + case ItemId_BigCatchLure: { + SET_FLAG(mItemFlags.flags, ItemFlag_BigCatchLure); } break; case ItemId_Rupoor10: {