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

En_Attack_Niw, En_Insect, z_skin_matrix, and z_skelanime matched (#493)

Browse source 
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* could be useful

* whoops

* ZAP2 stuff

* ZAP why

* ZAP again

* marginal improvement

* matched functions. Also fixed a serious lack of static

* format

* more static

* fixing a function prototype

* skelanime OK

* forgot .s

* skin matrix matched

* format
This commit is contained in:
petrie911 2020-11-23 20:34:32 -06:00 • committed by GitHub
parent 89f89ac5ea
commit 3aa76152c5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
61 changed files with 209 additions and 1264 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c
View file

@ -556,7 +556,7 @@ void EnHorseNormal_Update(Actor* thisx, GlobalContext* globalCtx) {
}
}
void func_80A6CAFC(Actor* thisx, GlobalContext* globalCtx, ColliderJntSphItem* collider) {
void func_80A6CAFC(Actor* thisx, GlobalContext* globalCtx, PSkinAwb* skin) {
Vec3f sp4C;
Vec3f sp40;
EnHorseNormal* this = THIS;
@ -566,7 +566,7 @@ void func_80A6CAFC(Actor* thisx, GlobalContext* globalCtx, ColliderJntSphItem* c
sp4C.x = this->headCollider.list[i].dim.modelSphere.center.x;
sp4C.y = this->headCollider.list[i].dim.modelSphere.center.y;
sp4C.z = this->headCollider.list[i].dim.modelSphere.center.z;
func_800A6408(collider, this->headCollider.list[i].dim.joint, &sp4C, &sp40);
func_800A6408(skin, this->headCollider.list[i].dim.joint, &sp4C, &sp40);
this->headCollider.list[i].dim.worldSphere.center.x = sp40.x;
this->headCollider.list[i].dim.worldSphere.center.y = sp40.y;
this->headCollider.list[i].dim.worldSphere.center.z = sp40.z;