mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-08 07:20:16 +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

12
src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c
View file

@ -43,11 +43,11 @@ const ActorInit Obj_Oshihiki_InitVars = {
(ActorFunc)ObjOshihiki_Draw,
};
f32 sScales[] = {
static f32 sScales[] = {
(1 / 10.0f), (1 / 6.0f), (1 / 5.0f), (1 / 3.0f), (1 / 10.0f), (1 / 6.0f), (1 / 5.0f), (1 / 3.0f),
};
Color_RGB8 sColors[][4] = {
static Color_RGB8 sColors[][4] = {
{ { 110, 86, 40 }, { 110, 86, 40 }, { 110, 86, 40 }, { 110, 86, 40 } }, // deku tree
{ { 106, 120, 110 }, { 104, 80, 20 }, { 0, 0, 0 }, { 0, 0, 0 } }, // dodongos cavern
{ { 142, 99, 86 }, { 72, 118, 96 }, { 0, 0, 0 }, { 0, 0, 0 } }, // forest temple
@ -59,7 +59,7 @@ Color_RGB8 sColors[][4] = {
{ { 232, 210, 176 }, { 232, 210, 176 }, { 232, 210, 176 }, { 232, 210, 176 } }, // gerudo training grounds
};
s16 sScenes[] = {
static s16 sScenes[] = {
SCENE_YDAN, SCENE_DDAN, SCENE_BMORI1, SCENE_HIDAN, SCENE_MIZUSIN,
SCENE_JYASINZOU, SCENE_HAKADAN, SCENE_GANON, SCENE_MEN,
};
@ -71,19 +71,19 @@ static InitChainEntry sInitChain[] = {
};
// The vertices and center of the bottom face
Vec3f sColCheckPoints[5] = {
static Vec3f sColCheckPoints[5] = {
{ 29.99f, 1.01f, -29.99f }, { -29.99f, 1.01f, -29.99f }, { -29.99f, 1.01f, 29.99f },
{ 29.99f, 1.01f, 29.99f }, { 0.0f, 1.01f, 0.0f },
};
Vec2f sFaceVtx[] = {
static Vec2f sFaceVtx[] = {
{ -30.0f, 0.0f },
{ 30.0f, 0.0f },
{ -30.0f, 60.0f },
{ 30.0f, 60.0f },
};
Vec2f sFaceDirection[] = {
static Vec2f sFaceDirection[] = {
{ 1.0f, 1.0f },
{ -1.0f, 1.0f },
{ 1.0f, -1.0f },