added macro for declaring state manager (used for annoying dummy funcs)

include/d/tg/d_t_rock_boat.h

@@ -23,14 +23,9 @@ public:
     STATE_FUNC_DECLARE(dTgRockBoat_c, Wait);
 
 private:
-
-    sFStateMgr_c<dTgRockBoat_c, sStateMethodUsr_FI_c> mStateMgr;
+    STATE_MGR_DECLARE(dTgRockBoat_c);
     int cooldown;
     int boatNum;
-
-    void dummy() {
-        mStateMgr.getStateID();
-    }
 };
 
 #endif

include/d/tg/d_t_tumble_weed.h

@@ -30,11 +30,8 @@ private:
     bool shouldDoWind();
     void doSpawnTumbleweed();
     void getWind(mVec3_c *);
-    void unused() {
-        mStateMgr.getStateID();
-    }
 
-    sFStateMgr_c<dTgTumbleWeed_c, sStateMethodUsr_FI_c> mStateMgr;
+    STATE_MGR_DECLARE(dTgTumbleWeed_c);
     u16 tumbleweedTimer;
     u16 padding;
     u16 windTimer;