mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-03 06:24:30 +00:00
Code Issues Projects Releases Wiki Activity

Documentation pass centered on z_player_lib (#1230)

Browse source
This commit is contained in:
Dragorn421 2022-05-29 04:52:15 -07:00 • committed by GitHub
parent e68f321777
commit d39ce02458
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 220 additions and 191 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/overlays/actors/ovl_En_Boom/z_en_boom.c
View file

@ -261,7 +261,7 @@ void EnBoom_Draw(Actor* thisx, PlayState* play) {
Matrix_MultVec3f(&sMultVec1, &vec1);
Matrix_MultVec3f(&sMultVec2, &vec2);
if (func_80090480(play, &this->collider, &this->boomerangInfo, &vec1, &vec2) != 0) {
if (func_80090480(play, &this->collider, &this->boomerangInfo, &vec1, &vec2)) {
EffectBlure_AddVertex(Effect_GetByIndex(this->effectIndex), &vec1, &vec2);
}

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

@ -2667,7 +2667,7 @@ s32 func_808356E8(Player* this, PlayState* play) {
}
void func_808357E8(Player* this, Gfx** dLists) {
this->leftHandDLists = &dLists[gSaveContext.linkAge];
this->leftHandDLists = dLists + gSaveContext.linkAge;
}
s32 func_80835800(Player* this, PlayState* play) {
@ -2754,7 +2754,7 @@ s32 func_80835B60(Player* this, PlayState* play) {
if (!(this->stateFlags1 & PLAYER_STATE1_25)) {
func_80833638(this, func_80835C08);
LinkAnimation_PlayOnce(play, &this->skelAnime2, &gPlayerAnim_0025F8);
func_808357E8(this, D_80125EF8);
func_808357E8(this, gPlayerLeftHandBoomerangDLs);
func_8002F7DC(&this->actor, NA_SE_PL_CATCH_BOOMERANG);
func_80832698(this, NA_SE_VO_LI_SWORD_N);
return 1;
@ -13805,11 +13805,11 @@ void func_80851A50(PlayState* play, Player* this, CsCmdActorAction* arg2) {
this->interactRangeActor->parent = &this->actor;
if (!LINK_IS_ADULT) {
dLists = D_80125DE8;
dLists = gPlayerLeftHandBgsDLs;
} else {
dLists = D_80125E18;
dLists = gPlayerLeftHandClosedDLs;
}
this->leftHandDLists = &dLists[gSaveContext.linkAge];
this->leftHandDLists = dLists + gSaveContext.linkAge;
func_8002F7DC(&this->actor, sp2C->unk_00);
if (!LINK_IS_ADULT) {
@ -14119,7 +14119,7 @@ void func_80852648(PlayState* play, Player* this, CsCmdActorAction* arg2) {
this->heldItemActionParam = this->itemActionParam = PLAYER_AP_NONE;
this->heldItemId = ITEM_NONE;
this->modelGroup = this->nextModelGroup = Player_ActionToModelGroup(this, PLAYER_AP_NONE);
this->leftHandDLists = D_80125E08;
this->leftHandDLists = gPlayerLeftHandOpenDLs;
Inventory_ChangeEquipment(EQUIP_TYPE_SWORD, EQUIP_VALUE_SWORD_MASTER);
gSaveContext.equips.buttonItems[0] = ITEM_SWORD_MASTER;
Inventory_DeleteEquipment(play, EQUIP_TYPE_SWORD);