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

Update structs.h because Ghidra can handle bitfields now

Browse Source
This commit is contained in:
rozlette
2019-11-13 22:14:03 -06:00
parent b4b98af631
commit b1938991fa
10 changed files with 47 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+12 -13
View File
@@ -7,7 +7,6 @@
#include <guint.h>
#include <unk.h>
#include <structs.h>
#include <structs_bitfields.h>
#include <stdlib.h>
#include <xstdio.h>
@@ -1836,18 +1835,18 @@ UNK_RET Lib_PushAwayXZVec3f(z_Vector3f* a0, z_Vector3f* a1, f32 a2); // func_800
f32 Lib_DistanceYVec3f(z_Vector3f* a0, z_Vector3f* a1); // func_800FFA4C
UNK_TYPE Lib_YawVec3f(z_Vector3f* a0, z_Vector3f* a1); // func_800FFA60
UNK_TYPE Lib_PitchVec3f(z_Vector3f* a0, z_Vector3f* a1); // func_800FFA94
void Lib_ApplyActorInitVars(z_Actor*, z_ActorCompInitEntry*); // func_800FFADC
UNK_RET Lib_ApplyActorInitVarByte1(u8* a0, z_ActorCompInitEntry* a1); // func_800FFB54
UNK_RET Lib_ApplyActorInitVarByte2(u8* a0, z_ActorCompInitEntry* a1); // func_800FFB70
UNK_RET Lib_ApplyActorInitVarShort1(u8* a0, z_ActorCompInitEntry* a1); // func_800FFB8C
UNK_RET Lib_ApplyActorInitVarShort2(u8* a0, z_ActorCompInitEntry* a1); // func_800FFBA8
UNK_RET Lib_ApplyActorInitVarWord1(u8* a0, z_ActorCompInitEntry* a1); // func_800FFBC4
UNK_RET Lib_ApplyActorInitVarWord2(u8* a0, z_ActorCompInitEntry* a1); // func_800FFBE0
UNK_RET Lib_ApplyActorInitVarFloat(u8* a0, z_ActorCompInitEntry* a1); // func_800FFBFC
UNK_RET Lib_ApplyActorInitVarFloat1000th(u8* a0, z_ActorCompInitEntry* a1); // func_800FFC20
UNK_RET Lib_ApplyActorInitVarVector3f(u8* a0, z_ActorCompInitEntry* a1); // func_800FFC50
UNK_RET Lib_ApplyActorInitVarVector3f1000th(u8* a0, z_ActorCompInitEntry* a1); // func_800FFC7C
UNK_RET Lib_ApplyActorInitVarVector3s(u8* a0, z_ActorCompInitEntry* a1); // func_800FFCB4
void Lib_ApplyActorInitVars(z_Actor*, z_ActorInitVar*); // func_800FFADC
UNK_RET Lib_ApplyActorInitVarByte1(u8* a0, z_ActorInitVar* a1); // func_800FFB54
UNK_RET Lib_ApplyActorInitVarByte2(u8* a0, z_ActorInitVar* a1); // func_800FFB70
UNK_RET Lib_ApplyActorInitVarShort1(u8* a0, z_ActorInitVar* a1); // func_800FFB8C
UNK_RET Lib_ApplyActorInitVarShort2(u8* a0, z_ActorInitVar* a1); // func_800FFBA8
UNK_RET Lib_ApplyActorInitVarWord1(u8* a0, z_ActorInitVar* a1); // func_800FFBC4
UNK_RET Lib_ApplyActorInitVarWord2(u8* a0, z_ActorInitVar* a1); // func_800FFBE0
UNK_RET Lib_ApplyActorInitVarFloat(u8* a0, z_ActorInitVar* a1); // func_800FFBFC
UNK_RET Lib_ApplyActorInitVarFloat1000th(u8* a0, z_ActorInitVar* a1); // func_800FFC20
UNK_RET Lib_ApplyActorInitVarVector3f(u8* a0, z_ActorInitVar* a1); // func_800FFC50
UNK_RET Lib_ApplyActorInitVarVector3f1000th(u8* a0, z_ActorInitVar* a1); // func_800FFC7C
UNK_RET Lib_ApplyActorInitVarVector3s(u8* a0, z_ActorInitVar* a1); // func_800FFCB4
f32 func_800FFCD8(f32*, f32, f32, f32, f32); // func_800FFCD8
UNK_RET Lib_ScaleMax_f(f32* a0, f32 a1, f32 a2, f32 a3); // func_800FFDF8
UNK_RET Lib_Scale_f(f32* a0, f32 a1, f32 a2); // func_800FFE68
include/structs.h
+4 -2
View File
@@ -178,8 +178,10 @@ typedef struct {
} z_ActorEnTest20C;
typedef struct {
/* 0x0 */ u16 info; // bitfield: 0-10: offset, 11-14: type, 15: more
/* 0x2 */ s16 value;
/* 0x0 */ u32 cont : 1;
/* 0x0 */ u32 type : 4;
/* 0x0 */ u32 offset : 11;
/* 0x2 */ s32 value : 16;
} z_ActorInitVar;
typedef struct {
include/structs_bitfields.h
-13
View File
@@ -1,13 +0,0 @@
#ifndef _STRUCTS_BITFIELDS_H_
#define _STRUCTS_BITFIELDS_H_
#include <PR/ultratypes.h>
typedef struct {
u32 cont : 1;
u32 type : 4;
u32 offset : 11;
s32 value : 16;
} z_ActorCompInitEntry;
#endif
include/variables.h
+2 -3
View File
@@ -7,7 +7,6 @@
#include <guint.h>
#include <unk.h>
#include <structs.h>
#include <structs_bitfields.h>
#include <stdlib.h>
#include <xstdio.h>
@@ -16027,7 +16026,7 @@ extern f32 D_80ACB650; // D_80ACB650
//extern UNK_TYPE D_80BD52FC;
extern z_ActorInitData bgIkanaRayInitVar; // D_80BD55D0
extern UNK_TYPE D_80BD55F0; // D_80BD55F0
extern z_ActorCompInitEntry bgIkanaRayCompInit[]; // D_80BD561C
extern z_ActorInitVar bgIkanaRayCompInit[]; // D_80BD561C
extern UNK_TYPE D_80BD562C; // D_80BD562C
//extern UNK_TYPE D_80BD5CF0;
//extern UNK_TYPE D_80BD5D10;
@@ -16839,6 +16838,6 @@ extern UNK_PTR D_800980D0_;
extern UNK_TYPE D_80099AD0_;
extern UNK_TYPE D_8009A670_;
extern UNK_TYPE D_8009B140_;
extern (*D_801BE960[12])(u8*, z_ActorCompInitEntry*);
extern (*D_801BE960[12])(u8*, z_ActorInitVar*);
#endif