mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-05-10 02:54:24 +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
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/code/z_camera.c
View file

@ -5813,9 +5813,8 @@ s32 Camera_Demo1(Camera* camera) {
rwData->keyframe = 0;
rwData->curFrame = 0.0f;
camera->animState++;
// "absolute" : "relative"
PRINTF(VT_SGR("1") "%06u:" VT_RST " camera: spline demo: start %s \n", camera->play->state.frames,
*relativeToPlayer == 0 ? "絶対" : "相対");
*relativeToPlayer == 0 ? T("絶対", "absolute") : T("相対", "relative"));
#if OOT_DEBUG
if (PREG(93)) {

19
src/code/z_kaleido_scope_call.c
View file

@ -18,14 +18,14 @@ void KaleidoScopeCall_LoadPlayer(void) {
if (gKaleidoMgrCurOvl != playerActorOvl) {
if (gKaleidoMgrCurOvl != NULL) {
PRINTF(VT_FGCOL(GREEN));
PRINTF("カレイド領域 強制排除\n"); // "Kaleido area forced exclusion"
PRINTF(T("カレイド領域 強制排除\n", "Kaleido area forced exclusion\n"));
PRINTF(VT_RST);
KaleidoManager_ClearOvl(gKaleidoMgrCurOvl);
}
PRINTF(VT_FGCOL(GREEN));
PRINTF("プレイヤーアクター搬入\n"); // "Player actor import"
PRINTF(T("プレイヤーアクター搬入\n", "Player actor import\n"));
PRINTF(VT_RST);
KaleidoManager_LoadOvl(playerActorOvl);
@ -33,8 +33,7 @@ void KaleidoScopeCall_LoadPlayer(void) {
}
void KaleidoScopeCall_Init(PlayState* play) {
// "Kaleidoscope replacement construction"
PRINTF("カレイド・スコープ入れ替え コンストラクト \n");
PRINTF(T("カレイド・スコープ入れ替え コンストラクト \n", "Kaleidoscope replacement construction\n"));
sKaleidoScopeUpdateFunc = KaleidoManager_GetRamAddr(KaleidoScope_Update);
sKaleidoScopeDrawFunc = KaleidoManager_GetRamAddr(KaleidoScope_Draw);
@ -48,8 +47,7 @@ void KaleidoScopeCall_Init(PlayState* play) {
}
void KaleidoScopeCall_Destroy(PlayState* play) {
// "Kaleidoscope replacement destruction"
PRINTF("カレイド・スコープ入れ替え デストラクト \n");
PRINTF(T("カレイド・スコープ入れ替え デストラクト \n", "Kaleidoscope replacement destruction\n"));
KaleidoSetup_Destroy(play);
}
@ -91,16 +89,14 @@ void KaleidoScopeCall_Update(PlayState* play) {
if (gKaleidoMgrCurOvl != kaleidoScopeOvl) {
if (gKaleidoMgrCurOvl != NULL) {
PRINTF(VT_FGCOL(GREEN));
// "Kaleido area Player Forced Elimination"
PRINTF("カレイド領域 プレイヤー 強制排除\n");
PRINTF(T("カレイド領域 プレイヤー 強制排除\n", "Kaleido area Player Forced Elimination\n"));
PRINTF(VT_RST);
KaleidoManager_ClearOvl(gKaleidoMgrCurOvl);
}
PRINTF(VT_FGCOL(GREEN));
// "Kaleido area Kaleidoscope loading"
PRINTF("カレイド領域 カレイドスコープ搬入\n");
PRINTF(T("カレイド領域 カレイドスコープ搬入\n", "Kaleido area Kaleidoscope loading\n"));
PRINTF(VT_RST);
KaleidoManager_LoadOvl(kaleidoScopeOvl);
@ -111,8 +107,7 @@ void KaleidoScopeCall_Update(PlayState* play) {
if (!IS_PAUSED(&play->pauseCtx)) {
PRINTF(VT_FGCOL(GREEN));
// "Kaleido area Kaleidoscope Emission"
PRINTF("カレイド領域 カレイドスコープ排出\n");
PRINTF(T("カレイド領域 カレイドスコープ排出\n", "Kaleido area Kaleidoscope Emission\n"));
PRINTF(VT_RST);
KaleidoManager_ClearOvl(kaleidoScopeOvl);

32
src/code/z_map_exp.c
View file

@ -28,9 +28,10 @@ void Map_SetPaletteData(PlayState* play, s16 room) {
}
PRINTF(VT_FGCOL(YELLOW));
// "PALETE Set"
PRINTF("ＰＡＬＥＴＥセット 【 i=%x : room=%x 】Room_Inf[%d][4]=%x ( map_palete_no = %d )\n", paletteIndex, room,
mapIndex, gSaveContext.save.info.sceneFlags[mapIndex].rooms, interfaceCtx->mapPaletteIndex);
PRINTF(T("ＰＡＬＥＴＥセット 【 i=%x : room=%x 】Room_Inf[%d][4]=%x ( map_palete_no = %d )\n",
"PALETE Set 【 i=%x : room=%x 】Room_Inf[%d][4]=%x ( map_palete_no = %d )\n"),
paletteIndex, room, mapIndex, gSaveContext.save.info.sceneFlags[mapIndex].rooms,
interfaceCtx->mapPaletteIndex);
PRINTF(VT_RST);
interfaceCtx->mapPalette[paletteIndex * 2] = 2;
@ -155,9 +156,9 @@ void Map_InitData(PlayState* play, s16 room) {
case SCENE_SPIRIT_TEMPLE_BOSS:
case SCENE_SHADOW_TEMPLE_BOSS:
PRINTF(VT_FGCOL(YELLOW));
// "Deku Tree Dungeon MAP Texture DMA"
PRINTF("デクの樹ダンジョンＭＡＰ テクスチャＤＭＡ(%x) scene_id_offset=%d VREG(30)=%d\n", room, mapIndex,
VREG(30));
PRINTF(T("デクの樹ダンジョンＭＡＰ テクスチャＤＭＡ(%x) scene_id_offset=%d VREG(30)=%d\n",
"Deku Tree Dungeon MAP Texture DMA(%x) scene_id_offset=%d VREG(30)=%d\n"),
room, mapIndex, VREG(30));
PRINTF(VT_RST);
DMA_REQUEST_SYNC(play->interfaceCtx.mapSegment,
(uintptr_t)_map_i_staticSegmentRomStart +
@ -166,7 +167,7 @@ void Map_InitData(PlayState* play, s16 room) {
R_COMPASS_OFFSET_X = gMapData->roomCompassOffsetX[mapIndex][room];
R_COMPASS_OFFSET_Y = gMapData->roomCompassOffsetY[mapIndex][room];
Map_SetFloorPalettesData(play, VREG(30));
PRINTF("ＭＡＰ 各階ＯＮチェック\n"); // "MAP Individual Floor ON Check"
PRINTF(T("ＭＡＰ 各階ＯＮチェック\n", "MAP Individual Floor ON Check\n"));
break;
}
}
@ -204,7 +205,7 @@ void Map_InitRoomData(PlayState* play, s16 room) {
interfaceCtx->unk_25A = mapIndex;
Map_SetPaletteData(play, room);
PRINTF(VT_FGCOL(YELLOW));
PRINTF("部屋部屋＝%d\n", room); // "Room Room = %d"
PRINTF(T("部屋部屋＝%d\n", "Room Room = %d\n"), room);
PRINTF(VT_RST);
Map_InitData(play, room);
break;
@ -233,9 +234,9 @@ void Map_Init(PlayState* play) {
interfaceCtx->unk_25A = -1;
interfaceCtx->mapSegment = GAME_STATE_ALLOC(&play->state, 0x1000, "../z_map_exp.c", 457);
// "ＭＡＰ texture initialization scene_data_ID=%d mapSegment=%x"
PRINTF("\n\n\nＭＡＰ テクスチャ初期化 scene_data_ID=%d\nmapSegment=%x\n\n", play->sceneId,
interfaceCtx->mapSegment);
PRINTF(T("\n\n\nＭＡＰ テクスチャ初期化 scene_data_ID=%d\nmapSegment=%x\n\n",
"\n\n\nMAP texture initialization scene_data_ID=%d\nmapSegment=%x\n\n"),
play->sceneId, interfaceCtx->mapSegment);
ASSERT(interfaceCtx->mapSegment != NULL, "parameter->mapSegment != NULL", "../z_map_exp.c", 459);
switch (play->sceneId) {
@ -555,9 +556,9 @@ void Map_Update(PlayState* play) {
}
if (interfaceCtx->mapRoomNum != sLastRoomNum) {
// "Current floor = %d Current room = %x Number of rooms = %d"
PRINTF("現在階＝%d 現在部屋＝%x 部屋数＝%d\n", floor, interfaceCtx->mapRoomNum,
gMapData->switchEntryCount[mapIndex]);
PRINTF(T("現在階＝%d 現在部屋＝%x 部屋数＝%d\n",
"Current floor = %d Current room = %x Number of rooms = %d\n"),
floor, interfaceCtx->mapRoomNum, gMapData->switchEntryCount[mapIndex]);
sLastRoomNum = interfaceCtx->mapRoomNum;
}
@ -566,8 +567,7 @@ void Map_Update(PlayState* play) {
(floor == gMapData->switchFromFloor[mapIndex][i])) {
interfaceCtx->mapRoomNum = gMapData->switchToRoom[mapIndex][i];
PRINTF(VT_FGCOL(YELLOW));
// "Layer switching = %x"
PRINTF("階層切替＝%x\n", interfaceCtx->mapRoomNum);
PRINTF(T("階層切替＝%x\n", "Layer switching = %x\n"), interfaceCtx->mapRoomNum);
PRINTF(VT_RST);
Map_InitData(play, interfaceCtx->mapRoomNum);
gSaveContext.sunsSongState = SUNSSONG_INACTIVE;

72
src/code/z_parameter.c
View file

@ -1113,8 +1113,9 @@ void Interface_SetSceneRestrictions(PlayState* play) {
interfaceCtx->restrictions.bButton = 0;
interfaceCtx->restrictions.hGauge = 0;
// "Data settings related to button display scene_data_ID=%d\n"
PRINTF("ボタン表示関係データ設定 scene_data_ID=%d\n", play->sceneId);
PRINTF(
T("ボタン表示関係データ設定 scene_data_ID=%d\n", "Data settings related to button display scene_data_ID=%d\n"),
play->sceneId);
do {
sceneId = (u8)play->sceneId;
@ -1381,7 +1382,7 @@ u8 Item_Give(PlayState* play, u8 item) {
gSaveContext.save.info.inventory.questItems |= gBitFlags[item - ITEM_MEDALLION_FOREST + QUEST_MEDALLION_FOREST];
PRINTF(VT_FGCOL(YELLOW));
PRINTF("封印 = %x\n", gSaveContext.save.info.inventory.questItems); // "Seals = %x"
PRINTF(T("封印 = %x\n", "Seals = %x\n"), gSaveContext.save.info.inventory.questItems);
PRINTF(VT_RST);
if (item == ITEM_MEDALLION_WATER) {
@ -1393,10 +1394,10 @@ u8 Item_Give(PlayState* play, u8 item) {
gSaveContext.save.info.inventory.questItems |= gBitFlags[item - ITEM_SONG_MINUET + QUEST_SONG_MINUET];
PRINTF(VT_FGCOL(YELLOW));
PRINTF("楽譜 = %x\n", gSaveContext.save.info.inventory.questItems); // "Musical scores = %x"
// "Musical scores = %x (%x) (%x)"
PRINTF("楽譜 = %x (%x) (%x)\n", gSaveContext.save.info.inventory.questItems,
gBitFlags[item - ITEM_SONG_MINUET + QUEST_SONG_MINUET], gBitFlags[item - ITEM_SONG_MINUET]);
PRINTF(T("楽譜 = %x\n", "Musical scores = %x\n"), gSaveContext.save.info.inventory.questItems);
PRINTF(T("楽譜 = %x (%x) (%x)\n", "Musical scores = %x (%x) (%x)\n"),
gSaveContext.save.info.inventory.questItems, gBitFlags[item - ITEM_SONG_MINUET + QUEST_SONG_MINUET],
gBitFlags[item - ITEM_SONG_MINUET]);
PRINTF(VT_RST);
return ITEM_NONE;
@ -1404,7 +1405,7 @@ u8 Item_Give(PlayState* play, u8 item) {
gSaveContext.save.info.inventory.questItems |= gBitFlags[item - ITEM_KOKIRI_EMERALD + QUEST_KOKIRI_EMERALD];
PRINTF(VT_FGCOL(YELLOW));
PRINTF("精霊石 = %x\n", gSaveContext.save.info.inventory.questItems); // "Spiritual Stones = %x"
PRINTF(T("精霊石 = %x\n", "Spiritual Stones = %x\n"), gSaveContext.save.info.inventory.questItems);
PRINTF(VT_RST);
return ITEM_NONE;
@ -1412,7 +1413,7 @@ u8 Item_Give(PlayState* play, u8 item) {
gSaveContext.save.info.inventory.questItems |= gBitFlags[item - ITEM_STONE_OF_AGONY + QUEST_STONE_OF_AGONY];
PRINTF(VT_FGCOL(YELLOW));
PRINTF("アイテム = %x\n", gSaveContext.save.info.inventory.questItems); // "Items = %x"
PRINTF(T("アイテム = %x\n", "Items = %x\n"), gSaveContext.save.info.inventory.questItems);
PRINTF(VT_RST);
return ITEM_NONE;
@ -1421,8 +1422,7 @@ u8 Item_Give(PlayState* play, u8 item) {
gSaveContext.save.info.inventory.gsTokens++;
PRINTF(VT_FGCOL(YELLOW));
// "N Coins = %x(%d)"
PRINTF("Ｎコイン = %x(%d)\n", gSaveContext.save.info.inventory.questItems,
PRINTF(T("Ｎコイン = %x(%d)\n", "N Coins = %x(%d)\n"), gSaveContext.save.info.inventory.questItems,
gSaveContext.save.info.inventory.gsTokens);
PRINTF(VT_RST);
@ -1613,9 +1613,8 @@ u8 Item_Give(PlayState* play, u8 item) {
if (gSaveContext.save.info.inventory.items[slot] == ITEM_NONE) {
Inventory_ChangeUpgrade(UPG_DEKU_NUTS, 1);
AMMO(ITEM_DEKU_NUT) += sAmmoRefillCounts[item - ITEM_DEKU_NUTS_5];
// "Deku Nuts %d(%d)=%d BS_count=%d"
PRINTF("デクの実 %d(%d)=%d BS_count=%d\n", item, ITEM_DEKU_NUTS_5, item - ITEM_DEKU_NUTS_5,
sAmmoRefillCounts[item - ITEM_DEKU_NUTS_5]);
PRINTF(T("デクの実 %d(%d)=%d BS_count=%d\n", "Deku Nuts %d(%d)=%d BS_count=%d\n"), item, ITEM_DEKU_NUTS_5,
item - ITEM_DEKU_NUTS_5, sAmmoRefillCounts[item - ITEM_DEKU_NUTS_5]);
} else {
AMMO(ITEM_DEKU_NUT) += sAmmoRefillCounts[item - ITEM_DEKU_NUTS_5];
if (AMMO(ITEM_DEKU_NUT) > CUR_CAPACITY(UPG_DEKU_NUTS)) {
@ -1624,8 +1623,7 @@ u8 Item_Give(PlayState* play, u8 item) {
}
item = ITEM_DEKU_NUT;
} else if (item == ITEM_BOMB) {
// "Bomb Bomb Bomb Bomb Bomb Bomb Bomb"
PRINTF(" 爆弾 爆弾 爆弾 爆弾 爆弾 爆弾 爆弾 \n");
PRINTF(T(" 爆弾 爆弾 爆弾 爆弾 爆弾 爆弾 爆弾 \n", "Bomb Bomb Bomb Bomb Bomb Bomb Bomb\n"));
if ((AMMO(ITEM_BOMB) += 1) > CUR_CAPACITY(UPG_BOMB_BAG)) {
AMMO(ITEM_BOMB) = CUR_CAPACITY(UPG_BOMB_BAG);
}
@ -1666,7 +1664,7 @@ u8 Item_Give(PlayState* play, u8 item) {
AMMO(ITEM_BOW) = CUR_CAPACITY(UPG_QUIVER);
}
PRINTF("%d本 Item_MaxGet=%d\n", AMMO(ITEM_BOW), CUR_CAPACITY(UPG_QUIVER));
PRINTF(T("%d本 Item_MaxGet=%d\n", "%d books Item_MaxGet=%d\n"), AMMO(ITEM_BOW), CUR_CAPACITY(UPG_QUIVER));
return ITEM_BOW;
} else if (item == ITEM_SLINGSHOT) {
@ -1730,7 +1728,7 @@ u8 Item_Give(PlayState* play, u8 item) {
gSaveContext.save.info.playerData.health += 0x10;
return ITEM_NONE;
} else if (item == ITEM_RECOVERY_HEART) {
PRINTF("回復ハート回復ハート回復ハート\n"); // "Recovery Heart"
PRINTF(T("回復ハート回復ハート回復ハート\n", "Recovery Heart Recovery Heart Recovery Heart\n"));
Health_ChangeBy(play, 0x10);
return item;
} else if (item == ITEM_MAGIC_JAR_SMALL) {
@ -1788,8 +1786,8 @@ u8 Item_Give(PlayState* play, u8 item) {
for (i = 0; i < 4; i++) {
if (gSaveContext.save.info.inventory.items[temp + i] == ITEM_BOTTLE_EMPTY) {
// "Item_Pt(1)=%d Item_Pt(2)=%d Item_Pt(3)=%d Empty Bottle=%d Content=%d"
PRINTF("Item_Pt(1)=%d Item_Pt(2)=%d Item_Pt(3)=%d 空瓶=%d 中味=%d\n",
PRINTF(T("Item_Pt(1)=%d Item_Pt(2)=%d Item_Pt(3)=%d 空瓶=%d 中味=%d\n",
"Item_Pt(1)=%d Item_Pt(2)=%d Item_Pt(3)=%d Empty Bottle=%d Content=%d\n"),
gSaveContext.save.info.equips.cButtonSlots[0], gSaveContext.save.info.equips.cButtonSlots[1],
gSaveContext.save.info.equips.cButtonSlots[2], temp + i, item);
@ -1939,8 +1937,8 @@ u8 Item_CheckObtainability(u8 item) {
} else if (item == ITEM_RECOVERY_HEART) {
return ITEM_RECOVERY_HEART;
} else if ((item == ITEM_MAGIC_JAR_SMALL) || (item == ITEM_MAGIC_JAR_BIG)) {
// "Magic Pot Get_Inf_Table( 25, 0x0100)=%d"
PRINTF("魔法の壷 Get_Inf_Table( 25, 0x0100)=%d\n", GET_INFTABLE(INFTABLE_198));
PRINTF(T("魔法の壷 Get_Inf_Table( 25, 0x0100)=%d\n", "Magic Pot Get_Inf_Table( 25, 0x0100)=%d\n"),
GET_INFTABLE(INFTABLE_198));
if (!GET_INFTABLE(INFTABLE_198)) {
return ITEM_NONE;
} else {
@ -2003,7 +2001,7 @@ s32 Inventory_ReplaceItem(PlayState* play, u16 oldItem, u16 newItem) {
for (i = 0; i < ARRAY_COUNT(gSaveContext.save.info.inventory.items); i++) {
if (gSaveContext.save.info.inventory.items[i] == oldItem) {
gSaveContext.save.info.inventory.items[i] = newItem;
PRINTF("アイテム消去(%d)\n", i); // "Item Purge (%d)"
PRINTF(T("アイテム消去(%d)\n", "Item Purge (%d)\n"), i);
for (i = 1; i < 4; i++) {
if (gSaveContext.save.info.equips.buttonItems[i] == oldItem) {
gSaveContext.save.info.equips.buttonItems[i] = newItem;
@ -2079,7 +2077,7 @@ s32 Inventory_ConsumeFairy(PlayState* play) {
break;
}
}
PRINTF("妖精使用＝%d\n", bottleSlot); // "Fairy Usage＝%d"
PRINTF(T("妖精使用＝%d\n", "Fairy Usage=%d\n"), bottleSlot);
gSaveContext.save.info.inventory.items[bottleSlot + i] = ITEM_BOTTLE_EMPTY;
return true;
}
@ -2197,16 +2195,15 @@ s32 Health_ChangeBy(PlayState* play, s16 amount) {
u16 heartCount;
u16 healthLevel;
// "＊＊＊＊＊ Fluctuation=%d (now=%d, max=%d) ＊＊＊"
PRINTF("＊＊＊＊＊ 増減=%d (now=%d, max=%d) ＊＊＊", amount, gSaveContext.save.info.playerData.health,
gSaveContext.save.info.playerData.healthCapacity);
PRINTF(T("＊＊＊＊＊ 増減=%d (now=%d, max=%d) ＊＊＊", "***** Fluctuation=%d (now=%d, max=%d) ***"), amount,
gSaveContext.save.info.playerData.health, gSaveContext.save.info.playerData.healthCapacity);
// clang-format off
if (amount > 0) { Audio_PlaySfxGeneral(NA_SE_SY_HP_RECOVER, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
&gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
} else if (gSaveContext.save.info.playerData.isDoubleDefenseAcquired && (amount < 0)) {
amount >>= 1;
PRINTF("ハート減少半分！！＝%d\n", amount); // "Heart decrease halved!!＝%d"
PRINTF(T("ハート減少半分！！＝%d\n", "Heart decrease halved!! = %d\n"), amount);
}
// clang-format on
@ -2229,8 +2226,8 @@ s32 Health_ChangeBy(PlayState* play, s16 amount) {
}
}
// "Life=%d ＊＊＊ %d ＊＊＊＊＊＊"
PRINTF(" ライフ=%d ＊＊＊ %d ＊＊＊＊＊＊\n", gSaveContext.save.info.playerData.health, healthLevel);
PRINTF(T(" ライフ=%d ＊＊＊ %d ＊＊＊＊＊＊\n", " Life=%d *** %d ******\n"),
gSaveContext.save.info.playerData.health, healthLevel);
if (gSaveContext.save.info.playerData.health <= 0) {
gSaveContext.save.info.playerData.health = 0;
@ -2249,8 +2246,8 @@ void Rupees_ChangeBy(s16 rupeeChange) {
}
void Inventory_ChangeAmmo(s16 item, s16 ammoChange) {
// "Item = (%d) Amount = (%d + %d)"
PRINTF("アイテム = (%d) 数 = (%d + %d) ", item, AMMO(item), ammoChange);
PRINTF(T("アイテム = (%d) 数 = (%d + %d) ", "Item = (%d) Amount = (%d + %d) "), item, AMMO(item),
ammoChange);
if (item == ITEM_DEKU_STICK) {
AMMO(ITEM_DEKU_STICK) += ammoChange;
@ -2304,7 +2301,7 @@ void Inventory_ChangeAmmo(s16 item, s16 ammoChange) {
AMMO(ITEM_MAGIC_BEAN) += ammoChange;
}
PRINTF("合計 = (%d)\n", AMMO(item)); // "Total = (%d)"
PRINTF(T("合計 = (%d)\n", "Total = (%d)\n"), AMMO(item));
}
void Magic_Fill(PlayState* play) {
@ -2480,8 +2477,8 @@ void Magic_Update(PlayState* play) {
&gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
}
// "Storage MAGIC_NOW=%d (%d)"
PRINTF("蓄電 MAGIC_NOW=%d (%d)\n", gSaveContext.save.info.playerData.magic, gSaveContext.magicFillTarget);
PRINTF(T("蓄電 MAGIC_NOW=%d (%d)\n", "Storage MAGIC_NOW=%d (%d)\n"),
gSaveContext.save.info.playerData.magic, gSaveContext.magicFillTarget);
if (gSaveContext.save.info.playerData.magic >= gSaveContext.magicFillTarget) {
gSaveContext.save.info.playerData.magic = gSaveContext.magicFillTarget;
@ -4165,8 +4162,7 @@ void Interface_Update(PlayState* play) {
Audio_PlaySfxGeneral(NA_SE_SY_RUPY_COUNT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
&gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
} else {
// "Rupee Amount MAX = %d"
PRINTF("ルピー数ＭＡＸ = %d\n", CUR_CAPACITY(UPG_WALLET));
PRINTF(T("ルピー数ＭＡＸ = %d\n", "Rupee Amount MAX = %d\n"), CUR_CAPACITY(UPG_WALLET));
gSaveContext.save.info.playerData.rupees = CUR_CAPACITY(UPG_WALLET);
gSaveContext.rupeeAccumulator = 0;
}
@ -4246,7 +4242,7 @@ void Interface_Update(PlayState* play) {
gSaveContext.save.info.playerData.magicLevel = gSaveContext.save.info.playerData.isDoubleMagicAcquired + 1;
gSaveContext.magicState = MAGIC_STATE_STEP_CAPACITY;
PRINTF(VT_FGCOL(YELLOW));
PRINTF("魔法スター─────ト！！！！！！！！！\n"); // "Magic Start!!!!!!!!!"
PRINTF(T("魔法スター─────ト！！！！！！！！！\n", "Magic Start!!!!!!!!!\n"));
PRINTF("MAGIC_MAX=%d\n", gSaveContext.save.info.playerData.magicLevel);
PRINTF("MAGIC_NOW=%d\n", gSaveContext.save.info.playerData.magic);
PRINTF("Z_MAGIC_NOW_NOW=%d\n", gSaveContext.magicFillTarget);

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;