diff options
Diffstat (limited to 'include/Item')
| -rw-r--r-- | include/Item/Item.hpp | 414 | ||||
| -rw-r--r-- | include/Item/ItemManager.hpp | 29 |
2 files changed, 221 insertions, 222 deletions
diff --git a/include/Item/Item.hpp b/include/Item/Item.hpp index 9535d9d2..cc3b9777 100644 --- a/include/Item/Item.hpp +++ b/include/Item/Item.hpp @@ -4,235 +4,235 @@ typedef s32 ItemFlag; enum ItemFlag_ { - ItemFlag_None = -1, - /* 0x00 */ ItemFlag_OshusSword = 0, - /* 0x01 */ ItemFlag_WoodenShield = 1, - /* 0x02 */ ItemFlag_Boomerang = 2, - /* 0x03 */ ItemFlag_Shovel = 3, - /* 0x04 */ ItemFlag_BombBag = 4, - /* 0x05 */ ItemFlag_Bow = 5, - /* 0x06 */ ItemFlag_GrapplingHook = 6, - /* 0x07 */ ItemFlag_BombchuBag = 7, - /* 0x08 */ ItemFlag_Hammer = 8, - /* 0x09 */ ItemFlag_PotionA = 9, - /* 0x0a */ ItemFlag_PotionB = 10, - ItemFlag_EQUIP_START = ItemFlag_OshusSword, - ItemFlag_EQUIP_END = ItemFlag_PotionB + 1, - ItemFlag_EQUIP_COUNT = ItemFlag_EQUIP_END - ItemFlag_EQUIP_START, + ItemFlag_None = -1, + /* 0x00 */ ItemFlag_OshusSword = 0, + /* 0x01 */ ItemFlag_WoodenShield = 1, + /* 0x02 */ ItemFlag_Boomerang = 2, + /* 0x03 */ ItemFlag_Shovel = 3, + /* 0x04 */ ItemFlag_BombBag = 4, + /* 0x05 */ ItemFlag_Bow = 5, + /* 0x06 */ ItemFlag_GrapplingHook = 6, + /* 0x07 */ ItemFlag_BombchuBag = 7, + /* 0x08 */ ItemFlag_Hammer = 8, + /* 0x09 */ ItemFlag_PotionA = 9, + /* 0x0a */ ItemFlag_PotionB = 10, + ItemFlag_EQUIP_START = ItemFlag_OshusSword, + ItemFlag_EQUIP_END = ItemFlag_PotionB + 1, + ItemFlag_EQUIP_COUNT = ItemFlag_EQUIP_END - ItemFlag_EQUIP_START, - /* 0x14 */ ItemFlag_SpiritOfCourage = 20, - /* 0x15 */ ItemFlag_SpiritOfPower = 21, - /* 0x16 */ ItemFlag_SpiritOfWisdom = 22, - /* 0x17 */ ItemFlag_CourageLv1 = 23, - /* 0x18 */ ItemFlag_PowerLv1 = 24, - /* 0x19 */ ItemFlag_WisdomLv1 = 25, - ItemFlag_FAIRY_LV1 = ItemFlag_CourageLv1, - /* 0x1a */ ItemFlag_CourageLv2 = 26, - /* 0x1b */ ItemFlag_PowerLv2 = 27, - /* 0x1c */ ItemFlag_WisdomLv2 = 28, - ItemFlag_FAIRY_LV2 = ItemFlag_CourageLv2, + /* 0x14 */ ItemFlag_SpiritOfCourage = 20, + /* 0x15 */ ItemFlag_SpiritOfPower = 21, + /* 0x16 */ ItemFlag_SpiritOfWisdom = 22, + /* 0x17 */ ItemFlag_CourageLv1 = 23, + /* 0x18 */ ItemFlag_PowerLv1 = 24, + /* 0x19 */ ItemFlag_WisdomLv1 = 25, + ItemFlag_FAIRY_LV1 = ItemFlag_CourageLv1, + /* 0x1a */ ItemFlag_CourageLv2 = 26, + /* 0x1b */ ItemFlag_PowerLv2 = 27, + /* 0x1c */ ItemFlag_WisdomLv2 = 28, + ItemFlag_FAIRY_LV2 = ItemFlag_CourageLv2, - /* 0x20 */ ItemFlag_Hourglass = 32, - /* 0x21 */ ItemFlag_SeaChartSW = 33, - /* 0x22 */ ItemFlag_SeaChartNW = 34, - /* 0x23 */ ItemFlag_SeaChartSE = 35, - /* 0x24 */ ItemFlag_SeaChartNE = 36, - /* 0x25 */ ItemFlag_PhantomSword = 37, - /* 0x26 */ ItemFlag_SunKey = 38, - /* 0x27 */ ItemFlag_Unk_39 = 39, - /* 0x28 */ ItemFlag_FishingRod = 40, - /* 0x29 */ ItemFlag_Cannon = 41, - /* 0x2a */ ItemFlag_KingsKey = 42, - /* 0x2b */ ItemFlag_GhostKey = 43, - /* 0x2c */ ItemFlag_SalvageArm = 44, + /* 0x20 */ ItemFlag_Hourglass = 32, + /* 0x21 */ ItemFlag_SeaChartSW = 33, + /* 0x22 */ ItemFlag_SeaChartNW = 34, + /* 0x23 */ ItemFlag_SeaChartSE = 35, + /* 0x24 */ ItemFlag_SeaChartNE = 36, + /* 0x25 */ ItemFlag_PhantomSword = 37, + /* 0x26 */ ItemFlag_SunKey = 38, + /* 0x27 */ ItemFlag_Unk_39 = 39, + /* 0x28 */ ItemFlag_FishingRod = 40, + /* 0x29 */ ItemFlag_Cannon = 41, + /* 0x2a */ ItemFlag_KingsKey = 42, + /* 0x2b */ ItemFlag_GhostKey = 43, + /* 0x2c */ ItemFlag_SalvageArm = 44, /* 0x2d */ ItemFlag_SwordsmansScroll = 45, /* 0x2e */ ItemFlag_CycloneSlate = 46, /* 0x2f */ ItemFlag_Unk_47 = 47, - /* 0x60 */ ItemFlag_TreasureChart1 = 96, - /* 0x61 */ ItemFlag_TreasureChart2 = 97, - /* 0x62 */ ItemFlag_TreasureChart3 = 98, - /* 0x63 */ ItemFlag_TreasureChart4 = 99, - /* 0x64 */ ItemFlag_TreasureChart5 = 100, - /* 0x65 */ ItemFlag_TreasureChart6 = 101, - /* 0x66 */ ItemFlag_TreasureChart7 = 102, - /* 0x67 */ ItemFlag_TreasureChart8 = 103, - /* 0x68 */ ItemFlag_TreasureChart9 = 104, - /* 0x69 */ ItemFlag_TreasureChart10 = 105, - /* 0x6a */ ItemFlag_TreasureChart11 = 106, - /* 0x6b */ ItemFlag_TreasureChart12 = 107, - /* 0x6c */ ItemFlag_TreasureChart13 = 108, - /* 0x6d */ ItemFlag_TreasureChart14 = 109, - /* 0x6e */ ItemFlag_TreasureChart15 = 110, - /* 0x6f */ ItemFlag_TreasureChart16 = 111, - /* 0x70 */ ItemFlag_TreasureChart17 = 112, - /* 0x71 */ ItemFlag_TreasureChart18 = 113, - /* 0x72 */ ItemFlag_TreasureChart19 = 114, - /* 0x73 */ ItemFlag_TreasureChart20 = 115, - /* 0x74 */ ItemFlag_TreasureChart21 = 116, - /* 0x75 */ ItemFlag_TreasureChart22 = 117, - /* 0x76 */ ItemFlag_TreasureChart23 = 118, - /* 0x77 */ ItemFlag_TreasureChart24 = 119, - /* 0x78 */ ItemFlag_TreasureChart25 = 120, - /* 0x79 */ ItemFlag_TreasureChart26 = 121, - /* 0x7a */ ItemFlag_TreasureChart27 = 122, - /* 0x7b */ ItemFlag_TreasureChart28 = 123, - /* 0x7c */ ItemFlag_TreasureChart29 = 124, - /* 0x7d */ ItemFlag_TreasureChart30 = 125, - /* 0x7e */ ItemFlag_TreasureChart31 = 126, - /* 0x7f */ ItemFlag_TreasureChart32 = 127, - ItemFlag_TREASURE_CHART_START = ItemFlag_TreasureChart1, + /* 0x60 */ ItemFlag_TreasureChart1 = 96, + /* 0x61 */ ItemFlag_TreasureChart2 = 97, + /* 0x62 */ ItemFlag_TreasureChart3 = 98, + /* 0x63 */ ItemFlag_TreasureChart4 = 99, + /* 0x64 */ ItemFlag_TreasureChart5 = 100, + /* 0x65 */ ItemFlag_TreasureChart6 = 101, + /* 0x66 */ ItemFlag_TreasureChart7 = 102, + /* 0x67 */ ItemFlag_TreasureChart8 = 103, + /* 0x68 */ ItemFlag_TreasureChart9 = 104, + /* 0x69 */ ItemFlag_TreasureChart10 = 105, + /* 0x6a */ ItemFlag_TreasureChart11 = 106, + /* 0x6b */ ItemFlag_TreasureChart12 = 107, + /* 0x6c */ ItemFlag_TreasureChart13 = 108, + /* 0x6d */ ItemFlag_TreasureChart14 = 109, + /* 0x6e */ ItemFlag_TreasureChart15 = 110, + /* 0x6f */ ItemFlag_TreasureChart16 = 111, + /* 0x70 */ ItemFlag_TreasureChart17 = 112, + /* 0x71 */ ItemFlag_TreasureChart18 = 113, + /* 0x72 */ ItemFlag_TreasureChart19 = 114, + /* 0x73 */ ItemFlag_TreasureChart20 = 115, + /* 0x74 */ ItemFlag_TreasureChart21 = 116, + /* 0x75 */ ItemFlag_TreasureChart22 = 117, + /* 0x76 */ ItemFlag_TreasureChart23 = 118, + /* 0x77 */ ItemFlag_TreasureChart24 = 119, + /* 0x78 */ ItemFlag_TreasureChart25 = 120, + /* 0x79 */ ItemFlag_TreasureChart26 = 121, + /* 0x7a */ ItemFlag_TreasureChart27 = 122, + /* 0x7b */ ItemFlag_TreasureChart28 = 123, + /* 0x7c */ ItemFlag_TreasureChart29 = 124, + /* 0x7d */ ItemFlag_TreasureChart30 = 125, + /* 0x7e */ ItemFlag_TreasureChart31 = 126, + /* 0x7f */ ItemFlag_TreasureChart32 = 127, + ItemFlag_TREASURE_CHART_START = ItemFlag_TreasureChart1, ItemFlag_COUNT = 128, }; typedef s32 ItemId; enum ItemId_ { - /* 0x00 */ ItemId_None = 0, - /* 0x01 */ ItemId_SmallKey = 1, - /* 0x02 */ ItemId_GreenRupee = 2, - /* 0x03 */ ItemId_OshusSword = 3, - /* 0x04 */ ItemId_WoodenShield = 4, - /* 0x05 */ ItemId_Unk_5 = 5, - /* 0x06 */ ItemId_Unk_6 = 6, - /* 0x07 */ ItemId_BombBag = 7, - /* 0x08 */ ItemId_Bow = 8, - /* 0x09 */ ItemId_BigGreenRupee = 9, - /* 0x0a */ ItemId_HeartContainer = 10, - /* 0x0b */ ItemId_Unk_11 = 11, - /* 0x0c */ ItemId_Boomerang = 12, - /* 0x0d */ ItemId_Scoop = 13, - /* 0x0e */ ItemId_BombchuBag = 14, - /* 0x0f */ ItemId_BossKey = 15, - /* 0x10 */ ItemId_Unk_16 = 16, - /* 0x11 */ ItemId_Unk_17 = 17, - /* 0x12 */ ItemId_PhantomHourglass = 18, - /* 0x13 */ ItemId_SWSeaChart = 19, - /* 0x14 */ ItemId_NWSeaChart = 20, - /* 0x15 */ ItemId_SESeaChart = 21, - /* 0x16 */ ItemId_NESeaChart = 22, - /* 0x17 */ ItemId_Unk_23 = 23, - /* 0x18 */ ItemId_BlueRupee = 24, - /* 0x19 */ ItemId_RedRupee = 25, - /* 0x1a */ ItemId_BigRedRupee = 26, - /* 0x1b */ ItemId_GoldRupee = 27, - /* 0x1c */ ItemId_Unk_28 = 28, - /* 0x1d */ ItemId_Unk_29 = 29, - /* 0x1e */ ItemId_Unk_30 = 30, - /* 0x1f */ ItemId_Hammer = 31, - /* 0x20 */ ItemId_Rope = 32, - /* 0x21 */ ItemId_SquareCrystal = 33, - /* 0x22 */ ItemId_RoundCrystal = 34, - /* 0x23 */ ItemId_TriangleCrystal = 35, - /* 0x24 */ ItemId_FishingRod = 36, - /* 0x25 */ ItemId_Cannon = 37, - /* 0x26 */ ItemId_SunKey = 38, - /* 0x27 */ ItemId_Unk_39 = 39, - /* 0x28 */ ItemId_Quiver = 40, - /* 0x29 */ ItemId_BigBombBag = 41, - /* 0x2a */ ItemId_BigBombchuBag = 42, - /* 0x2b */ ItemId_Unk_43 = 43, - /* 0x2c */ ItemId_KingsKey = 44, - /* 0x2d */ ItemId_PowerGem = 45, - /* 0x2e */ ItemId_WisdomGem = 46, - /* 0x2f */ ItemId_CourageGem = 47, - /* 0x30 */ ItemId_PinkCoral = 48, - /* 0x31 */ ItemId_WhitePearlLoop = 49, - /* 0x32 */ ItemId_DarkPearlLoop = 50, - /* 0x33 */ ItemId_ZoraScale = 51, - /* 0x34 */ ItemId_GoronAmber = 52, - /* 0x35 */ ItemId_RutoCrown = 53, - /* 0x36 */ ItemId_HelmarocPlume = 54, - /* 0x37 */ ItemId_RegalRing = 55, - ItemId_TREASURE_START = ItemId_PinkCoral, - ItemId_TREASURE_END = ItemId_RegalRing, - /* 0x38 */ ItemId_GhostKey = 56, - /* 0x39 */ ItemId_FreebieCard = 57, - /* 0x3a */ ItemId_ComplimentCard = 58, + /* 0x00 */ ItemId_None = 0, + /* 0x01 */ ItemId_SmallKey = 1, + /* 0x02 */ ItemId_GreenRupee = 2, + /* 0x03 */ ItemId_OshusSword = 3, + /* 0x04 */ ItemId_WoodenShield = 4, + /* 0x05 */ ItemId_Unk_5 = 5, + /* 0x06 */ ItemId_Unk_6 = 6, + /* 0x07 */ ItemId_BombBag = 7, + /* 0x08 */ ItemId_Bow = 8, + /* 0x09 */ ItemId_BigGreenRupee = 9, + /* 0x0a */ ItemId_HeartContainer = 10, + /* 0x0b */ ItemId_Unk_11 = 11, + /* 0x0c */ ItemId_Boomerang = 12, + /* 0x0d */ ItemId_Scoop = 13, + /* 0x0e */ ItemId_BombchuBag = 14, + /* 0x0f */ ItemId_BossKey = 15, + /* 0x10 */ ItemId_Unk_16 = 16, + /* 0x11 */ ItemId_Unk_17 = 17, + /* 0x12 */ ItemId_PhantomHourglass = 18, + /* 0x13 */ ItemId_SWSeaChart = 19, + /* 0x14 */ ItemId_NWSeaChart = 20, + /* 0x15 */ ItemId_SESeaChart = 21, + /* 0x16 */ ItemId_NESeaChart = 22, + /* 0x17 */ ItemId_Unk_23 = 23, + /* 0x18 */ ItemId_BlueRupee = 24, + /* 0x19 */ ItemId_RedRupee = 25, + /* 0x1a */ ItemId_BigRedRupee = 26, + /* 0x1b */ ItemId_GoldRupee = 27, + /* 0x1c */ ItemId_Unk_28 = 28, + /* 0x1d */ ItemId_Unk_29 = 29, + /* 0x1e */ ItemId_Unk_30 = 30, + /* 0x1f */ ItemId_Hammer = 31, + /* 0x20 */ ItemId_Rope = 32, + /* 0x21 */ ItemId_SquareCrystal = 33, + /* 0x22 */ ItemId_RoundCrystal = 34, + /* 0x23 */ ItemId_TriangleCrystal = 35, + /* 0x24 */ ItemId_FishingRod = 36, + /* 0x25 */ ItemId_Cannon = 37, + /* 0x26 */ ItemId_SunKey = 38, + /* 0x27 */ ItemId_Unk_39 = 39, + /* 0x28 */ ItemId_Quiver = 40, + /* 0x29 */ ItemId_BigBombBag = 41, + /* 0x2a */ ItemId_BigBombchuBag = 42, + /* 0x2b */ ItemId_Unk_43 = 43, + /* 0x2c */ ItemId_KingsKey = 44, + /* 0x2d */ ItemId_PowerGem = 45, + /* 0x2e */ ItemId_WisdomGem = 46, + /* 0x2f */ ItemId_CourageGem = 47, + /* 0x30 */ ItemId_PinkCoral = 48, + /* 0x31 */ ItemId_WhitePearlLoop = 49, + /* 0x32 */ ItemId_DarkPearlLoop = 50, + /* 0x33 */ ItemId_ZoraScale = 51, + /* 0x34 */ ItemId_GoronAmber = 52, + /* 0x35 */ ItemId_RutoCrown = 53, + /* 0x36 */ ItemId_HelmarocPlume = 54, + /* 0x37 */ ItemId_RegalRing = 55, + ItemId_TREASURE_START = ItemId_PinkCoral, + ItemId_TREASURE_END = ItemId_RegalRing, + /* 0x38 */ ItemId_GhostKey = 56, + /* 0x39 */ ItemId_FreebieCard = 57, + /* 0x3a */ ItemId_ComplimentCard = 58, /* 0x3b */ ItemId_ComplimentaryCard = 59, - /* 0x3c */ ItemId_RegalNecklace = 60, - /* 0x3d */ ItemId_SalvageArm = 61, - /* 0x3e */ ItemId_HerosNewClothes = 62, - /* 0x3f */ ItemId_Kaleidoscope = 63, - /* 0x40 */ ItemId_GuardNotebook = 64, - /* 0x41 */ ItemId_JolenesLetter = 65, - /* 0x42 */ ItemId_PrizePostcard = 66, - /* 0x43 */ ItemId_WoodHeart = 67, + /* 0x3c */ ItemId_RegalNecklace = 60, + /* 0x3d */ ItemId_SalvageArm = 61, + /* 0x3e */ ItemId_HerosNewClothes = 62, + /* 0x3f */ ItemId_Kaleidoscope = 63, + /* 0x40 */ ItemId_GuardNotebook = 64, + /* 0x41 */ ItemId_JolenesLetter = 65, + /* 0x42 */ ItemId_PrizePostcard = 66, + /* 0x43 */ ItemId_WoodHeart = 67, /* 0x44 */ ItemId_PhantomSwordBlade = 68, - /* 0x45 */ ItemId_PhantomSword = 69, - /* 0x46 */ ItemId_Unk_70 = 70, + /* 0x45 */ ItemId_PhantomSword = 69, + /* 0x46 */ ItemId_Unk_70 = 70, - /* 0x4b */ ItemId_TreasureChart1 = 75, - /* 0x4c */ ItemId_TreasureChart2 = 76, - /* 0x4d */ ItemId_TreasureChart3 = 77, - /* 0x4e */ ItemId_TreasureChart4 = 78, - /* 0x4f */ ItemId_TreasureChart5 = 79, - /* 0x50 */ ItemId_TreasureChart6 = 80, - /* 0x51 */ ItemId_TreasureChart7 = 81, - /* 0x52 */ ItemId_TreasureChart8 = 82, - /* 0x53 */ ItemId_TreasureChart9 = 83, - /* 0x54 */ ItemId_TreasureChart10 = 84, - /* 0x55 */ ItemId_TreasureChart11 = 85, - /* 0x56 */ ItemId_TreasureChart12 = 86, - /* 0x57 */ ItemId_TreasureChart13 = 87, - /* 0x58 */ ItemId_TreasureChart14 = 88, - /* 0x59 */ ItemId_TreasureChart15 = 89, - /* 0x5a */ ItemId_TreasureChart16 = 90, - /* 0x5b */ ItemId_TreasureChart17 = 91, - /* 0x5c */ ItemId_TreasureChart18 = 92, - /* 0x5d */ ItemId_TreasureChart19 = 93, - /* 0x5e */ ItemId_TreasureChart20 = 94, - /* 0x5f */ ItemId_TreasureChart21 = 95, - /* 0x60 */ ItemId_TreasureChart22 = 96, - /* 0x61 */ ItemId_TreasureChart23 = 97, - /* 0x62 */ ItemId_TreasureChart24 = 98, - /* 0x63 */ ItemId_TreasureChart25 = 99, - /* 0x64 */ ItemId_TreasureChart26 = 100, - /* 0x65 */ ItemId_TreasureChart27 = 101, - /* 0x66 */ ItemId_TreasureChart28 = 102, - /* 0x67 */ ItemId_TreasureChart29 = 103, - /* 0x68 */ ItemId_TreasureChart30 = 104, - /* 0x69 */ ItemId_TreasureChart31 = 105, - /* 0x6a */ ItemId_TreasureChart32 = 106, - ItemId_TREASURE_CHART_START = ItemId_TreasureChart1, - ItemId_TREASURE_CHART_END = ItemId_TreasureChart32, - /* 0x6b */ ItemId_SpiritOfPowerUpgradeLvl1 = 107, - /* 0x6c */ ItemId_SpiritOfWisdomUpgradeLvl1 = 108, + /* 0x4b */ ItemId_TreasureChart1 = 75, + /* 0x4c */ ItemId_TreasureChart2 = 76, + /* 0x4d */ ItemId_TreasureChart3 = 77, + /* 0x4e */ ItemId_TreasureChart4 = 78, + /* 0x4f */ ItemId_TreasureChart5 = 79, + /* 0x50 */ ItemId_TreasureChart6 = 80, + /* 0x51 */ ItemId_TreasureChart7 = 81, + /* 0x52 */ ItemId_TreasureChart8 = 82, + /* 0x53 */ ItemId_TreasureChart9 = 83, + /* 0x54 */ ItemId_TreasureChart10 = 84, + /* 0x55 */ ItemId_TreasureChart11 = 85, + /* 0x56 */ ItemId_TreasureChart12 = 86, + /* 0x57 */ ItemId_TreasureChart13 = 87, + /* 0x58 */ ItemId_TreasureChart14 = 88, + /* 0x59 */ ItemId_TreasureChart15 = 89, + /* 0x5a */ ItemId_TreasureChart16 = 90, + /* 0x5b */ ItemId_TreasureChart17 = 91, + /* 0x5c */ ItemId_TreasureChart18 = 92, + /* 0x5d */ ItemId_TreasureChart19 = 93, + /* 0x5e */ ItemId_TreasureChart20 = 94, + /* 0x5f */ ItemId_TreasureChart21 = 95, + /* 0x60 */ ItemId_TreasureChart22 = 96, + /* 0x61 */ ItemId_TreasureChart23 = 97, + /* 0x62 */ ItemId_TreasureChart24 = 98, + /* 0x63 */ ItemId_TreasureChart25 = 99, + /* 0x64 */ ItemId_TreasureChart26 = 100, + /* 0x65 */ ItemId_TreasureChart27 = 101, + /* 0x66 */ ItemId_TreasureChart28 = 102, + /* 0x67 */ ItemId_TreasureChart29 = 103, + /* 0x68 */ ItemId_TreasureChart30 = 104, + /* 0x69 */ ItemId_TreasureChart31 = 105, + /* 0x6a */ ItemId_TreasureChart32 = 106, + ItemId_TREASURE_CHART_START = ItemId_TreasureChart1, + ItemId_TREASURE_CHART_END = ItemId_TreasureChart32, + /* 0x6b */ ItemId_SpiritOfPowerUpgradeLvl1 = 107, + /* 0x6c */ ItemId_SpiritOfWisdomUpgradeLvl1 = 108, /* 0x6d */ ItemId_SpiritOfCourageUpgradeLvl1 = 109, - /* 0x6e */ ItemId_SpiritOfPowerUpgradeLvl2 = 110, - /* 0x6f */ ItemId_SpiritOfWisdomUpgradeLvl2 = 111, + /* 0x6e */ ItemId_SpiritOfPowerUpgradeLvl2 = 110, + /* 0x6f */ ItemId_SpiritOfWisdomUpgradeLvl2 = 111, /* 0x70 */ ItemId_SpiritOfCourageUpgradeLvl2 = 112, - /* 0x71 */ ItemId_SwordsmanScroll = 113, - /* 0x72 */ ItemId_Crimsonine = 114, - /* 0x73 */ ItemId_Azurine = 115, - /* 0x74 */ ItemId_Aquanine = 116, - /* 0x75 */ ItemId_RedPotion = 117, - /* 0x76 */ ItemId_PurplePotion = 118, - /* 0x77 */ ItemId_YellowPotion = 119, - /* 0x78 */ ItemId_SandOfHours = 120, - /* 0x79 */ ItemId_GoldenChimney = 121, - /* 0x7a */ ItemId_GoldenHandrail = 122, - /* 0x7b */ ItemId_GoldenCannon = 123, - /* 0x7c */ ItemId_GoldenHull = 124, - ItemId_GOLDEN_SHIP_START = ItemId_GoldenChimney, - ItemId_GOLDEN_SHIP_END = ItemId_GoldenHull, + /* 0x71 */ ItemId_SwordsmanScroll = 113, + /* 0x72 */ ItemId_Crimsonine = 114, + /* 0x73 */ ItemId_Azurine = 115, + /* 0x74 */ ItemId_Aquanine = 116, + /* 0x75 */ ItemId_RedPotion = 117, + /* 0x76 */ ItemId_PurplePotion = 118, + /* 0x77 */ ItemId_YellowPotion = 119, + /* 0x78 */ ItemId_SandOfHours = 120, + /* 0x79 */ ItemId_GoldenChimney = 121, + /* 0x7a */ ItemId_GoldenHandrail = 122, + /* 0x7b */ ItemId_GoldenCannon = 123, + /* 0x7c */ ItemId_GoldenHull = 124, + ItemId_GOLDEN_SHIP_START = ItemId_GoldenChimney, + ItemId_GOLDEN_SHIP_END = ItemId_GoldenHull, - /* 0x7d */ ItemId_Unk_125 = 125, - /* 0x7e */ ItemId_Unk_126 = 126, + /* 0x7d */ ItemId_Unk_125 = 125, + /* 0x7e */ ItemId_Unk_126 = 126, /* 0x7f */ ItemId_CycloneSlate = 127, - /* 0x80 */ ItemId_Unk_128 = 128, - /* 0x81 */ ItemId_Rupoor10 = 129, - /* 0x82 */ ItemId_Rupoor50 = 130, - /* 0x83 */ ItemId_Unk_131 = 131, - /* 0x84 */ ItemId_Unk_132 = 132, - /* 0x85 */ ItemId_Unk_133 = 133, - /* 0x86 */ ItemId_Unk_134 = 134, - /* 0x87 */ ItemId_Unk_135 = 135, - /* 0x88 */ ItemId_Unk_136 = 136, + /* 0x80 */ ItemId_Unk_128 = 128, + /* 0x81 */ ItemId_Rupoor10 = 129, + /* 0x82 */ ItemId_Rupoor50 = 130, + /* 0x83 */ ItemId_Unk_131 = 131, + /* 0x84 */ ItemId_Unk_132 = 132, + /* 0x85 */ ItemId_Unk_133 = 133, + /* 0x86 */ ItemId_Unk_134 = 134, + /* 0x87 */ ItemId_Unk_135 = 135, + /* 0x88 */ ItemId_Unk_136 = 136, }; namespace Item { bool func_ov00_020ad020(ItemId item); bool func_ov00_020ad068(ItemId item); -} +} // namespace Item diff --git a/include/Item/ItemManager.hpp b/include/Item/ItemManager.hpp index 3dcb77b9..1cc75738 100644 --- a/include/Item/ItemManager.hpp +++ b/include/Item/ItemManager.hpp @@ -1,24 +1,24 @@ #pragma once
extern "C" {
- #include <string.h>
+#include <string.h>
}
#include "global.h"
-#include "types.h"
#include "lib/math.h"
+#include "types.h"
#include "Actor/ActorNavi.hpp"
#include "DTCM/UnkStruct_027e0f78.hpp"
-#include "Save/AdventureFlags.hpp"
#include "Item/Item.hpp"
#include "Map/MapManager.hpp"
#include "Player/EquipItem.hpp"
#include "Player/HealthManager.hpp"
+#include "Render/ModelRender.hpp"
+#include "Save/AdventureFlags.hpp"
#include "Sound/Sfx.hpp"
-#include "System/SysNew.hpp"
#include "System/OverlayManager.hpp"
-#include "Render/ModelRender.hpp"
+#include "System/SysNew.hpp"
#define MAX_HOURGLASS_SECONDS 1500 // 25 minutes
#define MAX_AMMO_UPGRADE 2
@@ -69,7 +69,7 @@ enum ShipType_ { };
typedef u32 ShipItem;
-#define SHIP_ITEM(part, ship) (ShipPart_ ## part * ShipPart_COUNT + ShipType_ ## type)
+#define SHIP_ITEM(part, ship) (ShipPart_##part * ShipPart_COUNT + ShipType_##type)
#define ShipItem_COUNT (ShipPart_COUNT * ShipType_COUNT)
typedef u32 Treasure;
@@ -96,7 +96,6 @@ enum Potion_ { Potion_COUNT,
};
-
struct ItemFlags {
/* 00 */ u32 flags[CEIL_DIV(ItemFlag_COUNT, 32)];
/* 10 */
@@ -229,7 +228,7 @@ private: /* 150 */
public:
- static ItemManager* Create();
+ static ItemManager *Create();
static void Destroy();
ItemManager();
~ItemManager();
@@ -240,7 +239,7 @@ public: // Fairy
FairyId GetEquippedFairy() const;
- ActorNavi* GetFairy(FairyId id) const;
+ ActorNavi *GetFairy(FairyId id) const;
u32 GetActiveFairyLevel(FairyId id) const;
u32 GetFairyLevel(FairyId id) const;
@@ -253,15 +252,15 @@ public: void EquipItem_vfunc_38(unk32 param1);
bool EquipCollidesWith(Cylinder *cylinder, ItemFlag equipId);
s32 EquipItem_vfunc_2c(ItemFlag equipId);
- EquipItem* GetEquipItem(ItemFlag equipId);
+ EquipItem *GetEquipItem(ItemFlag equipId);
bool func_ov00_020ad790(unk32 param1);
bool SetEquippedItem(ItemFlag equipId);
void EquipPreviousItem();
void ForceEquipItem(ItemFlag equipId);
bool ClearForcedEquipItem();
void UpdateSwordShieldInUse();
- static EquipItem* GetEquipItemUnchecked(ItemFlag equipId);
-
+ static EquipItem *GetEquipItemUnchecked(ItemFlag equipId);
+
// Ammo
u16 GetAmmo(ItemFlag equipId) const;
void GiveAmmo(ItemFlag equipId, u16 amount);
@@ -272,10 +271,10 @@ public: // Item model
void func_ov00_020ad528();
- ItemModel* GetItemModel(ItemModelId id);
+ ItemModel *GetItemModel(ItemModelId id);
void func_ov00_020ad538(unk32 param1) const;
void func_ov00_020ad560(unk32 param1) const;
- ItemModel* GetDungeonItemModel(DungeonItemModelId id);
+ ItemModel *GetDungeonItemModel(DungeonItemModelId id);
void func_ov00_020ad594(unk32 param1) const;
void LoadFanfareItem(ItemId id);
bool GetFanfareItemScale(Vec3p *pScale) const;
@@ -299,7 +298,7 @@ public: bool IsTreasureSalvaged(u32 index) const;
void SetTreasureSalvaged(u32 index);
u8 GetMaxTreasureCount() const;
-
+
// mUnk_098, mUnk_09e
u8 GetUnk_098(u32 index) const;
u16 GetUnk_09e(u32 index) const;
|