Fixes

8 files changed, 55 insertions, 55 deletions

diff --git a/include/d/a/d_a_item.h b/include/d/a/d_a_item.h
index 7928765a..8c28c148 100644
--- a/include/d/a/d_a_item.h
+++ b/include/d/a/d_a_item.h
@@ -241,10 +241,10 @@ public:
     static Trial_e getCurrentTrial();
 
     enum Tear_e {
-        TEAR_0,
-        TEAR_1,
-        TEAR_2,
-        TEAR_3,
+        TEAR_FARON,
+        TEAR_ELDIN,
+        TEAR_LANAYRU,
+        TEAR_GODDESS,
         TEAR_MAX
     };
 
diff --git a/include/d/col/c/c_cc_d.h b/include/d/col/c/c_cc_d.h
index d5fa19bb..edd178ee 100644
--- a/include/d/col/c/c_cc_d.h
+++ b/include/d/col/c/c_cc_d.h
@@ -351,7 +351,7 @@ enum dCcD_ObjAtType {
     /* 0x 0001 0000 */ AT_TYPE_BELLOWS = (1 << 16),
     /* 0x 0002 0000 */ AT_TYPE_0x20000 = (1 << 17),
     /* 0x 0004 0000 */ AT_TYPE_0x40000 = (1 << 18),
-    /* 0x 0008 0000 */ AT_TYPE_0x80000 = (1 << 19),
+    /* 0x 0008 0000 */ AT_TYPE_GLITTERING_SPORES = (1 << 19),
     /* 0x 0010 0000 */ AT_TYPE_BUBBLE = (1 << 20),
     /* 0x 0020 0000 */ AT_TYPE_0x200000 = (1 << 21),
     /* 0x 0040 0000 */ AT_TYPE_BEETLE = (1 << 22),
@@ -361,7 +361,7 @@ enum dCcD_ObjAtType {
     /* 0x 0400 0000 */ AT_TYPE_KOLOKTOS_SWORD = (1 << 26),
     /* 0x 0800 0000 */ AT_TYPE_0x8000000 = (1 << 27),
     /* 0x 0148 8200 */ AT_TYPE_COMMON0 =
-        AT_TYPE_BUGNET | AT_TYPE_BEETLE | AT_TYPE_0x80000 | AT_TYPE_0x8000 | AT_TYPE_WIND,
+        AT_TYPE_BUGNET | AT_TYPE_BEETLE | AT_TYPE_GLITTERING_SPORES | AT_TYPE_0x8000 | AT_TYPE_WIND,
 };
 
 enum cCcD_AtModifiers_e {
diff --git a/include/toBeSorted/item_mdl.h b/include/toBeSorted/item_mdl.h
index d4771617..9897be10 100644
--- a/include/toBeSorted/item_mdl.h
+++ b/include/toBeSorted/item_mdl.h
@@ -14,30 +14,30 @@ class dAcItem_c;
 // vtable at 80533eb0
 class dItemMdl_c : public dMdl_c {
 public:
-    dItemMdl_c() : field_0x14(ITEM_MDL_UNK0x14_0) {}
+    dItemMdl_c() : mDrawMode(DrawMode_None) {}
     /* 0x08 */ virtual ~dItemMdl_c() {}
     /* 0x0C */ virtual bool init(u16 itemId, dAcItem_c *item, mAllocator_c *allocator) = 0;
-    /* 0x10 */ virtual void vt_0x10(u8) = 0;
+    /* 0x10 */ virtual void setDrawMode(u8) = 0;
     /* 0x14 */ virtual void setScale(const mVec3_c &scale) = 0;
     /* 0x18 */ virtual void setLocalMtx(const mMtx_c &mtx) = 0;
     /* 0x1C */ virtual void draw() = 0;
-    /* 0x20 */ virtual void vt_0x20(u16 itemId) = 0;
+    /* 0x20 */ virtual void changeItemId(u16 itemId) = 0;
     /* 0x24 */ virtual void setPriorityDraw() = 0;
     /* 0x28 */ virtual void unsetPriorityDraw() = 0;
     /* 0x2C */ virtual m3d::smdl_c *getMdl() {
         return nullptr;
     }
 
-    enum ItemMdl0x14_e {
-        ITEM_MDL_UNK0x14_0,
-        ITEM_MDL_UNK0x14_1,
-        ITEM_MDL_UNK0x14_2,
-        ITEM_MDL_UNK0x14_3,
+    enum DrawMode_e {
+        DrawMode_None,
+        DrawMode_Put,
+        DrawMode_Get,
+        DrawMode_Max,
     };
 
 protected:
     /* 0x10 */ dAcItem_c *mpItem;
-    /* 0x14 */ u8 field_0x14;
+    /* 0x14 */ u8 mDrawMode;
 };
 
 #endif
diff --git a/include/toBeSorted/item_mdl_item.h b/include/toBeSorted/item_mdl_item.h
index d2dbbfd1..e6f27aef 100644
--- a/include/toBeSorted/item_mdl_item.h
+++ b/include/toBeSorted/item_mdl_item.h
@@ -9,11 +9,11 @@ class dItemMdlItem_c : public dItemMdl_c {
 public:
     /* 0x08 */ virtual ~dItemMdlItem_c() {}
     /* 0x0C */ virtual bool init(u16 itemId, dAcItem_c *item, mAllocator_c *allocator) override;
-    /* 0x10 */ virtual void vt_0x10(u8) override;
+    /* 0x10 */ virtual void setDrawMode(u8) override;
     /* 0x14 */ virtual void setScale(const mVec3_c &scale) override;
     /* 0x18 */ virtual void setLocalMtx(const mMtx_c &mtx) override;
     /* 0x1C */ virtual void draw() override;
-    /* 0x20 */ virtual void vt_0x20(u16 itemId) override;
+    /* 0x20 */ virtual void changeItemId(u16 itemId) override;
     /* 0x24 */ virtual void setPriorityDraw() override;
     /* 0x28 */ virtual void unsetPriorityDraw() override;
     /* 0x2C */ virtual m3d::smdl_c *getMdl() override;
diff --git a/include/toBeSorted/item_mdl_light_fruit.h b/include/toBeSorted/item_mdl_light_fruit.h
index 0711ed38..3278da3e 100644
--- a/include/toBeSorted/item_mdl_light_fruit.h
+++ b/include/toBeSorted/item_mdl_light_fruit.h
@@ -10,21 +10,21 @@ class dItemMdlLightFruit_c : public dItemMdl_c {
 public:
     /* 0x08 */ virtual ~dItemMdlLightFruit_c() {}
     /* 0x0C */ virtual bool init(u16 itemId, dAcItem_c *item, mAllocator_c *allocator) override;
-    /* 0x10 */ virtual void vt_0x10(u8) override;
+    /* 0x10 */ virtual void setDrawMode(u8) override;
     /* 0x14 */ virtual void setScale(const mVec3_c &scale) override;
     /* 0x18 */ virtual void setLocalMtx(const mMtx_c &mtx) override;
     /* 0x1C */ virtual void draw() override;
-    /* 0x20 */ virtual void vt_0x20(u16 itemId) override;
+    /* 0x20 */ virtual void changeItemId(u16 itemId) override;
     /* 0x24 */ virtual void setPriorityDraw() override;
     /* 0x28 */ virtual void unsetPriorityDraw() override;
 
     static bool isMdlForItemId(u16 itemId);
 
 private:
-    /* 0x18 */ m3d::smdl_c mMdl1;
-    /* 0x34 */ m3d::smdl_c mMdl2;
-    /* 0x50 */ m3d::anmTexSrt_c mAnmTexSrt1;
-    /* 0x7C */ m3d::anmTexSrt_c mAnmTexSrt2;
+    /* 0x18 */ m3d::smdl_c mPutMdl;
+    /* 0x34 */ m3d::smdl_c mGetMdl;
+    /* 0x50 */ m3d::anmTexSrt_c mPutAnmTexSrt;
+    /* 0x7C */ m3d::anmTexSrt_c mGetAnmTexSrt;
 };
 
 #endif
diff --git a/include/toBeSorted/item_mdl_misc.h b/include/toBeSorted/item_mdl_misc.h
index d34c9ff1..ffee644f 100644
--- a/include/toBeSorted/item_mdl_misc.h
+++ b/include/toBeSorted/item_mdl_misc.h
@@ -14,11 +14,11 @@ class dItemMdlPut_c : public dItemMdl_c {
 public:
     /* 0x08 */ virtual ~dItemMdlPut_c() {}
     /* 0x0C */ virtual bool init(u16 itemId, dAcItem_c *item, mAllocator_c *allocator) override;
-    /* 0x10 */ virtual void vt_0x10(u8) override;
+    /* 0x10 */ virtual void setDrawMode(u8) override;
     /* 0x14 */ virtual void setScale(const mVec3_c &scale) override;
     /* 0x18 */ virtual void setLocalMtx(const mMtx_c &mtx) override;
     /* 0x1C */ virtual void draw() override;
-    /* 0x20 */ virtual void vt_0x20(u16 itemId) override;
+    /* 0x20 */ virtual void changeItemId(u16 itemId) override;
     /* 0x24 */ virtual void setPriorityDraw() override;
     /* 0x28 */ virtual void unsetPriorityDraw() override;
 
@@ -34,19 +34,19 @@ private:
     static const MdlConfig sMdlConfig[];
     static const u8 sMdlIdx[];
 
-    /* 0x18 */ m3d::smdl_c mGetMdl;
-    /* 0x34 */ m3d::smdl_c mPutMdl;
+    /* 0x18 */ m3d::smdl_c mPutMdl;
+    /* 0x34 */ m3d::smdl_c mGetMdl;
 };
 
 class dItemMdlShield_c : public dItemMdl_c {
 public:
     /* 0x08 */ virtual ~dItemMdlShield_c() {}
     /* 0x0C */ virtual bool init(u16 itemId, dAcItem_c *item, mAllocator_c *allocator) override;
-    /* 0x10 */ virtual void vt_0x10(u8) override;
+    /* 0x10 */ virtual void setDrawMode(u8) override;
     /* 0x14 */ virtual void setScale(const mVec3_c &scale) override;
     /* 0x18 */ virtual void setLocalMtx(const mMtx_c &mtx) override;
     /* 0x1C */ virtual void draw() override;
-    /* 0x20 */ virtual void vt_0x20(u16 itemId) override;
+    /* 0x20 */ virtual void changeItemId(u16 itemId) override;
     /* 0x24 */ virtual void setPriorityDraw() override;
     /* 0x28 */ virtual void unsetPriorityDraw() override;
 
@@ -72,11 +72,11 @@ public:
     dItemMdlBottle_c() : mFlags(0) {}
     /* 0x08 */ virtual ~dItemMdlBottle_c() {}
     /* 0x0C */ virtual bool init(u16 itemId, dAcItem_c *item, mAllocator_c *allocator) override;
-    /* 0x10 */ virtual void vt_0x10(u8) override;
+    /* 0x10 */ virtual void setDrawMode(u8) override;
     /* 0x14 */ virtual void setScale(const mVec3_c &scale) override;
     /* 0x18 */ virtual void setLocalMtx(const mMtx_c &mtx) override;
     /* 0x1C */ virtual void draw() override;
-    /* 0x20 */ virtual void vt_0x20(u16 itemId) override;
+    /* 0x20 */ virtual void changeItemId(u16 itemId) override;
     /* 0x24 */ virtual void setPriorityDraw() override;
     /* 0x28 */ virtual void unsetPriorityDraw() override;
     /* 0x2C */ virtual m3d::smdl_c *getMdl() override {
@@ -102,11 +102,11 @@ class dItemMdlTear_c : public dItemMdl_c {
 public:
     /* 0x08 */ virtual ~dItemMdlTear_c() {}
     /* 0x0C */ virtual bool init(u16 itemId, dAcItem_c *item, mAllocator_c *allocator) override;
-    /* 0x10 */ virtual void vt_0x10(u8) override;
+    /* 0x10 */ virtual void setDrawMode(u8) override;
     /* 0x14 */ virtual void setScale(const mVec3_c &scale) override;
     /* 0x18 */ virtual void setLocalMtx(const mMtx_c &mtx) override;
     /* 0x1C */ virtual void draw() override;
-    /* 0x20 */ virtual void vt_0x20(u16 itemId) override;
+    /* 0x20 */ virtual void changeItemId(u16 itemId) override;
     /* 0x24 */ virtual void setPriorityDraw() override;
     /* 0x28 */ virtual void unsetPriorityDraw() override;
 
@@ -119,23 +119,23 @@ private:
     static const MdlConfig sMdlConfig[];
     static const u8 sMdlIdx[];
 
-    /* 0x18 */ m3d::smdl_c mMdl1;
-    /* 0x34 */ m3d::smdl_c mMdl2;
-    /* 0x50 */ m3d::anmTexPat_c mAnmTexPat1;
-    /* 0x7C */ m3d::anmTexPat_c mAnmTexPat2;
-    /* 0xA8 */ m3d::anmTexSrt_c mAnmTexSrt1;
-    /* 0xD4 */ m3d::anmTexSrt_c mAnmTexSrt2;
+    /* 0x18 */ m3d::smdl_c mPutMdl;
+    /* 0x34 */ m3d::smdl_c mGetMdl;
+    /* 0x50 */ m3d::anmTexPat_c mPutAnmTexPat;
+    /* 0x7C */ m3d::anmTexPat_c mGetAnmTexPat;
+    /* 0xA8 */ m3d::anmTexSrt_c mPutAnmTexSrt;
+    /* 0xD4 */ m3d::anmTexSrt_c mGetAnmTexSrt;
 };
 
 class dItemMdlFirefly_c : public dItemMdl_c {
 public:
     /* 0x08 */ virtual ~dItemMdlFirefly_c() {}
     /* 0x0C */ virtual bool init(u16 itemId, dAcItem_c *item, mAllocator_c *allocator) override;
-    /* 0x10 */ virtual void vt_0x10(u8) override;
+    /* 0x10 */ virtual void setDrawMode(u8) override;
     /* 0x14 */ virtual void setScale(const mVec3_c &scale) override;
     /* 0x18 */ virtual void setLocalMtx(const mMtx_c &mtx) override;
     /* 0x1C */ virtual void draw() override;
-    /* 0x20 */ virtual void vt_0x20(u16 itemId) override;
+    /* 0x20 */ virtual void changeItemId(u16 itemId) override;
     /* 0x24 */ virtual void setPriorityDraw() override;
     /* 0x28 */ virtual void unsetPriorityDraw() override;
     /* 0x2C */ virtual m3d::smdl_c *getMdl() override;
@@ -152,11 +152,11 @@ class dItemMdlPotion_c : public dItemMdl_c {
 public:
     /* 0x08 */ virtual ~dItemMdlPotion_c() {}
     /* 0x0C */ virtual bool init(u16 itemId, dAcItem_c *item, mAllocator_c *allocator) override;
-    /* 0x10 */ virtual void vt_0x10(u8) override;
+    /* 0x10 */ virtual void setDrawMode(u8) override;
     /* 0x14 */ virtual void setScale(const mVec3_c &scale) override;
     /* 0x18 */ virtual void setLocalMtx(const mMtx_c &mtx) override;
     /* 0x1C */ virtual void draw() override;
-    /* 0x20 */ virtual void vt_0x20(u16 itemId) override;
+    /* 0x20 */ virtual void changeItemId(u16 itemId) override;
     /* 0x24 */ virtual void setPriorityDraw() override;
     /* 0x28 */ virtual void unsetPriorityDraw() override;
     /* 0x2C */ virtual m3d::smdl_c *getMdl() override;
diff --git a/include/toBeSorted/item_mdl_rupee.h b/include/toBeSorted/item_mdl_rupee.h
index 41757072..1882516e 100644
--- a/include/toBeSorted/item_mdl_rupee.h
+++ b/include/toBeSorted/item_mdl_rupee.h
@@ -10,11 +10,11 @@ class dItemMdlRupee_c : public dItemMdl_c {
 public:
     /* 0x08 */ virtual ~dItemMdlRupee_c() {}
     /* 0x0C */ virtual bool init(u16 itemId, dAcItem_c *item, mAllocator_c *allocator) override;
-    /* 0x10 */ virtual void vt_0x10(u8) override;
+    /* 0x10 */ virtual void setDrawMode(u8) override;
     /* 0x14 */ virtual void setScale(const mVec3_c &scale) override;
     /* 0x18 */ virtual void setLocalMtx(const mMtx_c &mtx) override;
     /* 0x1C */ virtual void draw() override;
-    /* 0x20 */ virtual void vt_0x20(u16 itemId) override;
+    /* 0x20 */ virtual void changeItemId(u16 itemId) override;
     /* 0x24 */ virtual void setPriorityDraw() override;
     /* 0x28 */ virtual void unsetPriorityDraw() override;
 
@@ -27,10 +27,10 @@ private:
     };
     static const MdlConfig sMdlConfig[];
 
-    /* 0x18 */ m3d::smdl_c mMdl1;
-    /* 0x34 */ m3d::smdl_c mMdl2;
-    /* 0x50 */ m3d::anmTexPat_c mAnmTexPat1;
-    /* 0x7C */ m3d::anmTexPat_c mAnmTexPat2;
+    /* 0x18 */ m3d::smdl_c mPutMdl;
+    /* 0x34 */ m3d::smdl_c mGetMdl;
+    /* 0x50 */ m3d::anmTexPat_c mPutAnmTexPat;
+    /* 0x7C */ m3d::anmTexPat_c mGetAnmTexPat;
 };
 
 #endif
diff --git a/include/toBeSorted/item_mdl_stamina_fruit.h b/include/toBeSorted/item_mdl_stamina_fruit.h
index b2b0adf7..f8cd9d32 100644
--- a/include/toBeSorted/item_mdl_stamina_fruit.h
+++ b/include/toBeSorted/item_mdl_stamina_fruit.h
@@ -10,21 +10,21 @@ class dItemMdlStaminaFruit_c : public dItemMdl_c {
 public:
     /* 0x08 */ virtual ~dItemMdlStaminaFruit_c() {}
     /* 0x0C */ virtual bool init(u16 itemId, dAcItem_c *item, mAllocator_c *allocator) override;
-    /* 0x10 */ virtual void vt_0x10(u8) override;
+    /* 0x10 */ virtual void setDrawMode(u8) override;
     /* 0x14 */ virtual void setScale(const mVec3_c &scale) override;
     /* 0x18 */ virtual void setLocalMtx(const mMtx_c &mtx) override;
     /* 0x1C */ virtual void draw() override;
-    /* 0x20 */ virtual void vt_0x20(u16 itemId) override;
+    /* 0x20 */ virtual void changeItemId(u16 itemId) override;
     /* 0x24 */ virtual void setPriorityDraw() override;
     /* 0x28 */ virtual void unsetPriorityDraw() override;
 
     static bool isMdlForItemId(u16 itemId);
 
 private:
-    /* 0x18 */ m3d::smdl_c mMdl1;
-    /* 0x34 */ m3d::smdl_c mMdl2;
-    /* 0x50 */ m3d::anmTexSrt_c mAnmTexSrt1;
-    /* 0x7C */ m3d::anmTexSrt_c mAnmTexSrt2;
+    /* 0x18 */ m3d::smdl_c mPutMdl;
+    /* 0x34 */ m3d::smdl_c mGetMdl;
+    /* 0x50 */ m3d::anmTexSrt_c mPutAnmTexSrt;
+    /* 0x7C */ m3d::anmTexSrt_c mGetAnmTexSrt;
 };
 
 #endif