mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-10 17:00: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_Obj_Comb/z_obj_comb.c
View file

@ -33,14 +33,14 @@ const ActorInit Obj_Comb_InitVars = {
(ActorFunc)ObjComb_Draw,
};
ColliderJntSphItemInit sJntSphItemsInit[1] = {
static ColliderJntSphItemInit sJntSphItemsInit[1] = {
{
{ 0x00, { 0x00000000, 0x00, 0x00 }, { 0x4001FFFE, 0x00, 0x00 }, 0x00, 0x01, 0x01 },
{ 0x00, { { 0, 0, 0 }, 15 }, 100 },
},
};
ColliderJntSphInit sJntSphInit = {
static ColliderJntSphInit sJntSphInit = {
{ COLTYPE_UNK10, 0x00, 0x09, 0x09, 0x20, COLSHAPE_JNTSPH },
1,
&sJntSphItemsInit,