finish player.c

5 files changed, 8 insertions, 8 deletions

diff --git a/src/manager/manager15.c b/src/manager/manager15.c
index b73beba0..8dc10a8f 100644
--- a/src/manager/manager15.c
+++ b/src/manager/manager15.c
@@ -315,8 +315,8 @@ void sub_0805A76C(Manager15* this) {
 }
 
 void sub_0805A7E4(Manager15* this) {
-    if (gPlayerState.playerAction != PLAYER_WARP) {
-        gPlayerState.playerAction = PLAYER_WARP;
+    if (gPlayerState.queued_action != PLAYER_WARP) {
+        gPlayerState.queued_action = PLAYER_WARP;
         gPlayerState.field_0x38 = 0;
         gPlayerState.field_0x39 = 0;
     }
diff --git a/src/manager/manager1A.c b/src/manager/manager1A.c
index dc09ea5f..b188ef08 100644
--- a/src/manager/manager1A.c
+++ b/src/manager/manager1A.c
@@ -137,7 +137,7 @@ void sub_0805B168(Manager1A* this) {
 u32 sub_0805B1CC(Manager1A* this) {
     u32 re = 0;
     if (CheckPlayerProximity(this->unk_20, this->unk_22, this->unk_24, this->unk_26)) {
-        if ((gPlayerState.flags & 0x4) && (gPlayerState.flags & 0x1)) {
+        if ((gPlayerState.flags & PL_DROWNING) && (gPlayerState.flags & PL_BUSY)) {
             gPlayerState.flags |= 0x8000;
         } else if (gPlayerState.flags & 0x8000) {
             re = 1;
diff --git a/src/manager/manager34.c b/src/manager/manager34.c
index 6ca4773c..a3f83418 100644
--- a/src/manager/manager34.c
+++ b/src/manager/manager34.c
@@ -39,11 +39,11 @@ void sub_0805DBF0(Manager34* this) {
         sub_0805DC70();
     } else {
         if (this->field_0x20 == 0x78) {
-            sub_08080964(0x78, 2);
+            InitScreenShake(0x78, 2);
         } else if (this->field_0x20 == 0xd2) {
-            sub_08080964(0x5a, 1);
+            InitScreenShake(0x5a, 1);
         } else if (this->field_0x20 == 0x12c) {
-            sub_08080964(0x5a, 0);
+            InitScreenShake(0x5a, 0);
         }
 
         if (this->field_0x20 < 0x78) {
diff --git a/src/manager/managerA.c b/src/manager/managerA.c
index fbaf30ff..1d68eadc 100644
--- a/src/manager/managerA.c
+++ b/src/manager/managerA.c
@@ -117,7 +117,7 @@ static u32 PlayerStateValid(ManagerA* this) {
 static void sub_08058514(ManagerA* this) {
     switch (this->manager.unk_0d) {
         case 1:
-            if (gPlayerState.flags & (PL_BUSY | PL_DROWNING | PL_USE_PORTAL | 0x1210))
+            if (gPlayerState.flags & (PL_BUSY | PL_DROWNING | PL_USE_PORTAL | PL_FALLING | 0x1010))
                 return;
             if (gPlayerEntity.z.HALF.HI != 0)
                 return;
diff --git a/src/manager/managerC.c b/src/manager/managerC.c
index 2583ce98..1dae3225 100644
--- a/src/manager/managerC.c
+++ b/src/manager/managerC.c
@@ -156,7 +156,7 @@ void sub_08058A04(ManagerC* this) {
     s32 tmp2 = gPlayerEntity.y.HALF.HI - gRoomControls.roomOriginY;
     if ((this->unk_20 - 0x118 < 0xDu) && CheckGlobalFlag(LV1TARU_OPEN) && (tmp - 0x6d < 0x17u) &&
         (tmp2 - 0x45 < 0x17u) && (gPlayerEntity.z.HALF.HI == 0)) {
-        gPlayerState.playerAction = 3;
+        gPlayerState.queued_action = PLAYER_FALL;
         gPlayerState.field_0x38 = 0;
         gPlayerEntity.x.HALF.HI = gRoomControls.roomOriginX + 0x78;
         gPlayerEntity.y.HALF.HI = gRoomControls.roomOriginY + 0x50;