Add more player inlines

3 files changed, 8 insertions, 7 deletions

diff --git a/src/d/actor/d_a_am.cpp b/src/d/actor/d_a_am.cpp
index 3b70f433..4a52db0e 100644
--- a/src/d/actor/d_a_am.cpp
+++ b/src/d/actor/d_a_am.cpp
@@ -647,7 +647,7 @@ static void action_dousa(am_class* i_this) {
         i_this->mGravity = -11.0f;
         i_this->speed.y = 40.0f;
         fopAcM_monsSeStart(i_this, JA_SE_CV_AM_JUMP, 0);
-        if (!Line_check(i_this, player->current.pos) || player->getDamageWaitTimer()) {
+        if (!Line_check(i_this, player->current.pos) || player->getDamageWaitTimer() != 0) {
             i_this->speedF = 0.0f;
         }
         i_this->mState += 1;
diff --git a/src/d/actor/d_a_player_main.cpp b/src/d/actor/d_a_player_main.cpp
index 295398e8..4790f2c7 100644
--- a/src/d/actor/d_a_player_main.cpp
+++ b/src/d/actor/d_a_player_main.cpp
@@ -1448,7 +1448,7 @@ BOOL daPy_lk_c::commonProcInit(daPy_lk_c::daPy_PROC procID) {
     m32F0.end();
     mSmokeEcallBack.end();
     
-    if (!(field_0x2b0 < 0.0f)) {
+    if (!checkGrabWear()) {
         m35D8 = 0.0f;
     }
     
@@ -2115,7 +2115,7 @@ void daPy_lk_c::setBgCheckParam() {
         mAcchCir[0].SetWallH(25.0f);
         mAcchCir[1].SetWallH(25.0f);
         mAcchCir[2].SetWallH(25.0f);
-    } else if (field_0x2b0 < 0.0f) {
+    } else if (checkGrabWear()) {
         mAcchCir[0].SetWallR(50.0f);
     } else {
         mAcchCir[0].SetWallR(35.0f);
diff --git a/src/d/actor/d_a_vrbox.cpp b/src/d/actor/d_a_vrbox.cpp
index a0785edd..dcf159a3 100644
--- a/src/d/actor/d_a_vrbox.cpp
+++ b/src/d/actor/d_a_vrbox.cpp
@@ -94,7 +94,7 @@ static BOOL daVrbox_color_set(vrbox_class* i_this) {
 
 /* 8015E6B8-8015E864       .text dungeon_rain_proc__Fv */
 static void dungeon_rain_proc() {
-    dScnKy_env_light_c* env_light = &g_env_light;
+    dScnKy_env_light_c* env_light = &g_env_light; // Probably a fakematch
     u8 mode = 0;
     int roomNo = dComIfGp_roomControl_getStayNo();
     
@@ -126,17 +126,18 @@ static void dungeon_rain_proc() {
             if (env_light->mRainCountOrig != 250) {
                 dKy_change_colpat(1);
                 dKyw_rain_set(250);
-                g_env_light.mThunderEff.mMode = 1;
+                env_light = &g_env_light;
+                env_light->mThunderEff.mMode = 1;
             }
         } else if (mode == 2) { // Thunder, but no rain
             env_light = &g_env_light;
-            if (g_env_light.mThunderEff.mMode == 0) {
+            if (env_light->mThunderEff.mMode == 0) {
                 dKy_change_colpat(1);
                 env_light->mThunderEff.mMode = 0xA;
             }
         } else { // No rain or thunder
             env_light = &g_env_light;
-            if (g_env_light.mThunderEff.mMode != 0) {
+            if (env_light->mThunderEff.mMode != 0) {
                 dKyw_rain_set(0);
                 env_light->mThunderEff.mMode = 0;
             }