mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-01-16 21:46:58 +00:00
Code Issues Projects Releases Wiki Activity

T() macro 6 (#2090)

Browse source 
* T() in z_skelanime.c

* T() in z_eff_blure.c

* T() in z_play.c

* T() in z_jpeg.c

* T() in z_horse.c

* T() in z_eff_spark.c

* T() in z_malloc.c

* T() in z_effect_soft_sprite.c

* add todo on translating "確保" (litterally ~"secure", but may be better as "allocate"-ish)

* review

* format
This commit is contained in:
Dragorn421 2024-08-27 17:10:07 +02:00 committed by GitHub
parent fd14ddcbf1
commit 6b58a15fc0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 106 additions and 102 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/code/z_eff_blure.c
View file

@ -12,8 +12,8 @@ void EffectBlure_AddVertex(EffectBlure* this, Vec3f* p1, Vec3f* p2) {
if (this != NULL) {
numElements = this->numElements;
if (numElements >= 16) {
// "Blure vertex addition processing: Table over %d"
PRINTF("ブラ─頂点追加処理:テーブルオーバー %d\n", numElements);
PRINTF(T("ブラ─頂点追加処理:テーブルオーバー %d\n", "Blur - vertex addition processing: Table over %d\n"),
numElements);
return;
}
@ -81,8 +81,8 @@ void EffectBlure_AddSpace(EffectBlure* this) {
if (this != NULL) {
numElements = this->numElements;
if (numElements >= 16) {
// "Blure space addition processing: Table over %d"
PRINTF("ブラ─空白追加処理:テーブルオーバー %d\n", numElements);
PRINTF(T("ブラ─空白追加処理:テーブルオーバー %d\n", "Blur - space addition processing: Table over %d\n"),
numElements);
return;
}
@ -397,8 +397,8 @@ void EffectBlure_DrawElemNoInterpolation(EffectBlure* this, EffectBlureElement*
vtx = GRAPH_ALLOC(gfxCtx, sizeof(Vtx[4]));
if (vtx == NULL) {
// "Vertices cannot be secured."
PRINTF("z_eff_blure.c::SQ_NoInterpolate_disp() 頂点確保できず。\n");
PRINTF(T("z_eff_blure.c::SQ_NoInterpolate_disp() 頂点確保できず。\n",
"z_eff_blure.c::SQ_NoInterpolate_disp() Vertices cannot be secured.\n"));
} else {
vtx[0].v = baseVtx;
vtx[1].v = baseVtx;
@ -556,8 +556,8 @@ void EffectBlure_DrawElemHermiteInterpolation(EffectBlure* this, EffectBlureElem
vtx = GRAPH_ALLOC(gfxCtx, sizeof(Vtx[16]));
if (vtx == NULL) {
// "Vertices cannot be secured."
PRINTF("z_eff_blure.c::SQ_HermiteInterpolate_disp() 頂点確保できず。\n");
PRINTF(T("z_eff_blure.c::SQ_HermiteInterpolate_disp() 頂点確保できず。\n",
"z_eff_blure.c::SQ_HermiteInterpolate_disp() Vertices cannot be secured.\n"));
} else {
Math_Vec3f_Diff(&sp1CC, &sp138, &sp158);
Math_Vec3f_Scale(&sp158, 10.0f);
@ -799,8 +799,9 @@ void EffectBlure_DrawSimpleVertices(GraphicsContext* gfxCtx, EffectBlure* this,
mtx = SkinMatrix_MtxFToNewMtx(gfxCtx, &sp94);
if (mtx == NULL) {
// "Forced termination because a matrix cannot be taken"
PRINTF("EffectBlureInfo2_disp_makeDisplayList()マトリックス取れないので,強制終了\n");
PRINTF(T("EffectBlureInfo2_disp_makeDisplayList()マトリックス取れないので,強制終了\n",
"EffectBlureInfo2_disp_makeDisplayList() Forced termination because a matrix cannot "
"be taken\n"));
break;
}
@ -851,8 +852,8 @@ void EffectBlure_DrawSimple(EffectBlure* this2, GraphicsContext* gfxCtx) {
vtx = GRAPH_ALLOC(gfxCtx, vtxCount * sizeof(Vtx));
if (vtx == NULL) {
// "Vertices cannot be secured. Forced termination"
PRINTF("ブラ─表示:頂点確保できず。強制終了\n");
PRINTF(T("ブラ─表示:頂点確保できず。強制終了\n",
"Blur - display: vertices cannot be secured. Forced termination\n"));
return;
}
@ -945,8 +946,7 @@ void EffectBlure_Draw(void* thisx, GraphicsContext* gfxCtx) {
vtx = GRAPH_ALLOC(gfxCtx, sizeof(Vtx[32]));
if (vtx == NULL) {
// "Blure display: Vertex table could not be secured"
PRINTF("ブラ─表示:頂点テーブル確保できず\n");
PRINTF(T("ブラ─表示:頂点テーブル確保できず\n", "Blur - display: vertex table could not be secured\n"));
} else {
j = 0;
for (i = 0; i < this->numElements; i++) {

8
src/code/z_eff_spark.c
View file

@ -10,7 +10,7 @@ void EffectSpark_Init(void* thisx, void* initParamsx) {
if ((this != NULL) && (initParams != NULL)) {
if ((initParams->uDiv == 0) || (initParams->vDiv == 0)) {
PRINTF("spark():u_div,v_div 0では困る。\n"); // "u_div,v_div 0 is not good."
PRINTF(T("spark():u_div,v_div 0では困る。\n", "spark():u_div,v_div 0 is not good.\n"));
return;
}
@ -55,7 +55,7 @@ void EffectSpark_Init(void* thisx, void* initParamsx) {
this->numElements = (this->uDiv * this->vDiv) + 2;
if (this->numElements > ARRAY_COUNT(this->elements)) {
PRINTF("table_sizeオーバー\n"); // "over table_size"
PRINTF(T("table_sizeオーバー\n", "over table_size\n"));
return;
}
@ -172,8 +172,8 @@ void EffectSpark_Draw(void* thisx, GraphicsContext* gfxCtx) {
vertices = GRAPH_ALLOC(gfxCtx, this->numElements * sizeof(Vtx[4]));
if (vertices == NULL) {
// "Memory Allocation Failure graph_malloc"
PRINTF("EffectSparkInfo_disp():メモリー確保失敗 graph_malloc\n");
PRINTF(T("EffectSparkInfo_disp():メモリー確保失敗 graph_malloc\n",
"EffectSparkInfo_disp(): Memory Allocation Failure graph_malloc\n"));
goto end;
}

54
src/code/z_effect_soft_sprite.c
View file

@ -189,8 +189,8 @@ void EffectSs_Spawn(PlayState* play, s32 type, s32 priority, void* initParams) {
overlaySize = (uintptr_t)overlayEntry->vramEnd - (uintptr_t)overlayEntry->vramStart;
if (overlayEntry->vramStart == NULL) {
// "Not an overlay"
PRINTF("EffectSoftSprite2_makeEffect():オーバーレイではありません。\n");
PRINTF(T("EffectSoftSprite2_makeEffect():オーバーレイではありません。\n",
"EffectSoftSprite2_makeEffect(): Not an overlay.\n"));
profile = overlayEntry->profile;
} else {
if (overlayEntry->loadedRamAddr == NULL) {
@ -198,11 +198,14 @@ void EffectSs_Spawn(PlayState* play, s32 type, s32 priority, void* initParams) {
if (overlayEntry->loadedRamAddr == NULL) {
PRINTF(VT_FGCOL(RED));
// "The memory of %d byte cannot be secured. Therefore, the program cannot be loaded.
// What a dangerous situation! Naturally, effects will not produced either."
PRINTF("EffectSoftSprite2_makeEffect():zelda_malloc_r()により,%"
"dbyteのメモリ確保ができま\nせん。そのため、プログラムのロードも\n出来ません。ただいま危険"
"な状態です！\nもちろん,エフェクトも出ません。\n",
PRINTF(T("EffectSoftSprite2_makeEffect():zelda_malloc_r()により,%dbyteのメモリ確保ができま\n"
"せん。そのため、プログラムのロードも\n"
"出来ません。ただいま危険な状態です！\n"
"もちろん,エフェクトも出ません。\n",
"EffectSoftSprite2_makeEffect():zelda_malloc_r() The memory of %d byte cannot be\n"
"secured. Therefore, the program\n"
"cannot be loaded. What a dangerous situation!\n"
"Naturally, effects will not be produced either.\n"),
overlaySize);
PRINTF(VT_RST);
return;
@ -226,10 +229,12 @@ void EffectSs_Spawn(PlayState* play, s32 type, s32 priority, void* initParams) {
}
if (profile->init == NULL) {
// "Effects have already been loaded, but the constructor is NULL so the addition will not occur.
// Please fix this. (Waste of memory) %08x %d"
PRINTF("EffectSoftSprite2_makeEffect():すでにエフェクトはロード済みで\nすが,"
"コンストラクターがNULLなので追加をやめます。\n直してください。（メモリーの無駄) %08x %d\n",
PRINTF(T("EffectSoftSprite2_makeEffect():すでにエフェクトはロード済みで\n"
"すが,コンストラクターがNULLなので追加をやめます。\n"
"直してください。（メモリーの無駄) %08x %d\n",
"EffectSoftSprite2_makeEffect(): Effects have already been loaded,\n"
"but the constructor is NULL so the addition will not occur.\n"
"Please fix this. (Waste of memory) %08x %d\n"),
profile, type);
return;
}
@ -242,11 +247,12 @@ void EffectSs_Spawn(PlayState* play, s32 type, s32 priority, void* initParams) {
if (profile->init(play, index, &sEffectSsInfo.table[index], initParams) == 0) {
PRINTF(VT_FGCOL(GREEN));
// "Construction failed for some reason. The constructor returned an error.
// Ceasing effect addition."
PRINTF("EffectSoftSprite2_makeEffect():"
"何らかの理由でコンストラクト失敗。コンストラクターがエラーを返しました。エフェクトの追加を中"
"止します。\n");
PRINTF(T("EffectSoftSprite2_makeEffect():"
"何らかの理由でコンストラクト失敗。コンストラクターがエラーを返しました。"
"エフェクトの追加を中止します。\n",
"EffectSoftSprite2_makeEffect(): "
"Construction failed for some reason. The constructor returned an error. "
"Ceasing effect addition.\n"));
PRINTF(VT_RST);
EffectSs_Reset(&sEffectSsInfo.table[index]);
}
@ -308,17 +314,17 @@ void EffectSs_DrawAll(PlayState* play) {
(sEffectSsInfo.table[i].pos.y > 32000.0f) || (sEffectSsInfo.table[i].pos.y < -32000.0f) ||
(sEffectSsInfo.table[i].pos.z > 32000.0f) || (sEffectSsInfo.table[i].pos.z < -32000.0f)) {
PRINTF(VT_FGCOL(RED));
// "Since the position is outside the area, delete it.
// Effect label No. %d: Please respond by the program.
// Here is ==> pos (%f, %f, %f) and the label is in z_effect_soft_sprite_dlftbls.decl."
PRINTF("EffectSoftSprite2_disp():位置が領域外のため "
"削除します。エフェクトラベルNo.%d:プログラムの方で対応をお願いします。ここです ==> "
"pos(%f, %f, %f)で、ラベルはz_effect_soft_sprite_dlftbls.declにあります。\n",
PRINTF(T("EffectSoftSprite2_disp():位置が領域外のため "
"削除します。エフェクトラベルNo.%d:プログラムの方で対応をお願いします。ここです ==> "
"pos(%f, %f, %f)で、ラベルはz_effect_soft_sprite_dlftbls.declにあります。\n",
"EffectSoftSprite2_disp(): Since the position is outside the area, "
"delete it. Effect label No. %d: Please respond by the program. Here is ==> "
"pos(%f, %f, %f) and the label is in z_effect_soft_sprite_dlftbls.decl.\n"),
sEffectSsInfo.table[i].type, sEffectSsInfo.table[i].pos.x, sEffectSsInfo.table[i].pos.y,
sEffectSsInfo.table[i].pos.z);
PRINTF(VT_FGCOL(GREEN));
// "If you are using pos for something else, consult me."
PRINTF("もし、posを別のことに使っている場合相談に応じます。\n");
PRINTF(T("もし、posを別のことに使っている場合相談に応じます。\n",
"If you are using pos for something else, consult me.\n"));
PRINTF(VT_RST);
EffectSs_Delete(&sEffectSsInfo.table[i]);

15
src/code/z_horse.c
View file

@ -75,9 +75,8 @@ void func_8006D0EC(PlayState* play, Player* player) {
ASSERT(horseActor != NULL, "horse_actor != NULL", "../z_horse.c", 389);
} else if ((play->sceneId == gSaveContext.save.info.horseData.sceneId) &&
(Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED) || DREG(1) != 0)) {
// "Set by existence of horse %d %d %d"
PRINTF("馬存在によるセット %d %d %d\n", gSaveContext.save.info.horseData.sceneId,
Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED), DREG(1));
PRINTF(T("馬存在によるセット %d %d %d\n", "Set by existence of horse %d %d %d\n"),
gSaveContext.save.info.horseData.sceneId, Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED), DREG(1));
if (func_8006CFC0(gSaveContext.save.info.horseData.sceneId)) {
Actor* horseActor =
@ -90,8 +89,9 @@ void func_8006D0EC(PlayState* play, Player* player) {
}
} else {
PRINTF(VT_COL(RED, WHITE));
// "Horse_SetNormal():%d set spot is no good."
PRINTF("Horse_SetNormal():%d セットスポットまずいです。\n", gSaveContext.save.info.horseData.sceneId);
PRINTF(
T("Horse_SetNormal():%d セットスポットまずいです。\n", "Horse_SetNormal():%d set spot is no good.\n"),
gSaveContext.save.info.horseData.sceneId);
PRINTF(VT_RST);
func_8006D074(play);
}
@ -246,8 +246,9 @@ void func_8006DC68(PlayState* play, Player* player) {
if (LINK_IS_ADULT) {
if (!func_8006CFC0(gSaveContext.save.info.horseData.sceneId)) {
PRINTF(VT_COL(RED, WHITE));
// "Horse_Set_Check():%d set spot is no good."
PRINTF("Horse_Set_Check():%d セットスポットまずいです。\n", gSaveContext.save.info.horseData.sceneId);
PRINTF(
T("Horse_Set_Check():%d セットスポットまずいです。\n", "Horse_Set_Check():%d set spot is no good.\n"),
gSaveContext.save.info.horseData.sceneId);
PRINTF(VT_RST);
func_8006D074(play);
}

24
src/code/z_jpeg.c
View file

@ -220,7 +220,7 @@ void Jpeg_ParseMarkers(u8* ptr, JpegContext* ctx) {
break;
}
default: {
PRINTF("マーカー不明 %02x\n", ptr[-1]); // "Unknown marker"
PRINTF(T("マーカー不明 %02x\n", "Unknown marker %02x\n"), ptr[-1]);
ptr += Jpeg_GetUnalignedU16(ptr);
break;
}
@ -256,8 +256,9 @@ s32 Jpeg_Decode(void* data, void* zbuffer, void* work, u32 workSize) {
curTime = osGetTime();
diff = curTime - time;
time = curTime;
// "Wait for synchronization of fifo buffer"
PRINTF("*** fifoバッファの同期待ち time = %6.3f ms ***\n", OS_CYCLES_TO_USEC(diff) / 1000.0f);
PRINTF(T("*** fifoバッファの同期待ち time = %6.3f ms ***\n",
"*** Wait for synchronization of fifo buffer time = %6.3f ms ***\n"),
OS_CYCLES_TO_USEC(diff) / 1000.0f);
ctx.workBuf = workBuff;
Jpeg_ParseMarkers(data, &ctx);
@ -265,8 +266,9 @@ s32 Jpeg_Decode(void* data, void* zbuffer, void* work, u32 workSize) {
curTime = osGetTime();
diff = curTime - time;
time = curTime;
// "Check markers for each segment"
PRINTF("*** 各セグメントのマーカーのチェック time = %6.3f ms ***\n", OS_CYCLES_TO_USEC(diff) / 1000.0f);
PRINTF(T("*** 各セグメントのマーカーのチェック time = %6.3f ms ***\n",
"*** Check markers for each segment time = %6.3f ms ***\n"),
OS_CYCLES_TO_USEC(diff) / 1000.0f);
switch (ctx.dqtCount) {
case 1:
@ -289,8 +291,8 @@ s32 Jpeg_Decode(void* data, void* zbuffer, void* work, u32 workSize) {
curTime = osGetTime();
diff = curTime - time;
time = curTime;
// "Create quantization table"
PRINTF("*** 量子化テーブル作成 time = %6.3f ms ***\n", OS_CYCLES_TO_USEC(diff) / 1000.0f);
PRINTF(T("*** 量子化テーブル作成 time = %6.3f ms ***\n", "*** Create quantization table time = %6.3f ms ***\n"),
OS_CYCLES_TO_USEC(diff) / 1000.0f);
switch (ctx.dhtCount) {
case 1:
@ -319,8 +321,8 @@ s32 Jpeg_Decode(void* data, void* zbuffer, void* work, u32 workSize) {
curTime = osGetTime();
diff = curTime - time;
time = curTime;
// "Huffman table creation"
PRINTF("*** ハフマンテーブル作成 time = %6.3f ms ***\n", OS_CYCLES_TO_USEC(diff) / 1000.0f);
PRINTF(T("*** ハフマンテーブル作成 time = %6.3f ms ***\n", "*** Huffman table creation time = %6.3f ms ***\n"),
OS_CYCLES_TO_USEC(diff) / 1000.0f);
decoder.imageData = ctx.imageData;
decoder.mode = ctx.mode;
@ -356,8 +358,8 @@ s32 Jpeg_Decode(void* data, void* zbuffer, void* work, u32 workSize) {
curTime = osGetTime();
diff = curTime - time;
time = curTime;
// "Unfold & draw"
PRINTF("*** 展開 & 描画 time = %6.3f ms ***\n", OS_CYCLES_TO_USEC(diff) / 1000.0f);
PRINTF(T("*** 展開 & 描画 time = %6.3f ms ***\n", "*** Unfold & draw time = %6.3f ms ***\n"),
OS_CYCLES_TO_USEC(diff) / 1000.0f);
return 0;
}

23
src/code/z_malloc.c
View file

@ -12,13 +12,11 @@ s32 gZeldaArenaLogSeverity = LOG_SEVERITY_ERROR;
void ZeldaArena_CheckPointer(void* ptr, u32 size, const char* name, const char* action) {
if (ptr == NULL) {
if (gZeldaArenaLogSeverity >= LOG_SEVERITY_ERROR) {
// "%s: %u bytes %s failed\n"
PRINTF("%s: %u バイトの%sに失敗しました\n", name, size, action);
PRINTF(T("%s: %u バイトの%sに失敗しました\n", "%s: %u bytes %s failed\n"), name, size, action);
__osDisplayArena(&sZeldaArena);
}
} else if (gZeldaArenaLogSeverity >= LOG_SEVERITY_VERBOSE) {
// "%s: %u bytes %s succeeded\n"
PRINTF("%s: %u バイトの%sに成功しました\n", name, size, action);
PRINTF(T("%s: %u バイトの%sに成功しました\n", "%s: %u bytes %s succeeded\n"), name, size, action);
}
}
@ -30,7 +28,8 @@ void ZeldaArena_CheckPointer(void* ptr, u32 size, const char* name, const char*
void* ZeldaArena_Malloc(u32 size) {
void* ptr = __osMalloc(&sZeldaArena, size);
ZELDA_ARENA_CHECK_POINTER(ptr, size, "zelda_malloc", "確保"); // "Secure"
// TODO re-evaluate "secure" as a translation (in this file and others using "確保")
ZELDA_ARENA_CHECK_POINTER(ptr, size, "zelda_malloc", T("確保", "Secure"));
return ptr;
}
@ -38,7 +37,7 @@ void* ZeldaArena_Malloc(u32 size) {
void* ZeldaArena_MallocDebug(u32 size, const char* file, int line) {
void* ptr = __osMallocDebug(&sZeldaArena, size, file, line);
ZELDA_ARENA_CHECK_POINTER(ptr, size, "zelda_malloc_DEBUG", "確保"); // "Secure"
ZELDA_ARENA_CHECK_POINTER(ptr, size, "zelda_malloc_DEBUG", T("確保", "Secure"));
return ptr;
}
#endif
@ -46,7 +45,7 @@ void* ZeldaArena_MallocDebug(u32 size, const char* file, int line) {
void* ZeldaArena_MallocR(u32 size) {
void* ptr = __osMallocR(&sZeldaArena, size);
ZELDA_ARENA_CHECK_POINTER(ptr, size, "zelda_malloc_r", "確保"); // "Secure"
ZELDA_ARENA_CHECK_POINTER(ptr, size, "zelda_malloc_r", T("確保", "Secure"));
return ptr;
}
@ -54,21 +53,21 @@ void* ZeldaArena_MallocR(u32 size) {
void* ZeldaArena_MallocRDebug(u32 size, const char* file, int line) {
void* ptr = __osMallocRDebug(&sZeldaArena, size, file, line);
ZELDA_ARENA_CHECK_POINTER(ptr, size, "zelda_malloc_r_DEBUG", "確保"); // "Secure"
ZELDA_ARENA_CHECK_POINTER(ptr, size, "zelda_malloc_r_DEBUG", T("確保", "Secure"));
return ptr;
}
#endif
void* ZeldaArena_Realloc(void* ptr, u32 newSize) {
ptr = __osRealloc(&sZeldaArena, ptr, newSize);
ZELDA_ARENA_CHECK_POINTER(ptr, newSize, "zelda_realloc", "再確保"); // "Re-securing"
ZELDA_ARENA_CHECK_POINTER(ptr, newSize, "zelda_realloc", T("再確保", "Re-securing"));
return ptr;
}
#if OOT_DEBUG
void* ZeldaArena_ReallocDebug(void* ptr, u32 newSize, const char* file, int line) {
ptr = __osReallocDebug(&sZeldaArena, ptr, newSize, file, line);
ZELDA_ARENA_CHECK_POINTER(ptr, newSize, "zelda_realloc_DEBUG", "再確保"); // "Re-securing"
ZELDA_ARENA_CHECK_POINTER(ptr, newSize, "zelda_realloc_DEBUG", T("再確保", "Re-securing"));
return ptr;
}
#endif
@ -92,13 +91,13 @@ void* ZeldaArena_Calloc(u32 num, u32 size) {
bzero(ret, n);
}
ZELDA_ARENA_CHECK_POINTER(ret, n, "zelda_calloc", "確保"); // "Secure"
ZELDA_ARENA_CHECK_POINTER(ret, n, "zelda_calloc", T("確保", "Secure"));
return ret;
}
#if OOT_DEBUG
void ZeldaArena_Display(void) {
PRINTF("ゼルダヒープ表示\n"); // "Zelda heap display"
PRINTF(T("ゼルダヒープ表示\n", "Zelda heap display\n"));
__osDisplayArena(&sZeldaArena);
}
#endif

24
src/code/z_play.c
View file

@ -360,9 +360,9 @@ void Play_Init(GameState* thisx) {
// The emulator constantly checks whether PC is 0x81000000, so this works even though it's not a valid address.
if ((gEntranceTable[((void)0, gSaveContext.save.entranceIndex)].sceneId == SCENE_GERUDO_VALLEY) &&
gSaveContext.sceneLayer == 6) {
PRINTF("エンディングはじまるよー\n"); // "The ending starts"
PRINTF(T("エンディングはじまるよー\n", "The ending starts\n"));
((void (*)(void))0x81000000)();
PRINTF("出戻り？\n"); // "Return?"
PRINTF(T("出戻り？\n", "Return?\n"));
}
Cutscene_HandleEntranceTriggers(this);
@ -429,8 +429,8 @@ void Play_Init(GameState* thisx) {
zAlloc = (uintptr_t)GAME_STATE_ALLOC(&this->state, zAllocSize, "../z_play.c", 2918);
zAllocAligned = (zAlloc + 8) & ~0xF;
ZeldaArena_Init((void*)zAllocAligned, zAllocSize - (zAllocAligned - zAlloc));
// "Zelda Heap"
PRINTF("ゼルダヒープ %08x-%08x\n", zAllocAligned, (u8*)zAllocAligned + zAllocSize - (s32)(zAllocAligned - zAlloc));
PRINTF(T("ゼルダヒープ %08x-%08x\n", "Zelda Heap %08x-%08x\n"), zAllocAligned,
(u8*)zAllocAligned + zAllocSize - (s32)(zAllocAligned - zAlloc));
#if OOT_DEBUG
Fault_AddClient(&D_801614B8, ZeldaArena_Display, NULL, NULL);
@ -533,7 +533,7 @@ void Play_Update(PlayState* this) {
switch (gTransitionTileState) {
case TRANS_TILE_PROCESS:
if (TransitionTile_Init(&gTransitionTile, 10, 7) == NULL) {
PRINTF("fbdemo_init呼出し失敗！\n"); // "fbdemo_init call failed!"
PRINTF(T("fbdemo_init呼出し失敗！\n", "fbdemo_init call failed!\n"));
gTransitionTileState = TRANS_TILE_OFF;
} else {
gTransitionTile.zBuffer = (u16*)gZBuffer;
@ -566,11 +566,9 @@ void Play_Update(PlayState* this) {
// fade out bgm if "continue bgm" flag is not set
if (!(gEntranceTable[this->nextEntranceIndex + sceneLayer].field &
ENTRANCE_INFO_CONTINUE_BGM_FLAG)) {
// "Sound initialized. 111"
PRINTF("\n\n\nサウンドイニシャル来ました。111");
PRINTF(T("\n\n\nサウンドイニシャル来ました。111", "\n\n\nSound initialized. 111"));
if ((this->transitionType < TRANS_TYPE_MAX) && !Environment_IsForcedSequenceDisabled()) {
// "Sound initialized. 222"
PRINTF("\n\n\nサウンドイニシャル来ました。222");
PRINTF(T("\n\n\nサウンドイニシャル来ました。222", "\n\n\nSound initialized. 222"));
func_800F6964(0x14);
gSaveContext.seqId = (u8)NA_BGM_DISABLED;
gSaveContext.natureAmbienceId = NATURE_ID_DISABLED;
@ -971,11 +969,11 @@ void Play_Update(PlayState* this) {
if (this->viewpoint != VIEWPOINT_NONE) {
if (CHECK_BTN_ALL(input[0].press.button, BTN_CUP)) {
if (IS_PAUSED(&this->pauseCtx)) {
// "Changing viewpoint is prohibited due to the kaleidoscope"
PRINTF(VT_FGCOL(CYAN) "カレイドスコープ中につき視点変更を禁止しております\n" VT_RST);
PRINTF(VT_FGCOL(CYAN) T("カレイドスコープ中につき視点変更を禁止しております\n",
"Changing viewpoint is prohibited due to the kaleidoscope\n") VT_RST);
} else if (Player_InCsMode(this)) {
// "Changing viewpoint is prohibited during the cutscene"
PRINTF(VT_FGCOL(CYAN) "デモ中につき視点変更を禁止しております\n" VT_RST);
PRINTF(VT_FGCOL(CYAN) T("デモ中につき視点変更を禁止しております\n",
"Changing viewpoint is prohibited during the cutscene\n") VT_RST);
} else if (R_SCENE_CAM_TYPE == SCENE_CAM_TYPE_FIXED_SHOP_VIEWPOINT) {
Audio_PlaySfxGeneral(NA_SE_SY_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
&gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);

32
src/code/z_skelanime.c
View file

@ -72,7 +72,7 @@ void SkelAnime_DrawLod(PlayState* play, void** skeleton, Vec3s* jointTable, Over
if (skeleton == NULL) {
PRINTF(VT_FGCOL(RED));
PRINTF("Si2_Lod_draw():skelがNULLです。\n"); // "skel is NULL."
PRINTF(T("Si2_Lod_draw():skelがNULLです。\n", "Si2_Lod_draw(): skel is NULL.\n"));
PRINTF(VT_RST);
return;
}
@ -185,7 +185,7 @@ void SkelAnime_DrawFlexLod(PlayState* play, void** skeleton, Vec3s* jointTable,
if (skeleton == NULL) {
PRINTF(VT_FGCOL(RED));
PRINTF("Si2_Lod_draw_SV():skelがNULLです。\n"); // "skel is NULL."
PRINTF(T("Si2_Lod_draw_SV():skelがNULLです。\n", "Si2_Lod_draw_SV(): skel is NULL.\n"));
PRINTF(VT_RST);
return;
}
@ -288,7 +288,7 @@ void SkelAnime_DrawOpa(PlayState* play, void** skeleton, Vec3s* jointTable, Over
if (skeleton == NULL) {
PRINTF(VT_FGCOL(RED));
PRINTF("Si2_draw():skelがNULLです。\n"); // "skel is NULL."
PRINTF(T("Si2_draw():skelがNULLです。\n", "Si2_draw(): skel is NULL.\n"));
PRINTF(VT_RST);
return;
}
@ -401,7 +401,7 @@ void SkelAnime_DrawFlexOpa(PlayState* play, void** skeleton, Vec3s* jointTable,
if (skeleton == NULL) {
PRINTF(VT_FGCOL(RED));
PRINTF("Si2_draw_SV():skelがNULLです。\n"); // "skel is NULL."
PRINTF(T("Si2_draw_SV():skelがNULLです。\n", "Si2_draw_SV(): skel is NULL.\n"));
PRINTF(VT_RST);
return;
}
@ -554,8 +554,7 @@ Gfx* SkelAnime_Draw(PlayState* play, void** skeleton, Vec3s* jointTable, Overrid
if (skeleton == NULL) {
PRINTF(VT_FGCOL(RED));
// "skel is NULL. Returns NULL."
PRINTF("Si2_draw2():skelがNULLです。NULLを返します。\n");
PRINTF(T("Si2_draw2():skelがNULLです。NULLを返します。\n", "Si2_draw2(): skel is NULL. Returns NULL.\n"));
PRINTF(VT_RST);
return NULL;
}
@ -663,8 +662,7 @@ Gfx* SkelAnime_DrawFlex(PlayState* play, void** skeleton, Vec3s* jointTable, s32
if (skeleton == NULL) {
PRINTF(VT_FGCOL(RED));
// "skel is NULL. Returns NULL."
PRINTF("Si2_draw2_SV():skelがNULLです。NULLを返します。\n");
PRINTF(T("Si2_draw2_SV():skelがNULLです。NULLを返します。\n", "Si2_draw2_SV(): skel is NULL. Returns NULL.\n"));
PRINTF(VT_RST);
return NULL;
}
@ -1131,8 +1129,8 @@ void SkelAnime_InitLink(PlayState* play, SkelAnime* skelAnime, FlexSkeletonHeade
if ((skelAnime->jointTable == NULL) || (skelAnime->morphTable == NULL)) {
PRINTF(VT_FGCOL(RED));
// "Memory allocation error"
PRINTF("Skeleton_Info_Rom_SV_ct メモリアロケーションエラー\n");
PRINTF(T("Skeleton_Info_Rom_SV_ct メモリアロケーションエラー\n",
"Skeleton_Info_Rom_SV_ct Memory allocation error\n"));
PRINTF(VT_RST);
}
@ -1445,7 +1443,7 @@ BAD_RETURN(s32) SkelAnime_Init(PlayState* play, SkelAnime* skelAnime, SkeletonHe
}
if ((skelAnime->jointTable == NULL) || (skelAnime->morphTable == NULL)) {
PRINTF(VT_FGCOL(RED));
PRINTF("Skeleton_Info2_ct メモリアロケーションエラー\n"); // "Memory allocation error"
PRINTF(T("Skeleton_Info2_ct メモリアロケーションエラー\n", "Skeleton_Info2_ct Memory allocation error\n"));
PRINTF(VT_RST);
}
@ -1478,8 +1476,8 @@ BAD_RETURN(s32) SkelAnime_InitFlex(PlayState* play, SkelAnime* skelAnime, FlexSk
}
if ((skelAnime->jointTable == NULL) || (skelAnime->morphTable == NULL)) {
PRINTF(VT_FGCOL(RED));
// "Memory allocation error"
PRINTF("Skeleton_Info_Rom_SV_ct メモリアロケーションエラー\n");
PRINTF(T("Skeleton_Info_Rom_SV_ct メモリアロケーションエラー\n",
"Skeleton_Info_Rom_SV_ct Memory allocation error\n"));
PRINTF(VT_RST);
}
@ -1503,8 +1501,8 @@ BAD_RETURN(s32) SkelAnime_InitSkin(PlayState* play, SkelAnime* skelAnime, Skelet
ZELDA_ARENA_MALLOC(skelAnime->limbCount * sizeof(*skelAnime->morphTable), "../z_skelanime.c", 3121);
if ((skelAnime->jointTable == NULL) || (skelAnime->morphTable == NULL)) {
PRINTF(VT_FGCOL(RED));
// "Memory allocation error"
PRINTF("Skeleton_Info2_skin2_ct メモリアロケーションエラー\n");
PRINTF(T("Skeleton_Info2_skin2_ct メモリアロケーションエラー\n",
"Skeleton_Info2_skin2_ct Memory allocation error\n"));
PRINTF(VT_RST);
}
@ -1897,13 +1895,13 @@ void SkelAnime_Free(SkelAnime* skelAnime, PlayState* play) {
if (skelAnime->jointTable != NULL) {
ZELDA_ARENA_FREE(skelAnime->jointTable, "../z_skelanime.c", 3729);
} else {
PRINTF("now_joint あきまへん！！\n"); // "now_joint is freed! !"
PRINTF(T("now_joint あきまへん！！\n", "now_joint is freed!!\n"));
}
if (skelAnime->morphTable != NULL) {
ZELDA_ARENA_FREE(skelAnime->morphTable, "../z_skelanime.c", 3731);
} else {
PRINTF("morf_joint あきまへん！！\n"); // "morf_joint is freed !!"
PRINTF(T("morf_joint あきまへん！！\n", "morf_joint is freed!!\n"));
}
}