Merge pull request #499 from LagoLunatic/arrow

arrow, tag_ret, obj_Ygush00, kytag06, nh: all OK

configure.py

@@ -198,11 +198,11 @@ cflags_rel = [
 
 
 # Helper function for single-object RELs
-def Rel(status, rel_name, cpp_name):
+def Rel(status, rel_name, cpp_name, extra_cflags=[]):
     return {
         "lib": rel_name,
         "mw_version": "GC/1.3.2",
-        "cflags": cflags_rel,
+        "cflags": cflags_rel + extra_cflags,
         "host": True,
         "objects": [
             Object(status, cpp_name),
@@ -211,8 +211,8 @@ def Rel(status, rel_name, cpp_name):
 
 
 # Helper function for actor RELs
-def ActorRel(status, rel_name):
-    return Rel(status, rel_name, f"d/actor/{rel_name}.cpp")
+def ActorRel(status, rel_name, extra_cflags=[]):
+    return Rel(status, rel_name, f"d/actor/{rel_name}.cpp", extra_cflags=extra_cflags)
 
 
 # Helper function for JSystem libraries
@@ -414,7 +414,7 @@ config.libs = [
             Object(NonMatching, "d/d_snap.cpp"),
             Object(Matching,    "d/d_point_wind.cpp"),
             Object(NonMatching, "d/actor/d_a_agb.cpp"),
-            Object(NonMatching, "d/actor/d_a_arrow.cpp"),
+            Object(Matching,    "d/actor/d_a_arrow.cpp", cflags=[*cflags_framework, "-sym off"]),
             Object(NonMatching, "d/actor/d_a_bg.cpp"),
             Object(NonMatching, "d/actor/d_a_bomb.cpp"),
             Object(NonMatching, "d/actor/d_a_bomb2.cpp"),
@@ -429,7 +429,7 @@ config.libs = [
             Object(NonMatching, "d/actor/d_a_ib.cpp"),
             Object(NonMatching, "d/actor/d_a_item.cpp"),
             Object(Matching,    "d/actor/d_a_itembase.cpp"),
-            Object(NonMatching, "d/actor/d_a_nh.cpp"),
+            Object(Matching,    "d/actor/d_a_nh.cpp"),
             Object(NonMatching, "d/actor/d_a_npc_fa1.cpp"),
             Object(NonMatching, "d/actor/d_a_obj_search.cpp"),
             Object(NonMatching, "d/actor/d_a_player.cpp"),
@@ -1239,7 +1239,7 @@ config.libs = [
     ActorRel(NonMatching, "d_a_kytag03"),
     ActorRel(NonMatching, "d_a_kytag04"),
     ActorRel(NonMatching, "d_a_kytag05"),
-    ActorRel(NonMatching, "d_a_kytag06"),
+    ActorRel(Matching,    "d_a_kytag06"),
     ActorRel(NonMatching, "d_a_kytag07"),
     ActorRel(NonMatching, "d_a_lamp"),
     ActorRel(NonMatching, "d_a_lod_bg"),
@@ -1250,7 +1250,7 @@ config.libs = [
     ActorRel(NonMatching, "d_a_msw"),
     ActorRel(NonMatching, "d_a_mtoge"),
     ActorRel(NonMatching, "d_a_obj_AjavW"),
-    ActorRel(NonMatching, "d_a_obj_Ygush00"),
+    ActorRel(Matching,    "d_a_obj_Ygush00", extra_cflags=["-sym off"]),
     ActorRel(NonMatching, "d_a_obj_akabe"),
     ActorRel(NonMatching, "d_a_obj_barrel"),
     ActorRel(NonMatching, "d_a_obj_barrel2"),
@@ -1292,7 +1292,7 @@ config.libs = [
     ActorRel(NonMatching, "d_a_pirate_flag"),
     ActorRel(NonMatching, "d_a_race_item"),
     ActorRel(NonMatching, "d_a_rd"),
-    ActorRel(Matching, "d_a_rectangle"),
+    ActorRel(Matching,    "d_a_rectangle"),
     ActorRel(NonMatching, "d_a_salvage"),
     ActorRel(NonMatching, "d_a_sbox"),
     ActorRel(NonMatching, "d_a_sk"),
@@ -1602,7 +1602,7 @@ config.libs = [
     ActorRel(NonMatching, "d_a_tag_etc"),
     ActorRel(NonMatching, "d_a_tag_island"),
     ActorRel(NonMatching, "d_a_tag_kf1"),
-    ActorRel(NonMatching, "d_a_tag_ret"),
+    ActorRel(Matching,    "d_a_tag_ret", extra_cflags=["-sym off"]),
     ActorRel(NonMatching, "d_a_tag_volcano"),
     ActorRel(NonMatching, "d_a_title"),
     ActorRel(NonMatching, "d_a_tn"),

include/JSystem/JParticle/JPAEmitter.h

@@ -73,6 +73,12 @@ public:
     void setGlobalRTMatrix(MtxP mtx) {
         JPASetRMtxTVecfromMtx(mtx, mGlobalRotation, mGlobalTranslation);
     }
+    void setGlobalTranslation(f32 x, f32 y, f32 z) { mGlobalTranslation.set(x, y, z); }
+    void setGlobalParticleScale(const JGeometry::TVec3<float>& scale) {
+        mGlobalScale.set(scale);
+        mGlobalScale2D.set(scale);
+    }
+    void setMaxFrame(s32 maxFrame) { mMaxFrame = maxFrame; }
 
     void stopCreateParticle() { setStatus(JPAEmtrStts_StopEmit); }
 

include/SSystem/SComponent/c_lib.h

@@ -86,16 +86,16 @@ inline T cLib_maxLimit(T val, T max) {
 }
 
 template <typename T>
-T cLib_calcTimer(T* value) {
-    if (*value != 0) {
-        *value = *value - 1;
-    }
-    return *value;
+T cLib_getRndValue(T min, T range) {
+    return (T)(min + cM_rndF((f32)range));
 }
 
 template <typename T>
-T cLib_getRndValue(T min, T range) {
-    return (T)(min + cM_rndF((f32)range));
+T cLib_calcTimer(T* value) {
+    if ((s32)*value != 0) {
+        *value = *value - 1;
+    }
+    return *value;
 }
 
 void MtxInit(void);

include/d/actor/d_a_arrow.h

@@ -33,9 +33,9 @@ public:
     void arrowShooting();
     void arrowUseMp();
     void ShieldReflect();
-    void check_water_in();
+    bool check_water_in();
     BOOL changeArrowMp();
-    void changeArrowType();
+    daArrow_c* changeArrowType();
     void changeArrowTypeNotReady();
     void setRoomInfo();
     void setKeepMatrix();
@@ -79,7 +79,7 @@ public:
     /* 0x360 */ dCcD_Stts mStts;
     /* 0x39C */ dCcD_Cps mCps;
     /* 0x4D4 */ dCcD_Sph mSph;
-    /* 0x600 */ u8 field_0x600[0x601 - 0x600];
+    /* 0x600 */ bool field_0x600;
     /* 0x601 */ u8 mArrowType;
     /* 0x602 */ s16 field_0x602;
     /* 0x604 */ s16 field_0x604;
@@ -111,7 +111,7 @@ public:
     /* 0x6A0 */ s32 field_0x6a0;
     /* 0x6A4 */ s32 mInWaterTimer;
     /* 0x6A8 */ cXyz field_0x6a8;
-    /* 0x6B4 */ u8 field_0x6B4[0x6E4 - 0x6B4];
+    /* 0x6B4 */ Mtx field_0x6b4;
     /* 0x6E4 */ u8 field_0x6e4;
     /* 0x6E5 */ u8 field_0x6E5[0x6E6 - 0x6E5];
     /* 0x6E6 */ csXyz field_0x6e6;

include/d/actor/d_a_player.h

@@ -100,7 +100,7 @@ public:
     virtual void getGroundY() = 0;
     virtual void getTactMusic() const;
     virtual void getTactTimerCancel() const;
-    virtual void checkPlayerGuard() const;
+    virtual BOOL checkPlayerGuard() const;
     virtual void getGrabMissActor();
     virtual u32 checkPlayerFly() const;
     virtual void checkFrontRoll() const;

include/d/actor/d_a_player_link.h

@@ -490,7 +490,7 @@ public:
     void setDamageEmitter();
     void endFlameDamageEmitter();
     void endDamageEmitter();
-    void setItemWaterEffect(fopAc_ac_c*, int, int);
+    static u32 setItemWaterEffect(fopAc_ac_c*, int, int);
     void getDemoLookActor();
     void setTinkleCeiverModel();
     void setTalismanModel();
@@ -1010,7 +1010,7 @@ public:
     virtual void getGroundY();
     virtual void getTactMusic() const;
     virtual void getTactTimerCancel() const;
-    virtual void checkPlayerGuard() const;
+    virtual BOOL checkPlayerGuard() const;
     virtual void getGrabMissActor();
     virtual u32 checkPlayerFly() const;
     virtual void checkFrontRoll() const;

include/d/d_bg_s.h

@@ -52,7 +52,10 @@ public:
 public:
     cBgS() {}
 
-    bool GetTriPla(cBgS_PolyInfo&) const;
+    cM3dGPla* GetTriPla(cBgS_PolyInfo&) const;
+    cM3dGPla* i_GetTriPla(cBgS_PolyInfo& polyInfo) const {
+        return GetTriPla(polyInfo.GetBgIndex(), polyInfo.GetPolyIndex());
+    }
     bool Regist(cBgW*, u32, void*);
     int Release(cBgW*);
     bool LineCross(cBgS_LinChk*);
@@ -101,8 +104,8 @@ public:
     void GetLinkNo(cBgS_PolyInfo&);
     int GetWallCode(cBgS_PolyInfo&);
     int GetSpecialCode(cBgS_PolyInfo&);
-    void GetAttributeCodeDirect(cBgS_PolyInfo&);
-    void GetAttributeCode(cBgS_PolyInfo&);
+    s32 GetAttributeCodeDirect(cBgS_PolyInfo&);
+    s32 GetAttributeCode(cBgS_PolyInfo&);
     void GetGroundCode(cBgS_PolyInfo&);
     void GetPolyId2(int, int, int, u32, u32);
     int GetCamMoveBG(cBgS_PolyInfo&);

include/d/d_bg_s_lin_chk.h

@@ -12,7 +12,7 @@ public:
         SetPolyPassChk(GetPolyPassChkInfo());
         SetGrpPassChk(GetGrpPassChkInfo());
     }
-    /* 80077D64 */ void Set(cXyz const* pi_start, cXyz const* pi_end, fopAc_ac_c const*);
+    /* 80077D64 */ void Set(cXyz* pi_start, cXyz* pi_end, fopAc_ac_c*);
 
     /* 80077CDC */ virtual ~dBgS_LinChk() {}
 

include/d/d_com_inf_game.h

@@ -193,9 +193,10 @@ public:
     s16 getItemMagicCount() { return mItemMagicCount; }
     void setItemMagicCount(s16 magic) { mItemMagicCount += magic; }
 
-    void setItemLifeCount(f32 num) {
-        mItemLifeCount += num;
-    }
+    void setItemLifeCount(f32 num) { mItemLifeCount += num; }
+    
+    s16 getItemArrowNumCount() { return mItemArrowNumCount; }
+    void setItemArrowNumCount(s16 num) { mItemArrowNumCount += num; }
 
     u8 checkMesgCancelButton() { return field_0x4949; }
 
@@ -1149,6 +1150,14 @@ inline void dComIfGp_setItemMagicCount(s16 magic) {
     g_dComIfG_gameInfo.play.setItemMagicCount(magic);
 }
 
+inline s16 dComIfGp_getItemArrowNumCount() {
+    return g_dComIfG_gameInfo.play.getItemArrowNumCount();
+}
+
+inline void dComIfGp_getItemArrowNumCount(s16 num) {
+    return g_dComIfG_gameInfo.play.setItemArrowNumCount(num);
+}
+
 inline u8 dComIfGp_checkMesgCancelButton() {
     return g_dComIfG_gameInfo.play.checkMesgCancelButton();
 }

include/d/d_jnt_hit.h

@@ -15,6 +15,13 @@ public:
 
 class JntHit_c {
 public:
+    void CreateInit();
+    void CylHitPosAngleOffset(cXyz*, csXyz*, cXyz*, csXyz*, cXyz, cXyz, float);
+    void Cyl2HitPosAngleOffset(cXyz*, csXyz*, cXyz*, csXyz*, cXyz, cXyz, float);
+    void SphHitPosAngleOffset(cXyz*, csXyz*, cXyz*, csXyz*, cXyz, float);
+    void HitBufferUpdate(int*, cXyz*, int, csXyz*, cXyz*);
+    s32 searchJntHitPosAngleOffset(cXyz*, csXyz*, cXyz*, csXyz*);
+    
     J3DModel* getModel() { return mpModel; }
     
     /* 0x00 */ __jnt_hit_data_c* mpHitData;

include/d/d_kankyo.h

@@ -405,6 +405,7 @@ void dKy_Sound_init();
 void dKy_change_colpat(u8 param_0);
 u8 dKy_pship_existense_chk();
 void dKy_Itemgetcol_chg_move();
+void dKy_arrowcol_chg_on(cXyz*, int);
 void dKy_arrowcol_chg_move();
 void dKy_setLight_init();
 void GxXFog_set();

src/d/actor/d_a_arrow.cpp

@@ -368,8 +368,61 @@ void daArrow_c::ShieldReflect() {
 }
 
 /* 800D50A0-800D5388       .text check_water_in__9daArrow_cFv */
-void daArrow_c::check_water_in() {
-    /* Nonmatching */
+bool daArrow_c::check_water_in() {
+    u8 prev_field_0x699 = field_0x699;
+    field_0x699 = daPy_lk_c::setItemWaterEffect(this, field_0x699, 1);
+    if (prev_field_0x699 == 0 && field_0x699 == 1) {
+        f32 waterY;
+        fopAcM_getWaterY(&current.pos, &waterY);
+        
+        f32 deltaY = fabs(next.pos.y - current.pos.y);
+        f32 waterDist = fabs(waterY - current.pos.y);
+        cXyz waterHitPos;
+        if (deltaY < 1.0f) {
+            waterHitPos = current.pos;
+        } else {
+            f32 weight = waterDist / deltaY;
+            if (weight > 1.0f) {
+                weight = 1.0f;
+            }
+            waterHitPos = (next.pos * weight) + (current.pos * (1.0f - weight));
+        }
+        
+        mCurrProcFunc = &procWater;
+        fopAcM_SetParam(this, 4);
+        
+        if (mArrowType == TYPE_FIRE) {
+            mInWaterTimer = 1;
+            dComIfGp_particle_setToon(0x35A, &waterHitPos, NULL, NULL, 0xFF, NULL, -1, NULL, NULL, NULL);
+            if (field_0x6e4 == 0) {
+                dKy_arrowcol_chg_on(&current.pos, 0);
+            }
+        } else if (mArrowType == TYPE_ICE) {
+            mInWaterTimer = 300;
+            fopAcM_createChild(
+                PROC_ARROW_ICEEFF, fpcM_GetID(this), mArrowType,
+                &waterHitPos, current.roomNo, &current.angle, NULL, -1, NULL
+            );
+            if (field_0x6e4 == 0) {
+                dKy_arrowcol_chg_on(&current.pos, 1);
+            }
+        } else if (mArrowType == TYPE_LIGHT) {
+            dComIfGp_particle_setToon(0x2A1, &waterHitPos, NULL, NULL, 0xFF, NULL, -1, NULL, NULL, NULL);
+            fopAcM_seStartCurrent(this, JA_SE_OBJ_LIGHT_ARW_EFF, 0);
+            if (field_0x6e4 == 0) {
+                dKy_arrowcol_chg_on(&current.pos, 2);
+            }
+            mInWaterTimer = 1;
+        } else {
+            mInWaterTimer = 1;
+        }
+        
+        field_0x698 = 0;
+        
+        return TRUE;
+    } else {
+        return FALSE;
+    }
 }
 
 /* 800D5388-800D53AC       .text changeArrowMp__9daArrow_cFv */
@@ -379,8 +432,50 @@ BOOL daArrow_c::changeArrowMp() {
 }
 
 /* 800D53AC-800D553C       .text changeArrowType__9daArrow_cFv */
-void daArrow_c::changeArrowType() {
-    /* Nonmatching */
+daArrow_c* daArrow_c::changeArrowType() {
+    u8 origArrowType = mArrowType;
+    mBtkFrame = 0.0f;
+    
+    daArrow_c* ret = this;
+    
+    if (mArrowType == TYPE_NORMAL) {
+        if (dComIfGs_getMagic() < 1 || !(dComIfGs_getItem(0xC) == MAGIC_ARROW || dComIfGs_getItem(0xC) == LIGHT_ARROW)) {
+            mArrowType = TYPE_NORMAL;
+        } else {
+            mArrowType = TYPE_FIRE;
+        }
+    } else if (mArrowType == TYPE_FIRE) {
+        if (dComIfGs_getMagic() < 1 || !(dComIfGs_getItem(0xC) == MAGIC_ARROW || dComIfGs_getItem(0xC) == LIGHT_ARROW)) {
+            mArrowType = TYPE_NORMAL;
+        } else {
+            mArrowType = TYPE_ICE;
+        }
+    } else if (mArrowType == TYPE_ICE) {
+        if (dComIfGs_getMagic() < 2 || dComIfGs_getItem(0xC) != LIGHT_ARROW) {
+            mArrowType = TYPE_NORMAL;
+        } else {
+            mArrowType = TYPE_LIGHT;
+        }
+    } else if (mArrowType == TYPE_LIGHT) {
+        mArrowType = TYPE_NORMAL;
+    }
+    
+    if (mArrowType != origArrowType) {
+        m_keep_type = mArrowType;
+        daArrow_c* newNockedArrow = (daArrow_c*)fopAcM_fastCreate(PROC_ARROW, 0, &current.pos, current.roomNo, NULL, NULL, -1, NULL, NULL);
+        if (!newNockedArrow) {
+            mArrowType = origArrowType;
+            m_keep_type = origArrowType;
+            setDrawShapeMaterial();
+            ret = this;
+        } else {
+            mArrowType = origArrowType;
+            fopAcM_delete(this);
+            ret = newNockedArrow;
+        }
+    }
+    
+    return ret;
 }
 
 /* 800D553C-800D560C       .text changeArrowTypeNotReady__9daArrow_cFv */
@@ -453,7 +548,7 @@ void daArrow_c::setKeepMatrix() {
     } else {
         daPy_py_c* player = daPy_getPlayerActorClass();
         
-        mDoMtx_stack_c::transS(0.7f, -0.07f, -0.2f);
+        mDoMtx_stack_c::transS(7.6f, -0.8f, -0.5f);
         // This function takes three signed shorts, but one of the literals passed here is unsigned.
         // X rotation must be a float literal to force the compiler to pass an unsigned short.
         // Z rotation must be an int literal to pass a signed short as normal.
@@ -512,27 +607,410 @@ void daArrow_c::setStopActorMatrix() {
 
 /* 800D5A70-800D5B20       .text procWait__9daArrow_cFv */
 BOOL daArrow_c::procWait() {
-    /* Nonmatching */
+    speedF = 0.0f;
+    setKeepMatrix();
+    cMtx_copy(mpModel->getBaseTRMtx(), field_0x6b4);
+    field_0x6e6 = shape_angle;
+    
+    if (fopAcM_GetParam(this) == 1) {
+        if (!mbShotByZelda) {
+            arrowUseMp();
+            checkRestMp();
+        }
+        
+        mCurrProcFunc = &procMove;
+        arrowShooting();
+    }
+    
+    return TRUE;
 }
 
 /* 800D5B20-800D6BF4       .text procMove__9daArrow_cFv */
 BOOL daArrow_c::procMove() {
-    /* Nonmatching */
+    speedF = 100.0f;
+    current.pos += speed;
+    cXyz quarterStepPos = current.pos + speed*0.25f;
+    mLinChk.Set(&next.pos, &quarterStepPos, this);
+    field_0x6e6 = shape_angle;
+    
+    cMtx_copy(mpModel->getBaseTRMtx(), field_0x6b4);
+    field_0x67c.z += 0x889;
+    
+    s32 hitType = 0; // No hit
+    if (mCps.ChkAtHit()) {
+        cXyz temp12;
+        cXyz hitPos;
+        csXyz temp11;
+        if (mArrowType == TYPE_LIGHT && field_0x664 == 0 && mCps.ChkAtShieldHit() && fpcM_GetName(mCps.GetAtHitAc()) == PROC_PLAYER) {
+            mCps.GetAtHitAc();
+            hitPos = *mCps.GetAtHitPosP();
+            hitType = -1; // Reflected hit
+            field_0x664 = 1;
+            ShieldReflect();
+        } else {
+            fopAc_ac_c* hitActor;
+            BOOL hitWasBlocked;
+            s32 bHitActor = mbHitActor;
+            if (bHitActor) {
+                hitActor = field_0x6ec;
+                hitPos = mNearestHitPos;
+                hitWasBlocked = FALSE;
+            } else {
+                hitActor = mCps.GetAtHitAc();
+                hitPos = *mCps.GetAtHitPosP();
+                hitWasBlocked = mCps.ChkAtShieldHit();
+            }
+            
+            if (hitActor) {
+                JntHit_c* jntHit = fopAcM_GetJntHit(hitActor);
+                if (mArrowType == TYPE_LIGHT) {
+                    if (fpcM_GetName(mCps.GetAtHitAc()) == PROC_BGN
+                     || fpcM_GetName(mCps.GetAtHitAc()) == PROC_BGN2
+                     || fpcM_GetName(mCps.GetAtHitAc()) == PROC_BGN3) {
+                        // Hit Puppet Ganon.
+                        if (hitWasBlocked) {
+                            field_0x6a8 = hitPos;
+                            current.pos = hitPos - (speed * 0.25f);
+                            
+                            if (field_0x6e4 == 0) {
+                                dKy_arrowcol_chg_on(&current.pos, 2);
+                            }
+                            
+                            mCurrProcFunc = &procStop_BG;
+                            fopAcM_OnStatus(this, 0x4000);
+                            fopAcM_SetParam(this, 2);
+                            field_0x604 = 0x28;
+                            
+                            dComIfG_Bgsp()->i_GetTriPla(mLinChk);
+                            
+                            csXyz temp10;
+                            temp10.x = cM_atan2s(speed.y, speed.absXZ());
+                            temp10.y = cM_atan2s(speed.x, speed.z);
+                            temp10.z = 0;
+                            mDoMtx_stack_c::transS(current.pos);
+                            mDoMtx_stack_c::ZXYrotM(temp10.x, temp10.y, 0);
+                            cMtx_copy(mDoMtx_stack_c::get(), field_0x6b4);
+                            
+                            dComIfGp_particle_setToon(0x2A1, &field_0x6a8, &temp10, NULL, 0xFF, NULL, -1, NULL, NULL, NULL);
+                            fopAcM_seStartCurrent(this, JA_SE_OBJ_LIGHT_ARW_EFF, 0);
+                            fopAcM_delete(this);
+                        } else {
+                            hitType = 0; // No hit (pass through)
+                        }
+                    } else {
+                        hitType = 0; // No hit (pass through)
+                    }
+                } else if (hitWasBlocked) {
+                    hitType = 1; // Blocked hit
+                } else if (jntHit) {
+                    mHitJointIndex = jntHit->searchJntHitPosAngleOffset(&hitPos, &shape_angle, &temp12, &temp11);
+                    if (mHitJointIndex >= 0) {
+                        field_0x6e6 = temp11;
+                        field_0x618 = temp12;
+                        hitType = 2; // Hit a joint
+                    } else if (mHitJointIndex == -3) {
+                        fopAcM_delete(this);
+                        return TRUE;
+                    }
+                }
+            }
+        }
+    }
+    
+    if (hitType > 0) {
+        field_0x604 = 0x28;
+        fopAcM_OnStatus(this, 0x4000);
+        
+        if (mPtclFollowCb.mpEmitter) {
+            mPtclFollowCb.end();
+        }
+        
+        if (hitType == 1) { // Blocked hit
+            fopAcM_SetParam(this, 3);
+            mCurrProcFunc = &procReturn;
+            speed *= -0.1f;
+            speed.y += speed.absXZ();
+            current.pos = next.pos;
+            field_0x69c = 0x2C00;
+            mDoMtx_stack_c::transS(current.pos);
+            mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, 0);
+            mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
+            fopAcM_seStartCurrent(this, JA_SE_LK_ARROW_REBOUND, 0x20);
+        } else if (hitType == 2) { // Hit a joint
+            fpcM_SetParam(this, 2);
+            mCurrProcFunc = &procStop_Actor;
+            
+            if (mArrowType == TYPE_FIRE) {
+                fopAcM_seStartCurrent(this, JA_SE_OBJ_FIRE_ARW_EFF, 0);
+                field_0x698 = 0;
+            } else if (mArrowType == TYPE_ICE) {
+                fopAcM_seStartCurrent(this, JA_SE_OBJ_ICE_ARW_EFF, 0);
+            } else if (mArrowType == TYPE_LIGHT) {
+                fopAcM_seStartCurrent(this, JA_SE_OBJ_LIGHT_ARW_EFF, 0);
+                field_0x698 = 0;
+            }
+            
+            setStopActorMatrix();
+        }
+    } else if (dComIfG_Bgsp()->LineCross(&mLinChk)) {
+        cXyz* linEnd = &mLinChk.GetLinP()->GetEndP();
+        field_0x6a8 = *linEnd;
+        current.pos = *linEnd - (speed * 0.25f);
+        
+        if (!check_water_in()) {
+            s32 temp8;
+            switch (mArrowType) {
+            case TYPE_FIRE:
+                temp8 = 0;
+                break;
+            case TYPE_ICE:
+                temp8 = 1;
+                break;
+            case TYPE_LIGHT:
+                temp8 = 2;
+                break;
+            default:
+                temp8 = -1;
+            }
+            
+            if (temp8 >= 0 && field_0x6e4 == 0) {
+                dKy_arrowcol_chg_on(&current.pos, temp8);
+            }
+            
+            mCurrProcFunc = &procStop_BG;
+            fopAcM_OnStatus(this, 0x4000);
+            fopAcM_SetParam(this, 2);
+            field_0x604 = 0x28;
+            cM3dGPla* triPla = dComIfG_Bgsp()->i_GetTriPla(mLinChk);
+            
+            csXyz temp10;
+            temp10.x = cM_atan2s(-triPla->mNormal.y, -triPla->mNormal.absXZ());
+            temp10.y = cM_atan2s(-triPla->mNormal.x, -triPla->mNormal.z);
+            temp10.z = 0;
+            mDoMtx_stack_c::transS(current.pos);
+            mDoMtx_stack_c::ZXYrotM(temp10.x, temp10.y, 0);
+            cMtx_copy(mDoMtx_stack_c::get(), field_0x6b4);
+            
+            if (mArrowType == TYPE_FIRE) {
+                dComIfGp_particle_setToon(0x29A, &field_0x6a8, &temp10, NULL, 0xFF, NULL, -1, NULL, NULL, NULL);
+                dComIfGp_particle_setToon(0x29B, &field_0x6a8, &temp10, NULL, 0xFF, NULL, -1, NULL, NULL, NULL);
+                fopAcM_seStartCurrent(this, JA_SE_OBJ_FIRE_ARW_EFF, 0);
+                field_0x698 = 0;
+            } else if (mArrowType == TYPE_ICE) {
+                if (dComIfG_Bgsp()->ChkGrpInf(mLinChk, 0x200)) {
+                    fopAcM_create(PROC_Obj_Magmarock, NULL, &field_0x6a8, current.roomNo, NULL, NULL, -1, NULL);
+                } else {
+                    dComIfGp_particle_setToon(0x29E, &field_0x6a8, &temp10, NULL, 0xFF, NULL, -1, NULL, NULL, NULL);
+                    
+                    fopAcM_createChild(
+                        PROC_ARROW_ICEEFF, fpcM_GetID(this),
+                        mArrowType, &field_0x6a8,
+                        current.roomNo, &field_0x6e6, NULL, -1, NULL
+                    );
+                    
+                    fopAcM_seStartCurrent(this, JA_SE_OBJ_ICE_ARW_EFF, 0);
+                }
+            } else if (mArrowType == TYPE_LIGHT) {
+                dComIfGp_particle_setToon(0x2A1, &field_0x6a8, &temp10, NULL, 0xFF, NULL, -1, NULL, NULL, NULL);
+                fopAcM_seStartCurrent(this, JA_SE_OBJ_LIGHT_ARW_EFF, 0);
+                field_0x698 = 0;
+            }
+            
+            s32 attribCode = dComIfG_Bgsp()->GetAttributeCode(mLinChk);
+            s32 mtrlSndId = dComIfG_Bgsp()->GetMtrlSndId(mLinChk);
+            
+            if (mArrowType == TYPE_NORMAL && (attribCode == 0x3 || attribCode == 0x14 || attribCode == 0xF || attribCode == 0x9 || attribCode == 0x15)) {
+                mCurrProcFunc = &procReturn;
+                fopAcM_SetParam(this, 3);
+                speed *= -0.1f;
+                speed.y += speed.absXZ();
+                current.pos = next.pos;
+                field_0x69c = 0x2C00;
+                csXyz temp9;
+                cM3d_CalcVecZAngle(triPla->mNormal, &temp9);
+                
+                dComIfGp_particle_setToon(0xC, &field_0x6a8, &temp9, NULL, 0xFF, NULL, -1, NULL, NULL, NULL);
+                fopAcM_seStartCurrent(this, JA_SE_LK_ARROW_REBOUND, mtrlSndId);
+            } else {
+                fopAcM_seStartCurrent(this, JA_SE_LK_ARROW_HIT, mtrlSndId);
+            }
+        }
+    } else if (check_water_in()) {
+        // Do nothing.
+        // There was probably some code here that got commented out.
+    }
+    
+    if (mCurrProcFunc == &procWater) {
+        mDoMtx_stack_c::transS(current.pos);
+        mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, 0);
+        mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
+    } else {
+        if ((current.pos - field_0x6a8).abs() > 25000.0f) {
+            speed.y -= 2.0f;
+            if (speed.y < -100.0f) {
+                speed.y = -100.0f;
+            }
+            if (field_0x6a8.y > current.pos.y) {
+                fopAcM_delete(this);
+                return TRUE;
+            }
+        } else if ((current.pos - field_0x6a8).abs() > 20000.0f) {
+            field_0x6e4 = 1;
+        }
+        
+        createBlur();
+        
+        mDoMtx_stack_c::transS(current.pos);
+        mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, 0);
+        mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
+        
+        cXyz end = current.pos + speed*1.25f;
+        mCps.SetStartEnd(current.pos, end);
+        mCps.SetR(5.0f);
+        mCps.CalcAtVec();
+        
+        dComIfG_Ccsp()->Set(&mCps);
+        // Using the dComIfG_Ccsp inline here breaks the match.
+        // dComIfG_Ccsp()->SetMass(&mCps, 1);
+        g_dComIfG_gameInfo.play.mCcS.SetMass(&mCps, 1);
+    }
+    
+    return TRUE;
 }
 
 /* 800D6BF4-800D6E70       .text procReturn__9daArrow_cFv */
 BOOL daArrow_c::procReturn() {
-    /* Nonmatching */
+    speedF = 0.0f;
+    speed.y -= 2.0f;
+    current.pos += speed;
+    shape_angle.x += field_0x69c;
+    cXyz quarterStepPos = current.pos + speed*0.25f;
+    field_0x699 = daPy_lk_c::setItemWaterEffect(this, field_0x699, 1);
+    mLinChk.Set(&next.pos, &quarterStepPos, this);
+    setBlur();
+    
+    if (dComIfG_Bgsp()->LineCross(&mLinChk)) {
+        cM3dGPla* triPla = dComIfG_Bgsp()->i_GetTriPla(mLinChk);
+        f32 temp2 = speed.abs();
+        cXyz temp1;
+        C_VECReflect(&speed, &triPla->mNormal, &temp1);
+        speed.x = temp1.x*temp2*0.5f;
+        speed.y = temp1.y*temp2*0.5f;
+        speed.z = temp1.z*temp2*0.5f;
+        
+        s32 temp3 = -field_0x69c;
+        field_0x69c = (temp3 / 2);
+        triPla = dComIfG_Bgsp()->i_GetTriPla(mLinChk);
+        if (triPla->mNormal.y >= 0.5f) {
+            field_0x69a = 1;
+        }
+    } else if (field_0x69a && speed.y < 0.0f) {
+        fopAcM_delete(this);
+    }
+    
+    mDoMtx_stack_c::transS(current.pos);
+    mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, 0);
+    mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
+    
+    return TRUE;
 }
 
 /* 800D6E70-800D71F8       .text procStop_BG__9daArrow_cFv */
 BOOL daArrow_c::procStop_BG() {
-    /* Nonmatching */
+    speedF = 0.0f;
+    
+    if (!dComIfG_Bgsp()->ChkPolySafe(mLinChk)) {
+        fopAcM_delete(this);
+        return TRUE;
+    }
+    
+    BOOL temp2 = FALSE;
+    
+    if (field_0x604 > 0) {
+        field_0x604--;
+        f32 temp4 = (field_0x604*(1/40.0f)) * 1024.0f * (field_0x604*(1/40.0f)) * cM_ssin(field_0x604*0x52FB);
+        shape_angle.x = field_0x6e6.x + temp4;
+        shape_angle.y = field_0x6e6.y;
+        temp2 = TRUE;
+    } else if (field_0x600) {
+        fopAcM_delete(this);
+        return TRUE;
+    }
+    
+    setBlur();
+    
+    if (dComIfG_Bgsp()->ChkMoveBG(mLinChk)) {
+        dComIfG_Bgsp()->MoveBgTransPos(mLinChk, true, &field_0x6a8, &current.angle, &shape_angle);
+        temp2 = TRUE;
+    }
+    
+    if (temp2) {
+        f32 xCos = cM_scos(shape_angle.x);
+        current.pos.x = field_0x6a8.x - cM_ssin(shape_angle.y) * 50.0f * xCos;
+        current.pos.y = field_0x6a8.y + cM_ssin(shape_angle.x) * 50.0f;
+        current.pos.z = field_0x6a8.z - cM_scos(shape_angle.y) * 50.0f * xCos;
+        
+        mDoMtx_stack_c::transS(current.pos);
+        mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, 0);
+        mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
+    }
+    
+    if (mArrowType == TYPE_NORMAL) {
+        mSph.SetC(current.pos);
+        dComIfG_Ccsp()->Set(&mSph);
+        
+        if (field_0x6a0 == 0) {
+            field_0x600 = true;
+            field_0x698 = 0;
+        } else {
+            field_0x6a0--;
+            
+            if (field_0x6a0 < 60) {
+                // This matches but probably isn't what they actually wrote.
+                u32 signBit = ((u32)field_0x6a0)>>31;
+                if ((((field_0x6a0&1) ^ signBit) - signBit) == 0) {
+                    field_0x698 = 0;
+                } else {
+                    field_0x698 = 1;
+                }
+            } else {
+                field_0x698 = 1;
+            }
+        }
+        
+        if (mSph.ChkCoHit()) {
+            dComIfGp_getItemArrowNumCount(1);
+            fopAcM_createItemForSimpleDemo(&current.pos, ARROW_10, -1, NULL, NULL, 0.0f, 0.0f);
+            mDoAud_seStart(JA_SE_CONSUMP_ITEM_GET, NULL, 0, 0);
+            fopAcM_delete(this);
+            return TRUE;
+        }
+    }
+    
+    if (mbShotByZelda) {
+        field_0x600 = true;
+    }
+    
+    return TRUE;
 }
 
 /* 800D71F8-800D727C       .text procStop_Actor__9daArrow_cFv */
 BOOL daArrow_c::procStop_Actor() {
-    /* Nonmatching */
+    speedF = 0.0f;
+    if (field_0x600) {
+        fopAcM_delete(this);
+        return TRUE;
+    }
+    
+    setBlur();
+    
+    if (fopAcM_SearchByID(mHitActorProcID)) {
+        setStopActorMatrix();
+    } else {
+        field_0x600 = true;
+    }
+    
+    return TRUE;
 }
 
 /* 800D727C-800D72BC       .text procWater__9daArrow_cFv */
@@ -620,7 +1098,88 @@ BOOL daArrow_c::createInit() {
 
 /* 800D74FC-800D7820       .text _execute__9daArrow_cFv */
 BOOL daArrow_c::_execute() {
-    /* Nonmatching */
+    if (mbShotByZelda) {
+        if (field_0x664 == 0) {
+            if (daPy_getPlayerLinkActorClass()->checkPlayerGuard()) {
+                mCps.SetAtSpl((dCcG_At_Spl)0);
+                mCps.SetAtType(AT_TYPE_NORMAL_ARROW);
+            } else {
+                mCps.SetAtSpl((dCcG_At_Spl)0xB);
+                mCps.SetAtType(AT_TYPE_LIGHT_ARROW);
+            }
+        } else {
+            mCps.SetAtSpl((dCcG_At_Spl)0);
+            mCps.SetAtType(AT_TYPE_NORMAL_ARROW);
+        }
+    }
+    
+    if (field_0x608 != 0) {
+        field_0x608--;
+        s8 temp4 = 0;
+        daPy_py_c* player = daPy_getPlayerActorClass();
+        
+        cXyz offset;
+        offset.x = 0.0f;
+        offset.y = g_regHIO.mChild->mFloatRegs[8] + 45.0f;
+        offset.z = g_regHIO.mChild->mFloatRegs[9] + 30.0f;
+        mDoMtx_YrotS(*calc_mtx, player->shape_angle.y);
+        cXyz offsetOut;
+        MtxPosition(&offset, &offsetOut);
+        current.pos = player->current.pos + offsetOut;
+        
+        mDoMtx_stack_c::transS(current.pos);
+        mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, 0);
+        mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
+        
+        if (mpSparkleEmitter) {
+            if (field_0x608) {
+                f32 scale = field_0x608*2.0f;
+                if (scale > 7.0f) {
+                    scale = 7.0f;
+                }
+                mpSparkleEmitter->setGlobalTranslation(current.pos.x, current.pos.y, current.pos.z);
+                JGeometry::TVec3<f32> scaleVec;
+                scaleVec.x = scale;
+                scaleVec.y = scale;
+                scaleVec.z = scale;
+                mpSparkleEmitter->setGlobalParticleScale(scaleVec);
+            } else {
+                mpSparkleEmitter->becomeInvalidEmitter();
+                mpSparkleEmitter = NULL;
+                temp4 = 1;
+            }
+        }
+        if (temp4 == 0) {
+            return TRUE;
+        }
+    }
+    
+    if (field_0x602 == m_count) {
+        field_0x600 = true;
+    }
+    
+    if (mBtkFrame > 0.0f) {
+        mBtkFrame += 1.0f;
+        if (mBtkFrame >= mpBtk->getFrameMax()) {
+            mBtkFrame = 0.0f;
+        }
+    } else {
+        if (cM_rnd() < 0.02f) {
+            mBtkFrame += 1.0f;
+        }
+    }
+    
+    setLightEffect();
+    
+    if (mCurrProcFunc) {
+        (this->*mCurrProcFunc)();
+    }
+    
+    mAttentionInfo.mPosition = current.pos;
+    mEyePos = current.pos;
+    setRoomInfo();
+    
+    return TRUE;
 }
 
 /* 800D7820-800D7960       .text _draw__9daArrow_cFv */
@@ -745,3 +1304,6 @@ extern actor_process_profile_definition g_profile_ARROW = {
     /* Group        */ fopAc_ACTOR_e,
     /* CullType     */ fopAc_CULLBOX_CUSTOM_e,
 };
+
+// Needed for the .data section to match.
+static u8 dummy3[0x3C] = {};

src/d/actor/d_a_kytag06.cpp

@@ -74,11 +74,11 @@ static int daKytag06_Create(fopAc_ac_c* i_this) {
 }
 
 static actor_method_class l_daKytag06_Method = {
-    (process_method_func)daKytag06_Execute,
-    (process_method_func)daKytag06_Draw,
-    (process_method_func)daKytag06_IsDelete,
-    (process_method_func)daKytag06_Delete,
     (process_method_func)daKytag06_Create,
+    (process_method_func)daKytag06_Delete,
+    (process_method_func)daKytag06_Execute,
+    (process_method_func)daKytag06_IsDelete,
+    (process_method_func)daKytag06_Draw,
 };
 
 extern actor_process_profile_definition g_profile_KYTAG06 = {

src/d/actor/d_a_nh.cpp

@@ -334,8 +334,8 @@ BOOL daNh_c::searchPlayer() {
     f32 playerDistDelta = mPlayerDist - playerDist;
     mPlayerDist = playerDist;
     if (playerDelta.absXZ() > 0.001f && playerDist < 600.0f && playerDistDelta > l_HIO.prm.mMinFrightenSpeed) {
-        // Player is nearby and moving closer. The Forest Firefly becomes frightened and tries to head home.
-        setAction(&returnAction, NULL);
+        // Player is nearby and moving closer. The Forest Firefly becomes frightened and tries to escape.
+        setAction(&escapeAction, NULL);
         return TRUE;
     }
     
@@ -562,12 +562,12 @@ BOOL daNh_c::draw() {
     if (mat) {
         J3DTevBlock* tevBlock = mat->getTevBlock();
         if (tevBlock) {
-            GXColorS10* color = tevBlock->getTevColor(1);
+            GXColorS10* color = &tevBlock->getTevColor(1)->mColor;
             if (color) {
                 mGlowAlpha = ((color->r + color->g + color->b) / 3) >> 2;
             }
             
-            GXColor* kColor = tevBlock->getTevKColor(3);
+            GXColor* kColor = &tevBlock->getTevKColor(3)->mColor;
             if (kColor) {
                 kColor->a = mAlpha;
             }