Merge branch 'main' into match_actor_rupee

include/Player/HealthManager.hpp

@@ -0,0 +1,22 @@
+#pragma once
+
+#include "global.h"
+#include "types.h"
+
+#include "System/SysNew.hpp"
+
+class HealthManager : public SysObject {
+public:
+    /* 00 */ u16 mMaxHealth;
+    /* 02 */ u16 mHealth;
+    /* 04 */ s16 mMaxShipHealth;
+    /* 06 */ s16 mShipHealth;
+    /* 08 */ u16 mSalvageArmHealth;
+    /* 0a */ s16 mFlags;
+    /* 0c */ unk16 mUnk_0c;
+    /* 0e */ unk8 mUnk_0e;
+    /* 0f */ unk8 mUnk_0f;
+    /* 10 */
+};
+
+extern HealthManager *gHealthManager;

include/Player/TouchControl.hpp

@@ -42,4 +42,5 @@ public:
     bool func_ov00_0207aeac();
     void UpdateConditionally(TouchState *state, u16 speed);
     void func_ov00_0207af38(u16 speed, bool param2);
+    ~TouchControl();
 };