mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-13 19:35:28 +00:00
Code Issues Projects Releases Wiki Activity

Cleanup translation comments (#924)

Browse source 
* `// Translates to:` -> `//`

* `// Translation: ([^"].*)` -> `// "$1"`

* Manual cleanup

* Manual cleanup in `src/code/`

* Use more lowercase for some all caps translations

* Move translations to end of lines where it fits under 100 bytes

* Move one translation to end of line manually

* Run formatter

* Cleanup in EnHeishi1 as suggested by Roman

* Update src/code/z_play.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
This commit is contained in:
Dragorn421 2021-09-04 15:33:19 +02:00 • committed by GitHub
parent 9b840ad842
commit 81830a6e8b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
70 changed files with 348 additions and 440 deletions
Download patch file Download diff file Expand all files Collapse all files

54
src/code/z_parameter.c
View file

@ -1068,7 +1068,7 @@ void Interface_SetSceneRestrictions(GlobalContext* globalCtx) {
i = 0;
// Translates to: "Data settings related to button display scene_data_ID=%d\n"
// "Data settings related to button display scene_data_ID=%d\n"
osSyncPrintf("ボタン表示関係データ設定 scene_data_ID=%d\n", globalCtx->sceneNum);
do {
@ -1319,8 +1319,7 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) {
gSaveContext.inventory.questItems |= gBitFlags[item - ITEM_MEDALLION_FOREST + QUEST_MEDALLION_FOREST];
osSyncPrintf(VT_FGCOL(YELLOW));
// Translates to: "Seals = %x"
osSyncPrintf("封印 = %x\n", gSaveContext.inventory.questItems);
osSyncPrintf("封印 = %x\n", gSaveContext.inventory.questItems); // "Seals = %x"
osSyncPrintf(VT_RST);
if (item == ITEM_MEDALLION_WATER) {
@ -1332,9 +1331,8 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) {
gSaveContext.inventory.questItems |= gBitFlags[item - ITEM_SONG_MINUET + QUEST_SONG_MINUET];
osSyncPrintf(VT_FGCOL(YELLOW));
// Translates to: "Musical scores = %x"
osSyncPrintf("楽譜 = %x\n", gSaveContext.inventory.questItems);
// Translates to: "Musical scores = %x (%x) (%x)"
osSyncPrintf("楽譜 = %x\n", gSaveContext.inventory.questItems); // "Musical scores = %x"
// "Musical scores = %x (%x) (%x)"
osSyncPrintf("楽譜 = %x (%x) (%x)\n", gSaveContext.inventory.questItems,
gBitFlags[item - ITEM_SONG_MINUET + QUEST_SONG_MINUET], gBitFlags[item - ITEM_SONG_MINUET]);
osSyncPrintf(VT_RST);
@ -1344,8 +1342,7 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) {
gSaveContext.inventory.questItems |= gBitFlags[item - ITEM_KOKIRI_EMERALD + QUEST_KOKIRI_EMERALD];
osSyncPrintf(VT_FGCOL(YELLOW));
// Translates to: "Spiritual Stones = %x"
osSyncPrintf("精霊石 = %x\n", gSaveContext.inventory.questItems);
osSyncPrintf("精霊石 = %x\n", gSaveContext.inventory.questItems); // "Spiritual Stones = %x"
osSyncPrintf(VT_RST);
return ITEM_NONE;
@ -1353,8 +1350,7 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) {
gSaveContext.inventory.questItems |= gBitFlags[item - ITEM_STONE_OF_AGONY + QUEST_STONE_OF_AGONY];
osSyncPrintf(VT_FGCOL(YELLOW));
// Translates to: "Items = %x"
osSyncPrintf("アイテム = %x\n", gSaveContext.inventory.questItems);
osSyncPrintf("アイテム = %x\n", gSaveContext.inventory.questItems); // "Items = %x"
osSyncPrintf(VT_RST);
return ITEM_NONE;
@ -1363,7 +1359,7 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) {
gSaveContext.inventory.gsTokens++;
osSyncPrintf(VT_FGCOL(YELLOW));
// Translates to: "N Coins = %x(%d)"
// "N Coins = %x(%d)"
osSyncPrintf("Ｎコイン = %x(%d)\n", gSaveContext.inventory.questItems, gSaveContext.inventory.gsTokens);
osSyncPrintf(VT_RST);
@ -1550,7 +1546,7 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) {
if (gSaveContext.inventory.items[slot] == ITEM_NONE) {
Inventory_ChangeUpgrade(UPG_NUTS, 1);
AMMO(ITEM_NUT) += sAmmoRefillCounts[item - ITEM_NUTS_5];
// Translates to: "Deku Nuts %d(%d)=%d BS_count=%d"
// "Deku Nuts %d(%d)=%d BS_count=%d"
osSyncPrintf("デクの実 %d(%d)=%d BS_count=%d\n", item, ITEM_NUTS_5, item - ITEM_NUTS_5,
sAmmoRefillCounts[item - ITEM_NUTS_5]);
} else {
@ -1561,7 +1557,7 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) {
}
item = ITEM_NUT;
} else if (item == ITEM_BOMB) {
// Translates to: "Bomb Bomb Bomb Bomb Bomb Bomb Bomb"
// "Bomb Bomb Bomb Bomb Bomb Bomb Bomb"
osSyncPrintf(" 爆弾 爆弾 爆弾 爆弾 爆弾 爆弾 爆弾 \n");
if ((AMMO(ITEM_BOMB) += 1) > CUR_CAPACITY(UPG_BOMB_BAG)) {
AMMO(ITEM_BOMB) = CUR_CAPACITY(UPG_BOMB_BAG);
@ -1667,8 +1663,7 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) {
gSaveContext.health += 0x10;
return ITEM_NONE;
} else if (item == ITEM_HEART) {
// Translates to: "Recovery Heart"
osSyncPrintf("回復ハート回復ハート回復ハート\n");
osSyncPrintf("回復ハート回復ハート回復ハート\n"); // "Recovery Heart"
Health_ChangeBy(globalCtx, 0x10);
return item;
} else if (item == ITEM_MAGIC_SMALL) {
@ -1720,7 +1715,7 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) {
for (i = 0; i < 4; i++) {
if (gSaveContext.inventory.items[temp + i] == ITEM_BOTTLE) {
// Translates to: "Item_Pt(1)=%d Item_Pt(2)=%d Item_Pt(3)=%d Empty Bottle=%d Content=%d"
// "Item_Pt(1)=%d Item_Pt(2)=%d Item_Pt(3)=%d Empty Bottle=%d Content=%d"
osSyncPrintf("Item_Pt(1)=%d Item_Pt(2)=%d Item_Pt(3)=%d 空瓶=%d 中味=%d\n",
gSaveContext.equips.cButtonSlots[0], gSaveContext.equips.cButtonSlots[1],
gSaveContext.equips.cButtonSlots[2], temp + i, item);
@ -1872,7 +1867,7 @@ u8 Item_CheckObtainability(u8 item) {
} else if (item == ITEM_HEART) {
return ITEM_HEART;
} else if ((item == ITEM_MAGIC_SMALL) || (item == ITEM_MAGIC_LARGE)) {
// Translates to: "Magic Pot Get_Inf_Table( 25, 0x0100)=%d"
// "Magic Pot Get_Inf_Table( 25, 0x0100)=%d"
osSyncPrintf("魔法の壷 Get_Inf_Table( 25, 0x0100)=%d\n", gSaveContext.infTable[25] & 0x100);
if (!(gSaveContext.infTable[25] & 0x100)) {
return ITEM_NONE;
@ -1936,8 +1931,7 @@ s32 Inventory_ReplaceItem(GlobalContext* globalCtx, u16 oldItem, u16 newItem) {
for (i = 0; i < ARRAY_COUNT(gSaveContext.inventory.items); i++) {
if (gSaveContext.inventory.items[i] == oldItem) {
gSaveContext.inventory.items[i] = newItem;
// Translates to: "Item Purge (%d)"
osSyncPrintf("アイテム消去(%d)\n", i);
osSyncPrintf("アイテム消去(%d)\n", i); // "Item Purge (%d)"
for (i = 1; i < 4; i++) {
if (gSaveContext.equips.buttonItems[i] == oldItem) {
gSaveContext.equips.buttonItems[i] = newItem;
@ -2020,8 +2014,7 @@ s32 Inventory_ConsumeFairy(GlobalContext* globalCtx) {
break;
}
}
// Translates to: "Fairy Usage＝%d"
osSyncPrintf("妖精使用＝%d\n", bottleSlot);
osSyncPrintf("妖精使用＝%d\n", bottleSlot); // "Fairy Usage＝%d"
gSaveContext.inventory.items[bottleSlot + i] = ITEM_BOTTLE;
return 1;
}
@ -2128,7 +2121,7 @@ s32 Health_ChangeBy(GlobalContext* globalCtx, s16 healthChange) {
u16 heartCount;
u16 healthLevel;
// Translates to: "＊＊＊＊＊ Fluctuation=%d (now=%d, max=%d) ＊＊＊"
// "＊＊＊＊＊ Fluctuation=%d (now=%d, max=%d) ＊＊＊"
osSyncPrintf("＊＊＊＊＊ 増減=%d (now=%d, max=%d) ＊＊＊", healthChange, gSaveContext.health,
gSaveContext.healthCapacity);
@ -2137,8 +2130,7 @@ s32 Health_ChangeBy(GlobalContext* globalCtx, s16 healthChange) {
&D_801333E0, &D_801333E0, &D_801333E8);
} else if ((gSaveContext.doubleDefense != 0) && (healthChange < 0)) {
healthChange >>= 1;
// Translates to: "Heart decrease halved!!＝%d"
osSyncPrintf("ハート減少半分！！＝%d\n", healthChange);
osSyncPrintf("ハート減少半分！！＝%d\n", healthChange); // "Heart decrease halved!!＝%d"
}
// clang-format on
@ -2161,7 +2153,7 @@ s32 Health_ChangeBy(GlobalContext* globalCtx, s16 healthChange) {
}
}
// Translates to: "Life=%d ＊＊＊ %d ＊＊＊＊＊＊"
// "Life=%d ＊＊＊ %d ＊＊＊＊＊＊"
osSyncPrintf(" ライフ=%d ＊＊＊ %d ＊＊＊＊＊＊\n", gSaveContext.health, healthLevel);
if (gSaveContext.health <= 0) {
@ -2181,7 +2173,7 @@ void Rupees_ChangeBy(s16 rupeeChange) {
}
void Inventory_ChangeAmmo(s16 item, s16 ammoChange) {
// Translates to: "Item = (%d) Amount = (%d + %d)"
// "Item = (%d) Amount = (%d + %d)"
osSyncPrintf("アイテム = (%d) 数 = (%d + %d) ", item, AMMO(item), ammoChange);
if (item == ITEM_STICK) {
@ -2236,8 +2228,7 @@ void Inventory_ChangeAmmo(s16 item, s16 ammoChange) {
AMMO(ITEM_BEAN) += ammoChange;
}
// Translates to: "Total = (%d)"
osSyncPrintf("合計 = (%d)\n", AMMO(item));
osSyncPrintf("合計 = (%d)\n", AMMO(item)); // "Total = (%d)"
}
void Magic_Fill(GlobalContext* globalCtx) {
@ -2385,7 +2376,7 @@ void Interface_UpdateMagicBar(GlobalContext* globalCtx) {
&D_801333E8);
}
// Translates to: "Storage MAGIC_NOW=%d (%d)"
// "Storage MAGIC_NOW=%d (%d)"
osSyncPrintf("蓄電 MAGIC_NOW=%d (%d)\n", gSaveContext.magic, gSaveContext.unk_13F6);
if (gSaveContext.magic >= gSaveContext.unk_13F6) {
gSaveContext.magic = gSaveContext.unk_13F6;
@ -3976,7 +3967,7 @@ void Interface_Update(GlobalContext* globalCtx) {
gSaveContext.rupees++;
Audio_PlaySoundGeneral(NA_SE_SY_RUPY_COUNT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
} else {
// Translates to: "Rupee Amount MAX = %d"
// "Rupee Amount MAX = %d"
osSyncPrintf("ルピー数ＭＡＸ = %d\n", CUR_CAPACITY(UPG_WALLET));
gSaveContext.rupees = CUR_CAPACITY(UPG_WALLET);
gSaveContext.rupeeAccumulator = 0;
@ -4054,8 +4045,7 @@ void Interface_Update(GlobalContext* globalCtx) {
gSaveContext.magicLevel = gSaveContext.doubleMagic + 1;
gSaveContext.unk_13F0 = 8;
osSyncPrintf(VT_FGCOL(YELLOW));
// Translates to: "Magic Start!!!!!!!!!"
osSyncPrintf("魔法スター─────ト！！！！！！！！！\n");
osSyncPrintf("魔法スター─────ト！！！！！！！！！\n"); // "Magic Start!!!!!!!!!"
osSyncPrintf("MAGIC_MAX=%d\n", gSaveContext.magicLevel);
osSyncPrintf("MAGIC_NOW=%d\n", gSaveContext.magic);
osSyncPrintf("Z_MAGIC_NOW_NOW=%d\n", gSaveContext.unk_13F6);