falso
/
oot
mirror of https://github.com/zeldaret/oot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

T() macro in overlays 10 (#2553) 

* T() mm2, niw, file_choose, file_nameset, kaleido_equipment, kaleido_item

* T() girla, ossan, xc

* review
This commit is contained in:
Dragorn421 2025-06-01 15:37:42 +02:00 committed by GitHub
parent 66a7720dcd
commit f4028e49b9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 85 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/overlays/actors/ovl_En_GirlA/z_en_girla.c
View File

@ -387,12 +387,13 @@ s32 EnGirlA_TryChangeShopItem(EnGirlA* this) {
void EnGirlA_InitItem(EnGirlA* this, PlayState* play) { void EnGirlA_InitItem(EnGirlA* this, PlayState* play) {
s16 params = this->actor.params; s16 params = this->actor.params;
PRINTF("%s(%2d)初期設定\n", sShopItemDescriptions[params], params); PRINTF(T("%s(%2d)初期設定\n", "%s(%2d) Initial setup\n"), sShopItemDescriptions[params], params);
if ((params >= SI_MAX) && (params < 0)) { if ((params >= SI_MAX) && (params < 0)) {
Actor_Kill(&this->actor); Actor_Kill(&this->actor);
PRINTF_COLOR_ERROR(); PRINTF_COLOR_ERROR();
PRINTF("引数がおかしいよ(arg_data=%d)！！\n", this->actor.params); PRINTF(T("引数がおかしいよ(arg_data=%d)！！\n", "The arguments are strange (arg_data=%d)!!\n"),
this->actor.params);
PRINTF_RST(); PRINTF_RST();
ASSERT(0, "0", "../z_en_girlA.c", 1421); ASSERT(0, "0", "../z_en_girlA.c", 1421);
return; return;
@ -418,7 +419,8 @@ void EnGirlA_Init(Actor* thisx, PlayState* play) {
EnGirlA_TryChangeShopItem(this); EnGirlA_TryChangeShopItem(this);
EnGirlA_InitItem(this, play); EnGirlA_InitItem(this, play);
PRINTF("%s(%2d)初期設定\n", sShopItemDescriptions[this->actor.params], this->actor.params); PRINTF(T("%s(%2d)初期設定\n", "%s(%2d) Initial setup\n"), sShopItemDescriptions[this->actor.params],
this->actor.params);
} }
void EnGirlA_Destroy(Actor* thisx, PlayState* play) { void EnGirlA_Destroy(Actor* thisx, PlayState* play) {

3
src/overlays/actors/ovl_En_Mm2/z_en_mm2.c
View File

@ -14,6 +14,7 @@
#include "segmented_address.h" #include "segmented_address.h"
#include "sys_matrix.h" #include "sys_matrix.h"
#include "terminal.h" #include "terminal.h"
#include "translation.h"
#include "z_lib.h" #include "z_lib.h"
#include "z64play.h" #include "z64play.h"
#include "z64save.h" #include "z64save.h"
@ -162,7 +163,7 @@ void EnMm2_Init(Actor* thisx, PlayState* play2) {
} }
if (this->actor.params == 1) { if (this->actor.params == 1) {
if (!GET_INFTABLE(INFTABLE_17F) || !GET_EVENTINF(EVENTINF_MARATHON_ACTIVE)) { if (!GET_INFTABLE(INFTABLE_17F) || !GET_EVENTINF(EVENTINF_MARATHON_ACTIVE)) {
PRINTF(VT_FGCOL(CYAN) " マラソン 開始されていない \n" VT_RST "\n"); PRINTF(VT_FGCOL(CYAN) T(" マラソン 開始されていない \n", " Marathon not started \n") VT_RST "\n");
Actor_Kill(&this->actor); Actor_Kill(&this->actor);
} }
} }

43
src/overlays/actors/ovl_En_Niw/z_en_niw.c
View File

@ -21,6 +21,7 @@
#include "sfx.h" #include "sfx.h"
#include "sys_matrix.h" #include "sys_matrix.h"
#include "terminal.h" #include "terminal.h"
#include "translation.h"
#include "versions.h" #include "versions.h"
#include "z_lib.h" #include "z_lib.h"
#include "z64effect.h" #include "z64effect.h"
@ -153,7 +154,8 @@ void EnNiw_Init(Actor* thisx, PlayState* play) {
if (this->actor.params == 0xB) { if (this->actor.params == 0xB) {
if (sLowerRiverSpawned) { if (sLowerRiverSpawned) {
Actor_Kill(&this->actor); Actor_Kill(&this->actor);
PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ もういてる原 Ver.1 ☆☆☆☆☆ \n" VT_RST); PRINTF(VT_FGCOL(YELLOW)
T("☆☆☆☆☆ もういてる原 Ver.1 ☆☆☆☆☆ \n", "☆☆☆☆☆ Original is already here Ver.1 ☆☆☆☆☆ \n") VT_RST);
return; return;
} }
sLowerRiverSpawned = true; sLowerRiverSpawned = true;
@ -164,7 +166,8 @@ void EnNiw_Init(Actor* thisx, PlayState* play) {
if (this->actor.params == 0xC) { if (this->actor.params == 0xC) {
if (sUpperRiverSpawned) { if (sUpperRiverSpawned) {
Actor_Kill(&this->actor); Actor_Kill(&this->actor);
PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ もういてる原 Ver.2 ☆☆☆☆☆ \n" VT_RST); PRINTF(VT_FGCOL(YELLOW)
T("☆☆☆☆☆ もういてる原 Ver.2 ☆☆☆☆☆ \n", "☆☆☆☆☆ Original is already here Ver.2 ☆☆☆☆☆ \n") VT_RST);
return; return;
} }
sUpperRiverSpawned = true; sUpperRiverSpawned = true;
@ -181,7 +184,7 @@ void EnNiw_Init(Actor* thisx, PlayState* play) {
if (fabsf(this->actor.world.pos.x - sKakarikoPosList[i].x) < 40.0f && if (fabsf(this->actor.world.pos.x - sKakarikoPosList[i].x) < 40.0f &&
fabsf(this->actor.world.pos.z - sKakarikoPosList[i].z) < 40.0f) { fabsf(this->actor.world.pos.z - sKakarikoPosList[i].z) < 40.0f) {
this->unk_2AA = i; this->unk_2AA = i;
PRINTF(VT_FGCOL(YELLOW) " 通常鶏index %d\n" VT_RST, this->unk_2AA); PRINTF(VT_FGCOL(YELLOW) T(" 通常鶏index %d\n", " Normal chicken index %d\n") VT_RST, this->unk_2AA);
if (gSaveContext.save.info.infTable[INFTABLE_INDEX_199_19A_19B_19C_19D_19E_19F] & if (gSaveContext.save.info.infTable[INFTABLE_INDEX_199_19A_19B_19C_19D_19E_19F] &
sKakarikoFlagList[i]) { sKakarikoFlagList[i]) {
this->actor.world.pos.x = 300.0f; this->actor.world.pos.x = 300.0f;
@ -259,7 +262,8 @@ void EnNiw_Init(Actor* thisx, PlayState* play) {
break; break;
} }
PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ どんな奴？ ☆☆☆☆☆ %d\n" VT_RST, this->actor.params); PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ どんな奴？ ☆☆☆☆☆ %d\n", "☆☆☆☆☆ What kind of guy? ☆☆☆☆☆ %d\n") VT_RST,
this->actor.params);
PRINTF("\n\n"); PRINTF("\n\n");
this->actionFunc = EnNiw_ResetAction; this->actionFunc = EnNiw_ResetAction;
} }
@ -386,7 +390,7 @@ void EnNiw_SpawnAttackCucco(EnNiw* this, PlayState* play) {
this->timer5 = 10; this->timer5 = 10;
} else { } else {
PRINTF("\n\n"); PRINTF("\n\n");
PRINTF(VT_FGCOL(GREEN) " ☆☆☆☆☆ 発生できず ☆☆☆☆☆ \n" VT_RST); PRINTF(VT_FGCOL(GREEN) T(" ☆☆☆☆☆ 発生できず ☆☆☆☆☆ \n", " ☆☆☆☆☆ Cannot occur ☆☆☆☆☆ \n") VT_RST);
} }
} }
} }
@ -983,17 +987,21 @@ void EnNiw_Update(Actor* thisx, PlayState* play) {
f32 camResult; f32 camResult;
s32 pad3[10]; s32 pad3[10];
PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ 上下？ ☆☆☆☆☆ %f\n" VT_RST, thisx->floorHeight); PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ 上下？ ☆☆☆☆☆ %f\n", "☆☆☆☆☆ Up and down? ☆☆☆☆☆ %f\n") VT_RST,
thisx->floorHeight);
cam.x = play->view.at.x - play->view.eye.x; cam.x = play->view.at.x - play->view.eye.x;
cam.y = play->view.at.y - play->view.eye.y; cam.y = play->view.at.y - play->view.eye.y;
cam.z = play->view.at.z - play->view.eye.z; cam.z = play->view.at.z - play->view.eye.z;
camResult = cam.y / sqrtf(SQ(cam.x) + SQ(cam.y) + SQ(cam.z)); camResult = cam.y / sqrtf(SQ(cam.x) + SQ(cam.y) + SQ(cam.z));
PRINTF(VT_FGCOL(RED) "☆☆☆☆☆ 範囲外Ｘ！ ☆☆☆☆☆ %f\n" VT_RST, thisx->world.pos.x); PRINTF(VT_FGCOL(RED) T("☆☆☆☆☆ 範囲外Ｘ！ ☆☆☆☆☆ %f\n", "☆☆☆☆☆ X out of range! ☆☆☆☆☆ %f\n") VT_RST,
PRINTF(VT_FGCOL(RED) "☆☆☆☆☆ 範囲外Ｙ！ ☆☆☆☆☆ %f\n" VT_RST, thisx->world.pos.y); thisx->world.pos.x);
PRINTF(VT_FGCOL(RED) "☆☆☆☆☆ 範囲外Ｚ！ ☆☆☆☆☆ %f\n" VT_RST, thisx->world.pos.z); PRINTF(VT_FGCOL(RED) T("☆☆☆☆☆ 範囲外Ｙ！ ☆☆☆☆☆ %f\n", "☆☆☆☆☆ Y out of range! ☆☆☆☆☆ %f\n") VT_RST,
PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ セットＸ！ ☆☆☆☆☆ %f\n" VT_RST, thisx->home.pos.x); thisx->world.pos.y);
PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ セットＹ！ ☆☆☆☆☆ %f\n" VT_RST, thisx->home.pos.y); PRINTF(VT_FGCOL(RED) T("☆☆☆☆☆ 範囲外Ｚ！ ☆☆☆☆☆ %f\n", "☆☆☆☆☆ Z out of range! ☆☆☆☆☆ %f\n") VT_RST,
PRINTF(VT_FGCOL(GREEN) "☆☆☆☆☆ セットＺ！ ☆☆☆☆☆ %f\n" VT_RST, thisx->home.pos.z); thisx->world.pos.z);
PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ セットＸ！ ☆☆☆☆☆ %f\n", "☆☆☆☆☆ Set X! ☆☆☆☆☆ %f\n") VT_RST, thisx->home.pos.x);
PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ セットＹ！ ☆☆☆☆☆ %f\n", "☆☆☆☆☆ Set Y! ☆☆☆☆☆ %f\n") VT_RST, thisx->home.pos.y);
PRINTF(VT_FGCOL(GREEN) T("☆☆☆☆☆ セットＺ！ ☆☆☆☆☆ %f\n", "☆☆☆☆☆ Set Z! ☆☆☆☆☆ %f\n") VT_RST, thisx->home.pos.z);
thisx->world.pos.x = thisx->home.pos.x; thisx->world.pos.x = thisx->home.pos.x;
thisx->world.pos.z = thisx->home.pos.z; thisx->world.pos.z = thisx->home.pos.z;
thisx->world.pos.y = ((thisx->home.pos.y + play->view.eye.y) + (camResult * 160.0f)); thisx->world.pos.y = ((thisx->home.pos.y + play->view.eye.y) + (camResult * 160.0f));
@ -1002,9 +1010,12 @@ void EnNiw_Update(Actor* thisx, PlayState* play) {
thisx->world.pos.y = thisx->home.pos.y + 300.0f; thisx->world.pos.y = thisx->home.pos.y + 300.0f;
} }
PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ 修整後Ｘ！ ☆☆☆☆☆ %f\n" VT_RST, thisx->world.pos.x); PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ 修整後Ｘ！ ☆☆☆☆☆ %f\n", "☆☆☆☆☆ X after correction! ☆☆☆☆☆ %f\n") VT_RST,
PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ 修整後Ｙ！ ☆☆☆☆☆ %f\n" VT_RST, thisx->world.pos.y); thisx->world.pos.x);
PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ 修整後Ｚ！ ☆☆☆☆☆ %f\n" VT_RST, thisx->world.pos.z); PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ 修整後Ｙ！ ☆☆☆☆☆ %f\n", "☆☆☆☆☆ Y after correction! ☆☆☆☆☆ %f\n") VT_RST,
thisx->world.pos.y);
PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ 修整後Ｚ！ ☆☆☆☆☆ %f\n", "☆☆☆☆☆ Z after correction! ☆☆☆☆☆ %f\n") VT_RST,
thisx->world.pos.z);
PRINTF("\n\n"); PRINTF("\n\n");
thisx->speed = 0.0f; thisx->speed = 0.0f;
thisx->gravity = -2.0f; thisx->gravity = -2.0f;
@ -1045,7 +1056,7 @@ void EnNiw_Update(Actor* thisx, PlayState* play) {
EffectSsGSplash_Spawn(play, &pos, NULL, NULL, 0, 400); EffectSsGSplash_Spawn(play, &pos, NULL, NULL, 0, 400);
this->timer5 = 0; this->timer5 = 0;
PRINTF("\n\n"); PRINTF("\n\n");
PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ ぶくぶく ☆☆☆☆☆ \n" VT_RST); PRINTF(VT_FGCOL(YELLOW) T("☆☆☆☆☆ ぶくぶく ☆☆☆☆☆ \n", "☆☆☆☆☆ Bubbling ☆☆☆☆☆ \n") VT_RST);
PRINTF("\n\n"); PRINTF("\n\n");
this->actionFunc = func_80AB6F04; this->actionFunc = func_80AB6F04;
return; return;

18
src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
View File

@ -173,17 +173,10 @@ static s16 D_80AC8904[] = { 0x001E, 0x001F, 0x0020, 0x0021, 0x0022, 0x0023, 0x00
#if DEBUG_FEATURES #if DEBUG_FEATURES
static char* sShopkeeperPrintName[] = { static char* sShopkeeperPrintName[] = {
"コキリの店 ", // "Kokiri Shop" T("コキリの店 ", "Kokiri Shop"), T("薬屋 ", "Potion Shop"), T("夜の店 ", "Night Shop"),
"薬屋 ", // "Potion Shop" T("路地裏の店 ", "Back Alley Shop"), T("盾の店 ", "Shield Shop"), T("大人の店 ", "Adult Shop"),
"夜の店 ", // "Night Shop" T("タロンの店 ", "Talon Shop"), T("ゾーラの店 ", "Zora Shop"), T("ゴロン夜の店", "Goron Night Shop"),
"路地裏の店 ", // "Back Alley Shop" T("インゴーの店", "Ingo Store"), T("お面屋 ", "Mask Shop"),
"盾の店 ", // "Shield Shop"
"大人の店 ", // "Adult Shop"
"タロンの店 ", // "Talon Shop"
"ゾーラの店 ", // "Zora Shop"
"ゴロン夜の店", // "Goron Night Shop"
"インゴーの店", // "Ingo Store"
"お面屋 ", // "Mask Shop"
}; };
#endif #endif
@ -612,7 +605,8 @@ void EnOssan_Init(Actor* thisx, PlayState* play) {
if (this->actor.params > OSSAN_TYPE_MASK && this->actor.params < OSSAN_TYPE_KOKIRI) { if (this->actor.params > OSSAN_TYPE_MASK && this->actor.params < OSSAN_TYPE_KOKIRI) {
Actor_Kill(&this->actor); Actor_Kill(&this->actor);
PRINTF_COLOR_ERROR(); PRINTF_COLOR_ERROR();
PRINTF("引数がおかしいよ(arg_data=%d)！！\n", this->actor.params); PRINTF(T("引数がおかしいよ(arg_data=%d)！！\n", "The arguments are strange (arg_data=%d)!!\n"),
this->actor.params);
PRINTF_RST(); PRINTF_RST();
ASSERT(0, "0", "../z_en_oB1.c", 1246); ASSERT(0, "0", "../z_en_oB1.c", 1246);
return; return;

11
src/overlays/actors/ovl_En_Xc/z_en_xc.c
View File

@ -376,10 +376,10 @@ void EnXc_SetupSerenadeAction(EnXc* this, PlayState* play) {
s32 pad; s32 pad;
this->action = SHEIK_ACTION_SERENADE; this->action = SHEIK_ACTION_SERENADE;
PRINTF("水のセレナーデ シーク誕生!!!!!!!!!!!!!!!!!!\n"); PRINTF(T("水のセレナーデ シーク誕生!!!!!!!!!!!!!!!!!!\n", "Water serenade Sheik's birth!!!!!!!!!!!!!!!!!!\n"));
} else { } else {
Actor_Kill(&this->actor); Actor_Kill(&this->actor);
PRINTF("水のセレナーデ シーク消滅!!!!!!!!!!!!!!!!!!\n"); PRINTF(T("水のセレナーデ シーク消滅!!!!!!!!!!!!!!!!!!\n", "Water serenade Sheik vanishes!!!!!!!!!!!!!!!!!!\n"));
} }
} }
@ -396,10 +396,10 @@ s32 EnXc_SerenadeCS(EnXc* this, PlayState* play) {
gSaveContext.cutsceneTrigger = 1; gSaveContext.cutsceneTrigger = 1;
SET_EVENTCHKINF(EVENTCHKINF_52); // Learned Serenade of Water Flag SET_EVENTCHKINF(EVENTCHKINF_52); // Learned Serenade of Water Flag
Item_Give(play, ITEM_SONG_SERENADE); Item_Give(play, ITEM_SONG_SERENADE);
PRINTF("ブーツを取った!!!!!!!!!!!!!!!!!!\n"); PRINTF(T("ブーツを取った!!!!!!!!!!!!!!!!!!\n", "I took the boots!!!!!!!!!!!!!!!!!!\n"));
return true; return true;
} else { } else {
PRINTF("はやくブーツを取るべし!!!!!!!!!!!!!!!!!!\n"); PRINTF(T("はやくブーツを取るべし!!!!!!!!!!!!!!!!!!\n", "Quickly get your boots!!!!!!!!!!!!!!!!!!\n"));
return false; return false;
} }
} }
@ -2402,7 +2402,8 @@ void EnXc_Init(Actor* thisx, PlayState* play) {
break; break;
#endif #endif
default: default:
PRINTF(VT_FGCOL(RED) " En_Oa2 の arg_data がおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); PRINTF(VT_FGCOL(RED) T(" En_Oa2 の arg_data がおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n",
" En_Oa2 arg_data is wrong!!!!!!!!!!!!!!!!!!!!!!!!!\n") VT_RST);
EnXc_DoNothing(this, play); EnXc_DoNothing(this, play);
} }
} }

3
src/overlays/gamestates/ovl_file_choose/z_file_choose.c
View File

@ -22,6 +22,7 @@
#include "sfx.h" #include "sfx.h"
#include "sys_matrix.h" #include "sys_matrix.h"
#include "terminal.h" #include "terminal.h"
#include "translation.h"
#include "versions.h" #include "versions.h"
#include "z_lib.h" #include "z_lib.h"
#include "z64audio.h" #include "z64audio.h"
@ -365,7 +366,7 @@ void FileSelect_InitModeUpdate(GameState* thisx) {
this->nextTitleLabel = FS_TITLE_OPEN_FILE; this->nextTitleLabel = FS_TITLE_OPEN_FILE;
PRINTF("Ｓｒａｍ Ｓｔａｒｔ─Ｌｏａｄ 》》》》》 "); PRINTF("Ｓｒａｍ Ｓｔａｒｔ─Ｌｏａｄ 》》》》》 ");
Sram_VerifyAndLoadAllSaves(this, sramCtx); Sram_VerifyAndLoadAllSaves(this, sramCtx);
PRINTF("終了！！！\n"); PRINTF(T("終了！！！\n", "End!!!\n"));
} }
#else #else
if (this->configMode == CM_FADE_IN_START) { if (this->configMode == CM_FADE_IN_START) {

3
src/overlays/gamestates/ovl_file_choose/z_file_nameset.c
View File

@ -12,6 +12,7 @@
#include "sfx.h" #include "sfx.h"
#include "sys_matrix.h" #include "sys_matrix.h"
#include "terminal.h" #include "terminal.h"
#include "translation.h"
#include "versions.h" #include "versions.h"
#include "z64audio.h" #include "z64audio.h"
#include "z64save.h" #include "z64save.h"
@ -1370,7 +1371,7 @@ void FileSelect_UpdateOptionsMenu(GameState* thisx) {
PRINTF("Na_SetSoundOutputMode = %d\n", gSaveContext.soundSetting); PRINTF("Na_SetSoundOutputMode = %d\n", gSaveContext.soundSetting);
PRINTF_RST(); PRINTF_RST();
Audio_SetSoundOutputMode(gSaveContext.soundSetting); Audio_SetSoundOutputMode(gSaveContext.soundSetting);
PRINTF("終了\n"); PRINTF(T("終了\n", "end\n"));
return; return;
} }

5
src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c
View File

@ -6,6 +6,7 @@
#include "printf.h" #include "printf.h"
#include "regs.h" #include "regs.h"
#include "sfx.h" #include "sfx.h"
#include "translation.h"
#include "z64play.h" #include "z64play.h"
#include "z64player.h" #include "z64player.h"
#include "z64save.h" #include "z64save.h"
@ -481,7 +482,9 @@ void KaleidoScope_DrawEquipment(PlayState* play) {
} else { } else {
cursorItem = ITEM_QUIVER_30 + sUpgradeItemOffsets[pauseCtx->cursorY[PAUSE_EQUIP]] + cursorItem = ITEM_QUIVER_30 + sUpgradeItemOffsets[pauseCtx->cursorY[PAUSE_EQUIP]] +
CUR_UPG_VALUE(pauseCtx->cursorY[PAUSE_EQUIP]) - 1; CUR_UPG_VALUE(pauseCtx->cursorY[PAUSE_EQUIP]) - 1;
PRINTF("大人 H_arrowcase_1 + non_equip_item_table = %d\n", cursorItem); PRINTF(T("大人 H_arrowcase_1 + non_equip_item_table = %d\n",
"Adult H_arrowcase_1 + non_equip_item_table = %d\n"),
cursorItem);
} }
} }
} else { } else {

61
src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c
View File

@ -7,6 +7,7 @@
#include "printf.h" #include "printf.h"
#include "regs.h" #include "regs.h"
#include "sfx.h" #include "sfx.h"
#include "translation.h"
#include "z64play.h" #include "z64play.h"
#include "z64save.h" #include "z64save.h"
@ -697,19 +698,19 @@ void KaleidoScope_UpdateItemEquip(PlayState* play) {
gSaveContext.save.info.equips.cButtonSlots[0] = pauseCtx->equipTargetSlot; gSaveContext.save.info.equips.cButtonSlots[0] = pauseCtx->equipTargetSlot;
Interface_LoadItemIcon1(play, 1); Interface_LoadItemIcon1(play, 1);
PRINTF("Ｃ左sl_item_no=%d (1)=%d (2)=%d (3)=%d\n", pauseCtx->equipTargetItem, PRINTF(T("Ｃ左sl_item_no=%d (1)=%d (2)=%d (3)=%d\n", "C left sl_item_no=%d (1)=%d (2)=%d (3)=%d\n"),
gSaveContext.save.info.equips.buttonItems[1], gSaveContext.save.info.equips.buttonItems[2], pauseCtx->equipTargetItem, gSaveContext.save.info.equips.buttonItems[1],
gSaveContext.save.info.equips.buttonItems[3]); gSaveContext.save.info.equips.buttonItems[2], gSaveContext.save.info.equips.buttonItems[3]);
PRINTF("Ｃ左sl_number=%d (1)=%d (2)=%d (3)=%d\n", pauseCtx->equipTargetSlot, PRINTF(T("Ｃ左sl_number=%d (1)=%d (2)=%d (3)=%d\n", "C left sl_number=%d (1)=%d (2)=%d (3)=%d\n"),
gSaveContext.save.info.equips.cButtonSlots[0], gSaveContext.save.info.equips.cButtonSlots[1], pauseCtx->equipTargetSlot, gSaveContext.save.info.equips.cButtonSlots[0],
gSaveContext.save.info.equips.cButtonSlots[2]); gSaveContext.save.info.equips.cButtonSlots[1], gSaveContext.save.info.equips.cButtonSlots[2]);
} else if (pauseCtx->equipTargetCBtn == 1) { } else if (pauseCtx->equipTargetCBtn == 1) {
PRINTF("Ｃ下sl_item_no=%d (1)=%d (2)=%d (3)=%d\n", pauseCtx->equipTargetItem, PRINTF(T("Ｃ下sl_item_no=%d (1)=%d (2)=%d (3)=%d\n", "C down sl_item_no=%d (1)=%d (2)=%d (3)=%d\n"),
gSaveContext.save.info.equips.buttonItems[1], gSaveContext.save.info.equips.buttonItems[2], pauseCtx->equipTargetItem, gSaveContext.save.info.equips.buttonItems[1],
gSaveContext.save.info.equips.buttonItems[3]); gSaveContext.save.info.equips.buttonItems[2], gSaveContext.save.info.equips.buttonItems[3]);
PRINTF("Ｃ下sl_number=%d (1)=%d (2)=%d (3)=%d\n", pauseCtx->equipTargetSlot, PRINTF(T("Ｃ下sl_number=%d (1)=%d (2)=%d (3)=%d\n", "C down sl_number=%d (1)=%d (2)=%d (3)=%d\n"),
gSaveContext.save.info.equips.cButtonSlots[0], gSaveContext.save.info.equips.cButtonSlots[1], pauseCtx->equipTargetSlot, gSaveContext.save.info.equips.cButtonSlots[0],
gSaveContext.save.info.equips.cButtonSlots[2]); gSaveContext.save.info.equips.cButtonSlots[1], gSaveContext.save.info.equips.cButtonSlots[2]);
if (pauseCtx->equipTargetSlot == gSaveContext.save.info.equips.cButtonSlots[0]) { if (pauseCtx->equipTargetSlot == gSaveContext.save.info.equips.cButtonSlots[0]) {
if (gSaveContext.save.info.equips.buttonItems[2] != ITEM_NONE) { if (gSaveContext.save.info.equips.buttonItems[2] != ITEM_NONE) {
@ -772,19 +773,19 @@ void KaleidoScope_UpdateItemEquip(PlayState* play) {
gSaveContext.save.info.equips.cButtonSlots[1] = pauseCtx->equipTargetSlot; gSaveContext.save.info.equips.cButtonSlots[1] = pauseCtx->equipTargetSlot;
Interface_LoadItemIcon1(play, 2); Interface_LoadItemIcon1(play, 2);
PRINTF("Ｃ下sl_item_no=%d (1)=%d (2)=%d (3)=%d\n", pauseCtx->equipTargetItem, PRINTF(T("Ｃ下sl_item_no=%d (1)=%d (2)=%d (3)=%d\n", "C down sl_item_no=%d (1)=%d (2)=%d (3)=%d\n"),
gSaveContext.save.info.equips.buttonItems[1], gSaveContext.save.info.equips.buttonItems[2], pauseCtx->equipTargetItem, gSaveContext.save.info.equips.buttonItems[1],
gSaveContext.save.info.equips.buttonItems[3]); gSaveContext.save.info.equips.buttonItems[2], gSaveContext.save.info.equips.buttonItems[3]);
PRINTF("Ｃ下sl_number=%d (1)=%d (2)=%d (3)=%d\n", pauseCtx->equipTargetSlot, PRINTF(T("Ｃ下sl_number=%d (1)=%d (2)=%d (3)=%d\n", "C down sl_number=%d (1)=%d (2)=%d (3)=%d\n"),
gSaveContext.save.info.equips.cButtonSlots[0], gSaveContext.save.info.equips.cButtonSlots[1], pauseCtx->equipTargetSlot, gSaveContext.save.info.equips.cButtonSlots[0],
gSaveContext.save.info.equips.cButtonSlots[2]); gSaveContext.save.info.equips.cButtonSlots[1], gSaveContext.save.info.equips.cButtonSlots[2]);
} else { } else {
PRINTF("Ｃ右sl_item_no=%d (1)=%d (2)=%d (3)=%d\n", pauseCtx->equipTargetItem, PRINTF(T("Ｃ右sl_item_no=%d (1)=%d (2)=%d (3)=%d\n", "C right sl_item_no=%d (1)=%d (2)=%d (3)=%d\n"),
gSaveContext.save.info.equips.buttonItems[1], gSaveContext.save.info.equips.buttonItems[2], pauseCtx->equipTargetItem, gSaveContext.save.info.equips.buttonItems[1],
gSaveContext.save.info.equips.buttonItems[3]); gSaveContext.save.info.equips.buttonItems[2], gSaveContext.save.info.equips.buttonItems[3]);
PRINTF("Ｃ右sl_number=%d (1)=%d (2)=%d (3)=%d\n", pauseCtx->equipTargetSlot, PRINTF(T("Ｃ右sl_number=%d (1)=%d (2)=%d (3)=%d\n", "C right sl_number=%d (1)=%d (2)=%d (3)=%d\n"),
gSaveContext.save.info.equips.cButtonSlots[0], gSaveContext.save.info.equips.cButtonSlots[1], pauseCtx->equipTargetSlot, gSaveContext.save.info.equips.cButtonSlots[0],
gSaveContext.save.info.equips.cButtonSlots[2]); gSaveContext.save.info.equips.cButtonSlots[1], gSaveContext.save.info.equips.cButtonSlots[2]);
if (pauseCtx->equipTargetSlot == gSaveContext.save.info.equips.cButtonSlots[0]) { if (pauseCtx->equipTargetSlot == gSaveContext.save.info.equips.cButtonSlots[0]) {
if (gSaveContext.save.info.equips.buttonItems[3] != ITEM_NONE) { if (gSaveContext.save.info.equips.buttonItems[3] != ITEM_NONE) {
@ -847,12 +848,12 @@ void KaleidoScope_UpdateItemEquip(PlayState* play) {
gSaveContext.save.info.equips.cButtonSlots[2] = pauseCtx->equipTargetSlot; gSaveContext.save.info.equips.cButtonSlots[2] = pauseCtx->equipTargetSlot;
Interface_LoadItemIcon1(play, 3); Interface_LoadItemIcon1(play, 3);
PRINTF("Ｃ右sl_item_no=%d (1)=%d (2)=%d (3)=%d\n", pauseCtx->equipTargetItem, PRINTF(T("Ｃ右sl_item_no=%d (1)=%d (2)=%d (3)=%d\n", "C right sl_item_no=%d (1)=%d (2)=%d (3)=%d\n"),
gSaveContext.save.info.equips.buttonItems[1], gSaveContext.save.info.equips.buttonItems[2], pauseCtx->equipTargetItem, gSaveContext.save.info.equips.buttonItems[1],
gSaveContext.save.info.equips.buttonItems[3]); gSaveContext.save.info.equips.buttonItems[2], gSaveContext.save.info.equips.buttonItems[3]);
PRINTF("Ｃ右sl_number=%d (1)=%d (2)=%d (3)=%d\n", pauseCtx->equipTargetSlot, PRINTF(T("Ｃ右sl_number=%d (1)=%d (2)=%d (3)=%d\n", "C right sl_number=%d (1)=%d (2)=%d (3)=%d\n"),
gSaveContext.save.info.equips.cButtonSlots[0], gSaveContext.save.info.equips.cButtonSlots[1], pauseCtx->equipTargetSlot, gSaveContext.save.info.equips.cButtonSlots[0],
gSaveContext.save.info.equips.cButtonSlots[2]); gSaveContext.save.info.equips.cButtonSlots[1], gSaveContext.save.info.equips.cButtonSlots[2]);
} }
pauseCtx->mainState = PAUSE_MAIN_STATE_IDLE; pauseCtx->mainState = PAUSE_MAIN_STATE_IDLE;