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_Kame (#536)

Browse Source 
* En_Kame

* PR
This commit is contained in:
Maide
2022-01-04 06:25:29 +00:00
committed by GitHub
parent 0a5bc25e8d
commit d90a15ba6e
5 changed files with 737 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spec
+1 -2
View File
@@ -3616,8 +3616,7 @@ beginseg
name "ovl_En_Kame"
compress
include "build/src/overlays/actors/ovl_En_Kame/z_en_kame.o"
include "build/data/ovl_En_Kame/ovl_En_Kame.data.o"
include "build/data/ovl_En_Kame/ovl_En_Kame.reloc.o"
include "build/src/overlays/actors/ovl_En_Kame/ovl_En_Kame_reloc.o"
endseg
beginseg
src/overlays/actors/ovl_En_Kame/z_en_kame.c
+714 -66
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Kame/z_en_kame.h
+21 -2
View File
@@ -9,9 +9,28 @@ typedef void (*EnKameActionFunc)(struct EnKame*, GlobalContext*);
typedef struct EnKame {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x154];
/* 0x0144 */ SkelAnime skelAnime1;
/* 0x0188 */ Vec3s jointTable1[13];
/* 0x01D6 */ Vec3s morphTable1[13];
/* 0x0224 */ SkelAnime skelAnime2;
/* 0x0268 */ Vec3s jointTable2[4];
/* 0x0280 */ Vec3s morphTable2[4];
/* 0x0298 */ EnKameActionFunc actionFunc;
/* 0x029C */ char unk_29C[0xF0];
/* 0x029C */ u8 unk_29C;
/* 0x029D */ u8 unk_29D;
/* 0x029E */ s16 unk_29E;
/* 0x02A0 */ s16 unk_2A0;
/* 0x02A2 */ s16 unk_2A2;
/* 0x02A4 */ s16 unk_2A4;
/* 0x02A6 */ s16 unk_2A6;
/* 0x02A8 */ f32 unk_2A8;
/* 0x02AC */ f32 unk_2AC;
/* 0x02B0 */ f32 unk_2B0;
/* 0x02B4 */ f32 unk_2B4;
/* 0x02B8 */ f32 unk_2B8;
/* 0x02BC */ Vec3f unk_2BC;
/* 0x02C8 */ Vec3f unk_2C8[10];
/* 0x0340 */ ColliderCylinder collider;
} EnKame; // size = 0x38C
extern const ActorInit En_Kame_InitVars;
tools/disasm/functions.txt
+1 -1
View File
@@ -12276,7 +12276,7 @@
0x80AD8A48:("func_80AD8A48",),
0x80AD8AF8:("func_80AD8AF8",),
0x80AD8BC0:("EnKame_Draw",),
0x80AD8CEC:("func_80AD8CEC",),
0x80AD8CEC:("Enkame_OverrideLimbDraw",),
0x80AD8D64:("func_80AD8D64",),
0x80AD9240:("func_80AD9240",),
0x80AD92FC:("func_80AD92FC",),
undefined_syms.txt
-17
View File
@@ -2663,23 +2663,6 @@ D_0600686C = 0x0600686C;
D_060081A4 = 0x060081A4;
D_06000214 = 0x06000214;
// ovl_En_Kame
D_060008B4 = 0x060008B4;
D_06000AF4 = 0x06000AF4;
D_06000B30 = 0x06000B30;
D_06001A50 = 0x06001A50;
D_06001C68 = 0x06001C68;
D_06002510 = 0x06002510;
D_060027D8 = 0x060027D8;
D_06002F88 = 0x06002F88;
D_060031DC = 0x060031DC;
D_060035EC = 0x060035EC;
D_060039C0 = 0x060039C0;
D_06004210 = 0x06004210;
D_06007C70 = 0x06007C70;
D_0600823C = 0x0600823C;
// ovl_En_Kanban
D_06000C30 = 0x06000C30;