mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-08 07:20:16 +00:00
Code Issues Projects Releases Wiki Activity

En_Tite OK (#555)

Browse source 
* EnTite_Update matching

* Fixes to update

* made good progress, func_80B1A2A0 is in a good place to be matching soon

* Merge stuff

* func_80B19E94 done, func_80B18CC4 done

* EnTite_Destroy and EnTite_Init done

* Commenting out sDamageTable and EnTite_Init until all the data matches

* Some more small functions done

* more progress

* func_80B19918 done

* func_80B18E7C done

* func_80B19524 done

* more progress

* EnTite_Draw equiv but nonmatching, file otherwise done

* Found some unstaged changed on old laptop

* Draw matching: File fully matching!

* Documentation

* finished documentation

* deleted data files

* update spec

* fixed waterY -> yDistToWater rename after merge

* ran format.sh

* fixing accidental renames in camera

* Fixed some obvious number/comment formatting issues

* Removed unecessary prototypes

* merge

* running format.sh

* suggestions

* more pr comment changes

* format to push

* one more change

* more renames (see pr comments)

* merge

* renames

* format.sh

* fix renames

* function comment formatting

* merge + format

* endless merge fixes

* merge fixes until  die

* yet again a merge fix

* pr suggestions
This commit is contained in:
AdamKiddle 2020-12-31 20:00:30 +00:00 • committed by GitHub
parent 5a2bd7a035
commit 600bad1f20
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
147 changed files with 1431 additions and 3642 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/overlays/actors/ovl_En_Poh/z_en_poh.c
View file

@ -437,7 +437,7 @@ void func_80ADEAC4(EnPoh* this, GlobalContext* globalCtx) {
this->unk_198--;
}
EnPoh_MoveTowardsPlayerHeight(this, globalCtx);
if (this->actor.xzDistFromLink < 200.0f) {
if (this->actor.xzDistToLink < 200.0f) {
func_80ADE1BC(this);
} else if (this->unk_198 == 0) {
EnPoh_SetupIdle(this);
@ -455,7 +455,7 @@ void EnPoh_Idle(EnPoh* this, GlobalContext* globalCtx) {
}
func_80ADEA5C(this);
EnPoh_MoveTowardsPlayerHeight(this, globalCtx);
if (this->actor.xzDistFromLink < 200.0f && this->unk_198 < 19) {
if (this->actor.xzDistToLink < 200.0f && this->unk_198 < 19) {
func_80ADE1BC(this);
} else if (this->unk_198 == 0) {
if (Rand_ZeroOne() < 0.1f) {
@ -487,9 +487,9 @@ void func_80ADEC9C(EnPoh* this, GlobalContext* globalCtx) {
Math_ScaledStepToS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink, 0x71C);
}
EnPoh_MoveTowardsPlayerHeight(this, globalCtx);
if (this->actor.xzDistFromLink > 280.0f) {
if (this->actor.xzDistToLink > 280.0f) {
EnPoh_SetupIdle(this);
} else if (this->unk_198 == 0 && this->actor.xzDistFromLink < 140.0f &&
} else if (this->unk_198 == 0 && this->actor.xzDistToLink < 140.0f &&
func_8002DFC8(&this->actor, 0x2AAA, globalCtx) == 0) {
EnPoh_SetupAttack(this);
}
@ -538,7 +538,7 @@ void func_80ADEF38(EnPoh* this, GlobalContext* globalCtx) {
} else if (this->skelAnime.curFrame > 10.0f) {
this->lightColor.a = ((this->skelAnime.curFrame - 10.0f) * 0.05f) * 255.0f;
}
if (this->skelAnime.playSpeed < 0.5f && this->actor.xzDistFromLink < 280.0f) {
if (this->skelAnime.playSpeed < 0.5f && this->actor.xzDistToLink < 280.0f) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_PO_APPEAR);
this->skelAnime.playSpeed = 1.0f;
}
@ -617,7 +617,7 @@ void func_80ADF5E0(EnPoh* this, GlobalContext* globalCtx) {
if (Math_ScaledStepToS(&this->actor.posRot.rot.y, this->unk_19C, 1820) != 0) {
EnPoh_SetupIdle(this);
}
if (this->actor.xzDistFromLink < 200.0f) {
if (this->actor.xzDistToLink < 200.0f) {
func_80ADE1BC(this);
}
EnPoh_MoveTowardsPlayerHeight(this, globalCtx);
@ -657,7 +657,7 @@ void func_80ADF894(EnPoh* this, GlobalContext* globalCtx) {
this->actor.posRot.pos.z += multiplier * Math_SinS(this->actor.shape.rot.y);
Math_ScaledStepToS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink + 0x8000, 0x71C);
EnPoh_MoveTowardsPlayerHeight(this, globalCtx);
if (this->unk_198 == 0 || this->actor.xzDistFromLink > 250.0f) {
if (this->unk_198 == 0 || this->actor.xzDistToLink > 250.0f) {
this->actor.posRot.rot.y = this->actor.shape.rot.y;
EnPoh_SetupIdle(this);
}