mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-09-03 01:53:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

En_Zob (#593)

Browse Source 
* En_Zob

* Merge

* Merge

* Merge

* PR

* fixer
This commit is contained in:
Maide
2022-02-28 02:44:29 +00:00
committed by GitHub
parent c9f64d3344
commit 6f4b349020
4 changed files with 711 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spec
+1 -2
View File
@@ -4458,8 +4458,7 @@ beginseg
name "ovl_En_Zob"
compress
include "build/src/overlays/actors/ovl_En_Zob/z_en_zob.o"
include "build/data/ovl_En_Zob/ovl_En_Zob.data.o"
include "build/data/ovl_En_Zob/ovl_En_Zob.reloc.o"
include "build/src/overlays/actors/ovl_En_Zob/ovl_En_Zob_reloc.o"
endseg
beginseg
src/overlays/actors/ovl_En_Zob/z_en_zob.c
+690 -40
View File
@@ -5,6 +5,7 @@
*/
#include "z_en_zob.h"
#include "objects/object_zob/object_zob.h"
#define FLAGS (ACTOR_FLAG_1 | ACTOR_FLAG_8)
@@ -15,10 +16,13 @@ void EnZob_Destroy(Actor* thisx, GlobalContext* globalCtx);
void EnZob_Update(Actor* thisx, GlobalContext* globalCtx);
void EnZob_Draw(Actor* thisx, GlobalContext* globalCtx);
void func_80B9F7E4(EnZob* this, s16 arg1, u8 arg2);
void func_80B9FD24(EnZob* this, GlobalContext* globalCtx);
void func_80B9FDDC(EnZob* this, GlobalContext* globalCtx);
void func_80B9FE1C(EnZob* this, GlobalContext* globalCtx);
void func_80B9FE5C(EnZob* this, GlobalContext* globalCtx);
void func_80B9FF20(EnZob* this, GlobalContext* globalCtx);
void func_80B9FF80(EnZob* this, GlobalContext* globalCtx);
void func_80BA005C(EnZob* this, GlobalContext* globalCtx);
void func_80BA00BC(EnZob* this, GlobalContext* globalCtx);
void func_80BA0318(EnZob* this, GlobalContext* globalCtx);
@@ -33,7 +37,6 @@ void func_80BA0BB4(EnZob* this, GlobalContext* globalCtx);
void func_80BA0C14(EnZob* this, GlobalContext* globalCtx);
void func_80BA0CF4(EnZob* this, GlobalContext* globalCtx);
#if 0
const ActorInit En_Zob_InitVars = {
ACTOR_EN_ZOB,
ACTORCAT_NPC,
@@ -46,79 +49,726 @@ const ActorInit En_Zob_InitVars = {
(ActorFunc)EnZob_Draw,
};
// static ColliderCylinderInit sCylinderInit = {
static ColliderCylinderInit D_80BA10D0 = {
{ COLTYPE_NONE, AT_NONE, AC_ON | AC_TYPE_ENEMY, OC1_ON | OC1_TYPE_ALL, OC2_TYPE_1, COLSHAPE_CYLINDER, },
{ ELEMTYPE_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, TOUCH_NONE | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_ON, },
static ColliderCylinderInit sCylinderInit = {
{
COLTYPE_NONE,
AT_NONE,
AC_ON | AC_TYPE_ENEMY,
OC1_ON | OC1_TYPE_ALL,
OC2_TYPE_1,
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0xF7CFFFFF, 0x00, 0x00 },
TOUCH_NONE | TOUCH_SFX_NORMAL,
BUMP_ON,
OCELEM_ON,
},
{ 30, 40, 0, { 0, 0, 0 } },
};
#endif
static AnimationHeader* sAnimations[] = {
&object_zob_Anim_0027D0, &object_zob_Anim_002B38, &object_zob_Anim_0037A0,
&object_zob_Anim_0043C4, &object_zob_Anim_005224, &object_zob_Anim_005E90,
&object_zob_Anim_006998, &object_zob_Anim_011144, &object_zob_Anim_001FD4,
};
extern ColliderCylinderInit D_80BA10D0;
Vec3f D_80BA1120 = { 300.0f, 900.0f, 0.0f };
extern UNK_TYPE D_06006998;
void EnZob_Init(Actor* thisx, GlobalContext* globalCtx) {
EnZob* this = THIS;
s32 i;
s16 cs;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Zob/EnZob_Init.s")
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 20.0f);
this->actor.colChkInfo.mass = MASS_IMMOVABLE;
Actor_SetScale(&this->actor, 0.0115f);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_zob_Skel_010810, &object_zob_Anim_006998, this->jointTable,
this->morphTable, 24);
Animation_PlayLoop(&this->skelAnime, &object_zob_Anim_006998);
Collider_InitAndSetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
this->unk_2F4 = 0;
this->unk_30E = -1;
this->unk_310 = 0;
this->unk_302 = 9;
this->unk_304 = 0;
this->actor.terminalVelocity = -4.0f;
this->actor.gravity = -4.0f;
func_80B9F7E4(this, 6, 2);
this->actionFunc = func_80BA0728;
this->actor.textId = 0;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Zob/EnZob_Destroy.s")
cs = this->actor.cutscene;
for (i = 0; i < ARRAY_COUNT(this->unk_306); i++) {
this->unk_306[i] = cs;
if (cs != -1) {
this->actor.cutscene = cs;
cs = ActorCutscene_GetAdditionalCutscene(this->actor.cutscene);
}
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Zob/func_80B9F7E4.s")
this->actor.cutscene = this->unk_306[0];
this->actor.flags |= ACTOR_FLAG_2000000;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Zob/func_80B9F86C.s")
switch (ENZOB_GET_F(&this->actor)) {
case ENZOB_F_1:
if (gSaveContext.weekEventReg[78] & 1) {
this->actionFunc = func_80BA0BB4;
} else {
this->actionFunc = func_80BA0AD8;
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Zob/func_80B9FA3C.s")
if (!(gSaveContext.weekEventReg[55] & 0x80)) {
Actor_MarkForDeath(&this->actor);
return;
}
break;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Zob/func_80B9FC0C.s")
case ENZOB_F_2:
this->actionFunc = func_80BA0CF4;
this->unk_2F4 |= 0x20;
this->unk_312 = -1;
func_80B9F7E4(this, 0, 2);
this->unk_304 = 5;
break;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Zob/func_80B9FC70.s")
default:
if (gSaveContext.weekEventReg[55] & 0x80) {
Actor_MarkForDeath(&this->actor);
}
this->actor.flags |= ACTOR_FLAG_10;
break;
}
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Zob/func_80B9FCA0.s")
void EnZob_Destroy(Actor* thisx, GlobalContext* globalCtx) {
EnZob* this = THIS;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Zob/func_80B9FD24.s")
Collider_DestroyCylinder(globalCtx, &this->collider);
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Zob/func_80B9FDDC.s")
void func_80B9F7E4(EnZob* this, s16 arg1, u8 arg2) {
Animation_Change(&this->skelAnime, sAnimations[arg1], 1.0f, 0.0f, Animation_GetLastFrame(sAnimations[arg1]), arg2,
-5.0f);
this->unk_302 = arg1;
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Zob/func_80B9FE1C.s")
void func_80B9F86C(EnZob* this) {
if (SkelAnime_Update(&this->skelAnime)) {
switch (this->unk_304) {
case 0:
if (Rand_ZeroFloat(1.0f) > 0.7f) {
if (this->unk_302 == 6) {
func_80B9F7E4(this, 7, 2);
} else {
func_80B9F7E4(this, 6, 2);
}
} else {
func_80B9F7E4(this, this->unk_302, 2);
}
break;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Zob/func_80B9FE5C.s")
case 1:
func_80B9F7E4(this, 3, 0);
break;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Zob/func_80B9FF20.s")
case 2:
func_80B9F7E4(this, 4, 0);
break;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Zob/func_80B9FF80.s")
case 3:
func_80B9F7E4(this, 5, 0);
break;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Zob/func_80BA005C.s")
case 4:
if (this->unk_302 == 3) {
func_80B9F7E4(this, 0, 0);
} else {
func_80B9F7E4(this, 3, 2);
}
break;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Zob/func_80BA00BC.s")
case 5:
if (Rand_ZeroFloat(1.0f) < 0.8f) {
func_80B9F7E4(this, this->unk_302, 2);
} else if (this->unk_302 == 0) {
func_80B9F7E4(this, 1, 2);
} else {
func_80B9F7E4(this, 0, 2);
}
break;
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Zob/func_80BA0318.s")
SkelAnime_Update(&this->skelAnime);
}
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Zob/func_80BA0374.s")
void func_80B9FA3C(EnZob* this, GlobalContext* globalCtx) {
u16 textId;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Zob/func_80BA0610.s")
this->unk_2F4 |= 1;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Zob/func_80BA06BC.s")
if (gSaveContext.playerForm != PLAYER_FORM_ZORA) {
if (gSaveContext.weekEventReg[30] & 2) {
textId = 0x11F9;
} else {
textId = 0x11F8;
}
this->unk_304 = 3;
func_80B9F7E4(this, 5, 0);
} else if (this->unk_2F4 & 0x10) {
textId = 0x1210;
this->unk_304 = 3;
func_80B9F7E4(this, 5, 2);
} else if (gSaveContext.weekEventReg[31] & 8) {
textId = 0x1205;
this->unk_304 = 1;
func_80B9F7E4(this, 3, 0);
} else if (this->unk_2F4 & 8) {
textId = 0x1215;
this->unk_304 = 3;
func_80B9F7E4(this, 5, 2);
} else if (this->unk_2F4 & 2) {
textId = 0x1203;
this->unk_304 = 1;
func_80B9F7E4(this, 2, 2);
} else if (gSaveContext.weekEventReg[30] & 8) {
textId = 0x11FA;
this->unk_304 = 1;
func_80B9F7E4(this, 2, 2);
} else if (!(gSaveContext.weekEventReg[30] & 4)) {
gSaveContext.weekEventReg[30] |= 4;
textId = 0x11FB;
this->unk_304 = 1;
func_80B9F7E4(this, 2, 2);
} else {
textId = 0x1201;
this->unk_304 = 3;
func_80B9F7E4(this, 4, 2);
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Zob/func_80BA0728.s")
func_801518B0(globalCtx, textId, &this->actor);
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Zob/func_80BA08E8.s")
void func_80B9FC0C(EnZob* this) {
if (this->unk_30E != -1) {
if (ActorCutscene_GetCurrentIndex() == this->unk_306[this->unk_30E]) {
ActorCutscene_Stop(this->unk_306[this->unk_30E]);
}
this->unk_30E = -1;
}
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Zob/func_80BA09E0.s")
void func_80B9FC70(EnZob* this, s16 arg1) {
func_80B9FC0C(this);
this->unk_30E = arg1;
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Zob/func_80BA0A04.s")
void func_80B9FCA0(EnZob* this, GlobalContext* globalCtx) {
func_801477B4(globalCtx);
globalCtx->msgCtx.ocarinaMode = 4;
func_80B9FC0C(this);
this->unk_2F4 &= ~1;
this->actionFunc = func_80BA0728;
this->unk_304 = 0;
func_80B9F7E4(this, 6, 2);
func_800B8718(&this->actor, &globalCtx->state);
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Zob/func_80BA0AD8.s")
void func_80B9FD24(EnZob* this, GlobalContext* globalCtx) {
u32 temp_v0;
s16 temp;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Zob/func_80BA0BB4.s")
func_80B9F86C(this);
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Zob/func_80BA0C14.s")
if (func_800EE29C(globalCtx, 500)) {
this->unk_30E = -1;
temp_v0 = func_800EE200(globalCtx, 500);
temp = globalCtx->csCtx.npcActions[temp_v0]->unk0;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Zob/func_80BA0CF4.s")
if (temp != this->unk_310) {
this->unk_310 = temp;
switch (temp) {
case 1:
func_80B9F7E4(this, 8, 0);
break;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Zob/EnZob_Update.s")
case 2:
func_80B9F7E4(this, 7, 0);
break;
}
}
}
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Zob/func_80BA0F64.s")
void func_80B9FDDC(EnZob* this, GlobalContext* globalCtx) {
func_801518B0(globalCtx, 0x120C, &this->actor);
this->actionFunc = func_80BA00BC;
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Zob/func_80BA0FAC.s")
void func_80B9FE1C(EnZob* this, GlobalContext* globalCtx) {
func_801518B0(globalCtx, 0x1211, &this->actor);
this->actionFunc = func_80BA00BC;
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Zob/EnZob_Draw.s")
void func_80B9FE5C(EnZob* this, GlobalContext* globalCtx) {
func_80B9F86C(this);
if (globalCtx->msgCtx.ocarinaMode == 3) {
globalCtx->msgCtx.unk11F10 = 0;
this->actionFunc = func_80B9FDDC;
func_80B9FC70(this, 0);
} else if (Message_GetState(&globalCtx->msgCtx) == 11) {
globalCtx->msgCtx.unk11F10 = 0;
this->actionFunc = func_80B9FE1C;
this->unk_304 = 3;
func_80B9F7E4(this, 5, 2);
func_80B9FC70(this, 0);
}
}
void func_80B9FF20(EnZob* this, GlobalContext* globalCtx) {
func_80B9F86C(this);
if (Message_GetState(&globalCtx->msgCtx) == 7) {
func_80152434(globalCtx, 0x42);
this->actionFunc = func_80B9FE5C;
func_80B9FC70(this, 2);
}
}
void func_80B9FF80(EnZob* this, GlobalContext* globalCtx) {
func_80B9F86C(this);
if (globalCtx->msgCtx.ocarinaMode == 3) {
this->actionFunc = func_80B9FF20;
this->unk_304 = 6;
func_80B9F7E4(this, 1, 0);
func_80152434(globalCtx, 0x3E);
func_80B9FC70(this, 1);
} else if (Message_GetState(&globalCtx->msgCtx) == 11) {
globalCtx->msgCtx.unk11F10 = 0;
this->actionFunc = func_80B9FE1C;
this->unk_304 = 3;
func_80B9F7E4(this, 5, 2);
func_80B9FC70(this, 0);
}
}
void func_80BA005C(EnZob* this, GlobalContext* globalCtx) {
func_80B9F86C(this);
if (Message_GetState(&globalCtx->msgCtx) == 7) {
func_80152434(globalCtx, 0x41);
this->actionFunc = func_80B9FF80;
func_80B9FC70(this, 2);
}
}
void func_80BA00BC(EnZob* this, GlobalContext* globalCtx) {
func_80B9F86C(this);
switch (Message_GetState(&globalCtx->msgCtx)) {
case 4:
if (func_80147624(globalCtx) && (globalCtx->msgCtx.unk11F04 == 0x1212)) {
switch (globalCtx->msgCtx.choiceIndex) {
case 1:
func_8019F208();
func_80151938(globalCtx, 0x1209);
this->unk_304 = 1;
func_80B9F7E4(this, 2, 2);
break;
case 0:
func_8019F230();
func_80151938(globalCtx, 0x1213);
break;
}
}
break;
case 5:
if (func_80147624(globalCtx)) {
switch (globalCtx->msgCtx.unk11F04) {
case 0x1208:
case 0x120E:
case 0x1216:
func_80151938(globalCtx, globalCtx->msgCtx.unk11F04 + 1);
break;
case 0x120C:
globalCtx->msgCtx.unk11F10 = 0;
this->actionFunc = func_80B9FD24;
func_80B9F7E4(this, 8, 0);
func_80B9FC70(this, 3);
break;
case 0x120D:
case 0x1211:
case 0x1213:
case 0x1217:
func_80151938(globalCtx, globalCtx->msgCtx.unk11F04 + 1);
this->unk_304 = 3;
func_80B9F7E4(this, 4, 2);
break;
case 0x1218:
func_80B9FCA0(this, globalCtx);
break;
case 0x1214:
this->unk_2F4 |= 8;
func_80B9FCA0(this, globalCtx);
break;
case 0x120F:
gSaveContext.weekEventReg[31] |= 8;
this->unk_2F4 |= 0x10;
func_80B9FCA0(this, globalCtx);
break;
case 0x1209:
func_80152434(globalCtx, 0x3D);
this->unk_304 = 4;
func_80B9F7E4(this, 0, 0);
this->actionFunc = func_80BA005C;
func_80B9FC70(this, 1);
break;
}
}
break;
}
}
void func_80BA0318(EnZob* this, GlobalContext* globalCtx) {
func_80152434(globalCtx, 0x3D);
this->unk_304 = 4;
func_80B9F7E4(this, 0, 0);
this->actionFunc = func_80BA005C;
func_80B9FC70(this, 1);
}
void func_80BA0374(EnZob* this, GlobalContext* globalCtx) {
Player* player = GET_PLAYER(globalCtx);
func_80B9F86C(this);
switch (Message_GetState(&globalCtx->msgCtx)) {
case 4:
if (func_80147624(globalCtx) && (globalCtx->msgCtx.unk11F04 == 0x1205)) {
switch (globalCtx->msgCtx.choiceIndex) {
case 0:
func_8019F208();
func_80151938(globalCtx, 0x1207);
func_80B9F7E4(this, 2, 2);
break;
case 1:
func_8019F230();
func_80151938(globalCtx, 0x1206);
break;
}
}
break;
case 5:
if (func_80147624(globalCtx)) {
switch (globalCtx->msgCtx.unk11F04) {
case 0x11F8:
gSaveContext.weekEventReg[30] |= 2;
func_80151938(globalCtx, 0x11F9);
break;
case 0x11F9:
func_801477B4(globalCtx);
this->actionFunc = func_80BA0728;
this->unk_304 = 0;
func_80B9F7E4(this, 6, 2);
this->unk_2F4 &= ~1;
break;
case 0x11FB:
case 0x11FC:
case 0x11FF:
case 0x1201:
case 0x1203:
func_80151938(globalCtx, globalCtx->msgCtx.unk11F04 + 1);
break;
case 0x11FD:
this->unk_304 = 3;
func_80B9F7E4(this, 4, 2);
func_80151938(globalCtx, globalCtx->msgCtx.unk11F04 + 1);
break;
case 0x11FE:
this->unk_304 = 1;
func_80B9F7E4(this, 3, 0);
func_80151938(globalCtx, globalCtx->msgCtx.unk11F04 + 1);
break;
case 0x11FA:
case 0x1200:
case 0x1202:
case 0x1204:
case 0x1206:
case 0x120F:
case 0x1210:
case 0x1215:
func_801477B4(globalCtx);
this->actionFunc = func_80BA0728;
this->unk_304 = 0;
func_80B9F7E4(this, 6, 2);
this->unk_2F4 &= ~1;
this->unk_2F4 |= 2;
break;
case 0x1207:
func_801477B4(globalCtx);
this->actionFunc = func_80BA0318;
player->unk_A90 = &this->actor;
player->stateFlags3 |= 0x20;
break;
}
}
break;
}
}
void func_80BA0610(EnZob* this, GlobalContext* globalCtx) {
func_80B9F86C(this);
if (Actor_ProcessTalkRequest(&this->actor, &globalCtx->state)) {
this->actor.flags &= ~ACTOR_FLAG_10000;
func_801518B0(globalCtx, 0x120D, &this->actor);
this->unk_304 = 3;
func_80B9F7E4(this, 5, 2);
func_80B9FC70(this, 0);
this->actionFunc = func_80BA00BC;
} else {
func_800B8614(&this->actor, globalCtx, 500.0f);
}
}
void func_80BA06BC(EnZob* this, GlobalContext* globalCtx) {
func_80B9FD24(this, globalCtx);
if (!func_800EE29C(globalCtx, 500)) {
this->actionFunc = func_80BA0610;
this->actor.flags |= ACTOR_FLAG_10000;
func_80BA0610(this, globalCtx);
}
}
void func_80BA0728(EnZob* this, GlobalContext* globalCtx) {
s32 pad;
Vec3f sp28;
func_80B9F86C(this);
if (func_800B8718(&this->actor, &globalCtx->state)) {
if (gSaveContext.playerForm == PLAYER_FORM_ZORA) {
func_801518B0(globalCtx, 0x1208, NULL);
gSaveContext.weekEventReg[30] |= 8;
} else {
func_801518B0(globalCtx, 0x1216, NULL);
}
this->actionFunc = func_80BA00BC;
this->unk_304 = 1;
func_80B9F7E4(this, 2, 2);
this->unk_30E = 0;
this->unk_2F4 |= 1;
} else if (Actor_ProcessTalkRequest(&this->actor, &globalCtx->state)) {
this->actionFunc = func_80BA0374;
func_80B9FA3C(this, globalCtx);
} else if (func_800EE29C(globalCtx, 500)) {
this->actionFunc = func_80BA06BC;
} else if ((this->actor.xzDistToPlayer < 180.0f) && (this->actor.xzDistToPlayer > 60.0f) &&
Player_IsFacingActor(&this->actor, 0x3000, globalCtx) && Actor_IsFacingPlayer(&this->actor, 0x3000)) {
func_800B8614(&this->actor, globalCtx, 150.0f);
func_800B874C(&this->actor, globalCtx, 200.0f, 150.0f);
}
sp28.x = this->actor.projectedPos.x;
sp28.y = this->actor.projectedPos.y;
sp28.z = this->actor.projectedPos.z;
func_801A1FB4(3, &sp28, 0x6C, 1000.0f);
}
void func_80BA08E8(EnZob* this, GlobalContext* globalCtx) {
s32 textId;
if (gSaveContext.playerForm == PLAYER_FORM_ZORA) {
if (gSaveContext.weekEventReg[79] & 1) {
textId = 0x1257;
this->unk_304 = 3;
func_80B9F7E4(this, 4, 2);
} else if (gSaveContext.weekEventReg[78] & 0x40) {
textId = 0x1256;
this->unk_304 = 1;
func_80B9F7E4(this, 2, 2);
} else {
textId = 0x1255;
gSaveContext.weekEventReg[78] |= 0x40;
this->unk_304 = 1;
func_80B9F7E4(this, 2, 2);
}
} else {
textId = 0x1254;
this->unk_304 = 3;
func_80B9F7E4(this, 5, 2);
}
func_801518B0(globalCtx, textId, &this->actor);
}
void func_80BA09E0(EnZob* this, GlobalContext* globalCtx) {
func_80B9F86C(this);
}
void func_80BA0A04(EnZob* this, GlobalContext* globalCtx) {
u8 temp_v0;
func_80B9F86C(this);
Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 2, 0x1000, 0x200);
this->actor.world.rot.y = this->actor.shape.rot.y;
temp_v0 = Message_GetState(&globalCtx->msgCtx);
if (temp_v0 != 2) {
if ((temp_v0 == 5) && func_80147624(globalCtx)) {
func_801477B4(globalCtx);
this->actionFunc = func_80BA0AD8;
this->unk_304 = 0;
func_80B9F7E4(this, 6, 2);
}
} else {
this->actionFunc = func_80BA0AD8;
this->unk_304 = 0;
func_80B9F7E4(this, 6, 2);
}
}
void func_80BA0AD8(EnZob* this, GlobalContext* globalCtx) {
func_80B9F86C(this);
if (this->actor.home.rot.y != this->actor.shape.rot.y) {
Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.home.rot.y, 2, 0x1000, 0x200);
this->actor.world.rot.y = this->actor.shape.rot.y;
}
if (Actor_ProcessTalkRequest(&this->actor, &globalCtx->state)) {
this->actionFunc = func_80BA0A04;
func_80BA08E8(this, globalCtx);
} else if ((this->actor.xzDistToPlayer < 120.0f) && Player_IsFacingActor(&this->actor, 0x3000, globalCtx) &&
Actor_IsFacingPlayer(&this->actor, 0x3000)) {
func_800B8614(&this->actor, globalCtx, 120.0f);
}
}
void func_80BA0BB4(EnZob* this, GlobalContext* globalCtx) {
func_80B9F86C(this);
if (gSaveContext.weekEventReg[79] & 1) {
this->actionFunc = func_80BA09E0;
func_80B9F7E4(this, 0, 2);
this->unk_304 = 5;
}
}
void func_80BA0C14(EnZob* this, GlobalContext* globalCtx) {
func_80B9F86C(this);
if (this->unk_312 < 799) {
this->unk_312 += 200;
} else {
this->unk_312 += 30;
}
if (this->unk_312 > 999) {
this->unk_312 = 999;
}
if (func_800EE29C(globalCtx, 0x203)) {
if (globalCtx->csCtx.npcActions[func_800EE200(globalCtx, 0x203)]->unk0 == 1) {
this->actionFunc = func_80BA0CF4;
this->unk_312 = -1;
}
} else {
this->actionFunc = func_80BA0CF4;
this->unk_312 = -1;
}
}
void func_80BA0CF4(EnZob* this, GlobalContext* globalCtx) {
func_80B9F86C(this);
if (func_800EE29C(globalCtx, 0x203) && (globalCtx->csCtx.npcActions[func_800EE200(globalCtx, 0x203)]->unk0 == 2)) {
this->actionFunc = func_80BA0C14;
}
}
void EnZob_Update(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
EnZob* this = THIS;
Actor_MoveWithGravity(&this->actor);
Collider_UpdateCylinder(&this->actor, &this->collider);
CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 10.0f, 10.0f, 10.0f, 4);
this->actionFunc(this, globalCtx);
if ((this->unk_30E != -1) && (ActorCutscene_GetCurrentIndex() != this->unk_306[this->unk_30E])) {
if (ActorCutscene_GetCurrentIndex() == 0x7C) {
ActorCutscene_Stop(0x7C);
ActorCutscene_SetIntentToPlay(this->unk_306[this->unk_30E]);
} else if (ActorCutscene_GetCanPlayNext(this->unk_306[this->unk_30E])) {
ActorCutscene_Start(this->unk_306[this->unk_30E], &this->actor);
} else {
ActorCutscene_SetIntentToPlay(this->unk_306[this->unk_30E]);
}
}
if (this->unk_2F4 & 1) {
func_800E9250(globalCtx, &this->actor, &this->unk_2F6, &this->unk_2FC, this->actor.focus.pos);
} else {
Math_SmoothStepToS(&this->unk_2F6.x, 0, 6, 6200, 100);
Math_SmoothStepToS(&this->unk_2F6.y, 0, 6, 6200, 100);
Math_SmoothStepToS(&this->unk_2FC.x, 0, 6, 6200, 100);
Math_SmoothStepToS(&this->unk_2FC.y, 0, 6, 6200, 100);
}
}
s32 func_80BA0F64(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx) {
EnZob* this = THIS;
if (limbIndex == 9) {
rot->x += this->unk_2F6.y;
rot->y += this->unk_2F6.x;
}
return false;
}
void func_80BA0FAC(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* thisx) {
EnZob* this = THIS;
if (limbIndex == 9) {
Matrix_MultiplyVector3fByState(&D_80BA1120, &this->actor.focus.pos);
}
}
void EnZob_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnZob* this = THIS;
OPEN_DISPS(globalCtx->state.gfxCtx);
func_8012C28C(globalCtx->state.gfxCtx);
if (this->unk_2F4 & 0x20) {
POLY_OPA_DISP = Gfx_SetFog(POLY_OPA_DISP, 0, 0, 0, 0, this->unk_312, 1000);
}
SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
func_80BA0F64, func_80BA0FAC, &this->actor);
if (this->unk_2F4 & 0x20) {
POLY_OPA_DISP = func_801660B8(globalCtx, POLY_OPA_DISP);
}
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
src/overlays/actors/ovl_En_Zob/z_en_zob.h
+20 -1
View File
@@ -7,9 +7,28 @@ struct EnZob;
typedef void (*EnZobActionFunc)(struct EnZob*, GlobalContext*);
#define ENZOB_GET_F(thisx) ((thisx)->params & 0xF)
enum {
/* 1 */ ENZOB_F_1 = 1,
/* 2 */ ENZOB_F_2,
};
typedef struct EnZob {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x1D0];
/* 0x0144 */ SkelAnime skelAnime;
/* 0x0188 */ Vec3s jointTable[24];
/* 0x0218 */ Vec3s morphTable[24];
/* 0x02A8 */ ColliderCylinder collider;
/* 0x02F4 */ u16 unk_2F4;
/* 0x02F6 */ Vec3s unk_2F6;
/* 0x02FC */ Vec3s unk_2FC;
/* 0x0302 */ s16 unk_302;
/* 0x0304 */ u16 unk_304;
/* 0x0306 */ s16 unk_306[4];
/* 0x030E */ s16 unk_30E;
/* 0x0310 */ s16 unk_310;
/* 0x0312 */ s16 unk_312;
/* 0x0314 */ EnZobActionFunc actionFunc;
} EnZob; // size = 0x318
undefined_syms.txt
-5
View File
@@ -1964,11 +1964,6 @@ D_06000700 = 0x06000700;
D_06013328 = 0x06013328;
// ovl_En_Zob
D_06006998 = 0x06006998;
D_06010810 = 0x06010810;
// ovl_En_Zod
D_06000D94 = 0x06000D94;