Name lots of nitro symbols

include/Save/SaveManager.hpp

@@ -34,7 +34,7 @@ class SaveAdventureFlags {
     /* 80 */
 
     SaveAdventureFlags() {
-        Fill32(0, this, sizeof(SaveAdventureFlags));
+        MI_CpuFill32(0, this, sizeof(SaveAdventureFlags));
     };
 };
 
@@ -49,7 +49,7 @@ class SaveInventory {
     /* 18 */
 
     SaveInventory() {
-        Fill32(0, this->mUnk_04, sizeof(mUnk_04));
+        MI_CpuFill32(0, this->mUnk_04, sizeof(mUnk_04));
         this->mUnk_12 = 0;
     };
 };
@@ -87,15 +87,15 @@ class SaveUnknown158 {
 public:
     /* 00 */ unk8 mUnk_00[0x0C];
     SaveUnknown158() {
-        Fill32(0, this, sizeof(SaveUnknown158));
+        MI_CpuFill32(0, this, sizeof(SaveUnknown158));
     };
 };
 
 class SaveUnknown164 {
 public:
     /* 00 */ unk8 mUnk_00[0x20];
     SaveUnknown164() {
-        Fill32(0, this, sizeof(SaveUnknown164));
+        MI_CpuFill32(0, this, sizeof(SaveUnknown164));
     };
 };
 
@@ -125,7 +125,7 @@ class Sub2Test2 {
     /* C84 */ unk32 mUnk_00_SaveInfoSub10[4];
 
     Sub2Test2() {
-        Fill32(0, this->mUnk_00_SaveInfoSub10, 16);
+        MI_CpuFill32(0, this->mUnk_00_SaveInfoSub10, 16);
     }
 };
 
@@ -171,7 +171,7 @@ class SaveUnknown14C {
         mUnk_D18 = 0;
         mUnk_D1C = 0;
         mSongs   = 0;
-        Fill32(0, this->mUnk_48_SaveUnknownD24, sizeof(this->mUnk_48_SaveUnknownD24));
+        MI_CpuFill32(0, this->mUnk_48_SaveUnknownD24, sizeof(this->mUnk_48_SaveUnknownD24));
         this->mUnk_50_SaveUnknownD24 = 0;
     }
 };

include/Unknown/UnkMemFuncs.h

@@ -5,18 +5,18 @@
 //! TODO: temporary place until this is documented properly
 
 extern "C" {
-void Fill16(int value, u16 *dst, size_t size);
-void Copy16(u16 *src, u16 *dest, size_t size);
-void Fill32(int value, void *dest, size_t size);
-// Copy32
+void MI_CpuFill16(int value, u16 *dst, size_t size);
+void MI_CpuCopy16(u16 *src, u16 *dest, size_t size);
+void MI_CpuFill32(int value, void *dest, size_t size);
+// MI_CpuCopy32
 // Stream32
-void Fill256(int value, void *dst, size_t size);
-void Copy256(void *src, void *dest, size_t size);
+void _MI_CpuFill(int value, void *dst, size_t size);
+void _MI_CpuCopy(void *src, void *dest, size_t size);
 // CopySingle256
 // CopySingle288
 // CopySingle384
 // CopySingle512
-void Fill(u8 *dst, int value, size_t size);
+void MI_CpuFill8(u8 *dst, int value, size_t size);
 // Copy
 // Zero288
 // Swap32

include/Unknown/UnkStruct_0204a110.hpp

@@ -68,7 +68,7 @@ class UnkStruct_0204a110_Sub3_00 {
     /* 200 */
 
     UnkStruct_0204a110_Sub3_00() {
-        Fill16(0, (u16 *) this->mUnk_000, sizeof(this->mUnk_000));
+        MI_CpuFill16(0, (u16 *) this->mUnk_000, sizeof(this->mUnk_000));
     }
 };
 

include/Unknown/UnkStruct_ov000_020b50c0.hpp

@@ -43,8 +43,6 @@ class UnkStruct_ov000_020b50c0 {
 
     UnkStruct_ov000_020b50c0();
 
-    void func_0200381c(const char *soundDataPath, unk32 param2, unk32 param3);
-
     void func_ov000_02069d3c(unk32 param1);
     void func_ov000_02069d7c(void);
     void func_ov000_02069f58(void);

src/000_Second/Actor/Actor.cpp

@@ -21,7 +21,7 @@ ARM Actor::Actor() {
     this->mUnk_5c.func_ov000_020975f8();
     this->mRef.Reset();
     this->mType = NULL;
-    Copy256(&data_ov000_020b539c.mUnk_00, &this->mUnk_5c, sizeof(data_ov000_020b539c.mUnk_00));
+    _MI_CpuCopy(&data_ov000_020b539c.mUnk_00, &this->mUnk_5c, sizeof(data_ov000_020b539c.mUnk_00));
     this->mPos     = this->mUnk_5c.mUnk_00;
     this->mPrevPos = this->mUnk_5c.mUnk_00;
     this->mAngle   = this->mUnk_5c.mUnk_0c;

src/001_SceneInit/Actor/ActorManager_001.cpp

@@ -115,7 +115,7 @@ THUMB void ActorManager::func_ov001_020bb018(UnkStruct_func_ov001_020bb018_param
     this->mActorTableEnd = this->mActorTable + allocCount * 4;
 
     size_t iVar9 = ((this->mActorTable + allocCount * 4) - this->mActorTable);
-    Fill32(0, this->mActorTable, (iVar9 * 4));
+    MI_CpuFill32(0, this->mActorTable, (iVar9 * 4));
     this->mUnk_08 = this->mActorTable;
     data_0204999c.func_ov001_020ba588(aligned08 + iVar5, 0x100);
 

src/018_StartUp/GameModeStartUp.cpp

@@ -12,29 +12,29 @@
 #include "regs.h"
 
 extern "C" {
-void func_020261f0(unk32 param1, void *param2);
+void OS_SetIrqFunction(unk32 param1, void *param2);
 void func_0201245c();
 void func_02027a28(void *param1, unk32 param2);
 void DC_FlushAll();
 void func_02013184();
 void func_020131b0();
-void func_020263bc(unk32 param1);
-void func_020234d4(unk32 param1);
+void OS_EnableIrqMask(unk32 param1);
+void GX_VBlankIntr(unk32 param1);
 void func_02031e48(void *param1);
-void func_02026ef0(void *param1);
-unk32 func_02027818(unk32 param1);
-unk32 func_0202780c(unk32 param1);
+void OS_WakeupThreadDirect(void *param1);
+unk32 OS_GetArenaLo(unk32 param1);
+unk32 OS_GetArenaHi(unk32 param1);
 UnkStruct_02011e10_Sub1 *func_020012e0(unk32 param1, unk32 param2, unk32 param3);
 unk32 func_0202d624(void *param1, unk32 param2);
 void *func_02001fd4(void *param1, size_t param2);
 void func_020013ac(void *param1);
 UnkStruct_02011e10_Sub1 *func_02001098(unk32 param1, unk32 param2, unk32 param3);
 unk32 func_020011f4();
-void func_0202793c(unk32 param1, unk32 param2);
-void func_0202e820();
-unk32 func_020271b0();
-unk32 func_0202e864(void *param1);
-void func_0202e8f8(void *param1);
+void OS_SetArenaLo(unk32 param1, unk32 param2);
+void TP_Init();
+unk32 OS_func_0065();
+unk32 TP_GetUserInfo(void *param1);
+void TP_SetCalibrateParam(void *param1);
 
 void func_0200a7b0(unk32 param1, void *param2, void *param3, void *param4, unk32 param5, unk32 param6, unk32 param7,
                    unk32 param8);
@@ -59,10 +59,10 @@ ARM Game::Game() :
     mUnk_18(NULL) {}
 
 ARM void Game::func_ov018_020c48a4() {
-    func_020261f0(1, func_02013184);
-    func_020263bc(1);
-    func_020234d4(1);
-    func_02026ef0(&this->mUnk_1C.mUnk_04);
+    OS_SetIrqFunction(1, func_02013184);
+    OS_EnableIrqMask(1);
+    GX_VBlankIntr(1);
+    OS_WakeupThreadDirect(&this->mUnk_1C.mUnk_04);
     func_02031e48(func_020131b0);
     this->TrySetCreateCallback((GameModeCreateCallback) Game::func_ov018_020c4ba8);
 }
@@ -83,8 +83,8 @@ ARM UnkStruct_02049b18::UnkStruct_02049b18() {
 }
 
 ARM void UnkStruct_02011e10::func_ov018_020c4980() {
-    unk32 arenaLo = func_02027818(0);
-    unk32 arenaHi = func_0202780c(0);
+    unk32 arenaLo = OS_GetArenaLo(0);
+    unk32 arenaHi = OS_GetArenaHi(0);
 
     for (int i = 0; i < HeapIndex_Max; i++) {
         this->mUnk_00[i] = NULL;
@@ -123,13 +123,13 @@ ARM void UnkStruct_02011e10::func_ov018_020c4a5c() {
     temp_r2 = this->mUnk_00[0];
 
     temp_r5 = ((uintptr_t) temp_r2->mUnk_1C - (uintptr_t) temp_r2); //! TODO: fake match?
-    temp_r7 = func_02027818(0);
+    temp_r7 = OS_GetArenaLo(0);
     temp_r7 += temp_r5;
 
-    temp_r0          = func_0202780c(0);
+    temp_r0          = OS_GetArenaHi(0);
     this->mUnk_00[1] = func_02001098(temp_r7, temp_r0 - temp_r7, 2);
     this->mUnk_5C    = func_020011f4();
-    func_0202793c(0, temp_r0);
+    OS_SetArenaLo(0, temp_r0);
     this->mUnk_74 = 1;
 }
 
@@ -147,12 +147,12 @@ ARM UnkStruct_02049b80::UnkStruct_02049b80() {
 ARM UnkStruct_02049b18_06::UnkStruct_02049b18_06() {
     unk8 auStack_18[8];
 
-    func_0202e820();
+    TP_Init();
 
-    if (func_020271b0() != 0) {
-        func_0202e8f8(NULL);
-    } else if (func_0202e864(auStack_18) != 0) {
-        func_0202e8f8(auStack_18);
+    if (OS_func_0065() != 0) {
+        TP_SetCalibrateParam(NULL);
+    } else if (TP_GetUserInfo(auStack_18) != 0) {
+        TP_SetCalibrateParam(auStack_18);
     }
 }