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_Kbt (#732)

Browse Source 
* En_Kbt

* PR

* a
This commit is contained in:
Maide
2022-03-27 11:27:09 -03:00
committed by GitHub
parent 35bc48de54
commit 38eef9252e
6 changed files with 549 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/xml/objects/object_kbt.xml
+7 -1
View File
@@ -42,7 +42,13 @@
<Texture Name="object_kbt_Tex_00A2F8" OutName="tex_00A2F8" Format="ci8" Width="8" Height="8" Offset="0xA2F8" />
<Texture Name="object_kbt_Tex_00A338" OutName="tex_00A338" Format="rgba16" Width="8" Height="8" Offset="0xA338" />
<Texture Name="object_kbt_Tex_00A3B8" OutName="tex_00A3B8" Format="ci8" Width="16" Height="32" Offset="0xA3B8" />
<!-- <Blob Name="object_kbt_Blob_00A5B8" Size="0x3800" Offset="0xA5B8" /> -->
<Texture Name="object_kbt_Tex_00A5B8" OutName="tex_00A5B8" Format="rgba16" Width="32" Height="32" Offset="0xA5B8" />
<Texture Name="object_kbt_Tex_00ADB8" OutName="tex_00ADB8" Format="rgba16" Width="32" Height="32" Offset="0xADB8" />
<Texture Name="object_kbt_Tex_00B5B8" OutName="tex_00B5B8" Format="rgba16" Width="32" Height="32" Offset="0xB5B8" />
<Texture Name="object_kbt_Tex_00BDB8" OutName="tex_00BDB8" Format="rgba16" Width="32" Height="32" Offset="0xBDB8" />
<Texture Name="object_kbt_Tex_00C5B8" OutName="tex_00C5B8" Format="rgba16" Width="32" Height="32" Offset="0xC5B8" />
<Texture Name="object_kbt_Tex_00CDB8" OutName="tex_00CDB8" Format="rgba16" Width="32" Height="32" Offset="0xCDB8" />
<Texture Name="object_kbt_Tex_00D5B8" OutName="tex_00D5B8" Format="rgba16" Width="32" Height="32" Offset="0xD5B8" />
<Limb Name="object_kbt_Standardlimb_00DDB8" Type="Standard" EnumName="OBJECT_KBT_LIMB_01" Offset="0xDDB8" />
<Limb Name="object_kbt_Standardlimb_00DDC4" Type="Standard" EnumName="OBJECT_KBT_LIMB_02" Offset="0xDDC4" />
<Limb Name="object_kbt_Standardlimb_00DDD0" Type="Standard" EnumName="OBJECT_KBT_LIMB_03" Offset="0xDDD0" />
spec
+1 -2
View File
@@ -3978,8 +3978,7 @@ beginseg
name "ovl_En_Kbt"
compress
include "build/src/overlays/actors/ovl_En_Kbt/z_en_kbt.o"
include "build/data/ovl_En_Kbt/ovl_En_Kbt.data.o"
include "build/data/ovl_En_Kbt/ovl_En_Kbt.reloc.o"
include "build/src/overlays/actors/ovl_En_Kbt/ovl_En_Kbt_reloc.o"
endseg
beginseg
src/overlays/actors/ovl_En_Kbt/z_en_kbt.c
+528 -18
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Kbt/z_en_kbt.h
+11 -1
View File
@@ -2,6 +2,7 @@
#define Z_EN_KBT_H
#include "global.h"
#include "objects/object_kbt/object_kbt.h"
struct EnKbt;
@@ -9,7 +10,16 @@ typedef void (*EnKbtActionFunc)(struct EnKbt*, GlobalContext*);
typedef struct EnKbt {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x144];
/* 0x0144 */ SkelAnime skelAnime;
/* 0x0188 */ Vec3s jointTable[OBJECT_KBT_LIMB_MAX];
/* 0x0200 */ Vec3s morphTable[OBJECT_KBT_LIMB_MAX];
/* 0x0278 */ Actor* unk_278;
/* 0x027C */ u16 unk_27C;
/* 0x027E */ u8 unk_27E;
/* 0x027F */ u8 unk_27F;
/* 0x0280 */ s16 unk_280;
/* 0x0282 */ s16 unk_282;
/* 0x0284 */ s16 unk_284;
/* 0x0288 */ EnKbtActionFunc actionFunc;
} EnKbt; // size = 0x28C
tools/disasm/functions.txt
+2 -2
View File
@@ -13501,8 +13501,8 @@
0x80B34574:("func_80B34574",),
0x80B34598:("func_80B34598",),
0x80B349A4:("EnKbt_Update",),
0x80B349C8:("func_80B349C8",),
0x80B34A00:("func_80B34A00",),
0x80B349C8:("EnKbt_OverrideLimbDraw",),
0x80B34A00:("EnKbt_PostLimbDraw",),
0x80B34A40:("EnKbt_Draw",),
0x80B34F70:("func_80B34F70",),
0x80B34FB4:("func_80B34FB4",),
undefined_syms.txt
-5
View File
@@ -1370,11 +1370,6 @@ D_0600D828 = 0x0600D828;
D_06000C30 = 0x06000C30;
D_06001630 = 0x06001630;
// ovl_En_Kbt
D_06004274 = 0x06004274;
D_0600DEE8 = 0x0600DEE8;
// ovl_En_Kitan
D_06000CE8 = 0x06000CE8;