create item enum

1 files changed, 120 insertions, 123 deletions

diff --git a/include/item.h b/include/item.h
index 7c36eb15..b47066da 100644
--- a/include/item.h
+++ b/include/item.h
@@ -21,128 +21,125 @@ extern void ItemOcarina(ItemBehavior*, u32);
 extern void ItemTryPickupObject(ItemBehavior*, u32);
 extern void ItemJarEmpty(ItemBehavior*, u32);
 
-/* On hold until naming conflicts are resolved */
-/*
-        enum
-    {
-        Untyped,
-        SmithSword = 0x01,
-        GreenSword = 0x02,
-        RedSword = 0x03,
-        BlueSword = 0x04,
-        // UnusedSword = 0x05,
-        FourSword = 0x06,
-        Bombs = 0x07,
-        RemoteBombs = 0x08,
-        Bow = 0x09,
-        LightArrow = 0x0A,
-        Boomerang = 0x0B,
-        MagicBoomerang = 0x0C,
-        Shield = 0x0D,
-        MirrorShield = 0x0E,
-        LanternOff = 0x0F,
+enum {
+    ITEM_NONE,
+    ITEM_SMITH_SWORD,
+    ITEM_GREEN_SWORD,
+    ITEM_RED_SWORD,
+    ITEM_BLUE_SWORD,
+    ITEM_UNUSED_SWORD,
+    ITEM_FOURSWORD,
+    ITEM_BOMBS,
+    ITEM_REMOTE_BOMBS,
+    ITEM_BOW,
+    ITEM_LIGHT_ARROW,
+    ITEM_BOOMERANG,
+    ITEM_MAGIC_BOOMERANG,
+    ITEM_SHIELD,
+    ITEM_MIRROR_SHIELD,
+    ITEM_LANTERN_OFF,
+    ITEM_LANTERN_ON,
+    ITEM_GUST_JAR,
+    ITEM_PACCI_CANE,
+    ITEM_MOLE_MITTS,
+    ITEM_ROCS_CAPE,
+    ITEM_PEGASUS_BOOTS,
+    ITEM_FIRE_ROD,
+    ITEM_OCARINA,
+    ITEM_ORB_GREEN,
+    ITEM_ORB_BLUE,
+    ITEM_ORB_RED,
+    ITEM_TRAP,
+    ITEM_BOTTLE1,
+    ITEM_BOTTLE2,
+    ITEM_BOTTLE3,
+    ITEM_BOTTLE4,
+    ITEM_BOTTLE_EMPTY,
+    ITEM_BOTTLE_BUTTER,
+    ITEM_BOTTLE_MILK,
+    ITEM_BOTTLE_HALF_MILK,
+    ITEM_BOTTLE_RED_POTION,
+    ITEM_BOTTLE_BLUE_POTION,
+    ITEM_BOTTLE_WATER,
+    ITEM_BOTTLE_MINERAL_WATER,
+    ITEM_BOTTLE_FAIRY,
+    ITEM_BOTTLE_PICOLYTE_RED,
+    ITEM_BOTTLE_PICOLYTE_ORANGE,
+    ITEM_BOTTLE_PICOLYTE_YELLOW,
+    ITEM_BOTTLE_PICOLYTE_GREEN,
+    ITEM_BOTTLE_PICOLYTE_BLUE,
+    ITEM_BOTTLE_PICOLYTE_WHITE,
+    BOTTLE_CHARM_NAYRU,
+    BOTTLE_CHARM_FARORE,
+    BOTTLE_CHARM_DIN,
+    ITEM_32,
+    ITEM_33,
+    ITEM_QST_SWORD,
+    ITEM_QST_BROKEN_SWORD,
+    ITEM_QST_DOGFOOD,
+    ITEM_QST_LONLON_KEY,
+    ITEM_QST_MUSHROOM,
+    ITEM_QST_BOOK1,
+    ITEM_QST_BOOK2,
+    ITEM_QST_BOOK3,
+    ITEM_QST_GRAVEYARD_KEY,
+    ITEM_QST_TINGLE_TROPHY,
+    ITEM_QST_CARLOV_MEDAL,
+    ITEM_SHELLS,
+    ITEM_EARTH_ELEMENT,
+    ITEM_FIRE_ELEMENT,
+    ITEM_WATER_ELEMENT,
+    ITEM_WIND_ELEMENT,
+    ITEM_GRIP_RING,
+    ITEM_POWER_BRACELETS,
+    ITEM_FLIPPERS,
+    ITEM_MAP,
+    ITEM_SKILL_SPIN_ATTACK,
+    ITEM_SKILL_ROLL_ATTACK,
+    ITEM_SKILL_DASH_ATTACK,
+    ITEM_SKILL_ROCK_BREAKER,
+    ITEM_SKILL_SWORD_BEAM,
+    ITEM_SKILL_GREAT_SPIN,
+    ITEM_SKILL_DOWN_THRUST,
+    ITEM_SKILL_PERIL_BEAM,
+    ITEM_DUNGEON_MAP,
+    ITEM_COMPASS,
+    ITEM_BIG_KEY,
+    ITEM_SMALL_KEY,
+    ITEM_RUPEE1,
+    ITEM_RUPEE5,
+    ITEM_RUPEE20,
+    ITEM_RUPEE50,
+    ITEM_RUPEE100,
+    ITEM_RUPEE200,
+    ITEM_5A,
+    ITEM_JABBERNUT,
+    ITEM_KINSTONE,
+    ITEM_BOMBS5,
+    ITEM_ARROWS5,
+    ITEM_HEART,
+    ITEM_FAIRY,
+    ITEM_SHELLS30,
+    ITEM_HEART_CONTAINER,
+    ITEM_HEART_PIECE,
+    ITEM_WALLET,
+    ITEM_BOMBBAG,
+    ITEM_LARGE_QUIVER,
+    ITEM_KINSTONE_BAG,
+    ITEM_BRIOCHE,
+    ITEM_CROISSANT,
+    ITEM_PIE,
+    ITEM_CAKE,
+    ITEM_BOMBS10,
+    ITEM_BOMBS30,
+    ITEM_ARROWS10,
+    ITEM_ARROWS30,
+    ITEM_ARROW_BUTTERFLY,
+    ITEM_DIG_BUTTERFLY,
+    ITEM_SWIM_BUTTERFLY,
+    ITEM_SKILL_FAST_SPIN,
+    ITEM_SKILL_FAST_SPLIT,
+    ITEM_SKILL_LONG_SPIN,
+};
 
-        GustJar = 0x11,
-        PacciCane = 0x12,
-        MoleMitts = 0x13,
-        RocsCape = 0x14,
-        PegasusBoots = 0x15,
-        FireRod = 0x16,
-        Ocarina = 0x17,
-        GreenOrb = 0x18,
-        BlueOrb = 0x19,
-        RedOrb = 0x1A,
-        Trap = 0x1B,
-        Bottle1 = 0x1C,
-        Bottle2 = 0x1D,
-        Bottle3 = 0x1E,
-        Bottle4 = 0x1F,
-        BottleEmpty = 0x20,
-        BottleButter = 0x21,
-        BottleMilk = 0x22,
-        BottleHalfMilk = 0x23,
-        BottleRedPotion = 0x24,
-        BottleBluePotion = 0x25,
-        BottleWater = 0x26,
-        BottleMineralWater = 0x27,
-        BottleFairy = 0x28,
-        BottlePicolyteRed = 0x29,
-        BottlePicolyteOrange = 0x2A,
-        BottlePicolyteYellow = 0x2B,
-        BottlePiclolyteGreen = 0x2C,
-        BottlePicolyteBlue = 0x2D,
-        BottlePicolyteWhite = 0x2E,
-        BottleCharmNayru = 0x2F,
-        BottleCharmFarore = 0x30,
-        BottleCharmDin = 0x31,
-
-
-        SmithSwordQuest = 0x34,
-        BrokenPicoriBlade = 0x35,
-        DogFoodBottle = 0x36,
-        LonLonKey = 0x37,
-        WakeUpMushroom = 0x38,
-        HyruleanBestiary = 0x39,
-        PicoriLegend = 0x3A,
-        MaskHistory = 0x3B,
-        GraveyardKey = 0x3C,
-        TingleTrophy = 0x3D,
-        CarlovMedal = 0x3E,
-        ShellsX = 0x3F,
-        EarthElement = 0x40,
-        FireElement = 0x41,
-        WaterElement = 0x42,
-        WindElement = 0x43,
-        GripRing = 0x44,
-        PowerBracelets = 0x45,
-        Flippers = 0x46,
-        HyruleMap = 0x47,
-        SpinAttack = 0x48,
-        RollAttack = 0x49,
-        DashAttack = 0x4A,
-        RockBreaker = 0x4B,
-        SwordBeam = 0x4C,
-        GreatSpin = 0x4D,
-        DownThrust = 0x4E,
-        PerilBeam = 0x4F,
-        DungeonMap = 0x50,
-        Compass = 0x51,
-        BigKey = 0x52,
-        SmallKey = 0x53,
-        Rupee1 = 0x54,
-        Rupee5 = 0x55,
-        Rupee20 = 0x56,
-        Rupee50 = 0x57,
-        Rupee100 = 0x58,
-        Rupee200 = 0x59,
-
-        JabberNut = 0x5B,
-        KinstoneX = 0x5C,
-        Bombs5 = 0x5D,
-        Arrows5 = 0x5E,
-        SmallHeart = 0x5F,
-        Fairy = 0x60,
-        Shells30 = 0x61,
-        HeartContainer = 0x62,
-        PieceOfHeart = 0x63,
-        Wallet = 0x64,
-        BombBag = 0x65,
-        LargeQuiver = 0x66,
-        KinstoneBag = 0x67,
-        Brioche = 0x68,
-        Croissant = 0x69,
-        PieSlice = 0x6A,
-        CakeSlice = 0x6B,
-        Bombs10 = 0x6C,
-        Bombs30 = 0x6D,
-        Arrows10 = 0x6E,
-        Arrows30 = 0x6F,
-        ArrowButterfly = 0x70,
-        DigButterfly = 0x71,
-        SwimButterfly = 0x72,
-        FastSpin = 0x73,
-        FastSplit = 0x74,
-        LongSpin = 0x75
-    } ItemType;
-*/
 #endif