fixed merge conflict

1 files changed, 4 insertions, 4 deletions

diff --git a/src/code/sys_ucode.c b/src/code/sys_ucode.c
index f92a0d61e..0bd169090 100644
--- a/src/code/sys_ucode.c
+++ b/src/code/sys_ucode.c
@@ -1,21 +1,21 @@
 #include <global.h>
 
-u32 func_800D2DF0()
+u32 SysUcode_GetUCodeBoot()
 {
     return &D_80009320;
 }
 
-u32 func_800D2DFC()
+u32 SysUcode_GetUcodeBootSize()
 {
     return (u32)&D_800093F0 - (u32)&D_80009320;
 }
 
-u32 func_800D2E14()
+u32 SysUcode_GetUcode()
 {
     return D_8012DBA0;
 }
 
-u32 func_800D2E20()
+u32 SysUcode_GetUcodeData()
 {
     return D_8012DBA4;
 }