mirror of
https://github.com/zeldaret/oot.git
synced 2025-07-16 21:05:12 +00:00
Decompile most of ovl_En_Horse_Ganon (#108)
* Work on horse ganon * Match destroy, init matches but need mv data -> .c * Match EnHorseGanon_Draw and func_80A68E14 * Move some data to .c * Decomp func_80A68870 * EnHorseGanon_Update nearly matches * func_80A68FA8 and func_80A686A8 match * Fix EnHorseGanon_Init, start on func_80A68B20 * match func_80A68B20 * Migrate data but something doesn't match * Matches with migrated data, fix most warnings * Rename some variables, some clean up * A little more cleanup before PR * Move commented out code to NON_MATCHING blocks * Run formatter and delete unused line, char -> u8 * Update function was matched Also imports another type from z_skin.Seeing as they are somewhat tentative I decided not to put them in any global file. * Update src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c Co-authored-by: Random <28494085+Random06457@users.noreply.github.com> * PR Changes * Apply suggestions from code review Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * PR Changes round 2 Co-authored-by: Random <28494085+Random06457@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
This commit is contained in:
Nathan Faltermeier
GitHub
parent
10d45ed7ea
commit
a65554d586
19 changed files with 307 additions and 791 deletions
|
|
@ -13,7 +13,16 @@ void EnHorseGanon_Destroy(EnHorseGanon* this, GlobalContext* globalCtx);
|
|||
void EnHorseGanon_Update(EnHorseGanon* this, GlobalContext* globalCtx);
|
||||
void EnHorseGanon_Draw(EnHorseGanon* this, GlobalContext* globalCtx);
|
||||
|
||||
/*
|
||||
void func_80A68660(unk_D_80A69248* data, s32 index, Vec3f* vec);
|
||||
void func_80A686A8(EnHorseGanon* this, GlobalContext* globalCtx);
|
||||
void func_80A68870(EnHorseGanon* this);
|
||||
void func_80A68AC4(EnHorseGanon* this);
|
||||
void func_80A68AF0(EnHorseGanon* this, GlobalContext* globalCtx);
|
||||
void func_80A68B20(EnHorseGanon* this);
|
||||
void func_80A68DB0(EnHorseGanon* this, GlobalContext* globalCtx);
|
||||
void func_80A68E14(EnHorseGanon* this, GlobalContext* globalCtx);
|
||||
void func_80A68FA8(EnHorseGanon* this, GlobalContext* globalCtx, ColliderJntSphItem* colliderSphereItem);
|
||||
|
||||
const ActorInit En_Horse_Ganon_InitVars = {
|
||||
ACTOR_EN_HORSE_GANON,
|
||||
ACTORTYPE_BG,
|
||||
|
|
@ -25,29 +34,278 @@ const ActorInit En_Horse_Ganon_InitVars = {
|
|||
(ActorFunc)EnHorseGanon_Update,
|
||||
(ActorFunc)EnHorseGanon_Draw,
|
||||
};
|
||||
*/
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68660.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A686A8.s")
|
||||
extern SkeletonHeader D_06008668;
|
||||
|
||||
extern AnimationHeader D_06004AA4;
|
||||
extern AnimationHeader D_06005264;
|
||||
extern AnimationHeader D_06005B78;
|
||||
extern AnimationHeader D_06002CE4;
|
||||
extern AnimationHeader D_06002650;
|
||||
extern AnimationHeader D_06003858;
|
||||
|
||||
AnimationHeader* D_80A691B0[] = { &D_06004AA4, &D_06005264, &D_06005B78, &D_06002CE4 };
|
||||
AnimationHeader* D_80A691C0[] = { &D_06002650, &D_06003858 };
|
||||
static f32 animPlaybackSpeed[] = { 0.66666666f, 0.66666666f, 1.0f, 1.0f, 1.0f, 0.66666666f };
|
||||
|
||||
static ColliderCylinderInit cylinderInit = {
|
||||
{ COLTYPE_UNK10, 0x00, 0x00, 0x39, 0x12, COLSHAPE_CYLINDER },
|
||||
{ 0x00, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, 0x00, 0x00, 0x01 },
|
||||
{ 40, 100, 0, { 0, 0, 0 } },
|
||||
};
|
||||
static ColliderJntSphItemInit jntsphItemsInit[1] = {
|
||||
{
|
||||
{ 0x00, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, 0x00, 0x00, 0x01 },
|
||||
{ 13, { { 0, 0, 0 }, 20 }, 100 },
|
||||
},
|
||||
};
|
||||
static ColliderJntSphInit jntsphInit = {
|
||||
{ COLTYPE_UNK10, 0x00, 0x09, 0x39, 0x12, COLSHAPE_JNTSPH },
|
||||
1,
|
||||
jntsphItemsInit,
|
||||
};
|
||||
|
||||
static CollisionCheckInfoInit collisionCheckInfoInit = {
|
||||
0x0A,
|
||||
0x0023,
|
||||
0x0064,
|
||||
0xFE,
|
||||
};
|
||||
|
||||
unk_D_80A69248 D_80A69248[] = { { 0x09B8, 0x0126, 0x0E2C, 0x07 }, { 0x0C11, 0x017A, 0x1269, 0x07 },
|
||||
{ 0x064E, 0xFEFB, 0x1DAC, 0x07 }, { 0x02F2, 0xFF45, 0x244F, 0x07 },
|
||||
{ 0xF96E, 0xFE0C, 0x3122, 0x07 }, { 0xF328, 0xFE0C, 0x32D5, 0x07 },
|
||||
{ 0xEBEA, 0xFE5F, 0x2D6E, 0x07 }, { 0xE95E, 0xFE27, 0x2565, 0x07 },
|
||||
{ 0xE593, 0xFE0C, 0x20AC, 0x07 }, { 0xE625, 0xFE77, 0x1B07, 0x07 },
|
||||
{ 0xEBB7, 0x007C, 0x1539, 0x07 }, { 0xF466, 0x0002, 0x11B9, 0x07 },
|
||||
{ 0xF47B, 0xFFDD, 0x11AF, 0x07 }, { 0xF88D, 0xFFD1, 0x0BA2, 0x07 } };
|
||||
|
||||
s32 D_80A692B8[] = { 0, 0x00000010 };
|
||||
|
||||
static InitChainEntry initChain[] = {
|
||||
ICHAIN_F32(unk_F8, 1200, ICHAIN_STOP),
|
||||
};
|
||||
|
||||
static void (*actionFuncs[])(EnHorseGanon*, GlobalContext*) = { func_80A68AF0, func_80A68DB0, NULL };
|
||||
|
||||
const f32 D_80A692D0 = 10430.3779f;
|
||||
|
||||
void func_80A68660(unk_D_80A69248* data, s32 index, Vec3f* vec) {
|
||||
vec->x = data[index].unk_0.x;
|
||||
vec->y = data[index].unk_0.y;
|
||||
vec->z = data[index].unk_0.z;
|
||||
}
|
||||
|
||||
void func_80A686A8(EnHorseGanon* this, GlobalContext* globalCtx) {
|
||||
Vec3f* tempPos;
|
||||
Vec3f vec;
|
||||
s16 y;
|
||||
|
||||
func_80A68660(D_80A69248, this->unk_1EC, &vec);
|
||||
if (Math3D_Vec3f_DistXYZ(&vec, &this->actor.posRot.pos) <= 400.0f) {
|
||||
this->unk_1EC += 1;
|
||||
if (this->unk_1EC >= 14) {
|
||||
this->unk_1EC = 0;
|
||||
func_80A68660(D_80A69248, 0, &vec);
|
||||
}
|
||||
}
|
||||
|
||||
tempPos = &this->actor.posRot.pos;
|
||||
y = Math_Vec3f_Yaw(tempPos, &vec) - this->actor.posRot.rot.y;
|
||||
if (y >= 301) {
|
||||
this->actor.posRot.rot.y += 300;
|
||||
} else if (y < -300) {
|
||||
this->actor.posRot.rot.y -= 300;
|
||||
} else {
|
||||
this->actor.posRot.rot.y += y;
|
||||
}
|
||||
this->actor.shape.rot.y = this->actor.posRot.rot.y;
|
||||
|
||||
if (func_8002DB8C(&this->actor, &PLAYER->actor) <= 300.0f) {
|
||||
if (this->actor.speedXZ < 12.0f) {
|
||||
this->actor.speedXZ += 1.0f;
|
||||
} else {
|
||||
this->actor.speedXZ -= 1.0f;
|
||||
}
|
||||
} else if (this->actor.speedXZ < D_80A69248[this->unk_1EC].unk_6) {
|
||||
this->actor.speedXZ += 0.5f;
|
||||
} else {
|
||||
this->actor.speedXZ -= 0.5f;
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef NON_MATCHING
|
||||
// regalloc mismatch
|
||||
void func_80A68870(EnHorseGanon* this) {
|
||||
if (this->skin.skelAnime.animCurrentFrame > D_80A692B8[this->soundCount]) {
|
||||
if (D_80A692B8[this->soundCount] != 0 || !(this->skin.skelAnime.animCurrentFrame > D_80A692B8[1])) {
|
||||
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_WALK, &this->actor.unk_E4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
|
||||
|
||||
this->soundCount += 1;
|
||||
if (this->soundCount >= 2) {
|
||||
this->soundCount = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
#else
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68870.s")
|
||||
#endif
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/EnHorseGanon_Init.s")
|
||||
void EnHorseGanon_Init(EnHorseGanon* this, GlobalContext* globalCtx) {
|
||||
ColliderCylinder* colliderCylinder = &this->colliderCylinder;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/EnHorseGanon_Destroy.s")
|
||||
Actor_ProcessInitChain(&this->actor, initChain);
|
||||
Actor_SetScale(&this->actor, 0.0115f);
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68AC4.s")
|
||||
this->actor.gravity = -3.5f;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68AF0.s")
|
||||
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Squiggly, 20.0f);
|
||||
this->actor.speedXZ = 0.0f;
|
||||
this->actor.posRot2.pos = this->actor.posRot.pos;
|
||||
this->action = 0;
|
||||
this->actor.posRot2.pos.y += 70.0f;
|
||||
func_800A663C(globalCtx, &this->skin, &D_06008668, &D_06004AA4);
|
||||
this->currentAnimation = 0;
|
||||
SkelAnime_ChangeAnimDefaultStop(&this->skin.skelAnime, D_80A691B0[0]);
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68B20.s")
|
||||
Collider_InitCylinder(globalCtx, colliderCylinder);
|
||||
Collider_SetCylinder(globalCtx, colliderCylinder, &this->actor, &cylinderInit);
|
||||
Collider_InitJntSph(globalCtx, &this->colliderSphere);
|
||||
Collider_SetJntSph(globalCtx, &this->colliderSphere, &this->actor, &jntsphInit, &this->colliderSphereItem);
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68DB0.s")
|
||||
func_80061ED4(&this->actor.colChkInfo, 0, &collisionCheckInfoInit);
|
||||
func_80A68AC4(this);
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68E14.s")
|
||||
void EnHorseGanon_Destroy(EnHorseGanon* this, GlobalContext* globalCtx) {
|
||||
func_800A6888(globalCtx, &this->skin);
|
||||
Collider_DestroyCylinder(globalCtx, &this->colliderCylinder);
|
||||
Collider_DestroyJntSph(globalCtx, &this->colliderSphere);
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/EnHorseGanon_Update.s")
|
||||
void func_80A68AC4(EnHorseGanon* this) {
|
||||
this->action = 0;
|
||||
SkelAnime_ChangeAnimDefaultRepeat(&this->skin.skelAnime, D_80A691C0[0]);
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68FA8.s")
|
||||
void func_80A68AF0(EnHorseGanon* this, GlobalContext* globalCtx) {
|
||||
this->actor.speedXZ = 0.0f;
|
||||
SkelAnime_FrameUpdateMatrix(&this->skin.skelAnime);
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/EnHorseGanon_Draw.s")
|
||||
void func_80A68B20(EnHorseGanon* this) {
|
||||
s32 animationChanged;
|
||||
f32 sp30;
|
||||
|
||||
animationChanged = 0;
|
||||
this->action = 1;
|
||||
if (this->actor.speedXZ <= 3.0f) {
|
||||
if (this->currentAnimation != 2) {
|
||||
animationChanged = 1;
|
||||
}
|
||||
this->currentAnimation = 2;
|
||||
} else if (this->actor.speedXZ <= 6.0f) {
|
||||
if (this->currentAnimation != 3) {
|
||||
animationChanged = 1;
|
||||
}
|
||||
this->currentAnimation = 3;
|
||||
} else {
|
||||
if (this->currentAnimation != 4) {
|
||||
animationChanged = 1;
|
||||
}
|
||||
this->currentAnimation = 4;
|
||||
}
|
||||
|
||||
if (this->currentAnimation == 2) {
|
||||
sp30 = this->actor.speedXZ / 3.0f;
|
||||
} else if (this->currentAnimation == 3) {
|
||||
sp30 = this->actor.speedXZ / 5.0f;
|
||||
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_RUN, &this->actor.unk_E4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
|
||||
} else if (this->currentAnimation == 4) {
|
||||
sp30 = this->actor.speedXZ / 7.0f;
|
||||
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_RUN, &this->actor.unk_E4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
|
||||
} else {
|
||||
sp30 = 1.0f;
|
||||
}
|
||||
|
||||
if (animationChanged == 1) {
|
||||
SkelAnime_ChangeAnim(&this->skin.skelAnime, D_80A691B0[this->currentAnimation],
|
||||
animPlaybackSpeed[this->currentAnimation] * sp30 * 1.5f, 0.0f,
|
||||
SkelAnime_GetFrameCount(&D_80A691B0[this->currentAnimation]->genericHeader), 2, -3.0f);
|
||||
} else {
|
||||
SkelAnime_ChangeAnim(&this->skin.skelAnime, D_80A691B0[this->currentAnimation],
|
||||
animPlaybackSpeed[this->currentAnimation] * sp30 * 1.5f, 0.0f,
|
||||
SkelAnime_GetFrameCount(&D_80A691B0[this->currentAnimation]->genericHeader), 2, 0.0f);
|
||||
}
|
||||
}
|
||||
|
||||
void func_80A68DB0(EnHorseGanon* this, GlobalContext* globalCtx) {
|
||||
if (this->currentAnimation == 2) {
|
||||
func_80A68870(this);
|
||||
}
|
||||
|
||||
func_80A686A8(this, globalCtx);
|
||||
|
||||
if (SkelAnime_FrameUpdateMatrix(&this->skin.skelAnime) != 0) {
|
||||
func_80A68B20(this);
|
||||
}
|
||||
}
|
||||
|
||||
void func_80A68E14(EnHorseGanon* this, GlobalContext* globalCtx) {
|
||||
u32 padding;
|
||||
CollisionPoly* col;
|
||||
f32 temp_ret;
|
||||
Vec3f v;
|
||||
s32 temp1;
|
||||
|
||||
v.x = Math_Sins(this->actor.shape.rot.y) * 30.0f + this->actor.posRot.pos.x;
|
||||
v.y = this->actor.posRot.pos.y + 60.0f;
|
||||
v.z = Math_Coss(this->actor.shape.rot.y) * 30.0f + this->actor.posRot.pos.z;
|
||||
|
||||
temp_ret = func_8003C940(&globalCtx->colCtx, &col, &temp1, &v);
|
||||
|
||||
this->unk_1F4 = temp_ret;
|
||||
this->actor.shape.rot.x = D_80A692D0 * Math_atan2f(this->actor.posRot.pos.y - temp_ret, 30.0f);
|
||||
}
|
||||
|
||||
void EnHorseGanon_Update(EnHorseGanon* this, GlobalContext* globalCtx) {
|
||||
u32 padding[2];
|
||||
|
||||
actionFuncs[this->action](this, globalCtx);
|
||||
Actor_MoveForward(&this->actor);
|
||||
func_8002E4B4(globalCtx, &this->actor, 20.0f, 55.0f, 100.0f, 29);
|
||||
this->actor.posRot2.pos = this->actor.posRot.pos;
|
||||
this->actor.posRot2.pos.y += 70.0f;
|
||||
Collider_CylinderUpdate(&this->actor, &this->colliderCylinder);
|
||||
CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->colliderCylinder.base);
|
||||
}
|
||||
|
||||
void func_80A68FA8(EnHorseGanon* this, GlobalContext* globalCtx, ColliderJntSphItem* colliderSphereItem) {
|
||||
Vec3f sp4C;
|
||||
Vec3f sp40;
|
||||
ColliderJntSphItem* temp_v0;
|
||||
s32 index;
|
||||
|
||||
for (index = 0; index < this->colliderSphere.count; index += 1) {
|
||||
sp4C.x = this->colliderSphere.list[index].dim.modelSphere.center.x;
|
||||
sp4C.y = this->colliderSphere.list[index].dim.modelSphere.center.y;
|
||||
sp4C.z = this->colliderSphere.list[index].dim.modelSphere.center.z;
|
||||
|
||||
func_800A6408(colliderSphereItem, this->colliderSphere.list[index].dim.joint, &sp4C, &sp40);
|
||||
|
||||
this->colliderSphere.list[index].dim.worldSphere.center.x = sp40.x;
|
||||
this->colliderSphere.list[index].dim.worldSphere.center.y = sp40.y;
|
||||
this->colliderSphere.list[index].dim.worldSphere.center.z = sp40.z;
|
||||
|
||||
temp_v0 = &this->colliderSphere.list[index];
|
||||
temp_v0->dim.worldSphere.radius = temp_v0->dim.scale * temp_v0->dim.modelSphere.radius;
|
||||
}
|
||||
CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->colliderSphere.base);
|
||||
}
|
||||
|
||||
void EnHorseGanon_Draw(EnHorseGanon* this, GlobalContext* globalCtx) {
|
||||
func_80A68E14(this, globalCtx);
|
||||
func_80093D18(globalCtx->state.gfxCtx);
|
||||
func_800A6330(&this->actor, globalCtx, &this->skin, func_80A68FA8, 1);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,9 +4,25 @@
|
|||
#include <ultra64.h>
|
||||
#include <global.h>
|
||||
|
||||
typedef struct {
|
||||
/* 0x0 */ Vec3s unk_0;
|
||||
/* 0x6 */ u8 unk_6;
|
||||
} unk_D_80A69248; // size = 0x8
|
||||
|
||||
typedef struct {
|
||||
/* 0x0000 */ Actor actor;
|
||||
/* 0x014C */ char unk_14C[0x15C];
|
||||
/* 0x014C */ s32 action;
|
||||
/* 0x0150 */ s32 currentAnimation;
|
||||
/* 0x0154 */ PSkinAwb skin;
|
||||
/* 0x01E4 */ u8 unk_1E4[0x04];
|
||||
/* 0x01E8 */ s32 soundCount;
|
||||
/* 0x01EC */ s32 unk_1EC;
|
||||
/* 0x01F0 */ u8 unk_1F0[0x04];
|
||||
/* 0x01F4 */ f32 unk_1F4;
|
||||
/* 0x01F8 */ u8 unk_1F8[0x04];
|
||||
/* 0x01FC */ ColliderCylinder colliderCylinder;
|
||||
/* 0x0248 */ ColliderJntSph colliderSphere;
|
||||
/* 0x0268 */ ColliderJntSphItem colliderSphereItem;
|
||||
} EnHorseGanon; // size = 0x02A8
|
||||
|
||||
extern const ActorInit En_Horse_Ganon_InitVars;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue