d_a_alink_hang first pass

2 files changed, 21 insertions, 19 deletions

diff --git a/include/d/a/d_a_alink.h b/include/d/a/d_a_alink.h
index 1ca2dabef2..7f2405565c 100644
--- a/include/d/a/d_a_alink.h
+++ b/include/d/a/d_a_alink.h
@@ -2212,13 +2212,13 @@ public:
     /* 800F9ABC */ int procCrawlAutoMove();
     /* 800F9D7C */ int procCrawlEndInit(int, s16, s16);
     /* 800F9F30 */ int procCrawlEnd();
-    /* 800F9FDC */ void getHangMoveAnmSpeed();
-    /* 800F9FFC */ void getHangDirectionFromAngle();
+    /* 800F9FDC */ f32 getHangMoveAnmSpeed();
+    /* 800F9FFC */ int getHangDirectionFromAngle();
     /* 800FA070 */ BOOL hangMoveBgCheck(s16, cXyz*);
-    /* 800FA338 */ void changeHangMoveProc(int);
-    /* 800FA5C8 */ void checkHangFootWall();
+    /* 800FA338 */ BOOL changeHangMoveProc(int);
+    /* 800FA5C8 */ bool checkHangFootWall();
     /* 800FA6E4 */ void setHangGroundY();
-    /* 800FA78C */ void changeHangEndProc();
+    /* 800FA78C */ int changeHangEndProc();
     /* 800FA85C */ void checkHangStartSideWall(s16);
     /* 800FAA7C */ int procHangStartInit();
     /* 800FAE14 */ int procHangStart();
@@ -2243,14 +2243,14 @@ public:
     /* 800FC748 */ void setBossBodyHangPos();
     /* 800FC77C */ int procBossBodyHangInit(fopAc_ac_c*);
     /* 800FC870 */ int procBossBodyHang();
-    /* 800FCF58 */ void getLadderUnitCount() const;
-    /* 800FCF84 */ void setLadderInit();
+    /* 800FCF58 */ int getLadderUnitCount() const;
+    /* 800FCF84 */ int setLadderInit();
     /* 800FD048 */ void setLadderPosInit();
     /* 800FD1F0 */ void setLadderPos(int);
-    /* 800FD288 */ void getLadderMoveAnmSpeed();
+    /* 800FD288 */ f32 getLadderMoveAnmSpeed();
     /* 800FD2AC */ void changeLadderMoveProc(int);
-    /* 800FD4A8 */ void setMoveBGLadderCorrect();
-    /* 800FD5E4 */ void checkLadderFall();
+    /* 800FD4A8 */ int setMoveBGLadderCorrect();
+    /* 800FD5E4 */ int checkLadderFall();
     /* 800FD648 */ int procLadderUpStartInit();
     /* 800FD7B0 */ int procLadderUpStart();
     /* 800FD824 */ int procLadderUpEndInit(int);
@@ -2261,17 +2261,17 @@ public:
     /* 800FDCCC */ int procLadderDownEnd();
     /* 800FDD90 */ int procLadderMoveInit(int, int, cXyz*);
     /* 800FDF50 */ int procLadderMove();
-    /* 800FE010 */ void getClimbMoveUpDownAnmSpeed();
-    /* 800FE034 */ void getClimbMoveSideAnmSpeed();
-    /* 800FE058 */ void checkClimbCode(cBgS_PolyInfo&);
+    /* 800FE010 */ f32 getClimbMoveUpDownAnmSpeed();
+    /* 800FE034 */ f32 getClimbMoveSideAnmSpeed();
+    /* 800FE058 */ BOOL checkClimbCode(cBgS_PolyInfo&);
     /* 800FE114 */ void setClimbInit();
     /* 800FE174 */ void setClimbShapeOffset();
-    /* 800FE3C4 */ void getClimbDirectionFromAngle();
+    /* 800FE3C4 */ int getClimbDirectionFromAngle();
     /* 800FE438 */ void changeClimbMoveProc(int);
     /* 800FE5A0 */ void checkClimbMoveUpDownProc(int);
     /* 800FE6E8 */ void checkClimbMoveSideProc(int);
     /* 800FE868 */ void setMoveBGClimbCorrect();
-    /* 800FEB90 */ void checkBgCorrectClimbMove(cXyz*, cXyz*);
+    /* 800FEB90 */ int checkBgCorrectClimbMove(cXyz*, cXyz*);
     /* 800FEC70 */ void checkClimbRoof(f32);
     /* 800FED50 */ void checkClimbGround(cXyz*, f32);
     /* 800FEEC0 */ void checkBgClimbMove(int);
@@ -2288,11 +2288,11 @@ public:
     /* 80100258 */ int procClimbWait();
     /* 801003E4 */ int procClimbToRoofInit();
     /* 80100464 */ int procClimbToRoof();
-    /* 801005CC */ void getRoofHangFMoveAnmSpeed() const;
-    /* 801005F0 */ void getRoofHangSMoveAnmSpeed() const;
+    /* 801005CC */ f32 getRoofHangFMoveAnmSpeed() const;
+    /* 801005F0 */ f32 getRoofHangSMoveAnmSpeed() const;
     /* 80100614 */ void setRoofHangHandOnSE(cBgS_PolyInfo*);
-    /* 80100668 */ void checkRoofHangMovePos();
-    /* 80100770 */ void commonRoofHangProc();
+    /* 80100668 */ int checkRoofHangMovePos();
+    /* 80100770 */ int commonRoofHangProc();
     /* 801008EC */ void checkNextActionRoofHang();
     /* 80100A10 */ int procRoofHangStartInit(cBgS_PolyInfo const&, cXyz const&, int);
     /* 80100AE4 */ int procRoofHangStart();
diff --git a/include/d/a/d_a_player.h b/include/d/a/d_a_player.h
index 6ebfbd8526..b0c0d56308 100644
--- a/include/d/a/d_a_player.h
+++ b/include/d/a/d_a_player.h
@@ -270,6 +270,7 @@ public:
         FLG2_UNK_20000 = 0x20000,
         FLG2_SCN_CHG_START = 0x8000,
         FLG2_UNK_4000 = 0x4000,
+        FLG2_UNK_2000 = 0x2000,
         FLG2_UNK_1000 = 0x1000,
         FLG2_UNK_200 = 0x200,
         FLG2_UNK_80 = 0x80,
@@ -289,6 +290,7 @@ public:
         FLG3_UNK_4000000 = 0x4000000,
         FLG3_UNK_2000000 = 0x2000000,
         FLG3_UNK_1000000 = 0x1000000,
+        FLG3_UNK_400000 = 0x400000,
         FLG3_UNK_100000 = 0x100000,
         FLG3_UNK_80000 = 0x80000,
         FLG3_COPY_ROD_THROW_AFTER = 0x40000,