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_Insect (#652)

Browse Source 
* En_Insect

* WHO DIDN'T FORMAT?!

* PR
This commit is contained in:
Maide
2022-02-14 01:32:56 +00:00
committed by GitHub
parent 18e714e098
commit 7565f9f052
4 changed files with 452 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spec
+1 -2
View File
@@ -1359,8 +1359,7 @@ beginseg
name "ovl_En_Insect"
compress
include "build/src/overlays/actors/ovl_En_Insect/z_en_insect.o"
include "build/data/ovl_En_Insect/ovl_En_Insect.data.o"
include "build/data/ovl_En_Insect/ovl_En_Insect.reloc.o"
include "build/src/overlays/actors/ovl_En_Insect/ovl_En_Insect_reloc.o"
endseg
beginseg
src/overlays/actors/ovl_En_Insect/z_en_insect.c
+436 -36
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Insect/z_en_insect.h
+13 -2
View File
@@ -7,11 +7,22 @@ struct EnInsect;
typedef void (*EnInsectActionFunc)(struct EnInsect*, GlobalContext*);
#define ENINSECT_GET_1(thisx) ((thisx)->params & 1)
typedef struct EnInsect {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x1C4];
/* 0x0144 */ ColliderJntSph collider;
/* 0x0164 */ ColliderJntSphElement colliderElements[1];
/* 0x01A4 */ SkelAnime skelAnime;
/* 0x01E8 */ Vec3s jointTable[24];
/* 0x0278 */ Vec3s morphTable[24];
/* 0x0308 */ EnInsectActionFunc actionFunc;
/* 0x030C */ char unk_30C[0xC];
/* 0x030C */ u16 unk_30C;
/* 0x030E */ s16 unk_30E;
/* 0x0310 */ s16 unk_310;
/* 0x0312 */ s16 unk_312;
/* 0x0314 */ s16 unk_314;
/* 0x0316 */ s16 unk_316;
} EnInsect; // size = 0x318
extern const ActorInit En_Insect_InitVars;
tools/disasm/functions.txt
+2 -2
View File
@@ -6912,8 +6912,8 @@
0x8091A5A0:("func_8091A5A0",),
0x8091A7B0:("func_8091A7B0",),
0x8091A8A0:("func_8091A8A0",),
0x8091A8C4:("func_8091A8C4",),
0x8091A8F4:("func_8091A8F4",),
0x8091A8C4:("EnInsect_XZDistanceSquared",),
0x8091A8F4:("EnInsect_InBottleRange",),
0x8091A9E4:("func_8091A9E4",),
0x8091AA78:("EnInsect_Init",),
0x8091AC4C:("EnInsect_Destroy",),