Player: Fix HackerJudge headers (#970)

data/file_list.yml

@@ -154240,7 +154240,7 @@ Util/HackerJudge.o:
   - offset: 0x551f98
     size: 24
     label: _ZN11HackerJudgeC2EPP14IUsePlayerHack
-    status: NotDecompiled
+    status: Matching
 Util/HelpFunction.o:
   '.text':
   - offset: 0x551fb0

src/Enemy/Gamane.cpp

@@ -27,7 +27,7 @@
 #include "Enemy/GamaneBullet.h"
 #include "Enemy/GamaneHackState.h"
 #include "Enemy/HackerDepthShadowMapCtrl.h"
-#include "Player/HackerJudge.h"
+#include "Player/HackerJudgeNormalFall.h"
 #include "Player/PlayerHackStartShaderCtrl.h"
 #include "Util/Hack.h"
 #include "Util/ItemUtil.h"

src/Enemy/KaronWingStateHack.cpp

@@ -18,7 +18,8 @@
 #include "Enemy/HackerDepthShadowMapCtrl.h"
 #include "Player/CollisionShapeInfo.h"
 #include "Player/CollisionShapeKeeper.h"
-#include "Player/HackerJudge.h"
+#include "Player/HackerJudgeNormalFall.h"
+#include "Player/HackerJudgeStartRun.h"
 #include "Player/HackerStateWingFly.h"
 #include "Player/PlayerActionTurnControl.h"
 #include "Player/PlayerCollider.h"

src/MapObj/AnagramAlphabetCharacter.cpp

@@ -16,7 +16,8 @@
 
 #include "MapObj/AnagramAlphabet.h"
 #include "MapObj/CapTargetParts.h"
-#include "Player/HackerJudge.h"
+#include "Player/HackerJudgeNormalFall.h"
+#include "Player/HackerJudgeStartRun.h"
 #include "Player/PlayerHackStartShaderCtrl.h"
 #include "Util/Hack.h"
 #include "Util/JudgeUtil.h"

src/Player/HackerJudge.h

@@ -1,71 +0,0 @@
-#pragma once
-
-#include <basis/seadTypes.h>
-
-#include "Library/HostIO/HioNode.h"
-
-#include "Player/IJudge.h"
-
-namespace al {
-class LiveActor;
-}
-
-class IUsePlayerCollision;
-class IUsePlayerHack;
-
-class HackerJudge : public al::HioNode, public IJudge {
-public:
-    HackerJudge(IUsePlayerHack** parent) { mHacker = parent; };
-
-    void reset() override;
-    void update() override;
-    bool judge() const override;
-
-    IUsePlayerHack** getHacker() const { return mHacker; };
-
-private:
-    IUsePlayerHack** mHacker;
-};
-
-class HackerJudgeNormalFall : public HackerJudge {
-public:
-    HackerJudgeNormalFall(const al::LiveActor* parent, s32 unk);
-    void reset() override;
-    void update() override;
-    bool judge() const override;
-
-    void setPlayerCollision(IUsePlayerCollision* playerCollision) {
-        mPlayerCollision = playerCollision;
-    }
-
-private:
-    s32 field_10;
-    s32 field_14;
-    IUsePlayerCollision* mPlayerCollision;
-};
-
-class HackerJudgeStartJump : public HackerJudge {
-public:
-    HackerJudgeStartJump(IUsePlayerHack**);
-    void reset() override;
-    void update() override;
-    bool judge() const override;
-};
-
-class HackerJudgeStartRun : public HackerJudge {
-public:
-    HackerJudgeStartRun(const al::LiveActor*, IUsePlayerHack**);
-    void reset() override;
-    void update() override;
-    bool judge() const override;
-
-    void setPlayerCollision(IUsePlayerCollision* playerCollision) {
-        mPlayerCollision = playerCollision;
-    }
-
-private:
-    al::LiveActor* mParent;
-    s32 field_18;
-    IUsePlayerCollision* mPlayerCollision;
-    f32 field_28;
-};

src/Player/HackerJudgeNormalFall.h

@@ -0,0 +1,33 @@
+#pragma once
+
+#include <basis/seadTypes.h>
+
+#include "Library/HostIO/HioNode.h"
+
+#include "Player/IJudge.h"
+
+namespace al {
+class LiveActor;
+}
+
+class IUsePlayerCollision;
+
+class HackerJudgeNormalFall : public al::HioNode, public IJudge {
+public:
+    HackerJudgeNormalFall(const al::LiveActor* parent, s32 unk);
+    void reset() override;
+    void update() override;
+    bool judge() const override;
+
+    void setPlayerCollision(IUsePlayerCollision* playerCollision) {
+        mPlayerCollision = playerCollision;
+    }
+
+private:
+    al::LiveActor* mActor;
+    s32 _10;
+    s32 _14;
+    IUsePlayerCollision* mPlayerCollision;
+};
+
+static_assert(sizeof(HackerJudgeNormalFall) == 0x20);

src/Player/HackerJudgeStartJump.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include "Util/HackerJudge.h"
+
+class IUsePlayerHack;
+
+class HackerJudgeStartJump : public HackerJudge {
+public:
+    HackerJudgeStartJump(IUsePlayerHack**);
+    void reset() override;
+    void update() override;
+    bool judge() const override;
+};
+
+static_assert(sizeof(HackerJudgeStartJump) == 0x10);

src/Player/HackerJudgeStartRun.h

@@ -0,0 +1,32 @@
+#pragma once
+
+#include <basis/seadTypes.h>
+
+#include "Util/HackerJudge.h"
+
+namespace al {
+class LiveActor;
+}
+
+class IUsePlayerCollision;
+class IUsePlayerHack;
+
+class HackerJudgeStartRun : public HackerJudge {
+public:
+    HackerJudgeStartRun(const al::LiveActor*, IUsePlayerHack**);
+    void reset() override;
+    void update() override;
+    bool judge() const override;
+
+    void setPlayerCollision(IUsePlayerCollision* playerCollision) {
+        mPlayerCollision = playerCollision;
+    }
+
+private:
+    al::LiveActor* mParent;
+    s32 _18;
+    IUsePlayerCollision* mPlayerCollision;
+    f32 _28;
+};
+
+static_assert(sizeof(HackerJudgeStartRun) == 0x30);

src/Util/HackerJudge.cpp

@@ -0,0 +1,3 @@
+#include "Util/HackerJudge.h"
+
+HackerJudge::HackerJudge(IUsePlayerHack** parent) : mHacker(parent) {}

src/Util/HackerJudge.h

@@ -0,0 +1,23 @@
+#pragma once
+
+#include <basis/seadTypes.h>
+
+#include "Library/HostIO/HioNode.h"
+
+#include "Player/IJudge.h"
+
+class IUsePlayerHack;
+
+class HackerJudge : public al::HioNode, public IJudge {
+public:
+    HackerJudge(IUsePlayerHack** parent);
+
+    void reset() override = 0;
+    void update() override = 0;
+    bool judge() const override = 0;
+
+    IUsePlayerHack** getHacker() const { return mHacker; };
+
+private:
+    IUsePlayerHack** mHacker;
+};