d_a_npc_rsh1 matching (#927)

* Initial work

* 14% matching in .text
- Add some of the static data
- Match sinit function
- Match HIO constructor
- Match _create
- Match some other trivial functions

* Match CreateHeap

* 20% matching in .text

* 31% matching in .text

* 34% matching in .text

* 38% matching in .text

* 51% matching in .text

* createShopList work

* More createShopList work

* 54% matching in .text: Match createShopList

* 57% matching in .text

* 68% matching in .text

* Variable name updates

* 75% matching in .text

* 81% matching in .text

* Match lookBack

* d_a_npc_rsh1 100% for demo and retail

* Replace magic constants with applicable enums

* Give some member fields trivial names and name some method parameters

* Fix a few renaming errors

* More renaming work

* Rename HIO fields and rest of actor fields

* Replace magic numbers associated with mItemNo

2 files changed, 1704 insertions, 92 deletions

diff --git a/src/d/actor/d_a_npc_rsh1.cpp b/src/d/actor/d_a_npc_rsh1.cpp
index deeaf107..f3a01504 100644
--- a/src/d/actor/d_a_npc_rsh1.cpp
+++ b/src/d/actor/d_a_npc_rsh1.cpp
@@ -5,11 +5,46 @@
 
 #include "d/dolzel_rel.h" // IWYU pragma: keep
 #include "d/actor/d_a_npc_rsh1.h"
+#include "d/actor/d_a_player_main.h"
+#include "d/d_item.h"
+#include "d/d_s_play.h"
+#include "d/d_snap.h"
+#include "d/res/res_rsh.h"
+#include "f_op/f_op_camera.h"
+#include "m_Do/m_Do_controller_pad.h"
 #include "m_Do/m_Do_ext.h"
 #include "d/d_procname.h"
 #include "d/d_priority.h"
 #include "d/d_cc_d.h"
 
+class daNpc_Rsh1_HIO_c : public JORReflexible {
+public:
+    daNpc_Rsh1_HIO_c();
+    virtual ~daNpc_Rsh1_HIO_c() {};
+
+    void genMessage(JORMContext* ctx) {};
+public:
+    /* 0x04 */ s8 mNo;
+    /* 0x05 */ u8 field_0x05[0x08 - 0x05];
+    /* 0x08 */ s32 m08;
+    /* 0x0C */ dNpc_HIO_c mNpcHIO;
+    /* 0x34 */ f32 m34;
+    /* 0x38 */ f32 m38;
+    /* 0x3C */ f32 m3C;
+    /* 0x40 */ f32 m40;
+    /* 0x44 */ f32 m44;
+    /* 0x48 */ f32 m48;
+    /* 0x4C */ f32 m4C;
+    /* 0x50 */ f32 mCylR1;
+    /* 0x54 */ f32 mCylR2;
+    /* 0x58 */ f32 mCylH;
+    /* 0x5C */ u8 m5C[12];
+    /* 0x68 */ u8 m68;
+    /* 0x69 */ u8 m69;
+    /* 0x6A */ u8 m6A;
+    /* 0x6B */ u8 m6B;
+};  // Size: 0x6C
+
 static dCcD_SrcCyl l_cyl_src = {
     // dCcD_SrcGObjInf
     {
@@ -40,270 +75,1840 @@ static dCcD_SrcCyl l_cyl_src = {
     }},
 };
 
+char daNpc_Rsh1_c::m_arcname[] = "Rsh";
+
+static daNpc_Rsh1_HIO_c l_HIO;
+static fpc_ProcID l_msgId;
+static msg_class* l_msg;
+
+static cXyz l_in_chk_pos1_tbl[4] = {
+    cXyz( 919.0f, 670.0f, -205111.0f),
+    cXyz(1466.0f, 670.0f, -204723.0f),
+    cXyz(1090.0f, 670.0f, -204173.0f),
+    cXyz( 603.0f, 670.0f, -204461.0f)
+};
+
+static cXyz l_in_chk_pos2_tbl[4] = {
+    cXyz(1466.0f, 670.0f, -204723.0f),
+    cXyz(1700.0f, 670.0f, -204518.0f),
+    cXyz(1423.0f, 670.0f, -204174.0f),
+    cXyz(1125.0f, 670.0f, -204337.0f)
+};
 
 /* 000000EC-0000021C       .text __ct__16daNpc_Rsh1_HIO_cFv */
 daNpc_Rsh1_HIO_c::daNpc_Rsh1_HIO_c() {
-    /* Nonmatching */
+    mNpcHIO.m04 = -20.0f;
+    mNpcHIO.mMaxHeadX = 0x200;
+    mNpcHIO.mMaxHeadY = 0x200;
+    mNpcHIO.mMaxBackboneX = 0x1388;
+    mNpcHIO.mMaxBackboneY = 0x1770;
+    mNpcHIO.mMinHeadX = -0x200;
+    mNpcHIO.mMinHeadY = -0x200;
+    mNpcHIO.mMinBackboneX = -5000;
+    mNpcHIO.mMinBackboneY = -6000;
+    mNpcHIO.mMaxTurnStep = 0x1000;
+    mNpcHIO.mMaxHeadTurnVel = 0x800;
+    mNpcHIO.mAttnYOffset = 80.0f;
+    mNpcHIO.mMaxAttnAngleY = 0x4000;
+    mNpcHIO.m22 = 0;
+    mNpcHIO.mMaxAttnDistXZ = 400.0f;
+    m34 = 1.0f;
+    m38 = 0.9f;
+    m3C = 0.5f;
+    m40 = 40.0f;
+    m44 = 30.0f;
+    m48 = 7.5f;
+    m4C = 1300.0f;
+    mCylR1 = 100.0f;
+    mCylR2 = 180.0f;
+    mCylH = 190.0f;
+    m68 = 0;
+    m69 = 0;
+    m6A = 0;
+    m6B = 0;
+    
+    m5C[0] = 0;
+    m5C[1] = 0;
+    m5C[2] = 0;
+    m5C[3] = 0;
+    m5C[4] = 0;
+    m5C[5] = 0;
+    m5C[6] = 0;
+    m5C[7] = 0;
+    m5C[8] = 0;
+    m5C[9] = 0;
+    m5C[10] = 0;
+    m5C[11] = 0;
+
+    mNo = -1;
+    m08 = -1;
 }
 
 /* 0000021C-0000045C       .text checkCreateInShopPlayer__12daNpc_Rsh1_cFv */
-void daNpc_Rsh1_c::checkCreateInShopPlayer() {
-    /* Nonmatching */
+BOOL daNpc_Rsh1_c::checkCreateInShopPlayer() {
+    cXyz* curr_tbl;
+    daPy_lk_c* link_p = DEMO_SELECT((daPy_lk_c *) dComIfGp_getPlayer(0), daPy_getPlayerLinkActorClass());
+    cXyz dir(
+        -cM_scos(current.angle.y),
+        0.0f,
+        cM_ssin(current.angle.y)
+    );
+
+    cXyz link_pos = link_p->current.pos;
+    cXyz diff = link_pos - current.pos;
+
+    cXyz* chk_pos_tbls[] = {
+        l_in_chk_pos1_tbl,
+        l_in_chk_pos2_tbl
+    };
+
+    int i, j, k, l;
+    for (i = 0; i < 2; i++) {
+        for (j = 0, k = 1, l = 0, curr_tbl = chk_pos_tbls[i]; j < 4;) {
+            cXyz temp2 = curr_tbl[j] - link_pos;
+            cXyz temp3 = curr_tbl[k] - link_pos;
+            cXyz t2_cross_t3 = temp2.outprod(temp3);
+            cXyz base_y = cXyz::BaseY;
+            
+            if (base_y.getDotProduct(t2_cross_t3) > 0.0f) {
+                l++;
+            }
+
+            k++; j++;
+            if (k > 3) k = 0; 
+        }
+
+        if ((l == 4 || l == 0) && 
+            diff.getDotProduct(dir) > 0.0f && 
+            std::fabsf(diff.y) < 25.0f) {
+            return TRUE;
+        }
+    }
+    return FALSE;
 }
 
 /* 00000498-00000710       .text daNpc_Rsh1_checkRotenBaseTalkArea__Fv */
-void daNpc_Rsh1_checkRotenBaseTalkArea() {
-    /* Nonmatching */
+static BOOL daNpc_Rsh1_checkRotenBaseTalkArea() {
+    static cXyz base_talk_area_tbl[] = {
+        cXyz(580.0f, 671.0f, -204393.0f),
+        cXyz(539.0f, 671.0f, -204321.0f),
+        cXyz(930.0f, 671.0f, -204114.0f),
+        cXyz(971.0f, 671.0f, -204189.0f)
+    };
+
+    daPy_lk_c* link_p = DEMO_SELECT((daPy_lk_c *) dComIfGp_getPlayer(0), daPy_getPlayerLinkActorClass());
+
+    cXyz* talk_area_pos_tbl_p;
+    cXyz link_pos = link_p->current.pos;
+
+    int j, k, l;
+    for (talk_area_pos_tbl_p = base_talk_area_tbl, j = 0, k = 1, l = 0; j < 4;) {
+        cXyz temp2 = talk_area_pos_tbl_p[j] - link_pos;
+        cXyz temp3 = talk_area_pos_tbl_p[k] - link_pos;
+        cXyz t2_cross_t3 = temp2.outprod(temp3);
+        cXyz base_y = cXyz::BaseY;
+        
+        if (base_y.getDotProduct(t2_cross_t3) > 0.0f) {
+            l++;
+        }
+
+        k++; j++;
+        if (k > 3) k = 0; 
+    }
+
+    if (l == 4 || l == 0) {
+        return TRUE;
+    }
+
+    return FALSE;
 }
 
 /* 00000710-000007A0       .text daNpc_Rsh1_countShop__Fv */
-void daNpc_Rsh1_countShop() {
-    /* Nonmatching */
+static int daNpc_Rsh1_countShop() {
+    u8 i = 0;
+    int result = 0;
+    for (; i <= 11; i++) {
+        if (dComIfGs_isGetItemReserve(i)) {
+            result++;
+        } else {
+            if (i == 0 && dComIfGs_checkGetItem(dItem_DELIVERY_BAG_e)) {
+                result++;
+            }
+        }
+    }
+    return result;
 }
 
 /* 000007A0-0000080C       .text daNpc_Rsh1_RotenItemNumInBag__Fv */
-void daNpc_Rsh1_RotenItemNumInBag() {
-    /* Nonmatching */
+static int daNpc_Rsh1_RotenItemNumInBag() {
+    int result = 0;
+    for (u8 i = 0x8C; i <= 0x97; i++) {
+        result += dComIfGs_checkReserveItem(i);
+    }
+    return result;
 }
 
 /* 0000080C-0000084C       .text daNpc_Rsh1_shopMsgCheck__FUl */
-void daNpc_Rsh1_shopMsgCheck(unsigned long) {
-    /* Nonmatching */
+static BOOL daNpc_Rsh1_shopMsgCheck(u32 param_1) {
+    if ((param_1 >= 0x286B && param_1 <= 0x2882) || 
+        (param_1 >= 0x2868 && param_1 <= 0x286A) || 
+        param_1 == 0x2863 || param_1 == 0x2884) {
+        return TRUE;
+    }
+    return FALSE;
 }
 
 /* 0000084C-0000087C       .text daNpc_Rsh1_shopStickMoveMsgCheck__FUl */
-void daNpc_Rsh1_shopStickMoveMsgCheck(unsigned long) {
-    /* Nonmatching */
+static BOOL daNpc_Rsh1_shopStickMoveMsgCheck(u32 param_1) {
+    if ((param_1 >= 0x286B && param_1 <= 0x2882 && (param_1 % 2 != 0)) || param_1 == 0x2863) {
+        return TRUE;
+    }
+    return FALSE;
 }
 
+static const int l_bck_ix_tbl[] = {
+    DEMO_SELECT(RSH_INDEX_BCK_RS_WAIT01, RSH_BCK_RS_WAIT01), 
+    DEMO_SELECT(RSH_INDEX_BCK_RS_WAIT02, RSH_BCK_RS_WAIT02), 
+    DEMO_SELECT(RSH_INDEX_BCK_RS_TALK01, RSH_BCK_RS_TALK01), 
+    DEMO_SELECT(RSH_INDEX_BCK_RS_TALK02, RSH_BCK_RS_TALK02),
+    DEMO_SELECT(RSH_INDEX_BCK_RS_TALK02, RSH_BCK_RS_TALK02), 
+    DEMO_SELECT(RSH_INDEX_BCK_RS_WALK, RSH_BCK_RS_WALK), 
+    DEMO_SELECT(RSH_INDEX_BCK_RS_PUSH, RSH_BCK_RS_PUSH)
+};
+
+static const int l_bas_ix_tbl[] = {
+    DEMO_SELECT(RSH_INDEX_BAS_RS_WAIT01, RSH_BAS_RS_WAIT01), 
+    DEMO_SELECT(RSH_INDEX_BAS_RS_WAIT02, RSH_BAS_RS_WAIT02), 
+    DEMO_SELECT(RSH_INDEX_BAS_RS_TALK01, RSH_BAS_RS_TALK01), 
+    DEMO_SELECT(RSH_INDEX_BAS_RS_TALK02, RSH_BAS_RS_TALK02), 
+    DEMO_SELECT(RSH_INDEX_BAS_RS_TALK02, RSH_BAS_RS_TALK02), 
+    DEMO_SELECT(RSH_INDEX_BAS_RS_WALK, RSH_BAS_RS_WALK), 
+    DEMO_SELECT(RSH_INDEX_BAS_RS_PUSH, RSH_BAS_RS_PUSH)
+};
+
+static const int l_btp_ix_tbl[] = {
+    DEMO_SELECT(RSH_INDEX_BTP_RS_MABA01, RSH_BTP_RS_MABA01), 
+    DEMO_SELECT(RSH_INDEX_BTP_RS_MABA01, RSH_BTP_RS_MABA01)
+};
+
 /* 0000087C-00000A44       .text nodeCallBack_Rsh__FP7J3DNodei */
-static BOOL nodeCallBack_Rsh(J3DNode*, int) {
-    /* Nonmatching */
+static BOOL nodeCallBack_Rsh(J3DNode* i_node, int i_calcTiming) {
+    if (i_calcTiming == J3DNodeCBCalcTiming_In) {
+        J3DModel* model_p = j3dSys.getModel();
+        daNpc_Rsh1_c* actor_p = (daNpc_Rsh1_c *) model_p->getUserArea();
+        J3DJoint* jnt_p = (J3DJoint *) i_node;
+        s32 jnt_no = jnt_p->getJntNo();
+        if (actor_p) {
+            MtxP anm_mtx = j3dSys.getModel()->getAnmMtx(jnt_no);
+            mDoMtx_copy(anm_mtx, *calc_mtx);
+            if (jnt_no == actor_p->getHeadJntNum()) {
+                cXyz temp1(0.0f, 0.0f, 0.0f);                
+                cXyz temp2;
+                cMtx_YrotM(*calc_mtx, -actor_p->getHead_y());
+                cMtx_ZrotM(*calc_mtx, -actor_p->getHead_x());
+                MtxPosition(&temp1, &temp2);
+
+                actor_p->setAttentionBasePos(temp2);
+                temp1.set(28.0f, 20.0f, 0.0f);
+                MtxPosition(&temp1, &temp2);
+
+                actor_p->setEyePos(temp2);
+                if (actor_p->m76F != 0xFF) {
+                    actor_p->m76F++;
+                }
+            } else if (jnt_no == actor_p->getBackboneJntNum()) {
+                cMtx_XrotM(*calc_mtx, +actor_p->getBackbone_y());
+                cMtx_ZrotM(*calc_mtx, +actor_p->getBackbone_x());
+            }
+
+            cMtx_copy(*calc_mtx, j3dSys.mCurrentMtx);
+            model_p->setAnmMtx(jnt_no, *calc_mtx);
+        } 
+    }
+    return TRUE;
 }
 
 /* 00000A44-00000B50       .text initTexPatternAnm__12daNpc_Rsh1_cFb */
-void daNpc_Rsh1_c::initTexPatternAnm(bool) {
-    /* Nonmatching */
+BOOL daNpc_Rsh1_c::initTexPatternAnm(bool i_modify) {
+    J3DModelData* morf_model_data_p = mpMorf->getModel()->getModelData();
+    m_head_tex_pattern = (J3DAnmTexPattern *) dComIfG_getObjectRes(m_arcname, l_btp_ix_tbl[m958]);
+    JUT_ASSERT(580, m_head_tex_pattern != NULL);
+
+
+    if (mBtpAnm.init(
+        morf_model_data_p, 
+        m_head_tex_pattern, TRUE, 
+        J3DFrameCtrl::EMode_LOOP, 
+        1.0f, 0, -1, 
+        i_modify, FALSE
+    ) == 0) {
+        return FALSE;
+    }
+
+    mBtpFrame = 0;
+    mTimer = 0;
+    return TRUE;
 }
 
 /* 00000B50-00000BDC       .text playTexPatternAnm__12daNpc_Rsh1_cFv */
 void daNpc_Rsh1_c::playTexPatternAnm() {
-    /* Nonmatching */
+    if (cLib_calcTimer(&mTimer) == 0) {
+        if (mBtpFrame >= m_head_tex_pattern->getFrameMax()) {
+            mBtpFrame -= m_head_tex_pattern->getFrameMax();
+            mTimer = cM_rndF(100.0f) + 30.0f;
+        } else {
+            mBtpFrame++;
+        }
+    }
 }
 
 /* 00000BDC-00000C64       .text setAnm__12daNpc_Rsh1_cFSc */
-void daNpc_Rsh1_c::setAnm(signed char) {
-    /* Nonmatching */
+void daNpc_Rsh1_c::setAnm(s8 i_index) {
+    static int play_mode_tbl[7] = {
+        2, 2, 2, 2,
+        2, 2, 2
+    };
+
+    static float morf_frame_tbl[7] = {
+        8.0f, 8.0f, 8.0f, 8.0f,
+        8.0f, 8.0f, 8.0f
+    };
+
+    static float play_speed_tbl[7] = {
+        1.0f, 1.0f, 1.0f, 1.0f,
+        1.0f, 1.0f, 1.0f
+    };
+
+
+    if (i_index != m959 || m959 == -1) {
+        m959 = i_index;
+        dNpc_setAnm_2(
+            mpMorf, 
+            play_mode_tbl[i_index],
+            morf_frame_tbl[i_index], 
+            play_speed_tbl[i_index],
+            l_bck_ix_tbl[i_index],
+            l_bas_ix_tbl[i_index],
+            m_arcname
+        );
+    }
 }
 
 /* 00000C64-00000CA8       .text setTexAnm__12daNpc_Rsh1_cFSc */
-void daNpc_Rsh1_c::setTexAnm(signed char) {
-    /* Nonmatching */
+void daNpc_Rsh1_c::setTexAnm(s8 param_1) {
+    if (m958 != param_1 || m958 == -1) {
+        m958 = param_1;
+        initTexPatternAnm(true);
+    }
 }
 
 /* 00000CA8-00000DDC       .text setAnmFromMsgTag__12daNpc_Rsh1_cFv */
 void daNpc_Rsh1_c::setAnmFromMsgTag() {
-    /* Nonmatching */
+    switch (dComIfGp_getMesgAnimeAttrInfo()) {
+        case 0:
+            setAnm(0);
+            break;
+        case 1:
+            setAnm(1);
+            break;
+        case 2:
+            setAnm(2);
+            break;
+        case 3:
+            setAnm(3);
+            break;
+        case 4:
+            setAnm(4);
+            m95A = 2;
+            break;
+        case 5:
+            setAnm(5);
+            break;
+        case 6:
+            setAnm(6);
+            break;
+    }
+
+    if (m959 == 4) {
+        if (mpMorf->checkFrame(mpMorf->getEndFrame() - 1.0f)) {
+            if (--m95A <= 0) {
+                setAnm(0);
+                m95A = 0;
+            }
+        }
+    }
+
+    dComIfGp_clearMesgAnimeAttrInfo();
 }
 
 /* 00000DDC-00000F50       .text chkAttention__12daNpc_Rsh1_cF4cXyzs */
-void daNpc_Rsh1_c::chkAttention(cXyz, short) {
-    /* Nonmatching */
+bool daNpc_Rsh1_c::chkAttention(cXyz i_pos, s16 i_angleAdjustment) {
+    daPy_lk_c* link_p = DEMO_SELECT((daPy_lk_c *) dComIfGp_getPlayer(0), daPy_getPlayerLinkActorClass());
+    
+    f32 max_attn_dist_xz = l_HIO.mNpcHIO.mMaxAttnDistXZ;
+    int max_attn_angle_y = l_HIO.mNpcHIO.mMaxAttnAngleY;
+    cXyz pos_diff = link_p->current.pos - i_pos;
+
+    f32 temp_abs_xz = pos_diff.absXZ();
+    s16 angle = cM_atan2s(pos_diff.x, pos_diff.z);
+    
+    if (mbAttention) {
+        max_attn_dist_xz += 40.0f;
+        max_attn_angle_y += 0x71C;
+    }
+
+    angle -= i_angleAdjustment;
+    return max_attn_angle_y > abs(angle) && max_attn_dist_xz > temp_abs_xz;
 }
 
 /* 00000F50-00001038       .text eventOrder__12daNpc_Rsh1_cFv */
 void daNpc_Rsh1_c::eventOrder() {
-    /* Nonmatching */
+    if (m95B == 5) {
+        fopAcM_orderOtherEventId(this, mShopOutEventIdx);
+    } else if (m95B == 4) {
+        fopAcM_orderOtherEvent2(this, "RSH_GET_DEMO", dEvtFlag_NOPARTNER_e);
+    } else if (m95B == 1 || m95B == 2 || m95B == 3) {
+        if (m95B != 3 || mShopIdx != -1 || daNpc_Rsh1_checkRotenBaseTalkArea()) {
+            eventInfo.onCondition(dEvtCnd_CANTALK_e);
+        }
+        if (m95B == 1 || m95B == 2) {
+            fopAcM_orderSpeakEvent(this);
+        }
+    }
 }
 
 /* 00001038-0000126C       .text checkOrder__12daNpc_Rsh1_cFv */
 void daNpc_Rsh1_c::checkOrder() {
-    /* Nonmatching */
+    if (eventInfo.checkCommandDemoAccrpt()) {
+        if (m95B == 5) {
+            m95B = 0;
+            setAction(&daNpc_Rsh1_c::event_action, NULL);
+        } else if (m95B == 4) {
+            m95B = 0;
+            mShopCamAct.Reset();
+            setAction(&daNpc_Rsh1_c::getdemo_action, NULL);
+        }
+    } else if (eventInfo.checkCommandTalk()) {
+        if (m95B == 1 || m95B == 2 || m95B == 3) {
+            daPy_lk_c* link_p = DEMO_SELECT((daPy_lk_c *) dComIfGp_getPlayer(0), daPy_getPlayerLinkActorClass());
+            s16 temp = cLib_targetAngleY(&current.pos, &link_p->current.pos) - home.angle.y;
+            if (temp > DEMO_SELECT(0x2000, 0x1800) || temp < DEMO_SELECT(-0x2000, -0x2800)) {
+                m780 = 0x2883;
+            } else if (m95B != 2) {
+                mShopCamAct.shop_cam_action_init();
+            }
+            m95B = 0;
+            m771 = true;
+            talkInit();
+        }
+    } else {
+        mShopCamAct.Save();
+    }
 }
 
 /* 0000126C-00001650       .text next_msgStatus__12daNpc_Rsh1_cFPUl */
-void daNpc_Rsh1_c::next_msgStatus(unsigned long*) {
-    /* Nonmatching */
+u16 daNpc_Rsh1_c::next_msgStatus(u32* o_pMsgNo) {
+    u16 msg_status;    
+    s32 msg_rupee;
+    msg_status = fopMsgStts_MSG_CONTINUES_e;
+    switch (*o_pMsgNo) {
+    case 0x2845:
+    case 0x2846:
+    case 0x2847:
+    case 0x2848:
+    case 0x284B:
+    case 0x284D:
+    case 0x284E:
+    case 0x284F:
+    case 0x2850:
+    case 0x2851:
+    case 0x2852:
+    case 0x2855:
+    case 0x2857:
+    case 0x2859:
+    case 0x285A:
+    case 0x285D:
+    case 0x285E:
+    case 0x2886:
+    case 0x2887:
+    case 0x2888:
+    case 0x288D:
+        *o_pMsgNo += 1;
+        break;
+    case 0x288C:
+        *o_pMsgNo = 0x2889;
+        break;
+    case 0x2889:
+        if (l_msg->mSelectNum == 0) {
+            s32 msg_rupee = dComIfGp_getMessageRupee();
+            if (msg_rupee > dComIfGs_getRupee()) {
+                *o_pMsgNo = 0x288A;
+                break;
+            }
+
+            dComIfGp_setItemRupeeCount(-(int)msg_rupee);
+            *o_pMsgNo = 0x288D;
+            break;
+        }
+        
+        *o_pMsgNo = 0x288B; 
+        break;
+    case 0x2862:
+        if (!shopPosMove()) {
+            msg_status = fopMsgStts_MSG_DISPLAYED_e;
+        } else {
+            setAnm(0);
+            *o_pMsgNo += 1;
+        }
+        break;
+    case 0x283D:
+    case 0x283F:
+    case 0x2841:
+    case 0x2843:
+        *o_pMsgNo -= 1;
+        break;
+    case 0x284C:
+        if (l_msg->mSelectNum == 0) {
+            *o_pMsgNo = 0x284D;
+        } else {
+            *o_pMsgNo = 0x284A;
+        }
+        break;
+    case 0x2853:
+        if (l_msg->mSelectNum == 0) {
+            *o_pMsgNo = 0x2855;
+        } else {
+            *o_pMsgNo = 0x2854;
+        }
+        break;
+    case 0x2854:
+        *o_pMsgNo = 0x284E;
+        break;
+    case 0x2866:
+        *o_pMsgNo = 0x2863;
+        break;
+    case 0x2863:
+        if (CPad_CHECK_TRIG_B(0)) {
+            *o_pMsgNo = 0x2867;
+        } else {
+            dComIfGp_setDoStatusForce(dActStts_CHOOSE_e);
+            dComIfGp_setAStatusForce(dActStts_CANCEL_e);
+            msg_status = fopMsgStts_MSG_DISPLAYED_e;
+        }
+        break;
+    case 0x286B:
+    case 0x286D:
+    case 0x286F:
+    case 0x2871:
+    case 0x2873:
+    case 0x2875:
+    case 0x2877:
+    case 0x2879:
+    case 0x287B:
+    case 0x287D:
+    case 0x287F:
+    case 0x2881:
+        if (CPad_CHECK_TRIG_B(0)) {
+            *o_pMsgNo = 0x2867;
+        } else {
+            dComIfGp_setDoStatusForce(dActStts_CHOOSE_e);
+            dComIfGp_setAStatusForce(dActStts_CANCEL_e);
+            *o_pMsgNo += 1;
+        }
+        break;
+    case 0x2868:
+    case 0x2869:
+    case 0x286A:
+    case 0x2884:
+        if (mpShopItems) {
+            mpShopItems->mSelectedItemIdx = -1;
+        }
+        *o_pMsgNo = 0x2863;
+        break;
+    case 0x286C:
+    case 0x286E:
+    case 0x2870:
+    case 0x2872:
+    case 0x2874:
+    case 0x2876:
+    case 0x2878:
+    case 0x287A:
+    case 0x287C:
+    case 0x287E:
+    case 0x2880:
+    case 0x2882:
+        if (mpShopItems) {
+            if (dComIfGp_checkMesgCancelButton()) {
+                *o_pMsgNo = *o_pMsgNo - 1;
+                break;
+            }
+            
+            if (l_msg->mSelectNum == 0) {
+                msg_rupee = dComIfGp_getMessageRupee();
+                u8 status = dShop_BoughtErrorStatus(mpShopItems, 0, msg_rupee);
+
+                if (status & 0x20) {
+                    *o_pMsgNo = 0x2868;
+                    break;
+                } 
+
+                if (status & 0x4) {
+                    *o_pMsgNo = 0x2869;
+                    break;
+                } 
+
+                if (daNpc_Rsh1_RotenItemNumInBag() >= 3) {
+                    *o_pMsgNo = 0x2884;
+                    break;
+                } 
+                
+                fopAcM_seStart(this, JA_SE_SHOP_BOUGHT, 0);
+                
+                mpShopItems->hideSelectItem();
+                mShopSelectItemNo = mpShopItems->getSelectItemNo();
+                dComIfGp_setItemRupeeCount(-(int)msg_rupee);
+
+                if (!checkItemGet((int)mpShopItems->getSelectItemNo(), TRUE)) {
+                    m95B = 4;
+                    msg_status = fopMsgStts_MSG_ENDS_e;
+                    break;
+                }
+
+                execItemGet((int)mpShopItems->getSelectItemNo());
+                *o_pMsgNo = 0x286A;
+                break;
+            }
+            
+            *o_pMsgNo -= 1;
+            break;
+        }
+        break;
+    case 0x2849:
+        dComIfGs_onEventBit(dSv_event_flag_c::UNK_1110);
+        msg_status = fopMsgStts_MSG_ENDS_e;
+        break;
+    case 0x2858:
+        dComIfGs_onEventBit(dSv_event_flag_c::UNK_1108);
+        msg_status = fopMsgStts_MSG_ENDS_e;
+        break;
+    default:
+        msg_status = fopMsgStts_MSG_ENDS_e;
+        break;
+    }
+    return msg_status;
 }
 
 /* 00001650-00001808       .text getMsg__12daNpc_Rsh1_cFv */
-void daNpc_Rsh1_c::getMsg() {
-    /* Nonmatching */
+u32 daNpc_Rsh1_c::getMsg() {
+    u32 msg_no;
+    
+    if (m780 != 0) {
+        msg_no = m780;
+        m780 = 0;
+    } else {
+        if (!checkItemGet(0x2A, TRUE) && daNpc_Rsh1_countShop() >= 3) {
+            return 0x285D;
+        }
+
+        if (!dComIfGs_checkGetItem(NORMAL_SAIL)) {
+            if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2420)) {
+                return 0x288C;
+            }
+            dComIfGs_onEventBit(dSv_event_flag_c::UNK_2420);
+            return 0x2886;
+        }
+
+        if (!dComIfGs_checkGetItem(dItem_DELIVERY_BAG_e)) {
+            return 0x2890;
+        }
+
+        if (mShopIdx == -1) {
+            if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_2D01) && 
+                !dComIfGs_isEventBit(dSv_event_flag_c::UNK_0E08) && 
+                dComIfGs_isEventBit(dSv_event_flag_c::UNK_1108)) {
+                return 0x2859;
+            }
+            
+            int shop_cnt = daNpc_Rsh1_countShop();
+            
+            if (shop_cnt >= 8) {
+                return 0x283E;
+            }
+
+            if (shop_cnt > 1) {
+                return 0x2840;
+            }
+
+            if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_1108)) {
+                return 0x2842;
+            }
+
+            if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_1110)) {
+                msg_no = 0x2845;
+            } else {
+                msg_no = 0x284B;
+            }
+        } else {
+            if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_1108)) {
+                msg_no = 0x2865;
+            } else {
+                msg_no = 0x2862;
+            }
+        }
+    }
+    
+    return msg_no;
 }
 
 /* 00001808-000018EC       .text setCollision__12daNpc_Rsh1_cFv */
 void daNpc_Rsh1_c::setCollision() {
-    /* Nonmatching */
+    f32 temp1, temp2;
+
+    if (chkAction(&daNpc_Rsh1_c::pl_shop_out_action)) {
+        temp1 = l_HIO.mCylR2;
+        temp2 = l_HIO.mCylH;
+        mCyl.SetC(m794);
+    } else {
+        temp1 = l_HIO.mCylR1;
+        temp2 = l_HIO.mCylH;
+        mCyl.SetC(current.pos);
+    }
+
+    mCyl.SetR(temp1);
+    mCyl.SetH(temp2);
+    dComIfG_Ccsp()->Set(&mCyl);
 }
 
 /* 000018EC-000018F8       .text talkInit__12daNpc_Rsh1_cFv */
 void daNpc_Rsh1_c::talkInit() {
-    /* Nonmatching */
+    m961 = 0;
 }
 
 /* 000018F8-00001CB4       .text normal_talk__12daNpc_Rsh1_cFv */
-void daNpc_Rsh1_c::normal_talk() {
-    /* Nonmatching */
+u16 daNpc_Rsh1_c::normal_talk() {
+    u16 status = l_msg->mStatus;
+    if (status == fopMsgStts_MSG_DISPLAYED_e) {
+        l_msg->mStatus = next_msgStatus(&m778);
+        if (l_msg->mStatus == fopMsgStts_MSG_CONTINUES_e) {
+            fopMsgM_messageSet(m778);
+        }
+    } else if (status == fopMsgStts_BOX_CLOSED_e) {
+        l_msg->mStatus = fopMsgStts_MSG_DESTROYED_e;
+    } else if (status == fopMsgStts_MSG_PREPARING_e) {
+        fopMsgM_demoMsgFlagOn();
+    }
+
+    if (mpShopItems) {
+        cXyz zoom_pos = mShopCamAct.getItemZoomPos(125.0f);
+        mpShopItems->Item_ZoomUp(zoom_pos);
+    }
+
+
+    mpShopCursor->hide();
+    if (dComIfGp_checkMesgSendButton() == 1) {
+        m778 = l_msg->mMsgNo;
+
+        static cXyz rel_cam_ctr_data[] = {
+            cXyz(96.0f, -46.0f, -26.0f),
+            cXyz(2.0f, -32.0f, 29.0f)
+        };
+
+        static cXyz rel_cam_eye_data[] = {
+            cXyz(-156.0f, -16.0f, 166.0f),
+            cXyz(144.0f, 19.0f, 215.0f)
+        };
+        
+        switch(m778) {
+        case 0x2846:
+        case 0x284E:
+        case 0x2858:
+        case 0x285A:
+        case 0x285E:
+        case 0x2887:
+        case 0x2888:
+            mShopCamAct.rsh_talk_cam_action_init(this, rel_cam_ctr_data[0], rel_cam_eye_data[0], 45.0f);
+            break;
+        case 0x2848:
+        case 0x2851:
+        case 0x2852:
+        case 0x288D:
+            mShopCamAct.rsh_talk_cam_action_init(this, rel_cam_ctr_data[1], rel_cam_eye_data[1], 45.0f);
+            break;  
+        case 0x2847:
+        default:
+            if (!mShopCamAct.checkCamAction(NULL) && !mShopCamAct.checkCamAction(&ShopCam_action_c::shop_cam_action)) {
+                mShopCamAct.shop_cam_action_init();
+            }
+            break;
+        }
+    }
+
+    return status;
 }
 
 /* 00001CB4-00001DE4       .text shop_talk__12daNpc_Rsh1_cFv */
-void daNpc_Rsh1_c::shop_talk() {
-    /* Nonmatching */
+u16 daNpc_Rsh1_c::shop_talk() {
+    mpShopCursor->show();
+    if (mpShopItems && dShop_now_triggercheck(l_msg, &mSTControl, mpShopItems, &m778, NULL, NULL)) {
+        m749 = true;
+        m77C = 0;
+    }
+
+    u16 status = l_msg->mStatus;
+    if (status == fopMsgStts_MSG_DISPLAYED_e || status == fopMsgStts_MSG_CONTINUES_e) {
+        if (m749) {
+            m749 = false;
+        } else {
+            m77C = m778;
+            l_msg->mStatus = next_msgStatus(&m77C);
+            if (l_msg->mStatus == fopMsgStts_MSG_CONTINUES_e) {
+                fopMsgM_messageSet(m77C);
+            }
+        }
+    } else if (status == fopMsgStts_BOX_CLOSED_e) {
+        l_msg->mStatus = fopMsgStts_MSG_DESTROYED_e;
+        if (mpShopItems) {
+            mpShopItems->mSelectedItemIdx = -1;
+        }
+    } else if (status == fopMsgStts_MSG_PREPARING_e) {
+        fopMsgM_demoMsgFlagOn();
+    }
+
+    return status;
 }
 
 /* 00001DE4-00001FE0       .text talk__12daNpc_Rsh1_cFv */
-void daNpc_Rsh1_c::talk() {
-    /* Nonmatching */
+u16 daNpc_Rsh1_c::talk() {
+    u16 result = 0xFF;
+
+    if (m961 == 0) {
+        l_msgId = fpcM_ERROR_PROCESS_ID_e;
+        l_msg = NULL;
+        m778 = getMsg();
+        m77C = 0;
+        m961 = 1;
+        mShopSelectItemNo = 0xFF;
+    } else if (m961 != -1) {
+        if (l_msgId == fpcM_ERROR_PROCESS_ID_e) {
+            l_msgId = fopMsgM_messageSet(m778, this);
+        } else if (l_msg == NULL) {
+            l_msg = fopMsgM_SearchByID(l_msgId);
+            if (l_msg) {
+                if (!daNpc_Rsh1_shopStickMoveMsgCheck(m778)) {
+                    m961 = 2;
+                } else {
+                    m961 = 3;
+                }
+            }
+        } else {
+            setAnmFromMsgTag();
+            switch (m961) {
+                case 2:
+                    result = normal_talk();
+                    break;
+                case 3:
+                    result = shop_talk();
+                    break;
+            }
+            if (dComIfGp_checkMesgSendButton()) {
+                m778 = l_msg->mMsgNo;
+                if (!daNpc_Rsh1_shopStickMoveMsgCheck(m778)) {
+                    if (!daNpc_Rsh1_shopMsgCheck(m778) && mpShopItems) {
+                        mpShopItems->mSelectedItemIdx = -1;
+                        mpShopItems->showItem();
+                    }
+                    m961 = 2;
+                } else {
+                    if (m778 == 0x2863 && mpShopItems) {
+                        mpShopItems->mSelectedItemIdx = -1;
+                        mpShopItems->showItem();
+                    }
+                    m961 = 3;
+                }
+            }
+        }
+    }
+
+    if (mpShopItems) {
+        mShopCamAct.m54 = mpShopItems->mSelectedItemIdx;
+    }
+
+    return result;
 }
 
 /* 00001FE0-00002358       .text CreateInit__12daNpc_Rsh1_cFv */
-void daNpc_Rsh1_c::CreateInit() {
-    /* Nonmatching */
+BOOL daNpc_Rsh1_c::CreateInit() {
+    cXyz dummy(0.0f, 0.0f, 0.0f);
+    mActorAngle = current.angle;
+    attention_info.flags = fopAc_Attn_LOCKON_TALK_e | fopAc_Attn_ACTION_SPEAK_e;
+    attention_info.distances[fopAc_Attn_TYPE_BATTLE_e] = 173;
+    attention_info.distances[8] = 173; // Bug?
+    gravity = -30.0f;
+    
+    switch (m95E) {
+        case 0:
+            setAction(&daNpc_Rsh1_c::wait_action, NULL);
+            break;
+        default:
+            break;
+    }
+
+    mAttnBasePos = current.pos;
+    
+    mStts.Init(0xFF, 0xFF, this);
+    mCyl.Set(l_cyl_src);
+    mCyl.SetStts(&mStts);
+
+    m962 = 0;
+    m749 = false;
+    m780 = 0;
+    mShopSelectItemNo = 0xFF;
+
+    mShopCamAct.setCamDataIdx(8);
+    mShopCamAct.setCamAction(NULL);
+
+    createShopList();
+
+    if (mShopIdx != -1 && mShopIdx != -1) {
+        mShopItemsArr[mShopIdx].init();
+    }
+
+    // setShopIdx(int)?
+    mShopIdx = -1;
+    if (mShopIdx != -1) {
+        mpShopItems = &mShopItemsArr[mShopIdx];
+        mShopCamAct.setCamDataIdx(mShopIdx + 8);
+    } else {
+        mpShopItems = NULL;
+    }
+
+    pathGet();
+    fopAcM_setCullSizeFar(this, 0.25f);
+    set_mtx();
+    mpMorf->setMorf(0.0f);
+    m794 = cXyz::Zero;
+    m7A0 = m794;
+    m793 = false;
+    mEventCut.setActorInfo("Rsh1", this);
+    mEventCut.setJntCtrlPtr(&mJntCtrl);
+
+    if (checkCreateInShopPlayer()) {
+        m95B = 5;
+        cLib_onBit<u32>(actor_status, fopAcStts_UNK4000_e);
+        mShopOutEventIdx = dComIfGp_evmng_getEventIdx("RSH_SHOP_OUT");
+        setAction(&daNpc_Rsh1_c::dummy_action, NULL);
+    } else {
+        m95B = 0;
+    }
+
+    return TRUE;
 }
 
 /* 00002358-000023A8       .text daNpc_Rsh1_checkRotenItemGet__Fi */
-void daNpc_Rsh1_checkRotenItemGet(int) {
-    /* Nonmatching */
+static BOOL daNpc_Rsh1_checkRotenItemGet(int i_itemNo) {
+    BOOL roten_item_get_check;
+    if (i_itemNo != 0) {
+        roten_item_get_check = dComIfGs_isGetItemReserve(i_itemNo);
+    } else {
+        roten_item_get_check = dComIfGs_checkGetItem(dItem_DELIVERY_BAG_e) ? TRUE : FALSE;
+    }
+    return roten_item_get_check;
 }
 
+extern Vec Item_set_pos_data_rshop_0[];
 /* 000023A8-00002568       .text createShopList__12daNpc_Rsh1_cFv */
 void daNpc_Rsh1_c::createShopList() {
-    /* Nonmatching */
+    csXyz temp(0, home.angle.y, 0);
+    
+    s16 y_vals[] = {
+        0xE800,
+        0xE400,
+        0xE000,
+        0xDC00
+    };
+        
+    int i, k;
+    for(k = 0, i = 0; i < ARRAY_SSIZE(mShopItemsArr); i++) {
+        int j = 0;
+        mShopItemsArr[i].setItemDataIdx(8);
+        temp.y = y_vals[i];
+
+        while(j < (ARRAY_SSIZE(mShopItemDataPtrs) / ARRAY_SSIZE(mShopItemsArr)) && k < ARRAY_SSIZE(mShopItemDataPtrs)) {
+            int idx = i * ((ARRAY_SSIZE(mShopItemDataPtrs) / ARRAY_SSIZE(mShopItemsArr))) + j;
+            mShopItemDataPtrs[k] = NULL;
+            if (daNpc_Rsh1_checkRotenItemGet(k)) {
+                mShopItemsArr[i].mItemActorProcessIds[j] = fopAcM_createShopItem(
+                    (cXyz *)&Item_set_pos_data_rshop_0[idx], 
+                    Item_setData_rshop[k]->mpItemData->mItemNo, 
+                    &temp, fopAcM_GetRoomNo(this)
+                );
+                mShopItemDataPtrs[idx] = Item_setData_rshop[k];
+                j++;
+            }
+            k++;
+        }
+
+        mShopItemsArr[i].setItemSum(j);
+
+        if (j < (ARRAY_SSIZE(mShopItemDataPtrs) / ARRAY_SSIZE(mShopItemsArr))) {
+            if (j == 0) {
+                i--;
+            }
+            break;
+        } else if (i == ARRAY_SSIZE(mShopItemsArr) - 1) {
+            break;
+        }
+    }
+
+    m78C = i + 1;
+    for (i = 0; i < m78C; i++) {
+        mShopItemsArr[i].setItemSetDataList(&mShopItemDataPtrs[i * 3]);
+    }
+
+    m78C = m78C > 1 ? m78C : 1;
 }
 
 /* 00002568-000025C0       .text setAttention__12daNpc_Rsh1_cFv */
 void daNpc_Rsh1_c::setAttention() {
-    /* Nonmatching */
+    attention_info.position.set(
+        mAttnBasePos.x,
+        mAttnBasePos.y + l_HIO.mNpcHIO.mAttnYOffset,
+        mAttnBasePos.z
+    );
+
+    eyePos = current.pos;
+    eyePos.y += 170.0f;
 }
 
 /* 000025C0-00002868       .text lookBack__12daNpc_Rsh1_cFv */
 void daNpc_Rsh1_c::lookBack() {
-    /* Nonmatching */
+    cXyz player_eye_pos;
+    cXyz* vec_p = NULL;
+    s16 temp2 = current.angle.y;
+    bool temp = true;
+    switch (m95C) {
+    case 1:
+        if (mbAttention) {
+            player_eye_pos = dNpc_playerEyePos(l_HIO.mNpcHIO.m04);
+            vec_p = &player_eye_pos;
+            setTexAnm(0);
+        } else {
+            vec_p = NULL;
+            setTexAnm(0);
+        }
+        break;
+    case 2:
+        if (mpShopItems) {
+            if (mShopCamAct.checkCamAction(NULL) || mShopCamAct.checkCamAction(&ShopCam_action_c::rsh_talk_cam_action)) {
+                player_eye_pos = dNpc_playerEyePos(l_HIO.mNpcHIO.m04);
+                temp = false;
+            } else if (mpShopItems->mSelectedItemIdx == -1) {
+                player_eye_pos = mShopCamAct.getItemZoomPos(125.0f);
+                temp = false;
+            } else {
+                cXyz temp = mpShopItems->getSelectItemBasePos();
+                player_eye_pos = mpShopItems->getSelectItemPos();
+                mpShopCursor->setPos(temp);
+                mpShopCursor->setScale(
+                    l_HIO.m34,
+                    l_HIO.m38,
+                    l_HIO.m3C,
+                    l_HIO.m40,
+                    l_HIO.m44
+                );
+                mpShopCursor->anm_play();
+            }
+            vec_p = &player_eye_pos;
+        } else {
+            vec_p = NULL;
+        }
+        break;
+    default:
+        break;
+    }
+
+    if (mJntCtrl.trnChk()) {
+        cLib_addCalcAngleS2(&mLookAtMaxVel, l_HIO.mNpcHIO.mMaxHeadTurnVel, 4, 0x800);
+    } else {
+        mLookAtMaxVel = 0;
+    }
+    
+    mJntCtrl.lookAtTarget(
+        &current.angle.y, vec_p, 
+        eyePos, temp2, 
+        mLookAtMaxVel, temp
+    );
 }
 
 /* 00002868-00002930       .text pathGet__12daNpc_Rsh1_cFv */
-void daNpc_Rsh1_c::pathGet() {
-    /* Nonmatching */
+bool daNpc_Rsh1_c::pathGet() {
+    int param = (fopAcM_GetParam(this) >> 0x10) & 0xFF;
+    mpPath = dPath_GetRoomPath(param, fopAcM_GetRoomNo(this));
+    if (mpPath) {        
+        int i;
+        dPnt* point_p;
+        for (i = 0, point_p = mpPath->m_points; i < mpPath->m_num; i++, point_p++) {
+            if (point_p->mArg3 != 0xFF) {
+                mPathPointPos[point_p->mArg3].set(
+                    point_p->m_position.x,
+                    point_p->m_position.y,
+                    point_p->m_position.z
+                );
+                m744[point_p->mArg3] = i;
+                if (point_p->mArg3 == 1) {
+                    m704 = i;
+                }
+            }
+        }
+    }
+    mShopIdx = 0;
+    return true;
 }
 
 /* 00002930-00002B60       .text getAimShopPosIdx__12daNpc_Rsh1_cFv */
-void daNpc_Rsh1_c::getAimShopPosIdx() {
-    /* Nonmatching */
+int daNpc_Rsh1_c::getAimShopPosIdx() {
+    daPy_lk_c* link_p = DEMO_SELECT((daPy_lk_c *) dComIfGp_getPlayer(0), daPy_getPlayerLinkActorClass());
+    cXyz link_pos = link_p->current.pos;
+    int condition;
+    int result_index = 1;    
+    f32 fcond = l_HIO.m4C; 
+    int temp_78C = m78C;
+
+    condition = temp_78C < 1 ? 1 : temp_78C;
+
+    for (int i = 0; i <= condition; i++) {
+        cXyz temp = link_pos;
+        temp -= mPathPointPos[i];
+        f32 mag = std::sqrtf(temp.abs2XZ());
+        
+        if (mag < fcond) {
+            fcond = std::sqrtf(temp.abs2XZ());
+            result_index = i;
+        }
+    }
+
+    return result_index;
 }
 
 /* 00002B60-00002C2C       .text shopPosMove__12daNpc_Rsh1_cFv */
-void daNpc_Rsh1_c::shopPosMove() {
-    /* Nonmatching */
+BOOL daNpc_Rsh1_c::shopPosMove() {
+    static Vec shop_buyer_pos[] = {
+        1314.0f, 672.0f, -204426.0f,
+        1544.0f, 672.0f, -204214.0f,
+        1775.0f, 672.0f, -204029.0f,
+        1985.0f, 672.0f, -203786.0f
+    };
+
+    if (mShopIdx != -1) {
+        cXyz temp = shop_buyer_pos[mShopIdx];
+        if (cLib_chasePosXZ(&current.pos, temp, l_HIO.m48) != 0) {
+            setAnm(0);
+            return TRUE;
+        } else {
+            s16 target = cLib_targetAngleY(&current.pos, &temp);
+            cLib_addCalcAngleS2(&current.angle.y, target, 8, 0x1000);
+            setAnm(5);
+        }
+    } else {
+        return TRUE;
+    }
+
+    return FALSE;
 }
 
 /* 00002C2C-00002E00       .text pathMove__12daNpc_Rsh1_cFPi */
-void daNpc_Rsh1_c::pathMove(int*) {
-    /* Nonmatching */
+BOOL daNpc_Rsh1_c::pathMove(int* param_1) {
+    dPnt* point;
+    
+    s8 temp;
+    int temp2;
+    int temp3;
+    int temp4;
+
+    if (param_1) {
+        temp4 = *param_1;
+    } else {
+        temp4 = getAimShopPosIdx();
+    }
+
+    if (m704 == m744[temp4]) {
+        temp = m704;
+    } else if (m704 < m744[temp4]) {
+        temp = m704 + 1;
+    } else {
+        temp = m704 - 1;
+    }
+
+    point = &mpPath->m_points[temp];
+    cXyz target_pos(point->m_position.x, point->m_position.y, point->m_position.z);
+    int chase_result = cLib_chasePosXZ(&current.pos, target_pos, l_HIO.m48);
+
+    if (chase_result != 0) {
+        m704 = temp;
+        if (point->mArg3 != 0xFF) {
+            temp2 = point->mArg3 - 1; 
+            temp3 = temp2 + 9;
+            
+            if (temp2 != -1 && mShopIdx != temp2) {
+                mShopItemsArr[temp2].init();
+            }
+
+            if (mShopIdx != -1 && mShopIdx != temp2) {
+                mShopItemsArr[mShopIdx].init();
+            }
+
+            mShopIdx = temp2;
+            if (mShopIdx != -1) {
+                mpShopItems = &mShopItemsArr[mShopIdx];
+                mShopCamAct.setCamDataIdx(mShopIdx + 8);
+            } else {
+                mpShopItems = NULL;
+            }
+
+            mShopCamAct.setCamDataIdx(temp3);
+            if (temp4 == temp2 + 1) {
+                cLib_addCalcAngleS2(&current.angle.y, home.angle.y, 8, 0x1000);
+                return TRUE;
+            }
+        }
+    }
+    s16 target = cLib_targetAngleY(&current.pos, &target_pos);
+    cLib_addCalcAngleS2(&current.angle.y, target, 8, 0x1000);
+    return FALSE;
 }
 
 /* 00002E00-00002F5C       .text wait01__12daNpc_Rsh1_cFv */
-void daNpc_Rsh1_c::wait01() {
-    /* Nonmatching */
+bool daNpc_Rsh1_c::wait01() {
+    if (m771) {
+        m95D = m95C;
+        m95C = 2;
+    } else {
+        if (mCyl.ChkCoHit()) {
+            fopAc_ac_c* actor_p = mCyl.GetCoHitAc();
+            if (actor_p && fpcM_GetName(actor_p) == PROC_PLAYER) {
+                m95B = 2;
+                m793 = true;
+                m780 = 0x2883;
+            }
+        } else {
+            daPy_lk_c* link_p = DEMO_SELECT((daPy_lk_c *) dComIfGp_getPlayer(0), daPy_getPlayerLinkActorClass());
+            BOOL path_move_res = pathMove(NULL);
+            if (!path_move_res) {
+                setAnm(5);
+                m95B = 0;
+            } else {
+                setAnm(0);
+            }
+
+            if (mbAttention) {
+                f32 abs_diff = std::fabsf(current.pos.y - link_p->current.pos.y);
+                if (path_move_res && abs_diff < 100.0f) {
+                    m95B = 3;
+                } else if (m95B == 3) {
+                    m95B = 0;
+                } 
+            }
+        }
+    }
+
+    return mpMorf->isMorf();
 }
 
 /* 00002F5C-00003154       .text talk01__12daNpc_Rsh1_cFv */
-void daNpc_Rsh1_c::talk01() {
-    /* Nonmatching */
+bool daNpc_Rsh1_c::talk01() {
+    u16 result = talk();
+    if (result == fopMsgStts_BOX_CLOSED_e) {
+        daPy_lk_c* link_p = DEMO_SELECT((daPy_lk_c *) dComIfGp_getPlayer(0), daPy_getPlayerLinkActorClass());
+        m95C = m95D;
+        dComIfGp_event_onEventFlag(dSv_event_flag_c::UNK_0008);
+        mShopCamAct.Reset();
+        link_p->offNoResetFlg0(daPy_py_c::daPyFlg0_NO_DRAW);
+        m771 = false;
+        setAnm(0);
+
+        if (m778 == 0x2856) {
+            m95B = 4;
+            mItemNo = FLOWER_1;
+        } else if (m778 == 0x288E) {
+            m95B = 4;
+            mItemNo = NORMAL_SAIL;
+        } else if (m778 == 0x285F) {
+            m95B = 4;
+            mItemNo = dItem_MAGIC_ARMOR_e;
+        } else if (m778 == 0x2883 && m793 == true) {
+            setAction(&daNpc_Rsh1_c::pl_shop_out_action, NULL);
+        } 
+    } else if (result == 8 && daNpc_Rsh1_shopMsgCheck(m778) && m778 == mpShopItems->getSelectItemBuyMsg()) {
+        dComIfGp_setDoStatusForce(dActStts_CHOOSE_e);
+        dComIfGp_setAStatusForce(dActStts_CANCEL_e);
+    }
+
+    return mpMorf->isMorf();
 }
 
 /* 00003154-00003358       .text getdemo_action__12daNpc_Rsh1_cFPv */
-void daNpc_Rsh1_c::getdemo_action(void*) {
-    /* Nonmatching */
+BOOL daNpc_Rsh1_c::getdemo_action(void* i_unusedP) {
+    UNUSED(i_unusedP);
+    int staff_idx = dComIfGp_evmng_getMyStaffId("Rsh1");
+
+    if (mActionStatus == 0) {
+        daPy_lk_c* link_p = DEMO_SELECT((daPy_lk_c *) dComIfGp_getPlayer(0), daPy_getPlayerLinkActorClass());
+        link_p->offNoResetFlg0(daPy_py_c::daPyFlg0_NO_DRAW);
+        m95C = m95D;
+        mShopCamAct.Reset();
+
+        fpc_ProcID pid = fopAcM_createItemForPresentDemo(
+            &current.pos, mItemNo, 
+            0, -1, 
+            DEMO_SELECT(-1, fopAcM_GetRoomNo(this))
+        );
+        if (pid != fpcM_ERROR_PROCESS_ID_e) {
+            dComIfGp_event_setItemPartnerId(pid);
+        }
+
+        dComIfGp_evmng_cutEnd(staff_idx);
+        mActionStatus++;
+    } else if (mActionStatus != -1) {
+        dComIfGp_evmng_cutEnd(staff_idx);
+        if (dComIfGp_evmng_endCheck("RSH_GET_DEMO")) {
+            m95B = 1;
+            dComIfGp_event_onEventFlag(dSv_event_flag_c::UNK_0008);
+
+            if (mItemNo == FLOWER_1) {
+                m780 = 0x2857;
+            } else if (mItemNo == NORMAL_SAIL) {
+                m780 = 0x288F;
+            } else if (mItemNo == dItem_MAGIC_ARMOR_e) {
+                m780 = 0x2860;
+            }
+
+            mItemNo = 0xFF;
+
+            setAction(&daNpc_Rsh1_c::wait_action, NULL);
+        }
+    }
+
+    return TRUE;
 }
 
 /* 00003358-00003424       .text wait_action__12daNpc_Rsh1_cFPv */
-void daNpc_Rsh1_c::wait_action(void*) {
-    /* Nonmatching */
+BOOL daNpc_Rsh1_c::wait_action(void* i_unusedP) {
+    UNUSED(i_unusedP);
+
+    if (mActionStatus == 0) {
+        m95C = 1;
+        mActionStatus++;
+    } else if (mActionStatus != -1) {
+        s16 sum = current.angle.y + getHead_y() + getBackbone_y();
+        mbAttention = chkAttention(current.pos, sum);
+        switch (m95C) {
+            case 1:
+                wait01();
+                break;
+            case 2:
+                talk01();
+                break;
+        } 
+    }
+
+    return TRUE;
 }
 
 /* 00003424-00003840       .text pl_shop_out_action__12daNpc_Rsh1_cFPv */
-void daNpc_Rsh1_c::pl_shop_out_action(void*) {
-    /* Nonmatching */
+BOOL daNpc_Rsh1_c::pl_shop_out_action(void* i_unusedP) {
+    UNUSED(i_unusedP);
+
+    f32 trig_amplitude_1 = 140.0f;
+    if (mActionStatus == 0) {
+        setAnm(6);
+        m794 = current.pos;
+        m794.x -= cM_ssin(current.angle.y) * trig_amplitude_1;
+        m794.z -= cM_scos(current.angle.y) * trig_amplitude_1;
+        m793 = false;
+        mActionStatus++;
+    } else if (mActionStatus != -1) {
+        int temp_78C = m78C;
+        daPy_lk_c* link_p = DEMO_SELECT((daPy_lk_c *) dComIfGp_getPlayer(0), daPy_getPlayerLinkActorClass());
+        cXyz link_pos = link_p->current.pos;
+        s16 target = cLib_targetAngleY(&current.pos, &link_pos);
+        if (pathMove(&temp_78C)) {
+            cXyz temp = cXyz::Zero;
+            f32 calc_pos = cLib_addCalcPos(&m794, current.pos, 0.25f, REG10_F(1) + 5.0f, 1.0f);
+            cLib_addCalcAngleS2(&current.angle.y, target, 4, 0x1000);
+            if (calc_pos < 1.0f) {
+                cLib_addCalcPos(&m7A0, temp, 0.25f, REG10_F(1) + 5.0f, 1.0f);
+                f32 mag = m7A0.abs();
+                if (mag > 1.0f) {
+                    setAnm(5);
+                } else {
+                    setAnm(0);
+                    setAction(&daNpc_Rsh1_c::wait_action, NULL);
+                }
+            } else {
+                f32 trig_amplitude_2 = REG10_F(2) + 100.0f;
+                temp.x += trig_amplitude_2 * cM_ssin(current.angle.y);
+                temp.z += trig_amplitude_2 * cM_scos(current.angle.y);
+                cLib_addCalcPos(&m7A0, temp, 0.25f, REG10_F(1) + 5.0f, 1.0f);
+            }
+        } else {
+            m794 = current.pos;
+            m794.x -= cM_ssin(current.angle.y) * trig_amplitude_1;
+            m794.z -= cM_scos(current.angle.y) * trig_amplitude_1;
+        }
+    }
+    return TRUE;
 }
 
 /* 00003840-000038A4       .text evn_setAnm_init__12daNpc_Rsh1_cFi */
-void daNpc_Rsh1_c::evn_setAnm_init(int) {
-    /* Nonmatching */
+bool daNpc_Rsh1_c::evn_setAnm_init(int i_staffIdx) {
+    int* anm_no_p = (int*) dComIfGp_evmng_getMyIntegerP(i_staffIdx, "AnmNo");
+    if (anm_no_p) {
+        setAnm(*anm_no_p);
+    }
+    return true;
 }
 
 /* 000038A4-0000396C       .text evn_talk_init__12daNpc_Rsh1_cFi */
-void daNpc_Rsh1_c::evn_talk_init(int) {
-    /* Nonmatching */
+bool daNpc_Rsh1_c::evn_talk_init(int i_staffIdx) {
+    u32* msg_no_p = (u32 *) dComIfGp_evmng_getMyIntegerP(i_staffIdx, "MsgNo");
+    u32* end_msg_no_p = (u32 *) dComIfGp_evmng_getMyIntegerP(i_staffIdx, "EndMsgNo");
+
+    l_msgId = -1;
+    l_msg = 0;
+
+    if (msg_no_p) {
+        m778 = *msg_no_p;
+    } else {
+        m778 = 0;
+    }
+
+    if (end_msg_no_p) {
+        m784 = *end_msg_no_p;
+    } else {
+        m784 = 0;
+    }
+
+    return true;
 }
 
 /* 0000396C-000039D4       .text evn_continue_talk_init__12daNpc_Rsh1_cFi */
-void daNpc_Rsh1_c::evn_continue_talk_init(int) {
-    /* Nonmatching */
+bool daNpc_Rsh1_c::evn_continue_talk_init(int i_staffIdx) {
+    u32* end_msg_no_p = (u32 *) dComIfGp_evmng_getMyIntegerP(i_staffIdx, "EndMsgNo");
+
+    if (end_msg_no_p) {
+        m784 = *end_msg_no_p;
+    } else {
+        m784 = 0;
+    }
+
+    return true;
 }
 
 /* 000039D4-00003B04       .text evn_talk__12daNpc_Rsh1_cFv */
-void daNpc_Rsh1_c::evn_talk() {
-    /* Nonmatching */
+BOOL daNpc_Rsh1_c::evn_talk() {
+    if (l_msgId == fpcM_ERROR_PROCESS_ID_e) {
+        l_msgId = fopMsgM_messageSet(m778, &eyePos);
+    } else if (!l_msg) {
+        l_msg = fopMsgM_SearchByID(l_msgId);
+        fopMsgM_demoMsgFlagOn();
+    } else {
+        setAnmFromMsgTag();
+        if (l_msg->mStatus == fopMsgStts_MSG_DISPLAYED_e) {
+            l_msg->mStatus = next_msgStatus(&m778);
+            if (l_msg->mStatus == fopMsgStts_MSG_CONTINUES_e) {
+                fopMsgM_messageSet(m778);
+            } 
+        } else {
+            if (l_msg->mStatus == fopMsgStts_BOX_CLOSED_e) {
+                l_msg->mStatus = fopMsgStts_MSG_DESTROYED_e;
+                l_msg = NULL;
+                l_msgId = -1;
+                return true;
+            }
+            if ((l_msg->mStatus == 2 || l_msg->mStatus == 6) && m778 == m784) {
+                m784 = 0;
+                return true;
+            } 
+        }
+    }
+    return false;
 }
 
 /* 00003B04-00003B88       .text evn_turn_init__12daNpc_Rsh1_cFi */
-void daNpc_Rsh1_c::evn_turn_init(int) {
-    /* Nonmatching */
+bool daNpc_Rsh1_c::evn_turn_init(int i_staffIdx) {
+    int* prm_p = dComIfGp_evmng_getMyIntegerP(i_staffIdx, "prm");
+    daPy_lk_c* link_p = DEMO_SELECT((daPy_lk_c *) dComIfGp_getPlayer(0), daPy_getPlayerLinkActorClass());
+    int prm;
+
+    if (prm_p) {
+        prm = *prm_p;
+    } else {
+        prm = 0;
+    }
+
+    if (prm == 1) {
+        current.angle.y = cLib_targetAngleY(&current.pos, &link_p->current.pos);
+    }
+
+    return true;
 }
 
 /* 00003B88-00003C10       .text evn_turn__12daNpc_Rsh1_cFv */
-void daNpc_Rsh1_c::evn_turn() {
-    /* Nonmatching */
+BOOL daNpc_Rsh1_c::evn_turn() {
+    daPy_lk_c* link_p = DEMO_SELECT((daPy_lk_c *) dComIfGp_getPlayer(0), daPy_getPlayerLinkActorClass());
+    s16 target = cLib_targetAngleY(&current.pos, &link_p->current.pos);
+    cLib_addCalcAngleS(&current.angle.y, target, 8, 0x1000, 0x100);
+    return cLib_distanceAngleS(current.angle.y, target) < 0x100;
 }
 
 /* 00003C10-00003D80       .text privateCut__12daNpc_Rsh1_cFv */
-void daNpc_Rsh1_c::privateCut() {
-    /* Nonmatching */
+bool daNpc_Rsh1_c::privateCut() {
+    static char* cut_name_tbl[] = {
+        "TALKMSG",
+        "CONTINUE_TALK",
+        "SETANM",
+        "TURN"
+    };
+    int staff_idx = dComIfGp_evmng_getMyStaffId(mEventCut.getActorName());
+    
+    if (staff_idx == -1) {
+        return false;
+    }
+
+    int act_idx = dComIfGp_evmng_getMyActIdx(
+        staff_idx, cut_name_tbl, 
+        ARRAY_SSIZE(cut_name_tbl), 
+        TRUE, 0
+    );
+    if (act_idx == -1) {
+        dComIfGp_evmng_cutEnd(staff_idx);
+    } else {
+        BOOL is_addvance = dComIfGp_evmng_getIsAddvance(staff_idx);
+        if (is_addvance) {
+            switch (act_idx) {
+                case 0:
+                    evn_talk_init(staff_idx);
+                    break;
+                case 1:
+                    evn_continue_talk_init(staff_idx);
+                    break;
+                case 2:
+                    evn_setAnm_init(staff_idx);
+                    break;
+                case 3:
+                    evn_turn_init(staff_idx);
+                    break;
+            }
+        }
+
+        BOOL result;
+        switch (act_idx) {
+            case 0:
+            case 1:
+                result = evn_talk();
+                break;
+            case 3:
+                result = evn_turn();
+                break;
+            case 2:
+            default:
+                result = true;
+                break;
+        }
+
+        if (result) {
+            dComIfGp_evmng_cutEnd(staff_idx);
+        }
+    }
+
+    return true;
 }
 
-/* 00003D80-00003EEC       .text event_action__12daNpc_Rsh1_cFPv */
-void daNpc_Rsh1_c::event_action(void*) {
-    /* Nonmatching */
+BOOL daNpc_Rsh1_c::event_action(void* i_unusedP) {
+    UNUSED(i_unusedP);
+    if (mActionStatus == 0) {
+        dComIfGp_evmng_getMyStaffId("Rsh1");
+        m95C = m95D;
+        m95B = 0;
+        mActionStatus++;
+    } else if (mActionStatus != -1) {
+        privateCut();
+        if (dComIfGp_evmng_endCheck(mShopOutEventIdx)) {
+            if (cLib_checkBit<u32>(actor_status, 0x4000)) {
+                cLib_offBit<u32>(actor_status, 0x4000);
+            }
+            dComIfGp_event_onEventFlag(dSv_event_flag_c::UNK_0008);
+            setAction(&daNpc_Rsh1_c::wait_action, NULL);
+        }
+        lookBack();
+    }
+
+    return TRUE;
 }
 
 /* 00003EEC-00003F08       .text dummy_action__12daNpc_Rsh1_cFPv */
-void daNpc_Rsh1_c::dummy_action(void*) {
-    /* Nonmatching */
+BOOL daNpc_Rsh1_c::dummy_action(void* i_unusedP) {
+    UNUSED(i_unusedP);
+    if (mActionStatus == 0) {
+        mActionStatus++;
+    }
+    return TRUE;
 }
 
 /* 00003F08-00004040       .text _draw__12daNpc_Rsh1_cFv */
 BOOL daNpc_Rsh1_c::_draw() {
-    /* Nonmatching */
+    J3DModel* morf_model_p = mpMorf->getModel();
+    J3DModelData* morf_model_data_p = morf_model_p->getModelData();
+    g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &current.pos, &tevStr);
+    g_env_light.setLightTevColorType(morf_model_p, &tevStr);
+    mBtpAnm.entry(morf_model_data_p, mBtpFrame);
+    mpMorf->updateDL();
+    mBtpAnm.remove(morf_model_data_p);
+
+    cXyz shadow_pos(
+        current.pos.x,
+        current.pos.y + 120.0f,
+        current.pos.z
+    );
+
+    f32 ground_y = mAcch.m_ground_h;
+    mShadowID = dComIfGd_setShadow(
+        mShadowID, 
+        1, mpMorf->getModel(), 
+        &shadow_pos, 800.0f, 20.0f, 
+        current.pos.y, ground_y, 
+        mAcch.m_gnd, &tevStr
+    );  
+    
+    if (mpShopItems && mpShopItems->mSelectedItemIdx >= 0) {
+        mpShopCursor->draw();
+    }
+
+    dSnap_RegistFig(DSNAP_TYPE_UNK5F, this, current.pos, current.angle.y, 1.0f, 1.0f, 1.0f);
+
+    return TRUE;
 }
 
 /* 00004040-0000427C       .text _execute__12daNpc_Rsh1_cFv */
 BOOL daNpc_Rsh1_c::_execute() {
-    /* Nonmatching */
+#if VERSION == VERSION_DEMO
+    if (l_HIO.m68 != 0) {
+        for (int i = 0; i < ARRAY_SSIZE(l_HIO.m5C); i++) {
+            if (l_HIO.m5C[i]) {
+                dComIfGs_onGetItemReserve(i);
+            } else {
+                dComIfGs_offGetItemReserve(i);
+            }
+        }
+
+        if (l_HIO.m69) {
+            dComIfGs_onEventBit(dSv_event_flag_c::UNK_0E08);
+        } else {
+            dComIfGs_offEventBit(dSv_event_flag_c::UNK_0E08);
+        }
+
+        if (l_HIO.m6A) {
+            dComIfGs_onEventBit(dSv_event_flag_c::UNK_1110);
+        } else {
+            dComIfGs_offEventBit(dSv_event_flag_c::UNK_1110);
+        }
+
+        if (l_HIO.m6B) {
+            dComIfGs_onEventBit(dSv_event_flag_c::UNK_1108);
+        } else {
+            dComIfGs_offEventBit(dSv_event_flag_c::UNK_1108);
+        }
+    }
+#endif
+
+    cXyz center = dComIfGp_getCamera(0)->mLookat.mCenter;
+    cXyz lookat_diff = center - current.pos;
+    f32 lookat_dist = lookat_diff.abs();
+
+    if (lookat_dist > REG10_F(10) + 5000.0f) {
+        return TRUE;
+    } else {
+        mJntCtrl.setParam(
+            l_HIO.mNpcHIO.mMaxBackboneX,
+            l_HIO.mNpcHIO.mMaxBackboneY,
+            l_HIO.mNpcHIO.mMinBackboneX,
+            l_HIO.mNpcHIO.mMinBackboneY,
+            l_HIO.mNpcHIO.mMaxHeadX,
+            l_HIO.mNpcHIO.mMaxHeadY,
+            l_HIO.mNpcHIO.mMinHeadX,
+            l_HIO.mNpcHIO.mMinHeadY,
+            l_HIO.mNpcHIO.mMaxTurnStep
+        );
+
+        playTexPatternAnm();
+        
+        mMorfIsStop = mpMorf->play(&eyePos, 0, 0);
+        if (mpMorf->getFrame() < mMorfPrevFrame) {
+            mMorfIsStop = true;
+        }
+        mMorfPrevFrame = mpMorf->getFrame();
+        
+        checkOrder();
+
+        (this->*mCurrProc)(NULL);
+
+        mShopCamAct.move();
+        if (mpShopItems) {
+            mpShopItems->Item_Move();
+        }
+
+        eventOrder();
+        lookBack();
+        setAttention();
+        fopAcM_posMoveF(this, mStts.GetCCMoveP());
+        
+        mAcch.CrrPos(*dComIfG_Bgsp());
+        tevStr.mRoomNo = dComIfG_Bgsp()->GetRoomId(mAcch.m_gnd);
+        tevStr.mEnvrIdxOverride = dComIfG_Bgsp()->GetPolyColor(mAcch.m_gnd);
+        
+        set_mtx();
+        setCollision();
+    }
+
+    return TRUE;
 }
 
 /* 0000427C-00004308       .text _delete__12daNpc_Rsh1_cFv */
 BOOL daNpc_Rsh1_c::_delete() {
-    /* Nonmatching */
+    dComIfG_resDeleteDemo(&mPhs, m_arcname);
+    if (DEMO_SELECT(true, heap) && mpMorf) {
+        mpMorf->stopZelAnime();
+    }
+
+    if (l_HIO.m08 >= 0) {
+        l_HIO.m08--;
+        if (l_HIO.m08 < 0) {
+            mDoHIO_deleteChild(l_HIO.mNo);
+        }
+    }
+
+    return TRUE;
 }
 
 /* 00004308-00004328       .text CheckCreateHeap__FP10fopAc_ac_c */
-static BOOL CheckCreateHeap(fopAc_ac_c*) {
-    /* Nonmatching */
+static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
+    return ((daNpc_Rsh1_c*)i_this)->CreateHeap();
 }
 
 /* 00004328-00004464       .text _create__12daNpc_Rsh1_cFv */
 cPhs_State daNpc_Rsh1_c::_create() {
-    /* Nonmatching */
+#if VERSION > VERSION_DEMO
+    fopAcM_SetupActor(this, daNpc_Rsh1_c);
+#endif
+
+    cPhs_State state = dComIfG_resLoad(&mPhs, m_arcname);
+
+
+    if (state == cPhs_COMPLEATE_e) {
+#if VERSION == VERSION_DEMO
+        fopAcM_SetupActor(this, daNpc_Rsh1_c);
+#endif
+        m95E = (fopAcM_GetParam(this) >> 0x14) & 0xF;
+
+        switch (m95E) {
+            case 0:
+                m95E = 0;
+                break;
+            default:
+                m95E = 0;
+                break;
+        }
+        
+        if (!fopAcM_entrySolidHeap(this, CheckCreateHeap, 0x6100)) {
+            return cPhs_ERROR_e;
+        }
+
+        cullMtx = mpMorf->getModel()->getBaseTRMtx();
+
+        if (l_HIO.m08 < 0) {
+            l_HIO.mNo = mDoHIO_createChild("露店の社長", &l_HIO); // "Stall owner"
+        }
+        l_HIO.m08++;
+
+        if (!CreateInit()) {
+            return cPhs_ERROR_e;
+        }
+    }
+
+    return state;
 }
 
 /* 00004698-000049A0       .text CreateHeap__12daNpc_Rsh1_cFv */
-void daNpc_Rsh1_c::CreateHeap() {
-    /* Nonmatching */
+BOOL daNpc_Rsh1_c::CreateHeap() {
+    J3DModelData* model_p = (J3DModelData *) dComIfG_getObjectRes(m_arcname, DEMO_SELECT(RSH_INDEX_BDL_RS, RSH_BDL_RS));
+    mpMorf = new mDoExt_McaMorf(
+        model_p, 
+        NULL, NULL, 
+        (J3DAnmTransform *) dComIfG_getObjectRes(m_arcname, DEMO_SELECT(RSH_INDEX_BCK_RS_WAIT01, RSH_BCK_RS_WAIT01)), 
+        J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1, 
+        dComIfG_getObjectRes(m_arcname, DEMO_SELECT(RSH_INDEX_BAS_RS_WAIT01, RSH_BAS_RS_WAIT01)), 
+        0, 0x11020203
+    );
+
+    if (!mpMorf || !mpMorf->getModel()) {
+#if VERSION > VERSION_DEMO
+        mpMorf = NULL;
+#endif
+        return FALSE;
+    }
+
+    m_head_jnt_num = model_p->getJointName()->getIndex("head");
+    JUT_ASSERT(DEMO_SELECT(2386, 2387), m_head_jnt_num >= 0);
+
+    m_backbone_jnt_num = model_p->getJointName()->getIndex("backbone");
+    JUT_ASSERT(DEMO_SELECT(2389, 2390), m_backbone_jnt_num >= 0);
+
+    switch (m95E) {
+        case 0:
+            m958 = 0;
+            break;
+    }
+
+    BOOL init_result = initTexPatternAnm(false); 
+
+#if VERSION > VERSION_DEMO
+    if (!init_result) {
+        return FALSE;
+    }
+#endif
+
+    for (u16 i = 0; i < model_p->getJointNum(); i++) {
+        if (i == m_head_jnt_num || i == m_backbone_jnt_num) {
+            mpMorf->getModel()->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack_Rsh);
+        }
+    }
+
+    mpMorf->getModel()->setUserArea((u32)this);
+    mAcchCir.SetWall(30.0f, 0.0f);
+    cXyz* speed_p = &speed;
+    cXyz* old_pos_p = &old.pos;
+    cXyz* current_pos_p = &current.pos;
+    mAcch.Set(current_pos_p, old_pos_p, this, 1, &mAcchCir, speed_p);
+
+    mpShopCursor = ShopCursor_create(
+        (J3DModelData *) dComIfG_getObjectRes(m_arcname, DEMO_SELECT(RSH_INDEX_BMD_SHOP_CURSOR01, RSH_BMD_SHOP_CURSOR01)),
+        (J3DAnmTevRegKey *) dComIfG_getObjectRes(m_arcname, DEMO_SELECT(RSH_INDEX_BRK_SHOP_CURSOR01, RSH_BRK_SHOP_CURSOR01)),
+        l_HIO.m34
+    );
+
+    return mpShopCursor != NULL ? TRUE : FALSE;
 }
 
 /* 000049A0-00004A28       .text set_mtx__12daNpc_Rsh1_cFv */
 void daNpc_Rsh1_c::set_mtx() {
-    /* Nonmatching */
+    J3DModel* morf_model_p = mpMorf->getModel();
+    mDoMtx_stack_c::transS(
+        current.pos.x + m7A0.x,
+        current.pos.y + m7A0.y,
+        current.pos.z + m7A0.z
+    );
+    mDoMtx_stack_c::YrotM(current.angle.y);
+    morf_model_p->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
 /* 00004A28-00004A48       .text daNpc_Rsh1_Create__FP10fopAc_ac_c */
diff --git a/src/d/d_save.cpp b/src/d/d_save.cpp
index d01bbb15..ea5f3c3a 100644
--- a/src/d/d_save.cpp
+++ b/src/d/d_save.cpp
@@ -696,6 +696,13 @@ void dSv_player_get_bag_item_c::onReserve(u8 i_no) {
     mReserveFlags |= (1 << i_no);
 }
 
+#if VERSION == VERSION_DEMO
+void dSv_player_get_bag_item_c::offReserve(u8 i_no) {
+    JUT_ASSERT(1334, 0 <= i_no && i_no < 32);
+    mReserveFlags &= ~(1 << i_no);
+}
+#endif
+
 /* 8005ABB4-8005AC48       .text isReserve__25dSv_player_get_bag_item_cFUc */
 BOOL dSv_player_get_bag_item_c::isReserve(u8 i_no) {
     JUT_ASSERT(DEMO_SELECT(1349, 1355), 0 <= i_no && i_no < 32);