mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-07-07 05:55:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

adjusting sub98 init structs across actors

Browse Source
This commit is contained in:
fig02
2020-03-31 05:00:04 -04:00
parent daa7877c96
commit 340fbd5a40
9 changed files with 48 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+2 -2
View File
@@ -756,8 +756,8 @@ s32 Actor_CollisionCheck_SetOT(GlobalContext* globalCtx, SubGlobalContext11E60*
// ? func_80061C98(?);
// ? func_80061E48(?);
// ? func_80061E8C(?);
void func_80061ED4(SubActorStruct98* sub98, ActorDamageChart* damageChart, SubActor98Init* subActor98Init);
void func_80061EFC(SubActorStruct98* sub98, ActorDamageChart* damageChart, SubActor98Init* subActor98Init);
void func_80061ED4(SubActorStruct98* sub98, ActorDamageChart* damageChart, Sub98Init4* sub98Init);
void func_80061EFC(SubActorStruct98* sub98, ActorDamageChart* damageChart, Sub98Init4* sub98Init);
// ? func_80061F64(?);
// ? func_800622E4(?);
// ? func_80062530(?);
include/z64actor.h
+15 -7
View File
@@ -80,13 +80,6 @@ typedef struct {
} attack[32];
} ActorDamageChart;
typedef struct {
/* 0x00 */ u8 health;
/* 0x02 */ s16 unk_02;
/* 0x04 */ s16 unk_04;
/* 0x06 */ u8 mass;
} SubActor98Init;
typedef struct {
/* 0x00 */ ActorDamageChart* damageChart; // For actors which contain a damage chart (example: Stalfos)...
/* 0x04 */ Vec3f displacement; // Amount to correct velocity (0x5C) by when colliding into a body
@@ -182,6 +175,21 @@ typedef struct Actor {
/* From here on, the structure and size varies for each actor */
} Actor; // size = 0x14C
typedef struct {
/* 0x00 */ u8 health;
/* 0x02 */ s16 unk_02;
/* 0x04 */ s16 unk_04;
/* 0x06 */ u8 mass;
} Sub98Init4;
typedef struct {
/* 0x00 */ u8 health;
/* 0x02 */ s16 unk_10;
/* 0x04 */ s16 unk_12;
/* 0x06 */ u16 unk_14;
/* 0x08 */ u8 mass;
} Sub98Init5;
typedef enum {
COLTYPE_CYLINDER = 1,
COLTYPE_CYLINDER_GROUP = 0,