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_Gg (#585)

Browse Source 
* En_Gg

* remove syms

* merge

* Merge

* PR

* PR
This commit is contained in:
Maide
2022-02-28 02:59:07 +00:00
committed by GitHub
parent e127ee650a
commit d60f3fcf2c
5 changed files with 766 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spec
+1 -2
View File
@@ -4026,8 +4026,7 @@ beginseg
name "ovl_En_Gg"
compress
include "build/src/overlays/actors/ovl_En_Gg/z_en_gg.o"
include "build/data/ovl_En_Gg/ovl_En_Gg.data.o"
include "build/data/ovl_En_Gg/ovl_En_Gg.reloc.o"
include "build/src/overlays/actors/ovl_En_Gg/ovl_En_Gg_reloc.o"
endseg
beginseg
src/overlays/actors/ovl_En_Gg/z_en_gg.c
+718 -40
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Gg/z_en_gg.h
+45 -2
View File
@@ -4,14 +4,57 @@
#include "global.h"
struct EnGg;
struct EnGgStruct;
typedef void (*EnGgActionFunc)(struct EnGg*, GlobalContext*);
typedef void (*EnGgUnkFunc)(struct EnGgStruct*, GlobalContext*);
typedef struct EnGgStruct {
/* 0x00 */ Vec3f unk_00;
/* 0x0C */ Vec3f unk_0C;
/* 0x18 */ Vec3f unk_18;
/* 0x24 */ Vec3f unk_24;
/* 0x30 */ u8 unk_30;
/* 0x34 */ EnGgUnkFunc unk_34;
/* 0x38 */ EnGgUnkFunc unk_38;
/* 0x3C */ s32 unk_3C;
/* 0x40 */ s32 unk_40;
/* 0x44 */ s32 unk_44;
/* 0x48 */ u8 unk_48;
} EnGgStruct; // size == 0x4C
typedef struct EnGg {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x90];
/* 0x0144 */ ColliderCylinder collider;
/* 0x0190 */ SkelAnime skelAnime;
/* 0x01D4 */ EnGgActionFunc actionFunc;
/* 0x01D8 */ char unk_1D8[0x1B8];
/* 0x01D8 */ Vec3s unk_1D8;
/* 0x01DE */ Vec3s unk_1DE;
/* 0x01E4 */ Vec3s jointTable[20];
/* 0x025C */ Vec3s morphTable[20];
/* 0x02D4 */ UNK_TYPE1 unk_2D4[0x6];
/* 0x02DA */ u8 unk_2DA;
/* 0x02DB */ u8 unk_2DB;
/* 0x02DC */ s16 unk_2DC;
/* 0x02DE */ UNK_TYPE1 unk2DE[4];
/* 0x02E2 */ s16 unk_2E2;
/* 0x02E4 */ s16 unk_2E4;
/* 0x02E6 */ s16 unk_2E6;
/* 0x02E8 */ s16 unk_2E8;
/* 0x02EA */ UNK_TYPE1 unk2EA[0x1A];
/* 0x0304 */ s16 unk_304;
/* 0x0306 */ u8 unk_306;
/* 0x0307 */ u8 unk_307;
/* 0x0308 */ u8 unk_308;
/* 0x0309 */ u8 unk_309;
/* 0x030A */ s16 unk_30A;
/* 0x030C */ UNK_TYPE1 unk30C[4];
/* 0x0310 */ f32 unk_310;
/* 0x0314 */ UNK_TYPE1 unk314[0xC];
/* 0x0320 */ Vec3f unk_320;
/* 0x032C */ Vec3f unk_32C;
/* 0x0338 */ Vec3f unk_338;
/* 0x0344 */ EnGgStruct unk_344;
} EnGg; // size = 0x390
extern const ActorInit En_Gg_InitVars;
tools/disasm/functions.txt
+2 -2
View File
@@ -13527,8 +13527,8 @@
0x80B364F8:("EnGg_Init",),
0x80B36660:("EnGg_Destroy",),
0x80B36670:("EnGg_Update",),
0x80B368B0:("func_80B368B0",),
0x80B368F0:("func_80B368F0",),
0x80B368B0:("EnGg_OverrideLimbDraw",),
0x80B368F0:("EnGg_PostLimbDraw",),
0x80B36A34:("EnGg_Draw",),
0x80B37080:("EnMaruta_Init",),
0x80B37280:("EnMaruta_Destroy",),
undefined_syms.txt
-5
View File
@@ -1367,11 +1367,6 @@ D_0600A344 = 0x0600A344;
D_06001EFC = 0x06001EFC;
D_0600A808 = 0x0600A808;
// ovl_En_Gg
D_0600F578 = 0x0600F578;
D_0600F6C0 = 0x0600F6C0;
// ovl_En_Gg2
D_0600F578 = 0x0600F578;