most of d_a_alink_wolf done / some misc (#1993)

* wip on alink_wolf * setup procvar unions * most of d_a_alink_wolf done + some misc
zeldaret · Nov 27, 2023 · 9ff0f50 · 9ff0f50
1 parent 6b0df1f
commit 9ff0f50
Show file tree

Hide file tree

Showing 81 changed files with 7,642 additions and 2,166 deletions.
diff --git a/include/Runtime.PPCEABI.H/__va_arg.h b/include/Runtime.PPCEABI.H/__va_arg.h
@@ -28,7 +28,7 @@ void* __va_arg(_va_list_struct*, int);
 // __builtin_va_info: initialize the __va_list_struct
 // _var_arg_typeof: convert type to integer for __va_arg
 #define __va_start(list, fmt) __builtin_va_info(&list)
-#define __va_arg(list, type) (*((type*)__va_arg(ap, _var_arg_typeof(type))))
+#define __va_arg(list, type) (*((type*)__va_arg(list, _var_arg_typeof(type))))
 #define va_start __va_start
 #define va_arg __va_arg
 #define va_end __va_end

diff --git a/include/SSystem/SComponent/c_m3d_g_cyl.h b/include/SSystem/SComponent/c_m3d_g_cyl.h
@@ -32,6 +32,7 @@ class cM3dGCyl {
     void calcMinMax(cXyz*, cXyz*);
     const cXyz* GetCP(void) const { return &mCenter; }
     f32 GetR(void) const { return mRadius; }
+    f32* GetRP() { return &mRadius; }
     f32 GetH(void) const { return mHeight; }
     cXyz& GetC() { return mCenter; }
 

diff --git a/include/Z2AudioLib/Z2Creature.h b/include/Z2AudioLib/Z2Creature.h
@@ -78,6 +78,7 @@ class Z2CreatureLink : public Z2Creature, public Z2LinkSoundStarter {
     u8 getLinkState() const { return mLinkState; }
     u8 getMoveSpeed() const { return mMoveSpeed; }
     bool isRiding() const { return mRiding; }
+    void i_setLinkState(u8 i_state) { mLinkState = i_state; }
 
     static Z2CreatureLink* mLinkPtr;
 

diff --git a/include/Z2AudioLib/Z2WolfHowlMgr.h b/include/Z2AudioLib/Z2WolfHowlMgr.h
@@ -32,7 +32,7 @@ class Z2WolfHowlMgr : public JASGlobalInstance<Z2WolfHowlMgr> {
     f32 getNowPitch();
     f32 getNowInputValue();
     void calcPitchMod(f32, f32);
-    void startWolfHowlSound(f32, f32, bool, f32);
+    s8 startWolfHowlSound(f32, f32, bool, f32);
     void setCorrectData(s8, Z2WolfHowlData*);
     SongNote getCorrectLine(u8);
     u8 getCorrectLineNum();
@@ -42,6 +42,10 @@ class Z2WolfHowlMgr : public JASGlobalInstance<Z2WolfHowlMgr> {
     int startGuideMelody(bool);
     void skipCorrectDemo();
 
+    void setCorrectCurve(s8 i_curve) { setCorrectData(i_curve, NULL); }
+    u32 getTimer() { return mTimer; }
+    u8 getReleaseTimer() { return mReleaseTimer; }
+
 private:
     /* 0x00 */ JAISoundHandle field_0x00;
     /* 0x04 */ JAISoundHandle field_0x04;