falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Purge `ExchangeItemID` enum (#1026) 

* Purge ExchangeItemID enum

* Add stff to namefixer

* Rename FISHING_ROD
This commit is contained in:
Anghelo Carvajal 2022-08-15 15:04:42 -04:00 committed by GitHub
parent 0f130c173d
commit a67571c2bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
49 changed files with 131 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/functions.h
View File

@ -678,8 +678,8 @@ PosRot* Actor_GetWorldPosShapeRot(PosRot* dest, Actor* actor);
s32 func_800B83F8(Actor* actor, Player* player, s32 flag);
s32 Actor_ProcessTalkRequest(Actor* actor, GameState* gameState);
s32 func_800B8500(Actor* actor, PlayState* play, f32 xzRange, f32 yRange, s32 exchangeItemId);
s32 func_800B85E0(Actor* actor, PlayState* play, f32 radius, s32 exchangeItemId);
s32 func_800B8500(Actor* actor, PlayState* play, f32 xzRange, f32 yRange, PlayerActionParam exchangeItemId);
s32 func_800B85E0(Actor* actor, PlayState* play, f32 radius, PlayerActionParam exchangeItemId);
s32 func_800B8614(Actor* actor, PlayState* play, f32 radius);
s32 func_800B863C(Actor* actor, PlayState* play);
s32 Actor_TextboxIsClosing(Actor* actor, PlayState* play);

22
include/z64item.h
View File

@ -210,7 +210,7 @@ typedef enum {
/* 0x59 */ ITEM_WALLET_DEFAULT,
/* 0x5A */ ITEM_WALLET_ADULT,
/* 0x5B */ ITEM_WALLET_GIANT,
/* 0x5C */ ITEM_FISHING_POLE,
/* 0x5C */ ITEM_FISHING_ROD,
/* 0x5D */ ITEM_REMAINS_ODOLWA,
/* 0x5E */ ITEM_REMAINS_GOHT,
/* 0x5F */ ITEM_REMAINS_GYORG,
@ -552,24 +552,4 @@ typedef enum {
/* 0x76 */ GID_MAX
} GetItemDrawID;
// This enum may not be real, and actionparam is just used directly.
// Keep using it for now.
// TODO: fill
typedef enum {
/* -1 */ EXCH_ITEM_MINUS1 = -1, // Unknown usage or function
/* 0x00 */ EXCH_ITEM_NONE,
/* 0x13 */ EXCH_ITEM_PICTO_BOX = 0x13,
/* 0x1E */ EXCH_ITEM_1E = 0x1E, // BOTTLE_MUSHROOM
/* 0x2A */ EXCH_ITEM_MOON_TEAR = 0x2A,
/* 0x2B */ EXCH_ITEM_DEED_LAND,
/* 0x2C */ EXCH_ITEM_ROOM_KEY,
/* 0x2D */ EXCH_ITEM_LETTER_TO_KAFEI,
/* 0x2E */ EXCH_ITEM_2E,
/* 0x2F */ EXCH_ITEM_DEED_SWAMP,
/* 0x30 */ EXCH_ITEM_DEED_MOUNTAIN,
/* 0x31 */ EXCH_ITEM_DEED_OCEAN,
/* 0x32 */ EXCH_ITEM_32,
/* 0x33 */ EXCH_ITEM_LETTER_MAMA
} ExchangeItemID;
#endif

5
include/z64player.h
View File

@ -70,10 +70,11 @@ typedef enum {
/* 0x19 */ PLAYER_MASK_MAX
} PlayerMask;
typedef enum {
typedef enum PlayerActionParam {
/* -1 */ PLAYER_AP_MINUS1 = -1,
/* 0x00 */ PLAYER_AP_NONE,
/* 0x01 */ PLAYER_AP_LAST_USED,
/* 0x02 */ PLAYER_AP_FISHING_POLE,
/* 0x02 */ PLAYER_AP_FISHING_ROD,
/* 0x03 */ PLAYER_AP_SWORD_KOKIRI,
/* 0x04 */ PLAYER_AP_SWORD_RAZOR,
/* 0x05 */ PLAYER_AP_SWORD_GILDED,

2
src/code/code_8012EC80.c
View File

@ -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

8
src/code/z_actor.c
View File

@ -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) {

6
src/code/z_player_lib.c
View File

@ -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;
}
}

2
src/overlays/actors/ovl_En_Ah/z_en_ah.c
View File

@ -554,7 +554,7 @@ void EnAh_Update(Actor* thisx, PlayState* play) {
radius = this->collider.dim.radius + 60;
height = this->collider.dim.height + 10;
func_8013C964(&this->actor, play, radius, height, EXCH_ITEM_NONE, this->unk_2D8 & 7);
func_8013C964(&this->actor, play, radius, height, PLAYER_AP_NONE, this->unk_2D8 & 7);
if (!(this->unk_2D8 & 0x10)) {
Actor_MoveWithGravity(&this->actor);
Actor_UpdateBgCheckInfo(play, &this->actor, 30.0f, 12.0f, 0.0f, 4);

4
src/overlays/actors/ovl_En_Al/z_en_al.c
View File

@ -659,7 +659,7 @@ s32 func_80BDF308(EnAl* this, PlayState* play, ScheduleOutput* scheduleOutput) {
break;
case 2:
this->unk_4F0 = EXCH_ITEM_NONE;
this->unk_4F0 = PLAYER_AP_NONE;
this->unk_4EA = 0;
func_80BDE27C(this, 2);
break;
@ -672,7 +672,7 @@ s32 func_80BDF390(EnAl* this, PlayState* play, ScheduleOutput* scheduleOutput) {
this->actor.flags |= ACTOR_FLAG_1;
this->actor.targetMode = 0;
this->unk_4F0 = EXCH_ITEM_NONE;
this->unk_4F0 = PLAYER_AP_NONE;
this->unk_4C2 = 0;
this->unk_4D4 = 40.0f;

2
src/overlays/actors/ovl_En_Baba/z_en_baba.c
View File

@ -647,7 +647,7 @@ void EnBaba_GaveBlastMask(EnBaba* this, PlayState* play) {
EnBaba_HandleConversation(this, play);
this->actionFunc = EnBaba_Talk;
} else {
func_800B85E0(&this->actor, play, 400.0f, EXCH_ITEM_MINUS1);
func_800B85E0(&this->actor, play, 400.0f, PLAYER_AP_MINUS1);
}
}

2
src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.c
View File

@ -150,7 +150,7 @@ s32 func_809CC270(EnBba01* this, PlayState* play) {
Actor_GetScreenPos(play, &this->enHy.actor, &x, &y);
//! @bug: Both x and y conditionals are always true, || should be an &&
if (!this->enHy.waitingOnInit && ((x >= 0) || (x < SCREEN_WIDTH)) && ((y >= 0) || (y < SCREEN_HEIGHT))) {
func_800B85E0(&this->enHy.actor, play, 30.0f, EXCH_ITEM_2E);
func_800B85E0(&this->enHy.actor, play, 30.0f, PLAYER_AP_MAGIC_BEANS);
}
return true;
}

4
src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.c
View File

@ -109,7 +109,7 @@ void func_809CCEE8(EnBji01* this, PlayState* play) {
} else {
this->moonsTear = (ObjMoonStone*)SubS_FindActor(play, NULL, ACTORCAT_PROP, ACTOR_OBJ_MOON_STONE);
}
func_800B8500(&this->actor, play, 60.0f, 10.0f, EXCH_ITEM_NONE);
func_800B8500(&this->actor, play, 60.0f, 10.0f, PLAYER_AP_NONE);
}
}
@ -162,7 +162,7 @@ void func_809CD028(EnBji01* this, PlayState* play) {
this->textId = 0x5F1;
}
func_800B8500(&this->actor, play, this->actor.xzDistToPlayer, this->actor.playerHeightRel,
EXCH_ITEM_NONE);
PLAYER_AP_NONE);
break;
case PLAYER_FORM_HUMAN:
this->textId = 0x5F7;

24
src/overlays/actors/ovl_En_Bjt/z_en_bjt.c
View File

@ -143,27 +143,27 @@ void EnBjt_UpdateCollision(EnBjt* this, PlayState* play) {
s32 EnBjt_TakeItem(s32 exchangeItem) {
switch (exchangeItem) {
case EXCH_ITEM_LETTER_TO_KAFEI:
case PLAYER_AP_LETTER_TO_KAFEI:
Inventory_DeleteItem(ITEM_LETTER_TO_KAFEI, SLOT(ITEM_LETTER_TO_KAFEI));
break;
case EXCH_ITEM_DEED_SWAMP:
case PLAYER_AP_DEED_SWAMP:
Inventory_DeleteItem(ITEM_DEED_SWAMP, SLOT(ITEM_DEED_SWAMP));
break;
case EXCH_ITEM_DEED_MOUNTAIN:
case PLAYER_AP_DEED_MOUNTAIN:
Inventory_DeleteItem(ITEM_DEED_MOUNTAIN, SLOT(ITEM_DEED_MOUNTAIN));
break;
case EXCH_ITEM_DEED_OCEAN:
case PLAYER_AP_DEED_OCEAN:
Inventory_DeleteItem(ITEM_DEED_OCEAN, SLOT(ITEM_DEED_OCEAN));
break;
case EXCH_ITEM_DEED_LAND:
case PLAYER_AP_DEED_LAND:
Inventory_DeleteItem(ITEM_DEED_LAND, SLOT(ITEM_DEED_LAND));
break;
case EXCH_ITEM_LETTER_MAMA:
case PLAYER_AP_LETTER_MAMA:
Inventory_DeleteItem(ITEM_LETTER_MAMA, SLOT(ITEM_LETTER_MAMA));
break;
@ -250,9 +250,9 @@ s32 EnBjt_ChooseBehaviour(Actor* thisx, PlayState* play) {
// Fallthrough
case TEXT_STATE_16:
itemAP = func_80123810(play);
if ((itemAP == EXCH_ITEM_DEED_LAND) || (itemAP == EXCH_ITEM_LETTER_TO_KAFEI) ||
(itemAP == EXCH_ITEM_DEED_SWAMP) || (itemAP == EXCH_ITEM_DEED_MOUNTAIN) ||
(itemAP == EXCH_ITEM_DEED_OCEAN) || (itemAP == EXCH_ITEM_LETTER_MAMA)) {
if ((itemAP == PLAYER_AP_DEED_LAND) || (itemAP == PLAYER_AP_LETTER_TO_KAFEI) ||
(itemAP == PLAYER_AP_DEED_SWAMP) || (itemAP == PLAYER_AP_DEED_MOUNTAIN) ||
(itemAP == PLAYER_AP_DEED_OCEAN) || (itemAP == PLAYER_AP_LETTER_MAMA)) {
EnBjt_ChangeAnim(this, TOILET_HAND_ANIM_WAITING_MORPH);
this->playedSfx = false;
this->behaviour++;
@ -274,9 +274,9 @@ s32 EnBjt_ChooseBehaviour(Actor* thisx, PlayState* play) {
break;
case TOILET_HAND_BEHAVIOUR_TAKE_ITEM:
if (player->exchangeItemId != EXCH_ITEM_NONE) {
if (player->exchangeItemId != PLAYER_AP_NONE) {
EnBjt_TakeItem(player->exchangeItemId);
player->exchangeItemId = EXCH_ITEM_NONE;
player->exchangeItemId = PLAYER_AP_NONE;
}
if (EnBjt_Vanish(this)) {
this->timer = 60;
@ -446,7 +446,7 @@ void EnBjt_Update(Actor* thisx, PlayState* play) {
if (this->scheduleResult != TOILET_HAND_SCH_NONE) {
EnBjt_UpdateSkelAnime(this);
func_8013C964(&this->actor, play, 60.0f, 10.0f, EXCH_ITEM_NONE, this->stateFlags & 7);
func_8013C964(&this->actor, play, 60.0f, 10.0f, PLAYER_AP_NONE, this->stateFlags & 7);
Actor_SetFocus(&this->actor, 26.0f);
EnBjt_UpdateCollision(this, play);
}

2
src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.c
View File

@ -142,7 +142,7 @@ s32 func_809CB4A0(EnCne01* this, PlayState* play) {
Actor_GetScreenPos(play, &this->enHy.actor, &x, &y);
//! @bug: Both x and y conditionals are always true, || should be an &&
if (!this->enHy.waitingOnInit && ((x >= 0) || (x < SCREEN_WIDTH)) && ((y >= 0) || (y < SCREEN_HEIGHT))) {
func_800B85E0(&this->enHy.actor, play, 30.0f, EXCH_ITEM_2E);
func_800B85E0(&this->enHy.actor, play, 30.0f, PLAYER_AP_MAGIC_BEANS);
}
return true;
}

2
src/overlays/actors/ovl_En_Dai/z_en_dai.c
View File

@ -561,7 +561,7 @@ void EnDai_Update(Actor* thisx, PlayState* play) {
SkelAnime_Update(&this->skelAnime);
func_80B3E834(this);
if (!(this->unk_1CE & 0x200)) {
func_8013C964(&this->actor, play, 0.0f, 0.0f, EXCH_ITEM_NONE, this->unk_1CE & 7);
func_8013C964(&this->actor, play, 0.0f, 0.0f, PLAYER_AP_NONE, this->unk_1CE & 7);
}
func_80B3E460(this);
}

2
src/overlays/actors/ovl_En_Dno/z_en_dno.c
View File

@ -517,7 +517,7 @@ void func_80A724B8(EnDno* this, PlayState* play) {
}
void func_80A7256C(EnDno* this, PlayState* play) {
func_800B8500(&this->actor, play, this->actor.xzDistToPlayer, this->actor.playerHeightRel, EXCH_ITEM_MINUS1);
func_800B8500(&this->actor, play, this->actor.xzDistToPlayer, this->actor.playerHeightRel, PLAYER_AP_MINUS1);
}
void func_80A72598(EnDno* this, PlayState* play) {

4
src/overlays/actors/ovl_En_Dnp/z_en_dnp.c
View File

@ -304,7 +304,7 @@ void func_80B3D338(EnDnp* this, PlayState* play) {
} else {
this->actor.textId = 0x971;
player->actor.textId = this->actor.textId;
func_800B8500(&this->actor, play, 9999.9f, 9999.9f, EXCH_ITEM_MINUS1);
func_800B8500(&this->actor, play, 9999.9f, 9999.9f, PLAYER_AP_MINUS1);
}
}
}
@ -409,7 +409,7 @@ void EnDnp_Update(Actor* thisx, PlayState* play) {
if ((this->unk_322 & 0x400) && !(gSaveContext.save.weekEventReg[23] & 0x20)) {
Actor_PickUp(&this->actor, play, GI_MAX, sp2C, sp28);
}
func_8013C964(&this->actor, play, sp2C, sp28, EXCH_ITEM_NONE, this->unk_322 & 7);
func_8013C964(&this->actor, play, sp2C, sp28, PLAYER_AP_NONE, this->unk_322 & 7);
Actor_SetFocus(&this->actor, 30.0f);
func_80B3CC80(this, play);
}

2
src/overlays/actors/ovl_En_Dnq/z_en_dnq.c
View File

@ -456,7 +456,7 @@ void EnDnq_Update(Actor* thisx, PlayState* play) {
this->unk_394 = this->picto.actor.xzDistToPlayer;
func_80A52C6C(this, play);
func_8013C964(&this->picto.actor, play, this->unk_390, fabsf(this->picto.actor.playerHeightRel) + 1.0f,
EXCH_ITEM_NONE, this->unk_37C & 7);
PLAYER_AP_NONE, this->unk_37C & 7);
this->picto.actor.xzDistToPlayer = this->unk_394;
Actor_SetFocus(&this->picto.actor, 46.0f);
func_80A52604(this, play);

2
src/overlays/actors/ovl_En_Dns/z_en_dns.c
View File

@ -550,7 +550,7 @@ void EnDns_Update(Actor* thisx, PlayState* play) {
func_8092C934(this);
func_8092C86C(this, play);
Actor_UpdateBgCheckInfo(play, &this->actor, 30.0f, 12.0f, 0.0f, 4);
func_8013C964(&this->actor, play, 80.0f, 40.0f, EXCH_ITEM_NONE, this->unk_2C6 & 7);
func_8013C964(&this->actor, play, 80.0f, 40.0f, PLAYER_AP_NONE, this->unk_2C6 & 7);
Actor_SetFocus(&this->actor, 34.0f);
func_8092C6FC(this, play);
func_8092C5C0(this);

8
src/overlays/actors/ovl_En_Fsn/z_en_fsn.c
View File

@ -212,7 +212,7 @@ void EnFsn_HandleSetupResumeInteraction(EnFsn* this, PlayState* play) {
if ((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play) &&
this->cutsceneState == ENFSN_CUTSCENESTATE_STOPPED) {
Actor_ProcessTalkRequest(&this->actor, &play->state);
func_800B85E0(&this->actor, play, 400.0f, EXCH_ITEM_MINUS1);
func_800B85E0(&this->actor, play, 400.0f, PLAYER_AP_MINUS1);
if (ENFSN_IS_SHOP(&this->actor)) {
this->actor.textId = 0;
}
@ -839,7 +839,7 @@ void EnFsn_StartBuying(EnFsn* this, PlayState* play) {
this->actionFunc = EnFsn_DeterminePrice;
break;
case 0x29CF:
player->exchangeItemId = EXCH_ITEM_NONE;
player->exchangeItemId = PLAYER_AP_NONE;
this->actionFunc = EnFsn_SetupDeterminePrice;
break;
}
@ -986,7 +986,7 @@ void EnFsn_MakeOffer(EnFsn* this, PlayState* play) {
break;
case 1:
func_8019F230();
player->exchangeItemId = EXCH_ITEM_NONE;
player->exchangeItemId = PLAYER_AP_NONE;
this->actionFunc = EnFsn_SetupDeterminePrice;
break;
}
@ -1042,7 +1042,7 @@ void EnFsn_ResumeInteraction(EnFsn* this, PlayState* play) {
this->actionFunc = EnFsn_ConverseBackroom;
}
} else {
func_800B85E0(&this->actor, play, 400.0f, EXCH_ITEM_MINUS1);
func_800B85E0(&this->actor, play, 400.0f, PLAYER_AP_MINUS1);
}
}

2
src/overlays/actors/ovl_En_Fu/z_en_fu.c
View File

@ -935,7 +935,7 @@ void func_80963630(EnFu* this, PlayState* play) {
player->stateFlags1 &= ~0x20;
} else {
this->actor.child->freezeTimer = 10;
func_800B85E0(&this->actor, play, 500.0f, EXCH_ITEM_MINUS1);
func_800B85E0(&this->actor, play, 500.0f, PLAYER_AP_MINUS1);
}
}

2
src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c
View File

@ -567,7 +567,7 @@ void EnGinkoMan_BankAward2(EnGinkoMan* this, PlayState* play) {
EnGinkoMan_SetupIdle(this);
}
} else {
func_800B85E0(&this->actor, play, 500.0f, EXCH_ITEM_MINUS1);
func_800B85E0(&this->actor, play, 500.0f, PLAYER_AP_MINUS1);
}
}

2
src/overlays/actors/ovl_En_Gm/z_en_gm.c
View File

@ -1710,7 +1710,7 @@ void EnGm_Update(Actor* thisx, PlayState* play) {
func_8094DFF8(this, play);
func_8094E2D0(this);
func_8094F2E8(this);
func_8013C964(&this->actor, play, this->unk_3B4, 30.0f, EXCH_ITEM_NONE, this->unk_3A4 & 7);
func_8013C964(&this->actor, play, this->unk_3B4, 30.0f, PLAYER_AP_NONE, this->unk_3A4 & 7);
if ((this->unk_258 != 3) && (this->unk_258 != 5) && (this->unk_258 != 8)) {
Actor_MoveWithGravity(&this->actor);
Actor_UpdateBgCheckInfo(play, &this->actor, 30.0f, 12.0f, 0.0f, 4);

4
src/overlays/actors/ovl_En_Go/z_en_go.c
View File

@ -1928,10 +1928,10 @@ void EnGo_Update(Actor* thisx, PlayState* play) {
} else {
phi_f0 = this->colliderCylinder.dim.radius + 40;
}
func_8013C964(&this->actor, play, phi_f0, 20.0f, EXCH_ITEM_NONE, this->unk_390 & 7);
func_8013C964(&this->actor, play, phi_f0, 20.0f, PLAYER_AP_NONE, this->unk_390 & 7);
} else if ((this->unk_390 & 0x200) && (this->unk_3EC != 0)) {
phi_f0 = this->colliderCylinder.dim.radius + 40;
func_8013C964(&this->actor, play, phi_f0, 20.0f, EXCH_ITEM_NONE, this->unk_390 & 7);
func_8013C964(&this->actor, play, phi_f0, 20.0f, PLAYER_AP_NONE, this->unk_390 & 7);
}
if ((ENGO_GET_F(&this->actor) != ENGO_F_8) && (ENGO_GET_F(&this->actor) != ENGO_F_2) &&

2
src/overlays/actors/ovl_En_Gs/z_en_gs.c
View File

@ -184,7 +184,7 @@ void func_80997D38(EnGs* this, PlayState* play) {
if (Message_GetState(&play->msgCtx) == TEXT_STATE_NONE) {
if (this->actor.xzDistToPlayer <= D_8099A408[this->actor.params]) {
func_8013E8F8(&this->actor, play, D_8099A408[this->actor.params], D_8099A408[this->actor.params],
EXCH_ITEM_NONE, 0x2000, 0x2000);
PLAYER_AP_NONE, 0x2000, 0x2000);
}
}

4
src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.c
View File

@ -295,7 +295,7 @@ void func_80BC7440(EnGuruguru* this, PlayState* play) {
this->textIdIndex++;
this->actor.textId = textIDs[this->textIdIndex];
func_801A3B48(1);
func_800B8500(&this->actor, play, 400.0f, 400.0f, EXCH_ITEM_MINUS1);
func_800B8500(&this->actor, play, 400.0f, 400.0f, PLAYER_AP_MINUS1);
this->unk268 = 0;
gSaveContext.save.weekEventReg[38] |= 0x40;
this->actionFunc = func_80BC7520;
@ -309,7 +309,7 @@ void func_80BC7520(EnGuruguru* this, PlayState* play) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
this->actionFunc = func_80BC7068;
} else {
func_800B8500(&this->actor, play, 400.0f, 400.0f, EXCH_ITEM_MINUS1);
func_800B8500(&this->actor, play, 400.0f, 400.0f, PLAYER_AP_MINUS1);
}
}

2
src/overlays/actors/ovl_En_Ig/z_en_ig.c
View File

@ -950,7 +950,7 @@ void EnIg_Update(Actor* thisx, PlayState* play) {
func_80BF1258(this);
func_80BF13E4(this);
func_80BF15EC(this);
func_8013C964(&this->actor, play, 60.0f, 30.0f, EXCH_ITEM_NONE, this->unk_3D0 & 7);
func_8013C964(&this->actor, play, 60.0f, 30.0f, PLAYER_AP_NONE, this->unk_3D0 & 7);
Actor_MoveWithGravity(&this->actor);
Actor_UpdateBgCheckInfo(play, &this->actor, 30.0f, 12.0f, 0.0f, 4);
func_80BF1354(this, play);

6
src/overlays/actors/ovl_En_In/z_en_in.c
View File

@ -388,7 +388,7 @@ void func_808F3AD4(EnIn* this, PlayState* play) {
this->unk48C = 1;
this->actionFunc = func_808F5A94;
} else {
func_800B85E0(&this->actor, play, 200.0f, EXCH_ITEM_MINUS1);
func_800B85E0(&this->actor, play, 200.0f, PLAYER_AP_MINUS1);
}
}
@ -412,7 +412,7 @@ void func_808F3BD4(EnIn* this, PlayState* play) {
this->unk48C = 1;
this->actionFunc = func_808F5A94;
} else {
func_800B85E0(&this->actor, play, 200.0f, EXCH_ITEM_MINUS1);
func_800B85E0(&this->actor, play, 200.0f, PLAYER_AP_MINUS1);
}
}
@ -436,7 +436,7 @@ void func_808F3CD4(EnIn* this, PlayState* play) {
this->unk48C = 1;
this->actionFunc = func_808F5A94;
} else {
func_800B85E0(&this->actor, play, 200.0f, EXCH_ITEM_MINUS1);
func_800B85E0(&this->actor, play, 200.0f, PLAYER_AP_MINUS1);
}
}

2
src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c
View File

@ -3454,7 +3454,7 @@ void func_80B4AF94(EnInvadepoh* this, PlayState* play) {
func_80151BB4(play, 5);
func_80B4ADB8(this);
} else {
func_800B85E0(&this->actor, play, 2000.0f, EXCH_ITEM_MINUS1);
func_800B85E0(&this->actor, play, 2000.0f, PLAYER_AP_MINUS1);
}
}

2
src/overlays/actors/ovl_En_Ja/z_en_ja.c
View File

@ -385,7 +385,7 @@ void EnJa_Update(Actor* thisx, PlayState* play) {
radius = this->collider.dim.radius + 30;
height = this->collider.dim.height + 10;
func_8013C964(&this->actor, play, radius, height, EXCH_ITEM_NONE, this->unk_340 & 7);
func_8013C964(&this->actor, play, radius, height, PLAYER_AP_NONE, this->unk_340 & 7);
if (this->unk_1D8.unk_00 != 2) {
Actor_MoveWithGravity(&this->actor);

10
src/overlays/actors/ovl_En_Kgy/z_en_kgy.c
View File

@ -586,7 +586,7 @@ void func_80B41CBC(EnKgy* this, PlayState* play) {
this->actionFunc = func_80B41E18;
func_80B411DC(this, play, 4);
} else {
func_800B8500(&this->actor, play, 1000.0f, 1000.0f, EXCH_ITEM_MINUS1);
func_800B8500(&this->actor, play, 1000.0f, 1000.0f, PLAYER_AP_MINUS1);
}
}
@ -595,7 +595,7 @@ void func_80B41D64(EnKgy* this, PlayState* play) {
if (Actor_HasParent(&this->actor, play)) {
this->actionFunc = func_80B41CBC;
this->actor.flags |= ACTOR_FLAG_10000;
func_800B8500(&this->actor, play, 1000.0f, 1000.0f, EXCH_ITEM_MINUS1);
func_800B8500(&this->actor, play, 1000.0f, 1000.0f, PLAYER_AP_MINUS1);
} else {
Actor_PickUp(&this->actor, play, this->unk_2EA, 2000.0f, 1000.0f);
}
@ -744,7 +744,7 @@ void func_80B41E18(EnKgy* this, PlayState* play) {
case 0xC46:
case 0xC55:
func_80123D50(play, GET_PLAYER(play), ITEM_BOTTLE, PLAYER_AP_BOTTLE);
player->exchangeItemId = EXCH_ITEM_NONE;
player->exchangeItemId = PLAYER_AP_NONE;
this->unk_29C &= ~0x8;
play->msgCtx.msgLength = 0;
func_80B41368(this, play, 4);
@ -759,7 +759,7 @@ void func_80B41E18(EnKgy* this, PlayState* play) {
case 0xC47:
func_80B40BC0(this, 1);
if (this->unk_29C & 8) {
player->exchangeItemId = EXCH_ITEM_NONE;
player->exchangeItemId = PLAYER_AP_NONE;
this->unk_29C &= ~8;
}
func_80B40EBC(this, play, textId);
@ -948,7 +948,7 @@ void func_80B4296C(EnKgy* this, PlayState* play) {
this->actor.flags &= ~ACTOR_FLAG_10000;
} else {
this->actor.flags |= ACTOR_FLAG_10000;
func_800B8500(&this->actor, play, 1000.0f, 1000.0f, EXCH_ITEM_NONE);
func_800B8500(&this->actor, play, 1000.0f, 1000.0f, PLAYER_AP_NONE);
}
}

4
src/overlays/actors/ovl_En_Ma4/z_en_ma4.c
View File

@ -828,7 +828,7 @@ void EnMa4_EponasSongCs(EnMa4* this, PlayState* play) {
Player* player = GET_PLAYER(play);
player->stateFlags1 |= 0x20;
func_800B85E0(&this->actor, play, 200.0f, EXCH_ITEM_MINUS1);
func_800B85E0(&this->actor, play, 200.0f, PLAYER_AP_MINUS1);
D_80AC0260 = 99;
this->hasBow = true;
EnMa4_SetupEndEponasSongCs(this);
@ -850,7 +850,7 @@ void EnMa4_EndEponasSongCs(EnMa4* this, PlayState* play) {
this->actor.flags &= ~ACTOR_FLAG_10000;
EnMa4_SetupDialogueHandler(this);
} else {
func_800B85E0(&this->actor, play, 200.0f, EXCH_ITEM_MINUS1);
func_800B85E0(&this->actor, play, 200.0f, PLAYER_AP_MINUS1);
}
}

2
src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.c
View File

@ -1002,7 +1002,7 @@ void EnMaYto_PostMilkRunExplainReward(EnMaYto* this, PlayState* play) {
EnMaYto_SetupPostMilkRunWaitDialogueEnd(this);
}
} else {
func_800B85E0(&this->actor, play, 200.0f, EXCH_ITEM_MINUS1);
func_800B85E0(&this->actor, play, 200.0f, PLAYER_AP_MINUS1);
}
}

4
src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c
View File

@ -475,7 +475,7 @@ void EnMinifrog_EndChoir(EnMinifrog* this, PlayState* play) {
Message_StartTextbox(play, 0xD7E, &this->actor); // "Let us do it again sometime."
this->actionFunc = EnMinifrog_YellowFrogDialog;
} else {
func_800B8500(&this->actor, play, 1000.0f, 1000.0f, EXCH_ITEM_MINUS1);
func_800B8500(&this->actor, play, 1000.0f, 1000.0f, PLAYER_AP_MINUS1);
}
}
@ -486,7 +486,7 @@ void EnMinifrog_GetFrogHP(EnMinifrog* this, PlayState* play) {
this->actor.parent = NULL;
this->actionFunc = EnMinifrog_EndChoir;
this->actor.flags |= ACTOR_FLAG_10000;
func_800B8500(&this->actor, play, 1000.0f, 1000.0f, EXCH_ITEM_NONE);
func_800B8500(&this->actor, play, 1000.0f, 1000.0f, PLAYER_AP_NONE);
} else {
Actor_PickUp(&this->actor, play, GI_HEART_PIECE, 10000.0f, 50.0f);
}

8
src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
View File

@ -1109,7 +1109,7 @@ void EnOssan_SetupItemPurchased(EnOssan* this, PlayState* play) {
this->cutscene = this->lookToShopkeeperCutscene;
ActorCutscene_SetIntentToPlay(this->cutscene);
}
func_800B85E0(&this->actor, play, 400.0f, EXCH_ITEM_MINUS1);
func_800B85E0(&this->actor, play, 400.0f, PLAYER_AP_MINUS1);
}
}
@ -1132,7 +1132,7 @@ void EnOssan_ContinueShopping(EnOssan* this, PlayState* play) {
player->stateFlags2 |= 0x20000000;
Message_StartTextbox(play, this->textId, &this->actor);
EnOssan_SetupStartShopping(play, this, true);
func_800B85E0(&this->actor, play, 100.0f, EXCH_ITEM_MINUS1);
func_800B85E0(&this->actor, play, 100.0f, PLAYER_AP_MINUS1);
break;
case 1:
default:
@ -1150,7 +1150,7 @@ void EnOssan_ContinueShopping(EnOssan* this, PlayState* play) {
player->stateFlags2 |= 0x20000000;
Message_StartTextbox(play, this->textId, &this->actor);
EnOssan_SetupStartShopping(play, this, true);
func_800B85E0(&this->actor, play, 100.0f, EXCH_ITEM_MINUS1);
func_800B85E0(&this->actor, play, 100.0f, PLAYER_AP_MINUS1);
}
}
@ -1174,7 +1174,7 @@ void EnOssan_ItemPurchased(EnOssan* this, PlayState* play) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
func_80151938(play, 0x642);
} else {
func_800B85E0(&this->actor, play, 400.0f, EXCH_ITEM_MINUS1);
func_800B85E0(&this->actor, play, 400.0f, PLAYER_AP_MINUS1);
}
}

10
src/overlays/actors/ovl_En_Owl/z_en_owl.c
View File

@ -229,7 +229,7 @@ s32 func_8095A978(EnOwl* this, PlayState* play, u16 textId, f32 targetDist, f32
this->actor.textId = textId;
if (this->actor.xzDistToPlayer < targetDist) {
this->actor.flags |= ACTOR_FLAG_10000;
func_800B8500(&this->actor, play, targetDist, arg4, EXCH_ITEM_NONE);
func_800B8500(&this->actor, play, targetDist, arg4, PLAYER_AP_NONE);
}
return false;
@ -242,7 +242,7 @@ s32 func_8095A9FC(EnOwl* this, PlayState* play, u16 textId) {
this->actor.textId = textId;
if (this->actor.xzDistToPlayer < 120.0f) {
func_800B8500(&this->actor, play, 350.0f, 1000.0f, EXCH_ITEM_NONE);
func_800B8500(&this->actor, play, 350.0f, 1000.0f, PLAYER_AP_NONE);
}
return false;
@ -505,7 +505,7 @@ void func_8095B574(EnOwl* this, PlayState* play) {
this->unk_406 = 2;
} else if (this->actor.xzDistToPlayer < 200.0f) {
this->actor.flags |= ACTOR_FLAG_10000;
func_800B8500(&this->actor, play, 200.0f, 400.0f, EXCH_ITEM_NONE);
func_800B8500(&this->actor, play, 200.0f, 400.0f, PLAYER_AP_NONE);
} else {
this->actor.flags &= ~ACTOR_FLAG_10000;
}
@ -718,11 +718,11 @@ void func_8095BE0C(EnOwl* this, PlayState* play) {
this->actionFlags |= 0x40;
} else if (this->actor.textId == 0xBF0) {
if (this->actor.isTargeted) {
func_800B8500(&this->actor, play, 200.0f, 200.0f, EXCH_ITEM_NONE);
func_800B8500(&this->actor, play, 200.0f, 200.0f, PLAYER_AP_NONE);
}
} else if (this->actor.xzDistToPlayer < 200.0f) {
this->actor.flags |= ACTOR_FLAG_10000;
func_800B8500(&this->actor, play, 200.0f, 200.0f, EXCH_ITEM_NONE);
func_800B8500(&this->actor, play, 200.0f, 200.0f, PLAYER_AP_NONE);
} else {
this->actor.flags &= ~ACTOR_FLAG_10000;
}

4
src/overlays/actors/ovl_En_Pm/z_en_pm.c
View File

@ -1380,7 +1380,7 @@ s32 func_80AF94AC(EnPm* this, PlayState* play, ScheduleOutput* scheduleOutput) {
if (scheduleOutput->result == 24) {
Flags_UnsetSwitch(play, 0);
Flags_UnsetSwitch(play, 1);
this->unk_394 = EXCH_ITEM_NONE;
this->unk_394 = PLAYER_AP_NONE;
this->unk_368 = 60.0f;
func_80AF7E98(this, 9);
}
@ -1568,7 +1568,7 @@ s32 func_80AF9BF8(EnPm* this, PlayState* play, ScheduleOutput* scheduleOutput) {
this->actor.flags |= ACTOR_FLAG_1;
this->actor.targetMode = 0;
this->unk_394 = EXCH_ITEM_NONE;
this->unk_394 = PLAYER_AP_NONE;
this->unk_356 = 0;
this->unk_368 = 40.0f;

8
src/overlays/actors/ovl_En_Pst/z_en_pst.c
View File

@ -224,7 +224,7 @@ s32 EnPst_ChooseBehaviour(Actor* thisx, PlayState* play) {
}
break;
case POSTBOX_BEHAVIOUR_TAKE_ITEM:
if (this->exchangeItemId == EXCH_ITEM_LETTER_TO_KAFEI) {
if (this->exchangeItemId == PLAYER_AP_LETTER_TO_KAFEI) {
scriptBranch = 1;
}
break;
@ -253,7 +253,7 @@ s32* EnPst_GetMsgEventScript(EnPst* this, PlayState* play) {
return NULL;
}
} else if (this->stateFlags & 0x20) {
if (this->exchangeItemId == EXCH_ITEM_LETTER_MAMA) {
if (this->exchangeItemId == PLAYER_AP_LETTER_MAMA) {
return D_80B2C488;
} else {
return D_80B2C490;
@ -284,10 +284,10 @@ s32 EnPst_CheckTalk(EnPst* this, PlayState* play) {
if (this->stateFlags & 7) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
this->stateFlags &= ~0x30;
if (player->exchangeItemId == EXCH_ITEM_LETTER_TO_KAFEI) {
if (player->exchangeItemId == PLAYER_AP_LETTER_TO_KAFEI) {
this->stateFlags |= 0x10;
this->exchangeItemId = player->exchangeItemId;
} else if (player->exchangeItemId != EXCH_ITEM_NONE) {
} else if (player->exchangeItemId != PLAYER_AP_NONE) {
this->stateFlags |= 0x20;
this->exchangeItemId = player->exchangeItemId;
}

14
src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.c
View File

@ -341,7 +341,7 @@ void func_80ADB544(EnSellnuts* this, PlayState* play) {
Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 3, 0x7D0, 0);
this->actor.world.rot.y = this->actor.shape.rot.y;
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
if (Player_GetExchangeItemId(play) == EXCH_ITEM_MOON_TEAR) {
if (Player_GetExchangeItemId(play) == PLAYER_AP_MOON_TEAR) {
player->actor.textId = D_80ADD928[this->unk_33A];
this->unk_340 = player->actor.textId;
this->actionFunc = func_80ADBAB8;
@ -382,7 +382,7 @@ void func_80ADB544(EnSellnuts* this, PlayState* play) {
} else if (((this->actor.xzDistToPlayer < 80.0f) &&
(((this->actor.playerHeightRel < 50.0f) && (this->actor.playerHeightRel > -50.0f)) ? true : false)) ||
this->actor.isTargeted) {
func_800B85E0(&this->actor, play, 80.0f, EXCH_ITEM_MOON_TEAR);
func_800B85E0(&this->actor, play, 80.0f, PLAYER_AP_MOON_TEAR);
if (player->transformation == PLAYER_FORM_DEKU) {
if (gSaveContext.save.day == 3) {
this->unk_33A = 2;
@ -421,8 +421,8 @@ void func_80ADB924(EnSellnuts* this, PlayState* play) {
if (talkState == TEXT_STATE_16) {
item = func_80123810(play);
if (item > EXCH_ITEM_NONE) {
if (item == EXCH_ITEM_MOON_TEAR) {
if (item > PLAYER_AP_NONE) {
if (item == PLAYER_AP_MOON_TEAR) {
player->actor.textId = D_80ADD928[this->unk_33A];
this->unk_340 = player->actor.textId;
player->exchangeItemId = item;
@ -433,7 +433,7 @@ void func_80ADB924(EnSellnuts* this, PlayState* play) {
this->actionFunc = func_80ADB0D8;
}
func_801477B4(play);
} else if (item < EXCH_ITEM_NONE) {
} else if (item < PLAYER_AP_NONE) {
this->unk_340 = D_80ADD920[this->unk_33A];
func_80151938(play, this->unk_340);
this->actionFunc = func_80ADB0D8;
@ -491,14 +491,14 @@ void func_80ADBC60(EnSellnuts* this, PlayState* play) {
Message_StartTextbox(play, this->unk_340, &this->actor);
this->actionFunc = func_80ADB0D8;
} else {
func_800B85E0(&this->actor, play, 400.0f, EXCH_ITEM_MINUS1);
func_800B85E0(&this->actor, play, 400.0f, PLAYER_AP_MINUS1);
this->unk_340 = D_80ADD930[this->unk_33A];
}
}
void func_80ADBCE4(EnSellnuts* this, PlayState* play) {
if ((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play)) {
func_800B85E0(&this->actor, play, 400.0f, EXCH_ITEM_MINUS1);
func_800B85E0(&this->actor, play, 400.0f, PLAYER_AP_MINUS1);
this->unk_340 = D_80ADD930[this->unk_33A];
this->actionFunc = func_80ADBC60;
}

6
src/overlays/actors/ovl_En_Shn/z_en_shn.c
View File

@ -293,10 +293,10 @@ s32 func_80AE68F0(EnShn* this, PlayState* play) {
if (this->unk_1D8 & 7) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
this->unk_1D8 &= ~0x180;
if (player->exchangeItemId == EXCH_ITEM_PICTO_BOX) {
if (player->exchangeItemId == PLAYER_AP_PICTO_BOX) {
this->unk_1D8 |= 0x80;
this->unk_2E4 = player->exchangeItemId;
} else if (player->exchangeItemId != EXCH_ITEM_NONE) {
} else if (player->exchangeItemId != PLAYER_AP_NONE) {
this->unk_1D8 |= 0x100;
this->unk_2E4 = player->exchangeItemId;
}
@ -382,7 +382,7 @@ void EnShn_Update(Actor* thisx, PlayState* play) {
func_80AE6130(this);
func_80AE63A8(this, play);
this->unk_2E0 = 0;
func_8013C964(&this->actor, play, 120.0f, 40.0f, EXCH_ITEM_NONE, this->unk_1D8 & 7);
func_8013C964(&this->actor, play, 120.0f, 40.0f, PLAYER_AP_NONE, this->unk_1D8 & 7);
}
s32 EnShn_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx) {

6
src/overlays/actors/ovl_En_Sob1/z_en_sob1.c
View File

@ -824,7 +824,7 @@ void EnSob1_ItemPurchased(EnSob1* this, PlayState* play) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
func_80151938(play, 0x647);
} else {
func_800B85E0(&this->actor, play, 400.0f, EXCH_ITEM_MINUS1);
func_800B85E0(&this->actor, play, 400.0f, PLAYER_AP_MINUS1);
}
}
@ -1080,7 +1080,7 @@ void EnSob1_SetupItemPurchased(EnSob1* this, PlayState* play) {
this->cutscene = this->lookToShopkeeperCutscene;
ActorCutscene_SetIntentToPlay(this->cutscene);
}
func_800B85E0(&this->actor, play, 400.0f, EXCH_ITEM_MINUS1);
func_800B85E0(&this->actor, play, 400.0f, PLAYER_AP_MINUS1);
}
}
@ -1096,7 +1096,7 @@ void EnSob1_ContinueShopping(EnSob1* this, PlayState* play) {
player->stateFlags2 |= 0x20000000;
Message_StartTextbox(play, this->welcomeTextId, &this->actor);
EnSob1_SetupStartShopping(play, this, true);
func_800B85E0(&this->actor, play, 200.0f, EXCH_ITEM_MINUS1);
func_800B85E0(&this->actor, play, 200.0f, PLAYER_AP_MINUS1);
}
}

4
src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c
View File

@ -899,7 +899,7 @@ void EnSyatekiMan_Swamp_GiveReward(EnSyatekiMan* this, PlayState* play) {
this->shootingGameState = SG_GAME_STATE_NONE;
this->actionFunc = EnSyatekiMan_Swamp_Talk;
} else {
func_800B85E0(&this->actor, play, 500.0f, EXCH_ITEM_MINUS1);
func_800B85E0(&this->actor, play, 500.0f, PLAYER_AP_MINUS1);
}
}
@ -963,7 +963,7 @@ void EnSyatekiMan_Town_GiveReward(EnSyatekiMan* this, PlayState* play) {
this->shootingGameState = SG_GAME_STATE_NONE;
this->actionFunc = EnSyatekiMan_Town_Talk;
} else {
func_800B85E0(&this->actor, play, 500.0f, EXCH_ITEM_MINUS1);
func_800B85E0(&this->actor, play, 500.0f, PLAYER_AP_MINUS1);
}
}

2
src/overlays/actors/ovl_En_Tab/z_en_tab.c
View File

@ -552,7 +552,7 @@ void EnTab_Update(Actor* thisx, PlayState* play) {
radius = this->collider.dim.radius + this->unk_30C;
height = this->collider.dim.height + 10;
func_8013C964(&this->actor, play, radius, height, EXCH_ITEM_NONE, this->unk_2FC & 7);
func_8013C964(&this->actor, play, radius, height, PLAYER_AP_NONE, this->unk_2FC & 7);
Actor_MoveWithGravity(&this->actor);
Actor_UpdateBgCheckInfo(play, &this->actor, 30.0f, 12.0f, 0.0f, 4);
func_80BE0620(this, play);

4
src/overlays/actors/ovl_En_Tk/z_en_tk.c
View File

@ -486,7 +486,7 @@ s32 func_80AECE60(EnTk* this, PlayState* play) {
}
if (!(this->unk_3CE & 8) && !(this->unk_2CA & 0x10) && (this->actor.xzDistToPlayer < 100.0f)) {
func_8013E8F8(&this->actor, play, 100.0f, 100.0f, EXCH_ITEM_NONE, 0x4000, 0x4000);
func_8013E8F8(&this->actor, play, 100.0f, 100.0f, PLAYER_AP_NONE, 0x4000, 0x4000);
}
return false;
@ -696,7 +696,7 @@ void func_80AED940(EnTk* this, PlayState* play) {
func_80AEDE10(this, play);
} else if (!(this->unk_2CA & 0x80)) {
if (this->actor.xzDistToPlayer < 100.0f) {
func_8013E8F8(&this->actor, play, 100.0f, 100.0f, EXCH_ITEM_NONE, 0x4000, 0x4000);
func_8013E8F8(&this->actor, play, 100.0f, 100.0f, PLAYER_AP_NONE, 0x4000, 0x4000);
}
} else {
func_800B8500(&this->actor, play, this->actor.xzDistToPlayer, this->actor.playerHeightRel, 0);

2
src/overlays/actors/ovl_En_Toto/z_en_toto.c
View File

@ -258,7 +258,7 @@ void func_80BA39C8(EnToto* this, PlayState* play) {
if (this->unk2B6 != 0) {
this->text = D_80BA5044;
this->actor.flags |= ACTOR_FLAG_10000;
func_800B8500(&this->actor, play, 9999.9f, 9999.9f, EXCH_ITEM_NONE);
func_800B8500(&this->actor, play, 9999.9f, 9999.9f, PLAYER_AP_NONE);
} else {
this->actor.flags &= ~ACTOR_FLAG_10000;
func_800B8614(&this->actor, play, 50.0f);

14
src/overlays/actors/ovl_En_Trt/z_en_trt.c
View File

@ -466,7 +466,7 @@ void EnTrt_GivenRedPotionForKoume(EnTrt* this, PlayState* play) {
ActorCutscene_SetIntentToPlay(this->cutscene);
}
}
func_800B85E0(&this->actor, play, 400.0f, EXCH_ITEM_MINUS1);
func_800B85E0(&this->actor, play, 400.0f, PLAYER_AP_MINUS1);
this->actionFunc = EnTrt_ItemGiven;
}
}
@ -1010,7 +1010,7 @@ void EnTrt_ItemGiven(EnTrt* this, PlayState* play) {
}
func_80151938(play, this->textId);
} else {
func_800B85E0(&this->actor, play, 400.0f, EXCH_ITEM_MINUS1);
func_800B85E0(&this->actor, play, 400.0f, PLAYER_AP_MINUS1);
}
}
@ -1083,7 +1083,7 @@ void EnTrt_SetupItemGiven(EnTrt* this, PlayState* play) {
this->cutscene = this->lookToShopkeeperCutscene;
ActorCutscene_SetIntentToPlay(this->cutscene);
}
func_800B85E0(&this->actor, play, 400.0f, EXCH_ITEM_MINUS1);
func_800B85E0(&this->actor, play, 400.0f, PLAYER_AP_MINUS1);
}
}
@ -1106,7 +1106,7 @@ void EnTrt_ContinueShopping(EnTrt* this, PlayState* play) {
player->stateFlags2 |= 0x20000000;
Message_StartTextbox(play, this->textId, &this->actor);
EnTrt_SetupStartShopping(play, this, true);
func_800B85E0(&this->actor, play, 400.0f, EXCH_ITEM_MINUS1);
func_800B85E0(&this->actor, play, 400.0f, PLAYER_AP_MINUS1);
break;
case 1:
default:
@ -1371,8 +1371,8 @@ void EnTrt_TalkToShopkeeper(EnTrt* this, PlayState* play) {
}
} else if (talkState == TEXT_STATE_16) {
itemGiven = func_80123810(play);
if (itemGiven > EXCH_ITEM_NONE) {
if (itemGiven == EXCH_ITEM_1E) {
if (itemGiven > PLAYER_AP_NONE) {
if (itemGiven == PLAYER_AP_BOTTLE_MUSHROOM) {
if (gSaveContext.save.weekEventReg[53] & 8) {
player->actor.textId = 0x888;
} else {
@ -1391,7 +1391,7 @@ void EnTrt_TalkToShopkeeper(EnTrt* this, PlayState* play) {
this->actionFunc = EnTrt_Goodbye;
}
func_801477B4(play);
} else if (itemGiven < EXCH_ITEM_NONE) {
} else if (itemGiven < PLAYER_AP_NONE) {
if (this->flags & ENTRT_GIVEN_MUSHROOM) {
this->textId = 0x88B;
} else {

4
src/overlays/actors/ovl_En_Tru/z_en_tru.c
View File

@ -1128,7 +1128,7 @@ void EnTru_Init(Actor* thisx, PlayState* play) {
if (gSaveContext.save.weekEventReg[16] & 0x10) {
func_80A86924(this, 5);
} else {
this->unk_388 = EXCH_ITEM_NONE;
this->unk_388 = PLAYER_AP_NONE;
}
this->actionFunc = func_80A87FD0;
@ -1154,7 +1154,7 @@ void EnTru_Update(Actor* thisx, PlayState* play) {
func_80A86DB8(this);
radius = this->collider.dim.worldSphere.radius + 30;
this->unk_388 = !(this->unk_34E & 0x80) ? EXCH_ITEM_NONE : EXCH_ITEM_NONE;
this->unk_388 = !(this->unk_34E & 0x80) ? PLAYER_AP_NONE : PLAYER_AP_NONE;
func_8013C964(&this->actor, play, radius, 20.0f, this->unk_388, this->unk_34E & 7);
func_80A8697C(this, play);

6
src/overlays/actors/ovl_En_Zot/z_en_zot.c
View File

@ -516,7 +516,7 @@ void func_80B975F8(EnZot* this, PlayState* play) {
if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
this->actionFunc = func_80B973BC;
} else {
func_800B8500(&this->actor, play, 10000.0f, 1000.0f, EXCH_ITEM_NONE);
func_800B8500(&this->actor, play, 10000.0f, 1000.0f, PLAYER_AP_NONE);
}
}
@ -931,7 +931,7 @@ void func_80B9849C(EnZot* this, PlayState* play) {
}
this->actionFunc = func_80B98728;
} else {
func_800B8500(&this->actor, play, 1000.0f, 1000.0f, EXCH_ITEM_MINUS1);
func_800B8500(&this->actor, play, 1000.0f, 1000.0f, PLAYER_AP_MINUS1);
}
}
@ -941,7 +941,7 @@ void func_80B9854C(EnZot* this, PlayState* play) {
this->actor.parent = NULL;
this->actionFunc = func_80B9849C;
this->actor.flags |= ACTOR_FLAG_10000;
func_800B8500(&this->actor, play, 1000.0f, 1000.0f, EXCH_ITEM_MINUS1);
func_800B8500(&this->actor, play, 1000.0f, 1000.0f, PLAYER_AP_MINUS1);
} else {
Actor_PickUp(&this->actor, play, this->unk_2D4, 10000.0f, 50.0f);
}

2
src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c
View File

@ -545,7 +545,7 @@ void func_80937FC8(ObjBean* this, PlayState* play) {
this->unk_1E8(this);
if (Actor_ProcessTalkRequest(&this->dyna.actor, &play->state)) {
if (Player_GetExchangeItemId(play) == EXCH_ITEM_2E) {
if (Player_GetExchangeItemId(play) == PLAYER_AP_MAGIC_BEANS) {
func_809383B4(this);
Flags_SetSwitch(play, OBJBEAN_GET_3F80(&this->dyna.actor, 0));
}

16
tools/namefixer.py
View File

@ -728,6 +728,22 @@ wordReplace = {
"ICHAIN_F32_DIV1000(minVelocityY,": "ICHAIN_F32_DIV1000(terminalVelocity,",
"ICHAIN_F32(minVelocityY,": "ICHAIN_F32(terminalVelocity,",
"EXCH_ITEM_MINUS1": "PLAYER_AP_MINUS1",
"EXCH_ITEM_NONE": "PLAYER_AP_NONE",
"EXCH_ITEM_PICTO_BOX": "PLAYER_AP_PICTO_BOX",
"EXCH_ITEM_1E": "PLAYER_AP_BOTTLE_MUSHROOM",
"EXCH_ITEM_MOON_TEAR": "PLAYER_AP_MOON_TEAR",
"EXCH_ITEM_DEED_LAND": "PLAYER_AP_DEED_LAND",
"EXCH_ITEM_ROOM_KEY": "PLAYER_AP_ROOM_KEY",
"EXCH_ITEM_LETTER_TO_KAFEI": "PLAYER_AP_LETTER_TO_KAFEI",
"EXCH_ITEM_2E": "PLAYER_AP_MAGIC_BEANS",
"EXCH_ITEM_DEED_SWAMP": "PLAYER_AP_DEED_SWAMP",
"EXCH_ITEM_DEED_MOUNTAIN": "PLAYER_AP_DEED_MOUNTAIN",
"EXCH_ITEM_DEED_OCEAN": "PLAYER_AP_DEED_OCEAN",
"EXCH_ITEM_LETTER_MAMA": "PLAYER_AP_LETTER_MAMA",
"ITEM_FISHING_POLE": "ITEM_FISHING_ROD",
"PLAYER_AP_FISHING_POLE": "PLAYER_AP_FISHING_ROD",
# Example of custom behaviour:
# "PLAYER": ("GET_PLAYER(play)", {"ignore": (-1, '"PLAYER"')}), # ignore "PLAYER" in sSoundBankNames
}