mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-03 06:24:30 +00:00
Code Issues Projects Releases Wiki Activity

T() macro 3 (#2083)

Browse source 
* T() in z_camera.c

* T() in z_parameter.c

* T() in z_room.c

* T() in z_kaleido_scope_call.c

* T() in z_map_exp.c
This commit is contained in:
Dragorn421 2024-08-24 17:47:45 +02:00 • committed by GitHub
parent ea40688e4a
commit b1b8b8c426
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 75 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/code/z_room.c
View file

@ -262,25 +262,24 @@ s32 Room_DecodeJpeg(void* data) {
OSTime time;
if (*(u32*)data == JPEG_MARKER) {
PRINTF("JPEGデータを展開します\n"); // "Expanding jpeg data"
PRINTF("JPEGデータアドレス %08x\n", data); // "Jpeg data address %08x"
// "Work buffer address (Z buffer) %08x"
PRINTF("ワークバッファアドレス（Ｚバッファ）%08x\n", gZBuffer);
PRINTF(T("JPEGデータを展開します\n", "Expanding jpeg data\n"));
PRINTF(T("JPEGデータアドレス %08x\n", "Jpeg data address %08x\n"), data);
PRINTF(T("ワークバッファアドレス（Ｚバッファ）%08x\n", "Work buffer address (Z buffer) %08x\n"), gZBuffer);
time = osGetTime();
if (!Jpeg_Decode(data, gZBuffer, gGfxSPTaskOutputBuffer, sizeof(gGfxSPTaskOutputBuffer))) {
time = osGetTime() - time;
// "Success... I think. time = %6.3f ms"
PRINTF("成功…だと思う。 time = %6.3f ms \n", OS_CYCLES_TO_USEC(time) / 1000.0f);
// "Writing back to original address from work buffer."
PRINTF("ワークバッファから元のアドレスに書き戻します。\n");
// "If the original buffer size isn't at least 150kB, it will be out of control."
PRINTF("元のバッファのサイズが150キロバイト無いと暴走するでしょう。\n");
PRINTF(T("成功…だと思う。 time = %6.3f ms \n", "Success... I think. time = %6.3f ms\n"),
OS_CYCLES_TO_USEC(time) / 1000.0f);
PRINTF(T("ワークバッファから元のアドレスに書き戻します。\n",
"Writing back to original address from work buffer.\n"));
PRINTF(T("元のバッファのサイズが150キロバイト無いと暴走するでしょう。\n",
"If the original buffer size isn't at least 150kB, it will be out of control.\n"));
bcopy(gZBuffer, data, sizeof(u16[SCREEN_HEIGHT][SCREEN_WIDTH]));
} else {
PRINTF("失敗！なんで〜\n"); // "Failure! Why is it 〜"
PRINTF(T("失敗！なんで〜\n", "Failure! Why is it ~\n"));
}
}
@ -439,8 +438,9 @@ RoomShapeImageMultiBgEntry* Room_GetImageMultiBgEntry(RoomShapeImageMulti* roomS
bgEntry++;
}
// "z_room.c: Data consistent with camera id does not exist camid=%d"
PRINTF(VT_COL(RED, WHITE) "z_room.c:カメラＩＤに一致するデータが存在しません camid=%d\n" VT_RST, bgCamIndex);
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);
LogUtils_HungupThread("../z_room.c", 726);
return NULL;
@ -577,14 +577,12 @@ u32 func_80096FE8(PlayState* play, RoomContext* roomCtx) {
}
PRINTF(VT_FGCOL(YELLOW));
// "Room buffer size=%08x(%5.1fK)"
PRINTF("部屋バッファサイズ=%08x(%5.1fK)\n", maxRoomSize, maxRoomSize / 1024.0f);
PRINTF(T("部屋バッファサイズ=%08x(%5.1fK)\n", "Room buffer size=%08x(%5.1fK)\n"), maxRoomSize,
maxRoomSize / 1024.0f);
roomCtx->bufPtrs[0] = GAME_STATE_ALLOC(&play->state, maxRoomSize, "../z_room.c", 946);
// "Room buffer initial pointer=%08x"
PRINTF("部屋バッファ開始ポインタ=%08x\n", roomCtx->bufPtrs[0]);
PRINTF(T("部屋バッファ開始ポインタ=%08x\n", "Room buffer initial pointer=%08x\n"), roomCtx->bufPtrs[0]);
roomCtx->bufPtrs[1] = (void*)((uintptr_t)roomCtx->bufPtrs[0] + maxRoomSize);
// "Room buffer end pointer=%08x"
PRINTF("部屋バッファ終了ポインタ=%08x\n", roomCtx->bufPtrs[1]);
PRINTF(T("部屋バッファ終了ポインタ=%08x\n", "Room buffer end pointer=%08x\n"), roomCtx->bufPtrs[1]);
PRINTF(VT_RST);
roomCtx->unk_30 = 0;
roomCtx->status = 0;