mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-02-07 02:40:30 -05:00
Code Issues Projects Releases Wiki Activity

pull in docs (#97)

Browse Source 
* rename `func_8002DF54` to `Player_SetCsActionWithHaltedActors`
* rename `func_8002F434` to `Actor_OfferGetItem`
This commit is contained in:
briaguya 2024-04-03 21:07:42 -04:00 committed by GitHub
parent 416ed84bc6
commit 0334c4e354
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
92 changed files with 359 additions and 360 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
soh/include/functions.h
View File

@ -429,7 +429,7 @@ void Actor_MountHorse(PlayState* play, Player* player, Actor* horse);
s32 func_8002DEEC(Player* player);
void func_8002DF18(PlayState* play, Player* player);
s32 func_8002DF38(PlayState* play, Actor* actor, u8 csMode);
s32 func_8002DF54(PlayState* play, Actor* actor, u8 arg2);
s32 Player_SetCsActionWithHaltedActors(PlayState* play, Actor* actor, u8 arg2);
void func_8002DF90(DynaPolyActor* dynaActor);
void func_8002DFA4(DynaPolyActor* dynaActor, f32 arg1, s16 arg2);
s32 Player_IsFacingActor(Actor* actor, s16 angle, PlayState* play);
@ -457,11 +457,11 @@ u32 Actor_TextboxIsClosing(Actor* actor, PlayState* play);
s8 func_8002F368(PlayState* play);
void Actor_GetScreenPos(PlayState* play, Actor* actor, s16* x, s16* y);
u32 Actor_HasParent(Actor* actor, PlayState* play);
// TODO: Rename the follwing 3 functions using whatever scheme we use when we rename func_8002F434 and func_8002F554.
// TODO: Rename the follwing 3 functions using whatever scheme we use when we rename Actor_OfferGetItem and func_8002F554.
s32 GiveItemEntryWithoutActor(PlayState* play, GetItemEntry getItemEntry);
s32 GiveItemEntryFromActor(Actor* actor, PlayState* play, GetItemEntry getItemEntry, f32 xzRange, f32 yRange);
s32 GiveItemEntryFromActorWithFixedRange(Actor* actor, PlayState* play, GetItemEntry getItemEntry);
s32 func_8002F434(Actor* actor, PlayState* play, s32 getItemId, f32 xzRange, f32 yRange);
s32 Actor_OfferGetItem(Actor* actor, PlayState* play, s32 getItemId, f32 xzRange, f32 yRange);
void func_8002F554(Actor* actor, PlayState* play, s32 getItemId);
void func_8002F580(Actor* actor, PlayState* play);
u32 Actor_HasNoParent(Actor* actor, PlayState* play);

2
soh/soh/Enhancements/timesaver_hook_handlers.cpp
View File

@ -464,7 +464,7 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
gPlayState->transitionType = TRANS_TYPE_FADE_WHITE;
gPlayState->transitionTrigger = TRANS_TRIGGER_START;
gSaveContext.nextTransitionType = 2;
func_8002DF54(gPlayState, &player->actor, 8);
Player_SetCsActionWithHaltedActors(gPlayState, &player->actor, 8);
}
}
});

7
soh/src/code/z_actor.c
View File

@ -1462,7 +1462,7 @@ s32 func_8002DF38(PlayState* play, Actor* actor, u8 csAction) {
return true;
}
s32 func_8002DF54(PlayState* play, Actor* actor, u8 csAction) {
s32 Player_SetCsActionWithHaltedActors(PlayState* play, Actor* actor, u8 csAction) {
Player* player = GET_PLAYER(play);
func_8002DF38(play, actor, csAction);
@ -2084,9 +2084,8 @@ s32 GiveItemEntryFromActorWithFixedRange(Actor* actor, PlayState* play, GetItemE
return GiveItemEntryFromActor(actor, play, getItemEntry, 50.0f, 10.0f);
}
// TODO: Rename to GiveItemIdFromActor or similar
// If you're doing something for randomizer, you're probably looking for GiveItemEntryFromActor
s32 func_8002F434(Actor* actor, PlayState* play, s32 getItemId, f32 xzRange, f32 yRange) {
s32 Actor_OfferGetItem(Actor* actor, PlayState* play, s32 getItemId, f32 xzRange, f32 yRange) {
Player* player = GET_PLAYER(play);
if (!(player->stateFlags1 &
@ -2116,7 +2115,7 @@ s32 func_8002F434(Actor* actor, PlayState* play, s32 getItemId, f32 xzRange, f32
// 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) {
func_8002F434(actor, play, getItemId, 50.0f, 10.0f);
Actor_OfferGetItem(actor, play, getItemId, 50.0f, 10.0f);
}
void func_8002F580(Actor* actor, PlayState* play) {

12
soh/src/code/z_camera.c
View File

@ -6184,14 +6184,14 @@ s32 Camera_Demo5(Camera* camera) {
pad = camera->play->state.frames - sDemo5PrevAction12Frame;
if (player->stateFlags1 & PLAYER_STATE1_ITEM_OVER_HEAD) {
// holding object over head.
func_8002DF54(camera->play, camera->target, 8);
Player_SetCsActionWithHaltedActors(camera->play, camera->target, 8);
} else if (ABS(pad) > 3000) {
func_8002DF54(camera->play, camera->target, 12);
Player_SetCsActionWithHaltedActors(camera->play, camera->target, 12);
} else {
func_8002DF54(camera->play, camera->target, 69);
Player_SetCsActionWithHaltedActors(camera->play, camera->target, 69);
}
} else {
func_8002DF54(camera->play, camera->target, 1);
Player_SetCsActionWithHaltedActors(camera->play, camera->target, 1);
}
}
@ -6250,7 +6250,7 @@ s32 Camera_Demo6(Camera* camera) {
camera->animState++;
case 1:
if (stateTimers[camera->animState] < anim->animTimer) {
func_8002DF54(camera->play, &camera->player->actor, 8);
Player_SetCsActionWithHaltedActors(camera->play, &camera->player->actor, 8);
Actor_GetWorld(&focusPosRot, camFocus);
anim->atTarget.x = focusPosRot.pos.x;
anim->atTarget.y = focusPosRot.pos.y - 20.0f;
@ -7735,7 +7735,7 @@ void Camera_Finish(Camera* camera) {
player->stateFlags1 &= ~PLAYER_STATE1_IN_CUTSCENE;
if (player->csAction != 0) {
func_8002DF54(camera->play, &player->actor, 7);
Player_SetCsActionWithHaltedActors(camera->play, &player->actor, 7);
osSyncPrintf("camera: player demo end!!\n");
}

2
soh/src/code/z_en_item00.c
View File

@ -732,7 +732,7 @@ void func_8001E5C8(EnItem00* this, PlayState* play) {
Player* player = GET_PLAYER(play);
if (this->getItemId != GI_NONE) {
if (!Actor_HasParent(&this->actor, play)) {
func_8002F434(&this->actor, play, this->getItemId, 50.0f, 80.0f);
Actor_OfferGetItem(&this->actor, play, this->getItemId, 50.0f, 80.0f);
this->unk_15A++;
} else {
this->getItemId = GI_NONE;

66
soh/src/code/z_onepointdemo.c
View File

@ -268,7 +268,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor
case 2290: {
Actor* rideActor = player->rideActor;
func_8002DF54(play, NULL, 8);
Player_SetCsActionWithHaltedActors(play, NULL, 8);
if (rideActor != NULL) {
rideActor->freezeTimer = 180;
}
@ -279,7 +279,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor
func_800C0808(play, camIdx, player, CAM_SET_CS_C);
} break;
case 5120:
func_8002DF54(play, NULL, 8);
Player_SetCsActionWithHaltedActors(play, NULL, 8);
csInfo->keyFrames = D_80121314;
csInfo->keyFrameCnt = 1;
@ -289,7 +289,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor
case 4510:
D_8012133C[0].eyeTargetInit = actor->world.pos;
D_8012133C[0].eyeTargetInit.y = player->actor.world.pos.y + 40.0f;
func_8002DF54(play, NULL, 8);
Player_SetCsActionWithHaltedActors(play, NULL, 8);
csInfo->keyFrames = D_8012133C;
csInfo->keyFrameCnt = 3;
@ -307,7 +307,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor
OnePointCutscene_AddVecSphToVec3f(&spB4, &spC0, &spD0);
Play_CameraChangeSetting(play, camIdx, CAM_SET_FREE2);
Play_CameraSetAtEye(play, camIdx, &spC0, &spB4);
func_8002DF54(play, NULL, 8);
Player_SetCsActionWithHaltedActors(play, NULL, 8);
csCam->roll = 0;
csCam->fov = 50.0f;
if (csCam->childCamIdx != SUBCAM_FREE) {
@ -321,7 +321,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor
if (Rand_ZeroOne() < 0.0f) {
D_801213B4[3].eyeTargetInit.x = -D_801213B4[3].eyeTargetInit.x;
}
func_8002DF54(play, NULL, 8);
Player_SetCsActionWithHaltedActors(play, NULL, 8);
csInfo->keyFrames = D_801213B4;
csInfo->keyFrameCnt = 5;
@ -374,10 +374,10 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor
Play_CameraSetAtEye(play, camIdx, &spC0, &spB4);
csCam->roll = 6;
csCam->fov = 75.0f;
func_8002DF54(play, NULL, 8);
Player_SetCsActionWithHaltedActors(play, NULL, 8);
break;
case 3040:
func_8002DF54(play, NULL, 8);
Player_SetCsActionWithHaltedActors(play, NULL, 8);
D_8012151C[0].timerInit = timer - 1;
csInfo->keyFrames = D_8012151C;
@ -401,7 +401,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor
csInfo->keyFrameCnt = 2;
func_800C0808(play, camIdx, player, CAM_SET_CS_C);
func_8002DF54(play, NULL, 8);
Player_SetCsActionWithHaltedActors(play, NULL, 8);
break;
case 3010:
D_801215BC[0].timerInit = timer;
@ -429,7 +429,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor
func_800C0808(play, camIdx, player, CAM_SET_CS_C);
break;
case 3090:
func_8002DF54(play, NULL, 8);
Player_SetCsActionWithHaltedActors(play, NULL, 8);
csInfo->keyFrames = D_80121814;
csInfo->keyFrameCnt = 4;
@ -445,14 +445,14 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor
Play_CameraSetAtEye(play, camIdx, &spC0, &spB4);
csCam->roll = 0;
csCam->fov = 70.0f;
func_8002DF54(play, NULL, 8);
Player_SetCsActionWithHaltedActors(play, NULL, 8);
break;
case 3380:
case 3065:
csInfo->keyFrames = D_801218B4;
csInfo->keyFrameCnt = 2;
func_8002DF54(play, NULL, 8);
Player_SetCsActionWithHaltedActors(play, NULL, 8);
func_800C0808(play, camIdx, player, CAM_SET_CS_C);
i = Quake_Add(csCam, 1);
@ -464,12 +464,12 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor
csInfo->keyFrames = D_80121904;
csInfo->keyFrameCnt = 2;
func_8002DF54(play, NULL, 8);
Player_SetCsActionWithHaltedActors(play, NULL, 8);
func_800C0808(play, camIdx, player, CAM_SET_CS_C);
break;
case 3050:
Play_CameraChangeSetting(play, camIdx, CAM_SET_CS_3);
func_8002DF54(play, &player->actor, 5);
Player_SetCsActionWithHaltedActors(play, &player->actor, 5);
OnePointCutscene_SetCsCamPoints(csCam, D_80120304 | 0x2000, D_80120300, D_8012013C, D_8012021C);
func_80078884(NA_SE_SY_CORRECT_CHIME);
OnePointCutscene_Vec3sToVec3f(&mainCam->at, &D_8012013C[D_801202FC - 2].pos);
@ -498,14 +498,14 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor
csCam->unk_14C |= 2;
csInfo->keyFrameCnt = 2;
func_8002DF54(play, NULL, 8);
Player_SetCsActionWithHaltedActors(play, NULL, 8);
func_800C0808(play, camIdx, player, CAM_SET_CS_C);
break;
case 3130:
csInfo->keyFrames = D_80121A44;
csInfo->keyFrameCnt = 12;
func_8002DF54(play, NULL, 8);
Player_SetCsActionWithHaltedActors(play, NULL, 8);
func_800C0808(play, camIdx, player, CAM_SET_CS_C);
csCam->unk_14C |= 2;
break;
@ -636,7 +636,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor
csCam->roll = 0;
csCam->fov = 75.0f;
player->actor.shape.rot.y = player->actor.world.rot.y = player->yaw = spD0.yaw + 0x7FFF;
func_8002DF54(play, NULL, 8);
Player_SetCsActionWithHaltedActors(play, NULL, 8);
break;
case 3240:
D_80121D3C[2].timerInit = timer - 5;
@ -644,12 +644,12 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor
csInfo->keyFrames = D_80121D3C;
csInfo->keyFrameCnt = 3;
func_8002DF54(play, NULL, 8);
Player_SetCsActionWithHaltedActors(play, NULL, 8);
func_800C0808(play, camIdx, player, CAM_SET_CS_C);
break;
case 6001:
Play_CameraChangeSetting(play, camIdx, CAM_SET_CS_3);
func_8002DF54(play, NULL, 8);
Player_SetCsActionWithHaltedActors(play, NULL, 8);
Actor_GetWorld(&spA0, actor);
if (spA0.pos.z > -750.0f) {
OnePointCutscene_SetCsCamPoints(csCam, D_801208E8, D_801208E4, D_801206A0, D_80120820);
@ -680,12 +680,12 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor
csInfo->keyFrames = D_80121DB4;
csInfo->keyFrameCnt = 9;
func_8002DF54(play, NULL, 8);
Player_SetCsActionWithHaltedActors(play, NULL, 8);
func_800C0808(play, camIdx, player, CAM_SET_CS_C);
break;
case 3310:
Play_CameraChangeSetting(play, camIdx, CAM_SET_FIRE_STAIRCASE);
func_8002DF54(play, NULL, 8);
Player_SetCsActionWithHaltedActors(play, NULL, 8);
Play_CopyCamera(play, camIdx, MAIN_CAM);
i = Quake_Add(csCam, 1);
@ -718,7 +718,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor
csInfo->keyFrames = D_80121FBC;
csInfo->keyFrameCnt = 4;
func_8002DF54(play, NULL, 8);
Player_SetCsActionWithHaltedActors(play, NULL, 8);
func_800C0808(play, camIdx, player, CAM_SET_CS_C);
i = Quake_Add(csCam, 3);
@ -745,7 +745,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor
D_801220D4[1].eyeTargetInit.y = 80.0f;
D_801220D4[1].eyeTargetInit.x = -D_801220D4[1].eyeTargetInit.x;
}
func_8002DF54(play, NULL, 8);
Player_SetCsActionWithHaltedActors(play, NULL, 8);
csInfo->keyFrames = D_801220D4;
csInfo->keyFrameCnt = 5;
@ -763,7 +763,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor
csInfo->keyFrames = D_801222B4;
csInfo->keyFrameCnt = 5;
func_8002DF54(play, NULL, 8);
Player_SetCsActionWithHaltedActors(play, NULL, 8);
func_800C0808(play, camIdx, player, CAM_SET_CS_C);
i = Quake_Add(csCam, 1);
@ -787,7 +787,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor
csInfo->keyFrames = D_801223CC;
csInfo->keyFrameCnt = 6;
func_8002DF54(play, NULL, 8);
Player_SetCsActionWithHaltedActors(play, NULL, 8);
func_800C0808(play, camIdx, player, CAM_SET_CS_C);
player->stateFlags1 |= PLAYER_STATE1_IN_CUTSCENE;
player->actor.freezeTimer = 90;
@ -801,7 +801,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor
csInfo->keyFrames = D_801224BC;
csInfo->keyFrameCnt = 7;
func_8002DF54(play, NULL, 8);
Player_SetCsActionWithHaltedActors(play, NULL, 8);
func_800C0808(play, camIdx, player, CAM_SET_CS_C);
i = Quake_Add(csCam, 1);
@ -815,7 +815,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor
player->actor.shape.rot.y = player->actor.world.rot.y = player->yaw = 0x3FFC;
func_800C0808(play, camIdx, player, CAM_SET_CS_C);
func_8002DF54(play, NULL, 8);
Player_SetCsActionWithHaltedActors(play, NULL, 8);
break;
case 4110:
csInfo->keyFrames = D_8012269C;
@ -825,7 +825,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor
func_800C0808(play, camIdx, player, CAM_SET_CS_C);
break;
case 4120:
func_8002DF54(play, NULL, 8);
Player_SetCsActionWithHaltedActors(play, NULL, 8);
D_80122714[1].timerInit = 80;
csInfo->keyFrames = D_80122714;
csInfo->keyFrameCnt = 4;
@ -843,7 +843,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor
csInfo->keyFrames = D_801228A4;
csInfo->keyFrameCnt = 5;
func_8002DF54(play, NULL, 8);
Player_SetCsActionWithHaltedActors(play, NULL, 8);
Camera_ChangeMode(mainCam, CAM_MODE_NORMAL);
func_800C0808(play, camIdx, player, CAM_SET_CS_C);
break;
@ -851,7 +851,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor
csInfo->keyFrames = D_8012296C;
csInfo->keyFrameCnt = 4;
func_8002DF54(play, NULL, 8);
Player_SetCsActionWithHaltedActors(play, NULL, 8);
Camera_ChangeMode(mainCam, CAM_MODE_NORMAL);
func_800C0808(play, camIdx, player, CAM_SET_CS_C);
break;
@ -859,7 +859,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor
csInfo->keyFrames = D_80122A0C;
csInfo->keyFrameCnt = 2;
func_8002DF54(play, NULL, 8);
Player_SetCsActionWithHaltedActors(play, NULL, 8);
Camera_ChangeMode(mainCam, CAM_MODE_NORMAL);
func_800C0808(play, camIdx, player, CAM_SET_CS_C);
break;
@ -908,11 +908,11 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor
csInfo->keyFrames = D_80122C8C;
csInfo->keyFrameCnt = 1;
func_8002DF54(play, NULL, 8);
Player_SetCsActionWithHaltedActors(play, NULL, 8);
func_800C0808(play, camIdx, player, CAM_SET_CS_C);
break;
case 3260:
func_8002DF54(play, NULL, 8);
Player_SetCsActionWithHaltedActors(play, NULL, 8);
D_80122CB4[1].timerInit = timer - 5;
csInfo->keyFrames = D_80122CB4;
@ -921,7 +921,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor
func_800C0808(play, camIdx, player, CAM_SET_CS_C);
break;
case 3261:
func_8002DF54(play, NULL, 8);
Player_SetCsActionWithHaltedActors(play, NULL, 8);
D_80122D04[1].timerInit = timer - 10;
csInfo->keyFrames = D_80122D04;

2
soh/src/code/z_parameter.c
View File

@ -6159,7 +6159,7 @@ void Interface_Draw(PlayState* play) {
gSaveContext.timer2State = 5;
gSaveContext.cutsceneIndex = 0;
Message_StartTextbox(play, 0x71B0, NULL);
func_8002DF54(play, NULL, 8);
Player_SetCsActionWithHaltedActors(play, NULL, 8);
} else {
D_8015FFE6 = 40;
gSaveContext.timer2State = 6;

2
soh/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c
View File

@ -305,7 +305,7 @@ void BgBreakwall_Wait(BgBreakwall* this, PlayState* play) {
if (GameInteractor_Should(GI_VB_PLAY_ENTRANCE_CS, true, &flag)) {
Cutscene_SetSegment(play, gDcOpeningCs);
gSaveContext.cutsceneTrigger = 1;
func_8002DF54(play, NULL, 0x31);
Player_SetCsActionWithHaltedActors(play, NULL, 0x31);
}
Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
}

18
soh/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c
View File

@ -203,7 +203,7 @@ void BgDyYoseizo_CheckMagicAcquired(BgDyYoseizo* this, PlayState* play) {
return;
}
func_8002DF54(play, &this->actor, 1);
Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
this->actionFunc = BgDyYoseizo_ChooseType;
}
}
@ -211,7 +211,7 @@ void BgDyYoseizo_CheckMagicAcquired(BgDyYoseizo* this, PlayState* play) {
void BgDyYoseizo_ChooseType(BgDyYoseizo* this, PlayState* play) {
s32 givingReward;
func_8002DF54(play, &this->actor, 1);
Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
// "Mode"
osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ もうど ☆☆☆☆☆ %d\n" VT_RST, play->msgCtx.ocarinaMode);
givingReward = false;
@ -327,12 +327,12 @@ void BgDyYoseizo_SetupSpinGrow_NoReward(BgDyYoseizo* this, PlayState* play) {
}
Audio_PlayActorSound2(&this->actor, NA_SE_VO_FR_LAUGH_0);
func_8002DF54(play, &this->actor, 1);
Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
this->actionFunc = BgDyYoseizo_SpinGrow_NoReward;
}
void BgDyYoseizo_SpinGrow_NoReward(BgDyYoseizo* this, PlayState* play) {
func_8002DF54(play, &this->actor, 1);
Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
Math_ApproachF(&this->actor.world.pos.y, this->grownHeight, this->heightFraction, 100.0f);
Math_ApproachF(&this->scale, 0.035f, this->scaleFraction, 0.005f);
Math_ApproachF(&this->heightFraction, 0.8f, 0.1f, 0.02f);
@ -358,7 +358,7 @@ void BgDyYoseizo_SpinGrow_NoReward(BgDyYoseizo* this, PlayState* play) {
void BgDyYoseizo_CompleteSpinGrow_NoReward(BgDyYoseizo* this, PlayState* play) {
f32 curFrame = this->skelAnime.curFrame;
func_8002DF54(play, &this->actor, 1);
Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
if ((this->frameCount * 1273.0f) <= this->bobTimer) {
this->bobTimer = 0.0f;
@ -372,7 +372,7 @@ void BgDyYoseizo_CompleteSpinGrow_NoReward(BgDyYoseizo* this, PlayState* play) {
}
void BgDyYoseizo_SetupGreetPlayer_NoReward(BgDyYoseizo* this, PlayState* play) {
func_8002DF54(play, &this->actor, 1);
Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
if (play->sceneNum == SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC) {
this->frameCount = Animation_GetLastFrame(&gGreatFairySittingAnim);
@ -392,7 +392,7 @@ void BgDyYoseizo_SetupGreetPlayer_NoReward(BgDyYoseizo* this, PlayState* play) {
}
void BgDyYoseizo_GreetPlayer_NoReward(BgDyYoseizo* this, PlayState* play) {
func_8002DF54(play, &this->actor, 1);
Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
this->bobTimer = this->skelAnime.curFrame * 1273.0f;
if ((this->frameCount * 1273.0f) <= this->bobTimer) {
@ -560,7 +560,7 @@ void BgDyYoseizo_Vanish(BgDyYoseizo* this, PlayState* play) {
Actor* findOcarinaSpot;
if (this->vanishTimer == 0) {
func_8002DF54(play, &this->actor, 7);
Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
play->envCtx.unk_BF = 0;
findOcarinaSpot = play->actorCtx.actorLists[ACTORCAT_PROP].head;
@ -582,7 +582,7 @@ void BgDyYoseizo_SetupSpinGrow_Reward(BgDyYoseizo* this, PlayState* play) {
if (play->csCtx.state != CS_STATE_IDLE) {
if ((play->csCtx.npcActions[0] != NULL) && (play->csCtx.npcActions[0]->action == 2)) {
this->actor.draw = BgDyYoseizo_Draw;
func_8002DF54(play, &this->actor, 1);
Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
this->finishedSpinGrow = false;
if (play->sceneNum == SCENE_GREAT_FAIRYS_FOUNTAIN_MAGIC) {

8
soh/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c
View File

@ -241,7 +241,7 @@ void BgGndIceblock_Idle(BgGndIceblock* this, PlayState* play) {
if (this->dyna.unk_150 > 0.0f) {
BgGndIceblock_SetNextPosition(this);
if (Actor_WorldDistXZToPoint(&this->dyna.actor, &this->targetPos) > 1.0f) {
func_8002DF54(play, &this->dyna.actor, 8);
Player_SetCsActionWithHaltedActors(play, &this->dyna.actor, 8);
this->actionFunc = BgGndIceblock_Slide;
}
}
@ -282,7 +282,7 @@ void BgGndIceblock_Fall(BgGndIceblock* this, PlayState* play) {
thisx->world.pos.y = thisx->home.pos.y - 100.0f;
thisx->world.pos.z = thisx->home.pos.z;
if (Player_InCsMode(play)) {
func_8002DF54(play, thisx, 7);
Player_SetCsActionWithHaltedActors(play, thisx, 7);
}
this->actionFunc = BgGndIceblock_Reset;
}
@ -295,7 +295,7 @@ void BgGndIceblock_Hole(BgGndIceblock* this, PlayState* play) {
if (Math_StepToF(&thisx->world.pos.y, thisx->home.pos.y - 100.0f, thisx->velocity.y)) {
thisx->velocity.y = 0.0f;
if (Player_InCsMode(play)) {
func_8002DF54(play, thisx, 7);
Player_SetCsActionWithHaltedActors(play, thisx, 7);
}
this->actionFunc = BgGndIceblock_Idle;
}
@ -319,7 +319,7 @@ void BgGndIceblock_Slide(BgGndIceblock* this, PlayState* play) {
switch (BgGndIceblock_NextAction(this)) {
case GNDICE_IDLE:
this->actionFunc = BgGndIceblock_Idle;
func_8002DF54(play, thisx, 7);
Player_SetCsActionWithHaltedActors(play, thisx, 7);
break;
case GNDICE_FALL:
this->actionFunc = BgGndIceblock_Fall;

2
soh/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c
View File

@ -370,7 +370,7 @@ void BgHeavyBlock_LiftedUp(BgHeavyBlock* this, PlayState* play) {
this->timer++;
if (!CVarGetInteger("gFasterHeavyBlockLift", 0)) {
func_8002DF54(play, &player->actor, 8);
Player_SetCsActionWithHaltedActors(play, &player->actor, 8);
}
// if parent is NULL, link threw it

4
soh/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c
View File

@ -138,7 +138,7 @@ void BgHidanDalm_Wait(BgHidanDalm* this, PlayState* play) {
this->dyna.actor.world.pos.x += 32.5f * Math_SinS(this->dyna.actor.world.rot.y);
this->dyna.actor.world.pos.z += 32.5f * Math_CosS(this->dyna.actor.world.rot.y);
func_8002DF54(play, &this->dyna.actor, 8);
Player_SetCsActionWithHaltedActors(play, &this->dyna.actor, 8);
this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_WHILE_CULLED;
this->actionFunc = BgHidanDalm_Shrink;
this->dyna.actor.bgCheckFlags &= ~2;
@ -159,7 +159,7 @@ void BgHidanDalm_Shrink(BgHidanDalm* this, PlayState* play) {
Vec3f pos;
if (Math_StepToF(&this->dyna.actor.scale.x, 0.0f, 0.004f)) {
func_8002DF54(play, &this->dyna.actor, 7);
Player_SetCsActionWithHaltedActors(play, &this->dyna.actor, 7);
Actor_Kill(&this->dyna.actor);
}

6
soh/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c
View File

@ -126,7 +126,7 @@ void BgIceObjects_CheckPits(BgIceObjects* this, PlayState* play) {
thisx->world.pos.y = thisx->home.pos.y - 60.0f;
thisx->world.pos.z = thisx->home.pos.z;
if (thisx->params != 0) {
func_8002DF54(play, thisx, 7);
Player_SetCsActionWithHaltedActors(play, thisx, 7);
}
this->actionFunc = BgIceObjects_Reset;
}
@ -143,7 +143,7 @@ void BgIceObjects_Idle(BgIceObjects* this, PlayState* play) {
BgIceObjects_SetNextTarget(this, play);
if (Actor_WorldDistXZToPoint(thisx, &this->targetPos) > 1.0f) {
thisx->flags |= ACTOR_FLAG_UPDATE_WHILE_CULLED;
func_8002DF54(play, thisx, 8);
Player_SetCsActionWithHaltedActors(play, thisx, 8);
thisx->params = 1;
this->actionFunc = BgIceObjects_Slide;
}
@ -173,7 +173,7 @@ void BgIceObjects_Slide(BgIceObjects* this, PlayState* play) {
thisx->flags &= ~ACTOR_FLAG_UPDATE_WHILE_CULLED;
}
thisx->params = 0;
func_8002DF54(play, thisx, 7);
Player_SetCsActionWithHaltedActors(play, thisx, 7);
Audio_PlayActorSound2(thisx, NA_SE_EV_BLOCK_BOUND);
if ((fabsf(thisx->world.pos.x + 1387.0f) < 1.0f) && (fabsf(thisx->world.pos.z + 260.0f) < 1.0f)) {
this->actionFunc = BgIceObjects_Stuck;

4
soh/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c
View File

@ -96,7 +96,7 @@ void BgMoriKaitenkabe_Wait(BgMoriKaitenkabe* this, PlayState* play) {
this->timer++;
if ((this->timer > (28 - CVarGetInteger("gFasterBlockPush", 0) * 4)) && !Player_InCsMode(play)) {
BgMoriKaitenkabe_SetupRotate(this);
func_8002DF54(play, &this->dyna.actor, 8);
Player_SetCsActionWithHaltedActors(play, &this->dyna.actor, 8);
Math_Vec3f_Copy(&this->lockedPlayerPos, &player->actor.world.pos);
push.x = Math_SinS(this->dyna.unk_158);
push.y = 0.0f;
@ -130,7 +130,7 @@ void BgMoriKaitenkabe_Rotate(BgMoriKaitenkabe* this, PlayState* play) {
Math_StepToF(&this->rotSpeed, 0.6f, 0.02f);
if (Math_StepToF(&this->rotYdeg, this->rotDirection * 45.0f, this->rotSpeed)) {
BgMoriKaitenkabe_SetupWait(this);
func_8002DF54(play, thisx, 7);
Player_SetCsActionWithHaltedActors(play, thisx, 7);
if (this->rotDirection > 0.0f) {
thisx->home.rot.y += 0x2000;
} else {

4
soh/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c
View File

@ -321,7 +321,7 @@ void BgPoEvent_BlockFall(BgPoEvent* this, PlayState* play) {
if (firstFall == 0) {
firstFall = 1;
} else {
func_8002DF54(play, &GET_PLAYER(play)->actor, 7);
Player_SetCsActionWithHaltedActors(play, &GET_PLAYER(play)->actor, 7);
}
}
this->direction = 0;
@ -358,7 +358,7 @@ void BgPoEvent_BlockIdle(BgPoEvent* this, PlayState* play) {
if (sBgPoEventPuzzleState == 0x10) {
sBgPoEventPuzzleState = 0x40;
Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_BLOCK_RISING);
func_8002DF54(play, &player->actor, 8);
Player_SetCsActionWithHaltedActors(play, &player->actor, 8);
}
} else if (this->dyna.unk_150 != 0.0f) {
if (this->direction == 0) {

2
soh/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c
View File

@ -223,7 +223,7 @@ void BgSpot00Hanebasi_Update(Actor* thisx, PlayState* play) {
Flags_SetEventChkInf(EVENTCHKINF_ZELDA_FLED_HYRULE_CASTLE);
Flags_SetEventChkInf(EVENTCHKINF_DRAWBRIDGE_OPENED_AFTER_ZELDA_FLED);
this->actionFunc = BgSpot00Hanebasi_DoNothing;
func_8002DF54(play, &player->actor, 8);
Player_SetCsActionWithHaltedActors(play, &player->actor, 8);
play->nextEntranceIndex = ENTR_HYRULE_FIELD_0;
gSaveContext.nextCutsceneIndex = 0xFFF1;
play->transitionTrigger = TRANS_TRIGGER_START;

12
soh/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c
View File

@ -443,7 +443,7 @@ void BossDodongo_IntroCutscene(BossDodongo* this, PlayState* play) {
break;
case 1:
func_80064520(play, &play->csCtx);
func_8002DF54(play, &this->actor, 1);
Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
Play_ClearAllSubCameras(play);
this->cutsceneCamera = Play_CreateSubCamera(play);
Play_ChangeCameraStatus(play, 0, 1);
@ -470,11 +470,11 @@ void BossDodongo_IntroCutscene(BossDodongo* this, PlayState* play) {
}
if (this->unk_198 == 110) {
func_8002DF54(play, &this->actor, 9);
Player_SetCsActionWithHaltedActors(play, &this->actor, 9);
}
if (this->unk_198 == 5) {
func_8002DF54(play, &this->actor, 12);
Player_SetCsActionWithHaltedActors(play, &this->actor, 12);
}
if (this->unk_198 < 6) {
@ -589,7 +589,7 @@ void BossDodongo_IntroCutscene(BossDodongo* this, PlayState* play) {
func_800C08AC(play, this->cutsceneCamera, 0);
this->cutsceneCamera = 0;
func_80064534(play, &play->csCtx);
func_8002DF54(play, &this->actor, 7);
Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
BossDodongo_SetupWalk(this);
this->unk_1DA = 50;
this->unk_1BC = 0;
@ -1535,7 +1535,7 @@ void BossDodongo_DeathCutscene(BossDodongo* this, PlayState* play) {
case 0:
this->csState = 5;
func_80064520(play, &play->csCtx);
func_8002DF54(play, &this->actor, 1);
Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
this->cutsceneCamera = Play_CreateSubCamera(play);
Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_UNK3);
Play_ChangeCameraStatus(play, this->cutsceneCamera, CAM_STAT_ACTIVE);
@ -1850,7 +1850,7 @@ void BossDodongo_DeathCutscene(BossDodongo* this, PlayState* play) {
this->csState = 100;
Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_ACTIVE);
func_80064534(play, &play->csCtx);
func_8002DF54(play, &this->actor, 7);
Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
if (!IS_BOSS_RUSH) {
Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_WARP1, -890.0f, -1523.76f, -3304.0f, 0, 0, 0, WARP_DUNGEON_CHILD);
} else {

12
soh/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c
View File

@ -323,7 +323,7 @@ void BossFd_Fly(BossFd* this, PlayState* play) {
this->introState = BFD_CS_START;
func_80064520(play, &play->csCtx);
func_8002DF54(play, &this->actor, 8);
Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
this->introCamera = Play_CreateSubCamera(play);
Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_WAIT);
Play_ChangeCameraStatus(play, this->introCamera, CAM_STAT_ACTIVE);
@ -399,7 +399,7 @@ void BossFd_Fly(BossFd* this, PlayState* play) {
Math_ApproachF(&this->camData.shake, 2.0f, 1.0f, 0.8 * 0.01f);
}
if (this->timers[0] == 40) {
func_8002DF54(play, &this->actor, 0x13);
Player_SetCsActionWithHaltedActors(play, &this->actor, 0x13);
}
if (this->timers[0] == 0) {
this->introState = BFD_CS_LOOK_GROUND;
@ -428,7 +428,7 @@ void BossFd_Fly(BossFd* this, PlayState* play) {
this->timers[0] = 170;
this->camData.speedMod = 0.0f;
this->camData.accel = 0.0f;
func_8002DF54(play, &this->actor, 0x14);
Player_SetCsActionWithHaltedActors(play, &this->actor, 0x14);
}
break;
case BFD_CS_COLLAPSE:
@ -478,7 +478,7 @@ void BossFd_Fly(BossFd* this, PlayState* play) {
if (this->timers[3] == 190) {
this->camData.atMaxVel.x = this->camData.atMaxVel.y = this->camData.atMaxVel.z = 0.05f;
this->platformSignal = VBSIMA_KILL;
func_8002DF54(play, &this->actor, 1);
Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
}
if (this->actor.world.pos.y > 120.0f) {
this->camData.nextAt = this->actor.world.pos;
@ -546,7 +546,7 @@ void BossFd_Fly(BossFd* this, PlayState* play) {
func_800C08AC(play, this->introCamera, 0);
this->introState = this->introFlyState = this->introCamera = BFD_CS_NONE;
func_80064534(play, &play->csCtx);
func_8002DF54(play, &this->actor, 7);
Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
this->actionFunc = BossFd_Wait;
this->handoffSignal = FD2_SIGNAL_GROUND;
Flags_SetEventChkInf(EVENTCHKINF_BEGAN_VOLVAGIA_BATTLE);
@ -854,7 +854,7 @@ void BossFd_Fly(BossFd* this, PlayState* play) {
this->work[BFD_CAM_SHAKE_TIMER] = 20;
Audio_PlaySoundGeneral(NA_SE_EN_VALVAISA_LAND2, &this->actor.projectedPos, 4, &D_801333E0,
&D_801333E0, &D_801333E8);
func_8002DF54(play, &this->actor, 5);
Player_SetCsActionWithHaltedActors(play, &this->actor, 5);
for (i1 = 0; i1 < 15; i1++) {
Vec3f sp144 = { 0.0f, 0.0f, 0.0f };
Vec3f sp138 = { 0.0f, 0.0f, 0.0f };

6
soh/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c
View File

@ -661,7 +661,7 @@ void BossFd2_Death(BossFd2* this, PlayState* play) {
case DEATH_START:
this->deathState = DEATH_RETREAT;
func_80064520(play, &play->csCtx);
func_8002DF54(play, &this->actor, 1);
Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
this->deathCamera = Play_CreateSubCamera(play);
Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_WAIT);
Play_ChangeCameraStatus(play, this->deathCamera, CAM_STAT_ACTIVE);
@ -754,7 +754,7 @@ void BossFd2_Death(BossFd2* this, PlayState* play) {
this->work[FD2_ACTION_STATE]++;
this->camData.speedMod = 0.0f;
this->camData.accel = 0.02f;
func_8002DF54(play, &bossFd->actor, 1);
Player_SetCsActionWithHaltedActors(play, &bossFd->actor, 1);
}
}
if ((bossFd->work[BFD_ACTION_STATE] == BOSSFD_BONES_FALL) && (bossFd->timers[0] == 5)) {
@ -788,7 +788,7 @@ void BossFd2_Death(BossFd2* this, PlayState* play) {
func_800C08AC(play, this->deathCamera, 0);
this->deathCamera = 0;
func_80064534(play, &play->csCtx);
func_8002DF54(play, &this->actor, 7);
Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
if (!IS_BOSS_RUSH) {
Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_WARP1, 0.0f, 100.0f, 0.0f, 0, 0,
0, WARP_DUNGEON_ADULT);

32
soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c
View File

@ -564,7 +564,7 @@ void BossGanon_IntroCutscene(BossGanon* this, PlayState* play) {
this->actor.shape.rot.y = 0;
func_80064520(play, &play->csCtx);
func_8002DF54(play, &this->actor, 8);
Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
this->csCamIndex = Play_CreateSubCamera(play);
Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_WAIT);
Play_ChangeCameraStatus(play, this->csCamIndex, CAM_STAT_ACTIVE);
@ -609,7 +609,7 @@ void BossGanon_IntroCutscene(BossGanon* this, PlayState* play) {
BossGanon_SetIntroCsCamera(this, 1);
if (this->csTimer == 10) {
func_8002DF54(play, &this->actor, 5);
Player_SetCsActionWithHaltedActors(play, &this->actor, 5);
}
if (this->csTimer == 13) {
@ -642,7 +642,7 @@ void BossGanon_IntroCutscene(BossGanon* this, PlayState* play) {
break;
}
func_8002DF54(play, &this->actor, 8);
Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
this->csState = 4;
BossGanon_SetIntroCsCamera(this, 2);
this->csTimer = 0;
@ -674,7 +674,7 @@ void BossGanon_IntroCutscene(BossGanon* this, PlayState* play) {
}
if (this->csTimer == 10) {
func_8002DF54(play, &this->actor, 0x4B);
Player_SetCsActionWithHaltedActors(play, &this->actor, 0x4B);
}
if (this->csTimer == 70) {
@ -740,7 +740,7 @@ void BossGanon_IntroCutscene(BossGanon* this, PlayState* play) {
this->csState = 9;
this->csTimer = 0;
func_8002DF54(play, &this->actor, 8);
Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
sBossGanonZelda->unk_3C8 = 0;
this->triforceType = GDF_TRIFORCE_ZELDA;
this->fwork[GDF_TRIFORCE_SCALE] = 10.0f;
@ -794,7 +794,7 @@ void BossGanon_IntroCutscene(BossGanon* this, PlayState* play) {
player->actor.world.pos.z = 20.0f;
if (this->csTimer == 20) {
func_8002DF54(play, &this->actor, 0x17);
Player_SetCsActionWithHaltedActors(play, &this->actor, 0x17);
Interface_ChangeAlpha(11); // show hearts only
}
@ -1031,7 +1031,7 @@ void BossGanon_IntroCutscene(BossGanon* this, PlayState* play) {
}
if (this->csTimer == 30) {
func_8002DF54(play, &this->actor, 0x4A);
Player_SetCsActionWithHaltedActors(play, &this->actor, 0x4A);
}
if (this->csTimer <= 50) {
@ -1154,7 +1154,7 @@ void BossGanon_IntroCutscene(BossGanon* this, PlayState* play) {
func_800C08AC(play, this->csCamIndex, 0);
this->csState = this->csCamIndex = 0;
func_80064534(play, &play->csCtx);
func_8002DF54(play, &this->actor, 7);
Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
BossGanon_SetupWait(this, play);
}
@ -1267,7 +1267,7 @@ void BossGanon_DeathAndTowerCutscene(BossGanon* this, PlayState* play) {
switch (this->csState) {
case 0:
func_80064520(play, &play->csCtx);
func_8002DF54(play, &this->actor, 8);
Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
this->csCamIndex = Play_CreateSubCamera(play);
Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_WAIT);
Play_ChangeCameraStatus(play, this->csCamIndex, CAM_STAT_ACTIVE);
@ -1510,7 +1510,7 @@ void BossGanon_DeathAndTowerCutscene(BossGanon* this, PlayState* play) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_GANON_BODY_SPARK - SFX_FLAG);
if (this->csTimer == 2) {
func_8002DF54(play, &this->actor, 0x39);
Player_SetCsActionWithHaltedActors(play, &this->actor, 0x39);
}
if (this->csTimer > 50) {
@ -1552,7 +1552,7 @@ void BossGanon_DeathAndTowerCutscene(BossGanon* this, PlayState* play) {
case 100:
func_80064520(play, &play->csCtx);
func_8002DF54(play, &this->actor, 8);
Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
this->csCamIndex = Play_CreateSubCamera(play);
Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_WAIT);
Play_ChangeCameraStatus(play, this->csCamIndex, CAM_STAT_ACTIVE);
@ -1651,11 +1651,11 @@ void BossGanon_DeathAndTowerCutscene(BossGanon* this, PlayState* play) {
this->csCamAt.z = -135.0f;
if (this->csTimer == 5) {
func_8002DF54(play, &this->actor, 0x4C);
Player_SetCsActionWithHaltedActors(play, &this->actor, 0x4C);
}
if (this->csTimer == 70) {
func_8002DF54(play, &this->actor, 0x4D);
Player_SetCsActionWithHaltedActors(play, &this->actor, 0x4D);
}
if (this->csTimer == 90) {
@ -1754,7 +1754,7 @@ void BossGanon_DeathAndTowerCutscene(BossGanon* this, PlayState* play) {
if (this->csTimer == 20) {
sBossGanonZelda->unk_3C8 = 5;
func_8002DF54(play, &this->actor, 0x39);
Player_SetCsActionWithHaltedActors(play, &this->actor, 0x39);
}
if (this->csTimer == 40) {
@ -1821,7 +1821,7 @@ void BossGanon_DeathAndTowerCutscene(BossGanon* this, PlayState* play) {
this->csState = 107;
this->csTimer = 0;
Message_StartTextbox(play, 0x70D2, NULL);
func_8002DF54(play, &this->actor, 0x39);
Player_SetCsActionWithHaltedActors(play, &this->actor, 0x39);
}
break;
@ -1863,7 +1863,7 @@ void BossGanon_DeathAndTowerCutscene(BossGanon* this, PlayState* play) {
this->csState = 109;
this->csCamIndex = 0;
func_80064534(play, &play->csCtx);
func_8002DF54(play, &this->actor, 7);
Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
Flags_SetSwitch(play, 0x37);
}
break;

54
soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c
View File

@ -228,7 +228,7 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) {
objectIdx = Object_GetIndex(&play->objectCtx, OBJECT_GANON_ANIME3);
if (Object_IsLoaded(&play->objectCtx, objectIdx)) {
func_80064520(play, &play->csCtx);
func_8002DF54(play, &this->actor, 8);
Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
this->unk_39E = Play_CreateSubCamera(play);
Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_WAIT);
Play_ChangeCameraStatus(play, this->unk_39E, CAM_STAT_ACTIVE);
@ -306,11 +306,11 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) {
}
if (this->csTimer == 40) {
sBossGanon2Zelda->unk_3C8 = 1;
func_8002DF54(play, &this->actor, 0x4E);
Player_SetCsActionWithHaltedActors(play, &this->actor, 0x4E);
}
if (this->csTimer == 85) {
sBossGanon2Zelda->unk_3C8 = 2;
func_8002DF54(play, &this->actor, 0x4F);
Player_SetCsActionWithHaltedActors(play, &this->actor, 0x4F);
}
this->unk_3A4.x = 930.0f;
this->unk_3A4.y = 1129.0f;
@ -339,14 +339,14 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) {
}
if (this->csTimer == 20) {
sBossGanon2Zelda->unk_3C8 = 3;
func_8002DF54(play, &this->actor, 0x50);
Player_SetCsActionWithHaltedActors(play, &this->actor, 0x50);
}
if (this->csTimer == 55) {
this->csState = 4;
this->csTimer = 0;
this->unk_410.x = 0.0f;
sBossGanon2Zelda->unk_3C8 = 4;
func_8002DF54(play, &this->actor, 0x50);
Player_SetCsActionWithHaltedActors(play, &this->actor, 0x50);
}
break;
case 4:
@ -363,7 +363,7 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) {
func_800C08AC(play, this->unk_39E, 0);
this->unk_39E = 0;
func_80064534(play, &play->csCtx);
func_8002DF54(play, &this->actor, 7);
Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
this->csState = 5;
this->csTimer = 0;
}
@ -409,7 +409,7 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) {
}
if (this->csTimer == 30) {
sBossGanon2Zelda->unk_3C8 = 5;
func_8002DF54(play, &this->actor, 0x51);
Player_SetCsActionWithHaltedActors(play, &this->actor, 0x51);
}
if (this->csTimer == 50) {
this->csTimer = 0;
@ -440,7 +440,7 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) {
func_80078884(NA_SE_EV_STONE_BOUND);
}
if (this->csTimer == 30) {
func_8002DF54(play, &this->actor, 0x52);
Player_SetCsActionWithHaltedActors(play, &this->actor, 0x52);
}
if (this->csTimer == 50) {
this->csTimer = 0;
@ -505,7 +505,7 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) {
this->unk_3B0.y = player->actor.world.pos.y;
this->unk_3B0.z = player->actor.world.pos.z - 200.0f;
if (this->csTimer == 20) {
func_8002DF54(play, &this->actor, 0x1E);
Player_SetCsActionWithHaltedActors(play, &this->actor, 0x1E);
}
if (this->csTimer == 60) {
this->unk_3A4.x = (this->actor.world.pos.x + 200.0f) - 154.0f;
@ -593,7 +593,7 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) {
SkelAnime_Free(&this->skelAnime, play);
SkelAnime_InitFlex(play, &this->skelAnime, &gGanonSkel, NULL, NULL, NULL, 0);
BossGanon2_SetObjectSegment(this, play, OBJECT_GANON_ANIME3, false);
func_8002DF54(play, &this->actor, 0x54);
Player_SetCsActionWithHaltedActors(play, &this->actor, 0x54);
this->unk_314 = 3;
// At this point, the actor has Ganon's skeleton but is still playing an animation for Ganondorf. This
@ -657,7 +657,7 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) {
this->actor.world.pos.x += 250;
this->actor.world.pos.y = 1886.0f;
this->unk_394 = 0.0f;
func_8002DF54(play, &this->actor, 0x53);
Player_SetCsActionWithHaltedActors(play, &this->actor, 0x53);
this->unk_30C = 5.0f;
this->unk_228 = 1.0f;
}
@ -742,7 +742,7 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) {
if (this->csTimer == 215) {
this->csState = 23;
this->unk_224 = 0.0f;
func_8002DF54(play, &this->actor, 0x55);
Player_SetCsActionWithHaltedActors(play, &this->actor, 0x55);
}
break;
case 23:
@ -762,7 +762,7 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) {
this->unk_3B0.z = player->actor.world.pos.z;
if (this->csTimer == 228) {
func_80078884(NA_SE_IT_SHIELD_REFLECT_SW);
func_8002DF54(play, &this->actor, 0x56);
Player_SetCsActionWithHaltedActors(play, &this->actor, 0x56);
func_800A9F6C(0.0f, 0xFF, 0xA, 0x32);
}
if (this->csTimer >= 229) {
@ -799,7 +799,7 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) {
func_80078884(NA_SE_IT_SWORD_SWING);
}
if (this->csTimer == 25) {
func_8002DF54(play, &this->actor, 0x57);
Player_SetCsActionWithHaltedActors(play, &this->actor, 0x57);
this->csState = 25;
this->csTimer = 0;
}
@ -846,7 +846,7 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) {
case 27:
this->unk_3BC.z = 0.0f;
if (this->csTimer == 4) {
func_8002DF54(play, &this->actor, 0x58);
Player_SetCsActionWithHaltedActors(play, &this->actor, 0x58);
}
this->unk_3A4.x = player->actor.world.pos.x - 20.0f;
this->unk_3A4.y = player->actor.world.pos.y + 50.0f;
@ -919,7 +919,7 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) {
func_800C08AC(play, this->unk_39E, 0);
this->unk_39E = 0;
func_80064534(play, &play->csCtx);
func_8002DF54(play, &this->actor, 7);
Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
this->csState = 0;
this->unk_337 = 1;
func_808FFDB0(this, play);
@ -1340,7 +1340,7 @@ void func_80900890(BossGanon2* this, PlayState* play) {
this->unk_39E = Play_CreateSubCamera(play);
Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_WAIT);
Play_ChangeCameraStatus(play, this->unk_39E, CAM_STAT_ACTIVE);
func_8002DF54(play, &this->actor, 8);
Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
this->csState = 1;
this->unk_3A4 = sp4C->eye;
this->unk_3B0 = sp4C->at;
@ -1388,7 +1388,7 @@ void func_80900890(BossGanon2* this, PlayState* play) {
func_800C08AC(play, this->unk_39E, 0);
this->unk_39E = 0;
func_80064534(play, &play->csCtx);
func_8002DF54(play, &this->actor, 7);
Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
this->csState = 3;
}
break;
@ -1399,7 +1399,7 @@ void func_80900890(BossGanon2* this, PlayState* play) {
Play_ChangeCameraStatus(play, this->unk_39E, CAM_STAT_ACTIVE);
this->csState = 11;
this->unk_334 = 1;
func_8002DF54(play, &this->actor, 0x60);
Player_SetCsActionWithHaltedActors(play, &this->actor, 0x60);
this->csTimer = 0;
case 11:
player->actor.world.pos.x = sBossGanon2Zelda->actor.world.pos.x + 50.0f + 10.0f;
@ -1420,7 +1420,7 @@ void func_80900890(BossGanon2* this, PlayState* play) {
func_800C08AC(play, this->unk_39E, 0);
this->unk_39E = 0;
func_80064534(play, &play->csCtx);
func_8002DF54(play, &this->actor, 7);
Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
}
break;
}
@ -1536,7 +1536,7 @@ void func_8090120C(BossGanon2* this, PlayState* play) {
this->unk_39E = Play_CreateSubCamera(play);
Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_WAIT);
Play_ChangeCameraStatus(play, this->unk_39E, CAM_STAT_ACTIVE);
func_8002DF54(play, &this->actor, 8);
Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
this->csState = 1;
this->csTimer = 0;
sBossGanon2Zelda->unk_3C8 = 9;
@ -1572,7 +1572,7 @@ void func_8090120C(BossGanon2* this, PlayState* play) {
this->skelAnime.playSpeed = 3.0f;
}
if (this->csTimer == 120) {
func_8002DF54(play, &this->actor, 0x63);
Player_SetCsActionWithHaltedActors(play, &this->actor, 0x63);
}
this->actor.world.rot.y = 0x4000;
this->actor.world.pos.x = this->actor.world.pos.z = 0.0f;
@ -1640,7 +1640,7 @@ void func_8090120C(BossGanon2* this, PlayState* play) {
this->csState = 5;
this->csTimer = 40;
this->skelAnime.playSpeed = 1.0f;
func_8002DF54(play, &this->actor, 0x64);
Player_SetCsActionWithHaltedActors(play, &this->actor, 0x64);
}
break;
case 5:
@ -1654,10 +1654,10 @@ void func_8090120C(BossGanon2* this, PlayState* play) {
Math_ApproachZeroF(&this->unk_38C, 1.0f, 8.0f);
}
if (this->csTimer == 70) {
func_8002DF54(play, &this->actor, 0x65);
Player_SetCsActionWithHaltedActors(play, &this->actor, 0x65);
}
if (this->csTimer == 150) {
func_8002DF54(play, &this->actor, 0x66);
Player_SetCsActionWithHaltedActors(play, &this->actor, 0x66);
}
this->unk_30C = 10.0f;
player->actor.world.pos.x = 250.0f;
@ -1676,7 +1676,7 @@ void func_8090120C(BossGanon2* this, PlayState* play) {
func_800C08AC(play, this->unk_39E, 0);
this->unk_39E = 0;
func_80064534(play, &play->csCtx);
func_8002DF54(play, &this->actor, 7);
Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
this->csState = 6;
}
break;
@ -1764,7 +1764,7 @@ void func_8090120C(BossGanon2* this, PlayState* play) {
if (this->csTimer == 55) {
Animation_MorphToPlayOnce(&this->skelAnime, &gGanonDeadStartAnim, 0.0f);
this->unk_194 = Animation_GetLastFrame(&gGanonDeadStartAnim);
func_8002DF54(play, &this->actor, 0x62);
Player_SetCsActionWithHaltedActors(play, &this->actor, 0x62);
this->csState = 8;
this->csTimer = 1000;
}

4
soh/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c
View File

@ -926,7 +926,7 @@ void BossGanondrof_Death(BossGanondrof* this, PlayState* play) {
switch (this->deathState) {
case DEATH_START:
func_80064520(play, &play->csCtx);
func_8002DF54(play, &this->actor, 1);
Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
this->deathCamera = Play_CreateSubCamera(play);
Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_WAIT);
osSyncPrintf("7\n");
@ -1104,7 +1104,7 @@ void BossGanondrof_Death(BossGanondrof* this, PlayState* play) {
func_800C08AC(play, this->deathCamera, 0);
this->deathCamera = 0;
func_80064534(play, &play->csCtx);
func_8002DF54(play, &this->actor, 7);
Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
if (!IS_BOSS_RUSH) {
Actor_Spawn(&play->actorCtx, play, ACTOR_ITEM_B_HEART, GND_BOSSROOM_CENTER_X, GND_BOSSROOM_CENTER_Y,
GND_BOSSROOM_CENTER_Z + 200.0f, 0, 0, 0, 0, true);

14
soh/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c
View File

@ -628,7 +628,7 @@ void BossGoma_SetupEncounterState4(BossGoma* this, PlayState* play) {
this->actionState = 4;
this->actor.flags |= ACTOR_FLAG_TARGETABLE;
func_80064520(play, &play->csCtx);
func_8002DF54(play, &this->actor, 1);
Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
this->subCameraId = Play_CreateSubCamera(play);
Play_ChangeCameraStatus(play, 0, 3);
Play_ChangeCameraStatus(play, this->subCameraId, 7);
@ -685,7 +685,7 @@ void BossGoma_Encounter(BossGoma* this, PlayState* play) {
Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_SHUTTER, 164.72f,
-480.0f, 397.68002f, 0, -0x705C, 0, 0x180);
} else {
func_8002DF54(play, &this->actor, 8);
Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
this->actionState = 1;
}
}
@ -756,7 +756,7 @@ void BossGoma_Encounter(BossGoma* this, PlayState* play) {
}
if (this->frameCount == 190) {
func_8002DF54(play, &this->actor, 2);
Player_SetCsActionWithHaltedActors(play, &this->actor, 2);
}
if (this->frameCount >= 228) {
@ -767,7 +767,7 @@ void BossGoma_Encounter(BossGoma* this, PlayState* play) {
func_800C08AC(play, this->subCameraId, 0);
this->subCameraId = 0;
func_80064534(play, &play->csCtx);
func_8002DF54(play, &this->actor, 7);
Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
this->actionState = 3;
}
break;
@ -964,7 +964,7 @@ void BossGoma_Encounter(BossGoma* this, PlayState* play) {
this->disableGameplayLogic = false;
this->patienceTimer = 200;
func_80064534(play, &play->csCtx);
func_8002DF54(play, &this->actor, 7);
Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
}
break;
}
@ -1054,7 +1054,7 @@ void BossGoma_Defeated(BossGoma* this, PlayState* play) {
case 0:
this->actionState = 1;
func_80064520(play, &play->csCtx);
func_8002DF54(play, &this->actor, 1);
Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
this->subCameraId = Play_CreateSubCamera(play);
Play_ChangeCameraStatus(play, 0, 3);
Play_ChangeCameraStatus(play, this->subCameraId, 7);
@ -1189,7 +1189,7 @@ void BossGoma_Defeated(BossGoma* this, PlayState* play) {
func_800C08AC(play, this->subCameraId, 0);
this->subCameraId = 0;
func_80064534(play, &play->csCtx);
func_8002DF54(play, &this->actor, 7);
Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
Actor_Kill(&this->actor);
}

12
soh/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c
View File

@ -1249,7 +1249,7 @@ void BossMo_IntroCs(BossMo* this, PlayState* play) {
(fabsf(player->actor.world.pos.x - -180.0f) < 40.0f))) {
// checks if Link is on one of the four platforms
func_80064520(play, &play->csCtx);
func_8002DF54(play, &this->actor, 8);
Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
this->csCamera = Play_CreateSubCamera(play);
Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_WAIT);
Play_ChangeCameraStatus(play, this->csCamera, CAM_STAT_ACTIVE);
@ -1357,11 +1357,11 @@ void BossMo_IntroCs(BossMo* this, PlayState* play) {
Math_ApproachF(&this->actor.speedXZ, sp80, 1.0f, sp78);
Math_ApproachF(&this->cameraYawRate, sp7C, 1.0f, 128.0f);
if (this->work[MO_TENT_MOVE_TIMER] == 525) {
func_8002DF54(play, &this->actor, 2);
Player_SetCsActionWithHaltedActors(play, &this->actor, 2);
}
if (this->work[MO_TENT_MOVE_TIMER] > 540) {
this->csState = MO_INTRO_REVEAL;
func_8002DF54(play, &this->actor, 1);
Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
sMorphaTent1->drawActor = true;
player->actor.world.pos.x = 180.0f;
player->actor.world.pos.z = -210.0f;
@ -1468,7 +1468,7 @@ void BossMo_IntroCs(BossMo* this, PlayState* play) {
func_800C08AC(play, this->csCamera, 0);
this->csState = this->csCamera = MO_BATTLE;
func_80064534(play, &play->csCtx);
func_8002DF54(play, &this->actor, 7);
Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
}
break;
}
@ -1533,7 +1533,7 @@ void BossMo_DeathCs(BossMo* this, PlayState* play) {
switch (this->csState) {
case MO_DEATH_START:
func_80064520(play, &play->csCtx);
func_8002DF54(play, &this->actor, 8);
Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
this->csCamera = Play_CreateSubCamera(play);
Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_WAIT);
Play_ChangeCameraStatus(play, this->csCamera, CAM_STAT_ACTIVE);
@ -1700,7 +1700,7 @@ void BossMo_DeathCs(BossMo* this, PlayState* play) {
func_800C08AC(play, this->csCamera, 0);
this->csCamera = 0;
func_80064534(play, &play->csCtx);
func_8002DF54(play, &this->actor, 7);
Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
sMorphaTent1->actor.world.pos.y = -1000.0f;
}
} else {

8
soh/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c
View File

@ -390,7 +390,7 @@ void BossSst_HeadSetupIntro(BossSst* this, PlayState* play) {
player->stateFlags1 |= PLAYER_STATE1_INPUT_DISABLED;
func_80064520(play, &play->csCtx);
func_8002DF54(play, &this->actor, 8);
Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
sCutsceneCamera = Play_CreateSubCamera(play);
Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_WAIT);
Play_ChangeCameraStatus(play, sCutsceneCamera, CAM_STAT_ACTIVE);
@ -423,7 +423,7 @@ void BossSst_HeadIntro(BossSst* this, PlayState* play) {
sHands[LEFT]->actor.flags |= ACTOR_FLAG_TARGETABLE;
player->stateFlags1 &= ~PLAYER_STATE1_INPUT_DISABLED;
func_80064534(play, &play->csCtx);
func_8002DF54(play, &this->actor, 7);
Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
sCameraAt.y += 30.0f;
sCameraAt.z += 300.0f;
Play_CameraSetAtEye(play, sCutsceneCamera, &sCameraAt, &sCameraEye);
@ -1032,7 +1032,7 @@ void BossSst_HeadSetupDeath(BossSst* this, PlayState* play) {
Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_WAIT);
Play_ChangeCameraStatus(play, sCutsceneCamera, CAM_STAT_ACTIVE);
Play_CopyCamera(play, sCutsceneCamera, MAIN_CAM);
func_8002DF54(play, &player->actor, 8);
Player_SetCsActionWithHaltedActors(play, &player->actor, 8);
func_80064520(play, &play->csCtx);
Math_Vec3f_Copy(&sCameraEye, &GET_ACTIVE_CAM(play)->eye);
this->actionFunc = BossSst_HeadDeath;
@ -1194,7 +1194,7 @@ void BossSst_HeadFinish(BossSst* this, PlayState* play) {
Play_ChangeCameraStatus(play, sCutsceneCamera, CAM_STAT_WAIT);
Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_ACTIVE);
Play_ClearCamera(play, sCutsceneCamera);
func_8002DF54(play, &GET_PLAYER(play)->actor, 7);
Player_SetCsActionWithHaltedActors(play, &GET_PLAYER(play)->actor, 7);
func_80064534(play, &play->csCtx);
Actor_Kill(&this->actor);
Actor_Kill(&sHands[LEFT]->actor);

18
soh/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c
View File

@ -1466,7 +1466,7 @@ void BossTw_TwinrovaMergeCS(BossTw* this, PlayState* play) {
case 0:
this->csState2 = 1;
func_80064520(play, &play->csCtx);
func_8002DF54(play, &this->actor, 0x39);
Player_SetCsActionWithHaltedActors(play, &this->actor, 0x39);
this->subCamId = Play_CreateSubCamera(play);
Play_ChangeCameraStatus(play, 0, CAM_STAT_WAIT);
Play_ChangeCameraStatus(play, this->subCamId, CAM_STAT_ACTIVE);
@ -1606,7 +1606,7 @@ void BossTw_TwinrovaMergeCS(BossTw* this, PlayState* play) {
Animation_MorphToPlayOnce(&this->skelAnime, &gTwinrovaIntroAnim, 0.0f);
this->workf[ANIM_SW_TGT] = Animation_GetLastFrame(&gTwinrovaIntroAnim);
this->timers[0] = 50;
func_8002DF54(play, &this->actor, 2);
Player_SetCsActionWithHaltedActors(play, &this->actor, 2);
Audio_PlayActorSound2(&this->actor, NA_SE_EN_TWINROBA_TRANSFORM);
Audio_QueueSeqCmd(SEQ_PLAYER_BGM_MAIN << 24 | NA_BGM_BOSS);
}
@ -1649,7 +1649,7 @@ void BossTw_TwinrovaMergeCS(BossTw* this, PlayState* play) {
}
if (this->timers[3] == 19) {
func_8002DF54(play, &this->actor, 5);
Player_SetCsActionWithHaltedActors(play, &this->actor, 5);
}
if (this->timers[3] == 16) {
@ -1682,7 +1682,7 @@ void BossTw_TwinrovaMergeCS(BossTw* this, PlayState* play) {
this->subCamId = 0;
this->csState2 = this->subCamId;
func_80064534(play, &play->csCtx);
func_8002DF54(play, &this->actor, 7);
Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
this->work[TW_PLLR_IDX] = 0;
this->targetPos = sTwinrovaPillarPos[0];
BossTw_TwinrovaSetupFly(this, play);
@ -1762,7 +1762,7 @@ void BossTw_TwinrovaIntroCS(BossTw* this, PlayState* play) {
player->actor.world.pos.x = player->actor.world.pos.z = .0f;
this->csState2 = 1;
func_80064520(play, &play->csCtx);
func_8002DF54(play, &this->actor, 0x39);
Player_SetCsActionWithHaltedActors(play, &this->actor, 0x39);
this->subCamId = Play_CreateSubCamera(play);
Play_ChangeCameraStatus(play, 0, CAM_STAT_WAIT);
Play_ChangeCameraStatus(play, this->subCamId, CAM_STAT_ACTIVE);
@ -2245,7 +2245,7 @@ void BossTw_TwinrovaIntroCS(BossTw* this, PlayState* play) {
this->subCamId = 0;
this->csState2 = this->subCamId;
func_80064534(play, &play->csCtx);
func_8002DF54(play, &this->actor, 7);
Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
BossTw_SetupWait(this, play);
}
break;
@ -2666,7 +2666,7 @@ void BossTw_TwinrovaDeathCS(BossTw* this, PlayState* play) {
case 0:
this->csState2 = 1;
func_80064520(play, &play->csCtx);
func_8002DF54(play, &this->actor, 8);
Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
this->subCamId = Play_CreateSubCamera(play);
Play_ChangeCameraStatus(play, 0, CAM_STAT_WAIT);
Play_ChangeCameraStatus(play, this->subCamId, CAM_STAT_ACTIVE);
@ -2705,7 +2705,7 @@ void BossTw_TwinrovaDeathCS(BossTw* this, PlayState* play) {
sKoumePtr->actor.world.pos.z = sKotakePtr->actor.world.pos.z;
sKoumePtr->work[YAW_TGT] = sKotakePtr->work[YAW_TGT] = sKoumePtr->actor.shape.rot.x =
sKotakePtr->actor.shape.rot.x = sKoumePtr->actor.shape.rot.y = sKotakePtr->actor.shape.rot.y = 0;
func_8002DF54(play, &sKoumePtr->actor, 1);
Player_SetCsActionWithHaltedActors(play, &sKoumePtr->actor, 1);
sKoumePtr->actor.flags |= ACTOR_FLAG_TARGETABLE;
}
break;
@ -2793,7 +2793,7 @@ void BossTw_TwinrovaDeathCS(BossTw* this, PlayState* play) {
this->csState2 = 4;
this->subCamId = 0;
func_80064534(play, &play->csCtx);
func_8002DF54(play, &this->actor, 7);
Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
Audio_QueueSeqCmd(SEQ_PLAYER_BGM_MAIN << 24 | NA_BGM_BOSS_CLEAR);
if (!IS_BOSS_RUSH) {
Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_DOOR_WARP1, 600.0f, 230.0f, 0.0f, 0,

20
soh/src/overlays/actors/ovl_Boss_Va/z_boss_va.c
View File

@ -657,7 +657,7 @@ void BossVa_Init(Actor* thisx, PlayState* play2) {
} else {
sCsState = INTRO_CALL_BARI;
sDoorState = 100;
func_8002DF54(play, &this->actor, 1);
Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
play->envCtx.screenFillColor[0] = 0xDC;
play->envCtx.screenFillColor[1] = 0xDC;
play->envCtx.screenFillColor[2] = 0xBE;
@ -799,7 +799,7 @@ void BossVa_BodyIntro(BossVa* this, PlayState* play) {
play->envCtx.screenFillColor[1] = 0xDC;
play->envCtx.screenFillColor[2] = 0xBE;
play->envCtx.screenFillColor[3] = 0xD2;
func_8002DF54(play, &this->actor, 8);
Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
player->actor.world.rot.y = player->actor.shape.rot.y = 0x7FFF;
sCsState++;
break;
@ -827,7 +827,7 @@ void BossVa_BodyIntro(BossVa* this, PlayState* play) {
case INTRO_CLOSE_DOOR:
this->timer--;
if (this->timer == 0) {
func_8002DF54(play, &this->actor, 2);
Player_SetCsActionWithHaltedActors(play, &this->actor, 2);
sCsState++;
this->timer = 30;
}
@ -842,7 +842,7 @@ void BossVa_BodyIntro(BossVa* this, PlayState* play) {
}
break;
case INTRO_CRACKLE:
func_8002DF54(play, &this->actor, 1);
Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
sCsState++;
break;
case INTRO_SPAWN_BARI:
@ -973,7 +973,7 @@ void BossVa_BodyIntro(BossVa* this, PlayState* play) {
sCameraAtMaxVel = sCameraEyeMaxVel;
if (this->timer >= 45000) {
play->envCtx.unk_BF = 1;
func_8002DF54(play, &this->actor, 8);
Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
} else if (this->timer >= 35000) {
Audio_QueueSeqCmd(SEQ_PLAYER_BGM_MAIN << 24 | NA_BGM_BOSS);
}
@ -1030,7 +1030,7 @@ void BossVa_BodyIntro(BossVa* this, PlayState* play) {
sCsCamera = 0;
func_80064534(play, &play->csCtx);
Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_ACTIVE);
func_8002DF54(play, &this->actor, 7);
Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
sCsState++;
Flags_SetEventChkInf(EVENTCHKINF_BEGAN_BARINA_BATTLE);
player->actor.shape.rot.y = player->actor.world.rot.y = this->actor.yawTowardsPlayer + 0x8000;
@ -1550,7 +1550,7 @@ void BossVa_BodyDeath(BossVa* this, PlayState* play) {
switch (sCsState) {
case DEATH_START:
func_8002DF54(play, &this->actor, 1);
Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
func_80064520(play, &play->csCtx);
sCsCamera = Play_CreateSubCamera(play);
Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_WAIT);
@ -1613,7 +1613,7 @@ void BossVa_BodyDeath(BossVa* this, PlayState* play) {
0x28);
this->onCeiling = 2; // Not used by body
BossVa_SetDeathEnv(play);
func_8002DF54(play, &this->actor, 8);
Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
}
break;
case DEATH_CORE_BURST:
@ -1654,7 +1654,7 @@ void BossVa_BodyDeath(BossVa* this, PlayState* play) {
camera->at = sCameraAt;
func_8002DF54(play, &this->actor, 7);
Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
sCsState++;
if (!IS_BOSS_RUSH) {
@ -2444,7 +2444,7 @@ void BossVa_BariIntro(BossVa* this, PlayState* play) {
switch (sCsState) {
case INTRO_LOOK_BARI:
if (this->actor.params == BOSSVA_BARI_UPPER_1) {
func_8002DF54(play, &this->actor, 1);
Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
if (Math_SmoothStepToF(&this->actor.world.pos.y, 60.0f, 0.3f, 1.0f, 0.15f) == 0.0f) {
this->timer--;
if (this->timer == 0) {

2
soh/src/overlays/actors/ovl_Demo_Im/z_demo_im.c
View File

@ -880,7 +880,7 @@ void func_80986B2C(PlayState* play) {
}
play->transitionType = TRANS_TYPE_CIRCLE(TCA_STARBURST, TCC_BLACK, TCS_FAST);
play->transitionTrigger = TRANS_TRIGGER_START;
func_8002DF54(play, &player->actor, 8);
Player_SetCsActionWithHaltedActors(play, &player->actor, 8);
}
}

4
soh/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c
View File

@ -560,7 +560,7 @@ void func_80997220(DoorShutter* this, PlayState* play) {
this->dyna.actor.velocity.y = 0.0f;
if (DoorShutter_SetupDoor(this, play) && !(player->stateFlags1 & PLAYER_STATE1_ITEM_OVER_HEAD)) {
DoorShutter_SetupAction(this, func_80997568);
func_8002DF54(play, NULL, 2);
Player_SetCsActionWithHaltedActors(play, NULL, 2);
}
}
@ -594,7 +594,7 @@ void func_80997528(DoorShutter* this, PlayState* play) {
void func_80997568(DoorShutter* this, PlayState* play) {
if (this->unk_16F++ > 30) {
func_8002DF54(play, NULL, 7);
Player_SetCsActionWithHaltedActors(play, NULL, 7);
DoorShutter_SetupDoor(this, play);
}
}

6
soh/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c
View File

@ -499,7 +499,7 @@ void DoorWarp1_ChildWarpIdle(DoorWarp1* this, PlayState* play) {
Audio_PlaySoundGeneral(NA_SE_EV_LINK_WARP, &player->actor.projectedPos, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
OnePointCutscene_Init(play, 0x25E7, 999, &this->actor, MAIN_CAM);
func_8002DF54(play, &this->actor, 10);
Player_SetCsActionWithHaltedActors(play, &this->actor, 10);
player->unk_450.x = this->actor.world.pos.x;
player->unk_450.z = this->actor.world.pos.z;
@ -584,7 +584,7 @@ void DoorWarp1_RutoWarpIdle(DoorWarp1* this, PlayState* play) {
if (this->rutoWarpState != WARP_BLUE_RUTO_STATE_INITIAL && DoorWarp1_PlayerInRange(this, play)) {
this->rutoWarpState = WARP_BLUE_RUTO_STATE_ENTERED;
func_8002DF54(play, &this->actor, 10);
Player_SetCsActionWithHaltedActors(play, &this->actor, 10);
this->unk_1B2 = 1;
DoorWarp1_SetupAction(this, func_80999EE0);
}
@ -706,7 +706,7 @@ void DoorWarp1_AdultWarpIdle(DoorWarp1* this, PlayState* play) {
player = GET_PLAYER(play);
OnePointCutscene_Init(play, 0x25E8, 999, &this->actor, MAIN_CAM);
func_8002DF54(play, &this->actor, 10);
Player_SetCsActionWithHaltedActors(play, &this->actor, 10);
player->unk_450.x = this->actor.world.pos.x;
player->unk_450.z = this->actor.world.pos.z;
this->unk_1B2 = 20;

4
soh/src/overlays/actors/ovl_En_Ani/z_en_ani.c
View File

@ -130,7 +130,7 @@ void func_809B0558(EnAni* this, PlayState* play) {
Flags_SetItemGetInf(ITEMGETINF_15);
} else {
if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_MAN_ON_ROOF, true, NULL)) {
func_8002F434(&this->actor, play, GI_HEART_PIECE, 10000.0f, 200.0f);
Actor_OfferGetItem(&this->actor, play, GI_HEART_PIECE, 10000.0f, 200.0f);
}
}
}
@ -141,7 +141,7 @@ void func_809B05F0(EnAni* this, PlayState* play) {
}
if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_MAN_ON_ROOF, true, NULL)) {
func_8002F434(&this->actor, play, GI_HEART_PIECE, 10000.0f, 200.0f);
Actor_OfferGetItem(&this->actor, play, GI_HEART_PIECE, 10000.0f, 200.0f);
}
}

10
soh/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c
View File

@ -295,7 +295,7 @@ void EnBomBowMan_RunGame(EnBomBowlMan* this, PlayState* play) {
Message_StartTextbox(play, this->actor.textId, NULL);
if (this->gameResult == 2) {
func_8002DF54(play, NULL, 8);
Player_SetCsActionWithHaltedActors(play, NULL, 8);
}
this->actionFunc = EnBomBowlMan_HandlePlayChoice;
} else {
@ -345,7 +345,7 @@ void EnBomBowlMan_HandlePlayChoice(EnBomBowlMan* this, PlayState* play) {
Message_ContinueTextbox(play, this->actor.textId);
this->dialogState = TEXT_STATE_EVENT;
OnePointCutscene_Init(play, 8010, -99, NULL, MAIN_CAM);
func_8002DF54(play, NULL, 8);
Player_SetCsActionWithHaltedActors(play, NULL, 8);
this->actionFunc = EnBomBowMan_SetupChooseShowPrize;
}
} else {
@ -381,11 +381,11 @@ void func_809C41FC(EnBomBowlMan* this, PlayState* play) {
Message_ContinueTextbox(play, this->actor.textId);
this->dialogState = TEXT_STATE_EVENT;
OnePointCutscene_Init(play, 8010, -99, NULL, MAIN_CAM);
func_8002DF54(play, NULL, 8);
Player_SetCsActionWithHaltedActors(play, NULL, 8);
this->actionFunc = EnBomBowMan_SetupChooseShowPrize;
} else {
if (this->gameResult == 2) {
func_8002DF54(play, NULL, 7);
Player_SetCsActionWithHaltedActors(play, NULL, 7);
}
this->actionFunc = EnBomBowMan_SetupRunGame;
}
@ -509,7 +509,7 @@ void EnBomBowlMan_BeginPlayGame(EnBomBowlMan* this, PlayState* play) {
// "Wow"
osSyncPrintf(VT_FGCOL(YELLOW) "☆ わー ☆ %d\n" VT_RST, play->bombchuBowlingStatus);
func_8002DF54(play, NULL, 7);
Player_SetCsActionWithHaltedActors(play, NULL, 7);
this->actionFunc = EnBomBowMan_SetupRunGame;
}
}

12
soh/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c
View File

@ -68,7 +68,7 @@ void EnBomBowlPit_DetectHit(EnBomBowlPit* this, PlayState* play) {
if (((fabsf(chuPosDiff.x) < 40.0f) || (BREG(2))) && ((fabsf(chuPosDiff.y) < 40.0f) || (BREG(2))) &&
((fabsf(chuPosDiff.z) < 40.0f) || (BREG(2)))) {
func_8002DF54(play, NULL, 8);
Player_SetCsActionWithHaltedActors(play, NULL, 8);
chu->timer = 1;
this->camId = Play_CreateSubCamera(play);
@ -107,7 +107,7 @@ void EnBomBowlPit_DetectHit(EnBomBowlPit* this, PlayState* play) {
Message_StartTextbox(play, this->actor.textId, NULL);
this->unk_154 = TEXT_STATE_EVENT;
func_80078884(NA_SE_EV_HIT_SOUND);
func_8002DF54(play, NULL, 8);
Player_SetCsActionWithHaltedActors(play, NULL, 8);
this->status = 1;
this->actionFunc = EnBomBowlPit_CameraDollyIn;
break;
@ -167,7 +167,7 @@ void EnBomBowlPit_SetupGivePrize(EnBomBowlPit* this, PlayState* play) {
Play_ClearCamera(play, this->camId);
Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_ACTIVE);
func_8002DF54(play, NULL, 8);
Player_SetCsActionWithHaltedActors(play, NULL, 8);
this->actionFunc = EnBomBowlPit_GivePrize;
}
}
@ -175,7 +175,7 @@ void EnBomBowlPit_SetupGivePrize(EnBomBowlPit* this, PlayState* play) {
void EnBomBowlPit_GivePrize(EnBomBowlPit* this, PlayState* play) {
Player* player = GET_PLAYER(play);
func_8002DF54(play, NULL, 7);
Player_SetCsActionWithHaltedActors(play, NULL, 7);
this->getItemId = sGetItemIds[this->prizeIndex];
this->getItemEntry = (GetItemEntry)GET_ITEM_NONE;
@ -203,7 +203,7 @@ void EnBomBowlPit_GivePrize(EnBomBowlPit* this, PlayState* play) {
player->stateFlags1 &= ~PLAYER_STATE1_IN_CUTSCENE;
this->actor.parent = NULL;
if (!IS_RANDO || this->getItemEntry.getItemId == GI_NONE) {
func_8002F434(&this->actor, play, this->getItemId, 2000.0f, 1000.0f);
Actor_OfferGetItem(&this->actor, play, this->getItemId, 2000.0f, 1000.0f);
} else {
GiveItemEntryFromActor(&this->actor, play, this->getItemEntry, 2000.0f, 1000.0f);
}
@ -216,7 +216,7 @@ void EnBomBowlPit_WaitTillPrizeGiven(EnBomBowlPit* this, PlayState* play) {
this->actionFunc = EnBomBowlPit_Reset;
} else {
if (!IS_RANDO || this->getItemEntry.getItemId == GI_NONE) {
func_8002F434(&this->actor, play, this->getItemId, 2000.0f, 1000.0f);
Actor_OfferGetItem(&this->actor, play, this->getItemId, 2000.0f, 1000.0f);
} else {
GiveItemEntryFromActor(&this->actor, play, this->getItemEntry, 2000.0f, 1000.0f);
}

4
soh/src/overlays/actors/ovl_En_Cow/z_en_cow.c
View File

@ -214,7 +214,7 @@ void func_809DF778(EnCow* this, PlayState* play) {
this->actor.parent = NULL;
this->actionFunc = func_809DF730;
} else {
func_8002F434(&this->actor, play, GI_MILK, 10000.0f, 100.0f);
Actor_OfferGetItem(&this->actor, play, GI_MILK, 10000.0f, 100.0f);
}
}
@ -223,7 +223,7 @@ void func_809DF7D8(EnCow* this, PlayState* play) {
this->actor.flags &= ~ACTOR_FLAG_WILL_TALK;
Message_CloseTextbox(play);
this->actionFunc = func_809DF778;
func_8002F434(&this->actor, play, GI_MILK, 10000.0f, 100.0f);
Actor_OfferGetItem(&this->actor, play, GI_MILK, 10000.0f, 100.0f);
}
}

4
soh/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c
View File

@ -470,7 +470,7 @@ void EnDaiku_InitSubCamera(EnDaiku* this, PlayState* play) {
Play_CameraSetAtEye(play, this->subCamId, &this->subCamAt, &this->subCamEye);
Play_CameraSetFov(play, this->subCamId, play->mainCamera.fov);
func_8002DF54(play, &this->actor, 1);
Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
}
void EnDaiku_UpdateSubCamera(EnDaiku* this, PlayState* play) {
@ -507,7 +507,7 @@ void EnDaiku_EscapeSuccess(EnDaiku* this, PlayState* play) {
Actor_Kill(&this->actor);
}
} else {
func_8002DF54(play, &this->actor, 7);
Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
}
}

20
soh/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c
View File

@ -138,7 +138,7 @@ s32 EnDivingGame_HasMinigameFinished(EnDivingGame* this, PlayState* play) {
Message_StartTextbox(play, this->actor.textId, NULL);
this->unk_292 = TEXT_STATE_EVENT;
this->allRupeesThrown = this->state = this->phase = this->unk_2A2 = this->grabbedRupeesCounter = 0;
func_8002DF54(play, NULL, 8);
Player_SetCsActionWithHaltedActors(play, NULL, 8);
this->actionFunc = func_809EE048;
return true;
} else {
@ -163,7 +163,7 @@ s32 EnDivingGame_HasMinigameFinished(EnDivingGame* this, PlayState* play) {
this->unk_292 = TEXT_STATE_EVENT;
func_800F5B58();
Audio_PlayFanfare(NA_BGM_SMALL_ITEM_GET);
func_8002DF54(play, NULL, 8);
Player_SetCsActionWithHaltedActors(play, NULL, 8);
if (!Flags_GetEventChkInf(EVENTCHKINF_OBTAINED_SILVER_SCALE)) {
this->actionFunc = func_809EE96C;
} else {
@ -191,7 +191,7 @@ void EnDivingGame_Talk(EnDivingGame* this, PlayState* play) {
if (this->unk_292 != TEXT_STATE_DONE) {
switch (this->state) {
case ENDIVINGGAME_STATE_NOTPLAYING:
func_8002DF54(play, NULL, 8);
Player_SetCsActionWithHaltedActors(play, NULL, 8);
this->actionFunc = EnDivingGame_HandlePlayChoice;
break;
case ENDIVINGGAME_STATE_AWARDPRIZE:
@ -258,7 +258,7 @@ void EnDivingGame_HandlePlayChoice(EnDivingGame* this, PlayState* play) {
this->actionFunc = func_809EE048;
} else {
play->msgCtx.msgMode = MSGMODE_PAUSED;
func_8002DF54(play, NULL, 8);
Player_SetCsActionWithHaltedActors(play, NULL, 8);
this->actionFunc = func_809EE0FC;
}
}
@ -270,11 +270,11 @@ void func_809EE048(EnDivingGame* this, PlayState* play) {
if (this->unk_292 == Message_GetState(&play->msgCtx) && Message_ShouldAdvance(play)) {
if (this->phase == ENDIVINGGAME_PHASE_ENDED) {
Message_CloseTextbox(play);
func_8002DF54(play, NULL, 7);
Player_SetCsActionWithHaltedActors(play, NULL, 7);
this->actionFunc = func_809EDCB0;
} else {
play->msgCtx.msgMode = MSGMODE_PAUSED;
func_8002DF54(play, NULL, 8);
Player_SetCsActionWithHaltedActors(play, NULL, 8);
this->actionFunc = func_809EE0FC;
}
}
@ -419,7 +419,7 @@ void func_809EE800(EnDivingGame* this, PlayState* play) {
func_80088B34(BREG(2) + 50);
}
func_800F5ACC(NA_BGM_TIMED_MINI_GAME);
func_8002DF54(play, NULL, 7);
Player_SetCsActionWithHaltedActors(play, NULL, 7);
this->actor.textId = 0x405B;
this->unk_292 = TEXT_STATE_EVENT;
this->state = ENDIVINGGAME_STATE_PLAYING;
@ -442,7 +442,7 @@ void func_809EE96C(EnDivingGame* this, PlayState* play) {
SkelAnime_Update(&this->skelAnime);
if ((this->unk_292 == Message_GetState(&play->msgCtx) && Message_ShouldAdvance(play))) {
Message_CloseTextbox(play);
func_8002DF54(play, NULL, 7);
Player_SetCsActionWithHaltedActors(play, NULL, 7);
this->actor.textId = 0x4056;
this->unk_292 = TEXT_STATE_EVENT;
this->state = ENDIVINGGAME_STATE_AWARDPRIZE;
@ -456,7 +456,7 @@ void func_809EEA00(EnDivingGame* this, PlayState* play) {
Message_CloseTextbox(play);
this->actor.parent = NULL;
if (!IS_RANDO) {
func_8002F434(&this->actor, play, GI_SCALE_SILVER, 90.0f, 10.0f);
Actor_OfferGetItem(&this->actor, play, GI_SCALE_SILVER, 90.0f, 10.0f);
} else {
GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_ZD_DIVING_MINIGAME, GI_SCALE_SILVER);
GiveItemEntryFromActor(&this->actor, play, getItemEntry, 90.0f, 10.0f);
@ -471,7 +471,7 @@ void func_809EEA90(EnDivingGame* this, PlayState* play) {
this->actionFunc = func_809EEAF8;
} else {
if (!IS_RANDO) {
func_8002F434(&this->actor, play, GI_SCALE_SILVER, 90.0f, 10.0f);
Actor_OfferGetItem(&this->actor, play, GI_SCALE_SILVER, 90.0f, 10.0f);
} else {
GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_ZD_DIVING_MINIGAME, GI_SCALE_SILVER);
GiveItemEntryFromActor(&this->actor, play, getItemEntry, 90.0f, 10.0f);

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

@ -391,7 +391,7 @@ void func_809EFDD0(EnDns* this, PlayState* play) {
GetItemEntry itemEntry = ItemTable_Retrieve(pendingGetItemId);
gSaveContext.pendingSale = itemEntry.itemId;
gSaveContext.pendingSaleMod = itemEntry.modIndex;
func_8002F434(&this->actor, play, pendingGetItemId, 130.0f, 100.0f);
Actor_OfferGetItem(&this->actor, play, pendingGetItemId, 130.0f, 100.0f);
}
void func_809EFEE8(EnDns* this, PlayState* play) {

8
soh/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c
View File

@ -126,7 +126,7 @@ void EnDntJiji_Wait(EnDntJiji* this, PlayState* play) {
!(player->stateFlags1 & PLAYER_STATE1_ITEM_OVER_HEAD)) {
OnePointCutscene_Init(play, 2230, -99, &this->actor, MAIN_CAM);
this->timer = 0;
func_8002DF54(play, NULL, 8);
Player_SetCsActionWithHaltedActors(play, NULL, 8);
this->actionFunc = EnDntJiji_SetupUnburrow;
}
}
@ -260,9 +260,9 @@ void EnDntJiji_Talk(EnDntJiji* this, PlayState* play) {
if ((Message_GetState(&play->msgCtx) == TEXT_STATE_EVENT) && Message_ShouldAdvance(play)) {
func_8005B1A4(GET_ACTIVE_CAM(play));
Message_CloseTextbox(play);
func_8002DF54(play, NULL, 7);
Player_SetCsActionWithHaltedActors(play, NULL, 7);
this->actor.parent = NULL;
func_8002F434(&this->actor, play, this->getItemId, 400.0f, 200.0f);
Actor_OfferGetItem(&this->actor, play, this->getItemId, 400.0f, 200.0f);
this->actionFunc = EnDntJiji_SetupGivePrize;
}
}
@ -272,7 +272,7 @@ void EnDntJiji_SetupGivePrize(EnDntJiji* this, PlayState* play) {
if (Actor_HasParent(&this->actor, play)) {
this->actionFunc = EnDntJiji_GivePrize;
} else {
func_8002F434(&this->actor, play, this->getItemId, 400.0f, 200.0f);
Actor_OfferGetItem(&this->actor, play, this->getItemId, 400.0f, 200.0f);
}
}

6
soh/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c
View File

@ -256,7 +256,7 @@ void EnDntNomal_TargetWait(EnDntNomal* this, PlayState* play) {
this->actionFunc = EnDntNomal_TargetGivePrize;
} else {
OnePointCutscene_Init(play, 4140, -99, &this->actor, MAIN_CAM);
func_8002DF54(play, &this->actor, 1);
Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
this->timer4 = 50;
this->actionFunc = EnDntNomal_SetupTargetUnburrow;
}
@ -346,7 +346,7 @@ void EnDntNomal_TargetTalk(EnDntNomal* this, PlayState* play) {
Message_CloseTextbox(play);
func_8005B1A4(GET_ACTIVE_CAM(play));
GET_ACTIVE_CAM(play)->csId = 0;
func_8002DF54(play, NULL, 8);
Player_SetCsActionWithHaltedActors(play, NULL, 8);
this->actionFunc = EnDntNomal_SetupTargetGivePrize;
}
}
@ -368,7 +368,7 @@ void EnDntNomal_TargetGivePrize(EnDntNomal* this, PlayState* play) {
if (Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_EX_ITEM, itemX, itemY, itemZ, 0,
0, 0, EXITEM_BULLET_BAG) == NULL) {
func_8002DF54(play, NULL, 7);
Player_SetCsActionWithHaltedActors(play, NULL, 7);
Actor_Kill(&this->actor);
}
this->spawnedItem = true;

8
soh/src/overlays/actors/ovl_En_Ds/z_en_ds.c
View File

@ -95,7 +95,7 @@ void EnDs_GiveOddPotion(EnDs* this, PlayState* play) {
this->actionFunc = EnDs_DisplayOddPotionText;
gSaveContext.timer2State = 0;
} else {
func_8002F434(&this->actor, play, GI_ODD_POTION, 10000.0f, 50.0f);
Actor_OfferGetItem(&this->actor, play, GI_ODD_POTION, 10000.0f, 50.0f);
}
}
@ -105,7 +105,7 @@ void EnDs_TalkAfterBrewOddPotion(EnDs* this, PlayState* play) {
this->actionFunc = EnDs_GiveOddPotion;
u32 itemId = GI_ODD_POTION;
if (GameInteractor_Should(GI_VB_TRADE_ODD_MUSHROOM, true, this)) {
func_8002F434(&this->actor, play, itemId, 10000.0f, 50.0f);
Actor_OfferGetItem(&this->actor, play, itemId, 10000.0f, 50.0f);
}
}
}
@ -178,7 +178,7 @@ void EnDs_GiveBluePotion(EnDs* this, PlayState* play) {
this->actor.parent = NULL;
this->actionFunc = EnDs_Talk;
} else {
func_8002F434(&this->actor, play, GI_POTION_BLUE, 10000.0f, 50.0f);
Actor_OfferGetItem(&this->actor, play, GI_POTION_BLUE, 10000.0f, 50.0f);
}
}
@ -200,7 +200,7 @@ void EnDs_OfferBluePotion(EnDs* this, PlayState* play) {
if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_GRANNYS_SHOP, true, this)) {
GetItemEntry itemEntry = ItemTable_Retrieve(GI_POTION_BLUE);
func_8002F434(&this->actor, play, GI_POTION_BLUE, 10000.0f, 50.0f);
Actor_OfferGetItem(&this->actor, play, GI_POTION_BLUE, 10000.0f, 50.0f);
gSaveContext.pendingSale = itemEntry.itemId;
gSaveContext.pendingSaleMod = itemEntry.modIndex;
}

10
soh/src/overlays/actors/ovl_En_Du/z_en_du.c
View File

@ -362,7 +362,7 @@ void func_809FE3C0(EnDu* this, PlayState* play) {
return;
}
if (this->interactInfo.talkState == NPC_TALK_STATE_ACTION) {
func_8002DF54(play, &this->actor, 7);
Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
this->interactInfo.talkState = NPC_TALK_STATE_IDLE;
}
if (this->actor.xzDistToPlayer < 116.0f + this->collider.dim.radius) {
@ -476,7 +476,7 @@ void func_809FE890(EnDu* this, PlayState* play) {
CsCmdActorAction* csAction;
if (play->csCtx.state == CS_STATE_IDLE) {
func_8002DF54(play, &this->actor, 1);
Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
EnDu_SetupAction(this, func_809FEB08);
return;
}
@ -549,7 +549,7 @@ void func_809FEB08(EnDu* this, PlayState* play) {
this->unk_1EE = 0;
if (this->unk_1E8 == 1) {
func_8002DF54(play, &this->actor, 7);
Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENDU_ANIM_1);
EnDu_SetupAction(this, func_809FE3C0);
return;
@ -569,7 +569,7 @@ void func_809FEB08(EnDu* this, PlayState* play) {
void func_809FEC14(EnDu* this, PlayState* play) {
if (this->interactInfo.talkState == NPC_TALK_STATE_ACTION) {
func_8002DF54(play, &this->actor, 7);
Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
EnDu_SetupAction(this, func_809FEC70);
func_809FEC70(this, play);
}
@ -582,7 +582,7 @@ void func_809FEC70(EnDu* this, PlayState* play) {
} else {
f32 xzRange = this->actor.xzDistToPlayer + 1.0f;
func_8002F434(&this->actor, play, GI_BRACELET, xzRange, fabsf(this->actor.yDistToPlayer) + 1.0f);
Actor_OfferGetItem(&this->actor, play, GI_BRACELET, xzRange, fabsf(this->actor.yDistToPlayer) + 1.0f);
}
}

2
soh/src/overlays/actors/ovl_En_Elf/z_en_elf.c
View File

@ -677,7 +677,7 @@ void func_80A0329C(EnElf* this, PlayState* play) {
if (!(this->fairyFlags & FAIRY_FLAG_BIG)) {
// GI_MAX in this case allows the player to catch the actor in a bottle
func_8002F434(&this->actor, play, GI_MAX, 80.0f, 60.0f);
Actor_OfferGetItem(&this->actor, play, GI_MAX, 80.0f, 60.0f);
}
}
}

6
soh/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c
View File

@ -400,7 +400,7 @@ void EnExItem_TargetPrizeApproach(EnExItem* this, PlayState* play) {
s32 getItemId;
this->actor.draw = NULL;
func_8002DF54(play, NULL, 7);
Player_SetCsActionWithHaltedActors(play, NULL, 7);
this->actor.parent = NULL;
if (IS_RANDO) {
GET_PLAYER(play)->stateFlags1 &= ~(PLAYER_STATE1_GETTING_ITEM | PLAYER_STATE1_ITEM_OVER_HEAD);
@ -415,7 +415,7 @@ void EnExItem_TargetPrizeApproach(EnExItem* this, PlayState* play) {
}
if (!IS_RANDO || getItemEntry.getItemId == GI_NONE) {
func_8002F434(&this->actor, play, getItemId, 2000.0f, 1000.0f);
Actor_OfferGetItem(&this->actor, play, getItemId, 2000.0f, 1000.0f);
} else {
GiveItemEntryFromActor(&this->actor, play, getItemEntry, 2000.0f, 1000.0f);
}
@ -429,7 +429,7 @@ void EnExItem_TargetPrizeGive(EnExItem* this, PlayState* play) {
} else {
if (!IS_RANDO) {
s32 getItemId = (CUR_UPG_VALUE(UPG_BULLET_BAG) == 2) ? GI_BULLET_BAG_50 : GI_BULLET_BAG_40;
func_8002F434(&this->actor, play, getItemId, 2000.0f, 1000.0f);
Actor_OfferGetItem(&this->actor, play, getItemId, 2000.0f, 1000.0f);
} else {
GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_LW_TARGET_IN_WOODS, GI_BULLET_BAG_50);
GiveItemEntryFromActor(&this->actor, play, getItemEntry, 2000.0f, 1000.0f);

2
soh/src/overlays/actors/ovl_En_Fish/z_en_fish.c
View File

@ -716,7 +716,7 @@ void EnFish_OrdinaryUpdate(EnFish* this, PlayState* play) {
EnFish_BeginRespawn(this);
} else if (EnFish_InBottleRange(this, play)) {
// GI_MAX in this case allows the player to catch the actor in a bottle
func_8002F434(&this->actor, play, GI_MAX, 80.0f, 20.0f);
Actor_OfferGetItem(&this->actor, play, GI_MAX, 80.0f, 20.0f);
}
}
}

4
soh/src/overlays/actors/ovl_En_Fr/z_en_fr.c
View File

@ -1020,7 +1020,7 @@ void EnFr_Deactivate(EnFr* this, PlayState* play) {
} else {
this->actionFunc = EnFr_GiveReward;
if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_FROGS, true, this)) {
func_8002F434(&this->actor, play, this->reward, 30.0f, 100.0f);
Actor_OfferGetItem(&this->actor, play, this->reward, 30.0f, 100.0f);
}
}
}
@ -1030,7 +1030,7 @@ void EnFr_GiveReward(EnFr* this, PlayState* play) {
this->actor.parent = NULL;
this->actionFunc = EnFr_SetIdle;
} else {
func_8002F434(&this->actor, play, this->reward, 30.0f, 100.0f);
Actor_OfferGetItem(&this->actor, play, this->reward, 30.0f, 100.0f);
}
}

4
soh/src/overlays/actors/ovl_En_Gb/z_en_gb.c
View File

@ -360,7 +360,7 @@ void func_80A2FA50(EnGb* this, PlayState* play) {
void func_80A2FB40(EnGb* this, PlayState* play) {
if (Message_GetState(&play->msgCtx) == TEXT_STATE_DONE && Message_ShouldAdvance(play)) {
if (!IS_RANDO) {
func_8002F434(&this->dyna.actor, play, GI_BOTTLE, 100.0f, 10.0f);
Actor_OfferGetItem(&this->dyna.actor, play, GI_BOTTLE, 100.0f, 10.0f);
} else {
GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_MARKET_10_BIG_POES, GI_BOTTLE);
GiveItemEntryFromActor(&this->dyna.actor, play, getItemEntry, 100.0f, 10.0f);
@ -375,7 +375,7 @@ void func_80A2FBB0(EnGb* this, PlayState* play) {
this->actionFunc = func_80A2FC0C;
} else {
if (!IS_RANDO) {
func_8002F434(&this->dyna.actor, play, GI_BOTTLE, 100.0f, 10.0f);
Actor_OfferGetItem(&this->dyna.actor, play, GI_BOTTLE, 100.0f, 10.0f);
} else {
GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_MARKET_10_BIG_POES, GI_BOTTLE);
GiveItemEntryFromActor(&this->dyna.actor, play, getItemEntry, 100.0f, 10.0f);

8
soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c
View File

@ -281,7 +281,7 @@ void EnGe1_KickPlayer(EnGe1* this, PlayState* play) {
void EnGe1_SpotPlayer(EnGe1* this, PlayState* play) {
this->cutsceneTimer = 30;
this->actionFunc = EnGe1_KickPlayer;
func_8002DF54(play, &this->actor, 0x5F);
Player_SetCsActionWithHaltedActors(play, &this->actor, 0x5F);
func_80078884(NA_SE_SY_FOUND);
Message_StartTextbox(play, 0x6000, &this->actor);
}
@ -573,7 +573,7 @@ void EnGe1_WaitTillItemGiven_Archery(EnGe1* this, PlayState* play) {
}
if (!IS_RANDO || getItemEntry.getItemId == GI_NONE) {
func_8002F434(&this->actor, play, getItemId, 10000.0f, 50.0f);
Actor_OfferGetItem(&this->actor, play, getItemId, 10000.0f, 50.0f);
} else {
GiveItemEntryFromActor(&this->actor, play, getItemEntry, 10000.0f, 50.0f);
}
@ -614,7 +614,7 @@ void EnGe1_BeginGiveItem_Archery(EnGe1* this, PlayState* play) {
}
if (!IS_RANDO || getItemEntry.getItemId == GI_NONE) {
func_8002F434(&this->actor, play, getItemId, 10000.0f, 50.0f);
Actor_OfferGetItem(&this->actor, play, getItemId, 10000.0f, 50.0f);
} else {
GiveItemEntryFromActor(&this->actor, play, getItemEntry, 10000.0f, 50.0f);
}
@ -662,7 +662,7 @@ void EnGe1_BeginGame_Archery(EnGe1* this, PlayState* play) {
Flags_SetEventChkInf(EVENTCHKINF_PLAYED_HORSEBACK_ARCHERY);
if (!(player->stateFlags1 & PLAYER_STATE1_ON_HORSE)) {
func_8002DF54(play, &this->actor, 1);
Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
} else {
horse = Actor_FindNearby(play, &player->actor, ACTOR_EN_HORSE, ACTORCAT_BG, 1200.0f);
player->actor.freezeTimer = 1200;

6
soh/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c
View File

@ -472,7 +472,7 @@ void EnGe2_WaitTillCardGiven(EnGe2* this, PlayState* play) {
this->actionFunc = EnGe2_SetActionAfterTalk;
} else {
if (!IS_RANDO) {
func_8002F434(&this->actor, play, GI_GERUDO_CARD, 10000.0f, 50.0f);
Actor_OfferGetItem(&this->actor, play, GI_GERUDO_CARD, 10000.0f, 50.0f);
} else {
GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_GF_GERUDO_MEMBERSHIP_CARD, GI_GERUDO_CARD);
GiveItemEntryFromActor(&this->actor, play, getItemEntry, 10000.0f, 50.0f);
@ -486,7 +486,7 @@ void EnGe2_GiveCard(EnGe2* this, PlayState* play) {
this->actor.flags &= ~ACTOR_FLAG_WILL_TALK;
this->actionFunc = EnGe2_WaitTillCardGiven;
if (!IS_RANDO) {
func_8002F434(&this->actor, play, GI_GERUDO_CARD, 10000.0f, 50.0f);
Actor_OfferGetItem(&this->actor, play, GI_GERUDO_CARD, 10000.0f, 50.0f);
} else {
GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_GF_GERUDO_MEMBERSHIP_CARD, GI_GERUDO_CARD);
GiveItemEntryFromActor(&this->actor, play, getItemEntry, 10000.0f, 50.0f);
@ -510,7 +510,7 @@ void EnGe2_SetupCapturePlayer(EnGe2* this, PlayState* play) {
this->stateFlags |= GE2_STATE_CAPTURING;
this->actor.speedXZ = 0.0f;
EnGe2_ChangeAction(this, GE2_ACTION_CAPTURETURN);
func_8002DF54(play, &this->actor, 95);
Player_SetCsActionWithHaltedActors(play, &this->actor, 95);
func_80078884(NA_SE_SY_FOUND);
Message_StartTextbox(play, 0x6000, &this->actor);
}

6
soh/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c
View File

@ -145,7 +145,7 @@ void EnGe3_WaitTillCardGiven(EnGe3* this, PlayState* play) {
this->actionFunc = EnGe3_Wait;
} else {
if (!IS_RANDO) {
func_8002F434(&this->actor, play, GI_GERUDO_CARD, 10000.0f, 50.0f);
Actor_OfferGetItem(&this->actor, play, GI_GERUDO_CARD, 10000.0f, 50.0f);
} else {
GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_GF_GERUDO_MEMBERSHIP_CARD, GI_GERUDO_CARD);
GiveItemEntryFromActor(&this->actor, play, getItemEntry, 10000.0f, 50.0f);
@ -159,7 +159,7 @@ void EnGe3_GiveCard(EnGe3* this, PlayState* play) {
this->actor.flags &= ~ACTOR_FLAG_WILL_TALK;
this->actionFunc = EnGe3_WaitTillCardGiven;
if (!IS_RANDO) {
func_8002F434(&this->actor, play, GI_GERUDO_CARD, 10000.0f, 50.0f);
Actor_OfferGetItem(&this->actor, play, GI_GERUDO_CARD, 10000.0f, 50.0f);
} else {
GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_GF_GERUDO_MEMBERSHIP_CARD, GI_GERUDO_CARD);
GiveItemEntryFromActor(&this->actor, play, getItemEntry, 10000.0f, 50.0f);
@ -172,7 +172,7 @@ void EnGe3_ForceTalk(EnGe3* this, PlayState* play) {
this->actionFunc = EnGe3_GiveCard;
} else {
if (!(this->unk_30C & 4)) {
func_8002DF54(play, &this->actor, 7);
Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
this->unk_30C |= 4;
}
this->actor.textId = 0x6004;

2
soh/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c
View File

@ -918,7 +918,7 @@ void EnGeldB_SpinAttack(EnGeldB* this, PlayState* play) {
if (&player->actor == this->swordCollider.base.at) {
func_8002F71C(play, &this->actor, 6.0f, this->actor.yawTowardsPlayer, 6.0f);
this->spinAttackState = 2;
func_8002DF54(play, &this->actor, 0x18);
Player_SetCsActionWithHaltedActors(play, &this->actor, 0x18);
Message_StartTextbox(play, 0x6003, &this->actor);
this->timer = 30;
this->actor.speedXZ = 0.0f;

4
soh/src/overlays/actors/ovl_En_Gm/z_en_gm.c
View File

@ -250,7 +250,7 @@ void EnGm_ProcessChoiceIndex(EnGm* this, PlayState* play) {
this->actionFunc = func_80A3DD7C;
} else {
if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_MEDIGORON, true, this)) {
func_8002F434(&this->actor, play, GI_SWORD_KNIFE, 415.0f, 10.0f);
Actor_OfferGetItem(&this->actor, play, GI_SWORD_KNIFE, 415.0f, 10.0f);
}
this->actionFunc = func_80A3DF00;
@ -270,7 +270,7 @@ void func_80A3DF00(EnGm* this, PlayState* play) {
this->actor.parent = NULL;
this->actionFunc = func_80A3DF60;
} else {
func_8002F434(&this->actor, play, GI_SWORD_KNIFE, 415.0f, 10.0f);
Actor_OfferGetItem(&this->actor, play, GI_SWORD_KNIFE, 415.0f, 10.0f);
}
}

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

@ -229,7 +229,7 @@ s16 EnGo_UpdateTalkState(PlayState* play, Actor* thisx) {
talkState = NPC_TALK_STATE_IDLE;
break;
case 0x3036:
func_8002F434(thisx, play, GI_TUNIC_GORON, xzRange, yRange);
Actor_OfferGetItem(thisx, play, GI_TUNIC_GORON, xzRange, yRange);
Flags_SetInfTable(INFTABLE_10D); // EnGo exclusive flag
talkState = NPC_TALK_STATE_ACTION;
break;
@ -975,7 +975,7 @@ void EnGo_GetItem(EnGo* this, PlayState* play) {
yDist = fabsf(this->actor.yDistToPlayer) + 1.0f;
xzDist = this->actor.xzDistToPlayer + 1.0f;
func_8002F434(&this->actor, play, getItemId, xzDist, yDist);
Actor_OfferGetItem(&this->actor, play, getItemId, xzDist, yDist);
}
}

8
soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c
View File

@ -284,7 +284,7 @@ s32 EnGo2_SpawnDust(EnGo2* this, u8 initialTimer, f32 scale, f32 scaleStep, s32
void EnGo2_GetItem(EnGo2* this, PlayState* play, s32 getItemId) {
this->getItemId = getItemId;
if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_GORON, true, this)) {
func_8002F434(&this->actor, play, getItemId, this->actor.xzDistToPlayer + 1.0f,
Actor_OfferGetItem(&this->actor, play, getItemId, this->actor.xzDistToPlayer + 1.0f,
fabsf(this->actor.yDistToPlayer) + 1.0f);
}
}
@ -1799,7 +1799,7 @@ void EnGo2_SetupGetItem(EnGo2* this, PlayState* play) {
this->actor.parent = NULL;
this->actionFunc = EnGo2_SetGetItem;
} else {
func_8002F434(&this->actor, play, this->getItemId, this->actor.xzDistToPlayer + 1.0f, fabsf(this->actor.yDistToPlayer) + 1.0f);
Actor_OfferGetItem(&this->actor, play, this->getItemId, this->actor.xzDistToPlayer + 1.0f, fabsf(this->actor.yDistToPlayer) + 1.0f);
}
}
@ -1936,7 +1936,7 @@ void EnGo2_GoronFireGenericAction(EnGo2* this, PlayState* play) {
(f32)((Math_SinS(this->actor.world.rot.y) * -30.0f) + this->actor.world.pos.x);
player->actor.world.pos.z =
(f32)((Math_CosS(this->actor.world.rot.y) * -30.0f) + this->actor.world.pos.z);
func_8002DF54(play, &this->actor, 8);
Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
Audio_PlayFanfare(NA_BGM_APPEAR);
}
break;
@ -1973,7 +1973,7 @@ void EnGo2_GoronFireGenericAction(EnGo2* this, PlayState* play) {
case 4: // Finalize walking away
Message_CloseTextbox(play);
EnGo2_GoronFireClearCamera(this, play);
func_8002DF54(play, &this->actor, 7);
Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
Actor_Kill(&this->actor);
break;
case 1:

4
soh/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c
View File

@ -391,7 +391,7 @@ void EnHeishi1_WaitNight(EnHeishi1* this, PlayState* play) {
Message_StartTextbox(play, 0x702D, &this->actor);
func_80078884(NA_SE_SY_FOUND);
osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 発見！ ☆☆☆☆☆ \n" VT_RST); // "Discovered!"
func_8002DF54(play, &this->actor, 1);
Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
this->actionFunc = EnHeishi1_SetupKick;
}
}
@ -475,7 +475,7 @@ void EnHeishi1_Update(Actor* thisx, PlayState* play) {
func_80078884(NA_SE_SY_FOUND);
// "Discovered!"
osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 発見！ ☆☆☆☆☆ \n" VT_RST);
func_8002DF54(play, &this->actor, 1);
Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
sHeishi1PlayerIsCaught = true;
this->actionFunc = EnHeishi1_SetupMoveToLink;
}

14
soh/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c
View File

@ -112,7 +112,7 @@ void EnHeishi2_Init(Actor* thisx, PlayState* play) {
this->actor.world.pos.z += 90.0f;
this->actor.shape.rot.y = this->actor.world.rot.y;
Collider_DestroyCylinder(play, &this->collider);
func_8002DF54(play, 0, 8);
Player_SetCsActionWithHaltedActors(play, 0, 8);
this->actor.flags |= ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_UPDATE_WHILE_CULLED;
this->actionFunc = func_80A544AC;
}
@ -265,7 +265,7 @@ void func_80A5344C(EnHeishi2* this, PlayState* play) {
void func_80A53538(EnHeishi2* this, PlayState* play) {
SkelAnime_Update(&this->skelAnime);
if (this->unk_300 == Message_GetState(&play->msgCtx) && Message_ShouldAdvance(play)) {
func_8002DF54(play, NULL, 8);
Player_SetCsActionWithHaltedActors(play, NULL, 8);
play->msgCtx.msgMode = MSGMODE_PAUSED;
this->actionFunc = func_80A535BC;
}
@ -337,7 +337,7 @@ void func_80A53850(EnHeishi2* this, PlayState* play) {
Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_ACTIVE);
Message_CloseTextbox(play);
this->unk_30C = 1;
func_8002DF54(play, NULL, 7);
Player_SetCsActionWithHaltedActors(play, NULL, 7);
this->actionFunc = func_80A531E4;
}
}
@ -426,7 +426,7 @@ void func_80A53AD4(EnHeishi2* this, PlayState* play) {
void func_80A53C0C(EnHeishi2* this, PlayState* play) {
SkelAnime_Update(&this->skelAnime);
if ((this->unk_300 == Message_GetState(&play->msgCtx)) && Message_ShouldAdvance(play)) {
func_8002DF54(play, 0, 8);
Player_SetCsActionWithHaltedActors(play, 0, 8);
play->msgCtx.msgMode = MSGMODE_PAUSED;
this->actionFunc = func_80A53C90;
}
@ -510,7 +510,7 @@ void func_80A53F30(EnHeishi2* this, PlayState* play) {
this->actionFunc = func_80A54038;
} else {
Message_CloseTextbox(play);
func_8002DF54(play, NULL, 7);
Player_SetCsActionWithHaltedActors(play, NULL, 7);
this->actionFunc = func_80A53908;
}
} else {
@ -528,7 +528,7 @@ void func_80A54038(EnHeishi2* this, PlayState* play) {
if ((Message_GetState(&play->msgCtx) == TEXT_STATE_EVENT) && Message_ShouldAdvance(play)) {
Flags_SetInfTable(INFTABLE_SHOWED_ZELDAS_LETTER_TO_GATE_GUARD);
Message_CloseTextbox(play);
func_8002DF54(play, 0, 7);
Player_SetCsActionWithHaltedActors(play, 0, 7);
this->actionFunc = func_80A53908;
}
}
@ -653,7 +653,7 @@ void func_80A5455C(EnHeishi2* this, PlayState* play) {
EnBom* bomb;
if ((Message_GetState(&play->msgCtx) == TEXT_STATE_EVENT) && Message_ShouldAdvance(play)) {
func_8002DF54(play, NULL, 7);
Player_SetCsActionWithHaltedActors(play, NULL, 7);
Message_CloseTextbox(play);
pos.x = Rand_CenteredFloat(20.0f) + this->unk_274.x;

4
soh/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c
View File

@ -137,7 +137,7 @@ void EnHeishi3_StandSentinelInGrounds(EnHeishi3* this, PlayState* play) {
Message_StartTextbox(play, 0x702D, &this->actor);
func_80078884(NA_SE_SY_FOUND);
osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 発見！ ☆☆☆☆☆ \n" VT_RST); // "Discovered!"
func_8002DF54(play, &this->actor, 1);
Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
this->actionFunc = EnHeishi3_CatchStart;
}
}
@ -165,7 +165,7 @@ void EnHeishi3_StandSentinelInCastle(EnHeishi3* this, PlayState* play) {
Message_StartTextbox(play, 0x702D, &this->actor);
func_80078884(NA_SE_SY_FOUND);
osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 発見！ ☆☆☆☆☆ \n" VT_RST); // "Discovered!"
func_8002DF54(play, &this->actor, 1);
Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
this->actionFunc = EnHeishi3_CatchStart;
}
}

4
soh/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c
View File

@ -270,7 +270,7 @@ void func_80A56994(EnHeishi4* this, PlayState* play) {
if ((this->unk_282 == Message_GetState(&play->msgCtx)) && Message_ShouldAdvance(play)) {
Message_CloseTextbox(play);
Flags_SetInfTable(INFTABLE_6C);
func_8002DF54(play, NULL, 8);
Player_SetCsActionWithHaltedActors(play, NULL, 8);
this->actionFunc = func_80A56A50;
}
}
@ -288,7 +288,7 @@ void func_80A56ACC(EnHeishi4* this, PlayState* play) {
SkelAnime_Update(&this->skelAnime);
if (this->unk_288 <= currentFrame) {
func_8002DF54(play, NULL, 7);
Player_SetCsActionWithHaltedActors(play, NULL, 7);
this->actionFunc = func_80A5673C;
}
}

4
soh/src/overlays/actors/ovl_En_Hs/z_en_hs.c
View File

@ -162,7 +162,7 @@ void func_80A6E740(EnHs* this, PlayState* play) {
Flags_SetRandomizerInf(RAND_INF_ADULT_TRADES_LW_TRADE_COJIRO);
func_80A6E3A0(this, func_80A6E630);
} else {
func_8002F434(&this->actor, play, GI_ODD_MUSHROOM, 10000.0f, 50.0f);
Actor_OfferGetItem(&this->actor, play, GI_ODD_MUSHROOM, 10000.0f, 50.0f);
}
this->unk_2A8 |= 1;
@ -174,7 +174,7 @@ void func_80A6E7BC(EnHs* this, PlayState* play) {
case 0:
func_80A6E3A0(this, func_80A6E740);
if (GameInteractor_Should(GI_VB_TRADE_COJIRO, true, this)) {
func_8002F434(&this->actor, play, GI_ODD_MUSHROOM, 10000.0f, 50.0f);
Actor_OfferGetItem(&this->actor, play, GI_ODD_MUSHROOM, 10000.0f, 50.0f);
}
break;
case 1:

4
soh/src/overlays/actors/ovl_En_Hy/z_en_hy.c
View File

@ -411,7 +411,7 @@ s32 EnHy_IsOsAnimeObjectLoaded(EnHy* this, PlayState* play) {
void func_80A6F7CC(EnHy* this, PlayState* play, s32 getItemId) {
this->unkGetItemId = getItemId;
func_8002F434(&this->actor, play, getItemId, this->actor.xzDistToPlayer + 1.0f,
Actor_OfferGetItem(&this->actor, play, getItemId, this->actor.xzDistToPlayer + 1.0f,
fabsf(this->actor.yDistToPlayer) + 1.0f);
}
@ -1069,7 +1069,7 @@ void func_80A714C4(EnHy* this, PlayState* play) {
this->actionFunc = func_80A71530;
} else {
if (!IS_RANDO || this->getItemEntry.getItemId == GI_NONE) {
func_8002F434(&this->actor, play, this->unkGetItemId, this->actor.xzDistToPlayer + 1.0f, fabsf(this->actor.yDistToPlayer) + 1.0f);
Actor_OfferGetItem(&this->actor, play, this->unkGetItemId, this->actor.xzDistToPlayer + 1.0f, fabsf(this->actor.yDistToPlayer) + 1.0f);
} else {
GiveItemEntryFromActor(&this->actor, play, this->getItemEntry, this->actor.xzDistToPlayer + 1.0f, fabsf(this->actor.yDistToPlayer) + 1.0f);
}

2
soh/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c
View File

@ -216,7 +216,7 @@ void EnIceHono_CapturableFlame(EnIceHono* this, PlayState* play) {
this->actor.parent = NULL;
} else if (EnIceHono_InBottleRange(this, play)) {
// GI_MAX in this case allows the player to catch the actor in a bottle
func_8002F434(&this->actor, play, GI_MAX, 60.0f, 100.0f);
Actor_OfferGetItem(&this->actor, play, GI_MAX, 60.0f, 100.0f);
}
if (this->actor.xzDistToPlayer < 200.0f) {

4
soh/src/overlays/actors/ovl_En_In/z_en_in.c
View File

@ -434,7 +434,7 @@ void func_80A79BAC(EnIn* this, PlayState* play, s32 index, u32 transitionType) {
}
play->transitionType = transitionType;
play->transitionTrigger = TRANS_TRIGGER_START;
func_8002DF54(play, &this->actor, 8);
Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
Interface_ChangeAlpha(1);
if (index == 0) {
AREG(6) = 0;
@ -856,7 +856,7 @@ void func_80A7ABD4(EnIn* this, PlayState* play) {
void func_80A7AE84(EnIn* this, PlayState* play) {
Play_ChangeCameraStatus(play, this->activeCamId, CAM_STAT_ACTIVE);
Play_ClearCamera(play, this->camId);
func_8002DF54(play, &this->actor, 7);
Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
Interface_ChangeAlpha(0x32);
this->actionFunc = func_80A7AEF0;
}

2
soh/src/overlays/actors/ovl_En_Insect/z_en_insect.c
View File

@ -786,7 +786,7 @@ void EnInsect_Update(Actor* thisx, PlayState* play) {
if (!(this->unk_314 & 8) && D_80A7DEB4 < 4 && EnInsect_InBottleRange(this, play) &&
// GI_MAX in this case allows the player to catch the actor in a bottle
func_8002F434(&this->actor, play, GI_MAX, 60.0f, 30.0f)) {
Actor_OfferGetItem(&this->actor, play, GI_MAX, 60.0f, 30.0f)) {
D_80A7DEB4++;
}
}

4
soh/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c
View File

@ -379,9 +379,9 @@ void EnIshi_Wait(EnIshi* this, PlayState* play) {
if (this->actor.xzDistToPlayer < 90.0f) {
// GI_NONE in these cases allows the player to lift the actor
if (type == ROCK_LARGE) {
func_8002F434(&this->actor, play, GI_NONE, 80.0f, 20.0f);
Actor_OfferGetItem(&this->actor, play, GI_NONE, 80.0f, 20.0f);
} else {
func_8002F434(&this->actor, play, GI_NONE, 50.0f, 10.0f);
Actor_OfferGetItem(&this->actor, play, GI_NONE, 50.0f, 10.0f);
}
}
}

2
soh/src/overlays/actors/ovl_En_Js/z_en_js.c
View File

@ -136,7 +136,7 @@ void func_80A89160(EnJs* this, PlayState* play) {
GetItemEntry itemEntry = ItemTable_Retrieve(GI_BOMBCHUS_10);
gSaveContext.pendingSale = itemEntry.itemId;
gSaveContext.pendingSaleMod = itemEntry.modIndex;
func_8002F434(&this->actor, play, GI_BOMBCHUS_10, 10000.0f, 50.0f);
Actor_OfferGetItem(&this->actor, play, GI_BOMBCHUS_10, 10000.0f, 50.0f);
}
}

6
soh/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c
View File

@ -260,7 +260,7 @@ void func_80A8F8D0(EnKakasi* this, PlayState* play) {
void func_80A8F9C8(EnKakasi* this, PlayState* play) {
func_80A8F28C(this);
SkelAnime_Update(&this->skelanime);
func_8002DF54(play, NULL, 8);
Player_SetCsActionWithHaltedActors(play, NULL, 8);
if (this->unk_196 == Message_GetState(&play->msgCtx) && Message_ShouldAdvance(play)) {
@ -269,7 +269,7 @@ void func_80A8F9C8(EnKakasi* this, PlayState* play) {
}
this->camId = OnePointCutscene_Init(play, 2270, -99, &this->actor, MAIN_CAM);
play->msgCtx.msgMode = MSGMODE_PAUSED;
func_8002DF54(play, NULL, 8);
Player_SetCsActionWithHaltedActors(play, NULL, 8);
func_8010BD58(play, OCARINA_ACTION_SCARECROW_LONG_PLAYBACK);
this->actionFunc = func_80A8FAA4;
}
@ -308,7 +308,7 @@ void func_80A8FBB8(EnKakasi* this, PlayState* play) {
if (this->unk_196 == Message_GetState(&play->msgCtx) && Message_ShouldAdvance(play)) {
func_8005B1A4(play->cameraPtrs[this->camId]);
Message_CloseTextbox(play);
func_8002DF54(play, NULL, 7);
Player_SetCsActionWithHaltedActors(play, NULL, 7);
this->actionFunc = func_80A8F660;
}
}

10
soh/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c
View File

@ -296,7 +296,7 @@ void func_80A91620(EnKakasi3* this, PlayState* play) {
if (play->msgCtx.ocarinaMode == OCARINA_MODE_03 && play->msgCtx.msgMode == MSGMODE_NONE) {
this->dialogState = TEXT_STATE_EVENT;
Message_StartTextbox(play, 0x40A5, NULL);
func_8002DF54(play, NULL, 8);
Player_SetCsActionWithHaltedActors(play, NULL, 8);
this->actionFunc = func_80A91A90;
return;
}
@ -354,7 +354,7 @@ void func_80A918E4(EnKakasi3* this, PlayState* play) {
this->dialogState = TEXT_STATE_EVENT;
OnePointCutscene_EndCutscene(play, this->camId);
this->camId = SUBCAM_NONE;
func_8002DF54(play, NULL, 8);
Player_SetCsActionWithHaltedActors(play, NULL, 8);
this->actionFunc = func_80A91A90;
return;
}
@ -370,7 +370,7 @@ void func_80A918E4(EnKakasi3* this, PlayState* play) {
this->unk_195 = true;
Message_StartTextbox(play, 0x40A7, NULL);
this->dialogState = TEXT_STATE_EVENT;
func_8002DF54(play, NULL, 8);
Player_SetCsActionWithHaltedActors(play, NULL, 8);
this->actionFunc = func_80A91A90;
return;
}
@ -384,7 +384,7 @@ void func_80A918E4(EnKakasi3* this, PlayState* play) {
void func_80A91A90(EnKakasi3* this, PlayState* play) {
func_80A90E28(this);
SkelAnime_Update(&this->skelAnime);
func_8002DF54(play, NULL, 8);
Player_SetCsActionWithHaltedActors(play, NULL, 8);
if (this->dialogState == Message_GetState(&play->msgCtx) && Message_ShouldAdvance(play)) {
if (this->unk_195) {
@ -400,7 +400,7 @@ void func_80A91A90(EnKakasi3* this, PlayState* play) {
}
Message_CloseTextbox(play);
play->msgCtx.ocarinaMode = OCARINA_MODE_04;
func_8002DF54(play, NULL, 7);
Player_SetCsActionWithHaltedActors(play, NULL, 7);
this->actionFunc = func_80A911F0;
}
}

2
soh/src/overlays/actors/ovl_En_Ko/z_en_ko.c
View File

@ -1215,7 +1215,7 @@ void func_80A99504(EnKo* this, PlayState* play) {
this->actor.parent = NULL;
this->actionFunc = func_80A99560;
} else {
func_8002F434(&this->actor, play, GI_SAW, 120.0f, 10.0f);
Actor_OfferGetItem(&this->actor, play, GI_SAW, 120.0f, 10.0f);
}
}

6
soh/src/overlays/actors/ovl_En_Kz/z_en_kz.c
View File

@ -396,7 +396,7 @@ void EnKz_SetupMweep(EnKz* this, PlayState* play) {
initPos.y += -100.0f;
initPos.z += 260.0f;
Play_CameraSetAtEye(play, this->cutsceneCamera, &pos, &initPos);
func_8002DF54(play, &this->actor, 8);
Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
this->actor.speedXZ = 0.1f * CVarGetInteger("gMweepSpeed", 1);
this->actionFunc = EnKz_Mweep;
}
@ -428,7 +428,7 @@ void EnKz_Mweep(EnKz* this, PlayState* play) {
void EnKz_StopMweep(EnKz* this, PlayState* play) {
Play_ChangeCameraStatus(play, this->gameplayCamera, CAM_STAT_ACTIVE);
Play_ClearCamera(play, this->cutsceneCamera);
func_8002DF54(play, &this->actor, 7);
Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
this->actionFunc = EnKz_Wait;
}
@ -463,7 +463,7 @@ void EnKz_SetupGetItem(EnKz* this, PlayState* play) {
getItemId = this->isTrading ? GI_FROG : GI_TUNIC_ZORA;
yRange = fabsf(this->actor.yDistToPlayer) + 1.0f;
xzRange = this->actor.xzDistToPlayer + 1.0f;
func_8002F434(&this->actor, play, getItemId, xzRange, yRange);
Actor_OfferGetItem(&this->actor, play, getItemId, xzRange, yRange);
}
}

2
soh/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c
View File

@ -335,7 +335,7 @@ void func_80AA0EA0(EnMa1* this, PlayState* play) {
this->actor.parent = NULL;
this->actionFunc = func_80AA0EFC;
} else {
func_8002F434(&this->actor, play, GI_WEIRD_EGG, 120.0f, 10.0f);
Actor_OfferGetItem(&this->actor, play, GI_WEIRD_EGG, 120.0f, 10.0f);
}
}

8
soh/src/overlays/actors/ovl_En_Mk/z_en_mk.c
View File

@ -102,7 +102,7 @@ void func_80AACA94(EnMk* this, PlayState* play) {
gSaveContext.eventInf[1] &= ~1;
}
} else {
func_8002F434(&this->actor, play, GI_EYEDROPS, 10000.0f, 50.0f);
Actor_OfferGetItem(&this->actor, play, GI_EYEDROPS, 10000.0f, 50.0f);
}
}
@ -110,7 +110,7 @@ void func_80AACB14(EnMk* this, PlayState* play) {
if (Actor_TextboxIsClosing(&this->actor, play)) {
this->actionFunc = func_80AACA94;
if (GameInteractor_Should(GI_VB_TRADE_FROG, true, this)) {
func_8002F434(&this->actor, play, GI_EYEDROPS, 10000.0f, 50.0f);
Actor_OfferGetItem(&this->actor, play, GI_EYEDROPS, 10000.0f, 50.0f);
}
}
}
@ -205,7 +205,7 @@ void func_80AACFA0(EnMk* this, PlayState* play) {
this->actionFunc = func_80AACA40;
Flags_SetItemGetInf(ITEMGETINF_10);
} else {
func_8002F434(&this->actor, play, GI_HEART_PIECE, 10000.0f, 50.0f);
Actor_OfferGetItem(&this->actor, play, GI_HEART_PIECE, 10000.0f, 50.0f);
}
}
@ -213,7 +213,7 @@ void func_80AAD014(EnMk* this, PlayState* play) {
if (Actor_TextboxIsClosing(&this->actor, play)) {
this->actionFunc = func_80AACFA0;
if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_LAB_DIVE, true, this)) {
func_8002F434(&this->actor, play, GI_HEART_PIECE, 10000.0f, 50.0f);
Actor_OfferGetItem(&this->actor, play, GI_HEART_PIECE, 10000.0f, 50.0f);
}
}

4
soh/src/overlays/actors/ovl_En_Ms/z_en_ms.c
View File

@ -134,7 +134,7 @@ void EnMs_Talk(EnMs* this, PlayState* play) {
}
if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_MAGIC_BEAN_SALESMAN, true, this)) {
func_8002F434(&this->actor, play, GI_BEAN, 90.0f, 10.0f);
Actor_OfferGetItem(&this->actor, play, GI_BEAN, 90.0f, 10.0f);
this->actionFunc = EnMs_Sell;
}
return;
@ -152,7 +152,7 @@ void EnMs_Sell(EnMs* this, PlayState* play) {
this->actor.parent = NULL;
this->actionFunc = EnMs_TalkAfterPurchase;
} else {
func_8002F434(&this->actor, play, GI_BEAN, 90.0f, 10.0f);
Actor_OfferGetItem(&this->actor, play, GI_BEAN, 90.0f, 10.0f);
}
}

2
soh/src/overlays/actors/ovl_En_Niw/z_en_niw.c
View File

@ -467,7 +467,7 @@ void func_80AB6450(EnNiw* this, PlayState* play) {
this->actionFunc = func_80AB6BF8;
} else {
// GI_NONE in this case allows the player to lift the actor
func_8002F434(&this->actor, play, GI_NONE, 25.0f, 10.0f);
Actor_OfferGetItem(&this->actor, play, GI_NONE, 25.0f, 10.0f);
func_80AB5BF8(this, play, 1);
}
}

10
soh/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c
View File

@ -314,7 +314,7 @@ void func_80ABA654(EnNiwLady* this, PlayState* play) {
if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_ANJU_AS_CHILD, true, this)) {
this->getItemId = GI_BOTTLE;
func_8002F434(&this->actor, play, GI_BOTTLE, 100.0f, 50.0f);
Actor_OfferGetItem(&this->actor, play, GI_BOTTLE, 100.0f, 50.0f);
} else {
// Circumvent the item offer action
this->actionFunc = func_80ABAC84;
@ -327,7 +327,7 @@ void func_80ABA654(EnNiwLady* this, PlayState* play) {
}
if (this->unk_26C == 1) {
this->getItemId = GI_RUPEE_PURPLE;
func_8002F434(&this->actor, play, GI_RUPEE_PURPLE, 100.0f, 50.0f);
Actor_OfferGetItem(&this->actor, play, GI_RUPEE_PURPLE, 100.0f, 50.0f);
this->actionFunc = func_80ABAC00;
}
this->actionFunc = func_80ABA244;
@ -405,7 +405,7 @@ void func_80ABA9B8(EnNiwLady* this, PlayState* play) {
this->actor.parent = NULL;
if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_ANJU_AS_ADULT, true, this)) {
func_8002F434(&this->actor, play, GI_POCKET_EGG, 200.0f, 100.0f);
Actor_OfferGetItem(&this->actor, play, GI_POCKET_EGG, 200.0f, 100.0f);
this->actionFunc = func_80ABAC00;
} else {
// Circumvent the item offer action
@ -440,7 +440,7 @@ void func_80ABAB08(EnNiwLady* this, PlayState* play) {
Message_CloseTextbox(play);
this->actor.parent = NULL;
if (GameInteractor_Should(GI_VB_TRADE_POCKET_CUCCO, true, this)) {
func_8002F434(&this->actor, play, GI_COJIRO, 200.0f, 100.0f);
Actor_OfferGetItem(&this->actor, play, GI_COJIRO, 200.0f, 100.0f);
this->actionFunc = func_80ABAC00;
} else {
// Circumvent the item offer action
@ -471,7 +471,7 @@ void func_80ABAC00(EnNiwLady* this, PlayState* play) {
if (LINK_IS_ADULT) {
getItemId = !Flags_GetItemGetInf(ITEMGETINF_2C) ? GI_POCKET_EGG : GI_COJIRO;
}
func_8002F434(&this->actor, play, getItemId, 200.0f, 100.0f);
Actor_OfferGetItem(&this->actor, play, getItemId, 200.0f, 100.0f);
}
}

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

@ -1389,7 +1389,7 @@ void EnOssan_GiveItemWithFanfare(PlayState* play, EnOssan* this) {
osSyncPrintf("\n" VT_FGCOL(YELLOW) "初めて手にいれた！！" VT_RST "\n\n");
if (!IS_RANDO) {
func_8002F434(&this->actor, play, this->shelfSlots[this->cursorIndex]->getItemId, 120.0f, 120.0f);
Actor_OfferGetItem(&this->actor, play, this->shelfSlots[this->cursorIndex]->getItemId, 120.0f, 120.0f);
} else {
ShopItemIdentity shopItemIdentity = Randomizer_IdentifyShopItem(play->sceneNum, this->cursorIndex);
// en_ossan/en_girla are also used for the happy mask shop, which never has randomized items
@ -1398,7 +1398,7 @@ void EnOssan_GiveItemWithFanfare(PlayState* play, EnOssan* this) {
GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(shopItemIdentity.randomizerCheck, shopItemIdentity.ogItemId);
GiveItemEntryFromActor(&this->actor, play, getItemEntry, 120.0f, 120.0f);
} else {
func_8002F434(&this->actor, play, this->shelfSlots[this->cursorIndex]->getItemId, 120.0f, 120.0f);
Actor_OfferGetItem(&this->actor, play, this->shelfSlots[this->cursorIndex]->getItemId, 120.0f, 120.0f);
}
}
play->msgCtx.msgMode = MSGMODE_TEXT_CLOSING;
@ -1736,7 +1736,7 @@ void EnOssan_State_GiveItemWithFanfare(EnOssan* this, PlayState* play, Player* p
return;
}
if (!IS_RANDO) {
func_8002F434(&this->actor, play, this->shelfSlots[this->cursorIndex]->getItemId, 120.0f, 120.0f);
Actor_OfferGetItem(&this->actor, play, this->shelfSlots[this->cursorIndex]->getItemId, 120.0f, 120.0f);
} else {
ShopItemIdentity shopItemIdentity = Randomizer_IdentifyShopItem(play->sceneNum, this->cursorIndex);
// en_ossan/en_girla are also used for the happy mask shop, which never has randomized items
@ -1746,7 +1746,7 @@ void EnOssan_State_GiveItemWithFanfare(EnOssan* this, PlayState* play, Player* p
Randomizer_GetItemFromKnownCheck(shopItemIdentity.randomizerCheck, shopItemIdentity.ogItemId);
GiveItemEntryFromActor(&this->actor, play, getItemEntry, 120.0f, 120.0f);
} else {
func_8002F434(&this->actor, play, this->shelfSlots[this->cursorIndex]->getItemId, 120.0f, 120.0f);
Actor_OfferGetItem(&this->actor, play, this->shelfSlots[this->cursorIndex]->getItemId, 120.0f, 120.0f);
}
}
}

6
soh/src/overlays/actors/ovl_En_Owl/z_en_owl.c
View File

@ -345,7 +345,7 @@ void func_80ACA71C(EnOwl* this) {
}
void func_80ACA76C(EnOwl* this, PlayState* play) {
func_8002DF54(play, &this->actor, 8);
Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
if (Actor_TextboxIsClosing(&this->actor, play)) {
Audio_QueueSeqCmd(0x1 << 28 | SEQ_PLAYER_FANFARE << 24 | 0xFF);
@ -355,7 +355,7 @@ void func_80ACA76C(EnOwl* this, PlayState* play) {
}
void func_80ACA7E0(EnOwl* this, PlayState* play) {
func_8002DF54(play, &this->actor, 8);
Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
if (Actor_TextboxIsClosing(&this->actor, play)) {
Audio_QueueSeqCmd(0x1 << 28 | SEQ_PLAYER_FANFARE << 24 | 0xFF);
@ -565,7 +565,7 @@ void EnOwl_WaitLakeHylia(EnOwl* this, PlayState* play) {
}
void func_80ACB03C(EnOwl* this, PlayState* play) {
func_8002DF54(play, &this->actor, 8);
Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
if (Actor_TextboxIsClosing(&this->actor, play)) {
Audio_QueueSeqCmd(0x1 << 28 | SEQ_PLAYER_FANFARE << 24 | 0xFF);

12
soh/src/overlays/actors/ovl_En_Skj/z_en_skj.c
View File

@ -1040,7 +1040,7 @@ void EnSkj_SariaSongTalk(EnSkj* this, PlayState* play) {
} else {
func_80AFFE24(this);
if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_SKULL_KID_SARIAS_SONG, true, this)) {
func_8002F434(&this->actor, play, GI_HEART_PIECE, EnSkj_GetItemXzRange(this), EnSkj_GetItemYRange(this));
Actor_OfferGetItem(&this->actor, play, GI_HEART_PIECE, EnSkj_GetItemXzRange(this), EnSkj_GetItemYRange(this));
}
}
}
@ -1056,7 +1056,7 @@ void func_80AFFE44(EnSkj* this, PlayState* play) {
EnSkj_SetupPostSariasSong(this);
} else {
if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_SKULL_KID_SARIAS_SONG, true, this)) {
func_8002F434(&this->actor, play, GI_HEART_PIECE, EnSkj_GetItemXzRange(this), EnSkj_GetItemYRange(this));
Actor_OfferGetItem(&this->actor, play, GI_HEART_PIECE, EnSkj_GetItemXzRange(this), EnSkj_GetItemYRange(this));
}
}
}
@ -1080,7 +1080,7 @@ void EnSkj_SetupMaskTrade(EnSkj* this) {
void EnSkj_StartMaskTrade(EnSkj* this, PlayState* play) {
u8 sp1F = Message_GetState(&play->msgCtx);
func_8002DF54(play, &this->actor, 1);
Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
if ((sp1F == TEXT_STATE_DONE) && Message_ShouldAdvance(play)) {
EnSkj_JumpFromStump(this);
}
@ -1178,7 +1178,7 @@ void EnSkj_SetupWaitForMaskTextClear(EnSkj* this) {
void EnSkj_WaitForMaskTextClear(EnSkj* this, PlayState* play) {
if ((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play)) {
func_8002DF54(play, &this->actor, 7);
Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
this->backflipFlag = 1;
EnSkj_Backflip(this);
}
@ -1553,7 +1553,7 @@ void EnSkj_WaitToGiveReward(EnSkj* this, PlayState* play) {
GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_LW_OCARINA_MEMORY_GAME, GI_HEART_PIECE);
GiveItemEntryFromActor(&this->actor, play, getItemEntry, 26.0f, 26.0f);
} else {
func_8002F434(&this->actor, play, sOcarinaGameRewards[gSaveContext.ocarinaGameRoundNum], 26.0f, 26.0f);
Actor_OfferGetItem(&this->actor, play, sOcarinaGameRewards[gSaveContext.ocarinaGameRoundNum], 26.0f, 26.0f);
}
this->actionFunc = EnSkj_GiveOcarinaGameReward;
@ -1569,7 +1569,7 @@ void EnSkj_GiveOcarinaGameReward(EnSkj* this, PlayState* play) {
GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_LW_OCARINA_MEMORY_GAME, GI_HEART_PIECE);
GiveItemEntryFromActor(&this->actor, play, getItemEntry, 26.0f, 26.0f);
} else {
func_8002F434(&this->actor, play, sOcarinaGameRewards[gSaveContext.ocarinaGameRoundNum], 26.0f, 26.0f);
Actor_OfferGetItem(&this->actor, play, sOcarinaGameRewards[gSaveContext.ocarinaGameRoundNum], 26.0f, 26.0f);
}
}
}

2
soh/src/overlays/actors/ovl_En_Sth/z_en_sth.c
View File

@ -302,7 +302,7 @@ void EnSth_GivePlayerItem(EnSth* this, PlayState* play) {
}
if (!IS_RANDO || getItemEntry.getItemId == GI_NONE) {
func_8002F434(&this->actor, play, getItemId, 10000.0f, 50.0f);
Actor_OfferGetItem(&this->actor, play, getItemId, 10000.0f, 50.0f);
} else {
GiveItemEntryFromActor(&this->actor, play, getItemEntry, 10000.0f, 50.0f);
}

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

@ -387,7 +387,7 @@ void EnSyatekiMan_EndGame(EnSyatekiMan* this, PlayState* play) {
}
}
if (GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_SHOOTING_GALLERY, true, this)) {
func_8002F434(&this->actor, play, this->getItemId, 2000.0f, 1000.0f);
Actor_OfferGetItem(&this->actor, play, this->getItemId, 2000.0f, 1000.0f);
}
this->actionFunc = EnSyatekiMan_GivePrize;
break;
@ -421,7 +421,7 @@ void EnSyatekiMan_GivePrize(EnSyatekiMan* this, PlayState* play) {
if (Actor_HasParent(&this->actor, play) || !GameInteractor_Should(GI_VB_GIVE_ITEM_FROM_SHOOTING_GALLERY, true, this)) {
this->actionFunc = EnSyatekiMan_FinishPrize;
} else {
func_8002F434(&this->actor, play, this->getItemId, 2000.0f, 1000.0f);
Actor_OfferGetItem(&this->actor, play, this->getItemId, 2000.0f, 1000.0f);
}
}

18
soh/src/overlays/actors/ovl_En_Ta/z_en_ta.c
View File

@ -707,7 +707,7 @@ void func_80B154FC(EnTa* this, PlayState* play) {
switch (EnTa_GetSuperCuccosCount(this, play)) {
case 1:
gSaveContext.timer1State = 0;
func_8002DF54(play, &this->actor, 1);
Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
Message_StartTextbox(play, 0x2084, &this->actor);
this->actionFunc = func_80B15424;
@ -749,7 +749,7 @@ void func_80B154FC(EnTa* this, PlayState* play) {
this->unk_2E0 &= ~0x200;
func_80078884(NA_SE_SY_FOUND);
gSaveContext.timer1State = 0;
func_8002DF54(play, &this->actor, 1);
Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
Message_StartTextbox(play, 0x2081, &this->actor);
this->actionFunc = func_80B15424;
func_80B14E28(this, play);
@ -802,7 +802,7 @@ void func_80B1585C(EnTa* this, PlayState* play) {
Animation_Change(&this->skelAnime, &gTalonSitWakeUpAnim, 1.0f,
Animation_GetLastFrame(&gTalonSitWakeUpAnim) - 1.0f,
Animation_GetLastFrame(&gTalonSitWakeUpAnim), ANIMMODE_ONCE, 10.0f);
func_8002DF54(play, &this->actor, 7);
Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
}
}
@ -817,7 +817,7 @@ void func_80B15AD4(EnTa* this, PlayState* play) {
func_800F5ACC(NA_BGM_TIMED_MINI_GAME);
this->unk_2E0 |= 0x200;
Message_CloseTextbox(play);
func_8002DF54(play, &this->actor, 1);
Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
}
if ((Message_GetState(&play->msgCtx) == TEXT_STATE_EVENT) && Message_ShouldAdvance(play)) {
@ -877,10 +877,10 @@ void func_80B15E80(EnTa* this, PlayState* play) {
}
this->unk_2E0 &= ~0x2;
} else if (this->unk_2E0 & 2) {
func_8002F434(&this->actor, play, GI_MILK, 10000.0f, 50.0f);
Actor_OfferGetItem(&this->actor, play, GI_MILK, 10000.0f, 50.0f);
} else {
if (!IS_RANDO) {
func_8002F434(&this->actor, play, GI_MILK_BOTTLE, 10000.0f, 50.0f);
Actor_OfferGetItem(&this->actor, play, GI_MILK_BOTTLE, 10000.0f, 50.0f);
} else {
GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_LLR_TALONS_CHICKENS, GI_MILK_BOTTLE);
GiveItemEntryFromActor(&this->actor, play, getItemEntry, 10000.0f, 50.0f);
@ -895,7 +895,7 @@ void func_80B15F54(EnTa* this, PlayState* play) {
this->unk_2E0 &= ~0x2;
func_80B13AA0(this, func_80B15E80, func_80B16938);
if (!IS_RANDO) {
func_8002F434(&this->actor, play, GI_MILK_BOTTLE, 10000.0f, 50.0f);
Actor_OfferGetItem(&this->actor, play, GI_MILK_BOTTLE, 10000.0f, 50.0f);
} else {
GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_LLR_TALONS_CHICKENS, GI_MILK_BOTTLE);
GiveItemEntryFromActor(&this->actor, play, getItemEntry, 10000.0f, 50.0f);
@ -923,7 +923,7 @@ void func_80B15FE8(EnTa* this, PlayState* play) {
GetItemEntry itemEntry = ItemTable_Retrieve(GI_MILK);
gSaveContext.pendingSale = itemEntry.itemId;
gSaveContext.pendingSaleMod = itemEntry.modIndex;
func_8002F434(&this->actor, play, GI_MILK, 10000.0f, 50.0f);
Actor_OfferGetItem(&this->actor, play, GI_MILK, 10000.0f, 50.0f);
break;
}
break;
@ -1014,7 +1014,7 @@ void func_80B1642C(EnTa* this, PlayState* play) {
Message_CloseTextbox(play);
this->unk_2E0 |= 2;
func_80B13AA0(this, func_80B15E80, func_80B16938);
func_8002F434(&this->actor, play, GI_MILK, 10000.0f, 50.0f);
Actor_OfferGetItem(&this->actor, play, GI_MILK, 10000.0f, 50.0f);
} else {
Message_ContinueTextbox(play, 0x208A);
func_80B13AA0(this, func_80B15E28, func_80B16938);

4
soh/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c
View File

@ -147,7 +147,7 @@ void func_80B17934(EnTakaraMan* this, PlayState* play) {
Rupees_ChangeBy(-10);
this->unk_214 = 1;
this->actor.parent = NULL;
func_8002F434(&this->actor, play, GI_DOOR_KEY, 2000.0f, 1000.0f);
Actor_OfferGetItem(&this->actor, play, GI_DOOR_KEY, 2000.0f, 1000.0f);
this->actionFunc = func_80B17A6C;
} else {
Message_CloseTextbox(play);
@ -172,7 +172,7 @@ void func_80B17A6C(EnTakaraMan* this, PlayState* play) {
if (Actor_HasParent(&this->actor, play)) {
this->actionFunc = func_80B17AC4;
} else {
func_8002F434(&this->actor, play, GI_DOOR_KEY, 2000.0f, 1000.0f);
Actor_OfferGetItem(&this->actor, play, GI_DOOR_KEY, 2000.0f, 1000.0f);
}
}

2
soh/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c
View File

@ -317,7 +317,7 @@ void func_80B20768(EnToryo* this, PlayState* play) {
this->unk_1E4 = 5;
Flags_SetRandomizerInf(RAND_INF_ADULT_TRADES_GV_TRADE_SAW);
} else {
func_8002F434(&this->actor, play, GI_SWORD_BROKEN, 100.0f, 10.0f);
Actor_OfferGetItem(&this->actor, play, GI_SWORD_BROKEN, 100.0f, 10.0f);
}
return;
}

4
soh/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c
View File

@ -196,7 +196,7 @@ void func_80B3A3D4(EnWonderTalk2* this, PlayState* play) {
}
this->actor.flags &= ~(ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_UPDATE_WHILE_CULLED);
if (GameInteractor_Should(GI_VB_WONDER_TALK, true, this)) {
func_8002DF54(play, NULL, 7);
Player_SetCsActionWithHaltedActors(play, NULL, 7);
}
this->unk_156 = true;
this->actionFunc = func_80B3A4F8;
@ -257,7 +257,7 @@ void func_80B3A4F8(EnWonderTalk2* this, PlayState* play) {
if (!this->unk_156) {
if (GameInteractor_Should(GI_VB_WONDER_TALK, true, this)) {
Message_StartTextbox(play, this->actor.textId, NULL);
func_8002DF54(play, NULL, 8);
Player_SetCsActionWithHaltedActors(play, NULL, 8);
}
this->actor.flags |= ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_UPDATE_WHILE_CULLED;
this->actionFunc = func_80B3A3D4;

8
soh/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c
View File

@ -421,7 +421,7 @@ void func_80B4BBC4(EnZl1* this, PlayState* play) {
Player* player = GET_PLAYER(play);
Animation_Change(&this->skelAnime, &gChildZelda1Anim_00438, 1.0f, 0.0f, frameCount, ANIMMODE_LOOP, 0.0f);
func_8002DF54(play, &this->actor, 1);
Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
Player_PlaySfx(&player->actor, NA_SE_VO_LI_SURPRISE_KID);
this->actor.textId = 0x7039;
Message_StartTextbox(play, this->actor.textId, NULL);
@ -510,7 +510,7 @@ void func_80B4BF2C(EnZl1* this, PlayState* play) {
if ((Message_GetState(msgCtx) == TEXT_STATE_EVENT) && Message_ShouldAdvance(play)) {
this->actor.textId = 0xFFFF;
play->talkWithPlayer(play, &this->actor);
func_8002F434(&this->actor, play, GI_LETTER_ZELDA, 120.0f, 10.0f);
Actor_OfferGetItem(&this->actor, play, GI_LETTER_ZELDA, 120.0f, 10.0f);
play->msgCtx.msgMode = MSGMODE_TEXT_CLOSING;
play->msgCtx.stateTimer = 4;
this->unk_1E2++;
@ -525,7 +525,7 @@ void func_80B4BF2C(EnZl1* this, PlayState* play) {
this->actor.parent = NULL;
this->unk_1E2++;
} else {
func_8002F434(&this->actor, play, GI_LETTER_ZELDA, 120.0f, 10.0f);
Actor_OfferGetItem(&this->actor, play, GI_LETTER_ZELDA, 120.0f, 10.0f);
}
break;
case 3:
@ -554,7 +554,7 @@ void func_80B4BF2C(EnZl1* this, PlayState* play) {
break;
case 6:
if (Actor_TextboxIsClosing(&this->actor, play)) {
func_8002DF54(play, &this->actor, 7);
Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
Interface_ChangeAlpha(50);
this->actor.flags &= ~ACTOR_FLAG_PLAYER_TALKED_TO;
this->unk_1E2 = 4;

12
soh/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c
View File

@ -325,7 +325,7 @@ s32 EnZl4_SetupFromLegendCs(EnZl4* this, PlayState* play) {
Actor* playerx = &GET_PLAYER(play)->actor;
s16 rotY;
func_8002DF54(play, &this->actor, 8);
Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
playerx->world.pos = this->actor.world.pos;
rotY = this->actor.shape.rot.y;
playerx->world.pos.x += 56.0f * Math_SinS(rotY);
@ -911,7 +911,7 @@ s32 EnZl4_CsLookWindow(EnZl4* this, PlayState* play) {
play->csCtx.segment = SEGMENTED_TO_VIRTUAL(gZeldasCourtyardGanonCs);
gSaveContext.cutsceneTrigger = 1;
this->talkState++;
func_8002DF54(play, &this->actor, 8);
Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
}
break;
case 2:
@ -921,7 +921,7 @@ s32 EnZl4_CsLookWindow(EnZl4* this, PlayState* play) {
}
} else {
func_800AA000(0.0f, 0xA0, 0xA, 0x28);
func_8002DF54(play, &this->actor, 1);
Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ZL4_ANIM_30);
EnZl4_SetCsCameraAngle(play, 11);
Message_StartTextbox(play, 0x7039, NULL);
@ -1109,7 +1109,7 @@ s32 EnZl4_CsMakePlan(EnZl4* this, PlayState* play) {
this->talkState = 7;
play->talkWithPlayer(play, &this->actor);
if (GameInteractor_Should(GI_VB_GIVE_ITEM_ZELDAS_LETTER, true, NULL)) {
func_8002F434(&this->actor, play, GI_LETTER_ZELDA, fabsf(this->actor.xzDistToPlayer) + 1.0f,
Actor_OfferGetItem(&this->actor, play, GI_LETTER_ZELDA, fabsf(this->actor.xzDistToPlayer) + 1.0f,
fabsf(this->actor.yDistToPlayer) + 1.0f);
}
play->msgCtx.stateTimer = 4;
@ -1121,7 +1121,7 @@ s32 EnZl4_CsMakePlan(EnZl4* this, PlayState* play) {
Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ZL4_ANIM_0);
this->talkState++;
} else {
func_8002F434(&this->actor, play, GI_LETTER_ZELDA, fabsf(this->actor.xzDistToPlayer) + 1.0f,
Actor_OfferGetItem(&this->actor, play, GI_LETTER_ZELDA, fabsf(this->actor.xzDistToPlayer) + 1.0f,
fabsf(this->actor.yDistToPlayer) + 1.0f);
}
// no break here is required for matching
@ -1189,7 +1189,7 @@ void EnZl4_Cutscene(EnZl4* this, PlayState* play) {
break;
case ZL4_CS_PLAN:
if (EnZl4_CsMakePlan(this, play)) {
func_8002DF54(play, &this->actor, 7);
Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
gSaveContext.unk_13EE = 0x32;
Flags_SetEventChkInf(EVENTCHKINF_OBTAINED_ZELDAS_LETTER);
this->actionFunc = EnZl4_Idle;

8
soh/src/overlays/actors/ovl_En_fHG/z_en_fhg.c
View File

@ -153,7 +153,7 @@ void EnfHG_Intro(EnfHG* this, PlayState* play) {
break;
}
func_80064520(play, &play->csCtx);
func_8002DF54(play, &this->actor, 8);
Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
this->cutsceneCamera = Play_CreateSubCamera(play);
Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_WAIT);
Play_ChangeCameraStatus(play, this->cutsceneCamera, CAM_STAT_ACTIVE);
@ -193,7 +193,7 @@ void EnfHG_Intro(EnfHG* this, PlayState* play) {
Audio_PlayActorSound2(&this->actor, NA_SE_EV_GANON_HORSE_GROAN);
}
if (this->timers[0] == 20) {
func_8002DF54(play, &this->actor, 9);
Player_SetCsActionWithHaltedActors(play, &this->actor, 9);
}
if (this->timers[0] == 1) {
Audio_QueueSeqCmd(SEQ_PLAYER_BGM_MAIN << 24 | NA_BGM_OPENING_GANON);
@ -354,7 +354,7 @@ void EnfHG_Intro(EnfHG* this, PlayState* play) {
this->bossGndSignal = FHG_FINISH;
}
if (this->timers[0] == 170) {
func_8002DF54(play, &this->actor, 8);
Player_SetCsActionWithHaltedActors(play, &this->actor, 8);
Audio_PlayActorSound2(&this->actor, NA_SE_EN_FANTOM_MASIC2);
}
Math_ApproachF(&this->cameraEye.z, this->cameraPanZ + (GND_BOSSROOM_CENTER_Z + 100.0f), 0.1f,
@ -401,7 +401,7 @@ void EnfHG_Intro(EnfHG* this, PlayState* play) {
func_800C08AC(play, this->cutsceneCamera, 0);
this->cutsceneCamera = 0;
func_80064534(play, &play->csCtx);
func_8002DF54(play, &this->actor, 7);
Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
this->actionFunc = EnfHG_Retreat;
}
break;

14
soh/src/overlays/actors/ovl_Fishing/z_fishing.c
View File

@ -5160,7 +5160,7 @@ void Fishing_HandleOwnerDialog(Fishing* this, PlayState* play) {
this->actor.parent = NULL;
if (!IS_RANDO || getItemEntry.getItemId == GI_NONE) {
func_8002F434(&this->actor, play, getItemId, 2000.0f, 1000.0f);
Actor_OfferGetItem(&this->actor, play, getItemId, 2000.0f, 1000.0f);
} else {
GiveItemEntryFromActor(&this->actor, play, getItemEntry, 2000.0f, 1000.0f);
}
@ -5215,7 +5215,7 @@ void Fishing_HandleOwnerDialog(Fishing* this, PlayState* play) {
this->stateAndTimer = 24;
} else {
if (!IS_RANDO) {
func_8002F434(&this->actor, play, GI_SCALE_GOLD, 2000.0f, 1000.0f);
Actor_OfferGetItem(&this->actor, play, GI_SCALE_GOLD, 2000.0f, 1000.0f);
} else {
GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_LH_ADULT_FISHING, GI_SCALE_GOLD);
GiveItemEntryFromActor(&this->actor, play, getItemEntry, 2000.0f, 1000.0f);
@ -5572,7 +5572,7 @@ void Fishing_UpdateOwner(Actor* thisx, PlayState* play2) {
sSubCamId = Play_CreateSubCamera(play);
Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_WAIT);
Play_ChangeCameraStatus(play, sSubCamId, CAM_STAT_ACTIVE);
func_8002DF54(play, &this->actor, 5);
Player_SetCsActionWithHaltedActors(play, &this->actor, 5);
mainCam = Play_GetCamera(play, MAIN_CAM);
sCameraEye.x = mainCam->eye.x;
sCameraEye.y = mainCam->eye.y;
@ -5604,7 +5604,7 @@ void Fishing_UpdateOwner(Actor* thisx, PlayState* play2) {
mainCam->at = sCameraAt;
func_800C08AC(play, sSubCamId, 0);
func_80064534(play, &play->csCtx);
func_8002DF54(play, &this->actor, 7);
Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
sFishingPlayerCinematicState = 0;
sSubCamId = 0;
sFishingCinematicTimer = 30;
@ -5620,7 +5620,7 @@ void Fishing_UpdateOwner(Actor* thisx, PlayState* play2) {
sSubCamId = Play_CreateSubCamera(play);
Play_ChangeCameraStatus(play, MAIN_CAM, CAM_STAT_WAIT);
Play_ChangeCameraStatus(play, sSubCamId, CAM_STAT_ACTIVE);
func_8002DF54(play, &this->actor, 5);
Player_SetCsActionWithHaltedActors(play, &this->actor, 5);
mainCam = Play_GetCamera(play, MAIN_CAM);
sCameraEye.x = mainCam->eye.x;
sCameraEye.y = mainCam->eye.y;
@ -5639,7 +5639,7 @@ void Fishing_UpdateOwner(Actor* thisx, PlayState* play2) {
if ((sFishingCinematicTimer == 0) && Message_ShouldAdvance(play)) {
sFishingPlayerCinematicState = 22;
sFishingCinematicTimer = 40;
func_8002DF54(play, &this->actor, 0x1C);
Player_SetCsActionWithHaltedActors(play, &this->actor, 0x1C);
sSinkingLureHeldY = 0.0f;
}
break;
@ -5708,7 +5708,7 @@ void Fishing_UpdateOwner(Actor* thisx, PlayState* play2) {
mainCam->at = sCameraAt;
func_800C08AC(play, sSubCamId, 0);
func_80064534(play, &play->csCtx);
func_8002DF54(play, &this->actor, 7);
Player_SetCsActionWithHaltedActors(play, &this->actor, 7);
sFishingPlayerCinematicState = 0;
sSubCamId = 0;
player->unk_860 = -5;

2
soh/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c
View File

@ -59,7 +59,7 @@ void ItemBHeart_Update(Actor* thisx, PlayState* play) {
Flags_SetCollectible(play, 0x1F);
Actor_Kill(&this->actor);
} else {
func_8002F434(&this->actor, play, GI_HEART_CONTAINER_2, 30.0f, 40.0f);
Actor_OfferGetItem(&this->actor, play, GI_HEART_CONTAINER_2, 30.0f, 40.0f);
}
}

4
soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c
View File

@ -134,7 +134,7 @@ void func_80B85824(ItemEtcetera* this, PlayState* play) {
Actor_Kill(&this->actor);
} else {
if (!IS_RANDO) {
func_8002F434(&this->actor, play, this->getItemId, 30.0f, 50.0f);
Actor_OfferGetItem(&this->actor, play, this->getItemId, 30.0f, 50.0f);
} else {
GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_LH_SUN, GI_ARROW_FIRE);
GiveItemEntryFromActor(&this->actor, play, getItemEntry, 30.0f, 50.0f);
@ -157,7 +157,7 @@ void func_80B858B4(ItemEtcetera* this, PlayState* play) {
if (0) {} // Necessary to match
if (!IS_RANDO) {
func_8002F434(&this->actor, play, this->getItemId, 30.0f, 50.0f);
Actor_OfferGetItem(&this->actor, play, this->getItemId, 30.0f, 50.0f);
} else {
GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_LH_UNDERWATER_ITEM, GI_LETTER_RUTO);
GiveItemEntryFromActor(&this->actor, play, getItemEntry, 30.0f, 50.0f);

2
soh/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c
View File

@ -190,7 +190,7 @@ void ItemOcarina_WaitInWater(ItemOcarina* this, PlayState* play) {
this->actor.draw = NULL;
} else {
if (GameInteractor_Should(GI_VB_GIVE_ITEM_OCARINA_OF_TIME, true, NULL)) {
func_8002F434(&this->actor, play, GI_OCARINA_OOT, 30.0f, 50.0f);
Actor_OfferGetItem(&this->actor, play, GI_OCARINA_OOT, 30.0f, 50.0f);
}
if ((play->gameplayFrames & 13) == 0) {

4
soh/src/overlays/actors/ovl_Item_Shield/z_item_shield.c
View File

@ -103,7 +103,7 @@ void func_80B86AC8(ItemShield* this, PlayState* play) {
Actor_Kill(&this->actor);
return;
}
func_8002F434(&this->actor, play, GI_SHIELD_DEKU, 30.0f, 50.0f);
Actor_OfferGetItem(&this->actor, play, GI_SHIELD_DEKU, 30.0f, 50.0f);
Actor_UpdateBgCheckInfo(play, &this->actor, 10.0f, 10.0f, 0.0f, 5);
if (this->actor.bgCheckFlags & 1) {
this->timer--;
@ -125,7 +125,7 @@ void func_80B86BC8(ItemShield* this, PlayState* play) {
Actor_Kill(&this->actor);
return;
}
func_8002F434(&this->actor, play, GI_SHIELD_DEKU, 30.0f, 50.0f);
Actor_OfferGetItem(&this->actor, play, GI_SHIELD_DEKU, 30.0f, 50.0f);
if (this->collider.base.acFlags & AC_HIT) {
ItemShield_SetupAction(this, func_80B86AC8);
this->actor.velocity.y = 4.0f;

2
soh/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c
View File

@ -274,7 +274,7 @@ void ObjTsubo_Idle(ObjTsubo* this, PlayState* play) {
phi_v1 = ABS(temp_v0);
if (phi_v1 >= 0x5556) {
// GI_NONE in this case allows the player to lift the actor
func_8002F434(&this->actor, play, GI_NONE, 30.0f, 30.0f);
Actor_OfferGetItem(&this->actor, play, GI_NONE, 30.0f, 30.0f);
}
}
}

10
soh/src/overlays/actors/ovl_player_actor/z_player.c
View File

@ -11477,11 +11477,11 @@ void Player_UpdateCommon(Player* this, PlayState* play, Input* input) {
CsCmdActorAction* linkActionCsCmd = play->csCtx.linkAction;
if ((linkActionCsCmd != NULL) && (D_808547C4[linkActionCsCmd->action] != 0)) {
func_8002DF54(play, NULL, 6);
Player_SetCsActionWithHaltedActors(play, NULL, 6);
Player_ZeroSpeedXZ(this);
} else if ((this->csAction == 0) && !(this->stateFlags2 & PLAYER_STATE2_UNDERWATER) &&
(play->csCtx.state != CS_STATE_UNSKIPPABLE_INIT)) {
func_8002DF54(play, NULL, 0x31);
Player_SetCsActionWithHaltedActors(play, NULL, 0x31);
Player_ZeroSpeedXZ(this);
}
}
@ -15342,7 +15342,7 @@ void func_808515A4(PlayState* play, Player* this, CsCmdActorAction* arg2) {
void func_80851688(PlayState* play, Player* this, CsCmdActorAction* arg2) {
if (func_8084B3CC(play, this) == 0) {
if ((this->csAction == 0x31) && (play->csCtx.state == CS_STATE_IDLE)) {
func_8002DF54(play, NULL, 7);
Player_SetCsActionWithHaltedActors(play, NULL, 7);
return;
}
@ -15923,7 +15923,7 @@ void func_80852C50(PlayState* play, Player* this, CsCmdActorAction* arg2) {
s32 sp24;
if (play->csCtx.state == CS_STATE_UNSKIPPABLE_INIT) {
func_8002DF54(play, NULL, 7);
Player_SetCsActionWithHaltedActors(play, NULL, 7);
this->cueId = 0;
Player_ZeroSpeedXZ(this);
return;
@ -16065,7 +16065,7 @@ void Player_StartTalking(PlayState* play, Actor* actor) {
this->exchangeItemId = EXCH_ITEM_NONE;
if (actor->textId == 0xFFFF) {
func_8002DF54(play, actor, 1);
Player_SetCsActionWithHaltedActors(play, actor, 1);
actor->flags |= ACTOR_FLAG_PLAYER_TALKED_TO;
func_80832528(play, this);
} else {