mirror of
https://github.com/zeldaret/oot.git
synced 2025-08-06 06:10:21 +00:00
EnTr, 1 nonmatching, mostly documented (#621)
* 2 functions left, data imported * one function left * setup for NON_MATCHING * struct variables named * most of the functions named, type enums * delete ASM * Actor fixes
This commit is contained in:
EllipticEllipsis
GitHub
parent
9607ce34fd
commit
c2b5ae3ed2
24 changed files with 527 additions and 1543 deletions
|
|
@ -15,15 +15,15 @@ void EnTr_Destroy(Actor* thisx, GlobalContext* globalCtx);
|
|||
void EnTr_Update(Actor* thisx, GlobalContext* globalCtx);
|
||||
void EnTr_Draw(Actor* thisx, GlobalContext* globalCtx);
|
||||
|
||||
extern UNK_TYPE D_060013CC;
|
||||
extern UNK_TYPE D_06001CDC;
|
||||
extern UNK_TYPE D_060035CC;
|
||||
extern UNK_TYPE D_06003FC8;
|
||||
extern UNK_TYPE D_060049C8;
|
||||
extern UNK_TYPE D_0600C530;
|
||||
extern UNK_TYPE D_06011688;
|
||||
void EnTr_DoNothing(EnTr* this, GlobalContext* globalCtx);
|
||||
void EnTr_ShrinkVanish(EnTr* this, GlobalContext* globalCtx);
|
||||
void EnTr_WaitToReappear(EnTr* this, GlobalContext* globalCtx);
|
||||
void EnTr_ChooseAction1(EnTr* this, GlobalContext* globalCtx);
|
||||
|
||||
void EnTr_UpdateRotation(EnTr* this, GlobalContext* globalCtx, s32 actionIndex);
|
||||
void func_80B24038(EnTr* this, GlobalContext* globalCtx, s32 actionIndex);
|
||||
void EnTr_SetStartPosRot(EnTr* this, GlobalContext* globalCtx, s32 actionIndex);
|
||||
|
||||
/*
|
||||
const ActorInit En_Tr_InitVars = {
|
||||
ACTOR_EN_TR,
|
||||
ACTORCAT_NPC,
|
||||
|
|
@ -35,45 +35,522 @@ const ActorInit En_Tr_InitVars = {
|
|||
(ActorFunc)EnTr_Update,
|
||||
(ActorFunc)EnTr_Draw,
|
||||
};
|
||||
*/
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B22CF0.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Init.s")
|
||||
// The first elements of these animation arrays are for Koume, the second for Kotake
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Destroy.s")
|
||||
static AnimationHeader* unused[] = {
|
||||
0x06003FC8,
|
||||
0x06001CDC,
|
||||
};
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B22E6C.s")
|
||||
static AnimationHeader* D_80B24368[] = {
|
||||
0x06002BC4, // Turn to look over right shoulder
|
||||
0x06000BFC, // Turn to look over right shoulder
|
||||
};
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B22F1C.s")
|
||||
static AnimationHeader* D_80B24370[] = {
|
||||
0x060035CC, // Looking over left shoulder
|
||||
0x060013CC, // Looking over right shoulder
|
||||
};
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B22F28.s")
|
||||
static AnimationHeader* D_80B24378[] = {
|
||||
0x060049C8, // Floating on broom
|
||||
0x060049C8, // Floating on broom
|
||||
};
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B230D8.s")
|
||||
static AnimationHeader* D_80B24380[] = {
|
||||
0x06012E1C, // Casting magic
|
||||
0x06012E1C, // Casting magic
|
||||
};
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23254.s")
|
||||
static f32 D_80B24388[] = { 0.0f, 20.0f, -30.0f, 20.0f, -20.0f, -20.0f, 30.0f };
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B234D4.s")
|
||||
static f32 D_80B243A4[] = { 0.0f, 30.0f, 0.0f, -30.0f, 30.0f, -30.0f, 0.0f };
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23690.s")
|
||||
// Has to be 1-dimensional to match
|
||||
static Color_RGBA8 D_80B243C0[4] = {
|
||||
{ 255, 200, 0, 255 },
|
||||
{ 255, 0, 0, 255 },
|
||||
{ 255, 255, 255, 255 },
|
||||
{ 0, 0, 255, 255 },
|
||||
};
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23820.s")
|
||||
static u64* sEyeTextures[] = {
|
||||
0x060086D8, // Open
|
||||
0x060094D8, // Half
|
||||
0x060098D8, // Closed
|
||||
};
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B238E0.s")
|
||||
extern AnimationHeader D_060013CC; // Looking over right shoulder
|
||||
extern AnimationHeader D_06001CDC; // Standing, broom in left hand
|
||||
extern AnimationHeader D_060035CC; // Looking over left shoulder
|
||||
extern AnimationHeader D_06003FC8; // Standing, broom over right shoulder
|
||||
extern AnimationHeader D_060049C8; // Floating on broom
|
||||
extern FlexSkeletonHeader D_0600C530;
|
||||
extern FlexSkeletonHeader D_06011688;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B239A8.s")
|
||||
void EnTr_SetupAction(EnTr* this, EnTrActionFunc actionFunc) {
|
||||
this->actionFunc = actionFunc;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23A88.s")
|
||||
void EnTr_Init(Actor* thisx, GlobalContext* globalCtx) {
|
||||
EnTr* this = THIS;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Update.s")
|
||||
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 30.0f);
|
||||
EnTr_SetupAction(this, EnTr_DoNothing);
|
||||
this->unk_2D4 = 0; // Set and not used
|
||||
this->actor.child = NULL;
|
||||
Actor_SetScale(&this->actor, 0.01f);
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23D74.s")
|
||||
switch (this->actor.params) {
|
||||
case TR_KOUME:
|
||||
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06011688, &D_06003FC8, this->jointTable,
|
||||
this->morphTable, 27);
|
||||
Animation_PlayOnce(&this->skelAnime, &D_06003FC8);
|
||||
this->animation = NULL;
|
||||
EnTr_SetupAction(this, EnTr_ChooseAction1);
|
||||
this->actionIndex = 3;
|
||||
break;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Draw.s")
|
||||
case TR_KOTAKE:
|
||||
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600C530, &D_06001CDC, this->jointTable,
|
||||
this->morphTable, 27);
|
||||
Animation_PlayOnce(&this->skelAnime, &D_06001CDC);
|
||||
this->animation = NULL;
|
||||
EnTr_SetupAction(this, EnTr_ChooseAction1);
|
||||
this->actionIndex = 2;
|
||||
break;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23FDC.s")
|
||||
default:
|
||||
__assert("0", "../z_en_tr.c", 277);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void EnTr_Destroy(Actor* thisx, GlobalContext* globalCtx) {
|
||||
}
|
||||
|
||||
void EnTr_CrySpellcast(EnTr* this, GlobalContext* globalCtx) {
|
||||
if (this->timer == 11) {
|
||||
// Both cry in the title screen cutscene, but only Kotake in the in-game cutscene
|
||||
if ((this->actor.params != TR_KOUME) || (gSaveContext.sceneSetupIndex == 6)) {
|
||||
Audio_PlaySoundGeneral(NA_SE_EN_TWINROBA_SHOOT_VOICE, &D_801333D4, 4, &D_801333E0, &D_801333E0,
|
||||
&D_801333E8);
|
||||
}
|
||||
}
|
||||
|
||||
if (this->timer > 0) {
|
||||
this->timer--;
|
||||
} else if (this->actor.child != NULL) {
|
||||
this->actor.child = NULL;
|
||||
}
|
||||
func_8002F974(&this->actor, NA_SE_EN_TWINROBA_FLY_DEMO - SFX_FLAG);
|
||||
}
|
||||
|
||||
void EnTr_DoNothing(EnTr* this, GlobalContext* globalCtx) {
|
||||
}
|
||||
|
||||
void EnTr_ChooseAction2(EnTr* this, GlobalContext* globalCtx) {
|
||||
if (globalCtx->csCtx.state != 0) {
|
||||
if (globalCtx->csCtx.npcActions[this->actionIndex] != NULL) {
|
||||
switch (globalCtx->csCtx.npcActions[this->actionIndex]->action) {
|
||||
|
||||
case 4:
|
||||
Actor_SetScale(&this->actor, 0.01f);
|
||||
EnTr_SetupAction(this, EnTr_ShrinkVanish);
|
||||
this->timer = 24;
|
||||
Audio_PlayActorSound2(&this->actor, NA_SE_EN_PO_DEAD2);
|
||||
break;
|
||||
|
||||
case 6:
|
||||
Animation_Change(&this->skelAnime, D_80B24380[this->actor.params], 1.0f, 0.0f,
|
||||
Animation_GetLastFrame(D_80B24380[this->actor.params]), ANIMMODE_ONCE, -5.0f);
|
||||
EnTr_SetupAction(this, EnTr_CrySpellcast);
|
||||
this->animation = D_80B24378[this->actor.params];
|
||||
this->timer = 39;
|
||||
Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DEMO_6K,
|
||||
this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, 0,
|
||||
0, 0, this->actor.params + 9);
|
||||
Audio_PlayActorSound2(&this->actor, NA_SE_EN_FANTOM_MASIC1);
|
||||
break;
|
||||
|
||||
default:
|
||||
func_80B24038(this, globalCtx, this->actionIndex);
|
||||
EnTr_UpdateRotation(this, globalCtx, this->actionIndex);
|
||||
break;
|
||||
}
|
||||
func_8002F974(&this->actor, NA_SE_EN_TWINROBA_FLY_DEMO - SFX_FLAG);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void EnTr_FlyKidnapCutscene(EnTr* this, GlobalContext* globalCtx) {
|
||||
Vec3f originalPos;
|
||||
s16 actionIndex;
|
||||
|
||||
originalPos = this->actor.world.pos;
|
||||
if (globalCtx->csCtx.state != 0) {
|
||||
actionIndex = this->actionIndex;
|
||||
|
||||
if (globalCtx->csCtx.npcActions[actionIndex] != NULL) {
|
||||
if (globalCtx->csCtx.npcActions[actionIndex]->action == 8) {
|
||||
func_80B24038(this, globalCtx, actionIndex);
|
||||
this->actor.world.rot.y = Math_Atan2S(this->actor.velocity.z, this->actor.velocity.x);
|
||||
Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.world.rot.y, 10, 0x400, 0x100);
|
||||
this->actor.world.rot.y = this->actor.shape.rot.y;
|
||||
} else {
|
||||
EnTr_SetStartPosRot(this, globalCtx, actionIndex);
|
||||
this->actor.world.pos.x += Math_SinS(this->timer) * 150.0f;
|
||||
this->actor.world.pos.y += -100.0f;
|
||||
this->actor.world.pos.z += Math_CosS(this->timer) * 150.0f;
|
||||
|
||||
this->actor.shape.rot.y = (s16)(this->timer) + 0x4000;
|
||||
this->timer += 0x400;
|
||||
|
||||
this->actor.velocity.x = this->actor.world.pos.x - originalPos.x;
|
||||
this->actor.velocity.y = this->actor.world.pos.y - originalPos.y;
|
||||
this->actor.velocity.z = this->actor.world.pos.z - originalPos.z;
|
||||
}
|
||||
|
||||
if (globalCtx->csCtx.frames < 670) {
|
||||
func_8002F974(&this->actor, NA_SE_EN_TWINROBA_FLY_DEMO - SFX_FLAG);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void func_80B23254(EnTr* this, GlobalContext* globalCtx, s32 arg2, f32 arg3, f32 scale) {
|
||||
Vec3f pos;
|
||||
Vec3f velocity;
|
||||
Vec3f accel;
|
||||
Vec3f sp58;
|
||||
Color_RGBA8* primColor;
|
||||
Color_RGBA8* envColor;
|
||||
Vec3f cameraEye;
|
||||
s16 yaw;
|
||||
s16 reversePitch;
|
||||
f32 sp3C;
|
||||
|
||||
cameraEye = ACTIVE_CAM->eye;
|
||||
yaw = Math_Vec3f_Yaw(&cameraEye, &this->actor.world.pos);
|
||||
reversePitch = -Math_Vec3f_Pitch(&cameraEye, &this->actor.world.pos);
|
||||
accel.z = 0.0f;
|
||||
accel.x = 0.0f;
|
||||
sp3C = Math_SinS(yaw);
|
||||
velocity.x = Math_CosS(reversePitch) * (arg3 * sp3C);
|
||||
velocity.y = Math_SinS(reversePitch) * arg3;
|
||||
sp3C = Math_CosS(yaw);
|
||||
velocity.z = Math_CosS(reversePitch) * (arg3 * sp3C);
|
||||
accel.y = 0.5f;
|
||||
|
||||
primColor = &D_80B243C0[2 * this->actor.params];
|
||||
envColor = &D_80B243C0[2 * this->actor.params + 1];
|
||||
|
||||
sp58 = this->actor.world.pos;
|
||||
sp58.x -= velocity.x * 10.0f;
|
||||
sp58.y -= velocity.y * 10.0f;
|
||||
sp58.z -= velocity.z * 10.0f;
|
||||
|
||||
pos.x = sp58.x + ((D_80B24388[arg2] * scale) * Math_CosS(yaw));
|
||||
pos.y = sp58.y + (D_80B243A4[arg2] * scale);
|
||||
pos.z = sp58.z - ((D_80B24388[arg2] * scale) * Math_SinS(yaw));
|
||||
func_8002829C(globalCtx, &pos, &velocity, &accel, primColor, envColor, (s32)(800.0f * scale), (s32)(80.0f * scale));
|
||||
}
|
||||
|
||||
void EnTr_ShrinkVanish(EnTr* this, GlobalContext* globalCtx) {
|
||||
s32 temp_hi;
|
||||
|
||||
if (this->timer >= 17) {
|
||||
this->actor.shape.rot.y = (this->actor.shape.rot.y - (this->timer * 0x28F)) + 0x3D68;
|
||||
} else {
|
||||
if (this->timer >= 5) {
|
||||
Actor_SetScale(&this->actor, this->actor.scale.x * 0.9f);
|
||||
this->actor.shape.rot.y = (this->actor.shape.rot.y - (this->timer * 0x28F)) + 0x3D68;
|
||||
} else if (this->timer > 0) {
|
||||
temp_hi = (this->timer * 2) % 7;
|
||||
func_80B23254(this, globalCtx, temp_hi, 5.0f, 0.2f);
|
||||
func_80B23254(this, globalCtx, (temp_hi + 1) % 7, 5.0f, 0.2f);
|
||||
Actor_SetScale(&this->actor, this->actor.scale.x * 0.9f);
|
||||
this->actor.shape.rot.y = (this->actor.shape.rot.y - (this->timer * 0x28F)) + 0x3D68;
|
||||
} else {
|
||||
EnTr_SetupAction(this, EnTr_WaitToReappear);
|
||||
this->actor.draw = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
if (this->timer == 4) {
|
||||
Audio_PlayActorSound2(&this->actor, NA_SE_EN_BUBLE_DOWN);
|
||||
}
|
||||
|
||||
if (this->timer > 0) {
|
||||
this->timer--;
|
||||
}
|
||||
}
|
||||
|
||||
void EnTr_Reappear(EnTr* this, GlobalContext* globalCtx) {
|
||||
s32 temp_hi;
|
||||
|
||||
if (this->timer >= 31) {
|
||||
temp_hi = (this->timer * 2) % 7;
|
||||
|
||||
func_80B23254(this, globalCtx, temp_hi, 5.0f, 1.0f);
|
||||
func_80B23254(this, globalCtx, (temp_hi + 1) % 7, 5.0f, 1.0f);
|
||||
} else if (this->timer == 30) {
|
||||
this->actor.draw = EnTr_Draw;
|
||||
this->actor.shape.rot.y += this->timer * 0x1A6;
|
||||
} else if (this->timer > 0) {
|
||||
this->actor.shape.rot.y += this->timer * 0x1A6;
|
||||
Actor_SetScale(&this->actor, (this->actor.scale.x * 0.8f) + 0.002f);
|
||||
} else {
|
||||
EnTr_SetupAction(this, EnTr_ChooseAction2);
|
||||
Actor_SetScale(&this->actor, 0.01f);
|
||||
}
|
||||
|
||||
if (this->timer > 0) {
|
||||
this->timer--;
|
||||
}
|
||||
func_8002F974(&this->actor, NA_SE_EN_TWINROBA_FLY_DEMO - SFX_FLAG);
|
||||
}
|
||||
|
||||
void EnTr_WaitToReappear(EnTr* this, GlobalContext* globalCtx) {
|
||||
if (globalCtx->csCtx.state != 0) {
|
||||
if ((globalCtx->csCtx.npcActions[this->actionIndex] != NULL) &&
|
||||
((globalCtx->csCtx.npcActions[this->actionIndex]->action == 3) ||
|
||||
(globalCtx->csCtx.npcActions[this->actionIndex]->action == 5))) {
|
||||
Audio_PlayActorSound2(&this->actor, NA_SE_EN_TWINROBA_TRANSFORM);
|
||||
this->timer = 34;
|
||||
EnTr_SetStartPosRot(this, globalCtx, this->actionIndex);
|
||||
EnTr_SetupAction(this, EnTr_Reappear);
|
||||
Animation_PlayLoop(&this->skelAnime, &D_060049C8);
|
||||
this->animation = NULL;
|
||||
Actor_SetScale(&this->actor, 0.003f);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void EnTr_TakeOff(EnTr* this, GlobalContext* globalCtx) {
|
||||
f32 lastFrame = Animation_GetLastFrame(D_80B24378[this->actor.params]);
|
||||
|
||||
if (globalCtx->csCtx.state != 0) {
|
||||
if ((globalCtx->csCtx.npcActions[this->actionIndex] != NULL) &&
|
||||
(globalCtx->csCtx.npcActions[this->actionIndex]->action == 3)) {
|
||||
Animation_Change(&this->skelAnime, D_80B24378[this->actor.params], 1.0f, 0.0f, lastFrame, ANIMMODE_LOOP,
|
||||
-10.0f);
|
||||
this->animation = NULL;
|
||||
EnTr_SetupAction(this, EnTr_ChooseAction2);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void EnTr_TurnLookOverShoulder(EnTr* this, GlobalContext* globalCtx) {
|
||||
f32 lastFrame = Animation_GetLastFrame(D_80B24368[this->actor.params]);
|
||||
|
||||
if (globalCtx->csCtx.state != 0) {
|
||||
if ((globalCtx->csCtx.npcActions[this->actionIndex] != NULL) &&
|
||||
(globalCtx->csCtx.npcActions[this->actionIndex]->action == 2)) {
|
||||
Animation_Change(&this->skelAnime, D_80B24368[this->actor.params], 1.0f, 0.0f, lastFrame, ANIMMODE_ONCE,
|
||||
-4.0f);
|
||||
this->animation = D_80B24370[this->actor.params];
|
||||
EnTr_SetupAction(this, EnTr_TakeOff);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void EnTr_ChooseAction1(EnTr* this, GlobalContext* globalCtx) {
|
||||
u32 frames = globalCtx->gameplayFrames;
|
||||
|
||||
if (globalCtx->csCtx.state != 0) {
|
||||
if (globalCtx->csCtx.npcActions[this->actionIndex] != NULL) {
|
||||
switch (globalCtx->csCtx.npcActions[this->actionIndex]->action) {
|
||||
case 1:
|
||||
EnTr_SetStartPosRot(this, globalCtx, this->actionIndex);
|
||||
EnTr_SetupAction(this, EnTr_TurnLookOverShoulder);
|
||||
break;
|
||||
|
||||
case 3:
|
||||
EnTr_SetStartPosRot(this, globalCtx, this->actionIndex);
|
||||
EnTr_SetupAction(this, EnTr_ChooseAction2);
|
||||
Animation_PlayLoop(&this->skelAnime, &D_060049C8);
|
||||
this->animation = NULL;
|
||||
break;
|
||||
|
||||
case 4:
|
||||
EnTr_SetupAction(this, EnTr_WaitToReappear);
|
||||
this->actor.draw = NULL;
|
||||
break;
|
||||
|
||||
case 7:
|
||||
EnTr_SetupAction(this, EnTr_FlyKidnapCutscene);
|
||||
Animation_PlayLoop(&this->skelAnime, &D_060049C8);
|
||||
this->animation = NULL;
|
||||
this->timer = ((this->actor.params != TR_KOUME) ? ((u8)frames << 10) + 0x8000 : (u8)frames << 10);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void EnTr_Update(Actor* thisx, GlobalContext* globalCtx) {
|
||||
s32 pad;
|
||||
EnTr* this = THIS;
|
||||
|
||||
Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 0.0f, 0.0f, 0.0f, 5);
|
||||
this->actionFunc(this, globalCtx);
|
||||
|
||||
if (SkelAnime_Update(&this->skelAnime) != 0) {
|
||||
if (this->animation != NULL) {
|
||||
if ((this->animation == &D_060035CC) || (this->animation == &D_060013CC)) {
|
||||
if (this->actor.params != TR_KOUME) {
|
||||
Audio_PlayActorSound2(&this->actor, NA_SE_EN_TWINROBA_LAUGH2);
|
||||
} else {
|
||||
Audio_PlayActorSound2(&this->actor, NA_SE_EN_TWINROBA_LAUGH);
|
||||
}
|
||||
Animation_PlayLoop(&this->skelAnime, this->animation);
|
||||
} else if (this->animation == &D_060049C8) {
|
||||
EnTr_SetupAction(this, EnTr_ChooseAction2);
|
||||
Animation_Change(&this->skelAnime, &D_060049C8, 1.0f, 0.0f, Animation_GetLastFrame(&D_060049C8),
|
||||
ANIMMODE_LOOP, -5.0f);
|
||||
} else {
|
||||
Animation_PlayLoop(&this->skelAnime, this->animation);
|
||||
}
|
||||
this->animation = NULL;
|
||||
} else {
|
||||
this->skelAnime.curFrame = 0.0f;
|
||||
}
|
||||
}
|
||||
Actor_SetFocus(&this->actor, 0.0f);
|
||||
|
||||
if (DECR(this->blinkTimer) == 0) {
|
||||
this->blinkTimer = Rand_S16Offset(60, 60);
|
||||
}
|
||||
this->eyeIndex = this->blinkTimer;
|
||||
if (this->eyeIndex >= 3) {
|
||||
this->eyeIndex = 0;
|
||||
}
|
||||
}
|
||||
|
||||
s32 EnTr_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
|
||||
Vec3f src = { 2300.0f, 0.0f, -600.0f };
|
||||
Vec3f dest = { 0.0f, 0.0f, 0.0f };
|
||||
EnTr* this = THIS;
|
||||
Actor* child = this->actor.child;
|
||||
|
||||
if ((child != NULL) && (limbIndex == 19)) {
|
||||
Matrix_MultVec3f(&src, &dest);
|
||||
dest.x -= (10.0f * Math_SinS(Camera_GetCamDirYaw(globalCtx->cameraPtrs[globalCtx->activeCamera])));
|
||||
dest.z -= (10.0f * Math_CosS(Camera_GetCamDirYaw(globalCtx->cameraPtrs[globalCtx->activeCamera])));
|
||||
child->world.pos = dest;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
void EnTr_Draw(Actor* thisx, GlobalContext* globalCtx) {
|
||||
s32 pad;
|
||||
EnTr* this = THIS;
|
||||
|
||||
if (1) {}
|
||||
|
||||
if ((globalCtx->csCtx.state == 0) || (globalCtx->csCtx.npcActions[this->actionIndex] == 0)) {
|
||||
this->actor.shape.shadowDraw = NULL;
|
||||
return;
|
||||
}
|
||||
|
||||
this->actor.shape.shadowDraw = ActorShadow_DrawCircle;
|
||||
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_tr.c", 840);
|
||||
func_800943C8(globalCtx->state.gfxCtx);
|
||||
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sEyeTextures[this->eyeIndex]));
|
||||
func_8002EBCC(&this->actor, globalCtx, 0);
|
||||
SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
|
||||
EnTr_OverrideLimbDraw, NULL, this);
|
||||
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_tr.c", 854);
|
||||
}
|
||||
|
||||
f32 func_80B23FDC(GlobalContext* globalCtx, s32 actionIndex) {
|
||||
f32 phi_f2;
|
||||
|
||||
phi_f2 = func_8006F93C(globalCtx->csCtx.npcActions[actionIndex]->endFrame,
|
||||
globalCtx->csCtx.npcActions[actionIndex]->startFrame, globalCtx->csCtx.frames);
|
||||
phi_f2 = CLAMP_MAX(phi_f2, 1.0f);
|
||||
return phi_f2;
|
||||
}
|
||||
|
||||
#ifdef NON_MATCHING
|
||||
// Major ordering issues, not making the three 0.1fs separate rodata, etc.
|
||||
void func_80B24038(EnTr* this, GlobalContext* globalCtx, s32 actionIndex) {
|
||||
Vec3f startPos;
|
||||
Vec3f endPos;
|
||||
Vec3f goalVel;
|
||||
f32 temp_f0;
|
||||
f32 temp_f0_2;
|
||||
f32 temp_f2_2;
|
||||
f32 phi_f12;
|
||||
|
||||
startPos.x = globalCtx->csCtx.npcActions[actionIndex]->startPos.x;
|
||||
startPos.y = globalCtx->csCtx.npcActions[actionIndex]->startPos.y;
|
||||
startPos.z = globalCtx->csCtx.npcActions[actionIndex]->startPos.z;
|
||||
|
||||
endPos.x = globalCtx->csCtx.npcActions[actionIndex]->endPos.x;
|
||||
endPos.y = globalCtx->csCtx.npcActions[actionIndex]->endPos.y;
|
||||
endPos.z = globalCtx->csCtx.npcActions[actionIndex]->endPos.z;
|
||||
|
||||
temp_f0 = func_80B23FDC(globalCtx, actionIndex);
|
||||
|
||||
goalVel.x = ((((endPos.x - startPos.x) * temp_f0) + startPos.x) - this->actor.world.pos.x) * 0.1f;
|
||||
goalVel.y = ((((endPos.y - startPos.y) * temp_f0) + startPos.y) - this->actor.world.pos.y) * 0.1f;
|
||||
goalVel.z = ((((endPos.z - startPos.z) * temp_f0) + startPos.z) - this->actor.world.pos.z) * 0.1f;
|
||||
|
||||
temp_f0_2 = sqrtf(SQ(goalVel.x) + SQ(goalVel.y) + SQ(goalVel.z));
|
||||
phi_f12 = CLAMP(temp_f0_2, 0.0f, 20.0f);
|
||||
|
||||
if ((temp_f0_2 != phi_f12) && (temp_f0_2 != 0.0f)) {
|
||||
temp_f2_2 = phi_f12 / temp_f0_2;
|
||||
|
||||
goalVel.x *= temp_f2_2;
|
||||
goalVel.y *= temp_f2_2;
|
||||
goalVel.z *= temp_f2_2;
|
||||
}
|
||||
|
||||
Math_StepToF(&this->actor.velocity.x, goalVel.x, 1.0f);
|
||||
Math_StepToF(&this->actor.velocity.y, goalVel.y, 1.0f);
|
||||
Math_StepToF(&this->actor.velocity.z, goalVel.z, 1.0f);
|
||||
func_8002D7EC(&this->actor);
|
||||
}
|
||||
#else
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B24038.s")
|
||||
#endif
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B24230.s")
|
||||
void EnTr_UpdateRotation(EnTr* this, GlobalContext* globalCtx, s32 actionIndex) {
|
||||
s16 rotY;
|
||||
s32 rotDiff;
|
||||
s32 rotSign;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B242B4.s")
|
||||
rotY = globalCtx->csCtx.npcActions[actionIndex]->rot.y;
|
||||
rotDiff = this->actor.world.rot.y - rotY;
|
||||
|
||||
if (rotDiff < 0) {
|
||||
rotDiff = 0 - rotDiff;
|
||||
rotSign = 1;
|
||||
} else {
|
||||
rotSign = -1;
|
||||
}
|
||||
|
||||
if (rotDiff >= 0x8000) {
|
||||
rotSign = 0 - rotSign;
|
||||
rotDiff = 0x10000 - rotDiff;
|
||||
}
|
||||
|
||||
rotDiff *= 0.1f;
|
||||
|
||||
this->actor.world.rot.y += rotDiff * rotSign;
|
||||
this->actor.shape.rot.y = this->actor.world.rot.y;
|
||||
}
|
||||
|
||||
void EnTr_SetStartPosRot(EnTr* this, GlobalContext* globalCtx, s32 actionIndex) {
|
||||
Vec3f startPos;
|
||||
|
||||
startPos.x = globalCtx->csCtx.npcActions[actionIndex]->startPos.x;
|
||||
startPos.y = globalCtx->csCtx.npcActions[actionIndex]->startPos.y;
|
||||
startPos.z = globalCtx->csCtx.npcActions[actionIndex]->startPos.z;
|
||||
this->actor.world.pos = startPos;
|
||||
this->actor.world.rot.y = this->actor.shape.rot.y = globalCtx->csCtx.npcActions[actionIndex]->rot.y;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,11 +6,27 @@
|
|||
|
||||
struct EnTr;
|
||||
|
||||
typedef void (*EnTrActionFunc)(struct EnTr*, GlobalContext*);
|
||||
|
||||
typedef struct EnTr {
|
||||
/* 0x0000 */ Actor actor;
|
||||
/* 0x014C */ char unk_14C[0x19C];
|
||||
/* 0x014C */ SkelAnime skelAnime;
|
||||
/* 0x0190 */ Vec3s jointTable[27];
|
||||
/* 0x0232 */ Vec3s morphTable[27];
|
||||
/* 0x02D4 */ s16 unk_2D4;
|
||||
/* 0x02D6 */ u16 timer; // Also used as an angle
|
||||
/* 0x02D8 */ s16 actionIndex;
|
||||
/* 0x02DC */ EnTrActionFunc actionFunc;
|
||||
/* 0x02E0 */ s16 eyeIndex;
|
||||
/* 0x02E2 */ s16 blinkTimer;
|
||||
/* 0x02E4 */ AnimationHeader* animation;
|
||||
} EnTr; // size = 0x02E8
|
||||
|
||||
extern const ActorInit En_Tr_InitVars;
|
||||
|
||||
typedef enum {
|
||||
/* 0 */ TR_KOUME,
|
||||
/* 1 */ TR_KOTAKE
|
||||
} TwinrovaType;
|
||||
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue