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

Thiefbird (#290) 

* Thiefbird

* Fix enums

* Rename funcs

* PR
This commit is contained in:
Maide 2021-09-28 22:56:25 +01:00 committed by GitHub
parent edb1dd4675
commit 9478fc760f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 1081 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/functions.h
View File

@ -2142,7 +2142,7 @@ void func_80112B40(GlobalContext* globalCtx, s32 arg1);
u32 Item_Give(GlobalContext* globalCtx, u8 param_2);
// void func_801143CC(void);
UNK_TYPE func_80114978(UNK_TYPE arg0);
// void func_801149A0(void);
void func_801149A0(s32 arg0, s16 arg1);
// void func_80114A9C(void);
// void func_80114B84(void);
// void func_80114CA0(void);

4
spec
View File

@ -5308,9 +5308,7 @@ beginseg
name "ovl_En_Thiefbird"
compress
include "build/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.o"
include "build/data/ovl_En_Thiefbird/ovl_En_Thiefbird.data.o"
include "build/data/ovl_En_Thiefbird/ovl_En_Thiefbird.bss.o"
include "build/data/ovl_En_Thiefbird/ovl_En_Thiefbird.reloc.o"
include "build/src/overlays/actors/ovl_En_Thiefbird/ovl_En_Thiefbird_reloc.o"
endseg
beginseg

1106
src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c
View File

File diff suppressed because it is too large Load Diff

32
src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.h
View File

@ -7,11 +7,39 @@ struct EnThiefbird;
typedef void (*EnThiefbirdActionFunc)(struct EnThiefbird*, GlobalContext*);
typedef struct {
/* 0x00 */ Vec3f unk_00;
/* 0x0C */ Vec3f unk_0C;
/* 0x18 */ f32 unk_18;
/* 0x1C */ s16 unk_1C;
/* 0x1E */ s16 unk_1E;
/* 0x20 */ s16 unk_20;
/* 0x22 */ s16 unk_22;
} EnThiefbirdUnkStruct; // size = 0x24
typedef struct EnThiefbird {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x44];
/* 0x0144 */ SkelAnime skelAnime;
/* 0x0188 */ EnThiefbirdActionFunc actionFunc;
/* 0x018C */ char unk_18C[0x804];
/* 0x018C */ u8 unk_18C;
/* 0x018E */ s16 unk_18E;
/* 0x0190 */ s16 unk_190;
/* 0x0192 */ s16 unk_192;
/* 0x0194 */ s16 unk_194;
/* 0x0196 */ s16 unk_196[6];
/* 0x01A2 */ Vec3s jointTable[17];
/* 0x0208 */ Vec3s morphTable[17];
/* 0x0270 */ ColliderJntSph collider;
/* 0x0290 */ ColliderJntSphElement colliderElements[3];
/* 0x0350 */ Vec3f unk_350[11];
/* 0x03D4 */ f32 unk_3D4;
/* 0x03D8 */ f32 unk_3D8;
/* 0x03DC */ f32 unk_3DC;
/* 0x03E0 */ f32 unk_3E0;
/* 0x03E4 */ Gfx* unk_3E4;
/* 0x03E8 */ UNK_PTR unk_3E8;
/* 0x03EC */ EnItem00* unk_3EC;
/* 0x03F0 */ EnThiefbirdUnkStruct unk_3F0[40];
} EnThiefbird; // size = 0x990
extern const ActorInit En_Thiefbird_InitVars;

4
tools/disasm/functions.txt
View File

@ -16781,8 +16781,8 @@
0x80C12B1C:("func_80C12B1C",),
0x80C12D00:("func_80C12D00",),
0x80C12ED4:("EnThiefbird_Update",),
0x80C130EC:("func_80C130EC",),
0x80C1315C:("func_80C1315C",),
0x80C130EC:("EnThiefbird_OverrideLimbDraw",),
0x80C1315C:("EnThiefbird_PostLimbDraw",),
0x80C13354:("func_80C13354",),
0x80C134D0:("EnThiefbird_Draw",),
0x80C13930:("EnJgameTsn_Init",),

3
undefined_syms.txt
View File

@ -3549,6 +3549,9 @@ D_060033B0 = 0x060033B0;
D_06003D58 = 0x06003D58;
D_060061A0 = 0x060061A0;
D_060063C4 = 0x060063C4;
D_06004348 = 0x06004348;
D_06004B88 = 0x06004B88;
D_060055E0 = 0x060055E0;
// ovl_En_Tite