From 389eae39255349e90afc70204e8110e9661fd1f4 Mon Sep 17 00:00:00 2001 From: mzxrules Date: Thu, 19 Mar 2020 23:03:48 -0400 Subject: [PATCH] func_8005B280 ok --- .../code/z_collision_check/func_8005B280.s | 13 ------------- src/code/z_collision_check.c | 9 ++++++++- 2 files changed, 8 insertions(+), 14 deletions(-) delete mode 100644 asm/non_matchings/code/z_collision_check/func_8005B280.s diff --git a/asm/non_matchings/code/z_collision_check/func_8005B280.s b/asm/non_matchings/code/z_collision_check/func_8005B280.s deleted file mode 100644 index a04f6ecba0..0000000000 --- a/asm/non_matchings/code/z_collision_check/func_8005B280.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_8005B280 -/* AD2420 8005B280 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* AD2424 8005B284 AFBF0024 */ sw $ra, 0x24($sp) -/* AD2428 8005B288 240E00FF */ li $t6, 255 -/* AD242C 8005B28C AFAE0010 */ sw $t6, 0x10($sp) -/* AD2430 8005B290 AFA00014 */ sw $zero, 0x14($sp) -/* AD2434 8005B294 0C016CAB */ jal func_8005B2AC -/* AD2438 8005B298 AFA00018 */ sw $zero, 0x18($sp) -/* AD243C 8005B29C 8FBF0024 */ lw $ra, 0x24($sp) -/* AD2440 8005B2A0 27BD0028 */ addiu $sp, $sp, 0x28 -/* AD2444 8005B2A4 03E00008 */ jr $ra -/* AD2448 8005B2A8 00000000 */ nop - diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c index 116059b18c..17f795f158 100644 --- a/src/code/z_collision_check.c +++ b/src/code/z_collision_check.c @@ -1,8 +1,15 @@ #include #include -#pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005B280.s") +void func_8005B2AC(GraphicsContext* gfx, Vec3f* vA, Vec3f* vB, Vec3f* vC, u8 r, u8 g, u8 b); +//draw red poly +void func_8005B280(GraphicsContext* gfx, Vec3f* vA, Vec3f* vB, Vec3f* vC) +{ + func_8005B2AC(gfx, vA, vB, vC, 255, 0, 0); +} + +//draw poly #pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005B2AC.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005B65C.s")