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

En_Elf Decompiled (#432)

Browse source 
* init matched

* everything but navi OK

* progress

* 4 left

* remove asm

* progress

* progress

* asm and spec

* remove comment

* suggestion

* review1

* use type enum

* name func

* overridelimbdraw

* review 2

* forgot one

* merge master

* format
This commit is contained in:
fig02 2020-10-28 13:02:35 -04:00 • committed by GitHub
parent 3ba022128c
commit 6e000fcc54
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
77 changed files with 1637 additions and 4303 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/overlays/actors/ovl_En_Gs/z_en_gs.c
View file

@ -5,6 +5,7 @@
*/
#include "z_en_gs.h"
#include "overlays/actors/ovl_En_Elf/z_en_elf.h"
#define FLAGS 0x02000009
@ -114,11 +115,11 @@ void func_80A4E470(EnGs* this, GlobalContext* globalCtx) {
(globalCtx->msgCtx.unk_E3F2 == 8) || (globalCtx->msgCtx.unk_E3F2 == 9) ||
(globalCtx->msgCtx.unk_E3F2 == 10)) {
Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ELF, this->actor.posRot.pos.x,
this->actor.posRot.pos.y + 40.0f, this->actor.posRot.pos.z, 0, 0, 0, 2);
this->actor.posRot.pos.y + 40.0f, this->actor.posRot.pos.z, 0, 0, 0, FAIRY_HEAL_TIMED);
Audio_PlayActorSound2(&this->actor, NA_SE_EV_BUTTERFRY_TO_FAIRY);
} else if (globalCtx->msgCtx.unk_E3F2 == 11) {
Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ELF, this->actor.posRot.pos.x,
this->actor.posRot.pos.y + 40.0f, this->actor.posRot.pos.z, 0, 0, 0, 7);
this->actor.posRot.pos.y + 40.0f, this->actor.posRot.pos.z, 0, 0, 0, FAIRY_HEAL_BIG);
Audio_PlayActorSound2(&this->actor, NA_SE_EV_BUTTERFRY_TO_FAIRY);
}
this->unk_19D = 0;