summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arm9/asm/unk_0201CBEC.s20
-rw-r--r--arm9/src/unk_0201CBEC.c12
2 files changed, 12 insertions, 20 deletions
diff --git a/arm9/asm/unk_0201CBEC.s b/arm9/asm/unk_0201CBEC.s
deleted file mode 100644
index cd295439..00000000
--- a/arm9/asm/unk_0201CBEC.s
+++ /dev/null
@@ -1,20 +0,0 @@
- .include "asm/macros.inc"
- .include "global.inc"
-
- .text
-
- thumb_func_start FUN_0201CBEC
-FUN_0201CBEC: ; 0x0201CBEC
- push {r3, lr}
- sub r0, r0, r2
- sub r2, r1, r3
- add r1, r0, #0x0
- mul r1, r0
- add r0, r2, #0x0
- mul r0, r2
- add r0, r1, r0
- lsl r0, r0, #0xc
- bl FX_Sqrt
- asr r0, r0, #0xc
- pop {r3, pc}
- .balign 4
diff --git a/arm9/src/unk_0201CBEC.c b/arm9/src/unk_0201CBEC.c
new file mode 100644
index 00000000..0e75c3ff
--- /dev/null
+++ b/arm9/src/unk_0201CBEC.c
@@ -0,0 +1,12 @@
+#include "global.h"
+#include "fx.h"
+
+int FUN_0201CBEC(int a0, int a1, int a2, int a3);
+
+THUMB_FUNC int FUN_0201CBEC(int a0, int a1, int a2, int a3) {
+
+ int r0 = a0 - a2;
+ int r2 = a1 - a3;
+
+ return FX_Sqrt((r0 * r0 + r2 * r2) << 0xc) >> 0xc;
+} \ No newline at end of file