diff --git a/soh/include/macros.h b/soh/include/macros.h
index 0cdd613f8..05dfbd452 100644
--- a/soh/include/macros.h
+++ b/soh/include/macros.h
@@ -86,29 +86,29 @@
 #define CHECK_FLAG_ALL(flags, mask) (((flags) & (mask)) == (mask))
 
 #ifndef NDEBUG
-#define LOG(exp, value, format, file, line)         \
+#define LOG(exp, value, format)         \
     do {                                            \
-        LogUtils_LogThreadId(file, line);           \
+        LogUtils_LogThreadId(__FILE__, __FILE__);           \
         osSyncPrintf(exp " = " format "\n", value); \
     } while (0)
 #else
-#define LOG(exp, value, format, file, line) ((void)0)
+#define LOG(exp, value, format) ((void)0)
 #endif
 
 #ifndef NDEBUG
-#define LOG_STRING(string, file, line) LOG(#string, string, "%s", file, line)
-#define LOG_ADDRESS(exp, value, file, line) LOG(exp, value, "%08x", file, line)
-#define LOG_TIME(exp, value, file, line) LOG(exp, value, "%lld", file, line)
-#define LOG_NUM(exp, value, file, line) LOG(exp, value, "%d", file, line)
-#define LOG_HEX(exp, value, file, line) LOG(exp, value, "%x", file, line)
-#define LOG_FLOAT(exp, value, file, line) LOG(exp, value, "%f", file, line)
+#define LOG_STRING(string) LOG(#string, string, "%s")
+#define LOG_ADDRESS(exp, value) LOG(exp, value, "%p")
+#define LOG_TIME(exp, value) LOG(exp, value, "%lld")
+#define LOG_NUM(exp, value) LOG(exp, value, "%d")
+#define LOG_HEX(exp, value) LOG(exp, value, "%x")
+#define LOG_FLOAT(exp, value) LOG(exp, value, "%f")
 #else
-#define LOG_STRING(string, file, line) ((void)0)
-#define LOG_ADDRESS(exp, value, file, line) ((void)0)
-#define LOG_TIME(exp, value, file, line) ((void)0)
-#define LOG_NUM(exp, value, file, line) ((void)0)
-#define LOG_HEX(exp, value, file, line) ((void)0)
-#define LOG_FLOAT(exp, value, file, line) ((void)0)
+#define LOG_STRING(string) ((void)0)
+#define LOG_ADDRESS(exp, value) ((void)0)
+#define LOG_TIME(exp, value) ((void)0)
+#define LOG_NUM(exp, value) ((void)0)
+#define LOG_HEX(exp, value) ((void)0)
+#define LOG_FLOAT(exp, value) ((void)0)
 #endif
 
 #define SET_NEXT_GAMESTATE(curState, newInit, newStruct) \
diff --git a/soh/src/boot/z_std_dma.c b/soh/src/boot/z_std_dma.c
index 847f35b12..ba21c6a4a 100644
--- a/soh/src/boot/z_std_dma.c
+++ b/soh/src/boot/z_std_dma.c
@@ -353,8 +353,7 @@ s32 DmaMgr_SendRequestImpl(DmaRequest* req, uintptr_t ram, uintptr_t vrom, size_
             osSyncPrintf("%c", 7);
             osSyncPrintf(VT_FGCOL(RED));
             osSyncPrintf("dmaEntryMsgQが一杯です。キューサイズの再検討をおすすめします。");
-            LOG_NUM("(sizeof(dmaEntryMsgBufs) / sizeof(dmaEntryMsgBufs[0]))", ARRAY_COUNT(sDmaMgrMsgs),
-                    __FILE__, __LINE__);
+            LOG_NUM("(sizeof(dmaEntryMsgBufs) / sizeof(dmaEntryMsgBufs[0]))", ARRAY_COUNT(sDmaMgrMsgs));
             osSyncPrintf(VT_RST);
         }
     }
diff --git a/soh/src/code/graph.c b/soh/src/code/graph.c
index bf0e1f5f7..949ce48d9 100644
--- a/soh/src/code/graph.c
+++ b/soh/src/code/graph.c
@@ -134,7 +134,7 @@ GameStateOverlay* Graph_GetNextGameState(GameState* gameState) {
         return &gGameStateOverlayTable[5];
     }
 
-    LOG_ADDRESS("game_init_func", gameStateInitFunc, __FILE__, __LINE__);
+    LOG_ADDRESS("game_init_func", gameStateInitFunc);
     return NULL;
 }
 
diff --git a/soh/src/code/padmgr.c b/soh/src/code/padmgr.c
index 4f14a9865..69fb8f5fb 100644
--- a/soh/src/code/padmgr.c
+++ b/soh/src/code/padmgr.c
@@ -154,7 +154,7 @@ void PadMgr_RumbleControl(PadMgr* padMgr) {
             } else if (var4 == 11) {
                 padMgr->pakType[i] = 2;
             } else if (var4 == 4) {
-                LOG_NUM("++errcnt", ++errcnt, __FILE__, __LINE__);
+                LOG_NUM("++errcnt", ++errcnt);
                 osSyncPrintf(VT_FGCOL(YELLOW));
                 // "Controller pack communication error"
                 osSyncPrintf("padmgr: %dコン: %s\n", i + 1, "コントローラパックの通信エラー");
@@ -237,7 +237,7 @@ void PadMgr_ProcessInputs(PadMgr* padMgr) {
                 break;
             case 4:
                 input->cur = input->prev;
-                LOG_NUM("this->Key_switch[i]", padMgr->ctrlrIsConnected[i], __FILE__, __LINE__);
+                LOG_NUM("this->Key_switch[i]", padMgr->ctrlrIsConnected[i]);
                 osSyncPrintf(VT_FGCOL(YELLOW));
                 // "Overrun error occurred"
                 osSyncPrintf("padmgr: %dコン: %s\n", i + 1, "オーバーランエラーが発生");
@@ -259,7 +259,7 @@ void PadMgr_ProcessInputs(PadMgr* padMgr) {
                 }
                 break;
             default:
-                LOG_HEX("padnow1->errno", padnow1->err_no, __FILE__, __LINE__);
+                LOG_HEX("padnow1->errno", padnow1->err_no);
                 Fault_AddHungupAndCrash(__FILE__, __LINE__);
         }
 
@@ -325,7 +325,7 @@ void PadMgr_HandleRetraceMsg(PadMgr* padMgr) {
             if (padMgr->padStatus[i].type == CONT_TYPE_NORMAL) {
                 mask |= 1 << i;
             } else {
-                //LOG_HEX("this->pad_status[i].type", padMgr->padStatus[i].type, __FILE__, __LINE__);
+                //LOG_HEX("this->pad_status[i].type", padMgr->padStatus[i].type);
                 // "An unknown type of controller is connected"
                 //osSyncPrintf("知らない種類のコントローラが接続されています\n");
             }
@@ -400,7 +400,7 @@ void PadMgr_ThreadEntry(PadMgr* padMgr) {
         }
 
         osRecvMesg(&padMgr->interruptMsgQ, (OSMesg*)&mesg, OS_MESG_BLOCK);
-        //LogUtils_CheckNullPointer("msg", mesg, __FILE__, __LINE__);
+        //LogUtils_CheckNullPointer("msg", mesg);
 
         PadMgr_HandleRetraceMsg(padMgr);
         break;
diff --git a/soh/src/code/sched.c b/soh/src/code/sched.c
index 1ec891e58..f1c3d2dbb 100644
--- a/soh/src/code/sched.c
+++ b/soh/src/code/sched.c
@@ -77,18 +77,18 @@ void Sched_HandleReset(SchedContext* sc) {
 
         if (sc->curRSPTask->framebuffer == NULL) {
             LOG_TIME("(((u64)(now - audio_rsp_start_time)*(1000000LL/15625LL))/((62500000LL*3/4)/15625LL))",
-                     OS_CYCLES_TO_USEC(now - sRSPAudioStartTime), __FILE__, __LINE__);
+                     OS_CYCLES_TO_USEC(now - sRSPAudioStartTime));
         } else if (OS_CYCLES_TO_USEC(now - sRSPGFXStartTime) > 1000000 ||
                    OS_CYCLES_TO_USEC(now - sRDPStartTime) > 1000000) {
             func_800FBFD8();
             if (sc->curRSPTask != NULL) {
                 LOG_TIME("(((u64)(now - graph_rsp_start_time)*(1000000LL/15625LL))/((62500000LL*3/4)/15625LL))",
-                         OS_CYCLES_TO_USEC(now - sRSPGFXStartTime), __FILE__, __LINE__);
+                         OS_CYCLES_TO_USEC(now - sRSPGFXStartTime));
                 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), __FILE__, __LINE__);
+                         OS_CYCLES_TO_USEC(now - sRDPStartTime));
                 osSendMesg32(&sc->interruptQ, RDP_DONE_MSG, OS_MESG_NOBLOCK);
             }
         }
diff --git a/soh/src/code/speed_meter.c b/soh/src/code/speed_meter.c
index 27a042b82..9bb9ad39d 100644
--- a/soh/src/code/speed_meter.c
+++ b/soh/src/code/speed_meter.c
@@ -120,7 +120,7 @@ void SpeedMeter_DrawAllocEntry(SpeedMeterAllocEntry* this, GraphicsContext* gfxC
 
     if (this->maxval == 0) {
         osSyncPrintf(VT_FGCOL(RED));
-        LOG_NUM("this->maxval", this->maxval, __FILE__, __LINE__);
+        LOG_NUM("this->maxval", this->maxval);
         osSyncPrintf(VT_RST);
     } else {
         OPEN_DISPS(gfxCtx);
diff --git a/soh/src/code/z_elf_message.c b/soh/src/code/z_elf_message.c
index 6441adc45..3e75c5c22 100644
--- a/soh/src/code/z_elf_message.c
+++ b/soh/src/code/z_elf_message.c
@@ -58,7 +58,7 @@ u32 ElfMessage_CheckCondition(ElfMessage* msg) {
             }
     }
 
-    LOG_STRING("企画外 条件", __FILE__, __LINE__); // "Unplanned conditions"
+    LOG_STRING("企画外 条件"); // "Unplanned conditions"
     ASSERT(0, "0", __FILE__, __LINE__);
 
     return false;
@@ -141,7 +141,7 @@ u16 ElfMessage_GetTextFromMsgs(ElfMessage* msg) {
             case (ELF_MSG_TYPE_END << 5):
                 return msg->byte2 | 0x100;
             default:
-                LOG_STRING("企画外 条件", __FILE__, __LINE__); // "Unplanned conditions"
+                LOG_STRING("企画外 条件"); // "Unplanned conditions"
                 ASSERT(0, "0", __FILE__, __LINE__);
         }
         msg++;
diff --git a/soh/src/code/z_fbdemo.c b/soh/src/code/z_fbdemo.c
index aaecfff42..712c9cf63 100644
--- a/soh/src/code/z_fbdemo.c
+++ b/soh/src/code/z_fbdemo.c
@@ -89,9 +89,8 @@ void TransitionUnk_InitGraphics(TransitionUnk* this) {
     gDPPipeSync(gfx++);
     gSPEndDisplayList(gfx++);
 
-    LOG_NUM("this->col * (1 + this->row * (1 + 7 + 1)) + 1 + 1", this->col * (1 + this->row * 9) + 2, __FILE__,
-            __LINE__);
-    LOG_NUM("gp - this->gfxtbl", gfx - this->gfx, __FILE__, __LINE__);
+    LOG_NUM("this->col * (1 + this->row * (1 + 7 + 1)) + 1 + 1", this->col * (1 + this->row * 9) + 2);
+    LOG_NUM("gp - this->gfxtbl", gfx - this->gfx);
 }
 
 void TransitionUnk_InitData(TransitionUnk* this) {
diff --git a/soh/src/code/z_kaleido_scope_call.c b/soh/src/code/z_kaleido_scope_call.c
index a46deaaf5..6e7e81651 100644
--- a/soh/src/code/z_kaleido_scope_call.c
+++ b/soh/src/code/z_kaleido_scope_call.c
@@ -37,10 +37,10 @@ void KaleidoScopeCall_Init(GlobalContext* globalCtx) {
     sKaleidoScopeUpdateFunc = KaleidoManager_GetRamAddr(KaleidoScope_Update);
     sKaleidoScopeDrawFunc = KaleidoManager_GetRamAddr(KaleidoScope_Draw);
 
-    LOG_ADDRESS("kaleido_scope_move", KaleidoScope_Update, __FILE__, __LINE__);
-    LOG_ADDRESS("kaleido_scope_move_func", sKaleidoScopeUpdateFunc, __FILE__, __LINE__);
-    LOG_ADDRESS("kaleido_scope_draw", KaleidoScope_Draw, __FILE__, __LINE__);
-    LOG_ADDRESS("kaleido_scope_draw_func", sKaleidoScopeDrawFunc, __FILE__, __LINE__);
+    LOG_ADDRESS("kaleido_scope_move", KaleidoScope_Update);
+    LOG_ADDRESS("kaleido_scope_move_func", sKaleidoScopeUpdateFunc);
+    LOG_ADDRESS("kaleido_scope_draw", KaleidoScope_Draw);
+    LOG_ADDRESS("kaleido_scope_draw_func", sKaleidoScopeDrawFunc);
 
     KaleidoSetup_Init(globalCtx);
 }
diff --git a/soh/src/code/z_play.c b/soh/src/code/z_play.c
index 089da3bcb..b269400c0 100644
--- a/soh/src/code/z_play.c
+++ b/soh/src/code/z_play.c
@@ -728,7 +728,7 @@ void Gameplay_Update(GlobalContext* globalCtx) {
                         globalCtx->envCtx.sandstormPrimA = 255;
                         globalCtx->envCtx.sandstormEnvA = 255;
                         // "It's here!!!!!!!!!"
-                        LOG_STRING("来た!!!!!!!!!!!!!!!!!!!!!", __FILE__, __LINE__);
+                        LOG_STRING("来た!!!!!!!!!!!!!!!!!!!!!");
                         globalCtx->transitionMode = 15;
                     } else {
                         globalCtx->transitionMode = 12;
@@ -773,12 +773,12 @@ void Gameplay_Update(GlobalContext* globalCtx) {
         }
 
         if (1 && HREG(63)) {
-            LOG_NUM("1", 1, __FILE__, __LINE__);
+            LOG_NUM("1", 1);
         }
 
         if (1 && (gTrnsnUnkState != 3)) {
             if (1 && HREG(63)) {
-                LOG_NUM("1", 1, __FILE__, __LINE__);
+                LOG_NUM("1", 1);
             }
 
             if ((gSaveContext.gameMode == 0) && (globalCtx->msgCtx.msgMode == MSGMODE_NONE) &&
@@ -787,30 +787,30 @@ void Gameplay_Update(GlobalContext* globalCtx) {
             }
 
             if (1 && HREG(63)) {
-                LOG_NUM("1", 1, __FILE__, __LINE__);
+                LOG_NUM("1", 1);
             }
 
             sp80 = (globalCtx->pauseCtx.state != 0) || (globalCtx->pauseCtx.debugState != 0);
 
             if (1 && HREG(63)) {
-                LOG_NUM("1", 1, __FILE__, __LINE__);
+                LOG_NUM("1", 1);
             }
 
             AnimationContext_Reset(&globalCtx->animationCtx);
 
             if (1 && HREG(63)) {
-                LOG_NUM("1", 1, __FILE__, __LINE__);
+                LOG_NUM("1", 1);
             }
 
             Object_UpdateBank(&globalCtx->objectCtx);
 
             if (1 && HREG(63)) {
-                LOG_NUM("1", 1, __FILE__, __LINE__);
+                LOG_NUM("1", 1);
             }
 
             if ((sp80 == 0) && (IREG(72) == 0)) {
                 if (1 && HREG(63)) {
-                    LOG_NUM("1", 1, __FILE__, __LINE__);
+                    LOG_NUM("1", 1);
                 }
 
                 globalCtx->gameplayFrames++;
@@ -830,37 +830,37 @@ void Gameplay_Update(GlobalContext* globalCtx) {
                     }
                 } else {
                     if (1 && HREG(63)) {
-                        LOG_NUM("1", 1, __FILE__, __LINE__);
+                        LOG_NUM("1", 1);
                     }
 
                     func_800973FC(globalCtx, &globalCtx->roomCtx);
 
                     if (1 && HREG(63)) {
-                        LOG_NUM("1", 1, __FILE__, __LINE__);
+                        LOG_NUM("1", 1);
                     }
 
                     CollisionCheck_AT(globalCtx, &globalCtx->colChkCtx);
 
                     if (1 && HREG(63)) {
-                        LOG_NUM("1", 1, __FILE__, __LINE__);
+                        LOG_NUM("1", 1);
                     }
 
                     CollisionCheck_OC(globalCtx, &globalCtx->colChkCtx);
 
                     if (1 && HREG(63)) {
-                        LOG_NUM("1", 1, __FILE__, __LINE__);
+                        LOG_NUM("1", 1);
                     }
 
                     CollisionCheck_Damage(globalCtx, &globalCtx->colChkCtx);
 
                     if (1 && HREG(63)) {
-                        LOG_NUM("1", 1, __FILE__, __LINE__);
+                        LOG_NUM("1", 1);
                     }
 
                     CollisionCheck_ClearContext(globalCtx, &globalCtx->colChkCtx);
 
                     if (1 && HREG(63)) {
-                        LOG_NUM("1", 1, __FILE__, __LINE__);
+                        LOG_NUM("1", 1);
                     }
 
                     if (globalCtx->unk_11DE9 == 0) {
@@ -868,31 +868,31 @@ void Gameplay_Update(GlobalContext* globalCtx) {
                     }
 
                     if (1 && HREG(63)) {
-                        LOG_NUM("1", 1, __FILE__, __LINE__);
+                        LOG_NUM("1", 1);
                     }
 
                     func_80064558(globalCtx, &globalCtx->csCtx);
 
                     if (1 && HREG(63)) {
-                        LOG_NUM("1", 1, __FILE__, __LINE__);
+                        LOG_NUM("1", 1);
                     }
 
                     func_800645A0(globalCtx, &globalCtx->csCtx);
 
                     if (1 && HREG(63)) {
-                        LOG_NUM("1", 1, __FILE__, __LINE__);
+                        LOG_NUM("1", 1);
                     }
 
                     Effect_UpdateAll(globalCtx);
 
                     if (1 && HREG(63)) {
-                        LOG_NUM("1", 1, __FILE__, __LINE__);
+                        LOG_NUM("1", 1);
                     }
 
                     EffectSs_UpdateAll(globalCtx);
 
                     if (1 && HREG(63)) {
-                        LOG_NUM("1", 1, __FILE__, __LINE__);
+                        LOG_NUM("1", 1);
                     }
                 }
             } else {
@@ -900,19 +900,19 @@ void Gameplay_Update(GlobalContext* globalCtx) {
             }
 
             if (1 && HREG(63)) {
-                LOG_NUM("1", 1, __FILE__, __LINE__);
+                LOG_NUM("1", 1);
             }
 
             func_80095AA0(globalCtx, &globalCtx->roomCtx.curRoom, &input[1], 0);
 
             if (1 && HREG(63)) {
-                LOG_NUM("1", 1, __FILE__, __LINE__);
+                LOG_NUM("1", 1);
             }
 
             func_80095AA0(globalCtx, &globalCtx->roomCtx.prevRoom, &input[1], 1);
 
             if (1 && HREG(63)) {
-                LOG_NUM("1", 1, __FILE__, __LINE__);
+                LOG_NUM("1", 1);
             }
 
             if (globalCtx->unk_1242B != 0) {
@@ -933,65 +933,65 @@ void Gameplay_Update(GlobalContext* globalCtx) {
             }
 
             if (1 && HREG(63)) {
-                LOG_NUM("1", 1, __FILE__, __LINE__);
+                LOG_NUM("1", 1);
             }
 
             SkyboxDraw_Update(&globalCtx->skyboxCtx);
 
             if (1 && HREG(63)) {
-                LOG_NUM("1", 1, __FILE__, __LINE__);
+                LOG_NUM("1", 1);
             }
 
             if ((globalCtx->pauseCtx.state != 0) || (globalCtx->pauseCtx.debugState != 0)) {
                 if (1 && HREG(63)) {
-                    LOG_NUM("1", 1, __FILE__, __LINE__);
+                    LOG_NUM("1", 1);
                 }
 
                 KaleidoScopeCall_Update(globalCtx);
             } else if (globalCtx->gameOverCtx.state != GAMEOVER_INACTIVE) {
                 if (1 && HREG(63)) {
-                    LOG_NUM("1", 1, __FILE__, __LINE__);
+                    LOG_NUM("1", 1);
                 }
 
                 GameOver_Update(globalCtx);
             } else {
                 if (1 && HREG(63)) {
-                    LOG_NUM("1", 1, __FILE__, __LINE__);
+                    LOG_NUM("1", 1);
                 }
 
                 Message_Update(globalCtx);
             }
 
             if (1 && HREG(63)) {
-                LOG_NUM("1", 1, __FILE__, __LINE__);
+                LOG_NUM("1", 1);
             }
 
             if (1 && HREG(63)) {
-                LOG_NUM("1", 1, __FILE__, __LINE__);
+                LOG_NUM("1", 1);
             }
 
             Interface_Update(globalCtx);
 
             if (1 && HREG(63)) {
-                LOG_NUM("1", 1, __FILE__, __LINE__);
+                LOG_NUM("1", 1);
             }
 
             AnimationContext_Update(globalCtx, &globalCtx->animationCtx);
 
             if (1 && HREG(63)) {
-                LOG_NUM("1", 1, __FILE__, __LINE__);
+                LOG_NUM("1", 1);
             }
 
             SoundSource_UpdateAll(globalCtx);
 
             if (1 && HREG(63)) {
-                LOG_NUM("1", 1, __FILE__, __LINE__);
+                LOG_NUM("1", 1);
             }
 
             ShrinkWindow_Update(R_UPDATE_RATE);
 
             if (1 && HREG(63)) {
-                LOG_NUM("1", 1, __FILE__, __LINE__);
+                LOG_NUM("1", 1);
             }
 
             TransitionFade_Update(&globalCtx->transitionFade, R_UPDATE_RATE);
@@ -1001,12 +1001,12 @@ void Gameplay_Update(GlobalContext* globalCtx) {
     }
 
     if (1 && HREG(63)) {
-        LOG_NUM("1", 1, __FILE__, __LINE__);
+        LOG_NUM("1", 1);
     }
 
 skip:
     if (1 && HREG(63)) {
-        LOG_NUM("1", 1, __FILE__, __LINE__);
+        LOG_NUM("1", 1);
     }
 
     if ((sp80 == 0) || (gDbgCamEnabled)) {
@@ -1016,13 +1016,13 @@ skip:
         globalCtx->nextCamera = globalCtx->activeCamera;
 
         if (1 && HREG(63)) {
-            LOG_NUM("1", 1, __FILE__, __LINE__);
+            LOG_NUM("1", 1);
         }
 
         for (i = 0; i < NUM_CAMS; i++) {
             if ((i != globalCtx->nextCamera) && (globalCtx->cameraPtrs[i] != NULL)) {
                 if (1 && HREG(63)) {
-                    LOG_NUM("1", 1, __FILE__, __LINE__);
+                    LOG_NUM("1", 1);
                 }
 
                 Camera_Update(globalCtx->cameraPtrs[i]);
@@ -1032,12 +1032,12 @@ skip:
         Camera_Update(globalCtx->cameraPtrs[globalCtx->nextCamera]);
 
         if (1 && HREG(63)) {
-            LOG_NUM("1", 1, __FILE__, __LINE__);
+            LOG_NUM("1", 1);
         }
     }
 
     if (1 && HREG(63)) {
-        LOG_NUM("1", 1, __FILE__, __LINE__);
+        LOG_NUM("1", 1);
     }
 
     Environment_Update(globalCtx, &globalCtx->envCtx, &globalCtx->lightCtx, &globalCtx->pauseCtx, &globalCtx->msgCtx,
@@ -1352,7 +1352,7 @@ void Gameplay_Main(GameState* thisx) {
     DebugDisplay_Init();
 
     if (1 && HREG(63)) {
-        LOG_NUM("1", 1, __FILE__, __LINE__);
+        LOG_NUM("1", 1);
     }
 
     if ((HREG(80) == 10) && (HREG(94) != 10)) {
@@ -1377,7 +1377,7 @@ void Gameplay_Main(GameState* thisx) {
     }
 
     if (1 && HREG(63)) {
-        LOG_NUM("1", 1, __FILE__, __LINE__);
+        LOG_NUM("1", 1);
     }
 
     FrameInterpolation_StartRecord();
@@ -1385,7 +1385,7 @@ void Gameplay_Main(GameState* thisx) {
     FrameInterpolation_StopRecord();
 
     if (1 && HREG(63)) {
-        LOG_NUM("1", 1, __FILE__, __LINE__);
+        LOG_NUM("1", 1);
     }
 }
 
diff --git a/soh/src/code/z_room.c b/soh/src/code/z_room.c
index 0a391d187..cc338af27 100644
--- a/soh/src/code/z_room.c
+++ b/soh/src/code/z_room.c
@@ -530,7 +530,7 @@ u32 func_80096FE8(GlobalContext* globalCtx, RoomContext* roomCtx) {
         RomFile* roomList = globalCtx->roomList;
         TransitionActorEntry* transitionActor = &globalCtx->transiActorCtx.list[0];
 
-        LOG_NUM("game_play->room_rom_address.num", globalCtx->numRooms, __FILE__, __LINE__);
+        LOG_NUM("game_play->room_rom_address.num", globalCtx->numRooms);
 
         for (j = 0; j < globalCtx->transiActorCtx.numActors; j++) {
             frontRoom = transitionActor->sides[0].room;
diff --git a/soh/src/code/z_skelanime.c b/soh/src/code/z_skelanime.c
index d6633fcdd..8f63afa25 100644
--- a/soh/src/code/z_skelanime.c
+++ b/soh/src/code/z_skelanime.c
@@ -476,10 +476,10 @@ void SkelAnime_GetFrameData(AnimationHeader* animation, s32 frame, s32 limbCount
 
     for (i = 0; i < limbCount; i++, frameTable++, jointIndices++) {
         if ((frameTable == NULL) || (jointIndices == NULL) || (dynamicData == NULL) || (staticData == NULL)) {
-            LOG_ADDRESS("out", frameTable, __FILE__, __LINE__);
-            LOG_ADDRESS("ref_tbl", jointIndices, __FILE__, __LINE__);
-            LOG_ADDRESS("frame_tbl", dynamicData, __FILE__, __LINE__);
-            LOG_ADDRESS("tbl", staticData, __FILE__, __LINE__);
+            LOG_ADDRESS("out", frameTable);
+            LOG_ADDRESS("ref_tbl", jointIndices);
+            LOG_ADDRESS("frame_tbl", dynamicData);
+            LOG_ADDRESS("tbl", staticData);
         }
 
         frameTable->x =
diff --git a/soh/src/code/z_vimode.c b/soh/src/code/z_vimode.c
index b23d40e2d..6d4291cb1 100644
--- a/soh/src/code/z_vimode.c
+++ b/soh/src/code/z_vimode.c
@@ -1,25 +1,25 @@
 #include "global.h"
 
 void ViMode_LogPrint(OSViMode* osViMode) {
-    LOG_ADDRESS("osvimodep", osViMode, __FILE__, __LINE__);
-    LOG_ADDRESS("osvimodep->comRegs.ctrl", osViMode->comRegs.ctrl, __FILE__, __LINE__);
-    LOG_ADDRESS("osvimodep->comRegs.width", osViMode->comRegs.width, __FILE__, __LINE__);
-    LOG_ADDRESS("osvimodep->comRegs.burst", osViMode->comRegs.burst, __FILE__, __LINE__);
-    LOG_ADDRESS("osvimodep->comRegs.vSync", osViMode->comRegs.vSync, __FILE__, __LINE__);
-    LOG_ADDRESS("osvimodep->comRegs.hSync", osViMode->comRegs.hSync, __FILE__, __LINE__);
-    LOG_ADDRESS("osvimodep->comRegs.leap", osViMode->comRegs.leap, __FILE__, __LINE__);
-    LOG_ADDRESS("osvimodep->comRegs.hStart", osViMode->comRegs.hStart, __FILE__, __LINE__);
-    LOG_ADDRESS("osvimodep->comRegs.xScale", osViMode->comRegs.xScale, __FILE__, __LINE__);
-    LOG_ADDRESS("osvimodep->fldRegs[0].vStart", osViMode->fldRegs[0].vStart, __FILE__, __LINE__);
-    LOG_ADDRESS("osvimodep->fldRegs[0].vBurst", osViMode->fldRegs[0].vBurst, __FILE__, __LINE__);
-    LOG_ADDRESS("osvimodep->fldRegs[0].origin", osViMode->fldRegs[0].origin, __FILE__, __LINE__);
-    LOG_ADDRESS("osvimodep->fldRegs[0].yScale", osViMode->fldRegs[0].yScale, __FILE__, __LINE__);
-    LOG_ADDRESS("osvimodep->fldRegs[0].vIntr", osViMode->fldRegs[0].vIntr, __FILE__, __LINE__);
-    LOG_ADDRESS("osvimodep->fldRegs[1].vStart", osViMode->fldRegs[1].vStart, __FILE__, __LINE__);
-    LOG_ADDRESS("osvimodep->fldRegs[1].vBurst", osViMode->fldRegs[1].vBurst, __FILE__, __LINE__);
-    LOG_ADDRESS("osvimodep->fldRegs[1].origin", osViMode->fldRegs[1].origin, __FILE__, __LINE__);
-    LOG_ADDRESS("osvimodep->fldRegs[1].yScale", osViMode->fldRegs[1].yScale, __FILE__, __LINE__);
-    LOG_ADDRESS("osvimodep->fldRegs[1].vIntr", osViMode->fldRegs[1].vIntr, __FILE__, __LINE__);
+    LOG_ADDRESS("osvimodep", osViMode);
+    LOG_ADDRESS("osvimodep->comRegs.ctrl", osViMode->comRegs.ctrl);
+    LOG_ADDRESS("osvimodep->comRegs.width", osViMode->comRegs.width);
+    LOG_ADDRESS("osvimodep->comRegs.burst", osViMode->comRegs.burst);
+    LOG_ADDRESS("osvimodep->comRegs.vSync", osViMode->comRegs.vSync);
+    LOG_ADDRESS("osvimodep->comRegs.hSync", osViMode->comRegs.hSync);
+    LOG_ADDRESS("osvimodep->comRegs.leap", osViMode->comRegs.leap);
+    LOG_ADDRESS("osvimodep->comRegs.hStart", osViMode->comRegs.hStart);
+    LOG_ADDRESS("osvimodep->comRegs.xScale", osViMode->comRegs.xScale);
+    LOG_ADDRESS("osvimodep->fldRegs[0].vStart", osViMode->fldRegs[0].vStart);
+    LOG_ADDRESS("osvimodep->fldRegs[0].vBurst", osViMode->fldRegs[0].vBurst);
+    LOG_ADDRESS("osvimodep->fldRegs[0].origin", osViMode->fldRegs[0].origin);
+    LOG_ADDRESS("osvimodep->fldRegs[0].yScale", osViMode->fldRegs[0].yScale);
+    LOG_ADDRESS("osvimodep->fldRegs[0].vIntr", osViMode->fldRegs[0].vIntr);
+    LOG_ADDRESS("osvimodep->fldRegs[1].vStart", osViMode->fldRegs[1].vStart);
+    LOG_ADDRESS("osvimodep->fldRegs[1].vBurst", osViMode->fldRegs[1].vBurst);
+    LOG_ADDRESS("osvimodep->fldRegs[1].origin", osViMode->fldRegs[1].origin);
+    LOG_ADDRESS("osvimodep->fldRegs[1].yScale", osViMode->fldRegs[1].yScale);
+    LOG_ADDRESS("osvimodep->fldRegs[1].vIntr", osViMode->fldRegs[1].vIntr);
 }
 
 // This function configures the custom VI mode (`viMode.customViMode`) based on the other flags in `viMode`.
diff --git a/soh/src/code/z_vismono.c b/soh/src/code/z_vismono.c
index 06914fce4..c90ccee13 100644
--- a/soh/src/code/z_vismono.c
+++ b/soh/src/code/z_vismono.c
@@ -96,10 +96,10 @@ void VisMono_Draw(VisMono* this, Gfx** gfxp) {
         glistpEnd = VisMono_DrawTexture(this, monoDL);
 
         if (!(glistpEnd <= monoDL + DLSIZE)) {
-            LOG_ADDRESS("glistp_end", glistpEnd, __FILE__, __LINE__);
-            LOG_ADDRESS("mono_dl", monoDL, __FILE__, __LINE__);
-            LOG_ADDRESS("mono_dl + (1+3+1+1+80*(7+2+2+3)+1)", monoDL + DLSIZE, __FILE__, __LINE__);
-            LOG_ADDRESS("(1+3+1+1+80*(7+2+2+3)+1)", DLSIZE, __FILE__, __LINE__);
+            LOG_ADDRESS("glistp_end", glistpEnd);
+            LOG_ADDRESS("mono_dl", monoDL);
+            LOG_ADDRESS("mono_dl + (1+3+1+1+80*(7+2+2+3)+1)", monoDL + DLSIZE);
+            LOG_ADDRESS("(1+3+1+1+80*(7+2+2+3)+1)", DLSIZE);
         }
         ASSERT(glistpEnd <= monoDL + DLSIZE, "glistp_end <= mono_dl + DLSIZE", __FILE__, __LINE__);
     }
diff --git a/soh/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c b/soh/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c
index 40cc0e01c..1dfdaa2fa 100644
--- a/soh/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c
+++ b/soh/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c
@@ -56,7 +56,7 @@ void ArrowFire_Init(Actor* thisx, GlobalContext* globalCtx) {
 
 void ArrowFire_Destroy(Actor* thisx, GlobalContext* globalCtx) {
     func_800876C8(globalCtx);
-    LOG_STRING("消滅", __FILE__, __LINE__); // "Disappearance"
+    LOG_STRING("消滅"); // "Disappearance"
 }
 
 void ArrowFire_Charge(ArrowFire* this, GlobalContext* globalCtx) {
diff --git a/soh/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c b/soh/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c
index 484ad4435..73ed5f707 100644
--- a/soh/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c
+++ b/soh/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c
@@ -57,7 +57,7 @@ void ArrowIce_Init(Actor* thisx, GlobalContext* globalCtx) {
 
 void ArrowIce_Destroy(Actor* thisx, GlobalContext* globalCtx) {
     func_800876C8(globalCtx);
-    LOG_STRING("消滅", __FILE__, __LINE__); // "Disappearance"
+    LOG_STRING("消滅"); // "Disappearance"
 }
 
 void ArrowIce_Charge(ArrowIce* this, GlobalContext* globalCtx) {
diff --git a/soh/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c b/soh/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c
index 01d2d6709..6f4bf8b5d 100644
--- a/soh/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c
+++ b/soh/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c
@@ -57,7 +57,7 @@ void ArrowLight_Init(Actor* thisx, GlobalContext* globalCtx) {
 
 void ArrowLight_Destroy(Actor* thisx, GlobalContext* globalCtx) {
     func_800876C8(globalCtx);
-    LOG_STRING("消滅", __FILE__, __LINE__); // "Disappearance"
+    LOG_STRING("消滅"); // "Disappearance"
 }
 
 void ArrowLight_Charge(ArrowLight* this, GlobalContext* globalCtx) {
diff --git a/soh/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c b/soh/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c
index ffc670d10..d7e398bb4 100644
--- a/soh/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c
+++ b/soh/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c
@@ -63,7 +63,7 @@ void BgGndIceblock_Init(Actor* thisx, GlobalContext* globalCtx) {
         this->dyna.actor.params = 1;
         sBlockPositions[1] = 14;
     } else {
-        LOG_FLOAT("thisx->world.position.x", this->dyna.actor.world.pos.x, __FILE__, __LINE__);
+        LOG_FLOAT("thisx->world.position.x", this->dyna.actor.world.pos.x);
         ASSERT(0, "0", __FILE__, __LINE__);
     }
 }
diff --git a/soh/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c b/soh/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c
index 88096cfa7..18b4d0bd3 100644
--- a/soh/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c
+++ b/soh/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c
@@ -351,7 +351,7 @@ void BgHeavyBlock_LiftedUp(BgHeavyBlock* this, GlobalContext* globalCtx) {
     if (this->timer == 11) {
         func_800AA000(0.0f, 0xFF, 0x14, 0x14);
         func_8002F7DC(&player->actor, NA_SE_PL_PULL_UP_BIGROCK);
-        LOG_STRING("NA_SE_PL_PULL_UP_BIGROCK", __FILE__, __LINE__);
+        LOG_STRING("NA_SE_PL_PULL_UP_BIGROCK");
     }
 
     if (this->timer < 40) {
diff --git a/soh/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c b/soh/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c
index 5049223d3..338a2b9b7 100644
--- a/soh/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c
+++ b/soh/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c
@@ -253,7 +253,7 @@ void DemoKekkai_TrialBarrierIdle(Actor* thisx, GlobalContext* globalCtx) {
     if (this->collider2.base.acFlags & AC_HIT) {
         func_80078884(NA_SE_SY_CORRECT_CHIME);
         // "I got it"
-        LOG_STRING("当ったよ", __FILE__, __LINE__);
+        LOG_STRING("当ったよ");
         this->actor.update = DemoKekkai_TrialBarrierDispel;
         this->timer = 0;
         globalCtx->csCtx.segment = SEGMENTED_TO_VIRTUAL(sSageCutscenes[this->actor.params]);
diff --git a/soh/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c b/soh/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c
index a8831e2f2..2b014ef03 100644
--- a/soh/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c
+++ b/soh/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c
@@ -47,14 +47,14 @@ void ElfMsg_SetupAction(ElfMsg* this, ElfMsgActionFunc actionFunc) {
 s32 ElfMsg_KillCheck(ElfMsg* this, GlobalContext* globalCtx) {
     if ((this->actor.world.rot.y > 0) && (this->actor.world.rot.y < 0x41) &&
         Flags_GetSwitch(globalCtx, this->actor.world.rot.y - 1)) {
-        LOG_STRING("共倒れ", __FILE__, __LINE__); // "Mutual destruction"
+        LOG_STRING("共倒れ"); // "Mutual destruction"
         if (((this->actor.params >> 8) & 0x3F) != 0x3F) {
             Flags_SetSwitch(globalCtx, (this->actor.params >> 8) & 0x3F);
         }
         Actor_Kill(&this->actor);
         return 1;
     } else if ((this->actor.world.rot.y == -1) && Flags_GetClear(globalCtx, this->actor.room)) {
-        LOG_STRING("共倒れ", __FILE__, __LINE__); // "Mutual destruction"
+        LOG_STRING("共倒れ"); // "Mutual destruction"
         if (((this->actor.params >> 8) & 0x3F) != 0x3F) {
             Flags_SetSwitch(globalCtx, (this->actor.params >> 8) & 0x3F);
         }
diff --git a/soh/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c b/soh/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c
index 2baa4a332..689bf5458 100644
--- a/soh/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c
+++ b/soh/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c
@@ -47,14 +47,14 @@ void ElfMsg2_SetupAction(ElfMsg2* this, ElfMsg2ActionFunc actionFunc) {
 s32 ElfMsg2_KillCheck(ElfMsg2* this, GlobalContext* globalCtx) {
     if ((this->actor.world.rot.y > 0) && (this->actor.world.rot.y < 0x41) &&
         Flags_GetSwitch(globalCtx, this->actor.world.rot.y - 1)) {
-        LOG_STRING("共倒れ", __FILE__, __LINE__); // "Mutual destruction"
+        LOG_STRING("共倒れ"); // "Mutual destruction"
         if (((this->actor.params >> 8) & 0x3F) != 0x3F) {
             Flags_SetSwitch(globalCtx, ((this->actor.params >> 8) & 0x3F));
         }
         Actor_Kill(&this->actor);
         return 1;
     } else if ((this->actor.world.rot.y == -1) && Flags_GetClear(globalCtx, this->actor.room)) {
-        LOG_STRING("共倒れ2", __FILE__, __LINE__); // "Mutual destruction 2"
+        LOG_STRING("共倒れ2"); // "Mutual destruction 2"
         if (((this->actor.params >> 8) & 0x3F) != 0x3F) {
             Flags_SetSwitch(globalCtx, ((this->actor.params >> 8) & 0x3F));
         }
@@ -63,7 +63,7 @@ s32 ElfMsg2_KillCheck(ElfMsg2* this, GlobalContext* globalCtx) {
     } else if (((this->actor.params >> 8) & 0x3F) == 0x3F) {
         return 0;
     } else if (Flags_GetSwitch(globalCtx, ((this->actor.params >> 8) & 0x3F))) {
-        LOG_STRING("共倒れ", __FILE__, __LINE__); // "Mutual destruction"
+        LOG_STRING("共倒れ"); // "Mutual destruction"
         Actor_Kill(&this->actor);
         return 1;
     }
diff --git a/soh/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c b/soh/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c
index 3d13dc421..0c030bab0 100644
--- a/soh/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c
+++ b/soh/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c
@@ -130,8 +130,7 @@ void EnArrow_Init(Actor* thisx, GlobalContext* globalCtx) {
             this->collider.base.atFlags = (AT_ON | AT_TYPE_ENEMY);
         } else if (this->actor.params <= ARROW_SEED) {
             this->collider.info.toucher.dmgFlags = dmgFlags[this->actor.params];
-            LOG_HEX("this->at_info.cl_elem.at_btl_info.at_type", this->collider.info.toucher.dmgFlags,
-                    __FILE__, __LINE__);
+            LOG_HEX("this->at_info.cl_elem.at_btl_info.at_type", this->collider.info.toucher.dmgFlags);
         }
     }
 
diff --git a/soh/src/overlays/actors/ovl_En_Elf/z_en_elf.c b/soh/src/overlays/actors/ovl_En_Elf/z_en_elf.c
index 2d867a047..1091935f7 100644
--- a/soh/src/overlays/actors/ovl_En_Elf/z_en_elf.c
+++ b/soh/src/overlays/actors/ovl_En_Elf/z_en_elf.c
@@ -1407,8 +1407,7 @@ void func_80A053F0(Actor* thisx, GlobalContext* globalCtx) {
 
         if (nREG(81) != 0) {
             if (gSaveContext.sceneFlags[127].chest) {
-                LOG_NUM("z_common_data.memory.information.room_inf[127][ 0 ]", gSaveContext.sceneFlags[127].chest,
-                        __FILE__, __LINE__);
+                LOG_NUM("z_common_data.memory.information.room_inf[127][ 0 ]", gSaveContext.sceneFlags[127].chest);
             }
         }
 
diff --git a/soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c b/soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c
index b18ce4a2f..0c0d30b50 100644
--- a/soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c
+++ b/soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c
@@ -628,8 +628,8 @@ void EnGe1_TalkNoPrize_Archery(EnGe1* this, GlobalContext* globalCtx) {
 
 void EnGe1_TalkAfterGame_Archery(EnGe1* this, GlobalContext* globalCtx) {
     gSaveContext.eventInf[0] &= ~0x100;
-    LOG_NUM("z_common_data.yabusame_total", gSaveContext.minigameScore, __FILE__, __LINE__);
-    LOG_NUM("z_common_data.memory.information.room_inf[127][ 0 ]", HIGH_SCORE(HS_HBA), __FILE__, __LINE__);
+    LOG_NUM("z_common_data.yabusame_total", gSaveContext.minigameScore);
+    LOG_NUM("z_common_data.memory.information.room_inf[127][ 0 ]", HIGH_SCORE(HS_HBA));
     this->actor.flags |= ACTOR_FLAG_16;
 
     if (HIGH_SCORE(HS_HBA) < gSaveContext.minigameScore) {
diff --git a/soh/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c b/soh/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c
index fb15de462..551db44d4 100644
--- a/soh/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c
+++ b/soh/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c
@@ -277,7 +277,7 @@ void func_80AAF668(EnMm2* this, GlobalContext* globalCtx) {
             HIGH_SCORE(HS_MARATHON) = gSaveContext.timer2Value;
         }
     } else {
-        LOG_HEX("((z_common_data.event_inf[1]) & (0x0001))", gSaveContext.eventInf[1] & 1, __FILE__, __LINE__);
+        LOG_HEX("((z_common_data.event_inf[1]) & (0x0001))", gSaveContext.eventInf[1] & 1);
         if (!(gSaveContext.eventInf[1] & 1)) {
             this->unk_1F4 |= 2;
             this->unk_1F4 &= ~1;
diff --git a/soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c b/soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c
index 6c7588bef..3e95779d8 100644
--- a/soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c
+++ b/soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c
@@ -180,8 +180,7 @@ void func_80B85B28(ItemEtcetera* this, GlobalContext* globalCtx) {
 
 void ItemEtcetera_UpdateFireArrow(ItemEtcetera* this, GlobalContext* globalCtx) {
     if ((globalCtx->csCtx.state != CS_STATE_IDLE) && (globalCtx->csCtx.npcActions[0] != NULL)) {
-        LOG_NUM("(game_play->demo_play.npcdemopnt[0]->dousa)", globalCtx->csCtx.npcActions[0]->action,
-                __FILE__, __LINE__);
+        LOG_NUM("(game_play->demo_play.npcdemopnt[0]->dousa)", globalCtx->csCtx.npcActions[0]->action);
         if (globalCtx->csCtx.npcActions[0]->action == 2) {
             this->actor.draw = ItemEtcetera_Draw;
             this->actor.gravity = -0.1f;
diff --git a/soh/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c b/soh/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c
index 02b6eec92..ab64917f3 100644
--- a/soh/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c
+++ b/soh/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c
@@ -70,7 +70,7 @@ void ItemOcarina_Init(Actor* thisx, GlobalContext* globalCtx) {
             return;
     }
 
-    LOG_NUM("no", params, __FILE__, __LINE__);
+    LOG_NUM("no", params);
     this->spinRotOffset = 0x400;
 }
 
diff --git a/soh/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c b/soh/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c
index be2cd81dd..4c41c6a87 100644
--- a/soh/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c
+++ b/soh/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c
@@ -61,7 +61,7 @@ void MagicWind_Init(Actor* thisx, GlobalContext* globalCtx) {
             SkelCurve_SetAnim(&this->skelCurve, &sAnim, 60.0f, 0.0f, 60.0f, -1.0f);
             MagicWind_SetupAction(this, MagicWind_Shrink);
             // "Means start"
-            LOG_STRING("表示開始", __FILE__, __LINE__);
+            LOG_STRING("表示開始");
             func_8002F7DC(&player->actor, NA_SE_PL_MAGIC_WIND_WARP);
             break;
     }
@@ -72,7 +72,7 @@ void MagicWind_Destroy(Actor* thisx, GlobalContext* globalCtx) {
     SkelCurve_Destroy(globalCtx, &this->skelCurve);
     func_800876C8(globalCtx);
     // "wipe out"
-    LOG_STRING("消滅", __FILE__, __LINE__);
+    LOG_STRING("消滅");
 }
 
 void MagicWind_UpdateAlpha(f32 alpha) {
@@ -94,7 +94,7 @@ void MagicWind_WaitForTimer(MagicWind* this, GlobalContext* globalCtx) {
     }
 
     // "Means start"
-    LOG_STRING("表示開始", __FILE__, __LINE__);
+    LOG_STRING("表示開始");
     func_8002F7DC(&player->actor, NA_SE_PL_MAGIC_WIND_NORMAL);
     MagicWind_UpdateAlpha(1.0f);
     MagicWind_SetupAction(this, MagicWind_Grow);
diff --git a/soh/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c b/soh/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c
index e5ab32654..19c5f0fa2 100644
--- a/soh/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c
+++ b/soh/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c
@@ -168,11 +168,11 @@ void MirRay_Init(Actor* thisx, GlobalContext* globalCtx) {
     ActorShape_Init(&this->actor.shape, 0.0f, NULL, 0.0f);
     // "Generation of reflectable light!"
     osSyncPrintf("反射用 光の発生!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
-    LOG_NUM("this->actor.arg_data", this->actor.params, __FILE__, __LINE__);
+    LOG_NUM("this->actor.arg_data", this->actor.params);
 
     if (this->actor.params >= 0xA) {
         // "Reflected light generation failure"
-        LOG_STRING("反射光 発生失敗", __FILE__, __LINE__);
+        LOG_STRING("反射光 発生失敗");
         Actor_Kill(&this->actor);
     }
 
diff --git a/soh/src/overlays/actors/ovl_player_actor/z_player.c b/soh/src/overlays/actors/ovl_player_actor/z_player.c
index a3f1e7870..58b833a7f 100644
--- a/soh/src/overlays/actors/ovl_player_actor/z_player.c
+++ b/soh/src/overlays/actors/ovl_player_actor/z_player.c
@@ -4900,7 +4900,7 @@ void func_8083AE40(Player* this, s16 objectId) {
 
         size = gObjectTable[objectId].vromEnd - gObjectTable[objectId].vromStart;
 
-        LOG_HEX("size", size, __FILE__, __LINE__);
+        LOG_HEX("size", size);
         ASSERT(size <= 1024 * 8, "size <= 1024 * 8", __FILE__, __LINE__);
 
         DmaMgr_SendRequest2(&this->giObjectDmaRequest, (uintptr_t)this->giObjectSegment, gObjectTable[objectId].vromStart,