From ca264a4429c68f0471c400b87dd08a0bdb98b308 Mon Sep 17 00:00:00 2001
From: Alejandro Javier Asenjo Nitti <alejandro.asenjo88@gmail.com>
Date: Tue, 10 Oct 2023 07:46:36 -0300
Subject: [PATCH] move files

---
 src/libultra/io/contreaddata.c | 7 +++++++
 src/libultra/io/crc.c          | 5 +++++
 src/main/contreaddata.c        | 7 -------
 src/main/crc.c                 | 5 -----
 yamls/us/main.yaml             | 4 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)
 create mode 100644 src/libultra/io/contreaddata.c
 create mode 100644 src/libultra/io/crc.c
 delete mode 100644 src/main/contreaddata.c
 delete mode 100644 src/main/crc.c

diff --git a/src/libultra/io/contreaddata.c b/src/libultra/io/contreaddata.c
new file mode 100644
index 00000000..93e53b2b
--- /dev/null
+++ b/src/libultra/io/contreaddata.c
@@ -0,0 +1,7 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/contreaddata/func_80020380.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/contreaddata/func_80020444.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/contreaddata/func_800204EC.s")
diff --git a/src/libultra/io/crc.c b/src/libultra/io/crc.c
new file mode 100644
index 00000000..868f8ad7
--- /dev/null
+++ b/src/libultra/io/crc.c
@@ -0,0 +1,5 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/crc/func_80026440.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/crc/func_800264F0.s")
diff --git a/src/main/contreaddata.c b/src/main/contreaddata.c
deleted file mode 100644
index 455da916..00000000
--- a/src/main/contreaddata.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/contreaddata/func_80020380.s")
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/contreaddata/func_80020444.s")
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/contreaddata/func_800204EC.s")
diff --git a/src/main/crc.c b/src/main/crc.c
deleted file mode 100644
index 4b3fb7be..00000000
--- a/src/main/crc.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/crc/func_80026440.s")
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/crc/func_800264F0.s")
diff --git a/yamls/us/main.yaml b/yamls/us/main.yaml
index 10c2d924..04a67a9c 100644
--- a/yamls/us/main.yaml
+++ b/yamls/us/main.yaml
@@ -31,7 +31,7 @@
       - [0x206B0, asm, 206B0]
       - [0x20A60, asm]
       - [0x20BC0, c, ../libultra/io/controller]
-      - [0x20F80, c, contreaddata]
+      - [0x20F80, c, ../libultra/io/contreaddata]
       - [0x211E0, c, recvmesg]
       - [0x21320, c, sendmesg]
       - [0x21470, c, contquery]
@@ -87,7 +87,7 @@
       - [0x25F10, asm, thread] # Problem when trying to C
       - [0x25F50, asm]
       - [0x26CD0, c, pfsisplug]
-      - [0x27040, c, crc]
+      - [0x27040, c, ../libultra/io/crc]
       - [0x271C0, asm]
       - [0x278D0, c, mtxutil]
       - [0x27B40, c, jammesg]