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

kz progress

This commit is contained in:
fig02 2020-03-30 14:46:51 -04:00
parent 6350e5e2b9
commit c190a51191
3 changed files with 115 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/functions.h
View File

@ -1005,6 +1005,7 @@ void Inventory_ChangeAmmo(s16 item, s16 ammoChange);
void func_80087680(GlobalContext* globalCtx);
void func_800876C8(GlobalContext* globalCtx);
s32 func_80087708(GlobalContext* globalCtx, s16 arg1, s16 arg2);
void func_80088AA0(s16 seconds);
void func_80088B34(s16 arg0);
void Interface_Draw(GlobalContext* globalCtx);
void Interface_Update(GlobalContext* globalCtx);
@ -1424,8 +1425,8 @@ void* func_800BFE5C(GlobalContext* globalCtx, RomFile* file);
// ? func_800C016C(?);
// ? func_800C0230(?);
s16 func_800C030C(GlobalContext* globalCtx);
// ? func_800C0314(?);
// ? func_800C0384(?);
void func_800C0314(GlobalContext* globalCtx, s16 a1, UNK_TYPE a2);
void func_800C0384(GlobalContext* globalCtx, s16 a1);
Camera* func_800C04A4(GlobalContext*, s16);
// ? func_800C04D8(?);
void func_800C0704(GlobalContext*, s16, f32);

118
src/overlays/actors/ovl_En_Kz/z_en_kz.c
View File

@ -8,12 +8,18 @@ void EnKz_Destroy(EnKz* this, GlobalContext* globalCtx);
void EnKz_Update(EnKz* this, GlobalContext* globalCtx);
void EnKz_Draw(EnKz* this, GlobalContext* globalCtx);
void func_80A9D42C(EnKz* this, GlobalContext* globalCtx);
void func_80A9D0C0(EnKz* this, GlobalContext* globalCtx);
void func_80A9D130(EnKz* this, GlobalContext* globalCtx);
void func_80A9D25C(EnKz* this, GlobalContext* globalCtx);
void func_80A9D3C8(EnKz* this, GlobalContext* globalCtx);
void func_80A9D42C(EnKz* this, GlobalContext* globalCtx);
void func_80A9D490(EnKz* this, GlobalContext* globalCtx);
void func_80A9D520(EnKz* this, GlobalContext* globalCtx);
void func_80A9D670();
void func_80A9D744();
/*
const ActorInit En_Kz_InitVars = {
ACTOR_EN_KZ,
@ -62,10 +68,16 @@ static struct_80034EC0_Entry animations[] = {
{ 0x0600046C, 1.0f, 0.0f, -1.0f, 0x00, -10.0f },
};
static UNK_PTR eyeImages[] = {
0x06001470,
0x06001870,
0x06001C70,
};
typedef enum {
/* 0x00 */ KZ_WAIT,
/* 0x01 */ KZ_TALK,
/* 0x02 */ KZ_MWEEP,
/* 0x02 */ KZ_SPECIAL, // as child used to setup the mweep cutscene, as adult use to setup get item
} KingZoraBehavior;
extern SkeletonHeader D_060186D0;
@ -78,7 +90,16 @@ extern SkeletonHeader D_060186D0;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9C6C0.s")
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9C8E4.s")
//EnKz_UpdateEyes
void func_80A9C8E4(EnKz* this) {
if (DECR(this->blinkTimer) == 0) {
this->eyeImageIdx += 1;
if (this->eyeImageIdx >= 3) {
this->blinkTimer = Math_Rand_S16Offset(30, 30);
this->eyeImageIdx = 0;
}
}
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9C95C.s")
@ -92,7 +113,8 @@ void EnKz_Init(EnKz* this, GlobalContext* globalCtx){
s32 pad;
s32 pad1;
SkelAnime_InitSV(globalCtx, &this->skelanime, &D_060186D0, NULL, &this->actorDrawTable, &this->skelanimeArg5, 12);
SkelAnime_InitSV(globalCtx, &this->skelanime, &D_060186D0, NULL, &this->actorDrawTable,
&this->actorTransitionTable, 12);
ActorShape_Init(&this->actor.shape, 0.0, NULL, 0.0);
ActorCollider_AllocCylinder(globalCtx, &this->collider);
ActorCollider_InitCylinder(globalCtx, &this->collider, &this->actor, &cylinderInit);
@ -117,11 +139,14 @@ void EnKz_Init(EnKz* this, GlobalContext* globalCtx){
}
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Destroy.s")
void EnKz_Destroy(EnKz* this, GlobalContext* globalCtx) {
EnKz* thisAgain = this;
ActorCollider_FreeCylinder(globalCtx, &thisAgain->collider);
}
//#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9D0C0.s")
//EnKz_PreMweepWait
void func_80A9D0C0(EnKz* this, GlobalContext* globalCtx){
if (this->nextBehavior == KZ_MWEEP) {
if (this->nextBehavior == KZ_SPECIAL) {
func_80034EC0(&this->skelanime, animations, 2); //use enum?
this->nextBehavior = KZ_WAIT;
this->actionFunc = func_80A9D130;
@ -178,19 +203,86 @@ void func_80A9D25C(EnKz* this, GlobalContext* globalCtx) {
}
}
//EnKz_StopMweep
void func_80A9D3C8(EnKz* this, GlobalContext* globalCtx) {
func_800C0314(globalCtx, this->unk_214, 7);
func_800C0384(globalCtx, this->unk_212);
func_8002DF54(globalCtx, &this->actor, 7);
this->actionFunc = func_80A9D42C;
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9D3C8.s")
//EnKz_PostMweepWait
void func_80A9D42C(EnKz* this, GlobalContext* globalCtx) {
if (this->nextBehavior == KZ_SPECIAL) {
this->actionFunc = func_80A9D490;
func_80A9D490(this, globalCtx);
} else {
func_80034F54(globalCtx, &this->unk_2A6, &this->unk_2BE, 12);
}
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9D42C.s")
//EnKz_SetupGetItem
void func_80A9D490(EnKz* this, GlobalContext* globalCtx) {
s32 getItemID;
f32 xzRange;
f32 yRange;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9D490.s")
if (func_8002F410(this, globalCtx)) {
this->actor.attachedA = NULL;
this->nextBehavior = KZ_TALK;
this->actionFunc = func_80A9D520;
} else {
getItemID = this->unk_209 == 1 ? GI_FROG : GI_TUNIC_ZORA;
yRange = fabsf(this->actor.yDistanceFromLink) + 1.0f;
xzRange = this->actor.xzDistanceFromLink + 1.0f;
func_8002F434(&this->actor, globalCtx, getItemID, xzRange, yRange);
}
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9D520.s")
//EnKz_StartTimer
void func_80A9D520(EnKz* this, GlobalContext* globalCtx) {
if ((func_8010BDBC(&globalCtx->msgCtx) == 6) && (func_80106BC8(globalCtx))) {
if (INV_CONTENT(ITEM_POCKET_EGG) == ITEM_FROG) {
func_80088AA0(180); // start timer 2 with 3 minutes
gSaveContext.event_inf[1] &= ~1;
}
this->nextBehavior = KZ_WAIT;
this->actionFunc = func_80A9D42C;
}
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Update.s")
void EnKz_Update(EnKz* this, GlobalContext* globalCtx) {
s32 pad1;
s32 pad2;
if (LINK_IS_ADULT && !(gSaveContext.inf_table[19] & 0x100)) {
gSaveContext.inf_table[19] |= 0x100;
}
ActorCollider_Cylinder_Update(&this->actor, &this->collider);
Actor_CollisionCheck_SetOT(globalCtx, &globalCtx->sub_11E60, &this->collider);
SkelAnime_FrameUpdateMatrix(&this->skelanime);
func_80A9C8E4(this);
Actor_MoveForward(&this->actor);
if (this->actionFunc != (ActorFunc)func_80A9D520) {
func_80A9CB18(this, globalCtx);
}
this->actionFunc(this, globalCtx);
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9D670.s")
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9D744.s")
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Draw.s")
//#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Draw.s")
void EnKz_Draw(EnKz* this, GlobalContext* globalCtx) {
Gfx* gfxArr[4];
GraphicsContext* gfxCtx;
gfxCtx = globalCtx->state.gfxCtx;
func_800C6AC4(&gfxArr, &globalCtx->state.gfxCtx, "../z_en_kz.c", 1259);
gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(eyeImages[this->eyeImageIdx]));
func_800943C8(&globalCtx->state.gfxCtx);
SkelAnime_DrawSV(globalCtx, &this->skelanime.skeleton, &this->skelanime.actorDrawTbl,
&this->skelanime.dListCount, func_80A9D670, func_80A9D744, &this->actor);
func_800C6B54(&gfxArr, &globalCtx->state.gfxCtx, "../z_en_kz.c", 1281);
}

13
src/overlays/actors/ovl_En_Kz/z_en_kz.h
View File

@ -10,15 +10,16 @@ typedef struct {
/* 0x0190 */ ActorFunc actionFunc;
/* 0x0194 */ ColliderCylinderMain collider;
/* 0x01E0 */ s16 nextBehavior; //name might be bad
/* 0x01E2 */ char unk_1E2[0x28];
/* 0x01E2 */ char unk_1E2[0x27];
/* 0x0209 */ u8 unk_209;
/* 0x020A */ s16 unk_20A;
/* 0x020C */ char unk_20C[0x6];
/* 0x020C */ s16 blinkTimer; // blink countdown
/* 0x020E */ char unk_20E[0x2];
/* 0x0210 */ s16 eyeImageIdx;
/* 0x0212 */ s16 unk_212; // cutscene and camera related
/* 0x0214 */ s16 unk_214; // cutscene and camera related
/* 0x0216 */ Vec3s actorDrawTable;
/* 0x021C */ char unk_21C[0x42];
/* 0x025E */ Vec3s skelanimeArg5;
/* 0x0264 */ char unk_264[0x42];
/* 0x0216 */ Vec3s actorDrawTable[12];
/* 0x025E */ Vec3s actorTransitionTable[12];
/* 0x02A6 */ Vec3s unk_2A6[4];
/* 0x02BE */ Vec3s unk_2BE[4];
} EnKz; // size = 0x02D8