diff --git a/asm/non_matchings/code/z_collision_check/func_8005BA84.s b/asm/non_matchings/code/z_collision_check/func_8005BA84.s deleted file mode 100644 index cc22a3408c..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005BA84.s +++ /dev/null @@ -1,28 +0,0 @@ -.late_rodata -glabel D_8013ACF0 - .float 0.01 - -.text -glabel func_8005BA84 -/* AD2C24 8005BA84 AFA40000 */ sw $a0, ($sp) -/* AD2C28 8005BA88 90CE0000 */ lbu $t6, ($a2) -/* AD2C2C 8005BA8C 3C018014 */ lui $at, %hi(D_8013ACF0) -/* AD2C30 8005BA90 24020001 */ li $v0, 1 -/* AD2C34 8005BA94 A0AE0014 */ sb $t6, 0x14($a1) -/* AD2C38 8005BA98 88D80002 */ lwl $t8, 2($a2) -/* AD2C3C 8005BA9C 98D80005 */ lwr $t8, 5($a2) -/* AD2C40 8005BAA0 A8B80000 */ swl $t8, ($a1) -/* AD2C44 8005BAA4 B8B80003 */ swr $t8, 3($a1) -/* AD2C48 8005BAA8 88CF0006 */ lwl $t7, 6($a2) -/* AD2C4C 8005BAAC 98CF0009 */ lwr $t7, 9($a2) -/* AD2C50 8005BAB0 A8AF0004 */ swl $t7, 4($a1) -/* AD2C54 8005BAB4 B8AF0007 */ swr $t7, 7($a1) -/* AD2C58 8005BAB8 84D9000A */ lh $t9, 0xa($a2) -/* AD2C5C 8005BABC C428ACF0 */ lwc1 $f8, %lo(D_8013ACF0)($at) -/* AD2C60 8005BAC0 44992000 */ mtc1 $t9, $f4 -/* AD2C64 8005BAC4 00000000 */ nop -/* AD2C68 8005BAC8 468021A0 */ cvt.s.w $f6, $f4 -/* AD2C6C 8005BACC 46083282 */ mul.s $f10, $f6, $f8 -/* AD2C70 8005BAD0 03E00008 */ jr $ra -/* AD2C74 8005BAD4 E4AA0010 */ swc1 $f10, 0x10($a1) - diff --git a/asm/non_matchings/code/z_collision_check/func_8005C328.s b/asm/non_matchings/code/z_collision_check/func_8005C328.s deleted file mode 100644 index 595f2a8b6f..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005C328.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_8005C328 -/* AD34C8 8005C328 AFA40000 */ sw $a0, ($sp) -/* AD34CC 8005C32C 88CF0000 */ lwl $t7, ($a2) -/* AD34D0 8005C330 98CF0003 */ lwr $t7, 3($a2) -/* AD34D4 8005C334 24020001 */ li $v0, 1 -/* AD34D8 8005C338 A8AF0000 */ swl $t7, ($a1) -/* AD34DC 8005C33C B8AF0003 */ swr $t7, 3($a1) -/* AD34E0 8005C340 88CE0004 */ lwl $t6, 4($a2) -/* AD34E4 8005C344 98CE0007 */ lwr $t6, 7($a2) -/* AD34E8 8005C348 A8AE0004 */ swl $t6, 4($a1) -/* AD34EC 8005C34C B8AE0007 */ swr $t6, 7($a1) -/* AD34F0 8005C350 88CF0008 */ lwl $t7, 8($a2) -/* AD34F4 8005C354 98CF000B */ lwr $t7, 0xb($a2) -/* AD34F8 8005C358 A8AF0008 */ swl $t7, 8($a1) -/* AD34FC 8005C35C 03E00008 */ jr $ra -/* AD3500 8005C360 B8AF000B */ swr $t7, 0xb($a1) - diff --git a/asm/non_matchings/code/z_collision_check/func_8005C540.s b/asm/non_matchings/code/z_collision_check/func_8005C540.s deleted file mode 100644 index 525aef245e..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005C540.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_8005C540 -/* AD36E0 8005C540 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AD36E4 8005C544 AFBF0014 */ sw $ra, 0x14($sp) -/* AD36E8 8005C548 AFA40018 */ sw $a0, 0x18($sp) -/* AD36EC 8005C54C 0C016DE1 */ jal func_8005B784 -/* AD36F0 8005C550 AFA5001C */ sw $a1, 0x1c($sp) -/* AD36F4 8005C554 8FA5001C */ lw $a1, 0x1c($sp) -/* AD36F8 8005C558 8FA40018 */ lw $a0, 0x18($sp) -/* AD36FC 8005C55C 0C016E7A */ jal func_8005B9E8 -/* AD3700 8005C560 24A50018 */ addiu $a1, $a1, 0x18 -/* AD3704 8005C564 8FBF0014 */ lw $ra, 0x14($sp) -/* AD3708 8005C568 27BD0018 */ addiu $sp, $sp, 0x18 -/* AD370C 8005C56C 24020001 */ li $v0, 1 -/* AD3710 8005C570 03E00008 */ jr $ra -/* AD3714 8005C574 00000000 */ nop diff --git a/include/z64actor.h b/include/z64actor.h index 70a250709a..4852755bb5 100644 --- a/include/z64actor.h +++ b/include/z64actor.h @@ -325,17 +325,25 @@ typedef struct { } ColliderCylinderInit_Actor; // size = 0x2C typedef struct { - Vec3s unk_00; - s32 unk_08[2]; + s16 unk_00; + s16 unk_02; + s16 unk_04; + s16 unk_06; +} ColliderJntSphDimUnk; //size = 0x08 + +typedef struct { + ColliderJntSphDimUnk unk_00; + Vec3s pos; + s16 radius; float unk_10; s8 unk_14; -} ColliderJntSphItemDim; //size 0x18 +} ColliderJntSphItemDim; //size = 0x18 typedef struct { u8 unk_00; - Vec3s unk_02; + ColliderJntSphDimUnk unk_02; s16 unk_0A; -} ColliderJntSphItemDimInit; //size 0x0C +} ColliderJntSphItemDimInit; //size = 0x0C typedef struct { /* 0x00 */ ColliderBody body; diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c index 001c5d1f6a..bfe9daa701 100644 --- a/src/code/z_collision_check.c +++ b/src/code/z_collision_check.c @@ -211,16 +211,12 @@ s32 func_8005BA74(GlobalContext* globalCtx, ColliderJntSphItemDim* item) } //SetInit JntSphItemDim -s32 func_8005BA84(GlobalContext* globalCtx, ColliderJntSphItemDim* dest, ColliderJntSphItemDimInit* src); -/* -{ +s32 func_8005BA84(GlobalContext* globalCtx, ColliderJntSphItemDim* dest, ColliderJntSphItemDimInit* src) { dest->unk_14 = src->unk_00; dest->unk_00 = src->unk_02; dest->unk_10 = src->unk_0A * 0.01f; return 1; } -*/ -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005BA84.s") //Initialize JntSphItem s32 func_8005BAD8(GlobalContext* globalCtx, ColliderJntSphItem* item) {