diff --git a/asm/non_matchings/code/z_collision_check/func_8005B7F4.s b/asm/non_matchings/code/z_collision_check/func_8005B7F4.s deleted file mode 100644 index ab676a972c..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005B7F4.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_8005B7F4 -/* AD2994 8005B7F4 AFA40000 */ sw $a0, ($sp) -/* AD2998 8005B7F8 8CCE0000 */ lw $t6, ($a2) -/* AD299C 8005B7FC 24020001 */ li $v0, 1 -/* AD29A0 8005B800 ACAE0000 */ sw $t6, ($a1) -/* AD29A4 8005B804 90CF0004 */ lbu $t7, 4($a2) -/* AD29A8 8005B808 A0AF0004 */ sb $t7, 4($a1) -/* AD29AC 8005B80C 90D80005 */ lbu $t8, 5($a2) -/* AD29B0 8005B810 03E00008 */ jr $ra -/* AD29B4 8005B814 A0B80005 */ sb $t8, 5($a1) - diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c index 2b6ac9b970..e00edf9bf5 100644 --- a/src/code/z_collision_check.c +++ b/src/code/z_collision_check.c @@ -74,7 +74,7 @@ extern ColliderTouch D_8011DE18; //initialize s32 func_8005B7C0(GlobalContext* globalCtx, ColliderTouch* touch) { - *colliderTouch = D_8011DE18; + *touch = D_8011DE18; return 1; } @@ -84,8 +84,14 @@ s32 func_8005B7E4(GlobalContext* globalCtx, ColliderTouch* touch) return 1; } -//initialize from overlay -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005B7F4.s") +//copy +s32 func_8005B7F4(GlobalContext* globalCtx, ColliderTouch* copyTo, ColliderTouch* copyFrom) +{ + copyTo->flags = copyFrom->flags; + copyTo->unk_04 = copyFrom->unk_04; + copyTo->damage = copyFrom->damage; + return 1; +} void func_8005B818(GlobalContext* globalCtx, ColliderBody* body) {