mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-08-18 22:07:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

z_player documentation 2024-10-11 (#4407)

Browse Source 
* Add names to start of typedefs

* Idle stuff

* 2 functions

* Player state flags

* Name functions + misc

* ActionChange => ActionHandler

* Some player unks

* More player unks

* Header misc

* Misc

* More misc

* Player Actions

* Missed comments

* Move ship specific stuff

* Fix build

* CsCmdActorAction to CsCmdActorCue

* Fix build
This commit is contained in:
Pepe20129
2024-10-17 20:55:31 +02:00
committed by GitHub
parent 3c5d9faba3
commit b5c6545d6f
65 changed files with 3603 additions and 2562 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/src/code/z_actor.c
+40 -40
View File
@@ -486,7 +486,7 @@ void func_8002C124(TargetContext* targetCtx, PlayState* play) {
func_8002BE64(targetCtx, targetCtx->unk_4C, spBC.x, spBC.y, spBC.z);
if ((!(player->stateFlags1 & PLAYER_STATE1_TEXT_ON_SCREEN)) || (actor != player->unk_664)) {
if ((!(player->stateFlags1 & PLAYER_STATE1_TALKING)) || (actor != player->focusActor)) {
OVERLAY_DISP = Gfx_SetupDL(OVERLAY_DISP, 0x39);
for (spB0 = 0, spAC = targetCtx->unk_4C; spB0 < spB8; spB0++, spAC = (spAC + 1) % 3) {
@@ -564,7 +564,7 @@ void func_8002C7BC(TargetContext* targetCtx, Player* player, Actor* actorArg, Pl
unkActor = NULL;
if ((player->unk_664 != NULL) && (player->unk_84B[player->unk_846] == 2)) {
if ((player->focusActor != NULL) && (player->controlStickDirections[player->controlStickDataIndex] == 2)) {
targetCtx->unk_94 = NULL;
} else {
func_80032AF0(play, &play->actorCtx, &unkActor, player);
@@ -1397,7 +1397,7 @@ s32 func_8002DD78(Player* player) {
s32 func_8002DDA8(PlayState* play) {
Player* player = GET_PLAYER(play);
return (player->stateFlags1 & PLAYER_STATE1_ITEM_OVER_HEAD) || func_8002DD78(player);
return (player->stateFlags1 & PLAYER_STATE1_CARRYING_ACTOR) || func_8002DD78(player);
}
s32 func_8002DDE4(PlayState* play) {
@@ -1448,7 +1448,7 @@ s32 func_8002DF38(PlayState* play, Actor* actor, u8 csAction) {
player->csAction = csAction;
player->csActor = actor;
player->doorBgCamIndex = 0;
player->cv.haltActorsDuringCsAction = false;
return true;
}
@@ -1457,7 +1457,7 @@ s32 Player_SetCsActionWithHaltedActors(PlayState* play, Actor* actor, u8 csActio
Player* player = GET_PLAYER(play);
func_8002DF38(play, actor, csAction);
player->doorBgCamIndex = 1;
player->cv.haltActorsDuringCsAction = true;
return true;
}
@@ -1854,7 +1854,7 @@ f32 func_8002EFC0(Actor* actor, Player* player, s16 arg2) {
s16 yawTemp = (s16)(actor->yawTowardsPlayer - 0x8000) - arg2;
s16 yawTempAbs = ABS(yawTemp);
if (player->unk_664 != NULL) {
if (player->focusActor != NULL) {
if ((yawTempAbs > 0x4000) || (actor->flags & ACTOR_FLAG_NO_LOCKON)) {
return FLT_MAX;
} else {
@@ -1900,7 +1900,7 @@ s32 func_8002F0C8(Actor* actor, Player* player, s32 flag) {
s16 abs_var = ABS(var);
f32 dist;
if ((player->unk_664 == NULL) && (abs_var > 0x2AAA)) {
if ((player->focusActor == NULL) && (abs_var > 0x2AAA)) {
dist = FLT_MAX;
} else {
dist = actor->xyzDistToPlayerSq;
@@ -1927,13 +1927,13 @@ s32 func_8002F1C4(Actor* actor, PlayState* play, f32 arg2, f32 arg3, u32 exchang
// This is convoluted but it seems like it must be a single if statement to match
if ((player->actor.flags & ACTOR_FLAG_PLAYER_TALKED_TO) || ((exchangeItemId != EXCH_ITEM_NONE) && Player_InCsMode(play)) ||
(!actor->isTargeted &&
((arg3 < fabsf(actor->yDistToPlayer)) || (player->targetActorDistance < actor->xzDistToPlayer) ||
((arg3 < fabsf(actor->yDistToPlayer)) || (player->talkActorDistance < actor->xzDistToPlayer) ||
(arg2 < actor->xzDistToPlayer)))) {
return false;
}
player->targetActor = actor;
player->targetActorDistance = actor->xzDistToPlayer;
player->talkActor = actor;
player->talkActorDistance = actor->xzDistToPlayer;
player->exchangeItemId = exchangeItemId;
return true;
@@ -2002,7 +2002,7 @@ s32 GiveItemEntryWithoutActor(PlayState* play, GetItemEntry getItemEntry) {
Player_GetExplosiveHeld(player) < 0) {
if (((player->heldActor != NULL) && ((getItemEntry.getItemId > GI_NONE) && (getItemEntry.getItemId < GI_MAX)) ||
(IS_RANDO && (getItemEntry.getItemId > RG_NONE) && (getItemEntry.getItemId < RG_MAX))) ||
(!(player->stateFlags1 & (PLAYER_STATE1_ITEM_OVER_HEAD | PLAYER_STATE1_IN_CUTSCENE)))) {
(!(player->stateFlags1 & (PLAYER_STATE1_CARRYING_ACTOR | PLAYER_STATE1_IN_CUTSCENE)))) {
if ((getItemEntry.getItemId != GI_NONE)) {
player->getItemEntry = getItemEntry;
player->getItemId = getItemEntry.getItemId;
@@ -2039,10 +2039,10 @@ s32 GiveItemEntryFromActor(Actor* actor, PlayState* play, GetItemEntry getItemEn
(PLAYER_STATE1_DEAD | PLAYER_STATE1_CHARGING_SPIN_ATTACK | PLAYER_STATE1_HANGING_OFF_LEDGE | PLAYER_STATE1_CLIMBING_LEDGE |
PLAYER_STATE1_JUMPING | PLAYER_STATE1_FREEFALL | PLAYER_STATE1_FIRST_PERSON | PLAYER_STATE1_CLIMBING_LADDER)) &&
Player_GetExplosiveHeld(player) < 0) {
if ((((player->heldActor != NULL) || (actor == player->targetActor)) &&
if ((((player->heldActor != NULL) || (actor == player->talkActor)) &&
((!IS_RANDO && ((getItemEntry.getItemId > GI_NONE) && (getItemEntry.getItemId < GI_MAX))) ||
(IS_RANDO && ((getItemEntry.getItemId > RG_NONE) && (getItemEntry.getItemId < RG_MAX))))) ||
(!(player->stateFlags1 & (PLAYER_STATE1_ITEM_OVER_HEAD | PLAYER_STATE1_IN_CUTSCENE)))) {
(!(player->stateFlags1 & (PLAYER_STATE1_CARRYING_ACTOR | PLAYER_STATE1_IN_CUTSCENE)))) {
if ((actor->xzDistToPlayer < xzRange) && (fabsf(actor->yDistToPlayer) < yRange)) {
s16 yawDiff = actor->yawTowardsPlayer - player->actor.shape.rot.y;
s32 absYawDiff = ABS(yawDiff);
@@ -2083,9 +2083,9 @@ s32 Actor_OfferGetItem(Actor* actor, PlayState* play, s32 getItemId, f32 xzRange
(PLAYER_STATE1_DEAD | PLAYER_STATE1_CHARGING_SPIN_ATTACK | PLAYER_STATE1_HANGING_OFF_LEDGE | PLAYER_STATE1_CLIMBING_LEDGE |
PLAYER_STATE1_JUMPING | PLAYER_STATE1_FREEFALL | PLAYER_STATE1_FIRST_PERSON | PLAYER_STATE1_CLIMBING_LADDER)) &&
Player_GetExplosiveHeld(player) < 0) {
if ((((player->heldActor != NULL) || (actor == player->targetActor)) &&
if ((((player->heldActor != NULL) || (actor == player->talkActor)) &&
((!IS_RANDO && ((getItemId > GI_NONE) && (getItemId < GI_MAX))) || (IS_RANDO && ((getItemId > RG_NONE) && (getItemId < RG_MAX))))) ||
(!(player->stateFlags1 & (PLAYER_STATE1_ITEM_OVER_HEAD | PLAYER_STATE1_IN_CUTSCENE)))) {
(!(player->stateFlags1 & (PLAYER_STATE1_CARRYING_ACTOR | PLAYER_STATE1_IN_CUTSCENE)))) {
if ((actor->xzDistToPlayer < xzRange) && (fabsf(actor->yDistToPlayer) < yRange)) {
s16 yawDiff = actor->yawTowardsPlayer - player->actor.shape.rot.y;
s32 absYawDiff = ABS(yawDiff);
@@ -2156,7 +2156,7 @@ u32 Actor_SetRideActor(PlayState* play, Actor* horse, s32 mountSide) {
Player* player = GET_PLAYER(play);
if (!(player->stateFlags1 &
(PLAYER_STATE1_DEAD | PLAYER_STATE1_ITEM_OVER_HEAD | PLAYER_STATE1_CHARGING_SPIN_ATTACK | PLAYER_STATE1_HANGING_OFF_LEDGE |
(PLAYER_STATE1_DEAD | PLAYER_STATE1_CARRYING_ACTOR | PLAYER_STATE1_CHARGING_SPIN_ATTACK | PLAYER_STATE1_HANGING_OFF_LEDGE |
PLAYER_STATE1_CLIMBING_LEDGE | PLAYER_STATE1_JUMPING | PLAYER_STATE1_FREEFALL | PLAYER_STATE1_FIRST_PERSON | PLAYER_STATE1_CLIMBING_LADDER))) {
player->rideActor = horse;
player->mountSide = mountSide;
@@ -2177,11 +2177,11 @@ s32 Actor_NotMounted(PlayState* play, Actor* horse) {
void func_8002F698(PlayState* play, Actor* actor, f32 arg2, s16 arg3, f32 arg4, u32 arg5, u32 arg6) {
Player* player = GET_PLAYER(play);
player->unk_8A0 = arg6;
player->unk_8A1 = arg5;
player->unk_8A2 = arg3;
player->unk_8A4 = arg2;
player->unk_8A8 = arg4;
player->knockbackDamage = arg6;
player->knockbackType = arg5;
player->knockbackRot = arg3;
player->knockbackSpeed = arg2;
player->knockbackYVelocity = arg4;
}
void func_8002F6D4(PlayState* play, Actor* actor, f32 arg2, s16 arg3, f32 arg4, u32 arg5) {
@@ -2502,18 +2502,18 @@ void func_800304DC(PlayState* play, ActorContext* actorCtx, ActorEntry* actorEnt
}
u32 D_80116068[ACTORCAT_MAX] = {
PLAYER_STATE1_TEXT_ON_SCREEN | PLAYER_STATE1_DEAD | PLAYER_STATE1_IN_ITEM_CS,
PLAYER_STATE1_TEXT_ON_SCREEN | PLAYER_STATE1_DEAD | PLAYER_STATE1_IN_ITEM_CS,
PLAYER_STATE1_TALKING | PLAYER_STATE1_DEAD | PLAYER_STATE1_IN_ITEM_CS,
PLAYER_STATE1_TALKING | PLAYER_STATE1_DEAD | PLAYER_STATE1_IN_ITEM_CS,
0,
PLAYER_STATE1_TEXT_ON_SCREEN | PLAYER_STATE1_GETTING_ITEM | PLAYER_STATE1_DEAD | PLAYER_STATE1_IN_ITEM_CS,
PLAYER_STATE1_TALKING | PLAYER_STATE1_GETTING_ITEM | PLAYER_STATE1_DEAD | PLAYER_STATE1_IN_ITEM_CS,
PLAYER_STATE1_DEAD,
PLAYER_STATE1_TEXT_ON_SCREEN | PLAYER_STATE1_DEAD | PLAYER_STATE1_IN_ITEM_CS | PLAYER_STATE1_IN_CUTSCENE,
PLAYER_STATE1_TALKING | PLAYER_STATE1_DEAD | PLAYER_STATE1_IN_ITEM_CS | PLAYER_STATE1_IN_CUTSCENE,
PLAYER_STATE1_DEAD | PLAYER_STATE1_IN_ITEM_CS,
0,
PLAYER_STATE1_TEXT_ON_SCREEN | PLAYER_STATE1_DEAD | PLAYER_STATE1_IN_ITEM_CS | PLAYER_STATE1_IN_CUTSCENE,
PLAYER_STATE1_TEXT_ON_SCREEN | PLAYER_STATE1_GETTING_ITEM | PLAYER_STATE1_DEAD | PLAYER_STATE1_IN_ITEM_CS,
PLAYER_STATE1_TALKING | PLAYER_STATE1_DEAD | PLAYER_STATE1_IN_ITEM_CS | PLAYER_STATE1_IN_CUTSCENE,
PLAYER_STATE1_TALKING | PLAYER_STATE1_GETTING_ITEM | PLAYER_STATE1_DEAD | PLAYER_STATE1_IN_ITEM_CS,
0,
PLAYER_STATE1_TEXT_ON_SCREEN | PLAYER_STATE1_DEAD | PLAYER_STATE1_IN_ITEM_CS,
PLAYER_STATE1_TALKING | PLAYER_STATE1_DEAD | PLAYER_STATE1_IN_ITEM_CS,
};
void Actor_UpdateAll(PlayState* play, ActorContext* actorCtx) {
@@ -2558,8 +2558,8 @@ void Actor_UpdateAll(PlayState* play, ActorContext* actorCtx) {
unkFlag = ACTOR_FLAG_NO_FREEZE_OCARINA;
}
if ((player->stateFlags1 & PLAYER_STATE1_TEXT_ON_SCREEN) && ((player->actor.textId & 0xFF00) != 0x600)) {
sp74 = player->targetActor;
if ((player->stateFlags1 & PLAYER_STATE1_TALKING) && ((player->actor.textId & 0xFF00) != 0x600)) {
sp74 = player->talkActor;
}
for (i = 0; i < ARRAY_COUNT(actorCtx->actorLists); i++, sp80++) {
@@ -2613,13 +2613,13 @@ void Actor_UpdateAll(PlayState* play, ActorContext* actorCtx) {
actor->flags &= ~ACTOR_FLAG_PLAY_HIT_SFX;
if ((DECR(actor->freezeTimer) == 0) && (actor->flags & (ACTOR_FLAG_UPDATE_WHILE_CULLED | ACTOR_FLAG_ACTIVE))) {
if (actor == player->unk_664) {
if (actor == player->focusActor) {
actor->isTargeted = true;
} else {
actor->isTargeted = false;
}
if ((actor->targetPriority != 0) && (player->unk_664 == NULL)) {
if ((actor->targetPriority != 0) && (player->focusActor == NULL)) {
actor->targetPriority = 0;
}
@@ -2643,14 +2643,14 @@ void Actor_UpdateAll(PlayState* play, ActorContext* actorCtx) {
}
}
actor = player->unk_664;
actor = player->focusActor;
if ((actor != NULL) && (actor->update == NULL)) {
actor = NULL;
func_8008EDF0(player);
Player_ReleaseLockOn(player);
}
if ((actor == NULL) || (player->unk_66C < 5)) {
if ((actor == NULL) || (player->zTargetActiveTimer < 5)) {
actor = NULL;
if (actorCtx->targetCtx.unk_4B != 0) {
actorCtx->targetCtx.unk_4B = 0;
@@ -3429,8 +3429,8 @@ Actor* Actor_Delete(ActorContext* actorCtx, Actor* actor, PlayState* play) {
osSyncPrintf("アクタークラス削除 [%s]\n", dbEntry->name); // "Actor class deleted [%s]"
}
if ((player != NULL) && (actor == player->unk_664)) {
func_8008EDF0(player);
if ((player != NULL) && (actor == player->focusActor)) {
Player_ReleaseLockOn(player);
Camera_ChangeMode(Play_GetCamera(play, Play_GetActiveCamId(play)), 0);
}
@@ -3484,7 +3484,7 @@ void func_800328D4(PlayState* play, ActorContext* actorCtx, Player* player, u32
Vec3f sp70;
actor = actorCtx->actorLists[actorCategory].head;
sp84 = player->unk_664;
sp84 = player->focusActor;
while (actor != NULL) {
if ((actor->update != NULL) && ((Player*)actor != player) && CHECK_FLAG_ALL(actor->flags, ACTOR_FLAG_TARGETABLE)) {
@@ -3985,7 +3985,7 @@ s16 Actor_TestFloorInDirection(Actor* actor, PlayState* play, f32 distance, s16
s32 Actor_IsTargeted(PlayState* play, Actor* actor) {
Player* player = GET_PLAYER(play);
if ((player->stateFlags1 & PLAYER_STATE1_ENEMY_TARGET) && actor->isTargeted) {
if ((player->stateFlags1 & PLAYER_STATE1_HOSTILE_LOCK_ON) && actor->isTargeted) {
return true;
} else {
return false;
@@ -3998,7 +3998,7 @@ s32 Actor_IsTargeted(PlayState* play, Actor* actor) {
s32 Actor_OtherIsTargeted(PlayState* play, Actor* actor) {
Player* player = GET_PLAYER(play);
if ((player->stateFlags1 & PLAYER_STATE1_ENEMY_TARGET) && !actor->isTargeted) {
if ((player->stateFlags1 & PLAYER_STATE1_HOSTILE_LOCK_ON) && !actor->isTargeted) {
return true;
} else {
return false;
soh/src/code/z_camera.c
+1 -1
View File
@@ -6182,7 +6182,7 @@ s32 Camera_Demo5(Camera* camera) {
sp4A = playerhead.rot.y - playerTargetGeo.yaw;
if (camera->target->category == ACTORCAT_PLAYER) {
pad = camera->play->state.frames - sDemo5PrevAction12Frame;
if (player->stateFlags1 & PLAYER_STATE1_ITEM_OVER_HEAD) {
if (player->stateFlags1 & PLAYER_STATE1_CARRYING_ACTOR) {
// holding object over head.
Player_SetCsActionWithHaltedActors(camera->play, camera->target, 8);
} else if (ABS(pad) > 3000) {
soh/src/code/z_parameter.c
+1 -1
View File
@@ -4051,7 +4051,7 @@ void Interface_DrawEnemyHealthBar(TargetContext* targetCtx, PlayState* play) {
Interface_CreateQuadVertexGroup(&sEnemyHealthVtx[12], -floorf(halfBarWidth) + endTexWidth, (-texHeight / 2) + 3,
healthBarFill, 7, 0);
if (((!(player->stateFlags1 & PLAYER_STATE1_TEXT_ON_SCREEN)) || (actor != player->unk_664)) && targetCtx->unk_44 < 500.0f) {
if (((!(player->stateFlags1 & PLAYER_STATE1_TALKING)) || (actor != player->focusActor)) && targetCtx->unk_44 < 500.0f) {
f32 slideInOffsetY = 0;
// Slide in the health bar from edge of the screen (mimic the Z-Target triangles fly in)
soh/src/code/z_player_lib.c
+128 -102
View File
@@ -34,73 +34,73 @@ s16 sBootData[PLAYER_BOOTS_MAX][17] = {
// Used to map action params to model groups
u8 sActionModelGroups[] = {
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_NONE
PLAYER_MODELGROUP_15, // PLAYER_IA_LAST_USED
PLAYER_MODELGROUP_10, // PLAYER_IA_FISHING_POLE
PLAYER_MODELGROUP_SWORD, // PLAYER_IA_SWORD_MASTER
PLAYER_MODELGROUP_SWORD, // PLAYER_IA_SWORD_KOKIRI
PLAYER_MODELGROUP_BGS, // PLAYER_IA_SWORD_BIGGORON
PLAYER_MODELGROUP_10, // PLAYER_IA_DEKU_STICK
PLAYER_MODELGROUP_HAMMER, // PLAYER_IA_HAMMER
PLAYER_MODELGROUP_BOW_SLINGSHOT, // PLAYER_IA_BOW
PLAYER_MODELGROUP_BOW_SLINGSHOT, // PLAYER_IA_BOW_FIRE
PLAYER_MODELGROUP_BOW_SLINGSHOT, // PLAYER_IA_BOW_ICE
PLAYER_MODELGROUP_BOW_SLINGSHOT, // PLAYER_IA_BOW_LIGHT
PLAYER_MODELGROUP_BOW_SLINGSHOT, // PLAYER_IA_BOW_0C
PLAYER_MODELGROUP_BOW_SLINGSHOT, // PLAYER_IA_BOW_0D
PLAYER_MODELGROUP_BOW_SLINGSHOT, // PLAYER_IA_BOW_0E
PLAYER_MODELGROUP_BOW_SLINGSHOT, // PLAYER_IA_SLINGSHOT
PLAYER_MODELGROUP_HOOKSHOT, // PLAYER_IA_HOOKSHOT
PLAYER_MODELGROUP_HOOKSHOT, // PLAYER_IA_LONGSHOT
PLAYER_MODELGROUP_EXPLOSIVES, // PLAYER_IA_BOMB
PLAYER_MODELGROUP_EXPLOSIVES, // PLAYER_IA_BOMBCHU
PLAYER_MODELGROUP_BOOMERANG, // PLAYER_IA_BOOMERANG
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_MAGIC_SPELL_15
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_MAGIC_SPELL_16
PLAYER_MODELGROUP_BOW_SLINGSHOT, // PLAYER_IA_MAGIC_SPELL_17
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_FARORES_WIND
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_NAYRUS_LOVE
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_DINS_FIRE
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_DEKU_NUT
PLAYER_MODELGROUP_OCARINA, // PLAYER_IA_OCARINA_FAIRY
PLAYER_MODELGROUP_OOT, // PLAYER_IA_OCARINA_OF_TIME
PLAYER_MODELGROUP_BOTTLE, // PLAYER_IA_BOTTLE
PLAYER_MODELGROUP_BOTTLE, // PLAYER_IA_BOTTLE_FISH
PLAYER_MODELGROUP_BOTTLE, // PLAYER_IA_BOTTLE_FIRE
PLAYER_MODELGROUP_BOTTLE, // PLAYER_IA_BOTTLE_BUG
PLAYER_MODELGROUP_BOTTLE, // PLAYER_IA_BOTTLE_POE
PLAYER_MODELGROUP_BOTTLE, // PLAYER_IA_BOTTLE_BIG_POE
PLAYER_MODELGROUP_BOTTLE, // PLAYER_IA_BOTTLE_RUTOS_LETTER
PLAYER_MODELGROUP_BOTTLE, // PLAYER_IA_BOTTLE_POTION_RED
PLAYER_MODELGROUP_BOTTLE, // PLAYER_IA_BOTTLE_POTION_BLUE
PLAYER_MODELGROUP_BOTTLE, // PLAYER_IA_BOTTLE_POTION_GREEN
PLAYER_MODELGROUP_BOTTLE, // PLAYER_IA_BOTTLE_MILK_FULL
PLAYER_MODELGROUP_BOTTLE, // PLAYER_IA_BOTTLE_MILK_HALF
PLAYER_MODELGROUP_BOTTLE, // PLAYER_IA_BOTTLE_FAIRY
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_ZELDAS_LETTER
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_WEIRD_EGG
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_CHICKEN
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_MAGIC_BEAN
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_POCKET_EGG
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_POCKET_CUCCO
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_COJIRO
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_ODD_MUSHROOM
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_ODD_POTION
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_POACHERS_SAW
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_BROKEN_GORONS_SWORD
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_PRESCRIPTION
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_FROG
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_EYEDROPS
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_CLAIM_CHECK
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_MASK_KEATON
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_MASK_SKULL
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_MASK_SPOOKY
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_MASK_BUNNY_HOOD
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_MASK_GORON
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_MASK_ZORA
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_MASK_GERUDO
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_MASK_TRUTH
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_LENS_OF_TRUTH
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_NONE
PLAYER_MODELGROUP_SWORD, // PLAYER_IA_SWORD_CS
PLAYER_MODELGROUP_10, // PLAYER_IA_FISHING_POLE
PLAYER_MODELGROUP_SWORD_AND_SHIELD, // PLAYER_IA_SWORD_MASTER
PLAYER_MODELGROUP_SWORD_AND_SHIELD, // PLAYER_IA_SWORD_KOKIRI
PLAYER_MODELGROUP_BGS, // PLAYER_IA_SWORD_BIGGORON
PLAYER_MODELGROUP_10, // PLAYER_IA_DEKU_STICK
PLAYER_MODELGROUP_HAMMER, // PLAYER_IA_HAMMER
PLAYER_MODELGROUP_BOW_SLINGSHOT, // PLAYER_IA_BOW
PLAYER_MODELGROUP_BOW_SLINGSHOT, // PLAYER_IA_BOW_FIRE
PLAYER_MODELGROUP_BOW_SLINGSHOT, // PLAYER_IA_BOW_ICE
PLAYER_MODELGROUP_BOW_SLINGSHOT, // PLAYER_IA_BOW_LIGHT
PLAYER_MODELGROUP_BOW_SLINGSHOT, // PLAYER_IA_BOW_0C
PLAYER_MODELGROUP_BOW_SLINGSHOT, // PLAYER_IA_BOW_0D
PLAYER_MODELGROUP_BOW_SLINGSHOT, // PLAYER_IA_BOW_0E
PLAYER_MODELGROUP_BOW_SLINGSHOT, // PLAYER_IA_SLINGSHOT
PLAYER_MODELGROUP_HOOKSHOT, // PLAYER_IA_HOOKSHOT
PLAYER_MODELGROUP_HOOKSHOT, // PLAYER_IA_LONGSHOT
PLAYER_MODELGROUP_EXPLOSIVES, // PLAYER_IA_BOMB
PLAYER_MODELGROUP_EXPLOSIVES, // PLAYER_IA_BOMBCHU
PLAYER_MODELGROUP_BOOMERANG, // PLAYER_IA_BOOMERANG
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_MAGIC_SPELL_15
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_MAGIC_SPELL_16
PLAYER_MODELGROUP_BOW_SLINGSHOT, // PLAYER_IA_MAGIC_SPELL_17
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_FARORES_WIND
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_NAYRUS_LOVE
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_DINS_FIRE
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_DEKU_NUT
PLAYER_MODELGROUP_OCARINA, // PLAYER_IA_OCARINA_FAIRY
PLAYER_MODELGROUP_OOT, // PLAYER_IA_OCARINA_OF_TIME
PLAYER_MODELGROUP_BOTTLE, // PLAYER_IA_BOTTLE
PLAYER_MODELGROUP_BOTTLE, // PLAYER_IA_BOTTLE_FISH
PLAYER_MODELGROUP_BOTTLE, // PLAYER_IA_BOTTLE_FIRE
PLAYER_MODELGROUP_BOTTLE, // PLAYER_IA_BOTTLE_BUG
PLAYER_MODELGROUP_BOTTLE, // PLAYER_IA_BOTTLE_POE
PLAYER_MODELGROUP_BOTTLE, // PLAYER_IA_BOTTLE_BIG_POE
PLAYER_MODELGROUP_BOTTLE, // PLAYER_IA_BOTTLE_RUTOS_LETTER
PLAYER_MODELGROUP_BOTTLE, // PLAYER_IA_BOTTLE_POTION_RED
PLAYER_MODELGROUP_BOTTLE, // PLAYER_IA_BOTTLE_POTION_BLUE
PLAYER_MODELGROUP_BOTTLE, // PLAYER_IA_BOTTLE_POTION_GREEN
PLAYER_MODELGROUP_BOTTLE, // PLAYER_IA_BOTTLE_MILK_FULL
PLAYER_MODELGROUP_BOTTLE, // PLAYER_IA_BOTTLE_MILK_HALF
PLAYER_MODELGROUP_BOTTLE, // PLAYER_IA_BOTTLE_FAIRY
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_ZELDAS_LETTER
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_WEIRD_EGG
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_CHICKEN
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_MAGIC_BEAN
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_POCKET_EGG
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_POCKET_CUCCO
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_COJIRO
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_ODD_MUSHROOM
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_ODD_POTION
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_POACHERS_SAW
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_BROKEN_GORONS_SWORD
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_PRESCRIPTION
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_FROG
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_EYEDROPS
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_CLAIM_CHECK
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_MASK_KEATON
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_MASK_SKULL
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_MASK_SPOOKY
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_MASK_BUNNY_HOOD
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_MASK_GORON
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_MASK_ZORA
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_MASK_GERUDO
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_MASK_TRUTH
PLAYER_MODELGROUP_DEFAULT, // PLAYER_IA_LENS_OF_TRUTH
};
TextTriggerEntry sTextTriggers[] = {
@@ -128,7 +128,7 @@ u8 gPlayerModelTypes[PLAYER_MODELGROUP_MAX][PLAYER_MODELGROUPENTRY_MAX] = {
PLAYER_MODELTYPE_SHEATH_19,
PLAYER_MODELTYPE_WAIST
},
/* PLAYER_MODELGROUP_SWORD */
/* PLAYER_MODELGROUP_SWORD_AND_SHIELD */
{
PLAYER_ANIMTYPE_1,
PLAYER_MODELTYPE_LH_SWORD,
@@ -232,7 +232,7 @@ u8 gPlayerModelTypes[PLAYER_MODELGROUP_MAX][PLAYER_MODELGROUPENTRY_MAX] = {
PLAYER_MODELTYPE_SHEATH_18,
PLAYER_MODELTYPE_WAIST
},
/* PLAYER_MODELGROUP_15 */
/* PLAYER_MODELGROUP_SWORD */
{
PLAYER_ANIMTYPE_0,
PLAYER_MODELTYPE_LH_SWORD,
@@ -565,7 +565,7 @@ uint8_t Player_IsCustomLinkModel() {
s32 Player_InBlockingCsMode(PlayState* play, Player* this) {
return (this->stateFlags1 & (PLAYER_STATE1_DEAD | PLAYER_STATE1_IN_CUTSCENE)) || (this->csAction != 0) || (play->transitionTrigger == TRANS_TRIGGER_START) ||
(this->stateFlags1 & PLAYER_STATE1_LOADING) || (this->stateFlags3 & PLAYER_STATE3_HOOKSHOT_TRAVELLING) ||
(this->stateFlags1 & PLAYER_STATE1_LOADING) || (this->stateFlags3 & PLAYER_STATE3_FLYING_WITH_HOOKSHOT) ||
((gSaveContext.magicState != MAGIC_STATE_IDLE) && (Player_ActionToMagicSpell(this, this->itemAction) >= 0));
}
@@ -575,8 +575,15 @@ s32 Player_InCsMode(PlayState* play) {
return Player_InBlockingCsMode(play, this) || (this->unk_6AD == 4);
}
s32 func_8008E9C4(Player* this) {
return (this->stateFlags1 & PLAYER_STATE1_ENEMY_TARGET);
/**
* Checks if Player is currently locked onto a hostile actor.
* `PLAYER_STATE1_HOSTILE_LOCK_ON` controls Player's "battle" response to hostile actors.
*
* Note that within Player, `Player_UpdateHostileLockOn` exists, which updates the flag and also returns the check.
* Player can use this function instead if the flag should be checked, but not updated.
*/
s32 Player_CheckHostileLockOn(Player* this) {
return (this->stateFlags1 & PLAYER_STATE1_HOSTILE_LOCK_ON);
}
s32 Player_IsChildWithHylianShield(Player* this) {
@@ -586,7 +593,7 @@ s32 Player_IsChildWithHylianShield(Player* this) {
s32 Player_ActionToModelGroup(Player* this, s32 actionParam) {
s32 modelGroup = sActionModelGroups[actionParam];
if ((modelGroup == PLAYER_MODELGROUP_SWORD) && Player_IsChildWithHylianShield(this)) {
if ((modelGroup == PLAYER_MODELGROUP_SWORD_AND_SHIELD) && Player_IsChildWithHylianShield(this)) {
// child, using kokiri sword with hylian shield equipped
return PLAYER_MODELGROUP_CHILD_HYLIAN_SHIELD;
} else {
@@ -735,29 +742,48 @@ void Player_UpdateBottleHeld(PlayState* play, Player* this, s32 item, s32 action
this->itemAction = actionParam;
}
void func_8008EDF0(Player* this) {
this->unk_664 = NULL;
this->stateFlags2 &= ~PLAYER_STATE2_SWITCH_TARGETING;
void Player_ReleaseLockOn(Player* this) {
this->focusActor = NULL;
this->stateFlags2 &= ~PLAYER_STATE2_LOCK_ON_WITH_SWITCH;
}
void func_8008EE08(Player* this) {
/**
* This function aims to clear Z-Target related state when it isn't in use.
* It also handles setting a specific free fall related state that is interntwined with Z-Targeting.
* TODO: Learn more about this and give a name to PLAYER_STATE1_19
*/
void Player_ClearZTargeting(Player* this) {
if ((this->actor.bgCheckFlags & 1) || (this->stateFlags1 & (PLAYER_STATE1_CLIMBING_LADDER | PLAYER_STATE1_ON_HORSE | PLAYER_STATE1_IN_WATER)) ||
(!(this->stateFlags1 & (PLAYER_STATE1_JUMPING | PLAYER_STATE1_FREEFALL)) && ((this->actor.world.pos.y - this->actor.floorHeight) < 100.0f))) {
this->stateFlags1 &= ~(PLAYER_STATE1_TARGETING | PLAYER_STATE1_TARGET_LOCKED | PLAYER_STATE1_TARGET_NOTHING | PLAYER_STATE1_JUMPING | PLAYER_STATE1_FREEFALL | PLAYER_STATE1_30);
this->stateFlags1 &= ~(PLAYER_STATE1_Z_TARGETING | PLAYER_STATE1_FRIENDLY_ACTOR_FOCUS | PLAYER_STATE1_PARALLEL | PLAYER_STATE1_JUMPING | PLAYER_STATE1_FREEFALL | PLAYER_STATE1_LOCK_ON_FORCED_TO_RELEASE);
} else if (!(this->stateFlags1 & (PLAYER_STATE1_JUMPING | PLAYER_STATE1_FREEFALL | PLAYER_STATE1_CLIMBING_LADDER))) {
this->stateFlags1 |= PLAYER_STATE1_FREEFALL;
}
func_8008EDF0(this);
Player_ReleaseLockOn(this);
}
void func_8008EEAC(PlayState* play, Actor* actor) {
/**
* Sets the "auto lock-on actor" to lock onto an actor without Player's input.
* This function will first release any existing lock-on or (try to) release parallel.
*
* When using Switch Targeting, it is not possible to carry an auto lock-on actor into a normal
* lock-on when the auto lock-on is finished.
* This is because the `PLAYER_STATE2_LOCK_ON_WITH_SWITCH` flag is never set with an auto lock-on.
* With Hold Targeting it is possible to keep the auto lock-on going by keeping the Z button held down.
*
* The auto lock-on is considered "friendly" even if the actor is actually hostile. If the auto lock-on is hostile,
* Player's battle response will not occur (if he is actionable) and the camera behaves differently.
* When transitioning from auto lock-on to normal lock-on (with Hold Targeting) there will be a noticeable change
* when it switches from "friendly" mode to "hostile" mode.
*/
void Player_SetAutoLockOnActor(PlayState* play, Actor* actor) {
Player* this = GET_PLAYER(play);
func_8008EE08(this);
this->unk_664 = actor;
this->unk_684 = actor;
this->stateFlags1 |= PLAYER_STATE1_TARGET_LOCKED;
Player_ClearZTargeting(this);
this->focusActor = actor;
this->autoLockOnActor = actor;
this->stateFlags1 |= PLAYER_STATE1_FRIENDLY_ACTOR_FOCUS;
Camera_SetParam(Play_GetCamera(play, 0), 8, actor);
Camera_ChangeMode(Play_GetCamera(play, 0), 2);
}
@@ -919,7 +945,7 @@ s32 Player_GetExplosiveHeld(Player* this) {
s32 func_8008F2BC(Player* this, s32 actionParam) {
s32 sword = 0;
if (actionParam != PLAYER_IA_LAST_USED) {
if (actionParam != PLAYER_IA_SWORD_CS) {
sword = actionParam - PLAYER_IA_SWORD_MASTER;
if ((sword < 0) || (sword >= 3)) {
goto return_neg;
@@ -1319,9 +1345,9 @@ s32 Player_OverrideLimbDrawGameplayCommon(PlayState* play, s32 limbIndex, Gfx**
Matrix_Translate((LINK_IS_ADULT ? 3600.0f : 2900.0f) * ABS(scale - 1.0f), 0.0f, 0.0f, MTXMODE_APPLY);
}
}
rot->x += this->unk_6BA;
rot->y -= this->unk_6B8;
rot->z += this->unk_6B6;
rot->x += this->headLimbRot.z;
rot->y -= this->headLimbRot.y;
rot->z += this->headLimbRot.x;
} else if (limbIndex == PLAYER_LIMB_L_HAND) {
if (CVarGetInteger(CVAR_COSMETIC("Link.SwordScale.Changed"), 0)) {
f32 scale = CVarGetFloat(CVAR_COSMETIC("Link.SwordScale.Value"), 1.0f);
@@ -1329,18 +1355,18 @@ s32 Player_OverrideLimbDrawGameplayCommon(PlayState* play, s32 limbIndex, Gfx**
Matrix_Translate(-((LINK_IS_ADULT ? 320.0f : 200.0f) * scale), 0.0f, 0.0f, MTXMODE_APPLY);
}
} else if (limbIndex == PLAYER_LIMB_UPPER) {
if (this->unk_6B0 != 0) {
if (this->upperLimbYawSecondary != 0) {
Matrix_RotateZ(0x44C * (M_PI / 0x8000), MTXMODE_APPLY);
Matrix_RotateY(this->unk_6B0 * (M_PI / 0x8000), MTXMODE_APPLY);
Matrix_RotateY(this->upperLimbYawSecondary * (M_PI / 0x8000), MTXMODE_APPLY);
}
if (this->unk_6BE != 0) {
Matrix_RotateY(this->unk_6BE * (M_PI / 0x8000), MTXMODE_APPLY);
if (this->upperLimbRot.y != 0) {
Matrix_RotateY(this->upperLimbRot.y * (M_PI / 0x8000), MTXMODE_APPLY);
}
if (this->unk_6BC != 0) {
Matrix_RotateX(this->unk_6BC * (M_PI / 0x8000), MTXMODE_APPLY);
if (this->upperLimbRot.x != 0) {
Matrix_RotateX(this->upperLimbRot.x * (M_PI / 0x8000), MTXMODE_APPLY);
}
if (this->unk_6C0 != 0) {
Matrix_RotateZ(this->unk_6C0 * (M_PI / 0x8000), MTXMODE_APPLY);
if (this->upperLimbRot.z != 0) {
Matrix_RotateZ(this->upperLimbRot.z * (M_PI / 0x8000), MTXMODE_APPLY);
}
} else if (limbIndex == PLAYER_LIMB_L_THIGH) {
func_8008F87C(play, this, &this->skelAnime, pos, rot, PLAYER_LIMB_L_THIGH, PLAYER_LIMB_L_SHIN,
@@ -1367,7 +1393,7 @@ s32 Player_OverrideLimbDrawGameplayDefault(PlayState* play, s32 limbIndex, Gfx**
if ((sLeftHandType == PLAYER_MODELTYPE_LH_BGS) && (gSaveContext.swordHealth <= 0.0f)) {
dLists += 4;
} else if ((sLeftHandType == PLAYER_MODELTYPE_LH_BOOMERANG) && (this->stateFlags1 & PLAYER_STATE1_THREW_BOOMERANG)) {
} else if ((sLeftHandType == PLAYER_MODELTYPE_LH_BOOMERANG) && (this->stateFlags1 & PLAYER_STATE1_BOOMERANG_THROWN)) {
dLists = &gPlayerLeftHandOpenDLs[gSaveContext.linkAge];
sLeftHandType = PLAYER_MODELTYPE_LH_OPEN;
} else if ((this->leftHandType == PLAYER_MODELTYPE_LH_OPEN) && (this->actor.speedXZ > 2.0f) && !(this->stateFlags1 & PLAYER_STATE1_IN_WATER)) {
@@ -1828,7 +1854,7 @@ void Player_PostLimbDrawGameplay(PlayState* play, s32 limbIndex, Gfx** dList, Ve
Matrix_Get(&sp14C);
Matrix_MtxFToYXZRotS(&sp14C, &hookedActor->world.rot, 0);
hookedActor->shape.rot = hookedActor->world.rot;
} else if (this->stateFlags1 & PLAYER_STATE1_ITEM_OVER_HEAD) {
} else if (this->stateFlags1 & PLAYER_STATE1_CARRYING_ACTOR) {
Vec3s spB8;
Matrix_Get(&sp14C);
@@ -2000,9 +2026,9 @@ u32 func_80091738(PlayState* play, u8* segment, SkelAnime* skelAnime) {
}
u8 sPauseModelGroupBySword[] = {
PLAYER_MODELGROUP_SWORD, // PLAYER_SWORD_KOKIRI
PLAYER_MODELGROUP_SWORD, // PLAYER_SWORD_MASTER
PLAYER_MODELGROUP_BGS, // PLAYER_SWORD_BIGGORON
PLAYER_MODELGROUP_SWORD_AND_SHIELD, // PLAYER_SWORD_KOKIRI
PLAYER_MODELGROUP_SWORD_AND_SHIELD, // PLAYER_SWORD_MASTER
PLAYER_MODELGROUP_BGS, // PLAYER_SWORD_BIGGORON
};
s32 Player_OverrideLimbDrawPause(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* arg) {
@@ -2015,7 +2041,7 @@ s32 Player_OverrideLimbDrawPause(PlayState* play, s32 limbIndex, Gfx** dList, Ve
Gfx** dLists;
size_t ptrSize = sizeof(uint32_t);
if ((modelGroup == PLAYER_MODELGROUP_SWORD) && !LINK_IS_ADULT && (playerSwordAndShield[1] == PLAYER_SHIELD_HYLIAN)) {
if ((modelGroup == PLAYER_MODELGROUP_SWORD_AND_SHIELD) && !LINK_IS_ADULT && (playerSwordAndShield[1] == PLAYER_SHIELD_HYLIAN)) {
modelGroup = PLAYER_MODELGROUP_CHILD_HYLIAN_SHIELD;
}
soh/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c
+1 -1
View File
@@ -61,7 +61,7 @@ void func_8087B758(BgHaka* this, Player* player) {
func_8002DBD0(&this->dyna.actor, &sp1C, &player->actor.world.pos);
if (fabsf(sp1C.x) < 34.6f && sp1C.z > -112.8f && sp1C.z < -36.0f) {
player->stateFlags2 |= PLAYER_STATE2_SPAWN_DUST;
player->stateFlags2 |= PLAYER_STATE2_FORCE_SAND_FLOOR_SOUND;
}
}
soh/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c
+1 -1
View File
@@ -290,7 +290,7 @@ void BgHakaSgami_Update(Actor* thisx, PlayState* play) {
BgHakaSgami* this = (BgHakaSgami*)thisx;
Player* player = GET_PLAYER(play);
if (!(player->stateFlags1 & (PLAYER_STATE1_TEXT_ON_SCREEN | PLAYER_STATE1_DEAD | PLAYER_STATE1_IN_ITEM_CS | PLAYER_STATE1_IN_CUTSCENE)) || (this->actionFunc == BgHakaSgami_SetupSpin)) {
if (!(player->stateFlags1 & (PLAYER_STATE1_TALKING | PLAYER_STATE1_DEAD | PLAYER_STATE1_IN_ITEM_CS | PLAYER_STATE1_IN_CUTSCENE)) || (this->actionFunc == BgHakaSgami_SetupSpin)) {
this->actionFunc(this, play);
}
}
soh/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c
+1 -1
View File
@@ -201,7 +201,7 @@ void BgJyaGoroiwa_Update(Actor* thisx, PlayState* play) {
s32 bgId;
Vec3f pos;
if (!(player->stateFlags1 & (PLAYER_STATE1_TEXT_ON_SCREEN | PLAYER_STATE1_DEAD | PLAYER_STATE1_IN_ITEM_CS | PLAYER_STATE1_IN_CUTSCENE))) {
if (!(player->stateFlags1 & (PLAYER_STATE1_TALKING | PLAYER_STATE1_DEAD | PLAYER_STATE1_IN_ITEM_CS | PLAYER_STATE1_IN_CUTSCENE))) {
this->actionFunc(this, play);
BgJyaGoroiwa_UpdateRotation(this);
pos.x = this->actor.world.pos.x;
soh/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c
+4 -4
View File
@@ -152,9 +152,9 @@ s32 BgSpot01Idohashira_NotInCsMode(PlayState* play) {
return false;
}
CsCmdActorAction* BgSpot01Idohashira_GetNpcAction(PlayState* play, s32 actionIdx) {
CsCmdActorCue* BgSpot01Idohashira_GetNpcAction(PlayState* play, s32 actionIdx) {
s32 pad[2];
CsCmdActorAction* npcAction = NULL;
CsCmdActorCue* npcAction = NULL;
if (!BgSpot01Idohashira_NotInCsMode(play)) {
npcAction = play->csCtx.npcActions[actionIdx];
@@ -186,7 +186,7 @@ f32 func_808AB1DC(f32 arg0, f32 arg1, u16 arg2, u16 arg3, u16 arg4) {
}
s32 func_808AB29C(BgSpot01Idohashira* this, PlayState* play) {
CsCmdActorAction* npcAction;
CsCmdActorCue* npcAction;
Vec3f* thisPos;
f32 endX;
f32 temp_f0;
@@ -237,7 +237,7 @@ void func_808AB414(BgSpot01Idohashira* this, PlayState* play) {
}
void func_808AB444(BgSpot01Idohashira* this, PlayState* play) {
CsCmdActorAction* npcAction = BgSpot01Idohashira_GetNpcAction(play, 2);
CsCmdActorCue* npcAction = BgSpot01Idohashira_GetNpcAction(play, 2);
u32 action;
u32 currentNpcAction;
soh/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c
+1 -1
View File
@@ -413,7 +413,7 @@ void func_808B57E0(BgSpot16Bombstone* this, PlayState* play) {
OnePointCutscene_Init(play, 4180, sTimer, NULL, MAIN_CAM);
}
}
} else if (player->stateFlags1 & PLAYER_STATE1_ITEM_OVER_HEAD) {
} else if (player->stateFlags1 & PLAYER_STATE1_CARRYING_ACTOR) {
playerHeldActor = player->heldActor;
if (playerHeldActor != NULL && playerHeldActor->category == ACTORCAT_EXPLOSIVE &&
playerHeldActor->id == ACTOR_EN_BOMBF) {
soh/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c
+2 -2
View File
@@ -92,7 +92,7 @@ void BgTreemouth_Destroy(Actor* thisx, PlayState* play) {
}
void func_808BC65C(BgTreemouth* this, PlayState* play) {
CsCmdActorAction* npcAction;
CsCmdActorCue* npcAction;
if ((play->csCtx.state != CS_STATE_IDLE)) {
npcAction = play->csCtx.npcActions[0];
@@ -198,7 +198,7 @@ void func_808BC9EC(BgTreemouth* this, PlayState* play) {
}
void func_808BCAF0(BgTreemouth* this, PlayState* play) {
CsCmdActorAction* npcAction;
CsCmdActorCue* npcAction;
if (play->csCtx.state != CS_STATE_IDLE) {
npcAction = play->csCtx.npcActions[0];
soh/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c
+2 -2
View File
@@ -389,7 +389,7 @@ void BossSst_HeadSetupIntro(BossSst* this, PlayState* play) {
player->actor.world.pos.z = sRoomCenter.z;
player->linearVelocity = player->actor.velocity.y = 0.0f;
player->actor.shape.rot.y = -0x8000;
player->zTargetYaw = -0x8000;
player->parallelYaw = -0x8000;
player->yaw = -0x8000;
player->fallStartHeight = 0;
player->stateFlags1 |= PLAYER_STATE1_INPUT_DISABLED;
@@ -448,7 +448,7 @@ void BossSst_HeadIntro(BossSst* this, PlayState* play) {
player->actor.world.pos.z = sRoomCenter.z;
player->linearVelocity = 0;
player->actor.shape.rot.y = -0x8000;
player->zTargetYaw = -0x8000;
player->parallelYaw = -0x8000;
player->yaw = -0x8000;
}
soh/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c
+1 -1
View File
@@ -807,7 +807,7 @@ void func_809691BC(Demo6K* this, PlayState* play, s32 params) {
Vec3f startPos;
Vec3f endPos;
f32 temp;
CsCmdActorAction* csAction = play->csCtx.npcActions[params];
CsCmdActorCue* csAction = play->csCtx.npcActions[params];
startPos.x = csAction->startPos.x;
startPos.y = csAction->startPos.y;
soh/src/overlays/actors/ovl_Demo_Du/z_demo_du.c
+16 -16
View File
@@ -103,7 +103,7 @@ void DemoDu_UpdateBgCheckInfo(DemoDu* this, PlayState* play) {
Actor_UpdateBgCheckInfo(play, &this->actor, 75.0f, 30.0f, 30.0f, 5);
}
CsCmdActorAction* DemoDu_GetNpcAction(PlayState* play, s32 idx) {
CsCmdActorCue* DemoDu_GetNpcAction(PlayState* play, s32 idx) {
if (play->csCtx.state != CS_STATE_IDLE) {
return play->csCtx.npcActions[idx];
}
@@ -111,7 +111,7 @@ CsCmdActorAction* DemoDu_GetNpcAction(PlayState* play, s32 idx) {
}
s32 DemoDu_IsNpcDoingThisAction(DemoDu* this, PlayState* play, u16 action, s32 idx) {
CsCmdActorAction* npcAction = DemoDu_GetNpcAction(play, idx);
CsCmdActorCue* npcAction = DemoDu_GetNpcAction(play, idx);
if ((npcAction != NULL) && (npcAction->action == action)) {
return true;
@@ -120,7 +120,7 @@ s32 DemoDu_IsNpcDoingThisAction(DemoDu* this, PlayState* play, u16 action, s32 i
}
s32 DemoDu_IsNpcNotDoingThisAction(DemoDu* this, PlayState* play, u16 action, s32 idx) {
CsCmdActorAction* npcAction = DemoDu_GetNpcAction(play, idx);
CsCmdActorCue* npcAction = DemoDu_GetNpcAction(play, idx);
if ((npcAction != NULL) && (npcAction->action != action)) {
return true;
@@ -129,7 +129,7 @@ s32 DemoDu_IsNpcNotDoingThisAction(DemoDu* this, PlayState* play, u16 action, s3
}
void DemoDu_MoveToNpcPos(DemoDu* this, PlayState* play, s32 idx) {
CsCmdActorAction* npcAction = DemoDu_GetNpcAction(play, idx);
CsCmdActorCue* npcAction = DemoDu_GetNpcAction(play, idx);
s32 pad;
if (npcAction != NULL) {
@@ -214,7 +214,7 @@ void DemoDu_CsFireMedallion_AdvanceTo01(DemoDu* this, PlayState* play) {
void DemoDu_CsFireMedallion_AdvanceTo02(DemoDu* this, PlayState* play) {
if (play->csCtx.state != CS_STATE_IDLE) {
CsCmdActorAction* npcAction = play->csCtx.npcActions[2];
CsCmdActorCue* npcAction = play->csCtx.npcActions[2];
if ((npcAction != NULL) && (npcAction->action != 1)) {
this->updateIndex = CS_FIREMEDALLION_SUBSCENE(2);
@@ -233,7 +233,7 @@ void DemoDu_CsFireMedallion_AdvanceTo03(DemoDu* this) {
void DemoDu_CsFireMedallion_AdvanceTo04(DemoDu* this, PlayState* play) {
if (play->csCtx.state != CS_STATE_IDLE) {
CsCmdActorAction* npcAction = play->csCtx.npcActions[2];
CsCmdActorCue* npcAction = play->csCtx.npcActions[2];
if ((npcAction != NULL) && (npcAction->action != 2)) {
Animation_Change(&this->skelAnime, &gDaruniaItemGiveAnim, 1.0f, 0.0f,
@@ -253,7 +253,7 @@ void DemoDu_CsFireMedallion_AdvanceTo05(DemoDu* this, s32 animFinished) {
void DemoDu_CsFireMedallion_AdvanceTo06(DemoDu* this, PlayState* play) {
if (play->csCtx.state != CS_STATE_IDLE) {
CsCmdActorAction* npcAction = play->csCtx.npcActions[6];
CsCmdActorCue* npcAction = play->csCtx.npcActions[6];
if ((npcAction != NULL) && (npcAction->action == 2)) {
this->updateIndex = CS_FIREMEDALLION_SUBSCENE(6);
@@ -444,7 +444,7 @@ void DemoDu_CsGoronsRuby_DaruniaFalling(DemoDu* this, PlayState* play) {
CutsceneContext* csCtx = &play->csCtx;
if (csCtx->state != CS_STATE_IDLE) {
CsCmdActorAction* npcAction = csCtx->npcActions[2];
CsCmdActorCue* npcAction = csCtx->npcActions[2];
Vec3f startPos;
Vec3f endPos;
Vec3f* pos = &this->actor.world.pos;
@@ -473,7 +473,7 @@ void DemoDu_CsGoronsRuby_AdvanceTo01(DemoDu* this, PlayState* play) {
void DemoDu_CsGoronsRuby_AdvanceTo02(DemoDu* this, PlayState* play) {
if (play->csCtx.state != CS_STATE_IDLE) {
CsCmdActorAction* npcAction = play->csCtx.npcActions[2];
CsCmdActorCue* npcAction = play->csCtx.npcActions[2];
if ((npcAction != NULL) && (npcAction->action != 1)) {
Animation_Change(&this->skelAnime, &gDaruniaStandUpAfterFallingAnim, 1.0f, 0.0f,
@@ -489,7 +489,7 @@ void DemoDu_CsGoronsRuby_AdvanceTo03(DemoDu* this, PlayState* play) {
CutsceneContext* csCtx = &play->csCtx;
if (csCtx->state != CS_STATE_IDLE) {
CsCmdActorAction* npcAction = csCtx->npcActions[2];
CsCmdActorCue* npcAction = csCtx->npcActions[2];
if ((npcAction != NULL) && (csCtx->frames >= npcAction->endFrame)) {
this->updateIndex = CS_GORONSRUBY_SUBSCENE(3);
@@ -500,7 +500,7 @@ void DemoDu_CsGoronsRuby_AdvanceTo03(DemoDu* this, PlayState* play) {
void DemoDu_CsGoronsRuby_AdvanceTo04(DemoDu* this, PlayState* play) {
if (play->csCtx.state != CS_STATE_IDLE) {
CsCmdActorAction* npcAction = play->csCtx.npcActions[2];
CsCmdActorCue* npcAction = play->csCtx.npcActions[2];
if ((npcAction != NULL) && (npcAction->action != 2)) {
this->updateIndex = CS_GORONSRUBY_SUBSCENE(4);
@@ -518,7 +518,7 @@ void DemoDu_CsGoronsRuby_AdvanceTo05(DemoDu* this, s32 animFinished) {
void DemoDu_CsGoronsRuby_AdvanceTo06(DemoDu* this, PlayState* play) {
if (play->csCtx.state != CS_STATE_IDLE) {
CsCmdActorAction* npcAction = play->csCtx.npcActions[2];
CsCmdActorCue* npcAction = play->csCtx.npcActions[2];
if ((npcAction != NULL) && (npcAction->action != 3)) {
Animation_Change(&this->skelAnime, &gDaruniaHitBreastAnim, 1.0f, 0.0f,
@@ -538,7 +538,7 @@ void DemoDu_CsGoronsRuby_AdvanceTo07(DemoDu* this, s32 animFinished) {
void DemoDu_CsGoronsRuby_AdvanceTo08(DemoDu* this, PlayState* play) {
if (play->csCtx.state != CS_STATE_IDLE) {
CsCmdActorAction* npcAction = play->csCtx.npcActions[2];
CsCmdActorCue* npcAction = play->csCtx.npcActions[2];
if ((npcAction != NULL) && (npcAction->action != 4)) {
Animation_Change(&this->skelAnime, &gDaruniaHitLinkAnim, 1.0f, 0.0f,
@@ -566,7 +566,7 @@ void DemoDu_CsGoronsRuby_AdvanceTo10(DemoDu* this, s32 animFinished) {
void DemoDu_CsGoronsRuby_AdvanceTo11(DemoDu* this, PlayState* play) {
if (play->csCtx.state != CS_STATE_IDLE) {
CsCmdActorAction* npcAction = play->csCtx.npcActions[2];
CsCmdActorCue* npcAction = play->csCtx.npcActions[2];
if ((npcAction != NULL) && (npcAction->action != 5)) {
Animation_Change(&this->skelAnime, &gDaruniaItemGiveAnim, 1.0f, 0.0f,
@@ -586,7 +586,7 @@ void DemoDu_CsGoronsRuby_AdvanceTo12(DemoDu* this, s32 animFinished) {
void DemoDu_CsGoronsRuby_AdvanceTo13(DemoDu* this, PlayState* play) {
if (play->csCtx.state != CS_STATE_IDLE) {
CsCmdActorAction* npcAction = play->csCtx.npcActions[2];
CsCmdActorCue* npcAction = play->csCtx.npcActions[2];
if ((npcAction != NULL) && (npcAction->action != 6)) {
Animation_Change(&this->skelAnime, &gDaruniaIdleAnim, 1.0f, 0.0f, Animation_GetLastFrame(&gDaruniaIdleAnim),
@@ -886,7 +886,7 @@ void DemoDu_CsCredits_BackTo02(DemoDu* this, s32 animFinished) {
}
void DemoDu_CsCredits_HandleSubscenesByNpcAction(DemoDu* this, PlayState* play) {
CsCmdActorAction* npcAction = DemoDu_GetNpcAction(play, 2);
CsCmdActorCue* npcAction = DemoDu_GetNpcAction(play, 2);
if (npcAction != NULL) {
s32 action = npcAction->action;
soh/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c
+4 -4
View File
@@ -331,7 +331,7 @@ void DemoEc_UseAnimationObject(DemoEc* this, PlayState* play) {
gSegments[6] = PHYSICAL_TO_VIRTUAL(play->objectCtx.status[animObjBankIndex].segment);
}
CsCmdActorAction* DemoEc_GetNpcAction(PlayState* play, s32 actionIndex) {
CsCmdActorCue* DemoEc_GetNpcAction(PlayState* play, s32 actionIndex) {
if (play->csCtx.state != CS_STATE_IDLE) {
return play->csCtx.npcActions[actionIndex];
} else {
@@ -340,7 +340,7 @@ CsCmdActorAction* DemoEc_GetNpcAction(PlayState* play, s32 actionIndex) {
}
void DemoEc_SetNpcActionPosRot(DemoEc* this, PlayState* play, s32 actionIndex) {
CsCmdActorAction* npcAction = DemoEc_GetNpcAction(play, actionIndex);
CsCmdActorCue* npcAction = DemoEc_GetNpcAction(play, actionIndex);
if (npcAction != NULL) {
this->actor.world.pos.x = npcAction->startPos.x;
@@ -821,7 +821,7 @@ void func_8096F26C(DemoEc* this, s32 arg1) {
}
void func_8096F2B0(DemoEc* this, PlayState* play, s32 arg2) {
CsCmdActorAction* npcAction;
CsCmdActorCue* npcAction;
s32 sp18;
npcAction = DemoEc_GetNpcAction(play, arg2);
@@ -895,7 +895,7 @@ void func_8096F544(DemoEc* this, s32 changeAnim) {
}
void func_8096F578(DemoEc* this, PlayState* play, s32 arg2) {
CsCmdActorAction* npcAction;
CsCmdActorCue* npcAction;
s32 sp18;
npcAction = DemoEc_GetNpcAction(play, arg2);
soh/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c
+3 -3
View File
@@ -50,7 +50,7 @@ void DemoExt_PlayVortexSFX(DemoExt* this) {
}
}
CsCmdActorAction* DemoExt_GetNpcAction(PlayState* play, s32 npcActionIndex) {
CsCmdActorCue* DemoExt_GetNpcAction(PlayState* play, s32 npcActionIndex) {
if (play->csCtx.state != CS_STATE_IDLE) {
return play->csCtx.npcActions[npcActionIndex];
}
@@ -63,7 +63,7 @@ void DemoExt_SetupWait(DemoExt* this) {
}
void DemoExt_SetupMaintainVortex(DemoExt* this, PlayState* play) {
CsCmdActorAction* npcAction = DemoExt_GetNpcAction(play, 5);
CsCmdActorCue* npcAction = DemoExt_GetNpcAction(play, 5);
if (npcAction != NULL) {
this->actor.world.pos.x = npcAction->startPos.x;
@@ -88,7 +88,7 @@ void DemoExt_FinishClosing(DemoExt* this) {
}
void DemoExt_CheckCsMode(DemoExt* this, PlayState* play) {
CsCmdActorAction* csCmdNPCAction = DemoExt_GetNpcAction(play, 5);
CsCmdActorCue* csCmdNPCAction = DemoExt_GetNpcAction(play, 5);
s32 csAction;
s32 previousCsAction;
soh/src/overlays/actors/ovl_Demo_Go/z_demo_go.c
+3 -3
View File
@@ -127,7 +127,7 @@ void func_8097CB0C(DemoGo* this, PlayState* play) {
Actor* thisx = &this->actor;
PosRot* world = &thisx->world;
CutsceneContext* csCtx = &play->csCtx;
CsCmdActorAction* npcAction;
CsCmdActorCue* npcAction;
f32 temp_ret;
s32 pad;
Vec3f startPos;
@@ -167,7 +167,7 @@ void func_8097CCC0(DemoGo* this) {
}
void func_8097CCE0(DemoGo* this, PlayState* play) {
CsCmdActorAction* npcAction;
CsCmdActorCue* npcAction;
Actor* thisx = &this->actor;
s32 rotYDelta;
s32 newRotY;
@@ -221,7 +221,7 @@ void func_8097CE20(DemoGo* this, PlayState* play) {
void func_8097CE78(DemoGo* this, PlayState* play) {
CutsceneContext* csCtx = &play->csCtx;
CsCmdActorAction* npcAction;
CsCmdActorCue* npcAction;
if (play->csCtx.state != CS_STATE_IDLE) {
npcAction = csCtx->npcActions[func_8097C870(this)];
soh/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c
+4 -4
View File
@@ -297,9 +297,9 @@ u8 func_8097E69C(PlayState* play) {
}
}
CsCmdActorAction* DemoGt_GetNpcAction(PlayState* play, u32 actionIdx) {
CsCmdActorCue* DemoGt_GetNpcAction(PlayState* play, u32 actionIdx) {
s32 pad[2];
CsCmdActorAction* ret = NULL;
CsCmdActorCue* ret = NULL;
if (!func_8097E69C(play)) {
ret = play->csCtx.npcActions[actionIdx];
@@ -309,7 +309,7 @@ CsCmdActorAction* DemoGt_GetNpcAction(PlayState* play, u32 actionIdx) {
}
u8 func_8097E704(PlayState* play, u16 arg1, s32 arg2) {
CsCmdActorAction* action = DemoGt_GetNpcAction(play, arg2);
CsCmdActorCue* action = DemoGt_GetNpcAction(play, arg2);
if ((action != NULL) && (action->action == arg1)) {
return true;
@@ -319,7 +319,7 @@ u8 func_8097E704(PlayState* play, u16 arg1, s32 arg2) {
}
void func_8097E744(DemoGt* this, PlayState* play, u32 actionIdx) {
CsCmdActorAction* npcAction = DemoGt_GetNpcAction(play, actionIdx);
CsCmdActorCue* npcAction = DemoGt_GetNpcAction(play, actionIdx);
Vec3f* pos = &this->dyna.actor.world.pos;
f32 startX;
f32 startY;
soh/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c
+5 -5
View File
@@ -37,7 +37,7 @@ s32 DemoIk_UpdateSkelAnime(DemoIk* this) {
return SkelAnime_Update(&this->skelAnime);
}
CsCmdActorAction* DemoIk_GetCue(PlayState* play, s32 index) {
CsCmdActorCue* DemoIk_GetCue(PlayState* play, s32 index) {
if (play->csCtx.state != CS_STATE_IDLE) {
return play->csCtx.npcActions[index];
}
@@ -45,7 +45,7 @@ CsCmdActorAction* DemoIk_GetCue(PlayState* play, s32 index) {
}
s32 DemoIk_CheckCue(PlayState* play, u16 action, s32 index) {
CsCmdActorAction* cue = DemoIk_GetCue(play, index);
CsCmdActorCue* cue = DemoIk_GetCue(play, index);
if ((cue != NULL) && (cue->action == action)) {
return 1;
@@ -147,7 +147,7 @@ void DemoIk_SpawnDeadDb(DemoIk* this, PlayState* play) {
}
void DemoIk_MoveToStartPos(DemoIk* this, PlayState* play, s32 index) {
CsCmdActorAction* cue = DemoIk_GetCue(play, index);
CsCmdActorCue* cue = DemoIk_GetCue(play, index);
if (cue != NULL) {
this->actor.world.pos.x = cue->startPos.x;
@@ -208,7 +208,7 @@ void func_809839AC(DemoIk* this) {
}
void func_809839D0(DemoIk* this, PlayState* play) {
CsCmdActorAction* cue = DemoIk_GetCue(play, DemoIk_GetIndexFromParams(this->actor.params));
CsCmdActorCue* cue = DemoIk_GetCue(play, DemoIk_GetIndexFromParams(this->actor.params));
if (cue != NULL) {
s32 nextCsAction = cue->action;
@@ -362,7 +362,7 @@ void func_8098402C(DemoIk* this) {
}
void func_80984048(DemoIk* this, PlayState* play) {
CsCmdActorAction* cue = DemoIk_GetCue(play, 4);
CsCmdActorCue* cue = DemoIk_GetCue(play, 4);
if (cue != NULL) {
s32 nextCsAction = cue->action;
soh/src/overlays/actors/ovl_Demo_Im/z_demo_im.c
+10 -10
View File
@@ -223,9 +223,9 @@ s32 DemoIm_IsCsStateIdle(PlayState* play) {
}
}
CsCmdActorAction* DemoIm_GetNpcAction(PlayState* play, s32 actionIdx) {
CsCmdActorCue* DemoIm_GetNpcAction(PlayState* play, s32 actionIdx) {
s32 pad[2];
CsCmdActorAction* ret = NULL;
CsCmdActorCue* ret = NULL;
if (!DemoIm_IsCsStateIdle(play)) {
ret = play->csCtx.npcActions[actionIdx];
@@ -234,7 +234,7 @@ CsCmdActorAction* DemoIm_GetNpcAction(PlayState* play, s32 actionIdx) {
}
s32 func_809850E8(DemoIm* this, PlayState* play, u16 action, s32 actionIdx) {
CsCmdActorAction* npcAction = DemoIm_GetNpcAction(play, actionIdx);
CsCmdActorCue* npcAction = DemoIm_GetNpcAction(play, actionIdx);
if (npcAction != NULL) {
if (npcAction->action == action) {
@@ -245,7 +245,7 @@ s32 func_809850E8(DemoIm* this, PlayState* play, u16 action, s32 actionIdx) {
}
s32 func_80985134(DemoIm* this, PlayState* play, u16 action, s32 actionIdx) {
CsCmdActorAction* npcAction = DemoIm_GetNpcAction(play, actionIdx);
CsCmdActorCue* npcAction = DemoIm_GetNpcAction(play, actionIdx);
if (npcAction != NULL) {
if (npcAction->action != action) {
@@ -256,7 +256,7 @@ s32 func_80985134(DemoIm* this, PlayState* play, u16 action, s32 actionIdx) {
}
void func_80985180(DemoIm* this, PlayState* play, s32 actionIdx) {
CsCmdActorAction* npcAction = DemoIm_GetNpcAction(play, actionIdx);
CsCmdActorCue* npcAction = DemoIm_GetNpcAction(play, actionIdx);
if (npcAction != NULL) {
this->actor.world.pos.x = npcAction->startPos.x;
@@ -267,7 +267,7 @@ void func_80985180(DemoIm* this, PlayState* play, s32 actionIdx) {
}
void func_80985200(DemoIm* this, PlayState* play, s32 actionIdx) {
CsCmdActorAction* npcAction = DemoIm_GetNpcAction(play, actionIdx);
CsCmdActorCue* npcAction = DemoIm_GetNpcAction(play, actionIdx);
if (npcAction != NULL) {
this->actor.world.pos.x = npcAction->startPos.x;
@@ -614,7 +614,7 @@ void func_80986148(DemoIm* this) {
}
void func_809861C4(DemoIm* this, PlayState* play) {
CsCmdActorAction* npcAction = DemoIm_GetNpcAction(play, 5);
CsCmdActorCue* npcAction = DemoIm_GetNpcAction(play, 5);
if (npcAction != NULL) {
u32 action = npcAction->action;
@@ -647,7 +647,7 @@ void func_8098629C(DemoIm* this, PlayState* play) {
}
void func_809862E0(DemoIm* this, PlayState* play) {
CsCmdActorAction* npcAction = DemoIm_GetNpcAction(play, 5);
CsCmdActorCue* npcAction = DemoIm_GetNpcAction(play, 5);
if (npcAction != NULL) {
u32 action = npcAction->action;
@@ -777,7 +777,7 @@ void func_80986794(DemoIm* this) {
}
void func_8098680C(DemoIm* this, PlayState* play) {
CsCmdActorAction* npcAction = DemoIm_GetNpcAction(play, 5);
CsCmdActorCue* npcAction = DemoIm_GetNpcAction(play, 5);
if (npcAction != NULL) {
u32 action = npcAction->action;
@@ -1055,7 +1055,7 @@ void func_809871B4(DemoIm* this, s32 arg1) {
}
void func_809871E8(DemoIm* this, PlayState* play) {
CsCmdActorAction* npcAction = DemoIm_GetNpcAction(play, 5);
CsCmdActorCue* npcAction = DemoIm_GetNpcAction(play, 5);
if (npcAction != NULL) {
u32 action = npcAction->action;
soh/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c
+1 -1
View File
@@ -376,7 +376,7 @@ void DemoKankyo_DoNothing2(DemoKankyo* this, PlayState* play) {
void DemoKankyo_SetRockPos(DemoKankyo* this, PlayState* play, s32 params) {
Vec3f startPos;
Vec3f endPos;
CsCmdActorAction* csAction = play->csCtx.npcActions[params];
CsCmdActorCue* csAction = play->csCtx.npcActions[params];
f32 temp_f0;
startPos.x = csAction->startPos.x;
soh/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c
+9 -9
View File
@@ -160,7 +160,7 @@ s32 DemoSa_UpdateSkelAnime(DemoSa* this) {
return SkelAnime_Update(&this->skelAnime);
}
CsCmdActorAction* DemoSa_GetNpcAction(PlayState* play, s32 idx) {
CsCmdActorCue* DemoSa_GetNpcAction(PlayState* play, s32 idx) {
if (play->csCtx.state != CS_STATE_IDLE) {
return play->csCtx.npcActions[idx];
}
@@ -168,7 +168,7 @@ CsCmdActorAction* DemoSa_GetNpcAction(PlayState* play, s32 idx) {
}
s32 func_8098E654(DemoSa* this, PlayState* play, u16 arg2, s32 arg3) {
CsCmdActorAction* npcAction = DemoSa_GetNpcAction(play, arg3);
CsCmdActorCue* npcAction = DemoSa_GetNpcAction(play, arg3);
if ((npcAction != NULL) && (npcAction->action == arg2)) {
return 1;
@@ -177,7 +177,7 @@ s32 func_8098E654(DemoSa* this, PlayState* play, u16 arg2, s32 arg3) {
}
s32 func_8098E6A0(DemoSa* this, PlayState* play, u16 arg2, s32 arg3) {
CsCmdActorAction* npcAction = DemoSa_GetNpcAction(play, arg3);
CsCmdActorCue* npcAction = DemoSa_GetNpcAction(play, arg3);
if ((npcAction != NULL) && (npcAction->action != arg2)) {
return 1;
@@ -186,7 +186,7 @@ s32 func_8098E6A0(DemoSa* this, PlayState* play, u16 arg2, s32 arg3) {
}
void func_8098E6EC(DemoSa* this, PlayState* play, s32 actionIdx) {
CsCmdActorAction* npcAction = DemoSa_GetNpcAction(play, actionIdx);
CsCmdActorCue* npcAction = DemoSa_GetNpcAction(play, actionIdx);
if (npcAction != NULL) {
this->actor.world.pos.x = npcAction->startPos.x;
@@ -267,7 +267,7 @@ void func_8098E960(DemoSa* this, PlayState* play) {
}
void func_8098E9EC(DemoSa* this, PlayState* play) {
CsCmdActorAction* npcAction;
CsCmdActorCue* npcAction;
if (play->csCtx.state != CS_STATE_IDLE) {
npcAction = play->csCtx.npcActions[4];
@@ -287,7 +287,7 @@ void func_8098EA3C(DemoSa* this) {
}
void func_8098EA68(DemoSa* this, PlayState* play) {
CsCmdActorAction* npcAction;
CsCmdActorCue* npcAction;
if (play->csCtx.state != CS_STATE_IDLE) {
npcAction = play->csCtx.npcActions[4];
@@ -308,7 +308,7 @@ void func_8098EB00(DemoSa* this, s32 arg1) {
}
void func_8098EB6C(DemoSa* this, PlayState* play) {
CsCmdActorAction* npcAction;
CsCmdActorCue* npcAction;
if (play->csCtx.state != CS_STATE_IDLE) {
npcAction = play->csCtx.npcActions[6];
@@ -552,7 +552,7 @@ void func_8098F610(DemoSa* this, s32 arg1) {
void func_8098F654(DemoSa* this, PlayState* play) {
s32 unk_1AC;
s32 action;
CsCmdActorAction* npcAction = DemoSa_GetNpcAction(play, 4);
CsCmdActorCue* npcAction = DemoSa_GetNpcAction(play, 4);
if (npcAction != NULL) {
action = npcAction->action;
@@ -697,7 +697,7 @@ void func_8098FB34(DemoSa* this, s32 arg1) {
void func_8098FB68(DemoSa* this, PlayState* play) {
s32 unk_1AC;
s32 action;
CsCmdActorAction* npcAction = DemoSa_GetNpcAction(play, 1);
CsCmdActorCue* npcAction = DemoSa_GetNpcAction(play, 1);
if (npcAction != NULL) {
action = npcAction->action;
soh/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c
+2 -2
View File
@@ -59,7 +59,7 @@ void func_80991298(DemoShd* this, PlayState* play) {
}
if (play->csCtx.state != CS_STATE_IDLE) {
CsCmdActorAction* npcAction0 = play->csCtx.npcActions[0];
CsCmdActorCue* npcAction0 = play->csCtx.npcActions[0];
if (npcAction0 != NULL) {
if (npcAction0->action == 2) {
@@ -74,7 +74,7 @@ void func_80991298(DemoShd* this, PlayState* play) {
}
if (play->csCtx.state != CS_STATE_IDLE) {
CsCmdActorAction* npcAction1 = play->csCtx.npcActions[1];
CsCmdActorCue* npcAction1 = play->csCtx.npcActions[1];
if (npcAction1 != NULL) {
if (npcAction1->action == 2) {
soh/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c
+3 -3
View File
@@ -420,7 +420,7 @@ void func_80996C60(DoorShutter* this, PlayState* play) {
DoorShutter_SetupAction(this, func_80997004);
this->unk_16C = sp38;
this->unk_170 = 0.0f;
Camera_ChangeDoorCam(play->cameraPtrs[MAIN_CAM], &this->dyna.actor, player->doorBgCamIndex, 0.0f, 12, sp34, 10);
Camera_ChangeDoorCam(play->cameraPtrs[MAIN_CAM], &this->dyna.actor, player->cv.slidingDoorBgCamIndex, 0.0f, 12, sp34, 10);
}
}
@@ -558,7 +558,7 @@ void func_80997220(DoorShutter* this, PlayState* play) {
}
this->unk_164 = 0;
this->dyna.actor.velocity.y = 0.0f;
if (DoorShutter_SetupDoor(this, play) && !(player->stateFlags1 & PLAYER_STATE1_ITEM_OVER_HEAD)) {
if (DoorShutter_SetupDoor(this, play) && !(player->stateFlags1 & PLAYER_STATE1_CARRYING_ACTOR)) {
DoorShutter_SetupAction(this, func_80997568);
Player_SetCsActionWithHaltedActors(play, NULL, 2);
}
@@ -642,7 +642,7 @@ void DoorShutter_Update(Actor* thisx, PlayState* play) {
DoorShutter* this = (DoorShutter*)thisx;
Player* player = GET_PLAYER(play);
if (!(player->stateFlags1 & (PLAYER_STATE1_TEXT_ON_SCREEN | PLAYER_STATE1_DEAD | PLAYER_STATE1_GETTING_ITEM | PLAYER_STATE1_IN_ITEM_CS)) || (this->actionFunc == DoorShutter_SetupType)) {
if (!(player->stateFlags1 & (PLAYER_STATE1_TALKING | PLAYER_STATE1_DEAD | PLAYER_STATE1_GETTING_ITEM | PLAYER_STATE1_IN_ITEM_CS)) || (this->actionFunc == DoorShutter_SetupType)) {
this->actionFunc(this, play);
}
}
soh/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c
+1 -1
View File
@@ -147,7 +147,7 @@ void EfcErupc_Draw(Actor* thisx, PlayState* play) {
gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(play->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
if (play->csCtx.state != 0) {
CsCmdActorAction* csActorAction = play->csCtx.npcActions[2];
CsCmdActorCue* csActorAction = play->csCtx.npcActions[2];
if (csActorAction != 0) {
csAction = csActorAction->action;
if ((csAction == 2) || (csAction == 3)) {
soh/src/overlays/actors/ovl_En_Bom/z_en_bom.c
+2 -2
View File
@@ -238,11 +238,11 @@ void EnBom_Explode(EnBom* this, PlayState* play) {
if (this->timer == 0) {
player = GET_PLAYER(play);
if ((player->stateFlags1 & PLAYER_STATE1_ITEM_OVER_HEAD) && (player->heldActor == &this->actor)) {
if ((player->stateFlags1 & PLAYER_STATE1_CARRYING_ACTOR) && (player->heldActor == &this->actor)) {
player->actor.child = NULL;
player->heldActor = NULL;
player->interactRangeActor = NULL;
player->stateFlags1 &= ~PLAYER_STATE1_ITEM_OVER_HEAD;
player->stateFlags1 &= ~PLAYER_STATE1_CARRYING_ACTOR;
}
Actor_Kill(&this->actor);
soh/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c
+5 -5
View File
@@ -164,7 +164,7 @@ void EnBombf_GrowBomb(EnBombf* this, PlayState* play) {
player->heldActor = NULL;
player->interactRangeActor = NULL;
this->actor.parent = NULL;
player->stateFlags1 &= ~PLAYER_STATE1_ITEM_OVER_HEAD;
player->stateFlags1 &= ~PLAYER_STATE1_CARRYING_ACTOR;
}
} else if (this->bombCollider.base.acFlags & AC_HIT) {
this->bombCollider.base.acFlags &= ~AC_HIT;
@@ -200,7 +200,7 @@ void EnBombf_GrowBomb(EnBombf* this, PlayState* play) {
player->heldActor = NULL;
player->interactRangeActor = NULL;
this->actor.parent = NULL;
player->stateFlags1 &= ~PLAYER_STATE1_ITEM_OVER_HEAD;
player->stateFlags1 &= ~PLAYER_STATE1_CARRYING_ACTOR;
this->actor.world.pos = this->actor.home.pos;
}
}
@@ -218,7 +218,7 @@ void EnBombf_GrowBomb(EnBombf* this, PlayState* play) {
player->heldActor = NULL;
player->interactRangeActor = NULL;
this->actor.parent = NULL;
player->stateFlags1 &= ~PLAYER_STATE1_ITEM_OVER_HEAD;
player->stateFlags1 &= ~PLAYER_STATE1_CARRYING_ACTOR;
this->actor.world.pos = this->actor.home.pos;
}
}
@@ -302,11 +302,11 @@ void EnBombf_Explode(EnBombf* this, PlayState* play) {
if (this->timer == 0) {
player = GET_PLAYER(play);
if ((player->stateFlags1 & PLAYER_STATE1_ITEM_OVER_HEAD) && (player->heldActor == &this->actor)) {
if ((player->stateFlags1 & PLAYER_STATE1_CARRYING_ACTOR) && (player->heldActor == &this->actor)) {
player->actor.child = NULL;
player->heldActor = NULL;
player->interactRangeActor = NULL;
player->stateFlags1 &= ~PLAYER_STATE1_ITEM_OVER_HEAD;
player->stateFlags1 &= ~PLAYER_STATE1_CARRYING_ACTOR;
}
Actor_Kill(&this->actor);
soh/src/overlays/actors/ovl_En_Boom/z_en_boom.c
+1 -1
View File
@@ -188,7 +188,7 @@ void EnBoom_Fly(EnBoom* this, PlayState* play) {
}
}
// Set player flags and kill the boomerang beacause Link caught it.
player->stateFlags1 &= ~PLAYER_STATE1_THREW_BOOMERANG;
player->stateFlags1 &= ~PLAYER_STATE1_BOOMERANG_THROWN;
player->boomerangQuickRecall = false;
Actor_Kill(&this->actor);
}
soh/src/overlays/actors/ovl_En_Dh/z_en_dh.c
+1 -1
View File
@@ -237,7 +237,7 @@ void EnDh_Wait(EnDh* this, PlayState* play) {
Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 1, 0x7D0, 0);
SkelAnime_Update(&this->skelAnime);
if (this->actor.params != ENDH_START_ATTACK_BOMB) {
func_8008EEAC(play, &this->actor);
Player_SetAutoLockOnActor(play, &this->actor);
}
}
}
soh/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c
+1 -1
View File
@@ -123,7 +123,7 @@ void EnDntJiji_Wait(EnDntJiji* this, PlayState* play) {
SkelAnime_Update(&this->skelAnime);
if ((this->timer == 1) && (this->actor.xzDistToPlayer < 150.0f) && !Play_InCsMode(play) &&
!(player->stateFlags1 & PLAYER_STATE1_ITEM_OVER_HEAD)) {
!(player->stateFlags1 & PLAYER_STATE1_CARRYING_ACTOR)) {
OnePointCutscene_Init(play, 2230, -99, &this->actor, MAIN_CAM);
this->timer = 0;
Player_SetCsActionWithHaltedActors(play, NULL, 8);
soh/src/overlays/actors/ovl_En_Du/z_en_du.c
+3 -3
View File
@@ -254,13 +254,13 @@ void func_809FDE9C(EnDu* this) {
}
}
void func_809FDFC0(CsCmdActorAction* csAction, Vec3f* dst) {
void func_809FDFC0(CsCmdActorCue* csAction, Vec3f* dst) {
dst->x = csAction->startPos.x;
dst->y = csAction->startPos.y;
dst->z = csAction->startPos.z;
}
void func_809FE000(CsCmdActorAction* csAction, Vec3f* dst) {
void func_809FE000(CsCmdActorCue* csAction, Vec3f* dst) {
dst->x = csAction->endPos.x;
dst->y = csAction->endPos.y;
dst->z = csAction->endPos.z;
@@ -473,7 +473,7 @@ void func_809FE890(EnDu* this, PlayState* play) {
Vec3f startPos;
Vec3f endPos;
Vec3f velocity = { 0.0f, 0.0f, 0.0f };
CsCmdActorAction* csAction;
CsCmdActorCue* csAction;
if (play->csCtx.state == CS_STATE_IDLE) {
Player_SetCsActionWithHaltedActors(play, &this->actor, 1);
soh/src/overlays/actors/ovl_En_Elf/z_en_elf.c
+11 -11
View File
@@ -1047,11 +1047,11 @@ void func_80A04414(EnElf* this, PlayState* play) {
}
if (this->fairyFlags & 1) {
if ((arrowPointedActor == NULL) || (player->unk_664 == NULL)) {
if ((arrowPointedActor == NULL) || (player->focusActor == NULL)) {
this->fairyFlags ^= 1;
}
} else {
if ((arrowPointedActor != NULL) && (player->unk_664 != NULL)) {
if ((arrowPointedActor != NULL) && (player->focusActor != NULL)) {
if (arrowPointedActor->category == ACTORCAT_NPC) {
targetSound = NA_SE_VO_NAVY_HELLO;
} else {
@@ -1103,7 +1103,7 @@ void func_80A0461C(EnElf* this, PlayState* play) {
} else if (arrowPointedActor == NULL || arrowPointedActor->category == ACTORCAT_NPC) {
if (arrowPointedActor != NULL) {
this->unk_2C0 = 100;
player->stateFlags2 |= PLAYER_STATE2_NAVI_OUT;
player->stateFlags2 |= PLAYER_STATE2_NAVI_ACTIVE;
temp = 0;
} else {
switch (this->unk_2A8) {
@@ -1124,7 +1124,7 @@ void func_80A0461C(EnElf* this, PlayState* play) {
this->unk_2AE--;
temp = 7;
} else {
player->stateFlags2 |= PLAYER_STATE2_NAVI_OUT;
player->stateFlags2 |= PLAYER_STATE2_NAVI_ACTIVE;
temp = 0;
}
} else {
@@ -1154,7 +1154,7 @@ void func_80A0461C(EnElf* this, PlayState* play) {
switch (temp) {
case 0:
if (!(player->stateFlags2 & PLAYER_STATE2_NAVI_OUT)) {
if (!(player->stateFlags2 & PLAYER_STATE2_NAVI_ACTIVE)) {
temp = 7;
if (this->unk_2C7 == 0) {
Audio_PlayActorSound2(&this->actor, NA_SE_EV_NAVY_VANISH);
@@ -1162,7 +1162,7 @@ void func_80A0461C(EnElf* this, PlayState* play) {
}
break;
case 8:
if (player->stateFlags2 & PLAYER_STATE2_NAVI_OUT) {
if (player->stateFlags2 & PLAYER_STATE2_NAVI_ACTIVE) {
func_80A0299C(this, 0x32);
this->unk_2C0 = 42;
temp = 11;
@@ -1172,10 +1172,10 @@ void func_80A0461C(EnElf* this, PlayState* play) {
}
break;
case 7:
player->stateFlags2 &= ~PLAYER_STATE2_NAVI_OUT;
player->stateFlags2 &= ~PLAYER_STATE2_NAVI_ACTIVE;
break;
default:
player->stateFlags2 |= PLAYER_STATE2_NAVI_OUT;
player->stateFlags2 |= PLAYER_STATE2_NAVI_ACTIVE;
break;
}
}
@@ -1232,7 +1232,7 @@ void func_80A04DE4(EnElf* this, PlayState* play) {
if (this->fairyFlags & 0x10) {
naviRefPos = play->actorCtx.targetCtx.naviRefPos;
if ((player->unk_664 == NULL) || (&player->actor == player->unk_664) || (&this->actor == player->unk_664)) {
if ((player->focusActor == NULL) || (&player->actor == player->focusActor) || (&this->actor == player->focusActor)) {
naviRefPos.x = player->bodyPartsPos[7].x + (Math_SinS(player->actor.shape.rot.y) * 20.0f);
naviRefPos.y = player->bodyPartsPos[7].y + 5.0f;
naviRefPos.z = player->bodyPartsPos[7].z + (Math_CosS(player->actor.shape.rot.y) * 20.0f);
@@ -1384,7 +1384,7 @@ void func_80A053F0(Actor* thisx, PlayState* play) {
EnElf* this = (EnElf*)thisx;
if (player->naviTextId == 0) {
if (player->unk_664 == NULL) {
if (player->focusActor == NULL) {
if (((gSaveContext.naviTimer >= 600) && (gSaveContext.naviTimer <= 3000)) || (nREG(89) != 0)) {
player->naviTextId = ElfMessage_GetCUpText(play);
@@ -1551,7 +1551,7 @@ void EnElf_Draw(Actor* thisx, PlayState* play) {
void EnElf_GetCutsceneNextPos(Vec3f* vec, PlayState* play, s32 action) {
Vec3f startPos;
Vec3f endPos;
CsCmdActorAction* npcAction = play->csCtx.npcActions[action];
CsCmdActorCue* npcAction = play->csCtx.npcActions[action];
f32 lerp;
startPos.x = npcAction->startPos.x;
soh/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c
+1 -1
View File
@@ -389,7 +389,7 @@ void EnExItem_TargetPrizeApproach(EnExItem* this, PlayState* play) {
this->actor.parent = NULL;
if (!GameInteractor_Should(VB_PLAY_ONEPOINT_ACTOR_CS, true, &this->actor)) {
GET_PLAYER(play)->stateFlags1 &= ~(PLAYER_STATE1_GETTING_ITEM | PLAYER_STATE1_ITEM_OVER_HEAD);
GET_PLAYER(play)->stateFlags1 &= ~(PLAYER_STATE1_GETTING_ITEM | PLAYER_STATE1_CARRYING_ACTOR);
}
if (CUR_UPG_VALUE(UPG_BULLET_BAG) == 1) {
soh/src/overlays/actors/ovl_En_Fish/z_en_fish.c
+1 -1
View File
@@ -622,7 +622,7 @@ void EnFish_Cutscene_WiggleFlyingThroughAir(EnFish* this, PlayState* play) {
void EnFish_UpdateCutscene(EnFish* this, PlayState* play) {
s32 pad;
s32 pad2;
CsCmdActorAction* csAction = play->csCtx.npcActions[1];
CsCmdActorCue* csAction = play->csCtx.npcActions[1];
Vec3f startPos;
Vec3f endPos;
f32 progress;
soh/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c
+1 -1
View File
@@ -725,7 +725,7 @@ void EnGoroiwa_Update(Actor* thisx, PlayState* play) {
s32 pad;
s32 sp30;
if (!(player->stateFlags1 & (PLAYER_STATE1_TEXT_ON_SCREEN | PLAYER_STATE1_DEAD | PLAYER_STATE1_IN_ITEM_CS | PLAYER_STATE1_IN_CUTSCENE))) {
if (!(player->stateFlags1 & (PLAYER_STATE1_TALKING | PLAYER_STATE1_DEAD | PLAYER_STATE1_IN_ITEM_CS | PLAYER_STATE1_IN_CUTSCENE))) {
if (this->collisionDisabledTimer > 0) {
this->collisionDisabledTimer--;
}
soh/src/overlays/actors/ovl_En_Horse/z_en_horse.c
+22 -22
View File
@@ -13,7 +13,7 @@
#define FLAGS ACTOR_FLAG_UPDATE_WHILE_CULLED
typedef void (*EnHorseCsFunc)(EnHorse*, PlayState*, CsCmdActorAction*);
typedef void (*EnHorseCsFunc)(EnHorse*, PlayState*, CsCmdActorCue*);
typedef void (*EnHorseActionFunc)(EnHorse*, PlayState*);
void EnHorse_Init(Actor* thisx, PlayState* play);
@@ -388,11 +388,11 @@ static s32 sIdleAnimIds[] = { 1, 3, 0, 3, 1, 0 };
static s16 sIngoAnimations[] = { 7, 6, 2, 2, 1, 1, 0, 0, 0, 0 };
void EnHorse_CsMoveInit(EnHorse* this, PlayState* play, CsCmdActorAction* action);
void EnHorse_CsJumpInit(EnHorse* this, PlayState* play, CsCmdActorAction* action);
void EnHorse_CsRearingInit(EnHorse* this, PlayState* play, CsCmdActorAction* action);
void EnHorse_WarpMoveInit(EnHorse* this, PlayState* play, CsCmdActorAction* action);
void EnHorse_CsWarpRearingInit(EnHorse* this, PlayState* play, CsCmdActorAction* action);
void EnHorse_CsMoveInit(EnHorse* this, PlayState* play, CsCmdActorCue* action);
void EnHorse_CsJumpInit(EnHorse* this, PlayState* play, CsCmdActorCue* action);
void EnHorse_CsRearingInit(EnHorse* this, PlayState* play, CsCmdActorCue* action);
void EnHorse_WarpMoveInit(EnHorse* this, PlayState* play, CsCmdActorCue* action);
void EnHorse_CsWarpRearingInit(EnHorse* this, PlayState* play, CsCmdActorCue* action);
static EnHorseCsFunc sCutsceneInitFuncs[] = {
NULL,
@@ -403,11 +403,11 @@ static EnHorseCsFunc sCutsceneInitFuncs[] = {
EnHorse_CsWarpRearingInit,
};
void EnHorse_CsMoveToPoint(EnHorse* this, PlayState* play, CsCmdActorAction* action);
void EnHorse_CsJump(EnHorse* this, PlayState* play, CsCmdActorAction* action);
void EnHorse_CsRearing(EnHorse* this, PlayState* play, CsCmdActorAction* action);
void EnHorse_CsWarpMoveToPoint(EnHorse* this, PlayState* play, CsCmdActorAction* action);
void EnHorse_CsWarpRearing(EnHorse* this, PlayState* play, CsCmdActorAction* action);
void EnHorse_CsMoveToPoint(EnHorse* this, PlayState* play, CsCmdActorCue* action);
void EnHorse_CsJump(EnHorse* this, PlayState* play, CsCmdActorCue* action);
void EnHorse_CsRearing(EnHorse* this, PlayState* play, CsCmdActorCue* action);
void EnHorse_CsWarpMoveToPoint(EnHorse* this, PlayState* play, CsCmdActorCue* action);
void EnHorse_CsWarpRearing(EnHorse* this, PlayState* play, CsCmdActorCue* action);
static EnHorseCsFunc sCutsceneActionFuncs[] = {
NULL, EnHorse_CsMoveToPoint, EnHorse_CsJump, EnHorse_CsRearing, EnHorse_CsWarpMoveToPoint, EnHorse_CsWarpRearing,
@@ -2104,7 +2104,7 @@ void EnHorse_UpdateIngoRace(EnHorse* this, PlayState* play) {
&((EnIn*)this->rider)->animationIdx, &((EnIn*)this->rider)->unk_1E0);
}
void EnHorse_CsMoveInit(EnHorse* this, PlayState* play, CsCmdActorAction* action) {
void EnHorse_CsMoveInit(EnHorse* this, PlayState* play, CsCmdActorCue* action) {
this->animationIdx = ENHORSE_ANIM_GALLOP;
this->cutsceneAction = 1;
Animation_PlayOnceSetSpeed(&this->skin.skelAnime, sAnimationHeaders[this->type][this->animationIdx],
@@ -2113,7 +2113,7 @@ void EnHorse_CsMoveInit(EnHorse* this, PlayState* play, CsCmdActorAction* action
void EnHorse_CsPlayHighJumpAnim(EnHorse* this, PlayState* play);
void EnHorse_CsMoveToPoint(EnHorse* this, PlayState* play, CsCmdActorAction* action) {
void EnHorse_CsMoveToPoint(EnHorse* this, PlayState* play, CsCmdActorCue* action) {
Vec3f endPos;
f32 speed = 8.0f;
@@ -2165,13 +2165,13 @@ void EnHorse_CsPlayHighJumpAnim(EnHorse* this, PlayState* play) {
func_800AA000(0.0f, 170, 10, 10);
}
void EnHorse_CsJumpInit(EnHorse* this, PlayState* play, CsCmdActorAction* action) {
void EnHorse_CsJumpInit(EnHorse* this, PlayState* play, CsCmdActorCue* action) {
EnHorse_CsSetAnimHighJump(this, play);
this->cutsceneAction = 2;
this->cutsceneFlags &= ~1;
}
void EnHorse_CsJump(EnHorse* this, PlayState* play, CsCmdActorAction* action) {
void EnHorse_CsJump(EnHorse* this, PlayState* play, CsCmdActorCue* action) {
f32 temp_f2;
if (this->cutsceneFlags & 1) {
@@ -2223,7 +2223,7 @@ void EnHorse_CsJump(EnHorse* this, PlayState* play, CsCmdActorAction* action) {
}
}
void EnHorse_CsRearingInit(EnHorse* this, PlayState* play, CsCmdActorAction* action) {
void EnHorse_CsRearingInit(EnHorse* this, PlayState* play, CsCmdActorCue* action) {
this->animationIdx = ENHORSE_ANIM_REARING;
this->cutsceneAction = 3;
this->cutsceneFlags &= ~4;
@@ -2236,7 +2236,7 @@ void EnHorse_CsRearingInit(EnHorse* this, PlayState* play, CsCmdActorAction* act
Animation_GetLastFrame(sAnimationHeaders[this->type][this->animationIdx]), ANIMMODE_ONCE, -3.0f);
}
void EnHorse_CsRearing(EnHorse* this, PlayState* play, CsCmdActorAction* action) {
void EnHorse_CsRearing(EnHorse* this, PlayState* play, CsCmdActorCue* action) {
this->actor.speedXZ = 0.0f;
if (this->curFrame > 25.0f) {
if (!(this->stateFlags & ENHORSE_LAND2_SOUND)) {
@@ -2259,7 +2259,7 @@ void EnHorse_CsRearing(EnHorse* this, PlayState* play, CsCmdActorAction* action)
}
}
void EnHorse_WarpMoveInit(EnHorse* this, PlayState* play, CsCmdActorAction* action) {
void EnHorse_WarpMoveInit(EnHorse* this, PlayState* play, CsCmdActorCue* action) {
this->actor.world.pos.x = action->startPos.x;
this->actor.world.pos.y = action->startPos.y;
this->actor.world.pos.z = action->startPos.z;
@@ -2272,7 +2272,7 @@ void EnHorse_WarpMoveInit(EnHorse* this, PlayState* play, CsCmdActorAction* acti
this->actor.speedXZ * 0.3f);
}
void EnHorse_CsWarpMoveToPoint(EnHorse* this, PlayState* play, CsCmdActorAction* action) {
void EnHorse_CsWarpMoveToPoint(EnHorse* this, PlayState* play, CsCmdActorCue* action) {
Vec3f endPos;
f32 speed = 8.0f;
@@ -2296,7 +2296,7 @@ void EnHorse_CsWarpMoveToPoint(EnHorse* this, PlayState* play, CsCmdActorAction*
}
}
void EnHorse_CsWarpRearingInit(EnHorse* this, PlayState* play, CsCmdActorAction* action) {
void EnHorse_CsWarpRearingInit(EnHorse* this, PlayState* play, CsCmdActorCue* action) {
this->actor.world.pos.x = action->startPos.x;
this->actor.world.pos.y = action->startPos.y;
this->actor.world.pos.z = action->startPos.z;
@@ -2315,7 +2315,7 @@ void EnHorse_CsWarpRearingInit(EnHorse* this, PlayState* play, CsCmdActorAction*
Animation_GetLastFrame(sAnimationHeaders[this->type][this->animationIdx]), ANIMMODE_ONCE, -3.0f);
}
void EnHorse_CsWarpRearing(EnHorse* this, PlayState* play, CsCmdActorAction* action) {
void EnHorse_CsWarpRearing(EnHorse* this, PlayState* play, CsCmdActorCue* action) {
this->actor.speedXZ = 0.0f;
if (this->curFrame > 25.0f) {
if (!(this->stateFlags & ENHORSE_LAND2_SOUND)) {
@@ -2362,7 +2362,7 @@ s32 EnHorse_GetCutsceneFunctionIndex(s32 csAction) {
void EnHorse_CutsceneUpdate(EnHorse* this, PlayState* play) {
s32 csFunctionIdx;
CsCmdActorAction* linkCsAction = play->csCtx.linkAction;
CsCmdActorCue* linkCsAction = play->csCtx.linkAction;
if (play->csCtx.state == 3) {
this->playerControlled = 1;
soh/src/overlays/actors/ovl_En_Ik/z_en_ik.c
+3 -3
View File
@@ -1056,7 +1056,7 @@ s32 func_80A7707C(EnIk* this) {
return SkelAnime_Update(&this->skelAnime);
}
CsCmdActorAction* EnIk_GetNpcAction(PlayState* play, s32 actionIdx) {
CsCmdActorCue* EnIk_GetNpcAction(PlayState* play, s32 actionIdx) {
if (play->csCtx.state != CS_STATE_IDLE) {
return play->csCtx.npcActions[actionIdx];
} else {
@@ -1065,7 +1065,7 @@ CsCmdActorAction* EnIk_GetNpcAction(PlayState* play, s32 actionIdx) {
}
void func_80A770C0(EnIk* this, PlayState* play, s32 actionIdx) {
CsCmdActorAction* npcAction = EnIk_GetNpcAction(play, actionIdx);
CsCmdActorCue* npcAction = EnIk_GetNpcAction(play, actionIdx);
if (npcAction != NULL) {
this->actor.world.pos.x = npcAction->startPos.x;
@@ -1247,7 +1247,7 @@ void func_80A77844(EnIk* this, PlayState* play) {
}
void func_80A779DC(EnIk* this, PlayState* play) {
CsCmdActorAction* npcAction = EnIk_GetNpcAction(play, 4);
CsCmdActorCue* npcAction = EnIk_GetNpcAction(play, 4);
u32 action;
u32 currentNpcAction;
soh/src/overlays/actors/ovl_En_Nb/z_en_nb.c
+12 -12
View File
@@ -232,7 +232,7 @@ s32 EnNb_UpdateSkelAnime(EnNb* this) {
return SkelAnime_Update(&this->skelAnime);
}
CsCmdActorAction* EnNb_GetNpcCsAction(PlayState* play, s32 npcActionIdx) {
CsCmdActorCue* EnNb_GetNpcCsAction(PlayState* play, s32 npcActionIdx) {
if (play->csCtx.state != CS_STATE_IDLE) {
return play->csCtx.npcActions[npcActionIdx];
}
@@ -240,7 +240,7 @@ CsCmdActorAction* EnNb_GetNpcCsAction(PlayState* play, s32 npcActionIdx) {
}
void EnNb_SetupCsPosRot(EnNb* this, PlayState* play, s32 npcActionIdx) {
CsCmdActorAction* csCmdNPCAction = EnNb_GetNpcCsAction(play, npcActionIdx);
CsCmdActorCue* csCmdNPCAction = EnNb_GetNpcCsAction(play, npcActionIdx);
s16 newRotY;
Actor* thisx = &this->actor;
@@ -253,7 +253,7 @@ void EnNb_SetupCsPosRot(EnNb* this, PlayState* play, s32 npcActionIdx) {
}
s32 func_80AB1390(EnNb* this, PlayState* play, u16 arg2, s32 npcActionIdx) {
CsCmdActorAction* csCmdNPCAction;
CsCmdActorCue* csCmdNPCAction;
if ((play->csCtx.state != CS_STATE_IDLE) &&
(csCmdNPCAction = play->csCtx.npcActions[npcActionIdx], csCmdNPCAction != NULL) &&
@@ -264,7 +264,7 @@ s32 func_80AB1390(EnNb* this, PlayState* play, u16 arg2, s32 npcActionIdx) {
}
s32 func_80AB13D8(EnNb* this, PlayState* play, u16 arg2, s32 npcActionIdx) {
CsCmdActorAction* csCmdNPCAction;
CsCmdActorCue* csCmdNPCAction;
if ((play->csCtx.state != CS_STATE_IDLE) &&
(csCmdNPCAction = play->csCtx.npcActions[npcActionIdx], csCmdNPCAction != NULL) &&
@@ -275,7 +275,7 @@ s32 func_80AB13D8(EnNb* this, PlayState* play, u16 arg2, s32 npcActionIdx) {
}
void EnNb_SetInitialCsPosRot(EnNb* this, PlayState* play, s32 npcActionIdx) {
CsCmdActorAction* csCmdNPCAction = EnNb_GetNpcCsAction(play, npcActionIdx);
CsCmdActorCue* csCmdNPCAction = EnNb_GetNpcCsAction(play, npcActionIdx);
Actor* thisx = &this->actor;
if (csCmdNPCAction != NULL) {
@@ -354,7 +354,7 @@ void EnNb_SetupChamberCsImpl(EnNb* this, PlayState* play) {
void EnNb_SetupChamberWarpImpl(EnNb* this, PlayState* play) {
CutsceneContext* csCtx = &play->csCtx;
CsCmdActorAction* csCmdNPCAction;
CsCmdActorCue* csCmdNPCAction;
if (csCtx->state != CS_STATE_IDLE) {
csCmdNPCAction = csCtx->npcActions[1];
@@ -375,7 +375,7 @@ void EnNb_SetupDefaultChamberIdle(EnNb* this) {
void EnNb_SetupArmRaise(EnNb* this, PlayState* play) {
AnimationHeader* animation = &gNabooruRaisingArmsGivingMedallionAnim;
CsCmdActorAction* csCmdNPCAction;
CsCmdActorCue* csCmdNPCAction;
if (play->csCtx.state != CS_STATE_IDLE) {
csCmdNPCAction = play->csCtx.npcActions[1];
@@ -398,7 +398,7 @@ void EnNb_SetupRaisedArmTransition(EnNb* this, s32 animFinished) {
}
void EnNb_SetupMedallion(EnNb* this, PlayState* play) {
CsCmdActorAction* csCmdNPCAction;
CsCmdActorCue* csCmdNPCAction;
if (play->csCtx.state != CS_STATE_IDLE) {
csCmdNPCAction = play->csCtx.npcActions[6];
@@ -587,7 +587,7 @@ void EnNb_PlayAgonySFX(EnNb* this, PlayState* play) {
}
void EnNb_SetPosInPortal(EnNb* this, PlayState* play) {
CsCmdActorAction* csCmdNPCAction = EnNb_GetNpcCsAction(play, 1);
CsCmdActorCue* csCmdNPCAction = EnNb_GetNpcCsAction(play, 1);
Vec3f* pos = &this->actor.world.pos;
f32 f0;
s32 pad;
@@ -642,7 +642,7 @@ void EnNb_SetupKidnap(EnNb* this) {
}
void EnNb_CheckKidnapCsMode(EnNb* this, PlayState* play) {
CsCmdActorAction* csCmdNPCAction = EnNb_GetNpcCsAction(play, 1);
CsCmdActorCue* csCmdNPCAction = EnNb_GetNpcCsAction(play, 1);
s32 action;
s32 previousCsAction;
@@ -849,7 +849,7 @@ void EnNb_SetupConfrontationDestroy(EnNb* this) {
}
void EnNb_CheckConfrontationCsMode(EnNb* this, PlayState* play) {
CsCmdActorAction* csCmdNPCAction;
CsCmdActorCue* csCmdNPCAction;
s32 csAction;
s32 previousCsAction;
@@ -1051,7 +1051,7 @@ void EnNb_CheckIfLookingUp(EnNb* this, s32 animFinished) {
}
void EnNb_CheckCreditsCsModeImpl(EnNb* this, PlayState* play) {
CsCmdActorAction* csCmdNPCAction = EnNb_GetNpcCsAction(play, 1);
CsCmdActorCue* csCmdNPCAction = EnNb_GetNpcCsAction(play, 1);
s32 action;
s32 previousCsAction;
soh/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c
+1 -1
View File
@@ -156,7 +156,7 @@ void EnNutsball_Update(Actor* thisx, PlayState* play) {
Player* player = GET_PLAYER(play);
s32 pad;
if (!(player->stateFlags1 & (PLAYER_STATE1_TEXT_ON_SCREEN | PLAYER_STATE1_DEAD | PLAYER_STATE1_IN_ITEM_CS | PLAYER_STATE1_IN_CUTSCENE)) || (this->actionFunc == func_80ABBB34)) {
if (!(player->stateFlags1 & (PLAYER_STATE1_TALKING | PLAYER_STATE1_DEAD | PLAYER_STATE1_IN_ITEM_CS | PLAYER_STATE1_IN_CUTSCENE)) || (this->actionFunc == func_80ABBB34)) {
this->actionFunc(this, play);
Actor_MoveForward(&this->actor);
soh/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c
+1 -1
View File
@@ -629,7 +629,7 @@ void EnOkuta_Update(Actor* thisx, PlayState* play2) {
Vec3f sp38;
s32 sp34;
if (!(player->stateFlags1 & (PLAYER_STATE1_TEXT_ON_SCREEN | PLAYER_STATE1_DEAD | PLAYER_STATE1_IN_ITEM_CS | PLAYER_STATE1_IN_CUTSCENE))) {
if (!(player->stateFlags1 & (PLAYER_STATE1_TALKING | PLAYER_STATE1_DEAD | PLAYER_STATE1_IN_ITEM_CS | PLAYER_STATE1_IN_CUTSCENE))) {
if (this->actor.params == 0) {
EnOkuta_ColliderCheck(this, play);
if (!WaterBox_GetSurfaceImpl(play, &play->colCtx, this->actor.world.pos.x,
soh/src/overlays/actors/ovl_En_Rd/z_en_rd.c
+3 -3
View File
@@ -340,8 +340,8 @@ void func_80AE2C1C(EnRd* this, PlayState* play) {
if (this->unk_306 == 0) {
if (!(this->unk_312 & PLAYER_STATE2_GRABBED_BY_ENEMY) && !CVarGetInteger(CVAR_CHEAT("NoRedeadFreeze"), 0)) {
player->actor.freezeTimer = 40;
func_8008EEAC(play, &this->actor);
GET_PLAYER(play)->unk_684 = &this->actor;
Player_SetAutoLockOnActor(play, &this->actor);
GET_PLAYER(play)->autoLockOnActor = &this->actor;
func_800AA000(this->actor.xzDistToPlayer, 0xFF, 0x14, 0x96);
}
this->unk_306 = 0x3C;
@@ -573,7 +573,7 @@ void func_80AE3834(EnRd* this, PlayState* play) {
if (!(this->unk_312 & 0x80) && !CVarGetInteger(CVAR_CHEAT("NoRedeadFreeze"), 0)) {
player->actor.freezeTimer = 60;
func_800AA000(this->actor.xzDistToPlayer, 0xFF, 0x14, 0x96);
func_8008EEAC(play, &this->actor);
Player_SetAutoLockOnActor(play, &this->actor);
}
Audio_PlayActorSound2(&this->actor, NA_SE_EN_REDEAD_AIM);
func_80AE2B90(this, play);
soh/src/overlays/actors/ovl_En_Rl/z_en_rl.c
+3 -3
View File
@@ -86,7 +86,7 @@ s32 func_80AE7494(EnRl* this) {
}
s32 func_80AE74B4(EnRl* this, PlayState* play, u16 arg2, s32 arg3) {
CsCmdActorAction* csCmdActorAction;
CsCmdActorCue* csCmdActorAction;
if (play->csCtx.state != CS_STATE_IDLE) {
csCmdActorAction = play->csCtx.npcActions[arg3];
@@ -98,7 +98,7 @@ s32 func_80AE74B4(EnRl* this, PlayState* play, u16 arg2, s32 arg3) {
}
s32 func_80AE74FC(EnRl* this, PlayState* play, u16 arg2, s32 arg3) {
CsCmdActorAction* csCmdActorAction;
CsCmdActorCue* csCmdActorAction;
if (play->csCtx.state != CS_STATE_IDLE) {
csCmdActorAction = play->csCtx.npcActions[arg3];
@@ -143,7 +143,7 @@ void func_80AE7668(EnRl* this, PlayState* play) {
}
void func_80AE7698(EnRl* this, PlayState* play) {
CsCmdActorAction* csCmdActorAction;
CsCmdActorCue* csCmdActorAction;
if (play->csCtx.state != CS_STATE_IDLE) {
csCmdActorAction = play->csCtx.npcActions[0];
soh/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c
+14 -14
View File
@@ -248,9 +248,9 @@ s32 EnRu1_IsCsStateIdle(PlayState* play) {
return false;
}
CsCmdActorAction* func_80AEAF58(PlayState* play, s32 npcActionIdx) {
CsCmdActorCue* func_80AEAF58(PlayState* play, s32 npcActionIdx) {
s32 pad[2];
CsCmdActorAction* ret = NULL;
CsCmdActorCue* ret = NULL;
if (!EnRu1_IsCsStateIdle(play)) {
ret = play->csCtx.npcActions[npcActionIdx];
@@ -259,7 +259,7 @@ CsCmdActorAction* func_80AEAF58(PlayState* play, s32 npcActionIdx) {
}
s32 func_80AEAFA0(PlayState* play, u16 action, s32 npcActionIdx) {
CsCmdActorAction* csCmdNPCAction = func_80AEAF58(play, npcActionIdx);
CsCmdActorCue* csCmdNPCAction = func_80AEAF58(play, npcActionIdx);
if ((csCmdNPCAction != NULL) && (csCmdNPCAction->action == action)) {
return true;
@@ -268,7 +268,7 @@ s32 func_80AEAFA0(PlayState* play, u16 action, s32 npcActionIdx) {
}
s32 func_80AEAFE0(PlayState* play, u16 action, s32 npcActionIdx) {
CsCmdActorAction* csCmdNPCAction = func_80AEAF58(play, npcActionIdx);
CsCmdActorCue* csCmdNPCAction = func_80AEAF58(play, npcActionIdx);
if ((csCmdNPCAction != NULL) && (csCmdNPCAction->action != action)) {
return true;
@@ -412,7 +412,7 @@ void func_80AEB3DC(EnRu1* this, PlayState* play) {
EnRu1_SetMouthIndex(this, 0);
}
CsCmdActorAction* func_80AEB438(PlayState* play) {
CsCmdActorCue* func_80AEB438(PlayState* play) {
return func_80AEAF58(play, 3);
}
@@ -482,7 +482,7 @@ void func_80AEB7D0(EnRu1* this) {
this->skelAnime.moveFlags &= ~0x3;
}
f32 func_80AEB7E0(CsCmdActorAction* csCmdNPCAction, PlayState* play) {
f32 func_80AEB7E0(CsCmdActorCue* csCmdNPCAction, PlayState* play) {
s32 csCtxFrames = play->csCtx.frames;
if ((csCtxFrames < csCmdNPCAction->endFrame) && (csCmdNPCAction->endFrame - csCmdNPCAction->startFrame > 0)) {
@@ -500,7 +500,7 @@ f32 func_80AEB87C(f32 arg0, s32 arg1, s32 arg2) {
}
void func_80AEB89C(EnRu1* this, PlayState* play) {
CsCmdActorAction* npcAction = func_80AEB438(play);
CsCmdActorCue* npcAction = func_80AEB438(play);
s16 npcActionRotY;
if (npcAction != NULL) {
@@ -528,7 +528,7 @@ void func_80AEB954(EnRu1* this, PlayState* play) {
void func_80AEB974(EnRu1* this, PlayState* play) {
Vec3f* thisPos;
f32 sp30;
CsCmdActorAction* csCmdNPCAction = func_80AEB438(play);
CsCmdActorCue* csCmdNPCAction = func_80AEB438(play);
s32 pad;
if (csCmdNPCAction != NULL) {
@@ -549,7 +549,7 @@ void func_80AEBA2C(EnRu1* this, PlayState* play) {
Vec3f* unk_364 = &this->unk_364;
Vec3f* thisPos;
f32 temp_ret_2;
CsCmdActorAction* csCmdNPCAction = func_80AEB438(play);
CsCmdActorCue* csCmdNPCAction = func_80AEB438(play);
s32 pad2;
if (csCmdNPCAction != NULL) {
@@ -675,7 +675,7 @@ void func_80AEBF60(EnRu1* this, PlayState* play) {
}
void func_80AEBFD8(EnRu1* this, PlayState* play) {
CsCmdActorAction* csCmdNPCAction = func_80AEB438(play);
CsCmdActorCue* csCmdNPCAction = func_80AEB438(play);
f32 frameCount;
u16 csCtxFrames;
u16 endFrame;
@@ -878,7 +878,7 @@ void func_80AEC780(EnRu1* this, PlayState* play) {
}
void func_80AEC81C(EnRu1* this, PlayState* play) {
CsCmdActorAction* csCmdNPCAction;
CsCmdActorCue* csCmdNPCAction;
s16 newRotY;
if (func_80AEAFE0(play, 1, 3)) {
@@ -1653,7 +1653,7 @@ void func_80AEE7C4(EnRu1* this, PlayState* play) {
}
player = GET_PLAYER(play);
if (player->stateFlags2 & PLAYER_STATE2_IDLING) {
if (player->stateFlags2 & PLAYER_STATE2_IDLE_FIDGET) {
this->unk_370 += 1.0f;
if (this->action != 32) {
if (*unk_370 > 30.0f) {
@@ -1953,8 +1953,8 @@ void func_80AEF5B8(EnRu1* this) {
void func_80AEF624(EnRu1* this, PlayState* play) {
f32 frameCount;
CsCmdActorAction* csCmdNPCAction;
CsCmdActorAction* csCmdNPCAction2;
CsCmdActorCue* csCmdNPCAction;
CsCmdActorCue* csCmdNPCAction2;
s16 newRotTmp;
if (func_80AEAFE0(play, 1, 3)) {
soh/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c
+8 -8
View File
@@ -176,7 +176,7 @@ s32 EnRu2_UpdateSkelAnime(EnRu2* this) {
return SkelAnime_Update(&this->skelAnime);
}
CsCmdActorAction* func_80AF27AC(PlayState* play, s32 npcActionIdx) {
CsCmdActorCue* func_80AF27AC(PlayState* play, s32 npcActionIdx) {
if (play->csCtx.state != CS_STATE_IDLE) {
return play->csCtx.npcActions[npcActionIdx];
}
@@ -184,7 +184,7 @@ CsCmdActorAction* func_80AF27AC(PlayState* play, s32 npcActionIdx) {
}
s32 func_80AF27D0(EnRu2* this, PlayState* play, u16 arg2, s32 npcActionIdx) {
CsCmdActorAction* csCmdActorAction = func_80AF27AC(play, npcActionIdx);
CsCmdActorCue* csCmdActorAction = func_80AF27AC(play, npcActionIdx);
if ((csCmdActorAction != NULL) && (csCmdActorAction->action == arg2)) {
return true;
@@ -193,7 +193,7 @@ s32 func_80AF27D0(EnRu2* this, PlayState* play, u16 arg2, s32 npcActionIdx) {
}
s32 func_80AF281C(EnRu2* this, PlayState* play, u16 arg2, s32 npcActionIdx) {
CsCmdActorAction* csCmdNPCAction = func_80AF27AC(play, npcActionIdx);
CsCmdActorCue* csCmdNPCAction = func_80AF27AC(play, npcActionIdx);
if ((csCmdNPCAction != NULL) && (csCmdNPCAction->action != arg2)) {
return true;
@@ -202,7 +202,7 @@ s32 func_80AF281C(EnRu2* this, PlayState* play, u16 arg2, s32 npcActionIdx) {
}
void func_80AF2868(EnRu2* this, PlayState* play, u32 npcActionIdx) {
CsCmdActorAction* csCmdNPCAction = func_80AF27AC(play, npcActionIdx);
CsCmdActorCue* csCmdNPCAction = func_80AF27AC(play, npcActionIdx);
s16 newRotY;
Actor* thisx = &this->actor;
@@ -287,7 +287,7 @@ void func_80AF2AB4(EnRu2* this, PlayState* play) {
void func_80AF2B44(EnRu2* this, PlayState* play) {
CutsceneContext* csCtx = &play->csCtx;
CsCmdActorAction* csCmdNPCAction;
CsCmdActorCue* csCmdNPCAction;
if (csCtx->state != CS_STATE_IDLE) {
csCmdNPCAction = csCtx->npcActions[3];
@@ -308,7 +308,7 @@ void func_80AF2B94(EnRu2* this) {
void func_80AF2BC0(EnRu2* this, PlayState* play) {
AnimationHeader* animation = &gAdultRutoRaisingArmsUpAnim;
CsCmdActorAction* csCmdNPCAction;
CsCmdActorCue* csCmdNPCAction;
if (play->csCtx.state != CS_STATE_IDLE) {
csCmdNPCAction = play->csCtx.npcActions[3];
@@ -327,7 +327,7 @@ void func_80AF2C54(EnRu2* this, s32 arg1) {
}
void func_80AF2C68(EnRu2* this, PlayState* play) {
CsCmdActorAction* csCmdNPCAction;
CsCmdActorCue* csCmdNPCAction;
if (play->csCtx.state != CS_STATE_IDLE) {
csCmdNPCAction = play->csCtx.npcActions[6];
@@ -544,7 +544,7 @@ void func_80AF3530(EnRu2* this, s32 arg1) {
}
void func_80AF3564(EnRu2* this, PlayState* play) {
CsCmdActorAction* csCmdNPCAction = func_80AF27AC(play, 3);
CsCmdActorCue* csCmdNPCAction = func_80AF27AC(play, 3);
s32 action;
s32 unk_2BC;
soh/src/overlays/actors/ovl_En_Sa/z_en_sa.c
+3 -3
View File
@@ -463,13 +463,13 @@ void func_80AF609C(EnSa* this) {
}
}
void func_80AF6130(CsCmdActorAction* csAction, Vec3f* dst) {
void func_80AF6130(CsCmdActorCue* csAction, Vec3f* dst) {
dst->x = csAction->startPos.x;
dst->y = csAction->startPos.y;
dst->z = csAction->startPos.z;
}
void func_80AF6170(CsCmdActorAction* csAction, Vec3f* dst) {
void func_80AF6170(CsCmdActorCue* csAction, Vec3f* dst) {
dst->x = csAction->endPos.x;
dst->y = csAction->endPos.y;
dst->z = csAction->endPos.z;
@@ -639,7 +639,7 @@ void func_80AF68E4(EnSa* this, PlayState* play) {
Vec3f startPos;
Vec3f endPos;
Vec3f D_80AF7448 = { 0.0f, 0.0f, 0.0f };
CsCmdActorAction* csAction;
CsCmdActorCue* csAction;
f32 temp_f0;
f32 gravity;
soh/src/overlays/actors/ovl_En_Ta/z_en_ta.c
+2 -2
View File
@@ -580,7 +580,7 @@ s32 func_80B150AC(EnTa* this, PlayState* play, s32 idx) {
Player* player = GET_PLAYER(play);
Actor* interactRangeActor;
if (player->stateFlags1 & PLAYER_STATE1_ITEM_OVER_HEAD) {
if (player->stateFlags1 & PLAYER_STATE1_CARRYING_ACTOR) {
interactRangeActor = player->interactRangeActor;
if (interactRangeActor != NULL && interactRangeActor->id == ACTOR_EN_NIW &&
interactRangeActor == &this->superCuccos[idx]->actor) {
@@ -614,7 +614,7 @@ void func_80B15100(EnTa* this, PlayState* play) {
if (player->heldActor == &this->superCuccos[unk_2CA]->actor) {
player->heldActor = NULL;
}
player->stateFlags1 &= ~PLAYER_STATE1_ITEM_OVER_HEAD;
player->stateFlags1 &= ~PLAYER_STATE1_CARRYING_ACTOR;
this->superCuccos[unk_2CA] = NULL;
}
this->unk_2E0 |= 1;
soh/src/overlays/actors/ovl_En_Test/z_en_test.c
+3 -3
View File
@@ -407,7 +407,7 @@ void EnTest_ChooseAction(EnTest* this, PlayState* play) {
} else {
if (this->actor.xzDistToPlayer < 110.0f) {
if (Rand_ZeroOne() > 0.2f) {
if (player->stateFlags1 & PLAYER_STATE1_ENEMY_TARGET) {
if (player->stateFlags1 & PLAYER_STATE1_HOSTILE_LOCK_ON) {
if (this->actor.isTargeted) {
EnTest_SetupSlashDown(this);
} else {
@@ -693,7 +693,7 @@ void EnTest_WalkAndBlock(EnTest* this, PlayState* play) {
if (this->actor.xzDistToPlayer < 110.0f) {
if (Rand_ZeroOne() > 0.2f) {
if (player->stateFlags1 & PLAYER_STATE1_ENEMY_TARGET) {
if (player->stateFlags1 & PLAYER_STATE1_HOSTILE_LOCK_ON) {
if (this->actor.isTargeted) {
EnTest_SetupSlashDown(this);
} else {
@@ -978,7 +978,7 @@ void EnTest_SlashDownEnd(EnTest* this, PlayState* play) {
if ((ABS(yawDiff) > 0x3E80) && (this->actor.params != STALFOS_TYPE_CEILING)) {
this->actor.world.rot.y = this->actor.yawTowardsPlayer;
EnTest_SetupJumpBack(this);
} else if (player->stateFlags1 & PLAYER_STATE1_ENEMY_TARGET) {
} else if (player->stateFlags1 & PLAYER_STATE1_HOSTILE_LOCK_ON) {
if (this->actor.isTargeted) {
EnTest_SetupSlashDown(this);
} else if ((play->gameplayFrames % 2) != 0) {
soh/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c
+13 -13
View File
@@ -136,7 +136,7 @@ void EnTorch2_Init(Actor* thisx, PlayState* play2) {
sInput.cur.stick_x = sInput.cur.stick_y = 0;
this->currentShield = PLAYER_SHIELD_HYLIAN;
this->heldItemAction = this->heldItemId = PLAYER_IA_SWORD_MASTER;
Player_SetModelGroup(this, PLAYER_MODELGROUP_SWORD);
Player_SetModelGroup(this, PLAYER_MODELGROUP_SWORD_AND_SHIELD);
play->playerInit(this, play, &gDarkLinkSkel);
this->actor.naviEnemyId = 0x26;
this->cylinder.base.acFlags = AC_ON | AC_TYPE_PLAYER;
@@ -604,7 +604,7 @@ void EnTorch2_Update(Actor* thisx, PlayState* play2) {
if ((this->actor.colChkInfo.health == 0) && sDeathFlag) {
this->csAction = 0x18;
this->csActor = &player->actor;
this->doorBgCamIndex = 1;
this->cv.haltActorsDuringCsAction = true;
sDeathFlag = false;
}
if ((this->invincibilityTimer == 0) && (this->actor.colChkInfo.health != 0) &&
@@ -614,11 +614,11 @@ void EnTorch2_Update(Actor* thisx, PlayState* play2) {
if (!Actor_ApplyDamage(&this->actor)) {
func_800F5B58();
this->actor.flags &= ~(ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_HOSTILE);
this->unk_8A1 = 2;
this->unk_8A4 = 6.0f;
this->unk_8A8 = 6.0f;
this->unk_8A0 = this->actor.colChkInfo.damage;
this->unk_8A2 = this->actor.yawTowardsPlayer + 0x8000;
this->knockbackType = 2;
this->knockbackSpeed = 6.0f;
this->knockbackYVelocity = 6.0f;
this->knockbackDamage = this->actor.colChkInfo.damage;
this->knockbackRot = this->actor.yawTowardsPlayer + 0x8000;
sDeathFlag++;
sActionState = ENTORCH2_DEATH;
Enemy_StartFinishingBlow(play, &this->actor);
@@ -634,11 +634,11 @@ void EnTorch2_Update(Actor* thisx, PlayState* play2) {
}
} else {
this->actor.flags &= ~ACTOR_FLAG_TARGETABLE;
this->unk_8A0 = this->actor.colChkInfo.damage;
this->unk_8A1 = 1;
this->unk_8A8 = 6.0f;
this->unk_8A4 = 8.0f;
this->unk_8A2 = this->actor.yawTowardsPlayer + 0x8000;
this->knockbackDamage = this->actor.colChkInfo.damage;
this->knockbackType = 1;
this->knockbackYVelocity = 6.0f;
this->knockbackSpeed = 8.0f;
this->knockbackRot = this->actor.yawTowardsPlayer + 0x8000;
Actor_SetDropFlag(&this->actor, &this->cylinder.info, 1);
this->stateFlags3 &= ~PLAYER_STATE3_PAUSE_ACTION_FUNC;
this->stateFlags3 |= PLAYER_STATE3_IGNORE_CEILING_FLOOR_WATER;
@@ -651,7 +651,7 @@ void EnTorch2_Update(Actor* thisx, PlayState* play2) {
}
}
this->actor.colChkInfo.damage = 0;
this->unk_8A0 = 0;
this->knockbackDamage = 0;
}
// Handles being frozen by a deku nut
soh/src/overlays/actors/ovl_En_Xc/z_en_xc.c
+22 -22
View File
@@ -122,8 +122,8 @@ s32 EnXc_AnimIsFinished(EnXc* this) {
return SkelAnime_Update(&this->skelAnime);
}
CsCmdActorAction* EnXc_GetCsCmd(PlayState* play, s32 npcActionIdx) {
CsCmdActorAction* action = NULL;
CsCmdActorCue* EnXc_GetCsCmd(PlayState* play, s32 npcActionIdx) {
CsCmdActorCue* action = NULL;
if (play->csCtx.state != 0) {
action = play->csCtx.npcActions[npcActionIdx];
@@ -132,7 +132,7 @@ CsCmdActorAction* EnXc_GetCsCmd(PlayState* play, s32 npcActionIdx) {
}
s32 EnXc_CompareCsAction(EnXc* this, PlayState* play, u16 action, s32 npcActionIdx) {
CsCmdActorAction* csCmdActorAction = EnXc_GetCsCmd(play, npcActionIdx);
CsCmdActorCue* csCmdActorAction = EnXc_GetCsCmd(play, npcActionIdx);
if (csCmdActorAction != NULL && csCmdActorAction->action == action) {
return true;
@@ -141,7 +141,7 @@ s32 EnXc_CompareCsAction(EnXc* this, PlayState* play, u16 action, s32 npcActionI
}
s32 EnXc_CsActionsAreNotEqual(EnXc* this, PlayState* play, u16 action, s32 npcActionIdx) {
CsCmdActorAction* csCmdNPCAction = EnXc_GetCsCmd(play, npcActionIdx);
CsCmdActorCue* csCmdNPCAction = EnXc_GetCsCmd(play, npcActionIdx);
if (csCmdNPCAction && csCmdNPCAction->action != action) {
return true;
@@ -150,7 +150,7 @@ s32 EnXc_CsActionsAreNotEqual(EnXc* this, PlayState* play, u16 action, s32 npcAc
}
void func_80B3C588(EnXc* this, PlayState* play, u32 npcActionIdx) {
CsCmdActorAction* csCmdNPCAction = EnXc_GetCsCmd(play, npcActionIdx);
CsCmdActorCue* csCmdNPCAction = EnXc_GetCsCmd(play, npcActionIdx);
Actor* thisx = &this->actor;
if (csCmdNPCAction != NULL) {
@@ -164,7 +164,7 @@ void func_80B3C588(EnXc* this, PlayState* play, u32 npcActionIdx) {
}
void func_80B3C620(EnXc* this, PlayState* play, s32 npcActionIdx) {
CsCmdActorAction* npcAction = EnXc_GetCsCmd(play, npcActionIdx);
CsCmdActorCue* npcAction = EnXc_GetCsCmd(play, npcActionIdx);
Vec3f* xcPos = &this->actor.world.pos;
f32 startX;
f32 startY;
@@ -528,7 +528,7 @@ s32 sEnXcFlameSpawned = false;
void EnXc_SpawnFlame(EnXc* this, PlayState* play) {
if (!sEnXcFlameSpawned) {
CsCmdActorAction* npcAction = EnXc_GetCsCmd(play, 0);
CsCmdActorCue* npcAction = EnXc_GetCsCmd(play, 0);
f32 xPos = npcAction->startPos.x;
f32 yPos = npcAction->startPos.y;
f32 zPos = npcAction->startPos.z;
@@ -540,7 +540,7 @@ void EnXc_SpawnFlame(EnXc* this, PlayState* play) {
void EnXc_SetupFlamePos(EnXc* this, PlayState* play) {
Vec3f* attachedPos;
CsCmdActorAction* npcAction = EnXc_GetCsCmd(play, 0);
CsCmdActorCue* npcAction = EnXc_GetCsCmd(play, 0);
if (this->flameActor != NULL) {
attachedPos = &this->flameActor->world.pos;
@@ -565,7 +565,7 @@ void EnXc_InitFlame(EnXc* this, PlayState* play) {
s16 sceneNum = play->sceneNum;
if (sceneNum == SCENE_DEATH_MOUNTAIN_CRATER) {
CsCmdActorAction* npcAction = EnXc_GetCsCmd(play, 0);
CsCmdActorCue* npcAction = EnXc_GetCsCmd(play, 0);
if (npcAction != NULL) {
s32 action = npcAction->action;
@@ -588,7 +588,7 @@ void EnXc_InitFlame(EnXc* this, PlayState* play) {
void func_80B3D48C(EnXc* this, PlayState* play) {
CutsceneContext* csCtx = &play->csCtx;
CsCmdActorAction* linkAction = csCtx->linkAction;
CsCmdActorCue* linkAction = csCtx->linkAction;
s16 yaw;
if (linkAction != NULL) {
@@ -603,7 +603,7 @@ void func_80B3D48C(EnXc* this, PlayState* play) {
AnimationHeader* EnXc_GetCurrentHarpAnim(PlayState* play, s32 index) {
AnimationHeader* animation = &gSheikPlayingHarp5Anim;
CsCmdActorAction* npcAction = EnXc_GetCsCmd(play, index);
CsCmdActorCue* npcAction = EnXc_GetCsCmd(play, index);
if (npcAction != NULL) {
u16 action = npcAction->action;
@@ -677,7 +677,7 @@ void EnXc_SetupFallFromSkyAction(EnXc* this, PlayState* play) {
CutsceneContext* csCtx = &play->csCtx;
if (csCtx->state != 0) {
CsCmdActorAction* npcAction = csCtx->npcActions[4];
CsCmdActorCue* npcAction = csCtx->npcActions[4];
if (npcAction && npcAction->action == 2) {
s32 pad;
@@ -752,7 +752,7 @@ void EnXc_SetupStoppedAction(EnXc* this) {
}
void func_80B3DAF0(EnXc* this, PlayState* play) {
CsCmdActorAction* npcAction = EnXc_GetCsCmd(play, 4);
CsCmdActorCue* npcAction = EnXc_GetCsCmd(play, 4);
u16 action;
if (npcAction &&
@@ -799,7 +799,7 @@ void func_80B3DCA8(EnXc* this, PlayState* play) {
f32 frameCount;
if (play->csCtx.state != 0) {
CsCmdActorAction* npcAction = play->csCtx.npcActions[4];
CsCmdActorCue* npcAction = play->csCtx.npcActions[4];
if (npcAction != NULL && npcAction->action == 8) {
frameCount = Animation_GetLastFrame(&gSheikInitialHarpAnim);
@@ -848,7 +848,7 @@ void func_80B3DE78(EnXc* this, s32 animFinished) {
void EnXc_SetupReverseAccel(EnXc* this, PlayState* play) {
if (play->csCtx.state != 0) {
CsCmdActorAction* npcAction = play->csCtx.npcActions[4];
CsCmdActorCue* npcAction = play->csCtx.npcActions[4];
if (npcAction != NULL && npcAction->action == 4) {
Animation_Change(&this->skelAnime, &gSheikWalkingAnim, -1.0f, Animation_GetLastFrame(&gSheikWalkingAnim),
@@ -900,7 +900,7 @@ void func_80B3E164(EnXc* this, PlayState* play) {
void EnXc_SetupDisappear(EnXc* this, PlayState* play) {
if (play->csCtx.state != 0) {
CsCmdActorAction* npcAction = play->csCtx.npcActions[4];
CsCmdActorCue* npcAction = play->csCtx.npcActions[4];
if (npcAction != NULL && npcAction->action == 9) {
s16 sceneNum = play->sceneNum;
@@ -1164,7 +1164,7 @@ void func_80B3EC0C(EnXc* this, PlayState* play) {
CutsceneContext* csCtx = &play->csCtx;
if (csCtx->state != 0) {
CsCmdActorAction* npcAction = csCtx->npcActions[4];
CsCmdActorCue* npcAction = csCtx->npcActions[4];
if ((npcAction != NULL) && (npcAction->action != 1)) {
PosRot* posRot = &this->actor.world;
@@ -1187,7 +1187,7 @@ void func_80B3EC90(EnXc* this, PlayState* play) {
CutsceneContext* csCtx = &play->csCtx;
if (csCtx->state != 0) {
CsCmdActorAction* npcAction = csCtx->npcActions[4];
CsCmdActorCue* npcAction = csCtx->npcActions[4];
if (npcAction != NULL && npcAction->action != 6) {
func_80B3C9EC(this);
@@ -1413,7 +1413,7 @@ void EnXc_PlayDiveSFX(Vec3f* src, PlayState* play) {
}
void EnXc_LakeHyliaDive(PlayState* play) {
CsCmdActorAction* npcAction = npcAction = EnXc_GetCsCmd(play, 0);
CsCmdActorCue* npcAction = npcAction = EnXc_GetCsCmd(play, 0);
if (npcAction != NULL) {
Vec3f startPos;
@@ -1442,7 +1442,7 @@ void func_80B3F534(PlayState* play) {
s32 D_80B41DAC = 1;
void func_80B3F59C(EnXc* this, PlayState* play) {
CsCmdActorAction* npcAction = EnXc_GetCsCmd(play, 0);
CsCmdActorCue* npcAction = EnXc_GetCsCmd(play, 0);
if (npcAction != NULL) {
s32 action = npcAction->action;
@@ -1649,7 +1649,7 @@ void func_80B3FF0C(EnXc* this, PlayState* play) {
CutsceneContext* csCtx = &play->csCtx;
if (csCtx->state != 0) {
CsCmdActorAction* npcAction = play->csCtx.npcActions[4];
CsCmdActorCue* npcAction = play->csCtx.npcActions[4];
if (npcAction != NULL) {
PosRot* posRot = &this->actor.world;
@@ -1984,7 +1984,7 @@ void func_80B40E88(EnXc* this) {
}
s32 EnXc_SetupNocturneState(Actor* thisx, PlayState* play) {
CsCmdActorAction* npcAction = EnXc_GetCsCmd(play, 4);
CsCmdActorCue* npcAction = EnXc_GetCsCmd(play, 4);
if (npcAction != NULL) {
s32 action = npcAction->action;
soh/src/overlays/actors/ovl_En_Zf/z_en_zf.c
+2 -2
View File
@@ -542,7 +542,7 @@ s32 EnZf_CanAttack(PlayState* play, EnZf* this) {
return true;
}
if (this->actor.params == ENZF_TYPE_DINOLFOS) {
targetedActor = player->unk_664;
targetedActor = player->focusActor;
if (targetedActor == NULL) {
return false;
} else {
@@ -1208,7 +1208,7 @@ void EnZf_Slash(EnZf* this, PlayState* play) {
if (yawDiff > 16000) {
this->actor.world.rot.y = this->actor.yawTowardsPlayer;
func_80B483E4(this, play);
} else if (player->stateFlags1 & (PLAYER_STATE1_ENEMY_TARGET | PLAYER_STATE1_HANGING_OFF_LEDGE | PLAYER_STATE1_CLIMBING_LEDGE)) {
} else if (player->stateFlags1 & (PLAYER_STATE1_HOSTILE_LOCK_ON | PLAYER_STATE1_HANGING_OFF_LEDGE | PLAYER_STATE1_CLIMBING_LEDGE)) {
if (this->actor.isTargeted) {
EnZf_SetupSlash(this);
} else {
soh/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c
+4 -4
View File
@@ -331,13 +331,13 @@ void func_80B4B240(EnZl1* this, PlayState* play) {
func_80038290(play, &this->actor, &this->unk_200, &this->unk_206, this->actor.focus.pos);
}
void func_80B4B7F4(CsCmdActorAction* npcAction, Vec3f* pos) {
void func_80B4B7F4(CsCmdActorCue* npcAction, Vec3f* pos) {
pos->x = npcAction->startPos.x;
pos->y = npcAction->startPos.y;
pos->z = npcAction->startPos.z;
}
void func_80B4B834(CsCmdActorAction* npcAction, Vec3f* pos) {
void func_80B4B834(CsCmdActorCue* npcAction, Vec3f* pos) {
pos->x = npcAction->endPos.x;
pos->y = npcAction->endPos.y;
pos->z = npcAction->endPos.z;
@@ -368,7 +368,7 @@ void func_80B4B8B4(EnZl1* this, PlayState* play) {
Vec3f sp8C = { -512.0f, 105.0f, -4.0f };
s32 pad2;
f32 actionLength;
CsCmdActorAction* npcAction;
CsCmdActorCue* npcAction;
Vec3f sp74;
Vec3f sp68;
Vec3f velocity = { 0.0f, 0.0f, 0.0f };
@@ -450,7 +450,7 @@ void func_80B4BC78(EnZl1* this, PlayState* play) {
Vec3f sp70;
Vec3f sp64;
Vec3f velocity = { 0.0f, 0.0f, 0.0f };
CsCmdActorAction* npcAction;
CsCmdActorCue* npcAction;
s32 pad;
f32 frameCount;
soh/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c
+14 -14
View File
@@ -212,7 +212,7 @@ s32 EnZl2_UpdateSkelAnime(EnZl2* this) {
return SkelAnime_Update(&this->skelAnime);
}
CsCmdActorAction* EnZl2_GetNpcAction(PlayState* play, s32 idx) {
CsCmdActorCue* EnZl2_GetNpcAction(PlayState* play, s32 idx) {
if (play->csCtx.state != CS_STATE_IDLE) {
return play->csCtx.npcActions[idx];
}
@@ -220,7 +220,7 @@ CsCmdActorAction* EnZl2_GetNpcAction(PlayState* play, s32 idx) {
}
void func_80B4EDB8(EnZl2* this, PlayState* play, s32 arg2) {
CsCmdActorAction* npcAction = EnZl2_GetNpcAction(play, arg2);
CsCmdActorCue* npcAction = EnZl2_GetNpcAction(play, arg2);
if (npcAction != NULL) {
this->actor.world.pos.x = npcAction->startPos.x;
@@ -683,7 +683,7 @@ void func_80B5008C(EnZl2* this) {
}
void func_80B500E0(EnZl2* this, PlayState* play) {
CsCmdActorAction* npcAction = EnZl2_GetNpcAction(play, 0);
CsCmdActorCue* npcAction = EnZl2_GetNpcAction(play, 0);
Vec3f* thisPos = &this->actor.world.pos;
f32 startX;
f32 startY;
@@ -715,7 +715,7 @@ void func_80B501C4(EnZl2* this, s32 alpha) {
}
void func_80B501E8(EnZl2* this, PlayState* play) {
CsCmdActorAction* npcAction = EnZl2_GetNpcAction(play, 0);
CsCmdActorCue* npcAction = EnZl2_GetNpcAction(play, 0);
if (npcAction != NULL) {
this->actor.shape.shadowAlpha = this->alpha =
@@ -732,7 +732,7 @@ void func_80B50260(EnZl2* this, PlayState* play) {
}
void func_80B50278(EnZl2* this, PlayState* play) {
CsCmdActorAction* npcAction = EnZl2_GetNpcAction(play, 0);
CsCmdActorCue* npcAction = EnZl2_GetNpcAction(play, 0);
this->actor.world.pos.x = npcAction->startPos.x;
this->actor.world.pos.y = npcAction->startPos.y;
@@ -746,7 +746,7 @@ void func_80B50278(EnZl2* this, PlayState* play) {
void func_80B50304(EnZl2* this, PlayState* play) {
s32 pad[2];
ActorShape* shape = &this->actor.shape;
CsCmdActorAction* npcAction = EnZl2_GetNpcAction(play, 0);
CsCmdActorCue* npcAction = EnZl2_GetNpcAction(play, 0);
f32 actionXDelta;
f32 actionZDelta;
@@ -761,7 +761,7 @@ void func_80B50304(EnZl2* this, PlayState* play) {
}
void func_80B503DC(EnZl2* this, PlayState* play) {
CsCmdActorAction* npcAction = EnZl2_GetNpcAction(play, 0);
CsCmdActorCue* npcAction = EnZl2_GetNpcAction(play, 0);
if ((npcAction != NULL) && (play->csCtx.frames >= npcAction->endFrame)) {
this->action = 4;
@@ -906,7 +906,7 @@ void func_80B50980(EnZl2* this, PlayState* play) {
}
void func_80B509A0(EnZl2* this, PlayState* play) {
CsCmdActorAction* npcAction = EnZl2_GetNpcAction(play, 0);
CsCmdActorCue* npcAction = EnZl2_GetNpcAction(play, 0);
if (npcAction != NULL) {
if (play->csCtx.frames >= npcAction->endFrame) {
@@ -918,7 +918,7 @@ void func_80B509A0(EnZl2* this, PlayState* play) {
}
void func_80B50A04(EnZl2* this, PlayState* play) {
CsCmdActorAction* npcAction = EnZl2_GetNpcAction(play, 0);
CsCmdActorCue* npcAction = EnZl2_GetNpcAction(play, 0);
s32 newAction;
s32 unk_240;
@@ -1329,7 +1329,7 @@ void func_80B518C0(EnZl2* this) {
}
void func_80B51948(EnZl2* this, PlayState* play) {
CsCmdActorAction* npcAction = EnZl2_GetNpcAction(play, 0);
CsCmdActorCue* npcAction = EnZl2_GetNpcAction(play, 0);
s32 newAction;
s32 unk_240;
@@ -1450,7 +1450,7 @@ void func_80B51D24(EnZl2* this, PlayState* play) {
}
void func_80B51DA4(EnZl2* this, PlayState* play) {
CsCmdActorAction* npcAction = EnZl2_GetNpcAction(play, 0);
CsCmdActorCue* npcAction = EnZl2_GetNpcAction(play, 0);
Vec3f* thisPos = &this->actor.world.pos;
f32 startX;
f32 startY;
@@ -1486,7 +1486,7 @@ void func_80B51EA8(EnZl2* this) {
void func_80B51EBC(EnZl2* this, PlayState* play) {
ActorShape* shape = &this->actor.shape;
CsCmdActorAction* npcAction = EnZl2_GetNpcAction(play, 0);
CsCmdActorCue* npcAction = EnZl2_GetNpcAction(play, 0);
s32 pad[2];
this->actor.world.rot.y = shape->rot.y = npcAction->rot.y;
@@ -1497,7 +1497,7 @@ void func_80B51EBC(EnZl2* this, PlayState* play) {
}
void func_80B51F38(EnZl2* this, PlayState* play) {
CsCmdActorAction* npcAction = EnZl2_GetNpcAction(play, 0);
CsCmdActorCue* npcAction = EnZl2_GetNpcAction(play, 0);
if (npcAction != NULL) {
if (play->csCtx.frames - 8 >= npcAction->endFrame) {
@@ -1508,7 +1508,7 @@ void func_80B51F38(EnZl2* this, PlayState* play) {
}
void func_80B51FA8(EnZl2* this, PlayState* play) {
CsCmdActorAction* npcAction = EnZl2_GetNpcAction(play, 0);
CsCmdActorCue* npcAction = EnZl2_GetNpcAction(play, 0);
s32 action;
s32 unk_240;
soh/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c
+2 -2
View File
@@ -314,7 +314,7 @@ void func_80B5BB78(EnZl4* this, PlayState* play) {
Npc_TrackPoint(&this->actor, &this->interactInfo, 2, NPC_TRACKING_HEAD_AND_TORSO);
}
void EnZl4_GetActionStartPos(CsCmdActorAction* action, Vec3f* vec) {
void EnZl4_GetActionStartPos(CsCmdActorCue* action, Vec3f* vec) {
vec->x = action->startPos.x;
vec->y = action->startPos.y;
vec->z = action->startPos.z;
@@ -1213,7 +1213,7 @@ void EnZl4_Idle(EnZl4* this, PlayState* play) {
void EnZl4_TheEnd(EnZl4* this, PlayState* play) {
s32 animIndex[] = { ZL4_ANIM_0, ZL4_ANIM_0, ZL4_ANIM_0, ZL4_ANIM_0, ZL4_ANIM_0,
ZL4_ANIM_0, ZL4_ANIM_0, ZL4_ANIM_26, ZL4_ANIM_21, ZL4_ANIM_3 };
CsCmdActorAction* npcAction;
CsCmdActorCue* npcAction;
Vec3f pos;
if (SkelAnime_Update(&this->skelAnime) && (this->skelAnime.animation == &gChildZeldaAnim_010DF8)) {
soh/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c
+3 -3
View File
@@ -73,20 +73,20 @@ void ObjDekujr_Init(Actor* thisx, PlayState* play) {
void ObjDekujr_Destroy(Actor* thisx, PlayState* play) {
}
void ObjDekujr_SetInitialPos(CsCmdActorAction* npcAction, Vec3f* initPos) {
void ObjDekujr_SetInitialPos(CsCmdActorCue* npcAction, Vec3f* initPos) {
initPos->x = npcAction->startPos.x;
initPos->y = npcAction->startPos.y;
initPos->z = npcAction->startPos.z;
}
void ObjDekujr_SetFinalPos(CsCmdActorAction* npcAction, Vec3f* finalPos) {
void ObjDekujr_SetFinalPos(CsCmdActorCue* npcAction, Vec3f* finalPos) {
finalPos->x = npcAction->endPos.x;
finalPos->y = npcAction->endPos.y;
finalPos->z = npcAction->endPos.z;
}
void ObjDekujr_ComeUp(ObjDekujr* this, PlayState* play) {
CsCmdActorAction* csCmdNPCAction;
CsCmdActorCue* csCmdNPCAction;
Vec3f initPos;
Vec3f finalPos;
Vec3f velocity = { 0.0f, 0.0f, 0.0f };
soh/src/overlays/actors/ovl_player_actor/z_player.c
+2834 -2067
View File
File diff suppressed because it is too large Load Diff
soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c
+1 -1
View File
@@ -4598,7 +4598,7 @@ void KaleidoScope_Update(PlayState* play)
osSyncPrintf("i=%d LAST_TIME_TYPE=%d\n", i, gSaveContext.unk_13EE);
gSaveContext.unk_13EA = 0;
Interface_ChangeAlpha(gSaveContext.unk_13EE);
player->targetActor = NULL;
player->talkActor = NULL;
Player_SetEquipmentData(play, player);
osSyncPrintf(VT_RST);
break;