2 files changed, 74 insertions, 9 deletions
diff --git a/include/d/d_a_obj.h b/include/d/d_a_obj.h
index 50eb03abd2..4cca65cf0a 100644
--- a/include/d/d_a_obj.h
+++ b/include/d/d_a_obj.h
@@ -24,14 +24,79 @@ T PrmAbstract(const fopAc_ac_c* i_actor, T i_nbits, T i_shift) {
 
 class HioVarious_c : public JORReflexible {
 public:
+    HioVarious_c();
+    virtual void genMessage(JORMContext*);
+
     static void init(JORReflexible* node_ptr, const char* node_name);
     static void clean(JORReflexible* node_ptr);
 
-    void genMessage(JORMContext*);
+    static HioVarious_c M_hio;
 
     /* 0x04 */ JORReflexible* node_ptrs[16];
     /* 0x44 */ const char* node_names[16];
-    /* 0x84 */ u8 field_0x84;
+    /* 0x84 */ s8 field_0x84;
+};
+
+class HioThrow_c : public JORReflexible {
+public:
+    HioThrow_c();
+#if DEBUG
+    virtual void listen(u32 command, const JOREvent* event) { JORReflexible::listen(command, event); }
+    virtual void genObjectInfo(const JORGenEvent* event) { JORReflexible::genObjectInfo(event); }
+    virtual void listenNodeEvent(const JORNodeEvent* event) { JORReflexible::listenNodeEvent(event); }
+    virtual void listenPropertyEvent(const JORPropertyEvent* event) { JORReflexible::listenPropertyEvent(event); }
+#endif
+    virtual void genMessage(JORMContext*);
+
+    static void init(JORReflexible* node_ptr, const char* node_name);
+    static void clean(JORReflexible* node_ptr);
+
+    static HioThrow_c M_hio;
+    static cXyz M_throw_pos_st;
+    static cXyz M_throw_pos_now;
+
+    /* 0x04 */ JORReflexible* node_ptrs[20];
+    /* 0x54 */ const char* node_names[20];
+    /* 0xA4 */ s8 field_0xa4;
+};
+
+class HioField_c : public JORReflexible {
+public:
+    HioField_c();
+    virtual void genMessage(JORMContext*);
+
+    static HioField_c M_hio;
+
+    /* 0x04 */ JORReflexible* node_ptrs[16];
+    /* 0x44 */ const char* node_names[16];
+    /* 0x84 */ s8 field_0x84;
+};
+
+class HioSpot_c : public JORReflexible {
+public:
+    HioSpot_c();
+    virtual void genMessage(JORMContext*);
+
+    static HioSpot_c M_hio;
+
+    /* 0x04 */ JORReflexible* node_ptrs[16];
+    /* 0x44 */ const char* node_names[16];
+    /* 0x84 */ s8 field_0x84;
+};
+
+class HioObj_c : public JORReflexible {
+public:
+    HioObj_c();
+    virtual void genMessage(JORMContext*);
+
+    static void init();
+    static void clean();
+
+    static HioObj_c M_hio;
+    static const char* const M_node_name[];
+    static JORReflexible* const M_node_ptr[];
+
+    /* 0x04 */ s8 M_no;
 };
 
 };  // namespace daObj
diff --git a/include/d/d_a_shop_item_static.h b/include/d/d_a_shop_item_static.h
index c7462ef752..0091c0b83c 100644
--- a/include/d/d_a_shop_item_static.h
+++ b/include/d/d_a_shop_item_static.h
@@ -5,13 +5,13 @@
 
 struct ResourceData {
     const char* get_arcName() const { return mArcName; }
-    s16 get_bmdName() const { return mBmdName; }
-    s16 get_btk1Name() const { return mBtkName; }
-    s16 get_bpk1Name() const { return mBpkName; }
-    s16 get_bck1Name() const { return mBckName; }
-    s16 get_bxa1Name() const { return mBxaName; }
-    s16 get_brk1Name() const { return mBrkName; }
-    s16 get_btp1Name() const { return mBtpName; }
+    const s16 get_bmdName() const { return mBmdName; }
+    const s16 get_btk1Name() const { return mBtkName; }
+    const s16 get_bpk1Name() const { return mBpkName; }
+    const s16 get_bck1Name() const { return mBckName; }
+    const s16 get_bxa1Name() const { return mBxaName; }
+    const s16 get_brk1Name() const { return mBrkName; }
+    const s16 get_btp1Name() const { return mBtpName; }
     f32 get_scale() const { return mScale; }
     f32 get_offsetY() const { return mOffsetY; }
     s16 get_angleX() const { return mAngle.x; }