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

En_Floormas OK (#97)

Browse source 
* EnFloorMas wip

* floormaster formatting

* floormaster wip

* ovl_En_Floormas OK

* pr recommendations

* pr updates
This commit is contained in:
krimtonz 2020-05-07 18:18:09 -05:00 • committed by GitHub
parent 5acc4e2f66
commit 0ebe904d0c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
67 changed files with 1110 additions and 3575 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/code/z_actor.c
View file

@ -1253,7 +1253,7 @@ void func_8002E4B4(GlobalContext* globalCtx, Actor* actor, f32 arg2, f32 arg3, f
&actor->wallPoly, &sp60, actor, arg2))) {
sp5C = actor->wallPoly;
Math_Vec3f_Copy(&actor->posRot.pos, &sp64);
actor->unk_7E = atan2s(sp5C->norm.z, sp5C->norm.x);
actor->wallPolyRot = atan2s(sp5C->norm.z, sp5C->norm.x);
actor->bgCheckFlags |= 8;
actor->wallPolySource = sp60;
} else {

3
src/code/z_en_a_keep.c
View file

@ -273,7 +273,8 @@ void func_8001D4A8(EnAObj* this, GlobalContext* globalCtx) {
if ((this->dyna.actor.speedXZ != 0.0f) && (this->dyna.actor.bgCheckFlags & 0x8)) {
if (1) { // Necessary to match
this->dyna.actor.posRot.rot.y =
((this->dyna.actor.unk_7E - this->dyna.actor.posRot.rot.y) + this->dyna.actor.unk_7E) - 0x8000;
((this->dyna.actor.wallPolyRot - this->dyna.actor.posRot.rot.y) + this->dyna.actor.wallPolyRot) -
0x8000;
}
this->dyna.actor.bgCheckFlags &= ~0x8;
}