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_Ig (#533)

Browse Source 
* En_Ig

* UNK_TYPE1

* Remove syms

* PR

* PR

* Merge

* Merge
This commit is contained in:
Maide
2022-01-16 17:46:08 +00:00
committed by GitHub
parent 7aa3766d67
commit b47941968d
6 changed files with 994 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/z64.h
+1 -1
View File
@@ -1395,7 +1395,7 @@ typedef struct EnHy {
typedef struct {
/* 0x0 */ u8 unk0;
/* 0x4 */ s32 unk4;
/* 0x8 */ s32 unk8;
/* 0x8 */ s32 unk8; // game script pointer?
} struct_80133038_arg2; // size = 0xC
typedef s32 (*func_8013E748_arg6)(struct GlobalContext*, Actor*, Vec3s*);
spec
+1 -2
View File
@@ -5027,8 +5027,7 @@ beginseg
name "ovl_En_Ig"
compress
include "build/src/overlays/actors/ovl_En_Ig/z_en_ig.o"
include "build/data/ovl_En_Ig/ovl_En_Ig.data.o"
include "build/data/ovl_En_Ig/ovl_En_Ig.reloc.o"
include "build/src/overlays/actors/ovl_En_Ig/ovl_En_Ig_reloc.o"
endseg
beginseg
src/overlays/actors/ovl_En_Ig/z_en_ig.c
+941 -56
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Ig/z_en_ig.h
+48 -2
View File
@@ -6,12 +6,58 @@
struct EnIg;
typedef void (*EnIgActionFunc)(struct EnIg*, GlobalContext*);
typedef s32 (*EnIgUnkFunc)(struct EnIg*, GlobalContext*);
typedef void (*EnIgUnkFunc2)(struct EnIg*, GlobalContext*);
#define ENIG_GET_FF(thisx) ((thisx)->params & 0xFF)
typedef struct EnIg {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x44];
/* 0x0144 */ SkelAnime skelAnime;
/* 0x0188 */ EnIgActionFunc actionFunc;
/* 0x018C */ char unk_18C[0x280];
/* 0x018C */ EnIgUnkFunc2 unk_18C;
/* 0x0190 */ MtxF unk_190;
/* 0x01D0 */ ColliderCylinder collider1;
/* 0x021C */ ColliderSphere collider2;
/* 0x0274 */ Path* unk_274;
/* 0x0278 */ Vec3f unk_278;
/* 0x0284 */ f32 unk_284;
/* 0x0288 */ s32 unk_288;
/* 0x028C */ s32 unk_28C;
/* 0x0290 */ s32 unk_290;
/* 0x0294 */ s32 unk_294;
/* 0x0298 */ struct_80133038_arg2 unk_298;
/* 0x02A4 */ s8 unk_2A4;
/* 0x02A8 */ Actor* unk_2A8;
/* 0x02AC */ UNK_TYPE1 unk2AC[0x4];
/* 0x02B0 */ Vec3f unk_2B0;
/* 0x02BC */ Vec3f unk_2BC;
/* 0x02C8 */ UNK_TYPE1 unk2C8[0xC];
/* 0x02D4 */ Vec3f unk_2D4;
/* 0x02E0 */ UNK_TYPE1 unk2E0[0x6];
/* 0x02E6 */ Vec3s unk_2E6;
/* 0x02EC */ Vec3s jointTable[19];
/* 0x035E */ Vec3s morphTable[19];
/* 0x03D0 */ u16 unk_3D0;
/* 0x03D2 */ u16 unk_3D2;
/* 0x03D4 */ f32 unk_3D4;
/* 0x03D8 */ UNK_TYPE1 unk3D8[0x8];
/* 0x03E0 */ s16 unk_3E0;
/* 0x03E2 */ s16 unk_3E2;
/* 0x03E4 */ s16 unk_3E4;
/* 0x03E6 */ s16 unk_3E6;
/* 0x03E8 */ s16 unk_3E8;
/* 0x03EA */ s16 unk_3EA;
/* 0x03EC */ s16 unk_3EC;
/* 0x03EE */ s16 unk_3EE;
/* 0x03F0 */ s16 unk_3F0;
/* 0x03F2 */ s16 unk_3F2;
/* 0x03F4 */ s16 unk_3F4;
/* 0x03F6 */ s16 unk_3F6;
/* 0x03F8 */ EnIgUnkFunc unk_3F8;
/* 0x03FC */ s32 unk_3FC;
/* 0x0400 */ UNK_TYPE1 unk400[0x8];
/* 0x0408 */ s32 unk_408;
} EnIg; // size = 0x40C
extern const ActorInit En_Ig_InitVars;
tools/disasm/functions.txt
+3 -3
View File
@@ -16315,9 +16315,9 @@
0x80BF2CC0:("EnIg_Init",),
0x80BF2DC4:("EnIg_Destroy",),
0x80BF2E04:("EnIg_Update",),
0x80BF2EDC:("func_80BF2EDC",),
0x80BF2EFC:("func_80BF2EFC",),
0x80BF302C:("func_80BF302C",),
0x80BF2EDC:("EnIg_OverrideLimbDraw",),
0x80BF2EFC:("EnIg_PostLimbDraw",),
0x80BF302C:("EnIg_UnkDraw",),
0x80BF312C:("EnIg_Draw",),
0x80BF3920:("func_80BF3920",),
0x80BF3C64:("func_80BF3C64",),
undefined_syms.txt
-9
View File
@@ -2454,15 +2454,6 @@ D_0600A480 = 0x0600A480;
D_060005C0 = 0x060005C0;
D_06006260 = 0x06006260;
// ovl_En_Ig
D_06008710 = 0x06008710;
D_060087B8 = 0x060087B8;
D_060089D8 = 0x060089D8;
D_06008B00 = 0x06008B00;
D_0600C538 = 0x0600C538;
D_060130D0 = 0x060130D0;
// ovl_En_Ik
D_06000CE8 = 0x06000CE8;