Add log macros

- Add log macros required to match `Graph_GetNextGameState`

6 files changed, 17 insertions, 27 deletions

diff --git a/src/code/graph.c b/src/code/graph.c
index 997bcd443..e29453bf2 100644
--- a/src/code/graph.c
+++ b/src/code/graph.c
@@ -124,8 +124,7 @@ GameStateOverlay* Graph_GetNextGameState() {
         return &gGameStateOverlayTable[5];
     }
 
-    LogUtils_LogThreadId("../graph.c", 696);
-    osSyncPrintf("game_init_func = %08x\n", game_init_func);
+    LOG_ADDRESS("game_init_func", game_init_func, "../graph.c", 696);
     return NULL;
 }
 
diff --git a/src/code/padmgr.c b/src/code/padmgr.c
index 5cc539dbf..8860c2980 100644
--- a/src/code/padmgr.c
+++ b/src/code/padmgr.c
@@ -143,8 +143,7 @@ void func_800C740C(PadMgr* padmgr) {
             } else if (var4 == 11) {
                 padmgr->unk_2AE[var3] = 2;
             } else if (var4 == 4) {
-                LogUtils_LogThreadId("../padmgr.c", 282);
-                osSyncPrintf("++errcnt = %d\n", ++D_8012D284);
+                LOG_VALUE("++errcnt", ++D_8012D284, "../padmgr.c", 282);
                 osSyncPrintf(VT_FGCOL(YELLOW));
                 osSyncPrintf("padmgr: %dコン: %s\n", var3 + 1, "コントローラパックの通信エラー");
                 osSyncPrintf(VT_RST);
diff --git a/src/code/z_elf_message.c b/src/code/z_elf_message.c
index 3828c6823..272efdf7a 100644
--- a/src/code/z_elf_message.c
+++ b/src/code/z_elf_message.c
@@ -47,8 +47,8 @@ u32 ElfMessage_CheckCondition(ElfMessage* msg) {
             }
     }
 
-    LogUtils_LogThreadId("../z_elf_message.c", 156);
-    osSyncPrintf("\"企画外 条件\" = %s\n", "企画外 条件"); // "Unplanned conditions"
+    // "Unplanned conditions"
+    LOG_STRING("\"企画外 条件\"", "企画外 条件", "../z_elf_message.c", 156);
     __assert("0", "../z_elf_message.c", 157);
 
     return false;
@@ -138,8 +138,8 @@ u16 ElfMessage_GetTextFromMsgs(ElfMessage* msg) {
             case 0xE0:
                 return msg->byte2 | 0x100;
             default:
-                LogUtils_LogThreadId("../z_elf_message.c", 281);
-                osSyncPrintf("\"企画外 条件\" = %s\n", "企画外 条件"); // "Unplanned conditions"
+                // "Unplanned conditions"
+                LOG_STRING("\"企画外 条件\"", "企画外 条件", "../z_elf_message.c", 281);
                 __assert("0", "../z_elf_message.c", 282);
         }
         msg++;
diff --git a/src/code/z_kaleido_scope_call.c b/src/code/z_kaleido_scope_call.c
index 3366c932d..60928cc61 100644
--- a/src/code/z_kaleido_scope_call.c
+++ b/src/code/z_kaleido_scope_call.c
@@ -30,15 +30,11 @@ void KaleidoScopeCall_Init(GlobalContext* globalCtx) {
     osSyncPrintf("カレイド・スコープ入れ替え コンストラクト \n");
     sKaleidoScopeUpdateFunc = KaleidoManager_GetRamAddr(func_80826CB4);
     sKaleidoScopeDrawFunc = KaleidoManager_GetRamAddr(func_808262B8);
-    // Note : the line numbers suggests there was a macro (see logutils.c)
-    LogUtils_LogThreadId("../z_kaleido_scope_call.c", 98);
-    osSyncPrintf("kaleido_scope_move = %08x\n", func_80826CB4);
-    LogUtils_LogThreadId("../z_kaleido_scope_call.c", 99);
-    osSyncPrintf("kaleido_scope_move_func = %08x\n", sKaleidoScopeUpdateFunc);
-    LogUtils_LogThreadId("../z_kaleido_scope_call.c", 100);
-    osSyncPrintf("kaleido_scope_draw = %08x\n", func_808262B8);
-    LogUtils_LogThreadId("../z_kaleido_scope_call.c", 101);
-    osSyncPrintf("kaleido_scope_draw_func = %08x\n", sKaleidoScopeDrawFunc);
+
+    LOG_ADDRESS("kaleido_scope_move", func_80826CB4, "../z_kaleido_scope_call.c", 98);
+    LOG_ADDRESS("kaleido_scope_move_func", sKaleidoScopeUpdateFunc, "../z_kaleido_scope_call.c", 99);
+    LOG_ADDRESS("kaleido_scope_draw", func_808262B8, "../z_kaleido_scope_call.c", 100);
+    LOG_ADDRESS("kaleido_scope_draw_func", sKaleidoScopeDrawFunc, "../z_kaleido_scope_call.c", 101);
     func_8006ECF4(globalCtx);
 }
 
diff --git a/src/code/z_room.c b/src/code/z_room.c
index ac4e829c5..1cd9984a2 100644
--- a/src/code/z_room.c
+++ b/src/code/z_room.c
@@ -558,8 +558,8 @@ u32 func_80096FE8(GlobalContext* globalCtx, RoomContext* roomCtx) {
         j = 0;
         roomList = globalCtx->roomList;
         transitionActor = &globalCtx->transitionActorList[0];
-        LogUtils_LogThreadId("../z_room.c", 912);
-        osSyncPrintf("game_play->room_rom_address.num = %d\n", globalCtx->nbRooms);
+        LOG_VALUE("game_play->room_rom_address.num", globalCtx->nbRooms, "../z_room.c", 912);
+
         for (j = 0; j < globalCtx->nbTransitionActors; j++) {
             frontRoom = transitionActor->frontRoom;
             backRoom = transitionActor->backRoom;
diff --git a/src/code/z_skelanime.c b/src/code/z_skelanime.c
index cc78b7c74..0dccdd5cb 100644
--- a/src/code/z_skelanime.c
+++ b/src/code/z_skelanime.c
@@ -520,14 +520,10 @@ void SkelAnime_AnimateFrame(AnimationHeader* animationSeg, s32 currentFrame, s32
     for (i = 0; i < limbCount; i++, dst++, index++) {
         if ((dst == NULL) || (index == NULL) || (frameRotationValueTable == NULL) || (rotationValueTable == NULL)) {
             if (1) {} // Necessary to match.
-            LogUtils_LogThreadId("../z_skelanime.c", 1392);
-            osSyncPrintf("out = %08x\n", dst);
-            LogUtils_LogThreadId("../z_skelanime.c", 1393);
-            osSyncPrintf("ref_tbl = %08x\n", index);
-            LogUtils_LogThreadId("../z_skelanime.c", 1394);
-            osSyncPrintf("frame_tbl = %08x\n", frameRotationValueTable);
-            LogUtils_LogThreadId("../z_skelanime.c", 1395);
-            osSyncPrintf("tbl = %08x\n", rotationValueTable);
+            LOG_ADDRESS("out", dst, "../z_skelanime.c", 1392);
+            LOG_ADDRESS("ref_tbl", index, "../z_skelanime.c", 1393);
+            LOG_ADDRESS("frame_tbl", frameRotationValueTable, "../z_skelanime.c", 1394);
+            LOG_ADDRESS("tbl", rotationValueTable, "../z_skelanime.c", 1395);
         }
 
         dst->x = index->x >= limit ? frameRotationValueTable[index->x] : rotationValueTable[index->x];