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_Tab (#657)

Browse Source 
* En_Tab

* PR
This commit is contained in:
Maide
2022-03-05 11:16:36 -03:00
committed by GitHub
parent 888448decf
commit 1c955e56b0
6 changed files with 593 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/xml/objects/object_tab.xml
+3 -2
View File
@@ -24,9 +24,10 @@
<Texture Name="object_tab_Tex_006328" OutName="tex_006328" Format="ci8" Width="8" Height="8" Offset="0x6328" />
<Texture Name="object_tab_Tex_006368" OutName="tex_006368" Format="ci8" Width="8" Height="16" Offset="0x6368" />
<Texture Name="object_tab_Tex_0063E8" OutName="tex_0063E8" Format="ci8" Width="8" Height="8" Offset="0x63E8" />
<!-- <Blob Name="object_tab_Blob_006428" Size="0x400" Offset="0x6428" /> -->
<Texture Name="object_tab_Tex_006428" OutName="tex_006428" Format="ci8" Width="32" Height="32" Offset="0x6428" />
<Texture Name="object_tab_Tex_006828" OutName="tex_006828" Format="ci8" Width="16" Height="16" Offset="0x6828" />
<!-- <Blob Name="object_tab_Blob_006928" Size="0x800" Offset="0x6928" /> -->
<Texture Name="object_tab_Tex_006928" OutName="tex_006928" Format="ci8" Width="32" Height="32" Offset="0x6928" />
<Texture Name="object_tab_Tex_006D28" OutName="tex_006D28" Format="ci8" Width="32" Height="32" Offset="0x6D28" />
<Texture Name="object_tab_Tex_007128" OutName="tex_007128" Format="ci8" Width="16" Height="16" Offset="0x7128" />
<Texture Name="object_tab_Tex_007228" OutName="tex_007228" Format="ci8" Width="16" Height="16" Offset="0x7228" />
<Texture Name="object_tab_Tex_007328" OutName="tex_007328" Format="i8" Width="32" Height="32" Offset="0x7328" />
spec
+1 -2
View File
@@ -4832,8 +4832,7 @@ beginseg
name "ovl_En_Tab"
compress
include "build/src/overlays/actors/ovl_En_Tab/z_en_tab.o"
include "build/data/ovl_En_Tab/ovl_En_Tab.data.o"
include "build/data/ovl_En_Tab/ovl_En_Tab.reloc.o"
include "build/src/overlays/actors/ovl_En_Tab/ovl_En_Tab_reloc.o"
endseg
beginseg
src/overlays/actors/ovl_En_Tab/z_en_tab.c
+553 -39
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Tab/z_en_tab.h
+33 -2
View File
@@ -2,16 +2,47 @@
#define Z_EN_TAB_H
#include "global.h"
#include "overlays/actors/ovl_En_Gm/z_en_gm.h"
struct EnTab;
typedef void (*EnTabActionFunc)(struct EnTab*, GlobalContext*);
typedef s32 (*EnTabUnkFunc)(struct EnTab*, GlobalContext*);
typedef struct EnTab {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x44];
/* 0x0144 */ SkelAnime skelAnime;
/* 0x0188 */ EnTabActionFunc actionFunc;
/* 0x018C */ char unk_18C[0x1B0];
/* 0x018C */ ColliderCylinder collider;
/* 0x01D8 */ u8 unk_1D8;
/* 0x01DC */ s32 unk_1DC;
/* 0x01E0 */ Actor* unk_1E0;
/* 0x01E4 */ EnGm* unk_1E4;
/* 0x01E8 */ Vec3f unk_1E8[2];
/* 0x0200 */ Vec3s unk_200[2];
/* 0x020C */ Vec3s jointTable[20];
/* 0x0284 */ Vec3s morphTable[20];
/* 0x02FC */ u16 unk_2FC;
/* 0x0300 */ f32 unk_300;
/* 0x0304 */ f32 unk_304;
/* 0x0308 */ f32 unk_308;
/* 0x030C */ s16 unk_30C;
/* 0x030E */ UNK_TYPE1 unk30E[4];
/* 0x0312 */ s16 unk_312;
/* 0x0314 */ s16 unk_314;
/* 0x0316 */ s16 unk_316;
/* 0x0318 */ s16 unk_318;
/* 0x031A */ s16 unk_31A;
/* 0x031C */ s16 unk_31C;
/* 0x031E */ s16 unk_31E;
/* 0x0320 */ s16 unk_320;
/* 0x0322 */ s16 unk_322;
/* 0x0324 */ s16 unk_324;
/* 0x0328 */ EnTabUnkFunc unk_328;
/* 0x032C */ s32 unk_32C;
/* 0x0330 */ UNK_TYPE1 unk330[4];
/* 0x0334 */ s32 unk_334;
/* 0x0338 */ s32 unk_338;
} EnTab; // size = 0x33C
extern const ActorInit En_Tab_InitVars;
tools/disasm/functions.txt
+3 -3
View File
@@ -16057,9 +16057,9 @@
0x80BE1424:("EnTab_Init",),
0x80BE1524:("EnTab_Destroy",),
0x80BE1550:("EnTab_Update",),
0x80BE1648:("func_80BE1648",),
0x80BE16B4:("func_80BE16B4",),
0x80BE1704:("func_80BE1704",),
0x80BE1648:("EnTab_OverrideLimbDraw",),
0x80BE16B4:("EnTab_PostLimbDraw",),
0x80BE1704:("EnTab_TransformDraw",),
0x80BE1810:("EnTab_Draw",),
0x80BE1C80:("func_80BE1C80",),
0x80BE1CEC:("EnNimotsu_Init",),
undefined_syms.txt
-4
View File
@@ -1809,10 +1809,6 @@ D_060091A8 = 0x060091A8;
D_06011AC8 = 0x06011AC8;
D_06012DE0 = 0x06012DE0;
// ovl_En_Tab
D_06007F78 = 0x06007F78;
// ovl_En_Takaraya
D_06000968 = 0x06000968;