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

Obj_Mine

Browse Source
This commit is contained in:
Maide
2021-09-28 21:01:36 +01:00
parent 4796e6f61d
commit 831fa5485a
4 changed files with 1061 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+1 -1
View File
@@ -3284,7 +3284,7 @@ void func_80179B34(float fParm1, f32 fParm2, f32 fParm5, f32 fParm6, f32 param_5
// void func_80179D74(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6, UNK_TYPE4 param_7, UNK_TYPE4 param_8, UNK_TYPE4 param_9, UNK_TYPE4 param_10);
void Math3D_ScaleAndAdd(Vec3f* a, Vec3f* b, f32 scale, Vec3f* dst);
void Math3D_Lerp(Vec3f* a, Vec3f* b, f32 t, Vec3f* dst);
s32 Math3D_Parallel(Vec3f* a, Vec3f* b);
f32 Math3D_Parallel(Vec3f* a, Vec3f* b);
s32 Math3D_AngleBetweenVectors(Vec3f* a, Vec3f* b, f32* angle);
void func_80179F64(Vec3f* param_1, Vec3f* param_2, Vec3f* param_3);
s32 Math3D_XZBoundCheck(f32 xMin, f32 xMax, f32 zMin, f32 zMax, f32 x, f32 z);
spec
+4 -2
View File
@@ -3229,9 +3229,11 @@ beginseg
name "ovl_Obj_Mine"
compress
include "build/src/overlays/actors/ovl_Obj_Mine/z_obj_mine.o"
include "build/data/ovl_Obj_Mine/ovl_Obj_Mine.data.o"
include "build/data/ovl_Obj_Mine/ovl_Obj_Mine.bss.o"
#ifdef NON_MATCHING
include "build/src/overlays/actors/ovl_Obj_Mine/ovl_Obj_Mine_reloc.o"
#else
include "build/data/ovl_Obj_Mine/ovl_Obj_Mine.reloc.o"
#endif
endseg
beginseg
src/overlays/actors/ovl_Obj_Mine/z_obj_mine.c
+998 -60
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_Obj_Mine/z_obj_mine.h
+58 -2
View File
@@ -7,11 +7,67 @@ struct ObjMine;
typedef void (*ObjMineActionFunc)(struct ObjMine*, GlobalContext*);
// definitely fake
typedef struct {
char unk_00[0x8];
Vec3f unk_08;
char unk_14[0xC];
Vec3f unk_20;
char unk_2C[0x1C];
} NextUnkStruct; // size = 0x48
// maybe fake
typedef struct {
/* 0x00 */ s16 unk_00;
/* 0x02 */ s16 unk_02;
} ObjMineUnkStruct3;
typedef struct {
/* 0x00 */ Vec3f unk_00;
/* 0x0C */ Vec3f unk_0C;
/* 0x18 */ Vec3f unk_18;
///* 0x24 */ char unk_24[0x3C];
/* 0x24 */ Vec3f unk_24;
/* 0x30 */ f32 unk_30;
/* 0x34 */ f32 unk_34;
/* 0x38 */ f32 unk_38;
/* 0x3C */ f32 unk_3C;
/* 0x40 */ f32 unk_40;
/* 0x44 */ f32 unk_44;
/* 0x48 */ f32 unk_48;
/* 0x4C */ s16 unk_4C;
/* 0x50 */ f32 unk_50;
/* 0x54 */ s16 unk_54;
/* 0x58 */ f32 unk_58;
/* 0x5C */ f32 unk_5C;
/* 0x60 */ ObjMineUnkStruct3 unk_60[1];
} ObjMineUnkStruct; // size = ?? 0x44??? 48 array???
// probably fake
typedef struct {
/* 0x00 */ Vec3f unk_00;
/* 0x0c */ Vec3f unk_0C;
///* 0x10 */ f32 unk_10;
///* 0x14 */ char unk_14[0x4];
/* 0x18 */ Vec3f unk_18;
///* 0x1C */ char unk_1C[0x4];
///* 0x20 */ f32 unk_20;
/* 0x24 */ Vec3f unk_24;
/* 0x30 */ Vec3f unk_30;
/* 0x3C */ Vec3f unk_3C;
} ObjMineUnkStruct2; // size = 0x48???
typedef struct ObjMine {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x60];
/* 0x0144 */ ColliderJntSph collider;
/* 0x0164 */ ColliderJntSphElement colliderElements[1];
/* 0x01A4 */ ObjMineActionFunc actionFunc;
/* 0x01A8 */ char unk_1A8[0x120C];
/* 0x01A8 */ f32 unk_1A8;
/* 0x01AC */ s32 unk_1AC;
/* 0x01B0 */ s32 unk_1B0;
/* 0x01B4 */ Vec3s* unk_1B4;
/* 0x01B8 */ ObjMineUnkStruct unk_1B8; // array??
/* 0x021C */ char unk_21C[0x1198];
} ObjMine; // size = 0x13B4
extern const ActorInit Obj_Mine_InitVars;