summaryrefslogtreecommitdiff
path: root/src/code
diff options
context:
space:
mode:
authorcadmic <cadmic24@gmail.com>2024-12-26 14:42:38 -0800
committerGitHub <noreply@github.com>2024-12-26 17:42:38 -0500
commit1662ac70af687819712472b8daf5b75ceeb5e8c0 (patch)
treea88829a5932212dd1cefdfc3d7aead908060beb5 /src/code
parentaaf31832334730ebf4ad9a1c852159467fac4bf5 (diff)
Fix iQue audio and line numbers (#2386)
Diffstat (limited to 'src/code')
-rw-r--r--src/code/game.c4
-rw-r--r--src/code/graph.c6
-rw-r--r--src/code/sys_cfb.c2
-rw-r--r--src/code/z_eff_ss_dead.c2
-rw-r--r--src/code/z_room.c4
5 files changed, 9 insertions, 9 deletions
diff --git a/src/code/game.c b/src/code/game.c
index 2bed93e96..ee29c8449 100644
--- a/src/code/game.c
+++ b/src/code/game.c
@@ -391,7 +391,7 @@ void GameState_InitArena(GameState* gameState, size_t size) {
} else {
THA_Init(&gameState->tha, NULL, 0);
PRINTF(T("ハイラル確保失敗\n", "Failure to secure Hyrule\n"));
- HUNGUP_AND_CRASH("../game.c", LN4(895, 898, 985, 999));
+ HUNGUP_AND_CRASH("../game.c", LN4(895, 898, 985, 999, 999));
}
}
@@ -432,7 +432,7 @@ void GameState_Realloc(GameState* gameState, size_t size) {
SystemArena_Display();
#endif
- HUNGUP_AND_CRASH("../game.c", LN4(940, 943, 1030, 1044));
+ HUNGUP_AND_CRASH("../game.c", LN4(940, 943, 1030, 1044, 1044));
}
}
diff --git a/src/code/graph.c b/src/code/graph.c
index 84186386e..091c80bae 100644
--- a/src/code/graph.c
+++ b/src/code/graph.c
@@ -380,7 +380,7 @@ void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState) {
PRINTF("%c", BEL);
PRINTF(VT_COL(RED, WHITE) T("ダイナミック領域先頭が破壊されています\n", "Dynamic area head is destroyed\n")
VT_RST);
- Fault_AddHungupAndCrash("../graph.c", LN4(937, 940, 951, 1070));
+ Fault_AddHungupAndCrash("../graph.c", LN4(937, 940, 951, 1070, 1067));
}
if (pool->tailMagic != GFXPOOL_TAIL_MAGIC) {
@@ -388,7 +388,7 @@ void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState) {
PRINTF("%c", BEL);
PRINTF(VT_COL(RED, WHITE)
T("ダイナミック領域末尾が破壊されています\n", "Dynamic region tail is destroyed\n") VT_RST);
- Fault_AddHungupAndCrash("../graph.c", LN4(943, 946, 957, 1076));
+ Fault_AddHungupAndCrash("../graph.c", LN4(943, 946, 957, 1076, 1073));
}
}
@@ -481,7 +481,7 @@ void Graph_ThreadEntry(void* arg0) {
sprintf(faultMsg, "CLASS SIZE= %d bytes", size);
Fault_AddHungupAndCrashImpl("GAME CLASS MALLOC FAILED", faultMsg);
#else
- Fault_AddHungupAndCrash("../graph.c", LN4(1067, 1070, 1081, 1200));
+ Fault_AddHungupAndCrash("../graph.c", LN4(1067, 1070, 1081, 1200, 1197));
#endif
}
diff --git a/src/code/sys_cfb.c b/src/code/sys_cfb.c
index 9ad789176..e175ddf94 100644
--- a/src/code/sys_cfb.c
+++ b/src/code/sys_cfb.c
@@ -34,7 +34,7 @@ void SysCfb_Init(s32 n64dd) {
PRINTF("RAM4M mode\n");
sSysCfbEnd = 0x80400000;
} else {
- LogUtils_HungupThread("../sys_cfb.c", LN4(305, 308, 322, 354));
+ LogUtils_HungupThread("../sys_cfb.c", LN4(305, 308, 322, 354, 341));
}
screenSize = SCREEN_WIDTH * SCREEN_HEIGHT;
diff --git a/src/code/z_eff_ss_dead.c b/src/code/z_eff_ss_dead.c
index 3c1adf4cb..2a64a23f4 100644
--- a/src/code/z_eff_ss_dead.c
+++ b/src/code/z_eff_ss_dead.c
@@ -30,7 +30,7 @@ void func_80026400(PlayState* play, Color_RGBA8* color, s16 arg2, s16 arg3) {
Gfx* displayListHead;
f32 cos;
-#if !PLATFORM_N64
+#if PLATFORM_GC
if (arg3 == 0) {
return;
}
diff --git a/src/code/z_room.c b/src/code/z_room.c
index 67d99eb21..2612e2450 100644
--- a/src/code/z_room.c
+++ b/src/code/z_room.c
@@ -458,7 +458,7 @@ RoomShapeImageMultiBgEntry* Room_GetImageMultiBgEntry(RoomShapeImageMulti* roomS
"z_room.c: Data consistent with camera id does not exist camid=%d\n") VT_RST,
bgCamIndex);
-#if PLATFORM_GC
+#if !PLATFORM_N64
LogUtils_HungupThread("../z_room.c", 726);
#else
Fault_AddHungupAndCrash("../z_room.c", LN2(724, 727, 721));
@@ -545,7 +545,7 @@ void Room_DrawImage(PlayState* play, Room* room, u32 flags) {
} else if (roomShape->amountType == ROOM_SHAPE_IMAGE_AMOUNT_MULTI) {
Room_DrawImageMulti(play, room, flags);
} else {
-#if PLATFORM_GC
+#if !PLATFORM_N64
LogUtils_HungupThread("../z_room.c", 841);
#else
Fault_AddHungupAndCrash("../z_room.c", LN2(849, 852, 836));