mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-08-03 00:36:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

en_hs2 OK (#46)

Browse Source 
* en_hs2 OK

* Formatted files

* Renamed the DoNothing func.

Co-authored-by: fullgrowngaming <fullgrowngaming@gmail.com>
This commit is contained in:
kyleburnette
2021-02-11 19:12:54 -08:00
committed by GitHub
parent 6ac8ea373c
commit ee0ab1cbc9
5 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/overlays/actors/ovl_En_Hs2/z_en_hs2.c
+19 -7
View File
@@ -9,7 +9,8 @@ void EnHs2_Destroy(Actor* thisx, GlobalContext* globalCtx);
void EnHs2_Update(Actor* thisx, GlobalContext* globalCtx);
void EnHs2_Draw(Actor* thisx, GlobalContext* globalCtx);
/*
void EnHs2_DoNothing(EnHs2* this, GlobalContext* globalCtx);
const ActorInit En_Hs2_InitVars = {
ACTOR_EN_HS2,
ACTORTYPE_NPC,
@@ -21,14 +22,25 @@ const ActorInit En_Hs2_InitVars = {
(ActorFunc)EnHs2_Update,
(ActorFunc)EnHs2_Draw
};
*/
GLOBAL_ASM("asm/non_matchings/ovl_En_Hs2_0x8098EF60/EnHs2_Init.asm")
void EnHs2_Init(Actor* thisx, GlobalContext* globalCtx) {
EnHs2* this = THIS;
GLOBAL_ASM("asm/non_matchings/ovl_En_Hs2_0x8098EF60/EnHs2_Destroy.asm")
Actor_SetScale(&this->actor, 1.0f);
this->actionFunc = EnHs2_DoNothing;
}
GLOBAL_ASM("asm/non_matchings/ovl_En_Hs2_0x8098EF60/func_8098EFAC.asm")
void EnHs2_Destroy(Actor* thisx, GlobalContext* globalCtx) {
}
GLOBAL_ASM("asm/non_matchings/ovl_En_Hs2_0x8098EF60/EnHs2_Update.asm")
void EnHs2_DoNothing(EnHs2* this, GlobalContext* globalCtx) {
}
GLOBAL_ASM("asm/non_matchings/ovl_En_Hs2_0x8098EF60/EnHs2_Draw.asm")
void EnHs2_Update(Actor* thisx, GlobalContext* globalCtx) {
EnHs2* this = THIS;
this->actionFunc(this, globalCtx);
}
void EnHs2_Draw(Actor* thisx, GlobalContext* globalCtx) {
}
src/overlays/actors/ovl_En_Hs2/z_en_hs2.h
+4 -1
View File
@@ -5,9 +5,12 @@
struct EnHs2;
typedef void (*EnHs2ActionFunc)(struct EnHs2*, GlobalContext*);
typedef struct EnHs2 {
/* 0x000 */ Actor actor;
/* 0x144 */ char unk_144[0x254];
/* 0x144 */ char unk_144[0x250];
/* 0x394 */ EnHs2ActionFunc actionFunc;
} EnHs2; // size = 0x398
extern const ActorInit En_Hs2_InitVars;