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

En_Sw (6 non-matching) (#295) 

* En_Sw

* spec

* Sw

* Fix
This commit is contained in:
Maide 2021-10-11 18:41:02 +01:00 committed by GitHub
parent 28523e2980
commit a2666a6ee0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 1239 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/functions.h
View File

@ -2697,7 +2697,7 @@ Path* func_8013BB34(GlobalContext* globalCtx, u8 arg1, s32 arg2);
Actor* func_8013BB7C(Actor* actor, GlobalContext* globalCtx, s32 actorCategory, s32 actorId); Actor* func_8013BB7C(Actor* actor, GlobalContext* globalCtx, s32 actorCategory, s32 actorId);
s32 func_8013BC6C(SkelAnime* skelAnime, ActorAnimationEntryS* arg1, s32 arg2); s32 func_8013BC6C(SkelAnime* skelAnime, ActorAnimationEntryS* arg1, s32 arg2);
// void func_8013BD40(void); // void func_8013BD40(void);
// void func_8013BEDC(void); s32 func_8013BEDC(GlobalContext* globalCtx, s32 arg1, s32 arg2, s32* arg3);
// void func_8013C068(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5); // void func_8013C068(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5);
// void func_8013C624(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6); // void func_8013C624(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6);
// void func_8013C8B8(void); // void func_8013C8B8(void);

7
spec
View File

@ -1202,8 +1202,11 @@ beginseg
name "ovl_En_Sw" name "ovl_En_Sw"
compress compress
include "build/src/overlays/actors/ovl_En_Sw/z_en_sw.o" include "build/src/overlays/actors/ovl_En_Sw/z_en_sw.o"
include "build/data/ovl_En_Sw/ovl_En_Sw.data.o" #ifdef NON_MATCHING
include "build/data/ovl_En_Sw/ovl_En_Sw.reloc.o" include "build/src/overlays/actors/ovl_En_Sw/ovl_En_Sw_reloc.o"
#else
include "build/data/ovl_En_Sw/ovl_En_Sw.reloc.o"
#endif
endseg endseg
beginseg beginseg

1241
src/overlays/actors/ovl_En_Sw/z_en_sw.c
View File

File diff suppressed because it is too large Load Diff

43
src/overlays/actors/ovl_En_Sw/z_en_sw.h
View File

@ -7,11 +7,50 @@ struct EnSw;
typedef void (*EnSwActionFunc)(struct EnSw*, GlobalContext*); typedef void (*EnSwActionFunc)(struct EnSw*, GlobalContext*);
#define ENSW_GET_3(thisx) (((thisx)->params & 3) & 0xFF)
#define ENSW_GET_3FC(thisx) (((thisx)->params & 0x3FC) >> 2)
#define ENSW_GET_FF00(thisx) ((((thisx)->params & 0xFF00) >> 8) & 0xFF)
typedef struct {
u8 unk_00;
s32 unk_04;
} EnSwUnkStruct;
typedef struct EnSw { typedef struct EnSw {
/* 0x0000 */ Actor actor; /* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x44]; /* 0x0144 */ SkelAnime skelAnime;
/* 0x0188 */ EnSwActionFunc actionFunc; /* 0x0188 */ EnSwActionFunc actionFunc;
/* 0x018C */ char unk_18C[0x318]; /* 0x018C */ ColliderSphere collider;
/* 0x01E4 */ EnSwUnkStruct* unk_1E4;
/* 0x01E8 */ Vec3s jointTable[30];
/* 0x029C */ Vec3s morphTable[30];
/* 0x0350 */ Vec3f unk_350;
/* 0x035C */ Vec3f unk_35C;
/* 0x0368 */ Vec3f unk_368;
/* 0x0374 */ Vec3f unk_374;
/* 0x0380 */ Vec3f unk_380[12];
/* 0x0410 */ u16 unk_410;
/* 0x0412 */ u8 unk_412;
/* 0x0414 */ f32 unk_414;
/* 0x0418 */ f32 unk_418[12];
/* 0x0448 */ f32 unk_448;
/* 0x044C */ f32 unk_44C;
/* 0x0450 */ f32 unk_450;
/* 0x0454 */ s16 unk_454;
/* 0x0456 */ s16 unk_456;
/* 0x0458 */ s16 unk_458;
/* 0x045A */ s16 unk_45A;
/* 0x045C */ s16 unk_45C;
/* 0x045E */ s16 unk_45E;
/* 0x0460 */ s16 unk_460;
/* 0x0462 */ s16 unk_462;
/* 0x0464 */ s16 unk_464[12];
/* 0x047C */ s16 unk_47C[12];
/* 0x0494 */ s16 unk_494;
/* 0x0496 */ s16 unk_496;
/* 0x0468 */ s16 unk_498;
/* 0x049C */ s32 unk_49C;
/* 0x04A0 */ s32 unk_4A0;
} EnSw; // size = 0x4A4 } EnSw; // size = 0x4A4
extern const ActorInit En_Sw_InitVars; extern const ActorInit En_Sw_InitVars;

2
tools/disasm/functions.txt
View File

@ -6457,7 +6457,7 @@
0x808DB454:("EnSw_Init",), 0x808DB454:("EnSw_Init",),
0x808DB70C:("EnSw_Destroy",), 0x808DB70C:("EnSw_Destroy",),
0x808DB738:("EnSw_Update",), 0x808DB738:("EnSw_Update",),
0x808DB7F4:("func_808DB7F4",), 0x808DB7F4:("EnSw_OverrideLimbDraw",),
0x808DB8DC:("EnSw_Draw",), 0x808DB8DC:("EnSw_Draw",),
0x808DBE80:("ObjectKankyo_SetupAction",), 0x808DBE80:("ObjectKankyo_SetupAction",),
0x808DBE8C:("func_808DBE8C",), 0x808DBE8C:("func_808DBE8C",),

3
undefined_syms.txt
View File

@ -3471,6 +3471,9 @@ D_060048B8 = 0x060048B8;
D_06004950 = 0x06004950; D_06004950 = 0x06004950;
D_060049E8 = 0x060049E8; D_060049E8 = 0x060049E8;
D_06005298 = 0x06005298; D_06005298 = 0x06005298;
D_06000304 = 0x06000304;
D_060055A8 = 0x060055A8;
D_06005B98 = 0x06005B98;
// ovl_En_Syateki_Crow // ovl_En_Syateki_Crow