From b8a0751518e4da775d299fbe2bedc50d274cab48 Mon Sep 17 00:00:00 2001
From: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com>
Date: Tue, 21 Apr 2020 17:40:56 -0400
Subject: [PATCH] Match coss.c (#86)

* Match coss.c

* Remove asm file.

* Update src/libultra_code/coss.c

Co-Authored-By: Lucas Shaw <49287729+shawlucas@users.noreply.github.com>

Co-authored-by: Lucas Shaw <49287729+shawlucas@users.noreply.github.com>
---
 asm/non_matchings/code/coss/coss.s | 13 -------------
 src/libultra_code/coss.c           |  5 ++++-
 2 files changed, 4 insertions(+), 14 deletions(-)
 delete mode 100644 asm/non_matchings/code/coss/coss.s

diff --git a/asm/non_matchings/code/coss/coss.s b/asm/non_matchings/code/coss/coss.s
deleted file mode 100644
index 78d6843b43..0000000000
--- a/asm/non_matchings/code/coss/coss.s
+++ /dev/null
@@ -1,13 +0,0 @@
-glabel coss
-/* B7B920 80104780 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* B7B924 80104784 AFA40018 */  sw    $a0, 0x18($sp)
-/* B7B928 80104788 00802825 */  move  $a1, $a0
-/* B7B92C 8010478C 24A44000 */  addiu $a0, $a1, 0x4000
-/* B7B930 80104790 AFBF0014 */  sw    $ra, 0x14($sp)
-/* B7B934 80104794 308EFFFF */  andi  $t6, $a0, 0xffff
-/* B7B938 80104798 0C040114 */  jal   sins
-/* B7B93C 8010479C 01C02025 */   move  $a0, $t6
-/* B7B940 801047A0 8FBF0014 */  lw    $ra, 0x14($sp)
-/* B7B944 801047A4 27BD0018 */  addiu $sp, $sp, 0x18
-/* B7B948 801047A8 03E00008 */  jr    $ra
-/* B7B94C 801047AC 00000000 */   nop   
diff --git a/src/libultra_code/coss.c b/src/libultra_code/coss.c
index 0158b34802..1f2a260dd6 100644
--- a/src/libultra_code/coss.c
+++ b/src/libultra_code/coss.c
@@ -1,3 +1,6 @@
 #include "libultra_internal.h"
+#include <global.h>
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/coss/coss.s")
+s16 coss(u16 angle) {
+    return sins(angle + 0x4000);
+}