d_a_player_npc OK, d_a_npc_os 100% except weakfunc order

include/d/actor/d_a_npc_os.h

@@ -45,7 +45,7 @@ public:
     f32 getBaseAnimeFrame() { return 0.0f; }
     f32 getBaseAnimeFrameRate() { return 1.0f; }
     s8 getCattleRoomNo() { return m_cattleRoomNo; }
-    cXyz& getEyePos() { return eyePos; }
+    cXyz& getEyePos() { return field_0x748; }
     f32 getGroundY() { return mAcch.GetGroundH(); }
     s16 getHead_x() { return mJntCtrl.getHead_x(); }
     s16 getHead_y() { return mJntCtrl.getHead_y(); }
@@ -57,20 +57,20 @@ public:
         }
     }
     BOOL isFinish() { return cLib_checkBit(field_0x784, 0x1UL); }
-    BOOL isGravity() { return cLib_checkBit(field_0x784, 0x8UL); }
-    BOOL isPlayerRoom_Goat() {}
+    void onFinish() { cLib_onBit(field_0x784, 0x1UL); }
     BOOL isSetHomePos() { return cLib_checkBit(field_0x784, 0x2UL); }
+    void onSetHomePos() { cLib_onBit(field_0x784, 0x2UL); }
     BOOL isWaterHit() { return cLib_checkBit(field_0x784, 0x4UL); }
-    void offGravity() { field_0x784 &= ~0x8; }
+    void onWaterHit() { cLib_onBit(field_0x784, 0x4UL); }
+    BOOL isGravity() { return cLib_checkBit(field_0x784, 0x8UL); }
+    void onGravity() { cLib_onBit(field_0x784, 0x8UL); }
+    void offGravity() { cLib_offBit(field_0x784, 0x8UL); }
     void offPlayerRoom(int idx) { m_playerRoom[idx] = false; }
-    void onFinish() { field_0x784 |= 0x1; }
-    void onGravity() { field_0x784 |= 0x8; }
     void onPlayerRoom(int idx) { m_playerRoom[idx] = true; }
-    void onSetHomePos() { field_0x784 |= 0x2; }
-    void onWaterHit() { field_0x784 |= 0x4; }
     void setCattleRoomNo(s8 roomNo) { m_cattleRoomNo = roomNo; }
 
     static bool isPlayerRoom(int idx) { return m_playerRoom[idx]; }
+    static bool isPlayerRoom_Goat() { return isPlayerRoom(1); }
 
     s32 create();
     BOOL createHeap();

include/d/d_com_inf_game.h

@@ -1036,6 +1036,7 @@ inline void dComIfGs_setRestartOption(s8 i_option) {
 
 inline void dComIfGs_setRestartOption(cXyz* i_pos, s16 i_angle, s8 i_roomNo, s8 i_option) {
     g_dComIfG_gameInfo.save.getRestart().setRestartOption(i_option, i_pos, i_angle, i_roomNo);
+    g_dComIfG_gameInfo.save.getPlayer().getPriest().set(i_option, *i_pos, i_angle, i_roomNo);
 }
 
 inline u32 dComIfGs_getRestartRoomParam() {

include/d/d_particle.h

@@ -75,6 +75,11 @@ public:
     virtual void end();
 
     void setTevStr(dKy_tevstr_c* tevStr) { mTevstr = tevStr; }
+    void remove() { end(); }
+
+    void offWindOff() {}
+    void onWindOff() {}
+    void setColor(const GXColor&) {}
 
     /* 0x14 */ s8 field_0x14;
     /* 0x15 */ u8 field_0x15;