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

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

7
src/overlays/actors/ovl_En_Encount1/z_en_encount1.c
View file

@ -12,8 +12,8 @@ void EnEncount1_SpawnLeevers(EnEncount1* this, GlobalContext* globalCtx);
void EnEncount1_SpawnTektites(EnEncount1* this, GlobalContext* globalCtx);
void EnEncount1_SpawnStalchildOrWolfos(EnEncount1* this, GlobalContext* globalCtx);
s16 sLeeverAngles[] = { 0x0000, 0x2710, 0x7148, 0x8EB8, 0xD8F0 };
f32 sLeeverDists[] = { 200.0f, 170.0f, 120.0f, 120.0f, 170.0f };
static s16 sLeeverAngles[] = { 0x0000, 0x2710, 0x7148, 0x8EB8, 0xD8F0 };
static f32 sLeeverDists[] = { 200.0f, 170.0f, 120.0f, 120.0f, 170.0f };
const ActorInit En_Encount1_InitVars = {
ACTOR_EN_ENCOUNT1,
@ -141,7 +141,8 @@ void EnEncount1_SpawnLeevers(EnEncount1* this, GlobalContext* globalCtx) {
leever = (EnReeba*)Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_REEBA,
spawnPos.x, spawnPos.y, spawnPos.z, 0, 0, 0, spawnParams);
if (1) {} if (1) {}
if (1) {}
if (1) {}
if (leever != NULL) {
this->curNumSpawn++;
leever->unk_280 = this->leeverIndex++;