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_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

11
src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c
View file

@ -5,6 +5,7 @@
*/
#include "z_shot_sun.h"
#include "overlays/actors/ovl_En_Elf/z_en_elf.h"
#include "vt.h"
#define FLAGS 0x00000009
@ -72,7 +73,7 @@ void ShotSun_Destroy(Actor* thisx, GlobalContext* globalCtx) {
void ShotSun_SpawnFairy(ShotSun* this, GlobalContext* globalCtx) {
s32 params = this->actor.params & 0xFF;
s32 fairyParams;
s32 fairyType;
if (this->timer > 0) {
this->timer--;
@ -81,16 +82,16 @@ void ShotSun_SpawnFairy(ShotSun* this, GlobalContext* globalCtx) {
switch (params) {
case 0x40:
fairyParams = 7;
fairyType = FAIRY_HEAL_BIG;
break;
case 0x41:
fairyParams = 7;
fairyType = FAIRY_HEAL_BIG;
break;
}
// UB: fairyParams may be uninitialized
//! @bug fairyType may be uninitialized
Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ELF, this->actor.initPosRot.pos.x,
this->actor.initPosRot.pos.y, this->actor.initPosRot.pos.z, 0, 0, 0, fairyParams);
this->actor.initPosRot.pos.y, this->actor.initPosRot.pos.z, 0, 0, 0, fairyType);
Actor_Kill(&this->actor);
}