mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-27 23:36:22 +00:00
Code Issues Projects Releases Wiki Activity

rename to upper action (#1570)

Browse source
This commit is contained in:
fig02 2023-11-04 02:59:12 -04:00 committed by GitHub
parent 8718a5c8c0
commit 042a5c5530
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 89 additions and 89 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/z64player.h
View file

@ -669,7 +669,7 @@ typedef struct {
#define PLAYER_STATE3_7 (1 << 7) #define PLAYER_STATE3_7 (1 << 7)
typedef void (*PlayerActionFunc)(struct Player*, struct PlayState*); typedef void (*PlayerActionFunc)(struct Player*, struct PlayState*);
typedef s32 (*ItemActionFunc)(struct Player*, struct PlayState*); typedef s32 (*UpperActionFunc)(struct Player*, struct PlayState*);
typedef void (*PlayerFuncA74)(struct PlayState*, struct Player*); typedef void (*PlayerFuncA74)(struct PlayState*, struct Player*);
typedef struct Player { typedef struct Player {
@ -773,11 +773,11 @@ typedef struct Player {
/* 0x06C0 */ s16 unk_6C0; /* 0x06C0 */ s16 unk_6C0;
/* 0x06C2 */ s16 unk_6C2; /* 0x06C2 */ s16 unk_6C2;
/* 0x06C4 */ f32 unk_6C4; /* 0x06C4 */ f32 unk_6C4;
/* 0x06C8 */ SkelAnime skelAnimeUpper; /* 0x06C8 */ SkelAnime upperSkelAnime;
/* 0x070C */ Vec3s jointTableUpper[PLAYER_LIMB_BUF_COUNT]; /* 0x070C */ Vec3s upperJointTable[PLAYER_LIMB_BUF_COUNT];
/* 0x079C */ Vec3s morphTableUpper[PLAYER_LIMB_BUF_COUNT]; /* 0x079C */ Vec3s upperMorphTable[PLAYER_LIMB_BUF_COUNT];
/* 0x082C */ ItemActionFunc itemActionFunc; /* 0x082C */ UpperActionFunc upperActionFunc;
/* 0x0830 */ f32 skelAnimeUpperBlendWeight; /* 0x0830 */ f32 upperAnimBlendWeight;
/* 0x0834 */ s16 unk_834; /* 0x0834 */ s16 unk_834;
/* 0x0836 */ s8 unk_836; /* 0x0836 */ s8 unk_836;
/* 0x0837 */ u8 unk_837; /* 0x0837 */ u8 unk_837;

166
src/overlays/actors/ovl_player_actor/z_player.c
View file

@ -147,7 +147,7 @@ void func_80833984(PlayState* play, Player* this);
void Player_InitItemAction(PlayState* play, Player* this, s8 itemAction); void Player_InitItemAction(PlayState* play, Player* this, s8 itemAction);
s32 func_8083485C(Player* this, PlayState* play); s32 func_8083485C(Player* this, PlayState* play);
s32 func_808349DC(Player* this, PlayState* play); s32 func_808349DC(Player* this, PlayState* play);
s32 Player_IA_ChangeHeldItem(Player* this, PlayState* play); s32 Player_UpperAction_ChangeHeldItem(Player* this, PlayState* play);
s32 func_80834B5C(Player* this, PlayState* play); s32 func_80834B5C(Player* this, PlayState* play);
s32 func_80834C74(Player* this, PlayState* play); s32 func_80834C74(Player* this, PlayState* play);
s32 func_8083501C(Player* this, PlayState* play); s32 func_8083501C(Player* this, PlayState* play);
@ -2136,10 +2136,10 @@ LinkAnimationHeader* func_808335F4(Player* this) {
} }
} }
void Player_SetItemActionFunc(Player* this, ItemActionFunc itemActionFunc) { void Player_SetUpperActionFunc(Player* this, UpperActionFunc upperActionFunc) {
this->itemActionFunc = itemActionFunc; this->upperActionFunc = upperActionFunc;
this->unk_836 = 0; this->unk_836 = 0;
this->skelAnimeUpperBlendWeight = 0.0f; this->upperAnimBlendWeight = 0.0f;
func_808326F0(this); func_808326F0(this);
} }
@ -2434,7 +2434,7 @@ void Player_StartChangingHeldItem(Player* this, PlayState* play) {
heldItemAction = Player_ItemToItemAction(this->heldItemId); heldItemAction = Player_ItemToItemAction(this->heldItemId);
Player_SetItemActionFunc(this, Player_IA_ChangeHeldItem); Player_SetUpperActionFunc(this, Player_UpperAction_ChangeHeldItem);
nextAnimType = gPlayerModelTypes[this->nextModelGroup][PLAYER_MODELGROUPENTRY_ANIM]; nextAnimType = gPlayerModelTypes[this->nextModelGroup][PLAYER_MODELGROUPENTRY_ANIM];
itemChangeType = sItemChangeTypes[gPlayerModelTypes[this->modelGroup][PLAYER_MODELGROUPENTRY_ANIM]][nextAnimType]; itemChangeType = sItemChangeTypes[gPlayerModelTypes[this->modelGroup][PLAYER_MODELGROUPENTRY_ANIM]][nextAnimType];
@ -2468,7 +2468,7 @@ void Player_StartChangingHeldItem(Player* this, PlayState* play) {
playSpeed *= 2.0f; playSpeed *= 2.0f;
} }
LinkAnimation_Change(play, &this->skelAnimeUpper, anim, playSpeed, startFrame, endFrame, ANIMMODE_ONCE, 0.0f); LinkAnimation_Change(play, &this->upperSkelAnime, anim, playSpeed, startFrame, endFrame, ANIMMODE_ONCE, 0.0f);
this->stateFlags1 &= ~PLAYER_STATE1_START_CHANGING_HELD_ITEM; this->stateFlags1 &= ~PLAYER_STATE1_START_CHANGING_HELD_ITEM;
} }
@ -2519,7 +2519,7 @@ s32 func_8083442C(Player* this, PlayState* play) {
(gSaveContext.magicState != MAGIC_STATE_IDLE)) { (gSaveContext.magicState != MAGIC_STATE_IDLE)) {
Sfx_PlaySfxCentered(NA_SE_SY_ERROR); Sfx_PlaySfxCentered(NA_SE_SY_ERROR);
} else { } else {
Player_SetItemActionFunc(this, func_808351D4); Player_SetUpperActionFunc(this, func_808351D4);
this->stateFlags1 |= PLAYER_STATE1_9; this->stateFlags1 |= PLAYER_STATE1_9;
this->unk_834 = 14; this->unk_834 = 14;
@ -2568,11 +2568,11 @@ void Player_FinishItemChange(PlayState* play, Player* this) {
} }
void func_80834644(PlayState* play, Player* this) { void func_80834644(PlayState* play, Player* this) {
if (Player_IA_ChangeHeldItem == this->itemActionFunc) { if (Player_UpperAction_ChangeHeldItem == this->upperActionFunc) {
Player_FinishItemChange(play, this); Player_FinishItemChange(play, this);
} }
Player_SetItemActionFunc(this, sItemActionUpdateFuncs[this->heldItemAction]); Player_SetUpperActionFunc(this, sItemActionUpdateFuncs[this->heldItemAction]);
this->unk_834 = 0; this->unk_834 = 0;
this->unk_6AC = 0; this->unk_6AC = 0;
Player_DetachHeldActor(play, this); Player_DetachHeldActor(play, this);
@ -2580,7 +2580,7 @@ void func_80834644(PlayState* play, Player* this) {
} }
LinkAnimationHeader* func_808346C4(PlayState* play, Player* this) { LinkAnimationHeader* func_808346C4(PlayState* play, Player* this) {
Player_SetItemActionFunc(this, func_80834B5C); Player_SetUpperActionFunc(this, func_80834B5C);
Player_DetachHeldActor(play, this); Player_DetachHeldActor(play, this);
if (this->unk_870 < 0.5f) { if (this->unk_870 < 0.5f) {
@ -2601,7 +2601,7 @@ s32 func_80834758(PlayState* play, Player* this) {
anim = func_808346C4(play, this); anim = func_808346C4(play, this);
frame = Animation_GetLastFrame(anim); frame = Animation_GetLastFrame(anim);
LinkAnimation_Change(play, &this->skelAnimeUpper, anim, 1.0f, frame, frame, ANIMMODE_ONCE, 0.0f); LinkAnimation_Change(play, &this->upperSkelAnime, anim, 1.0f, frame, frame, ANIMMODE_ONCE, 0.0f);
Player_PlaySfx(this, NA_SE_IT_SHIELD_POSTURE); Player_PlaySfx(this, NA_SE_IT_SHIELD_POSTURE);
return 1; return 1;
@ -2619,13 +2619,13 @@ s32 func_8083485C(Player* this, PlayState* play) {
} }
void func_80834894(Player* this) { void func_80834894(Player* this) {
Player_SetItemActionFunc(this, func_80834C74); Player_SetUpperActionFunc(this, func_80834C74);
if (this->itemAction < 0) { if (this->itemAction < 0) {
func_8008EC70(this); func_8008EC70(this);
} }
Animation_Reverse(&this->skelAnimeUpper); Animation_Reverse(&this->upperSkelAnime);
Player_PlaySfx(this, NA_SE_IT_SHIELD_REMOVE); Player_PlaySfx(this, NA_SE_IT_SHIELD_REMOVE);
} }
@ -2634,9 +2634,9 @@ void Player_WaitToFinishItemChange(PlayState* play, Player* this) {
f32 changeFrame; f32 changeFrame;
changeFrame = itemChangeEntry->changeFrame; changeFrame = itemChangeEntry->changeFrame;
changeFrame = (this->skelAnimeUpper.playSpeed < 0.0f) ? changeFrame - 1.0f : changeFrame; changeFrame = (this->upperSkelAnime.playSpeed < 0.0f) ? changeFrame - 1.0f : changeFrame;
if (LinkAnimation_OnFrame(&this->skelAnimeUpper, changeFrame)) { if (LinkAnimation_OnFrame(&this->upperSkelAnime, changeFrame)) {
Player_FinishItemChange(play, this); Player_FinishItemChange(play, this);
} }
@ -2661,16 +2661,16 @@ s32 func_808349DC(Player* this, PlayState* play) {
} }
} }
s32 Player_IA_ChangeHeldItem(Player* this, PlayState* play) { s32 Player_UpperAction_ChangeHeldItem(Player* this, PlayState* play) {
if (LinkAnimation_Update(play, &this->skelAnimeUpper) || if (LinkAnimation_Update(play, &this->upperSkelAnime) ||
((Player_ItemToItemAction(this->heldItemId) == this->heldItemAction) && ((Player_ItemToItemAction(this->heldItemId) == this->heldItemAction) &&
(sUseHeldItem = (sUseHeldItem =
(sUseHeldItem || ((this->modelAnimType != PLAYER_ANIMTYPE_3) && (play->shootingGalleryStatus == 0)))))) { (sUseHeldItem || ((this->modelAnimType != PLAYER_ANIMTYPE_3) && (play->shootingGalleryStatus == 0)))))) {
Player_SetItemActionFunc(this, sItemActionUpdateFuncs[this->heldItemAction]); Player_SetUpperActionFunc(this, sItemActionUpdateFuncs[this->heldItemAction]);
this->unk_834 = 0; this->unk_834 = 0;
this->unk_6AC = 0; this->unk_6AC = 0;
sHeldItemButtonIsHeldDown = sUseHeldItem; sHeldItemButtonIsHeldDown = sUseHeldItem;
return this->itemActionFunc(this, play); return this->upperActionFunc(this, play);
} }
if (func_80833350(this) != 0) { if (func_80833350(this) != 0) {
@ -2685,7 +2685,7 @@ s32 Player_IA_ChangeHeldItem(Player* this, PlayState* play) {
} }
s32 func_80834B5C(Player* this, PlayState* play) { s32 func_80834B5C(Player* this, PlayState* play) {
LinkAnimation_Update(play, &this->skelAnimeUpper); LinkAnimation_Update(play, &this->upperSkelAnime);
if (!CHECK_BTN_ALL(sControlInput->cur.button, BTN_R)) { if (!CHECK_BTN_ALL(sControlInput->cur.button, BTN_R)) {
func_80834894(this); func_80834894(this);
@ -2701,10 +2701,10 @@ s32 func_80834BD4(Player* this, PlayState* play) {
LinkAnimationHeader* anim; LinkAnimationHeader* anim;
f32 frame; f32 frame;
if (LinkAnimation_Update(play, &this->skelAnimeUpper)) { if (LinkAnimation_Update(play, &this->upperSkelAnime)) {
anim = func_808346C4(play, this); anim = func_808346C4(play, this);
frame = Animation_GetLastFrame(anim); frame = Animation_GetLastFrame(anim);
LinkAnimation_Change(play, &this->skelAnimeUpper, anim, 1.0f, frame, frame, ANIMMODE_ONCE, 0.0f); LinkAnimation_Change(play, &this->upperSkelAnime, anim, 1.0f, frame, frame, ANIMMODE_ONCE, 0.0f);
} }
this->stateFlags1 |= PLAYER_STATE1_22; this->stateFlags1 |= PLAYER_STATE1_22;
@ -2716,12 +2716,12 @@ s32 func_80834BD4(Player* this, PlayState* play) {
s32 func_80834C74(Player* this, PlayState* play) { s32 func_80834C74(Player* this, PlayState* play) {
sUseHeldItem = sHeldItemButtonIsHeldDown; sUseHeldItem = sHeldItemButtonIsHeldDown;
if (sUseHeldItem || LinkAnimation_Update(play, &this->skelAnimeUpper)) { if (sUseHeldItem || LinkAnimation_Update(play, &this->upperSkelAnime)) {
Player_SetItemActionFunc(this, sItemActionUpdateFuncs[this->heldItemAction]); Player_SetUpperActionFunc(this, sItemActionUpdateFuncs[this->heldItemAction]);
LinkAnimation_PlayLoop(play, &this->skelAnimeUpper, LinkAnimation_PlayLoop(play, &this->upperSkelAnime,
GET_PLAYER_ANIM(PLAYER_ANIMGROUP_wait, this->modelAnimType)); GET_PLAYER_ANIM(PLAYER_ANIMGROUP_wait, this->modelAnimType));
this->unk_6AC = 0; this->unk_6AC = 0;
this->itemActionFunc(this, play); this->upperActionFunc(this, play);
return 0; return 0;
} }
@ -2741,11 +2741,11 @@ s32 func_80834D2C(Player* this, PlayState* play) {
} else { } else {
anim = &gPlayerAnim_link_hook_shot_ready; anim = &gPlayerAnim_link_hook_shot_ready;
} }
LinkAnimation_PlayOnce(play, &this->skelAnimeUpper, anim); LinkAnimation_PlayOnce(play, &this->upperSkelAnime, anim);
} else { } else {
Player_SetItemActionFunc(this, func_80835884); Player_SetUpperActionFunc(this, func_80835884);
this->unk_834 = 10; this->unk_834 = 10;
LinkAnimation_PlayOnce(play, &this->skelAnimeUpper, &gPlayerAnim_link_boom_throw_wait2waitR); LinkAnimation_PlayOnce(play, &this->upperSkelAnime, &gPlayerAnim_link_boom_throw_wait2waitR);
} }
if (this->stateFlags1 & PLAYER_STATE1_23) { if (this->stateFlags1 & PLAYER_STATE1_23) {
@ -2870,10 +2870,10 @@ s32 func_808351D4(Player* this, PlayState* play) {
if ((this->unk_836 == 0) && (func_80833350(this) == 0) && if ((this->unk_836 == 0) && (func_80833350(this) == 0) &&
(this->skelAnime.animation == &gPlayerAnim_link_bow_side_walk)) { (this->skelAnime.animation == &gPlayerAnim_link_bow_side_walk)) {
LinkAnimation_PlayOnce(play, &this->skelAnimeUpper, D_808543CC[sp2C]); LinkAnimation_PlayOnce(play, &this->upperSkelAnime, D_808543CC[sp2C]);
this->unk_836 = -1; this->unk_836 = -1;
} else if (LinkAnimation_Update(play, &this->skelAnimeUpper)) { } else if (LinkAnimation_Update(play, &this->upperSkelAnime)) {
LinkAnimation_PlayLoop(play, &this->skelAnimeUpper, D_808543D4[sp2C]); LinkAnimation_PlayLoop(play, &this->upperSkelAnime, D_808543D4[sp2C]);
this->unk_836 = 1; this->unk_836 = 1;
} else if (this->unk_836 == 1) { } else if (this->unk_836 == 1) {
this->unk_836 = 2; this->unk_836 = 2;
@ -2886,7 +2886,7 @@ s32 func_808351D4(Player* this, PlayState* play) {
func_80834EB8(this, play); func_80834EB8(this, play);
if ((this->unk_836 > 0) && ((this->unk_860 < 0) || (!sHeldItemButtonIsHeldDown && !func_80834E7C(play)))) { if ((this->unk_836 > 0) && ((this->unk_860 < 0) || (!sHeldItemButtonIsHeldDown && !func_80834E7C(play)))) {
Player_SetItemActionFunc(this, func_808353D8); Player_SetUpperActionFunc(this, func_808353D8);
if (this->unk_860 >= 0) { if (this->unk_860 >= 0) {
if (sp2C == 0) { if (sp2C == 0) {
if (!func_808350A4(play, this)) { if (!func_808350A4(play, this)) {
@ -2906,7 +2906,7 @@ s32 func_808351D4(Player* this, PlayState* play) {
} }
s32 func_808353D8(Player* this, PlayState* play) { s32 func_808353D8(Player* this, PlayState* play) {
LinkAnimation_Update(play, &this->skelAnimeUpper); LinkAnimation_Update(play, &this->upperSkelAnime);
if (Player_HoldsHookshot(this) && !func_80834FBC(this)) { if (Player_HoldsHookshot(this) && !func_80834FBC(this)) {
return 1; return 1;
@ -2920,7 +2920,7 @@ s32 func_808353D8(Player* this, PlayState* play) {
if (Player_HoldsHookshot(this)) { if (Player_HoldsHookshot(this)) {
this->unk_836 = 1; this->unk_836 = 1;
} else { } else {
LinkAnimation_PlayOnce(play, &this->skelAnimeUpper, &gPlayerAnim_link_bow_bow_shoot_next); LinkAnimation_PlayOnce(play, &this->upperSkelAnime, &gPlayerAnim_link_bow_bow_shoot_next);
} }
} }
} else { } else {
@ -2936,10 +2936,10 @@ s32 func_808353D8(Player* this, PlayState* play) {
} }
if (Player_HoldsHookshot(this)) { if (Player_HoldsHookshot(this)) {
Player_SetItemActionFunc(this, func_8083501C); Player_SetUpperActionFunc(this, func_8083501C);
} else { } else {
Player_SetItemActionFunc(this, func_80835588); Player_SetUpperActionFunc(this, func_80835588);
LinkAnimation_PlayOnce(play, &this->skelAnimeUpper, &gPlayerAnim_link_bow_bow_shoot_end); LinkAnimation_PlayOnce(play, &this->upperSkelAnime, &gPlayerAnim_link_bow_bow_shoot_end);
} }
this->unk_834 = 0; this->unk_834 = 0;
@ -2949,8 +2949,8 @@ s32 func_808353D8(Player* this, PlayState* play) {
} }
s32 func_80835588(Player* this, PlayState* play) { s32 func_80835588(Player* this, PlayState* play) {
if (!(this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) || LinkAnimation_Update(play, &this->skelAnimeUpper)) { if (!(this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) || LinkAnimation_Update(play, &this->upperSkelAnime)) {
Player_SetItemActionFunc(this, func_8083501C); Player_SetUpperActionFunc(this, func_8083501C);
} }
return 1; return 1;
@ -2979,8 +2979,8 @@ s32 func_80835644(PlayState* play, Player* this, Actor* arg2) {
void func_80835688(Player* this, PlayState* play) { void func_80835688(Player* this, PlayState* play) {
if (!func_80835644(play, this, this->heldActor)) { if (!func_80835644(play, this, this->heldActor)) {
Player_SetItemActionFunc(this, func_808356E8); Player_SetUpperActionFunc(this, func_808356E8);
LinkAnimation_PlayLoop(play, &this->skelAnimeUpper, &gPlayerAnim_link_normal_carryB_wait); LinkAnimation_PlayLoop(play, &this->upperSkelAnime, &gPlayerAnim_link_normal_carryB_wait);
} }
} }
@ -2996,8 +2996,8 @@ s32 func_808356E8(Player* this, PlayState* play) {
} }
if (this->stateFlags1 & PLAYER_STATE1_11) { if (this->stateFlags1 & PLAYER_STATE1_11) {
if (LinkAnimation_Update(play, &this->skelAnimeUpper)) { if (LinkAnimation_Update(play, &this->upperSkelAnime)) {
LinkAnimation_PlayLoop(play, &this->skelAnimeUpper, &gPlayerAnim_link_normal_carryB_wait); LinkAnimation_PlayLoop(play, &this->upperSkelAnime, &gPlayerAnim_link_normal_carryB_wait);
} }
if ((heldActor->id == ACTOR_EN_NIW) && (this->actor.velocity.y <= 0.0f)) { if ((heldActor->id == ACTOR_EN_NIW) && (this->actor.velocity.y <= 0.0f)) {
@ -3022,7 +3022,7 @@ s32 func_80835800(Player* this, PlayState* play) {
} }
if (this->stateFlags1 & PLAYER_STATE1_25) { if (this->stateFlags1 & PLAYER_STATE1_25) {
Player_SetItemActionFunc(this, func_80835B60); Player_SetUpperActionFunc(this, func_80835B60);
} else if (func_80834F2C(this, play)) { } else if (func_80834F2C(this, play)) {
return 1; return 1;
} }
@ -3031,9 +3031,9 @@ s32 func_80835800(Player* this, PlayState* play) {
} }
s32 func_80835884(Player* this, PlayState* play) { s32 func_80835884(Player* this, PlayState* play) {
if (LinkAnimation_Update(play, &this->skelAnimeUpper)) { if (LinkAnimation_Update(play, &this->upperSkelAnime)) {
Player_SetItemActionFunc(this, func_808358F0); Player_SetUpperActionFunc(this, func_808358F0);
LinkAnimation_PlayLoop(play, &this->skelAnimeUpper, &gPlayerAnim_link_boom_throw_waitR); LinkAnimation_PlayLoop(play, &this->upperSkelAnime, &gPlayerAnim_link_boom_throw_waitR);
} }
func_80834EB8(this, play); func_80834EB8(this, play);
@ -3046,17 +3046,17 @@ s32 func_808358F0(Player* this, PlayState* play) {
if ((func_808334E4(this) == animSeg) || (func_80833528(this) == animSeg) || (func_808335B0(this) == animSeg) || if ((func_808334E4(this) == animSeg) || (func_80833528(this) == animSeg) || (func_808335B0(this) == animSeg) ||
(func_808335F4(this) == animSeg)) { (func_808335F4(this) == animSeg)) {
AnimationContext_SetCopyAll(play, this->skelAnime.limbCount, this->skelAnimeUpper.jointTable, AnimationContext_SetCopyAll(play, this->skelAnime.limbCount, this->upperSkelAnime.jointTable,
this->skelAnime.jointTable); this->skelAnime.jointTable);
} else { } else {
LinkAnimation_Update(play, &this->skelAnimeUpper); LinkAnimation_Update(play, &this->upperSkelAnime);
} }
func_80834EB8(this, play); func_80834EB8(this, play);
if (!sHeldItemButtonIsHeldDown) { if (!sHeldItemButtonIsHeldDown) {
Player_SetItemActionFunc(this, func_808359FC); Player_SetUpperActionFunc(this, func_808359FC);
LinkAnimation_PlayOnce(play, &this->skelAnimeUpper, LinkAnimation_PlayOnce(play, &this->upperSkelAnime,
(this->unk_870 < 0.5f) ? &gPlayerAnim_link_boom_throwR : &gPlayerAnim_link_boom_throwL); (this->unk_870 < 0.5f) ? &gPlayerAnim_link_boom_throwR : &gPlayerAnim_link_boom_throwL);
} }
@ -3064,10 +3064,10 @@ s32 func_808358F0(Player* this, PlayState* play) {
} }
s32 func_808359FC(Player* this, PlayState* play) { s32 func_808359FC(Player* this, PlayState* play) {
if (LinkAnimation_Update(play, &this->skelAnimeUpper)) { if (LinkAnimation_Update(play, &this->upperSkelAnime)) {
Player_SetItemActionFunc(this, func_80835B60); Player_SetUpperActionFunc(this, func_80835B60);
this->unk_834 = 0; this->unk_834 = 0;
} else if (LinkAnimation_OnFrame(&this->skelAnimeUpper, 6.0f)) { } else if (LinkAnimation_OnFrame(&this->upperSkelAnime, 6.0f)) {
f32 posX = (Math_SinS(this->actor.shape.rot.y) * 10.0f) + this->actor.world.pos.x; f32 posX = (Math_SinS(this->actor.shape.rot.y) * 10.0f) + this->actor.world.pos.x;
f32 posZ = (Math_CosS(this->actor.shape.rot.y) * 10.0f) + this->actor.world.pos.z; f32 posZ = (Math_CosS(this->actor.shape.rot.y) * 10.0f) + this->actor.world.pos.z;
s32 yaw = (this->unk_664 != NULL) ? this->actor.shape.rot.y + 14000 : this->actor.shape.rot.y; s32 yaw = (this->unk_664 != NULL) ? this->actor.shape.rot.y + 14000 : this->actor.shape.rot.y;
@ -3098,8 +3098,8 @@ s32 func_80835B60(Player* this, PlayState* play) {
} }
if (!(this->stateFlags1 & PLAYER_STATE1_25)) { if (!(this->stateFlags1 & PLAYER_STATE1_25)) {
Player_SetItemActionFunc(this, func_80835C08); Player_SetUpperActionFunc(this, func_80835C08);
LinkAnimation_PlayOnce(play, &this->skelAnimeUpper, &gPlayerAnim_link_boom_catch); LinkAnimation_PlayOnce(play, &this->upperSkelAnime, &gPlayerAnim_link_boom_catch);
func_808357E8(this, gPlayerLeftHandBoomerangDLs); func_808357E8(this, gPlayerLeftHandBoomerangDLs);
Player_PlaySfx(this, NA_SE_PL_CATCH_BOOMERANG); Player_PlaySfx(this, NA_SE_PL_CATCH_BOOMERANG);
func_80832698(this, NA_SE_VO_LI_SWORD_N); func_80832698(this, NA_SE_VO_LI_SWORD_N);
@ -3110,8 +3110,8 @@ s32 func_80835B60(Player* this, PlayState* play) {
} }
s32 func_80835C08(Player* this, PlayState* play) { s32 func_80835C08(Player* this, PlayState* play) {
if (!func_80835800(this, play) && LinkAnimation_Update(play, &this->skelAnimeUpper)) { if (!func_80835800(this, play) && LinkAnimation_Update(play, &this->upperSkelAnime)) {
Player_SetItemActionFunc(this, func_80835800); Player_SetUpperActionFunc(this, func_80835800);
} }
return 1; return 1;
@ -3345,7 +3345,7 @@ int Player_CanUpdateItems(Player* this) {
return (!(Player_Action_808458D0 == this->actionFunc) || return (!(Player_Action_808458D0 == this->actionFunc) ||
((this->stateFlags1 & PLAYER_STATE1_START_CHANGING_HELD_ITEM) && ((this->stateFlags1 & PLAYER_STATE1_START_CHANGING_HELD_ITEM) &&
((this->heldItemId == ITEM_LAST_USED) || (this->heldItemId == ITEM_NONE)))) && ((this->heldItemId == ITEM_LAST_USED) || (this->heldItemId == ITEM_NONE)))) &&
(!(Player_IA_ChangeHeldItem == this->itemActionFunc) || (!(Player_UpperAction_ChangeHeldItem == this->upperActionFunc) ||
(Player_ItemToItemAction(this->heldItemId) == this->heldItemAction)); (Player_ItemToItemAction(this->heldItemId) == this->heldItemAction));
} }
@ -3373,24 +3373,24 @@ s32 Player_UpdateUpperBody(Player* this, PlayState* play) {
} }
} }
if (!this->itemActionFunc(this, play)) { if (!this->upperActionFunc(this, play)) {
return 0; return 0;
} }
if (this->skelAnimeUpperBlendWeight != 0.0f) { if (this->upperAnimBlendWeight != 0.0f) {
if ((func_80833350(this) == 0) || (this->speedXZ != 0.0f)) { if ((func_80833350(this) == 0) || (this->speedXZ != 0.0f)) {
AnimationContext_SetCopyFalse(play, this->skelAnime.limbCount, this->skelAnimeUpper.jointTable, AnimationContext_SetCopyFalse(play, this->skelAnime.limbCount, this->upperSkelAnime.jointTable,
this->skelAnime.jointTable, sUpperBodyLimbCopyMap); this->skelAnime.jointTable, sUpperBodyLimbCopyMap);
} }
Math_StepToF(&this->skelAnimeUpperBlendWeight, 0.0f, 0.25f); Math_StepToF(&this->upperAnimBlendWeight, 0.0f, 0.25f);
AnimationContext_SetInterp(play, this->skelAnime.limbCount, this->skelAnime.jointTable, AnimationContext_SetInterp(play, this->skelAnime.limbCount, this->skelAnime.jointTable,
this->skelAnimeUpper.jointTable, 1.0f - this->skelAnimeUpperBlendWeight); this->upperSkelAnime.jointTable, 1.0f - this->upperAnimBlendWeight);
} else if ((func_80833350(this) == 0) || (this->speedXZ != 0.0f)) { } else if ((func_80833350(this) == 0) || (this->speedXZ != 0.0f)) {
AnimationContext_SetCopyTrue(play, this->skelAnime.limbCount, this->skelAnime.jointTable, AnimationContext_SetCopyTrue(play, this->skelAnime.limbCount, this->skelAnime.jointTable,
this->skelAnimeUpper.jointTable, sUpperBodyLimbCopyMap); this->upperSkelAnime.jointTable, sUpperBodyLimbCopyMap);
} else { } else {
AnimationContext_SetCopyAll(play, this->skelAnime.limbCount, this->skelAnime.jointTable, AnimationContext_SetCopyAll(play, this->skelAnime.limbCount, this->skelAnime.jointTable,
this->skelAnimeUpper.jointTable); this->upperSkelAnime.jointTable);
} }
return 1; return 1;
@ -3836,7 +3836,7 @@ s32 Player_TryActionChangeList(PlayState* play, Player* this, s8* actionChangeLi
} }
if (!(this->stateFlags1 & PLAYER_STATE1_START_CHANGING_HELD_ITEM) && if (!(this->stateFlags1 & PLAYER_STATE1_START_CHANGING_HELD_ITEM) &&
(Player_IA_ChangeHeldItem != this->itemActionFunc)) { (Player_UpperAction_ChangeHeldItem != this->upperActionFunc)) {
// Process all entries in the Action Change List with a positive index // Process all entries in the Action Change List with a positive index
while (*actionChangeList >= 0) { while (*actionChangeList >= 0) {
if (sActionChangeFuncs[*actionChangeList](this, play)) { if (sActionChangeFuncs[*actionChangeList](this, play)) {
@ -4368,14 +4368,14 @@ s32 func_808382DC(Player* this, PlayState* play) {
} }
if (!(this->av1.actionVar1 = sp54)) { if (!(this->av1.actionVar1 = sp54)) {
Player_SetItemActionFunc(this, func_80834BD4); Player_SetUpperActionFunc(this, func_80834BD4);
if (this->unk_870 < 0.5f) { if (this->unk_870 < 0.5f) {
anim = D_808543BC[Player_HoldsTwoHandedWeapon(this)]; anim = D_808543BC[Player_HoldsTwoHandedWeapon(this)];
} else { } else {
anim = D_808543B4[Player_HoldsTwoHandedWeapon(this)]; anim = D_808543B4[Player_HoldsTwoHandedWeapon(this)];
} }
LinkAnimation_PlayOnce(play, &this->skelAnimeUpper, anim); LinkAnimation_PlayOnce(play, &this->upperSkelAnime, anim);
} else { } else {
Player_AnimPlayOnce(play, this, D_808543C4[Player_HoldsTwoHandedWeapon(this)]); Player_AnimPlayOnce(play, this, D_808543C4[Player_HoldsTwoHandedWeapon(this)]);
} }
@ -7445,7 +7445,7 @@ void Player_Action_80840450(Player* this, PlayState* play) {
func_8083721C(this); func_8083721C(this);
if (!Player_TryActionChangeList(play, this, sActionChangeList1, true)) { if (!Player_TryActionChangeList(play, this, sActionChangeList1, true)) {
if (!func_80833B54(this) && (!func_80833B2C(this) || (func_80834B5C != this->itemActionFunc))) { if (!func_80833B54(this) && (!func_80833B2C(this) || (func_80834B5C != this->upperActionFunc))) {
func_8083CF10(this, play); func_8083CF10(this, play);
return; return;
} }
@ -7522,7 +7522,7 @@ void Player_Action_808407CC(Player* this, PlayState* play) {
return; return;
} }
if (func_80834B5C == this->itemActionFunc) { if (func_80834B5C == this->upperActionFunc) {
func_8083CEAC(this, play); func_8083CEAC(this, play);
return; return;
} }
@ -8570,7 +8570,7 @@ void Player_Action_808435C4(Player* this, PlayState* play) {
if (this->av1.actionVar1 == 0) { if (this->av1.actionVar1 == 0) {
D_808535E0 = Player_UpdateUpperBody(this, play); D_808535E0 = Player_UpdateUpperBody(this, play);
if ((func_80834B5C == this->itemActionFunc) || (func_808374A0(play, this, &this->skelAnimeUpper, 4.0f) > 0)) { if ((func_80834B5C == this->upperActionFunc) || (func_808374A0(play, this, &this->upperSkelAnime, 4.0f) > 0)) {
Player_SetupAction(play, this, Player_Action_80840450, 1); Player_SetupAction(play, this, Player_Action_80840450, 1);
} }
} else { } else {
@ -9908,9 +9908,9 @@ void Player_InitCommon(Player* this, PlayState* play, FlexSkeletonHeader* skelHe
SkelAnime_InitLink(play, &this->skelAnime, skelHeader, GET_PLAYER_ANIM(PLAYER_ANIMGROUP_wait, this->modelAnimType), SkelAnime_InitLink(play, &this->skelAnime, skelHeader, GET_PLAYER_ANIM(PLAYER_ANIMGROUP_wait, this->modelAnimType),
9, this->jointTable, this->morphTable, PLAYER_LIMB_MAX); 9, this->jointTable, this->morphTable, PLAYER_LIMB_MAX);
this->skelAnime.baseTransl = sSkeletonBaseTransl; this->skelAnime.baseTransl = sSkeletonBaseTransl;
SkelAnime_InitLink(play, &this->skelAnimeUpper, skelHeader, func_80833338(this), 9, this->jointTableUpper, SkelAnime_InitLink(play, &this->upperSkelAnime, skelHeader, func_80833338(this), 9, this->upperJointTable,
this->morphTableUpper, PLAYER_LIMB_MAX); this->upperMorphTable, PLAYER_LIMB_MAX);
this->skelAnimeUpper.baseTransl = sSkeletonBaseTransl; this->upperSkelAnime.baseTransl = sSkeletonBaseTransl;
Effect_Add(play, &this->meleeWeaponEffectIndex, EFFECT_BLURE2, 0, 0, &D_8085470C); Effect_Add(play, &this->meleeWeaponEffectIndex, EFFECT_BLURE2, 0, 0, &D_8085470C);
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFeet, this->ageProperties->unk_04); ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFeet, this->ageProperties->unk_04);
@ -12512,27 +12512,27 @@ void Player_Action_8084CC98(Player* this, PlayState* play) {
!Player_ActionChange_6(this, play))) { !Player_ActionChange_6(this, play))) {
if (D_808535E0 == 0) { if (D_808535E0 == 0) {
if (this->av1.actionVar1 != 0) { if (this->av1.actionVar1 != 0) {
if (LinkAnimation_Update(play, &this->skelAnimeUpper)) { if (LinkAnimation_Update(play, &this->upperSkelAnime)) {
rideActor->stateFlags &= ~ENHORSE_FLAG_8; rideActor->stateFlags &= ~ENHORSE_FLAG_8;
this->av1.actionVar1 = 0; this->av1.actionVar1 = 0;
} }
if (this->skelAnimeUpper.animation == &gPlayerAnim_link_uma_stop_muti) { if (this->upperSkelAnime.animation == &gPlayerAnim_link_uma_stop_muti) {
if (LinkAnimation_OnFrame(&this->skelAnimeUpper, 23.0f)) { if (LinkAnimation_OnFrame(&this->upperSkelAnime, 23.0f)) {
Player_PlaySfx(this, NA_SE_IT_LASH); Player_PlaySfx(this, NA_SE_IT_LASH);
func_80832698(this, NA_SE_VO_LI_LASH); func_80832698(this, NA_SE_VO_LI_LASH);
} }
AnimationContext_SetCopyAll(play, this->skelAnime.limbCount, this->skelAnime.jointTable, AnimationContext_SetCopyAll(play, this->skelAnime.limbCount, this->skelAnime.jointTable,
this->skelAnimeUpper.jointTable); this->upperSkelAnime.jointTable);
} else { } else {
if (LinkAnimation_OnFrame(&this->skelAnimeUpper, 10.0f)) { if (LinkAnimation_OnFrame(&this->upperSkelAnime, 10.0f)) {
Player_PlaySfx(this, NA_SE_IT_LASH); Player_PlaySfx(this, NA_SE_IT_LASH);
func_80832698(this, NA_SE_VO_LI_LASH); func_80832698(this, NA_SE_VO_LI_LASH);
} }
AnimationContext_SetCopyTrue(play, this->skelAnime.limbCount, this->skelAnime.jointTable, AnimationContext_SetCopyTrue(play, this->skelAnime.limbCount, this->skelAnime.jointTable,
this->skelAnimeUpper.jointTable, sUpperBodyLimbCopyMap); this->upperSkelAnime.jointTable, sUpperBodyLimbCopyMap);
} }
} else { } else {
LinkAnimationHeader* anim = NULL; LinkAnimationHeader* anim = NULL;
@ -12546,7 +12546,7 @@ void Player_Action_8084CC98(Player* this, PlayState* play) {
} }
if (anim != NULL) { if (anim != NULL) {
LinkAnimation_PlayOnce(play, &this->skelAnimeUpper, anim); LinkAnimation_PlayOnce(play, &this->upperSkelAnime, anim);
this->av1.actionVar1 = 1; this->av1.actionVar1 = 1;
} }
} }