diff options
| author | Jordan Longstaff <JordanLongstaff@users.noreply.github.com> | 2024-12-13 17:56:42 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-13 15:56:42 -0700 |
| commit | 5d8e7740efb6516ec5001b039feb71ffaf518c5a (patch) | |
| tree | f8314959823c7040a2b48e3457aece4fabfc7f9b /soh/src/code | |
| parent | 1a5632e3b5d877bf5869b642585c8973458b333f (diff) | |
Rename two Actor functions from decomp (#4674)
Diffstat (limited to 'soh/src/code')
| -rw-r--r-- | soh/src/code/z_actor.c | 9 | ||||
| -rw-r--r-- | soh/src/code/z_en_item00.c | 4 |
2 files changed, 6 insertions, 7 deletions
diff --git a/soh/src/code/z_actor.c b/soh/src/code/z_actor.c index be846b173..399b2bda7 100644 --- a/soh/src/code/z_actor.c +++ b/soh/src/code/z_actor.c @@ -2102,14 +2102,13 @@ s32 Actor_OfferGetItem(Actor* actor, PlayState* play, s32 getItemId, f32 xzRange return false; } -// TODO: Rename to GiveItemIdFromActorWithFixedRange or similar // If you're doing something for randomizer, you're probably looking for GiveItemEntryFromActorWithFixedRange -void func_8002F554(Actor* actor, PlayState* play, s32 getItemId) { +void Actor_OfferGetItemNearby(Actor* actor, PlayState* play, s32 getItemId) { Actor_OfferGetItem(actor, play, getItemId, 50.0f, 10.0f); } -void func_8002F580(Actor* actor, PlayState* play) { - func_8002F554(actor, play, GI_NONE); +void Actor_OfferCarry(Actor* actor, PlayState* play) { + Actor_OfferGetItemNearby(actor, play, GI_NONE); } u32 Actor_HasNoParent(Actor* actor, PlayState* play) { @@ -4610,7 +4609,7 @@ s32 func_80035124(Actor* actor, PlayState* play) { ret = 1; } else { actor->shape.rot.x = actor->shape.rot.z = 0; - func_8002F580(actor, play); + Actor_OfferCarry(actor, play); } break; case 1: diff --git a/soh/src/code/z_en_item00.c b/soh/src/code/z_en_item00.c index 93e5fad42..5bc90c6ca 100644 --- a/soh/src/code/z_en_item00.c +++ b/soh/src/code/z_en_item00.c @@ -588,7 +588,7 @@ void EnItem00_Init(Actor* thisx, PlayState* play) { } if ((getItemId != GI_NONE) && !Actor_HasParent(&this->actor, play)) { - func_8002F554(&this->actor, play, getItemId); + Actor_OfferGetItemNearby(&this->actor, play, getItemId); } EnItem00_SetupAction(this, func_8001E5C8); @@ -956,7 +956,7 @@ void EnItem00_Update(Actor* thisx, PlayState* play) { params = &this->actor.params; if ((getItemId != GI_NONE) && !Actor_HasParent(&this->actor, play)) { - func_8002F554(&this->actor, play, getItemId); + Actor_OfferGetItemNearby(&this->actor, play, getItemId); } switch (*params) { |