diff --git a/include/d/actor/d_a_fganon.h b/include/d/actor/d_a_fganon.h
index f06c8599c..7bcb0f1da 100644
--- a/include/d/actor/d_a_fganon.h
+++ b/include/d/actor/d_a_fganon.h
@@ -123,7 +123,7 @@ public:
     virtual ~daFganon_HIO_c() {}
 
 public:
-    /* 0x00 */ // vtable  
+    /* 0x00 */ // vtable
     /* 0x04 */ s8 mNo;
     /* 0x05 */ u8 m05;
     /* 0x06 */ u8 m06;
diff --git a/include/d/actor/d_a_npc_km1.h b/include/d/actor/d_a_npc_km1.h
index 061ed46b6..4e155c98b 100644
--- a/include/d/actor/d_a_npc_km1.h
+++ b/include/d/actor/d_a_npc_km1.h
@@ -89,7 +89,7 @@ public:
     /* 0x6D8 */ J3DAnmTexPattern* m_head_tex_pattern;
     /* 0x6DC */ mDoExt_btpAnm mBtpAnm;
     /* 0x6F0 */ u8 mBtpFrame;
-    /* 0x6F1 */ u8 field_0x6F1;    
+    /* 0x6F1 */ u8 field_0x6F1;
     /* 0x6F2 */ s16 field_0x6F2;
     /* 0x6F4 */ ActionFunc field_0x6F4;
     /* 0x700 */ dNpc_EventCut_c mEventCut;
@@ -104,14 +104,14 @@ public:
     /* 0x7AC */ f32 field_0x7AC;
     /* 0x7B0 */ s16 field_0x7B0;
     /* 0x7B2 */ s16 field_0x7B2;
-    /* 0x7B4 */ s8 field_0x7B4; 
+    /* 0x7B4 */ s8 field_0x7B4;
     /* 0x7B5 */ s8 field_0x7B5;
     /* 0x7B6 */ u8 field_0x7B6;
     /* 0x7B7 */ u8 field_0x7B7;
     /* 0x7B8 */ u8 field_0x7B8;
     /* 0x7B9 */ u8 field_0x7B9[0x7BC - 0x7B9];
-    /* 0x7BC */ s32 field_0x7BC; 
-    /* 0x7C0 */ s32 field_0x7C0; 
+    /* 0x7BC */ s32 field_0x7BC;
+    /* 0x7C0 */ s32 field_0x7C0;
     /* 0x7C4 */ u8 field_0x7C4;
     /* 0x7C5 */ u8 field_0x7C5;
     /* 0x7C6 */ bool mHeadOnlyFollow;
diff --git a/include/d/actor/d_a_obj_hha.h b/include/d/actor/d_a_obj_hha.h
index 1ece6786a..d1a0b6405 100644
--- a/include/d/actor/d_a_obj_hha.h
+++ b/include/d/actor/d_a_obj_hha.h
@@ -24,7 +24,7 @@ public:
     void exe_normal(daObjHha_c*);
     void exe_move(daObjHha_c*);
     void draw_normal(daObjHha_c*);
-public: 
+public:
     /* 0x00 */ J3DModel* mpModel;
     /* 0x04 */ dBgW* mpBgw;
     /* 0x08 */ cXyz mPos; // Position offset from current.pos
diff --git a/include/d/actor/d_a_obj_shmrgrd.h b/include/d/actor/d_a_obj_shmrgrd.h
index bcb88d59e..9d6b8710f 100644
--- a/include/d/actor/d_a_obj_shmrgrd.h
+++ b/include/d/actor/d_a_obj_shmrgrd.h
@@ -28,7 +28,7 @@ public:
             return false;
         } else {
             return fopAcM_isSwitch(const_cast<daObjShmrgrd_c*>(this), prm_get_swSave());
-        } 
+        }
     }
     void on_switch() const {
         if (prm_get_swSave() != 0xFF) {
diff --git a/include/d/actor/d_a_obj_smplbg.h b/include/d/actor/d_a_obj_smplbg.h
index f2ea7257f..138e71133 100644
--- a/include/d/actor/d_a_obj_smplbg.h
+++ b/include/d/actor/d_a_obj_smplbg.h
@@ -17,7 +17,7 @@ namespace daObjSmplbg {
         struct Attr_c {
             /* 0x00 */ u32 mHeapSize;
             /* 0x04 */ const char* mResName;
-            /* 0x08 */ s16 mBDLFileIndex;             
+            /* 0x08 */ s16 mBDLFileIndex;
             /* 0x0A */ s16 mDZBFileIndex;
             /* 0x0C */ MoveBGActor_SetFunc mMoveBGProc;
             /* 0x10 */ u32 mFlags;
@@ -26,7 +26,7 @@ namespace daObjSmplbg {
             /* 0x18 */ s16 mCullMinZ;
             /* 0x1A */ s16 mCullMaxX;
             /* 0x1C */ s16 mCullMaxY;
-            /* 0x1E */ s16 mCullMaxZ;             
+            /* 0x1E */ s16 mCullMaxZ;
             /* 0x20 */ f32 mEyeOffset;
         };
         
diff --git a/include/d/actor/d_a_obj_table.h b/include/d/actor/d_a_obj_table.h
index 87ecb2df6..a9fe69c81 100644
--- a/include/d/actor/d_a_obj_table.h
+++ b/include/d/actor/d_a_obj_table.h
@@ -8,7 +8,7 @@
 
 namespace daObjTable {
     class Act_c : public dBgS_MoveBgActor {
-    public: 
+    public:
         virtual BOOL CreateHeap();
         virtual BOOL Create();
         cPhs_State Mthd_Create();
diff --git a/include/d/actor/d_a_player_HIO.h b/include/d/actor/d_a_player_HIO.h
index dd8da3037..6032adf62 100644
--- a/include/d/actor/d_a_player_HIO.h
+++ b/include/d/actor/d_a_player_HIO.h
@@ -56,7 +56,7 @@ public:
     /* 0x68 */ f32 field_0x68;
     /* 0x6C */ f32 field_0x6C;
     /* 0x70 */ f32 field_0x70;
-    /* 0x74 */ f32 field_0x74; 
+    /* 0x74 */ f32 field_0x74;
     /* 0x78 */ f32 field_0x78;
     /* 0x7C */ f32 field_0x7C;
     /* 0x80 */ f32 field_0x80;
diff --git a/include/d/actor/d_a_shand.h b/include/d/actor/d_a_shand.h
index d1b9d0b0c..bde329a14 100644
--- a/include/d/actor/d_a_shand.h
+++ b/include/d/actor/d_a_shand.h
@@ -26,9 +26,9 @@ public:
     /* 0x2C8 */ cXyz field_2C8;
     /* 0x2D4 */ cXyz field_2D4;
     /* 0x2E0 */ u8 unused_2E0[0x2F0 - 0x2E0];
-    /* 0x2F0 */ float field_2F0; 
-    /* 0x2F4 */ float field_2F4; 
-    /* 0x2F8 */ float field_2F8; 
+    /* 0x2F0 */ float field_2F0;
+    /* 0x2F4 */ float field_2F4;
+    /* 0x2F8 */ float field_2F8;
     /* 0x2FC */ float field_2FC;
     /* 0x300 */ float field_300;
     /* 0x304 */ float field_304;
@@ -37,7 +37,7 @@ public:
     /* 0x310 */ cXyz* field_310;
     /* 0x314 */ u8* field_314;
     /* 0x318 */ short field_318;
-    /* 0x31C */ shand_s field_31C[20]; 
+    /* 0x31C */ shand_s field_31C[20];
     /* 0x54C */ mDoExt_3DlineMat1_c mLineMat;
     /* 0x588 */ dCcD_Stts mStts;
     /* 0x5C4 */ dCcD_Sph mSph;
diff --git a/include/d/actor/d_a_tag_attention.h b/include/d/actor/d_a_tag_attention.h
index 9b7ac0b20..a049d7add 100644
--- a/include/d/actor/d_a_tag_attention.h
+++ b/include/d/actor/d_a_tag_attention.h
@@ -52,12 +52,12 @@ namespace daTagAttention {
             return true;
         }
 
-        int prm_get_Type() const 
+        int prm_get_Type() const
         {
             return daObj::PrmAbstract(this, PRM_TYPE_W, PRM_TYPE_S);
         }
 
-        int prm_get_swSave() const 
+        int prm_get_swSave() const
         {
             return daObj::PrmAbstract(this, PRM_SWSAVE_W, PRM_SWSAVE_S);
         }
diff --git a/include/d/actor/d_a_tornado.h b/include/d/actor/d_a_tornado.h
index db7f97686..7f7d58b22 100644
--- a/include/d/actor/d_a_tornado.h
+++ b/include/d/actor/d_a_tornado.h
@@ -14,23 +14,23 @@ class daTornado_HIO_c0 {
 
 class daTornado_c : public fopAc_ac_c {
 public:
-    float getJointXPos(int jno) const { 
-        if (mpModel) 
-            return mpModel->getAnmMtx(jno)[0][3]; 
-        else 
-            return current.pos.x; 
+    float getJointXPos(int jno) const {
+        if (mpModel)
+            return mpModel->getAnmMtx(jno)[0][3];
+        else
+            return current.pos.x;
     }
-    float getJointYPos(int jno) const { 
-        if (mpModel) 
-            return mpModel->getAnmMtx(jno)[1][3]; 
-        else 
-            return current.pos.y; 
+    float getJointYPos(int jno) const {
+        if (mpModel)
+            return mpModel->getAnmMtx(jno)[1][3];
+        else
+            return current.pos.y;
     }
-    float getJointZPos(int jno) const { 
-        if (mpModel) 
-            return mpModel->getAnmMtx(jno)[2][3]; 
-        else 
-            return current.pos.z; 
+    float getJointZPos(int jno) const {
+        if (mpModel)
+            return mpModel->getAnmMtx(jno)[2][3];
+        else
+            return current.pos.z;
     }
     void getScaleEnd() {}
     void getSmallScaleEnd() {}
diff --git a/include/d/d_camera.h b/include/d/d_camera.h
index 73420043c..f68f0e3fc 100644
--- a/include/d/d_camera.h
+++ b/include/d/d_camera.h
@@ -165,7 +165,7 @@ public:
             /* 0x1C */ cSAngle mBank;
             /* 0x1E */ s16 m1E;
         } m00;
-    } 
+    }
     /* 0x0A4 */ m0A4[2];
     /* 0x0E4 */ int mStageMapToolCameraIdx;
     /* 0x0E8 */ int m0E8;
diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h
index e45e967c4..5bdda2a78 100644
--- a/include/d/d_com_inf_game.h
+++ b/include/d/d_com_inf_game.h
@@ -523,9 +523,9 @@ public:
 
     u8 getPictureStatus() { return mPictureStatus; }
     void setPictureStatusOn() { mPictureStatus = 2; }
-    void setPictureStatusGetOn(u8 to_set) { 
-        mPictureStatus = 3; 
-        field_0x495f = to_set; 
+    void setPictureStatusGetOn(u8 to_set) {
+        mPictureStatus = 3;
+        field_0x495f = to_set;
     }
 
     u8 getScopeMesgStatus() { return mScopeMesgStatus; }
diff --git a/include/d/d_grass.h b/include/d/d_grass.h
index 710384941..d08d4ba07 100644
--- a/include/d/d_grass.h
+++ b/include/d/d_grass.h
@@ -19,7 +19,7 @@ public:
     void WorkAt(fopAc_ac_c*, u32, int, dCcMassS_HitInf*);
     void hitCheck(int);
 
-public:    
+public:
     /* 0x00 */ u8 mState;
     /* 0x01 */ u8 mInitFlags;
     /* 0x02 */ s8 mAnimIdx;
diff --git a/include/d/d_particle.h b/include/d/d_particle.h
index cdb6bfe69..2ebd712a2 100644
--- a/include/d/d_particle.h
+++ b/include/d/d_particle.h
@@ -129,7 +129,7 @@ public:
     void setSpeed (f32 vel) { mVelFade1 = vel; }
     void setPitch (f32 pitch) { mVelFade2 = pitch; }
     void setMaxSpeed (f32 vel) { mMaxParticleVelocity = vel; }
-    void setMaxDisSpeed (f32 vel) { mVelSpeed = vel; } 
+    void setMaxDisSpeed (f32 vel) { mVelSpeed = vel; }
     void setAnchor (cXyz* anchorPos1, cXyz* anchorPos2) { mCollapsePos[0].set(*anchorPos1); mCollapsePos[1].set(*anchorPos2); }
 
     virtual ~dPa_waveEcallBack() {}
@@ -489,8 +489,8 @@ public:
     void draw2DmenuFore(JPADrawInfo* inf) { draw(inf, dPtclGroup_2DmenuFore_e); }
     void draw2DmenuBack(JPADrawInfo* inf) { draw(inf, dPtclGroup_2DmenuBack_e); }
 
-    u32 getParticleNum() { return mEmitterMng->getParticleNumber(); } 
-    u32 getEmitterNum() { return mEmitterMng->getEmitterNumber(); } 
+    u32 getParticleNum() { return mEmitterMng->getParticleNumber(); }
+    u32 getEmitterNum() { return mEmitterMng->getEmitterNumber(); }
 
     int addModelEmitter(dPa_modelEmitter_c *emitter) { return mModelControl->add(emitter); }
     void drawModelParticle() { mModelControl->draw(); }
diff --git a/src/d/actor/d_a_arrow.cpp b/src/d/actor/d_a_arrow.cpp
index 739567e06..99206245c 100644
--- a/src/d/actor/d_a_arrow.cpp
+++ b/src/d/actor/d_a_arrow.cpp
@@ -1102,8 +1102,8 @@ BOOL daArrow_c::_execute() {
         
         cXyz offset;
         offset.x = 0.0f;
-        offset.y = 45.0f + g_regHIO.mChild->mFloatRegs[8];
-        offset.z = 30.0f + g_regHIO.mChild->mFloatRegs[9];
+        offset.y = 45.0f + REG0_F(8);
+        offset.z = 30.0f + REG0_F(9);
         mDoMtx_YrotS(*calc_mtx, player->shape_angle.y);
         cXyz offsetOut;
         MtxPosition(&offset, &offsetOut);
diff --git a/src/d/actor/d_a_esa.cpp b/src/d/actor/d_a_esa.cpp
index 9fe4e53ae..39b9da8bc 100644
--- a/src/d/actor/d_a_esa.cpp
+++ b/src/d/actor/d_a_esa.cpp
@@ -250,7 +250,7 @@ static cPhs_State daEsa_Create(fopAc_ac_c* i_actor) {
 
     i_this->field_0x2B9 = fopAcM_GetParam(i_this) & 0xFF;
     i_this->field_0x2BA = fopAcM_GetParam(i_this) >> 8 & 0xFF;
-    if(g_regHIO.mChild->mShortRegs[0] != 0) {
+    if(REG0_S(0) != 0) {
         i_this->field_0x2BA = 1;
     }
 
@@ -274,8 +274,8 @@ static cPhs_State daEsa_Create(fopAc_ac_c* i_actor) {
         }
     }
 
-    f32 temp = g_regHIO.mChild->mFloatRegs[6] + 0.65f;
-    f32 scaleF = temp + cM_rndF(g_regHIO.mChild->mFloatRegs[5] + 1.0f - temp);
+    f32 temp = REG0_F(6) + 0.65f;
+    f32 scaleF = temp + cM_rndF(REG0_F(5) + 1.0f - temp);
     cXyz scale(scaleF, scaleF, scaleF);
     i_this->mpModel->setBaseScale(scale);
     fopAcM_SetMtx(i_this, i_this->mpModel->getBaseTRMtx());
diff --git a/src/d/actor/d_a_kt.cpp b/src/d/actor/d_a_kt.cpp
index 50a46b7d5..afae2d146 100644
--- a/src/d/actor/d_a_kt.cpp
+++ b/src/d/actor/d_a_kt.cpp
@@ -237,7 +237,7 @@ calc_012:
             i_this->mTimer[0] = cM_rndF(2.0f) + 10.0f + REG0_F(12);
         }
         if (i_this->mTimer[0] > (s16)(REG0_S(1) + 8)) {
-            cLib_addCalcAngleS2(&i_this->mAngleRoll, g_regHIO.mChild->mShortRegs[2] + 0x3000, 2, g_regHIO.mChild->mShortRegs[3] + 0x2000);
+            cLib_addCalcAngleS2(&i_this->mAngleRoll, REG0_S(2) + 0x3000, 2, REG0_S(3) + 0x2000);
         }
         if (i_this->mTimer[1] == 0) {
             i_this->mTimer[1] = 20.0f + cM_rndF(50.0f);
diff --git a/src/d/actor/d_a_machine.cpp b/src/d/actor/d_a_machine.cpp
index dff228fe4..905db3e25 100644
--- a/src/d/actor/d_a_machine.cpp
+++ b/src/d/actor/d_a_machine.cpp
@@ -205,7 +205,6 @@ void daMachine_c::set_next_pnt() {
     field_0xc15 += field_0xc16;
 
     if(dPath_ChkClose(field_0xc18) != 0) {
-
         if (field_0xc15 > (s8)field_0xc18->m_num - 1) {
             field_0xc15 = 0;
         } else if (field_0xc15 < 0) {
@@ -378,7 +377,6 @@ void daMachine_c::set_at() {
   
     fVar1 = field_0xc04.getFrameCtrl()->getFrame();
     if ((5.0f < fVar1) && (25.0f > fVar1)) {
-
         field_0xc6c.set(field_0xc3c[0][3],
                         field_0xc3c[1][3],
                         field_0xc3c[2][3]);
diff --git a/src/d/actor/d_a_npc_ji1.cpp b/src/d/actor/d_a_npc_ji1.cpp
index 2b1a873bf..c0326730d 100644
--- a/src/d/actor/d_a_npc_ji1.cpp
+++ b/src/d/actor/d_a_npc_ji1.cpp
@@ -3750,8 +3750,8 @@ BOOL daNpc_Ji1_c::battleAtSet() {
     f32 cos = cM_scos(current.angle.y);
 
     if(mAnimation == 0x14) {
-        field_0xA40.SetR(g_regHIO.mChild[10].mFloatRegs[9] + 85.0f);
-        field_0xB90.y = field_0xB78.y = g_regHIO.mChild[10].mFloatRegs[10] + 40.0f;
+        field_0xA40.SetR(REG10_F(9) + 85.0f);
+        field_0xB90.y = field_0xB78.y = REG10_F(10) + 40.0f;
         field_0xA40.SetStartEnd(field_0xB90, field_0xB78);
         field_0xA40.CalcVec(&temp);
         if(!temp.normalizeRS()) {
diff --git a/src/d/actor/d_a_npc_km1.cpp b/src/d/actor/d_a_npc_km1.cpp
index 02f71dfd4..f97f7dda5 100644
--- a/src/d/actor/d_a_npc_km1.cpp
+++ b/src/d/actor/d_a_npc_km1.cpp
@@ -17,8 +17,7 @@ static daNpc_Km1_HIO_c l_HIO;
 
 /* 000000EC-00000144       .text __ct__15daNpc_Km1_HIO_cFv */
 daNpc_Km1_HIO_c::daNpc_Km1_HIO_c() {
-
-    static hio_prm_c a_prm_tbl= {
+    static hio_prm_c a_prm_tbl = {
         0x1FFE,
         0x38E0,
         0xE002,
@@ -67,7 +66,6 @@ static BOOL nodeCallBack_Km(J3DNode* i_node, int i_calcTiming) {
 extern dCcD_SrcCyl dNpc_cyl_src;
 /* 0000032C-0000043C       .text createInit__11daNpc_Km1_cFv */
 bool daNpc_Km1_c::createInit() {
-
     mEventCut.setActorInfo2("Km1", this);
     attention_info.flags = fopAc_Attn_LOCKON_TALK_e | fopAc_Attn_ACTION_SPEAK_e;
     attention_info.distances[fopAc_Attn_TYPE_TALK_e] = 0xAB;
@@ -88,7 +86,6 @@ bool daNpc_Km1_c::createInit() {
 
 /* 0000043C-0000054C       .text setMtx__11daNpc_Km1_cFv */
 void daNpc_Km1_c::setMtx() {
-
     if (field_0x7C7 == 0) {
         playTexPatternAnm();
         field_0x7B4 = mpMorf->play(&eyePos,0,0);
@@ -138,7 +135,6 @@ void daNpc_Km1_c::setAnm_tex(signed char i_param_1) {
 
 /* 00000734-00000850       .text init_btp__11daNpc_Km1_cFbi */
 bool daNpc_Km1_c::init_btp(bool param_1, int param_2) {
-
     int btp_num;
     int iVar3;
     J3DModelData *pJVar4;
@@ -173,7 +169,6 @@ bool daNpc_Km1_c::initTexPatternAnm(bool param_1) {
 
 /* 00000894-00000958       .text playTexPatternAnm__11daNpc_Km1_cFv */
 void daNpc_Km1_c::playTexPatternAnm() {
-
     //TODO: Rewrite this conditional logic
     bool var_r4 = true;
     if(field_0x7CD == 0){
@@ -200,14 +195,12 @@ void daNpc_Km1_c::playTexPatternAnm() {
 
 /* 00000958-00000A24       .text setAnm_anm__11daNpc_Km1_cFPQ211daNpc_Km1_c9anm_prm_c */
 s32 daNpc_Km1_c::setAnm_anm(daNpc_Km1_c::anm_prm_c* i_anm_ptr) {
-
     u32 uVar2 = 0;
     int local_18;
     int local_14;
     
 
     if (i_anm_ptr->field_0x0 >= 0 && field_0x7CE != i_anm_ptr->field_0x0) {
-
         field_0x7CE = i_anm_ptr->field_0x0;
         if (mpMorf != NULL) {
             anmResID(field_0x7CE,&local_18,&local_14);
@@ -225,7 +218,6 @@ s32 daNpc_Km1_c::setAnm_anm(daNpc_Km1_c::anm_prm_c* i_anm_ptr) {
 
 /* 00000A24-00000A8C       .text setAnm__11daNpc_Km1_cFv */
 void daNpc_Km1_c::setAnm() {
-
     static daNpc_Km1_c::anm_prm_c a_anm_prm_tbl[3] = {
         {-1,-1,0.0f,0.0f,-1},
         {ANM_WAIT,0,8.0f,1.0f,J3DFrameCtrl::EMode_LOOP},
@@ -237,7 +229,6 @@ void daNpc_Km1_c::setAnm() {
 
 /* 00000A8C-00000A98       .text chngAnmTag__11daNpc_Km1_cFv */
 void daNpc_Km1_c::chngAnmTag() {
-
     switch(field_0x7CC){
         case 0:
             break;
@@ -246,7 +237,6 @@ void daNpc_Km1_c::chngAnmTag() {
 
 /* 00000A98-00000AA4       .text ctrlAnmTag__11daNpc_Km1_cFv */
 void daNpc_Km1_c::ctrlAnmTag() {
-
     switch(field_0x7CB){
         case 0:
             break;
@@ -263,11 +253,10 @@ void daNpc_Km1_c::chngAnmAtr(unsigned char param_1) {
 
 /* 00000AE4-00000AE8       .text ctrlAnmAtr__11daNpc_Km1_cFv */
 void daNpc_Km1_c::ctrlAnmAtr() {
-
 }
+
 /* 00000AE8-00000B50       .text setAnm_ATR__11daNpc_Km1_cFi */
 void daNpc_Km1_c::setAnm_ATR(int param_1) {
-
     static daNpc_Km1_c::anm_prm_c a_anm_prm_tbl[1] = {
         {ANM_WAIT,0x00,8.0f,1.0f,J3DFrameCtrl::EMode_LOOP}
     };
@@ -280,7 +269,6 @@ void daNpc_Km1_c::setAnm_ATR(int param_1) {
 
 /* 00000B50-00000C0C       .text anmAtr__11daNpc_Km1_cFUs */
 void daNpc_Km1_c::anmAtr(unsigned short param_1) {
-
     if(param_1 == 6){
         if(field_0x7D6 == 0){
             field_0x7CC = 0xFF;
@@ -302,7 +290,6 @@ void daNpc_Km1_c::anmAtr(unsigned short param_1) {
 
 /* 00000C0C-00000C64       .text setStt__11daNpc_Km1_cFSc */
 void daNpc_Km1_c::setStt(signed char param_1) {
-
     s8 uVar1 = field_0x7D0;
     field_0x7D0 = param_1;
     switch((s8)field_0x7D0) {
@@ -317,15 +304,14 @@ void daNpc_Km1_c::setStt(signed char param_1) {
             break;
     }
 }
+
 /* 00000C64-00000C6C       .text next_msgStatus__11daNpc_Km1_cFPUl */
 u16 daNpc_Km1_c::next_msgStatus(unsigned long*) {
-
     return fopMsgStts_MSG_ENDS_e;
 }
 
 /* 00000C6C-00000C74       .text getMsg__11daNpc_Km1_cFv */
 u32 daNpc_Km1_c::getMsg() {
-
     return 0;
 }
 
@@ -342,7 +328,6 @@ void daNpc_Km1_c::eventOrder() {
 
 /* 00000CC4-00000D04       .text checkOrder__11daNpc_Km1_cFv */
 void daNpc_Km1_c::checkOrder() {
-
     if(eventInfo.checkCommandDemoAccrpt()){
         return;
     }
@@ -359,7 +344,6 @@ void daNpc_Km1_c::checkOrder() {
 
 /* 00000D04-00000E94       .text lookBack__11daNpc_Km1_cFv */
 void daNpc_Km1_c::lookBack() {
-
     cXyz vec1;
     cXyz vec2 = current.pos;
     vec2.y = eyePos.y;
@@ -400,7 +384,6 @@ void daNpc_Km1_c::lookBack() {
 
 /* 00000E94-00000F14       .text chkAttention__11daNpc_Km1_cFv */
 bool daNpc_Km1_c::chkAttention() {
-
     dAttention_c& attention = dComIfGp_getAttention();
     if(attention.LockonTruth() != 0){
         return this == attention.LockonTarget(0);
@@ -411,7 +394,6 @@ bool daNpc_Km1_c::chkAttention() {
 
 /* 00000F14-00000F78       .text setAttention__11daNpc_Km1_cFv */
 void daNpc_Km1_c::setAttention() {
-
     f32 f1 = current.pos.z; 
     f32 f2 = current.pos.y + l_HIO.mPrmTbl.mAttentionArrowYOffset;   
 
@@ -425,7 +407,6 @@ void daNpc_Km1_c::setAttention() {
 
 /* 00000F78-00000FA4       .text decideType__11daNpc_Km1_cFi */
 bool daNpc_Km1_c::decideType(int param_1) {
-
     field_0x7D3 = 0xFF;
     switch(fopAcM_GetName(this)){
         case PROC_NPC_KM1:
@@ -492,7 +473,6 @@ void daNpc_Km1_c::privateCut() {
 
 /* 00001144-00001164       .text endEvent__11daNpc_Km1_cFv */
 void daNpc_Km1_c::endEvent() {
-
     dComIfGp_event_onEventFlag(8);
     field_0x7CB = 0xFF;
 
@@ -500,7 +480,6 @@ void daNpc_Km1_c::endEvent() {
 
 /* 00001164-000011C4       .text event_proc__11daNpc_Km1_cFv */
 void daNpc_Km1_c::event_proc() {
-
     if(!mEventCut.cutProc()){
         privateCut();
     }
@@ -510,7 +489,6 @@ void daNpc_Km1_c::event_proc() {
 
 /* 000011C4-00001270       .text set_action__11daNpc_Km1_cFM11daNpc_Km1_cFPCvPvPv_iPv */
 bool daNpc_Km1_c::set_action(ActionFunc i_action, void* param_2) {
-
     if(field_0x6F4 != i_action){
         if(field_0x6F4 != 0){
             field_0x7D5 = 0xFF;
@@ -525,7 +503,6 @@ bool daNpc_Km1_c::set_action(ActionFunc i_action, void* param_2) {
 
 /* 00001270-00001368       .text wait01__11daNpc_Km1_cFv */
 BOOL daNpc_Km1_c::wait01() {
-
     if(field_0x7C5 != 0){
         bool set_stt = true;
         field_0x7B7 = 0xFF;
@@ -574,7 +551,6 @@ BOOL daNpc_Km1_c::talk01() {
 
 /* 000013F8-000014AC       .text wait_action1__11daNpc_Km1_cFPv */
 int daNpc_Km1_c::wait_action1(void*) {
-
     if(field_0x7D5 == 0){
         setStt(1);
         field_0x7D5 += 1;
@@ -599,7 +575,6 @@ int daNpc_Km1_c::wait_action1(void*) {
 
 /* 000014AC-00001548       .text demo__11daNpc_Km1_cFv */
 u8 daNpc_Km1_c::demo() {
-
     if(demoActorID == 0){
         if(field_0x7C7 != 0){
             field_0x7C7 = 0;
@@ -649,7 +624,6 @@ BOOL daNpc_Km1_c::_draw() {
 
 /* 000016AC-00001808       .text _execute__11daNpc_Km1_cFv */
 BOOL daNpc_Km1_c::_execute() {
-
     if(field_0x7B8 == 0){
         field_0x774 = current.pos;
         field_0x76C = current.angle;
@@ -680,7 +654,6 @@ BOOL daNpc_Km1_c::_execute() {
 
 /* 00001808-0000188C       .text _delete__11daNpc_Km1_cFv */
 BOOL daNpc_Km1_c::_delete() {
-
     fopAcM_GetID(this);
     dComIfG_resDeleteDemo(&field_0x6C4,"Km");
 
@@ -704,13 +677,14 @@ static BOOL CheckCreateHeap(fopAc_ac_c* actor) {
 
 /* 000018AC-00001A1C       .text _create__11daNpc_Km1_cFv */
 cPhs_State daNpc_Km1_c::_create() {
-    static int a_heap_size_tbl[1] = {0x000272E0};
+    static int a_heap_size_tbl[] = {
+        0x272E0
+    };
 
 #if VERSION > VERSION_DEMO
     fopAcM_SetupActor(this, daNpc_Km1_c);
 #endif
 
-
     if (!decideType(fopAcM_GetParam(this) & 0xFF )) {
         return cPhs_ERROR_e;
     }
@@ -745,7 +719,6 @@ cPhs_State daNpc_Km1_c::_create() {
 
 /* 00001E4C-00002158       .text CreateHeap__11daNpc_Km1_cFv */
 BOOL daNpc_Km1_c::CreateHeap() {
-
     static u8 a_tex_pattern_num_tbl[1] = {TEXPATTERN_MABA};
     J3DModelData *a_mdl_data;
 
@@ -759,9 +732,8 @@ BOOL daNpc_Km1_c::CreateHeap() {
         J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1, NULL,
         0x80000, 0x11020002
     );
-    if (mpMorf){ 
+    if (mpMorf){
         if(mpMorf->getModel()) {
-
             m_head_jnt_num = a_mdl_data->getJointName()->getIndex("head");
             JUT_ASSERT(VERSION_SELECT(1335, 1344, 1344, 1344), m_head_jnt_num >= 0);
             m_backbone_jnt_num = a_mdl_data->getJointName()->getIndex("backbone");
@@ -786,6 +758,7 @@ BOOL daNpc_Km1_c::CreateHeap() {
     }
     return FALSE;
 }
+
 /* 00002158-00002178       .text daNpc_Km1_Create__FP10fopAc_ac_c */
 static cPhs_State daNpc_Km1_Create(fopAc_ac_c* i_this) {
     return ((daNpc_Km1_c*)i_this)->_create();
diff --git a/src/d/actor/d_a_npc_photo.cpp b/src/d/actor/d_a_npc_photo.cpp
index 74bf19e99..82a8da5a4 100644
--- a/src/d/actor/d_a_npc_photo.cpp
+++ b/src/d/actor/d_a_npc_photo.cpp
@@ -798,7 +798,6 @@ bool daNpcPhoto_c::_delete() {
 
 /* 000010A4-0000125C       .text _draw__12daNpcPhoto_cFv */
 bool daNpcPhoto_c::_draw() {
-
     J3DModel* model = mpMorf->getModel();
     J3DModelData *model_data = model->getModelData();
     g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &current.pos, &tevStr);
@@ -1939,7 +1938,6 @@ void daNpcPhoto_c::setMtx() {
 
 /* 000040B8-0000432C       .text chkAttention__12daNpcPhoto_cFv */
 void daNpcPhoto_c::chkAttention() {
-
     if(mEventCut.getAttnFlag()) {
         mLookAtPos = mEventCut.getAttnPos();
         field_0x9D6 = 1;
diff --git a/src/d/actor/d_a_obj_correct.cpp b/src/d/actor/d_a_obj_correct.cpp
index 5ab5530dc..a279011c1 100644
--- a/src/d/actor/d_a_obj_correct.cpp
+++ b/src/d/actor/d_a_obj_correct.cpp
@@ -106,7 +106,6 @@ void* daObjCorrect::Act_c::chk_try_actor2(daObjTry::Act_c* actor, daObjTry::Type
     if (type == actor->prm_get_type()) {
         f32 dist = actor->current.pos.abs2(current.pos);
         if (dist < i_depression_r_sq) {
-
             bool should_return;
             if (dist < i_sw_r_sq) {
                 should_return = prm_get_swSave() == actor->prm_get_swSave();
diff --git a/src/d/actor/d_a_obj_doguu.cpp b/src/d/actor/d_a_obj_doguu.cpp
index 03bf22bbf..530e43939 100644
--- a/src/d/actor/d_a_obj_doguu.cpp
+++ b/src/d/actor/d_a_obj_doguu.cpp
@@ -222,7 +222,6 @@ void daObjDoguu_c::CreateInit() {
         field_0x8A2 = true;
         field_0x8AC = 14;
     } else if (dComIfGs_isEventBit(0x1480) && dComIfGs_isEventBit(0x1440) && dComIfGs_isEventBit(0x1410)) {
-
         mBckHead.setFrame(mBckHead.getEndFrame());
         mBckBody.setFrame(mBckBody.getEndFrame());
         mBckCrystal.setFrame(mBckCrystal.getEndFrame());
@@ -230,7 +229,6 @@ void daObjDoguu_c::CreateInit() {
         field_0x8A1 = true;
         field_0x8A2 = false;
         field_0x8AC = 14;
-        
     } else {
         field_0x8A1 = false;
         if (
diff --git a/src/d/actor/d_a_obj_pfall.cpp b/src/d/actor/d_a_obj_pfall.cpp
index 2ee9e336f..cbb4a049e 100644
--- a/src/d/actor/d_a_obj_pfall.cpp
+++ b/src/d/actor/d_a_obj_pfall.cpp
@@ -74,7 +74,6 @@ void daObj_Pfall_c::setAnm() {
 
 /* 00000190-000004DC       .text set_mtx__13daObj_Pfall_cFv */
 void daObj_Pfall_c::set_mtx() {
-
     static cXyz offset_pos_left(-35.0f, 0.0f, 105.0f);
     static cXyz offset_pos_right(35.0f, 0.0f, -105.0f);
 
@@ -325,7 +324,6 @@ void daObj_Pfall_c::mode_wait_init() {
 
 /* 00000F1C-00000FC0       .text mode_wait__13daObj_Pfall_cFv */
 void daObj_Pfall_c::mode_wait() {
-
     if(dLib_checkPlayerInCircle(current.pos, 100.0f, 100.0f) 
         && dComIfGp_getPlayer(0)->speedF == 0.0f
         && cLib_calcTimer(&field_0x3B8) == 0) {
@@ -370,7 +368,6 @@ void daObj_Pfall_c::mode_proc_call() {
 
 /* 00001130-000012F4       .text _execute__13daObj_Pfall_cFv */
 bool daObj_Pfall_c::_execute() {
-
     attention_info.position = current.pos;
     eyePos = current.pos;
     
diff --git a/src/d/actor/d_a_player_main.cpp b/src/d/actor/d_a_player_main.cpp
index 1011f2448..a0256f9be 100644
--- a/src/d/actor/d_a_player_main.cpp
+++ b/src/d/actor/d_a_player_main.cpp
@@ -8435,7 +8435,6 @@ BOOL daPy_lk_c::procIceSlipFallUp() {
 
 /* 8011970C-801197D4       .text procIceSlipAlmostFall_init__9daPy_lk_cFv */
 BOOL daPy_lk_c::procIceSlipAlmostFall_init() {
-
     commonProcInit(daPyProc_ICE_SLIP_ALMOST_FALL_e);
     current.angle.y = cM_atan2s(m36AC.x, m36AC.z);
     int direction = getDirectionFromAngle(current.angle.y - shape_angle.y);
diff --git a/src/d/actor/d_a_tag_event.cpp b/src/d/actor/d_a_tag_event.cpp
index 68cd7c627..b00d04999 100644
--- a/src/d/actor/d_a_tag_event.cpp
+++ b/src/d/actor/d_a_tag_event.cpp
@@ -514,12 +514,10 @@ cPhs_State daTag_Event_c::create() {
 
     if (getType() == 0xD) {
         setActio(ACTION_SPE_ARRIVAL);
+    } else if (mEventIdx != -1 && (swbit == 0xFF || !dComIfGs_isSwitch(swbit, fopAcM_GetRoomNo(this)))) {
+        setActio(ACTION_ARRIVAL);
     } else {
-        if (mEventIdx != -1 && (swbit == 0xFF || !dComIfGs_isSwitch(swbit, fopAcM_GetRoomNo(this)))) {
-            setActio(ACTION_ARRIVAL);
-        } else {
-            setActio(ACTION_WAIT);
-        }
+        setActio(ACTION_WAIT);
     }
 
     shape_angle.x = shape_angle.z = 0;
diff --git a/src/d/d_cc_uty.cpp b/src/d/d_cc_uty.cpp
index a0c3d1e40..9c8c6c69d 100644
--- a/src/d/d_cc_uty.cpp
+++ b/src/d/d_cc_uty.cpp
@@ -223,7 +223,7 @@ fopAc_ac_c* cc_at_check(fopAc_ac_c* tgActor, CcAtInfo* atInfo) {
             
             fopAcM_seStart(tgActor, JA_SE_LK_LAST_HIT, 0);
             
-            pauseTime = 6 + g_regHIO.mChild->mShortRegs[7];
+            pauseTime = 6 + REG0_S(7);
             
             if (atInfo->pParticlePos) {
                 dComIfGp_particle_set(dPa_name::ID_COMMON_0010, atInfo->pParticlePos);
@@ -241,7 +241,7 @@ fopAc_ac_c* cc_at_check(fopAc_ac_c* tgActor, CcAtInfo* atInfo) {
                 if (atInfo->mResultingAttackType == 9) {
                     pauseTime = 6;
                 } else {
-                    pauseTime = 4 + g_regHIO.mChild->mShortRegs[6];
+                    pauseTime = 4 + REG0_S(6);
                 }
             } else {
                 if (fopAcM_GetName(tgActor) == PROC_MT) {
@@ -254,7 +254,7 @@ fopAc_ac_c* cc_at_check(fopAc_ac_c* tgActor, CcAtInfo* atInfo) {
                 } else {
                     fopAcM_seStart(tgActor, at_se_get(atInfo->mpObj), r29);
                 }
-                pauseTime = 1 + g_regHIO.mChild->mShortRegs[5];
+                pauseTime = 1 + REG0_S(5);
             }
         }
         
diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp
index 03e26305c..48ba1a0f6 100644
--- a/src/d/d_kankyo.cpp
+++ b/src/d/d_kankyo.cpp
@@ -350,11 +350,11 @@ void envcolor_init() {
     stage_vrbox_info_class* vrbox = dComIfGp_getStageVrboxInfo();
 
     for (int i = 0; i < 20; i++) {
-        g_regHIO.mChild[3].mFloatRegs[i] = 0.0f;
+        REG3_F(i) = 0.0f;
     }
 
     for (int i = 0; i < 10; i++) {
-        g_regHIO.mChild[3].mShortRegs[i] = 0;
+        REG3_S(i) = 0;
     }
 
 #if VERSION > VERSION_DEMO