summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authoremilybrooks <emilybrooksemilybrooks@gmail.com>2023-09-11 11:02:09 -0700
committerGitHub <noreply@github.com>2023-09-11 11:02:09 -0700
commit2b9ed4a58d80024d0d9b7232e92ebf9ef6160bda (patch)
tree2e9d674bde9ee6c430faf6595e336731210df8c8 /include
parent1b465cfe8b3f228faa08fba8d58a8d3be6e82d06 (diff)
ac_toudai matched 12 functions, 2 non-equivalent (#65)
* first commit * matched the gSegments thing * more progress * matched aTOU_actor_dt * matched aTOU_set_bgOffset and imported data * named everything * cleanup, work on draw functions * cleanup * review * Revert "review" This reverts commit 229788b68359cb9ff3c372639c767e4e08011d96. * format * removed change to ac_structure.h * temp changing data symbols * format * review * fix conflicts * fix season u32 thing
Diffstat (limited to 'include')
-rw-r--r--include/c_keyframe.h2
-rw-r--r--include/m_collision_bg.h12
-rw-r--r--include/m_common_data.h16
-rw-r--r--include/m_lib.h2
-rw-r--r--include/m_rcp.h (renamed from include/6E0F50.h)6
-rw-r--r--include/unknown_structs.h8
6 files changed, 38 insertions, 8 deletions
diff --git a/include/c_keyframe.h b/include/c_keyframe.h
index 6193640..d375efa 100644
--- a/include/c_keyframe.h
+++ b/include/c_keyframe.h
@@ -99,6 +99,8 @@ s16 cKF_KeyCalc(s16 startIndex, s16 sequenceLength, Keyframe* dataSource, f32 cu
void cKF_SkeletonInfo_subRotInterpolation(f32 t, s16* out, s16 jointRotation, s16 morphRotation);
void cKF_SkeletonInfo_morphST(s16* joint, s16* morph, f32 t);
void cKF_SkeletonInfo_R_zeroClear(SkeletonInfoR* skeletonInfo);
+void cKF_SkeletonInfo_R_ct(SkeletonInfoR* skeletonInfo, BaseSkeletonR* skeleton, BaseAnimationR* animation,
+ Vec3s* jointTable, Vec3s* morphTable);
void cKF_SkeletonInfo_R_dt(SkeletonInfoR* skeletonInfo);
void cKF_SkeletonInfo_R_init_standard_stop(SkeletonInfoR* skeletonInfo, BaseAnimationR* animation, Vec3s* diffRotTable);
void cKF_SkeletonInfo_R_init_standard_stop_speedset(SkeletonInfoR* skeletonInfo, BaseAnimationR* animation,
diff --git a/include/m_collision_bg.h b/include/m_collision_bg.h
index a677c0d..d68d2c9 100644
--- a/include/m_collision_bg.h
+++ b/include/m_collision_bg.h
@@ -4,6 +4,16 @@
#include "ultra64.h"
#include "z64math.h"
+typedef struct mCoBG_OffsetTable {
+ /* 0x00 */ u8 unitAttribute;
+ /* 0x01 */ s8 crOffset;
+ /* 0x02 */ s8 luOffset;
+ /* 0x03 */ s8 ldOffset;
+ /* 0x04 */ s8 rdOffset;
+ /* 0x05 */ s8 ruOffset;
+ /* 0x06 */ s8 slateSwitch;
+} mCoBG_OffsetTable; // size = 0x7
+
// void func_80067430_jp();
// void func_800674B0_jp();
// void func_800674D8_jp();
@@ -215,7 +225,7 @@ s32 mCoBG_SearchWaterLimitDistN(UNK_TYPE* arg0, Vec3f arg1, s16 arg4, f32 arg5,
// void func_800739FC_jp();
// void func_80073C38_jp();
// void func_80073CC0_jp();
-// void mCoBG_SetPluss5PointOffset_file();
+void mCoBG_SetPluss5PointOffset_file(Vec3f pos, mCoBG_OffsetTable offsetData, char* file, s32 line);
// void func_80074090_jp();
// void func_80074174_jp();
// void func_800741DC_jp();
diff --git a/include/m_common_data.h b/include/m_common_data.h
index c3ef8d1..a53d6d2 100644
--- a/include/m_common_data.h
+++ b/include/m_common_data.h
@@ -84,11 +84,12 @@ typedef struct CommonData_unk_10078 {
typedef UNK_RET (*CommonData_unk_10098_unk_4)(struct ActorOverlay*, size_t);
typedef UNK_RET (*CommonData_unk_10098_unk_8)(void);
-
// TODO: figure out if this is a generic memory allocation or if it is Actor specific
typedef UNK_PTR (*CommonData_unk_10098_unk_0C)(void);
-
typedef UNK_RET (*CommonData_unk_10098_unk_10)(struct Actor*);
+typedef UNK_RET (*CommonData_unk_10098_unk_A8)(UNK_PTR, UNK_TYPE, u16 name, Actor* actor);
+typedef UNK_RET (*CommonData_unk_10098_unk_AC)(u16);
+typedef UNK_RET (*CommonData_unk_10098_unk_450)(u16);
typedef struct CommonData_unk_10098 {
/* 0x00 */ UNK_TYPE1 unk_00[0x4];
@@ -96,7 +97,16 @@ typedef struct CommonData_unk_10098 {
/* 0x08 */ CommonData_unk_10098_unk_8 unk_08;
/* 0x0C */ CommonData_unk_10098_unk_0C unk_0C;
/* 0x10 */ CommonData_unk_10098_unk_10 unk_10;
-} CommonData_unk_10098; // size >= 0x10
+ /* 0x014 */ UNK_TYPE1 unk_14[0x94];
+ /* 0x0A8 */ CommonData_unk_10098_unk_A8 unk_A8; // unload object
+ /* 0x0AC */ CommonData_unk_10098_unk_AC unk_AC; // load object
+ /* 0x0B0 */ UNK_TYPE unk_B0;
+ /* 0x0B4 */ UNK_TYPE1 pad[0x450-0xb4];
+ /* 0x450 */ CommonData_unk_10098_unk_450 unk_450; // load palette
+ /* 0x454 */ UNK_TYPE unk_454;
+ /* 0x458 */ UNK_TYPE1 pad2[0x86C-0x458];
+ /* 0x86C */ UNK_TYPE unk_86C;
+} CommonData_unk_10098; // size >= 0x870
typedef struct mPr_mother_mail_info_c {
/* 0x00 */ UNK_TYPE1 unk_00[0xE];
diff --git a/include/m_lib.h b/include/m_lib.h
index 2478201..1fdaecd 100644
--- a/include/m_lib.h
+++ b/include/m_lib.h
@@ -48,7 +48,7 @@ s16 search_position_angleY(Vec3f* arg0, Vec3f* arg1);
// void ValueSet__xyz_t();
// void ValueSet__xyz_t_x1000();
// void ValueSet__s_xyz();
-// void add_calc();
+f32 add_calc(f32* pValue, f32 target, f32 fraction, f32 maxStep, f32 minStep);
// void add_calc2();
// void add_calc0();
// void add_calc_a();
diff --git a/include/6E0F50.h b/include/m_rcp.h
index bd456a5..da77c5c 100644
--- a/include/6E0F50.h
+++ b/include/m_rcp.h
@@ -17,9 +17,9 @@ Gfx* gfx_set_fog_nosync(Gfx* gfx, u8 arg1, u8 arg2, u8 arg3, s32 arg4, s16 arg5,
// void func_800BD4E8_jp();
// void _texture_z_light_fog_prim_shadow();
// void func_800BD538_jp();
-// void func_800BD598_jp();
-// void func_800BD5C0_jp();
-// void func_800BD5E8_jp();
+void func_800BD598_jp(Gfx* gfx);
+void func_800BD5C0_jp(struct GraphicsContext* gfxCtx);
+void func_800BD5E8_jp(Gfx* gfx);
// void func_800BD648_jp();
// void func_800BD68C_jp();
// void func_800BD6D0_jp();
diff --git a/include/unknown_structs.h b/include/unknown_structs.h
index d3de487..59a8da2 100644
--- a/include/unknown_structs.h
+++ b/include/unknown_structs.h
@@ -41,6 +41,14 @@ typedef struct Game_Play_unk_0110 {
/* 0x1818 */ void* unk_1818;
} Game_Play_unk_0110; // size >= 0x181C
+typedef struct ShadowData {
+ /* 0x00 */ u32 numberOfVertices;
+ /* 0x04 */ u8* vertexFixFlagTable;
+ /* 0x08 */ f32 size;
+ /* 0x0C */ Vtx* vertices;
+ /* 0x10 */ Gfx* model;
+} ShadowData; // size = 0x14
+
typedef struct struct_809AEFA4 {
/* 0x00 */ UNK_PTR unk_00;
/* 0x04 */ UNK_PTR unk_04;