Use "switch no" instead of "switch id/index"

include/d/actor/d_a_cc.h

@@ -25,7 +25,7 @@ public:
     /* 0x2F0 */ u8 mBehaviorType;
     /* 0x2F1 */ u8 mColorType;
     /* 0x2F2 */ u8 mNoticeRangeByte;
-    /* 0x2F3 */ u8 mDisableSpawnSwitchIndex;
+    /* 0x2F3 */ u8 mDisableSpawnSwitchNo;
     /* 0x2F4 */ u8 mCurrAction;
     /* 0x2F5 */ u8 m2F5;
     /* 0x2F6 */ u8 m2F6[0x2F7 - 0x2F6];
@@ -90,6 +90,6 @@ public:
     /* 0xA34 */ u8 mA34[0xBD4 - 0xA34];
     /* 0xBD4 */ enemyfire mEnemyFire;
     /* 0xDFC */ u8 mDFC[0xE04 - 0xDFC];
-};
+};  // Size: 0xE04
 
 #endif /* D_A_CC_H */

include/d/actor/d_a_ep.h

@@ -36,7 +36,7 @@ public:
     /* 0x502 */ s16 mAlphaModelRotY;
     /* 0x504 */ u8 mType;
     /* 0x505 */ u8 m505;
-    /* 0x506 */ u8 mOnSwitchId;
+    /* 0x506 */ u8 mOnSwitchNo;
     /* 0x507 */ u8 m507;
     /* 0x508 */ u8 m508;
     /* 0x509 */ u8 m509[0x50C - 0x509];
@@ -72,6 +72,6 @@ public:
     /* 0x894 */ u8 m894[0x910 - 0x894];
     /* 0x910 */ u8 mGroundCheckTimer;
     /* 0x911 */ u8 m911[0x914 - 0x911];
-};
+};  // Size: 0x914
 
 #endif /* D_A_EP_H */

include/d/actor/d_a_kamome.h

@@ -17,11 +17,11 @@ public:
     /* 0x2A0 */ u8 mType;
     /* 0x2A1 */ u8 mKoMaxCount;
     /* 0x2A2 */ u8 mPathIdx;
-    /* 0x2A3 */ u8 mSwitchIdArg;
+    /* 0x2A3 */ u8 mSwitchNoPrm;
     /* 0x2A4 */ int mGlobalTimer;
     /* 0x2A8 */ u8 mAnimState;
     /* 0x2A9 */ u8 mMoveState;
-    /* 0x2AA */ u8 mSwitchId;
+    /* 0x2AA */ u8 mSwitchNo;
     /* 0x2AB */ u8 m2AB;
     /* 0x2AC */ s16 mJointRotY;
     /* 0x2AE */ s16 mJointRotZ;
@@ -66,6 +66,6 @@ public:
     /* 0x55C */ dCcD_Sph mSph;
     /* 0x688 */ u8 m688;
     /* 0x689 */ u8 m689[0x68C - 0x689];
-};
+};  // Size: 0x68C
 
 #endif /* D_A_KAMOME_H */

include/d/actor/d_a_kantera.h

@@ -27,7 +27,7 @@ public:
     /* 0x298 */ u8 mParam0;
     /* 0x299 */ u8 mParam1;
     /* 0x29A */ u8 mParam2;
-    /* 0x29B */ u8 mSwitchID;
+    /* 0x29B */ u8 mSwitchNo;
     /* 0x29C */ J3DModel* mpModel;
     /* 0x2A0 */ J3DModel* mpModel2;
     /* 0x2A4 */ fpc_ProcID mTargetActorID;
@@ -67,6 +67,6 @@ public:
     /* 0x6F0 */ dPa_followEcallBack mPtclCallBack1;
     /* 0x704 */ cXyz mParticleScale;
     /* 0x710 */ mo_ga_s mGa[2];
-};
+};  // Size: 0x770
 
 #endif /* D_A_KANTERA_H */

include/d/actor/d_a_kytag03.h

@@ -10,14 +10,13 @@ class kytag03_class : public fopAc_ac_c {
 public:
     /* 0x290 */ request_of_phase_process_class mPhs;
     /* 0x298 */ mDoExt_McaMorf* mpModel;
-    /* 0x29C */ u32 field_0x29c;
+    /* 0x29C */ u8 m29C[0x2A0 - 0x29C];
     /* 0x2A0 */ u8 field_0x2a0;
-    /* 0x2A1 */ u8 mSwitchID;
+    /* 0x2A1 */ u8 mSwitchNo;
     /* 0x2A2 */ u8 mbRoomActive;
     /* 0x2A3 */ u8 mbVisible;
     /* 0x2A4 */ u8 mbIsActive;
-    /* 0x2A5 */ u8 m2A5;
     /* 0x2A8 */ f32 field_0x2a8;
-};
+};  // Size: 0x2AC
 
 #endif /* D_A_KYTAG03_H */

include/d/actor/d_a_tsubo.h

@@ -200,7 +200,7 @@ namespace daTsubo {
         /* 0x638 */ dCcD_Stts mStts;
         /* 0x674 */ int mType;
         /* 0x678 */ int m678;
-        /* 0x67C */ u16 mSwitchId;
+        /* 0x67C */ u16 mSwitchNo;
         /* 0x67E */ u8 m67E[0x67F - 0x67E];
         /* 0x67F */ u8 m67F;
         /* 0x680 */ u8 m680[0x682 - 0x680];
@@ -231,7 +231,7 @@ namespace daTsubo {
         /* 0x802 */ u8 m802[0x814 - 0x802];
         /* 0x814 */ cXyz m814;
         /* 0x820 */ u8 m820[0xF00 - 0x820];
-    };
+    };  // Size: 0xF00
     
     namespace Method {
         s32 Create(void*);

include/d/actor/d_a_wall.h

@@ -24,6 +24,14 @@ public:
     void set_se();
     bool _draw();
 
+    static GXColor m_smoke_color;
+    static const s16 m_heapsize[3];
+    static const char* m_arcname[3];
+    static const Vec m_cull_size[][2];
+    static const Vec m_tri_vtx[3][4];
+    static const s16 m_bmdname[3];
+    static const s16 m_dzbname[3];
+
 public:
     /* 0x290 */ request_of_phase_process_class mPhs;
     /* 0x298 */ J3DModel* mpModel;
@@ -36,16 +44,8 @@ public:
     /* 0x5D0 */ JPABaseEmitter* mpEmitter;
     /* 0x5D4 */ f32 mDst;
     /* 0x5D8 */ u8 mBreakCounter;
-    /* 0x5DC */ s32 mSwitchIndex;
+    /* 0x5DC */ s32 mSwitchNo;
     /* 0x5E0 */ u8 mType;
-
-    static GXColor m_smoke_color;
-    static const s16 m_heapsize[3];
-    static const char* m_arcname[3];
-    static const Vec m_cull_size[][2];
-    static const Vec m_tri_vtx[3][4];
-    static const s16 m_bmdname[3];
-    static const s16 m_dzbname[3];
-};
+};  // Size: 0x5E4
 
 #endif /* D_A_WALL_H */