d_a_alink work / bump dtk version (#2205)

32 files changed, 100 insertions, 81 deletions

diff --git a/include/JSystem/J3DGraphAnimator/J3DModelData.h b/include/JSystem/J3DGraphAnimator/J3DModelData.h
index 17557f4495..a2ac2d0f57 100644
--- a/include/JSystem/J3DGraphAnimator/J3DModelData.h
+++ b/include/JSystem/J3DGraphAnimator/J3DModelData.h
@@ -71,7 +71,7 @@ public:
     bool checkBBoardFlag() const { return mbHasBillboard == 1; }
     bool isLocked() { return mMaterialTable.isLocked(); }
     void entryTexMtxAnimator(J3DAnmTextureSRTKey* anm) { mMaterialTable.entryTexMtxAnimator(anm); }
-    void entryTevRegAnimator(J3DAnmTevRegKey* anm) { mMaterialTable.entryTevRegAnimator(anm); }
+    int entryTevRegAnimator(J3DAnmTevRegKey* anm) { return mMaterialTable.entryTevRegAnimator(anm); }
     void entryTexNoAnimator(J3DAnmTexPattern* anm) { mMaterialTable.entryTexNoAnimator(anm); }
     int removeTexNoAnimator(J3DAnmTexPattern* anm) {
         return mMaterialTable.removeTexNoAnimator(anm);
diff --git a/include/SSystem/SComponent/c_cc_d.h b/include/SSystem/SComponent/c_cc_d.h
index 48536ec566..eb5b37dfd8 100644
--- a/include/SSystem/SComponent/c_cc_d.h
+++ b/include/SSystem/SComponent/c_cc_d.h
@@ -348,6 +348,7 @@ public:
     void SetActor(void* ac) { mp_actor = (fopAc_ac_c*)ac; }
     cXyz* GetCCMoveP() { return &m_cc_move; }
     fpc_ProcID GetApid() const { return m_apid; }
+    u8 GetDmg() const { return m_dmg; }
 };  // Size = 0x1C
 
 STATIC_ASSERT(0x1C == sizeof(cCcD_Stts));
@@ -380,6 +381,7 @@ public:
     u32 MskRPrm(u32 mask) { return mRPrm & mask; }
     void OnSPrmBit(u32 flag) { mSPrm |= flag; }
     void OffSPrmBit(u32 flag) { mSPrm &= ~flag; }
+    u32 ChkSPrm(u32 prm) const { return MskSPrm(prm); }
 
     void Set(cCcD_SrcObjCommonBase const& src) { mSPrm = src.mSPrm; }
 };
@@ -517,6 +519,7 @@ public:
     cCcD_Obj* GetAtHitObj() { return mObjAt.GetHitObj(); }
     cCcD_Obj* GetTgHitObj() { return mObjTg.GetHitObj(); }
     cCcD_Obj* GetCoHitObj() { return mObjCo.GetHitObj(); }
+    u32 ChkAtSPrm(u32 prm) { return mObjAt.ChkSPrm(prm); }
 
 };  // Size = 0x40
 
diff --git a/include/d/actor/d_a_alink.h b/include/d/actor/d_a_alink.h
index 992a13f920..f8c00df8ef 100644
--- a/include/d/actor/d_a_alink.h
+++ b/include/d/actor/d_a_alink.h
@@ -145,7 +145,7 @@ public:
     /* 800D0B8C */ virtual ~daAlink_matAnm_c();
     /* 8009D90C */ virtual void calc(J3DMaterial*) const;
 
-    static void decMorfFrame() {}
+    static void decMorfFrame() { cLib_calcTimer<u8>(&m_morf_frame); }
     static void setMorfFrame(u8 i_frame) { m_morf_frame = i_frame; }
 
     static u8 m_morf_frame;
@@ -681,6 +681,7 @@ public:
         FTANM_UNK_9B = 0x9B,
         FTANM_UNK_9C = 0x9C,
         FTANM_UNK_9D = 0x9D,
+        FTANM_UNK_9E = 0x9E,
         FTANM_UNK_9F = 0x9F,
         FTANM_UNK_A0 = 0xA0,
         FTANM_UNK_A1 = 0xA1,
@@ -1774,12 +1775,12 @@ public:
     /* 800D72BC */ int setDamagePoint(int i_dmgAmount, int i_checkZoraMag, int i_setDmgTimer, int);
     /* 800D7478 */ void setDamagePointNormal(int);
     /* 800D74A4 */ void setLandDamagePoint(int);
-    /* 800D74F4 */ Vec* getDamageVec(dCcD_GObjInf*);
+    /* 800D74F4 */ cXyz* getDamageVec(dCcD_GObjInf*);
     /* 800D76C4 */ void setDashDamage();
     /* 800D7768 */ static BOOL checkIcePolygonDamage(cBgS_PolyInfo*);
     /* 800D77C8 */ BOOL checkMagicArmorNoDamage();
-    /* 800D7820 */ void checkPolyDamage();
-    /* 800D7A98 */ bool checkElecReturnDamage(dCcD_GObjInf&, fopAc_ac_c**);
+    /* 800D7820 */ int checkPolyDamage();
+    /* 800D7A98 */ BOOL checkElecReturnDamage(dCcD_GObjInf&, fopAc_ac_c**);
     /* 800D7B18 */ void damageTimerCount();
     /* 800D7BE8 */ bool checkHugeAttack(int) const;
     /* 800D7C14 */ bool checkLargeAttack(int) const;
@@ -1800,7 +1801,7 @@ public:
     /* 800DB418 */ int procCoElecDamage();
     /* 800DB5B0 */ int procStEscapeInit();
     /* 800DB610 */ int procStEscape();
-    /* 800DB6A4 */ int procDkCaughtInit(unsigned int);
+    /* 800DB6A4 */ int procDkCaughtInit(fpc_ProcID);
     /* 800DB860 */ int procDkCaught();
     /* 800DBC98 */ void setScreamWaitAnime();
     /* 800DBD1C */ int procScreamWaitInit();
@@ -3048,7 +3049,7 @@ public:
     virtual void onFrollCrashFlg(u8, int);
     virtual MtxP getModelJointMtx(u16);
     virtual MtxP getHeadMtx();
-    virtual bool setHookshotCarryOffset(unsigned int, cXyz const*);
+    virtual bool setHookshotCarryOffset(fpc_ProcID, cXyz const*);
     virtual BOOL checkCutJumpCancelTurn() const;
     virtual bool checkIronBallReturn() const;
     virtual bool checkIronBallGroundStop() const;
@@ -3137,8 +3138,8 @@ public:
     virtual BOOL checkCutJumpMode() const;
 
     u32 checkModeFlg(u32 pFlag) const { return mModeFlg & pFlag; }
-    bool checkSmallUpperGuardAnime() const { return checkUpperAnime(0x16); }
-    bool checkFmChainGrabAnime() const { return checkUpperAnime(0x62) || checkUpperAnime(0x2A0); }
+    BOOL checkSmallUpperGuardAnime() const { return checkUpperAnime(0x16); }
+    BOOL checkFmChainGrabAnime() const { return checkUpperAnime(0x62) || checkUpperAnime(0x2A0); }
     Z2WolfHowlMgr* i_getWolfHowlMgrP() { return &mZ2WolfHowlMgr; }
 
     // this might be a fake match, but helps fix usage in many functions
@@ -3199,8 +3200,9 @@ public:
     BOOL checkCopyRodReadyAnime() const { return mEquipItem == COPY_ROD && checkUpperAnime(0x54); }
     BOOL checkCanoeFishingWaitAnime() const { return checkUpperAnime(0x5D) || checkUpperAnime(0x260); }
     BOOL checkCopyRodControllAnime() const { return checkUpperAnime(0x202); }
+    BOOL checkWolfHeadDamageAnime() const { return checkUpperAnime(0x2A7); }
 
-    s16 checkWolfEyeUp() const { return mWolfEyeUp; }
+    int checkWolfEyeUp() const { return mWolfEyeUp; }
     void onModeFlg(u32 flag) { mModeFlg |= flag; }
     void offModeFlg(u32 flag) { mModeFlg &= ~flag; }
     bool swordButton() { return itemButtonCheck(8); }
@@ -3249,7 +3251,7 @@ public:
     const daAlink_AnmData* getAnmData(daAlink_ANM anmID) const { return &m_anmDataTable[anmID]; }
     const daAlink_FaceTexData* getFaceTexData(daAlink_FTANM i_anmID) const { return &m_faceTexDataTable[i_anmID]; }
 
-    BOOL checkReinRide() const { return mRideStatus == 1 || mRideStatus == 2; }
+    u32 checkReinRide() const { return mRideStatus == 1 || mRideStatus == 2; }
     int getGrassHowlEventActor() const { return field_0x3198; }
     MtxP getShieldMtx() const { return mShieldModel->getBaseTRMtx(); }
     MtxP getMagneBootsMtx() { return mMagneBootMtx; }
@@ -3582,8 +3584,8 @@ public:
     /* 0x02854 */ daPy_actorKeep_c mCargoCarryAcKeep;
     /* 0x0285C */ daPy_actorKeep_c field_0x285c;
     /* 0x02864 */ dMsgFlow_c mMsgFlow;
-    /* 0x028B0 */ unsigned int mShieldArrowIDs[16];
-    /* 0x028F0 */ unsigned int mMsgClassID;
+    /* 0x028B0 */ fpc_ProcID mShieldArrowIDs[16];
+    /* 0x028F0 */ fpc_ProcID mMsgClassID;
     /* 0x028F4 */ int mAtnActorID;
     /* 0x028F8 */ int field_0x28f8;
     /* 0x028FC */ int field_0x28fc;
@@ -3722,6 +3724,7 @@ public:
     union {
         s16 field_0x3008;
         s16 mHowlExitID;
+        s16 mIceFreezeTimer;
     } /* 0x03008 */ mProcVar0;
     union {
         s16 field_0x300a;
diff --git a/include/d/actor/d_a_b_bq.h b/include/d/actor/d_a_b_bq.h
index 0bbe9fe33e..6c3d46aaf6 100644
--- a/include/d/actor/d_a_b_bq.h
+++ b/include/d/actor/d_a_b_bq.h
@@ -39,8 +39,8 @@ public:
     /* 0x06D0 */ f32 mDistToPlayer;
     /* 0x06D4 */ s16 mTimers[5];
     /* 0x06DE */ s16 field_0x6de;
-    /* 0x06E0 */ unsigned int mTentacleIDs[2];
-    /* 0x06E8 */ unsigned int mMonkeyBombID;
+    /* 0x06E0 */ fpc_ProcID mTentacleIDs[2];
+    /* 0x06E8 */ fpc_ProcID mMonkeyBombID;
     /* 0x06EC */ u8 field_0x6ec;
     /* 0x06ED */ s8 mColpatType;
     /* 0x06F0 */ f32 mColpatBlend;
diff --git a/include/d/actor/d_a_canoe.h b/include/d/actor/d_a_canoe.h
index 044dddd85c..9081cce828 100644
--- a/include/d/actor/d_a_canoe.h
+++ b/include/d/actor/d_a_canoe.h
@@ -37,7 +37,7 @@ public:
     bool checkJumpRideFlg() { return mJumpRideFlg; }
     void incShapeOffsetY(f32 offset) { mShapeOffsetY += offset; }
     void incShapeAngleZ(s16 incZ) { shape_angle.z += incZ; }
-    void onRodID(unsigned int i_rodID) { mRodID = i_rodID; }
+    void onRodID(fpc_ProcID i_rodID) { mRodID = i_rodID; }
     void setWaterFallDownSe() { field_0x141c.startSound(Z2SE_AL_CANOE_FALL_DW, 0, -1); }
 
     void setPosAndAngle(cXyz const* i_pos, s16 i_angle) {
diff --git a/include/d/actor/d_a_horse.h b/include/d/actor/d_a_horse.h
index 83b3e78fc2..8e14f97df2 100644
--- a/include/d/actor/d_a_horse.h
+++ b/include/d/actor/d_a_horse.h
@@ -206,6 +206,8 @@ public:
     bool checkGetOff() const { return fabsf(speedF) < 3.0f; }
     bool checkEnemySearch() { return checkResetStateFlg0(ENEMY_SEARCH); }
     bool checkOriginalDemo() const { return field_0x16b8 == 3; }
+    s16 checkCowHit() const { return mCowHit; }
+    s16 getCowHitAngle() const { return mCowHitAngle; }
 
     void onTagJump(f32 param_0, f32 param_1, f32 param_2) {
         field_0x1768 = param_0;
diff --git a/include/d/actor/d_a_midna.h b/include/d/actor/d_a_midna.h
index 79d1ebeee2..8919fc302a 100644
--- a/include/d/actor/d_a_midna.h
+++ b/include/d/actor/d_a_midna.h
@@ -51,7 +51,7 @@ public:
     void onForcePanic();
     u32 checkForceNormalColor() const;
     u32 checkForceTiredColor() const;
-    bool checkMidnaTired();
+    static bool checkMidnaTired();
     void onNoServiceWait();
 
     /* 804BC3E0 */ void modelCallBack(int);
diff --git a/include/d/actor/d_a_myna.h b/include/d/actor/d_a_myna.h
index 9e8fd96983..176fab59d4 100644
--- a/include/d/actor/d_a_myna.h
+++ b/include/d/actor/d_a_myna.h
@@ -87,7 +87,7 @@ public:
     /* 80948644 */ void attack2_move();
     /* 809486F8 */ void attack2_talk_init();
     /* 80948734 */ void attack2_talk_move();
-    /* 809487EC */ void soldoutItem(unsigned int);
+    /* 809487EC */ void soldoutItem(fpc_ProcID);
     /* 80948828 */ bool fly_attack_move();
     /* 80948ADC */ bool fly_return_move();
     /* 80948DFC */ void fly_body_wave();
@@ -95,7 +95,7 @@ public:
     /* 80948FAC */ int chkEvent();
     /* 809490B8 */ int orderEvent();
     /* 80949128 */ void deleteItem(int);
-    /* 80949144 */ void deleteItem(unsigned int);
+    /* 80949144 */ void deleteItem(fpc_ProcID);
     /* 80949190 */ void initiate();
     /* 80949408 */ void setItemInfo();
     /* 80949544 */ void setRoomNo();
diff --git a/include/d/actor/d_a_player.h b/include/d/actor/d_a_player.h
index 7124160dca..3ed8224f10 100644
--- a/include/d/actor/d_a_player.h
+++ b/include/d/actor/d_a_player.h
@@ -255,7 +255,7 @@ public:
     };
 
     enum daPy_FLG1 {
-        FLG1_UNK_40000000 = 0x40000000,
+        FLG1_ICE_FREEZE = 0x40000000,
         FLG1_UNK_20000000 = 0x20000000,
         FLG1_UNK_10000000 = 0x10000000,
         FLG1_UNK_4000000 = 0x4000000,
@@ -387,6 +387,8 @@ public:
         ERFLG1_UNK_100000 = 0x100000,
         ERFLG1_UNK_40000 = 0x40000,
         ERFLG1_UNK_10000 = 0x10000,
+        ERFLG1_UNK_8000 = 0x8000,
+        ERFLG1_UNK_4000 = 0x4000,
         ERFLG1_UNK_2000 = 0x2000,
         ERFLG1_UNK_1000 = 0x1000,
         ERFLG1_UNK_800 = 0x800,
@@ -437,6 +439,7 @@ public:
     };
 
     enum daPy_RFLG1 {
+        RFLG1_UNK_400 = 0x400,
         RFLG1_UNK_200 = 0x200,
         RFLG1_UNK_100 = 0x100,
         RFLG1_UNK_80 = 0x80,
@@ -551,8 +554,8 @@ public:
     static void setPlayerDamage(int, int);
     static void setMidnaMotionNum(int);
     static void setMidnaFaceNum(int);
-    BOOL checkShieldGet();
-    BOOL checkSwordGet();
+    static BOOL checkShieldGet();
+    static BOOL checkSwordGet();
     void changeDemoParam2(s16);
     cXyz getHeadTopPos() const;
     BOOL checkThrowDamage() const { return checkNoResetFlg1(FLG1_THROW_DAMAGE); }
@@ -641,7 +644,7 @@ public:
     virtual void onFrollCrashFlg(u8, int);  // weak
     virtual MtxP getModelJointMtx(u16);
     virtual MtxP getHeadMtx();
-    virtual bool setHookshotCarryOffset(unsigned int, cXyz const*);
+    virtual bool setHookshotCarryOffset(fpc_ProcID, cXyz const*);
     virtual BOOL checkCutJumpCancelTurn() const { return FALSE; }
     virtual bool checkIronBallReturn() const;
     virtual bool checkIronBallGroundStop() const;
@@ -766,12 +769,13 @@ public:
     bool checkSceneChangeAreaStart() const { return checkNoResetFlg2(FLG2_SCN_CHG_START); }
     bool checkFrontRollCrash() const { return checkResetFlg0(RFLG0_FRONT_ROLL_CRASH); }
     bool checkWolfAttackReverse() const { return checkResetFlg1(RFLG1_WOLF_ATTACK_REVERSE); }
-    bool checkFreezeDamage() const { return checkNoResetFlg1(FLG1_UNK_40000000); }
+    bool checkFreezeDamage() const { return checkNoResetFlg1(FLG1_ICE_FREEZE); }
     bool checkWolfTagLockJumpReady() const { return checkResetFlg0(RFLG0_UNK_20000); }
     bool getGrabUpEnd() const { return checkResetFlg0(RFLG0_GRAB_UP_END); }
     bool getGrabPutStart() const { return checkResetFlg0(RFLG0_GRAB_PUT_START); }
     bool checkSwimUp() const { return checkNoResetFlg0(FLG0_SWIM_UP); }
     BOOL checkHorseZelda() const { return checkNoResetFlg2(FLG2_HORSE_ZELDA); }
+    BOOL checkSpecialHorseRide() { return checkNoResetFlg2(daPy_FLG2(FLG2_HORSE_ZELDA | FLG2_UNK_1000000 | FLG2_UNK_800000)); }
 
     void onBossRoomWait() { onEndResetFlg0(ERFLG0_BOSS_ROOM_WAIT); }
     void onBeeFollow() { onEndResetFlg0(ERFLG0_BEE_FOLLOW); }
@@ -852,10 +856,10 @@ public:
     cXyz* getRightHandPosP() { return &mRightHandPos; }
 
     u32 checkWolf() const { return checkNoResetFlg1(FLG1_IS_WOLF); }
-    BOOL checkEquipHeavyBoots() const { return checkNoResetFlg0(FLG0_EQUIP_HVY_BOOTS); }
-    BOOL checkMagneBootsOn() const { return checkNoResetFlg0(FLG0_MAGNE_BOOTS_ON); }
+    u32 checkEquipHeavyBoots() const { return checkNoResetFlg0(FLG0_EQUIP_HVY_BOOTS); }
+    u32 checkMagneBootsOn() const { return checkNoResetFlg0(FLG0_MAGNE_BOOTS_ON); }
     BOOL checkFastSwordCut() const { return checkNoResetFlg0(FLG0_UNK_80000); }
-    bool checkMidnaRide() const { return checkNoResetFlg0(FLG0_MIDNA_RIDE); }
+    u32 checkMidnaRide() const { return checkNoResetFlg0(FLG0_MIDNA_RIDE); }
     void onPlayerNoDraw() { onNoResetFlg0(FLG0_PLAYER_NO_DRAW); }
     void offPlayerNoDraw() { offNoResetFlg0(FLG0_PLAYER_NO_DRAW); }
     void onPushPullKeep() { onNoResetFlg0(FLG0_PUSH_PULL_KEEP); }
diff --git a/include/d/d_bg_s.h b/include/d/d_bg_s.h
index e34f5bf6c2..b8207d72d5 100644
--- a/include/d/d_bg_s.h
+++ b/include/d/d_bg_s.h
@@ -21,7 +21,7 @@ public:
     void Release();
 
     virtual ~cBgS_ChkElm() {}
-    virtual void Regist2(dBgW_Base*, unsigned int, void*);
+    virtual void Regist2(dBgW_Base*, fpc_ProcID, void*);
 
     bool ChkUsed() const { return m_used; }
 };  // Size: 0x14
@@ -35,7 +35,7 @@ public:
 
 public:
     cBgS() {}
-    bool Regist(dBgW_Base*, unsigned int, void*);
+    bool Regist(dBgW_Base*, fpc_ProcID, void*);
     int Release(dBgW_Base*);
     bool LineCross(cBgS_LinChk*);
     f32 GroundCross(cBgS_GndChk*);
diff --git a/include/d/d_bg_s_acch.h b/include/d/d_bg_s_acch.h
index 09f2eb2fd5..9b1adf9095 100644
--- a/include/d/d_bg_s_acch.h
+++ b/include/d/d_bg_s_acch.h
@@ -101,7 +101,7 @@ public:
     /* 80077178 */ f32 GetWallAllLowH_R();
     /* 800771E4 */ f32 GetSpeedY();
     /* 80077200 */ f32 GetWallAddY(Vec&);
-    /* 80077278 */ void SetNowActorInfo(int, void*, unsigned int);
+    /* 80077278 */ void SetNowActorInfo(int, void*, fpc_ProcID);
     /* 80077288 */ void SetWallPolyIndex(int, int);
     /* 800772E8 */ void CalcMovePosWork();
     /* 8007732C */ void CalcWallRR();
diff --git a/include/d/d_bg_w_base.h b/include/d/d_bg_w_base.h
index 3d7174c8a1..f1e924e519 100644
--- a/include/d/d_bg_w_base.h
+++ b/include/d/d_bg_w_base.h
@@ -4,6 +4,7 @@
 #include "SSystem/SComponent/c_bg_s_poly_info.h"
 #include "SSystem/SComponent/c_bg_w.h"
 #include "SSystem/SComponent/c_m3d_g_pla.h"
+#include "f_pc/f_pc_base.h"
 
 class cBgS_GndChk;
 class cBgS_LinChk;
diff --git a/include/d/d_camera.h b/include/d/d_camera.h
index 0b31947d99..79d334354a 100644
--- a/include/d/d_camera.h
+++ b/include/d/d_camera.h
@@ -363,7 +363,7 @@ public:
     /* 80181490 */ void onHorseDush();
     /* 80181500 */ void GetForceLockOnActor();
     /* 80181534 */ void ForceLockOn(fopAc_ac_c*);
-    /* 80181560 */ void ForceLockOff(unsigned int);
+    /* 80181560 */ void ForceLockOff(fpc_ProcID);
     /* 8018159C */ void ForceLockOff(fopAc_ac_c*);
     /* 80181E20 */ cXyz Up();
     /* 80181E64 */ cXyz Eye();
diff --git a/include/d/d_cc_d.h b/include/d/d_cc_d.h
index 6cfdc09d80..6ec77a91ea 100644
--- a/include/d/d_cc_d.h
+++ b/include/d/d_cc_d.h
@@ -116,12 +116,12 @@ public:
     /* 8008523C */ virtual ~dCcD_GStts() {}
     void ClrAt() { mAt = 0; }
     void ClrTg() { mTg = 0; }
-    void SetAtApid(unsigned int id) { mAtApid = id; }
-    void SetTgApid(unsigned int id) { mTgApid = id; }
+    void SetAtApid(fpc_ProcID id) { mAtApid = id; }
+    void SetTgApid(fpc_ProcID id) { mTgApid = id; }
     u8 GetRoomId() { return mRoomId; }
     void SetRoomId(int id) { mRoomId = id; }
-    unsigned int GetAtOldApid() { return mAtOldApid; }
-    unsigned int GetTgOldApid() { return mTgOldApid; }
+    fpc_ProcID GetAtOldApid() { return mAtOldApid; }
+    fpc_ProcID GetTgOldApid() { return mTgOldApid; }
     bool ChkNoActor() { return field_0x1C & 1;}
     bool ChkNoneActorPerfTblId() { return field_0x08 == 0xFFFF; }
     dCcG_At_Spl GetAtSpl() { return (dCcG_At_Spl)mAt; }
@@ -174,7 +174,7 @@ public:
     dCcD_GAtTgCoCommonBase() { ct(); }
     /* 8008364C */ void ClrActorInfo();
     /* 80083660 */ void ct();
-    /* 80083678 */ void SetHitApid(unsigned int);
+    /* 80083678 */ void SetHitApid(fpc_ProcID);
     /* 80083688 */ fopAc_ac_c* GetAc();
     /* 80083704 */ void Set(dCcD_SrcGAtTgCoCommonBase const&);
     /* 80083718 */ void SetEffCounterTimer();
@@ -359,9 +359,9 @@ public:
     dCcD_HitCallback GetCoHitCallback() { return mGObjCo.GetHitCallback(); }
     dCcD_HitCallback GetAtHitCallback() { return mGObjAt.GetHitCallback(); }
     dCcD_HitCallback GetTgHitCallback() { return mGObjTg.GetHitCallback(); }
-    void SetCoHitApid(unsigned int apid) { mGObjCo.SetHitApid(apid); }
-    void SetAtHitApid(unsigned int apid) { mGObjAt.SetHitApid(apid); }
-    void SetTgHitApid(unsigned int apid) { mGObjTg.SetHitApid(apid); }
+    void SetCoHitApid(fpc_ProcID apid) { mGObjCo.SetHitApid(apid); }
+    void SetAtHitApid(fpc_ProcID apid) { mGObjAt.SetHitApid(apid); }
+    void SetTgHitApid(fpc_ProcID apid) { mGObjTg.SetHitApid(apid); }
     void OnCoHitNoActor() { mGObjCo.OnRPrm(1); }
     void OffCoHitNoActor() { mGObjCo.OffRPrm(1); }
     void OnAtHitNoActor() { mGObjAt.OnRPrm(2); }
@@ -404,6 +404,7 @@ public:
     cXyz* GetTgHitPosP() { return mGObjTg.GetHitPosP(); }
     cXyz* GetTgRVecP() { return mGObjTg.GetRVecP(); }
     bool ChkTgHookshotThrough() { return mGObjTg.ChkSPrm(0x80); }
+    bool ChkTgShieldHit() { return mGObjTg.ChkRPrm(2); }
     
     static const Z2SoundID m_hitSeID[24];
 
diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h
index 7a19fa9dd5..276a4cfbe5 100644
--- a/include/d/d_com_inf_game.h
+++ b/include/d/d_com_inf_game.h
@@ -493,7 +493,7 @@ public:
     }
     void setPlayerStatus(int param_0, int i, u32 flag) { mPlayerStatus[param_0][i] |= flag; }
     void clearPlayerStatus(int param_0, int i, u32 flag) { mPlayerStatus[param_0][i] &= ~flag; }
-    bool checkPlayerStatus(int param_0, int i, u32 flag) { return flag & mPlayerStatus[param_0][i]; }
+    u32 checkPlayerStatus(int param_0, int i, u32 flag) { return flag & mPlayerStatus[param_0][i]; }
 
     int getPlayerCameraID(int i) { return mPlayerCameraID[i * 8]; }
     int getCameraPlayer1ID(int i) { return mCameraInfo[i].field_0x5; }
@@ -813,7 +813,7 @@ public:
     /* 0x1DDF8 */ u8 mFadeBrightness;
     /* 0x1DDF9 */ u8 mWorldDark;
     /* 0x1DDFA */ s8 field_0x1ddfa;
-    /* 0x1DDFB */ s8 field_0x1ddfb;
+    /* 0x1DDFB */ s8 mPolyDamageOff;
     /* 0x1DDFC */ s8 field_0x1ddfc;
     /* 0x1DE00 */ u32 field_0x1de00;
     /* 0x1DE04 */ u32 field_0x1de04;
@@ -1009,6 +1009,7 @@ s8 dComIfGs_BossLife_public_Get();
 u8 dComIfGs_checkGetInsectNum();
 u8 dComIfGs_getSelectMixItemNoArrowIndex(int i_selmixItemIdx);
 BOOL dComIfGs_isStageTbox(int i_stageNo, int i_no);
+s8 dComIfGs_PolyDamageOff_Check();
 
 inline void dComIfGs_init() {
     g_dComIfG_gameInfo.info.init();
@@ -1993,11 +1994,11 @@ inline void dComIfGp_init() {
     g_dComIfG_gameInfo.play.init();
 }
 
-inline bool dComIfGp_checkPlayerStatus0(int param_0, u32 flag) {
+inline u32 dComIfGp_checkPlayerStatus0(int param_0, u32 flag) {
     return g_dComIfG_gameInfo.play.checkPlayerStatus(param_0, 0, flag);
 }
 
-inline bool dComIfGp_checkPlayerStatus1(int param_0, u32 flag) {
+inline u32 dComIfGp_checkPlayerStatus1(int param_0, u32 flag) {
     return g_dComIfG_gameInfo.play.checkPlayerStatus(param_0, 1, flag);
 }
 
@@ -2005,7 +2006,7 @@ inline void dComIfGp_setItemLifeCount(float amount, u8 type) {
     g_dComIfG_gameInfo.play.setItemLifeCount(amount, type);
 }
 
-inline void dComIfGp_setItemRupeeCount(int amount) {
+inline void dComIfGp_setItemRupeeCount(s32 amount) {
     g_dComIfG_gameInfo.play.setItemRupeeCount(amount);
 }
 
@@ -3341,7 +3342,7 @@ inline void dComIfGp_event_setItemPartner(void* param_0) {
     g_dComIfG_gameInfo.play.getEvent().setPtI(param_0);
 }
 
-inline void dComIfGp_event_setItemPartnerId(unsigned int id) {
+inline void dComIfGp_event_setItemPartnerId(fpc_ProcID id) {
     g_dComIfG_gameInfo.play.getEvent().setPtI_Id(id);
 }
 
diff --git a/include/d/d_event.h b/include/d/d_event.h
index ecf410bc36..4f1c92504a 100644
--- a/include/d/d_event.h
+++ b/include/d/d_event.h
@@ -125,7 +125,7 @@ public:
     dStage_MapEvent_dt_c* getStageEventDt();
     void sceneChange(int exitId);
     u32 getPId(void*);
-    fopAc_ac_c* convPId(unsigned int);
+    fopAc_ac_c* convPId(fpc_ProcID);
     void* getStbDemoData(char* resName);
     static dStage_MapEvent_dt_c* searchMapEventData(u8 mapToolID, s32 roomNo);
     static dStage_MapEvent_dt_c* searchMapEventData(u8 mapToolID);
@@ -134,7 +134,7 @@ public:
     void setPt2(void* ptr);
     void setPtT(void* ptr);
     void setPtI(void* ptr);
-    void setPtI_Id(unsigned int id);
+    void setPtI_Id(fpc_ProcID id);
     void setPtD(void* ptr);
     void setGtItm(u8 itemNo);
 
@@ -155,7 +155,7 @@ public:
     void setCullRate(f32 f) { mCullRate = f; }
     BOOL chkTalkXY() { return field_0xed == 1 || field_0xed == 2; }
 
-    bool isOrderOK() { return mEventStatus == 0 || mEventStatus == 2; }
+    BOOL isOrderOK() { return mEventStatus == 0 || mEventStatus == 2; }
     fopAc_ac_c* getPt1() { return convPId(mPt1); }
     fopAc_ac_c* getPt2() { return convPId(mPt2); }
     fopAc_ac_c* getPtT() { return convPId(mPtT); }
diff --git a/include/d/d_gameover.h b/include/d/d_gameover.h
index e1eae61b9e..46ab16304c 100644
--- a/include/d/d_gameover.h
+++ b/include/d/d_gameover.h
@@ -81,9 +81,9 @@ public:
 };  // Size: 0x11C
 
 s32 d_GameOver_Create(u8 param_0);
-bool d_GameOver_Delete(unsigned int& i_id);
+bool d_GameOver_Delete(fpc_ProcID& i_id);
 
-inline s32 d_GameOver_CheckDelete(unsigned int& id) {
+inline s32 d_GameOver_CheckDelete(fpc_ProcID& id) {
     if (id != UINT32_MAX) {
         dGameover_c* gameover = (dGameover_c*)fopMsgM_SearchByID(id);
 
@@ -97,7 +97,7 @@ inline s32 d_GameOver_CheckDelete(unsigned int& id) {
     return 0;
 }
 
-inline s32 d_GameOver_animeStart(unsigned int& id) {
+inline s32 d_GameOver_animeStart(fpc_ProcID& id) {
     if (id != UINT32_MAX) {
         dGameover_c* gameover = (dGameover_c*)fopMsgM_SearchByID(id);
 
diff --git a/include/d/d_kankyo.h b/include/d/d_kankyo.h
index 21cd96a26e..21cdd5abd4 100644
--- a/include/d/d_kankyo.h
+++ b/include/d/d_kankyo.h
@@ -4,6 +4,7 @@
 #include "JSystem/J3DGraphBase/J3DStruct.h"
 #include "d/d_kankyo_wether.h"
 #include "m_Do/m_Do_ext.h"
+#include "f_pc/f_pc_base.h"
 
 class JPABaseEmitter;
 class cBgS_PolyInfo;
@@ -30,7 +31,7 @@ void dKy_GxFog_set();
 static void GxFog_set();
 static void GxXFog_set();
 u8 dKy_pol_argument_get(cBgS_PolyInfo const* i_poly);
-void dKy_Sound_set(cXyz i_pos, int param_1, unsigned int i_actorID, int param_3);
+void dKy_Sound_set(cXyz i_pos, int param_1, fpc_ProcID i_actorID, int param_3);
 void dKy_bg_MAxx_proc(void* param_0);
 void dKy_change_colpat(u8 colpat);
 void dKy_BossLight_set(cXyz* param_0, _GXColor* param_1, f32 param_2, u8 param_3);
diff --git a/include/d/d_msg_object.h b/include/d/d_msg_object.h
index bd4f077c5e..4b413d2519 100644
--- a/include/d/d_msg_object.h
+++ b/include/d/d_msg_object.h
@@ -118,7 +118,7 @@ public:
     /* 802380F4 */ static bool getString(u32, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*,
                                          char*, char*, char*, s16*);
     /* 80238174 */ static void* getMsgDtPtr();
-    /* 80238188 */ static void setProcessID(unsigned int);
+    /* 80238188 */ static void setProcessID(fpc_ProcID);
     /* 8023819C */ static msg_class* getActor();
     /* 802381C0 */ static fopAc_ac_c* getpTalkActor();
     /* 802381D4 */ static int getIdx();
@@ -181,7 +181,7 @@ public:
     void onCameraCancelFlagLocal() { mCameraCancelFlag = true; }
     void offCameraCancelFlagLocal() { mCameraCancelFlag = false; }
     void onKillMessageFlagLocal() { mKillMessageFlag = true; }
-    void setProcessIDLocal(unsigned int id) { mProcessID = id; }
+    void setProcessIDLocal(fpc_ProcID id) { mProcessID = id; }
     void setPortalMessageIDLocal(u16 msgID) { mPortalMessageID = msgID; }
     void setInsectItemNoLocal(u8 itemNo) { mInsectItemNo = itemNo; }
     void setLetterNameIDLocal(u16 nameID) { mLetterNameID = nameID; }
diff --git a/include/d/d_stage.h b/include/d/d_stage.h
index 5f66ac7032..45b8898841 100644
--- a/include/d/d_stage.h
+++ b/include/d/d_stage.h
@@ -833,7 +833,7 @@ public:
     static void onNoChangeRoom() { mNoChangeRoom = true; }
     static void setProcID(u32 id) { mProcID = id; }
     static u32 getProcID() { return mProcID; }
-    static void setStatusProcID(int i_roomNo, unsigned int i_id) { mStatus[i_roomNo].mProcID = i_id; }
+    static void setStatusProcID(int i_roomNo, fpc_ProcID i_id) { mStatus[i_roomNo].mProcID = i_id; }
     static int getStatusProcID(int i_roomNo) { return mStatus[i_roomNo].mProcID; }
     static void setRegionNo(int i_roomNo, u8 i_regionNo) { mStatus[i_roomNo].mRegionNo = i_regionNo; }
     static void setZoneCount(int i_roomNo, int count) { mStatus[i_roomNo].mZoneCount = count; }
diff --git a/include/f_op/f_op_actor.h b/include/f_op/f_op_actor.h
index dd76d7f88e..07feb9b429 100644
--- a/include/f_op/f_op_actor.h
+++ b/include/f_op/f_op_actor.h
@@ -125,7 +125,7 @@ public:
     void beforeProc();
     void onCondition(u16);
     void offCondition(u16);
-    bool checkCommandCatch();
+    BOOL checkCommandCatch();
     BOOL checkCommandDoor();
     BOOL checkCommandDemoAccrpt() { return mCommand == dEvtCmd_INDEMO_e; }
 
diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h
index 1103ed83fa..fcf43fa269 100644
--- a/include/f_op/f_op_actor_mng.h
+++ b/include/f_op/f_op_actor_mng.h
@@ -487,11 +487,11 @@ void* fopAcM_fastCreate(const char* p_actorName, u32 parameter, const cXyz* pAct
                         const csXyz* p_angle, const cXyz* p_scale, createFunc p_createFunc,
                         void* p_createFuncData);
 
-s32 fopAcM_createChild(s16 procName, unsigned int parentPId, u32 parameters, const cXyz* p_pos,
+s32 fopAcM_createChild(s16 procName, fpc_ProcID parentPId, u32 parameters, const cXyz* p_pos,
                        int roomNo, const csXyz* p_angle, const cXyz* p_scale, s8 subType,
                        createFunc p_createFunc);
 
-s32 fopAcM_createChildFromOffset(s16 procName, unsigned int parentProcID, u32 actorParams,
+s32 fopAcM_createChildFromOffset(s16 procName, fpc_ProcID parentProcID, u32 actorParams,
                                  const cXyz* p_pos, int roomNo, const csXyz* p_angle,
                                  const cXyz* p_scale, s8 subType, createFunc p_createFunc);
 
diff --git a/include/f_op/f_op_msg_mng.h b/include/f_op/f_op_msg_mng.h
index 8e41c92f4e..e0df017a9b 100644
--- a/include/f_op/f_op_msg_mng.h
+++ b/include/f_op/f_op_msg_mng.h
@@ -41,14 +41,14 @@ s32 fopMsgM_create(s16 param_0, fopAc_ac_c* param_1, cXyz* param_2, u32* param_3
                    fopMsgCreateFunc createFunc);
 void fopMsgM_Delete(void* process);
 fopMsg_prm_class* fopMsgM_GetAppend(void* msg);
-void fopMsgM_setMessageID(unsigned int);
+void fopMsgM_setMessageID(fpc_ProcID);
 void fopMsgM_destroyExpHeap(JKRExpHeap*);
 f32 fopMsgM_valueIncrease(int param_0, int param_1, u8 param_2);
 s32 fopMsgM_setStageLayer(void*);
 int fopMsgM_messageSet(u32 i_msgIdx, fopAc_ac_c* i_actorP, u32 param_2);
 int fopMsgM_messageSet(u32 param_0, u32 param_1);
 int fopMsgM_messageSetDemo(u32 param_0);
-msg_class* fopMsgM_SearchByID(unsigned int param_0);
+msg_class* fopMsgM_SearchByID(fpc_ProcID param_0);
 char* fopMsgM_messageGet(char* msg, u32 string_id);
 s32 fop_Timer_create(s16 param_0, u8 param_1, u32 param_2, u8 param_3, u8 param_4, f32 param_5,
                      f32 param_6, f32 param_7, f32 param_8, fopMsgCreateFunc createFunc);
diff --git a/include/f_op/f_op_overlap_mng.h b/include/f_op/f_op_overlap_mng.h
index ddc709c0f3..12c2503190 100644
--- a/include/f_op/f_op_overlap_mng.h
+++ b/include/f_op/f_op_overlap_mng.h
@@ -10,7 +10,7 @@ int fopOvlpM_SceneIsStart();
 void fopOvlpM_Management();
 int fopOvlpM_IsOutReq(overlap_task_class* i_this);
 void fopOvlpM_Done(overlap_task_class* i_this);
-void fopOvlpM_ToldAboutID(unsigned int param_1);
+void fopOvlpM_ToldAboutID(fpc_ProcID param_1);
 int fopOvlpM_IsPeek();
 int fopOvlpM_IsDone();
 int fopOvlpM_IsDoingReq();
@@ -19,4 +19,4 @@ request_base_class* fopOvlpM_Request(s16 param_1, u16 param_2);
 int fopOvlpM_Cancel();
 void fopOvlpM_Init();
 
-#endif
\ No newline at end of file
+#endif
diff --git a/include/f_op/f_op_scene_mng.h b/include/f_op/f_op_scene_mng.h
index 6be68ae1e7..55cb5579a5 100644
--- a/include/f_op/f_op_scene_mng.h
+++ b/include/f_op/f_op_scene_mng.h
@@ -6,9 +6,9 @@
 
 typedef struct base_process_class base_process_class;
 
-scene_class* fopScnM_SearchByID(unsigned int id);
+scene_class* fopScnM_SearchByID(fpc_ProcID id);
 int fopScnM_ChangeReq(scene_class*, s16, s16, u16);
-unsigned int fopScnM_DeleteReq(scene_class*);
+fpc_ProcID fopScnM_DeleteReq(scene_class*);
 int fopScnM_CreateReq(s16, s16, u16, u32);
 u32 fopScnM_ReRequest(s16, u32);
 void fopScnM_Management(void);
diff --git a/include/f_op/f_op_scene_req.h b/include/f_op/f_op_scene_req.h
index e83310a90e..a3c35934f9 100644
--- a/include/f_op/f_op_scene_req.h
+++ b/include/f_op/f_op_scene_req.h
@@ -20,7 +20,7 @@ public:
 
 // cPhs__Step fopScnRq_phase_ClearOverlap(scene_request_class* param_1);
 s32 fopScnRq_Request(int, scene_class*, s16, void*, s16, u16);
-s32 fopScnRq_ReRequest(unsigned int, s16, void*);
+s32 fopScnRq_ReRequest(fpc_ProcID, s16, void*);
 void fopScnRq_Handler(void);
 
-#endif
\ No newline at end of file
+#endif
diff --git a/include/f_pc/f_pc_create_req.h b/include/f_pc/f_pc_create_req.h
index f357aeef1f..743bf91252 100644
--- a/include/f_pc/f_pc_create_req.h
+++ b/include/f_pc/f_pc_create_req.h
@@ -6,6 +6,7 @@
 #include "f_pc/f_pc_create_tag.h"
 #include "f_pc/f_pc_method.h"
 #include "f_pc/f_pc_method_tag.h"
+#include "f_pc/f_pc_base.h"
 
 typedef struct base_process_class base_process_class;
 typedef struct layer_class layer_class;
@@ -28,8 +29,8 @@ typedef struct create_request {
     layer_class* mpLayer;
 } create_request;  // Size: 0x48
 
-bool fpcCtRq_isCreatingByID(create_tag* pTag, unsigned int* pId);
-BOOL fpcCtRq_IsCreatingByID(unsigned int id);
+bool fpcCtRq_isCreatingByID(create_tag* pTag, fpc_ProcID* pId);
+BOOL fpcCtRq_IsCreatingByID(fpc_ProcID id);
 void fpcCtRq_CreateQTo(create_request* pReq);
 void fpcCtRq_ToCreateQ(create_request* pReq);
 BOOL fpcCtRq_Delete(create_request* pReq);
diff --git a/include/f_pc/f_pc_creator.h b/include/f_pc/f_pc_creator.h
index 582abf5f39..b37a2ce88a 100644
--- a/include/f_pc/f_pc_creator.h
+++ b/include/f_pc/f_pc_creator.h
@@ -2,11 +2,11 @@
 #ifndef F_PC_CREATOR_H_
 #define F_PC_CREATOR_H_
 
-#include "dolphin/types.h"
+#include "f_pc/f_pc_base.h"
 
 typedef struct base_process_class base_process_class;
 
-BOOL fpcCt_IsCreatingByID(unsigned int id);
+BOOL fpcCt_IsCreatingByID(fpc_ProcID id);
 s32 fpcCt_IsDoing(base_process_class* pProc);
 BOOL fpcCt_Abort(base_process_class* pProc);
 void fpcCt_Handler(void);
diff --git a/include/f_pc/f_pc_executor.h b/include/f_pc/f_pc_executor.h
index 6c15d16378..53a19b986f 100644
--- a/include/f_pc/f_pc_executor.h
+++ b/include/f_pc/f_pc_executor.h
@@ -4,12 +4,13 @@
 
 #include "f_pc/f_pc_layer_iter.h"
 #include "f_pc/f_pc_line_iter.h"
+#include "f_pc/f_pc_base.h"
 
 typedef struct base_process_class base_process_class;
 
 base_process_class* fpcEx_Search(fpcLyIt_JudgeFunc pFunc, void* pUserData);
-base_process_class* fpcEx_SearchByID(unsigned int id);
-BOOL fpcEx_IsExist(unsigned int id);
+base_process_class* fpcEx_SearchByID(fpc_ProcID id);
+BOOL fpcEx_IsExist(fpc_ProcID id);
 s32 fpcEx_ToLineQ(base_process_class* pProc);
 s32 fpcEx_ExecuteQTo(base_process_class* pProc);
 s32 fpcEx_Execute(base_process_class* pProc);
diff --git a/include/f_pc/f_pc_layer.h b/include/f_pc/f_pc_layer.h
index 4f7e0046b7..3930dfb49f 100644
--- a/include/f_pc/f_pc_layer.h
+++ b/include/f_pc/f_pc_layer.h
@@ -5,7 +5,7 @@
 #include "SSystem/SComponent/c_list.h"
 #include "SSystem/SComponent/c_node.h"
 #include "SSystem/SComponent/c_tree.h"
-#include "dolphin/types.h"
+#include "f_pc/f_pc_base.h"
 
 typedef struct create_tag_class create_tag_class;
 typedef struct process_method_tag_class process_method_tag_class;
@@ -26,8 +26,8 @@ typedef struct layer_class {
 void fpcLy_SetCurrentLayer(layer_class* pLayer);
 layer_class* fpcLy_CurrentLayer(void);
 layer_class* fpcLy_RootLayer(void);
-layer_class* fpcLy_Layer(unsigned int id);
-layer_class* fpcLy_Search(unsigned int id);
+layer_class* fpcLy_Layer(fpc_ProcID id);
+layer_class* fpcLy_Search(fpc_ProcID id);
 void fpcLy_Regist(layer_class* pLayer);
 
 void fpcLy_CreatedMesg(layer_class* pLayer);
diff --git a/include/f_pc/f_pc_manager.h b/include/f_pc/f_pc_manager.h
index e808099465..57895a485f 100644
--- a/include/f_pc/f_pc_manager.h
+++ b/include/f_pc/f_pc_manager.h
@@ -63,7 +63,7 @@ inline void* fpcM_GetAppend(const void* proc) {
     return ((base_process_class*)proc)->mpUserData;
 }
 
-inline BOOL fpcM_IsExecuting(unsigned int id) {
+inline BOOL fpcM_IsExecuting(fpc_ProcID id) {
     return fpcEx_IsExist(id);
 }
 
@@ -83,7 +83,7 @@ void fpcM_Draw(void* pProc);
 s32 fpcM_DrawIterater(fpcM_DrawIteraterFunc pFunc);
 s32 fpcM_Execute(void* pProc);
 s32 fpcM_Delete(void* pProc);
-BOOL fpcM_IsCreating(unsigned int pID);
+BOOL fpcM_IsCreating(fpc_ProcID pID);
 void fpcM_Management(fpcM_ManagementFunc pFunc1, fpcM_ManagementFunc pFunc2);
 void fpcM_Init();
 base_process_class* fpcM_FastCreate(s16 pProcTypeID, FastCreateReqFunc param_2, void* param_3,
@@ -91,6 +91,6 @@ base_process_class* fpcM_FastCreate(s16 pProcTypeID, FastCreateReqFunc param_2,
 s32 fpcM_IsPause(void* pProc, u8 param_2);
 void fpcM_PauseEnable(void* pProc, u8 param_2);
 void fpcM_PauseDisable(void* pProc, u8 param_2);
-void* fpcM_JudgeInLayer(unsigned int pLayerID, fpcCtIt_JudgeFunc pFunc, void* pUserData);
+void* fpcM_JudgeInLayer(fpc_ProcID pLayerID, fpcCtIt_JudgeFunc pFunc, void* pUserData);
 
 #endif
diff --git a/include/f_pc/f_pc_node_req.h b/include/f_pc/f_pc_node_req.h
index a99c22d028..bc8f13327f 100644
--- a/include/f_pc/f_pc_node_req.h
+++ b/include/f_pc/f_pc_node_req.h
@@ -4,6 +4,7 @@
 #include "SSystem/SComponent/c_phase.h"
 #include "f_pc/f_pc_method.h"
 #include "f_pc/f_pc_method_tag.h"
+#include "f_pc/f_pc_base.h"
 
 typedef struct layer_class layer_class;
 typedef struct process_node_class process_node_class;
@@ -64,7 +65,7 @@ node_create_request* fpcNdRq_CreateNode(u32 pRequestSize, s16 param_2, void* par
 node_create_request*
 fpcNdRq_Request(u32 param_1, int param_2, process_node_class* param_3, s16 param_4,
                 void* param_5, node_create_request_method_class* pNodeCreateRequestMethodClass);
-s32 fpcNdRq_ReChangeNode(unsigned int pRequestId, s16 param_2, void* param_3);
-s32 fpcNdRq_ReRequest(unsigned int pRequestId, s16 param_2, void* param_3);
+s32 fpcNdRq_ReChangeNode(fpc_ProcID pRequestId, s16 param_2, void* param_3);
+s32 fpcNdRq_ReRequest(fpc_ProcID pRequestId, s16 param_2, void* param_3);
 
-#endif
\ No newline at end of file
+#endif