falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

en_bu OK (#96) 

* en_bu OK

* renamed action func

* made the char array in the header of type UNK_TYPE1

* renamed display list pointer as suggested
This commit is contained in:
kyleburnette 2021-04-30 21:42:16 -07:00 committed by GitHub
parent 441f33968c
commit c377ffe4ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 40 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
linker_scripts/code_script.txt
View File

@ -3649,9 +3649,9 @@ SECTIONS
ovl_En_Bu : AT(RomLocation) ovl_En_Bu : AT(RomLocation)
{ {
build/src/overlays/actors/ovl_En_Bu/z_en_bu.o(.text) build/src/overlays/actors/ovl_En_Bu/z_en_bu.o(.text)
build/asm/overlays/ovl_En_Bu_data.o(.data) build/src/overlays/actors/ovl_En_Bu/z_en_bu.o(.data)
build/src/overlays/actors/ovl_En_Bu/z_en_bu.o(.rodata) build/src/overlays/actors/ovl_En_Bu/z_en_bu.o(.rodata)
build/asm/overlays/ovl_En_Bu_rodata.o(.rodata) build/src/overlays/actors/ovl_En_Bu/z_en_bu_overlay.o(.ovl)
} }
SegmentEnd = .; SegmentEnd = .;
SegmentSize = SegmentEnd - SegmentStart; SegmentSize = SegmentEnd - SegmentStart;

39
src/overlays/actors/ovl_En_Bu/z_en_bu.c
View File

@ -9,7 +9,8 @@ void EnBu_Destroy(Actor* thisx, GlobalContext* globalCtx);
void EnBu_Update(Actor* thisx, GlobalContext* globalCtx); void EnBu_Update(Actor* thisx, GlobalContext* globalCtx);
void EnBu_Draw(Actor* thisx, GlobalContext* globalCtx); void EnBu_Draw(Actor* thisx, GlobalContext* globalCtx);
/* void EnBu_DoNothing(EnBu* this, GlobalContext* globalCtx);
const ActorInit En_Bu_InitVars = { const ActorInit En_Bu_InitVars = {
ACTOR_EN_BU, ACTOR_EN_BU,
ACTORCAT_ENEMY, ACTORCAT_ENEMY,
@ -21,14 +22,38 @@ const ActorInit En_Bu_InitVars = {
(ActorFunc)EnBu_Update, (ActorFunc)EnBu_Update,
(ActorFunc)EnBu_Draw (ActorFunc)EnBu_Draw
}; };
*/
#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bu_0x809ACD90/EnBu_Init.asm") void EnBu_Init(Actor* thisx, GlobalContext* globalCtx) {
EnBu* this = THIS;
#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bu_0x809ACD90/EnBu_Destroy.asm") this->actionFunc = EnBu_DoNothing;
}
#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bu_0x809ACD90/func_809ACDB8.asm") void EnBu_Destroy(Actor* thisx, GlobalContext* globalCtx) {
}
#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bu_0x809ACD90/EnBu_Update.asm") void EnBu_DoNothing(EnBu* this, GlobalContext* globalCtx) {
}
#pragma GLOBAL_ASM("./asm/non_matchings/overlays/ovl_En_Bu_0x809ACD90/EnBu_Draw.asm") void EnBu_Update(Actor* thisx, GlobalContext* globalCtx) {
EnBu* this = THIS;
Actor_SetVelocityAndMoveYRotationAndGravity(&this->actor);
this->actionFunc(this, globalCtx);
}
void EnBu_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnBu* this = THIS;
OPEN_DISPS(globalCtx->state.gfxCtx);
SysMatrix_InsertTranslation(this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, 0);
SysMatrix_InsertZRotation_s(this->actor.shape.rot.z, 1);
Matrix_RotateY(this->actor.shape.rot.y, 1);
SysMatrix_InsertXRotation_s(this->actor.shape.rot.x, 1);
Matrix_Scale(0.01f, 0.01f, 0.01f, 1);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, this->displayListPtr);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}

6
src/overlays/actors/ovl_En_Bu/z_en_bu.h
View File

@ -5,9 +5,13 @@
struct EnBu; struct EnBu;
typedef void (*EnBuActionFunc)(struct EnBu*, GlobalContext*);
typedef struct EnBu { typedef struct EnBu {
/* 0x000 */ Actor actor; /* 0x000 */ Actor actor;
/* 0x144 */ char unk_144[0x4C]; /* 0x144 */ EnBuActionFunc actionFunc;
/* 0x148 */ UNK_TYPE1 unk148[0x44];
/* 0x18C */ Gfx* displayListPtr;
} EnBu; // size = 0x190 } EnBu; // size = 0x190
extern const ActorInit En_Bu_InitVars; extern const ActorInit En_Bu_InitVars;

2
tables/functions.txt
View File

@ -8846,7 +8846,7 @@
0x809ACB28:("func_809ACB28",), 0x809ACB28:("func_809ACB28",),
0x809ACD90:("EnBu_Init",), 0x809ACD90:("EnBu_Init",),
0x809ACDA8:("EnBu_Destroy",), 0x809ACDA8:("EnBu_Destroy",),
0x809ACDB8:("func_809ACDB8",), 0x809ACDB8:("EnBu_DoNothing",),
0x809ACDC8:("EnBu_Update",), 0x809ACDC8:("EnBu_Update",),
0x809ACE00:("EnBu_Draw",), 0x809ACE00:("EnBu_Draw",),
0x809ACF40:("EnEncount3_Init",), 0x809ACF40:("EnEncount3_Init",),