obj_hana OK (#20)

This commit is contained in:
fullgrowngaming
2020-09-19 19:55:06 -07:00
committed by GitHub
parent dc7b8cc5b4
commit a241f57e60
5 changed files with 34 additions and 11 deletions
+26 -6
View File
@@ -1,3 +1,8 @@
/*
* File: z_obj_hana.c
* Description: Orange Graveyard Flower
*/
#include "z_obj_hana.h"
#define FLAGS 0x00000000
@@ -9,7 +14,6 @@ void ObjHana_Destroy(Actor* thisx, GlobalContext* globalCtx);
void ObjHana_Update(Actor* thisx, GlobalContext* globalCtx);
void ObjHana_Draw(Actor* thisx, GlobalContext* globalCtx);
/*
const ActorInit Obj_Hana_InitVars = {
ACTOR_OBJ_HANA,
ACTORTYPE_PROP,
@@ -21,12 +25,28 @@ const ActorInit Obj_Hana_InitVars = {
(ActorFunc)ObjHana_Update,
(ActorFunc)ObjHana_Draw
};
*/
GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hana_0x8095FB10/ObjHana_Init.asm")
extern UNK_TYPE D_06000500;
GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hana_0x8095FB10/ObjHana_Destroy.asm")
static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 10, ICHAIN_CONTINUE),
ICHAIN_F32(unkFC, 900, ICHAIN_CONTINUE),
ICHAIN_F32(unk100, 40, ICHAIN_CONTINUE),
ICHAIN_F32(unk104, 40, ICHAIN_STOP),
};
GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hana_0x8095FB10/ObjHana_Update.asm")
void ObjHana_Init(Actor* thisx, GlobalContext* globalCtx) {
ObjHana* this = THIS;
Actor_ProcessInitChain(&this->actor, sInitChain);
}
GLOBAL_ASM("asm/non_matchings/ovl_Obj_Hana_0x8095FB10/ObjHana_Draw.asm")
void ObjHana_Destroy(Actor* thisx, GlobalContext* globalCtx) {
}
void ObjHana_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void ObjHana_Draw(Actor* thisx, GlobalContext* globalCtx) {
func_800BDFC0(globalCtx, &D_06000500);
}