summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
author123456789758 <205478182+123456789758@users.noreply.github.com>2025-03-31 18:10:34 -0400
committerGitHub <noreply@github.com>2025-03-31 18:10:34 -0400
commita69b604b01f520ea6a96c1411ebde44bbf3ff46d (patch)
treee652289fc8231c89e4af57ddcc754227ca278f12 /include
parent0b883c50c68d145cdf069e910f68208954108512 (diff)
d_a_player_pushpull.inc - Almost all matching except minor issues. (#728)
Co-authored-by: ‎ ‎ ‎ <‎ ‎ ‎>
Diffstat (limited to 'include')
-rw-r--r--include/d/actor/d_a_player.h1
-rw-r--r--include/d/actor/d_a_player_main.h2
-rw-r--r--include/d/d_bg_w.h1
3 files changed, 3 insertions, 1 deletions
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,