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_Ja (#581)

Browse Source 
* En_Ja

* Fix a problem

* Merge

* Merge

* TrasnformDraw

* Need static data

* PR
This commit is contained in:
Maide
2022-02-19 19:04:34 +00:00
committed by GitHub
parent 926b575d13
commit 3086543498
6 changed files with 749 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/xml/objects/object_boj.xml
+3 -1
View File
@@ -20,7 +20,9 @@
<Texture Name="object_boj_Tex_006030" OutName="tex_006030" Format="ci8" Width="8" Height="8" Offset="0x6030" />
<Texture Name="object_boj_Tex_006070" OutName="tex_006070" Format="ci8" Width="32" Height="16" Offset="0x6070" />
<Texture Name="object_boj_Tex_006270" OutName="tex_006270" Format="ci8" Width="8" Height="8" Offset="0x6270" />
<!-- <Blob Name="object_boj_Blob_0062B0" Size="0x300" Offset="0x62B0" /> -->
<Texture Name="object_boj_Tex_0062B0" OutName="tex_0062B0" Format="ci8" Width="16" Height="16" Offset="0x62B0" />
<Texture Name="object_boj_Tex_0063B0" OutName="tex_0063B0" Format="ci8" Width="16" Height="16" Offset="0x63B0" />
<Texture Name="object_boj_Tex_0064B0" OutName="tex_0064B0" Format="ci8" Width="16" Height="16" Offset="0x64B0" />
<Texture Name="object_boj_Tex_0065B0" OutName="tex_0065B0" Format="ci8" Width="8" Height="8" Offset="0x65B0" />
<Texture Name="object_boj_Tex_0065F0" OutName="tex_0065F0" Format="i8" Width="16" Height="16" Offset="0x65F0" />
<Texture Name="object_boj_Tex_0066F0" OutName="tex_0066F0" Format="ci8" Width="8" Height="8" Offset="0x66F0" />
spec
+1 -2
View File
@@ -4625,8 +4625,7 @@ beginseg
name "ovl_En_Ja"
compress
include "build/src/overlays/actors/ovl_En_Ja/z_en_ja.o"
include "build/data/ovl_En_Ja/ovl_En_Ja.data.o"
include "build/data/ovl_En_Ja/ovl_En_Ja.reloc.o"
include "build/src/overlays/actors/ovl_En_Ja/ovl_En_Ja_reloc.o"
endseg
beginseg
src/overlays/actors/ovl_En_Ja/z_en_ja.c
+694 -44
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Ja/z_en_ja.h
+48 -2
View File
@@ -7,11 +7,57 @@ struct EnJa;
typedef void (*EnJaActionFunc)(struct EnJa*, GlobalContext*);
#define ENJA_GET_3(thisx) (((thisx)->params & 3) & 0xFF)
typedef struct {
/* 0x00 */ Vec3f unk_00;
/* 0x0C */ s16 unk_0C;
/* 0x0E */ s16 unk_0E;
} EnJaStruct; // size = 0x10
typedef struct {
/* 0x00 */ u8 unk_00;
/* 0x04 */ s32 unk_04;
/* 0x08 */ Player* player;
} EnJaStruct2; // size = 0x10
typedef struct EnJa {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x44];
/* 0x0144 */ SkelAnime skelAnime;
/* 0x0188 */ EnJaActionFunc actionFunc;
/* 0x018C */ char unk_18C[0x1EC];
/* 0x018C */ ColliderCylinder collider;
/* 0x01D8 */ EnJaStruct2 unk_1D8;
/* 0x01E4 */ Vec3s unk_1E4;
/* 0x01EC */ Vec3f unk_1EC;
/* 0x01F8 */ Vec3f unk_1F8;
/* 0x0204 */ Vec3f unk_204;
/* 0x0210 */ Vec3f unk_210;
/* 0x021C */ Vec3f unk_21C;
/* 0x0228 */ Vec3f unk_228;
/* 0x0234 */ EnJaStruct unk_234[4];
/* 0x0274 */ Vec3s unk_274;
/* 0x027A */ Vec3s unk_27A;
/* 0x0280 */ Vec3s jointTable[16];
/* 0x02E0 */ Vec3s morphTable[16];
/* 0x0340 */ u16 unk_340;
/* 0x0344 */ f32 unk_344;
/* 0x0348 */ f32 unk_348;
/* 0x034C */ f32 unk_34C;
/* 0x0350 */ UNK_TYPE1 unk350[0x4];
/* 0x0354 */ s16 unk_354;
/* 0x0356 */ s16 unk_356;
/* 0x0358 */ s16 unk_358;
/* 0x035A */ s16 unk_35A;
/* 0x035C */ s16 unk_35C;
/* 0x035E */ s16 unk_35E;
/* 0x0360 */ s16 unk_360;
/* 0x0362 */ s16 unk_362;
/* 0x0364 */ s16 unk_364;
/* 0x0366 */ s16 unk_366;
/* 0x0368 */ void* unk_368;
/* 0x036C */ s32 unk_36C;
/* 0x0370 */ UNK_TYPE1 unk370[4];
/* 0x0374 */ s32 unk_374;
} EnJa; // size = 0x378
extern const ActorInit En_Ja_InitVars;
tools/disasm/functions.txt
+3 -3
View File
@@ -15503,9 +15503,9 @@
0x80BC2388:("EnJa_Init",),
0x80BC2498:("EnJa_Destroy",),
0x80BC24C4:("EnJa_Update",),
0x80BC25E0:("func_80BC25E0",),
0x80BC2620:("func_80BC2620",),
0x80BC2B30:("func_80BC2B30",),
0x80BC25E0:("EnJa_OverrideLimbDraw",),
0x80BC2620:("EnJa_PostLimbDraw",),
0x80BC2B30:("EnJa_TransformDraw",),
0x80BC2CE4:("EnJa_Draw",),
0x80BC2EA4:("func_80BC2EA4",),
0x80BC3154:("func_80BC3154",),
undefined_syms.txt
-6
View File
@@ -1535,12 +1535,6 @@ D_06012FC8 = 0x06012FC8;
D_06013928 = 0x06013928;
D_06016588 = 0x06016588;
// ovl_En_Ja
D_0600BA30 = 0x0600BA30;
D_0600BCC8 = 0x0600BCC8;
D_0600C240 = 0x0600C240;
// ovl_En_Jgame_Tsn
D_06008AB8 = 0x06008AB8;