diff options
| author | mzxrules <mzxrules@gmail.com> | 2022-06-18 10:33:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-18 10:33:59 -0400 |
| commit | ec43a32c2677dbaea2f4332ba5a624ec7759b711 (patch) | |
| tree | f1dc7f53705efb6902b7be7bcd98c80abc21b49e /src/code | |
| parent | 8049dec3393c4ade687dbdfd84d3ccde73168ab0 (diff) | |
z_en_box.c, z_demo_tre_lgt.c OK, some object_box documentation (#703)
* All functions attempted, 2 NON_MATCHINGs
* z_en_box OK, more documentation
* format
* en_box cleanups, fix GI item table
* z_demo_tre_lgt OK
* format.sh
* pr suggestions 1
* object_box improvements
* Merge remote-tracking branch 'origin/master' into z_en_box
* Revert "Merge remote-tracking branch 'origin/master' into z_en_box"
This reverts commit 5aacdf26e49c91fadc6f50dc2b9e19935a8f3ec4.
* more suggested changes
* fix comment
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_actor.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 6d0b9573d..9325d315c 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -2003,11 +2003,11 @@ s32 Actor_PickUp(Actor* actor, GlobalContext* globalCtx, s32 getItemId, f32 xzRa if (!(player->stateFlags1 & 0x3C7080) && Player_GetExplosiveHeld(player) < 0) { if ((actor->xzDistToPlayer <= xzRange) && (fabsf(actor->playerHeightRel) <= fabsf(yRange))) { - if (((getItemId == GI_MASK_CIRCUS_LEADER) || (getItemId == GI_PENDANT_OF_MEMORIES) || - (getItemId == GI_DEED_LAND) || - (((player->heldActor != NULL) || (actor == player->targetActor)) && + if ((getItemId == GI_MASK_CIRCUS_LEADER || getItemId == GI_PENDANT_OF_MEMORIES || + getItemId == GI_DEED_LAND || + ((player->heldActor != NULL || actor == player->targetActor) && (getItemId > GI_NONE && getItemId < GI_MAX))) || - (!(player->stateFlags1 & 0x20000800))) { + !(player->stateFlags1 & 0x20000800)) { s16 yawDiff = actor->yawTowardsPlayer - player->actor.shape.rot.y; s32 absYawDiff = ABS_ALT(yawDiff); @@ -4482,9 +4482,10 @@ void func_800BE5CC(Actor* actor, ColliderJntSph* collider, s32 colliderIndex) { } } -s32 func_800BE63C(struct EnBox* chest) { - if ((chest->unk_1F1 == 5) || (chest->unk_1F1 == 6) || (chest->unk_1F1 == 7) || (chest->unk_1F1 == 8) || - (chest->unk_1F1 == 0xC)) { +s32 Actor_IsSmallChest(struct EnBox* chest) { + if (chest->type == ENBOX_TYPE_SMALL || chest->type == ENBOX_TYPE_SMALL_INVISIBLE || + chest->type == ENBOX_TYPE_SMALL_ROOM_CLEAR || chest->type == ENBOX_TYPE_SMALL_SWITCH_FLAG_FALL || + chest->type == ENBOX_TYPE_SMALL_SWITCH_FLAG) { return true; } return false; |