d_a_e_rdy debug work (#3011)

* debug work for d_a_e_rdy

* remove unused fake function

* fix regressions

* rename variable

* Fix version diffs of angle adding

include/SSystem/SComponent/c_angle.h

@@ -3,6 +3,13 @@
 
 #include "SSystem/SComponent/c_xyz.h"
 
+#if PLATFORM_SHIELD
+#define ADD_ANGLE(x, y) ((x) += (s16)(y))
+#else
+#define ADD_ANGLE(x, y) ((x) += (y))
+#endif
+
+
 class cSAngle {
 private:
     s16 mAngle;

include/SSystem/SComponent/c_lib.h

@@ -102,7 +102,7 @@ void MtxTrans(f32, f32, f32, u8);
 void MtxScale(f32, f32, f32, u8);
 void MtxPosition(cXyz*, cXyz*);
 void MtxPush(void);
-Mtx* MtxPull(void);
+void MtxPull(void);
 
 extern Mtx* calc_mtx;
 

include/d/actor/d_a_e_yc.h

@@ -43,7 +43,7 @@ public:
     /* 0x6A2 */ s16 mTimer[4];
     /* 0x6AA */ s16 mCcDisableTimer;
     /* 0x6AC */ u32 mRiderID;
-    /* 0x6B0 */ u8 field_0x6b0;
+    /* 0x6B0 */ s8 field_0x6b0;
     /* 0x6B1 */ u8 field_0x6b1;
     /* 0x6B2 */ s8 mNoDrawFlag;
     /* 0x6B3 */ s8 mWolfBiteDamageCount;

src/SSystem/SComponent/c_lib.cpp

@@ -530,6 +530,6 @@ void MtxPush() {
     MTXCopy(mtx, *calc_mtx);
 }
 
-Mtx* MtxPull() {
-    return calc_mtx--;
+void MtxPull() {
+    calc_mtx--;
 }

src/d/actor/d_a_alink.cpp

@@ -2855,11 +2855,7 @@ s16 daAlink_c::getNeckAimAngle(cXyz* param_0, s16* param_1, s16* param_2, s16* p
     s16 sp18;
     s16 sp16 = field_0x2fe6 + mBodyAngle.y;
     if ((mProcID == PROC_GOAT_CATCH && mProcVar1.field_0x300a == 0) || (mProcID == PROC_HAND_PAT && mProcVar2.field_0x300c == 0)) {
-#if VERSION == VERSION_SHIELD_DEBUG
-        sp16 += (s16)0x8000;
-#else
-        sp16 -= (s16)0x8000;
-#endif
+        ADD_ANGLE(sp16, 0x8000);
     }
 
     cXyz sp28 = eyePos - field_0x34e0;

src/d/actor/d_a_cstatue.cpp

@@ -1043,7 +1043,7 @@ void daCstatue_c::initStartBrkBtk() {
     for (int iParticle = 0; iParticle < 2; iParticle++) {
         dComIfGp_particle_set(0x88bb, &mBallPos, &angle, NULL);
         dComIfGp_particle_set(0x88bc, &mBallPos, &angle, NULL);
-        angle.y -= (s16)0x8000;
+        ADD_ANGLE(angle.y, 0x8000);
     }
 }