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

Document EnGoroiwa and BgJyaGoroiwa (#860)

Browse source 
* Document EnGoroiwa and BgJyaGoroiwa

* Run format.sh

* Add renamed functions to actorfixer script

* no more calling out "the devs" for bad code

* `EnGoroiwa#flags` -> `stateFlags`

* `Matrix_MtxFToRotS` -> `Matrix_MtxFToYXZRotS` (and not ZXY oops), `func_800D2264` -> `Matrix_MtxFToZYXRotS`
This commit is contained in:
Dragorn421 2021-08-22 17:25:17 +02:00 • committed by GitHub
parent 18c84b0be7
commit 743f42f651
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
29 changed files with 425 additions and 394 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/overlays/actors/ovl_En_Sw/z_en_sw.c
View file

@ -89,7 +89,7 @@ s32 func_80B0BE20(EnSw* this, CollisionPoly* poly) {
sp44.z = COLPOLY_GET_NORMAL(poly->normal.z);
sp34 = Math_FAcosF(DOTXYZ(sp44, this->unk_364));
EnSw_CrossProduct(&this->unk_364, &sp44, &sp38);
func_800D23FC(sp34, &sp38, MTXMODE_NEW);
Matrix_RotateAxis(sp34, &sp38, MTXMODE_NEW);
Matrix_MultVec3f(&this->unk_370, &sp38);
this->unk_370 = sp38;
EnSw_CrossProduct(&this->unk_370, &sp44, &this->unk_37C);
@ -117,7 +117,7 @@ s32 func_80B0BE20(EnSw* this, CollisionPoly* poly) {
this->unk_3D8.wy = 0.0f;
this->unk_3D8.wz = 0.0f;
this->unk_3D8.ww = 1.0f;
func_800D20CC(&this->unk_3D8, &this->actor.world.rot, 0);
Matrix_MtxFToYXZRotS(&this->unk_3D8, &this->actor.world.rot, 0);
//! @bug: Does not return.
}
@ -404,7 +404,7 @@ s32 func_80B0CCF4(EnSw* this, f32* arg1) {
sp6C.x = COLPOLY_GET_NORMAL(temp_v1->normal.x);
sp6C.y = COLPOLY_GET_NORMAL(temp_v1->normal.y);
sp6C.z = COLPOLY_GET_NORMAL(temp_v1->normal.z);
func_800D23FC(*arg1, &sp6C, MTXMODE_NEW);
Matrix_RotateAxis(*arg1, &sp6C, MTXMODE_NEW);
Matrix_MultVec3f(&this->unk_370, &sp6C);
this->unk_370 = sp6C;
EnSw_CrossProduct(&this->unk_370, &this->unk_364, &this->unk_37C);
@ -432,7 +432,7 @@ s32 func_80B0CCF4(EnSw* this, f32* arg1) {
sp2C.wy = 0.0f;
sp2C.wz = 0.0f;
sp2C.ww = 1.0f;
func_800D20CC(&sp2C, &this->actor.world.rot, 0);
Matrix_MtxFToYXZRotS(&sp2C, &this->actor.world.rot, 0);
return true;
}