summaryrefslogtreecommitdiff
path: root/src/code
diff options
context:
space:
mode:
Diffstat (limited to 'src/code')
-rw-r--r--src/code/game.c12
-rw-r--r--src/code/graph.c18
-rw-r--r--src/code/padmgr.c4
-rw-r--r--src/code/sys_cfb.c6
-rw-r--r--src/code/z_bgcheck.c8
-rw-r--r--src/code/z_play.c6
-rw-r--r--src/code/z_room.c12
7 files changed, 56 insertions, 10 deletions
diff --git a/src/code/game.c b/src/code/game.c
index 2b665e0d8..bd129ef77 100644
--- a/src/code/game.c
+++ b/src/code/game.c
@@ -386,7 +386,11 @@ void GameState_InitArena(GameState* gameState, size_t size) {
} else {
THA_Init(&gameState->tha, NULL, 0);
PRINTF(T("ハイラル確保失敗\n", "Failure to secure Hyrule\n"));
-#if PLATFORM_N64
+#if OOT_VERSION < NTSC_1_1
+ HUNGUP_AND_CRASH("../game.c", 895);
+#elif OOT_VERSION < PAL_1_0
+ HUNGUP_AND_CRASH("../game.c", 898);
+#elif OOT_VERSION < GC_JP
HUNGUP_AND_CRASH("../game.c", 985);
#else
HUNGUP_AND_CRASH("../game.c", 999);
@@ -431,7 +435,11 @@ void GameState_Realloc(GameState* gameState, size_t size) {
SystemArena_Display();
#endif
-#if PLATFORM_N64
+#if OOT_VERSION < NTSC_1_1
+ HUNGUP_AND_CRASH("../game.c", 940);
+#elif OOT_VERSION < PAL_1_0
+ HUNGUP_AND_CRASH("../game.c", 943);
+#elif OOT_VERSION < GC_JP
HUNGUP_AND_CRASH("../game.c", 1030);
#else
HUNGUP_AND_CRASH("../game.c", 1044);
diff --git a/src/code/graph.c b/src/code/graph.c
index bf1621452..1a98ab1af 100644
--- a/src/code/graph.c
+++ b/src/code/graph.c
@@ -379,7 +379,11 @@ 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);
-#if PLATFORM_N64
+#if OOT_VERSION < NTSC_1_1
+ Fault_AddHungupAndCrash("../graph.c", 937);
+#elif OOT_VERSION < PAL_1_0
+ Fault_AddHungupAndCrash("../graph.c", 940);
+#elif OOT_VERSION < GC_JP
Fault_AddHungupAndCrash("../graph.c", 951);
#else
Fault_AddHungupAndCrash("../graph.c", 1070);
@@ -390,7 +394,11 @@ 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);
-#if PLATFORM_N64
+#if OOT_VERSION < NTSC_1_1
+ Fault_AddHungupAndCrash("../graph.c", 943);
+#elif OOT_VERSION < PAL_1_0
+ Fault_AddHungupAndCrash("../graph.c", 946);
+#elif OOT_VERSION < GC_JP
Fault_AddHungupAndCrash("../graph.c", 957);
#else
Fault_AddHungupAndCrash("../graph.c", 1076);
@@ -486,7 +494,11 @@ void Graph_ThreadEntry(void* arg0) {
sprintf(faultMsg, "CLASS SIZE= %d bytes", size);
Fault_AddHungupAndCrashImpl("GAME CLASS MALLOC FAILED", faultMsg);
-#elif PLATFORM_N64
+#elif OOT_VERSION < NTSC_1_1
+ Fault_AddHungupAndCrash("../graph.c", 1067);
+#elif OOT_VERSION < PAL_1_0
+ Fault_AddHungupAndCrash("../graph.c", 1070);
+#elif OOT_VERSION < GC_JP
Fault_AddHungupAndCrash("../graph.c", 1081);
#else
Fault_AddHungupAndCrash("../graph.c", 1200);
diff --git a/src/code/padmgr.c b/src/code/padmgr.c
index 58e0ba2f3..f9ccce780 100644
--- a/src/code/padmgr.c
+++ b/src/code/padmgr.c
@@ -326,7 +326,9 @@ void PadMgr_UpdateInputs(PadMgr* padMgr) {
default:
// Unknown error response
LOG_HEX("padnow1->errno", pad->errno, "../padmgr.c", 396);
-#if PLATFORM_N64
+#if OOT_VERSION < NTSC_1_1
+ Fault_AddHungupAndCrash("../padmgr.c", 379);
+#elif OOT_VERSION < GC_JP
Fault_AddHungupAndCrash("../padmgr.c", 382);
#else
Fault_AddHungupAndCrash("../padmgr.c", 397);
diff --git a/src/code/sys_cfb.c b/src/code/sys_cfb.c
index 553cc50d8..76012588b 100644
--- a/src/code/sys_cfb.c
+++ b/src/code/sys_cfb.c
@@ -33,7 +33,11 @@ void SysCfb_Init(s32 n64dd) {
PRINTF("RAM4M mode\n");
sSysCfbEnd = 0x80400000;
} else {
-#if PLATFORM_N64
+#if OOT_VERSION < NTSC_1_1
+ LogUtils_HungupThread("../sys_cfb.c", 305);
+#elif OOT_VERSION < PAL_1_0
+ LogUtils_HungupThread("../sys_cfb.c", 308);
+#elif OOT_VERSION < GC_JP
LogUtils_HungupThread("../sys_cfb.c", 322);
#else
LogUtils_HungupThread("../sys_cfb.c", 354);
diff --git a/src/code/z_bgcheck.c b/src/code/z_bgcheck.c
index e1960e6d1..163b9a2b3 100644
--- a/src/code/z_bgcheck.c
+++ b/src/code/z_bgcheck.c
@@ -1611,7 +1611,11 @@ void BgCheck_Allocate(CollisionContext* colCtx, PlayState* play, CollisionHeader
colCtx->subdivAmount.z,
ALIGNOF_MASK(StaticLookup));
if (colCtx->lookupTbl == NULL) {
+#if OOT_VERSION < NTSC_1_1
+ LogUtils_HungupThread("../z_bgcheck.c", 4173);
+#else
LogUtils_HungupThread("../z_bgcheck.c", 4176);
+#endif
}
colCtx->minBounds.x = colCtx->colHeader->minBounds.x;
colCtx->minBounds.y = colCtx->colHeader->minBounds.y;
@@ -1635,7 +1639,11 @@ void BgCheck_Allocate(CollisionContext* colCtx, PlayState* play, CollisionHeader
tblMax = customNodeListMax;
} else {
if (colCtx->memSize < memSize) {
+#if OOT_VERSION < NTSC_1_1
+ LogUtils_HungupThread("../z_bgcheck.c", 4227);
+#else
LogUtils_HungupThread("../z_bgcheck.c", 4230);
+#endif
}
tblMax = (colCtx->memSize - memSize) / sizeof(SSNode);
}
diff --git a/src/code/z_play.c b/src/code/z_play.c
index e4269a2c2..3cfedca3d 100644
--- a/src/code/z_play.c
+++ b/src/code/z_play.c
@@ -176,7 +176,11 @@ void Play_SetupTransition(PlayState* this, s32 transitionType) {
break;
default:
-#if OOT_VERSION < PAL_1_1
+#if OOT_VERSION < NTSC_1_1
+ HUNGUP_AND_CRASH("../z_play.c", 2263);
+#elif OOT_VERSION < PAL_1_0
+ HUNGUP_AND_CRASH("../z_play.c", 2266);
+#elif OOT_VERSION < PAL_1_1
HUNGUP_AND_CRASH("../z_play.c", 2269);
#elif OOT_VERSION < GC_JP
HUNGUP_AND_CRASH("../z_play.c", 2272);
diff --git a/src/code/z_room.c b/src/code/z_room.c
index 6ac20bbd9..80154f61c 100644
--- a/src/code/z_room.c
+++ b/src/code/z_room.c
@@ -456,7 +456,11 @@ RoomShapeImageMultiBgEntry* Room_GetImageMultiBgEntry(RoomShapeImageMulti* roomS
PRINTF(VT_COL(RED, WHITE) T("z_room.c:カメラＩＤに一致するデータが存在しません camid=%d\n",
"z_room.c: Data consistent with camera id does not exist camid=%d\n") VT_RST,
bgCamIndex);
-#if PLATFORM_N64
+#if OOT_VERSION < NTSC_1_1
+ Fault_AddHungupAndCrash("../z_room.c", 724);
+#elif OOT_VERSION < PAL_1_0
+ Fault_AddHungupAndCrash("../z_room.c", 727);
+#elif OOT_VERSION < GC_JP
Fault_AddHungupAndCrash("../z_room.c", 721);
#else
LogUtils_HungupThread("../z_room.c", 726);
@@ -543,7 +547,11 @@ 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_N64
+#if OOT_VERSION < NTSC_1_1
+ Fault_AddHungupAndCrash("../z_room.c", 849);
+#elif OOT_VERSION < PAL_1_0
+ Fault_AddHungupAndCrash("../z_room.c", 852);
+#elif OOT_VERSION < GC_JP
Fault_AddHungupAndCrash("../z_room.c", 836);
#else
LogUtils_HungupThread("../z_room.c", 841);
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 16:45:01 +0000