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

More actor cleanup Part 3 (#118)

Browse source 
* Add custom types for actor specific functions (like actions)

* Add a forward struct declaration for all other actors
This commit is contained in:
Roman971 2020-05-06 00:53:15 +02:00 • committed by GitHub
parent f114df8929
commit 1425678d8a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
477 changed files with 1817 additions and 792 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c
View file

@ -53,7 +53,7 @@ void func_80B98320(ObjMakekinsuta* this, GlobalContext* globalCtx) {
Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_SW, this->actor.posRot.pos.x,
this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, this->actor.shape.rot.y, 0,
(this->actor.params | 0x8000));
this->actionFunc = &func_80B983D4;
this->actionFunc = func_80B983D4;
return;
}
this->unk_150 = this->unk_150 + 1;

8
src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.h
View file

@ -4,9 +4,13 @@
#include <ultra64.h>
#include <global.h>
typedef struct {
struct ObjMakekinsuta;
typedef void (*ObjMakekinsutaActionFunc)(struct ObjMakekinsuta*, GlobalContext*);
typedef struct ObjMakekinsuta {
/* 0x0000 */ Actor actor;
/* 0x014C */ ActorFunc actionFunc;
/* 0x014C */ ObjMakekinsutaActionFunc actionFunc;
/* 0x150 */ s16 unk_150;
/* 0x152 */ s16 unk_152;
} ObjMakekinsuta; // size = 0x0154