diff --git a/asm/non_matchings/code/z_collision_check/func_8005C730.s b/asm/non_matchings/code/z_collision_check/func_8005C730.s deleted file mode 100644 index 1e9bba3c8c..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005C730.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_8005C730 -/* AD38D0 8005C730 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AD38D4 8005C734 AFBF0014 */ sw $ra, 0x14($sp) -/* AD38D8 8005C738 AFA40018 */ sw $a0, 0x18($sp) -/* AD38DC 8005C73C AFA5001C */ sw $a1, 0x1c($sp) -/* AD38E0 8005C740 0C016E4F */ jal func_8005B93C -/* AD38E4 8005C744 AFA60020 */ sw $a2, 0x20($sp) -/* AD38E8 8005C748 8FA5001C */ lw $a1, 0x1c($sp) -/* AD38EC 8005C74C 8FA60020 */ lw $a2, 0x20($sp) -/* AD38F0 8005C750 8FA40018 */ lw $a0, 0x18($sp) -/* AD38F4 8005C754 24A50028 */ addiu $a1, $a1, 0x28 -/* AD38F8 8005C758 0C017182 */ jal func_8005C608 -/* AD38FC 8005C75C 24C60018 */ addiu $a2, $a2, 0x18 -/* AD3900 8005C760 8FBF0014 */ lw $ra, 0x14($sp) -/* AD3904 8005C764 27BD0018 */ addiu $sp, $sp, 0x18 -/* AD3908 8005C768 24020001 */ li $v0, 1 -/* AD390C 8005C76C 03E00008 */ jr $ra -/* AD3910 8005C770 00000000 */ nop - diff --git a/include/z64actor.h b/include/z64actor.h index b7796377d5..516e8c4874 100644 --- a/include/z64actor.h +++ b/include/z64actor.h @@ -371,13 +371,18 @@ typedef struct { /* 0x00 */ Vec3f poly[3]; /* 0x24 */ Vec3f unitNormal; /* 0x30 */ float normalDist; -} ColliderTriItemDim; +} ColliderTriItemDim; //size = 0x34 typedef struct { /* 0x00 */ ColliderBody body; /* 0x28 */ ColliderTriItemDim dim; } ColliderTriItem; +typedef struct { + /* 0x00 */ ColliderBodyInit body; + /* 0x18 */ ColliderTriItemDim dim; +} ColliderTriItemInit; + typedef struct { /* 0x00 */ Actor* actor; diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c index b95dd7ad6d..c1fe0778f5 100644 --- a/src/code/z_collision_check.c +++ b/src/code/z_collision_check.c @@ -633,8 +633,13 @@ s32 func_8005C6F8(GlobalContext* globalCtx, ColliderTriItem* collision) { return 1; } +//SetInit ColliderTriItem +s32 func_8005C730(GlobalContext* globalCtx, ColliderTriItem* dest, ColliderTriItemInit* src) { + func_8005B93C(globalCtx, &dest->body, &src->body); + func_8005C608(globalCtx, &dest->dim, &src->dim); + return 1; +} -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005C730.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005C774.s")