change OSMesg definition and fix memory corruptions

15 files changed, 115 insertions, 117 deletions

diff --git a/soh/src/code/__osMalloc.c b/soh/src/code/__osMalloc.c
index bba1e6735..1604332b7 100644
--- a/soh/src/code/__osMalloc.c
+++ b/soh/src/code/__osMalloc.c
@@ -63,7 +63,7 @@ void ArenaImpl_LockInit(Arena* arena) {
 }
 
 void ArenaImpl_Lock(Arena* arena) {
-    osSendMesg(&arena->lock, NULL, OS_MESG_BLOCK);
+    osSendMesgPtr(&arena->lock, NULL, OS_MESG_BLOCK);
 }
 
 void ArenaImpl_Unlock(Arena* arena) {
diff --git a/soh/src/code/audioMgr.c b/soh/src/code/audioMgr.c
index e8c7be032..ab34a4617 100644
--- a/soh/src/code/audioMgr.c
+++ b/soh/src/code/audioMgr.c
@@ -7,7 +7,7 @@ void func_800C3C80(AudioMgr* audioMgr) {
 
     task = audioMgr->rspTask;
     if (audioMgr->rspTask->taskQueue != NULL) {
-        osSendMesg(task->taskQueue, NULL, OS_MESG_BLOCK);
+        osSendMesgPtr(task->taskQueue, NULL, OS_MESG_BLOCK);
     }
 }
 
@@ -25,8 +25,8 @@ void AudioMgr_HandleRetrace(AudioMgr* audioMgr) {
         audioMgr->audioTask.list = audioMgr->rspTask->task;
         audioMgr->audioTask.msgQ = &audioMgr->unk_AC;
 
-        audioMgr->audioTask.msg = NULL;
-        osSendMesg(&audioMgr->sched->cmdQ, &audioMgr->audioTask, OS_MESG_BLOCK);
+        audioMgr->audioTask.msg.ptr = NULL;
+        osSendMesgPtr(&audioMgr->sched->cmdQ, &audioMgr->audioTask, OS_MESG_BLOCK);
         Sched_SendEntryMsg(audioMgr->sched);
     }
 
@@ -96,7 +96,7 @@ void AudioMgr_Init(AudioMgr* audioMgr, void* stack, OSPri pri, OSId id, SchedCon
     osCreateMesgQueue(&audioMgr->unk_74, &audioMgr->unk_8C, 8);
     osCreateMesgQueue(&audioMgr->unk_C8, &audioMgr->unk_E0, 1);
 
-    osSendMesg(&audioMgr->unk_AC, NULL, OS_MESG_BLOCK);
+    osSendMesgPtr(&audioMgr->unk_AC, NULL, OS_MESG_BLOCK);
 
         static bool hasInitialized = false;
 
@@ -107,7 +107,7 @@ void AudioMgr_Init(AudioMgr* audioMgr, void* stack, OSPri pri, OSId id, SchedCon
         Audio_Init();
         AudioLoad_SetDmaHandler(DmaMgr_DmaHandler);
         Audio_InitSound();
-        osSendMesg(&audioMgr->unk_C8, NULL, OS_MESG_BLOCK);
+        osSendMesgPtr(&audioMgr->unk_C8, NULL, OS_MESG_BLOCK);
         ModInternal_ExecuteAudioInitHooks();
         // Removed due to crash
         //IrqMgr_AddClient(audioMgr->irqMgr, &irqClient, &audioMgr->unk_74);
diff --git a/soh/src/code/audio_load.c b/soh/src/code/audio_load.c
index 02986ca6c..587eb4194 100644
--- a/soh/src/code/audio_load.c
+++ b/soh/src/code/audio_load.c
@@ -461,7 +461,7 @@ s32 AudioLoad_SyncLoadInstrument(s32 fontId, s32 instId, s32 drumId) {
 
 void AudioLoad_AsyncLoad(s32 tableType, s32 id, s32 nChunks, s32 retData, OSMesgQueue* retQueue) {
     if (AudioLoad_AsyncLoadInner(tableType, id, nChunks, retData, retQueue) == NULL) {
-        osSendMesg(retQueue, 0xFFFFFFFF, OS_MESG_NOBLOCK);
+        osSendMesg32(retQueue, 0xFFFFFFFF, OS_MESG_NOBLOCK);
     }
 }
 
@@ -1079,7 +1079,7 @@ void* AudioLoad_AsyncLoadInner(s32 tableType, s32 id, s32 nChunks, s32 retData,
     ret = AudioLoad_SearchCaches(tableType, realId);
     if (ret != NULL) {
         status = 2;
-        osSendMesg(retQueue, MK_ASYNC_MSG(retData, 0, 0, 0), OS_MESG_NOBLOCK);
+        osSendMesg32(retQueue, MK_ASYNC_MSG(retData, 0, 0, 0), OS_MESG_NOBLOCK);
     } else {
         sp50 = AudioLoad_GetLoadTable(tableType);
         size = sp50->entries[realId].size;
@@ -1312,19 +1312,12 @@ void AudioLoad_Init(void* heap, size_t heapSize) {
     void* temp_v0_3;
     s32 i;
     u64* heapP;
-    u8* ctxP;
     s16* u2974p;
 
     D_801755D0 = NULL;
     gAudioContext.resetTimer = 0;
 
-    {
-        s32 i;
-        u8* ctxP = (u8*)&gAudioContext;
-        for (i = sizeof(gAudioContext); i >= 0; i--) {
-            *ctxP++ = 0;
-        }
-    }
+    memset(&gAudioContext, 0, sizeof(gAudioContext));
 
     switch (osTvType) {
         case OS_TV_PAL:
@@ -1421,7 +1414,7 @@ void AudioLoad_Init(void* heap, size_t heapSize) {
 
     AudioHeap_AllocPoolInit(&gAudioContext.permanentPool, temp_v0_3, D_8014A6C4.permanentPoolSize);
     gAudioContextInitalized = true;
-    osSendMesg(gAudioContext.taskStartQueueP, (void*)gAudioContext.totalTaskCnt, OS_MESG_NOBLOCK);
+    osSendMesg32(gAudioContext.taskStartQueueP, gAudioContext.totalTaskCnt, OS_MESG_NOBLOCK);
 }
 
 void AudioLoad_InitSlowLoads(void) {
@@ -1649,7 +1642,7 @@ AudioAsyncLoad* AudioLoad_StartAsyncLoadUnkMedium(s32 unkMediumParam, uintptr_t
         return NULL;
     }
 
-    osSendMesg(&gAudioContext.asyncLoadUnkMediumQueue, asyncLoad, OS_MESG_NOBLOCK);
+    osSendMesgPtr(&gAudioContext.asyncLoadUnkMediumQueue, asyncLoad, OS_MESG_NOBLOCK);
     asyncLoad->unkMediumParam = unkMediumParam;
     return asyncLoad;
 }
@@ -1765,7 +1758,7 @@ void AudioLoad_FinishAsyncLoad(AudioAsyncLoad* asyncLoad) {
             break;
     }
 
-    doneMsg = asyncLoad->retMsg;
+    doneMsg.data32 = asyncLoad->retMsg;
     if (1) {}
     asyncLoad->status = LOAD_STATUS_WAITING;
     osSendMesg(asyncLoad->retQueue, doneMsg, OS_MESG_NOBLOCK);
diff --git a/soh/src/code/code_800E4FE0.c b/soh/src/code/code_800E4FE0.c
index 777efaa23..865e8ee29 100644
--- a/soh/src/code/code_800E4FE0.c
+++ b/soh/src/code/code_800E4FE0.c
@@ -39,7 +39,7 @@ extern u64 rspAspMainDataStart[];
 extern u64 rspAspMainDataEnd[];
 
 void AudioMgr_CreateNextAudioBuffer(s16* samples, u32 num_samples) {
-    u32 sp4C;
+    OSMesg sp4C;
 
     gAudioContext.totalTaskCnt++;
 
@@ -50,7 +50,7 @@ void AudioMgr_CreateNextAudioBuffer(s16* samples, u32 num_samples) {
     if (gAudioContext.resetStatus != 0) {
         if (AudioHeap_ResetStep() == 0) {
             if (gAudioContext.resetStatus == 0) {
-                osSendMesg(gAudioContext.audioResetQueueP, gAudioContext.audioResetSpecIdToLoad, OS_MESG_NOBLOCK);
+                osSendMesg8(gAudioContext.audioResetQueueP, gAudioContext.audioResetSpecIdToLoad, OS_MESG_NOBLOCK);
             }
         }
     }
@@ -58,8 +58,8 @@ void AudioMgr_CreateNextAudioBuffer(s16* samples, u32 num_samples) {
     int j = 0;
     if (gAudioContext.resetStatus == 0) {
         // msg = 0000RREE R = read pos, E = End Pos
-        while (osRecvMesg(gAudioContext.cmdProcQueueP, (OSMesg*)&sp4C, OS_MESG_NOBLOCK) != -1) {
-            Audio_ProcessCmds(sp4C);
+        while (osRecvMesg(gAudioContext.cmdProcQueueP, &sp4C, OS_MESG_NOBLOCK) != -1) {
+            Audio_ProcessCmds(sp4C.data32);
             j++;
         }
         if ((j == 0) && (gAudioContext.cmdQueueFinished)) {
@@ -84,7 +84,7 @@ AudioTask* func_800E5000(void) {
     s16* currAiBuffer;
     OSTask_t* task;
     s32 index;
-    u32 sp4C;
+    OSMesg sp4C;
     s32 sp48;
     s32 i;
 
@@ -102,7 +102,7 @@ AudioTask* func_800E5000(void) {
         }
     }
 
-    osSendMesg(gAudioContext.taskStartQueueP, gAudioContext.totalTaskCnt, OS_MESG_NOBLOCK);
+    osSendMesg32(gAudioContext.taskStartQueueP, gAudioContext.totalTaskCnt, OS_MESG_NOBLOCK);
     gAudioContext.rspTaskIdx ^= 1;
     gAudioContext.curAIBufIdx++;
     gAudioContext.curAIBufIdx %= 3;
@@ -149,7 +149,7 @@ AudioTask* func_800E5000(void) {
     if (gAudioContext.resetStatus != 0) {
         if (AudioHeap_ResetStep() == 0) {
             if (gAudioContext.resetStatus == 0) {
-                osSendMesg(gAudioContext.audioResetQueueP, gAudioContext.audioResetSpecIdToLoad, OS_MESG_NOBLOCK);
+                osSendMesg8(gAudioContext.audioResetQueueP, gAudioContext.audioResetSpecIdToLoad, OS_MESG_NOBLOCK);
             }
 
             sWaitingAudioTask = NULL;
@@ -186,11 +186,11 @@ AudioTask* func_800E5000(void) {
     j = 0;
     if (gAudioContext.resetStatus == 0) {
         // msg = 0000RREE R = read pos, E = End Pos
-        while (osRecvMesg(gAudioContext.cmdProcQueueP, (OSMesg*)&sp4C, OS_MESG_NOBLOCK) != -1) {
+        while (osRecvMesg(gAudioContext.cmdProcQueueP, &sp4C, OS_MESG_NOBLOCK) != -1) {
             if (1) {}
             if (1) {}
             if (1) {}
-            Audio_ProcessCmds(sp4C);
+            Audio_ProcessCmds(sp4C.data32);
             j++;
         }
         if ((j == 0) && (gAudioContext.cmdQueueFinished)) {
@@ -386,11 +386,11 @@ void Audio_InitMesgQueuesInternal(void) {
                       ARRAY_COUNT(gAudioContext.audioResetMesgs));
 }
 
-void Audio_QueueCmd(u32 opArgs, void** data) {
+void Audio_QueueCmd(u32 opArgs, u32 data) {
     AudioCmd* cmd = &gAudioContext.cmdBuf[gAudioContext.cmdWrPos & 0xFF];
 
     cmd->opArgs = opArgs;
-    cmd->data = *data;
+    cmd->data = data;
 
     gAudioContext.cmdWrPos++;
 
@@ -400,23 +400,28 @@ void Audio_QueueCmd(u32 opArgs, void** data) {
 }
 
 void Audio_QueueCmdF32(u32 opArgs, f32 data) {
-    Audio_QueueCmd(opArgs, (void**)&data);
+    union
+    {
+        f32 f;
+        u32 u;
+    } uData = { .f = data };
+    Audio_QueueCmd(opArgs, uData.u);
 }
 
 void Audio_QueueCmdS32(u32 opArgs, s32 data) {
-    Audio_QueueCmd(opArgs, (void**)&data);
+    Audio_QueueCmd(opArgs, data);
 }
 
 void Audio_QueueCmdS8(u32 opArgs, s8 data) {
     u32 uData = data << 0x18;
 
-    Audio_QueueCmd(opArgs, (void**)&uData);
+    Audio_QueueCmd(opArgs, uData);
 }
 
 void Audio_QueueCmdU16(u32 opArgs, u16 data) {
     u32 uData = data << 0x10;
 
-    Audio_QueueCmd(opArgs, (void**)&uData);
+    Audio_QueueCmd(opArgs, uData);
 }
 
 s32 Audio_ScheduleProcessCmds(void) {
@@ -428,8 +433,8 @@ s32 Audio_ScheduleProcessCmds(void) {
     }
 
     ret =
-        osSendMesg(gAudioContext.cmdProcQueueP,
-                   (void*)(((gAudioContext.cmdRdPos & 0xFF) << 8) | (gAudioContext.cmdWrPos & 0xFF)), OS_MESG_NOBLOCK);
+        osSendMesg32(gAudioContext.cmdProcQueueP,
+                   (((gAudioContext.cmdRdPos & 0xFF) << 8) | (gAudioContext.cmdWrPos & 0xFF)), OS_MESG_NOBLOCK);
     if (ret != -1) {
         gAudioContext.cmdRdPos = gAudioContext.cmdWrPos;
         ret = 0;
@@ -531,11 +536,11 @@ void func_800E5EA4(s32 arg0, u32* arg1, u32* arg2) {
 
 s32 func_800E5EDC(void) {
     s32 pad;
-    s32 sp18;
+    OSMesg sp18;
 
-    if (osRecvMesg(gAudioContext.audioResetQueueP, (OSMesg*)&sp18, OS_MESG_NOBLOCK) == -1) {
+    if (osRecvMesg(gAudioContext.audioResetQueueP, &sp18, OS_MESG_NOBLOCK) == -1) {
         return 0;
-    } else if (gAudioContext.audioResetSpecIdToLoad != sp18) {
+    } else if (gAudioContext.audioResetSpecIdToLoad != sp18.data8) {
         return -1;
     } else {
         return 1;
@@ -545,7 +550,7 @@ s32 func_800E5EDC(void) {
 void func_800E5F34(void) {
     // macro?
     // clang-format off
-    s32 chk = -1; s32 sp28; do {} while (osRecvMesg(gAudioContext.audioResetQueueP, (OSMesg*)&sp28, OS_MESG_NOBLOCK) != chk);
+    s32 chk = -1; OSMesg sp28; do {} while (osRecvMesg(gAudioContext.audioResetQueueP, &sp28, OS_MESG_NOBLOCK) != chk);
     // clang-format on
 }
 
diff --git a/soh/src/code/game.c b/soh/src/code/game.c
index a411523ec..69b7c0ef7 100644
--- a/soh/src/code/game.c
+++ b/soh/src/code/game.c
@@ -240,7 +240,7 @@ int fbTest = -1;
 void GameState_Update(GameState* gameState) {
     GraphicsContext* gfxCtx = gameState->gfxCtx;
 
-    if (fbTest == -1) 
+    if (fbTest == -1)
     {
         fbTest = gfx_create_framebuffer(64, 112);
         //fbTest = gfx_create_framebuffer(256, 512);
@@ -323,18 +323,18 @@ void GameState_Update(GameState* gameState) {
         GameState_Draw(gameState, gfxCtx);
         func_800C49F4(gfxCtx);
     }
-    
+
     // -----------------------
     // Cheats hooks
     // -----------------------
-    
+
     // Inf Money
     if (CVar_GetS32("gInfiniteMoney", 0) != 0) {
         if (gSaveContext.rupees < CUR_CAPACITY(UPG_WALLET)) {
             gSaveContext.rupees = CUR_CAPACITY(UPG_WALLET);
         }
     }
-    
+
     // Inf Health
     if (CVar_GetS32("gInfiniteHealth", 0) != 0) {
         if (gSaveContext.health < gSaveContext.healthCapacity) {
@@ -348,33 +348,33 @@ void GameState_Update(GameState* gameState) {
         if (AMMO(ITEM_STICK) < CUR_CAPACITY(UPG_STICKS)) {
             AMMO(ITEM_STICK) = CUR_CAPACITY(UPG_STICKS);
         }
-        
+
         // Deku Nuts
         if (AMMO(ITEM_NUT) < CUR_CAPACITY(UPG_NUTS)) {
             AMMO(ITEM_NUT) = CUR_CAPACITY(UPG_NUTS);
         }
-        
+
         // Bombs
         if (AMMO(ITEM_BOMB) < CUR_CAPACITY(UPG_BOMB_BAG)) {
             AMMO(ITEM_BOMB) = CUR_CAPACITY(UPG_BOMB_BAG);
         }
-        
+
         // Fairy Bow (Ammo)
         if (AMMO(ITEM_BOW) < CUR_CAPACITY(UPG_QUIVER)) {
             AMMO(ITEM_BOW) = CUR_CAPACITY(UPG_QUIVER);
         }
-        
+
         // Fairy Slingshot (Ammo)
         if (AMMO(ITEM_SLINGSHOT) < CUR_CAPACITY(UPG_BULLET_BAG)) {
             AMMO(ITEM_SLINGSHOT) = CUR_CAPACITY(UPG_BULLET_BAG);
         }
-        
+
         // Bombchus (max: 50, no upgrades)
         if (AMMO(ITEM_BOMBCHU) < 50) {
             AMMO(ITEM_BOMBCHU) = 50;
         }
     }
-    
+
     // Inf Magic
     if (CVar_GetS32("gInfiniteMagic", 0) != 0) {
         if (gSaveContext.magicAcquired && gSaveContext.magic != (gSaveContext.doubleMagic + 1) * 0x30) {
@@ -386,7 +386,7 @@ void GameState_Update(GameState* gameState) {
     if (CVar_GetS32("gInfiniteNayru", 0) != 0) {
         gSaveContext.nayrusLoveTimer = 0x44B;
     }
-    
+
     // Moon Jump On L
     if (CVar_GetS32("gMoonJumpOnL", 0) != 0) {
         if (gGlobalCtx) {
@@ -424,7 +424,7 @@ void GameState_Update(GameState* gameState) {
     } else {
         CVar_SetS32("gPrevTime", -1);
     }
-   
+
     //since our CVar is same value and properly default to 0 there is not problems doing this in single line.
     gSaveContext.language = CVar_GetS32("gLanguages", 0);
 
@@ -525,7 +525,7 @@ void GameState_Init(GameState* gameState, GameStateFunc init, GraphicsContext* g
     }
     SpeedMeter_Init(&D_801664D0);
     func_800AA0B4();
-    osSendMesg(&gameState->gfxCtx->queue, NULL, OS_MESG_BLOCK);
+    osSendMesgPtr(&gameState->gfxCtx->queue, NULL, OS_MESG_BLOCK);
 
     endTime = osGetTime();
     // "Other initialization processing time %d us"
diff --git a/soh/src/code/graph.c b/soh/src/code/graph.c
index 651d405d5..ca0c9511a 100644
--- a/soh/src/code/graph.c
+++ b/soh/src/code/graph.c
@@ -170,12 +170,12 @@ void Graph_TaskSet00(GraphicsContext* gfxCtx) {
 
     D_8016A528 = osGetTime() - sGraphSetTaskTime - D_8016A558;
 
-    osSetTimer(&timer, OS_USEC_TO_CYCLES(3000000), 0, &gfxCtx->queue, (OSMesg)666);
+    osSetTimer(&timer, OS_USEC_TO_CYCLES(3000000), 0, &gfxCtx->queue, OS_MESG_32(666));
 
     osRecvMesg(&gfxCtx->queue, &msg, OS_MESG_BLOCK);
     osStopTimer(&timer);
     //OTRTODO - Proper GFX crash handler
-    #if 0 
+    #if 0
     if (msg == (OSMesg)666) {
         osSyncPrintf(VT_FGCOL(RED));
         osSyncPrintf("RCPが帰ってきませんでした。"); // "RCP did not return."
@@ -194,7 +194,7 @@ void Graph_TaskSet00(GraphicsContext* gfxCtx) {
         }
         Fault_AddHungupAndCrashImpl("RCP is HUNG UP!!", "Oh! MY GOD!!");
     }
-    #endif 
+    #endif
     osRecvMesg(&gfxCtx->queue, &msg, OS_MESG_NOBLOCK);
 
     D_8012D260 = gfxCtx->workBuffer;
@@ -243,7 +243,7 @@ void Graph_TaskSet00(GraphicsContext* gfxCtx) {
     }
 
     scTask->msgQ = &gfxCtx->queue;
-    scTask->msg = NULL;
+    scTask->msg.ptr = NULL;
 
     cfb = &sGraphCfbInfos[sGraphCfbInfoIdx++];
     cfb->fb1 = gfxCtx->curFrameBuffer;
@@ -262,7 +262,7 @@ void Graph_TaskSet00(GraphicsContext* gfxCtx) {
 
     gfxCtx->schedMsgQ = &gSchedContext.cmdQ;
 
-    osSendMesg(&gSchedContext.cmdQ, scTask, OS_MESG_BLOCK);
+    osSendMesgPtr(&gSchedContext.cmdQ, scTask, OS_MESG_BLOCK);
     Sched_SendEntryMsg(&gSchedContext);
 }
 
@@ -399,7 +399,7 @@ void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState) {
         sGraphUpdateTime = time;
     }
 
-    if (CVar_GetS32("gDebugEnabled", 0)) 
+    if (CVar_GetS32("gDebugEnabled", 0))
     {
         if (CHECK_BTN_ALL(gameState->input[0].press.button, BTN_Z) &&
             CHECK_BTN_ALL(gameState->input[0].cur.button, BTN_L | BTN_R)) {
@@ -475,14 +475,14 @@ static void RunFrame()
         {
             uint64_t ticksA, ticksB;
             ticksA = GetPerfCounter();
-            
+
             Graph_StartFrame();
 
             // TODO: Workaround for rumble being too long. Implement os thread functions.
             for (int i = 0; i < 3; i++) {
                 PadMgr_ThreadEntry(&gPadMgr);
             }
-            
+
             Graph_Update(&runFrameContext.gfxCtx, runFrameContext.gameState);
             ticksB = GetPerfCounter();
 
diff --git a/soh/src/code/irqmgr.c b/soh/src/code/irqmgr.c
index 6e7118bff..43d61ad71 100644
--- a/soh/src/code/irqmgr.c
+++ b/soh/src/code/irqmgr.c
@@ -32,11 +32,11 @@ void IrqMgr_AddClient(IrqMgr* this, IrqMgrClient* c, OSMesgQueue* msgQ) {
     osSetIntMask(prevInt);
 
     if (this->resetStatus > STATUS_IDLE) {
-        osSendMesg(c->queue, (OSMesg) & this->prenmiMsg, OS_MESG_NOBLOCK);
+        osSendMesgPtr(c->queue, &this->prenmiMsg, OS_MESG_NOBLOCK);
     }
 
     if (this->resetStatus >= STATUS_NMI) {
-        osSendMesg(c->queue, (OSMesg) & this->nmiMsg, OS_MESG_NOBLOCK);
+        osSendMesgPtr(c->queue, &this->nmiMsg, OS_MESG_NOBLOCK);
     }
 }
 
@@ -107,8 +107,8 @@ void IrqMgr_HandlePreNMI(IrqMgr* this) {
     this->resetStatus = STATUS_PRENMI;
     sIrqMgrResetTime = this->resetTime = osGetTime();
 
-    osSetTimer(&this->timer, OS_USEC_TO_CYCLES(450000), 0ull, &this->queue, (OSMesg)PRENMI450_MSG);
-    IrqMgr_JamMesgForClient(this, (OSMesg) & this->prenmiMsg);
+    osSetTimer(&this->timer, OS_USEC_TO_CYCLES(450000), 0ull, &this->queue, OS_MESG_32(PRENMI450_MSG));
+    IrqMgr_JamMesgForClient(this, OS_MESG_PTR(&this->prenmiMsg));
 }
 
 void IrqMgr_CheckStack() {
@@ -131,19 +131,19 @@ void IrqMgr_HandlePRENMI450(IrqMgr* this) {
     gIrqMgrResetStatus = temp;
     this->resetStatus = STATUS_NMI;
 
-    osSetTimer(&this->timer, OS_USEC_TO_CYCLES(30000), 0ull, &this->queue, (OSMesg)PRENMI480_MSG);
-    IrqMgr_SendMesgForClient(this, (OSMesg) & this->nmiMsg);
+    osSetTimer(&this->timer, OS_USEC_TO_CYCLES(30000), 0ull, &this->queue, OS_MESG_32(PRENMI480_MSG));
+    IrqMgr_SendMesgForClient(this, OS_MESG_PTR(&this->nmiMsg));
 }
 
 void IrqMgr_HandlePRENMI480(IrqMgr* this) {
     u32 ret;
 
-    osSetTimer(&this->timer, OS_USEC_TO_CYCLES(20000), 0ull, &this->queue, (OSMesg)PRENMI500_MSG);
+    osSetTimer(&this->timer, OS_USEC_TO_CYCLES(20000), 0ull, &this->queue, OS_MESG_32(PRENMI500_MSG));
     ret = osAfterPreNMI();
     if (ret) {
         // "osAfterPreNMI returned %d !?"
         osSyncPrintf("osAfterPreNMIが %d を返しました！？\n", ret);
-        osSetTimer(&this->timer, OS_USEC_TO_CYCLES(1000), 0ull, &this->queue, (OSMesg)PRENMI480_MSG);
+        osSetTimer(&this->timer, OS_USEC_TO_CYCLES(1000), 0ull, &this->queue, OS_MESG_32(PRENMI480_MSG));
     }
 }
 
@@ -160,7 +160,7 @@ void IrqMgr_HandleRetrace(IrqMgr* this) {
         }
     }
     sIrqMgrRetraceCount++;
-    IrqMgr_SendMesgForClient(this, (OSMesg) & this->retraceMsg);
+    IrqMgr_SendMesgForClient(this, OS_MESG_PTR(&this->retraceMsg));
 }
 
 void IrqMgr_ThreadEntry(void* arg0) {
@@ -168,13 +168,13 @@ void IrqMgr_ThreadEntry(void* arg0) {
     IrqMgr* this = (IrqMgr*)arg0;
     u8 exit;
 
-    msg = 0;
+    msg.data32 = 0;
     osSyncPrintf("ＩＲＱマネージャスレッド実行開始\n"); // "Start IRQ manager thread execution"
     exit = false;
 
     while (!exit) {
         osRecvMesg(&this->queue, &msg, OS_MESG_BLOCK);
-        switch ((u32)msg) {
+        switch (msg.data32) {
             case RETRACE_MSG:
                 IrqMgr_HandleRetrace(this);
                 break;
@@ -225,8 +225,8 @@ void IrqMgr_Init(IrqMgr* this, void* stack, OSPri pri, u8 retraceCount) {
     this->resetTime = 0;
 
     osCreateMesgQueue(&this->queue, this->msgBuf, ARRAY_COUNT(this->msgBuf));
-    osSetEventMesg(OS_EVENT_PRENMI, &this->queue, (OSMesg)PRE_NMI_MSG);
-    osViSetEvent(&this->queue, (OSMesg)RETRACE_MSG, retraceCount);
+    osSetEventMesg(OS_EVENT_PRENMI, &this->queue, OS_MESG_32(PRE_NMI_MSG));
+    osViSetEvent(&this->queue, OS_MESG_32(RETRACE_MSG), retraceCount);
     osCreateThread(&this->thread, 0x13, IrqMgr_ThreadEntry, this, stack, pri);
     osStartThread(&this->thread);
 }
diff --git a/soh/src/code/main.c b/soh/src/code/main.c
index b9e74298d..35435815c 100644
--- a/soh/src/code/main.c
+++ b/soh/src/code/main.c
@@ -87,7 +87,7 @@ void Main(void* arg) {
     R_ENABLE_ARENA_DBG = 0;
 
     osCreateMesgQueue(&sSiIntMsgQ, sSiIntMsgBuf, 1);
-    osSetEventMesg(5, &sSiIntMsgQ, 0);
+    osSetEventMesg(5, &sSiIntMsgQ, OS_MESG_PTR(NULL));
 
     Main_LogSystemHeap();
 
@@ -118,7 +118,7 @@ void Main(void* arg) {
 
     while (true) {
         msg = NULL;
-        osRecvMesg(&irqMgrMsgQ, (OSMesg)&msg, OS_MESG_BLOCK);
+        osRecvMesg(&irqMgrMsgQ, (OSMesg*)&msg, OS_MESG_BLOCK);
         if (msg == NULL) {
             break;
         }
diff --git a/soh/src/code/padmgr.c b/soh/src/code/padmgr.c
index b467f5ee6..c650639df 100644
--- a/soh/src/code/padmgr.c
+++ b/soh/src/code/padmgr.c
@@ -20,7 +20,7 @@ OSMesgQueue* PadMgr_LockSerialMesgQueue(PadMgr* padMgr) {
                      padMgr->serialMsgQ.validCount, padMgr, &padMgr->serialMsgQ, &ctrlrQ);
     }
 
-    osRecvMesg(&padMgr->serialMsgQ, (OSMesg)&ctrlrQ, OS_MESG_BLOCK);
+    osRecvMesg(&padMgr->serialMsgQ, (OSMesg*)&ctrlrQ, OS_MESG_BLOCK);
 
     if (D_8012D280 > 2) {
         // "serialMsgQ Locked"
@@ -38,7 +38,7 @@ void PadMgr_UnlockSerialMesgQueue(PadMgr* padMgr, OSMesgQueue* ctrlrQ) {
                      padMgr->serialMsgQ.validCount, padMgr, &padMgr->serialMsgQ, ctrlrQ);
     }
 
-    osSendMesg(&padMgr->serialMsgQ, ctrlrQ, OS_MESG_BLOCK);
+    osSendMesgPtr(&padMgr->serialMsgQ, ctrlrQ, OS_MESG_BLOCK);
 
     if (D_8012D280 > 2) {
         // "serialMsgQ Unlocked"
@@ -52,7 +52,7 @@ void PadMgr_LockPadData(PadMgr* padMgr) {
 }
 
 void PadMgr_UnlockPadData(PadMgr* padMgr) {
-    osSendMesg(&padMgr->lockMsgQ, NULL, OS_MESG_BLOCK);
+    osSendMesgPtr(&padMgr->lockMsgQ, NULL, OS_MESG_BLOCK);
 }
 
 void PadMgr_RumbleControl(PadMgr* padMgr) {
@@ -174,7 +174,7 @@ void PadMgr_RumbleStop(PadMgr* padMgr) {
     for (i = 0; i < 4; i++) {
         if (osMotorInit(ctrlrQ, &padMgr->pfs[i], i) == 0) {
 #if 0
-            if ((gFaultStruct.msgId == 0) && (padMgr->rumbleOnFrames != 0)) 
+            if ((gFaultStruct.msgId == 0) && (padMgr->rumbleOnFrames != 0))
             {
                 osSyncPrintf(VT_FGCOL(YELLOW));
                 // "Stop vibration pack"
@@ -399,7 +399,7 @@ void PadMgr_ThreadEntry(PadMgr* padMgr) {
             osSyncPrintf("コントローラスレッドイベント待ち %lld\n", OS_CYCLES_TO_USEC(osGetTime()));
         }
 
-        osRecvMesg(&padMgr->interruptMsgQ, (OSMesg)&mesg, OS_MESG_BLOCK);
+        osRecvMesg(&padMgr->interruptMsgQ, (OSMesg*)&mesg, OS_MESG_BLOCK);
         //LogUtils_CheckNullPointer("msg", mesg, "../padmgr.c", 563);
 
         PadMgr_HandleRetraceMsg(padMgr);
diff --git a/soh/src/code/sched.c b/soh/src/code/sched.c
index 38b51bcde..4bc314491 100644
--- a/soh/src/code/sched.c
+++ b/soh/src/code/sched.c
@@ -84,12 +84,12 @@ void Sched_HandleReset(SchedContext* sc) {
             if (sc->curRSPTask != NULL) {
                 LOG_TIME("(((u64)(now - graph_rsp_start_time)*(1000000LL/15625LL))/((62500000LL*3/4)/15625LL))",
                          OS_CYCLES_TO_USEC(now - sRSPGFXStartTime), "../sched.c", 427);
-                osSendMesg(&sc->interruptQ, RSP_DONE_MSG, OS_MESG_NOBLOCK);
+                osSendMesg32(&sc->interruptQ, RSP_DONE_MSG, OS_MESG_NOBLOCK);
             }
             if (sc->curRDPTask != NULL) {
                 LOG_TIME("(((u64)(now - rdp_start_time)*(1000000LL/15625LL))/((62500000LL*3/4)/15625LL))",
                          OS_CYCLES_TO_USEC(now - sRDPStartTime), "../sched.c", 431);
-                osSendMesg(&sc->interruptQ, RDP_DONE_MSG, OS_MESG_NOBLOCK);
+                osSendMesg32(&sc->interruptQ, RDP_DONE_MSG, OS_MESG_NOBLOCK);
             }
         }
     }
@@ -294,10 +294,10 @@ void Sched_HandleEntry(SchedContext* sc) {
     OSScTask* nextRSP = NULL;
     OSScTask* nextRDP = NULL;
     s32 state;
-    OSMesg msg = NULL;
+    OSMesg msg = OS_MESG_PTR(NULL);
 
     while (osRecvMesg(&sc->cmdQ, &msg, OS_MESG_NOBLOCK) != -1) {
-        Sched_QueueTask(sc, msg);
+        Sched_QueueTask(sc, msg.ptr);
     }
 
     if (sc->doAudio != 0 && sc->curRSPTask != NULL) {
@@ -427,14 +427,14 @@ void Sched_SendEntryMsg(SchedContext* sc) {
         osSyncPrintf("osScKickEntryMsg\n");
     }
 
-    osSendMesg(&sc->interruptQ, ENTRY_MSG, OS_MESG_BLOCK);
+    osSendMesg32(&sc->interruptQ, ENTRY_MSG, OS_MESG_BLOCK);
 }
 
 void Sched_ThreadEntry(void* arg) {
-    void* msg;
+    OSMesg msg;
     SchedContext* sc = (SchedContext*)arg;
 
-    msg = NULL;
+    msg.ptr = NULL;
 
     while (true) {
         if (sLogScheduler) {
@@ -444,7 +444,7 @@ void Sched_ThreadEntry(void* arg) {
 
         osRecvMesg(&sc->interruptQ, &msg, OS_MESG_BLOCK);
 
-        switch ((s32)msg) {
+        switch (msg.data32) {
             case ENTRY_MSG:
                 if (sLogScheduler) {
                     osSyncPrintf("%08d:ENTRY_MSG\n", (u32)OS_CYCLES_TO_USEC(osGetTime()));
@@ -466,7 +466,7 @@ void Sched_ThreadEntry(void* arg) {
             default:
                 break;
         }
-        switch (((OSScMsg*)msg)->type) {
+        switch (((OSScMsg*)msg.ptr)->type) {
             case 1:
                 Sched_HandleRetrace(sc);
                 continue;
@@ -485,8 +485,8 @@ void Sched_Init(SchedContext* sc, void* stack, OSPri priority, UNK_TYPE arg3, UN
     sc->unk_24C = 1;
     osCreateMesgQueue(&sc->interruptQ, sc->intBuf, 8);
     osCreateMesgQueue(&sc->cmdQ, sc->cmdMsgBuf, 8);
-    osSetEventMesg(OS_EVENT_SP, &sc->interruptQ, RSP_DONE_MSG);
-    osSetEventMesg(OS_EVENT_DP, &sc->interruptQ, RDP_DONE_MSG);
+    osSetEventMesg(OS_EVENT_SP, &sc->interruptQ, OS_MESG_32(RSP_DONE_MSG));
+    osSetEventMesg(OS_EVENT_DP, &sc->interruptQ, OS_MESG_32(RDP_DONE_MSG));
     IrqMgr_AddClient(irqMgr, &sc->irqClient, &sc->interruptQ);
     osCreateThread(&sc->thread, 5, Sched_ThreadEntry, sc, stack, priority);
     osStartThread(&sc->thread);
diff --git a/soh/src/code/sleep.c b/soh/src/code/sleep.c
index f08129701..c637520e7 100644
--- a/soh/src/code/sleep.c
+++ b/soh/src/code/sleep.c
@@ -6,7 +6,7 @@ void Sleep_Cycles(OSTime cycles) {
     OSTimer timer;
 
     osCreateMesgQueue(&mq, &msg, OS_MESG_BLOCK);
-    osSetTimer(&timer, cycles, 0, &mq, NULL);
+    osSetTimer(&timer, cycles, 0, &mq, OS_MESG_PTR(NULL));
     osRecvMesg(&mq, NULL, OS_MESG_BLOCK);
 }
 
diff --git a/soh/src/code/z_lifemeter.c b/soh/src/code/z_lifemeter.c
index e45850a73..79a1f89eb 100644
--- a/soh/src/code/z_lifemeter.c
+++ b/soh/src/code/z_lifemeter.c
@@ -136,7 +136,7 @@ void HealthMeter_Init(GlobalContext* globalCtx) {
         HeartDDOutline[1] = HEARTS_DD_PRIM_G;
         HeartDDOutline[2] = HEARTS_DD_PRIM_B;
     }
-    
+
     interfaceCtx->unk_228 = 0x140;
     interfaceCtx->unk_226 = gSaveContext.health;
     interfaceCtx->unk_22A = interfaceCtx->unk_1FE = 0;
@@ -162,9 +162,9 @@ void HealthMeter_Init(GlobalContext* globalCtx) {
     sHeartsDDPrim[0][1] = sHeartsDDPrim[1][1] = HeartDDOutline[1];
     sHeartsDDPrim[0][2] = sHeartsDDPrim[1][2] = HeartDDOutline[2];
 
-    sHeartsDDPrim[2][0] = HeartInner[0];
-    sHeartsDDPrim[2][1] = HeartInner[1];
-    sHeartsDDPrim[2][2] = HeartInner[2];
+    // sHeartsDDPrim[2][0] = HeartInner[0];
+    // sHeartsDDPrim[2][1] = HeartInner[1];
+    // sHeartsDDPrim[2][2] = HeartInner[2];
 
     sHeartsDDEnv[0][0] = sHeartsDDEnv[1][0] = HeartDDInner[0];
     sHeartsDDEnv[0][1] = sHeartsDDEnv[1][1] = HeartDDInner[1];
@@ -274,11 +274,11 @@ void HealthMeter_Update(GlobalContext* globalCtx) {
     sHeartsDDEnv[0][2] = HeartDDInner[2];
 
     if (CVar_GetS32("gHudColors", 1) == 2) {
-        sHeartsDDPrim[2][0] = HeartInner[0]; 
+        sHeartsDDPrim[2][0] = HeartInner[0];
         sHeartsDDPrim[2][1] = HeartInner[1];
         sHeartsDDPrim[2][2] = HeartInner[2];
 
-        sHeartsDDPrim[1][0] = HeartDDOutline[0]; 
+        sHeartsDDPrim[1][0] = HeartDDOutline[0];
         sHeartsDDPrim[1][1] = HeartDDOutline[1];
         sHeartsDDPrim[1][2] = HeartDDOutline[2];
 
@@ -286,7 +286,7 @@ void HealthMeter_Update(GlobalContext* globalCtx) {
         sHeartsDDEnv[1][1] = HeartDDInner[1];
         sHeartsDDEnv[1][2] = HeartDDInner[2];
 
-        HeartDDInner[0] = HeartInner[0]; 
+        HeartDDInner[0] = HeartInner[0];
         HeartDDInner[1] = HeartInner[1];
         HeartDDInner[2] = HeartInner[2];
 
@@ -306,9 +306,9 @@ void HealthMeter_Update(GlobalContext* globalCtx) {
         sBeatingHeartsDDEnv[1] = (u8)(gFactor + HeartDDInner[1]) & 0xFF;
         sBeatingHeartsDDEnv[2] = (u8)(bFactor + HeartDDInner[2]) & 0xFF;
     } else {
-        sHeartsDDPrim[2][0] = HEARTS_PRIM_R; 
-        sHeartsDDPrim[2][1] = HEARTS_PRIM_G;
-        sHeartsDDPrim[2][2] = HEARTS_PRIM_B;
+        // sHeartsDDPrim[2][0] = HEARTS_PRIM_R;
+        // sHeartsDDPrim[2][1] = HEARTS_PRIM_G;
+        // sHeartsDDPrim[2][2] = HEARTS_PRIM_B;
 
         sHeartsDDPrim[1][0] = HEARTS_DD_PRIM_R;
         sHeartsDDPrim[1][1] = HEARTS_DD_PRIM_G;
diff --git a/soh/src/code/z_msgevent.c b/soh/src/code/z_msgevent.c
index 267180e1f..7ea6521ed 100644
--- a/soh/src/code/z_msgevent.c
+++ b/soh/src/code/z_msgevent.c
@@ -10,11 +10,11 @@ void MsgEvent_SendNullTask(void) {
     task.next = NULL;
     task.flags = OS_SC_RCP_MASK;
     task.msgQ = &queue;
-    task.msg = NULL;
+    task.msg.ptr = NULL;
     task.framebuffer = NULL;
     task.list.t.type = M_NULTASK;
     osCreateMesgQueue(task.msgQ, &msg, 1);
-    osSendMesg(&gSchedContext.cmdQ, &task, OS_MESG_BLOCK);
+    osSendMesgPtr(&gSchedContext.cmdQ, &task, OS_MESG_BLOCK);
     Sched_SendEntryMsg(&gSchedContext);
     osRecvMesg(&queue, NULL, OS_MESG_BLOCK);
 }
diff --git a/soh/src/code/z_parameter.c b/soh/src/code/z_parameter.c
index a9e9e4f9e..57cb53c1a 100644
--- a/soh/src/code/z_parameter.c
+++ b/soh/src/code/z_parameter.c
@@ -1317,7 +1317,7 @@ void Interface_LoadItemIcon1(GlobalContext* globalCtx, u16 button) {
     osCreateMesgQueue(&interfaceCtx->loadQueue, &interfaceCtx->loadMsg, OS_MESG_BLOCK);
     DmaMgr_SendRequest2(&interfaceCtx->dmaRequest_160, interfaceCtx->iconItemSegment + button * 0x1000,
                         (uintptr_t)_icon_item_staticSegmentRomStart + (gSaveContext.equips.buttonItems[button] * 0x1000),
-                        0x1000, 0, &interfaceCtx->loadQueue, NULL, "../z_parameter.c", 1171);
+                        0x1000, 0, &interfaceCtx->loadQueue, OS_MESG_PTR(NULL), "../z_parameter.c", 1171);
     osRecvMesg(&interfaceCtx->loadQueue, NULL, OS_MESG_BLOCK);
 }
 
@@ -1327,7 +1327,7 @@ void Interface_LoadItemIcon2(GlobalContext* globalCtx, u16 button) {
     osCreateMesgQueue(&interfaceCtx->loadQueue, &interfaceCtx->loadMsg, OS_MESG_BLOCK);
     DmaMgr_SendRequest2(&interfaceCtx->dmaRequest_180, interfaceCtx->iconItemSegment + button * 0x1000,
                         (uintptr_t)_icon_item_staticSegmentRomStart + (gSaveContext.equips.buttonItems[button] * 0x1000),
-                        0x1000, 0, &interfaceCtx->loadQueue, NULL, "../z_parameter.c", 1193);
+                        0x1000, 0, &interfaceCtx->loadQueue, OS_MESG_PTR(NULL), "../z_parameter.c", 1193);
     osRecvMesg(&interfaceCtx->loadQueue, NULL, OS_MESG_BLOCK);
 }
 
@@ -2164,7 +2164,7 @@ void Interface_SetNaviCall(GlobalContext* globalCtx, u16 naviCallState) {
 
     if (((naviCallState == 0x1D) || (naviCallState == 0x1E)) && !interfaceCtx->naviCalling &&
         (globalCtx->csCtx.state == CS_STATE_IDLE)) {
-        if (!CVar_GetS32("gDisableNaviCallAudio", 0)) {            
+        if (!CVar_GetS32("gDisableNaviCallAudio", 0)) {
             // clang-format off
             if (naviCallState == 0x1E) { Audio_PlaySoundGeneral(NA_SE_VO_NAVY_CALL, &D_801333D4, 4,
                                                                 &D_801333E0, &D_801333E0, &D_801333E8); }
@@ -2884,7 +2884,7 @@ void Interface_DrawItemButtons(GlobalContext* globalCtx) {
             gDPSetEnvColor(OVERLAY_DISP++, 0, 0, 0, 0);
             gDPSetCombineLERP(OVERLAY_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0,
                               PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0);
-            
+
             //There is probably a more elegant way to do it.
             char* doAction = actionsTbl[3];
             char newName[512];
@@ -2903,7 +2903,7 @@ void Interface_DrawItemButtons(GlobalContext* globalCtx) {
                 doAction = newName;
             }
             memcpy(interfaceCtx->doActionSegment + DO_ACTION_TEX_SIZE * 2, ResourceMgr_LoadTexByName(doAction), DO_ACTION_TEX_SIZE);
-            
+
             gDPLoadTextureBlock_4b(OVERLAY_DISP++, interfaceCtx->doActionSegment + DO_ACTION_TEX_SIZE * 2, G_IM_FMT_IA,
                                    DO_ACTION_TEX_WIDTH, DO_ACTION_TEX_HEIGHT, 0, G_TX_NOMIRROR | G_TX_WRAP,
                                    G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
@@ -2987,8 +2987,8 @@ void Interface_DrawItemButtons(GlobalContext* globalCtx) {
                 //This later will feature color per C button right now that it.
                 gDPSetPrimColor(OVERLAY_DISP++, 0, 0, CVar_GetS32("gCCCBtnPrimR", R_C_BTN_COLOR(0)), CVar_GetS32("gCCCBtnPrimG", R_C_BTN_COLOR(1)), CVar_GetS32("gCCCBtnPrimB", R_C_BTN_COLOR(2)), interfaceCtx->cRightAlpha);
             }
-            
-            OVERLAY_DISP = Gfx_TextureIA8(OVERLAY_DISP, ((u8*)gButtonBackgroundTex), 32, 32, 
+
+            OVERLAY_DISP = Gfx_TextureIA8(OVERLAY_DISP, ((u8*)gButtonBackgroundTex), 32, 32,
                                           OTRGetRectDimensionFromRightEdge(R_ITEM_BTN_X(temp)+Right_HUD_Margin), R_ITEM_BTN_Y(temp)+(Top_HUD_Margin*-1), R_ITEM_BTN_WIDTH(temp),
                                           R_ITEM_BTN_WIDTH(temp), R_ITEM_BTN_DD(temp) << 1, R_ITEM_BTN_DD(temp) << 1);
 
@@ -3073,7 +3073,7 @@ void Interface_DrawAmmoCount(GlobalContext* globalCtx, s16 button, s16 alpha) {
         }
 
         if (i != 0) {
-            OVERLAY_DISP = Gfx_TextureIA8(OVERLAY_DISP, (u8*)_gAmmoDigit0Tex[i], 8, 8, 
+            OVERLAY_DISP = Gfx_TextureIA8(OVERLAY_DISP, (u8*)_gAmmoDigit0Tex[i], 8, 8,
                                           OTRGetRectDimensionFromRightEdge(R_ITEM_AMMO_X(button)+Right_HUD_Margin), R_ITEM_AMMO_Y(button)+(Top_HUD_Margin*-1), 8, 8, 1 << 10, 1 << 10);
         }
 
@@ -3444,11 +3444,11 @@ void Interface_Draw(GlobalContext* globalCtx) {
 
                 if ((player->stateFlags1 & 0x00800000) || (globalCtx->shootingGalleryStatus > 1) ||
                     ((globalCtx->sceneNum == SCENE_BOWLING) && Flags_GetSwitch(globalCtx, 0x38))) {
-                    
+
                     if (!fullUi) {
                         Interface_DrawItemIconTexture(globalCtx, gItemIcons[gSaveContext.equips.buttonItems[0]], 0);
                     }
-                    
+
                     gDPPipeSync(OVERLAY_DISP++);
                     gDPSetCombineLERP(OVERLAY_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE,
                                       0, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0);
@@ -4070,7 +4070,7 @@ void Interface_Draw(GlobalContext* globalCtx) {
 
                 for (svar1 = 0; svar1 < 5; svar1++) {
                     // clang-format off
-                    svar5 = OTRGetRectDimensionFromLeftEdge(gSaveContext.timerX[svar6]); 
+                    svar5 = OTRGetRectDimensionFromLeftEdge(gSaveContext.timerX[svar6]);
                     OVERLAY_DISP = Gfx_TextureI8(OVERLAY_DISP, digitTextures[timerDigits[svar1]], 8, 16,
                                       svar5 + timerDigitLeftPos[svar1],
                                       svar2 = gSaveContext.timerY[svar6], digitWidth[svar1], VREG(42), VREG(43) << 1,
diff --git a/soh/src/code/z_room.c b/soh/src/code/z_room.c
index d3e1171ea..f1fa7c7e1 100644
--- a/soh/src/code/z_room.c
+++ b/soh/src/code/z_room.c
@@ -586,7 +586,7 @@ s32 func_8009728C(GlobalContext* globalCtx, RoomContext* roomCtx, s32 roomNum) {
 
         osCreateMesgQueue(&roomCtx->loadQueue, &roomCtx->loadMsg, 1);
         DmaMgr_SendRequest2(&roomCtx->dmaRequest, roomCtx->unk_34, globalCtx->roomList[roomNum].vromStart, size, 0,
-                            &roomCtx->loadQueue, NULL, "../z_room.c", 1036);
+                            &roomCtx->loadQueue, OS_MESG_PTR(NULL), "../z_room.c", 1036);
         roomCtx->unk_30 ^= 1;
 
         return 1;