From a69b604b01f520ea6a96c1411ebde44bbf3ff46d Mon Sep 17 00:00:00 2001
From: 123456789758 <205478182+123456789758@users.noreply.github.com>
Date: Mon, 31 Mar 2025 18:10:34 -0400
Subject: d_a_player_pushpull.inc - Almost all matching except minor issues.
 (#728)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: ‎ ‎ ‎ <‎ ‎ ‎>
---
 include/d/actor/d_a_player.h      | 1 +
 include/d/actor/d_a_player_main.h | 2 +-
 include/d/d_bg_w.h                | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/d/actor/d_a_player.h b/include/d/actor/d_a_player.h
index 2134389f..f6c37b8c 100644
--- a/include/d/actor/d_a_player.h
+++ b/include/d/actor/d_a_player.h
@@ -147,6 +147,7 @@ public:
         daPyRFlg0_UNK1                  = 0x00000001,
         daPyRFlg0_UNK2                  = 0x00000002,
         daPyRFlg0_ROPE_GRAB_RIGHT_HAND  = 0x00000004,
+        daPyRFlg0_UNK8                  = 0x00000008,
         daPyRFlg0_UNK10                 = 0x00000010,
         daPyRFlg0_GRAB_UP_END           = 0x00000020,
         daPyRFlg0_AUTO_JUMP_LAND        = 0x00000040,
diff --git a/include/d/actor/d_a_player_main.h b/include/d/actor/d_a_player_main.h
index 21949ff7..fd95dc1c 100644
--- a/include/d/actor/d_a_player_main.h
+++ b/include/d/actor/d_a_player_main.h
@@ -1600,7 +1600,7 @@ public:
     BOOL procHammerFrontSwing();
     BOOL procHammerFrontSwingEnd_init();
     BOOL procHammerFrontSwingEnd();
-    void setPushPullKeepData(dBgW::PushPullLabel);
+    int setPushPullKeepData(dBgW::PushPullLabel);
     BOOL procPushPullWait_init(int);
     BOOL procPushPullWait();
     BOOL procPushMove_init();
diff --git a/include/d/d_bg_w.h b/include/d/d_bg_w.h
index b14e8b16..021355d3 100644
--- a/include/d/d_bg_w.h
+++ b/include/d/d_bg_w.h
@@ -19,6 +19,7 @@ typedef struct _GXColor GXColor;
 class dBgW : public cBgW {
 public:
     enum PushPullLabel {
+        PP_UNK0_e = 0x00,
         PP_UNK1_e = 0x01,
         PP_UNK2_e = 0x02,
         PP_UNK4_e = 0x04,
-- 
cgit v1.2.3