d_a_alink work / bump dtk version (#2205)

31 files changed, 1234 insertions, 589 deletions

diff --git a/src/d/actor/d_a_alink_damage.inc b/src/d/actor/d_a_alink_damage.inc
index cf7bacb6a3..fdf9e1160e 100644
--- a/src/d/actor/d_a_alink_damage.inc
+++ b/src/d/actor/d_a_alink_damage.inc
@@ -3,6 +3,8 @@
  * Player Damage action handling
  */
 
+#include "d/actor/d_a_alink.h"
+
 /* 800D6D94-800D6DA4 0D16D4 0010+00 0/0 0/0 2/2 .text            getFreezeR__9daAlink_cCFv */
 s16 daAlink_c::getFreezeR() const {
     return daAlinkHIO_damage_c0::m.mFreezeR;
@@ -154,25 +156,24 @@ f32 daAlink_c::damageMagnification(int i_checkZoraMag, int param_1) {
     if (param_1 == 0 && checkNoResetFlg3(FLG3_UNK_40000000) &&
         !checkEndResetFlg2(ERFLG2_UNK_40))
     {
-        base_mag = 1.5f; /* 1.5 */
+        base_mag = 1.5f;
     } else {
-        base_mag = 1.0f; /* 1.0 */
+        base_mag = 1.0f;
     }
 
     if (checkWolf() && !checkCargoCarry() && param_1 == 0) {
-        return /* 2.0 */ 2.0f * base_mag;
+        return 2.0f * base_mag;
     }
 
     if (checkZoraWearAbility() && i_checkZoraMag) {
-        return /* 10.0 */ 10.0f * base_mag;
+        return 10.0f * base_mag;
     }
 
     return base_mag;
 }
 
 /* 800D72BC-800D7478 0D1BFC 01BC+00 6/6 1/1 0/0 .text            setDamagePoint__9daAlink_cFiiii */
-// regalloc and literals
-#ifdef NONMATCHING
+// NONMATCHING - regalloc
 int daAlink_c::setDamagePoint(int i_dmgAmount, int i_checkZoraMag, int i_setDmgTimer, int param_3) {
     if (i_dmgAmount <= 0) {
         dComIfGp_setItemLifeCount(-i_dmgAmount, 0);
@@ -195,7 +196,7 @@ int daAlink_c::setDamagePoint(int i_dmgAmount, int i_checkZoraMag, int i_setDmgT
         dComIfGp_setItemLifeCount(-magnified_dmg, 0);
     }
 
-    onResetFlg1(0x400);
+    onResetFlg1(RFLG1_UNK_400);
     mSwordUpTimer = 0;
 
     if (i_setDmgTimer) {
@@ -204,14 +205,8 @@ int daAlink_c::setDamagePoint(int i_dmgAmount, int i_checkZoraMag, int i_setDmgT
     }
 
     field_0x3006 = 0;
-
     return 0;
 }
-#else
-int daAlink_c::setDamagePoint(int param_0, int param_1, int param_2, int param_3) {
-    // NONMATCHING
-}
-#endif
 
 /* 800D7478-800D74A4 0D1DB8 002C+00 6/6 0/0 0/0 .text            setDamagePointNormal__9daAlink_cFi
  */
@@ -228,8 +223,36 @@ void daAlink_c::setLandDamagePoint(int i_dmgAmount) {
 
 /* 800D74F4-800D76C4 0D1E34 01D0+00 11/11 0/0 0/0 .text getDamageVec__9daAlink_cFP12dCcD_GObjInf
  */
-Vec* daAlink_c::getDamageVec(dCcD_GObjInf* param_0) {
-    // NONMATCHING
+cXyz* daAlink_c::getDamageVec(dCcD_GObjInf* i_hitObj) {
+    cXyz* vec = i_hitObj->GetTgRVecP();
+    cXyz sp40;
+
+    f32 var_f31 = vec->abs2XZ();
+
+    if (checkResetFlg1(RFLG1_UNK_2)) {
+        sp40.set(cM_ssin(shape_angle.y) * -10.0f, 0.0f, cM_scos(shape_angle.y) * -10.0f);
+        i_hitObj->SetTgRVec(sp40);
+    } else if (var_f31 < 0.1f) {
+        if (i_hitObj->GetTgHitAc() != NULL) {
+            sp40 = current.pos - i_hitObj->GetTgHitAc()->current.pos;
+        } else {
+            sp40 = current.pos - *i_hitObj->GetTgHitPosP();
+        }
+
+        var_f31 = sp40.abs2();
+        if (var_f31 < 0.1f) {
+            sp40.x = cM_ssin(shape_angle.y) * -10.0f;
+            sp40.y = 0.0f;
+            sp40.z = cM_scos(shape_angle.y) * -10.0f;
+        } else {
+            sp40 *= 10.0f / JMAFastSqrt(var_f31);
+        }
+
+        i_hitObj->SetTgRVec(sp40);
+    }
+
+    multVecMagneBootInvMtx(vec);
+    return vec;
 }
 
 /* 800D76C4-800D7768 0D2004 00A4+00 1/1 0/0 0/0 .text            setDashDamage__9daAlink_cFv */
@@ -258,13 +281,64 @@ BOOL daAlink_c::checkMagicArmorNoDamage() {
 }
 
 /* 800D7820-800D7A98 0D2160 0278+00 1/1 0/0 0/0 .text            checkPolyDamage__9daAlink_cFv */
-void daAlink_c::checkPolyDamage() {
-    // NONMATCHING
+int daAlink_c::checkPolyDamage() {
+    if (dComIfGs_PolyDamageOff_Check()) {
+        return 0;
+    }
+
+    if (checkEndResetFlg1(ERFLG1_UNK_4000)) {
+        return 4;
+    }
+
+    int var_r29;
+    if (!checkBoardRide() && mLinkAcch.i_ChkGroundHit()) {
+        if (dComIfG_Bgsp().ChkPolySafe(mLinkAcch.m_gnd) && (dKy_pol_argument_get(&mLinkAcch.m_gnd) & 0x60)) {
+            var_r29 = 1;
+            if (checkIcePolygonDamage(&mLinkAcch.m_gnd)) {
+                var_r29 |= 0x80;
+            }
+
+            cM3dGPla sp38;
+            dComIfG_Bgsp().GetTriPla(mLinkAcch.m_gnd, &sp38);
+            field_0x311e = sp38.mNormal.atan2sX_Z();
+            return var_r29;
+        }
+    }
+
+    if (!checkBoardRide() && ((checkWaterPolygonUnder() && dComIfG_Bgsp().ChkPolySafe(mLinkAcch.m_wtr) && ((dKy_pol_argument_get(&mLinkAcch.m_wtr) & 0x60) || field_0x2fbc == 6)) || (checkModeFlg(0x40) && field_0x33bc < field_0x33b8 && -1000000000.0f != field_0x33b8 && ((field_0x2fc6 & 0x60) || field_0x2fc5 == 6) && (field_0x2fc5 != 6 || !(field_0x33b8 > field_0x33d8 + daAlinkHIO_basic_c0::m.mLavaDeathDepth))))) {
+        return 2;
+    }
+
+    if (mLinkAcch.ChkWallHit()) {
+        dBgS_AcchCir* acch_cir = mAcchCir;
+        
+        for (int i = 0; i < 3; i++) {
+            if (acch_cir->ChkWallHit()) {
+                if (dComIfG_Bgsp().ChkPolySafe(*acch_cir) && (dKy_pol_argument_get(acch_cir) & 0x60)) {
+                    var_r29 = 3;
+
+                    field_0x311e = acch_cir->GetWallAngleY();
+                    if (checkIcePolygonDamage(acch_cir)) {
+                        var_r29 |= 0x80;
+                    }
+
+                    if (dKy_pol_argument_get(acch_cir) & 0x20) {
+                        var_r29 |= 0x40;
+                    }
+
+                    return var_r29;
+                }
+            }
+            acch_cir++;
+        }
+    }
+
+    return field_0x2fca;
 }
 
 /* 800D7A98-800D7B18 0D23D8 0080+00 1/1 0/0 0/0 .text
  * checkElecReturnDamage__9daAlink_cFR12dCcD_GObjInfPP10fopAc_ac_c */
-bool daAlink_c::checkElecReturnDamage(dCcD_GObjInf& param_0, fopAc_ac_c** param_1) {
+BOOL daAlink_c::checkElecReturnDamage(dCcD_GObjInf& param_0, fopAc_ac_c** param_1) {
     if (param_0.ChkAtHit() && param_0.GetAtHitGObj() != NULL) {
         dCcD_GObjInf* gobj_p = (dCcD_GObjInf*)param_0.GetAtHitGObj();
 
@@ -313,18 +387,541 @@ bool daAlink_c::checkLargeAttack(int param_0) const {
 
 /* 800D7C40-800D8F3C 0D2580 12FC+00 1/1 0/0 0/0 .text            checkDamageAction__9daAlink_cFv */
 BOOL daAlink_c::checkDamageAction() {
-    // NONMATCHING
+    s16 spE = field_0x3006;
+    field_0x3006 = 0;
+
+    u8 spA = field_0x2fca;
+    field_0x2fca = 0;
+
+    if (checkAnmEnd(&mUpperFrameCtrl[2])) {
+        if (checkDashDamageAnime()) {
+            resetUpperAnime(UPPER_2, daAlinkHIO_damage_c0::m.mDashDmgAnm.mInterpolation);
+        } else if (checkWolfHeadDamageAnime()) {
+            resetUpperAnime(UPPER_2, 3.0f);
+        } else if (checkSmallUpperGuardAnime()) {
+            resetUpperAnime(UPPER_2, 3.0f);
+            setUpperGuardAnime(-1.0f);
+        } else if (checkZoraSwimDamageAnime()) {
+            resetUpperAnime(UPPER_2, 3.0f);
+        }
+    }
+
+    if (checkEndResetFlg0(ERFLG0_UNK_40)) {
+        if (getSumouMode()) {
+            cancelSumouMode();
+        }
+    
+        if (checkEndResetFlg1(ERFLG1_UNK_80)) {
+            return procOctaIealSpitInit();
+        }
+    
+        if (checkEndResetFlg0(ERFLG0_UNK_40000000)) {
+            return commonFallInit(4);
+        }
+    
+        if (mProcID == PROC_WOLF_CARGO_CARRY && mProcVar2.field_0x300c == 0) {
+            offNoResetFlg0(FLG0_UNK_100000);
+        }
+    
+        return procCoLargeDamageInit(-3, 1, 0, 0, NULL, 0);
+    }
+
+    if (checkEventRun()) {
+        offNoResetFlg1(FLG1_UNK_1);
+        offNoResetFlg0(FLG0_UNK_20000);
+        return 0;
+    }
+
+    if (checkNoResetFlg1(FLG1_UNK_1)) {
+        if (!checkModeFlg(0x70C52) && !checkWolf() && procDkCaughtInit(field_0x28f8)) {
+            return 1;
+        }
+
+        if (mProcID != PROC_DK_CAUGHT) {
+            offNoResetFlg1(FLG1_UNK_1);
+        }
+    }
+
+    if (checkNoResetFlg0(FLG0_UNK_20000)) {
+        if ((!checkModeFlg(0x70C52)) && (!checkWolf()) && (!checkDkCaught2Anime())) {
+            setUpperAnimeBase(getMainBckData(ANM_HORSE_WAIT_D_B)->m_underID);
+            setFacePriAnime(ANM_HORSE_WAIT_D_B);
+            field_0x30f6 = daAlinkHIO_damCaught_c0::m.field_0x14;
+            field_0x2f96 = 1;
+            field_0x2f97 = 6;
+            onNoResetFlg1(FLG1_UNK_100000);
+            return procWaitInit();
+        }
+
+        if (!checkDkCaught2Anime()) {
+            offNoResetFlg0(FLG0_UNK_20000);
+        }
+    }
+
+    if (checkEndResetFlg0(ERFLG0_UNK_80)) {
+        if (checkEndResetFlg1(ERFLG1_UNK_80)) {
+            return procOctaIealSpitInit();
+        }
+
+        if (checkEndResetFlg0(ERFLG0_UNK_40000000)) {
+            return commonFallInit(4);
+        }
+
+        return procCoLargeDamageInit(-3, 1, 0, 0, NULL, 0);
+    }
+
+    if (checkEndResetFlg1(ERFLG1_UNK_400)) {
+        return procCoSandWallHitInit();
+    }
+
+    if (checkNoResetFlg2(FLG2_UNK_1000)) {
+        if (commonLargeDamageUpInit(-4, 1, 0, 0)) {
+            current.pos = field_0x3744;
+            shape_angle.y = field_0x3104;
+            current.angle.y = shape_angle.y;
+            return 1;
+        }
+        return 0;
+    }
+
+    if (mDamageTimer != 0) {
+        return checkWolfBarrierHitReverse();
+    }
+
+    dCcD_GObjInf* var_r29 = NULL;
+    for (int i = 0; i < 3; i++) {
+        if (field_0x850[i].ChkTgHit() && (field_0x2fb8 == 0 || (1 << i) == 0)) {
+            var_r29 = &field_0x850[i];
+            break;
+        }
+    }
+
+    if (var_r29 == NULL && checkWolf()) {
+        var_r29 = &field_0xFB8;
+    }
+
+    if (checkEndResetFlg1(ERFLG1_UNK_8000) && checkWolf()) {
+        return procWolfCargoCarryInit();
+    }
+
+    BOOL armor_no_dmg = checkMagicArmorNoDamage();
+    fopAc_ac_c* sp30 = NULL;
+    field_0x2fca = spA;
+    int sp2C = checkPolyDamage();
+    field_0x2fca = 0;
+    field_0x3006 = spE;
+
+    if (sp2C & 0x80) {
+        field_0x3006++;
+        if (field_0x3006 < daAlinkHIO_damage_c0::m.mFreezeTime) {
+            sp2C = 0;
+        }
+    } else if (field_0x3006 > 3) {
+        field_0x3006 -= 3;
+    } else {
+        field_0x3006 = 0;
+    }
+
+    if (sp2C != 0) {
+        int sp28 = (sp2C & 7);
+        setDamagePoint(1, sp2C & 0x80, TRUE, 0);
+
+        if (checkWolf()) {
+            mDamageTimer = daAlinkHIO_damage_c0::m.mWolfFloorInvincibleTime;
+            setDamageColorTime();
+        }
+
+        if (checkModeFlg(0x4000000)) {
+            dComIfGp_getVibration().StartShock(2, 0x1F, cXyz(0.0f, 1.0f, 0.0f));
+
+            if (checkWolf()) {
+                setWolfHeadDamage();
+            } else {
+                voiceStart(Z2SE_AL_V_DAMAGE_S);
+                seStartOnlyReverb(Z2SE_AL_DAMAGE_NORMAL);
+            }
+        } else {
+            if (!checkModeFlg(0x40000) && ((sp2C & 0x40) || (!mLinkAcch.i_ChkGroundHit() && (sp28 == 3 || sp28 == 4)))) {
+                dComIfGp_getVibration().StartShock(2, 0x1F, cXyz(0.0f, 1.0f, 0.0f));
+
+                int sp24;
+                if (sp2C & 0x80) {
+                    sp24 = 1;
+                } else {
+                    sp24 = 0;
+                }
+
+                if (sp28 == 4) {
+                    field_0x311e = shape_angle.y;
+                }
+
+                return procCoLargeDamageInit(-5, 1, 0, 0, NULL, sp24);
+            }
+
+            dComIfGp_getVibration().StartShock(2, 0x1F, cXyz(0.0f, 1.0f, 0.0f));
+
+            if (checkWolf()) {
+                if (checkModeFlg(0x40000)) {
+                    setWolfHeadDamage();
+                } else if (sp2C & 0x80) {
+                    return procWolfDamageInit(NULL);
+                } else {
+                    return procCoPolyDamageInit();
+                }
+            } else if (checkModeFlg(0x40000)) {
+                return procSwimDamageInit(NULL);
+            } else if (sp2C & 0x80) {
+                return procDamageInit(NULL, 0);
+            } else {
+                return procCoPolyDamageInit();
+            }
+        }
+    } else if ((mEquipItem == 0x103 || (checkHookshotItem(mEquipItem) && !mAtCps[0].ChkAtSPrm(0x20))) && (checkElecReturnDamage(mAtCps[0], &sp30) || checkElecReturnDamage(mAtCps[1], &sp30) || checkElecReturnDamage(mAtCps[2], &sp30))) {
+        setDamagePointNormal(2);
+        onResetFlg1(RFLG1_UNK_2);
+        dComIfGp_getVibration().StartShock(4, 0x1F, cXyz(0.0f, 1.0f, 0.0f));
+
+        if (checkModeFlg(0x4000000)) {
+            if (checkWolf()) {
+                setWolfHeadDamage();
+            } else {
+                voiceStart(Z2SE_AL_V_DAMAGE_S);
+                seStartOnlyReverb(Z2SE_AL_DAMAGE_NORMAL);
+            }
+        } else {
+            return procCoElecDamageInit(sp30, NULL, 0);
+        }
+    } else if (var_r29 != NULL && var_r29->ChkTgHit() && mProcID != PROC_GUARD_SLIP) {
+        fopAc_ac_c* tghit_ac = var_r29->GetTgHitAc();
+        s16 tghit_ac_name;
+        if (tghit_ac != NULL) {
+            tghit_ac_name = fopAcM_GetName(tghit_ac);
+        } else {
+            tghit_ac_name = PROC_ALINK;
+        }
+
+        dCcD_GObjInf* tghit_gobj = var_r29->GetTgHitGObj();
+        int at_spl;
+        u8 at_mtrl;
+        if (tghit_gobj != NULL) {
+            at_spl = tghit_gobj->GetAtSpl();
+            at_mtrl = tghit_gobj->GetAtMtrl();
+        } else {
+            at_spl = field_0x814.GetAtSpl();
+            at_mtrl = dCcD_MTRL_NONE;
+        }
+    
+        if (at_spl == 8 && checkWolf()) {
+            at_spl = 1;
+        }
+    
+        if (var_r29->ChkTgShieldHit()) {
+            setGuardSe(var_r29);
+
+            if (checkHugeAttack(at_spl)) {
+                dComIfGp_getVibration().StartShock(5, 1, cXyz(0.0f, 1.0f, 0.0f));
+            } else if (checkLargeAttack(at_spl)) {
+                dComIfGp_getVibration().StartShock(4, 1, cXyz(0.0f, 1.0f, 0.0f));
+            } else if (at_spl == 8) {
+                dComIfGp_getVibration().StartShock(2, 1, cXyz(0.0f, 1.0f, 0.0f));
+            } else {
+                dComIfGp_getVibration().StartShock(3, 1, cXyz(0.0f, 1.0f, 0.0f));
+            }
+    
+            if (!armor_no_dmg && at_mtrl == dCcD_MTRL_FIRE && checkWoodShieldEquip() && field_0x2fcb == 0 && !field_0x2e44.checkPassNum(15)) {
+                field_0x2fcb = 120;
+                seStartOnlyReverb(Z2SE_AL_BURN_START);
+            }
+
+            if ((mProcID != PROC_GUARD_ATTACK || (tghit_ac_name != PROC_E_TK_BALL && tghit_ac_name != PROC_KN_BULLET)) && !checkModeFlg(0x4000000)) {
+                if (at_spl == 10 || at_spl == 11 || at_spl == 9) {
+                    return procGuardBreakInit();
+                }
+
+                if (!armor_no_dmg) {
+                    if (var_r29->ChkTgShield()) {
+                        if (checkHorseRide()) {
+                            if ((checkLargeAttack(at_spl) || checkHugeAttack(at_spl)) && (!checkSpecialHorseRide())) {
+                                return procHorseHangInit(var_r29, 0);
+                            }
+                        } else if (at_spl == 8 || checkModeFlg(0x70C52)) {
+                            if (!checkModeFlg(0x400) && mEquipItem != IRONBALL) {
+                                setSmallGuard(var_r29);
+                            }
+                        } else {
+                            return procGuardSlipInit(at_spl, var_r29);
+                        }
+                    } else if (var_r29->ChkTgSpShield()) {
+                        return procGuardSlipInit(at_spl, var_r29);
+                    }
+                }
+            }
+        } else {
+            int dmg = field_0x814.GetDmg();
+            if (var_r29->ChkTgHit() && tghit_gobj != NULL && tghit_gobj->GetAtType() == AT_TYPE_BOMB) {
+                if (checkNoResetFlg3(FLG3_UNK_40000000)) {
+                    dmg = 1;
+                } else {
+                    dmg = 2;
+                }
+            }
+
+            if (at_mtrl == dCcD_MTRL_UNK_5) {
+                dComIfGp_getVibration().StartShock(4, 0x1F, cXyz(0.0f, 1.0f, 0.0f));
+            } else if (checkHugeAttack(at_spl)) {
+                dComIfGp_getVibration().StartShock(8, 0x1F, cXyz(0.0f, 1.0f, 0.0f));
+            } else if (checkLargeAttack(at_spl)) {
+                dComIfGp_getVibration().StartShock(4, 0x1F, cXyz(0.0f, 1.0f, 0.0f));
+            } else {
+                dComIfGp_getVibration().StartShock(2, 0x1F, cXyz(0.0f, 1.0f, 0.0f));
+            }
+
+            setDamagePoint(dmg, at_mtrl == dCcD_MTRL_FIRE || at_mtrl == dCcD_MTRL_ICE, TRUE, 0);
+
+            if (armor_no_dmg && at_mtrl != dCcD_MTRL_UNK_5 && at_mtrl != dCcD_MTRL_ICE) {
+                setGuardSe(var_r29);
+            } else if (at_mtrl == dCcD_MTRL_FIRE) {
+                seStartOnlyReverb(Z2SE_AL_BURN_START);
+                if (at_spl == 8) {
+                    initFirePointDamageEffect(var_r29->GetTgHitPosP(), var_r29);
+                } else {
+                    initFirePointDamageEffectAll();
+                }
+            }
+
+            if (checkModeFlg(0x4000000)) {
+                if (checkWolf()) {
+                    setWolfHeadDamage();
+                } else if (!armor_no_dmg) {
+                    voiceStart(Z2SE_AL_V_DAMAGE_S);
+                    seStartOnlyReverb(Z2SE_AL_DAMAGE_NORMAL);
+                }
+            } else if (at_mtrl == dCcD_MTRL_UNK_5 && !checkSpecialHorseRide()) {
+                return procCoElecDamageInit(var_r29->GetTgHitAc(), var_r29, at_spl);
+            } else if (checkReinRide()) {
+                if (at_mtrl == dCcD_MTRL_UNK_5) {
+                    return procCoLargeDamageInit(-1, 1, 0, 0, var_r29, 0);
+                }
+
+                if (!checkBoarSingleBattle() && (mProcID == PROC_HORSE_HANG || mProcID == PROC_BOAR_RUN || mProcID == PROC_HORSE_RUN || checkLargeAttack(at_spl) || checkHugeAttack(at_spl))) {
+                    setHorseZeldaDamage();
+                    procCoLargeDamageInit(-1, 1, 0, 0, var_r29, 0);
+                    onModeFlg(0x2000);
+                    return 1;
+                }
+
+                if (!armor_no_dmg) {
+                    if (checkHorseNotDamageReaction()) {
+                        voiceStart(Z2SE_AL_V_DAMAGE_S);
+                        seStartOnlyReverb(Z2SE_AL_DAMAGE_NORMAL);
+                    } else if (at_spl == 8 || checkHorseZelda()) {
+                        return procHorseDamageInit(var_r29);
+                    } else {
+                        return procHorseHangInit(var_r29, 1);
+                    }
+                }
+            } else if (checkModeFlg(0x40000)) {
+                if (checkWolf()) {
+                    setWolfHeadDamage();
+                } else if (!armor_no_dmg) {
+                    return procSwimDamageInit(var_r29);
+                }
+            } else if (dmg == 0 && !checkWolf() && (at_spl == 10 || at_spl == 11 || at_spl == 9) && mLinkAcch.i_ChkGroundHit() && !checkModeFlg(0x70C52)) {
+                return procGuardBreakInit();
+            } else if (checkHugeAttack(at_spl)) {
+                return procCoLargeDamageInit(-1, 0, 0, 0, var_r29, 0);
+            } else if (checkModeFlg(0x70C52) || checkLargeAttack(at_spl)) {
+                if (checkModeFlg(0x10000) && !checkLargeAttack(at_spl)) {
+                    voiceStart(Z2SE_AL_V_DAMAGE_S);
+                    seStartOnlyReverb(Z2SE_AL_DAMAGE_NORMAL);
+                    procFallInit(1, daAlinkHIO_autoJump_c0::m.mFallInterpolation);
+                    onModeFlg(8);
+                    return 1;
+                }
+
+                if (at_spl == 8 && (mProcID == PROC_WOLF_ROPE_MOVE || mProcID == PROC_WOLF_ROPE_SUBJECTIVITY || mProcID == PROC_WOLF_ROPE_STAGGER)) {
+                    cXyz* sp14 = getDamageVec(var_r29);
+                    if ((s16)(sp14->atan2sX_Z() - shape_angle.y) >= 0) {
+                        return procWolfRopeHangInit(2);
+                    }
+                    return procWolfRopeHangInit(3);
+                }
+
+                return procCoLargeDamageInit(-1, 1, 0, 0, var_r29, 0);
+            } else if (!armor_no_dmg || at_mtrl == dCcD_MTRL_ICE) {
+                if (checkDashAnime() && at_mtrl != dCcD_MTRL_ICE) {
+                    setDashDamage();
+                } else if (mProcID == PROC_WOLF_MOVE && at_mtrl != dCcD_MTRL_ICE && mNormalSpeed > field_0x594 * 0.7f) {
+                    setWolfHeadDamage();
+                } else if (checkWolf()) {
+                    return procWolfDamageInit(var_r29);
+                } else {
+                    return procDamageInit(var_r29, 0);
+                }
+            }
+        }
+    }
+
+    if (checkHorseRide()) {
+        daHorse_c* horsep = dComIfGp_getHorseActor();
+        if (horsep->checkCowHit() != 0) {
+            current.angle.y = horsep->getCowHitAngle();
+
+            if (checkBoarSingleBattle()) {
+                dComIfGp_getVibration().StartShock(8, 0x1F, cXyz(0.0f, 1.0f, 0.0f));
+                return procCoLargeDamageInit(-1, 0, 0, 0, NULL, 0);
+            }
+    
+            dComIfGp_getVibration().StartShock(4, 0x1F, cXyz(0.0f, 1.0f, 0.0f));
+            return procCoLargeDamageInit(-1, 1, 0, 0, NULL, 0);
+        }
+    }
+
+    field_0x814.ClrTg();
+    field_0x814.ClrAt();
+    return checkWolfBarrierHitReverse();
 }
 
 /* 800D8F3C-800D9514 0D387C 05D8+00 2/2 0/0 0/0 .text procDamageInit__9daAlink_cFP12dCcD_GObjInfi
  */
+// NONMATCHING - cLib_minMaxLimit appears to have issues when using s16
 int daAlink_c::procDamageInit(dCcD_GObjInf* param_0, int param_1) {
-    // NONMATCHING
+    BOOL freeze_player;
+
+    if (!param_1 && (param_0 == NULL || (param_0->GetTgHitGObj() != NULL && param_0->GetTgHitGObj()->GetAtMtrl() == dCcD_MTRL_ICE))) {
+        freeze_player = true;
+        voiceStart(Z2SE_AL_V_DAMAGE_FREEZE);
+        seStartOnlyReverb(Z2SE_AL_FREEZE);
+    } else {
+        seStartOnlyReverb(Z2SE_AL_DAMAGE_NORMAL);
+        freeze_player = false;
+        
+        if (!param_1) {
+            voiceStart(Z2SE_AL_V_DAMAGE_S);
+        }
+    }
+
+    if (checkIronBallWaitAnime() && !freeze_player && !param_1) {
+        return 1;
+    }
+
+    commonProcInit(PROC_DAMAGE);
+
+    cXyz sp7C;
+    f32 var_f31;
+    f32 var_f30 = cM_ssin(shape_angle.y);
+    f32 var_f29 = cM_scos(shape_angle.y);
+
+    cXyz* var_r29;
+    if (param_0 != NULL) {
+        var_r29 = getDamageVec(param_0);   
+    } else if (param_1) {
+        s16 var_r24 = field_0x3102 + 0x8000;
+        sp7C.set(cM_ssin(var_r24), 0.0f, cM_scos(var_r24));
+        var_r29 = &sp7C;
+        offModeFlg(8);
+    } else {
+        sp7C.set(cM_ssin(field_0x311e), 0.0f, cM_scos(field_0x311e));
+        var_r29 = &sp7C;
+    }
+
+    cXyz sp88(var_r29->z * -var_f30 + var_r29->x * var_f29,
+                var_r29->y,
+                var_r29->z * var_f29 + var_r29->x * var_f30);
+    
+    mProcVar2.field_0x300c = cLib_minMaxLimit<s16>(cM_atan2s(sp88.z, sp88.y), -daAlinkHIO_damNormal_c0::m.field_0x50, daAlinkHIO_damNormal_c0::m.field_0x50);
+    mProcVar3.field_0x300e.x = cLib_minMaxLimit<s16>(cM_atan2s(sp88.x, -JMAFastSqrt(sp88.y * sp88.y + sp88.z * sp88.z)), -daAlinkHIO_damNormal_c0::m.field_0x52, daAlinkHIO_damNormal_c0::m.field_0x52);
+
+    if (freeze_player) {
+        var_f31 = 0.0f;
+    } else if (mTargetedActor != NULL) {
+        var_f31 = daAlinkHIO_atnMove_c0::m.mWaitAnmSpeed;
+    } else {
+        var_f31 = daAlinkHIO_noActAtnMove_c0::m.mWaitAnmSpeed;
+    }
+
+    if (checkAtnLeftAnime()) {
+        setUnderAnime(0x1A, UNDER_2, var_f31, 0.0f, -1, -1.0f);
+    } else if (checkAtnRightAnime()) {
+        setUnderAnime(0x1C, UNDER_2, var_f31, 0.0f, -1, -1.0f);
+    }
+
+    int direction = getDirectionFromAngle(cM_atan2s(-sp88.x, -sp88.z));
+    if (direction == DIR_FORWARD) {
+        setSingleAnimeParam(ANM_DMG_SMALL_A, &daAlinkHIO_damNormal_c0::m.field_0x0);
+        field_0x3478 = daAlinkHIO_damNormal_c0::m.field_0x0.mCheckFrame;
+    } else if (direction == DIR_BACKWARD) {
+        setSingleAnimeParam(ANM_DMG_SMALL_B, &daAlinkHIO_damNormal_c0::m.field_0x14);
+        field_0x3478 = daAlinkHIO_damNormal_c0::m.field_0x14.mCheckFrame;
+    } else if (direction == DIR_LEFT) {
+        setSingleAnimeParam(ANM_DMG_SMALL_LEFT, &daAlinkHIO_damNormal_c0::m.field_0x28);
+        field_0x3478 = daAlinkHIO_damNormal_c0::m.field_0x28.mCheckFrame;
+    } else {
+        setSingleAnimeParam(ANM_DMG_SMALL_RIGHT, &daAlinkHIO_damNormal_c0::m.field_0x3C);
+        field_0x3478 = daAlinkHIO_damNormal_c0::m.field_0x3C.mCheckFrame;
+    }
+
+    current.angle.y = var_r29->atan2sX_Z();
+    mProcVar3.field_0x300e.y = current.angle.y;
+
+    mNormalSpeed = var_r29->absXZ() * daAlinkHIO_damNormal_c0::m.field_0x58 + daAlinkHIO_damNormal_c0::m.field_0x54;
+    if (mNormalSpeed > daAlinkHIO_move_c0::m.mMaxSpeed) {
+        mNormalSpeed = daAlinkHIO_move_c0::m.mMaxSpeed;
+    }
+
+    daPy_frameCtrl_c* frame_ctrl = mUnderFrameCtrl;
+    field_0x347c = M_PI / (frame_ctrl->getEnd() - frame_ctrl->getStart());
+
+    if (freeze_player) {
+        frame_ctrl->setRate(daAlinkHIO_damNormal_c0::m.field_0x60);
+        frame_ctrl->setEnd(7);
+        mNormalSpeed = 0.0f;
+        mProcVar0.mIceFreezeTimer = 90;
+        onNoResetFlg1(FLG1_ICE_FREEZE);
+    } else {
+        mProcVar0.mIceFreezeTimer = 0;
+    }
+
+    mProcVar1.field_0x300a = 0;
+    return 1;
 }
 
 /* 800D9514-800D96DC 0D3E54 01C8+00 1/0 0/0 0/0 .text            procDamage__9daAlink_cFv */
 int daAlink_c::procDamage() {
-    // NONMATCHING
+    daPy_frameCtrl_c* frame_ctrl = mUnderFrameCtrl;
+    f32 var_f30 = frame_ctrl->getFrame() - frame_ctrl->getStart();
+    f32 var_f31 = cM_fsin(field_0x347c * var_f30);
+
+    mBodyAngle.x = mProcVar2.field_0x300c * var_f31;
+    mBodyAngle.z = -mProcVar3.field_0x300e.x * var_f31;
+    mBodyAngle.y = 0;
+
+    cLib_chaseF(&mNormalSpeed, 0.0f, daAlinkHIO_damNormal_c0::m.field_0x5C);
+
+    if (checkFreezeDamage()) {
+        freezeTimerDamage();
+    }
+
+    if (checkAnmEnd(frame_ctrl)) {
+        current.angle.y = shape_angle.y;
+
+        if (!checkFreezeDamage()) {
+            checkNextAction(0);
+        } else if (mProcVar0.mIceFreezeTimer == 0) {
+            seStartOnlyReverb(Z2SE_AL_FREEZE_RECOVER);
+            procStEscapeInit();
+            onModeFlg(8);
+        }
+    } else if (frame_ctrl->getFrame() > field_0x3478) {
+        current.angle.y = shape_angle.y;
+        onModeFlg(4);
+
+        if (!checkNextAction(1)) {
+            current.angle.y = mProcVar3.field_0x300e.y;
+        }
+    }
+
+    return 1;
 }
 
 /* 800D96DC-800D9E88 0D401C 07AC+00 12/12 0/0 0/0 .text
@@ -454,9 +1051,8 @@ int daAlink_c::procStEscapeInit() {
     commonProcInit(PROC_HUMAN_ST_ESCAPE);
     setSingleAnimeParam(ANM_FROZEN_FREE, &daAlinkHIO_damCaught_c0::m.field_0x0);
 
-    f32 tmp_7 = 7.0f;
-    mUnderFrameCtrl[0].setFrame(tmp_7);
-    getNowAnmPackUnder(UNDER_0)->setFrame(tmp_7);
+    mUnderFrameCtrl[0].setFrame(7.0f);
+    getNowAnmPackUnder(UNDER_0)->setFrame(7.0f);
     mNormalSpeed = 0.0f;
 
     return 1;
@@ -561,8 +1157,76 @@ int daAlink_c::procCoSandWallHit() {
 
 /* 800DBED8-800DC214 0D6818 033C+00 1/1 0/0 0/0 .text            procCoLavaReturnInit__9daAlink_cFi
  */
-int daAlink_c::procCoLavaReturnInit(int param_0) {
-    // NONMATCHING
+int daAlink_c::procCoLavaReturnInit(BOOL i_sandReturn) {
+    if (!dComIfGp_event_compulsory(this, 0, 0xFFFF)) {
+        return 0;
+    }
+
+    mDemo.setSpecialDemoType();
+    u32 chk_40 = checkModeFlg(0x40);
+
+    if (!commonProcInitNotSameProc(PROC_LAVA_RETURN)) {
+        return 1;
+    }
+
+    if (chk_40) {
+        current.pos.x = field_0x3834.x;
+        current.pos.z = field_0x3834.z;
+    }
+
+    onNoResetFlg0(FLG0_SWIM_UP);
+
+    if (checkWolf()) {
+        setSingleAnimeWolfBase(WANM_SWIM_DROWN);
+        setFaceBasicTexture(FTANM_UNK_9E);
+
+        if (i_sandReturn) {
+            voiceStart(Z2SE_WL_V_FALL_QUICKSAND);
+        } else {
+            voiceStart(Z2SE_WL_V_FALL_MAGMA);
+        }
+    } else {
+        setSingleAnimeBase(ANM_SWIM_DROWN);
+
+        if (mEquipItem == 0x103) {
+            field_0x2f92 = 100;
+        }
+
+        if (i_sandReturn) {
+            voiceStart(Z2SE_AL_V_FALL_QUICKSAND);
+        } else {
+            voiceStart(Z2SE_AL_V_FALL_MAGMA);
+        }
+    }
+
+    if (i_sandReturn) {
+        seStartOnlyReverb(Z2SE_AL_SINK_SAND_PITFALL);
+        field_0x2fbd = 0xFF;
+        offModeFlg(0x40000);
+
+        field_0x2060->getOldFrameTransInfo(0)->mTranslate.y += field_0x3458;
+        mSinkShapeOffset -= field_0x3458;
+        field_0x2f99 = 0;
+        field_0x32cc = 5;
+        field_0x3198 = 4;
+    } else {
+        seStartOnlyReverb(Z2SE_AL_SINK_MAGMA);
+        
+        cXyz particle_pos(current.pos.x, mWaterY, current.pos.z);
+        dComIfGp_particle_set(0x8757, &particle_pos, &tevStr, NULL, NULL);
+        dComIfGp_particle_set(0x8758, &particle_pos, &tevStr, NULL, NULL);
+        field_0x32cc = 4;
+        field_0x3198 = 8;
+    }
+
+    field_0x3080 = 0;
+    mDamageTimer = 0;
+    mNormalSpeed = 0.0f;
+    field_0x3194 = 1;
+
+    u32 id = fopAcM_GetID(this);
+    dCam_getBody()->StartEventCamera(9, id, "Type", 1, &field_0x3194, 0);
+    return 1;
 }
 
 /* 800DC214-800DC278 0D6B54 0064+00 1/0 0/0 0/0 .text            procCoLavaReturn__9daAlink_cFv */
@@ -618,7 +1282,7 @@ int daAlink_c::procCoSwimFreezeReturnInit() {
     field_0x3080 = 0;
     mDamageTimer = 0;
     mNormalSpeed = 0.0f;
-    onNoResetFlg1(FLG1_UNK_40000000);
+    onNoResetFlg1(FLG1_ICE_FREEZE);
     field_0x3194 = 1;
 
     u32 id = fopAcM_GetID(this);
@@ -631,7 +1295,7 @@ int daAlink_c::procCoSwimFreezeReturnInit() {
 int daAlink_c::procCoSwimFreezeReturn() {
     if (mProcVar2.field_0x300c == 0) {
         if (checkRestartDead(4, 1)) {
-            onNoResetFlg1(FLG1_UNK_40000000);
+            onNoResetFlg1(FLG1_ICE_FREEZE);
         } else {
             u32 mode = 4;
             setLastSceneDamage(4, &mode);
diff --git a/src/d/actor/d_a_alink_demo.inc b/src/d/actor/d_a_alink_demo.inc
index 9f05cc0acb..de1b4eff56 100644
--- a/src/d/actor/d_a_alink_demo.inc
+++ b/src/d/actor/d_a_alink_demo.inc
@@ -199,7 +199,7 @@ int daAlink_c::checkDemoAction() {
                     if (!checkCanoeRide()) {
                         daCanoe_c* canoe_p =
                             (daCanoe_c*)fopAcIt_Judge((fopAcIt_JudgeFunc)daAlink_searchCanoe, NULL);
-                        unsigned int rodID =
+                        fpc_ProcID rodID =
                             fopAcM_create(PROC_MG_ROD, 0xD, &mLeftHandPos, -1, NULL, NULL, -1);
                         canoe_p->onRodID(rodID);
                         return procCanoeJumpRideInit(NULL);
diff --git a/src/d/actor/d_a_alink_guard.inc b/src/d/actor/d_a_alink_guard.inc
index 6290a9da05..d9ad458a9b 100644
--- a/src/d/actor/d_a_alink_guard.inc
+++ b/src/d/actor/d_a_alink_guard.inc
@@ -91,7 +91,7 @@ void daAlink_c::stickArrowIncrement(int param_0) {
 /* 800DC8C4-800DCA2C 0D7204 0168+00 0/0 0/0 1/1 .text
  * setArrowShieldActor__9daAlink_cFP10fopAc_ac_ci               */
 void daAlink_c::setArrowShieldActor(fopAc_ac_c* i_actor, int param_1) {
-    unsigned int new_arrow_id = fopAcM_GetID(i_actor);
+    fpc_ProcID new_arrow_id = fopAcM_GetID(i_actor);
 
     int arrow_num = 0;
     for (; arrow_num < 16; arrow_num++) {
@@ -309,4 +309,4 @@ int daAlink_c::procTurnMoveInit(int param_0) {
 /* 800DE380-800DE64C 0D8CC0 02CC+00 1/0 0/0 0/0 .text            procTurnMove__9daAlink_cFv */
 int daAlink_c::procTurnMove() {
     // NONMATCHING
-}
\ No newline at end of file
+}
diff --git a/src/d/actor/d_a_alink_hook.inc b/src/d/actor/d_a_alink_hook.inc
index bf8623d4a4..b01f029f31 100644
--- a/src/d/actor/d_a_alink_hook.inc
+++ b/src/d/actor/d_a_alink_hook.inc
@@ -190,7 +190,7 @@ void daAlink_c::setHookshotCatchNow() {
 
 /* 80108A90-80108B34 1033D0 00A4+00 1/0 0/0 0/0 .text setHookshotCarryOffset__9daAlink_cFUiPC4cXyz
  */
-bool daAlink_c::setHookshotCarryOffset(unsigned int i_carryActorID, cXyz const* i_posOffset) {
+bool daAlink_c::setHookshotCarryOffset(fpc_ProcID i_carryActorID, cXyz const* i_posOffset) {
     if (dComIfGp_checkPlayerStatus1(0, 0x10000)) {
         fopAc_ac_c* carryActor_p = mCargoCarryAcKeep.getActor();
 
diff --git a/src/d/actor/d_a_alink_link.inc b/src/d/actor/d_a_alink_link.inc
index 97310d4e8b..c07676402d 100644
--- a/src/d/actor/d_a_alink_link.inc
+++ b/src/d/actor/d_a_alink_link.inc
@@ -2291,45 +2291,7 @@ int daAlink_c::procGoronRideWait() {
     // NONMATCHING
 }
 
-/* ############################################################################################## */
-/* 8039207C-80392088 01E6DC 000C+00 0/1 0/0 0/0 .rodata          @74748 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static u8 const lit_74748[12] = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
-COMPILER_STRIP_GATE(0x8039207C, &lit_74748);
-#pragma pop
-
-/* 80392088-80392094 01E6E8 000C+00 0/1 0/0 0/0 .rodata          localBoomCatchPos$74910 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static Vec const localBoomCatchPos = {
-    18.7f,
-    146.3f,
-    69.2f,
-};
-COMPILER_STRIP_GATE(0x80392088, &localBoomCatchPos);
-#pragma pop
-
-/* 80392094-80392094 01E6F4 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
-#pragma push
-#pragma force_active on
-SECTION_DEAD static char const* const stringBase_803925D1 = "Alink";
-SECTION_DEAD static char const* const stringBase_803925D7 = "kiko_yami";
-SECTION_DEAD static char const* const stringBase_803925E1 = "fire_insect";
-SECTION_DEAD static char const* const stringBase_803925ED = "MapToolCamera19";
-SECTION_DEAD static char const* const stringBase_803925FD = "yami_mog";
-SECTION_DEAD static char const* const stringBase_80392606 = "R_SP109";
-SECTION_DEAD static char const* const stringBase_8039260E = "MapToolCamera1";
-SECTION_DEAD static char const* const stringBase_8039261D = "MapToolCamera2";
-SECTION_DEAD static char const* const stringBase_8039262C = "MapToolCamera23";
-/* @stringBase0 padding */
-SECTION_DEAD static char const* const pad_8039263C = "\0\0\0";
-#pragma pop
-
 /* 800C8700-800CAFA8 0C3040 28A8+00 1/1 0/0 0/0 .text            execute__9daAlink_cFv */
-#ifdef NONMATCHING
 int daAlink_c::execute() {
     loadModelDVD();
 
@@ -2603,20 +2565,16 @@ int daAlink_c::execute() {
             event_name = NULL;
         }
 
-        if (event_name != NULL) {
-            if (!strcmp(event_name, "kiko_yami") || !strcmp(event_name, "fire_insect") ||
-                (checkStageName("F_SP108") &&
-                 (!strcmp(event_name, "MapToolCamera19") || !strcmp(event_name, "yami_mog"))) ||
-                (checkStageName("R_SP109") &&
-                 (!strcmp(event_name, "MapToolCamera1") || !strcmp(event_name, "MapToolCamera2") ||
-                  !strcmp(event_name, "MapToolCamera19") || !strcmp(event_name, "fire_insect"))) ||
-                (checkStageName("F_SP115") && !strcmp(event_name, "MapToolCamera23")))
-            {
+        if (event_name != NULL && (!strcmp(event_name, "kiko_yami") || !strcmp(event_name, "fire_insect") ||
+            (checkStageName("F_SP108") &&
+                (!strcmp(event_name, "MapToolCamera19") || !strcmp(event_name, "yami_mog"))) ||
+            (checkStageName("R_SP109") &&
+                (!strcmp(event_name, "MapToolCamera1") || !strcmp(event_name, "MapToolCamera2") ||
+                !strcmp(event_name, "MapToolCamera19") || !strcmp(event_name, "fire_insect"))) ||
+            (checkStageName("F_SP115") && !strcmp(event_name, "MapToolCamera23"))))
+        {
                 mWolfEyeUp = daAlinkHIO_wolf_c0::m.mSensesLingerTime + 1;
-            }
-        }
-
-        if (checkEndResetFlg1(ERFLG1_UNK_200) || (checkDungeon() && eventInfo.checkCommandDoor()) ||
+        } else if (checkEndResetFlg1(ERFLG1_WOLF_EYE_KEEP) || (checkDungeon() && eventInfo.checkCommandDoor()) ||
             mProcID == PROC_WOLF_GET_SMELL || mProcID == PROC_WOLF_DIG ||
             mProcID == PROC_WOLF_DIG_THROUGH || checkNoResetFlg0(FLG0_UNK_4000) ||
             dComIfGp_checkPlayerStatus1(0, 0x1000000) ||
@@ -2732,548 +2690,553 @@ int daAlink_c::execute() {
 
     playFaceTextureAnime();
 
-    cXyz old_pos = current.pos;
-    posMove();
-
-    if (checkWolf()) {
-        wolfBgCheck();
-    } else if (checkModeFlg(MODE_SWIMMING)) {
-        swimBgCheck(120.0f);
-    }
-
-    cXyz pos = current.pos;
-    field_0x3528 = speed;
-
-    mLinkAcch.ClrGroundHit();
-    mLinkAcch.CrrPos(dComIfG_Bgsp());
+    {
+        cXyz old_pos = current.pos;
+        posMove();
 
-    if (checkMagneBootsOn()) {
-        current.pos = pos;
-    }
+        if (checkWolf()) {
+            wolfBgCheck();
+        } else if (checkModeFlg(MODE_SWIMMING)) {
+            swimBgCheck(120.0f);
+        }
 
-    if (!mLinkAcch.ChkGroundHit() && !mLinkAcch.ChkRoofHit() && getZoraSwim()) {
-        current.pos.y = pos.y;
-    }
+        cXyz pos = current.pos;
+        field_0x3528 = speed;
 
-    iceSlipBgCheck();
-    setWaterY();
-    autoGroundHit();
+        mLinkAcch.ClrGroundHit();
+        mLinkAcch.CrrPos(dComIfG_Bgsp());
 
-    if (checkNoResetFlg0(FLG0_UNDERWATER) ||
-        (checkPossibleWaterInMode() && !checkNoResetFlg0(FLG0_SWIM_UP)))
-    {
-        f32 var_f31;
-        if (mProcID == PROC_HOOKSHOT_FLY) {
-            var_f31 = current.pos.y - (field_0x598 * 0.5f);
-        } else if (dComIfGp_checkPlayerStatus1(0, 0x2000000)) {
-            var_f31 = (-65.0f + current.pos.y) - daAlinkHIO_swim_c0::m.mInitHeight;
-        } else {
-            var_f31 = current.pos.y;
+        if (checkMagneBootsOn()) {
+            current.pos = pos;
         }
 
-        if (!checkNoResetFlg0(FLG0_UNK_80) ||
-            mWaterY - var_f31 <= daAlinkHIO_swim_c0::m.mInitHeight)
-        {
-            swimOutAfter(0);
+        if (!mLinkAcch.ChkGroundHit() && !mLinkAcch.ChkRoofHit() && getZoraSwim()) {
+            current.pos.y = pos.y;
         }
-    }
 
-    if (mProcID == PROC_TOOL_DEMO || mProcID == PROC_GANON_FINISH) {
-        J3DTransformInfo ti;
-        field_0x1f20->getAnm(0)->getTransform(0, &ti);
-        mDoMtx_stack_c::transS(old_pos);
-        mDoMtx_stack_c::YrotM(shape_angle.y);
+        iceSlipBgCheck();
+        setWaterY();
+        autoGroundHit();
 
-        Vec tmp;
-        mDoMtx_stack_c::multVec(&tmp, &current.pos);
-        speed.y = 0.0f;
+        if (checkNoResetFlg0(FLG0_UNDERWATER) ||
+            (checkPossibleWaterInMode() && !checkNoResetFlg0(FLG0_SWIM_UP)))
+        {
+            f32 var_f31;
+            if (mProcID == PROC_HOOKSHOT_FLY) {
+                var_f31 = current.pos.y - (field_0x598 * 0.5f);
+            } else if (dComIfGp_checkPlayerStatus1(0, 0x2000000)) {
+                var_f31 = (current.pos.y + -65.0f) - (daAlinkHIO_swim_c0::m.mInitHeight - 5.0f);
+            } else {
+                var_f31 = current.pos.y;
+            }
 
-        if (field_0x3198 != 0) {
-            if (mLinkAcch.GetGroundH() != -1000000000.0f) {
-                current.pos.y = mLinkAcch.GetGroundH();
+            if (!checkNoResetFlg0(FLG0_UNK_80) ||
+                mWaterY - var_f31 <= daAlinkHIO_swim_c0::m.mInitHeight - 5.0f)
+            {
+                swimOutAfter(0);
             }
         }
-    } else if (mProcID == PROC_HOOKSHOT_FLY || mProcID == PROC_MAGNE_BOOTS_FLY ||
-               (checkModeFlg(MODE_ROPE_WALK | MODE_VINE_CLIMB | MODE_UNK_800 | MODE_RIDING) &&
-                mProcID != PROC_HORSE_GETOFF && mProcID != PROC_WOLF_CHAIN_READY &&
-                !checkBoardRide()))
-    {
-        current.pos = pos;
-    } else if (checkModeFlg(MODE_UNK_4000)) {
-        if (mProcID == PROC_DOOR_OPEN || mProcID == PROC_HANG_LEVER_DOWN) {
-            current.pos.y = old_pos.y;
-            speed.y = 0.0f;
-        }
-        current.pos.x = pos.x;
-        current.pos.z = pos.z;
-    } else if (checkFlyAtnWait() || mProcID == PROC_WARP) {
-        current.pos.y = old_pos.y;
-        speed.y = 0.0f;
-    }
 
-    field_0x3178 = field_0x3174;
+        if (mProcID == PROC_TOOL_DEMO || mProcID == PROC_GANON_FINISH) {
+            J3DTransformInfo ti;
+            field_0x1f20->getAnm(0)->getTransform(0, &ti);
+            mDoMtx_stack_c::transS(old_pos);
+            mDoMtx_stack_c::YrotM(shape_angle.y);
 
-    if (mLinkAcch.GetGroundH() != -1000000000.0f) {
-        setRoomInfo();
+            Vec tmp = {0.0f, 0.0f, 0.0f};
+            tmp.x = ti.mTranslate.x;
+            tmp.z = ti.mTranslate.z;
+            mDoMtx_stack_c::multVec(&tmp, &current.pos);
+            speed.y = 0.0f;
 
-        if (!checkModeFlg(MODE_PLAYER_FLY) && !checkMagneBootsOn() && mProcID != PROC_TOOL_DEMO &&
-            mProcID != PROC_GANON_FINISH && mProcID != PROC_DUNGEON_WARP &&
-            (field_0x2f8c == 1 || field_0x2f8c == 3))
+            if (field_0x3198 != 0) {
+                if (mLinkAcch.GetGroundH() != -1000000000.0f) {
+                    current.pos.y = mLinkAcch.GetGroundH();
+                }
+            }
+        } else if (mProcID == PROC_HOOKSHOT_FLY || mProcID == PROC_MAGNE_BOOTS_FLY ||
+                (checkModeFlg(MODE_ROPE_WALK | MODE_VINE_CLIMB | MODE_UNK_800 | MODE_RIDING) &&
+                    mProcID != PROC_HORSE_GETOFF && mProcID != PROC_WOLF_CHAIN_READY &&
+                    !checkBoardRide()))
         {
-            setStepsOffset();
-        } else {
-            field_0x2b9c = 0.0f;
-            if (!checkModeFlg(MODE_SWIMMING)) {
-                field_0x2b98 = 0.0f;
+            current.pos = pos;
+        } else if (checkModeFlg(MODE_UNK_4000)) {
+            if (mProcID == PROC_DOOR_OPEN || mProcID == PROC_HANG_LEVER_DOWN) {
+                current.pos.y = old_pos.y;
+                speed.y = 0.0f;
             }
+            current.pos.x = pos.x;
+            current.pos.z = pos.z;
+        } else if (checkFlyAtnWait() || mProcID == PROC_WARP) {
+            current.pos.y = old_pos.y;
+            speed.y = 0.0f;
         }
 
-        if (checkModeFlg(MODE_UNK_2000000)) {
-            setShapeAngleOnGround();
-        }
-
-        if (!checkRestartRoom() && !checkDeadHP()) {
-            checkSceneChange(dComIfG_Bgsp().GetExitId(mLinkAcch.m_gnd));
-        }
+        field_0x3178 = field_0x3174;
 
-        if (mLinkAcch.ChkGroundHit()) {
-            if (dComIfG_Bgsp().ChkMoveBG(mLinkAcch.m_gnd)) {
-                dComIfG_Bgsp().MoveBgTransPos(mLinkAcch.m_gnd, true, &field_0x34ec, NULL, NULL);
-            }
+        if (mLinkAcch.GetGroundH() != -1000000000.0f) {
+            setRoomInfo();
 
-            if (checkNoResetFlg0(FLG0_UNK_80) && !checkNoResetFlg0(FLG0_UNDERWATER) &&
-                mWaterY >= mLinkAcch.GetGroundH())
+            if (!checkModeFlg(MODE_PLAYER_FLY) && !checkMagneBootsOn() && mProcID != PROC_TOOL_DEMO &&
+                mProcID != PROC_GANON_FINISH && mProcID != PROC_DUNGEON_WARP &&
+                (field_0x2f8c == 1 || field_0x2f8c == 3))
             {
-                mPolySound = dKy_pol_sound_get(&mLinkAcch.m_wtr);
-            } else if (checkEndResetFlg0(ERFLG0_UNK_200000)) {
-                mPolySound = 11;
+                setStepsOffset();
             } else {
-                mPolySound = dKy_pol_sound_get(&mLinkAcch.m_gnd);
+                field_0x2b9c = 0.0f;
+                if (!checkModeFlg(MODE_SWIMMING)) {
+                    field_0x2b98 = 0.0f;
+                }
             }
 
-            field_0x2ff0 = getGroundAngle(&mLinkAcch.m_gnd, shape_angle.y);
-        } else {
-            if (mProcID == PROC_TOOL_DEMO || mProcID == PROC_GANON_FINISH) {
-                if (checkNoResetFlg0(FLG0_UNK_80) && mWaterY >= mLinkAcch.GetGroundH()) {
+            if (checkModeFlg(MODE_UNK_2000000)) {
+                setShapeAngleOnGround();
+            }
+
+            if (!checkRestartRoom() && !checkDeadHP()) {
+                checkSceneChange(dComIfG_Bgsp().GetExitId(mLinkAcch.m_gnd));
+            }
+
+            if (mLinkAcch.ChkGroundHit()) {
+                if (dComIfG_Bgsp().ChkMoveBG(mLinkAcch.m_gnd)) {
+                    dComIfG_Bgsp().MoveBgTransPos(mLinkAcch.m_gnd, true, &field_0x34ec, NULL, NULL);
+                }
+
+                if (checkNoResetFlg0(FLG0_UNK_80) && !checkNoResetFlg0(FLG0_UNDERWATER) &&
+                    mWaterY >= mLinkAcch.GetGroundH())
+                {
                     mPolySound = dKy_pol_sound_get(&mLinkAcch.m_wtr);
                 } else if (checkEndResetFlg0(ERFLG0_UNK_200000)) {
                     mPolySound = 11;
                 } else {
                     mPolySound = dKy_pol_sound_get(&mLinkAcch.m_gnd);
                 }
-            } else if (checkModeFlg(MODE_SWIMMING) && checkNoResetFlg0(FLG0_UNK_80)) {
+
+                field_0x2ff0 = getGroundAngle(&mLinkAcch.m_gnd, shape_angle.y);
+            } else {
+                if (mProcID == PROC_TOOL_DEMO || mProcID == PROC_GANON_FINISH) {
+                    if (checkNoResetFlg0(FLG0_UNK_80) && mWaterY >= mLinkAcch.GetGroundH()) {
+                        mPolySound = dKy_pol_sound_get(&mLinkAcch.m_wtr);
+                    } else if (checkEndResetFlg0(ERFLG0_UNK_200000)) {
+                        mPolySound = 11;
+                    } else {
+                        mPolySound = dKy_pol_sound_get(&mLinkAcch.m_gnd);
+                    }
+                } else if (checkModeFlg(MODE_SWIMMING) && checkNoResetFlg0(FLG0_UNK_80)) {
+                    mPolySound = dKy_pol_sound_get(&mLinkAcch.m_wtr);
+                } else {
+                    mPolySound = 0;
+                }
+
+                field_0x2ff0 = 0;
+            }
+            mDoAud_setLinkGroupInfo(dComIfG_Bgsp().GetGrpSoundId(mLinkAcch.m_gnd));
+        } else {
+            field_0x3174 = -1;
+            field_0x2ff0 = 0;
+            field_0x2fbb = 16;
+            field_0x2fbd = 0;
+            field_0x2fa8 = 0;
+
+            if (checkModeFlg(MODE_SWIMMING) && dComIfG_Bgsp().ChkPolySafe(mLinkAcch.m_wtr)) {
                 mPolySound = dKy_pol_sound_get(&mLinkAcch.m_wtr);
             } else {
                 mPolySound = 0;
             }
 
-            field_0x2ff0 = 0;
+            if (!checkRestartRoom() && !checkDeadHP()) {
+                checkSceneChange(0x3F);
+            }
         }
-        mDoAud_setLinkGroupInfo(dComIfG_Bgsp().GetGrpSoundId(mLinkAcch.m_gnd));
-    } else {
-        field_0x3174 = -1;
-        field_0x2ff0 = 0;
-        field_0x2fbb = 16;
-        field_0x2fbd = 0;
-        field_0x2fa8 = 0;
-
-        if (checkModeFlg(MODE_SWIMMING) && dComIfG_Bgsp().ChkPolySafe(mLinkAcch.m_wtr)) {
-            mPolySound = dKy_pol_sound_get(&mLinkAcch.m_wtr);
+
+        if (checkMagneBootsOn()) {
+            field_0x2fbd = 0;
+            field_0x2f5c.mPosition = current.pos;
+            field_0x2f5c.mPow = 100.0f;
+
+            if (checkNoResetFlg0(FLG0_UNK_2000)) {
+                mPolySound = dKy_pol_sound_get(&mMagneLineChk);
+                field_0x2ff0 = 0;
+                field_0x3174 = dComIfG_Bgsp().GetGroundCode(mMagneLineChk);
+                field_0x2fbb = dComIfG_Bgsp().GetPolyAtt0(mMagneLineChk);
+                field_0x2fa8 = dComIfG_Bgsp().GetSpecialCode(mMagneLineChk);
+                setMagneBootsMtx(&mMagneLineChk, 0);
+            } else {
+                mPolySound = 0;
+                field_0x2ff0 = 0;
+                field_0x3174 = -1;
+                field_0x2fbb = 16;
+                field_0x2fa8 = 0;
+            }
         } else {
-            mPolySound = 0;
+            field_0x2f5c.mPow = 0.0f;
+            if (mProcID != PROC_MAGNE_BOOTS_FLY) {
+                mMagneBootsTopVec = cXyz::BaseY;
+            }
         }
 
-        if (!checkRestartRoom() && !checkDeadHP()) {
-            checkSceneChange(0x3F);
+        if (dComIfGp_evmng_startCheck(l_peepEventName)) {
+            if (field_0x2ff2 > 0) {
+                field_0x2ff2--;
+            } else if (dComIfGp_evmng_startCheck(l_peepEventName)) {
+                startPeepChange();
+            }
         }
-    }
 
-    if (checkMagneBootsOn()) {
-        field_0x2fbd = 0;
-        field_0x2f5c.mPosition = current.pos;
-        field_0x2f5c.mPow = 100.0f;
-
-        if (checkNoResetFlg0(FLG0_UNK_2000)) {
-            mPolySound = dKy_pol_sound_get(&mMagneLineChk);
-            field_0x2ff0 = 0;
-            field_0x3174 = dComIfG_Bgsp().GetGroundCode(mMagneLineChk);
-            field_0x2fbb = dComIfG_Bgsp().GetPolyAtt0(mMagneLineChk);
-            field_0x2fa8 = dComIfG_Bgsp().GetSpecialCode(mMagneLineChk);
-            setMagneBootsMtx(&mMagneLineChk, 0);
+        if (checkModeFlg(MODE_VINE_CLIMB) && mProcVar2.field_0x300c != 0 &&
+            dComIfG_Bgsp().ChkPolySafe(mPolyInfo1))
+        {
+            mZ2Link.framework(dKy_pol_sound_get(&mPolyInfo1), mVoiceReverbIntensity);
         } else {
-            mPolySound = 0;
-            field_0x2ff0 = 0;
-            field_0x3174 = -1;
-            field_0x2fbb = 16;
-            field_0x2fa8 = 0;
-        }
-    } else {
-        field_0x2f5c.mPow = 0.0f;
-        if (mProcID != PROC_MAGNE_BOOTS_FLY) {
-            mMagneBootsTopVec = cXyz::BaseY;
+            mZ2Link.framework(mPolySound, mVoiceReverbIntensity);
         }
-    }
 
-    if (dComIfGp_evmng_startCheck(l_peepEventName)) {
-        if (field_0x2ff2 > 0) {
-            field_0x2ff2--;
-        } else if (dComIfGp_evmng_startCheck(l_peepEventName)) {
-            startPeepChange();
+        if (field_0x2d7c != NULL) {
+            mZ2Link.updateAnime(field_0x2d7c->getFrame(), field_0x2d7c->getRate());
         }
-    }
-
-    if (checkModeFlg(MODE_VINE_CLIMB) && mProcVar2.field_0x300c != 0 &&
-        dComIfG_Bgsp().ChkPolySafe(mPolyInfo1))
-    {
-        mZ2Link.framework(dKy_pol_sound_get(&mPolyInfo1), mVoiceReverbIntensity);
-    } else {
-        mZ2Link.framework(mPolySound, mVoiceReverbIntensity);
-    }
 
-    if (field_0x2d7c != NULL) {
-        mZ2Link.updateAnime(field_0x2d7c->getFrame(), field_0x2d7c->getRate());
-    }
-
-    if (mProcID != PROC_DAMAGE && mProcID != PROC_SWIM_DAMAGE && mProcID != PROC_HORSE_DAMAGE) {
-        setMoveSlantAngle();
+        if (mProcID != PROC_DAMAGE && mProcID != PROC_SWIM_DAMAGE && mProcID != PROC_HORSE_DAMAGE) {
+            setMoveSlantAngle();
 
-        if (checkReinRide() && checkUpperGuardAnime()) {
-            setBodyAngleRideReadyAnime();
-        } else if (!checkSmallUpperGuardAnime() && !checkWolf()) {
-            if (!checkModeFlg(MODE_UNK_20000000)) {
-                if (checkUpperGuardAnime()) {
-                    setBodyAngleXReadyAnime(0);
-                } else if (!checkUpperReadyThrowAnime()) {
-                    cLib_addCalcAngleS(&mBodyAngle.x, 0, 4, 0x0C00, 0x0180);
+            if (checkReinRide() && checkUpperGuardAnime()) {
+                setBodyAngleRideReadyAnime();
+            } else if (!checkSmallUpperGuardAnime() && !checkWolf()) {
+                if (!checkModeFlg(MODE_UNK_20000000)) {
+                    if (checkUpperGuardAnime()) {
+                        setBodyAngleXReadyAnime(0);
+                    } else if (!checkUpperReadyThrowAnime()) {
+                        cLib_addCalcAngleS(&mBodyAngle.x, 0, 4, 0x0C00, 0x0180);
+                    }
                 }
-            }
 
-            if (!checkModeFlg(MODE_UNK_40000000)) {
-                cLib_addCalcAngleS(&mBodyAngle.y, 0, 4, 0x0C00, 0x0180);
+                if (!checkModeFlg(MODE_UNK_40000000)) {
+                    cLib_addCalcAngleS(&mBodyAngle.y, 0, 4, 0x0C00, 0x0180);
+                }
             }
         }
-    }
 
-    setMatrix();
-    setNeckAngle();
+        setMatrix();
+        setNeckAngle();
 
-    if (field_0x2fcc != 0) {
-        field_0x2fcc--;
-    }
+        if (field_0x2fcc != 0) {
+            field_0x2fcc--;
+        }
 
-    if (!checkWolf()) {
-        setHatAngle();
+        if (!checkWolf()) {
+            setHatAngle();
 
-        if (field_0x2fb0 != 0) {
-            field_0x2fb0--;
-        }
+            if (field_0x2fb0 != 0) {
+                field_0x2fb0--;
+            }
 
-        footBgCheck();
-        handBgCheck();
+            footBgCheck();
+            handBgCheck();
 
-        field_0x30c8 = mBodyAngle.y >> 1;
-        modelCalc(mpLinkModel);
+            field_0x30c8 = mBodyAngle.y >> 1;
+            modelCalc(mpLinkModel);
 
-        if (field_0x2fcb != 0) {
-            if (checkWoodShieldEquip() && mWaterY < mShieldModel->getBaseTRMtx()[1][3]) {
-                field_0x2fcb--;
+            if (field_0x2fcb != 0) {
+                if (checkWoodShieldEquip() && mWaterY < mShieldModel->getBaseTRMtx()[1][3]) {
+                    field_0x2fcb--;
 
-                if (field_0x2fcb == 0) {
-                    dMeter2Info_setShield(NO_ITEM, true);
-                    stickArrowIncrement(1);
-                    setWoodShieldBurnOutEffect();
+                    if (field_0x2fcb == 0) {
+                        dMeter2Info_setShield(NO_ITEM, true);
+                        stickArrowIncrement(1);
+                        setWoodShieldBurnOutEffect();
 
-                    // "Your shield burned up..."
-                    dMeter2Info_setFloatingMessage(2047, 90, false);
+                        // "Your shield burned up..."
+                        dMeter2Info_setFloatingMessage(2047, 90, false);
 
-                    stage_stag_info_class* pstag = dComIfGp_getStage()->getStagInfo();
-                    if (dStage_stagInfo_GetSaveTbl(pstag) == 0x11 &&
-                        !dComIfGs_isItemFirstBit(HYLIA_SHIELD))
-                    {
-                        fopAcM_onSwitch(this, 0x6F);
+                        stage_stag_info_class* pstag = dComIfGp_getStage()->getStagInfo();
+                        if (dStage_stagInfo_GetSaveTbl(pstag) == 0x11 &&
+                            !dComIfGs_isItemFirstBit(HYLIA_SHIELD))
+                        {
+                            fopAcM_onSwitch(this, 0x6F);
+                        }
+                        seStartOnlyReverb(Z2SE_AL_WOOD_SHIELD_BURN);
                     }
-                    seStartOnlyReverb(Z2SE_AL_WOOD_SHIELD_BURN);
+                } else {
+                    clearWoodShieldBurnEffect();
                 }
-            } else {
-                clearWoodShieldBurnEffect();
             }
-        }
 
-        if (checkShieldGet() && !checkWoodShieldEquip()) {
-            stickArrowIncrement(1);
-        }
-        setItemMatrix(0);
-    } else {
-        daMidna_c* pmidna = getMidnaActor();
+            if (checkShieldGet() && !checkWoodShieldEquip()) {
+                stickArrowIncrement(1);
+            }
+            setItemMatrix(0);
+        } else {
+            daMidna_c* pmidna = (daMidna_c*)getMidnaActor();
 
-        if (mClothesChangeWaitTimer == 0) {
-            if ((pmidna->checkMidnaTired() || pmidna->checkForceTiredColor()) &&
-                !pmidna->checkForceNormalColor())
-            {
-                mpWlMidnaModel->getModelData()->entryTevRegAnimator(mpDMidnaBrk);
-                mpWlMidnaMaskModel->getModelData()->entryTevRegAnimator(mpDMidnaMaskBrk);
-                mpWlMidnaHandModel->getModelData()->entryTevRegAnimator(mpDMidnaHandBrk);
-                mpWlMidnaHairModel->getModelData()->entryTevRegAnimator(mpDMidnaHairHandBrk);
-            } else {
-                mpWlMidnaModel->getModelData()->removeTevRegAnimator(mpDMidnaBrk);
-                mpWlMidnaMaskModel->getModelData()->removeTevRegAnimator(mpDMidnaMaskBrk);
-                mpWlMidnaHandModel->getModelData()->removeTevRegAnimator(mpDMidnaHandBrk);
-                mpWlMidnaHairModel->getModelData()->removeTevRegAnimator(mpDMidnaHairHandBrk);
+            if (mClothesChangeWaitTimer == 0) {
+                if ((pmidna->checkMidnaTired() || pmidna->checkForceTiredColor()) &&
+                    !pmidna->checkForceNormalColor())
+                {
+                    mpWlMidnaModel->getModelData()->entryTevRegAnimator(mpDMidnaBrk);
+                    mpWlMidnaMaskModel->getModelData()->entryTevRegAnimator(mpDMidnaMaskBrk);
+                    mpWlMidnaHandModel->getModelData()->entryTevRegAnimator(mpDMidnaHandBrk);
+                    mpWlMidnaHairModel->getModelData()->entryTevRegAnimator(mpDMidnaHairHandBrk);
+                } else {
+                    mpWlMidnaModel->getModelData()->removeTevRegAnimator(mpDMidnaBrk);
+                    mpWlMidnaMaskModel->getModelData()->removeTevRegAnimator(mpDMidnaMaskBrk);
+                    mpWlMidnaHandModel->getModelData()->removeTevRegAnimator(mpDMidnaHandBrk);
+                    mpWlMidnaHairModel->getModelData()->removeTevRegAnimator(mpDMidnaHairHandBrk);
+                }
             }
-        }
 
-        wolfFootBgCheck();
-        setWolfTailAngle();
-        modelCalc(mpLinkModel);
-        checkWolfUseAbility();
+            wolfFootBgCheck();
+            setWolfTailAngle();
+            modelCalc(mpLinkModel);
+            checkWolfUseAbility();
 
-        if (checkWolfEyeUp() != 0) {
-            mWolfEyeUpTimer++;
-            if (mWolfEyeUpTimer > 30) {
-                mWolfEyeUpTimer = 30;
+            if (checkWolfEyeUp() != 0) {
+                mWolfEyeUpTimer++;
+                if (mWolfEyeUpTimer > 30) {
+                    mWolfEyeUpTimer = 30;
+                }
+            } else if (mWolfEyeUpTimer != 0) {
+                mWolfEyeUpTimer--;
             }
-        } else if (mWolfEyeUpTimer != 0) {
-            mWolfEyeUpTimer--;
+
+            setWolfItemMatrix();
         }
 
-        setWolfItemMatrix();
-    }
+        if (checkFmChainGrabAnime()) {
+            mNowAnmPackUpper[2].setRatio(1.0f);
+        }
 
-    if (checkFmChainGrabAnime()) {
-        mNowAnmPackUpper[2].setRatio(1.0f);
-    }
+        setBodyPartPos();
 
-    setBodyPartPos();
+        if (!checkWolf() && checkEndResetFlg0(ERFLG0_UNK_800000)) {
+            setHatAngle();
+            modelCalc(mpLinkModel);
+        }
 
-    if (!checkWolf() && checkEndResetFlg0(ERFLG0_UNK_800000)) {
-        setHatAngle();
-        modelCalc(mpLinkModel);
-    }
+        setHangWaterY();
+        setCollision();
+        setAttentionPos();
+        setLight();
+        setEffect();
 
-    setHangWaterY();
-    setCollision();
-    setAttentionPos();
-    setLight();
-    setEffect();
+        if (mClothesChangeWaitTimer != 0) {
+            mDoMtx_stack_c::copy(mpLinkModel->getBaseTRMtx());
 
-    if (mClothesChangeWaitTimer != 0) {
-        mDoMtx_stack_c::copy(mpLinkModel->getBaseTRMtx());
+            if (!checkWolf()) {
+                mDoMtx_stack_c::transM(0.0f, 0.0f, 30.0f);
+            }
 
-        if (!checkWolf()) {
-            mDoMtx_stack_c::transM(0.0f, 0.0f, 30.0f);
+            mpWlChangeModel->setBaseTRMtx(mDoMtx_stack_c::get());
+            mpWlChangeModel->calc();
         }
 
-        mpWlChangeModel->setBaseTRMtx(mDoMtx_stack_c::get());
-        mpWlChangeModel->calc();
-    }
-
-    mSight.mLockCursor.update();
-    setGrabItemPos();
+        mSight.mLockCursor.update();
+        setGrabItemPos();
 
-    checkRoofRestart();
-    mExitID = 0x3F;
-    mpScnChg = NULL;
+        checkRoofRestart();
+        mExitID = 0x3F;
+        mpScnChg = NULL;
 
-    cMtx_multVec(mpLinkModel->getAnmMtx(0), &localBoomCatchPos, &field_0x3534);
-
-    if (checkResetFlg0(RFLG0_UNK_10)) {
-        mZ2Link.setResumeAttack(true);
-    } else {
-        mZ2Link.setResumeAttack(false);
-    }
+        static Vec const localBoomCatchPos = {18.7f, 146.3f, 69.2f};
+        cMtx_multVec(mpLinkModel->getAnmMtx(0), &localBoomCatchPos, &field_0x3534);
 
-    if (!checkEventRun() && checkNoResetFlg0(FLG0_UNK_80) &&
-        (mWaterY > current.pos.y + 40.0f || checkModeFlg(MODE_SWIMMING)) &&
-        getMoveBGActorName(mLinkAcch.m_wtr, TRUE) == PROC_Obj_Onsen)
-    {
-        if (mHotspringRecoverTimer != 0) {
-            mHotspringRecoverTimer--;
+        if (checkResetFlg0(RFLG0_UNK_10)) {
+            mZ2Link.setResumeAttack(true);
         } else {
-            mHotspringRecoverTimer = daAlinkHIO_basic_c0::m.mHotspringRecoverTime;
-            dComIfGp_setItemLifeCount(1.0f, 1);
+            mZ2Link.setResumeAttack(false);
         }
-    } else {
-        mHotspringRecoverTimer = daAlinkHIO_basic_c0::m.mHotspringRecoverTime;
-    }
 
-    if ((checkAttentionLock() || !checkUpperReadyThrowAnime()) &&
-        mProcID != PROC_HOOKSHOT_WALL_SHOOT && mProcID != PROC_HOOKSHOT_ROOF_SHOOT)
-    {
-        mFastShotTime = 0;
-    }
-
-    if (checkDeadHP()) {
-        eventInfo.offCondition(fopAcCnd_NOEXEC_e);
-    } else if (!checkMagneBootsOn()) {
-        f32 var_f31_2;
-        if (mLinkAcch.ChkGroundHit()) {
-            cM3dGPla plane;
-            dComIfG_Bgsp().GetTriPla(mLinkAcch.m_gnd, &plane);
-            var_f31_2 = plane.mNormal.y;
+        if (!checkEventRun() && checkNoResetFlg0(FLG0_UNK_80) &&
+            (mWaterY > current.pos.y + 40.0f || checkModeFlg(MODE_SWIMMING)) &&
+            getMoveBGActorName(mLinkAcch.m_wtr, TRUE) == PROC_Obj_Onsen)
+        {
+            if (mHotspringRecoverTimer != 0) {
+                mHotspringRecoverTimer--;
+            } else {
+                mHotspringRecoverTimer = daAlinkHIO_basic_c0::m.mHotspringRecoverTime;
+                dComIfGp_setItemLifeCount(1.0f, 1);
+            }
         } else {
-            var_f31_2 = -1.0f;
+            mHotspringRecoverTimer = daAlinkHIO_basic_c0::m.mHotspringRecoverTime;
         }
 
-        if (cBgW_CheckBGround(var_f31_2) && !checkModeFlg(MODE_PLAYER_FLY)) {
-            eventInfo.onCondition(0x5D);
-        } else if (checkModeFlg(MODE_SWIMMING) || mProcID == PROC_WOLF_ROPE_MOVE ||
-                   ((checkReinRide() || checkCanoeRide() || checkSpinnerRide()) &&
-                    !checkNoResetFlg3(FLG3_UNK_80000) && !checkModeFlg(MODE_JUMP)))
+        if (checkAttentionLock() || (!checkUpperReadyThrowAnime() &&
+            mProcID != PROC_HOOKSHOT_WALL_SHOOT && mProcID != PROC_HOOKSHOT_ROOF_SHOOT))
         {
-            eventInfo.onCondition(dEvtCnd_CANTALK_e);
-            if (checkReinRide() || checkCanoeRide()) {
-                eventInfo.onCondition(dEvtCnd_CANGETITEM_e);
+            mFastShotTime = 0;
+        }
+
+        if (checkDeadHP()) {
+            eventInfo.offCondition(fopAcCnd_NOEXEC_e);
+        } else if (!checkMagneBootsOn()) {
+            f32 var_f31_2;
+            if (mLinkAcch.ChkGroundHit()) {
+                cM3dGPla plane;
+                dComIfG_Bgsp().GetTriPla(mLinkAcch.m_gnd, &plane);
+                var_f31_2 = plane.mNormal.y;
+            } else {
+                var_f31_2 = -1.0f;
+            }
+
+            if (cBgW_CheckBGround(var_f31_2) && !checkModeFlg(MODE_PLAYER_FLY)) {
+                eventInfo.onCondition(0x5D);
+            } else if (checkModeFlg(MODE_SWIMMING) || mProcID == PROC_WOLF_ROPE_MOVE ||
+                    ((checkReinRide() || checkCanoeRide() || checkSpinnerRide()) &&
+                        !checkNoResetFlg3(FLG3_UNK_80000) && !checkModeFlg(MODE_JUMP)))
+            {
+                eventInfo.onCondition(dEvtCnd_CANTALK_e);
+                if (checkReinRide() || checkCanoeRide()) {
+                    eventInfo.onCondition(dEvtCnd_CANGETITEM_e);
+                }
             }
+        } else if (checkMagneBootsOn() && cBgW_CheckBGround(mMagneBootsTopVec.y)) {
+            eventInfo.onCondition(dEvtCnd_CANTALK_e);
         }
-    } else if (checkMagneBootsOn() && cBgW_CheckBGround(mMagneBootsTopVec.y)) {
-        eventInfo.onCondition(dEvtCnd_CANTALK_e);
-    }
 
-    if (checkEndResetFlg1(ERFLG1_UNK_40000) && checkMidnaRide() && checkWolf()) {
-        getMidnaActor()->onForcePanic();
-    }
+        if (checkEndResetFlg1(ERFLG1_UNK_40000) && checkMidnaRide() && checkWolf()) {
+            getMidnaActor()->onForcePanic();
+        }
 
-    field_0x30fe = 0;
-    field_0x372c = cXyz::Zero;
-    field_0x2fb8 = 0;
+        field_0x30fe = 0;
+        field_0x372c = cXyz::Zero;
+        field_0x2fb8 = 0;
 
-    if (checkMagicArmorWearAbility() && mClothesChangeWaitTimer == 0) {
-        if (checkMagicArmorNoDamage() && !checkEventRun()) {
-            if (field_0x2fc3 == 0) {
-                field_0x2fc3 = 10;
-                dComIfGp_setItemRupeeCount(-1);
-            } else {
-                field_0x2fc3--;
+        if (checkMagicArmorWearAbility() && mClothesChangeWaitTimer == 0) {
+            if (checkMagicArmorNoDamage() && !checkEventRun()) {
+                if (field_0x2fc3 == 0) {
+                    field_0x2fc3 = 10;
+                    dComIfGp_setItemRupeeCount(-1);
+                } else {
+                    field_0x2fc3--;
+                }
+            }
+
+            if (dComIfGs_getRupee() == 0 && field_0x2fd7 != 0) {
+                setMagicArmorBrk(0);
+                seStartOnlyReverb(Z2SE_AL_M_ARMER_TURNOFF);
+                mZ2Link.setLinkState(5);
+            } else if (dComIfGs_getRupee() != 0 && field_0x2fd7 == 0) {
+                setMagicArmorBrk(1);
+                seStartOnlyReverb(Z2SE_AL_M_ARMER_RECOVER);
+                mZ2Link.setLinkState(4);
             }
         }
 
-        if (dComIfGs_getRupee() == 0 && field_0x2fd7 != 0) {
-            setMagicArmorBrk(0);
-            seStartOnlyReverb(Z2SE_AL_M_ARMER_TURNOFF);
-            mZ2Link.setLinkState(5);
-        } else if (dComIfGs_getRupee() == 0 && field_0x2fd7 == 0) {
-            setMagicArmorBrk(1);
-            seStartOnlyReverb(Z2SE_AL_M_ARMER_RECOVER);
-            mZ2Link.setLinkState(4);
+        if (!checkWolf()) {
+            for (u8 i = 0; i < 2; i++) {
+                u8 tmp = (i + 1) % 2;
+                if (dComIfGp_getSelectItem(i) == EMPTY_BOTTLE && (field_0x2fae & (1 << i)) &&
+                    dComIfGp_getSelectItem(tmp) == EMPTY_BOTTLE)
+                {
+                    field_0x2fae |= (u8)(1 << tmp);
+                }
+            }
         }
-    }
 
-    if (!checkWolf()) {
         for (int i = 0; i < 2; i++) {
-            u8 tmp = (i + 1) & 1;
-            if (dComIfGp_getSelectItem(i) == EMPTY_BOTTLE && (field_0x2fae & (1 << i)) &&
-                dComIfGp_getSelectItem(tmp) == EMPTY_BOTTLE)
-            {
-                field_0x2fae |= (1 << tmp);
+            if (!(field_0x2fae & (1 << i)) && !(field_0x2faf & (1 << i))) {
+                dMeter2Info_offUseButton(4 << i);
             }
         }
-    }
 
-    for (int i = 0; i < 2; i++) {
-        if (!(field_0x2fae & (1 << i)) && !(field_0x2faf & (1 << i))) {
-            dMeter2Info_offUseButton(4 << i);
+        if (!(field_0x2fae & 0x40) && !(field_0x2faf & 0x40)) {
+            dMeter2Info_offUseButton(0x40);
         }
-    }
 
-    if (!(field_0x2fae & 0x40) && !(field_0x2faf & 0x40)) {
-        dMeter2Info_offUseButton(0x40);
-    }
-
-    if (!(field_0x2fae & 0x8) && !(field_0x2faf & 0x8)) {
-        dMeter2Info_offUseButton(2);
-        if (getSumouMode()) {
-            dMeter2Info_offUseButton(1);
+        if (!(field_0x2fae & 0x8) && !(field_0x2faf & 0x8)) {
+            dMeter2Info_offUseButton(2);
+            if (getSumouMode()) {
+                dMeter2Info_offUseButton(1);
+            }
         }
-    }
 
-    field_0x2faf = field_0x2fae;
+        field_0x2faf = field_0x2fae;
 
-    for (int i = 0; i < 4; i++) {
-        cXyz tmp(current.pos.x + 500.0f, current.pos.y + 500.0f, current.pos.z + 500.0f);
-        if (i != field_0x2fa3 - 1) {
-            field_0x354c[i] = tmp;
+        for (int i = 0; i < 4; i++) {
+            cXyz tmp(current.pos.x + 500.0f, current.pos.y + 500.0f, current.pos.z + 500.0f);
+            if (i != field_0x2fa3 - 1) {
+                field_0x354c[i] = tmp;
+            }
         }
-    }
 
-    if (checkEventRun()) {
-        if (mProcID != PROC_GRASS_WHISTLE_WAIT) {
-            setDoStatus(0);
-        }
-        setRStatus(0);
-    } else if (dComIfGp_getDoStatus() == 0x86 || dComIfGp_getDoStatus() == 0x8B) {
-        setDoStatus(3);
-    } else if (dComIfGp_getDoStatus() == 0x89) {
-        setDoStatus(8);
-    } else if (dComIfGp_getDoStatus() == 0x93) {
-        setDoStatusEmphasys(0x19);
-    } else if (dComIfGp_getDoStatus() == 0x8E) {
-        setDoStatusEmphasys(0x15);
-    } else {
-        if (dComIfGp_getDoStatus() == 0x8C) {
-            setDoStatus(0);
-        } else if (checkStageName("F_SP127") && checkCanoeRide() && dComIfGp_getDoStatus() == 4) {
-            setDoStatus(0);
-        } else if (dComIfGp_getDoStatus() == 0x90) {
-            setDoStatus(0);
-        } else if (dComIfGp_getDoStatus() == 0x98) {
-            setDoStatusEmphasys(0x39);
-        } else if (dComIfGp_getDoStatus() == 0x99) {
-            setDoStatusEmphasys(0x15);
-        } else if (dComIfGp_getDoStatus() == 0x91) {
-            if (checkWolf() ||
-                (field_0x27f4 != NULL &&
-                 (field_0x27f4->speedF > 0.1f ||
-                  (checkGoatCatchActor(field_0x27f4) && fopAcM_GetName(field_0x27f4) != PROC_COW))))
-            {
-                setDoStatusEmphasys(0x15);
-            } else {
+        if (checkEventRun()) {
+            if (mProcID != PROC_GRASS_WHISTLE_WAIT) {
                 setDoStatus(0);
             }
-        } else if (dComIfGp_getDoStatus() == 0x97) {
-            if (current.pos.y + 200.0f < mWaterY) {
-                setDoStatus(0x4C);
-            } else {
+            setRStatus(0);
+        } else {
+            if (dComIfGp_getDoStatus() == 0x86 || dComIfGp_getDoStatus() == 0x8B) {
+                setDoStatus(3);
+            } else if (dComIfGp_getDoStatus() == 0x89) {
+                setDoStatus(8);
+            } else if (dComIfGp_getDoStatus() == 0x93) {
+                setDoStatusEmphasys(0x19);
+            } else if (dComIfGp_getDoStatus() == 0x8E) {
+                setDoStatusEmphasys(0x15);
+            } else if (dComIfGp_getDoStatus() == 0x8C) {
                 setDoStatus(0);
+            } else if (checkStageName("F_SP127") && checkCanoeRide() && dComIfGp_getDoStatus() == 4) {
+                setDoStatus(0);
+            } else if (dComIfGp_getDoStatus() == 0x90) {
+                setDoStatus(0);
+            } else if (dComIfGp_getDoStatus() == 0x98) {
+                setDoStatusEmphasys(0x39);
+            } else if (dComIfGp_getDoStatus() == 0x99) {
+                setDoStatusEmphasys(0x15);
+            } else if (dComIfGp_getDoStatus() == 0x91) {
+                if (checkWolf() ||
+                    (field_0x27f4 != NULL &&
+                        (field_0x27f4->speedF > 0.1f ||
+                        (checkGoatCatchActor(field_0x27f4) && fopAcM_GetName(field_0x27f4) != PROC_COW))))
+                {
+                    setDoStatusEmphasys(0x15);
+                } else {
+                    setDoStatus(0);
+                }
+            } else if (dComIfGp_getDoStatus() == 0x97) {
+                if (current.pos.y + 200.0f < mWaterY) {
+                    setDoStatus(0x4C);
+                } else {
+                    setDoStatus(0);
+                }
+            } else if (dComIfGp_getDoStatus() == 0x19 && dComIfGp_getHorseActor() != NULL &&
+                        dComIfGp_getHorseActor()->getZeldaActor() != NULL)
+            {
+                setDoStatus(0x19);
+            } else if (dComIfGp_getDoStatus() == 5 && field_0x27f4 != NULL &&
+                        (fopAcM_GetName(field_0x27f4) == PROC_Obj_WindStone ||
+                        fopAcM_GetName(field_0x27f4) == PROC_Obj_SmWStone))
+            {
+                setDoStatusEmphasys(0x3B);
+            } else if (dComIfGp_getDoStatus() == 0x14) {
+                if (checkEndResetFlg1(ERFLG1_UNK_4000000)) {
+                    setDoStatusEmphasys(0x61);
+                } else if (checkEndResetFlg1(ERFLG1_UNK_10000000)) {
+                    setDoStatusEmphasys(0x14);
+                }
             }
-        } else if (dComIfGp_getDoStatus() == 0x19 && dComIfGp_getHorseActor() != NULL &&
-                   dComIfGp_getHorseActor()->getZeldaActor() != NULL)
-        {
-            setDoStatus(0x19);
-        } else if (dComIfGp_getDoStatus() == 5 && field_0x27f4 != NULL &&
-                   (fopAcM_GetName(field_0x27f4) == PROC_Obj_WindStone ||
-                    fopAcM_GetName(field_0x27f4) == PROC_Obj_SmWStone))
-        {
-            setDoStatusEmphasys(0x3B);
-        } else if (dComIfGp_getDoStatus() == 0x14) {
-            if (checkEndResetFlg1(ERFLG1_UNK_4000000)) {
-                setDoStatusEmphasys(0x61);
-            } else if (checkEndResetFlg1(ERFLG1_UNK_10000000)) {
-                setDoStatusEmphasys(0x14);
-            }
-        }
 
-        int grab_status = getWallGrabStatus();
-        if (checkWolf()) {
-            if (grab_status == 0x15) {
-                setWallGrabStatus(0x3F, 2);
-            } else if (grab_status == 0x96) {
-                setWallGrabStatus(0xC, checkChainEmphasys());
-            }
-        } else {
-            if (grab_status == 0x96) {
-                setWallGrabStatus(0x15, checkChainEmphasys());
-            }
+            int grab_status = getWallGrabStatus();
+            if (checkWolf()) {
+                if (grab_status == 0x15) {
+                    setWallGrabStatus(0x3F, 2);
+                } else if (grab_status == 0x96) {
+                    setWallGrabStatus(0xC, checkChainEmphasys());
+                }
+            } else {
+                if (grab_status == 0x96) {
+                    setWallGrabStatus(0x15, checkChainEmphasys());
+                }
 
-            if (dComIfGp_getRStatus() == 0x3A && checkShieldAttackEmphasys() == 0) {
-                setRStatus(0);
+                if (dComIfGp_getRStatus() == 0x3A && checkShieldAttackEmphasys() == 0) {
+                    setRStatus(0);
+                }
             }
         }
-    }
 
-    mDoAud_setLinkHp(dComIfGs_getLife(), dComIfGs_getMaxLifeGauge());
+        mDoAud_setLinkHp(dComIfGs_getLife(), dComIfGs_getMaxLifeGauge());
+    }
 
     if (dComIfGp_att_getCatghTarget() != NULL && !checkWolf()) {
-        if (checkRideOn() && checkCastleTownUseItem(EMPTY_BOTTLE)) {
+        if (!checkRideOn() && checkCastleTownUseItem(EMPTY_BOTTLE)) {
             dComIfGp_setBottleStatus(0x6C, 0);
         }
     }
@@ -3318,11 +3281,6 @@ int daAlink_c::execute() {
 
     return 1;
 }
-#else
-int daAlink_c::execute() {
-    // NONMATCHING
-}
-#endif
 
 /* 800CAFA8-800CAFC8 0C58E8 0020+00 1/0 0/0 0/0 .text            daAlink_Execute__FP9daAlink_c */
 static int daAlink_Execute(daAlink_c* i_this) {
@@ -4050,18 +4008,41 @@ int daAlink_c::procCoSwimSubjectivityInit() {
 /* 800CF018-800CF100 0C9958 00E8+00 1/0 0/0 0/0 .text procCoSwimSubjectivity__9daAlink_cFv */
 int daAlink_c::procCoSwimSubjectivity() {
     // NONMATCHING
+    onResetFlg0(RFLG0_UNK_4000000);
+    setTalkStatus();
+
+    if (orderTalk(1)) {
+        return 1;
+    }
+
+    if (checkNoResetFlg0(FLG0_SWIM_UP)) {
+        setSwimUpDownOffset();
+    }
+
+    if (checkSubjectEnd(0)) {
+        seStartSystem(Z2SE_SUBJ_VIEW_OUT);
+
+        if (checkWolf()) {
+            procWolfSwimWaitInit(0);
+        } else {
+            procSwimWaitInit(0);
+        }
+    } else {
+        setBodyAngleToCamera();
+    }
+
+    return 1;
 }
 
 /* 800CF100-800CF1B8 0C9A40 00B8+00 1/1 0/0 0/0 .text procCoPeepSubjectivityInit__9daAlink_cFv */
 int daAlink_c::procCoPeepSubjectivityInit() {
     commonProcInit(PROC_PEEP_SUBJECTIVITY);
-    f32 tmp_0 = 0.0f;
-    mNormalSpeed = tmp_0;
+    mNormalSpeed = 0.0f;
 
     if (checkWolf()) {
-        setSingleAnimeWolfBaseSpeed(WANM_WAIT, tmp_0, 3.0f);
+        setSingleAnimeWolfBaseSpeed(WANM_WAIT, 0.0f, 3.0f);
     } else {
-        setSingleAnimeBaseSpeed(ANM_WAIT, tmp_0, 3.0f);
+        setSingleAnimeBaseSpeed(ANM_WAIT, 0.0f, 3.0f);
     }
 
     onPlayerNoDraw();
diff --git a/src/d/actor/d_a_myna.cpp b/src/d/actor/d_a_myna.cpp
index b56785610d..15a6e55cc3 100644
--- a/src/d/actor/d_a_myna.cpp
+++ b/src/d/actor/d_a_myna.cpp
@@ -1733,7 +1733,7 @@ void daMyna_c::attack2_talk_move() {
 }
 
 /* 809487EC-80948828 002C6C 003C+00 0/0 0/0 2/2 .text            soldoutItem__8daMyna_cFUi */
-void daMyna_c::soldoutItem(unsigned int i_itemId) {
+void daMyna_c::soldoutItem(fpc_ProcID i_itemId) {
     for (int i = 0; i < mNumShopItems; i++) {
         if (i_itemId == mShopItems[i].mTargetActorID) {
             mShopItems[i].mItemStatus = 3;
@@ -1968,7 +1968,7 @@ void daMyna_c::deleteItem(int i_itemIndex) {
 /* 80949144-80949190 0035C4 004C+00 0/0 0/0 0/0 .text            deleteItem__8daMyna_cFUi */
 // Nonmatching, no clue what's going on here
 #ifdef NONMATCHING
-void daMyna_c::deleteItem(unsigned int i_itemId) {
+void daMyna_c::deleteItem(fpc_ProcID i_itemId) {
     for (int i = 0; i < mNumShopItems; i++) {
         if (i_itemId == mShopItems[i].mTargetActorID) {
             mShopItems[i].mTargetActorID = -1;
@@ -1977,7 +1977,7 @@ void daMyna_c::deleteItem(unsigned int i_itemId) {
     }
 }
 #else
-void daMyna_c::deleteItem(unsigned int param_0) {
+void daMyna_c::deleteItem(fpc_ProcID param_0) {
     // NONMATCHING
 }
 #endif
@@ -2884,4 +2884,4 @@ static u8 data_8094BB2C[4];
 static u8 data_8094BB30[4];
 #pragma pop
 
-/* 8094B24C-8094B24C 00009C 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
\ No newline at end of file
+/* 8094B24C-8094B24C 00009C 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
diff --git a/src/d/d_bg_s.cpp b/src/d/d_bg_s.cpp
index b24727deec..139e15393c 100644
--- a/src/d/d_bg_s.cpp
+++ b/src/d/d_bg_s.cpp
@@ -18,7 +18,7 @@ void cBgS_ChkElm::Init() {
 }
 
 /* 80074110-80074128 06EA50 0018+00 1/0 0/0 0/0 .text Regist2__11cBgS_ChkElmFP9dBgW_BaseUiPv */
-void cBgS_ChkElm::Regist2(dBgW_Base* p_data, unsigned int actor_id, void* p_actor) {
+void cBgS_ChkElm::Regist2(dBgW_Base* p_data, fpc_ProcID actor_id, void* p_actor) {
     m_used = true;
     m_bgw_base_ptr = p_data;
     m_actor_id = actor_id;
@@ -38,7 +38,7 @@ void cBgS_ChkElm::Release() {
 static int l_SetCounter;
 
 /* 80074144-80074250 06EA84 010C+00 1/1 0/0 0/0 .text            Regist__4cBgSFP9dBgW_BaseUiPv */
-bool cBgS::Regist(dBgW_Base* p_data, unsigned int actor_id, void* p_actor) {
+bool cBgS::Regist(dBgW_Base* p_data, fpc_ProcID actor_id, void* p_actor) {
     if (p_data == NULL) {
         return true;
     } else if (p_data->ChkUsed()) {
@@ -907,4 +907,4 @@ f32 dBgS_GetNY(cBgS_PolyInfo const& poly) {
 
     dComIfG_Bgsp().GetTriPla(poly, &pla);
     return pla.mNormal.y;
-}
\ No newline at end of file
+}
diff --git a/src/d/d_bg_s_acch.cpp b/src/d/d_bg_s_acch.cpp
index 9b34d2f813..6f88296b7b 100644
--- a/src/d/d_bg_s_acch.cpp
+++ b/src/d/d_bg_s_acch.cpp
@@ -589,7 +589,7 @@ f32 dBgS_Acch::GetWallAddY(Vec& param_0) {
 
 /* 80077278-80077288 071BB8 0010+00 0/0 2/2 0/0 .text            SetNowActorInfo__9dBgS_AcchFiPvUi
  */
-void dBgS_Acch::SetNowActorInfo(int bg_index, void* param_1, unsigned int param_2) {
+void dBgS_Acch::SetNowActorInfo(int bg_index, void* param_1, fpc_ProcID param_2) {
     m_bg_index = bg_index;
     field_0x7c = param_1;
     field_0x80 = param_2;
@@ -660,4 +660,4 @@ bool dBgS_Acch::ChkLineDown() {
     return m_flags & LINE_DOWN;
 }
 
-#pragma nosyminline on
\ No newline at end of file
+#pragma nosyminline on
diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp
index 2489c238f8..d4541dcf40 100644
--- a/src/d/d_camera.cpp
+++ b/src/d/d_camera.cpp
@@ -4294,7 +4294,7 @@ void dCamera_c::ForceLockOn(fopAc_ac_c* param_0) {
 }
 
 /* 80181560-8018159C 17BEA0 003C+00 1/1 0/0 0/0 .text            ForceLockOff__9dCamera_cFUi */
-void dCamera_c::ForceLockOff(unsigned int param_0) {
+void dCamera_c::ForceLockOff(fpc_ProcID param_0) {
     // NONMATCHING
 }
 
@@ -5034,4 +5034,4 @@ extern "C" void checkEndMessage__12daTagMwait_cFv() {
     // NONMATCHING
 }
 
-/* 80393F68-80393F68 0205C8 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
\ No newline at end of file
+/* 80393F68-80393F68 0205C8 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
diff --git a/src/d/d_cc_d.cpp b/src/d/d_cc_d.cpp
index f37704a578..102f672064 100644
--- a/src/d/d_cc_d.cpp
+++ b/src/d/d_cc_d.cpp
@@ -26,7 +26,7 @@ void dCcD_GAtTgCoCommonBase::ct() {
 }
 
 /* 80083678-80083688 07DFB8 0010+00 0/0 2/2 0/0 .text SetHitApid__22dCcD_GAtTgCoCommonBaseFUi */
-void dCcD_GAtTgCoCommonBase::SetHitApid(unsigned int hitApid) {
+void dCcD_GAtTgCoCommonBase::SetHitApid(fpc_ProcID hitApid) {
     mApid = hitApid;
     mAc = NULL;
 }
@@ -461,4 +461,4 @@ void dCcD_Sph::MoveCAt(cXyz& pos) {
 
 cCcD_ShapeAttr* dCcD_Sph::GetShapeAttr() {
     return this;
-}
\ No newline at end of file
+}
diff --git a/src/d/d_com_inf_game.cpp b/src/d/d_com_inf_game.cpp
index ff5eb14518..1fded32d65 100644
--- a/src/d/d_com_inf_game.cpp
+++ b/src/d/d_com_inf_game.cpp
@@ -956,7 +956,7 @@ void dComIfG_inf_c::ct() {
     play.ct();
     mWorldDark = 0;
     field_0x1ddfa = -1;
-    field_0x1ddfb = 0;
+    mPolyDamageOff = false;
     field_0x1de00 = 0;
     field_0x1de04 = 0;
     field_0x1de08 = 0;
@@ -2245,12 +2245,12 @@ BOOL dComIfGs_Wolf_Change_Check() {
     return is_wolf;
 }
 
-void dComIfGs_PolyDamageOff_Set(s8 param_0) {
-    g_dComIfG_gameInfo.field_0x1ddfb = param_0;
+void dComIfGs_PolyDamageOff_Set(s8 i_setting) {
+    g_dComIfG_gameInfo.mPolyDamageOff = i_setting;
 }
 
-u8 dComIfGs_PolyDamageOff_Check() {
-    return g_dComIfG_gameInfo.field_0x1ddfb;
+s8 dComIfGs_PolyDamageOff_Check() {
+    return g_dComIfG_gameInfo.mPolyDamageOff;
 }
 
 void dComIfGs_shake_kandelaar() {
@@ -2370,4 +2370,4 @@ u8 dComIfGs_staffroll_next_go_check() {
 GXColor g_whiteColor = {255, 255, 255, 255};
 
 /* 8045060C-80450610 00008C 0004+00 0/0 3/3 3/3 .sdata           g_saftyWhiteColor */
-GXColor g_saftyWhiteColor = {160, 160, 160, 255};
\ No newline at end of file
+GXColor g_saftyWhiteColor = {160, 160, 160, 255};
diff --git a/src/d/d_event.cpp b/src/d/d_event.cpp
index 1028ca36e7..2665db02ff 100644
--- a/src/d/d_event.cpp
+++ b/src/d/d_event.cpp
@@ -1080,7 +1080,7 @@ u32 dEvt_control_c::getPId(void* actor) {
 }
 
 /* 800432EC-8004331C 03DC2C 0030+00 7/7 13/13 16/16 .text            convPId__14dEvt_control_cFUi */
-fopAc_ac_c* dEvt_control_c::convPId(unsigned int id) {
+fopAc_ac_c* dEvt_control_c::convPId(fpc_ProcID id) {
     return (fopAc_ac_c*)fopAcIt_Judge(fpcSch_JudgeByID, &id);
 }
 
@@ -1207,7 +1207,7 @@ void dEvt_control_c::setPtI(void* ptr) {
     mPtI = getPId(ptr);
 }
 
-void dEvt_control_c::setPtI_Id(unsigned int id) {
+void dEvt_control_c::setPtI_Id(fpc_ProcID id) {
     mPtI = id;
 }
 
@@ -1220,4 +1220,4 @@ void dEvt_control_c::setGtItm(u8 itemNo) {
 }
 
 /* 80379DC6-80379DD0 006426 0008+02 0/0 0/0 0/0 .rodata          None */
-static char const* const stringBase_80379DC6 = "GIVEMAN";
\ No newline at end of file
+static char const* const stringBase_80379DC6 = "GIVEMAN";
diff --git a/src/d/d_gameover.cpp b/src/d/d_gameover.cpp
index bc5a920a1b..a758e94b5b 100644
--- a/src/d/d_gameover.cpp
+++ b/src/d/d_gameover.cpp
@@ -958,7 +958,7 @@ s32 d_GameOver_Create(u8 i_gameoverType) {
 }
 
 /* 8019C008-8019C06C 196948 0064+00 0/0 1/1 0/0 .text            d_GameOver_Delete__FRUi */
-bool d_GameOver_Delete(unsigned int& i_id) {
+bool d_GameOver_Delete(fpc_ProcID& i_id) {
     if (i_id != UINT32_MAX) {
         fopMsgM_Delete(fopMsgM_SearchByID(i_id));
         i_id = -1;
@@ -996,4 +996,4 @@ extern "C" void __dt__12dMenu_save_cFv() {
     // NONMATCHING
 }
 
-/* 80394C28-80394C28 021288 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
\ No newline at end of file
+/* 80394C28-80394C28 021288 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp
index b8e3404251..762f35ae78 100644
--- a/src/d/d_kankyo.cpp
+++ b/src/d/d_kankyo.cpp
@@ -4888,7 +4888,7 @@ static void dKy_Sound_init() {
 }
 
 /* 801A81C0-801A8474 1A2B00 02B4+00 0/0 5/5 27/27 .text            dKy_Sound_set__F4cXyziUii */
-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) {
     // NONMATCHING
 }
 
@@ -6259,4 +6259,4 @@ void dKy_bg_MAxx_proc(void* param_0) {
 // dScnKy_env_light_c::~dScnKy_env_light_c() {
 extern "C" void __dt__18dScnKy_env_light_cFv() {
     // NONMATCHING
-}
\ No newline at end of file
+}
diff --git a/src/d/d_msg_object.cpp b/src/d/d_msg_object.cpp
index d1c3fd43ac..a0337a8288 100644
--- a/src/d/d_msg_object.cpp
+++ b/src/d/d_msg_object.cpp
@@ -2888,7 +2888,7 @@ void* dMsgObject_c::getMsgDtPtr() {
 }
 
 /* 80238188-8023819C 232AC8 0014+00 0/0 0/0 1/1 .text            setProcessID__12dMsgObject_cFUi */
-void dMsgObject_c::setProcessID(unsigned int id) {
+void dMsgObject_c::setProcessID(fpc_ProcID id) {
     dMsgObject_getMsgObjectClass()->setProcessIDLocal(id);
 }
 
@@ -3263,4 +3263,4 @@ extern "C" void setActorPos__19jmessage_tReferenceF4cXyz() {
     // NONMATCHING
 }
 
-/* 80399660-80399660 025CC0 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
\ No newline at end of file
+/* 80399660-80399660 025CC0 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
diff --git a/src/d/d_s_room.cpp b/src/d/d_s_room.cpp
index a57bada88f..82186dc92f 100644
--- a/src/d/d_s_room.cpp
+++ b/src/d/d_s_room.cpp
@@ -121,7 +121,7 @@ static int deleteJugge(void* i_obj, void*) {
 }
 
 /* 8025B174-8025B194 255AB4 0020+00 1/1 0/0 0/0 .text isCreatingCallback__FP10create_tagPUi */
-static void* isCreatingCallback(create_tag* param_1, unsigned int* param_2) {
+static void* isCreatingCallback(create_tag* param_1, fpc_ProcID* param_2) {
     void* tagData = param_1->mBase.mpTagData;
     if (*(*((int**)tagData + 0x11) + 3) == *param_2) {
         return tagData;
@@ -130,7 +130,7 @@ static void* isCreatingCallback(create_tag* param_1, unsigned int* param_2) {
 }
 
 /* 8025B194-8025B1D0 255AD4 003C+00 2/2 0/0 0/0 .text            isCreating__FUi */
-static bool isCreating(unsigned int param_0) {
+static bool isCreating(fpc_ProcID param_0) {
     return fpcCtIt_Judge((fpcCtIt_JudgeFunc)isCreatingCallback, &param_0);
 }
 
@@ -445,4 +445,4 @@ scene_process_profile_definition g_profile_ROOM_SCENE = {
     0,                                          // mParameters
     &g_fopScn_Method.mBase,                     // sub_method
     (process_method_class*)&l_dScnRoom_Method,  // mpMtd
-};
\ No newline at end of file
+};
diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp
index 32f4070709..2477af3cd4 100644
--- a/src/f_op/f_op_actor_mng.cpp
+++ b/src/f_op/f_op_actor_mng.cpp
@@ -294,7 +294,7 @@ void fopAcM_setRoomLayer(void* i_proc, int i_roomNo) {
 }
 
 /* 800199BC-80019A2C 0142FC 0070+00 0/0 4/4 114/114 .text fopAcM_SearchByID__FUiPP10fopAc_ac_c */
-s32 fopAcM_SearchByID(unsigned int i_actorID, fopAc_ac_c** i_outActor) {
+s32 fopAcM_SearchByID(fpc_ProcID i_actorID, fopAc_ac_c** i_outActor) {
     if (fpcM_IsCreating(i_actorID)) {
         *i_outActor = NULL;
     } else {
@@ -340,7 +340,7 @@ fopAcM_prm_class* fopAcM_CreateAppend() {
  * createAppend__FUsUlPC4cXyziPC5csXyzPC4cXyzScUi               */
 fopAcM_prm_class* createAppend(u16 i_enemyNo, u32 i_parameters, const cXyz* i_pos, int i_roomNo,
                                const csXyz* i_angle, const cXyz* i_scale, s8 i_subType,
-                               unsigned int i_parentProcID) {
+                               fpc_ProcID i_parentProcID) {
     fopAcM_prm_class* params = fopAcM_CreateAppend();
     if (params == NULL) {
         return NULL;
@@ -391,7 +391,7 @@ void fopAcM_delete(fopAc_ac_c* i_actor) {
 }
 
 /* 80019CB8-80019D18 0145F8 0060+00 0/0 3/3 12/12 .text            fopAcM_delete__FUi */
-s32 fopAcM_delete(unsigned int i_actorID) {
+s32 fopAcM_delete(fpc_ProcID i_actorID) {
     void* actor = fopAcM_SearchByID(i_actorID);
 
     if (actor != NULL) {
@@ -455,7 +455,7 @@ void* fopAcM_fastCreate(const char* p_actorName, u32 i_parameters, const cXyz* i
 
 /* 80019EF0-80019F78 014830 0088+00 0/0 1/1 105/105 .text
  * fopAcM_createChild__FsUiUlPC4cXyziPC5csXyzPC4cXyzScPFPv_i    */
-s32 fopAcM_createChild(s16 i_procName, unsigned int i_parentProcID, u32 i_parameters,
+s32 fopAcM_createChild(s16 i_procName, fpc_ProcID i_parentProcID, u32 i_parameters,
                        const cXyz* i_pos, int i_roomNo, const csXyz* i_angle, const cXyz* i_scale,
                        s8 i_subType, createFunc i_createFunc) {
     fopAcM_prm_class* prm = createAppend(0xFFFF, i_parameters, i_pos, i_roomNo, i_angle, i_scale,
@@ -469,7 +469,7 @@ s32 fopAcM_createChild(s16 i_procName, unsigned int i_parentProcID, u32 i_parame
 
 /* 80019F78-8001A138 0148B8 01C0+00 0/0 0/0 6/6 .text
  * fopAcM_createChildFromOffset__FsUiUlPC4cXyziPC5csXyzPC4cXyzScPFPv_i */
-s32 fopAcM_createChildFromOffset(s16 i_procName, unsigned int i_parentProcID, u32 i_parameters,
+s32 fopAcM_createChildFromOffset(s16 i_procName, fpc_ProcID i_parentProcID, u32 i_parameters,
                                  const cXyz* i_pos, int i_roomNo, const csXyz* i_angle,
                                  const cXyz* i_scale, s8 i_subType, createFunc i_createFunc) {
     fopAc_ac_c* parent_actor = fopAcM_SearchByID(i_parentProcID);
@@ -2460,4 +2460,4 @@ bool fopAcM_wt_c::waterCheck(cXyz const* i_pos) {
 }
 
 /* 8001DE10-8001DE14 018750 0004+00 0/0 1/1 0/0 .text            fopAcM_initManager__Fv */
-void fopAcM_initManager() {}
\ No newline at end of file
+void fopAcM_initManager() {}
diff --git a/src/f_op/f_op_msg_mng.cpp b/src/f_op/f_op_msg_mng.cpp
index f4791ac7be..ec597cb8e5 100644
--- a/src/f_op/f_op_msg_mng.cpp
+++ b/src/f_op/f_op_msg_mng.cpp
@@ -39,7 +39,7 @@ s32 fopMsgM_setStageLayer(void* param_0) {
 }
 
 /* 8001FA24-8001FA44 01A364 0020+00 3/3 14/14 4/4 .text            fopMsgM_SearchByID__FUi */
-msg_class* fopMsgM_SearchByID(unsigned int i_id) {
+msg_class* fopMsgM_SearchByID(fpc_ProcID i_id) {
     return (msg_class*)fpcEx_SearchByID(i_id);
 }
 
@@ -66,7 +66,7 @@ SECTION_SDATA2 static u8 lit_3902[4] = {
 /* 8001FA6C-8001FB50 01A3AC 00E4+00 1/1 0/0 0/0 .text createAppend__FP10fopAc_ac_cP4cXyzPUlPUlUi
  */
 static fopMsg_prm_class* createAppend(fopAc_ac_c* i_actor, cXyz* i_pos, u32* i_msgID, u32* param_3,
-                                      unsigned int param_4) {
+                                      fpc_ProcID param_4) {
     fopMsg_prm_class* params =
         static_cast<fopMsg_prm_class*>(cMl::memalignB(-4, sizeof(fopMsg_prm_class)));
 
@@ -102,7 +102,7 @@ static fopMsg_prm_class* createAppend(fopAc_ac_c* i_actor, cXyz* i_pos, u32* i_m
  */
 static fopMsg_prm_timer* createTimerAppend(int i_mode, u32 i_limitMs, u8 i_type, u8 param_3,
                                            f32 param_4, f32 param_5, f32 param_6, f32 param_7,
-                                           unsigned int param_8) {
+                                           fpc_ProcID param_8) {
     fopMsg_prm_timer* appen = (fopMsg_prm_timer*)cMl::memalignB(-4, sizeof(fopMsg_prm_timer));
 
     if (appen == NULL) {
@@ -284,7 +284,7 @@ char* fopMsgM_messageGet(char* i_stringBuf, u32 i_msgId) {
 }
 
 /* 80020100-80020108 01AA40 0008+00 0/0 1/1 0/0 .text            fopMsgM_setMessageID__FUi */
-void fopMsgM_setMessageID(unsigned int msg_id) {
+void fopMsgM_setMessageID(fpc_ProcID msg_id) {
     i_msgID = msg_id;
 }
 
@@ -410,4 +410,4 @@ JKRExpHeap* fopMsgM_createExpHeap(u32 i_heapSize, JKRHeap* i_heap) {
 /* 800203E0-80020400 01AD20 0020+00 0/0 3/3 0/0 .text fopMsgM_destroyExpHeap__FP10JKRExpHeap */
 void fopMsgM_destroyExpHeap(JKRExpHeap* i_heap) {
     i_heap->destroy();
-}
\ No newline at end of file
+}
diff --git a/src/f_op/f_op_overlap_mng.cpp b/src/f_op/f_op_overlap_mng.cpp
index d5afe44a66..a725442c33 100644
--- a/src/f_op/f_op_overlap_mng.cpp
+++ b/src/f_op/f_op_overlap_mng.cpp
@@ -45,7 +45,7 @@ void fopOvlpM_Done(overlap_task_class* pTaskClass) {
 }
 
 /* 8001E540-8001E558 018E80 0018+00 0/0 1/1 0/0 .text            fopOvlpM_ToldAboutID__FUi */
-void fopOvlpM_ToldAboutID(unsigned int param_1) {
+void fopOvlpM_ToldAboutID(fpc_ProcID param_1) {
     l_fopOvlpM_overlap[0] ? l_fopOvlpM_overlap[0]->field_0x20[0x32] = param_1 : 0;
 }
 
@@ -116,4 +116,4 @@ int fopOvlpM_Cancel() {
 }
 
 /* 8001E6E8-8001E6EC 019028 0004+00 0/0 1/1 0/0 .text            fopOvlpM_Init__Fv */
-void fopOvlpM_Init() {}
\ No newline at end of file
+void fopOvlpM_Init() {}
diff --git a/src/f_op/f_op_scene_mng.cpp b/src/f_op/f_op_scene_mng.cpp
index a5cbc42dd9..2e93330f8f 100644
--- a/src/f_op/f_op_scene_mng.cpp
+++ b/src/f_op/f_op_scene_mng.cpp
@@ -8,7 +8,7 @@
 #include "f_op/f_op_scene_req.h"
 
 /* 8001ECB0-8001ECE0 0195F0 0030+00 0/0 7/7 1/1 .text            fopScnM_SearchByID__FUi */
-scene_class* fopScnM_SearchByID(unsigned int id) {
+scene_class* fopScnM_SearchByID(fpc_ProcID id) {
     return (scene_class*)fopScnIt_Judge((fop_ScnItFunc)fpcSch_JudgeByID, &id);
 }
 
@@ -30,7 +30,7 @@ int fopScnM_ChangeReq(scene_class* i_scene, s16 param_2, s16 param_3, u16 param_
 
 /* 8001ED3C-8001ED84 01967C 0048+00 0/0 1/1 0/0 .text            fopScnM_DeleteReq__FP11scene_class
  */
-unsigned int fopScnM_DeleteReq(scene_class* i_scene) {
+fpc_ProcID fopScnM_DeleteReq(scene_class* i_scene) {
     u32 sceneRequestID = fopScnRq_Request(1, i_scene, 0x7FFF, 0, 0x7FFF, 0);
     return sceneRequestID != 0xFFFFFFFF;
 }
@@ -56,4 +56,4 @@ void fopScnM_Management() {
 }
 
 /* 8001EE30-8001EE34 019770 0004+00 0/0 1/1 0/0 .text            fopScnM_Init__Fv */
-void fopScnM_Init() {}
\ No newline at end of file
+void fopScnM_Init() {}
diff --git a/src/f_op/f_op_scene_req.cpp b/src/f_op/f_op_scene_req.cpp
index ca4b6faf0e..939acafe3d 100644
--- a/src/f_op/f_op_scene_req.cpp
+++ b/src/f_op/f_op_scene_req.cpp
@@ -159,11 +159,11 @@ s32 fopScnRq_Request(int param_1, scene_class* i_scene, s16 param_3, void* param
 }
 
 /* 8001F0FC-8001F11C 019A3C 0020+00 0/0 1/1 0/0 .text            fopScnRq_ReRequest__FUisPv */
-s32 fopScnRq_ReRequest(unsigned int param_1, s16 param_2, void* param_3) {
+s32 fopScnRq_ReRequest(fpc_ProcID param_1, s16 param_2, void* param_3) {
     return fpcNdRq_ReRequest(param_1, param_2, param_3);
 }
 
 /* 8001F11C-8001F13C 019A5C 0020+00 0/0 1/1 0/0 .text            fopScnRq_Handler__Fv */
 void fopScnRq_Handler() {
     fpcNdRq_Handler();
-}
\ No newline at end of file
+}
diff --git a/src/f_pc/f_pc_base.cpp b/src/f_pc/f_pc_base.cpp
index 6ed9a17c8f..b79d0a65de 100644
--- a/src/f_pc/f_pc_base.cpp
+++ b/src/f_pc/f_pc_base.cpp
@@ -78,7 +78,7 @@ s32 fpcBs_Delete(base_process_class* i_proc) {
 }
 
 /* 80020820-8002091C 00FC+00 s=0 e=2 z=0  None .text      fpcBs_Create__FsUiPv */
-base_process_class* fpcBs_Create(s16 i_procTypeID, unsigned int i_procID, void* i_data) {
+base_process_class* fpcBs_Create(s16 i_procTypeID, fpc_ProcID i_procID, void* i_data) {
     process_profile_definition* procProfDef;
     base_process_class* procClass;
     u32 size;
@@ -130,4 +130,4 @@ s32 fpcBs_SubCreate(base_process_class* i_proc) {
         i_proc->mUnk2 = 5;
         return cPhs_ERROR_e;
     }
-}
\ No newline at end of file
+}
diff --git a/src/f_pc/f_pc_create_iter.cpp b/src/f_pc/f_pc_create_iter.cpp
index bd6aa7ac52..cb1cc2961e 100644
--- a/src/f_pc/f_pc_create_iter.cpp
+++ b/src/f_pc/f_pc_create_iter.cpp
@@ -37,10 +37,10 @@ void* fpcCtIt_filter_JudgeInLayer(create_tag* i_createTag, fpcCtIt_jilprm_c* i_i
 }
 
 /* 80020A94-80020ACC 0038+00 s=0 e=1 z=0  None .text      fpcCtIt_JudgeInLayer__FUiPFPvPv_PvPv */
-void* fpcCtIt_JudgeInLayer(unsigned int i_layerID, fpcCtIt_JudgeFunc i_judgeFunc, void* i_data) {
+void* fpcCtIt_JudgeInLayer(fpc_ProcID i_layerID, fpcCtIt_JudgeFunc i_judgeFunc, void* i_data) {
     fpcCtIt_jilprm_c data;
     data.mLayerID = i_layerID;
     data.mFunc = i_judgeFunc;
     data.mpUserData = i_data;
     return fpcCtIt_Judge((fpcCtIt_JudgeFunc)fpcCtIt_filter_JudgeInLayer, &data);
-}
\ No newline at end of file
+}
diff --git a/src/f_pc/f_pc_create_req.cpp b/src/f_pc/f_pc_create_req.cpp
index f605b23ee7..07a01a84b8 100644
--- a/src/f_pc/f_pc_create_req.cpp
+++ b/src/f_pc/f_pc_create_req.cpp
@@ -13,13 +13,13 @@
 
 /* 80020ACC-80020AE8 001C+00 s=1 e=0 z=0  None .text      fpcCtRq_isCreatingByID__FP10create_tagPUi
  */
-bool fpcCtRq_isCreatingByID(create_tag* i_createTag, unsigned int* i_procID) {
+bool fpcCtRq_isCreatingByID(create_tag* i_createTag, fpc_ProcID* i_procID) {
     create_request* pReq = static_cast<create_request*>(i_createTag->mBase.mpTagData);
     return pReq->mBsPcId == *i_procID;
 }
 
 /* 80020AE8-80020B20 0038+00 s=0 e=2 z=0  None .text      fpcCtRq_IsCreatingByID__FUi */
-BOOL fpcCtRq_IsCreatingByID(unsigned int i_id) {
+BOOL fpcCtRq_IsCreatingByID(fpc_ProcID i_id) {
     return fpcCtIt_Judge((fpcLyIt_JudgeFunc)fpcCtRq_isCreatingByID, &i_id) != NULL ? TRUE : FALSE;
 }
 
@@ -130,4 +130,4 @@ create_request* fpcCtRq_Create(layer_class* i_layer, u32 i_size, create_request_
     }
 
     return pReq;
-}
\ No newline at end of file
+}
diff --git a/src/f_pc/f_pc_creator.cpp b/src/f_pc/f_pc_creator.cpp
index 3c1cf9b948..62f002044e 100644
--- a/src/f_pc/f_pc_creator.cpp
+++ b/src/f_pc/f_pc_creator.cpp
@@ -12,7 +12,7 @@
 //
 
 /* 80020EA8-80020EC8 0020+00 s=0 e=1 z=0  None .text      fpcCt_IsCreatingByID__FUi */
-BOOL fpcCt_IsCreatingByID(unsigned int i_id) {
+BOOL fpcCt_IsCreatingByID(fpc_ProcID i_id) {
     return fpcCtRq_IsCreatingByID(i_id);
 }
 
@@ -29,4 +29,4 @@ BOOL fpcCt_Abort(base_process_class* i_proc) {
 /* 80020F10-80020F30 0020+00 s=0 e=1 z=0  None .text      fpcCt_Handler__Fv */
 void fpcCt_Handler() {
     fpcCtRq_Handler();
-}
\ No newline at end of file
+}
diff --git a/src/f_pc/f_pc_executor.cpp b/src/f_pc/f_pc_executor.cpp
index 1bd53269db..0327d6e729 100644
--- a/src/f_pc/f_pc_executor.cpp
+++ b/src/f_pc/f_pc_executor.cpp
@@ -14,7 +14,7 @@ base_process_class* fpcEx_Search(fpcLyIt_JudgeFunc i_judgeFunc, void* i_data) {
 }
 
 /* 80021358-8002139C 0044+00 s=1 e=5 z=30  None .text      fpcEx_SearchByID__FUi */
-base_process_class* fpcEx_SearchByID(unsigned int i_id) {
+base_process_class* fpcEx_SearchByID(fpc_ProcID i_id) {
     if (i_id + 2 <= 1)
         return NULL;
 
@@ -22,7 +22,7 @@ base_process_class* fpcEx_SearchByID(unsigned int i_id) {
 }
 
 /* 8002139C-800213C4 0028+00 s=0 e=7 z=42  None .text      fpcEx_IsExist__FUi */
-BOOL fpcEx_IsExist(unsigned int i_id) {
+BOOL fpcEx_IsExist(fpc_ProcID i_id) {
     return fpcEx_SearchByID(i_id) != NULL ? TRUE : FALSE;
 }
 
@@ -85,4 +85,4 @@ s32 fpcEx_ToExecuteQ(base_process_class* i_proc) {
 /* 80021568-80021588 0020+00 s=0 e=1 z=0  None .text      fpcEx_Handler__FPFPvPv_i */
 void fpcEx_Handler(fpcLnIt_QueueFunc i_queueFunc) {
     fpcLnIt_Queue(i_queueFunc);
-}
\ No newline at end of file
+}
diff --git a/src/f_pc/f_pc_layer.cpp b/src/f_pc/f_pc_layer.cpp
index a243ddbe7d..291d5cc26b 100644
--- a/src/f_pc/f_pc_layer.cpp
+++ b/src/f_pc/f_pc_layer.cpp
@@ -111,7 +111,7 @@ layer_class* fpcLy_CurrentLayer() {
 }
 
 /* 800216FC-8002174C 0050+00 s=1 e=0 z=0  None .text      fpcLy_Search__FUi */
-layer_class* fpcLy_Search(unsigned int i_id) {
+layer_class* fpcLy_Search(fpc_ProcID i_id) {
     layer_class* layer_p = fpcLy_RootLayer();
     while (layer_p != NULL) {
         if (layer_p->mLayerID == i_id) {
@@ -123,7 +123,7 @@ layer_class* fpcLy_Search(unsigned int i_id) {
 }
 
 /* 8002174C-800217BC 0070+00 s=0 e=5 z=0  None .text      fpcLy_Layer__FUi */
-layer_class* fpcLy_Layer(unsigned int i_id) {
+layer_class* fpcLy_Layer(fpc_ProcID i_id) {
     if (i_id == 0 || fpcLy_RootLayer()->mLayerID == i_id) {
         return fpcLy_RootLayer();
     } else if (i_id == ~2 || fpcLy_CurrentLayer()->mLayerID == i_id) {
@@ -176,4 +176,4 @@ void fpcLy_Create(layer_class* i_layer, void* i_node, node_list_class* i_nodeLis
     cTr_Create(&i_layer->mNodeListTree, (i_layer->mNodeListTree).mpLists,
                (i_layer->mNodeListTree).mNumLists);
     fpcLy_Regist(i_layer);
-}
\ No newline at end of file
+}
diff --git a/src/f_pc/f_pc_layer_tag.cpp b/src/f_pc/f_pc_layer_tag.cpp
index 181d31fe0d..d0b96f21eb 100644
--- a/src/f_pc/f_pc_layer_tag.cpp
+++ b/src/f_pc/f_pc_layer_tag.cpp
@@ -8,7 +8,7 @@
 
 /* 80021CD4-80021DCC 00F8+00 s=1 e=1 z=0  None .text
  * fpcLyTg_ToQueue__FP26layer_management_tag_classUiUsUs        */
-s32 fpcLyTg_ToQueue(layer_management_tag_class* i_LyTag, unsigned int i_layerID, u16 i_listID,
+s32 fpcLyTg_ToQueue(layer_management_tag_class* i_LyTag, fpc_ProcID i_layerID, u16 i_listID,
                     u16 i_listPriority) {
     if (i_LyTag->mpLayer == NULL && i_layerID == -1) {
         return 0;
@@ -48,7 +48,7 @@ s32 fpcLyTg_QueueTo(layer_management_tag_class* i_LyTag) {
 
 /* 80021E2C-80021EB0 0084+00 s=0 e=1 z=0  None .text
  * fpcLyTg_Move__FP26layer_management_tag_classUiUsUs           */
-s32 fpcLyTg_Move(layer_management_tag_class* i_LyTag, unsigned int i_layerID, u16 i_listID,
+s32 fpcLyTg_Move(layer_management_tag_class* i_LyTag, fpc_ProcID i_layerID, u16 i_listID,
                  u16 i_listPriority) {
     layer_class* layer = fpcLy_Layer(i_layerID);
     if (layer == NULL) {
@@ -63,7 +63,7 @@ s32 fpcLyTg_Move(layer_management_tag_class* i_LyTag, unsigned int i_layerID, u1
 
 /* 80021EB0-80021F64 00B4+00 s=0 e=1 z=0  None .text
  * fpcLyTg_Init__FP26layer_management_tag_classUiPv             */
-s32 fpcLyTg_Init(layer_management_tag_class* i_LyTag, unsigned int i_id, void* i_data) {
+s32 fpcLyTg_Init(layer_management_tag_class* i_LyTag, fpc_ProcID i_id, void* i_data) {
     static layer_management_tag_class crear = {
         NULL, NULL, NULL, NULL, 0, NULL, 0xFFFF, 0xFFFF,
     };
@@ -78,4 +78,4 @@ s32 fpcLyTg_Init(layer_management_tag_class* i_LyTag, unsigned int i_id, void* i
     } else {
         return 0;
     }
-}
\ No newline at end of file
+}
diff --git a/src/f_pc/f_pc_manager.cpp b/src/f_pc/f_pc_manager.cpp
index 7296a35f59..3c433790db 100644
--- a/src/f_pc/f_pc_manager.cpp
+++ b/src/f_pc/f_pc_manager.cpp
@@ -38,7 +38,7 @@ s32 fpcM_Delete(void* i_proc) {
 }
 
 /* 80022138-80022158 0020+00 s=0 e=6 z=43  None .text      fpcM_IsCreating__FUi */
-BOOL fpcM_IsCreating(unsigned int pID) {
+BOOL fpcM_IsCreating(fpc_ProcID pID) {
     return fpcCt_IsCreatingByID(pID);
 }
 
@@ -121,7 +121,7 @@ void fpcM_PauseDisable(void* i_proc, u8 i_flag) {
 }
 
 /* 800223B4-80022428 0074+00 s=0 e=1 z=0  None .text      fpcM_JudgeInLayer__FUiPFPvPv_PvPv */
-void* fpcM_JudgeInLayer(unsigned int i_layerID, fpcCtIt_JudgeFunc i_judgeFunc, void* i_data) {
+void* fpcM_JudgeInLayer(fpc_ProcID i_layerID, fpcCtIt_JudgeFunc i_judgeFunc, void* i_data) {
     layer_class* layer = fpcLy_Layer(i_layerID);
     if (layer != NULL) {
         void* ret = fpcCtIt_JudgeInLayer(i_layerID, i_judgeFunc, i_data);
@@ -132,4 +132,4 @@ void* fpcM_JudgeInLayer(unsigned int i_layerID, fpcCtIt_JudgeFunc i_judgeFunc, v
     } else {
         return NULL;
     }
-}
\ No newline at end of file
+}
diff --git a/src/f_pc/f_pc_node_req.cpp b/src/f_pc/f_pc_node_req.cpp
index 2b1c261e74..81d8b8fd2b 100644
--- a/src/f_pc/f_pc_node_req.cpp
+++ b/src/f_pc/f_pc_node_req.cpp
@@ -316,7 +316,7 @@ node_create_request* fpcNdRq_Request(u32 i_requestSize, int i_reqType,
 }
 
 /* 80023098-80023110 0078+00 s=1 e=0 z=0  None .text      fpcNdRq_ReChangeNode__FUisPv */
-s32 fpcNdRq_ReChangeNode(unsigned int i_requestID, s16 i_procName, void* i_data) {
+s32 fpcNdRq_ReChangeNode(fpc_ProcID i_requestID, s16 i_procName, void* i_data) {
     request_node_class* currentNode;
     node_create_request* found;
     currentNode = (request_node_class*)l_fpcNdRq_Queue.mpHead;
@@ -336,6 +336,6 @@ s32 fpcNdRq_ReChangeNode(unsigned int i_requestID, s16 i_procName, void* i_data)
 }
 
 /* 80023110-80023130 0020+00 s=0 e=1 z=0  None .text      fpcNdRq_ReRequest__FUisPv */
-s32 fpcNdRq_ReRequest(unsigned int i_requestID, s16 i_procName, void* i_data) {
+s32 fpcNdRq_ReRequest(fpc_ProcID i_requestID, s16 i_procName, void* i_data) {
     return fpcNdRq_ReChangeNode(i_requestID, i_procName, i_data);
-}
\ No newline at end of file
+}
diff --git a/src/f_pc/f_pc_priority.cpp b/src/f_pc/f_pc_priority.cpp
index cc763088c3..9f9713faa2 100644
--- a/src/f_pc/f_pc_priority.cpp
+++ b/src/f_pc/f_pc_priority.cpp
@@ -77,7 +77,7 @@ s32 fpcPi_Delete(process_priority_class* i_procPriority) {
 }
 
 /* 800232B4-800232E8 0034+00 s=2 e=0 z=0  None .text      fpcPi_IsNormal__FUiUsUs */
-s32 fpcPi_IsNormal(unsigned int i_layer, u16 i_listID, u16 i_priority) {
+s32 fpcPi_IsNormal(fpc_ProcID i_layer, u16 i_listID, u16 i_priority) {
     if ((i_layer < 0xFFFFFFFE) && (i_listID < 0xFFFE) && (i_priority < 0xFFFE))
         return 1;
 
@@ -86,7 +86,7 @@ s32 fpcPi_IsNormal(unsigned int i_layer, u16 i_listID, u16 i_priority) {
 
 /* 800232E8-80023428 0140+00 s=0 e=3 z=0  None .text
  * fpcPi_Change__FP22process_priority_classUiUsUs               */
-s32 fpcPi_Change(process_priority_class* i_procPriority, unsigned int i_layer, u16 i_listID, u16 i_priority) {
+s32 fpcPi_Change(process_priority_class* i_procPriority, fpc_ProcID i_layer, u16 i_listID, u16 i_priority) {
     base_process_class* pProc = (base_process_class*)i_procPriority->mBase.mpTagData;
     BOOL changed = 0;
 
@@ -151,7 +151,7 @@ s32 fpcPi_Handler() {
 
 /* 800234BC-80023564 00A8+00 s=0 e=1 z=0  None .text
  * fpcPi_Init__FP22process_priority_classPvUiUsUs               */
-s32 fpcPi_Init(process_priority_class* i_procPriority, void* i_data, unsigned int i_layer, u16 i_listID,
+s32 fpcPi_Init(process_priority_class* i_procPriority, void* i_data, fpc_ProcID i_layer, u16 i_listID,
                u16 i_priority) {
     if (!fpcPi_IsNormal(i_layer, i_listID, i_priority))
         return 0;
@@ -170,4 +170,4 @@ s32 fpcPi_Init(process_priority_class* i_procPriority, void* i_data, unsigned in
 
 /* ############################################################################################## */
 /* 804505F0-804505F8 0008+00 s=0 e=5 z=1  None .sdata     None */
-s8 data_804505F0 = 0xFF;
\ No newline at end of file
+s8 data_804505F0 = 0xFF;