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

En_Dg (#233) 

* En_Dg

* Macros & Anim struct

* NBS

* PR

* PR

* Sort funcs/externs
This commit is contained in:
Maide 2021-08-08 22:10:31 +01:00 committed by GitHub
parent a0896b0895
commit 9dd5821669
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 1139 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/functions.h
View File

@ -1040,7 +1040,7 @@ f32 func_800C3D50(s32 arg0, CollisionContext* colCtx, s32 arg2, CollisionPoly**
Actor* actor, s32 arg7, f32 arg8, s32 arg9); Actor* actor, s32 arg7, f32 arg8, s32 arg9);
// void func_800C3F40(void); // void func_800C3F40(void);
// void func_800C3FA0(void); // void func_800C3FA0(void);
f32 func_800C4000(GlobalContext* globalCtx, CollisionContext* colCtx, Vec3s* arg2, Vec3f* arg3); f32 func_800C4000(GlobalContext* globalCtx, CollisionContext* colCtx, s32* arg2, Vec3f* arg3);
// void func_800C4058(void); // void func_800C4058(void);
// void func_800C40B4(void); // void func_800C40B4(void);
f32 func_800C411C(CollisionContext* colCtx, CollisionPoly** arg1, s32* arg2, Actor* actor, Vec3f* pos); f32 func_800C411C(CollisionContext* colCtx, CollisionPoly** arg1, s32* arg2, Actor* actor, Vec3f* pos);
@ -4003,7 +4003,7 @@ void audio_setBGM(u32 bgmID);
void Audio_PreNMI(void); void Audio_PreNMI(void);
// void func_801A44C4(void); // void func_801A44C4(void);
// void func_801A44D4(void); // void func_801A44D4(void);
// void func_801A46F8(void); s32 func_801A46F8(void);
// void func_801A4748(void); // void func_801A4748(void);
// void func_801A479C(void); // void func_801A479C(void);
// void func_801A47DC(void); // void func_801A47DC(void);

3
spec
View File

@ -2172,8 +2172,7 @@ beginseg
name "ovl_En_Dg" name "ovl_En_Dg"
compress compress
include "build/src/overlays/actors/ovl_En_Dg/z_en_dg.o" include "build/src/overlays/actors/ovl_En_Dg/z_en_dg.o"
include "build/data/ovl_En_Dg/ovl_En_Dg.data.o" include "build/src/overlays/actors/ovl_En_Dg/ovl_En_Dg_reloc.o"
include "build/data/ovl_En_Dg/ovl_En_Dg.reloc.o"
endseg endseg
beginseg beginseg

1170
src/overlays/actors/ovl_En_Dg/z_en_dg.c
View File

File diff suppressed because it is too large Load Diff

28
src/overlays/actors/ovl_En_Dg/z_en_dg.h
View File

@ -5,12 +5,32 @@
struct EnDg; struct EnDg;
typedef void (*EnDgActionFunc)(struct EnDg* this, GlobalContext* globalCtx); typedef void (*EnDgActionFunc)(struct EnDg*, GlobalContext*);
#define ENDG_GET_FC00(thisx) (((thisx)->params & 0xFC00) >> 0xA)
#define ENDG_GET_3E0(thisx) (((thisx)->params & 0x3E0) >> 5)
typedef struct EnDg { typedef struct EnDg {
/* 0x0000 */ Actor actor; /* 0x000 */ Actor actor;
/* 0x0144 */ EnDgActionFunc actionFunc; /* 0x144 */ EnDgActionFunc actionFunc;
/* 0x0148 */ char unk_144[0x158]; /* 0x148 */ UNK_TYPE1 unk_148[0x4];
/* 0x14C */ SkelAnime skelAnime;
/* 0x190 */ ColliderCylinder collider;
/* 0x1DC */ Path* unk_1DC;
/* 0x1E0 */ s32 unk_1E0;
/* 0x1E4 */ Vec3s jointTable[13];
/* 0x232 */ Vec3s morphTable[13];
/* 0x280 */ u16 unk_280;
/* 0x282 */ s16 unk_282;
/* 0x284 */ s16 unk_284;
/* 0x286 */ s16 unk_286;
/* 0x288 */ s16 unk_288;
/* 0x28A */ s16 unk_28A;
/* 0x28C */ s16 unk_28C;
/* 0x28E */ s16 unk_28E;
/* 0x290 */ s16 unk_290;
/* 0x292 */ s16 unk_292;
/* 0x294 */ Vec3f unk_294;
} EnDg; // size = 0x2A0 } EnDg; // size = 0x2A0
extern const ActorInit En_Dg_InitVars; extern const ActorInit En_Dg_InitVars;

3
src/overlays/actors/ovl_En_Suttari/z_en_suttari.c
View File

@ -202,7 +202,8 @@ void EnSuttari_UpdateTime(void) {
s32 func_80BAA904(EnSuttari* this, GlobalContext* globalCtx) { s32 func_80BAA904(EnSuttari* this, GlobalContext* globalCtx) {
Vec3f sp2C; Vec3f sp2C;
Vec3s sp24; s32 pad;
s32 sp24;
sp2C.x = (Math_SinS(this->actor.world.rot.y) * 50.0f) + this->actor.world.pos.x; sp2C.x = (Math_SinS(this->actor.world.rot.y) * 50.0f) + this->actor.world.pos.x;
sp2C.y = this->actor.world.pos.y + 100.0f; sp2C.y = this->actor.world.pos.y + 100.0f;

9
undefined_syms.txt
View File

@ -1799,6 +1799,15 @@ D_0600D640 = 0x0600D640;
// ovl_En_Dg // ovl_En_Dg
D_060080F0 = 0x060080F0; D_060080F0 = 0x060080F0;
D_060021C8 = 0x060021C8;
D_06001BD8 = 0x06001BD8;
D_06000998 = 0x06000998;
D_06001FB0 = 0x06001FB0;
D_06001048 = 0x06001048;
D_06001348 = 0x06001348;
D_06001560 = 0x06001560;
D_06001A84 = 0x06001A84;
D_060017C0 = 0x060017C0;
// ovl_En_Dinofos // ovl_En_Dinofos