diff options
| author | Anghelo Carvajal <angheloalf95@gmail.com> | 2022-08-15 15:04:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-15 15:04:42 -0400 |
| commit | a67571c2bf91bf8f9f9ab6cff65c6680d1be9273 (patch) | |
| tree | eac2c08687dbf2e50fce629bedf0e25b456fa050 /src/code | |
| parent | 0f130c173d5ceca2cca723178c19556bcdc00988 (diff) | |
Purge `ExchangeItemID` enum (#1026)
* Purge ExchangeItemID enum
* Add stff to namefixer
* Rename FISHING_ROD
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/code_8012EC80.c | 2 | ||||
| -rw-r--r-- | src/code/z_actor.c | 8 | ||||
| -rw-r--r-- | src/code/z_player_lib.c | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/code/code_8012EC80.c b/src/code/code_8012EC80.c index 5649ae80c..ee2070610 100644 --- a/src/code/code_8012EC80.c +++ b/src/code/code_8012EC80.c @@ -189,7 +189,7 @@ void* gItemIcons[] = { 0x08059000, // ITEM_WALLET_DEFAULT 0x0805A000, // ITEM_WALLET_ADULT 0x0805B000, // ITEM_WALLET_GIANT - 0x0805C000, // ITEM_FISHING_POLE + 0x0805C000, // ITEM_FISHING_ROD 0x0805D000, // ITEM_REMAINS_ODOLWA 0x0805E000, // ITEM_REMAINS_GOHT 0x0805F000, // ITEM_REMAINS_GYORG diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 9ecaba91f..da2b70292 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -1850,10 +1850,10 @@ s32 Actor_ProcessTalkRequest(Actor* actor, GameState* gameState) { // Actor_PickUpExchange? Seems to be called with exchangeItemId -1 if the same actor used Actor_PickUp // This function is also used to toggle the "Speak" action on the A button -s32 func_800B8500(Actor* actor, PlayState* play, f32 xzRange, f32 yRange, s32 exchangeItemId) { +s32 func_800B8500(Actor* actor, PlayState* play, f32 xzRange, f32 yRange, PlayerActionParam exchangeItemId) { Player* player = GET_PLAYER(play); - if ((player->actor.flags & ACTOR_FLAG_100) || ((exchangeItemId > EXCH_ITEM_NONE) && Player_InCsMode(play)) || + if ((player->actor.flags & ACTOR_FLAG_100) || ((exchangeItemId > PLAYER_AP_NONE) && Player_InCsMode(play)) || (!actor->isTargeted && ((fabsf(actor->playerHeightRel) > fabsf(yRange)) || ((actor->xzDistToPlayer > player->targetActorDistance)) || (xzRange < actor->xzDistToPlayer)))) { @@ -1868,12 +1868,12 @@ s32 func_800B8500(Actor* actor, PlayState* play, f32 xzRange, f32 yRange, s32 ex return true; } -s32 func_800B85E0(Actor* actor, PlayState* play, f32 radius, s32 exchangeItemId) { +s32 func_800B85E0(Actor* actor, PlayState* play, f32 radius, PlayerActionParam exchangeItemId) { return func_800B8500(actor, play, radius, radius, exchangeItemId); } s32 func_800B8614(Actor* actor, PlayState* play, f32 radius) { - return func_800B85E0(actor, play, radius, EXCH_ITEM_NONE); + return func_800B85E0(actor, play, radius, PLAYER_AP_NONE); } s32 func_800B863C(Actor* actor, PlayState* play) { diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c index 100cb3f8a..1566077f1 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -774,11 +774,11 @@ s32 func_801240DC(Player* player) { } s32 func_80124110(Player* player, s32 actionParam) { - s32 temp_v0 = actionParam - PLAYER_AP_FISHING_POLE; + s32 temp_v0 = actionParam - PLAYER_AP_FISHING_ROD; if (player->transformation != PLAYER_FORM_GORON) { - if (((actionParam - PLAYER_AP_FISHING_POLE) > (PLAYER_AP_FISHING_POLE - PLAYER_AP_FISHING_POLE)) && - ((actionParam - PLAYER_AP_FISHING_POLE) < (PLAYER_AP_SWORD_GREAT_FAIRY - PLAYER_AP_FISHING_POLE))) { + if (((actionParam - PLAYER_AP_FISHING_ROD) > (PLAYER_AP_FISHING_ROD - PLAYER_AP_FISHING_ROD)) && + ((actionParam - PLAYER_AP_FISHING_ROD) < (PLAYER_AP_SWORD_GREAT_FAIRY - PLAYER_AP_FISHING_ROD))) { return temp_v0; } } |