Anchor + Player Models 4

Co-authored-by: PurpleHato <[email protected]> Co-authored-by: MelonSpeedruns <[email protected]> Co-authored-by: Sirius902 <[email protected]>
garrettjoecox · Dec 5, 2023 · 533109d · 533109d
1 parent 0e8121c
commit 533109d
Show file tree

Hide file tree

Showing 16 changed files with 943 additions and 24 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,7 +6,7 @@ set(CMAKE_CXX_STANDARD 20 CACHE STRING "The C++ standard to use")
 set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version")
 
 project(Ship VERSION 8.0.3 LANGUAGES C CXX)
-set(PROJECT_BUILD_NAME "Anchor Build 13" CACHE STRING "")
+set(PROJECT_BUILD_NAME "Anchor + Player Models 4" CACHE STRING "")
 set(PROJECT_TEAM "github.com/harbourmasters" CACHE STRING "")
 
 set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT soh)

diff --git a/soh/include/functions.h b/soh/include/functions.h
@@ -1124,6 +1124,7 @@ s32 func_8008EF44(PlayState* play, s32 ammo);
 s32 Player_IsBurningStickInRange(PlayState* play, Vec3f* pos, f32 radius, f32 arg3);
 s32 Player_GetStrength(void);
 u8 Player_GetMask(PlayState* play);
+s32 Player_InflictDamage(PlayState* play, s32 damage);
 Player* Player_UnsetMask(PlayState* play);
 s32 Player_HasMirrorShieldEquipped(PlayState* play);
 s32 Player_HasMirrorShieldSetToDraw(PlayState* play);
@@ -1148,6 +1149,10 @@ s32 Player_OverrideLimbDrawGameplayCommon(PlayState* play, s32 limbIndex, Gfx**
 s32 Player_OverrideLimbDrawGameplayDefault(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* data);
 s32 Player_OverrideLimbDrawGameplayFirstPerson(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* data);
 s32 Player_OverrideLimbDrawGameplayCrawling(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* data);
+void DrawAnchorPuppet(PlayState* play, void** skeleton, Vec3s* jointTable, s32 dListCount, s32 lod, s32 tunic,
+                      s32 boots, s32 face, OverrideLimbDrawOpa overrideLimbDraw, PostLimbDrawOpa postLimbDraw,
+                      void* this, PlayerData playerData, s32 anchorActorIndex);
+s32 PuppetOverrideDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* data);
 u8 func_80090480(PlayState* play, ColliderQuad* collider, WeaponInfo* weaponDim, Vec3f* newTip,
                  Vec3f* newBase);
 void Player_DrawGetItem(PlayState* play, Player* player);

diff --git a/soh/include/z64save.h b/soh/include/z64save.h
@@ -166,6 +166,43 @@ typedef struct {
     u8 value;
 } RandoSetting;
 
+typedef struct {
+    s32 playerAge;
+    u16 playerSound;
+    u8 sheathType;
+    u8 leftHandType;
+    u8 biggoron_broken;
+    u8 rightHandType;
+    u8 tunicType;
+    u8 bootsType;
+    s16 faceType;
+    u8 shieldType;
+    u8 damageEffect;
+    u8 damageValue;
+    s16 playerHealth;
+    s16 playerHealthCapacity;
+    s16 playerMagic;
+    s16 playerMagicCapacity;
+    s16 isPlayerMagicAcquired;
+    s16 isDoubleMagicAcquired;
+    s32 strengthValue;
+    f32 yOffset;
+    u8 currentMask;
+    u8 swordEquipped;
+    u32 playerStateFlags1;
+    u8 moveFlags;
+    f32 unk_6C4;
+    s16 bunnyEarX;
+    s16 bunnyEarY;
+    s16 bunnyEarZ;
+    f32 speedXZ;
+    s8 itemAction;
+    f32 unk_85C;
+    Vec3f stickWeaponTip;
+    s16 unk_860;
+    s8 unk_862;
+} PlayerData;
+
 typedef struct {
     /* 0x0000 */ s32 entranceIndex; // start of `save` substruct, originally called "memory"
     /* 0x0004 */ s32 linkAge; // 0: Adult; 1: Child (see enum `LinkAge`)
@@ -325,6 +362,10 @@ typedef struct {
     /*        */ u16 adultTradeItems;
     /*        */ u8 triforcePiecesCollected;
     // #endregion
+    // #region SOH [Network]
+    // Upstream TODO: Move these to their own struct or name to more obviously specific to Network
+    /*        */ PlayerData playerData;
+    // #endregion
 } SaveContext; // size = 0x1428
 
 typedef enum {

diff --git a/soh/soh/ActorDB.cpp b/soh/soh/ActorDB.cpp
@@ -604,8 +604,29 @@ static ActorDBInit EnPartnerInit = {
 };
 extern "C" s16 gEnPartnerId;
 
+#ifdef ENABLE_REMOTE_CONTROL
+#include "src/overlays/actors/ovl_Link_Puppet/z_link_puppet.h"
+static ActorDBInit EnLinkPuppetInit = {
+    "En_Link_Puppet",
+    "Puppet",
+    ACTORCAT_ITEMACTION,
+    (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_UPDATE_WHILE_CULLED | ACTOR_FLAG_DRAW_WHILE_CULLED),
+    OBJECT_LINK_BOY,
+    sizeof(LinkPuppet),
+    (ActorFunc)LinkPuppet_Init,
+    (ActorFunc)LinkPuppet_Destroy,
+    (ActorFunc)LinkPuppet_Update,
+    (ActorFunc)LinkPuppet_Draw,
+    nullptr,
+};
+#endif
+extern "C" s16 gEnLinkPuppetId;
+
 void ActorDB::AddBuiltInCustomActors() {
     gEnPartnerId = ActorDB::Instance->AddEntry(EnPartnerInit).entry.id;
+#ifdef ENABLE_REMOTE_CONTROL
+    gEnLinkPuppetId = ActorDB::Instance->AddEntry(EnLinkPuppetInit).entry.id;
+#endif
 }
 
 extern "C" ActorDBEntry* ActorDB_Retrieve(const int id) {