Mark funcs with weak func order issues as Equivalent, fix a few other issues

include/JSystem/JParticle/JPAEmitter.h

@@ -8,8 +8,6 @@
 #include "JSystem/JMath/random.h"
 #include "JSystem/JGeometry.h"
 #include "JSystem/TPosition3.hh"
-#include "SSystem/SComponent/c_xyz.h"
-#include "SSystem/SComponent/c_sxyz.h"
 #include "dolphin/gx/GXStruct.h"
 #include "dolphin/mtx/mtx.h"
 

include/d/actor/d_a_npc_os.h

@@ -16,8 +16,10 @@ class daNpc_Os_infiniteEcallBack_c : public dPa_levelEcallBack {
 public:
     void end();
     void makeEmitter(u16, const cXyz*, const csXyz*, const cXyz*);
-    void execute(JPABaseEmitter*);
-    void setup(JPABaseEmitter*, const cXyz*, const csXyz*, s8);
+    void execute(JPABaseEmitter*) {}
+    void setup(JPABaseEmitter* pEmitter, const cXyz*, const csXyz*, s8) {
+        mpBaseEmitter = pEmitter;
+    }
 
     JPABaseEmitter* getEmitter() { return mpBaseEmitter; }
 
@@ -41,8 +43,6 @@ public:
     cXyz& getAttentionBasePos() { return field_0x754; }
     s16 getBackbone_x() { return mJntCtrl.getBackbone_x(); }
     s16 getBackbone_y() { return mJntCtrl.getBackbone_y(); }
-    f32 getBaseAnimeFrame() { return 0.0f; }
-    f32 getBaseAnimeFrameRate() { return 1.0f; }
     s8 getCattleRoomNo() { return m_cattleRoomNo; }
     cXyz& getEyePos() { return field_0x748; }
     f32 getGroundY() { return mAcch.GetGroundH(); }
@@ -50,6 +50,8 @@ public:
     s16 getHead_y() { return mJntCtrl.getHead_y(); }
     MtxP getLeftHandMatrix() { return cullMtx; }
     MtxP getRightHandMatrix() { return cullMtx; }
+    f32 getBaseAnimeFrameRate() { return 1.0f; }
+    f32 getBaseAnimeFrame() { return 0.0f; }
     void incAttnSetCount() {
         if(field_0x7A3 != 0xFF) {
             field_0x7A3 += 1;

include/d/actor/d_a_player.h

@@ -486,15 +486,15 @@ public:
     virtual MtxP getLeftHandMatrix() = 0;
     virtual MtxP getRightHandMatrix() = 0;
     virtual f32 getGroundY() = 0;
-    virtual s32 getTactMusic() const;// { return -1; }
+    virtual s32 getTactMusic() const { return -1; }
     virtual int getTactTimerCancel() const { return 0; }
     virtual BOOL checkPlayerGuard() const { return FALSE; }
     virtual fopAc_ac_c* getGrabMissActor() { return NULL; }
-    virtual u32 checkPlayerFly() const;// { return 0; }
+    virtual u32 checkPlayerFly() const { return 0; }
     virtual BOOL checkFrontRoll() const { return FALSE; }
     virtual BOOL checkBottleSwing() const { return FALSE; }
     virtual BOOL checkCutCharge() const { return FALSE; }
-    virtual BOOL getBokoFlamePos(cXyz*);// { return FALSE; }
+    virtual BOOL getBokoFlamePos(cXyz*) { return FALSE; }
     virtual BOOL checkTactWait() const { return FALSE; }
     virtual void setTactZev(fpc_ProcID, int, char*) {}
     virtual void onDekuSpReturnFlg(u8) {}
@@ -503,18 +503,18 @@ public:
     virtual f32 getBaseAnimeFrame() = 0;
     virtual fpc_ProcID getItemID() const { return fpcM_ERROR_PROCESS_ID_e; }
     virtual fpc_ProcID getThrowBoomerangID() const { return fpcM_ERROR_PROCESS_ID_e; }
-    virtual fpc_ProcID getGrabActorID() const;// { return fpcM_ERROR_PROCESS_ID_e; }
+    virtual fpc_ProcID getGrabActorID() const { return fpcM_ERROR_PROCESS_ID_e; }
     virtual BOOL checkGrabBarrel() { return FALSE; }
     virtual u32 checkPlayerNoDraw() { return FALSE; }
     virtual BOOL checkRopeTag() { return FALSE; }
     virtual BOOL checkRopeReadyAnime() const { return FALSE; }
     virtual void voiceStart(u32) {}
     virtual void setOutPower(f32, s16, int) {}
-    virtual void onFrollCrashFlg(u32);// {}
+    virtual void onFrollCrashFlg(u32) {}
     virtual MtxP getModelJointMtx(u16) { return NULL; }
     virtual f32 getOldSpeedY() { return 0.0f; }
     virtual BOOL setHookshotCarryOffset(fpc_ProcID, const cXyz*) { return FALSE; }
-    virtual void setPlayerPosAndAngle(cXyz*, s16);// {}
+    virtual void setPlayerPosAndAngle(cXyz*, s16) {}
     virtual void setPlayerPosAndAngle(cXyz*, csXyz*) {}
     virtual void setPlayerPosAndAngle(MtxP) {}
     virtual BOOL setThrowDamage(cXyz*, s16, f32, f32, int) { return FALSE; }

include/d/d_bg_s_movebg_actor.h

@@ -42,4 +42,4 @@ public:
 
 STATIC_ASSERT(sizeof(dBgS_MoveBgActor) == 0x2C8);
 
-#endif /* D_BG_S_MOVEBG_ACTOR_H */
+#endif /* D_BG_S_MOVEBG_ACTOR_H */