Game-Decompilation/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2024-11-27 06:40:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

En_Gb2 (#453)

Browse Source 
* En_Gb2

* Negs

* PR

* Update src/overlays/actors/ovl_En_Gb2/z_en_gb2.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
This commit is contained in:
Maide 2022-01-04 04:35:21 +00:00 committed by GitHub
parent fc37051216
commit 9a0079de8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 974 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spec
View File

@ -3880,8 +3880,7 @@ beginseg
name "ovl_En_Gb2"
compress
include "build/src/overlays/actors/ovl_En_Gb2/z_en_gb2.o"
include "build/data/ovl_En_Gb2/ovl_En_Gb2.data.o"
include "build/data/ovl_En_Gb2/ovl_En_Gb2.reloc.o"
include "build/src/overlays/actors/ovl_En_Gb2/ovl_En_Gb2_reloc.o"
endseg
beginseg

1000
src/overlays/actors/ovl_En_Gb2/z_en_gb2.c
View File

File diff suppressed because it is too large Load Diff

30
src/overlays/actors/ovl_En_Gb2/z_en_gb2.h
View File

@ -7,11 +7,35 @@ struct EnGb2;
typedef void (*EnGb2ActionFunc)(struct EnGb2*, GlobalContext*);
#define ENGB2_GET_7(thisx) ((thisx)->params & 7)
#define ENGB2_GET_7F8(thisx) (((thisx)->params & 0x7F8) >> 3)
enum {
/* 0 */ ENGB2_7_0,
/* 1 */ ENGB2_7_1,
/* 2 */ ENGB2_7_2,
};
typedef struct EnGb2 {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0xD4];
/* 0x0218 */ EnGb2ActionFunc actionFunc;
/* 0x021C */ char unk_21C[0x78];
/* 0x144 */ SkelAnime skelAnime;
/* 0x188 */ Vec3s jointTable[12];
/* 0x1D0 */ Vec3s morphTable[12];
/* 0x218 */ EnGb2ActionFunc actionFunc;
/* 0x21C */ ColliderCylinder collider;
/* 0x268 */ Actor* unk_268;
/* 0x26C */ u16 unk_26C;
/* 0x26E */ u16 unk_26E;
/* 0x270 */ Vec3s unk_270;
/* 0x276 */ Vec3s unk_276;
/* 0x27C */ s16 unk_27C;
/* 0x27E */ s16 unk_27E;
/* 0x280 */ s16 unk_280;
/* 0x282 */ s16 unk_282[3];
/* 0x288 */ s16 unk_288;
/* 0x28A */ u8 unk_28A;
/* 0x28C */ s32 unk_28C;
/* 0x290 */ s16 unk_290;
} EnGb2; // size = 0x294
extern const ActorInit En_Gb2_InitVars;

4
tools/disasm/functions.txt
View File

@ -13021,8 +13021,8 @@
0x80B1137C:("EnGb2_Init",),
0x80B116E4:("EnGb2_Destroy",),
0x80B11710:("EnGb2_Update",),
0x80B1179C:("func_80B1179C",),
0x80B117FC:("func_80B117FC",),
0x80B1179C:("EnGb2_OverrideLimbDraw",),
0x80B117FC:("EnGb2_PostLimbDraw",),
0x80B11858:("EnGb2_Draw",),
0x80B11E60:("EnOnpuman_Init",),
0x80B11F18:("EnOnpuman_Destroy",),

5
undefined_syms.txt
View File

@ -2278,11 +2278,6 @@ D_060015C0 = 0x060015C0;
D_060023D4 = 0x060023D4;
D_06002720 = 0x06002720;
// ovl_En_Gb2
D_0600049C = 0x0600049C;
D_06007230 = 0x06007230;
// ovl_En_Ge1
D_06002B98 = 0x06002B98;