izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

En_Trt2 (#448)

Browse Source 
* Trt2

* Whoops

* PR

* PR

* PR

* Merge

* Merge

* Merge

* bgcheck

* I got trolled >:
This commit is contained in:
Maide
2022-01-29 18:45:32 -05:00
committed by GitHub
parent 850823c2ee
commit c840e04c27
5 changed files with 867 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spec
+1 -2
View File
@@ -3589,8 +3589,7 @@ beginseg
name "ovl_En_Trt2"
compress
include "build/src/overlays/actors/ovl_En_Trt2/z_en_trt2.o"
include "build/data/ovl_En_Trt2/ovl_En_Trt2.data.o"
include "build/data/ovl_En_Trt2/ovl_En_Trt2.reloc.o"
include "build/src/overlays/actors/ovl_En_Trt2/ovl_En_Trt2_reloc.o"
endseg
beginseg
src/overlays/actors/ovl_En_Trt2/z_en_trt2.c
+832 -83
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Trt2/z_en_trt2.h
+31 -3
View File
@@ -6,11 +6,39 @@
struct EnTrt2;
typedef void (*EnTrt2ActionFunc)(struct EnTrt2*, GlobalContext*);
typedef void (*EnTrt2UnkFunc)(struct EnTrt2*);
typedef void (*EnTrt2UnkFunc2)(struct EnTrt2*, GlobalContext*);
#define ENTRT2_GET_FC00(thisx) (((thisx)->params & 0xFC00) >> 0xA)
typedef struct EnTrt2 {
/* 0x0000 */ Actor actor;
/* 0x0144 */ EnTrt2ActionFunc actionFunc;
/* 0x0148 */ char unk_148[0x294];
/* 0x000 */ Actor actor;
/* 0x144 */ EnTrt2ActionFunc actionFunc;
/* 0x148 */ UNK_TYPE1 unk_148[8];
/* 0x150 */ SkelAnime skelAnime;
/* 0x194 */ ColliderCylinder collider;
/* 0x1E0 */ Path* path;
/* 0x1E4 */ s32 unk_1E4;
/* 0x1E8 */ UNK_TYPE1 unk_1E8[0x154];
/* 0x33C */ s16 unk_33C[27];
/* 0x372 */ s16 unk_372[27];
/* 0x3A8 */ u16 unk_3A8;
/* 0x3AA */ UNK_TYPE1 unk_3AA[4];
/* 0x3AE */ s16 unk_3AE;
/* 0x3B0 */ s16 unk_3B0;
/* 0x3B2 */ s16 unk_3B2;
/* 0x3B4 */ s16 unk_3B4;
/* 0x3B6 */ s16 unk_3B6;
/* 0x3B8 */ s16 unk_3B8;
/* 0x3BC */ EnTrt2UnkFunc unk_3BC;
/* 0x3C0 */ s16 unk_3C0;
/* 0x3C2 */ Vec3s unk_3C2;
/* 0x3C8 */ Vec3f unk_3C8;
/* 0x3D4 */ s16 unk_3D4;
/* 0x3D6 */ s16 unk_3D6;
/* 0x3D8 */ u8 unk_3D8;
/* 0x3D9 */ u8 unk_3D9;
/* 0x3DA */ s16 unk_3DA;
} EnTrt2; // size = 0x3DC
extern const ActorInit En_Trt2_InitVars;
tools/disasm/functions.txt
+3 -3
View File
@@ -12206,9 +12206,9 @@
0x80AD5150:("EnTrt2_Update",),
0x80AD5234:("func_80AD5234",),
0x80AD5394:("func_80AD5394",),
0x80AD54C8:("func_80AD54C8",),
0x80AD5584:("func_80AD5584",),
0x80AD566C:("func_80AD566C",),
0x80AD54C8:("EnTrt2_OverrideLimbDraw",),
0x80AD5584:("EnTrt2_PostLimbDraw",),
0x80AD566C:("EnTrt2_UnkDraw",),
0x80AD56E8:("func_80AD56E8",),
0x80AD5BB0:("ObjTokeiStep_SetSysMatrix",),
0x80AD5BE8:("ObjTokeiStep_AddQuake",),
undefined_syms.txt
-5
View File
@@ -2067,11 +2067,6 @@ D_0600B2B0 = 0x0600B2B0;
D_0600FEF0 = 0x0600FEF0;
D_06000A44 = 0x06000A44;
// ovl_En_Trt2
D_06000A44 = 0x06000A44;
D_0600FEF0 = 0x0600FEF0;
// ovl_En_Tru
D_0601A820 = 0x0601A820;