diff --git a/asm/non_matchings/code/z_collision_check/func_8005B7C0.s b/asm/non_matchings/code/z_collision_check/func_8005B7C0.s deleted file mode 100644 index e86d871e46..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005B7C0.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_8005B7C0 -/* AD2960 8005B7C0 3C0E8012 */ lui $t6, %hi(D_8011DE18) # $t6, 0x8012 -/* AD2964 8005B7C4 AFA40000 */ sw $a0, ($sp) -/* AD2968 8005B7C8 25CEDE18 */ addiu $t6, %lo(D_8011DE18) # addiu $t6, $t6, -0x21e8 -/* AD296C 8005B7CC 8DD80000 */ lw $t8, ($t6) -/* AD2970 8005B7D0 24020001 */ li $v0, 1 -/* AD2974 8005B7D4 ACB80000 */ sw $t8, ($a1) -/* AD2978 8005B7D8 8DCF0004 */ lw $t7, 4($t6) -/* AD297C 8005B7DC 03E00008 */ jr $ra -/* AD2980 8005B7E0 ACAF0004 */ sw $t7, 4($a1) - diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c index 311600e150..2b6ac9b970 100644 --- a/src/code/z_collision_check.c +++ b/src/code/z_collision_check.c @@ -70,13 +70,21 @@ void func_8005B79C(GlobalContext* globalCtx, Collider* collision) collision->maskB &= ~0x1; } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005B7C0.s") +extern ColliderTouch D_8011DE18; +//initialize +s32 func_8005B7C0(GlobalContext* globalCtx, ColliderTouch* touch) { + *colliderTouch = D_8011DE18; + return 1; +} + +//destructor 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") void func_8005B818(GlobalContext* globalCtx, ColliderBody* body)