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_Jgame_Tsn (#722)

Browse Source 
* En_Jgame_Tsn

* Merge
This commit is contained in:
Maide
2022-03-27 11:01:23 -03:00
committed by GitHub
parent 061ebc3b12
commit 145b2f6a61
6 changed files with 610 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spec
+1 -2
View File
@@ -5139,8 +5139,7 @@ beginseg
name "ovl_En_Jgame_Tsn"
compress
include "build/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.o"
include "build/data/ovl_En_Jgame_Tsn/ovl_En_Jgame_Tsn.data.o"
include "build/data/ovl_En_Jgame_Tsn/ovl_En_Jgame_Tsn.reloc.o"
include "build/src/overlays/actors/ovl_En_Jgame_Tsn/ovl_En_Jgame_Tsn_reloc.o"
endseg
beginseg
src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c
+580 -41
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.h
+25 -2
View File
@@ -2,16 +2,39 @@
#define Z_EN_JGAME_TSN_H
#include "global.h"
#include "objects/object_tsn/object_tsn.h"
struct EnJgameTsn;
typedef void (*EnJgameTsnActionFunc)(struct EnJgameTsn*, GlobalContext*);
#define ENJGAMETSN_GET_FF(thisx) ((thisx)->params & 0xFF)
typedef struct {
/* 0x00 */ Vec3s* points;
/* 0x04 */ s32 count;
} EnJgameTsnStruct; // size = 0x8
typedef struct EnJgameTsn {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x90];
/* 0x0144 */ ColliderCylinder collider;
/* 0x0190 */ SkelAnime skelAnime;
/* 0x01D4 */ EnJgameTsnActionFunc actionFunc;
/* 0x01D8 */ char unk_1D8[0x12C];
/* 0x01D8 */ EnJgameTsnStruct unk_1D8[4];
/* 0x01F8 */ EnJgameTsnStruct unk_1F8;
/* 0x0200 */ EnJgameTsnStruct unk_200;
/* 0x0208 */ u8* unk_208[4];
/* 0x0218 */ s32 unk_218;
/* 0x021C */ s32 unk_21C;
/* 0x0220 */ Vec3s jointTable[OBJECT_TSN_LIMB_MAX];
/* 0x0286 */ Vec3s morphTable[OBJECT_TSN_LIMB_MAX];
/* 0x02EC */ Vec3s unk_2EC;
/* 0x02F2 */ Vec3s unk_2F2;
/* 0x02F8 */ s16 unk_2F8;
/* 0x02FA */ s16 unk_2FA;
/* 0x02FC */ s16 unk_2FC;
/* 0x02FE */ s16 unk_2FE;
/* 0x0300 */ u16 unk_300;
} EnJgameTsn; // size = 0x304
extern const ActorInit En_Jgame_Tsn_InitVars;
src/overlays/actors/ovl_Obj_Jgame_Light/z_obj_jgame_light.h
+2
View File
@@ -5,6 +5,8 @@
struct ObjJgameLight;
#define OBJJGAMELIGHT_GET_7F(thisx) ((thisx)->params & 0x7F)
typedef struct ObjJgameLight {
/* 0x000 */ Actor actor;
/* 0x144 */ char unk_144[0x78];
tools/disasm/functions.txt
+2 -2
View File
@@ -16811,8 +16811,8 @@
0x80C14D14:("func_80C14D14",),
0x80C14D58:("func_80C14D58",),
0x80C14E08:("EnJgameTsn_Update",),
0x80C14E64:("func_80C14E64",),
0x80C14EE4:("func_80C14EE4",),
0x80C14E64:("EnJgamesTsn_OverrideLimbDraw",),
0x80C14EE4:("EnJgamesTsn_PostLimbDraw",),
0x80C14F1C:("EnJgameTsn_Draw",),
0x80C152F0:("ObjJgameLight_Init",),
0x80C1542C:("ObjJgameLight_Destroy",),
undefined_syms.txt
-5
View File
@@ -1355,11 +1355,6 @@ D_06012FC8 = 0x06012FC8;
D_06013928 = 0x06013928;
D_06016588 = 0x06016588;
// ovl_En_Jgame_Tsn
D_06008AB8 = 0x06008AB8;
D_060092FC = 0x060092FC;
// ovl_En_Js
D_06010880 = 0x06010880;