mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-06 22:30:15 +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

18
src/overlays/actors/ovl_En_Kanban/z_en_kanban.c
View file

@ -387,7 +387,7 @@ void EnKanban_Update(Actor* thisx, GlobalContext* globalCtx2) {
Collider_CylinderUpdate(&this->actor, &this->collider);
CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
if (this->actor.xzDistFromLink > 500.0f) {
if (this->actor.xzDistToLink > 500.0f) {
this->actor.flags |= 1;
this->partFlags = 0xFFFF;
}
@ -412,7 +412,7 @@ void EnKanban_Update(Actor* thisx, GlobalContext* globalCtx2) {
f32 tempX;
f32 tempY;
f32 tempZ;
f32 tempWaterY;
f32 tempYDistToWater;
u8 onGround;
Actor_MoveForward(&this->actor);
@ -422,7 +422,7 @@ void EnKanban_Update(Actor* thisx, GlobalContext* globalCtx2) {
tempY = this->actor.posRot.pos.y;
tempZ = this->actor.posRot.pos.z;
tempBgFlags = this->actor.bgCheckFlags;
tempWaterY = this->actor.waterY;
tempYDistToWater = this->actor.yDistToWater;
this->actor.posRot.pos.z += ((this->actor.posRot.pos.y - this->actor.groundY) * -50.0f) / 100.0f;
func_8002E4B4(globalCtx, &this->actor, 10.0f, 10.0f, 50.0f, 4);
@ -432,7 +432,7 @@ void EnKanban_Update(Actor* thisx, GlobalContext* globalCtx2) {
this->actor.posRot.pos.y = tempY;
this->actor.posRot.pos.z = tempZ;
this->actor.bgCheckFlags = tempBgFlags;
this->actor.waterY = tempWaterY;
this->actor.yDistToWater = tempYDistToWater;
osSyncPrintf(VT_RST);
onGround = (this->actor.bgCheckFlags & 1);
@ -480,13 +480,13 @@ void EnKanban_Update(Actor* thisx, GlobalContext* globalCtx2) {
this->actionState = ENKANBAN_WATER;
Audio_PlayActorSound2(&this->actor, NA_SE_EV_BOMB_DROP_WATER);
this->bounceX = this->bounceZ = 0;
this->actor.posRot.pos.y += this->actor.waterY;
this->actor.posRot.pos.y += this->actor.yDistToWater;
EffectSsGSplash_Spawn(globalCtx, &this->actor.posRot.pos, NULL, NULL, 0, (this->partCount * 20) + 300);
EffectSsGRipple_Spawn(globalCtx, &this->actor.posRot.pos, 150, 650, 0);
EffectSsGRipple_Spawn(globalCtx, &this->actor.posRot.pos, 300, 800, 5);
this->actor.velocity.y = 0.0f;
this->actor.gravity = 0.0f;
osSyncPrintf(" WAT Y = %f\n", this->actor.waterY);
osSyncPrintf(" WAT Y = %f\n", this->actor.yDistToWater);
osSyncPrintf(" POS Y = %f\n", this->actor.posRot.pos.y);
osSyncPrintf(" GROUND Y = %f\n", this->actor.groundY);
break;
@ -572,7 +572,7 @@ void EnKanban_Update(Actor* thisx, GlobalContext* globalCtx2) {
s32 rippleScale;
if ((player->actor.speedXZ > 0.0f) && (player->actor.posRot.pos.y < this->actor.posRot.pos.y) &&
(this->actor.xyzDistFromLinkSq < 2500.0f)) {
(this->actor.xyzDistToLinkSq < 2500.0f)) {
Math_ApproachF(&this->actor.speedXZ, player->actor.speedXZ, 1.0f, 0.2f);
if (this->actor.speedXZ > 1.0f) {
this->actor.speedXZ = 1.0f;
@ -624,8 +624,8 @@ void EnKanban_Update(Actor* thisx, GlobalContext* globalCtx2) {
}
EffectSsGRipple_Spawn(globalCtx, &this->actor.posRot.pos, rippleScale, rippleScale + 500, 0);
}
} else if ((globalCtx->actorCtx.unk_02 != 0) && (this->actor.xyzDistFromLinkSq < SQ(100.0f))) {
f32 hammerStrength = (100.0f - sqrtf(this->actor.xyzDistFromLinkSq)) * 0.05f;
} else if ((globalCtx->actorCtx.unk_02 != 0) && (this->actor.xyzDistToLinkSq < SQ(100.0f))) {
f32 hammerStrength = (100.0f - sqrtf(this->actor.xyzDistToLinkSq)) * 0.05f;
this->actionState = ENKANBAN_AIR;
this->actor.gravity = -1.0f;