diff --git a/include/Item/Item.hpp b/include/Item/Item.hpp
index be4dd102..a2b02076 100644
--- a/include/Item/Item.hpp
+++ b/include/Item/Item.hpp
@@ -50,98 +50,140 @@ enum ItemFlag_ {
 
 typedef s32 ItemId;
 enum ItemId_ {
-    ItemId_SmallKey = 1,
-    ItemId_GreenRupee = 2,
-    ItemId_OshusSword = 3,
-    ItemId_WoodenShield = 4,
+    /* 0x01 */ ItemId_SmallKey = 1,
+    /* 0x02 */ ItemId_GreenRupee = 2,
+    /* 0x03 */ ItemId_OshusSword = 3,
+    /* 0x04 */ ItemId_WoodenShield = 4,
 
-    ItemId_BombBag = 7,
-    ItemId_Bow = 8,
-    ItemId_BigGreenRupee = 9,
-    ItemId_HeartContainer = 10,
+    /* 0x07 */ ItemId_BombBag = 7,
+    /* 0x08 */ ItemId_Bow = 8,
+    /* 0x09 */ ItemId_BigGreenRupee = 9,
+    /* 0x0a */ ItemId_HeartContainer = 10,
 
-    ItemId_Boomerang = 12,
-    ItemId_Scoop = 13,
-    ItemId_BombchuBag = 14,
-    ItemId_BossKey = 15,
+    /* 0x0c */ ItemId_Boomerang = 12,
+    /* 0x0d */ ItemId_Scoop = 13,
+    /* 0x0e */ ItemId_BombchuBag = 14,
+    /* 0x0f */ ItemId_BossKey = 15,
 
-    ItemId_PhantomHourglass = 18,
-    ItemId_SWSeaChart = 19,
-    ItemId_NWSeaChart = 20,
-    ItemId_SESeaChart = 21,
-    ItemId_NESeaChart = 22,
+    /* 0x12 */ ItemId_PhantomHourglass = 18,
+    /* 0x13 */ ItemId_SWSeaChart = 19,
+    /* 0x14 */ ItemId_NWSeaChart = 20,
+    /* 0x15 */ ItemId_SESeaChart = 21,
+    /* 0x16 */ ItemId_NESeaChart = 22,
     
-    ItemId_BlueRupee = 24,
-    ItemId_RedRupee = 25,
-    ItemId_BigRedRupee = 26,
-    ItemId_GoldRupee = 27,
+    /* 0x18 */ ItemId_BlueRupee = 24,
+    /* 0x19 */ ItemId_RedRupee = 25,
+    /* 0x1a */ ItemId_BigRedRupee = 26,
+    /* 0x1b */ ItemId_GoldRupee = 27,
 
-    ItemId_Hammer = 31,
-    ItemId_Rope = 32,
-    ItemId_SquareCrystal = 33,
-    ItemId_RoundCrystal = 34,
-    ItemId_TriangleCrystal = 35,
-    ItemId_FishingRod = 36,
-    ItemId_Cannon = 37,
-    ItemId_SunKey = 38,
+    /* 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,
 
-    ItemId_Quiver = 40,
-    ItemId_BigBombBag = 41,
-    ItemId_BigBombchuBag = 42,
-    ItemId_Unk_43 = 43,
-    ItemId_KingsKey = 44,
-    ItemId_PowerGem = 45,
-    ItemId_WisdomGem = 46,
-    ItemId_CourageGem = 47,
-    ItemId_PinkCoral = 48,
-    ItemId_WhitePearlLoop = 49,
-    ItemId_DarkPearlLoop = 50,
-    ItemId_ZoraScale = 51,
-    ItemId_GoronAmber = 52,
-    ItemId_RutoCrown = 53,
-    ItemId_HelmarocPlume = 54,
-    ItemId_RegalRing = 55,
-    ItemId_GhostKey = 56,
-    ItemId_FreebieCard = 57,
-    ItemId_ComplimentCard = 58,
-    ItemId_ComplimentaryCard = 59,
-    ItemId_RegalNecklace = 60,
-    ItemId_SalvageArm = 61,
-    ItemId_HerosNewClothes = 62,
-    ItemId_Kaleidoscope = 63,
-    ItemId_GuardNotebook = 64,
-    ItemId_JolenesLetter = 65,
-    ItemId_PrizePostcard = 66,
-    ItemId_WoodHeart = 67,
-    ItemId_PhantomSwordBlade = 68,
-    ItemId_PhantomSword = 69,
+    /* 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,
+    /* 0x44 */ ItemId_PhantomSwordBlade = 68,
+    /* 0x45 */ ItemId_PhantomSword = 69,
+    /* 0x46 */ ItemId_Unk_70 = 70,
 
-    ItemId_SpiritOfPowerUpgradeLvl1 = 107,
-    ItemId_SpiritOfWisdomUpgradeLvl1 = 108,
-    ItemId_SpiritOfCourageUpgradeLvl1 = 109,
-    ItemId_SpiritOfPowerUpgradeLvl2 = 110,
-    ItemId_SpiritOfWisdomUpgradeLvl2 = 111,
-    ItemId_SpiritOfCourageUpgradeLvl2 = 112,
-    ItemId_SwordsmanScroll = 113,
-    ItemId_Crimsonine = 114,
-    ItemId_Azurine = 115,
-    ItemId_Aquanine = 116,
-    ItemId_RedPotion = 117,
-    ItemId_PurplePotion = 118,
-    ItemId_YellowPotion = 119,
-    ItemId_SandOfHours = 120,
-    ItemId_GoldenChimney = 121,
-    ItemId_GoldenHandrail = 122,
-    ItemId_GoldenCannon = 123,
-    ItemId_GoldenHull = 124,
+    /* 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,
+    /* 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,
 
-    ItemId_Unk_126 = 126,
-    ItemId_CycloneSlate = 127,
+    /* 0x7d */ ItemId_Unk_125 = 125,
+    /* 0x7e */ ItemId_Unk_126 = 126,
+    /* 0x7f */ ItemId_CycloneSlate = 127,
 
-    ItemId_Rupoor10 = 129,
-    ItemId_Rupoor50 = 130,
+    /* 0x81 */ ItemId_Rupoor10 = 129,
+    /* 0x82 */ ItemId_Rupoor50 = 130,
 
-    ItemId_Unk_133 = 133,
+    /* 0x85 */ ItemId_Unk_133 = 133,
+
+    /* 0x88 */ ItemId_Unk_136 = 136,
 };
 
 namespace Item {