mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-06-17 15:17:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

More GCC compatibility/warning fixes (#3118)

Browse Source 
* Wrap >4-char literals in a MULTI_CHAR macro

Modern compilers do not support CW's non-standard behavior with
>4 char literals. We can, however, use a constexpr function to
compute the u64 values directly. This leaves <=4 char literals
unchanged.

* Replace non-pointer usages of NULL with 0

* Define NULL to nullptr on C++11 and above

* Fix more -Wpointer-arith and -Woverflow warnings

* Replace u32/s32 with uintptr_t/intptr_t where appropriate

* JSUOutputStream: Overload all standard int types
This commit is contained in:
Luke Street
2026-02-28 21:19:17 -07:00
committed by GitHub
parent b5d3b8c059
commit 6a48380461
169 changed files with 1849 additions and 1818 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_alink.cpp
+2 -2
View File
@@ -3082,7 +3082,7 @@ cXyz* daAlink_c::getNeckAimPos(cXyz* param_0, int* param_1, int param_2) {
}
} else if (field_0x35c4.abs2XZ() > 1.0f && checkModeFlg(1)) {
f32 var_f31;
if (checkWolf() != NULL) {
if (checkWolf() != 0) {
var_f31 = 80.0f;
} else {
var_f31 = 150.0f;
@@ -12223,7 +12223,7 @@ BOOL daAlink_c::checkGroundSpecialMode() {
return procScreamWaitInit();
}
return NULL;
return 0;
}
int daAlink_c::commonCheckNextAction(int param_0) {
src/d/actor/d_a_alink_horse.inc
+1 -1
View File
@@ -339,7 +339,7 @@ void daAlink_c::setHorseStirrup() {
if (field_0x2fab & 1) {
mDoMtx_stack_c::copy(mpLinkModel->getAnmMtx(field_0x30bc));
mDoMtx_stack_c::transM(-2.0f, -11.0f, 1.5f);
mDoMtx_stack_c::ZXYrotM(NULL, -0x8000, 0x4000);
mDoMtx_stack_c::ZXYrotM(0, -0x8000, 0x4000);
mDoMtx_copy(mDoMtx_stack_c::get(), horse->getLeftStirrupMtx());
}
src/d/actor/d_a_alink_swim.inc
+1 -1
View File
@@ -346,7 +346,7 @@ int daAlink_c::checkNextActionSwim() {
int daAlink_c::checkSwimAction(int param_0) {
f32 var_f31;
if (checkWolf()) {
if (getMoveBGActorName(mLinkAcch.m_gnd, NULL) == PROC_Obj_ITA) {
if (getMoveBGActorName(mLinkAcch.m_gnd, 0) == PROC_Obj_ITA) {
var_f31 = 200.0f;
} else {
var_f31 = mpHIO->mWolf.mWlSwim.m.mStartHeight;
src/d/actor/d_a_b_dr.cpp
+1 -1
View File
@@ -4083,7 +4083,7 @@ int daB_DR_c::create() {
gravity = -3.0f;
mSound.init(&current.pos, &eyePos, 3, 1);
mColliderStts.Init(0x19, NULL, this);
mColliderStts.Init(0x19, 0, this);
fopAcM_OnStatus(this, 0x4000);
src/d/actor/d_a_balloon_2D.cpp
+23 -23
View File
@@ -165,18 +165,18 @@ int daBalloon2D_c::createHeap() {
JKRArchive* arc = resInfo->getArchive();
mScreen->setPriority("zelda_balloon_game.blo", 0x20000, arc);
dPaneClass_showNullPane(mScreen);
field_0x578 = new CPaneMgr(mScreen, 'n_all', 2, NULL);
field_0x57c = new CPaneMgr(mScreen, 'score_tn', 0, NULL);
field_0x580 = new CPaneMgr(mScreen, 'suji_n', 2, NULL);
field_0x584 = new CPaneMgr(mScreen, 's_set_n', 0, NULL);
field_0x588 = new CPaneMgr(mScreen, 'tas_n', 0, NULL);
field_0x58c = new CPaneMgr(mScreen, 'combo_tn', 0, NULL);
field_0x590 = new CPaneMgr(mScreen, 'num_n', 0, NULL);
field_0x594 = new CPaneMgr(mScreen, 'co_set_n', 2, NULL);
field_0x598 = new CPaneMgr(mScreen, 'bal_3_n', 2, NULL);
field_0x59c = new CPaneMgr(mScreen, 'bal_2_n', 2, NULL);
field_0x5a0 = new CPaneMgr(mScreen, 'bal_1_n', 2, NULL);
field_0x5a4 = new CPaneMgr(mScreen, 'ba_com_n', 2, NULL);
field_0x578 = new CPaneMgr(mScreen, MULTI_CHAR('n_all'), 2, NULL);
field_0x57c = new CPaneMgr(mScreen, MULTI_CHAR('score_tn'), 0, NULL);
field_0x580 = new CPaneMgr(mScreen, MULTI_CHAR('suji_n'), 2, NULL);
field_0x584 = new CPaneMgr(mScreen, MULTI_CHAR('s_set_n'), 0, NULL);
field_0x588 = new CPaneMgr(mScreen, MULTI_CHAR('tas_n'), 0, NULL);
field_0x58c = new CPaneMgr(mScreen, MULTI_CHAR('combo_tn'), 0, NULL);
field_0x590 = new CPaneMgr(mScreen, MULTI_CHAR('num_n'), 0, NULL);
field_0x594 = new CPaneMgr(mScreen, MULTI_CHAR('co_set_n'), 2, NULL);
field_0x598 = new CPaneMgr(mScreen, MULTI_CHAR('bal_3_n'), 2, NULL);
field_0x59c = new CPaneMgr(mScreen, MULTI_CHAR('bal_2_n'), 2, NULL);
field_0x5a0 = new CPaneMgr(mScreen, MULTI_CHAR('bal_1_n'), 2, NULL);
field_0x5a4 = new CPaneMgr(mScreen, MULTI_CHAR('ba_com_n'), 2, NULL);
field_0x578->setAlphaRate(0.0f);
field_0x5a4->setAlphaRate(0.0f);
for (s32 i = 0; i < 10; i++) {
@@ -197,17 +197,17 @@ int daBalloon2D_c::createHeap() {
}
J2DTextBox* combos[2];
J2DTextBox* scores[2];
combos[0] = (J2DTextBox*)mScreen->search('combo_ts');
combos[1] = (J2DTextBox*)mScreen->search('combo_t');
scores[0] = (J2DTextBox*)mScreen->search('score_ts');
scores[1] = (J2DTextBox*)mScreen->search('score_t');
field_0x5a8[0] = (J2DPicture*)mScreen->search('suji_4');
field_0x5a8[1] = (J2DPicture*)mScreen->search('suji_3');
field_0x5a8[2] = (J2DPicture*)mScreen->search('suji_2');
field_0x5a8[3] = (J2DPicture*)mScreen->search('suji_1');
field_0x5a8[4] = (J2DPicture*)mScreen->search('suji_0');
field_0x5a8[5] = (J2DPicture*)mScreen->search('num_1');
field_0x5a8[6] = (J2DPicture*)mScreen->search('num_0');
combos[0] = (J2DTextBox*)mScreen->search(MULTI_CHAR('combo_ts'));
combos[1] = (J2DTextBox*)mScreen->search(MULTI_CHAR('combo_t'));
scores[0] = (J2DTextBox*)mScreen->search(MULTI_CHAR('score_ts'));
scores[1] = (J2DTextBox*)mScreen->search(MULTI_CHAR('score_t'));
field_0x5a8[0] = (J2DPicture*)mScreen->search(MULTI_CHAR('suji_4'));
field_0x5a8[1] = (J2DPicture*)mScreen->search(MULTI_CHAR('suji_3'));
field_0x5a8[2] = (J2DPicture*)mScreen->search(MULTI_CHAR('suji_2'));
field_0x5a8[3] = (J2DPicture*)mScreen->search(MULTI_CHAR('suji_1'));
field_0x5a8[4] = (J2DPicture*)mScreen->search(MULTI_CHAR('suji_0'));
field_0x5a8[5] = (J2DPicture*)mScreen->search(MULTI_CHAR('num_1'));
field_0x5a8[6] = (J2DPicture*)mScreen->search(MULTI_CHAR('num_0'));
for (int i = 0; i < 2; i++) {
combos[i]->setString(32, "");
scores[i]->setString(32, "");
src/d/actor/d_a_boomerang.cpp
+15 -15
View File
@@ -158,10 +158,10 @@ static const u32 l_lockSeFlg[BOOMERANG_LOCK_MAX] = {
};
void daBoomerang_sight_c::initialize() {
m_cursorYellowAllPane = m_cursorYellowScrn->search('n_all');
m_cursorYellow0Pane = m_cursorYellowScrn->search('cursor0');
m_cursorYellow1Pane = m_cursorYellowScrn->search('cursor1');
m_cursorYellow2Pane = m_cursorYellowScrn->search('cursor2');
m_cursorYellowAllPane = m_cursorYellowScrn->search(MULTI_CHAR('n_all'));
m_cursorYellow0Pane = m_cursorYellowScrn->search(MULTI_CHAR('cursor0'));
m_cursorYellow1Pane = m_cursorYellowScrn->search(MULTI_CHAR('cursor1'));
m_cursorYellow2Pane = m_cursorYellowScrn->search(MULTI_CHAR('cursor2'));
m_cursorYellowBck->searchUpdateMaterialID(m_cursorYellowScrn);
m_cursorYellowAllPane->setAnimation(m_cursorYellowBck);
@@ -174,7 +174,7 @@ void daBoomerang_sight_c::initialize() {
m_cursorYellow0Pane->setAnimation(m_cursorYellowBpk);
m_cursorYellow1Pane->setAnimation(m_cursorYellowBpk);
m_cursorYellow2Pane->setAnimation(m_cursorYellowBpk);
m_cursorYellowScrn->search('flash')->setAnimation(m_cursorYellowBpk);
m_cursorYellowScrn->search(MULTI_CHAR('flash'))->setAnimation(m_cursorYellowBpk);
m_cursorYellowBpk->setFrame(0.0f);
m_cursorYellow2Brk->searchUpdateMaterialID(m_cursorYellowScrn);
@@ -192,10 +192,10 @@ void daBoomerang_sight_c::initialize() {
m_cursorYellowScrn->setUserInfo('n_43');
m_cursorYellowAllPane->setUserInfo(' ');
m_cursorRedAllPane = m_cursorRedScrn->search('n_all');
m_cursorRed0Pane = m_cursorRedScrn->search('cursor0');
m_cursorRed1Pane = m_cursorRedScrn->search('cursor1');
m_cursorRed2Pane = m_cursorRedScrn->search('cursor2');
m_cursorRedAllPane = m_cursorRedScrn->search(MULTI_CHAR('n_all'));
m_cursorRed0Pane = m_cursorRedScrn->search(MULTI_CHAR('cursor0'));
m_cursorRed1Pane = m_cursorRedScrn->search(MULTI_CHAR('cursor1'));
m_cursorRed2Pane = m_cursorRedScrn->search(MULTI_CHAR('cursor2'));
m_cursorRedAllPane->setAnimation(m_cursorYellowBck);
m_cursorRed0Pane->setAnimation(m_cursorYellowBck);
@@ -204,7 +204,7 @@ void daBoomerang_sight_c::initialize() {
m_cursorRed0Pane->setAnimation(m_cursorYellowBpk);
m_cursorRed1Pane->setAnimation(m_cursorYellowBpk);
m_cursorRed2Pane->setAnimation(m_cursorYellowBpk);
m_cursorRedScrn->search('flash')->setAnimation(m_cursorYellowBpk);
m_cursorRedScrn->search(MULTI_CHAR('flash'))->setAnimation(m_cursorYellowBpk);
m_cursorRed2Brk->searchUpdateMaterialID(m_cursorRedScrn);
m_cursorRedBrk->searchUpdateMaterialID(m_cursorRedScrn);
@@ -221,10 +221,10 @@ void daBoomerang_sight_c::initialize() {
m_cursorRedScrn->setUserInfo('n_43');
m_cursorRedAllPane->setUserInfo(' ');
m_cursorOrangeAllPane = m_cursorOrangeScrn->search('n_all');
m_cursorOrange0Pane = m_cursorOrangeScrn->search('cursor0');
m_cursorOrange1Pane = m_cursorOrangeScrn->search('cursor1');
m_cursorOrange2Pane = m_cursorOrangeScrn->search('cursor2');
m_cursorOrangeAllPane = m_cursorOrangeScrn->search(MULTI_CHAR('n_all'));
m_cursorOrange0Pane = m_cursorOrangeScrn->search(MULTI_CHAR('cursor0'));
m_cursorOrange1Pane = m_cursorOrangeScrn->search(MULTI_CHAR('cursor1'));
m_cursorOrange2Pane = m_cursorOrangeScrn->search(MULTI_CHAR('cursor2'));
m_cursorOrangeAllPane->setAnimation(m_cursorYellowBck);
m_cursorOrange0Pane->setAnimation(m_cursorYellowBck);
@@ -233,7 +233,7 @@ void daBoomerang_sight_c::initialize() {
m_cursorOrange0Pane->setAnimation(m_cursorYellowBpk);
m_cursorOrange1Pane->setAnimation(m_cursorYellowBpk);
m_cursorOrange2Pane->setAnimation(m_cursorYellowBpk);
m_cursorOrangeScrn->search('flash')->setAnimation(m_cursorYellowBpk);
m_cursorOrangeScrn->search(MULTI_CHAR('flash'))->setAnimation(m_cursorYellowBpk);
m_cursorOrange2Brk->searchUpdateMaterialID(m_cursorOrangeScrn);
m_cursorOrangeBrk->searchUpdateMaterialID(m_cursorOrangeScrn);
src/d/actor/d_a_coach_2D.cpp
+9 -9
View File
@@ -125,13 +125,13 @@ int daCoach2D_c::createHeap() {
mpFireIconBrk->searchUpdateMaterialID(mpScrn);
setBrkAnime(true);
mpPaneAll = new CPaneMgr(mpScrn, 'n_all', 2, NULL);
mpPaneBasha = new CPaneMgr(mpScrn, 'basha_n', 2, NULL);
mpPaneFire = new CPaneMgr(mpScrn, 'fire_n', 2, NULL);
mpPaneAll = new CPaneMgr(mpScrn, MULTI_CHAR('n_all'), 2, NULL);
mpPaneBasha = new CPaneMgr(mpScrn, MULTI_CHAR('basha_n'), 2, NULL);
mpPaneFire = new CPaneMgr(mpScrn, MULTI_CHAR('fire_n'), 2, NULL);
mpScrn->search('fire_b_n')->move(mpPaneFire->getPosX(), mpPaneFire->getPosY());
mpScrn->search(MULTI_CHAR('fire_b_n'))->move(mpPaneFire->getPosX(), mpPaneFire->getPosY());
mpPaneFireB = new CPaneMgr(mpScrn, 'fire_b_n', 2, NULL);
mpPaneFireB = new CPaneMgr(mpScrn, MULTI_CHAR('fire_b_n'), 2, NULL);
mMsgLight = new dMsgScrnLight_c(6, 0xFF);
@@ -288,7 +288,7 @@ void daCoach2D_c::update() {
icon_pos_x -= var_f29;
}
f32 var_f30 = 4.0f * ((J2DPicture*)mpScrn->search('basha_p0'))->getWhite().r;
f32 var_f30 = 4.0f * ((J2DPicture*)mpScrn->search(MULTI_CHAR('basha_p0')))->getWhite().r;
if (var_f30 > 255.0f) {
var_f30 = 255.0f;
}
@@ -320,14 +320,14 @@ void daCoach2D_c::setBrkAnime(bool param_0) {
if (mBrkFrame >= mpFireIconBrk->getFrameMax()) {
mBrkFrame -= mpFireIconBrk->getFrameMax();
}
mpScrn->search('basha_f0')->show();
mpScrn->search(MULTI_CHAR('basha_f0'))->show();
} else {
mpScrn->search('basha_f0')->hide();
mpScrn->search(MULTI_CHAR('basha_f0'))->hide();
mBrkFrame = 0.0f;
}
mpFireIconBrk->setFrame(mBrkFrame);
mpScrn->search('basha_p0')->setAnimation(mpFireIconBrk);
mpScrn->search(MULTI_CHAR('basha_p0'))->setAnimation(mpFireIconBrk);
}
static int daCoach2D_create(daCoach2D_c* i_this) {
src/d/actor/d_a_coach_fire.cpp
+2 -2
View File
@@ -113,11 +113,11 @@ int daCoachFire_c::execute() {
dAttention_c* attn = dComIfGp_getAttention();
if (attn->LockonTruth()) {
if (attn->LockonTarget(0) != this) {
if (coach->deleteFireArrowFromList(fopAcM_GetID(this)) != NULL) {
if (coach->deleteFireArrowFromList(fopAcM_GetID(this)) != false) {
fopAcM_delete(this);
}
}
} else if (coach->deleteFireArrowFromList(fopAcM_GetID(this)) != NULL) {
} else if (coach->deleteFireArrowFromList(fopAcM_GetID(this)) != false) {
fopAcM_delete(this);
}
}
src/d/actor/d_a_door_shutter.cpp
+3 -3
View File
@@ -306,7 +306,7 @@ int daDoor20_c::checkOpenMsgDoor(int* param_1) {
*param_1 = 0;
return 1;
}
field_0x624.init(NULL, msgNo, NULL, NULL);
field_0x624.init(0, msgNo, NULL, NULL);
int rv = field_0x624.checkOpenDoor(this, param_1);
dMsgObject_endFlowGroup();
return rv;
@@ -1380,7 +1380,7 @@ int daDoor20_c::createKey() {
}
field_0x5ec =
fopAcM_createChildFromOffset(PROC_Obj_Lv5Key, fopAcM_GetID(this), 0xffffffff,
&cStack_28, roomNo, &cStack_30, &scale, 0xffffffff, 0);
&cStack_28, roomNo, &cStack_30, &scale, -1, 0);
break;
default:
OSReport_Error("シャッタードア：鍵タイプが不明です\n"); // Shutter door: key type unknown
@@ -1399,7 +1399,7 @@ int daDoor20_c::createKey() {
}
field_0x5ec =
fopAcM_createChildFromOffset(PROC_OBJ_KEYHOLE, fopAcM_GetID(this), 0xffffffff,
&cStack_28, roomNo, &cStack_30, &scale, 0xffffffff, 0);
&cStack_28, roomNo, &cStack_30, &scale, -1, 0);
}
current.pos = prevPos;
src/d/actor/d_a_e_arrow.cpp
+1 -1
View File
@@ -330,7 +330,7 @@ static void e_arrow_spin(e_arrow_class* i_this) {
}
static void* s_limit_sub(void* i_actor, void* i_data) {
if (fopAcM_IsActor(i_actor) != NULL && i_actor != i_data &&
if (fopAcM_IsActor(i_actor) != FALSE && i_actor != i_data &&
fopAcM_GetName(i_actor) == PROC_E_ARROW &&
static_cast<e_arrow_class*>(i_actor)->mAction == ACTION_ARROW_FIRE &&
fabsf(static_cast<e_arrow_class*>(i_actor)->field_0xa00.z -
src/d/actor/d_a_e_bg.cpp
+1 -1
View File
@@ -93,7 +93,7 @@ int daE_BG_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
}
int daE_BG_c::JointCallBack(J3DJoint* i_joint, int param_1) {
if (param_1 == NULL) {
if (param_1 == 0) {
J3DModel* model = j3dSys.getModel();
daE_BG_c* bg = (daE_BG_c*)model->getUserArea();
if (bg != NULL) {
src/d/actor/d_a_e_df.cpp
+1 -1
View File
@@ -659,7 +659,7 @@ int daE_DF_c::Create() {
return cPhs_ERROR_e;
}
if (fopAcM_entrySolidHeap(this, useHeapInit, 0x1a40) == NULL) {
if (fopAcM_entrySolidHeap(this, useHeapInit, 0x1a40) == false) {
return cPhs_ERROR_e;
}
src/d/actor/d_a_e_gi.cpp
+1 -1
View File
@@ -93,7 +93,7 @@ int daE_GI_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
}
int daE_GI_c::JointCallBack(J3DJoint* i_joint, int param_1) {
if (param_1 == NULL) {
if (param_1 == 0) {
J3DModel* model = j3dSys.getModel();
daE_GI_c* a_this = (daE_GI_c*)model->getUserArea();
src/d/actor/d_a_e_hp.cpp
+2 -2
View File
@@ -119,7 +119,7 @@ int daE_HP_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
}
int daE_HP_c::JointCallBack(J3DJoint* i_joint, int param_1) {
if (param_1 == NULL) {
if (param_1 == 0) {
J3DModel* model = j3dSys.getModel();
daE_HP_c* poe = (daE_HP_c*)model->getUserArea();
if (poe != NULL) {
@@ -155,7 +155,7 @@ int daE_HP_c::LampCtrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
}
int daE_HP_c::LampJointCallBack(J3DJoint* i_joint, int param_1) {
if (param_1 == NULL) {
if (param_1 == 0) {
J3DModel* model = j3dSys.getModel();
daE_HP_c* poe = (daE_HP_c*)model->getUserArea();
if (poe != NULL) {
src/d/actor/d_a_e_yh.cpp
+1 -1
View File
@@ -2008,7 +2008,7 @@ static int daE_YH_Execute(e_yh_class* i_this) {
J3DModel* model = i_this->mpMorf->getModel();
model->setBaseTRMtx(mDoMtx_stack_c::get());
i_this->mpMorf->play(NULL, dComIfGp_getReverb(fopAcM_GetRoomNo(a_this)));
i_this->mpMorf->play(0, dComIfGp_getReverb(fopAcM_GetRoomNo(a_this)));
i_this->mBrk->play();
i_this->mpMorf->modelCalc();
src/d/actor/d_a_e_ym.cpp
+1 -1
View File
@@ -3147,7 +3147,7 @@ void daE_YM_c::action() {
cXyz unused_vec(field_0x68c, field_0x68c, field_0x68c);
cXyz my_pos = current.pos;
setMidnaBindEffect(this, &mSound, &my_pos, &scale);
mpMorf->play(NULL, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
mpMorf->play(0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
mpBrk->play();
}
src/d/actor/d_a_formation_mng.cpp
+1 -1
View File
@@ -382,7 +382,7 @@ void daFmtMng_c::create_init() {
for (int i = 0; i < mFormationLine * mFormationRow; i++, member++) {
member->mNpcId = fopAcM_createChild(0x294, fopAcM_GetID(this), (inTime << 0x10) | 0x200,
&member->field_0x04, fopAcM_GetRoomNo(this),
&home.angle, NULL, 0xffffffff, NULL);
&home.angle, NULL, -1, NULL);
}
}
src/d/actor/d_a_kago.cpp
+16 -16
View File
@@ -188,7 +188,7 @@ bool daKago_c::checkBck(int param_0) {
}
int daKago_c::draw() {
if (field_0x6de == NULL) {
if (field_0x6de == 0) {
return 1;
}
@@ -511,7 +511,7 @@ void daKago_c::demo_skip(int param_0) {
switch (param_0) {
case 0:
field_0x748 = 2;
field_0x74c = NULL;
field_0x74c = 0;
break;
case 1:
field_0x728 = 0;
@@ -525,7 +525,7 @@ void daKago_c::demo_skip(int param_0) {
/* dSv_event_flag_c::M_051 - Main Event - Shadow Kargorok (?) (Large) event complete (Horse grass appears in various places) */
dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[84]);
field_0x748 = 7;
field_0x74c = NULL;
field_0x74c = 0;
break;
case 4:
setSceneChange(0);
@@ -692,7 +692,7 @@ int daKago_c::setSceneChange(int param_0) {
void daKago_c::createBalloonScore() {
if (field_0x6e7 != 0 && mBalloon2DId == fpcM_ERROR_PROCESS_ID_e) {
mBalloon2DId = fopAcM_create(PROC_BALLOON2D, 0, 0, 0xffffffff, 0, 0, 0xffffffff);
mBalloon2DId = fopAcM_create(PROC_BALLOON2D, 0, 0, 0xffffffff, 0, 0, -1);
field_0x6e9 = 1;
}
}
@@ -1199,7 +1199,7 @@ void daKago_c::executeFly() {
}
if (field_0x744 == 3) {
cLib_chaseUC(&field_0x6de, 0, 4);
cLib_addCalcAngleS(&current.angle.x, 0xffffe000, 8, 0x100, 0x10);
cLib_addCalcAngleS(&current.angle.x, -8192, 8, 0x100, 0x10);
} else {
cLib_addCalcAngleS(&current.angle.x, unkInt2, 8, 0x100, 0x10);
}
@@ -2230,7 +2230,7 @@ bool daKago_c::PerchDemoAwayForward() {
if (field_0x728 < 30) {
cLib_addCalcAngleS(&current.angle.x, 0, 8, 0x100, 0x40);
} else {
cLib_addCalcAngleS(&current.angle.x, 0xffffe000, 8, 0x100, 0x40);
cLib_addCalcAngleS(&current.angle.x, -8192, 8, 0x100, 0x40);
}
shape_angle.x = current.angle.x;
@@ -2277,7 +2277,7 @@ bool daKago_c::PerchDemoAwayForward() {
cLib_chaseF(&field_0x6f8, 30.0f, 1.0f);
cLib_addCalcAngleS(&current.angle.x, 0xffffe000, 8, 0x100, 0x40);
cLib_addCalcAngleS(&current.angle.x, -8192, 8, 0x100, 0x40);
shape_angle.x = current.angle.x;
shape_angle.y = current.angle.y;
@@ -2547,7 +2547,7 @@ bool daKago_c::executeFirstDemo() {
if (field_0x728 > 30) {
cLib_chaseF(&field_0x6cc, 350.0f, 4.0f);
cLib_addCalcAngleS(&field_0x718, 0xfffff800, 8, 0x100, 0x10);
cLib_addCalcAngleS(&field_0x718, -2048, 8, 0x100, 0x10);
} else {
cLib_chaseF(&field_0x6cc, 350.0f, 6.0f);
cLib_addCalcAngleS(&field_0x718, 0x400, 8, 0x200, 0x10);
@@ -2699,7 +2699,7 @@ bool daKago_c::executeFirstDemo() {
case 6:
dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 2);
cLib_addCalcAngleS(&current.angle.x, 0xffffe000, 8, 0x100, 0x40);
cLib_addCalcAngleS(&current.angle.x, -8192, 8, 0x100, 0x40);
shape_angle.x = current.angle.x;
shape_angle.y = current.angle.y;
@@ -2944,7 +2944,7 @@ void daKago_c::executeLandingLakeHairia() {
speedF = field_0x6f8 * std::abs(cM_scos(current.angle.x));
speed.y = -field_0x6f8 * cM_ssin(current.angle.x);
cLib_chaseAngleS(&shape_angle.x, 0xffffe000, 0x100);
cLib_chaseAngleS(&shape_angle.x, -8192, 0x100);
current.angle.x = shape_angle.x;
if (field_0x728 == 90) {
@@ -3078,7 +3078,7 @@ void daKago_c::executeLandingBoartHouse() {
speedF = field_0x6f8 * std::abs(cM_scos(current.angle.x));
speed.y = -field_0x6f8 * cM_ssin(current.angle.x);
cLib_chaseAngleS(&shape_angle.x, 0xffffe000, 0x100);
cLib_chaseAngleS(&shape_angle.x, -8192, 0x100);
current.angle.x = shape_angle.x;
if (field_0x728 == 0x50) {
@@ -3391,7 +3391,7 @@ void daKago_c::setDashBlurEffect(int param_0) {
field_0x6be.y = shape_angle.y;
field_0x6be.z = 0;
}
field_0xb40 = dComIfGp_particle_set(field_0xb40, 0x860f, &cameraEyeOffset, &tevStr, &field_0x6be, 0, 0xff, 0, 0xffffffff, 0, 0, 0);
field_0xb40 = dComIfGp_particle_set(field_0xb40, 0x860f, &cameraEyeOffset, &tevStr, &field_0x6be, 0, 0xff, 0, -1, 0, 0, 0);
}
void daKago_c::setWallHitEffect(cXyz param_0, int param_1) {
@@ -3422,7 +3422,7 @@ void daKago_c::setSibukiEffect() {
for (int i = 0; i < 3; i++) {
field_0xb44[i] =
dComIfGp_particle_set(field_0xb44[i], kago_wave_id[i], &acStack_28, &tevStr, &cStack_30,
0, 0xff, 0, 0xffffffff, 0, 0, 0);
0, 0xff, 0, -1, 0, 0, 0);
}
if (field_0x6e7 == 0) {
@@ -3436,7 +3436,7 @@ void daKago_c::setDashSibukiEffect() {
cXyz acStack_20(current.pos.x, field_0x70c + l_HIO.mYOffsetFromWaterSurface, current.pos.z);
csXyz cStack_28(0, shape_angle.y, 0);
field_0xb50 = dComIfGp_particle_set(field_0xb50, 0x86fe, &acStack_20, &tevStr, &cStack_28, 0,
0xff, 0, 0xffffffff, 0, 0, 0);
0xff, 0, -1, 0, 0, 0);
}
void daKago_c::setWaterFallEffect() {
@@ -3450,7 +3450,7 @@ void daKago_c::setWaterFallEffect() {
for (int i = 0; i < 2; i++) {
field_0xb44[i] =
dComIfGp_particle_set(field_0xb44[i], kago_wave_id[i], &acStack_28, &tevStr, &cStack_30,
0, 0xff, 0, 0xffffffff, 0, 0, 0);
0, 0xff, 0, -1, 0, 0, 0);
}
if (field_0x6e7 == 0) {
mSound.startCreatureSoundLevel(Z2SE_EN_YC_SPLASH, 0, -1);
@@ -3734,7 +3734,7 @@ int daKago_c::ctrlJoint(J3DJoint* param_0, J3DModel* param_1) {
}
int daKago_c::JointCallBack(J3DJoint* param_0, int param_1) {
if (param_1 == NULL) {
if (param_1 == 0) {
J3DModel* model = j3dSys.getModel();
daKago_c* kago = (daKago_c*)model->getUserArea();
if (kago != NULL) {
src/d/actor/d_a_movie_player.cpp
+1 -1
View File
@@ -3719,7 +3719,7 @@ BOOL daMP_WaitUntilPrepare() {
}
void daMP_PrepareReady(BOOL msg) {
OSSendMessage(&daMP_PrepareReadyQueue, (OSMessage)msg, 1);
OSSendMessage(&daMP_PrepareReadyQueue, (OSMessage)(uintptr_t)msg, 1);
}
static BOOL daMP_THPPlayerPrepare(s32 frame, s32 flag, s32 audioTrack) {
src/d/actor/d_a_nbomb.cpp
+1 -1
View File
@@ -97,7 +97,7 @@ int daNbomb_c::searchEnemy(fopAc_ac_c* i_enemy) {
static void* daNbomb_searchEnemy(fopAc_ac_c* i_actor, void* i_data) {
if (fopAcM_GetGroup(i_actor) == fopAc_ENEMY_e &&
((daNbomb_c*)i_data)->searchEnemy(i_actor) != NULL)
((daNbomb_c*)i_data)->searchEnemy(i_actor) != 0)
{
return i_actor;
}
src/d/actor/d_a_npc_blue_ns.cpp
+2 -2
View File
@@ -736,14 +736,14 @@ void daNpcBlueNS_c::playMotion() {
int daNpcBlueNS_c::setAction(int (daNpcBlueNS_c::*i_action)(int)) {
field_0xdc0 = 3;
if (mAction != NULL) {
(this->*mAction)(NULL);
(this->*mAction)(0);
}
field_0xdc0 = 0;
mAction = i_action;
if (mAction != NULL) {
(this->*mAction)(NULL);
(this->*mAction)(0);
}
return 1;
src/d/actor/d_a_npc_chin.cpp
+2 -2
View File
@@ -362,7 +362,7 @@ int daNpcChin_c::CreateHeap() {
setMotionAnm(motionAnmParam, 0.0f);
if (field_0xe24 != 0 && mSpotLight.loadModel() == NULL) {
if (field_0xe24 != 0 && mSpotLight.loadModel() == 0) {
return 0;
}
@@ -439,7 +439,7 @@ int daNpcChin_c::createHeapCallBack(fopAc_ac_c* i_this) {
}
int daNpcChin_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
if (param_1 == NULL) {
if (param_1 == 0) {
J3DModel* model = j3dSys.getModel();
daNpcChin_c* chin = (daNpcChin_c*)model->getUserArea();
if (chin != NULL) {
src/d/actor/d_a_npc_fairy.cpp
+3 -3
View File
@@ -883,7 +883,7 @@ void daNpc_Fairy_c::srchActors() {
BOOL daNpc_Fairy_c::evtTalk() {
if (chkAction(&daNpc_Fairy_c::talk)) {
(this->*mAction)(NULL);
(this->*mAction)(0);
} else {
mPreItemNo = 0;
@@ -952,7 +952,7 @@ void daNpc_Fairy_c::action() {
}
if (mAction) {
(this->*mAction)(NULL);
(this->*mAction)(0);
}
}
@@ -1124,7 +1124,7 @@ BOOL daNpc_Fairy_c::setAction(actionFunc action, int param_2) {
mMode = 0xFFFF;
if (mAction) {
(this->*mAction)(NULL);
(this->*mAction)(0);
}
mMode = 0;
src/d/actor/d_a_npc_grm.cpp
+2 -2
View File
@@ -448,8 +448,8 @@ BOOL daNpc_grM_c::evtProc() {
int face_motion, motion;
if (ctrlMsgAnm(&face_motion, &motion, this, field_0xe2d)) {
if (field_0xe26) {
mFaceMotionSeqMngr.setNo(face_motion, -1.0f, TRUE, NULL);
mMotionSeqMngr.setNo(motion, -1.0f, TRUE, NULL);
mFaceMotionSeqMngr.setNo(face_motion, -1.0f, TRUE, 0);
mMotionSeqMngr.setNo(motion, -1.0f, TRUE, 0);
}
} else if (tmp != 0 && field_0xe26) {
setAfterTalkMotion();
src/d/actor/d_a_npc_hanjo.cpp
+1 -1
View File
@@ -1791,7 +1791,7 @@ int daNpc_Hanjo_c::takayose(void* param_0) {
}
}
}
if (daPy_py_c::checkNowWolf() && mCyl2.ChkCoHit() != NULL) {
if (daPy_py_c::checkNowWolf() && mCyl2.ChkCoHit() != 0) {
if (!daPy_getPlayerActorClass()->checkPlayerFly() ||
daPy_getPlayerActorClass()->checkAutoJump() ||
daPy_getPlayerActorClass()->checkWolfTriggerJump())
src/d/actor/d_a_npc_henna.cpp
+2 -2
View File
@@ -277,7 +277,7 @@ static void message_shop(npc_henna_class* i_this) {
i_this->field_0x750 = 1;
}
if (i_this->field_0x750 != 0) {
fopAcM_OffStatus(actor, NULL);
fopAcM_OffStatus(actor, 0);
cLib_offBit<u32>(actor->attention_info.flags, fopAc_AttnFlag_SPEAK_e | fopAc_AttnFlag_TALK_e);
} else {
fopAcM_OnStatus(actor, 0);
@@ -2498,7 +2498,7 @@ static int daNpc_Henna_Execute(npc_henna_class* i_this) {
mDoMtx_stack_c::transS(-460.0f + AREG_F(0), 51.0f + AREG_F(1),
-240.0f + AREG_F(2));
mDoMtx_stack_c::YrotM(-17729 + AREG_S(0));
mDoMtx_stack_c::XrotM(AREG_S(1) - 0x8107);
mDoMtx_stack_c::XrotM((s16)(AREG_S(1) - 0x8107));
mDoMtx_stack_c::ZrotM(AREG_S(2) + 2000 + sp_0xe);
} else {
mDoMtx_stack_c::transS(-790.0f + AREG_F(0), 153.0f + AREG_F(1),
src/d/actor/d_a_npc_kasi_hana.cpp
+3 -3
View File
@@ -853,7 +853,7 @@ BOOL daNpcKasiHana_c::main() {
}
if (mAction) {
(this->*mAction)(NULL);
(this->*mAction)(0);
}
mKasiMng.sendInfo();
@@ -1072,14 +1072,14 @@ BOOL daNpcKasiHana_c::setAction(actionFunc action) {
mMode = -1;
if (mAction) {
(this->*mAction)(NULL);
(this->*mAction)(0);
}
mMode = 0;
mAction = action;
if (mAction) {
(this->*mAction)(NULL);
(this->*mAction)(0);
}
return TRUE;
src/d/actor/d_a_npc_kasi_kyu.cpp
+3 -3
View File
@@ -400,7 +400,7 @@ BOOL daNpcKasiKyu_c::main() {
}
if (mAction) {
(this->*mAction)(NULL);
(this->*mAction)(0);
}
playMotion();
@@ -621,14 +621,14 @@ BOOL daNpcKasiKyu_c::setAction(actionFunc action) {
mMode = -1;
if (mAction) {
(this->*mAction)(NULL);
(this->*mAction)(0);
}
mMode = 0;
mAction = action;
if (mAction) {
(this->*mAction)(NULL);
(this->*mAction)(0);
}
return TRUE;
src/d/actor/d_a_npc_kasi_mich.cpp
+3 -3
View File
@@ -400,7 +400,7 @@ BOOL daNpcKasiMich_c::main() {
}
if (mAction) {
(this->*mAction)(NULL);
(this->*mAction)(0);
}
playMotion();
@@ -621,14 +621,14 @@ BOOL daNpcKasiMich_c::setAction(actionFunc action) {
mMode = -1;
if (mAction) {
(this->*mAction)(NULL);
(this->*mAction)(0);
}
mMode = 0;
mAction = action;
if (mAction) {
(this->*mAction)(NULL);
(this->*mAction)(0);
}
return TRUE;
src/d/actor/d_a_npc_kn.cpp
+1 -1
View File
@@ -4965,7 +4965,7 @@ int daNpc_Kn_c::setPrtcl() {
mParticleMngr[i].mpModel == true ? &mParticleMngr[i].mAngle : NULL,
0, fopAcM_GetRoomNo(this), 0.0f, speedF);
if (mParticleMngr[i].mpModel != NULL) {
if (mParticleMngr[i].mpModel != false) {
emitter = mParticleMngr[i].mManager.getCenterEmitter(0, 0);
if (emitter != NULL) {
switch (i) {
src/d/actor/d_a_npc_maro.cpp
+1 -1
View File
@@ -386,7 +386,7 @@ int daNpc_Maro_c::Execute() {
setSellItemMax(getMaxNumItem());
field_0xf60 = -1;
setMasterType(2);
mShopCamAction.setCamDataIdx(NULL);
mShopCamAction.setCamDataIdx(0);
mShopCamAction.setCamAction(NULL);
field_0x1131 = 1;
}
src/d/actor/d_a_npc_rafrel.cpp
+1 -1
View File
@@ -421,7 +421,7 @@ int daNpcRafrel_c::createHeapCallBack(fopAc_ac_c* i_this) {
}
int daNpcRafrel_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
if (param_1 == NULL) {
if (param_1 == 0) {
J3DModel* mdl_p = j3dSys.getModel();
daNpcRafrel_c* i_this = (daNpcRafrel_c*)mdl_p->getUserArea();
src/d/actor/d_a_npc_shad.cpp
+1 -1
View File
@@ -1485,7 +1485,7 @@ bool daNpcShad_c::talk(void* param_1) {
if (strcmp(dComIfGp_getStartStageName(), "R_SP116") == 0 || mCurAngle.y == fopAcM_searchPlayerAngleY(this)) {
if (talkProc(NULL, TRUE, NULL)) {
mActorMngr[0].entry(daPy_getPlayerActorClass());
itemNo = NULL;
itemNo = 0;
eventID = mFlow.getEventId(&itemNo);
OS_REPORT("会話終了時 イベントID=%d アイテムNo=%d\n", eventID, itemNo); // At the end of the conversation, Event ID=%d Item No=%d
src/d/actor/d_a_npc_tk.cpp
+4 -4
View File
@@ -1340,7 +1340,7 @@ void daNPC_TK_c::executeBack() {
if (current.pos.y > unkXyz1.y) {
cLib_chaseAngleS(&shape_angle.x, 0x2000, 0x400);
} else {
cLib_chaseAngleS(&shape_angle.x, 0xffffe000, 0x400);
cLib_chaseAngleS(&shape_angle.x, -8192, 0x400);
}
} else {
cLib_chaseAngleS(&field_0x69c, 0x200, 0x10);
@@ -1379,7 +1379,7 @@ void daNPC_TK_c::executeBack() {
if (current.pos.y > unkXyz1.y) {
cLib_chaseAngleS(&shape_angle.x, 0x2000, 0x400);
} else {
cLib_chaseAngleS(&shape_angle.x, 0xffffe000, 0x400);
cLib_chaseAngleS(&shape_angle.x, -8192, 0x400);
}
} else {
cLib_chaseAngleS(&field_0x69c, 0x200, 0x10);
@@ -2456,7 +2456,7 @@ void daNPC_TK_c::executeWolfPerch() {
void daNPC_TK_c::executeResistanceDemo() {
daNpcMoiR_c* npcMoiR;
if (fopAcM_SearchByName(PROC_NPC_MOIR, (fopAc_ac_c**)&npcMoiR) == NULL || npcMoiR == NULL) {
if (fopAcM_SearchByName(PROC_NPC_MOIR, (fopAc_ac_c**)&npcMoiR) == 0 || npcMoiR == NULL) {
return;
}
@@ -2623,7 +2623,7 @@ void daNPC_TK_c::executeResistanceDemo() {
// fallthrough
case 8: {
cLib_addCalcAngleS2(&field_0x6a2, 0xffffdc00, 8, 0x200);
cLib_addCalcAngleS2(&field_0x6a2, -9216, 8, 0x200);
cLib_addCalcAngleS2(&field_0x6a0, 0x1000, 8, 0x200);
cLib_addCalcAngleS2(&field_0x6aa, 0x2000, 8, 0x200);
src/d/actor/d_a_npc_tkj2.cpp
+1 -1
View File
@@ -176,7 +176,7 @@ static void Wind_effect(npc_tkj2_class* i_this) {
if ((s16)(sVar1 - i_this->field_0x5c4) < 0) {
cLib_addCalcAngleS(&a_this->shape_angle.z, 0x2000, 0x10, 0x1000, 0);
} else {
cLib_addCalcAngleS(&a_this->shape_angle.z, 0xFFFFE000, 2, 0x1000, 0);
cLib_addCalcAngleS(&a_this->shape_angle.z, -8192, 2, 0x1000, 0);
}
}
src/d/actor/d_a_npc_uri.cpp
+4 -4
View File
@@ -904,12 +904,12 @@ int daNpc_Uri_c::selectAction() {
switch (mType) {
case TYPE_1:
if (field_0x100d != NULL) {
if (field_0x100d != 0) {
field_0xfc0[0] = &daNpc_Uri_c::sitWait;
} else {
if (field_0x100e != NULL) {
if (field_0x100e != 0) {
/* T_0007 - Ordon Village - During Uli's pick-up tutorial */
if (daNpcT_chkTmpBit(7) && field_0x100f == NULL) {
if (daNpcT_chkTmpBit(7) && field_0x100f == 0) {
field_0xfc0[0] = &daNpc_Uri_c::walk;
} else {
field_0xfc0[0] = &daNpc_Uri_c::wait;
@@ -981,7 +981,7 @@ int daNpc_Uri_c::getTutorialCond(cXyz param_1) {
field_0x1000 = mpHIO->m.field_0xa8 - 100.0f;
return 5;
}
if (field_0x1009 != NULL) {
if (field_0x1009 != 0) {
return 8;
}
}
src/d/actor/d_a_npc_ykw.cpp
+2 -2
View File
@@ -462,7 +462,7 @@ int daNpc_ykW_c::createHeapCallBack(fopAc_ac_c* i_this) {
}
int daNpc_ykW_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
if (param_1 == NULL) {
if (param_1 == 0) {
J3DModel* model = j3dSys.getModel();
daNpc_ykW_c* ykw = (daNpc_ykW_c*)model->getUserArea();
if (ykw != 0) {
@@ -1822,7 +1822,7 @@ BOOL daNpc_ykW_c::cutLv5DungeonClear(int param_0) {
itemPos.y += 50.0f;
unkActor1 = fopAcM_fastCreateItem(&itemPos, 0, fopAcM_GetRoomNo(this), &unkSxyz,
&unkXyz1, &unkFloat2, &unkFloat3, -1, NULL, NULL);
&unkXyz1, &unkFloat2, &unkFloat3, -1, 0, NULL);
if (unkActor1 != NULL) {
mDoAud_seStart(Z2SE_OBJ_YO_HEART_S, &itemPos, 0, 0);
fopAcM_OnStatus(unkActor1, fopAcM_STATUS_UNK_0x4000);
src/d/actor/d_a_obj_avalanche.cpp
+1 -1
View File
@@ -253,7 +253,7 @@ int daObjAvalanche_c::demoProc() {
void daObjAvalanche_c::setEffect() {
cXyz acStack_18(0.0f, 0.0f, 0.0f);
csXyz cStack_20(0, 0, 0);
dComIfGp_particle_set(0x8c51, &acStack_18, &cStack_20, NULL, 0xff, NULL, 0xffffffff, NULL, NULL,
dComIfGp_particle_set(0x8c51, &acStack_18, &cStack_20, NULL, 0xff, NULL, -1, NULL, NULL,
NULL);
}
src/d/actor/d_a_obj_batta.cpp
+1 -1
View File
@@ -509,7 +509,7 @@ int daObjBATTA_c::execute() {
action();
mBrk->play();
mBtk->play();
mpMorf->play(NULL, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
mpMorf->play(0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
mtx_set();
if (field_0x9f0 == 0) {
mSph.SetC(current.pos);
src/d/actor/d_a_obj_bed.cpp
+1 -1
View File
@@ -30,7 +30,7 @@ void daObj_Bed_HIO_c::genMessage(JORMContext* ctx) {
}
#endif
daObj_Bed_HIOParam const daObj_Bed_Param_c::m = {NULL, -3.0f, 1.0f, 600.0f};
daObj_Bed_HIOParam const daObj_Bed_Param_c::m = {0, -3.0f, 1.0f, 600.0f};
daObj_Bed_c::~daObj_Bed_c() {
if (mpCollider != NULL) {
src/d/actor/d_a_obj_bky_rock.cpp
+1 -1
View File
@@ -68,7 +68,7 @@ int daBkyRock_c::draw() {
mModels[mMode], &tevStr);
if (field_0x57a) {
dMdl_c* dMdl = dMdl_mng_c::entry(mModels[2]->getModelData(), NULL, current.roomNo);
dMdl_c* dMdl = dMdl_mng_c::entry(mModels[2]->getModelData(), 0, current.roomNo);
if (dMdl != NULL) {
_pieceData* piece = mPieces;
for (int i = 0; i < 20; i++, piece++) {
src/d/actor/d_a_obj_bmWindow.cpp
+1 -1
View File
@@ -288,7 +288,7 @@ void daBmWindow_c::setBreakEffect(int param_1) {
}
int temp = param_1 * 3;
for (int i = temp; i < temp + 3; i++) {
dComIfGp_particle_set(particle_id[i], &cStack_2c, &cStack_40, &scale, 0xff, 0, 0xffffffff,
dComIfGp_particle_set(particle_id[i], &cStack_2c, &cStack_40, &scale, 0xff, 0, -1,
NULL, NULL, NULL);
}
}
src/d/actor/d_a_obj_digholl.cpp
+2 -2
View File
@@ -74,9 +74,9 @@ int daObjDigholl_c::execute() {
}
if (player->current.pos.abs(current.pos) < 1000.0f) {
dComIfGp_particle_setSimple(0x70f, &current.pos, 0xff, g_whiteColor, g_whiteColor, NULL,
dComIfGp_particle_setSimple(0x70f, &current.pos, 0xff, g_whiteColor, g_whiteColor, 0,
0.0f);
dComIfGp_particle_setSimple(0x73d, &current.pos, 0xff, g_whiteColor, g_whiteColor, NULL,
dComIfGp_particle_setSimple(0x73d, &current.pos, 0xff, g_whiteColor, g_whiteColor, 0,
0.0f);
}
src/d/actor/d_a_obj_flag.cpp
+1 -1
View File
@@ -80,7 +80,7 @@ void daObjFlag_c::calcJointAngle() {
joint->mJoint3 = joint->mJoint1 - joint->mJoint2;
}
if(attr().field_0x25 != NULL) {
if(attr().field_0x25 != 0) {
if(i == 1) {
calcAngleSwingX(joint, power);
}
src/d/actor/d_a_obj_kbox.cpp
+2 -2
View File
@@ -62,7 +62,7 @@ static void break_eff(obj_kbox_class* i_this) {
fopAcM_GetRoomNo(&i_this->mActor), NULL, NULL, &particleScale);
dPa_modelEcallBack::setModel(pEmitter, kibako_bmd, i_this->mActor.tevStr, 3, NULL, 0, 0);
for (int i = 0; i < 3; i++) {
dComIfGp_particle_set(particle_id[i], &emitterPos, 0, &particleScale, 0xff, 0, 0xffffffff,
dComIfGp_particle_set(particle_id[i], &emitterPos, 0, &particleScale, 0xff, 0, -1,
0, 0, 0);
}
}
@@ -213,7 +213,7 @@ static void kbox_float(obj_kbox_class* i_this) {
i_this->field_0x5a4 + i_this->field_0x590 + i_this->field_0x58c + i_this->field_0x5ac;
i_this->field_0x9e8 = dComIfGp_particle_set(i_this->field_0x9e8, 0x86c3,
&cStack_88, &a_this->tevStr, &a_this->shape_angle,
&cStack_7c, 0xff, 0, 0xffffffff, 0, 0, 0);
&cStack_7c, 0xff, 0, -1, 0, 0, 0);
if (i_this->field_0x5ac <= -50.0f) {
fopAcM_delete(a_this);
dComIfGp_particle_set(0x86c4, &cStack_88, &a_this->tevStr, &a_this->shape_angle,
src/d/actor/d_a_obj_laundry_rope.cpp
+1 -1
View File
@@ -113,7 +113,7 @@ cXyz* daObjLndRope_c::getRopeStartPos() {
}
f32 daObjLndRope_c::getStartRate(cXyz* i_ropeSegmentPos) {
if (mFlag != NULL) {
if (mFlag != 0) {
return mScale * (i_ropeSegmentPos->x - getRopeStartPos()->x);
} else {
return mScale * (i_ropeSegmentPos->z - getRopeStartPos()->z);
src/d/actor/d_a_obj_lp.cpp
+5 -5
View File
@@ -53,14 +53,14 @@ static int tandem;
static int demo_f;
static int target_info[10];
static void* target_info[10];
static int target_info_count;
static void* s_ks_sub(void* param_1, void* param_2) {
if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == 0x60) {
if (target_info_count < 10) {
target_info[target_info_count] = (intptr_t)param_1;
target_info[target_info_count] = param_1;
target_info_count++;
}
return param_1;
@@ -77,7 +77,7 @@ static int hit_check(obj_lp_class* i_this, wd_ss* WdSs) {
fVar1 = 50.0f;
for (int i = 0; i < target_info_count; i++) {
sp6c = WdSs->field_0x10 - *(cXyz *)(target_info[i] + 0x4d0);
sp6c = WdSs->field_0x10 - *(cXyz *)((u8 *)target_info[i] + 0x4d0);
if (sp6c.y >= -3.0f) {
f32 dist = JMAFastSqrt(sp6c.x * sp6c.x + sp6c.z * sp6c.z);
if (dist <= fVar1 * WdSs->field_0x3c) {
@@ -126,7 +126,7 @@ static int hit_check(obj_lp_class* i_this, wd_ss* WdSs) {
cLib_addCalc2(&WdSs->field_0x10.y, WdSs->field_0x4.y + fVar8 * -0.5f, 0.5f, 3.0f);
cLib_addCalc2(&WdSs->field_0x28.x, fVar8, 0.1f, fVar8 * 0.5f);
cLib_addCalcAngleS2(&WdSs->field_0x34, cM_atan2s(sp6c.x, sp6c.z), 0x20, 0x400);
cLib_addCalcAngleS2(&WdSs->field_0x36, 0xfffff060, 0x20, 0x400);
cLib_addCalcAngleS2(&WdSs->field_0x36, -4000, 0x20, 0x400);
rv = 1;
}
}
@@ -221,7 +221,7 @@ static int daObj_Lp_Execute(obj_lp_class* i_this) {
target_info[i] = 0;
}
target_info[0] = (intptr_t)dComIfGp_getPlayer(0);
target_info[0] = dComIfGp_getPlayer(0);
target_info_count = 1;
if (strcmp(dComIfGp_getStartStageName(), "D_MN05") == 0) {
src/d/actor/d_a_obj_lv3Water.cpp
+1 -1
View File
@@ -31,7 +31,7 @@ public:
};
daLv3Water_HIO_c::daLv3Water_HIO_c() {
mLevelControlWaitFrames = NULL;
mLevelControlWaitFrames = 0;
}
#if DEBUG
src/d/actor/d_a_obj_lv6ChangeGate.cpp
+2 -2
View File
@@ -127,7 +127,7 @@ int daLv6ChangeGate_c::Execute(Mtx** param_0) {
for (int i = 0; i < 12; i++) {
cXyz spC(cyl_x_offset + mMoveTransX, 0.0f, 0.0f);
mDoMtx_stack_c::ZXYrotS(NULL, shape_angle.y, shape_angle.z);
mDoMtx_stack_c::ZXYrotS(0, shape_angle.y, shape_angle.z);
mDoMtx_stack_c::multVec(&spC, &spC);
spC += current.pos;
@@ -251,7 +251,7 @@ void daLv6ChangeGate_c::init_modeBreak() {
void daLv6ChangeGate_c::modeBreak() {
cXyz effpos(mMoveTransX, 0.0f, 0.0f);
mDoMtx_stack_c::ZXYrotS(NULL, shape_angle.y, shape_angle.z);
mDoMtx_stack_c::ZXYrotS(0, shape_angle.y, shape_angle.z);
mDoMtx_stack_c::multVec(&effpos, &effpos);
effpos += current.pos;
src/d/actor/d_a_obj_lv6TogeRoll.cpp
+2 -2
View File
@@ -206,7 +206,7 @@ void daTogeRoll_c::moveTogeRoll() {
&daTogeRoll_c::modeBound, &daTogeRoll_c::modeBound2, &daTogeRoll_c::modeBoundWait,
};
if (field_0x5dc == NULL) {
if (field_0x5dc == 0) {
for (int i = 0; i < 8; i++) {
if (mSph[i].ChkCoHit()) {
fopAc_ac_c* hit_actor = dCc_GetAc(mSph[i].GetCoHitObj()->GetAc());
@@ -264,7 +264,7 @@ void daTogeRoll_c::init_modeBoundWait() {
}
void daTogeRoll_c::modeBoundWait() {
if (field_0x5db != NULL) {
if (field_0x5db != 0) {
field_0x5db -= 1;
} else {
field_0x5dc = 0;
src/d/actor/d_a_obj_lv6bemos2.cpp
+1 -1
View File
@@ -494,7 +494,7 @@ void daObjLv6Bm_c::calcBeam() {
if (field_0xa19 > 0) {
cXyz sp84(field_0x9f8);
if (fopAcM_lc_c::lineCheck(&field_0x9e4, &field_0x9f8, this) != NULL && fopAcM_lc_c::checkGroundHit()) {
if (fopAcM_lc_c::lineCheck(&field_0x9e4, &field_0x9f8, this) != false && fopAcM_lc_c::checkGroundHit()) {
sp84 = fopAcM_lc_c::getCross();
}
src/d/actor/d_a_obj_magne_arm.cpp
+4 -4
View File
@@ -186,8 +186,8 @@ int daObjMarm_c::Create() {
mIsYRotForward = 0;
}
if (dComIfG_Bgsp().Regist((dBgW_Base*)mpBgW1, this) != NULL ||
dComIfG_Bgsp().Regist((dBgW_Base*)mpBgW2, this) != NULL)
if (dComIfG_Bgsp().Regist((dBgW_Base*)mpBgW1, this) != false ||
dComIfG_Bgsp().Regist((dBgW_Base*)mpBgW2, this) != false)
{
return FALSE;
}
@@ -1060,11 +1060,11 @@ void daObjMarm_c::debugDraw() {
}
int daObjMarm_c::Delete() {
if (mpBgW1 != NULL && mpBgW1->ChkUsed() != NULL) {
if (mpBgW1 != NULL && mpBgW1->ChkUsed() != false) {
dComIfG_Bgsp().Release(mpBgW1);
}
if (mpBgW2 != NULL && mpBgW2->ChkUsed() != NULL) {
if (mpBgW2 != NULL && mpBgW2->ChkUsed() != false) {
dComIfG_Bgsp().Release(mpBgW2);
}
endMagneHoleEffect();
src/d/actor/d_a_obj_maki.cpp
+1 -1
View File
@@ -114,7 +114,7 @@ int daObj_Maki_Execute(obj_maki_class* i_this) {
cxyz.y += 20000.0f;
i_this->field_0x6f8[0] = dComIfGp_particle_set(
i_this->field_0x6f8[0], 0x820b, &i_this->current.pos, &i_this->tevStr,
&i_this->shape_angle, 0, 0xff, 0, 0xffffffff, 0, 0, 0);
&i_this->shape_angle, 0, 0xff, 0, -1, 0, 0, 0);
fopAcM_seStartLevel(i_this, 0x800a6, 0);
}
}
src/d/actor/d_a_obj_prop.cpp
+1 -1
View File
@@ -53,7 +53,7 @@ int daObjProp_c::Delete() {
}
int daObjProp_c::draw() {
g_env_light.settingTevStruct(NULL, &current.pos, &tevStr);
g_env_light.settingTevStruct(0, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
mDoExt_modelUpdate(mpModel);
return 1;
src/d/actor/d_a_obj_rfHole.cpp
+1 -1
View File
@@ -157,7 +157,7 @@ void daRfHole_c::setBreakEffect() {
mDoMtx_stack_c::multVec(&acStack_24, &acStack_24);
cXyz cStack_30 = current.pos + acStack_24;
for (int i = 0; i < 5; i++) {
dComIfGp_particle_set(particle_id[i], &cStack_30, NULL, &scale, 0xff, 0, 0xffffffff, NULL,
dComIfGp_particle_set(particle_id[i], &cStack_30, NULL, &scale, 0xff, 0, -1, NULL,
NULL, NULL);
}
}
src/d/actor/d_a_obj_rope_bridge.cpp
+1 -1
View File
@@ -16,7 +16,7 @@ static char* l_ropeArcName = "L_Ropest";
void daObjRBridge_c::initBaseMtx() {
mDoMtx_stack_c::transS(current.pos);
mDoMtx_stack_c::ZXYrotM(NULL, current.angle.y, 0);
mDoMtx_stack_c::ZXYrotM(0, current.angle.y, 0);
MTXCopy(mDoMtx_stack_c::get(), mMtx);
mpBrgModel->setBaseScale(scale);
src/d/actor/d_a_obj_sekizoa.cpp
+2 -2
View File
@@ -255,7 +255,7 @@ int daObj_Sekizoa_c::CreateHeap() {
}
if (mType == TYPE_6) {
int success_create = mInvModel.create(mpMorf[0]->getModel(), 1);
if (success_create == NULL) {
if (success_create == 0) {
return 0;
}
@@ -736,7 +736,7 @@ void daObj_Sekizoa_c::setAttnPos() {
mpMorf[1]->modelCalc();
}
if (mpMcaMorf != NULL) {
((mDoExt_McaMorfSO*)mpMcaMorf)->play(NULL, 0);
((mDoExt_McaMorfSO*)mpMcaMorf)->play(0, 0);
if (mType == TYPE_1 || mType == TYPE_3 || mType == TYPE_5) {
mDoMtx_stack_c::copy(mpMorf[0]->getModel()->getAnmMtx(7));
} else {
src/d/actor/d_a_obj_so.cpp
+1 -1
View File
@@ -831,7 +831,7 @@ static void demo_camera(obj_so_class* i_this) {
// fallthrough
case 2:
sp3c.set(12459.0f, 3152.0f, 4628.0f);
daPy_getPlayerActorClass()->setPlayerPosAndAngle(&sp3c, 0xfffffaee, 0);
daPy_getPlayerActorClass()->setPlayerPosAndAngle(&sp3c, -1298, 0);
i_this->mDemoCamCenter.x = a_this->current.pos.x;
i_this->mDemoCamCenter.z = a_this->current.pos.z;
sp3c.y = (a_this->current.pos.y + 150.0f) - 50.0f;
src/d/actor/d_a_obj_stone.cpp
+2 -2
View File
@@ -807,7 +807,7 @@ void daObjStone_c::init_modeBreak() {
JPABaseEmitter* emitter = dComIfGp_particle_set(
0x15c, &current.pos, 0, &acStack_40, 0xff, &dPa_modelEcallBack::getEcallback(), fopAcM_GetRoomNo(this), 0, 0, 0);
dPa_modelEcallBack::setModel(emitter, stone_bmd, tevStr,
3, 0, NULL, 0);
3, 0, 0, 0);
for (int i = 0; i < 3; i = i + 1) {
dComIfGp_particle_set(
l_eff_id[i],
@@ -947,7 +947,7 @@ void daObjStone_c::set_carry_eff() {
if (field_0x0950 == 3) {
for (int i = 0; i < 3; i++) {
field_0x0964[i] =
dComIfGp_particle_set(l_carry_eff_id[i], &current.pos, 0, &pos, 0xFF, 0, 0xFFFFFFFF,
dComIfGp_particle_set(l_carry_eff_id[i], &current.pos, 0, &pos, 0xFF, 0, -1,
0, 0, 0); // float literal inline
if (field_0x0964[i] != 0) {
field_0x0964[i]->becomeImmortalEmitter();
src/d/actor/d_a_obj_tks.cpp
+1 -1
View File
@@ -279,7 +279,7 @@ int daObjTks_c::createHeapCallBack(fopAc_ac_c* i_this) {
}
int daObjTks_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
if (param_1 == NULL) {
if (param_1 == 0) {
J3DModel* mdl_p = j3dSys.getModel();
daObjTks_c* a_this = (daObjTks_c*)mdl_p->getUserArea();
src/d/actor/d_a_obj_vground.cpp
+2 -2
View File
@@ -47,7 +47,7 @@ int daObjVGnd_c::CreateHeap() {
J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, 0xb);
JUT_ASSERT(198, pbtk != NULL);
mpBtk = new mDoExt_btkAnm();
if ((!mpBtk) || (!mpBtk->init(modelData, pbtk, 1, NULL, 1.0f, NULL, -1))) {
if ((!mpBtk) || (!mpBtk->init(modelData, pbtk, 1, 0, 1.0f, 0, -1))) {
return 0;
}
}
@@ -56,7 +56,7 @@ int daObjVGnd_c::CreateHeap() {
J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, 0x8);
JUT_ASSERT(212, pbrk != NULL);
mpBrk = new mDoExt_brkAnm();
if ((!mpBrk) || (!mpBrk->init(modelData, pbrk, 1, NULL, 1.0f, NULL, -1))) {
if ((!mpBrk) || (!mpBrk->init(modelData, pbrk, 1, 0, 1.0f, 0, -1))) {
return 0;
}
}
src/d/actor/d_a_passer_mng.cpp
+1 -1
View File
@@ -23,7 +23,7 @@ int daPasserMng_c::execute() {
csXyz cStack_20(field_0x596 != 0 ? 0xff : endTime, current.angle.y, 0);
childProcIds[currentChildIndex] =
fopAcM_createChild(npcId, fopAcM_GetID(this), getPasserParam(), &current.pos,
fopAcM_GetRoomNo(this), &cStack_20, 0, 0xffffffff, 0);
fopAcM_GetRoomNo(this), &cStack_20, 0, -1, 0);
currentChildIndex = (currentChildIndex + 1) % getMaxNum();
}
mTime = time + intervalTime;
src/d/actor/d_a_shop_item.cpp
+1 -1
View File
@@ -128,7 +128,7 @@ void daShopItem_c::CreateInit() {
home.pos = current.pos;
set_mtx();
mpModel->setUserArea(NULL);
mpModel->setUserArea(0);
}
void daShopItem_c::set_mtx() {
src/d/actor/d_a_tag_allmato.cpp
+1 -1
View File
@@ -517,7 +517,7 @@ int daTag_AllMato_c::checkCrsMato2() {
}
fopAc_ac_c* sp18 = NULL;
int sp14 = NULL;
int sp14 = 0;
for (int i = 0; i < 499; i++) {
for (int j = 0; j < mBouMatoActorNum; j++) {
src/d/actor/d_a_title.cpp
+8 -8
View File
@@ -182,12 +182,12 @@ void daTitle_c::loadWait_proc() {
mTitle.Scr->setPriority("zelda_press_start.blo", 0x100000, mpMount->getArchive());
J2DTextBox* text[7];
text[0] = (J2DTextBox*)mTitle.Scr->search('t_s_00');
text[1] = (J2DTextBox*)mTitle.Scr->search('t_s_01');
text[2] = (J2DTextBox*)mTitle.Scr->search('t_s_02');
text[3] = (J2DTextBox*)mTitle.Scr->search('t_s_03');
text[4] = (J2DTextBox*)mTitle.Scr->search('t_s_04');
text[5] = (J2DTextBox*)mTitle.Scr->search('t_s_05');
text[0] = (J2DTextBox*)mTitle.Scr->search(MULTI_CHAR('t_s_00'));
text[1] = (J2DTextBox*)mTitle.Scr->search(MULTI_CHAR('t_s_01'));
text[2] = (J2DTextBox*)mTitle.Scr->search(MULTI_CHAR('t_s_02'));
text[3] = (J2DTextBox*)mTitle.Scr->search(MULTI_CHAR('t_s_03'));
text[4] = (J2DTextBox*)mTitle.Scr->search(MULTI_CHAR('t_s_04'));
text[5] = (J2DTextBox*)mTitle.Scr->search(MULTI_CHAR('t_s_05'));
text[6] = (J2DTextBox*)mTitle.Scr->search('t_o');
for (int i = 0; i < 7; i++) {
@@ -196,9 +196,9 @@ void daTitle_c::loadWait_proc() {
fopMsgM_messageGet(text[i]->getStringPtr(), 100);
}
field_0x600 = new CPaneMgrAlpha(mTitle.Scr, 'n_all', 2, NULL);
field_0x600 = new CPaneMgrAlpha(mTitle.Scr, MULTI_CHAR('n_all'), 2, NULL);
field_0x600->setAlpha(0);
J2DPane* pane = mTitle.Scr->search('n_all');
J2DPane* pane = mTitle.Scr->search(MULTI_CHAR('n_all'));
pane->translate(g_daTitHIO.mPSPosX, g_daTitHIO.mPSPosY);
pane->scale(g_daTitHIO.mPSScaleX, g_daTitHIO.mPSScaleY);
mpHeap->becomeCurrentHeap();
src/d/d_bg_s.cpp
+1 -1
View File
@@ -712,7 +712,7 @@ void dBgS::MoveBgMatrixCrrPos(cBgS_PolyInfo const& i_poly, bool param_1, cXyz* i
void dBgS_MoveBGProc_Typical(dBgW* i_bgw, void* i_actor_ptr, cBgS_PolyInfo const& i_poly,
bool param_3, cXyz* i_pos, csXyz* i_angle, csXyz* i_shapeAngle) {
Mtx m;
if (i_bgw->GetOldInvMtx(m) != NULL) {
if (i_bgw->GetOldInvMtx(m) != 0) {
cXyz move_old;
MTXMultVec(m, i_pos, &move_old);
src/d/d_bg_w_kcol.cpp
+3 -3
View File
@@ -689,9 +689,9 @@ void dBgWKCol::ShdwDraw(cBgS_ShdwDraw* param_0) {
do {
stepY_sp78 = 1000000;
best1_sp70 = NULL;
best2_sp6C = NULL;
best3_sp68 = NULL;
best1_sp70 = 0;
best2_sp6C = 0;
best3_sp68 = 0;
int x_sp44 = minX_spA0;
do {
src/d/d_bright_check.cpp
+15 -15
View File
@@ -28,32 +28,32 @@ dBrightCheck_c::~dBrightCheck_c() {
void dBrightCheck_c::screenSet() {
static u64 const tv_btnA[] = {
'cont_at1', 'cont_at2', 'cont_at3', 'cont_at4', 'cont_at',
MULTI_CHAR('cont_at1'), MULTI_CHAR('cont_at2'), MULTI_CHAR('cont_at3'), MULTI_CHAR('cont_at4'), MULTI_CHAR('cont_at'),
};
static u64 const ftv_btnA[] = {
'font_a1', 'font_at2', 'font_at3', 'font_at4', 'font_at',
MULTI_CHAR('font_a1'), MULTI_CHAR('font_at2'), MULTI_CHAR('font_at3'), MULTI_CHAR('font_at4'), MULTI_CHAR('font_at'),
};
#if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN)
static u64 const txTV[] = {
'menu_t6s', 'menu_t6', 'menu_t9s', 'menu_t9', 'menut10s',
'menu_t10', 'menu_t7s', 'menu_t7', 'menu_t8s', 'menu_t8',
MULTI_CHAR('menu_t6s'), MULTI_CHAR('menu_t6'), MULTI_CHAR('menu_t9s'), MULTI_CHAR('menu_t9'), MULTI_CHAR('menut10s'),
MULTI_CHAR('menu_t10'), MULTI_CHAR('menu_t7s'), MULTI_CHAR('menu_t7'), MULTI_CHAR('menu_t8s'), MULTI_CHAR('menu_t8'),
};
#else
static u64 const txTV[] = {
'menu_t61', 'menu_t2', 'menu_t91', 'menu_t1', 'menut101',
'menu_t01', 'menu_t71', 'menu_t3', 'menu_t81', 'menu_t4',
MULTI_CHAR('menu_t61'), MULTI_CHAR('menu_t2'), MULTI_CHAR('menu_t91'), MULTI_CHAR('menu_t1'), MULTI_CHAR('menut101'),
MULTI_CHAR('menu_t01'), MULTI_CHAR('menu_t71'), MULTI_CHAR('menu_t3'), MULTI_CHAR('menu_t81'), MULTI_CHAR('menu_t4'),
};
#endif
#if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN)
static u64 const txTVhide[] = {
'fmenu_6n', 'fmenu_9n', 'fmenu_10', 'fmenu_7n', 'fmenu_8n',
MULTI_CHAR('fmenu_6n'), MULTI_CHAR('fmenu_9n'), MULTI_CHAR('fmenu_10'), MULTI_CHAR('fmenu_7n'), MULTI_CHAR('fmenu_8n'),
};
#else
static u64 const txTVhide[] = {
'menu_6n', 'menu_9n', 'menu_10n', 'menu_7n', 'menu_8n',
MULTI_CHAR('menu_6n'), MULTI_CHAR('menu_9n'), MULTI_CHAR('menu_10n'), MULTI_CHAR('menu_7n'), MULTI_CHAR('menu_8n'),
};
#endif
@@ -61,16 +61,16 @@ void dBrightCheck_c::screenSet() {
JUT_ASSERT(0, mBrightCheck.Scr != NULL);
mBrightCheck.Scr->setPriority("zelda_option_check.blo", 0x1100000, mArchive);
mBrightCheck.Scr->search('g_abtn_n')->hide();
mBrightCheck.Scr->search(MULTI_CHAR('g_abtn_n'))->hide();
#if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN)
J2DTextBox* settings_text = (J2DTextBox*)mBrightCheck.Scr->search('t_t00');
mBrightCheck.Scr->search('t_t00')->show();
mBrightCheck.Scr->search('f_t00')->hide();
J2DTextBox* settings_text = (J2DTextBox*)mBrightCheck.Scr->search(MULTI_CHAR('t_t00'));
mBrightCheck.Scr->search(MULTI_CHAR('t_t00'))->show();
mBrightCheck.Scr->search(MULTI_CHAR('f_t00'))->hide();
#else
J2DTextBox* settings_text = (J2DTextBox*)mBrightCheck.Scr->search('f_t00');
mBrightCheck.Scr->search('f_t00')->show();
mBrightCheck.Scr->search('t_t00')->hide();
J2DTextBox* settings_text = (J2DTextBox*)mBrightCheck.Scr->search(MULTI_CHAR('f_t00'));
mBrightCheck.Scr->search(MULTI_CHAR('f_t00'))->show();
mBrightCheck.Scr->search(MULTI_CHAR('t_t00'))->hide();
#endif
settings_text->setFont(mDoExt_getRubyFont());
src/d/d_camera.cpp
+1 -1
View File
@@ -10131,7 +10131,7 @@ bool dCamera_c::eventCamera(s32 param_0) {
}
int* sp90_i;
if (getEvStringData(sp90, "Trim", "DEFAULT") != NULL) {
if (getEvStringData(sp90, "Trim", "DEFAULT") != false) {
sp90_i = (int*)sp90;
if (*sp90_i == 'STAN') {
mEventData.field_0x1c = 0;
src/d/d_cc_d.cpp
+1 -1
View File
@@ -255,7 +255,7 @@ dCcD_GObjInf* dCcD_GObjInf::GetTgHitGObj() {
u8 dCcD_GObjInf::GetTgHitObjSe() {
dCcD_GObjInf* objInf = GetTgHitGObj();
if (objInf == NULL) {
return NULL;
return 0;
} else {
return objInf->GetAtSe();
}
src/d/d_com_inf_game.cpp
+3 -3
View File
@@ -1114,7 +1114,7 @@ void dComIfG_inf_c::baseCsr_c::draw(f32 param_1, f32 param_2) {
r28 = 0xFF;
}
J2DPicture* picture = field_0x8.getPicture('cursor00');
J2DPicture* picture = field_0x8.getPicture(MULTI_CHAR('cursor00'));
JUT_ASSERT(1450, picture != NULL);
picture->scale(1.3f, 1.3f);
JUtility::TColor color = picture->getWhite();
@@ -1148,7 +1148,7 @@ void dComIfG_inf_c::baseCsr_c::create() {
int rt = field_0x8.create(resInfo->getArchive(), "zelda_pointing_cursor_navi.blo");
JUT_ASSERT(1498, rt);
J2DPicture* picture = field_0x8.getPicture('cursor00');
J2DPicture* picture = field_0x8.getPicture(MULTI_CHAR('cursor00'));
JUT_ASSERT(1500, picture != NULL);
JUtility::TColor color = picture->getWhite();
color.a = 0;
@@ -1172,7 +1172,7 @@ void dComIfG_inf_c::baseCsr_c::particleExecute() {
}
void dComIfG_inf_c::anmCsr_c::draw(f32 param_1, f32 param_2) {
field_0x8.setPos('lock_n', param_1, param_2);
field_0x8.setPos(MULTI_CHAR('lock_n'), param_1, param_2);
dComIfGd_set2DXlu(&field_0x8);
}
#endif
src/d/d_error_msg.cpp
+3 -3
View File
@@ -72,9 +72,9 @@ static void messageSet(u32 status, bool i_drawBg) {
JUT_ASSERT(102, strlen(msg_p)-1 < 512);
J2DTextBox tpane('TEXT1', JGeometry::TBox2<f32>(0.0f, 0.0f, FB_WIDTH, 200.0f), (ResFONT*)font_data, msg_p, 512, HBIND_CENTER, VBIND_CENTER);
J2DTextBox spane('TEXT2', JGeometry::TBox2<f32>(0.0f, 0.0f, FB_WIDTH, 200.0f), (ResFONT*)font_data, msg_p, 512, HBIND_CENTER, VBIND_CENTER);
J2DPicture ppane('PICT1', JGeometry::TBox2<f32>(0.0f, 0.0f, FB_WIDTH, FB_HEIGHT), (ResTIMG*)black_tex, NULL);
J2DTextBox tpane(MULTI_CHAR('TEXT1'), JGeometry::TBox2<f32>(0.0f, 0.0f, FB_WIDTH, 200.0f), (ResFONT*)font_data, msg_p, 512, HBIND_CENTER, VBIND_CENTER);
J2DTextBox spane(MULTI_CHAR('TEXT2'), JGeometry::TBox2<f32>(0.0f, 0.0f, FB_WIDTH, 200.0f), (ResFONT*)font_data, msg_p, 512, HBIND_CENTER, VBIND_CENTER);
J2DPicture ppane(MULTI_CHAR('PICT1'), JGeometry::TBox2<f32>(0.0f, 0.0f, FB_WIDTH, FB_HEIGHT), (ResTIMG*)black_tex, NULL);
JUTResFont font((ResFONT*)font_data, NULL);
JUTFont* pfont = (JUTFont*)&font;
src/d/d_ev_camera.cpp
+1 -1
View File
@@ -3127,7 +3127,7 @@ bool dCamera_c::useItem1EvCamera() {
if (item_p->field_0x20 < item_p->field_0x4) break;
if (data_list[item_p->mType][1].field_0x08 != NULL && item_p->field_0x1c == 0) {
if (data_list[item_p->mType][1].field_0x08 != 0 && item_p->field_0x1c == 0) {
item_p->field_0x1c = 1;
item_p->field_0x0 = 1;
break;
src/d/d_event_manager.cpp
+1 -1
View File
@@ -1245,7 +1245,7 @@ void* dEvent_manager_c::getMySubstanceP(int staffId, const char* dataname, int d
int dEvent_manager_c::getMySubstanceNum(int staffId, const char* dataname) {
dEvDtData_c* data = getMyDataP(staffId, dataname, FALSE);
if (data == NULL) {
return NULL;
return 0;
} else {
return data->getNumber();
}
src/d/d_file_sel_info.cpp
+26 -26
View File
@@ -36,24 +36,24 @@ void dFile_info_c::screenSet() {
mFileInfo.Scr->setPriority("zelda_file_select_info_text.blo", 0x1100000, mArchive);
mFileInfo.mFont = mDoExt_getMesgFont();
mFileInfo.Scr->search('w_cp_ef1')->hide();
mFileInfo.field_0x10 = mFileInfo.Scr->search('w_dat_i1');
mDatBase = new CPaneMgrAlpha(mFileInfo.Scr, 'w_dat_i1', 2, NULL);
mNoDatBase = new CPaneMgrAlpha(mFileInfo.Scr, 'w_nda_i1', 2, NULL);
mFileInfo.Scr->search(MULTI_CHAR('w_cp_ef1'))->hide();
mFileInfo.field_0x10 = mFileInfo.Scr->search(MULTI_CHAR('w_dat_i1'));
mDatBase = new CPaneMgrAlpha(mFileInfo.Scr, MULTI_CHAR('w_dat_i1'), 2, NULL);
mNoDatBase = new CPaneMgrAlpha(mFileInfo.Scr, MULTI_CHAR('w_nda_i1'), 2, NULL);
J2DTextBox* info_text[4];
#if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN)
info_text[0] = (J2DTextBox*)mFileInfo.Scr->search('w_s_t_01');
info_text[1] = (J2DTextBox*)mFileInfo.Scr->search('w_p_t_01');
mFileInfo.Scr->search('f_s_t_02')->hide();
mFileInfo.Scr->search('f_p_t_02')->hide();
info_text[0] = (J2DTextBox*)mFileInfo.Scr->search(MULTI_CHAR('w_s_t_01'));
info_text[1] = (J2DTextBox*)mFileInfo.Scr->search(MULTI_CHAR('w_p_t_01'));
mFileInfo.Scr->search(MULTI_CHAR('f_s_t_02'))->hide();
mFileInfo.Scr->search(MULTI_CHAR('f_p_t_02'))->hide();
#else
info_text[0] = (J2DTextBox*)mFileInfo.Scr->search('f_s_t_02');
info_text[1] = (J2DTextBox*)mFileInfo.Scr->search('f_p_t_02');
mFileInfo.Scr->search('w_s_t_01')->hide();
mFileInfo.Scr->search('w_p_t_01')->hide();
info_text[0] = (J2DTextBox*)mFileInfo.Scr->search(MULTI_CHAR('f_s_t_02'));
info_text[1] = (J2DTextBox*)mFileInfo.Scr->search(MULTI_CHAR('f_p_t_02'));
mFileInfo.Scr->search(MULTI_CHAR('w_s_t_01'))->hide();
mFileInfo.Scr->search(MULTI_CHAR('w_p_t_01'))->hide();
#endif
for (int i = 0; i < 2; i++) {
@@ -64,19 +64,19 @@ void dFile_info_c::screenSet() {
dMeter2Info_getString(0x3D1, info_text[1]->getStringPtr(), NULL); // Total play time
#if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN)
info_text[0] = (J2DTextBox*)mFileInfo.Scr->search('w_name01');
info_text[1] = (J2DTextBox*)mFileInfo.Scr->search('w_new_1');
mFileInfo.Scr->search('f_name01')->hide();
mFileInfo.Scr->search('f_new_1')->hide();
info_text[0] = (J2DTextBox*)mFileInfo.Scr->search(MULTI_CHAR('w_name01'));
info_text[1] = (J2DTextBox*)mFileInfo.Scr->search(MULTI_CHAR('w_new_1'));
mFileInfo.Scr->search(MULTI_CHAR('f_name01'))->hide();
mFileInfo.Scr->search(MULTI_CHAR('f_new_1'))->hide();
#else
info_text[0] = (J2DTextBox*)mFileInfo.Scr->search('f_name01');
info_text[1] = (J2DTextBox*)mFileInfo.Scr->search('f_new_1');
mFileInfo.Scr->search('w_name01')->hide();
mFileInfo.Scr->search('w_new_1')->hide();
info_text[0] = (J2DTextBox*)mFileInfo.Scr->search(MULTI_CHAR('f_name01'));
info_text[1] = (J2DTextBox*)mFileInfo.Scr->search(MULTI_CHAR('f_new_1'));
mFileInfo.Scr->search(MULTI_CHAR('w_name01'))->hide();
mFileInfo.Scr->search(MULTI_CHAR('w_new_1'))->hide();
#endif
info_text[2] = (J2DTextBox*)mFileInfo.Scr->search('w_time01');
info_text[3] = (J2DTextBox*)mFileInfo.Scr->search('w_ptim01');
info_text[2] = (J2DTextBox*)mFileInfo.Scr->search(MULTI_CHAR('w_time01'));
info_text[3] = (J2DTextBox*)mFileInfo.Scr->search(MULTI_CHAR('w_ptim01'));
for (int i = 0; i < 4; i++) {
info_text[i]->setFont(mFileInfo.mFont);
@@ -122,9 +122,9 @@ int dFile_info_c::setSaveData(dSv_save_c* i_savedata, BOOL i_validChksum, u8 i_d
void dFile_info_c::setHeartCnt(dSv_save_c* i_savedata) {
static u64 l_htag[] = {
'hear_20', 'hear_21', 'hear_22', 'hear_23', 'hear_24', 'hear_25', 'hear_26',
'hear_27', 'hear_28', 'hear_29', 'hear_30', 'hear_31', 'hear_32', 'hear_33',
'hear_34', 'hear_35', 'hear_36', 'hear_37', 'hear_38', 'hear_39',
MULTI_CHAR('hear_20'), MULTI_CHAR('hear_21'), MULTI_CHAR('hear_22'), MULTI_CHAR('hear_23'), MULTI_CHAR('hear_24'), MULTI_CHAR('hear_25'), MULTI_CHAR('hear_26'),
MULTI_CHAR('hear_27'), MULTI_CHAR('hear_28'), MULTI_CHAR('hear_29'), MULTI_CHAR('hear_30'), MULTI_CHAR('hear_31'), MULTI_CHAR('hear_32'), MULTI_CHAR('hear_33'),
MULTI_CHAR('hear_34'), MULTI_CHAR('hear_35'), MULTI_CHAR('hear_36'), MULTI_CHAR('hear_37'), MULTI_CHAR('hear_38'), MULTI_CHAR('hear_39'),
};
static const char* amariheartTex[] = {
@@ -218,7 +218,7 @@ void dDlst_FileInfo_c::draw() {
MTXScale(m, mBasePane->getWidth() / field_0x10->getWidth(),
mBasePane->getHeight() / field_0x10->getHeight(), 1.0f);
MTXConcat(glb_mtx, m, glb_mtx);
Scr->search('Nm_02')->setMtx(glb_mtx);
Scr->search(MULTI_CHAR('Nm_02'))->setMtx(glb_mtx);
}
Scr->draw(0.0f, 0.0f, graf_ctx);
src/d/d_file_sel_warning.cpp
+7 -7
View File
@@ -59,20 +59,20 @@ void dFile_warning_c::screenSet() {
mFileWarn.Scr->animation();
mFileWarn.mFont = mDoExt_getMesgFont();
mpRootPane = new CPaneMgr(mFileWarn.Scr, 'Nm_02', 0, NULL);
mpRootPane = new CPaneMgr(mFileWarn.Scr, MULTI_CHAR('Nm_02'), 0, NULL);
JUT_ASSERT(0, mpRootPane != NULL);
field_0x34 = mpRootPane->getTranslateY();
#if REGION_JPN
mFileWarn.Scr->search('ms_for_2')->hide();
mFileWarn.Scr->search('ms_for_3')->hide();
mFileWarn.Scr->search(MULTI_CHAR('ms_for_2'))->hide();
mFileWarn.Scr->search(MULTI_CHAR('ms_for_3'))->hide();
field_0x20 = static_cast<J2DTextBox*>(mFileWarn.Scr->search('w_msg_jp'));
field_0x20 = static_cast<J2DTextBox*>(mFileWarn.Scr->search(MULTI_CHAR('w_msg_jp')));
#else
mFileWarn.Scr->search('w_msg_jp')->hide();
mFileWarn.Scr->search('ms_for_2')->hide();
mFileWarn.Scr->search(MULTI_CHAR('w_msg_jp'))->hide();
mFileWarn.Scr->search(MULTI_CHAR('ms_for_2'))->hide();
field_0x20 = static_cast<J2DTextBox*>(mFileWarn.Scr->search('ms_for_3'));
field_0x20 = static_cast<J2DTextBox*>(mFileWarn.Scr->search(MULTI_CHAR('ms_for_3')));
#endif
field_0x20->show();
field_0x20->setFont(mFileWarn.mFont);
src/d/d_file_select.cpp
+91 -91
View File
@@ -59,7 +59,7 @@ static s32 MenuSelEndFrameTbl[3] = {
898,
};
static u64 l_tagName13[3] = {'w_dat_i0', 'w_dat_i1', 'w_dat_i2'};
static u64 l_tagName13[3] = {MULTI_CHAR('w_dat_i0'), MULTI_CHAR('w_dat_i1'), MULTI_CHAR('w_dat_i2')};
dFs_HIO_c::dFs_HIO_c() {
base_effect_appear_frames = 5;
@@ -807,15 +807,15 @@ void dFile_select_c::dataSelectStart() {
yesnoMenuMoveAnmInitSet(0x473, 0x47d);
selectWakuAlpahAnmInit(mSelectNum, 0xff, 0, g_fsHIO.select_box_appear_frames);
mSelDt.ScrDt->search('ken_00')->hide();
mSelDt.ScrDt->search('ken_01')->hide();
mSelDt.ScrDt->search('ken_02')->hide();
mSelDt.ScrDt->search('tate_00')->hide();
mSelDt.ScrDt->search('tate_01')->hide();
mSelDt.ScrDt->search('tate_02')->hide();
mSelDt.ScrDt->search('fuku_00')->hide();
mSelDt.ScrDt->search('fuku_01')->hide();
mSelDt.ScrDt->search('fuku_02')->hide();
mSelDt.ScrDt->search(MULTI_CHAR('ken_00'))->hide();
mSelDt.ScrDt->search(MULTI_CHAR('ken_01'))->hide();
mSelDt.ScrDt->search(MULTI_CHAR('ken_02'))->hide();
mSelDt.ScrDt->search(MULTI_CHAR('tate_00'))->hide();
mSelDt.ScrDt->search(MULTI_CHAR('tate_01'))->hide();
mSelDt.ScrDt->search(MULTI_CHAR('tate_02'))->hide();
mSelDt.ScrDt->search(MULTI_CHAR('fuku_00'))->hide();
mSelDt.ScrDt->search(MULTI_CHAR('fuku_01'))->hide();
mSelDt.ScrDt->search(MULTI_CHAR('fuku_02'))->hide();
mpFileSelect3d->drawOff();
mDataSelProc = DATASELPROC_SELECT_DATA_OPENERASE_MOVE;
@@ -1002,8 +1002,8 @@ void dFile_select_c::dataSelectMoveAnime() {
void dFile_select_c::makeRecInfo(u8 i_dataNo) {
dSv_save_c* pSave = (dSv_save_c*)&mSaveData[i_dataNo];
J2DPane* ken0 = mSelDt.ScrDt->search('ken_00');
J2DPane* ken1 = mSelDt.ScrDt->search('ken_01');
J2DPane* ken0 = mSelDt.ScrDt->search(MULTI_CHAR('ken_00'));
J2DPane* ken1 = mSelDt.ScrDt->search(MULTI_CHAR('ken_01'));
ken0->hide();
ken1->hide();
@@ -1017,7 +1017,7 @@ void dFile_select_c::makeRecInfo(u8 i_dataNo) {
ken1->hide();
}
J2DPane* ken2 = mSelDt.ScrDt->search('ken_02');
J2DPane* ken2 = mSelDt.ScrDt->search(MULTI_CHAR('ken_02'));
if (pSave->getPlayer().getGetItem().isFirstBit(fpcNm_ITEM_MASTER_SWORD) ||
pSave->getPlayer().getGetItem().isFirstBit(fpcNm_ITEM_LIGHT_SWORD))
{
@@ -1026,8 +1026,8 @@ void dFile_select_c::makeRecInfo(u8 i_dataNo) {
ken2->hide();
}
J2DPane* tate0 = mSelDt.ScrDt->search('tate_00');
J2DPane* tate1 = mSelDt.ScrDt->search('tate_01');
J2DPane* tate0 = mSelDt.ScrDt->search(MULTI_CHAR('tate_00'));
J2DPane* tate1 = mSelDt.ScrDt->search(MULTI_CHAR('tate_01'));
tate0->hide();
tate1->hide();
@@ -1039,28 +1039,28 @@ void dFile_select_c::makeRecInfo(u8 i_dataNo) {
tate1->show();
}
J2DPane* tate2 = mSelDt.ScrDt->search('tate_02');
J2DPane* tate2 = mSelDt.ScrDt->search(MULTI_CHAR('tate_02'));
if (pSave->getPlayer().getGetItem().isFirstBit(fpcNm_ITEM_HYLIA_SHIELD)) {
tate2->show();
} else {
tate2->hide();
}
J2DPane* fuku0 = mSelDt.ScrDt->search('fuku_00');
J2DPane* fuku0 = mSelDt.ScrDt->search(MULTI_CHAR('fuku_00'));
if (pSave->getPlayer().getGetItem().isFirstBit(fpcNm_ITEM_WEAR_KOKIRI)) {
fuku0->show();
} else {
fuku0->hide();
}
J2DPane* fuku1 = mSelDt.ScrDt->search('fuku_01');
J2DPane* fuku1 = mSelDt.ScrDt->search(MULTI_CHAR('fuku_01'));
if (pSave->getPlayer().getGetItem().isFirstBit(fpcNm_ITEM_WEAR_ZORA)) {
fuku1->show();
} else {
fuku1->hide();
}
J2DPane* fuku2 = mSelDt.ScrDt->search('fuku_02');
J2DPane* fuku2 = mSelDt.ScrDt->search(MULTI_CHAR('fuku_02'));
if (pSave->getPlayer().getGetItem().isFirstBit(fpcNm_ITEM_ARMOR)) {
fuku2->show();
} else {
@@ -1659,7 +1659,7 @@ void dFile_select_c::copySelMoveAnmInitSet(int param_0, int param_1) {
}
void dFile_select_c::setSaveDataForCopySel() {
static u64 l_tagName101[2] = {'w_nun01', 'w_nun02'};
static u64 l_tagName101[2] = {MULTI_CHAR('w_nun01'), MULTI_CHAR('w_nun02')};
static char* l_numTex[3] = {"tt_1_metal_40x40.bti", "tt_2_metal_40x40.bti",
"tt_3_metal_40x40.bti"};
SaveDataBuf* pSave = mSaveData;
@@ -2901,31 +2901,31 @@ void dFile_select_c::cardToNandDataCopyErrDisp3() {
#endif
void dFile_select_c::screenSet() {
static u64 l_tagName0[3] = {'w_sel_00', 'w_sel_01', 'w_sel_02'};
static u64 l_tagName3[3] = {'w_moyo00', 'w_moyo01', 'w_moyo02'};
static u64 l_tagName4[3] = {'w_gold00', 'w_gold01', 'w_gold02'};
static u64 l_tagName5[3] = {'w_go2_00', 'w_go2_01', 'w_go2_02'};
static u64 l_tagName12[3] = {'w_bk_l00', 'w_bk_l01', 'w_bk_l02'};
static u64 l_nouseTag[15] = {'w_mcheck', 'w_tabi1', 'w_tabi2', 'w_tabi3', 'w_doko_c',
'w_uwa_c', 'w_cp_chu', 'w_cpsita', 'w_cp_x', 'w_de',
'w_de_chu', 'w_desita', 'w_de_x', 'w_name', 'w_h_name'};
static u64 l_tagName0[3] = {MULTI_CHAR('w_sel_00'), MULTI_CHAR('w_sel_01'), MULTI_CHAR('w_sel_02')};
static u64 l_tagName3[3] = {MULTI_CHAR('w_moyo00'), MULTI_CHAR('w_moyo01'), MULTI_CHAR('w_moyo02')};
static u64 l_tagName4[3] = {MULTI_CHAR('w_gold00'), MULTI_CHAR('w_gold01'), MULTI_CHAR('w_gold02')};
static u64 l_tagName5[3] = {MULTI_CHAR('w_go2_00'), MULTI_CHAR('w_go2_01'), MULTI_CHAR('w_go2_02')};
static u64 l_tagName12[3] = {MULTI_CHAR('w_bk_l00'), MULTI_CHAR('w_bk_l01'), MULTI_CHAR('w_bk_l02')};
static u64 l_nouseTag[15] = {MULTI_CHAR('w_mcheck'), MULTI_CHAR('w_tabi1'), MULTI_CHAR('w_tabi2'), MULTI_CHAR('w_tabi3'), MULTI_CHAR('w_doko_c'),
MULTI_CHAR('w_uwa_c'), MULTI_CHAR('w_cp_chu'), MULTI_CHAR('w_cpsita'), MULTI_CHAR('w_cp_x'), 'w_de',
MULTI_CHAR('w_de_chu'), MULTI_CHAR('w_desita'), MULTI_CHAR('w_de_x'), MULTI_CHAR('w_name'), MULTI_CHAR('w_h_name')};
#if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN)
static u64 l_tagName21[2] = {'w_tabi_s', 'w_tabi_x'};
static u64 l_tagName21[2] = {MULTI_CHAR('w_tabi_s'), MULTI_CHAR('w_tabi_x')};
#else
static u64 l_tagName21[2] = {'t_for', 't_for1'};
static u64 l_tagName21[2] = {MULTI_CHAR('t_for'), MULTI_CHAR('t_for1')};
#endif
static u64 l_tagName18[3] = {'w_de_ef0', 'w_de_ef1', 'w_de_ef2'};
static u64 l_tagName19[3] = {'w_cp_ef0', 'w_cp_ef1', 'w_cp_ef2'};
static u64 l_tagName18[3] = {MULTI_CHAR('w_de_ef0'), MULTI_CHAR('w_de_ef1'), MULTI_CHAR('w_de_ef2')};
static u64 l_tagName19[3] = {MULTI_CHAR('w_cp_ef0'), MULTI_CHAR('w_cp_ef1'), MULTI_CHAR('w_cp_ef2')};
#if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN)
static u64 l_tagName20[2] = {'w_er_msg', 'w_er_msR'};
static u64 l_tagName20[2] = {MULTI_CHAR('w_er_msg'), MULTI_CHAR('w_er_msR')};
#else
static u64 l_tagName20[2] = {'er_for0', 'er_for1'};
static u64 l_tagName20[2] = {MULTI_CHAR('er_for0'), MULTI_CHAR('er_for1')};
#endif
static u64 l_tagName131[3] = {'N_sel_00', 'N_sel_01', 'N_sel_02'};
static u64 l_tagName131[3] = {MULTI_CHAR('N_sel_00'), MULTI_CHAR('N_sel_01'), MULTI_CHAR('N_sel_02')};
fileSel.Scr = new J2DScreen();
JUT_ASSERT(4917, fileSel.Scr != NULL);
@@ -2944,27 +2944,27 @@ void dFile_select_c::screenSet() {
field_0x0090->searchUpdateMaterialID(fileSel.Scr);
field_0x009c->searchUpdateMaterialID(fileSel.Scr);
mBaseMovePane = new CPaneMgr(fileSel.Scr, 'w_move_n', 0, NULL);
mBaseSubPane = fileSel.Scr->search('w_sub_n');
mBaseMovePane = new CPaneMgr(fileSel.Scr, MULTI_CHAR('w_move_n'), 0, NULL);
mBaseSubPane = fileSel.Scr->search(MULTI_CHAR('w_sub_n'));
for (int i = 0; i < 3; i++) {
mSelFilePanes[i] = new CPaneMgr(fileSel.Scr, l_tagName0[i], 1, NULL);
}
fileSel.Scr->search('Wi_btn_n')->hide();
mBbtnPane = new CPaneMgrAlpha(fileSel.Scr, 'w_n_bbtn', 2, NULL);
mAbtnPane = new CPaneMgrAlpha(fileSel.Scr, 'w_n_abtn', 2, NULL);
fileSel.Scr->search(MULTI_CHAR('Wi_btn_n'))->hide();
mBbtnPane = new CPaneMgrAlpha(fileSel.Scr, MULTI_CHAR('w_n_bbtn'), 2, NULL);
mAbtnPane = new CPaneMgrAlpha(fileSel.Scr, MULTI_CHAR('w_n_abtn'), 2, NULL);
#if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN)
mModoruTxtPane = new CPaneMgrAlpha(fileSel.Scr, 'w_modo', 2, NULL);
mKetteiTxtPane = new CPaneMgrAlpha(fileSel.Scr, 'w_kete', 2, NULL);
fileSel.Scr->search('f_modo')->hide();
fileSel.Scr->search('f_kete')->hide();
mModoruTxtPane = new CPaneMgrAlpha(fileSel.Scr, MULTI_CHAR('w_modo'), 2, NULL);
mKetteiTxtPane = new CPaneMgrAlpha(fileSel.Scr, MULTI_CHAR('w_kete'), 2, NULL);
fileSel.Scr->search(MULTI_CHAR('f_modo'))->hide();
fileSel.Scr->search(MULTI_CHAR('f_kete'))->hide();
#else
mModoruTxtPane = new CPaneMgrAlpha(fileSel.Scr, 'f_modo', 2, NULL);
mKetteiTxtPane = new CPaneMgrAlpha(fileSel.Scr, 'f_kete', 2, NULL);
fileSel.Scr->search('w_modo')->hide();
fileSel.Scr->search('w_kete')->hide();
mModoruTxtPane = new CPaneMgrAlpha(fileSel.Scr, MULTI_CHAR('f_modo'), 2, NULL);
mKetteiTxtPane = new CPaneMgrAlpha(fileSel.Scr, MULTI_CHAR('f_kete'), 2, NULL);
fileSel.Scr->search(MULTI_CHAR('w_modo'))->hide();
fileSel.Scr->search(MULTI_CHAR('w_kete'))->hide();
#endif
((J2DTextBox*)mModoruTxtPane->getPanePtr())->setFont(fileSel.font[0]);
@@ -3032,13 +3032,13 @@ void dFile_select_c::screenSet() {
}
#if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN)
fileSel.Scr->search('t_for')->hide();
fileSel.Scr->search('t_for1')->hide();
fileSel.Scr->search(MULTI_CHAR('t_for'))->hide();
fileSel.Scr->search(MULTI_CHAR('t_for1'))->hide();
#else
fileSel.Scr->search('w_tabi_s')->hide();
fileSel.Scr->search('w_tabi_x')->hide();
fileSel.Scr->search('w_mgn1')->hide();
fileSel.Scr->search('w_mgn2')->hide();
fileSel.Scr->search(MULTI_CHAR('w_tabi_s'))->hide();
fileSel.Scr->search(MULTI_CHAR('w_tabi_x'))->hide();
fileSel.Scr->search(MULTI_CHAR('w_mgn1'))->hide();
fileSel.Scr->search(MULTI_CHAR('w_mgn2'))->hide();
#endif
for (int i = 0; i < 2; i++) {
@@ -3085,17 +3085,17 @@ void dFile_select_c::screenSet() {
field_0x0208 = 0;
field_0x0209 = 0;
mErrorMsgPane = fileSel.Scr->search('w_er_n');
mErrorMsgPane = fileSel.Scr->search(MULTI_CHAR('w_er_n'));
#if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN)
fileSel.Scr->search('er_for0')->hide();
fileSel.Scr->search('er_for1')->hide();
fileSel.Scr->search(MULTI_CHAR('er_for0'))->hide();
fileSel.Scr->search(MULTI_CHAR('er_for1'))->hide();
#else
fileSel.Scr->search('w_er_msg')->hide();
fileSel.Scr->search('w_er_msR')->hide();
fileSel.Scr->search(MULTI_CHAR('w_er_msg'))->hide();
fileSel.Scr->search(MULTI_CHAR('w_er_msR'))->hide();
#endif
fileSel.Scr->search('w_er_msE')->hide();
fileSel.Scr->search(MULTI_CHAR('w_er_msE'))->hide();
for (int i = 0; i < 2; i++) {
mErrorMsgTxtPane[i] = new CPaneMgrAlpha(fileSel.Scr, l_tagName20[i], 0, NULL);
@@ -3132,7 +3132,7 @@ void dFile_select_c::screenSet() {
mSelIcon->setPos(vtxCenter.x, vtxCenter.y, mSelFilePanes[mSelectNum]->getPanePtr(), true);
mSelIcon->setAlphaRate(0.0f);
J2DPane* basePane = fileSel.Scr->search('Nm_02');
J2DPane* basePane = fileSel.Scr->search(MULTI_CHAR('Nm_02'));
basePane->setAnimation(mBaseMoveAnm);
setWakuAnm();
@@ -3161,11 +3161,11 @@ void dFile_select_c::screenSet() {
mFileInfoNoDatBasePane[i] = mFileInfo[i]->getNoDatBase();
}
mNameBasePane = fileSel.Scr->search('name_n');
mNameBasePane = fileSel.Scr->search(MULTI_CHAR('name_n'));
mpName = new dName_c(mNameBasePane);
field_0x0128 = false;
mpFileWarning = new dFile_warning_c(mpArchive, 0);
mSelDt.mpPane = fileSel.Scr->search('w_moyo03');
mSelDt.mpPane = fileSel.Scr->search(MULTI_CHAR('w_moyo03'));
#if PLATFORM_GCN
JUtility::TColor black = mDoGph_gInf_c::getFadeColor();
@@ -3174,7 +3174,7 @@ void dFile_select_c::screenSet() {
white.a = 0xff;
ResTIMG* timg = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', "tt_block8x8.bti");
mpFadePict = new J2DPicture('PICT01', JGeometry::TBox2<f32>(0.0f, FB_WIDTH, 0.0f, FB_HEIGHT),
mpFadePict = new J2DPicture(MULTI_CHAR('PICT01'), JGeometry::TBox2<f32>(0.0f, FB_WIDTH, 0.0f, FB_HEIGHT),
timg, NULL);
mpFadePict->setBlackWhite(black, white);
mpFadePict->setAlpha(0);
@@ -3182,20 +3182,20 @@ void dFile_select_c::screenSet() {
}
void dFile_select_c::screenSetCopySel() {
static u64 l_tagName000[2] = {'w_sel_01', 'w_sel_02'};
static u64 l_tagName001[2] = {'w_moyo01', 'w_moyo02'};
static u64 l_tagName002[2] = {'w_gold01', 'w_gold02'};
static u64 l_tagName003[2] = {'w_go2_01', 'w_go2_02'};
static u64 l_tagName004[2] = {'w_bk_l01', 'w_bk_l02'};
static u64 l_tagName005[2] = {'w_cp_ef1', 'w_cp_ef2'};
static u64 l_tagName000[2] = {MULTI_CHAR('w_sel_01'), MULTI_CHAR('w_sel_02')};
static u64 l_tagName001[2] = {MULTI_CHAR('w_moyo01'), MULTI_CHAR('w_moyo02')};
static u64 l_tagName002[2] = {MULTI_CHAR('w_gold01'), MULTI_CHAR('w_gold02')};
static u64 l_tagName003[2] = {MULTI_CHAR('w_go2_01'), MULTI_CHAR('w_go2_02')};
static u64 l_tagName004[2] = {MULTI_CHAR('w_bk_l01'), MULTI_CHAR('w_bk_l02')};
static u64 l_tagName005[2] = {MULTI_CHAR('w_cp_ef1'), MULTI_CHAR('w_cp_ef2')};
mCpSel.Scr = new J2DScreen();
JUT_ASSERT(5286, mCpSel.Scr != NULL);
mCpSel.Scr->setPriority("zelda_file_select_copy_select.blo", 0x1100000, mpArchive);
dPaneClass_showNullPane(mCpSel.Scr);
mCpSel.mpPane2 = mCpSel.Scr->search('name_n');
mCpSel.mpPane1 = fileSel.Scr->search('name_n');
mCpSel.mpPane2 = mCpSel.Scr->search(MULTI_CHAR('name_n'));
mCpSel.mpPane1 = fileSel.Scr->search(MULTI_CHAR('name_n'));
void* bck = JKRGetNameResource("zelda_file_select_copy_select.bck", mpArchive);
mCpSelBck = (J2DAnmTransform*)J2DAnmLoaderDataBase::load(bck);
@@ -3249,7 +3249,7 @@ void dFile_select_c::screenSetCopySel() {
mCpSel.Scr->search(l_tagName005[i])->hide();
}
J2DPane* namePane = mCpSel.Scr->search('name_n');
J2DPane* namePane = mCpSel.Scr->search(MULTI_CHAR('name_n'));
namePane->setAnimation(mCpSelBck);
mCpSelBck->setFrame(0.0f);
namePane->animationTransform();
@@ -3271,15 +3271,15 @@ void dFile_select_c::screenSetCopySel() {
}
void dFile_select_c::screenSetYesNo() {
static u64 l_tagName012[2] = {'w_no_n', 'w_yes_n'};
static u64 l_tagName013[2] = {'w_no_t', 'w_yes_t'};
static u64 l_tagName013U[2] = {'f_no_t', 'f_yes_t'};
static u64 l_tagName9[2] = {'w_no_m', 'w_yes_m'};
static u64 l_tagName012[2] = {MULTI_CHAR('w_no_n'), MULTI_CHAR('w_yes_n')};
static u64 l_tagName013[2] = {MULTI_CHAR('w_no_t'), MULTI_CHAR('w_yes_t')};
static u64 l_tagName013U[2] = {MULTI_CHAR('f_no_t'), MULTI_CHAR('f_yes_t')};
static u64 l_tagName9[2] = {MULTI_CHAR('w_no_m'), MULTI_CHAR('w_yes_m')};
static u64 l_tagName10[2] = {
'w_no_g',
'w_yes_g',
MULTI_CHAR('w_no_g'),
MULTI_CHAR('w_yes_g'),
};
static u64 l_tagName11[2] = {'w_no_gr', 'w_yes_gr'};
static u64 l_tagName11[2] = {MULTI_CHAR('w_no_gr'), MULTI_CHAR('w_yes_gr')};
static u8 l_msgNum2[2] = {0x08, 0x07};
mYnSel.ScrYn = new J2DScreen();
@@ -3337,12 +3337,12 @@ void dFile_select_c::screenSetYesNo() {
}
void dFile_select_c::screenSet3Menu() {
static u64 l_tagName6[3] = {'w_sat_mo', 'w_del_mo', 'w_cop_mo'};
static u64 l_tagName7[3] = {'w_sat_g', 'w_del_g', 'w_cop_g'};
static u64 l_tagName8[3] = {'w_sat_gr', 'w_del_gr', 'w_cop_gr'};
static u64 l_tagName1[3] = {'w_sta_n', 'w_del_n', 'w_cop_n'};
static u64 l_tagName011[3] = {'w_sta', 'w_del', 'w_cop_t'};
static u64 l_tagName011U[3] = {'f_sta', 'f_del', 'f_cop_t'};
static u64 l_tagName6[3] = {MULTI_CHAR('w_sat_mo'), MULTI_CHAR('w_del_mo'), MULTI_CHAR('w_cop_mo')};
static u64 l_tagName7[3] = {MULTI_CHAR('w_sat_g'), MULTI_CHAR('w_del_g'), MULTI_CHAR('w_cop_g')};
static u64 l_tagName8[3] = {MULTI_CHAR('w_sat_gr'), MULTI_CHAR('w_del_gr'), MULTI_CHAR('w_cop_gr')};
static u64 l_tagName1[3] = {MULTI_CHAR('w_sta_n'), MULTI_CHAR('w_del_n'), MULTI_CHAR('w_cop_n')};
static u64 l_tagName011[3] = {MULTI_CHAR('w_sta'), MULTI_CHAR('w_del'), MULTI_CHAR('w_cop_t')};
static u64 l_tagName011U[3] = {MULTI_CHAR('f_sta'), MULTI_CHAR('f_del'), MULTI_CHAR('f_cop_t')};
static u8 l_msgNum[3] = {0x57, 0x58, 0x56};
m3mSel.Scr3m = new J2DScreen();
@@ -3368,7 +3368,7 @@ void dFile_select_c::screenSet3Menu() {
m3mBtk->searchUpdateMaterialID(m3mSel.Scr3m);
m3mBtkFrame = 0;
m3mMenuPane = m3mSel.Scr3m->search('wmenu_n');
m3mMenuPane = m3mSel.Scr3m->search(MULTI_CHAR('wmenu_n'));
m3mMenuPane->setAnimation(m3mBck);
m3mBck->setFrame(799.0f);
m3mMenuPane->animationTransform();
@@ -3412,13 +3412,13 @@ void dFile_select_c::screenSetDetail() {
mSelDt.ScrDt->setAnimation(mSelDtBtk);
mSelDtBtkFrame = 0;
mSelDt.mpPane2 = mSelDt.ScrDt->search('n_all');
mSelDtPane_mset = new CPaneMgr(mSelDt.ScrDt, 'mset_p_n', 0, NULL);
mSelDt.mpPane2 = mSelDt.ScrDt->search(MULTI_CHAR('n_all'));
mSelDtPane_mset = new CPaneMgr(mSelDt.ScrDt, MULTI_CHAR('mset_p_n'), 0, NULL);
mpFileSelect3d->setBasePane(mSelDtPane_mset);
mpFileSelect3d->setBase2Pane(fileSel.Scr->search('w_sub_n'));
mpFileSelect3d->setBase2Pane(fileSel.Scr->search(MULTI_CHAR('w_sub_n')));
mSelDt.ScrDt->search('d_win_n')->setUserInfo('n_43');
mSelDt.ScrDt->search(MULTI_CHAR('d_win_n'))->setUserInfo('n_43');
}
void dFile_select_c::setWakuAnm() {
src/d/d_gameover.cpp
+4 -4
View File
@@ -369,14 +369,14 @@ dDlst_GameOverScrnDraw_c::dDlst_GameOverScrnDraw_c(JKRArchive* i_archive) {
mFadeColor.set(0, 0, 0, 0);
if (dMeter2Info_getGameOverType() != 0) {
mpScreen->search('n_base')->hide();
mpScreen->search(MULTI_CHAR('n_base'))->hide();
if (mDoGph_gInf_c::getFadeRate() == 1.0f) {
mFadeColor = mDoGph_gInf_c::getFadeColor();
}
}
mpScreen->search('base_b')->hide();
mpScreen->search(MULTI_CHAR('base_b'))->hide();
JUtility::TColor img_white(mFadeColor);
JUtility::TColor img_black(mFadeColor);
@@ -385,10 +385,10 @@ dDlst_GameOverScrnDraw_c::dDlst_GameOverScrnDraw_c(JKRArchive* i_archive) {
ResTIMG* img = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', "tt_block8x8.bti");
mpBackImg =
new J2DPicture('PICT01', JGeometry::TBox2<f32>(0.0f, 486.0f, 0.0f, 660.0f), img, NULL);
new J2DPicture(MULTI_CHAR('PICT01'), JGeometry::TBox2<f32>(0.0f, 486.0f, 0.0f, 660.0f), img, NULL);
mpBackImg->setBlackWhite(img_white, img_black);
J2DTextBox* gold_tbox = (J2DTextBox*)mpScreen->search('gold_00');
J2DTextBox* gold_tbox = (J2DTextBox*)mpScreen->search(MULTI_CHAR('gold_00'));
gold_tbox->setFont(mDoExt_getSubFont());
char string[64];
src/d/d_kankyo_rain.cpp
+2 -2
View File
@@ -2540,9 +2540,9 @@ void dKyr_drawSun(Mtx drawMtx, cXyz* ppos, GXColor& unused, u8** tex) {
color_reg0.b = 0;
f32 size = 8000.0f;
if (strcmp(dComIfGp_getStartStageName(), "F_SP127") == NULL) {
if (strcmp(dComIfGp_getStartStageName(), "F_SP127") == 0) {
size = 11000.0f;
} else if (strcmp(dComIfGp_getStartStageName(), "F_SP200") == NULL) {
} else if (strcmp(dComIfGp_getStartStageName(), "F_SP200") == 0) {
size = 10000.0f;
}
src/d/d_kantera_icon_meter.cpp
+2 -2
View File
@@ -31,9 +31,9 @@ void dKantera_icon_c::initiate() {
dPaneClass_showNullPane(scrn);
mpKanteraIcon->setScreen(scrn);
mpParent = new CPaneMgr(scrn, 'kan_m_n', 2, NULL);
mpParent = new CPaneMgr(scrn, MULTI_CHAR('kan_m_n'), 2, NULL);
mpGauge = new CPaneMgr(scrn, 'yellow_m', 0, NULL);
mpGauge = new CPaneMgr(scrn, MULTI_CHAR('yellow_m'), 0, NULL);
}
void dKantera_icon_c::setAlphaRate(f32 alphaRate) {
src/d/d_menu_collect.cpp
+154 -154
View File
@@ -255,25 +255,25 @@ static u8 const lit_3778[12] = {
};
void dMenu_Collect2D_c::screenSet() {
static const u64 text_sv[3] = {'sav_0', 'sav_1', 'sav_2'};
static const u64 text_op[3] = {'opt_0', 'opt_1', 'opt_2',};
static const u64 ftext_sv[3] = {'f_sav_0', 'f_sav_1', 'f_sav_2'};
static const u64 ftext_op[3] = {'f_opt_0', 'f_opt_1', 'f_opt_2'};
static const u64 text_a_tag[5] = {'atext1_1', 'atext1_2', 'atext1_3', 'atext1_4', 'atext1_5'};
static const u64 text_b_tag[5] = {'btext1_1', 'btext1_2', 'btext1_3', 'btext1_4', 'btext1_5'};
static const u64 text_sv[3] = {MULTI_CHAR('sav_0'), MULTI_CHAR('sav_1'), MULTI_CHAR('sav_2')};
static const u64 text_op[3] = {MULTI_CHAR('opt_0'), MULTI_CHAR('opt_1'), MULTI_CHAR('opt_2'),};
static const u64 ftext_sv[3] = {MULTI_CHAR('f_sav_0'), MULTI_CHAR('f_sav_1'), MULTI_CHAR('f_sav_2')};
static const u64 ftext_op[3] = {MULTI_CHAR('f_opt_0'), MULTI_CHAR('f_opt_1'), MULTI_CHAR('f_opt_2')};
static const u64 text_a_tag[5] = {MULTI_CHAR('atext1_1'), MULTI_CHAR('atext1_2'), MULTI_CHAR('atext1_3'), MULTI_CHAR('atext1_4'), MULTI_CHAR('atext1_5')};
static const u64 text_b_tag[5] = {MULTI_CHAR('btext1_1'), MULTI_CHAR('btext1_2'), MULTI_CHAR('btext1_3'), MULTI_CHAR('btext1_4'), MULTI_CHAR('btext1_5')};
#if REGION_JPN
static_cast<J2DTextBox*>(mpScreen->search('t_t00'))->setFont(mDoExt_getRubyFont());
static_cast<J2DTextBox*>(mpScreen->search('t_t00'))->setString(0x20, "");
static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('t_t00')))->setFont(mDoExt_getRubyFont());
static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('t_t00')))->setString(0x20, "");
dMeter2Info_getStringKanji(
0x3E1, static_cast<J2DTextBox*>(mpScreen->search('t_t00'))->getStringPtr(), NULL);
mpScreen->search('f_t00')->hide();
0x3E1, static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('t_t00')))->getStringPtr(), NULL);
mpScreen->search(MULTI_CHAR('f_t00'))->hide();
#else
static_cast<J2DTextBox*>(mpScreen->search('f_t00'))->setFont(mDoExt_getRubyFont());
static_cast<J2DTextBox*>(mpScreen->search('f_t00'))->setString(0x20, "");
static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('f_t00')))->setFont(mDoExt_getRubyFont());
static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('f_t00')))->setString(0x20, "");
dMeter2Info_getStringKanji(
0x3E1, static_cast<J2DTextBox*>(mpScreen->search('f_t00'))->getStringPtr(), NULL);
mpScreen->search('t_t00')->hide();
0x3E1, static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('f_t00')))->getStringPtr(), NULL);
mpScreen->search(MULTI_CHAR('t_t00'))->hide();
#endif
for (int i = 0; i < 3; i++) {
@@ -312,45 +312,45 @@ void dMenu_Collect2D_c::screenSet() {
}
#if REGION_JPN
static_cast<J2DTextBox*>(mpScreen->search('item_n00'))->setFont(mDoExt_getMesgFont());
static_cast<J2DTextBox*>(mpScreen->search('item_n01'))->setFont(mDoExt_getMesgFont());
static_cast<J2DTextBox*>(mpScreen->search('item_n02'))->setFont(mDoExt_getMesgFont());
static_cast<J2DTextBox*>(mpScreen->search('item_n03'))->setFont(mDoExt_getMesgFont());
static_cast<J2DTextBox*>(mpScreen->search('item_n00'))->setString(0x20, "");
static_cast<J2DTextBox*>(mpScreen->search('item_n01'))->setString(0x20, "");
static_cast<J2DTextBox*>(mpScreen->search('item_n02'))->setString(0x20, "");
static_cast<J2DTextBox*>(mpScreen->search('item_n03'))->setString(0x20, "");
static_cast<J2DTextBox*>(mpScreen->search('i_text1'))->setFont(mDoExt_getMesgFont());
static_cast<J2DTextBox*>(mpScreen->search('i_text0'))->setFont(mDoExt_getMesgFont());
static_cast<J2DTextBox*>(mpScreen->search('i_text1'))->setString(0x100, "");
static_cast<J2DTextBox*>(mpScreen->search('i_text0'))->setString(0x100, "");
static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('item_n00')))->setFont(mDoExt_getMesgFont());
static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('item_n01')))->setFont(mDoExt_getMesgFont());
static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('item_n02')))->setFont(mDoExt_getMesgFont());
static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('item_n03')))->setFont(mDoExt_getMesgFont());
static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('item_n00')))->setString(0x20, "");
static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('item_n01')))->setString(0x20, "");
static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('item_n02')))->setString(0x20, "");
static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('item_n03')))->setString(0x20, "");
static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('i_text1')))->setFont(mDoExt_getMesgFont());
static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('i_text0')))->setFont(mDoExt_getMesgFont());
static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('i_text1')))->setString(0x100, "");
static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('i_text0')))->setString(0x100, "");
mpScreen->search('item_n04')->hide();
mpScreen->search('item_n05')->hide();
mpScreen->search('item_n06')->hide();
mpScreen->search('item_n07')->hide();
mpScreen->search('f_text1')->hide();
mpScreen->search('f_text0')->hide();
mpScreen->search(MULTI_CHAR('item_n04'))->hide();
mpScreen->search(MULTI_CHAR('item_n05'))->hide();
mpScreen->search(MULTI_CHAR('item_n06'))->hide();
mpScreen->search(MULTI_CHAR('item_n07'))->hide();
mpScreen->search(MULTI_CHAR('f_text1'))->hide();
mpScreen->search(MULTI_CHAR('f_text0'))->hide();
#else
static_cast<J2DTextBox*>(mpScreen->search('item_n04'))->setFont(mDoExt_getMesgFont());
static_cast<J2DTextBox*>(mpScreen->search('item_n05'))->setFont(mDoExt_getMesgFont());
static_cast<J2DTextBox*>(mpScreen->search('item_n06'))->setFont(mDoExt_getMesgFont());
static_cast<J2DTextBox*>(mpScreen->search('item_n07'))->setFont(mDoExt_getMesgFont());
static_cast<J2DTextBox*>(mpScreen->search('item_n04'))->setString(0x20, "");
static_cast<J2DTextBox*>(mpScreen->search('item_n05'))->setString(0x20, "");
static_cast<J2DTextBox*>(mpScreen->search('item_n06'))->setString(0x20, "");
static_cast<J2DTextBox*>(mpScreen->search('item_n07'))->setString(0x20, "");
static_cast<J2DTextBox*>(mpScreen->search('f_text1'))->setFont(mDoExt_getMesgFont());
static_cast<J2DTextBox*>(mpScreen->search('f_text0'))->setFont(mDoExt_getMesgFont());
static_cast<J2DTextBox*>(mpScreen->search('f_text1'))->setString(0x100, "");
static_cast<J2DTextBox*>(mpScreen->search('f_text0'))->setString(0x100, "");
static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('item_n04')))->setFont(mDoExt_getMesgFont());
static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('item_n05')))->setFont(mDoExt_getMesgFont());
static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('item_n06')))->setFont(mDoExt_getMesgFont());
static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('item_n07')))->setFont(mDoExt_getMesgFont());
static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('item_n04')))->setString(0x20, "");
static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('item_n05')))->setString(0x20, "");
static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('item_n06')))->setString(0x20, "");
static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('item_n07')))->setString(0x20, "");
static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('f_text1')))->setFont(mDoExt_getMesgFont());
static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('f_text0')))->setFont(mDoExt_getMesgFont());
static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('f_text1')))->setString(0x100, "");
static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('f_text0')))->setString(0x100, "");
mpScreen->search('item_n00')->hide();
mpScreen->search('item_n01')->hide();
mpScreen->search('item_n02')->hide();
mpScreen->search('item_n03')->hide();
mpScreen->search('i_text1')->hide();
mpScreen->search('i_text0')->hide();
mpScreen->search(MULTI_CHAR('item_n00'))->hide();
mpScreen->search(MULTI_CHAR('item_n01'))->hide();
mpScreen->search(MULTI_CHAR('item_n02'))->hide();
mpScreen->search(MULTI_CHAR('item_n03'))->hide();
mpScreen->search(MULTI_CHAR('i_text1'))->hide();
mpScreen->search(MULTI_CHAR('i_text0'))->hide();
#endif
field_0x22d[0][0] = 0;
@@ -365,13 +365,13 @@ void dMenu_Collect2D_c::screenSet() {
if (field_0x22d[3][0] != 0) {
if (dComIfGs_isItemFirstBit(0x28)) {
mpScreen->search('ken_00')->hide();
mpScreen->search('ken_01')->show();
mpScreen->search(MULTI_CHAR('ken_00'))->hide();
mpScreen->search(MULTI_CHAR('ken_01'))->show();
} else if (dComIfGs_isItemFirstBit(0x3F)
/* dSv_event_flag_c::F_0026 - Ordon Village - gave wooden sword to talo on 3rd day */
&& !dComIfGs_isEventBit(0x302)) {
mpScreen->search('ken_00')->show();
mpScreen->search('ken_01')->hide();
mpScreen->search(MULTI_CHAR('ken_00'))->show();
mpScreen->search(MULTI_CHAR('ken_01'))->hide();
}
}
@@ -391,11 +391,11 @@ void dMenu_Collect2D_c::screenSet() {
dComIfGs_isItemFirstBit(0x2B) || dComIfGs_isItemFirstBit(0x2A) ? true : false;
if (field_0x22d[3][1] != 0) {
if (dComIfGs_isItemFirstBit(0x2B)) {
mpScreen->search('tate_00')->show();
mpScreen->search('tate_01')->hide();
mpScreen->search(MULTI_CHAR('tate_00'))->show();
mpScreen->search(MULTI_CHAR('tate_01'))->hide();
} else if (dComIfGs_isItemFirstBit(0x2A)) {
mpScreen->search('tate_00')->hide();
mpScreen->search('tate_01')->show();
mpScreen->search(MULTI_CHAR('tate_00'))->hide();
mpScreen->search(MULTI_CHAR('tate_01'))->show();
}
}
field_0x22d[4][1] = dComIfGs_isItemFirstBit(0x2C);
@@ -662,14 +662,14 @@ void dMenu_Collect2D_c::screenSet() {
mCursorX = i_copy;
mCursorY = j_copy;
}
mpLinkPm = new CPaneMgr(mpScreen, 'linki_n', 0, NULL);
mpLinkPm = new CPaneMgr(mpScreen, MULTI_CHAR('linki_n'), 0, NULL);
mLinkGlobalCenterPos.x = mpLinkPm->getInitGlobalCenterPosX();
mLinkGlobalCenterPos.y = mpLinkPm->getInitGlobalCenterPosY();
mLinkGlobalCenterPos.z = -1000.0f;
mpMaskPm = new CPaneMgr(mpScreen, 'kamen_n', 0, NULL);
mpModelBg = new CPaneMgr(mpScreen, 'modelbgn', 2, NULL);
mpHeartParent = new CPaneMgr(mpScreen, 'heart_n', 0, NULL);
mpHeartPiece = new CPaneMgr(mpScreen, 'heart_kn', 0, NULL);
mpMaskPm = new CPaneMgr(mpScreen, MULTI_CHAR('kamen_n'), 0, NULL);
mpModelBg = new CPaneMgr(mpScreen, MULTI_CHAR('modelbgn'), 2, NULL);
mpHeartParent = new CPaneMgr(mpScreen, MULTI_CHAR('heart_n'), 0, NULL);
mpHeartPiece = new CPaneMgr(mpScreen, MULTI_CHAR('heart_kn'), 0, NULL);
setAButtonString(mCurrentAString);
setBButtonString(mCurrentBString);
setItemNameString(mCursorX, mCursorY);
@@ -702,12 +702,12 @@ void dMenu_Collect2D_c::btkAnimeLoop0(J2DAnmTextureSRTKey* i_SRTKey) {
} else {
mFrame = 0.0f;
}
static_cast<J2DTextBox*>(mpScreen->search('modelbg0'))->setAnimation(i_SRTKey);
static_cast<J2DTextBox*>(mpScreen->search('modelbg1'))->setAnimation(i_SRTKey);
static_cast<J2DTextBox*>(mpScreen->search('modelbg2'))->setAnimation(i_SRTKey);
static_cast<J2DTextBox*>(mpScreen->search('modelbg3'))->setAnimation(i_SRTKey);
static_cast<J2DTextBox*>(mpScreen->search('modelbg4'))->setAnimation(i_SRTKey);
static_cast<J2DTextBox*>(mpScreen->search('modelbg5'))->setAnimation(i_SRTKey);
static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('modelbg0')))->setAnimation(i_SRTKey);
static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('modelbg1')))->setAnimation(i_SRTKey);
static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('modelbg2')))->setAnimation(i_SRTKey);
static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('modelbg3')))->setAnimation(i_SRTKey);
static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('modelbg4')))->setAnimation(i_SRTKey);
static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('modelbg5')))->setAnimation(i_SRTKey);
}
void dMenu_Collect2D_c::setBackAlpha() {
@@ -1126,24 +1126,24 @@ void dMenu_Collect2D_c::changeClothe() {
void dMenu_Collect2D_c::setArrowMaxNum(u8 param_0) {
switch (param_0) {
case 0:
mpScreen->search('item_0_0')->hide();
mpScreen->search('item_0_1')->hide();
mpScreen->search('item_0_2')->hide();
mpScreen->search(MULTI_CHAR('item_0_0'))->hide();
mpScreen->search(MULTI_CHAR('item_0_1'))->hide();
mpScreen->search(MULTI_CHAR('item_0_2'))->hide();
break;
case 30:
mpScreen->search('item_0_0')->show();
mpScreen->search('item_0_1')->hide();
mpScreen->search('item_0_2')->hide();
mpScreen->search(MULTI_CHAR('item_0_0'))->show();
mpScreen->search(MULTI_CHAR('item_0_1'))->hide();
mpScreen->search(MULTI_CHAR('item_0_2'))->hide();
break;
case 60:
mpScreen->search('item_0_0')->hide();
mpScreen->search('item_0_1')->show();
mpScreen->search('item_0_2')->hide();
mpScreen->search(MULTI_CHAR('item_0_0'))->hide();
mpScreen->search(MULTI_CHAR('item_0_1'))->show();
mpScreen->search(MULTI_CHAR('item_0_2'))->hide();
break;
case 100:
mpScreen->search('item_0_0')->hide();
mpScreen->search('item_0_1')->hide();
mpScreen->search('item_0_2')->show();
mpScreen->search(MULTI_CHAR('item_0_0'))->hide();
mpScreen->search(MULTI_CHAR('item_0_1'))->hide();
mpScreen->search(MULTI_CHAR('item_0_2'))->show();
break;
}
}
@@ -1151,26 +1151,26 @@ void dMenu_Collect2D_c::setArrowMaxNum(u8 param_0) {
void dMenu_Collect2D_c::setWalletMaxNum(u16 i_walletSize) {
switch (i_walletSize) {
case 300:
mpScreen->search('item_1_0')->show();
mpScreen->search('item_1_1')->hide();
mpScreen->search('item_1_2')->hide();
mpScreen->search(MULTI_CHAR('item_1_0'))->show();
mpScreen->search(MULTI_CHAR('item_1_1'))->hide();
mpScreen->search(MULTI_CHAR('item_1_2'))->hide();
break;
case 600:
mpScreen->search('item_1_0')->hide();
mpScreen->search('item_1_1')->show();
mpScreen->search('item_1_2')->hide();
mpScreen->search(MULTI_CHAR('item_1_0'))->hide();
mpScreen->search(MULTI_CHAR('item_1_1'))->show();
mpScreen->search(MULTI_CHAR('item_1_2'))->hide();
break;
case 1000:
mpScreen->search('item_1_0')->hide();
mpScreen->search('item_1_1')->hide();
mpScreen->search('item_1_2')->show();
mpScreen->search(MULTI_CHAR('item_1_0'))->hide();
mpScreen->search(MULTI_CHAR('item_1_1'))->hide();
mpScreen->search(MULTI_CHAR('item_1_2'))->show();
break;
}
}
void dMenu_Collect2D_c::setSmellType() {
static const u64 smell_tag[5] = {
'wolf_med', 'wolf_chi', 'wolf_fis', 'wolf_iri', 'wolf_pou',
MULTI_CHAR('wolf_med'), MULTI_CHAR('wolf_chi'), MULTI_CHAR('wolf_fis'), MULTI_CHAR('wolf_iri'), MULTI_CHAR('wolf_pou'),
};
s32 smellType = -1;
switch (dComIfGs_getCollectSmell()) {
@@ -1201,10 +1201,10 @@ void dMenu_Collect2D_c::setSmellType() {
void dMenu_Collect2D_c::setHeartPiece() {
static const u64 heart_tag[4] = {
'heart_1n',
'heart_2n',
'heart_3n',
'heart_4n',
MULTI_CHAR('heart_1n'),
MULTI_CHAR('heart_2n'),
MULTI_CHAR('heart_3n'),
MULTI_CHAR('heart_4n'),
};
s32 life = dComIfGs_getMaxLife() % 5;
for (int i = 0; i < MAX_VISIBLE_HEARTPIECES; i++) {
@@ -1228,10 +1228,10 @@ void dMenu_Collect2D_c::setPohMaxNum(u8 i_pohNum) {
JKRArchive* archive = dComIfGp_getMain2DArchive();
const char* textureName = dMeter2Info_getNumberTextureName(div);
ResTIMG* timg = (ResTIMG*)archive->getResource('TIMG', textureName);
static_cast<J2DPicture*>(mpScreen->search('item2_3'))->changeTexture(timg, 0);
static_cast<J2DPicture*>(mpScreen->search(MULTI_CHAR('item2_3')))->changeTexture(timg, 0);
check = 1;
} else {
mpScreen->search('item2_3')->hide();
mpScreen->search(MULTI_CHAR('item2_3'))->hide();
}
div = index / 10;
index = index % 10;
@@ -1239,25 +1239,25 @@ void dMenu_Collect2D_c::setPohMaxNum(u8 i_pohNum) {
JKRArchive* archive = dComIfGp_getMain2DArchive();
const char* textureName2 = dMeter2Info_getNumberTextureName(div);
ResTIMG* timg2 = (ResTIMG*)archive->getResource('TIMG', textureName2);
static_cast<J2DPicture*>(mpScreen->search('item2_2'))->changeTexture(timg2, 0);
static_cast<J2DPicture*>(mpScreen->search(MULTI_CHAR('item2_2')))->changeTexture(timg2, 0);
} else {
mpScreen->search('item2_2')->hide();
mpScreen->search(MULTI_CHAR('item2_2'))->hide();
}
JKRArchive* archive = dComIfGp_getMain2DArchive();
const char* textureName3 = dMeter2Info_getNumberTextureName(index);
ResTIMG* timg3 = (ResTIMG*)archive->getResource('TIMG', textureName3);
static_cast<J2DPicture*>(mpScreen->search('item2_1'))->changeTexture(timg3, 0);
static_cast<J2DPicture*>(mpScreen->search(MULTI_CHAR('item2_1')))->changeTexture(timg3, 0);
} else {
mpScreen->search('item2_3')->hide();
mpScreen->search('item2_2')->hide();
mpScreen->search('item2_1')->hide();
mpScreen->search(MULTI_CHAR('item2_3'))->hide();
mpScreen->search(MULTI_CHAR('item2_2'))->hide();
mpScreen->search(MULTI_CHAR('item2_1'))->hide();
}
}
void dMenu_Collect2D_c::setEquipItemFrameColorSword(int i_frame) {
static const u64 tag[2] = {
'ken_g_0',
'ken_g_1',
MULTI_CHAR('ken_g_0'),
MULTI_CHAR('ken_g_1'),
};
if (i_frame == -1) {
@@ -1313,8 +1313,8 @@ void dMenu_Collect2D_c::setEquipItemFrameColorSword(int i_frame) {
void dMenu_Collect2D_c::setEquipItemFrameColorShield(int i_frame) {
static const u64 tag[2] = {
'tate_g_0',
'tate_g_1',
MULTI_CHAR('tate_g_0'),
MULTI_CHAR('tate_g_1'),
};
if (i_frame == -1) {
@@ -1361,9 +1361,9 @@ void dMenu_Collect2D_c::setEquipItemFrameColorShield(int i_frame) {
void dMenu_Collect2D_c::setEquipItemFrameColorClothes(int i_frame) {
static const u64 tag[3] = {
'fuku_g_0',
'fuku_g_1',
'fuku_g_2',
MULTI_CHAR('fuku_g_0'),
MULTI_CHAR('fuku_g_1'),
MULTI_CHAR('fuku_g_2'),
};
if (i_frame == -1) {
@@ -1413,7 +1413,7 @@ void dMenu_Collect2D_c::setEquipItemFrameColorClothes(int i_frame) {
void dMenu_Collect2D_c::setHIO(bool i_useHIO) {
static const u64 kaz_n[9] = {
'uzu_00', 'uzu_01', 'uzu_02', 'uzu_03', 'uzu_04', 'uzu_05', 'uzu_06', 'uzu_07', 'hishi',
MULTI_CHAR('uzu_00'), MULTI_CHAR('uzu_01'), MULTI_CHAR('uzu_02'), MULTI_CHAR('uzu_03'), MULTI_CHAR('uzu_04'), MULTI_CHAR('uzu_05'), MULTI_CHAR('uzu_06'), MULTI_CHAR('uzu_07'), MULTI_CHAR('hishi'),
};
if (mBlueSmokePosX != g_drawHIO.mCollectScreen.mBlueSmokePosX ||
@@ -1461,7 +1461,7 @@ void dMenu_Collect2D_c::setHIO(bool i_useHIO) {
}
if (g_drawHIO.mCollectScreen.mColorDebugON) {
J2DPicture* basePicture = (J2DPicture*)mpScreen->search('nht_base');
J2DPicture* basePicture = (J2DPicture*)mpScreen->search(MULTI_CHAR('nht_base'));
basePicture->setBlackWhite(g_drawHIO.mCollectScreen.mVesselBack[0],
g_drawHIO.mCollectScreen.mVesselFront[0]);
@@ -1502,29 +1502,29 @@ void dMenu_Collect2D_c::setHIO(bool i_useHIO) {
u64 dMenu_Collect2D_c::getItemTag(int i_tag1, int i_tag2, bool param_3) {
static const u64 itemTag[6][7] = {
{0, 0, 0, 'ken_n0', 'ken_n1', 'heart_kn', 'kamen_n'},
{0, 0, 0, 'tate_n0', 'tate_n1'},
{0, 0, 0, MULTI_CHAR('ken_n0'), MULTI_CHAR('ken_n1'), MULTI_CHAR('heart_kn'), MULTI_CHAR('kamen_n')},
{0, 0, 0, MULTI_CHAR('tate_n0'), MULTI_CHAR('tate_n1')},
{
0,
0,
0,
'fuku_n0',
'fuku_n1',
'fuku_n2',
MULTI_CHAR('fuku_n0'),
MULTI_CHAR('fuku_n1'),
MULTI_CHAR('fuku_n2'),
},
{
'item_1_n',
'item_0_n',
'kabu_6n',
'maki_5_n',
MULTI_CHAR('item_1_n'),
MULTI_CHAR('item_0_n'),
MULTI_CHAR('kabu_6n'),
MULTI_CHAR('maki_5_n'),
},
{
'wolf_n',
'item_2_n',
'fish_3_n',
'lett_4_n',
MULTI_CHAR('wolf_n'),
MULTI_CHAR('item_2_n'),
MULTI_CHAR('fish_3_n'),
MULTI_CHAR('lett_4_n'),
},
{'save_n', 'option_n'},
{MULTI_CHAR('save_n'), MULTI_CHAR('option_n')},
};
if (i_tag2 == 5 && !param_3) {
@@ -2034,37 +2034,37 @@ void dMenu_Collect2D_c::_draw() {
if (mItemNameString == 0) {
#if REGION_JPN
char* stringPtr1 = static_cast<J2DTextBox*>(mpScreen->search('i_text1'))->getStringPtr();
char* stringPtr1 = static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('i_text1')))->getStringPtr();
#else
char* stringPtr1 = static_cast<J2DTextBox*>(mpScreen->search('f_text1'))->getStringPtr();
char* stringPtr1 = static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('f_text1')))->getStringPtr();
#endif
strcpy(stringPtr1, "");
#if REGION_JPN
char* stringPtr0 = static_cast<J2DTextBox*>(mpScreen->search('i_text0'))->getStringPtr();
char* stringPtr0 = static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('i_text0')))->getStringPtr();
#else
char* stringPtr0 = static_cast<J2DTextBox*>(mpScreen->search('f_text0'))->getStringPtr();
char* stringPtr0 = static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('f_text0')))->getStringPtr();
#endif
strcpy(stringPtr0, "");
} else {
#if REGION_JPN
J2DTextBox* textBox1 = static_cast<J2DTextBox*>(mpScreen->search('i_text1'));
J2DTextBox* textBox1 = static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('i_text1')));
#else
J2DTextBox* textBox1 = static_cast<J2DTextBox*>(mpScreen->search('f_text1'));
J2DTextBox* textBox1 = static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('f_text1')));
#endif
mpString->getString(mItemNameString, textBox1, NULL, NULL, NULL, 0);
#if REGION_JPN
J2DTextBox* textBox0 = static_cast<J2DTextBox*>(mpScreen->search('i_text0'));
J2DTextBox* textBox0 = static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('i_text0')));
#else
J2DTextBox* textBox0 = static_cast<J2DTextBox*>(mpScreen->search('f_text0'));
J2DTextBox* textBox0 = static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('f_text0')));
#endif
mpString->getString(mItemNameString, textBox0, NULL, NULL, NULL, 0);
#if REGION_JPN
textBox0 = static_cast<J2DTextBox*>(mpScreen->search('i_text0'));
textBox0 = static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('i_text0')));
#else
textBox0 = static_cast<J2DTextBox*>(mpScreen->search('f_text0'));
textBox0 = static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('f_text0')));
#endif
mpString->drawOutFontLocal(textBox0, -1.0f);
}
@@ -2088,7 +2088,7 @@ bool dMenu_Collect2D_c::isOutCheck() {
void dMenu_Collect2D_c::setAButtonString(u16 i_stringID) {
static const u64 text_a_tag[5] = {
'atext1_1', 'atext1_2', 'atext1_3', 'atext1_4', 'atext1_5',
MULTI_CHAR('atext1_1'), MULTI_CHAR('atext1_2'), MULTI_CHAR('atext1_3'), MULTI_CHAR('atext1_4'), MULTI_CHAR('atext1_5'),
};
if (i_stringID != mCurrentAString) {
@@ -2112,7 +2112,7 @@ void dMenu_Collect2D_c::setAButtonString(u16 i_stringID) {
void dMenu_Collect2D_c::setBButtonString(u16 i_stringID) {
static const u64 text_b_tag[5] = {
'btext1_1', 'btext1_2', 'btext1_3', 'btext1_4', 'btext1_5',
MULTI_CHAR('btext1_1'), MULTI_CHAR('btext1_2'), MULTI_CHAR('btext1_3'), MULTI_CHAR('btext1_4'), MULTI_CHAR('btext1_5'),
};
if (i_stringID != mCurrentBString) {
@@ -2146,23 +2146,23 @@ void dMenu_Collect2D_c::setItemNameString(u8 param_0, u8 param_1) {
} else {
#if REGION_JPN
char* stringPtr =
static_cast<J2DTextBox*>(mpScreen->search('item_n00'))->getStringPtr();
static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('item_n00')))->getStringPtr();
dMeter2Info_getStringKanji(uVar6, stringPtr, NULL);
stringPtr = static_cast<J2DTextBox*>(mpScreen->search('item_n01'))->getStringPtr();
stringPtr = static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('item_n01')))->getStringPtr();
dMeter2Info_getStringKanji(uVar6, stringPtr, NULL);
stringPtr = static_cast<J2DTextBox*>(mpScreen->search('item_n02'))->getStringPtr();
stringPtr = static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('item_n02')))->getStringPtr();
dMeter2Info_getStringKanji(uVar6, stringPtr, NULL);
stringPtr = static_cast<J2DTextBox*>(mpScreen->search('item_n03'))->getStringPtr();
stringPtr = static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('item_n03')))->getStringPtr();
dMeter2Info_getStringKanji(uVar6, stringPtr, NULL);
#else
char* stringPtr =
static_cast<J2DTextBox*>(mpScreen->search('item_n04'))->getStringPtr();
static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('item_n04')))->getStringPtr();
dMeter2Info_getStringKanji(uVar6, stringPtr, NULL);
stringPtr = static_cast<J2DTextBox*>(mpScreen->search('item_n05'))->getStringPtr();
stringPtr = static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('item_n05')))->getStringPtr();
dMeter2Info_getStringKanji(uVar6, stringPtr, NULL);
stringPtr = static_cast<J2DTextBox*>(mpScreen->search('item_n06'))->getStringPtr();
stringPtr = static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('item_n06')))->getStringPtr();
dMeter2Info_getStringKanji(uVar6, stringPtr, NULL);
stringPtr = static_cast<J2DTextBox*>(mpScreen->search('item_n07'))->getStringPtr();
stringPtr = static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('item_n07')))->getStringPtr();
dMeter2Info_getStringKanji(uVar6, stringPtr, NULL);
#endif
}
@@ -2172,21 +2172,21 @@ void dMenu_Collect2D_c::setItemNameString(u8 param_0, u8 param_1) {
void dMenu_Collect2D_c::setItemNameStringNull() {
mItemNameString = 0;
#if REGION_JPN
J2DTextBox* textBox = (J2DTextBox*)mpScreen->search('item_n00');
J2DTextBox* textBox = (J2DTextBox*)mpScreen->search(MULTI_CHAR('item_n00'));
strcpy(textBox->getStringPtr(), "");
textBox = (J2DTextBox*)mpScreen->search('item_n01');
textBox = (J2DTextBox*)mpScreen->search(MULTI_CHAR('item_n01'));
strcpy(textBox->getStringPtr(), "");
textBox = (J2DTextBox*)mpScreen->search('item_n02');
textBox = (J2DTextBox*)mpScreen->search(MULTI_CHAR('item_n02'));
strcpy(textBox->getStringPtr(), "");
textBox = (J2DTextBox*)mpScreen->search('item_n03');
textBox = (J2DTextBox*)mpScreen->search(MULTI_CHAR('item_n03'));
#else
J2DTextBox* textBox = (J2DTextBox*)mpScreen->search('item_n04');
J2DTextBox* textBox = (J2DTextBox*)mpScreen->search(MULTI_CHAR('item_n04'));
strcpy(textBox->getStringPtr(), "");
textBox = (J2DTextBox*)mpScreen->search('item_n05');
textBox = (J2DTextBox*)mpScreen->search(MULTI_CHAR('item_n05'));
strcpy(textBox->getStringPtr(), "");
textBox = (J2DTextBox*)mpScreen->search('item_n06');
textBox = (J2DTextBox*)mpScreen->search(MULTI_CHAR('item_n06'));
strcpy(textBox->getStringPtr(), "");
textBox = (J2DTextBox*)mpScreen->search('item_n07');
textBox = (J2DTextBox*)mpScreen->search(MULTI_CHAR('item_n07'));
#endif
strcpy(textBox->getStringPtr(), "");
}
src/d/d_menu_dmap.cpp
+95 -95
View File
@@ -147,32 +147,32 @@ void dMenu_DmapBg_c::mapScreenInit() {
}
#if (PLATFORM_WII || PLATFORM_SHIELD)
mpBlack = new CPaneMgrAlpha(mMapScreen[0], 'm_black', 2, NULL);
mpBlack = new CPaneMgrAlpha(mMapScreen[0], MULTI_CHAR('m_black'), 2, NULL);
JUT_ASSERT(699, mpBlack != NULL);
mpBlack->setAlphaRate(0.0f);
#else
mpBlack = NULL;
#endif
mMapScreen[0]->search('map_icon')->hide();
mMapScreen[0]->search('map_aria')->hide();
mMapScreen[0]->search('n_all')->hide();
mMapScreen[1]->search('n_all')->hide();
mMapScreen[0]->search('m_black')->hide();
mMapScreen[1]->search('bs_00_0')->hide();
mMapScreen[1]->search('bs_00_1')->hide();
mMapScreen[1]->search('gold00_0')->hide();
mMapScreen[1]->search('gold00_1')->hide();
mMapScreen[1]->search('m_black')->hide();
mMapScreen[1]->search('center_n')->hide();
mMapScreen[1]->search('map_ai_n')->setBasePosition(J2DBasePosition_0);
mMapScreen[0]->search('center_n')->setBasePosition(J2DBasePosition_4);
mMapScreen[0]->search(MULTI_CHAR('map_icon'))->hide();
mMapScreen[0]->search(MULTI_CHAR('map_aria'))->hide();
mMapScreen[0]->search(MULTI_CHAR('n_all'))->hide();
mMapScreen[1]->search(MULTI_CHAR('n_all'))->hide();
mMapScreen[0]->search(MULTI_CHAR('m_black'))->hide();
mMapScreen[1]->search(MULTI_CHAR('bs_00_0'))->hide();
mMapScreen[1]->search(MULTI_CHAR('bs_00_1'))->hide();
mMapScreen[1]->search(MULTI_CHAR('gold00_0'))->hide();
mMapScreen[1]->search(MULTI_CHAR('gold00_1'))->hide();
mMapScreen[1]->search(MULTI_CHAR('m_black'))->hide();
mMapScreen[1]->search(MULTI_CHAR('center_n'))->hide();
mMapScreen[1]->search(MULTI_CHAR('map_ai_n'))->setBasePosition(J2DBasePosition_0);
mMapScreen[0]->search(MULTI_CHAR('center_n'))->setBasePosition(J2DBasePosition_4);
OSInitFastCast();
{
Mtx m;
CPaneMgr pane;
Vec vtx = pane.getGlobalVtx(mMapScreen[1]->search('map_icon'), &m, 0, false, 0);
Vec vtx = pane.getGlobalVtx(mMapScreen[1]->search(MULTI_CHAR('map_icon')), &m, 0, false, 0);
field_0xdc0 = vtx.x;
field_0xdc4 = vtx.y;
}
@@ -193,7 +193,7 @@ void dMenu_DmapBg_c::mapScreenInit() {
mMapScreen[0]->animation();
setGoldAnimation(true);
mMapPane = (J2DPicture*)mMapScreen[1]->search('map_aria');
mMapPane = (J2DPicture*)mMapScreen[1]->search(MULTI_CHAR('map_aria'));
mMapPane->setCornerColor(JUtility::TColor(0xFF, 0xFF, 0xFF, 0xFF));
mMapPane->setWhite(JUtility::TColor(0xFF, 0xFF, 0xFF, 0xFF));
@@ -204,7 +204,7 @@ void dMenu_DmapBg_c::mapScreenInit() {
mMapWidth = vtx3.x - vtx0.x;
mMapHeight = vtx3.y - vtx0.y;
J2DPicture* map_icon_pic = (J2DPicture*)mMapScreen[1]->search('map_icon');
J2DPicture* map_icon_pic = (J2DPicture*)mMapScreen[1]->search(MULTI_CHAR('map_icon'));
map_icon_pic->setBasePosition(J2DBasePosition_4);
map_icon_pic->setCornerColor(JUtility::TColor(0xFF, 0xFF, 0xFF, 0xFF));
map_icon_pic->setAlpha(0);
@@ -212,7 +212,7 @@ void dMenu_DmapBg_c::mapScreenInit() {
initiate(dComIfGp_getDmapResArchive());
for (int i = 0; i < 2; i++) {
mpMapSpace[i] = new CPaneMgr(mMapScreen[i], 'mapspace', 0, NULL);
mpMapSpace[i] = new CPaneMgr(mMapScreen[i], MULTI_CHAR('mapspace'), 0, NULL);
JUT_ASSERT(817, mpMapSpace[i] != NULL);
mpMapSpace[i]->paneTrans(0.0f, -15.0f);
@@ -282,15 +282,15 @@ bool dMenu_DmapBg_c::iconScaleAnm() {
}
void dMenu_DmapBg_c::buttonIconScreenInit() {
static u64 const cont_at[5] = {'cont_at', 'cont_at1', 'cont_at2', 'cont_at3', 'cont_at4'};
static u64 const cont_bt[5] = {'cont_bt', 'cont_bt1', 'cont_bt2', 'cont_bt3', 'cont_bt4'};
static u64 const font_at[5] = {'font_at', 'font_at1', 'font_at2', 'font_at3', 'font_at4'};
static u64 const font_bt[5] = {'font_bt', 'font_bt1', 'font_bt2', 'font_bt3', 'font_bt4'};
static u64 const cont_at[5] = {MULTI_CHAR('cont_at'), MULTI_CHAR('cont_at1'), MULTI_CHAR('cont_at2'), MULTI_CHAR('cont_at3'), MULTI_CHAR('cont_at4')};
static u64 const cont_bt[5] = {MULTI_CHAR('cont_bt'), MULTI_CHAR('cont_bt1'), MULTI_CHAR('cont_bt2'), MULTI_CHAR('cont_bt3'), MULTI_CHAR('cont_bt4')};
static u64 const font_at[5] = {MULTI_CHAR('font_at'), MULTI_CHAR('font_at1'), MULTI_CHAR('font_at2'), MULTI_CHAR('font_at3'), MULTI_CHAR('font_at4')};
static u64 const font_bt[5] = {MULTI_CHAR('font_bt'), MULTI_CHAR('font_bt1'), MULTI_CHAR('font_bt2'), MULTI_CHAR('font_bt3'), MULTI_CHAR('font_bt4')};
static u64 const c_tag[2] = {
#if VERSION == VERSION_GCN_JPN
'c_text_s', 'c_text'
MULTI_CHAR('c_text_s'), MULTI_CHAR('c_text')
#else
'f_text_s', 'f_text'
MULTI_CHAR('f_text_s'), MULTI_CHAR('f_text')
#endif
};
@@ -314,9 +314,9 @@ void dMenu_DmapBg_c::buttonIconScreenInit() {
#else
mDecorateScreen = NULL;
mpDecorateRoot = NULL;
mButtonScreen->search('w_spot')->hide();
mButtonScreen->search('spot00')->hide();
mButtonScreen->search('spot01')->hide();
mButtonScreen->search(MULTI_CHAR('w_spot'))->hide();
mButtonScreen->search(MULTI_CHAR('spot00'))->hide();
mButtonScreen->search(MULTI_CHAR('spot01'))->hide();
#endif
mpButtonRoot = new CPaneMgrAlphaMorf(mButtonScreen, 'ROOT', 2, NULL);
@@ -327,7 +327,7 @@ void dMenu_DmapBg_c::buttonIconScreenInit() {
mpButtonText[i] = NULL;
}
mpCButton = new CPaneMgrAlpha(mButtonScreen, 'c_btn', 2, NULL);
mpCButton = new CPaneMgrAlpha(mButtonScreen, MULTI_CHAR('c_btn'), 2, NULL);
JUT_ASSERT(978, mpCButton != NULL);
mpJButton = NULL;
@@ -373,9 +373,9 @@ void dMenu_DmapBg_c::buttonIconScreenInit() {
void dMenu_DmapBg_c::setAButtonString(u32 i_msgNo) {
static u64 const cont_at[5] = {
#if VERSION == VERSION_GCN_JPN
'cont_at', 'cont_at1', 'cont_at2', 'cont_at3', 'cont_at4'
MULTI_CHAR('cont_at'), MULTI_CHAR('cont_at1'), MULTI_CHAR('cont_at2'), MULTI_CHAR('cont_at3'), MULTI_CHAR('cont_at4')
#else
'font_at', 'font_at1', 'font_at2', 'font_at3', 'font_at4'
MULTI_CHAR('font_at'), MULTI_CHAR('font_at1'), MULTI_CHAR('font_at2'), MULTI_CHAR('font_at3'), MULTI_CHAR('font_at4')
#endif
};
for (int i = 0; i < 5; i++) {
@@ -390,9 +390,9 @@ void dMenu_DmapBg_c::setAButtonString(u32 i_msgNo) {
void dMenu_DmapBg_c::setBButtonString(u32 i_msgNo) {
static u64 const cont_bt[5] = {
#if VERSION == VERSION_GCN_JPN
'cont_bt', 'cont_bt1', 'cont_bt2', 'cont_bt3', 'cont_bt4'
MULTI_CHAR('cont_bt'), MULTI_CHAR('cont_bt1'), MULTI_CHAR('cont_bt2'), MULTI_CHAR('cont_bt3'), MULTI_CHAR('cont_bt4')
#else
'font_bt', 'font_bt1', 'font_bt2', 'font_bt3', 'font_bt4'
MULTI_CHAR('font_bt'), MULTI_CHAR('font_bt1'), MULTI_CHAR('font_bt2'), MULTI_CHAR('font_bt3'), MULTI_CHAR('font_bt4')
#endif
};
for (int i = 0; i < 5; i++) {
@@ -413,9 +413,9 @@ dMenu_Dmap_c* dMenu_Dmap_c::myclass;
void dMenu_DmapBg_c::setCButtonString(u32 i_msgNo) {
static u64 const c_tag[2] = {
#if VERSION == VERSION_GCN_JPN
'c_text_s', 'c_text'
MULTI_CHAR('c_text_s'), MULTI_CHAR('c_text')
#else
'f_text_s', 'f_text'
MULTI_CHAR('f_text_s'), MULTI_CHAR('f_text')
#endif
};
int i;
@@ -479,7 +479,7 @@ void dMenu_DmapBg_c::baseScreenInit() {
JUT_ASSERT(1362, fg != false);
dPaneClass_showNullPane(mFloorScreen);
mBaseScreen->search('w_btn_n')->hide();
mBaseScreen->search(MULTI_CHAR('w_btn_n'))->hide();
mpBaseRoot = new CPaneMgrAlphaMorf(mBaseScreen, 'ROOT', 2, NULL);
JUT_ASSERT(1396, mpBaseRoot != NULL);
@@ -494,11 +494,11 @@ void dMenu_DmapBg_c::baseScreenInit() {
mpDrawCursor->setParam(0.95f, 0.9f, 0.1f, 0.6f, 0.5f);
#if VERSION == VERSION_GCN_JPN
J2DTextBox* uVar9 = (J2DTextBox*)mBaseScreen->search('t_t00');
mBaseScreen->search('f_t_00')->hide();
J2DTextBox* uVar9 = (J2DTextBox*)mBaseScreen->search(MULTI_CHAR('t_t00'));
mBaseScreen->search(MULTI_CHAR('f_t_00'))->hide();
#else
J2DTextBox* uVar9 = (J2DTextBox*)mBaseScreen->search('f_t_00');
mBaseScreen->search('t_t00')->hide();
J2DTextBox* uVar9 = (J2DTextBox*)mBaseScreen->search(MULTI_CHAR('f_t_00'));
mBaseScreen->search(MULTI_CHAR('t_t00'))->hide();
#endif
uVar9->setFont(mDoExt_getSubFont());
uVar9->setString(32, "");
@@ -524,11 +524,11 @@ void dMenu_DmapBg_c::setFloorMessage() {
};
#if VERSION == VERSION_GCN_JPN
#define FLOOR_TAG(A, B) ('ffoor0_0' | (A<<16) | (B))
#define FFOOR_TAG(A, B) ('floor0_0' | (A<<16) | (B))
#define FLOOR_TAG(A, B) (MULTI_CHAR('ffoor0_0') | (A<<16) | (B))
#define FFOOR_TAG(A, B) (MULTI_CHAR('floor0_0') | (A<<16) | (B))
#else
#define FLOOR_TAG(A, B) ('floor0_0' | (A<<16) | (B))
#define FFOOR_TAG(A, B) ('ffoor0_0' | (A<<16) | (B))
#define FLOOR_TAG(A, B) (MULTI_CHAR('floor0_0') | (A<<16) | (B))
#define FFOOR_TAG(A, B) (MULTI_CHAR('ffoor0_0') | (A<<16) | (B))
#endif
floor_textbox_1[0] = (J2DTextBox*)mFloorScreen->search(FFOOR_TAG(7, 1));
@@ -795,8 +795,8 @@ void dMenu_DmapBg_c::setAllAlphaRate(f32 i_rate, bool param_2) {
}
void dMenu_DmapBg_c::setGoldAnimation(bool param_1) {
J2DPane* gold0 = mMapScreen[0]->search('gold00_0');
J2DPane* gold1 = mMapScreen[0]->search('gold00_1');
J2DPane* gold0 = mMapScreen[0]->search(MULTI_CHAR('gold00_0'));
J2DPane* gold1 = mMapScreen[0]->search(MULTI_CHAR('gold00_1'));
if (param_1) {
gold0->setAnimation(field_0xd28[0]);
@@ -809,13 +809,13 @@ void dMenu_DmapBg_c::setGoldAnimation(bool param_1) {
void dMenu_DmapBg_c::setGoldFrameAlphaRate(f32 i_rate) {
if (0.0f == i_rate) {
mMapScreen[0]->search('gold00_0')->hide();
mMapScreen[0]->search('gold00_1')->hide();
mMapScreen[0]->search(MULTI_CHAR('gold00_0'))->hide();
mMapScreen[0]->search(MULTI_CHAR('gold00_1'))->hide();
} else {
mMapScreen[0]->search('gold00_0')->show();
mMapScreen[0]->search('gold00_1')->show();
mMapScreen[0]->search('gold00_0')->setAlpha(i_rate * 255.0f);
mMapScreen[0]->search('gold00_1')->setAlpha(i_rate * 255.0f);
mMapScreen[0]->search(MULTI_CHAR('gold00_0'))->show();
mMapScreen[0]->search(MULTI_CHAR('gold00_1'))->show();
mMapScreen[0]->search(MULTI_CHAR('gold00_0'))->setAlpha(i_rate * 255.0f);
mMapScreen[0]->search(MULTI_CHAR('gold00_1'))->setAlpha(i_rate * 255.0f);
}
}
@@ -875,7 +875,7 @@ void dMenu_DmapBg_c::draw() {
mMapScreen[0]->draw(field_0xd94, field_0xd98, grafContext);
if (mpBackTexture != NULL) {
J2DPane* center_pane = mMapScreen[0]->search('center_n');
J2DPane* center_pane = mMapScreen[0]->search(MULTI_CHAR('center_n'));
CPaneMgr pane;
Mtx mtx;
Vec local_200 = pane.getGlobalVtx(center_pane, &mtx, 0, false, 0);
@@ -904,7 +904,7 @@ void dMenu_DmapBg_c::draw() {
mMapScreen[1]->draw(field_0xd94, field_0xd98, grafContext);
J2DPane* center_pane = mMapScreen[1]->search('center_n');
J2DPane* center_pane = mMapScreen[1]->search(MULTI_CHAR('center_n'));
CPaneMgr pane;
Mtx local_110;
Vec local_218 = pane.getGlobalVtx(center_pane, &local_110, 0, false, 0);
@@ -1061,18 +1061,18 @@ dMenu_Dmap_c::dMenu_Dmap_c(JKRExpHeap* param_1, STControl* param_2, CSTControl*
}
void dMenu_Dmap_c::screenInit() {
static u64 const floor_tag[8] = {'floor7_n', 'floor0_n', 'floor1_n', 'floor2_n',
'floor3_n', 'floor4_n', 'floor5_n', 'floor6_n'};
static u64 const icon_tag[8] = {'ico_set7', 'ico_set0', 'ico_set1', 'ico_set2',
'ico_set3', 'ico_set4', 'ico_set5', 'ico_set6'};
static u64 const boss_tag[8] = {'ic_st_b7', 'ic_st_b0', 'ic_st_b1', 'ic_st_b2',
'ic_st_b3', 'ic_st_b4', 'ic_st_b5', 'ic_st_b6'};
static u64 const stay_tag[2] = {'rink_nul', 'boss_nul'};
static u64 const waku_tag[3] = {'gray_map', 'gray_con', 'gray_key'};
static u64 const key_tag[3] = {'key_00', 'key_01', 'key_02'};
static u64 const item_tag[3] = {'map000', 'con000', 'i_key_n'};
static u64 const floor_tag[8] = {MULTI_CHAR('floor7_n'), MULTI_CHAR('floor0_n'), MULTI_CHAR('floor1_n'), MULTI_CHAR('floor2_n'),
MULTI_CHAR('floor3_n'), MULTI_CHAR('floor4_n'), MULTI_CHAR('floor5_n'), MULTI_CHAR('floor6_n')};
static u64 const icon_tag[8] = {MULTI_CHAR('ico_set7'), MULTI_CHAR('ico_set0'), MULTI_CHAR('ico_set1'), MULTI_CHAR('ico_set2'),
MULTI_CHAR('ico_set3'), MULTI_CHAR('ico_set4'), MULTI_CHAR('ico_set5'), MULTI_CHAR('ico_set6')};
static u64 const boss_tag[8] = {MULTI_CHAR('ic_st_b7'), MULTI_CHAR('ic_st_b0'), MULTI_CHAR('ic_st_b1'), MULTI_CHAR('ic_st_b2'),
MULTI_CHAR('ic_st_b3'), MULTI_CHAR('ic_st_b4'), MULTI_CHAR('ic_st_b5'), MULTI_CHAR('ic_st_b6')};
static u64 const stay_tag[2] = {MULTI_CHAR('rink_nul'), MULTI_CHAR('boss_nul')};
static u64 const waku_tag[3] = {MULTI_CHAR('gray_map'), MULTI_CHAR('gray_con'), MULTI_CHAR('gray_key')};
static u64 const key_tag[3] = {MULTI_CHAR('key_00'), MULTI_CHAR('key_01'), MULTI_CHAR('key_02')};
static u64 const item_tag[3] = {MULTI_CHAR('map000'), MULTI_CHAR('con000'), MULTI_CHAR('i_key_n')};
field_0x10 = new CPaneMgr(mpDrawBg->mBaseScreen, 'floo_s_n', 0, NULL);
field_0x10 = new CPaneMgr(mpDrawBg->mBaseScreen, MULTI_CHAR('floo_s_n'), 0, NULL);
for (int i = 0; i < 8; i++) {
field_0x114[i] = 0.0f;
@@ -1119,7 +1119,7 @@ void dMenu_Dmap_c::screenInit() {
f32 var_f29;
f32 var_f28 = 7.0f;
var_f29 = mpDrawBg->mFloorScreen->search('s_n_all')->getHeight();
var_f29 = mpDrawBg->mFloorScreen->search(MULTI_CHAR('s_n_all'))->getHeight();
f32 var_f30 = mSelFloor[0]->getPanePtr()->getHeight();
f32 var_f27 = mFloorAll - mBottomFloor + 1;
@@ -1138,19 +1138,19 @@ void dMenu_Dmap_c::screenInit() {
iconMoveCalc();
Vec local_b0 = mSelFloor[getDefaultCurFloorPos()]->getGlobalVtxCenter(false, 0);
mpDrawBg->mpDrawCursor->setPos(local_b0.x + field_0x104, local_b0.y, mSelFloor[getDefaultCurFloorPos()]->getPanePtr(), true);
field_0x94 = new CPaneMgr(mpDrawBg->mBaseScreen, 'item_s_n', 0, NULL);
field_0x7c[0] = new CPaneMgr(mpDrawBg->mBaseScreen, 'map_n', 3, NULL);
field_0x7c[1] = new CPaneMgr(mpDrawBg->mBaseScreen, 'con_n', 3, NULL);
field_0x7c[2] = new CPaneMgr(mpDrawBg->mBaseScreen, 'key_n', 3, NULL);
field_0x88[0] = new CPaneMgr(mpDrawBg->mBaseScreen, 'map000', 3, NULL);
field_0x88[1] = new CPaneMgr(mpDrawBg->mBaseScreen, 'con000', 3, NULL);
field_0x94 = new CPaneMgr(mpDrawBg->mBaseScreen, MULTI_CHAR('item_s_n'), 0, NULL);
field_0x7c[0] = new CPaneMgr(mpDrawBg->mBaseScreen, MULTI_CHAR('map_n'), 3, NULL);
field_0x7c[1] = new CPaneMgr(mpDrawBg->mBaseScreen, MULTI_CHAR('con_n'), 3, NULL);
field_0x7c[2] = new CPaneMgr(mpDrawBg->mBaseScreen, MULTI_CHAR('key_n'), 3, NULL);
field_0x88[0] = new CPaneMgr(mpDrawBg->mBaseScreen, MULTI_CHAR('map000'), 3, NULL);
field_0x88[1] = new CPaneMgr(mpDrawBg->mBaseScreen, MULTI_CHAR('con000'), 3, NULL);
if (dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()) == dStage_SaveTbl_LV2) {
field_0x88[2] = new CPaneMgr(mpDrawBg->mBaseScreen, 'i_key_n', 3, NULL);
field_0x88[2] = new CPaneMgr(mpDrawBg->mBaseScreen, MULTI_CHAR('i_key_n'), 3, NULL);
} else if (dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()) == dStage_SaveTbl_LV5) {
field_0x88[2] = new CPaneMgr(mpDrawBg->mBaseScreen, 'lv5_k_n', 3, NULL);
field_0x88[2] = new CPaneMgr(mpDrawBg->mBaseScreen, MULTI_CHAR('lv5_k_n'), 3, NULL);
} else {
field_0x88[2] = new CPaneMgr(mpDrawBg->mBaseScreen, 'nor_k_n', 3, NULL);
field_0x88[2] = new CPaneMgr(mpDrawBg->mBaseScreen, MULTI_CHAR('nor_k_n'), 3, NULL);
}
for (int i = 0; i < 3; i++) {
@@ -1158,8 +1158,8 @@ void dMenu_Dmap_c::screenInit() {
}
if (dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()) == dStage_SaveTbl_LV2) {
mpDrawBg->mBaseScreen->search('lv5_k_n')->hide();
mpDrawBg->mBaseScreen->search('nor_k_n')->hide();
mpDrawBg->mBaseScreen->search(MULTI_CHAR('lv5_k_n'))->hide();
mpDrawBg->mBaseScreen->search(MULTI_CHAR('nor_k_n'))->hide();
u8 key_num = 0;
if (checkItemGet(fpcNm_ITEM_L2_KEY_PIECES1, 1)) {
@@ -1187,19 +1187,19 @@ void dMenu_Dmap_c::screenInit() {
}
if (key_num == 0 || dMeter2Info_isTempBit(0)) {
mpDrawBg->mBaseScreen->search('key_n_n')->hide();
mpDrawBg->mBaseScreen->search(MULTI_CHAR('key_n_n'))->hide();
} else {
ResTIMG* tex = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', dMeter2Info_getNumberTextureName(key_num));
((J2DPicture*)mpDrawBg->mBaseScreen->search('c_n_2_s'))->changeTexture(tex, 0);
((J2DPicture*)mpDrawBg->mBaseScreen->search('c_n_2'))->changeTexture(tex, 0);
((J2DPicture*)mpDrawBg->mBaseScreen->search(MULTI_CHAR('c_n_2_s')))->changeTexture(tex, 0);
((J2DPicture*)mpDrawBg->mBaseScreen->search(MULTI_CHAR('c_n_2')))->changeTexture(tex, 0);
tex = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', dMeter2Info_getNumberTextureName(3));
((J2DPicture*)mpDrawBg->mBaseScreen->search('c_n_1_s'))->changeTexture(tex, 0);
((J2DPicture*)mpDrawBg->mBaseScreen->search('c_n_1'))->changeTexture(tex, 0);
((J2DPicture*)mpDrawBg->mBaseScreen->search(MULTI_CHAR('c_n_1_s')))->changeTexture(tex, 0);
((J2DPicture*)mpDrawBg->mBaseScreen->search(MULTI_CHAR('c_n_1')))->changeTexture(tex, 0);
}
} else if (dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()) == dStage_SaveTbl_LV5) {
mpDrawBg->mBaseScreen->search('i_key_n')->hide();
mpDrawBg->mBaseScreen->search('nor_k_n')->hide();
mpDrawBg->mBaseScreen->search('key_n_n')->hide();
mpDrawBg->mBaseScreen->search(MULTI_CHAR('i_key_n'))->hide();
mpDrawBg->mBaseScreen->search(MULTI_CHAR('nor_k_n'))->hide();
mpDrawBg->mBaseScreen->search(MULTI_CHAR('key_n_n'))->hide();
u8 itemNo = fpcNm_ITEM_NONE;
field_0x174[2] = 0;
@@ -1230,14 +1230,14 @@ void dMenu_Dmap_c::screenInit() {
case fpcNm_ITEM_TOMATO_PUREE:
case fpcNm_ITEM_TASTE:
dMeter2Info_readItemTexture(itemNo, mItemTexBuf,
(J2DPicture*)mpDrawBg->mBaseScreen->search('lv5_boss'), NULL, NULL, NULL, NULL,
(J2DPicture*)mpDrawBg->mBaseScreen->search(MULTI_CHAR('lv5_boss')), NULL, NULL, NULL, NULL,
NULL, NULL, -1);
break;
}
} else {
mpDrawBg->mBaseScreen->search('i_key_n')->hide();
mpDrawBg->mBaseScreen->search('lv5_k_n')->hide();
mpDrawBg->mBaseScreen->search('key_n_n')->hide();
mpDrawBg->mBaseScreen->search(MULTI_CHAR('i_key_n'))->hide();
mpDrawBg->mBaseScreen->search(MULTI_CHAR('lv5_k_n'))->hide();
mpDrawBg->mBaseScreen->search(MULTI_CHAR('key_n_n'))->hide();
field_0x174[2] = (u8)dComIfGs_isDungeonItemBossKey() ? fpcNm_ITEM_BOSS_KEY : 0;
}
@@ -1258,9 +1258,9 @@ void dMenu_Dmap_c::screenInit() {
mpDrawBg->mBaseScreen->search(waku_tag[i])->hide();
if (i == 2) {
mpDrawBg->mBaseScreen->search('lv5_k_n')->hide();
mpDrawBg->mBaseScreen->search('nor_k_n')->hide();
mpDrawBg->mBaseScreen->search('key_n_n')->hide();
mpDrawBg->mBaseScreen->search(MULTI_CHAR('lv5_k_n'))->hide();
mpDrawBg->mBaseScreen->search(MULTI_CHAR('nor_k_n'))->hide();
mpDrawBg->mBaseScreen->search(MULTI_CHAR('key_n_n'))->hide();
}
}
}
@@ -1270,7 +1270,7 @@ void dMenu_Dmap_c::screenInit() {
}
field_0x94->hide();
field_0x98 = new CPaneMgr(mpDrawBg->mBaseScreen, 'so_s_n', 0, NULL);
field_0x98 = new CPaneMgr(mpDrawBg->mBaseScreen, MULTI_CHAR('so_s_n'), 0, NULL);
field_0x98->hide();
}
@@ -1728,7 +1728,7 @@ void dMenu_Dmap_c::_create() {
screenInit();
mpDrawBg->getMapPane()->changeTexture(mMapCtrl->getResTIMGPointer(0), NULL);
mpDrawBg->getMapPane()->changeTexture(mMapCtrl->getResTIMGPointer(0), 0);
if (mpDrawBg->getMapPane()->append(mMapCtrl->getResTIMGPointer(1), 1.0f)) {
mpDrawBg->getMapPane()->setBlendRatio(1.0f, 0.0f);
@@ -2025,8 +2025,8 @@ void dMenu_Dmap_c::_draw() {
sp14[1] = -(field_0x138 + 100.0f * (sp20 * mMapCtrl->getPixelPerCm()));
Vec spC;
spC.x = mpDrawBg->mMapScreen[0]->search('center_n')->getGlbBounds().i.x + (mpDrawBg->mMapScreen[0]->search('center_n')->getWidth() / 2);
spC.y = mpDrawBg->mMapScreen[0]->search('center_n')->getGlbBounds().i.y + (mpDrawBg->mMapScreen[0]->search('center_n')->getHeight() / 2);
spC.x = mpDrawBg->mMapScreen[0]->search(MULTI_CHAR('center_n'))->getGlbBounds().i.x + (mpDrawBg->mMapScreen[0]->search(MULTI_CHAR('center_n'))->getWidth() / 2);
spC.y = mpDrawBg->mMapScreen[0]->search(MULTI_CHAR('center_n'))->getGlbBounds().i.y + (mpDrawBg->mMapScreen[0]->search(MULTI_CHAR('center_n'))->getHeight() / 2);
CPaneMgr sp70;
//!@bug It's unclear what this is supposed to be, but a stack pointer being converted to a bool is probably not intended.
src/d/d_menu_fishing.cpp
+25 -25
View File
@@ -220,54 +220,54 @@ void dMenu_Fishing_c::wait_move() {
void dMenu_Fishing_c::screenSetBase() {
static const u64 fish_n[6] = {
'fish_n_6', 'fish_n_5', 'fish_n_3', 'fish_n_1', 'fish_n_2', 'fish_n_4',
MULTI_CHAR('fish_n_6'), MULTI_CHAR('fish_n_5'), MULTI_CHAR('fish_n_3'), MULTI_CHAR('fish_n_1'), MULTI_CHAR('fish_n_2'), MULTI_CHAR('fish_n_4'),
};
static const u64 fish_p0[6] = {
'fi_pa_6n', 'fi_pa_5n', 'fi_pa_3n', 'fi_pa_1n', 'fi_pa_2n', 'fi_pa_4n',
MULTI_CHAR('fi_pa_6n'), MULTI_CHAR('fi_pa_5n'), MULTI_CHAR('fi_pa_3n'), MULTI_CHAR('fi_pa_1n'), MULTI_CHAR('fi_pa_2n'), MULTI_CHAR('fi_pa_4n'),
};
static const u64 fish_p1[6] = {
'fi_na_6n', 'fi_na_5n', 'fi_na_3n', 'fi_na_1n', 'fi_na_2n', 'fi_na_4n',
MULTI_CHAR('fi_na_6n'), MULTI_CHAR('fi_na_5n'), MULTI_CHAR('fi_na_3n'), MULTI_CHAR('fi_na_1n'), MULTI_CHAR('fi_na_2n'), MULTI_CHAR('fi_na_4n'),
};
static const u64 fish_p2[6] = {'fi_li_6n', 'fi_li_5n', 'fi_li_3n',
'fi_li_1n', 'fi_li_2n', 'fi_li_4n'};
static const u64 fish_p2[6] = {MULTI_CHAR('fi_li_6n'), MULTI_CHAR('fi_li_5n'), MULTI_CHAR('fi_li_3n'),
MULTI_CHAR('fi_li_1n'), MULTI_CHAR('fi_li_2n'), MULTI_CHAR('fi_li_4n')};
static const u64 fish_p3[6] = {
'b_box_6n', 'b_box_5n', 'b_box_3n', 'b_box_1n', 'b_box_2n', 'b_box_4n',
MULTI_CHAR('b_box_6n'), MULTI_CHAR('b_box_5n'), MULTI_CHAR('b_box_3n'), MULTI_CHAR('b_box_1n'), MULTI_CHAR('b_box_2n'), MULTI_CHAR('b_box_4n'),
};
static const u64 fish_p4[6] = {
'r_box_6n', 'r_box_5n', 'r_box_3n', 'r_box_1n', 'r_box_2n', 'r_box_4n',
MULTI_CHAR('r_box_6n'), MULTI_CHAR('r_box_5n'), MULTI_CHAR('r_box_3n'), MULTI_CHAR('r_box_1n'), MULTI_CHAR('r_box_2n'), MULTI_CHAR('r_box_4n'),
};
static const u64 fish_p5[6] = {
'info_6_n', 'info_5_n', 'info_3_n', 'info_1_n', 'info_2_n', 'info_4_n',
MULTI_CHAR('info_6_n'), MULTI_CHAR('info_5_n'), MULTI_CHAR('info_3_n'), MULTI_CHAR('info_1_n'), MULTI_CHAR('info_2_n'), MULTI_CHAR('info_4_n'),
};
static const u64 size_1[6] = {
'size_t_6', 'size_t_5', 'size_t_3', 'size_t_1', 'size_t_2', 'size_t_4',
MULTI_CHAR('size_t_6'), MULTI_CHAR('size_t_5'), MULTI_CHAR('size_t_3'), MULTI_CHAR('size_t_1'), MULTI_CHAR('size_t_2'), MULTI_CHAR('size_t_4'),
};
static const u64 size_unit_1[6] = {
'cm_t_6', 'cm_t_5', 'cm_t_3', 'cm_t_1', 'cm_t_2', 'cm_t_4',
MULTI_CHAR('cm_t_6'), MULTI_CHAR('cm_t_5'), MULTI_CHAR('cm_t_3'), MULTI_CHAR('cm_t_1'), MULTI_CHAR('cm_t_2'), MULTI_CHAR('cm_t_4'),
};
static const u64 count_1[6] = {
'count_t6', 'count_t5', 'count_t3', 'count_t1', 'count_t2', 'count_t4',
MULTI_CHAR('count_t6'), MULTI_CHAR('count_t5'), MULTI_CHAR('count_t3'), MULTI_CHAR('count_t1'), MULTI_CHAR('count_t2'), MULTI_CHAR('count_t4'),
};
static const u64 count_unit_1[6] = {
'cou_t_6', 'cou_t_5', 'cou_t_3', 'cou_t_1', 'cou_t_2', 'cou_t_4',
MULTI_CHAR('cou_t_6'), MULTI_CHAR('cou_t_5'), MULTI_CHAR('cou_t_3'), MULTI_CHAR('cou_t_1'), MULTI_CHAR('cou_t_2'), MULTI_CHAR('cou_t_4'),
};
static const u64 name_0[6] = {
'name_6', 'name_5', 'name_3', 'name_1', 'name_2', 'name_4',
MULTI_CHAR('name_6'), MULTI_CHAR('name_5'), MULTI_CHAR('name_3'), MULTI_CHAR('name_1'), MULTI_CHAR('name_2'), MULTI_CHAR('name_4'),
};
static const u64 fname_0[6] = {
'f_name_6', 'f_name_5', 'f_name_3', 'f_name_1', 'f_name_2', 'f_name_4',
MULTI_CHAR('f_name_6'), MULTI_CHAR('f_name_5'), MULTI_CHAR('f_name_3'), MULTI_CHAR('f_name_1'), MULTI_CHAR('f_name_2'), MULTI_CHAR('f_name_4'),
};
static const u32 name_id[6] = {
@@ -281,7 +281,7 @@ void dMenu_Fishing_c::screenSetBase() {
mpScreen = new J2DScreen();
mpScreen->setPriority("zelda_fish_window.blo", 0x20000, mpArchive);
dPaneClass_showNullPane(mpScreen);
mpParent = new CPaneMgr(mpScreen, 'n_all', 2, NULL);
mpParent = new CPaneMgr(mpScreen, MULTI_CHAR('n_all'), 2, NULL);
mpParent->setAlphaRate(0.0f);
for (int i = 0; i < MAX_FINDABLE_FISHES; i++) {
mpFishParent[i] = new CPaneMgr(mpScreen, fish_n[i], 0, NULL);
@@ -292,15 +292,15 @@ void dMenu_Fishing_c::screenSetBase() {
mpFishParts[4][i] = new CPaneMgr(mpScreen, fish_p4[i], 0, NULL);
mpFishParts[5][i] = new CPaneMgr(mpScreen, fish_p5[i], 0, NULL);
}
mpFishInfoParent[0] = new CPaneMgr(mpScreen, 'info_blu', 0, NULL);
mpFishInfoParent[1] = new CPaneMgr(mpScreen, 'info_red', 0, NULL);
mpFishInfoParent[0] = new CPaneMgr(mpScreen, MULTI_CHAR('info_blu'), 0, NULL);
mpFishInfoParent[1] = new CPaneMgr(mpScreen, MULTI_CHAR('info_red'), 0, NULL);
#if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN)
J2DTextBox* textBox = (J2DTextBox*)mpScreen->search('t_t00');
mpScreen->search('f_t00')->hide();
J2DTextBox* textBox = (J2DTextBox*)mpScreen->search(MULTI_CHAR('t_t00'));
mpScreen->search(MULTI_CHAR('f_t00'))->hide();
#else
J2DTextBox* textBox = (J2DTextBox*)mpScreen->search('f_t00');
mpScreen->search('t_t00')->hide();
J2DTextBox* textBox = (J2DTextBox*)mpScreen->search(MULTI_CHAR('f_t00'));
mpScreen->search(MULTI_CHAR('t_t00'))->hide();
#endif
textBox->setFont(mDoExt_getSubFont());
@@ -329,8 +329,8 @@ void dMenu_Fishing_c::screenSetBase() {
mpFishNameString[i]->setString(0x20, "");
dMeter2Info_getStringKanji(name_id[i], mpFishNameString[i]->getStringPtr(), NULL);
}
mpInfoLargestString = (J2DTextBox*)mpScreen->search('inf_size');
mpInfoNumCaughtString = (J2DTextBox*)mpScreen->search('inf_cou');
mpInfoLargestString = (J2DTextBox*)mpScreen->search(MULTI_CHAR('inf_size'));
mpInfoNumCaughtString = (J2DTextBox*)mpScreen->search(MULTI_CHAR('inf_cou'));
mpInfoLargestString->setFont(mDoExt_getMesgFont());
mpInfoNumCaughtString->setFont(mDoExt_getMesgFont());
mpInfoLargestString->setString(0x20, "");
@@ -340,8 +340,8 @@ void dMenu_Fishing_c::screenSetBase() {
}
void dMenu_Fishing_c::screenSetDoIcon() {
static const u64 text_a_tag[5] = {'atext1_1', 'atext1_2', 'atext1_3', 'atext1_4', 'atext1_5'};
static const u64 text_b_tag[5] = {'btext1_1', 'btext1_2', 'btext1_3', 'btext1_4', 'btext1_5'};
static const u64 text_a_tag[5] = {MULTI_CHAR('atext1_1'), MULTI_CHAR('atext1_2'), MULTI_CHAR('atext1_3'), MULTI_CHAR('atext1_4'), MULTI_CHAR('atext1_5')};
static const u64 text_b_tag[5] = {MULTI_CHAR('btext1_1'), MULTI_CHAR('btext1_2'), MULTI_CHAR('btext1_3'), MULTI_CHAR('btext1_4'), MULTI_CHAR('btext1_5')};
mpIconScreen = new J2DScreen();
mpIconScreen->setPriority("zelda_collect_soubi_do_icon_parts.blo", 0x20000, mpArchive);
src/d/d_menu_fmap.cpp
+1 -1
View File
@@ -2270,7 +2270,7 @@ bool dMenu_Fmap_c::readFieldMapData(void** o_data, char const* i_path, bool para
}
void dMenu_Fmap_c::decodeFieldMapData() {
int field_data = (intptr_t)mpFieldDat;
intptr_t field_data = (intptr_t)mpFieldDat;
dMenu_Fmap_field_region_data_c* region_data
= (dMenu_Fmap_field_region_data_c*)(field_data + mpFieldDat->mRegionDataOffset);
dMenuMapCommon_c::Stage_c* stage_data
src/d/d_menu_fmap2D.cpp
+68 -68
View File
@@ -178,10 +178,10 @@ dMenu_Fmap2DBack_c::dMenu_Fmap2DBack_c() {
mpBaseRoot = new CPaneMgrAlphaMorf(mpBaseScreen, 'ROOT', 2, NULL);
JUT_ASSERT(264, mpBaseRoot != NULL);
mpMapArea = new CPaneMgr(mpBaseScreen, 'center_n', 0, NULL);
mpMapArea = new CPaneMgr(mpBaseScreen, MULTI_CHAR('center_n'), 0, NULL);
JUT_ASSERT(269, mpMapArea != NULL);
mpMapBlack = new CPaneMgr(mpBaseScreen, 'map_blak', 0, NULL);
mpMapBlack = new CPaneMgr(mpBaseScreen, MULTI_CHAR('map_blak'), 0, NULL);
JUT_ASSERT(273, mpMapBlack != NULL);
mpMeterHaihai = new dMeterHaihai_c(1);
@@ -204,12 +204,12 @@ dMenu_Fmap2DBack_c::dMenu_Fmap2DBack_c() {
dPaneClass_showNullPane(mpPointScreen);
mpPointParent = new CPaneMgr(mpPointScreen, 'f_po_n', 2, NULL);
mpPointParent = new CPaneMgr(mpPointScreen, MULTI_CHAR('f_po_n'), 2, NULL);
JUT_ASSERT(301, mpPointParent != NULL);
mpPointParent->scale(g_fmapHIO.mCursorScale, g_fmapHIO.mCursorScale);
static const u64 cur_tag[4] = {'f_po_ru', 'f_po_rd', 'f_po_ld', 'f_po_lu'};
static const u64 cur_tag[4] = {MULTI_CHAR('f_po_ru'), MULTI_CHAR('f_po_rd'), MULTI_CHAR('f_po_ld'), MULTI_CHAR('f_po_lu')};
for (int i = 0; i < 4; i++) {
J2DPicture* picture = static_cast<J2DPicture*>(mpPointScreen->search(cur_tag[i]));
@@ -390,7 +390,7 @@ void dMenu_Fmap2DBack_c::draw() {
if (g_fmapHIO.mCursorDebugON) {
mpPointParent->scale(g_fmapHIO.mCursorScale, g_fmapHIO.mCursorScale);
static const u64 cur_tag[4] = {'f_po_ru', 'f_po_rd', 'f_po_ld', 'f_po_lu'};
static const u64 cur_tag[4] = {MULTI_CHAR('f_po_ru'), MULTI_CHAR('f_po_rd'), MULTI_CHAR('f_po_ld'), MULTI_CHAR('f_po_lu')};
for (int i = 0; i < 4; i++) {
J2DPicture* picture = static_cast<J2DPicture*>(mpPointScreen->search(cur_tag[i]));
@@ -1814,8 +1814,8 @@ void dMenu_Fmap2DBack_c::btkAnimeLoop(f32 i_step) {
mAnmFrame = 0.0f;
}
mpBaseScreen->search('gold00_0')->setAnimation(mpBaseAnm);
mpBaseScreen->search('gold00_1')->setAnimation(mpBaseAnm);
mpBaseScreen->search(MULTI_CHAR('gold00_0'))->setAnimation(mpBaseAnm);
mpBaseScreen->search(MULTI_CHAR('gold00_1'))->setAnimation(mpBaseAnm);
mpBaseScreen->animation();
}
@@ -2187,46 +2187,46 @@ dMenu_Fmap2DTop_c::dMenu_Fmap2DTop_c(JKRExpHeap* i_heap, STControl* i_stick) {
mpAnalogStickAlpha = NULL;
mpAnalogStick = NULL;
mpDpad = NULL;
mpTitleScreen->search('tri_Null')->hide();
mpTitleScreen->search(MULTI_CHAR('tri_Null'))->hide();
#endif
#if PLATFORM_GCN
mpArrowLAlpha[0] = new CPaneMgrAlpha(mpTitleScreen, 'yaji_04', 0, NULL);
mpArrowLAlpha[1] = new CPaneMgrAlpha(mpTitleScreen, 'yaji_05', 0, NULL);
mpArrowRAlpha[0] = new CPaneMgrAlpha(mpTitleScreen, 'yaji_06', 0, NULL);
mpArrowRAlpha[1] = new CPaneMgrAlpha(mpTitleScreen, 'yaji_07', 0, NULL);
mpArrowLAlpha[0] = new CPaneMgrAlpha(mpTitleScreen, MULTI_CHAR('yaji_04'), 0, NULL);
mpArrowLAlpha[1] = new CPaneMgrAlpha(mpTitleScreen, MULTI_CHAR('yaji_05'), 0, NULL);
mpArrowRAlpha[0] = new CPaneMgrAlpha(mpTitleScreen, MULTI_CHAR('yaji_06'), 0, NULL);
mpArrowRAlpha[1] = new CPaneMgrAlpha(mpTitleScreen, MULTI_CHAR('yaji_07'), 0, NULL);
mpDpadAlpha = new CPaneMgrAlpha(mpTitleScreen, 'juji_c_n', 2, NULL);
mpDpadAlpha = new CPaneMgrAlpha(mpTitleScreen, MULTI_CHAR('juji_c_n'), 2, NULL);
mpDpadAlpha->setAlphaRate(0.0f);
mpAnalogStickAlpha = new CPaneMgrAlpha(mpTitleScreen, 'as_n', 2, NULL);
mpAnalogStickAlpha->setAlphaRate(0.0f);
mpAnalogStick = new CPaneMgr(mpTitleScreen, 'as_n', 0, NULL);
mpDpad = new CPaneMgr(mpTitleScreen, 'juji_c_n', 0, NULL);
mpDpad = new CPaneMgr(mpTitleScreen, MULTI_CHAR('juji_c_n'), 0, NULL);
#endif
#if PLATFORM_SHIELD
mpButtonA = new CPaneMgr(mpTitleScreen, 'abtn_n', 2, NULL);
mpButtonA = new CPaneMgr(mpTitleScreen, MULTI_CHAR('abtn_n'), 2, NULL);
JUT_ASSERT(3935, mpButtonA != NULL);
mpButtonB = new CPaneMgr(mpTitleScreen, 'bbtn_n', 2, NULL);
mpButtonB = new CPaneMgr(mpTitleScreen, MULTI_CHAR('bbtn_n'), 2, NULL);
JUT_ASSERT(3938, mpButtonB != NULL);
mpButtonZ = new CPaneMgr(mpTitleScreen, 'j_scal_n', 2, NULL);
mpButtonZ = new CPaneMgr(mpTitleScreen, MULTI_CHAR('j_scal_n'), 2, NULL);
JUT_ASSERT(3941, mpButtonZ != NULL);
mpButtonTextA = new CPaneMgr(mpTitleScreen, 'a_text_n', 2, NULL);
mpButtonTextA = new CPaneMgr(mpTitleScreen, MULTI_CHAR('a_text_n'), 2, NULL);
JUT_ASSERT(3953, mpButtonTextA != NULL);
mpButtonTextB = new CPaneMgr(mpTitleScreen, 'b_text_n', 2, NULL);
mpButtonTextB = new CPaneMgr(mpTitleScreen, MULTI_CHAR('b_text_n'), 2, NULL);
JUT_ASSERT(3956, mpButtonTextB != NULL);
mpButtonTextZ = new CPaneMgr(mpTitleScreen, 'z_text_n', 2, NULL);
mpButtonTextZ = new CPaneMgr(mpTitleScreen, MULTI_CHAR('z_text_n'), 2, NULL);
JUT_ASSERT(3959, mpButtonTextZ != NULL);
#else
mpButtonA = new CPaneMgr(mpTitleScreen, 'abtn_n1', 2, NULL);
mpButtonA = new CPaneMgr(mpTitleScreen, MULTI_CHAR('abtn_n1'), 2, NULL);
JUT_ASSERT(3935, mpButtonA != NULL);
mpButtonB = new CPaneMgr(mpTitleScreen, 'bbtn_n1', 2, NULL);
mpButtonB = new CPaneMgr(mpTitleScreen, MULTI_CHAR('bbtn_n1'), 2, NULL);
JUT_ASSERT(3938, mpButtonB != NULL);
mpButtonZ = new CPaneMgr(mpTitleScreen, 'zbtn_n1', 2, NULL);
mpButtonZ = new CPaneMgr(mpTitleScreen, MULTI_CHAR('zbtn_n1'), 2, NULL);
JUT_ASSERT(3941, mpButtonZ != NULL);
mpButtonTextA = new CPaneMgr(mpTitleScreen, 'a_text_n', 2, NULL);
mpButtonTextA = new CPaneMgr(mpTitleScreen, MULTI_CHAR('a_text_n'), 2, NULL);
JUT_ASSERT(3953, mpButtonTextA != NULL);
mpButtonTextB = new CPaneMgr(mpTitleScreen, 'b_text_n', 2, NULL);
mpButtonTextB = new CPaneMgr(mpTitleScreen, MULTI_CHAR('b_text_n'), 2, NULL);
JUT_ASSERT(3956, mpButtonTextB != NULL);
mpButtonTextZ = new CPaneMgr(mpTitleScreen, 'z_text_n', 2, NULL);
mpButtonTextZ = new CPaneMgr(mpTitleScreen, MULTI_CHAR('z_text_n'), 2, NULL);
JUT_ASSERT(3959, mpButtonTextZ != NULL);
#endif
mpButtonA->setAlphaRate(0.0f);
@@ -2236,16 +2236,16 @@ dMenu_Fmap2DTop_c::dMenu_Fmap2DTop_c(JKRExpHeap* i_heap, STControl* i_stick) {
mpButtonTextB->setAlphaRate(0.0f);
mpButtonTextZ->setAlphaRate(0.0f);
mpNamePane = new CPaneMgr(mpTitleScreen, 'name_n', 0, NULL);
mpNamePane = new CPaneMgr(mpTitleScreen, MULTI_CHAR('name_n'), 0, NULL);
JUT_ASSERT(3970, mpNamePane != NULL);
mpSubPane = new CPaneMgr(mpTitleScreen, 'sub_n_n', 0, NULL);
mpSubPane = new CPaneMgr(mpTitleScreen, MULTI_CHAR('sub_n_n'), 0, NULL);
JUT_ASSERT(3974, mpSubPane != NULL);
if (dMeter2Info_getMapStatus() == 9) {
mpNamePane->hide();
mpSubPane->hide();
}
mpContPane = new CPaneMgr(mpTitleScreen, 'cont_n', 0, NULL);
mpContPane = new CPaneMgr(mpTitleScreen, MULTI_CHAR('cont_n'), 0, NULL);
JUT_ASSERT(3984, mpContPane != NULL);
mTitlePosX = mTitlePosY = 0.0f;
@@ -2271,8 +2271,8 @@ dMenu_Fmap2DTop_c::dMenu_Fmap2DTop_c(JKRExpHeap* i_heap, STControl* i_stick) {
mAnmFrame = 0.0f;
static const u64 area_name[3] = {'i_name_s', 'i_name' ,'i_name1'};
static const u64 farea_name[3] = {'f_name_1', 'f_name3', 'f_name2'};
static const u64 area_name[3] = {MULTI_CHAR('i_name_s'), MULTI_CHAR('i_name') ,MULTI_CHAR('i_name1')};
static const u64 farea_name[3] = {MULTI_CHAR('f_name_1'), MULTI_CHAR('f_name3'), MULTI_CHAR('f_name2')};
for (int i = 0; i < 3; i++) {
#if VERSION == VERSION_GCN_JPN
static_cast<J2DTextBox*>(mpTitleScreen->search(area_name[i]))
@@ -2288,17 +2288,17 @@ dMenu_Fmap2DTop_c::dMenu_Fmap2DTop_c(JKRExpHeap* i_heap, STControl* i_stick) {
}
#if PLATFORM_GCN
static const u64 sfont_name[7] = {
'sfont00', 'sfontl0', 'sfontl1', 'sfontl2', 'sfontb0', 'sfontb1', 'sfontb2'
MULTI_CHAR('sfont00'), MULTI_CHAR('sfontl0'), MULTI_CHAR('sfontl1'), MULTI_CHAR('sfontl2'), MULTI_CHAR('sfontb0'), MULTI_CHAR('sfontb1'), MULTI_CHAR('sfontb2')
};
static const u64 ffont_name[7] = {
'ffont00', 'ffontl0', 'ffontl1', 'ffontl2', 'ffontb0', 'ffontb3', 'ffontb4'
MULTI_CHAR('ffont00'), MULTI_CHAR('ffontl0'), MULTI_CHAR('ffontl1'), MULTI_CHAR('ffontl2'), MULTI_CHAR('ffontb0'), MULTI_CHAR('ffontb3'), MULTI_CHAR('ffontb4')
};
#else
static const u64 sfont_name[7] = {
'sfont00', 'sfontl0', 'sfontl1', 'sfontl2', 'sfontb0', 'sfontb1', 'sfontb2'
MULTI_CHAR('sfont00'), MULTI_CHAR('sfontl0'), MULTI_CHAR('sfontl1'), MULTI_CHAR('sfontl2'), MULTI_CHAR('sfontb0'), MULTI_CHAR('sfontb1'), MULTI_CHAR('sfontb2')
};
static const u64 ffont_name[7] = {
'ffont01', 'ffontl3', 'ffontl4', 'ffontl5', 'ffontb3', 'ffontb4', 'ffontb5'
MULTI_CHAR('ffont01'), MULTI_CHAR('ffontl3'), MULTI_CHAR('ffontl4'), MULTI_CHAR('ffontl5'), MULTI_CHAR('ffontb3'), MULTI_CHAR('ffontb4'), MULTI_CHAR('ffontb5')
};
#endif
for (int i = 0; i < 7; i++) {
@@ -2316,8 +2316,8 @@ dMenu_Fmap2DTop_c::dMenu_Fmap2DTop_c(JKRExpHeap* i_heap, STControl* i_stick) {
}
setTitleNameString(0x3e0);
static const u64 cont_zt[5] = {'cont_zt', 'cont_zt1', 'cont_zt2', 'cont_zt3', 'cont_zt4'};
static const u64 font_zt[5] = {'font_zt1', 'font_zt2', 'font_zt3', 'font_zt4', 'font_zt5'};
static const u64 cont_zt[5] = {MULTI_CHAR('cont_zt'), MULTI_CHAR('cont_zt1'), MULTI_CHAR('cont_zt2'), MULTI_CHAR('cont_zt3'), MULTI_CHAR('cont_zt4')};
static const u64 font_zt[5] = {MULTI_CHAR('font_zt1'), MULTI_CHAR('font_zt2'), MULTI_CHAR('font_zt3'), MULTI_CHAR('font_zt4'), MULTI_CHAR('font_zt5')};
for (int i = 0; i < 5; i++) {
#if VERSION == VERSION_GCN_JPN
static_cast<J2DTextBox*>(mpTitleScreen->search(cont_zt[i]))
@@ -2333,11 +2333,11 @@ dMenu_Fmap2DTop_c::dMenu_Fmap2DTop_c(JKRExpHeap* i_heap, STControl* i_stick) {
}
setZButtonString(0x529, 0xff);
#if PLATFORM_GCN
static const u64 cont_bt[5] = {'cont_bt1', 'cont_bt2', 'cont_bt3', 'cont_bt4', 'cont_bt'};
static const u64 font_bt[5] = {'font_bt1', 'font_bt2', 'font_bt3', 'font_bt4', 'font_bt5'};
static const u64 cont_bt[5] = {MULTI_CHAR('cont_bt1'), MULTI_CHAR('cont_bt2'), MULTI_CHAR('cont_bt3'), MULTI_CHAR('cont_bt4'), MULTI_CHAR('cont_bt')};
static const u64 font_bt[5] = {MULTI_CHAR('font_bt1'), MULTI_CHAR('font_bt2'), MULTI_CHAR('font_bt3'), MULTI_CHAR('font_bt4'), MULTI_CHAR('font_bt5')};
#else
static const u64 cont_bt[5] = {'cont_bt1', 'cont_bt2', 'cont_bt3', 'cont_bt4', 'cont_bt8'};
static const u64 font_bt[5] = {'font_bt1', 'font_bt2', 'font_bt3', 'font_bt4', 'font_bt5'};
static const u64 cont_bt[5] = {MULTI_CHAR('cont_bt1'), MULTI_CHAR('cont_bt2'), MULTI_CHAR('cont_bt3'), MULTI_CHAR('cont_bt4'), MULTI_CHAR('cont_bt8')};
static const u64 font_bt[5] = {MULTI_CHAR('font_bt1'), MULTI_CHAR('font_bt2'), MULTI_CHAR('font_bt3'), MULTI_CHAR('font_bt4'), MULTI_CHAR('font_bt5')};
#endif
for (int i = 0; i < 5; i++) {
#if VERSION == VERSION_GCN_JPN
@@ -2354,8 +2354,8 @@ dMenu_Fmap2DTop_c::dMenu_Fmap2DTop_c(JKRExpHeap* i_heap, STControl* i_stick) {
}
setBButtonString(0x522, 0xff);
static const u64 cont_at[5] = {'cont_at', 'cont_at1', 'cont_at2', 'cont_at3', 'cont_at4'};
static const u64 font_at[5] = {'font_at1', 'font_at2', 'font_at3', 'font_at4', 'font_at5'};
static const u64 cont_at[5] = {MULTI_CHAR('cont_at'), MULTI_CHAR('cont_at1'), MULTI_CHAR('cont_at2'), MULTI_CHAR('cont_at3'), MULTI_CHAR('cont_at4')};
static const u64 font_at[5] = {MULTI_CHAR('font_at1'), MULTI_CHAR('font_at2'), MULTI_CHAR('font_at3'), MULTI_CHAR('font_at4'), MULTI_CHAR('font_at5')};
for (int i = 0; i < 5; i++) {
#if VERSION == VERSION_GCN_JPN
static_cast<J2DTextBox*>(mpTitleScreen->search(cont_at[i]))
@@ -2372,8 +2372,8 @@ dMenu_Fmap2DTop_c::dMenu_Fmap2DTop_c(JKRExpHeap* i_heap, STControl* i_stick) {
setAButtonString(0x527, 0xff);
#if PLATFORM_GCN
static const u64 juji_c[5] = {'juji_c00', 'juji_c01', 'juji_c02', 'juji_c03', 'juji_c04'};
static const u64 fuji_c[5] = {'fuji_c00', 'fuji_c01', 'fuji_c02', 'fuji_c03', 'fuji_c04'};
static const u64 juji_c[5] = {MULTI_CHAR('juji_c00'), MULTI_CHAR('juji_c01'), MULTI_CHAR('juji_c02'), MULTI_CHAR('juji_c03'), MULTI_CHAR('juji_c04')};
static const u64 fuji_c[5] = {MULTI_CHAR('fuji_c00'), MULTI_CHAR('fuji_c01'), MULTI_CHAR('fuji_c02'), MULTI_CHAR('fuji_c03'), MULTI_CHAR('fuji_c04')};
for (int i = 0; i < 5; i++) {
#if VERSION == VERSION_GCN_JPN
static_cast<J2DTextBox*>(mpTitleScreen->search(juji_c[i]))
@@ -2389,8 +2389,8 @@ dMenu_Fmap2DTop_c::dMenu_Fmap2DTop_c(JKRExpHeap* i_heap, STControl* i_stick) {
}
setCrossLRString(0x3f9);
static const u64 ast_c[5] = {'ast_00', 'ast_01', 'ast_02', 'ast_03', 'ast_04'};
static const u64 fst_c[5] = {'fst_00', 'fst_01', 'fst_02', 'fst_03', 'fst_04'};
static const u64 ast_c[5] = {MULTI_CHAR('ast_00'), MULTI_CHAR('ast_01'), MULTI_CHAR('ast_02'), MULTI_CHAR('ast_03'), MULTI_CHAR('ast_04')};
static const u64 fst_c[5] = {MULTI_CHAR('fst_00'), MULTI_CHAR('fst_01'), MULTI_CHAR('fst_02'), MULTI_CHAR('fst_03'), MULTI_CHAR('fst_04')};
for (int i = 0; i < 5; i++) {
#if VERSION == VERSION_GCN_JPN
static_cast<J2DTextBox*>(mpTitleScreen->search(ast_c[i]))
@@ -2575,28 +2575,28 @@ void dMenu_Fmap2DTop_c::btkAnimeLoop(J2DAnmTextureSRTKey* i_anm, f32 i_delta) {
mAnmFrame = 0.0f;
}
mpTitleScreen->search('spot_0')->setAnimation(i_anm);
mpTitleScreen->search(MULTI_CHAR('spot_0'))->setAnimation(i_anm);
mpTitleScreen->animation();
}
void dMenu_Fmap2DTop_c::setMoyaAlpha(u8 i_alpha) {
mpTitleScreen->search('spot_0')->setAlpha(i_alpha);
mpTitleScreen->search(MULTI_CHAR('spot_0'))->setAlpha(i_alpha);
}
void dMenu_Fmap2DTop_c::setTitleNameString(u32 param_0) {
#if VERSION == VERSION_GCN_JPN
static const u64 sfont_name[7] = {
'sfont00', 'sfontl0', 'sfontl1', 'sfontl2', 'sfontb0', 'sfontb1', 'sfontb2'
MULTI_CHAR('sfont00'), MULTI_CHAR('sfontl0'), MULTI_CHAR('sfontl1'), MULTI_CHAR('sfontl2'), MULTI_CHAR('sfontb0'), MULTI_CHAR('sfontb1'), MULTI_CHAR('sfontb2')
};
#define setTitleNameString_font_name sfont_name
#elif PLATFORM_GCN
static const u64 ffont_name[7] = {
'ffont00', 'ffontl0', 'ffontl1', 'ffontl2', 'ffontb0', 'ffontb3', 'ffontb4'
MULTI_CHAR('ffont00'), MULTI_CHAR('ffontl0'), MULTI_CHAR('ffontl1'), MULTI_CHAR('ffontl2'), MULTI_CHAR('ffontb0'), MULTI_CHAR('ffontb3'), MULTI_CHAR('ffontb4')
};
#define setTitleNameString_font_name ffont_name
#else
static const u64 ffont_name[7] = {
'ffont01', 'ffontl3', 'ffontl4', 'ffontl5', 'ffontb3', 'ffontb4', 'ffontb5'
MULTI_CHAR('ffont01'), MULTI_CHAR('ffontl3'), MULTI_CHAR('ffontl4'), MULTI_CHAR('ffontl5'), MULTI_CHAR('ffontb3'), MULTI_CHAR('ffontb4'), MULTI_CHAR('ffontb5')
};
#define setTitleNameString_font_name ffont_name
#endif
@@ -2617,10 +2617,10 @@ void dMenu_Fmap2DTop_c::setTitleNameString(u32 param_0) {
void dMenu_Fmap2DTop_c::setAreaNameString(u32 param_0) {
#if VERSION == VERSION_GCN_JPN
static const u64 iarea_name[3] = {'i_name_s', 'i_name', 'i_name1'};
static const u64 iarea_name[3] = {MULTI_CHAR('i_name_s'), MULTI_CHAR('i_name'), MULTI_CHAR('i_name1')};
#define setAreaNameString_area_name iarea_name
#else
static const u64 farea_name[3] = {'f_name_1', 'f_name3', 'f_name2'};
static const u64 farea_name[3] = {MULTI_CHAR('f_name_1'), MULTI_CHAR('f_name3'), MULTI_CHAR('f_name2')};
#define setAreaNameString_area_name farea_name
#endif
for (int i = 0; i < 3; i++) {
@@ -2644,10 +2644,10 @@ void dMenu_Fmap2DTop_c::setZButtonString(u32 param_0, u8 i_alpha) {
}
#if VERSION == VERSION_GCN_JPN
static const u64 cont_zt[5] = {'cont_zt', 'cont_zt1', 'cont_zt2', 'cont_zt3', 'cont_zt4'};
static const u64 cont_zt[5] = {MULTI_CHAR('cont_zt'), MULTI_CHAR('cont_zt1'), MULTI_CHAR('cont_zt2'), MULTI_CHAR('cont_zt3'), MULTI_CHAR('cont_zt4')};
#define setZButtonString_font_zt cont_zt
#else
static const u64 font_zt[5] = {'font_zt1', 'font_zt2', 'font_zt3', 'font_zt4', 'font_zt5'};
static const u64 font_zt[5] = {MULTI_CHAR('font_zt1'), MULTI_CHAR('font_zt2'), MULTI_CHAR('font_zt3'), MULTI_CHAR('font_zt4'), MULTI_CHAR('font_zt5')};
#define setZButtonString_font_zt font_zt
#endif
if (param_0 == 0 || !isWarpAccept()) {
@@ -2678,10 +2678,10 @@ void dMenu_Fmap2DTop_c::setZButtonString(u32 param_0, u8 i_alpha) {
void dMenu_Fmap2DTop_c::setBButtonString(u32 param_0, u8 i_alpha) {
#if VERSION == VERSION_GCN_JPN
static const u64 cont_bt[5] = {'cont_bt1', 'cont_bt2', 'cont_bt3', 'cont_bt4', 'cont_bt'};
static const u64 cont_bt[5] = {MULTI_CHAR('cont_bt1'), MULTI_CHAR('cont_bt2'), MULTI_CHAR('cont_bt3'), MULTI_CHAR('cont_bt4'), MULTI_CHAR('cont_bt')};
#define setBButtonString_font_bt cont_bt
#else
static const u64 font_bt[5] = {'font_bt1', 'font_bt2', 'font_bt3', 'font_bt4', 'font_bt5'};
static const u64 font_bt[5] = {MULTI_CHAR('font_bt1'), MULTI_CHAR('font_bt2'), MULTI_CHAR('font_bt3'), MULTI_CHAR('font_bt4'), MULTI_CHAR('font_bt5')};
#define setBButtonString_font_bt font_bt
#endif
if (param_0 == 0) {
@@ -2704,10 +2704,10 @@ void dMenu_Fmap2DTop_c::setBButtonString(u32 param_0, u8 i_alpha) {
void dMenu_Fmap2DTop_c::setAButtonString(u32 param_0, u8 i_alpha) {
#if VERSION == VERSION_GCN_JPN
static const u64 cont_at[5] = {'cont_at', 'cont_at1', 'cont_at2', 'cont_at3', 'cont_at4'};
static const u64 cont_at[5] = {MULTI_CHAR('cont_at'), MULTI_CHAR('cont_at1'), MULTI_CHAR('cont_at2'), MULTI_CHAR('cont_at3'), MULTI_CHAR('cont_at4')};
#define setAButtonString_font_at cont_at
#else
static const u64 font_at[5] = {'font_at1', 'font_at2', 'font_at3', 'font_at4', 'font_at5'};
static const u64 font_at[5] = {MULTI_CHAR('font_at1'), MULTI_CHAR('font_at2'), MULTI_CHAR('font_at3'), MULTI_CHAR('font_at4'), MULTI_CHAR('font_at5')};
#define setAButtonString_font_at font_at
#endif
if (param_0 == 0) {
@@ -2731,23 +2731,23 @@ void dMenu_Fmap2DTop_c::setAButtonString(u32 param_0, u8 i_alpha) {
void dMenu_Fmap2DTop_c::setCrossLRString(u32 param_0) {
#if PLATFORM_GCN || (VERSION == VERSION_SHIELD)
#if VERSION == VERSION_GCN_JPN
static const u64 juji_c[5] = {'juji_c00', 'juji_c01', 'juji_c02', 'juji_c03', 'juji_c04'};
static const u64 juji_c[5] = {MULTI_CHAR('juji_c00'), MULTI_CHAR('juji_c01'), MULTI_CHAR('juji_c02'), MULTI_CHAR('juji_c03'), MULTI_CHAR('juji_c04')};
#else
static const u64 juji_c[5] = {'fuji_c00', 'fuji_c01', 'fuji_c02', 'fuji_c03', 'fuji_c04'};
static const u64 juji_c[5] = {MULTI_CHAR('fuji_c00'), MULTI_CHAR('fuji_c01'), MULTI_CHAR('fuji_c02'), MULTI_CHAR('fuji_c03'), MULTI_CHAR('fuji_c04')};
#endif
if (param_0 == 0) {
for (int i = 0; i < 5; i++) {
J2DTextBox* text_box = static_cast<J2DTextBox*>(mpTitleScreen->search(juji_c[i]));
strcpy(text_box->getStringPtr(), "");
}
mpTitleScreen->search('juy_sha0')->show();
mpTitleScreen->search(MULTI_CHAR('juy_sha0'))->show();
mAlphaDpad = 1;
} else {
for (int i = 0; i < 5; i++) {
J2DTextBox* text_box = static_cast<J2DTextBox*>(mpTitleScreen->search(juji_c[i]));
dMeter2Info_getStringKanji(param_0, text_box->getStringPtr(), NULL);
}
mpTitleScreen->search('juy_sha0')->show();
mpTitleScreen->search(MULTI_CHAR('juy_sha0'))->show();
mAlphaDpad = 2;
}
#endif
@@ -2756,23 +2756,23 @@ void dMenu_Fmap2DTop_c::setCrossLRString(u32 param_0) {
void dMenu_Fmap2DTop_c::set3DStickString(u32 param_0) {
#if PLATFORM_GCN || (VERSION == VERSION_SHIELD)
#if VERSION == VERSION_GCN_JPN
static const u64 ast_c[5] = {'ast_00', 'ast_01', 'ast_02', 'ast_03', 'ast_04'};
static const u64 ast_c[5] = {MULTI_CHAR('ast_00'), MULTI_CHAR('ast_01'), MULTI_CHAR('ast_02'), MULTI_CHAR('ast_03'), MULTI_CHAR('ast_04')};
#else
static const u64 ast_c[5] = {'fst_00', 'fst_01', 'fst_02', 'fst_03', 'fst_04'};
static const u64 ast_c[5] = {MULTI_CHAR('fst_00'), MULTI_CHAR('fst_01'), MULTI_CHAR('fst_02'), MULTI_CHAR('fst_03'), MULTI_CHAR('fst_04')};
#endif
if (param_0 == 0) {
for (int i = 0; i < 5; i++) {
J2DTextBox* text_box = static_cast<J2DTextBox*>(mpTitleScreen->search(ast_c[i]));
strcpy(text_box->getStringPtr(), "");
}
mpTitleScreen->search('as_sha0')->show();
mpTitleScreen->search(MULTI_CHAR('as_sha0'))->show();
mAlphaAnalogStick = 1;
} else {
for (int i = 0; i < 5; i++) {
J2DTextBox* text_box = static_cast<J2DTextBox*>(mpTitleScreen->search(ast_c[i]));
dMeter2Info_getStringKanji(param_0, text_box->getStringPtr(), NULL);
}
mpTitleScreen->search('as_sha0')->show();
mpTitleScreen->search(MULTI_CHAR('as_sha0'))->show();
mAlphaAnalogStick = 2;
}
#endif
src/d/d_menu_insect.cpp
+27 -27
View File
@@ -441,20 +441,20 @@ void dMenu_Insect_c::explain_close_move() {
void dMenu_Insect_c::screenSetBase() {
static const u64 insect_tag[MAX_INSECT_NUM] = {
'ari_os', 'ari_ms', 'kag_os', 'kag_ms', 'kab_os', 'kab_ms', 'kam_os', 'kam_mes',
'kuwa_os', 'kuwa_mes', 'dan_os', 'dan_mes', 'cho_os', 'cho_ms', 'tent_os', 'tent_mes',
'kata_os', 'kata_mes', 'nana_os', 'nana_mes', 'bat_os', 'bat_mes', 'tonb_os', 'tonb_mes',
MULTI_CHAR('ari_os'), MULTI_CHAR('ari_ms'), MULTI_CHAR('kag_os'), MULTI_CHAR('kag_ms'), MULTI_CHAR('kab_os'), MULTI_CHAR('kab_ms'), MULTI_CHAR('kam_os'), MULTI_CHAR('kam_mes'),
MULTI_CHAR('kuwa_os'), MULTI_CHAR('kuwa_mes'), MULTI_CHAR('dan_os'), MULTI_CHAR('dan_mes'), MULTI_CHAR('cho_os'), MULTI_CHAR('cho_ms'), MULTI_CHAR('tent_os'), MULTI_CHAR('tent_mes'),
MULTI_CHAR('kata_os'), MULTI_CHAR('kata_mes'), MULTI_CHAR('nana_os'), MULTI_CHAR('nana_mes'), MULTI_CHAR('bat_os'), MULTI_CHAR('bat_mes'), MULTI_CHAR('tonb_os'), MULTI_CHAR('tonb_mes'),
};
static const u64 ageha_tag[MAX_INSECT_NUM] = {
'ageha00', 'ageha01', 'ageha02', 'ageha03', 'ageha04', 'ageha05', 'ageha06', 'ageha07',
'ageha08', 'ageha09', 'ageha10', 'ageha11', 'ageha12', 'ageha13', 'ageha14', 'ageha15',
'ageha16', 'ageha17', 'ageha18', 'ageha19', 'ageha20', 'ageha21', 'ageha22', 'ageha23',
MULTI_CHAR('ageha00'), MULTI_CHAR('ageha01'), MULTI_CHAR('ageha02'), MULTI_CHAR('ageha03'), MULTI_CHAR('ageha04'), MULTI_CHAR('ageha05'), MULTI_CHAR('ageha06'), MULTI_CHAR('ageha07'),
MULTI_CHAR('ageha08'), MULTI_CHAR('ageha09'), MULTI_CHAR('ageha10'), MULTI_CHAR('ageha11'), MULTI_CHAR('ageha12'), MULTI_CHAR('ageha13'), MULTI_CHAR('ageha14'), MULTI_CHAR('ageha15'),
MULTI_CHAR('ageha16'), MULTI_CHAR('ageha17'), MULTI_CHAR('ageha18'), MULTI_CHAR('ageha19'), MULTI_CHAR('ageha20'), MULTI_CHAR('ageha21'), MULTI_CHAR('ageha22'), MULTI_CHAR('ageha23'),
};
mpScreen = new J2DScreen();
mpScreen->setPriority("zelda_gold_insects.blo", 0x20000, mpArchive);
dPaneClass_showNullPane(mpScreen);
mpParent = new CPaneMgr(mpScreen, 'n_all', 2, NULL);
mpParent = new CPaneMgr(mpScreen, MULTI_CHAR('n_all'), 2, NULL);
mpParent->setAlphaRate(0.0f);
for (int i = 0; i < MAX_INSECT_NUM; i++) {
mpINSParent[i] = new CPaneMgr(mpScreen, insect_tag[i], 0, NULL);
@@ -475,11 +475,11 @@ void dMenu_Insect_c::screenSetBase() {
}
}
#if VERSION == VERSION_GCN_JPN
J2DTextBox* textBox = (J2DTextBox*)mpScreen->search('t_t00');
mpScreen->search('f_t00')->hide();
J2DTextBox* textBox = (J2DTextBox*)mpScreen->search(MULTI_CHAR('t_t00'));
mpScreen->search(MULTI_CHAR('f_t00'))->hide();
#else
J2DTextBox* textBox = (J2DTextBox*)mpScreen->search('f_t00');
mpScreen->search('t_t00')->hide();
J2DTextBox* textBox = (J2DTextBox*)mpScreen->search(MULTI_CHAR('f_t00'));
mpScreen->search(MULTI_CHAR('t_t00'))->hide();
#endif
textBox->setFont(mDoExt_getSubFont());
textBox->setString(0x200, "");
@@ -490,27 +490,27 @@ void dMenu_Insect_c::screenSetExplain() {
mpExpScreen = new J2DScreen();
mpExpScreen->setPriority("zelda_gold_insects_info.blo", 0x20000, mpArchive);
dPaneClass_showNullPane(mpExpScreen);
mpExpParent = new CPaneMgr(mpExpScreen, 'n_all', 2, NULL);
mpExpParent = new CPaneMgr(mpExpScreen, MULTI_CHAR('n_all'), 2, NULL);
mpExpParent->setAlphaRate(0.0f);
mpExpSubWin[0] = new CPaneMgr(mpExpScreen, 'in_win_n', 0, NULL);
mpExpSubWin[1] = new CPaneMgr(mpExpScreen, 'w_d_mo_n', 0, NULL);
mpExpSubWin[0] = new CPaneMgr(mpExpScreen, MULTI_CHAR('in_win_n'), 0, NULL);
mpExpSubWin[1] = new CPaneMgr(mpExpScreen, MULTI_CHAR('w_d_mo_n'), 0, NULL);
if (field_0xf6 == 0) {
mpExpSubWin[1]->hide();
}
#if VERSION == VERSION_GCN_JPN
mpInfoText = new CPaneMgr(mpExpScreen, 'mg_3line', 0, NULL);
mpExpScreen->search('n_e4line')->hide();
field_0x5c = (J2DTextBox*)mpExpScreen->search('w_msg_jp');
mpExpScreen->search('ms_for_2')->hide();
mpInfoText = new CPaneMgr(mpExpScreen, MULTI_CHAR('mg_3line'), 0, NULL);
mpExpScreen->search(MULTI_CHAR('n_e4line'))->hide();
field_0x5c = (J2DTextBox*)mpExpScreen->search(MULTI_CHAR('w_msg_jp'));
mpExpScreen->search(MULTI_CHAR('ms_for_2'))->hide();
#else
mpInfoText = new CPaneMgr(mpExpScreen, 'mg_e4lin', 0, NULL);
mpExpScreen->search('n_3line')->hide();
field_0x5c = (J2DTextBox*)mpExpScreen->search('ms_for_2');
mpExpScreen->search('w_msg_jp')->hide();
mpInfoText = new CPaneMgr(mpExpScreen, MULTI_CHAR('mg_e4lin'), 0, NULL);
mpExpScreen->search(MULTI_CHAR('n_3line'))->hide();
field_0x5c = (J2DTextBox*)mpExpScreen->search(MULTI_CHAR('ms_for_2'));
mpExpScreen->search(MULTI_CHAR('w_msg_jp'))->hide();
#endif
mpExpScreen->search('ms_for_3')->hide();
field_0x54[0] = (J2DPicture*)mpExpScreen->search('insects');
field_0x54[1] = (J2DPicture*)mpExpScreen->search('insectss');
mpExpScreen->search(MULTI_CHAR('ms_for_3'))->hide();
field_0x54[0] = (J2DPicture*)mpExpScreen->search(MULTI_CHAR('insects'));
field_0x54[1] = (J2DPicture*)mpExpScreen->search(MULTI_CHAR('insectss'));
J2DTextBox* textBox = (J2DTextBox*)mpInfoText->getPanePtr();
textBox->setFont(mDoExt_getMesgFont());
J2DTextBox* textBox2 = (J2DTextBox*)mpInfoText->getPanePtr();
@@ -521,10 +521,10 @@ void dMenu_Insect_c::screenSetExplain() {
void dMenu_Insect_c::screenSetDoIcon() {
static const u64 text_a_tag[5] = {
'atext1_1', 'atext1_2', 'atext1_3', 'atext1_4', 'atext1_5',
MULTI_CHAR('atext1_1'), MULTI_CHAR('atext1_2'), MULTI_CHAR('atext1_3'), MULTI_CHAR('atext1_4'), MULTI_CHAR('atext1_5'),
};
static const u64 text_b_tag[5] = {
'btext1_1', 'btext1_2', 'btext1_3', 'btext1_4', 'btext1_5',
MULTI_CHAR('btext1_1'), MULTI_CHAR('btext1_2'), MULTI_CHAR('btext1_3'), MULTI_CHAR('btext1_4'), MULTI_CHAR('btext1_5'),
};
mpIconScreen = new J2DScreen();
src/d/d_menu_item_explain.cpp
+22 -22
View File
@@ -42,17 +42,17 @@ static moveFunc move_process[] = {
dMenu_ItemExplain_c::dMenu_ItemExplain_c(JKRExpHeap* i_heap, JKRArchive* i_archive,
STControl* i_stick, bool param_3) {
static const u64 name_tag[4] = {
'item_n04',
'item_n05',
'item_n06',
'item_n07',
MULTI_CHAR('item_n04'),
MULTI_CHAR('item_n05'),
MULTI_CHAR('item_n06'),
MULTI_CHAR('item_n07'),
};
static const u64 fame_tag[4] = {
'f_item_1',
'f_item_2',
'f_item_3',
'f_item_4',
MULTI_CHAR('f_item_1'),
MULTI_CHAR('f_item_2'),
MULTI_CHAR('f_item_3'),
MULTI_CHAR('f_item_4'),
};
mpHeap = i_heap;
@@ -97,18 +97,18 @@ dMenu_ItemExplain_c::dMenu_ItemExplain_c(JKRExpHeap* i_heap, JKRArchive* i_archi
mpKanteraMeter = new dKantera_icon_c();
mpInfoScreen = new J2DScreen();
mpInfoScreen->setPriority("zelda_item_screen_info.blo", 0x20000, mpArchive);
mpParent[0] = new CPaneMgr(mpInfoScreen, 'n_all', 2, NULL);
mpParent[0] = new CPaneMgr(mpInfoScreen, MULTI_CHAR('n_all'), 2, NULL);
mpParent[1] = NULL;
mpLabel = new CPaneMgr(mpInfoScreen, 'label_n', 0, NULL);
mpLabel = new CPaneMgr(mpInfoScreen, MULTI_CHAR('label_n'), 0, NULL);
mDescAlpha = 0.0f;
field_0x78 = 0;
mAlphaRatio = 201.0f;
#if VERSION == VERSION_GCN_JPN
mpInfoText = new CPaneMgr(mpInfoScreen, 'i_text4', 0, NULL);
mpInfoScreen->search('i_text1')->hide();
mpInfoText = new CPaneMgr(mpInfoScreen, MULTI_CHAR('i_text4'), 0, NULL);
mpInfoScreen->search(MULTI_CHAR('i_text1'))->hide();
#else
mpInfoText = new CPaneMgr(mpInfoScreen, 'i_text1', 0, NULL);
mpInfoScreen->search('i_text4')->hide();
mpInfoText = new CPaneMgr(mpInfoScreen, MULTI_CHAR('i_text1'), 0, NULL);
mpInfoScreen->search(MULTI_CHAR('i_text4'))->hide();
#endif
((J2DTextBox*)(mpInfoText->getPanePtr()))->setFont(mDoExt_getMesgFont());
((J2DTextBox*)(mpInfoText->getPanePtr()))->setString(0x200, "");
@@ -124,25 +124,25 @@ dMenu_ItemExplain_c::dMenu_ItemExplain_c(JKRExpHeap* i_heap, JKRArchive* i_archi
((J2DTextBox*)(mpNameText[i]->getPanePtr()))->setFont(mDoExt_getMesgFont());
((J2DTextBox*)(mpNameText[i]->getPanePtr()))->setString(0x20, "");
}
mpInfoIcon = new CPaneMgr(mpInfoScreen, 'i_icon_p', 0, NULL);
mpInfoIcon = new CPaneMgr(mpInfoScreen, MULTI_CHAR('i_icon_p'), 0, NULL);
for (int i = 0; i < 4; i++) {
mpExpItemTex[i] = (ResTIMG*)mpHeap->alloc(0xC00, 0x20);
}
mpExpItemPane[0] = new J2DPicture(
'i_icon_1',
MULTI_CHAR('i_icon_1'),
JGeometry::TBox2<f32>(0.0f, 0.0f, mpInfoIcon->getInitSizeX(), mpInfoIcon->getInitSizeY()),
((J2DPicture*)(mpInfoIcon->getPanePtr()))->getTexture(0)->getTexInfo(), NULL);
mpExpItemPane[0]->setBasePosition(J2DBasePosition_4);
mpInfoIcon->getPanePtr()->appendChild(mpExpItemPane[0]);
mpExpItemPane[1] = new J2DPicture(
'i_icon_2',
MULTI_CHAR('i_icon_2'),
JGeometry::TBox2<f32>(0.0f, 0.0f, mpInfoIcon->getInitSizeX(), mpInfoIcon->getInitSizeY()),
((J2DPicture*)(mpInfoIcon->getPanePtr()))->getTexture(0)->getTexInfo(), NULL);
mpExpItemPane[1]->setBasePosition(J2DBasePosition_4);
mpInfoIcon->getPanePtr()->appendChild(mpExpItemPane[1]);
mpExpItemPane[2] = new J2DPicture(
'i_icon_3',
MULTI_CHAR('i_icon_3'),
JGeometry::TBox2<f32>(0.0f, 0.0f, mpInfoIcon->getInitSizeX(), mpInfoIcon->getInitSizeY()),
((J2DPicture*)(mpInfoIcon->getPanePtr()))->getTexture(0)->getTexInfo(), NULL);
mpExpItemPane[2]->setBasePosition(J2DBasePosition_4);
@@ -152,7 +152,7 @@ dMenu_ItemExplain_c::dMenu_ItemExplain_c(JKRExpHeap* i_heap, JKRArchive* i_archi
'TIMG', dMeter2Info_getNumberTextureName(0));
for (int i = 0; i < 3; i++) {
mpItemNumTex[i] = new J2DPicture(texResource);
mpInfoScreen->search('info_n1')->appendChild(mpItemNumTex[i]);
mpInfoScreen->search(MULTI_CHAR('info_n1'))->appendChild(mpItemNumTex[i]);
mpItemNumTex[i]->move(i * 16.0f + (mpInfoIcon->getPosX() + mpInfoIcon->getSizeX() * 0.5f),
mpInfoIcon->getPosY() + mpInfoIcon->getSizeY() - 3.0f);
mpItemNumTex[i]->resize(16.0f, 16.0f);
@@ -290,7 +290,7 @@ void dMenu_ItemExplain_c::move() {
if (status != mStatus) {
(this->*init_process[mStatus])();
}
if (mStatus != NULL) {
if (mStatus != 0) {
mpInfoScreen->animation();
}
if (g_ringHIO.mItemDescAlpha != mDescAlpha) {
@@ -396,7 +396,7 @@ void dMenu_ItemExplain_c::open_init() {
}
}
setNumber();
mpInfoScreen->search('i_i_back')->show();
mpInfoScreen->search(MULTI_CHAR('i_i_back'))->show();
field_0xe6 = 0;
} else {
mpInfoIcon->hide();
@@ -404,7 +404,7 @@ void dMenu_ItemExplain_c::open_init() {
mpExpItemPane[i]->hide();
}
setNumber();
mpInfoScreen->search('i_i_back')->hide();
mpInfoScreen->search(MULTI_CHAR('i_i_back'))->hide();
field_0xe6 = 1;
}
if (mpArrow != NULL) {
src/d/d_menu_letter.cpp
+95 -95
View File
@@ -429,11 +429,11 @@ void dMenu_Letter_c::wait_move() {
if (mProcess == 1 || mProcess == 2) {
#if VERSION == VERSION_GCN_JPN
J2DTextBox* textBox = (J2DTextBox*)mpBaseScreen->search('t_t00');
mpBaseScreen->search('f_t_00')->hide();
J2DTextBox* textBox = (J2DTextBox*)mpBaseScreen->search(MULTI_CHAR('t_t00'));
mpBaseScreen->search(MULTI_CHAR('f_t_00'))->hide();
#else
J2DTextBox* textBox = (J2DTextBox*)mpBaseScreen->search('f_t_00');
mpBaseScreen->search('t_t00')->hide();
J2DTextBox* textBox = (J2DTextBox*)mpBaseScreen->search(MULTI_CHAR('f_t_00'));
mpBaseScreen->search(MULTI_CHAR('t_t00'))->hide();
#endif
dComIfGp_setMessageCountNumber(field_0x374 + (field_0x36f + 1) * 100);
mpString->getString(0x4d6, textBox, NULL, NULL, NULL, 0);
@@ -492,7 +492,7 @@ void dMenu_Letter_c::read_open_init() {
}
J2DTextBox* text2 = (J2DTextBox*)field_0x2ec[i]->getPanePtr();
mpString->getStringPage(dMenu_Letter::getLetterText(idx), field_0x3e3 - 1, LINE_MAX, text2, text1,
NULL, NULL, NULL);
0, NULL, NULL);
}
field_0x3e2 = mpString->getPageMax(LINE_MAX);
if (field_0x3e2 > 1) {
@@ -551,7 +551,7 @@ void dMenu_Letter_c::read_move_init() {
setBButtonString(0x3f9);
}
CPaneMgr paneMgr;
J2DPane* pane = mpLetterScreen[0]->search('set_ya_n');
J2DPane* pane = mpLetterScreen[0]->search(MULTI_CHAR('set_ya_n'));
Vec pos = paneMgr.getGlobalVtxCenter(pane, false, 0);
mpArrow->setPos(pos.x, pos.y);
} else {
@@ -592,7 +592,7 @@ void dMenu_Letter_c::read_move_move() {
mpArrow->arwAnimeMove();
}
CPaneMgr paneMgr;
J2DPane* pane = mpLetterScreen[0]->search('set_ya_n');
J2DPane* pane = mpLetterScreen[0]->search(MULTI_CHAR('set_ya_n'));
Vec pos = paneMgr.getGlobalVtxCenter(pane, false, 0);
mpArrow->setPos(pos.x, pos.y);
}
@@ -642,7 +642,7 @@ void dMenu_Letter_c::read_next_fadein_init() {
text1 = (J2DTextBox*)field_0x2f4[i]->getPanePtr();
}
J2DTextBox* text2 = (J2DTextBox*)field_0x2ec[i]->getPanePtr();
mpString->getStringPage(dMenu_Letter::getLetterText(idx), field_0x3e3 - 1, LINE_MAX, text2, text1, NULL, NULL, NULL);
mpString->getStringPage(dMenu_Letter::getLetterText(idx), field_0x3e3 - 1, LINE_MAX, text2, text1, 0, NULL, NULL);
}
char acStack_30[10];
sprintf(acStack_30, "%d/%d", field_0x3e3, field_0x3e2);
@@ -705,51 +705,51 @@ void dMenu_Letter_c::read_close_move() {
void dMenu_Letter_c::screenSetMenu() {
static const u64 tag_sub0[6] = {
'menu_t0s', 'menu_t1s', 'menu_t2s', 'menu_t3s', 'menu_t4s', 'menu_t5s',
MULTI_CHAR('menu_t0s'), MULTI_CHAR('menu_t1s'), MULTI_CHAR('menu_t2s'), MULTI_CHAR('menu_t3s'), MULTI_CHAR('menu_t4s'), MULTI_CHAR('menu_t5s'),
};
static const u64 tag_sub1[6] = {
'menu_t0', 'menu_t1', 'menu_t2', 'menu_t3', 'menu_t4', 'menu_t5',
MULTI_CHAR('menu_t0'), MULTI_CHAR('menu_t1'), MULTI_CHAR('menu_t2'), MULTI_CHAR('menu_t3'), MULTI_CHAR('menu_t4'), MULTI_CHAR('menu_t5'),
};
static const u64 tag_name0[6] = {
'menu_t6s', 'menu_f7s', 'menu_f8s', 'menu_t9s', 'menu_10s', 'menu_11s',
MULTI_CHAR('menu_t6s'), MULTI_CHAR('menu_f7s'), MULTI_CHAR('menu_f8s'), MULTI_CHAR('menu_t9s'), MULTI_CHAR('menu_10s'), MULTI_CHAR('menu_11s'),
};
static const u64 tag_name1[6] = {
'menu_f6', 'menu_f7', 'menu_t8', 'menu_t9', 'menu_t10', 'menu_t11',
MULTI_CHAR('menu_f6'), MULTI_CHAR('menu_f7'), MULTI_CHAR('menu_t8'), MULTI_CHAR('menu_t9'), MULTI_CHAR('menu_t10'), MULTI_CHAR('menu_t11'),
};
static const u64 ftag_sub0[6] = {
'fenu_t0s', 'fenu_t1s', 'fenu_t2s', 'fenu_t3s', 'fenu_t4s', 'fenu_t5s',
MULTI_CHAR('fenu_t0s'), MULTI_CHAR('fenu_t1s'), MULTI_CHAR('fenu_t2s'), MULTI_CHAR('fenu_t3s'), MULTI_CHAR('fenu_t4s'), MULTI_CHAR('fenu_t5s'),
};
static const u64 ftag_sub1[6] = {
'fenu_t0', 'fenu_t1', 'fenu_t2', 'fenu_t3', 'fenu_t4', 'fenu_t5',
MULTI_CHAR('fenu_t0'), MULTI_CHAR('fenu_t1'), MULTI_CHAR('fenu_t2'), MULTI_CHAR('fenu_t3'), MULTI_CHAR('fenu_t4'), MULTI_CHAR('fenu_t5'),
};
static const u64 ftag_name0[6] = {
'fenu_t6s', 'fenu_t7s', 'fenu_f8s', 'fenu_t9s', 'fenu_10s', 'fenu_11s',
MULTI_CHAR('fenu_t6s'), MULTI_CHAR('fenu_t7s'), MULTI_CHAR('fenu_f8s'), MULTI_CHAR('fenu_t9s'), MULTI_CHAR('fenu_10s'), MULTI_CHAR('fenu_11s'),
};
static const u64 ftag_name1[6] = {
'fenu_t6', 'fenu_t7', 'fenu_t8', 'fenu_t9', 'fenu_t10', 'fenu_t11',
MULTI_CHAR('fenu_t6'), MULTI_CHAR('fenu_t7'), MULTI_CHAR('fenu_t8'), MULTI_CHAR('fenu_t9'), MULTI_CHAR('fenu_t10'), MULTI_CHAR('fenu_t11'),
};
static const u64 tag_letter[6] = {
'let_00_n', 'let_01_n', 'let_02_n', 'let_03_n', 'let_04_n', 'let_05_n',
MULTI_CHAR('let_00_n'), MULTI_CHAR('let_01_n'), MULTI_CHAR('let_02_n'), MULTI_CHAR('let_03_n'), MULTI_CHAR('let_04_n'), MULTI_CHAR('let_05_n'),
};
static const u64 tag_frame[6] = {
'flame_00', 'flame_01', 'flame_02', 'flame_03', 'flame_04', 'flame_05',
MULTI_CHAR('flame_00'), MULTI_CHAR('flame_01'), MULTI_CHAR('flame_02'), MULTI_CHAR('flame_03'), MULTI_CHAR('flame_04'), MULTI_CHAR('flame_05'),
};
static const u64 tag_menu0[6] = {
#if VERSION == VERSION_GCN_JPN
'menu_t0', 'menu_t1', 'menu_t2', 'menu_t3', 'menu_t4', 'menu_t5',
MULTI_CHAR('menu_t0'), MULTI_CHAR('menu_t1'), MULTI_CHAR('menu_t2'), MULTI_CHAR('menu_t3'), MULTI_CHAR('menu_t4'), MULTI_CHAR('menu_t5'),
#else
'fenu_t0', 'fenu_t1', 'fenu_t2', 'fenu_t3', 'fenu_t4', 'fenu_t5',
MULTI_CHAR('fenu_t0'), MULTI_CHAR('fenu_t1'), MULTI_CHAR('fenu_t2'), MULTI_CHAR('fenu_t3'), MULTI_CHAR('fenu_t4'), MULTI_CHAR('fenu_t5'),
#endif
};
static const u64 tag_menu1[6] = {
#if VERSION == VERSION_GCN_JPN
'menu_f6', 'menu_f7', 'menu_t8', 'menu_t9', 'menu_t10', 'menu_t11',
MULTI_CHAR('menu_f6'), MULTI_CHAR('menu_f7'), MULTI_CHAR('menu_t8'), MULTI_CHAR('menu_t9'), MULTI_CHAR('menu_t10'), MULTI_CHAR('menu_t11'),
#else
'fenu_t6', 'fenu_t7', 'fenu_t8', 'fenu_t9', 'fenu_t10', 'fenu_t11',
MULTI_CHAR('fenu_t6'), MULTI_CHAR('fenu_t7'), MULTI_CHAR('fenu_t8'), MULTI_CHAR('fenu_t9'), MULTI_CHAR('fenu_t10'), MULTI_CHAR('fenu_t11'),
#endif
};
static const u64 tag_midoku[6] = {
'midoku_0', 'midoku_1', 'midoku_2', 'midoku_3', 'midoku_4', 'midoku_5',
MULTI_CHAR('midoku_0'), MULTI_CHAR('midoku_1'), MULTI_CHAR('midoku_2'), MULTI_CHAR('midoku_3'), MULTI_CHAR('midoku_4'), MULTI_CHAR('midoku_5'),
};
mpMenuScreen = new J2DScreen();
@@ -757,7 +757,7 @@ void dMenu_Letter_c::screenSetMenu() {
bool fg = mpMenuScreen->setPriority("zelda_letter_select_6menu.blo", 0x20000, mpArchive);
JUT_ASSERT(1156, fg != false);
dPaneClass_showNullPane(mpMenuScreen);
mpParent[0] = new CPaneMgr(mpMenuScreen, 'n_all', 2, NULL);
mpParent[0] = new CPaneMgr(mpMenuScreen, MULTI_CHAR('n_all'), 2, NULL);
JUT_ASSERT(1161, mpParent[0] != NULL);
mpParent[0]->setAlphaRate(0.0f);
for (int i = 0; i < 6; i++) {
@@ -829,7 +829,7 @@ void dMenu_Letter_c::screenSetMenu() {
fg = mpMenuDMYScreen->setPriority("zelda_letter_select_6menu.blo", 0x20000, mpArchive);
JUT_ASSERT(1280, fg != false);
dPaneClass_showNullPane(mpMenuDMYScreen);
mpDMYParent = new CPaneMgr(mpMenuDMYScreen, 'n_all', 2, NULL);
mpDMYParent = new CPaneMgr(mpMenuDMYScreen, MULTI_CHAR('n_all'), 2, NULL);
JUT_ASSERT(1285, mpDMYParent != NULL);
for (int i = 0; i < 6; i++) {
#if VERSION == VERSION_GCN_JPN
@@ -867,15 +867,15 @@ void dMenu_Letter_c::screenSetMenu() {
void dMenu_Letter_c::screenSetBase() {
static const u64 tag_pip[9] = {
'pi_00_n', 'pi_01_n', 'pi_02_n', 'pi_03_n', 'pi_04_n',
'pi_05_n', 'pi_06_n', 'pi_07_n', 'pi_08_n',
MULTI_CHAR('pi_00_n'), MULTI_CHAR('pi_01_n'), MULTI_CHAR('pi_02_n'), MULTI_CHAR('pi_03_n'), MULTI_CHAR('pi_04_n'),
MULTI_CHAR('pi_05_n'), MULTI_CHAR('pi_06_n'), MULTI_CHAR('pi_07_n'), MULTI_CHAR('pi_08_n'),
};
static const u64 tag_pil[9] = {
'pi_l_00', 'pi_l_01', 'pi_l_02', 'pi_l_03', 'pi_l_04',
'pi_l_05', 'pi_l_06', 'pi_l_07', 'pi_l_08',
MULTI_CHAR('pi_l_00'), MULTI_CHAR('pi_l_01'), MULTI_CHAR('pi_l_02'), MULTI_CHAR('pi_l_03'), MULTI_CHAR('pi_l_04'),
MULTI_CHAR('pi_l_05'), MULTI_CHAR('pi_l_06'), MULTI_CHAR('pi_l_07'), MULTI_CHAR('pi_l_08'),
};
static const u64 tag_pii[9] = {
'pi_00', 'pi_01', 'pi_02', 'pi_03', 'pi_04', 'pi_05', 'pi_06', 'pi_07', 'pi_08',
MULTI_CHAR('pi_00'), MULTI_CHAR('pi_01'), MULTI_CHAR('pi_02'), MULTI_CHAR('pi_03'), MULTI_CHAR('pi_04'), MULTI_CHAR('pi_05'), MULTI_CHAR('pi_06'), MULTI_CHAR('pi_07'), MULTI_CHAR('pi_08'),
};
mpBaseScreen = new J2DScreen();
@@ -883,39 +883,39 @@ void dMenu_Letter_c::screenSetBase() {
bool fg = mpBaseScreen->setPriority("zelda_letter_select_base.blo", 0x20000, mpArchive);
JUT_ASSERT(1361, fg != false);
dPaneClass_showNullPane(mpBaseScreen);
mpBaseScreen->search('wi_btn_n')->hide();
mpParent[1] = new CPaneMgr(mpBaseScreen, 'n_all', 2, NULL);
mpBaseScreen->search(MULTI_CHAR('wi_btn_n'))->hide();
mpParent[1] = new CPaneMgr(mpBaseScreen, MULTI_CHAR('n_all'), 2, NULL);
JUT_ASSERT(1372, mpParent[1] != NULL);
mpParent[1]->setAlphaRate(0.0f);
#if VERSION == VERSION_GCN_JPN
J2DTextBox* piVar9 = (J2DTextBox*)mpBaseScreen->search('t_t00');
mpBaseScreen->search('f_t_00')->hide();
J2DTextBox* piVar9 = (J2DTextBox*)mpBaseScreen->search(MULTI_CHAR('t_t00'));
mpBaseScreen->search(MULTI_CHAR('f_t_00'))->hide();
#else
J2DTextBox* piVar9 = (J2DTextBox*)mpBaseScreen->search('f_t_00');
mpBaseScreen->search('t_t00')->hide();
J2DTextBox* piVar9 = (J2DTextBox*)mpBaseScreen->search(MULTI_CHAR('f_t_00'));
mpBaseScreen->search(MULTI_CHAR('t_t00'))->hide();
#endif
piVar9->setString(0x40, "");
piVar9->setFont(mDoExt_getSubFont());
dComIfGp_setMessageCountNumber(field_0x374 + (field_0x36f + 1) * 100);
mpString->getString(0x4d6, piVar9, NULL, NULL, NULL, 0);
#if VERSION == VERSION_GCN_JPN
J2DTextBox* text1 = (J2DTextBox*)mpBaseScreen->search('wps_text');
J2DTextBox* text2 = (J2DTextBox*)mpBaseScreen->search('w_p_text');
J2DTextBox* text3 = (J2DTextBox*)mpBaseScreen->search('g_ps_txt');
J2DTextBox* text4 = (J2DTextBox*)mpBaseScreen->search('g_p_text');
mpBaseScreen->search('fwpstex1')->hide();
mpBaseScreen->search('fwp_tex1')->hide();
mpBaseScreen->search('fgps_tx1')->hide();
mpBaseScreen->search('fgp_tex1')->hide();
J2DTextBox* text1 = (J2DTextBox*)mpBaseScreen->search(MULTI_CHAR('wps_text'));
J2DTextBox* text2 = (J2DTextBox*)mpBaseScreen->search(MULTI_CHAR('w_p_text'));
J2DTextBox* text3 = (J2DTextBox*)mpBaseScreen->search(MULTI_CHAR('g_ps_txt'));
J2DTextBox* text4 = (J2DTextBox*)mpBaseScreen->search(MULTI_CHAR('g_p_text'));
mpBaseScreen->search(MULTI_CHAR('fwpstex1'))->hide();
mpBaseScreen->search(MULTI_CHAR('fwp_tex1'))->hide();
mpBaseScreen->search(MULTI_CHAR('fgps_tx1'))->hide();
mpBaseScreen->search(MULTI_CHAR('fgp_tex1'))->hide();
#else
J2DTextBox* text1 = (J2DTextBox*)mpBaseScreen->search('fwpstex1');
J2DTextBox* text2 = (J2DTextBox*)mpBaseScreen->search('fwp_tex1');
J2DTextBox* text3 = (J2DTextBox*)mpBaseScreen->search('fgps_tx1');
J2DTextBox* text4 = (J2DTextBox*)mpBaseScreen->search('fgp_tex1');
mpBaseScreen->search('wps_text')->hide();
mpBaseScreen->search('w_p_text')->hide();
mpBaseScreen->search('g_ps_txt')->hide();
mpBaseScreen->search('g_p_text')->hide();
J2DTextBox* text1 = (J2DTextBox*)mpBaseScreen->search(MULTI_CHAR('fwpstex1'));
J2DTextBox* text2 = (J2DTextBox*)mpBaseScreen->search(MULTI_CHAR('fwp_tex1'));
J2DTextBox* text3 = (J2DTextBox*)mpBaseScreen->search(MULTI_CHAR('fgps_tx1'));
J2DTextBox* text4 = (J2DTextBox*)mpBaseScreen->search(MULTI_CHAR('fgp_tex1'));
mpBaseScreen->search(MULTI_CHAR('wps_text'))->hide();
mpBaseScreen->search(MULTI_CHAR('w_p_text'))->hide();
mpBaseScreen->search(MULTI_CHAR('g_ps_txt'))->hide();
mpBaseScreen->search(MULTI_CHAR('g_p_text'))->hide();
#endif
text1->setString(0x40, "");
text2->setString(0x40, "");
@@ -929,16 +929,16 @@ void dMenu_Letter_c::screenSetBase() {
dMeter2Info_getStringKanji(0x4d7, text2->getStringPtr(), 0);
dMeter2Info_getStringKanji(0x4d7, text3->getStringPtr(), 0);
dMeter2Info_getStringKanji(0x4d7, text4->getStringPtr(), 0);
((J2DTextBox*)mpBaseScreen->search('pi_no_00'))->setFont(mDoExt_getMesgFont());
((J2DTextBox*)mpBaseScreen->search('pi_no_01'))->setFont(mDoExt_getMesgFont());
((J2DTextBox*)mpBaseScreen->search('pi_no_02'))->setFont(mDoExt_getMesgFont());
((J2DTextBox*)mpBaseScreen->search('pi_no_03'))->setFont(mDoExt_getMesgFont());
((J2DTextBox*)mpBaseScreen->search('pi_no_04'))->setFont(mDoExt_getMesgFont());
((J2DTextBox*)mpBaseScreen->search('pi_no_05'))->setFont(mDoExt_getMesgFont());
((J2DTextBox*)mpBaseScreen->search('pi_no_06'))->setFont(mDoExt_getMesgFont());
((J2DTextBox*)mpBaseScreen->search('pi_no_07'))->setFont(mDoExt_getMesgFont());
((J2DTextBox*)mpBaseScreen->search('pi_no_08'))->setFont(mDoExt_getMesgFont());
field_0x1ec = (J2DTextBox*)mpBaseScreen->search('let_area');
((J2DTextBox*)mpBaseScreen->search(MULTI_CHAR('pi_no_00')))->setFont(mDoExt_getMesgFont());
((J2DTextBox*)mpBaseScreen->search(MULTI_CHAR('pi_no_01')))->setFont(mDoExt_getMesgFont());
((J2DTextBox*)mpBaseScreen->search(MULTI_CHAR('pi_no_02')))->setFont(mDoExt_getMesgFont());
((J2DTextBox*)mpBaseScreen->search(MULTI_CHAR('pi_no_03')))->setFont(mDoExt_getMesgFont());
((J2DTextBox*)mpBaseScreen->search(MULTI_CHAR('pi_no_04')))->setFont(mDoExt_getMesgFont());
((J2DTextBox*)mpBaseScreen->search(MULTI_CHAR('pi_no_05')))->setFont(mDoExt_getMesgFont());
((J2DTextBox*)mpBaseScreen->search(MULTI_CHAR('pi_no_06')))->setFont(mDoExt_getMesgFont());
((J2DTextBox*)mpBaseScreen->search(MULTI_CHAR('pi_no_07')))->setFont(mDoExt_getMesgFont());
((J2DTextBox*)mpBaseScreen->search(MULTI_CHAR('pi_no_08')))->setFont(mDoExt_getMesgFont());
field_0x1ec = (J2DTextBox*)mpBaseScreen->search(MULTI_CHAR('let_area'));
for (int i = 0; i < 9; i++) {
field_0x1f0[i] = (J2DTextBox*)mpBaseScreen->search(tag_pip[i]);
if (field_0x374 > 1 && i < field_0x374) {
@@ -970,7 +970,7 @@ void dMenu_Letter_c::screenSetShadow() {
mpSdwScreen = new J2DScreen();
mpSdwScreen->setPriority("zelda_letter_select_shadow.blo", 0x20000, mpArchive);
dPaneClass_showNullPane(mpSdwScreen);
mpParent[2] = new CPaneMgr(mpSdwScreen, 'n_all', 2, NULL);
mpParent[2] = new CPaneMgr(mpSdwScreen, MULTI_CHAR('n_all'), 2, NULL);
mpParent[2]->setAlphaRate(0.0f);
}
@@ -983,20 +983,20 @@ void dMenu_Letter_c::screenSetLetter() {
#if VERSION == VERSION_GCN_JPN
if (dComIfGs_getOptRuby() == 0) {
field_0x2ec[0] = new CPaneMgr(mpLetterScreen[0], 't3f_s', 0, NULL);
field_0x2ec[1] = new CPaneMgr(mpLetterScreen[0], 'mg_3flin', 0, NULL);
field_0x2f4[0] = new CPaneMgr(mpLetterScreen[0], 'mg_3f_s', 0, NULL);
field_0x2f4[1] = new CPaneMgr(mpLetterScreen[0], 'mg_3f', 0, NULL);
field_0x2ec[0] = new CPaneMgr(mpLetterScreen[0], MULTI_CHAR('t3f_s'), 0, NULL);
field_0x2ec[1] = new CPaneMgr(mpLetterScreen[0], MULTI_CHAR('mg_3flin'), 0, NULL);
field_0x2f4[0] = new CPaneMgr(mpLetterScreen[0], MULTI_CHAR('mg_3f_s'), 0, NULL);
field_0x2f4[1] = new CPaneMgr(mpLetterScreen[0], MULTI_CHAR('mg_3f'), 0, NULL);
mpLetterScreen[0]->search('t4_s')->hide();
mpLetterScreen[0]->search('mg_e4lin')->hide();
mpLetterScreen[0]->search(MULTI_CHAR('mg_e4lin'))->hide();
mpLetterScreen[0]->search('t3_s')->hide();
mpLetterScreen[0]->search('mg_3line')->hide();
mpLineParent = new CPaneMgr(mpLetterScreen[0], 'jp_fri_n', 0, NULL);
mpLetterScreen[0]->search(MULTI_CHAR('mg_3line'))->hide();
mpLineParent = new CPaneMgr(mpLetterScreen[0], MULTI_CHAR('jp_fri_n'), 0, NULL);
JUT_ASSERT(1530, mpLineParent != NULL);
for (int i = 0; i < 12; i++) {
static u64 const line_tag[12] = {
'line00', 'line01', 'line02', 'line03', 'line04', 'line05',
'line06', 'line07', 'line08',
MULTI_CHAR('line00'), MULTI_CHAR('line01'), MULTI_CHAR('line02'), MULTI_CHAR('line03'), MULTI_CHAR('line04'), MULTI_CHAR('line05'),
MULTI_CHAR('line06'), MULTI_CHAR('line07'), MULTI_CHAR('line08'),
};
if (line_tag[i] != 0) {
@@ -1012,22 +1012,22 @@ void dMenu_Letter_c::screenSetLetter() {
((J2DTextBox*)field_0x2f4[1]->getPanePtr())->setLineSpace(((J2DTextBox*)field_0x2ec[1]->getPanePtr())->getLineSpace());
} else {
field_0x2ec[0] = new CPaneMgr(mpLetterScreen[0], 't3_s', 0, NULL);
field_0x2ec[1] = new CPaneMgr(mpLetterScreen[0], 'mg_3line', 0, NULL);
field_0x2ec[1] = new CPaneMgr(mpLetterScreen[0], MULTI_CHAR('mg_3line'), 0, NULL);
for (int i = 0; i < 2; i++) {
field_0x2f4[i] = NULL;
}
mpLetterScreen[0]->search('t4_s')->hide();
mpLetterScreen[0]->search('mg_e4lin')->hide();
mpLetterScreen[0]->search('t3f_s')->hide();
mpLetterScreen[0]->search('mg_3flin')->hide();
mpLetterScreen[0]->search('mg_3f_s')->hide();
mpLetterScreen[0]->search('mg_3f')->hide();
mpLetterScreen[0]->search(MULTI_CHAR('mg_e4lin'))->hide();
mpLetterScreen[0]->search(MULTI_CHAR('t3f_s'))->hide();
mpLetterScreen[0]->search(MULTI_CHAR('mg_3flin'))->hide();
mpLetterScreen[0]->search(MULTI_CHAR('mg_3f_s'))->hide();
mpLetterScreen[0]->search(MULTI_CHAR('mg_3f'))->hide();
mpLineParent = new CPaneMgr(mpLetterScreen[0], 'jp_n', 0, NULL);
JUT_ASSERT(1530, mpLineParent != NULL);
for (int i = 0; i < 12; i++) {
static u64 const line_tag[12] = {
'line21', 'line22', 'line23', 'line24', 'line25', 'line26',
'line27', 'line28', 'line29',
MULTI_CHAR('line21'), MULTI_CHAR('line22'), MULTI_CHAR('line23'), MULTI_CHAR('line24'), MULTI_CHAR('line25'), MULTI_CHAR('line26'),
MULTI_CHAR('line27'), MULTI_CHAR('line28'), MULTI_CHAR('line29'),
};
if (line_tag[i] != 0) {
@@ -1037,26 +1037,26 @@ void dMenu_Letter_c::screenSetLetter() {
}
}
mpLetterScreen[0]->search('jp_fri_n')->hide();
mpLetterScreen[0]->search(MULTI_CHAR('jp_fri_n'))->hide();
mpLetterScreen[0]->search('us_n')->hide();
}
#else
static u64 const line_tag[12] = {
'line09', 'line10', 'line11', 'line12', 'line13', 'line14',
'line15', 'line16', 'line17', 'line18', 'line19', 'line20',
MULTI_CHAR('line09'), MULTI_CHAR('line10'), MULTI_CHAR('line11'), MULTI_CHAR('line12'), MULTI_CHAR('line13'), MULTI_CHAR('line14'),
MULTI_CHAR('line15'), MULTI_CHAR('line16'), MULTI_CHAR('line17'), MULTI_CHAR('line18'), MULTI_CHAR('line19'), MULTI_CHAR('line20'),
};
field_0x2ec[0] = new CPaneMgr(mpLetterScreen[0], 't4_s', 0, NULL);
field_0x2ec[1] = new CPaneMgr(mpLetterScreen[0], 'mg_e4lin', 0, NULL);
field_0x2ec[1] = new CPaneMgr(mpLetterScreen[0], MULTI_CHAR('mg_e4lin'), 0, NULL);
for (int i = 0; i < 2; i++) {
field_0x2f4[i] = NULL;
}
mpLetterScreen[0]->search('t3f_s')->hide();
mpLetterScreen[0]->search('mg_3flin')->hide();
mpLetterScreen[0]->search('mg_3f_s')->hide();
mpLetterScreen[0]->search('mg_3f')->hide();
mpLetterScreen[0]->search(MULTI_CHAR('t3f_s'))->hide();
mpLetterScreen[0]->search(MULTI_CHAR('mg_3flin'))->hide();
mpLetterScreen[0]->search(MULTI_CHAR('mg_3f_s'))->hide();
mpLetterScreen[0]->search(MULTI_CHAR('mg_3f'))->hide();
mpLetterScreen[0]->search('t3_s')->hide();
mpLetterScreen[0]->search('mg_3line')->hide();
mpLetterScreen[0]->search(MULTI_CHAR('mg_3line'))->hide();
mpLineParent = new CPaneMgr(mpLetterScreen[0], 'us_n', 0, NULL);
JUT_ASSERT(1530, mpLineParent != NULL);
for (int i = 0; i < 12; i++) {
@@ -1066,7 +1066,7 @@ void dMenu_Letter_c::screenSetLetter() {
field_0x25c[i] = NULL;
}
}
mpLetterScreen[0]->search('jp_fri_n')->hide();
mpLetterScreen[0]->search(MULTI_CHAR('jp_fri_n'))->hide();
mpLetterScreen[0]->search('jp_n')->hide();
#endif
@@ -1086,8 +1086,8 @@ void dMenu_Letter_c::screenSetLetter() {
#endif
}
}
field_0x1e4[0] = (J2DTextBox*)mpLetterScreen[0]->search('p_texts');
field_0x1e4[1] = (J2DTextBox*)mpLetterScreen[0]->search('p_text');
field_0x1e4[0] = (J2DTextBox*)mpLetterScreen[0]->search(MULTI_CHAR('p_texts'));
field_0x1e4[1] = (J2DTextBox*)mpLetterScreen[0]->search(MULTI_CHAR('p_text'));
for (int i = 0; i < 2; i++) {
field_0x1e4[i]->setFont(mDoExt_getSubFont());
field_0x1e4[i]->setString(0x10, "");
@@ -1098,7 +1098,7 @@ void dMenu_Letter_c::screenSetLetter() {
JUT_ASSERT(1631, fg != false);
dPaneClass_showNullPane(mpLetterScreen[1]);
for (int i = 0; i < 2; i++) {
mpTextParent[i] = new CPaneMgr(mpLetterScreen[i], 'n_all', 2, NULL);
mpTextParent[i] = new CPaneMgr(mpLetterScreen[i], MULTI_CHAR('n_all'), 2, NULL);
JUT_ASSERT(1636, mpTextParent[i] != NULL);
mpTextParent[i]->scale(0.0f, 0.0f);
mpTextParent[i]->setAlphaRate(0.0f);
@@ -1112,10 +1112,10 @@ void dMenu_Letter_c::screenSetLetter() {
void dMenu_Letter_c::screenSetDoIcon() {
static const u64 text_a_tag[5] = {
'atext1_1', 'atext1_2', 'atext1_3', 'atext1_4', 'atext1_5',
MULTI_CHAR('atext1_1'), MULTI_CHAR('atext1_2'), MULTI_CHAR('atext1_3'), MULTI_CHAR('atext1_4'), MULTI_CHAR('atext1_5'),
};
static const u64 text_b_tag[5] = {
'btext1_1', 'btext1_2', 'btext1_3', 'btext1_4', 'btext1_5',
MULTI_CHAR('btext1_1'), MULTI_CHAR('btext1_2'), MULTI_CHAR('btext1_3'), MULTI_CHAR('btext1_4'), MULTI_CHAR('btext1_5'),
};
mpIconScreen = new J2DScreen();
src/d/d_menu_option.cpp
+108 -108
View File
@@ -92,13 +92,13 @@ dMenu_Option_c::~dMenu_Option_c() {}
static const u32 dMo_soundMode[3] = {0, 1, 2};
void dMenu_Option_c::_create() {
static const u64 text_a_tag[5] = {'atext1_1', 'atext1_2', 'atext1_3', 'atext1_4', 'atext1_5'};
static const u64 text_b_tag[5] = {'btext1_1', 'btext1_2', 'btext1_3', 'btext1_4', 'btext1_5'};
static const u64 l_tagName012[2] = {'w_no_n', 'w_yes_n'};
static const u64 l_tagName013[2] = {'w_no_t', 'w_yes_t'};
static const u64 l_tagName9[2] = {'w_no_m', 'w_yes_m'};
static const u64 l_tagName10[2] = {'w_no_g', 'w_yes_g'};
static const u64 l_tagName11[2] = {'w_no_gr', 'w_yes_gr'};
static const u64 text_a_tag[5] = {MULTI_CHAR('atext1_1'), MULTI_CHAR('atext1_2'), MULTI_CHAR('atext1_3'), MULTI_CHAR('atext1_4'), MULTI_CHAR('atext1_5')};
static const u64 text_b_tag[5] = {MULTI_CHAR('btext1_1'), MULTI_CHAR('btext1_2'), MULTI_CHAR('btext1_3'), MULTI_CHAR('btext1_4'), MULTI_CHAR('btext1_5')};
static const u64 l_tagName012[2] = {MULTI_CHAR('w_no_n'), MULTI_CHAR('w_yes_n')};
static const u64 l_tagName013[2] = {MULTI_CHAR('w_no_t'), MULTI_CHAR('w_yes_t')};
static const u64 l_tagName9[2] = {MULTI_CHAR('w_no_m'), MULTI_CHAR('w_yes_m')};
static const u64 l_tagName10[2] = {MULTI_CHAR('w_no_g'), MULTI_CHAR('w_yes_g')};
static const u64 l_tagName11[2] = {MULTI_CHAR('w_no_gr'), MULTI_CHAR('w_yes_gr')};
static const u8 l_msgNum2[2] = {8, 7};
mpFont = mDoExt_getMesgFont();
@@ -116,14 +116,14 @@ void dMenu_Option_c::_create() {
bool fg = mpScreen->setPriority("zelda_option_select_menu.blo", 0x20000, mpArchive);
JUT_ASSERT(210, fg != false);
mpScreen->search('base_a_n')->hide();
mpScreen->search('y_set_p4')->hide();
mpScreen->search('y_set_p3')->hide();
mpScreen->search('y_set_p2')->hide();
mpScreen->search('y_set_p1')->hide();
mpScreen->search('y_set_p0')->hide();
field_0x254[0] = (J2DTextBox*)mpScreen->search('cont_ts');
field_0x254[1] = (J2DTextBox*)mpScreen->search('cont_t');
mpScreen->search(MULTI_CHAR('base_a_n'))->hide();
mpScreen->search(MULTI_CHAR('y_set_p4'))->hide();
mpScreen->search(MULTI_CHAR('y_set_p3'))->hide();
mpScreen->search(MULTI_CHAR('y_set_p2'))->hide();
mpScreen->search(MULTI_CHAR('y_set_p1'))->hide();
mpScreen->search(MULTI_CHAR('y_set_p0'))->hide();
field_0x254[0] = (J2DTextBox*)mpScreen->search(MULTI_CHAR('cont_ts'));
field_0x254[1] = (J2DTextBox*)mpScreen->search(MULTI_CHAR('cont_t'));
for (int i = 0; i < 2; i++) {
field_0x254[i]->setFont(mDoExt_getMesgFont());
field_0x254[i]->setString(0x20, "");
@@ -132,8 +132,8 @@ void dMenu_Option_c::_create() {
JUT_ASSERT(246, mpBackScreen != NULL);
fg = mpBackScreen->setPriority("zelda_option_base.blo", 0x20000, mpArchive);
JUT_ASSERT(251, fg != false);
mpBackScreen->search('wi_btn_n')->hide();
field_0x27c = mpBackScreen->search('let_area');
mpBackScreen->search(MULTI_CHAR('wi_btn_n'))->hide();
field_0x27c = mpBackScreen->search(MULTI_CHAR('let_area'));
mpClipScreen = new J2DScreen();
JUT_ASSERT(265, mpClipScreen != NULL);
@@ -147,7 +147,7 @@ void dMenu_Option_c::_create() {
fg = mpShadowScreen->setPriority("zelda_option_menu_shadow.blo", 0x20000, mpArchive);
JUT_ASSERT(278, fg != false);
dPaneClass_showNullPane(mpShadowScreen);
mpShadowScreen->search('mw_n_5')->hide();
mpShadowScreen->search(MULTI_CHAR('mw_n_5'))->hide();
mpTVScreen = new J2DScreen();
JUT_ASSERT(287, mpTVScreen != NULL);
@@ -155,12 +155,12 @@ void dMenu_Option_c::_create() {
JUT_ASSERT(291, fg != false);
dPaneClass_showNullPane(mpTVScreen);
mpTVButtonAB = new CPaneMgr(mpTVScreen, 'g_abtn_n', 0, NULL);
mpTVButtonAB = new CPaneMgr(mpTVScreen, MULTI_CHAR('g_abtn_n'), 0, NULL);
JUT_ASSERT(295, mpTVButtonAB != NULL);
mpTVButtonText = new CPaneMgr(mpTVScreen, 'a_text_n', 0, NULL);
mpTVButtonText = new CPaneMgr(mpTVScreen, MULTI_CHAR('a_text_n'), 0, NULL);
JUT_ASSERT(298, mpTVButtonText != NULL);
mpTVScreen->search('g_abtn_n')->hide();
mpTVScreen->search(MULTI_CHAR('g_abtn_n'))->hide();
mpScreenIcon = new J2DScreen();
JUT_ASSERT(325, mpScreenIcon != NULL);
@@ -1289,141 +1289,141 @@ void dMenu_Option_c::menuHide(int index) {
void dMenu_Option_c::screenSet() {
static const u64 tag_frame[6] = {
'flame_00', 'flame_01', 'flame_02', 'flame_03', 'flame_04', 'flame_05',
MULTI_CHAR('flame_00'), MULTI_CHAR('flame_01'), MULTI_CHAR('flame_02'), MULTI_CHAR('flame_03'), MULTI_CHAR('flame_04'), MULTI_CHAR('flame_05'),
};
#if VERSION == VERSION_GCN_JPN
static const u64 tag_menu0[6] = {
'menu_t0', 'menu_t1', 'menu_t2', 'menu_t3', 'menu_t4', 'menu_t5',
MULTI_CHAR('menu_t0'), MULTI_CHAR('menu_t1'), MULTI_CHAR('menu_t2'), MULTI_CHAR('menu_t3'), MULTI_CHAR('menu_t4'), MULTI_CHAR('menu_t5'),
};
#else
static const u64 tag_menu0[6] = {
'fenu_t0', 'fenu_t1', 'fenu_t2', 'fenu_t3', 'fenu_t4', 'fenu_t5',
MULTI_CHAR('fenu_t0'), MULTI_CHAR('fenu_t1'), MULTI_CHAR('fenu_t2'), MULTI_CHAR('fenu_t3'), MULTI_CHAR('fenu_t4'), MULTI_CHAR('fenu_t5'),
};
#endif
static const u64 let_n[6] = {
'let_00_n', 'let_01_n', 'let_02_n', 'let_03_n', 'let_04_n', 'let_05_n',
MULTI_CHAR('let_00_n'), MULTI_CHAR('let_01_n'), MULTI_CHAR('let_02_n'), MULTI_CHAR('let_03_n'), MULTI_CHAR('let_04_n'), MULTI_CHAR('let_05_n'),
};
static const u64 let2_n[6] = {
'let_00_n', 'let_01_n', 'let_02_n', 'let_03_n', 'let_04_n',
MULTI_CHAR('let_00_n'), MULTI_CHAR('let_01_n'), MULTI_CHAR('let_02_n'), MULTI_CHAR('let_03_n'), MULTI_CHAR('let_04_n'),
};
static const u64 menu_n[6] = {
'menu_n0', 'menu_n1', 'menu_n2', 'menu_n3', 'menu_n4', 'menu_n5',
MULTI_CHAR('menu_n0'), MULTI_CHAR('menu_n1'), MULTI_CHAR('menu_n2'), MULTI_CHAR('menu_n3'), MULTI_CHAR('menu_n4'), MULTI_CHAR('menu_n5'),
};
static const u64 menu2_n[6] = {
'mw_n_0', 'mw_n_1', 'mw_n_2', 'mw_n_3', 'mw_n_4',
MULTI_CHAR('mw_n_0'), MULTI_CHAR('mw_n_1'), MULTI_CHAR('mw_n_2'), MULTI_CHAR('mw_n_3'), MULTI_CHAR('mw_n_4'),
};
static const u64 al0_n[6] = {
's_grr_00', 's_grr_01', 's_grr_02', 's_grr_03', 's_grr_04', 's_grr_05',
MULTI_CHAR('s_grr_00'), MULTI_CHAR('s_grr_01'), MULTI_CHAR('s_grr_02'), MULTI_CHAR('s_grr_03'), MULTI_CHAR('s_grr_04'), MULTI_CHAR('s_grr_05'),
};
static const u64 al1_n[6] = {
'c_grr_00', 'c_grr_01', 'c_grr_02', 'c_grr_03', 'c_grr_04', 'c_grr_05',
MULTI_CHAR('c_grr_00'), MULTI_CHAR('c_grr_01'), MULTI_CHAR('c_grr_02'), MULTI_CHAR('c_grr_03'), MULTI_CHAR('c_grr_04'), MULTI_CHAR('c_grr_05'),
};
static const u64 al2_n[6] = {
's_grl_00', 's_grl_01', 's_grl_02', 's_grl_03', 's_grl_04', 's_grl_05',
MULTI_CHAR('s_grl_00'), MULTI_CHAR('s_grl_01'), MULTI_CHAR('s_grl_02'), MULTI_CHAR('s_grl_03'), MULTI_CHAR('s_grl_04'), MULTI_CHAR('s_grl_05'),
};
static const u64 al3_n[6] = {
'c_grl_00', 'c_grl_01', 'c_grl_02', 'c_grl_03', 'c_grl_04', 'c_grl_05',
MULTI_CHAR('c_grl_00'), MULTI_CHAR('c_grl_01'), MULTI_CHAR('c_grl_02'), MULTI_CHAR('c_grl_03'), MULTI_CHAR('c_grl_04'), MULTI_CHAR('c_grl_05'),
};
static const u64 haihail_n[5] = {
'y_set_l0', 'y_set_l1', 'y_set_l2', 'y_set_l3', 'y_set_l4',
MULTI_CHAR('y_set_l0'), MULTI_CHAR('y_set_l1'), MULTI_CHAR('y_set_l2'), MULTI_CHAR('y_set_l3'), MULTI_CHAR('y_set_l4'),
};
static const u64 haihair_n[5] = {
'y_set_r0', 'y_set_r1', 'y_set_r2', 'y_set_r3', 'y_set_r4',
MULTI_CHAR('y_set_r0'), MULTI_CHAR('y_set_r1'), MULTI_CHAR('y_set_r2'), MULTI_CHAR('y_set_r3'), MULTI_CHAR('y_set_r4'),
};
static const u64 menu3_n[6] = {
'menuapn0', 'menuapn1', 'menuapn2', 'menuapn3', 'menuapn4',
MULTI_CHAR('menuapn0'), MULTI_CHAR('menuapn1'), MULTI_CHAR('menuapn2'), MULTI_CHAR('menuapn3'), MULTI_CHAR('menuapn4'),
};
static const u64 tv_btnA[5] = {
'cont_at1', 'cont_at2', 'cont_at3', 'cont_at4', 'cont_at',
MULTI_CHAR('cont_at1'), MULTI_CHAR('cont_at2'), MULTI_CHAR('cont_at3'), MULTI_CHAR('cont_at4'), MULTI_CHAR('cont_at'),
};
static const u64 ftv_btnA[5] = {
'font_a1', 'font_at2', 'font_at3', 'font_at4', 'font_at',
MULTI_CHAR('font_a1'), MULTI_CHAR('font_at2'), MULTI_CHAR('font_at3'), MULTI_CHAR('font_at4'), MULTI_CHAR('font_at'),
};
#if VERSION == VERSION_GCN_JPN
static const u64 fenu_t0[2] = {'fenu_t0s', 'fenu_t0'};
static const u64 menu_t0[2] = {'menu_t0s', 'menu_t0'};
static const u64 fenu_t1[2] = {'fenu_t1s', 'fenu_t1'};
static const u64 menu_t1[2] = {'menu_t1s', 'menu_t1'};
static const u64 fenu_t2[2] = {'fenu_t2s', 'fenu_t2'};
static const u64 menu_t2[2] = {'menu_t2s', 'menu_t2'};
static const u64 fenu_t3[2] = {'fenu_t3s', 'fenu_t3'};
static const u64 menu_t3[2] = {'menu_t3s', 'menu_t3'};
static const u64 fenu_t4[2] = {'fenu_t4s', 'fenu_t4'};
static const u64 menu_t4[2] = {'menu_t4s', 'menu_t4'};
static const u64 fenu_t5[2] = {'fenu_t5s', 'fenu_t5'};
static const u64 menu_t5[2] = {'menu_t5s', 'menu_t5'};
static const u64 fenu_t0[2] = {MULTI_CHAR('fenu_t0s'), MULTI_CHAR('fenu_t0')};
static const u64 menu_t0[2] = {MULTI_CHAR('menu_t0s'), MULTI_CHAR('menu_t0')};
static const u64 fenu_t1[2] = {MULTI_CHAR('fenu_t1s'), MULTI_CHAR('fenu_t1')};
static const u64 menu_t1[2] = {MULTI_CHAR('menu_t1s'), MULTI_CHAR('menu_t1')};
static const u64 fenu_t2[2] = {MULTI_CHAR('fenu_t2s'), MULTI_CHAR('fenu_t2')};
static const u64 menu_t2[2] = {MULTI_CHAR('menu_t2s'), MULTI_CHAR('menu_t2')};
static const u64 fenu_t3[2] = {MULTI_CHAR('fenu_t3s'), MULTI_CHAR('fenu_t3')};
static const u64 menu_t3[2] = {MULTI_CHAR('menu_t3s'), MULTI_CHAR('menu_t3')};
static const u64 fenu_t4[2] = {MULTI_CHAR('fenu_t4s'), MULTI_CHAR('fenu_t4')};
static const u64 menu_t4[2] = {MULTI_CHAR('menu_t4s'), MULTI_CHAR('menu_t4')};
static const u64 fenu_t5[2] = {MULTI_CHAR('fenu_t5s'), MULTI_CHAR('fenu_t5')};
static const u64 menu_t5[2] = {MULTI_CHAR('menu_t5s'), MULTI_CHAR('menu_t5')};
#else
static const u64 fenu_t0[2] = {'fenu_t0s', 'fenu_t0'};
static const u64 menu_t0[2] = {'menu_t0s', 'menu_t0'};
static const u64 fenu_t2[2] = {'fenu_t1s', 'fenu_t1'};
static const u64 menu_t2[2] = {'menu_t1s', 'menu_t1'};
static const u64 fenu_t3[2] = {'fenu_t2s', 'fenu_t2'};
static const u64 menu_t3[2] = {'menu_t2s', 'menu_t2'};
static const u64 fenu_t4[2] = {'fenu_t3s', 'fenu_t3'};
static const u64 menu_t4[2] = {'menu_t3s', 'menu_t3'};
static const u64 fenu_t1[2] = {'fenu_t4s', 'fenu_t4'};
static const u64 menu_t1[2] = {'menu_t4s', 'menu_t4'};
static const u64 fenu_t5[2] = {'fenu_t5s', 'fenu_t5'};
static const u64 menu_t5[2] = {'menu_t5s', 'menu_t5'};
static const u64 fenu_t0[2] = {MULTI_CHAR('fenu_t0s'), MULTI_CHAR('fenu_t0')};
static const u64 menu_t0[2] = {MULTI_CHAR('menu_t0s'), MULTI_CHAR('menu_t0')};
static const u64 fenu_t2[2] = {MULTI_CHAR('fenu_t1s'), MULTI_CHAR('fenu_t1')};
static const u64 menu_t2[2] = {MULTI_CHAR('menu_t1s'), MULTI_CHAR('menu_t1')};
static const u64 fenu_t3[2] = {MULTI_CHAR('fenu_t2s'), MULTI_CHAR('fenu_t2')};
static const u64 menu_t3[2] = {MULTI_CHAR('menu_t2s'), MULTI_CHAR('menu_t2')};
static const u64 fenu_t4[2] = {MULTI_CHAR('fenu_t3s'), MULTI_CHAR('fenu_t3')};
static const u64 menu_t4[2] = {MULTI_CHAR('menu_t3s'), MULTI_CHAR('menu_t3')};
static const u64 fenu_t1[2] = {MULTI_CHAR('fenu_t4s'), MULTI_CHAR('fenu_t4')};
static const u64 menu_t1[2] = {MULTI_CHAR('menu_t4s'), MULTI_CHAR('menu_t4')};
static const u64 fenu_t5[2] = {MULTI_CHAR('fenu_t5s'), MULTI_CHAR('fenu_t5')};
static const u64 menu_t5[2] = {MULTI_CHAR('menu_t5s'), MULTI_CHAR('menu_t5')};
#endif
static const u64 menut_0[6] = {
'menut0as', 'menut0a', 'menut0a2', 'menut0a1', 'menut0a4', 'menut0a3',
MULTI_CHAR('menut0as'), MULTI_CHAR('menut0a'), MULTI_CHAR('menut0a2'), MULTI_CHAR('menut0a1'), MULTI_CHAR('menut0a4'), MULTI_CHAR('menut0a3'),
};
static const u64 fenut_0[6] = {
'menut010', 'menut0a9', 'menut0a8', 'menut0a7', 'menut0a6', 'menut0a5',
MULTI_CHAR('menut010'), MULTI_CHAR('menut0a9'), MULTI_CHAR('menut0a8'), MULTI_CHAR('menut0a7'), MULTI_CHAR('menut0a6'), MULTI_CHAR('menut0a5'),
};
static const u64 menut_1[6] = {
'menut1as', 'menut1a', 'menut1a2', 'menut1a1', 'menut1a4', 'menut1a3',
MULTI_CHAR('menut1as'), MULTI_CHAR('menut1a'), MULTI_CHAR('menut1a2'), MULTI_CHAR('menut1a1'), MULTI_CHAR('menut1a4'), MULTI_CHAR('menut1a3'),
};
static const u64 fenut_1[6] = {
'menut110', 'menut1a9', 'menut1a8', 'menut1a7', 'menut1a6', 'menut1a5',
MULTI_CHAR('menut110'), MULTI_CHAR('menut1a9'), MULTI_CHAR('menut1a8'), MULTI_CHAR('menut1a7'), MULTI_CHAR('menut1a6'), MULTI_CHAR('menut1a5'),
};
static const u64 menut_2[6] = {
'menut2as', 'menut2a', 'menut2a2', 'menut2a1', 'menut2a4', 'menut2a3',
MULTI_CHAR('menut2as'), MULTI_CHAR('menut2a'), MULTI_CHAR('menut2a2'), MULTI_CHAR('menut2a1'), MULTI_CHAR('menut2a4'), MULTI_CHAR('menut2a3'),
};
static const u64 fenut_2[6] = {
'menut210', 'menut2a9', 'menut2a8', 'menut2a7', 'menut2a6', 'menut2a5',
MULTI_CHAR('menut210'), MULTI_CHAR('menut2a9'), MULTI_CHAR('menut2a8'), MULTI_CHAR('menut2a7'), MULTI_CHAR('menut2a6'), MULTI_CHAR('menut2a5'),
};
static const u64 menut_3[6] = {
'menut3a5', 'menut3a6', 'menut3a7', 'menut3a8', 'menut3a9', 'menut310',
MULTI_CHAR('menut3a5'), MULTI_CHAR('menut3a6'), MULTI_CHAR('menut3a7'), MULTI_CHAR('menut3a8'), MULTI_CHAR('menut3a9'), MULTI_CHAR('menut310'),
};
static const u64 fenut_3[6] = {
'menut315', 'menut314', 'menut313', 'menut312', 'menut311', 'menut001',
MULTI_CHAR('menut315'), MULTI_CHAR('menut314'), MULTI_CHAR('menut313'), MULTI_CHAR('menut312'), MULTI_CHAR('menut311'), MULTI_CHAR('menut001'),
};
static const u64 menut_4[6] = {
'menut3as', 'menut3a', 'menut3a2', 'menut3a1', 'menut3a4', 'menut3a3',
MULTI_CHAR('menut3as'), MULTI_CHAR('menut3a'), MULTI_CHAR('menut3a2'), MULTI_CHAR('menut3a1'), MULTI_CHAR('menut3a4'), MULTI_CHAR('menut3a3'),
};
static const u64 fenut_4[6] = {
'menut321', 'menut320', 'menut319', 'menut318', 'menut317', 'menut316',
MULTI_CHAR('menut321'), MULTI_CHAR('menut320'), MULTI_CHAR('menut319'), MULTI_CHAR('menut318'), MULTI_CHAR('menut317'), MULTI_CHAR('menut316'),
};
#if VERSION == VERSION_GCN_JPN
static const u64 tx[6] = {
'wps_text', 'w_p_text', 'g_ps_tx3', 'g_p_tex3', 'wps_tex1', 'w_p_tex1',
MULTI_CHAR('wps_text'), MULTI_CHAR('w_p_text'), MULTI_CHAR('g_ps_tx3'), MULTI_CHAR('g_p_tex3'), MULTI_CHAR('wps_tex1'), MULTI_CHAR('w_p_tex1'),
};
#else
static const u64 tx[6] = {
'w_p_tex5', 'w_p_tex6', 'w_p_tex3', 'w_p_tex4', 'fps_tex1', 'f_p_tex1',
MULTI_CHAR('w_p_tex5'), MULTI_CHAR('w_p_tex6'), MULTI_CHAR('w_p_tex3'), MULTI_CHAR('w_p_tex4'), MULTI_CHAR('fps_tex1'), MULTI_CHAR('f_p_tex1'),
};
#endif
static const u64 op_tx[4] = {
'w_text_n', 'w_btn_n', 'w_k_t_n', 'w_abtn_n',
MULTI_CHAR('w_text_n'), MULTI_CHAR('w_btn_n'), MULTI_CHAR('w_k_t_n'), MULTI_CHAR('w_abtn_n'),
};
static const u64 z_tx[3] = {
'z_gc_n', 0, 0,
MULTI_CHAR('z_gc_n'), 0, 0,
};
#if VERSION == VERSION_GCN_JPN
static const u64 txTV[10] = {
'menu_t6s', 'menu_t6', 'menu_t9s', 'menu_t9', 'menut10s',
'menu_t10', 'menu_t7s', 'menu_t7', 'menu_t8s', 'menu_t8',
MULTI_CHAR('menu_t6s'), MULTI_CHAR('menu_t6'), MULTI_CHAR('menu_t9s'), MULTI_CHAR('menu_t9'), MULTI_CHAR('menut10s'),
MULTI_CHAR('menu_t10'), MULTI_CHAR('menu_t7s'), MULTI_CHAR('menu_t7'), MULTI_CHAR('menu_t8s'), MULTI_CHAR('menu_t8'),
};
#else
static const u64 txTV[10] = {
'menu_t61', 'menu_t2', 'menu_t91', 'menu_t1', 'menut101',
'menu_t01', 'menu_t71', 'menu_t3', 'menu_t81', 'menu_t4',
MULTI_CHAR('menu_t61'), MULTI_CHAR('menu_t2'), MULTI_CHAR('menu_t91'), MULTI_CHAR('menu_t1'), MULTI_CHAR('menut101'),
MULTI_CHAR('menu_t01'), MULTI_CHAR('menu_t71'), MULTI_CHAR('menu_t3'), MULTI_CHAR('menu_t81'), MULTI_CHAR('menu_t4'),
};
#endif
mpTitle = new CPaneMgr(mpBackScreen, 'title_n', 0, NULL);
mpTitle = new CPaneMgr(mpBackScreen, MULTI_CHAR('title_n'), 0, NULL);
Vec pos = mpTitle->getGlobalVtxCenter(mpTitle->mPane, false, 0);
mpWarning->mPosY = pos.y + g_drawHIO.mOptionScreen.mBackgroundPosY;
for (int i = 0; i < 6; i++) {
@@ -1445,11 +1445,11 @@ void dMenu_Option_c::screenSet() {
mpDrawCursor->setScale(0.0f);
mpDrawCursor->setParam(1.01f, 0.85f, 0.02f, 0.5f, 0.5f);
mpDrawCursor->offPlayAnime(0);
mpParent[0] = new CPaneMgr(mpScreen, 'n_all', 2, NULL);
mpParent[1] = new CPaneMgr(mpClipScreen, 'n_all', 2, NULL);
mpParent[0] = new CPaneMgr(mpScreen, MULTI_CHAR('n_all'), 2, NULL);
mpParent[1] = new CPaneMgr(mpClipScreen, MULTI_CHAR('n_all'), 2, NULL);
mpParent[2] = new CPaneMgr(mpShadowScreen, 'nall', 2, NULL);
mpParent[3] = new CPaneMgr(mpTVScreen, 'n_all', 2, NULL);
mpParent[4] = new CPaneMgr(mpBackScreen, 'n_all', 2, NULL);
mpParent[3] = new CPaneMgr(mpTVScreen, MULTI_CHAR('n_all'), 2, NULL);
mpParent[4] = new CPaneMgr(mpBackScreen, MULTI_CHAR('n_all'), 2, NULL);
for (int i = 0; i < 6; i++) {
mpMenuNull[i] = new CPaneMgr(mpScreen, let_n[i], 0, NULL);
mpMenuPane[i] = new CPaneMgr(mpScreen, menu_n[i], 0, NULL);
@@ -1484,31 +1484,31 @@ void dMenu_Option_c::screenSet() {
}
}
for (int i = 0; i < 6; i++) {
if (let2_n[i] != NULL) {
if (let2_n[i] != 0) {
mpMenuPane3[i] = new CPaneMgr(mpClipScreen, let2_n[i], 0, NULL);
} else {
mpMenuPane3[i] = NULL;
}
if (menu3_n[i] != NULL) {
if (menu3_n[i] != 0) {
mpMenuPane32[i] = new CPaneMgr(mpClipScreen, menu3_n[i], 0, NULL);
} else {
mpMenuPane32[i] = NULL;
}
}
#if VERSION == VERSION_GCN_JPN
field_0x270[0] = (J2DTextBox*)mpBackScreen->search('t_t00');
field_0x270[1] = (J2DTextBox*)mpBackScreen->search('t_t01');
mpBackScreen->search('f_t00')->hide();
mpBackScreen->search('t_t01')->hide();
field_0x270[2] = (J2DTextBox*)mpTVScreen->search('t_t00');
mpTVScreen->search('f_t00')->hide();
field_0x270[0] = (J2DTextBox*)mpBackScreen->search(MULTI_CHAR('t_t00'));
field_0x270[1] = (J2DTextBox*)mpBackScreen->search(MULTI_CHAR('t_t01'));
mpBackScreen->search(MULTI_CHAR('f_t00'))->hide();
mpBackScreen->search(MULTI_CHAR('t_t01'))->hide();
field_0x270[2] = (J2DTextBox*)mpTVScreen->search(MULTI_CHAR('t_t00'));
mpTVScreen->search(MULTI_CHAR('f_t00'))->hide();
#else
field_0x270[0] = (J2DTextBox*)mpBackScreen->search('f_t00');
field_0x270[1] = (J2DTextBox*)mpBackScreen->search('t_t01');
mpBackScreen->search('t_t00')->hide();
mpBackScreen->search('t_t01')->hide();
field_0x270[2] = (J2DTextBox*)mpTVScreen->search('f_t00');
mpTVScreen->search('t_t00')->hide();
field_0x270[0] = (J2DTextBox*)mpBackScreen->search(MULTI_CHAR('f_t00'));
field_0x270[1] = (J2DTextBox*)mpBackScreen->search(MULTI_CHAR('t_t01'));
mpBackScreen->search(MULTI_CHAR('t_t00'))->hide();
mpBackScreen->search(MULTI_CHAR('t_t01'))->hide();
field_0x270[2] = (J2DTextBox*)mpTVScreen->search(MULTI_CHAR('f_t00'));
mpTVScreen->search(MULTI_CHAR('t_t00'))->hide();
#endif
for (int i = 0; i < 3; i++) {
field_0x270[i]->setFont(mDoExt_getRubyFont());
@@ -1697,11 +1697,11 @@ void dMenu_Option_c::screenSet() {
field_0x3b4 = 0.0f;
menuVisible();
#if VERSION == VERSION_GCN_JPN
mpBackScreen->search('jpn_n')->show();
mpBackScreen->search('foregn_n')->hide();
mpBackScreen->search(MULTI_CHAR('jpn_n'))->show();
mpBackScreen->search(MULTI_CHAR('foregn_n'))->hide();
#else
mpBackScreen->search('jpn_n')->hide();
mpBackScreen->search('foregn_n')->show();
mpBackScreen->search(MULTI_CHAR('jpn_n'))->hide();
mpBackScreen->search(MULTI_CHAR('foregn_n'))->show();
#endif
for (int i = 0; i < 6; i++) {
J2DTextBox* backScreen = (J2DTextBox*)mpBackScreen->search(tx[i]);
@@ -1715,12 +1715,12 @@ void dMenu_Option_c::screenSet() {
mpString->getString(0x556, backScreen, NULL, NULL, NULL, 0);
}
}
mpBackScreen->search('wi_btn_n')->hide();
mpBackScreen->search(MULTI_CHAR('wi_btn_n'))->hide();
for (int i = 0; i < 4; i++) {
field_0x1c0[i] = 0;
}
for (int i = 0; i < 3; i++) {
if (z_tx[i] != NULL) {
if (z_tx[i] != 0) {
mpZButtonText[i] = new CPaneMgr(mpBackScreen, z_tx[i], 2, NULL);
} else {
mpZButtonText[i] = NULL;
@@ -2075,14 +2075,14 @@ void dMenu_Option_c::changeTVCheck() {
static void dummy() {
#if VERSION == VERSION_GCN_JPN
static const u64 txTVhide[5] = {'fmenu_6n', 'fmenu_9n', 'fmenu_10', 'fmenu_7n', 'fmenu_8n'};
static const u64 txTVhide[5] = {MULTI_CHAR('fmenu_6n'), MULTI_CHAR('fmenu_9n'), MULTI_CHAR('fmenu_10'), MULTI_CHAR('fmenu_7n'), MULTI_CHAR('fmenu_8n')};
#else
static const u64 txTVhide[5] = {'menu_6n', 'menu_9n', 'menu_10n', 'menu_7n', 'menu_8n'};
static const u64 txTVhide[5] = {MULTI_CHAR('menu_6n'), MULTI_CHAR('menu_9n'), MULTI_CHAR('menu_10n'), MULTI_CHAR('menu_7n'), MULTI_CHAR('menu_8n')};
#endif
}
void dMenu_Option_c::setAButtonString(u16 i_stringID) {
static const u64 text_a_tag[5] = {'atext1_1', 'atext1_2', 'atext1_3', 'atext1_4', 'atext1_5'};
static const u64 text_a_tag[5] = {MULTI_CHAR('atext1_1'), MULTI_CHAR('atext1_2'), MULTI_CHAR('atext1_3'), MULTI_CHAR('atext1_4'), MULTI_CHAR('atext1_5')};
u32 stringId = i_stringID;
if (stringId != field_0x3dc) {
field_0x3dc = i_stringID;
@@ -2101,7 +2101,7 @@ void dMenu_Option_c::setAButtonString(u16 i_stringID) {
}
void dMenu_Option_c::setBButtonString(u16 i_stringID) {
static const u64 text_b_tag[5] = {'btext1_1', 'btext1_2', 'btext1_3', 'btext1_4', 'btext1_5'};
static const u64 text_b_tag[5] = {MULTI_CHAR('btext1_1'), MULTI_CHAR('btext1_2'), MULTI_CHAR('btext1_3'), MULTI_CHAR('btext1_4'), MULTI_CHAR('btext1_5')};
u32 stringId = i_stringID;
if (stringId != field_0x3de) {
field_0x3de = i_stringID;
src/d/d_menu_ring.cpp
+54 -54
View File
@@ -48,34 +48,34 @@ static procFunc stick_proc[] = {
dMenu_Ring_c::dMenu_Ring_c(JKRExpHeap* i_heap, STControl* i_stick, CSTControl* i_cStick,
u8 i_ringOrigin) {
static const u64 xy_text[5] = {
'yx_text', 'yx_te_s1', 'yx_te_s2', 'yx_te_s3', 'yx_te_s4',
MULTI_CHAR('yx_text'), MULTI_CHAR('yx_te_s1'), MULTI_CHAR('yx_te_s2'), MULTI_CHAR('yx_te_s3'), MULTI_CHAR('yx_te_s4'),
};
static const u64 fxy_text[5] = {
'fyx_tex', 'fyx_te_1', 'fyx_te_2', 'fyx_te_3', 'fyx_te_4',
MULTI_CHAR('fyx_tex'), MULTI_CHAR('fyx_te_1'), MULTI_CHAR('fyx_te_2'), MULTI_CHAR('fyx_te_3'), MULTI_CHAR('fyx_te_4'),
};
static const u64 c_text[5] = {
'c_text', 'c_te_s1', 'c_te_s2', 'c_te_s3', 'c_te_s4',
MULTI_CHAR('c_text'), MULTI_CHAR('c_te_s1'), MULTI_CHAR('c_te_s2'), MULTI_CHAR('c_te_s3'), MULTI_CHAR('c_te_s4'),
};
static const u64 fc_text[5] = {
'fc_text', 'fc_te_s1', 'fc_te_s2', 'fc_te_s3', 'fc_te_s4',
MULTI_CHAR('fc_text'), MULTI_CHAR('fc_te_s1'), MULTI_CHAR('fc_te_s2'), MULTI_CHAR('fc_te_s3'), MULTI_CHAR('fc_te_s4'),
};
static const u64 c_text1[5] = {
'c_text1', 'c_texs1', 'c_texs2', 'c_texs3', 'c_texs4',
MULTI_CHAR('c_text1'), MULTI_CHAR('c_texs1'), MULTI_CHAR('c_texs2'), MULTI_CHAR('c_texs3'), MULTI_CHAR('c_texs4'),
};
static const u64 fc_text1[5] = {
'fc_text1', 'fc_texs1', 'fc_texs2', 'fc_texs3', 'fc_texs4',
MULTI_CHAR('fc_text1'), MULTI_CHAR('fc_texs1'), MULTI_CHAR('fc_texs2'), MULTI_CHAR('fc_texs3'), MULTI_CHAR('fc_texs4'),
};
static const u64 t_on[5] = {
'gr_t_on', 'g_tof_s5', 'g_tof_s6', 'g_tof_s7', 'g_tof_s8',
MULTI_CHAR('gr_t_on'), MULTI_CHAR('g_tof_s5'), MULTI_CHAR('g_tof_s6'), MULTI_CHAR('g_tof_s7'), MULTI_CHAR('g_tof_s8'),
};
static const u64 ft_on[5] = {
'fr_t_on', 'f_tof_s5', 'f_tof_s6', 'f_tof_s7', 'f_tof_s8',
MULTI_CHAR('fr_t_on'), MULTI_CHAR('f_tof_s5'), MULTI_CHAR('f_tof_s6'), MULTI_CHAR('f_tof_s7'), MULTI_CHAR('f_tof_s8'),
};
static const u64 t_off[5] = {
'gr_t_of', 'g_tof_s1', 'g_tof_s2', 'g_tof_s3', 'g_tof_s4',
MULTI_CHAR('gr_t_of'), MULTI_CHAR('g_tof_s1'), MULTI_CHAR('g_tof_s2'), MULTI_CHAR('g_tof_s3'), MULTI_CHAR('g_tof_s4'),
};
static const u64 ft_off[5] = {
'fr_t_of', 'f_tof_s1', 'f_tof_s2', 'f_tof_s3', 'f_tof_s4',
MULTI_CHAR('fr_t_of'), MULTI_CHAR('f_tof_s1'), MULTI_CHAR('f_tof_s2'), MULTI_CHAR('f_tof_s3'), MULTI_CHAR('f_tof_s4'),
};
mpHeap = i_heap;
@@ -264,12 +264,12 @@ dMenu_Ring_c::dMenu_Ring_c(JKRExpHeap* i_heap, STControl* i_stick, CSTControl* i
"SCRN/zelda_item_select_icon_message_ver2.blo", 0x20000,
dComIfGp_getRingResArchive());
dPaneClass_showNullPane(mpScreen);
mpMessageParent = new CPaneMgrAlpha(mpScreen, 'n_all', 2, NULL);
mpMessageParent = new CPaneMgrAlpha(mpScreen, MULTI_CHAR('n_all'), 2, NULL);
mpTextParent[0] = new CPaneMgr(mpScreen, 'r_n', 0, NULL);
mpTextParent[1] = new CPaneMgr(mpScreen, 'c_n', 2, NULL);
mpTextParent[1]->setAlphaRate(1.0f);
mpTextParent[2] = NULL;
mpTextParent[3] = new CPaneMgr(mpScreen, 'c_sen_n', 2, NULL);
mpTextParent[3] = new CPaneMgr(mpScreen, MULTI_CHAR('c_sen_n'), 2, NULL);
mpTextParent[4] = new CPaneMgr(mpScreen, 'gr_n', 2, NULL);
mpTextParent[4]->hide();
for (int i = 5; i < 10; i++) {
@@ -301,20 +301,20 @@ dMenu_Ring_c::dMenu_Ring_c(JKRExpHeap* i_heap, STControl* i_stick, CSTControl* i
mItemSlotParam2[i] = (mpItemBuf[i][0]->height / 48.0f * (texScale / 100.0f));
}
}
mpScreen->search('r_btn_n')->hide();
mpScreen->search(MULTI_CHAR('r_btn_n'))->hide();
if (mPlayerIsWolf) {
mpScreen->search('yx_te_s1')->hide();
mpScreen->search('yx_te_s2')->hide();
mpScreen->search('yx_te_s3')->hide();
mpScreen->search('yx_te_s4')->hide();
mpScreen->search('yx_text')->hide();
mpScreen->search('fyx_te_1')->hide();
mpScreen->search('fyx_te_2')->hide();
mpScreen->search('fyx_te_3')->hide();
mpScreen->search('fyx_te_4')->hide();
mpScreen->search('fyx_tex')->hide();
mpScreen->search('x_btn_n')->hide();
mpScreen->search('y_btn_n')->hide();
mpScreen->search(MULTI_CHAR('yx_te_s1'))->hide();
mpScreen->search(MULTI_CHAR('yx_te_s2'))->hide();
mpScreen->search(MULTI_CHAR('yx_te_s3'))->hide();
mpScreen->search(MULTI_CHAR('yx_te_s4'))->hide();
mpScreen->search(MULTI_CHAR('yx_text'))->hide();
mpScreen->search(MULTI_CHAR('fyx_te_1'))->hide();
mpScreen->search(MULTI_CHAR('fyx_te_2'))->hide();
mpScreen->search(MULTI_CHAR('fyx_te_3'))->hide();
mpScreen->search(MULTI_CHAR('fyx_te_4'))->hide();
mpScreen->search(MULTI_CHAR('fyx_tex'))->hide();
mpScreen->search(MULTI_CHAR('x_btn_n'))->hide();
mpScreen->search(MULTI_CHAR('y_btn_n'))->hide();
}
mpString = new dMsgString_c();
for (i = 0; i < 5; i++) {
@@ -387,38 +387,38 @@ dMenu_Ring_c::dMenu_Ring_c(JKRExpHeap* i_heap, STControl* i_stick, CSTControl* i
"SCRN/zelda_item_select_icon3_spot.blo", 0x20000,
dComIfGp_getRingResArchive());
dPaneClass_showNullPane(mpSpotScreen);
mpSpotParent = new CPaneMgrAlpha(mpSpotScreen, 'n_all', 2, NULL);
mpSpotParent = new CPaneMgrAlpha(mpSpotScreen, MULTI_CHAR('n_all'), 2, NULL);
mpCenterScreen = new J2DScreen();
dPaneClass_setPriority(&mpResData[2], mpHeap, mpCenterScreen,
"SCRN/zelda_item_select_icon3_center_parts.blo", 0x20000,
dComIfGp_getRingResArchive());
dPaneClass_showNullPane(mpCenterScreen);
mpCenterParent = new CPaneMgrAlpha(mpCenterScreen, 'center_n', 2, NULL);
mpNameParent = new CPaneMgr(mpCenterScreen, 'label_n', 1, NULL);
mpCircle = new CPaneMgr(mpCenterScreen, 'circle_n', 2, NULL);
mpCenterParent = new CPaneMgrAlpha(mpCenterScreen, MULTI_CHAR('center_n'), 2, NULL);
mpNameParent = new CPaneMgr(mpCenterScreen, MULTI_CHAR('label_n'), 1, NULL);
mpCircle = new CPaneMgr(mpCenterScreen, MULTI_CHAR('circle_n'), 2, NULL);
J2DTextBox* textBox[4];
#if VERSION == VERSION_GCN_JPN
textBox[0] = (J2DTextBox*)mpCenterScreen->search('item_n04');
textBox[1] = (J2DTextBox*)mpCenterScreen->search('item_n05');
textBox[2] = (J2DTextBox*)mpCenterScreen->search('item_n06');
textBox[3] = (J2DTextBox*)mpCenterScreen->search('item_n07');
J2DPane* pane = mpCenterScreen->search('fitem_n1');
textBox[0] = (J2DTextBox*)mpCenterScreen->search(MULTI_CHAR('item_n04'));
textBox[1] = (J2DTextBox*)mpCenterScreen->search(MULTI_CHAR('item_n05'));
textBox[2] = (J2DTextBox*)mpCenterScreen->search(MULTI_CHAR('item_n06'));
textBox[3] = (J2DTextBox*)mpCenterScreen->search(MULTI_CHAR('item_n07'));
J2DPane* pane = mpCenterScreen->search(MULTI_CHAR('fitem_n1'));
pane->mVisible = false;
pane = mpCenterScreen->search('fitem_n2');
pane = mpCenterScreen->search(MULTI_CHAR('fitem_n2'));
pane->mVisible = false;
pane = mpCenterScreen->search('fitem_n3');
pane = mpCenterScreen->search(MULTI_CHAR('fitem_n3'));
pane->mVisible = false;
pane = mpCenterScreen->search('fitem_n4');
pane = mpCenterScreen->search(MULTI_CHAR('fitem_n4'));
pane->mVisible = false;
#else
textBox[0] = (J2DTextBox*)mpCenterScreen->search('fitem_n1');
textBox[1] = (J2DTextBox*)mpCenterScreen->search('fitem_n2');
textBox[2] = (J2DTextBox*)mpCenterScreen->search('fitem_n3');
textBox[3] = (J2DTextBox*)mpCenterScreen->search('fitem_n4');
mpCenterScreen->search('item_n04');
mpCenterScreen->search('item_n05');
mpCenterScreen->search('item_n06');
mpCenterScreen->search('item_n07');
textBox[0] = (J2DTextBox*)mpCenterScreen->search(MULTI_CHAR('fitem_n1'));
textBox[1] = (J2DTextBox*)mpCenterScreen->search(MULTI_CHAR('fitem_n2'));
textBox[2] = (J2DTextBox*)mpCenterScreen->search(MULTI_CHAR('fitem_n3'));
textBox[3] = (J2DTextBox*)mpCenterScreen->search(MULTI_CHAR('fitem_n4'));
mpCenterScreen->search(MULTI_CHAR('item_n04'));
mpCenterScreen->search(MULTI_CHAR('item_n05'));
mpCenterScreen->search(MULTI_CHAR('item_n06'));
mpCenterScreen->search(MULTI_CHAR('item_n07'));
#endif
for (int i = 0; i < 4; i++) {
textBox[i]->setFont(mDoExt_getMesgFont());
@@ -614,7 +614,7 @@ void dMenu_Ring_c::_draw() {
if (mStatus != STATUS_EXPLAIN && mPikariFlashingSpeed > 0.0f) {
Vec pos;
CPaneMgr paneMgr;
pos = paneMgr.getGlobalVtxCenter(mpScreen->search('gr_btn'), true, 0);
pos = paneMgr.getGlobalVtxCenter(mpScreen->search(MULTI_CHAR('gr_btn')), true, 0);
dMeter2Info_getMeterClass()->getMeterDrawPtr()->drawPikari(
pos.x, pos.y, &mPikariFlashingSpeed, g_ringHIO.mPikariScale, g_ringHIO.mPikariFrontOuter,
g_ringHIO.mPikariFrontInner, g_ringHIO.mPikariBackOuter, g_ringHIO.mPikariBackInner,
@@ -1102,15 +1102,15 @@ void dMenu_Ring_c::setScale() {
void dMenu_Ring_c::setNameString(u32 i_stringID) {
J2DTextBox* textBox[4];
#if VERSION == VERSION_GCN_JPN
textBox[0] = (J2DTextBox*)mpCenterScreen->search('item_n04');
textBox[1] = (J2DTextBox*)mpCenterScreen->search('item_n05');
textBox[2] = (J2DTextBox*)mpCenterScreen->search('item_n06');
textBox[3] = (J2DTextBox*)mpCenterScreen->search('item_n07');
textBox[0] = (J2DTextBox*)mpCenterScreen->search(MULTI_CHAR('item_n04'));
textBox[1] = (J2DTextBox*)mpCenterScreen->search(MULTI_CHAR('item_n05'));
textBox[2] = (J2DTextBox*)mpCenterScreen->search(MULTI_CHAR('item_n06'));
textBox[3] = (J2DTextBox*)mpCenterScreen->search(MULTI_CHAR('item_n07'));
#else
textBox[0] = (J2DTextBox*)mpCenterScreen->search('fitem_n1');
textBox[1] = (J2DTextBox*)mpCenterScreen->search('fitem_n2');
textBox[2] = (J2DTextBox*)mpCenterScreen->search('fitem_n3');
textBox[3] = (J2DTextBox*)mpCenterScreen->search('fitem_n4');
textBox[0] = (J2DTextBox*)mpCenterScreen->search(MULTI_CHAR('fitem_n1'));
textBox[1] = (J2DTextBox*)mpCenterScreen->search(MULTI_CHAR('fitem_n2'));
textBox[2] = (J2DTextBox*)mpCenterScreen->search(MULTI_CHAR('fitem_n3'));
textBox[3] = (J2DTextBox*)mpCenterScreen->search(MULTI_CHAR('fitem_n4'));
#endif
if (mNameStringID != i_stringID) {
for (int i = 0; i < 4; i++) {
src/d/d_menu_save.cpp
+42 -42
View File
@@ -150,28 +150,28 @@ void dMenu_save_c::_create() {
}
void dMenu_save_c::screenSet() {
static u64 l_tagName0[3] = {'w_sel_00', 'w_sel_01', 'w_sel_02'};
static u64 l_tagName000[2] = {'w_no_t', 'w_yes_t'};
static u64 l_tagName000U[2] = {'f_no_t', 'f_yes_t'};
static u64 l_tagName00[2] = {'w_modo', 'w_kete'};
static u64 l_tagName00U[2] = {'f_modo', 'f_kete'};
static u64 l_tagName3[3] = {'w_moyo00', 'w_moyo01', 'w_moyo02'};
static u64 l_tagName4[3] = {'w_gold00', 'w_gold01', 'w_gold02'};
static u64 l_tagName5[3] = {'w_go2_00', 'w_go2_01', 'w_go2_02'};
static u64 l_tagName9[2] = {'w_no_m', 'w_yes_m'};
static u64 l_tagName10[2] = {'w_no_g', 'w_yes_g'};
static u64 l_tagName11[2] = {'w_no_gr', 'w_yes_gr'};
static u64 l_tagName12[3] = {'w_bk_l00', 'w_bk_l01', 'w_bk_l02'};
static u64 l_tagName0[3] = {MULTI_CHAR('w_sel_00'), MULTI_CHAR('w_sel_01'), MULTI_CHAR('w_sel_02')};
static u64 l_tagName000[2] = {MULTI_CHAR('w_no_t'), MULTI_CHAR('w_yes_t')};
static u64 l_tagName000U[2] = {MULTI_CHAR('f_no_t'), MULTI_CHAR('f_yes_t')};
static u64 l_tagName00[2] = {MULTI_CHAR('w_modo'), MULTI_CHAR('w_kete')};
static u64 l_tagName00U[2] = {MULTI_CHAR('f_modo'), MULTI_CHAR('f_kete')};
static u64 l_tagName3[3] = {MULTI_CHAR('w_moyo00'), MULTI_CHAR('w_moyo01'), MULTI_CHAR('w_moyo02')};
static u64 l_tagName4[3] = {MULTI_CHAR('w_gold00'), MULTI_CHAR('w_gold01'), MULTI_CHAR('w_gold02')};
static u64 l_tagName5[3] = {MULTI_CHAR('w_go2_00'), MULTI_CHAR('w_go2_01'), MULTI_CHAR('w_go2_02')};
static u64 l_tagName9[2] = {MULTI_CHAR('w_no_m'), MULTI_CHAR('w_yes_m')};
static u64 l_tagName10[2] = {MULTI_CHAR('w_no_g'), MULTI_CHAR('w_yes_g')};
static u64 l_tagName11[2] = {MULTI_CHAR('w_no_gr'), MULTI_CHAR('w_yes_gr')};
static u64 l_tagName12[3] = {MULTI_CHAR('w_bk_l00'), MULTI_CHAR('w_bk_l01'), MULTI_CHAR('w_bk_l02')};
#if VERSION == VERSION_GCN_JPN
static u64 l_tagName21[2] = {'w_tabi_s', 'w_tabi_x'};
static u64 l_tagName20[2] = {'w_er_msg', 'w_er_msR'};
static u64 l_tagName21[2] = {MULTI_CHAR('w_tabi_s'), MULTI_CHAR('w_tabi_x')};
static u64 l_tagName20[2] = {MULTI_CHAR('w_er_msg'), MULTI_CHAR('w_er_msR')};
#else
static u64 l_tagName21[2] = {'t_for', 't_for1'};
static u64 l_tagName211[10] = {'tmoyou00', 'tmoyou01', 'tmoyou02', 'tmoyou03', 'tmoyou04',
'tmoyou05', 'tmoyou06', 'tmoyou07', 'tmoyou08', 'tmoyou09'};
static u64 l_tagName20[2] = {'er_for0', 'er_for1'};
static u64 l_tagName21[2] = {MULTI_CHAR('t_for'), MULTI_CHAR('t_for1')};
static u64 l_tagName211[10] = {MULTI_CHAR('tmoyou00'), MULTI_CHAR('tmoyou01'), MULTI_CHAR('tmoyou02'), MULTI_CHAR('tmoyou03'), MULTI_CHAR('tmoyou04'),
MULTI_CHAR('tmoyou05'), MULTI_CHAR('tmoyou06'), MULTI_CHAR('tmoyou07'), MULTI_CHAR('tmoyou08'), MULTI_CHAR('tmoyou09')};
static u64 l_tagName20[2] = {MULTI_CHAR('er_for0'), MULTI_CHAR('er_for1')};
#endif
static u64 l_tagName13[3] = {'w_dat_i0', 'w_dat_i1', 'w_dat_i2'};
static u64 l_tagName13[3] = {MULTI_CHAR('w_dat_i0'), MULTI_CHAR('w_dat_i1'), MULTI_CHAR('w_dat_i2')};
static u8 l_msgNum0[2] = {0x08, 0x07};
static u8 l_msgNum[2] = {0x54, 0x55};
@@ -193,15 +193,15 @@ void dMenu_save_c::screenSet() {
field_0x48->searchUpdateMaterialID(mSaveSel.Scr);
field_0x4c->searchUpdateMaterialID(mSaveSel.Scr);
mpSelectMoveBase = new CPaneMgr(mSaveSel.Scr, 'w_move_n', 0, NULL);
field_0xa0 = mSaveSel.Scr->search('wmenu_n');
mpSelectMoveBase = new CPaneMgr(mSaveSel.Scr, MULTI_CHAR('w_move_n'), 0, NULL);
field_0xa0 = mSaveSel.Scr->search(MULTI_CHAR('wmenu_n'));
for (int i = 0; i < 3; i++) {
mpSelData[i] = new CPaneMgr(mSaveSel.Scr, l_tagName0[i], 0, NULL);
}
mpNoYes[0] = new CPaneMgr(mSaveSel.Scr, 'w_no_n', 0, NULL);
mpNoYes[1] = new CPaneMgr(mSaveSel.Scr, 'w_yes_n', 0, NULL);
mpNoYes[0] = new CPaneMgr(mSaveSel.Scr, MULTI_CHAR('w_no_n'), 0, NULL);
mpNoYes[1] = new CPaneMgr(mSaveSel.Scr, MULTI_CHAR('w_yes_n'), 0, NULL);
for (int i = 0; i < 2; i++) {
#if VERSION == VERSION_GCN_JPN
@@ -218,17 +218,17 @@ void dMenu_save_c::screenSet() {
((J2DTextBox*)mpNoYesTxt[i]->getPanePtr())->setString(message);
}
mSaveSel.Scr->search('Wi_btn_n')->hide();
mSaveSel.Scr->search('GC_btn_n')->show();
mSaveSel.Scr->search(MULTI_CHAR('Wi_btn_n'))->hide();
mSaveSel.Scr->search(MULTI_CHAR('GC_btn_n'))->show();
mpBBtnIcon = new CPaneMgrAlpha(mSaveSel.Scr, 'w_nbbtn', 2, NULL);
mpABtnIcon = new CPaneMgrAlpha(mSaveSel.Scr, 'w_nabtn', 2, NULL);
mpBBtnIcon = new CPaneMgrAlpha(mSaveSel.Scr, MULTI_CHAR('w_nbbtn'), 2, NULL);
mpABtnIcon = new CPaneMgrAlpha(mSaveSel.Scr, MULTI_CHAR('w_nabtn'), 2, NULL);
#if VERSION == VERSION_GCN_JPN
mpBackTxt = new CPaneMgrAlpha(mSaveSel.Scr, 'w_modo', 2, NULL);
mpConfirmTxt = new CPaneMgrAlpha(mSaveSel.Scr, 'w_kete', 2, NULL);
mpBackTxt = new CPaneMgrAlpha(mSaveSel.Scr, MULTI_CHAR('w_modo'), 2, NULL);
mpConfirmTxt = new CPaneMgrAlpha(mSaveSel.Scr, MULTI_CHAR('w_kete'), 2, NULL);
#else
mpBackTxt = new CPaneMgrAlpha(mSaveSel.Scr, 'f_modo', 2, NULL);
mpConfirmTxt = new CPaneMgrAlpha(mSaveSel.Scr, 'f_kete', 2, NULL);
mpBackTxt = new CPaneMgrAlpha(mSaveSel.Scr, MULTI_CHAR('f_modo'), 2, NULL);
mpConfirmTxt = new CPaneMgrAlpha(mSaveSel.Scr, MULTI_CHAR('f_kete'), 2, NULL);
#endif
mpBackTxt->setAlpha(0);
@@ -314,11 +314,11 @@ void dMenu_save_c::screenSet() {
}
#if VERSION == VERSION_GCN_JPN
mSaveSel.Scr->search('t_for')->hide();
mSaveSel.Scr->search('t_for1')->hide();
mSaveSel.Scr->search(MULTI_CHAR('t_for'))->hide();
mSaveSel.Scr->search(MULTI_CHAR('t_for1'))->hide();
#else
mSaveSel.Scr->search('w_tabi_s')->hide();
mSaveSel.Scr->search('w_tabi_x')->hide();
mSaveSel.Scr->search(MULTI_CHAR('w_tabi_s'))->hide();
mSaveSel.Scr->search(MULTI_CHAR('w_tabi_x'))->hide();
for (int i = 0; i < 10; i++) {
mSaveSel.Scr->search(l_tagName211[i])->hide();
@@ -346,13 +346,13 @@ void dMenu_save_c::screenSet() {
mpHeaderTxtPane[1]->setAlpha(0);
mHeaderTxtType = 0;
field_0xb4 = mSaveSel.Scr->search('w_er_n');
field_0xb4 = mSaveSel.Scr->search(MULTI_CHAR('w_er_n'));
#if VERSION == VERSION_GCN_JPN
mSaveSel.Scr->search('er_for0')->hide();
mSaveSel.Scr->search('er_for1')->hide();
mSaveSel.Scr->search(MULTI_CHAR('er_for0'))->hide();
mSaveSel.Scr->search(MULTI_CHAR('er_for1'))->hide();
#else
mSaveSel.Scr->search('w_er_msg')->hide();
mSaveSel.Scr->search('w_er_msR')->hide();
mSaveSel.Scr->search(MULTI_CHAR('w_er_msg'))->hide();
mSaveSel.Scr->search(MULTI_CHAR('w_er_msR'))->hide();
#endif
for (int i = 0; i < 2; i++) {
@@ -391,7 +391,7 @@ void dMenu_save_c::screenSet() {
mSelIcon->setPos(pos.x, pos.y, mpSelData[mSelectedFile]->getPanePtr(), true);
mSelIcon->setAlphaRate(0.0f);
J2DPane* pane = mSaveSel.Scr->search('Nm_02');
J2DPane* pane = mSaveSel.Scr->search(MULTI_CHAR('Nm_02'));
pane->setAnimation(field_0x40);
field_0x64 = 0;
field_0x50 = 1;
@@ -794,7 +794,7 @@ void dMenu_save_c::saveQuestion() {
if (mYesNoCursor == CURSOR_YES) {
field_0x1c0 = 1;
J2DPane* pane = mSaveSel.Scr->search('Nm_02');
J2DPane* pane = mSaveSel.Scr->search(MULTI_CHAR('Nm_02'));
pane->setAnimation(field_0x40);
field_0xd2 = 0;
src/d/d_menu_skill.cpp
+33 -33
View File
@@ -361,57 +361,57 @@ void dMenu_Skill_c::read_close_move() {
void dMenu_Skill_c::screenSetMenu() {
static const u64 tag_sub0[7] = {
'menu_t0s', 'menu_t1s', 'menu_t2s', 'menu_t3s', 'menu_t4s', 'menu_t5s', 'menu_t51',
MULTI_CHAR('menu_t0s'), MULTI_CHAR('menu_t1s'), MULTI_CHAR('menu_t2s'), MULTI_CHAR('menu_t3s'), MULTI_CHAR('menu_t4s'), MULTI_CHAR('menu_t5s'), MULTI_CHAR('menu_t51'),
};
static const u64 tag_sub1[7] = {
'menu_t0', 'menu_t1', 'menu_t2', 'menu_t3', 'menu_t4', 'menu_t5', 'menu_t6',
MULTI_CHAR('menu_t0'), MULTI_CHAR('menu_t1'), MULTI_CHAR('menu_t2'), MULTI_CHAR('menu_t3'), MULTI_CHAR('menu_t4'), MULTI_CHAR('menu_t5'), MULTI_CHAR('menu_t6'),
};
static const u64 tag_name0[7] = {
'menu_t6s', 'menu_f7s', 'menu_f8s', 'menu_t9s', 'menu_10s', 'menu_11s', 'menu_112',
MULTI_CHAR('menu_t6s'), MULTI_CHAR('menu_f7s'), MULTI_CHAR('menu_f8s'), MULTI_CHAR('menu_t9s'), MULTI_CHAR('menu_10s'), MULTI_CHAR('menu_11s'), MULTI_CHAR('menu_112'),
};
static const u64 tag_name1[7] = {
'menu_f6', 'menu_f7', 'menu_t8', 'menu_t9', 'menu_t10', 'menu_t11', 'menu_t01',
MULTI_CHAR('menu_f6'), MULTI_CHAR('menu_f7'), MULTI_CHAR('menu_t8'), MULTI_CHAR('menu_t9'), MULTI_CHAR('menu_t10'), MULTI_CHAR('menu_t11'), MULTI_CHAR('menu_t01'),
};
static const u64 ftag_sub0[7] = {
'fenu_t0s', 'fenu_t1s', 'fenu_t2s', 'fenu_t3s', 'fenu_t4s', 'fenu_t5s', 'fenu_t6s',
MULTI_CHAR('fenu_t0s'), MULTI_CHAR('fenu_t1s'), MULTI_CHAR('fenu_t2s'), MULTI_CHAR('fenu_t3s'), MULTI_CHAR('fenu_t4s'), MULTI_CHAR('fenu_t5s'), MULTI_CHAR('fenu_t6s'),
};
static const u64 ftag_sub1[7] = {
'fenu_t0', 'fenu_t1', 'fenu_t2', 'fenu_t3', 'fenu_t4', 'fenu_t5', 'fenu_t6',
MULTI_CHAR('fenu_t0'), MULTI_CHAR('fenu_t1'), MULTI_CHAR('fenu_t2'), MULTI_CHAR('fenu_t3'), MULTI_CHAR('fenu_t4'), MULTI_CHAR('fenu_t5'), MULTI_CHAR('fenu_t6'),
};
static const u64 ftag_name0[7] = {
'fenu_t7s', 'fenu_t8s', 'fenu_t9s', 'fenu_10s', 'fenu_11s', 'fenu_12s', 'fenu_13s',
MULTI_CHAR('fenu_t7s'), MULTI_CHAR('fenu_t8s'), MULTI_CHAR('fenu_t9s'), MULTI_CHAR('fenu_10s'), MULTI_CHAR('fenu_11s'), MULTI_CHAR('fenu_12s'), MULTI_CHAR('fenu_13s'),
};
static const u64 ftag_name1[7] = {
'fenu_t7', 'fenu_t8', 'fenu_t9', 'fenu_10', 'fenu_11', 'fenu_12', 'fenu_13',
MULTI_CHAR('fenu_t7'), MULTI_CHAR('fenu_t8'), MULTI_CHAR('fenu_t9'), MULTI_CHAR('fenu_10'), MULTI_CHAR('fenu_11'), MULTI_CHAR('fenu_12'), MULTI_CHAR('fenu_13'),
};
static const u64 tag_letter[7] = {
'let_00_n', 'let_01_n', 'let_02_n', 'let_03_n', 'let_04_n', 'let_05_n', 'let_06_n',
MULTI_CHAR('let_00_n'), MULTI_CHAR('let_01_n'), MULTI_CHAR('let_02_n'), MULTI_CHAR('let_03_n'), MULTI_CHAR('let_04_n'), MULTI_CHAR('let_05_n'), MULTI_CHAR('let_06_n'),
};
static const u64 tag_frame[7] = {
'flame_00', 'flame_01', 'flame_02', 'flame_03', 'flame_04', 'flame_05', 'flame_06',
MULTI_CHAR('flame_00'), MULTI_CHAR('flame_01'), MULTI_CHAR('flame_02'), MULTI_CHAR('flame_03'), MULTI_CHAR('flame_04'), MULTI_CHAR('flame_05'), MULTI_CHAR('flame_06'),
};
static const u64 tag_maki[7] = {
'maki_0n', 'maki_1n', 'maki_2n', 'maki_3n', 'maki_4n', 'maki_5n', 'maki_6n',
MULTI_CHAR('maki_0n'), MULTI_CHAR('maki_1n'), MULTI_CHAR('maki_2n'), MULTI_CHAR('maki_3n'), MULTI_CHAR('maki_4n'), MULTI_CHAR('maki_5n'), MULTI_CHAR('maki_6n'),
};
static const u64 tag_makic[7] = {
'maki_0', 'maki_1', 'maki_2', 'maki_3', 'maki_4', 'maki_5', 'maki_6',
MULTI_CHAR('maki_0'), MULTI_CHAR('maki_1'), MULTI_CHAR('maki_2'), MULTI_CHAR('maki_3'), MULTI_CHAR('maki_4'), MULTI_CHAR('maki_5'), MULTI_CHAR('maki_6'),
};
mpMenuScreen = new J2DScreen();
mpMenuScreen->setPriority("zelda_ougi_window.blo", 0x20000, mpArchive);
dPaneClass_showNullPane(mpMenuScreen);
mpParent = new CPaneMgr(mpMenuScreen, 'n_all', 2, NULL);
mpParent = new CPaneMgr(mpMenuScreen, MULTI_CHAR('n_all'), 2, NULL);
mpParent->setAlphaRate(0.0f);
for (int i = 0; i < 7; i++) {
#if VERSION == VERSION_GCN_JPN
@@ -470,11 +470,11 @@ void dMenu_Skill_c::screenSetMenu() {
}
}
#if VERSION == VERSION_GCN_JPN
J2DTextBox* textBox = (J2DTextBox*)mpMenuScreen->search('t_t00');
mpMenuScreen->search('f_t00')->hide();
J2DTextBox* textBox = (J2DTextBox*)mpMenuScreen->search(MULTI_CHAR('t_t00'));
mpMenuScreen->search(MULTI_CHAR('f_t00'))->hide();
#else
J2DTextBox* textBox = (J2DTextBox*)mpMenuScreen->search('f_t00');
mpMenuScreen->search('t_t00')->hide();
J2DTextBox* textBox = (J2DTextBox*)mpMenuScreen->search(MULTI_CHAR('f_t00'));
mpMenuScreen->search(MULTI_CHAR('t_t00'))->hide();
#endif
textBox->setFont(mDoExt_getSubFont());
textBox->setString(0x200, "");
@@ -483,29 +483,29 @@ void dMenu_Skill_c::screenSetMenu() {
void dMenu_Skill_c::screenSetLetter() {
static const u64 name_tag[4] = {
'item_n04',
'item_n05',
'item_n06',
'item_n07',
MULTI_CHAR('item_n04'),
MULTI_CHAR('item_n05'),
MULTI_CHAR('item_n06'),
MULTI_CHAR('item_n07'),
};
static const u64 fame_tag[4] = {
'f_item_1',
'f_item_2',
'f_item_3',
'f_item_4',
MULTI_CHAR('f_item_1'),
MULTI_CHAR('f_item_2'),
MULTI_CHAR('f_item_3'),
MULTI_CHAR('f_item_4'),
};
mpLetterScreen = new J2DScreen();
mpLetterScreen->setPriority("zelda_ougi_info.blo", 0x20000, mpArchive);
dPaneClass_showNullPane(mpLetterScreen);
#if VERSION == VERSION_GCN_JPN
mpTextPane = new CPaneMgr(mpLetterScreen, 'mg_3line', 0, NULL);
mpLetterScreen->search('n_e4line')->hide();
mpTextPane = new CPaneMgr(mpLetterScreen, MULTI_CHAR('mg_3line'), 0, NULL);
mpLetterScreen->search(MULTI_CHAR('n_e4line'))->hide();
#else
mpTextPane = new CPaneMgr(mpLetterScreen, 'mg_e4lin', 0, NULL);
mpLetterScreen->search('n_3line')->hide();
mpTextPane = new CPaneMgr(mpLetterScreen, MULTI_CHAR('mg_e4lin'), 0, NULL);
mpLetterScreen->search(MULTI_CHAR('n_3line'))->hide();
#endif
mpExpName = new CPaneMgr(mpLetterScreen, 'label_n', 0, NULL);
mpExpName = new CPaneMgr(mpLetterScreen, MULTI_CHAR('label_n'), 0, NULL);
J2DTextBox* paneFont = (J2DTextBox*)mpTextPane->getPanePtr();
paneFont->setFont(mDoExt_getMesgFont());
J2DTextBox* paneString = (J2DTextBox*)mpTextPane->getPanePtr();
@@ -521,7 +521,7 @@ void dMenu_Skill_c::screenSetLetter() {
mpNameString[i]->setFont(mDoExt_getMesgFont());
mpNameString[i]->setString(0x40, "");
}
mpTextParent = new CPaneMgr(mpLetterScreen, 'n_all', 2, NULL);
mpTextParent = new CPaneMgr(mpLetterScreen, MULTI_CHAR('n_all'), 2, NULL);
mpTextParent->setAlphaRate(0.0f);
ResTIMG* timg = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', "tt_block8x8.bti");
mpBlackTex = new J2DPicture(timg);
@@ -531,10 +531,10 @@ void dMenu_Skill_c::screenSetLetter() {
void dMenu_Skill_c::screenSetDoIcon() {
static const u64 text_a_tag[5] = {
'atext1_1', 'atext1_2', 'atext1_3', 'atext1_4', 'atext1_5',
MULTI_CHAR('atext1_1'), MULTI_CHAR('atext1_2'), MULTI_CHAR('atext1_3'), MULTI_CHAR('atext1_4'), MULTI_CHAR('atext1_5'),
};
static const u64 text_b_tag[5] = {
'btext1_1', 'btext1_2', 'btext1_3', 'btext1_4', 'btext1_5',
MULTI_CHAR('btext1_1'), MULTI_CHAR('btext1_2'), MULTI_CHAR('btext1_3'), MULTI_CHAR('btext1_4'), MULTI_CHAR('btext1_5'),
};
mpIconScreen = new J2DScreen();
mpIconScreen->setPriority("zelda_collect_soubi_do_icon_parts.blo", 0x20000, mpArchive);
src/d/d_meter2_draw.cpp
+145 -145
View File
@@ -50,7 +50,7 @@ dMeter2Draw_c::dMeter2Draw_c(JKRExpHeap* mp_heap) {
JUT_ASSERT(0, fg != false);
dPaneClass_showNullPane(mpScreen);
mpScreen->search('ju_ring5')->hide();
mpScreen->search(MULTI_CHAR('ju_ring5'))->hide();
field_0x73c = 0.0f;
for (int i = 0; i < 2; i++) {
@@ -71,10 +71,10 @@ dMeter2Draw_c::dMeter2Draw_c(JKRExpHeap* mp_heap) {
JUT_ASSERT(0, fg != false);
dPaneClass_showNullPane(mpPikariScreen);
mpPikariParent = new CPaneMgr(mpPikariScreen, 'pika_n', 0, NULL);
mpPikariParent = new CPaneMgr(mpPikariScreen, MULTI_CHAR('pika_n'), 0, NULL);
JUT_ASSERT(0, mpPikariParent != NULL);
mPikariBlack = static_cast<J2DPicture*>(mpPikariScreen->search('pika00'))->getBlack();
mPikariWhite = static_cast<J2DPicture*>(mpPikariScreen->search('pika00'))->getWhite();
mPikariBlack = static_cast<J2DPicture*>(mpPikariScreen->search(MULTI_CHAR('pika00')))->getBlack();
mPikariWhite = static_cast<J2DPicture*>(mpPikariScreen->search(MULTI_CHAR('pika00')))->getWhite();
OSInitFastCast();
void* pikari_bck = JKRGetNameResource("zelda_icon_pikari.bck", dComIfGp_getMain2DArchive());
@@ -86,14 +86,14 @@ dMeter2Draw_c::dMeter2Draw_c(JKRExpHeap* mp_heap) {
mPikariBpk->searchUpdateMaterialID(mpPikariScreen);
playPikariBpkAnimation(1.0f);
mpParent = new CPaneMgr(mpScreen, 'n_all', 2, NULL);
mpParent = new CPaneMgr(mpScreen, MULTI_CHAR('n_all'), 2, NULL);
JUT_ASSERT(0, mpParent != NULL);
static u64 const a_tag[] = {'cont_at1', 'cont_at2', 'cont_at3', 'cont_at4', 'cont_at'};
static u64 const b_tag[] = {'cont_bt1', 'cont_bt2', 'cont_bt3', 'cont_bt4', 'cont_bt'};
static u64 const z_tag[] = {'cont_zt1', 'cont_zt2', 'cont_zt3', 'cont_zt4', 'cont_rt'};
static u64 const x_tag[] = {'cont_xt1', 'cont_xt2', 'cont_xt3', 'cont_xt4', 'cont_xt5'};
static u64 const y_tag[] = {'cont_yt1', 'cont_yt2', 'cont_yt3', 'cont_yt4', 'cont_yt5'};
static u64 const a_tag[] = {MULTI_CHAR('cont_at1'), MULTI_CHAR('cont_at2'), MULTI_CHAR('cont_at3'), MULTI_CHAR('cont_at4'), MULTI_CHAR('cont_at')};
static u64 const b_tag[] = {MULTI_CHAR('cont_bt1'), MULTI_CHAR('cont_bt2'), MULTI_CHAR('cont_bt3'), MULTI_CHAR('cont_bt4'), MULTI_CHAR('cont_bt')};
static u64 const z_tag[] = {MULTI_CHAR('cont_zt1'), MULTI_CHAR('cont_zt2'), MULTI_CHAR('cont_zt3'), MULTI_CHAR('cont_zt4'), MULTI_CHAR('cont_rt')};
static u64 const x_tag[] = {MULTI_CHAR('cont_xt1'), MULTI_CHAR('cont_xt2'), MULTI_CHAR('cont_xt3'), MULTI_CHAR('cont_xt4'), MULTI_CHAR('cont_xt5')};
static u64 const y_tag[] = {MULTI_CHAR('cont_yt1'), MULTI_CHAR('cont_yt2'), MULTI_CHAR('cont_yt3'), MULTI_CHAR('cont_yt4'), MULTI_CHAR('cont_yt5')};
for (int i = 0; i < 5; i++) {
mpAText[i] = new CPaneMgr(mpScreen, a_tag[i], 0, NULL);
@@ -721,36 +721,36 @@ void dMeter2Draw_c::initLife() {
}
static u64 const life_tag[] = {
'hpb_00', 'hpb_01', 'hpb_02', 'hpb_03', 'hpb_04', 'hpb_05', 'hpb_06',
'hpb_07', 'hpb_08', 'hpb_09', 'hpb_10', 'hpb_11', 'hpb_12', 'hpb_13',
'hpb_14', 'hpb_15', 'hpb_16', 'hpb_17', 'hpb_18', 'hpb_19',
MULTI_CHAR('hpb_00'), MULTI_CHAR('hpb_01'), MULTI_CHAR('hpb_02'), MULTI_CHAR('hpb_03'), MULTI_CHAR('hpb_04'), MULTI_CHAR('hpb_05'), MULTI_CHAR('hpb_06'),
MULTI_CHAR('hpb_07'), MULTI_CHAR('hpb_08'), MULTI_CHAR('hpb_09'), MULTI_CHAR('hpb_10'), MULTI_CHAR('hpb_11'), MULTI_CHAR('hpb_12'), MULTI_CHAR('hpb_13'),
MULTI_CHAR('hpb_14'), MULTI_CHAR('hpb_15'), MULTI_CHAR('hpb_16'), MULTI_CHAR('hpb_17'), MULTI_CHAR('hpb_18'), MULTI_CHAR('hpb_19'),
};
static u64 const mark_tag[] = {
'heartn00', 'heartn01', 'heartn02', 'heartn03', 'heartn04', 'heartn05', 'heartn06',
'heartn07', 'heartn08', 'heartn09', 'heartn10', 'heartn11', 'heartn12', 'heartn13',
'heartn14', 'heartn15', 'heartn16', 'heartn17', 'heartn18', 'heartn19',
MULTI_CHAR('heartn00'), MULTI_CHAR('heartn01'), MULTI_CHAR('heartn02'), MULTI_CHAR('heartn03'), MULTI_CHAR('heartn04'), MULTI_CHAR('heartn05'), MULTI_CHAR('heartn06'),
MULTI_CHAR('heartn07'), MULTI_CHAR('heartn08'), MULTI_CHAR('heartn09'), MULTI_CHAR('heartn10'), MULTI_CHAR('heartn11'), MULTI_CHAR('heartn12'), MULTI_CHAR('heartn13'),
MULTI_CHAR('heartn14'), MULTI_CHAR('heartn15'), MULTI_CHAR('heartn16'), MULTI_CHAR('heartn17'), MULTI_CHAR('heartn18'), MULTI_CHAR('heartn19'),
};
static u64 const base_tag[] = {
'h_ba_n00', 'h_ba_n01', 'h_ba_n02', 'h_ba_n03', 'h_ba_n04', 'h_ba_n05', 'h_ba_n06',
'h_ba_n07', 'h_ba_n08', 'h_ba_n09', 'h_ba_n10', 'h_ba_n11', 'h_ba_n12', 'h_ba_n13',
'h_ba_n14', 'h_ba_n15', 'h_ba_n16', 'h_ba_n17', 'h_ba_n18', 'h_ba_n19',
MULTI_CHAR('h_ba_n00'), MULTI_CHAR('h_ba_n01'), MULTI_CHAR('h_ba_n02'), MULTI_CHAR('h_ba_n03'), MULTI_CHAR('h_ba_n04'), MULTI_CHAR('h_ba_n05'), MULTI_CHAR('h_ba_n06'),
MULTI_CHAR('h_ba_n07'), MULTI_CHAR('h_ba_n08'), MULTI_CHAR('h_ba_n09'), MULTI_CHAR('h_ba_n10'), MULTI_CHAR('h_ba_n11'), MULTI_CHAR('h_ba_n12'), MULTI_CHAR('h_ba_n13'),
MULTI_CHAR('h_ba_n14'), MULTI_CHAR('h_ba_n15'), MULTI_CHAR('h_ba_n16'), MULTI_CHAR('h_ba_n17'), MULTI_CHAR('h_ba_n18'), MULTI_CHAR('h_ba_n19'),
};
static u64 const lifet1_tag[] = {
'hear_00s', 'hear_01s', 'hear_02s', 'hear_03s', 'hear_04s', 'hear_05s', 'hear_06s',
'hear_07s', 'hear_08s', 'hear_09s', 'hear_10s', 'hear_11s', 'hear_12s', 'hear_13s',
'hear_14s', 'hear_15s', 'hear_16s', 'hear_17s', 'hear_18s', 'hear_19s',
MULTI_CHAR('hear_00s'), MULTI_CHAR('hear_01s'), MULTI_CHAR('hear_02s'), MULTI_CHAR('hear_03s'), MULTI_CHAR('hear_04s'), MULTI_CHAR('hear_05s'), MULTI_CHAR('hear_06s'),
MULTI_CHAR('hear_07s'), MULTI_CHAR('hear_08s'), MULTI_CHAR('hear_09s'), MULTI_CHAR('hear_10s'), MULTI_CHAR('hear_11s'), MULTI_CHAR('hear_12s'), MULTI_CHAR('hear_13s'),
MULTI_CHAR('hear_14s'), MULTI_CHAR('hear_15s'), MULTI_CHAR('hear_16s'), MULTI_CHAR('hear_17s'), MULTI_CHAR('hear_18s'), MULTI_CHAR('hear_19s'),
};
static u64 const lifet2_tag[] = {
'hear_00', 'hear_01', 'hear_02', 'hear_03', 'hear_04', 'hear_05', 'hear_06',
'hear_07', 'hear_08', 'hear_09', 'hear_10', 'hear_11', 'hear_12', 'hear_13',
'hear_14', 'hear_15', 'hear_16', 'hear_17', 'hear_18', 'hear_19',
MULTI_CHAR('hear_00'), MULTI_CHAR('hear_01'), MULTI_CHAR('hear_02'), MULTI_CHAR('hear_03'), MULTI_CHAR('hear_04'), MULTI_CHAR('hear_05'), MULTI_CHAR('hear_06'),
MULTI_CHAR('hear_07'), MULTI_CHAR('hear_08'), MULTI_CHAR('hear_09'), MULTI_CHAR('hear_10'), MULTI_CHAR('hear_11'), MULTI_CHAR('hear_12'), MULTI_CHAR('hear_13'),
MULTI_CHAR('hear_14'), MULTI_CHAR('hear_15'), MULTI_CHAR('hear_16'), MULTI_CHAR('hear_17'), MULTI_CHAR('hear_18'), MULTI_CHAR('hear_19'),
};
mpLifeParent = new CPaneMgr(mpScreen, 'heart_n', 2, NULL);
mpLifeParent = new CPaneMgr(mpScreen, MULTI_CHAR('heart_n'), 2, NULL);
JUT_ASSERT(0, mpLifeParent != NULL);
for (int i = 0; i < 20; i++) {
@@ -770,7 +770,7 @@ void dMeter2Draw_c::initLife() {
JUT_ASSERT(0, mpLifeTexture[i][1] != NULL);
}
mpBigHeart = new CPaneMgr(mpScreen, 'bigh_n', 2, NULL);
mpBigHeart = new CPaneMgr(mpScreen, MULTI_CHAR('bigh_n'), 2, NULL);
JUT_ASSERT(0, mpBigHeart != NULL);
mpLifeParent->setAlphaRate(0.0f);
@@ -791,20 +791,20 @@ void dMeter2Draw_c::initMagic() {
field_0x550 = 0.0f;
field_0x554 = 0.0f;
mpMagicParent = new CPaneMgr(mpKanteraScreen, 'magic_n', 2, NULL);
mpMagicParent = new CPaneMgr(mpKanteraScreen, MULTI_CHAR('magic_n'), 2, NULL);
JUT_ASSERT(0, mpMagicParent != NULL);
mpMagicBase = new CPaneMgr(mpKanteraScreen, 'mm_base', 0, NULL);
mpMagicBase = new CPaneMgr(mpKanteraScreen, MULTI_CHAR('mm_base'), 0, NULL);
JUT_ASSERT(0, mpMagicBase != NULL);
mpMagicFrameL = new CPaneMgr(mpKanteraScreen, 'm_w_l_n', 2, NULL);
mpMagicFrameL = new CPaneMgr(mpKanteraScreen, MULTI_CHAR('m_w_l_n'), 2, NULL);
JUT_ASSERT(0, mpMagicFrameL != NULL);
mpMagicFrameR =
new CPaneMgr(mpKanteraScreen, 'm_w_r_n', 2, NULL);
new CPaneMgr(mpKanteraScreen, MULTI_CHAR('m_w_r_n'), 2, NULL);
JUT_ASSERT(0, mpMagicFrameR != NULL);
mpMagicMeter = new CPaneMgr(mpKanteraScreen, 'mm_00', 0, NULL);
mpMagicMeter = new CPaneMgr(mpKanteraScreen, MULTI_CHAR('mm_00'), 0, NULL);
JUT_ASSERT(0, mpMagicMeter != NULL);
OSInitFastCast();
@@ -851,7 +851,7 @@ void dMeter2Draw_c::initMagic() {
}
void dMeter2Draw_c::initLightDrop() {
mpLightDropParent = new CPaneMgr(mpScreen, 's_tuta_n', 2, NULL);
mpLightDropParent = new CPaneMgr(mpScreen, MULTI_CHAR('s_tuta_n'), 2, NULL);
JUT_ASSERT(0, mpLightDropParent != NULL);
static u64 const tuta_0[] = {
@@ -860,13 +860,13 @@ void dMeter2Draw_c::initLightDrop() {
};
static u64 const tuta_1[] = {
'sl_00', 'sl_01', 'sl_02', 'sl_03', 'sl_04', 'sl_05', 'sl_06', 'sl_07',
'sl_08', 'sl_09', 'sl_10', 'sl_11', 'sl_12', 'sl_13', 'sl_14', 'sl_15',
MULTI_CHAR('sl_00'), MULTI_CHAR('sl_01'), MULTI_CHAR('sl_02'), MULTI_CHAR('sl_03'), MULTI_CHAR('sl_04'), MULTI_CHAR('sl_05'), MULTI_CHAR('sl_06'), MULTI_CHAR('sl_07'),
MULTI_CHAR('sl_08'), MULTI_CHAR('sl_09'), MULTI_CHAR('sl_10'), MULTI_CHAR('sl_11'), MULTI_CHAR('sl_12'), MULTI_CHAR('sl_13'), MULTI_CHAR('sl_14'), MULTI_CHAR('sl_15'),
};
static u64 const tuta_2[] = {
'scp_00', 'scp_01', 'scp_02', 'scp_03', 'scp_04', 'scp_05', 'scp_06', 'scp_07',
'scp_08', 'scp_09', 'scp_10', 'scp_11', 'scp_12', 'scp_13', 'scp_14', 'scp_15',
MULTI_CHAR('scp_00'), MULTI_CHAR('scp_01'), MULTI_CHAR('scp_02'), MULTI_CHAR('scp_03'), MULTI_CHAR('scp_04'), MULTI_CHAR('scp_05'), MULTI_CHAR('scp_06'), MULTI_CHAR('scp_07'),
MULTI_CHAR('scp_08'), MULTI_CHAR('scp_09'), MULTI_CHAR('scp_10'), MULTI_CHAR('scp_11'), MULTI_CHAR('scp_12'), MULTI_CHAR('scp_13'), MULTI_CHAR('scp_14'), MULTI_CHAR('scp_15'),
};
for (int i = 0; i < 16; i++) {
@@ -880,10 +880,10 @@ void dMeter2Draw_c::initLightDrop() {
JUT_ASSERT(0, mpSIParts[i][2] != NULL);
}
mpSIParent[0] = new CPaneMgr(mpScreen, 'tuta_n', 2, NULL);
mpSIParent[0] = new CPaneMgr(mpScreen, MULTI_CHAR('tuta_n'), 2, NULL);
JUT_ASSERT(0, mpSIParent[0] != NULL);
mpSIParent[1] = new CPaneMgr(mpScreen, 's_null', 2, NULL);
mpSIParent[1] = new CPaneMgr(mpScreen, MULTI_CHAR('s_null'), 2, NULL);
JUT_ASSERT(0, mpSIParent[1] != NULL);
mpLightDropParent->setAlphaRate(0.0f);
@@ -907,12 +907,12 @@ void dMeter2Draw_c::initLightDrop() {
}
void dMeter2Draw_c::initRupeeKey() {
mpRupeeKeyParent = new CPaneMgr(mpScreen, 'r_k_n', 2, NULL);
mpRupeeKeyParent = new CPaneMgr(mpScreen, MULTI_CHAR('r_k_n'), 2, NULL);
JUT_ASSERT(0, mpRupeeKeyParent != NULL);
field_0x718 = 1.0f;
static u64 const rupeet1_tag[] = {'r_n_1_s', 'r_n_2_s', 'r_n_3_s', 'r_n_4_s'};
static u64 const rupeet2_tag[] = {'r_n_1', 'r_n_2', 'r_n_3', 'r_n_4'};
static u64 const rupeet1_tag[] = {MULTI_CHAR('r_n_1_s'), MULTI_CHAR('r_n_2_s'), MULTI_CHAR('r_n_3_s'), MULTI_CHAR('r_n_4_s')};
static u64 const rupeet2_tag[] = {MULTI_CHAR('r_n_1'), MULTI_CHAR('r_n_2'), MULTI_CHAR('r_n_3'), MULTI_CHAR('r_n_4')};
for (int i = 0; i < 4; i++) {
mpRupeeTexture[i][0] = new CPaneMgr(mpScreen, rupeet1_tag[i], 0, NULL);
@@ -924,20 +924,20 @@ void dMeter2Draw_c::initRupeeKey() {
mpRupeeTexture[i][1]->getPanePtr()->setBasePosition(J2DBasePosition_4);
}
mpRupeeParent[0] = new CPaneMgr(mpScreen, 'rupi_n', 2, NULL);
mpRupeeParent[0] = new CPaneMgr(mpScreen, MULTI_CHAR('rupi_n'), 2, NULL);
JUT_ASSERT(0, mpRupeeParent[0] != NULL);
mpRupeeParent[1] = new CPaneMgr(mpScreen, 'moyou_rn', 2, NULL);
mpRupeeParent[1] = new CPaneMgr(mpScreen, MULTI_CHAR('moyou_rn'), 2, NULL);
JUT_ASSERT(0, mpRupeeParent[1] != NULL);
mpRupeeParent[2] = new CPaneMgr(mpScreen, 'moyou_ln', 2, NULL);
mpRupeeParent[2] = new CPaneMgr(mpScreen, MULTI_CHAR('moyou_ln'), 2, NULL);
JUT_ASSERT(0, mpRupeeParent[2] != NULL);
mpRupeeParent[0]->setAlphaRate(0.0f);
mpRupeeParent[1]->setAlphaRate(0.0f);
mpRupeeParent[2]->setAlphaRate(0.0f);
static u64 const key_tag[] = {'key_nul', 'k_n_1_n', 'k_n_2_n', 'k_n_3_n', 'k_n_4_n'};
static u64 const key_tag[] = {MULTI_CHAR('key_nul'), MULTI_CHAR('k_n_1_n'), MULTI_CHAR('k_n_2_n'), MULTI_CHAR('k_n_3_n'), MULTI_CHAR('k_n_4_n')};
for (int i = 0; i < 5; i++) {
mpKeyTexture[i] = new CPaneMgr(mpScreen, key_tag[i], 0, NULL);
@@ -946,7 +946,7 @@ void dMeter2Draw_c::initRupeeKey() {
mpKeyTexture[i]->hide();
}
mpKeyParent = new CPaneMgr(mpScreen, 'key_n', 2, NULL);
mpKeyParent = new CPaneMgr(mpScreen, MULTI_CHAR('key_n'), 2, NULL);
JUT_ASSERT(0, mpKeyParent != NULL);
mpKeyParent->setAlphaRate(0.0f);
@@ -988,7 +988,7 @@ void dMeter2Draw_c::initButton() {
}
}
mpItemB = new CPaneMgr(mpScreen, 'b_itm_p', 0, NULL);
mpItemB = new CPaneMgr(mpScreen, MULTI_CHAR('b_itm_p'), 0, NULL);
JUT_ASSERT(0, mpItemB != NULL);
mpItemB->getPanePtr()->setBasePosition(J2DBasePosition_4);
mpItemB->show();
@@ -1003,19 +1003,19 @@ void dMeter2Draw_c::initButton() {
field_0x771 = dComIfGs_getBButtonItemKey();
mpItemBPane = new J2DPicture(
'b_itm_pp',
MULTI_CHAR('b_itm_pp'),
JGeometry::TBox2<f32>(0.0f, 0.0f, mpItemB->getInitSizeX(), mpItemB->getInitSizeY()),
static_cast<J2DPicture*>(mpItemB->getPanePtr())->getTexture(0)->getTexInfo(), NULL);
JUT_ASSERT(0, mpItemBPane != NULL);
mpItemBPane->setBasePosition(J2DBasePosition_4);
mpItemB->getPanePtr()->appendChild(mpItemBPane);
mpItemXY[0] = new CPaneMgr(mpScreen, 'x_itm_p', 0, NULL);
mpItemXY[0] = new CPaneMgr(mpScreen, MULTI_CHAR('x_itm_p'), 0, NULL);
JUT_ASSERT(0, mpItemXY[0] != NULL);
mpItemXY[0]->getPanePtr()->setBasePosition(J2DBasePosition_4);
dMeter2Info_setMeterItemPanePtr(0, mpItemXY[0]);
mpItemXY[1] = new CPaneMgr(mpScreen, 'y_itm_p', 0, NULL);
mpItemXY[1] = new CPaneMgr(mpScreen, MULTI_CHAR('y_itm_p'), 0, NULL);
JUT_ASSERT(0, mpItemXY[1] != NULL);
mpItemXY[1]->getPanePtr()->setBasePosition(J2DBasePosition_4);
dMeter2Info_setMeterItemPanePtr(1, mpItemXY[1]);
@@ -1024,7 +1024,7 @@ void dMeter2Draw_c::initButton() {
mpBTextA = NULL;
mpItemXYPane[0] = new J2DPicture(
'x_itm_pp',
MULTI_CHAR('x_itm_pp'),
JGeometry::TBox2<f32>(0.0f, 0.0f, mpItemXY[0]->getInitSizeX(), mpItemXY[0]->getInitSizeY()),
static_cast<J2DPicture*>(mpItemXY[0]->getPanePtr())->getTexture(0)->getTexInfo(), NULL);
JUT_ASSERT(0, mpItemXYPane[0] != NULL);
@@ -1032,84 +1032,84 @@ void dMeter2Draw_c::initButton() {
mpItemXY[0]->getPanePtr()->appendChild(mpItemXYPane[0]);
mpItemXYPane[1] = new J2DPicture(
'y_itm_pp',
MULTI_CHAR('y_itm_pp'),
JGeometry::TBox2<f32>(0.0f, 0.0f, mpItemXY[1]->getInitSizeX(), mpItemXY[1]->getInitSizeY()),
static_cast<J2DPicture*>(mpItemXY[1]->getPanePtr())->getTexture(0)->getTexInfo(), NULL);
JUT_ASSERT(0, mpItemXYPane[1] != NULL);
mpItemXYPane[1]->setBasePosition(J2DBasePosition_4);
mpItemXY[1]->getPanePtr()->appendChild(mpItemXYPane[1]);
mpItemR = new CPaneMgr(mpScreen, 'r_itm_p', 0, NULL);
mpItemR = new CPaneMgr(mpScreen, MULTI_CHAR('r_itm_p'), 0, NULL);
JUT_ASSERT(0, mpItemR != NULL);
mpItemR->getPanePtr()->setBasePosition(J2DBasePosition_4);
dMeter2Info_setMeterItemPanePtr(2, mpItemR);
mpItemXYPane[2] = new J2DPicture(
'r_itm_pp',
MULTI_CHAR('r_itm_pp'),
JGeometry::TBox2<f32>(0.0f, 0.0f, mpItemR->getInitSizeX(), mpItemR->getInitSizeY()),
static_cast<J2DPicture*>(mpItemR->getPanePtr())->getTexture(0)->getTexInfo(), NULL);
JUT_ASSERT(0, mpItemXYPane[2] != NULL);
mpItemXYPane[2]->setBasePosition(J2DBasePosition_4);
mpItemR->getPanePtr()->appendChild(mpItemXYPane[2]);
mpLightB = new CPaneMgr(mpScreen, 'b_light', 0, NULL);
mpLightB = new CPaneMgr(mpScreen, MULTI_CHAR('b_light'), 0, NULL);
JUT_ASSERT(0, mpLightB != NULL);
mpLightB->getPanePtr()->setBasePosition(J2DBasePosition_4);
field_0x72c = 1.0f;
mpLightB->hide();
mpLightXY[0] = new CPaneMgr(mpScreen, 'x_light', 0, NULL);
mpLightXY[0] = new CPaneMgr(mpScreen, MULTI_CHAR('x_light'), 0, NULL);
JUT_ASSERT(0, mpLightXY[0] != NULL);
mpLightXY[0]->getPanePtr()->setBasePosition(J2DBasePosition_4);
mpLightXY[0]->hide();
mpLightXY[1] = new CPaneMgr(mpScreen, 'y_light', 0, NULL);
mpLightXY[1] = new CPaneMgr(mpScreen, MULTI_CHAR('y_light'), 0, NULL);
JUT_ASSERT(0, mpLightXY[1] != NULL);
mpLightXY[1]->getPanePtr()->setBasePosition(J2DBasePosition_4);
mpLightXY[1]->hide();
mpLightXY[2] = new CPaneMgr(mpScreen, 'r_light', 0, NULL);
mpLightXY[2] = new CPaneMgr(mpScreen, MULTI_CHAR('r_light'), 0, NULL);
JUT_ASSERT(0, mpLightXY[2] != NULL);
mpLightXY[2]->getPanePtr()->setBasePosition(J2DBasePosition_4);
mpLightXY[2]->hide();
mpBTextA = new CPaneMgr(mpScreen, 'b_text_a', 0, NULL);
mpBTextA = new CPaneMgr(mpScreen, MULTI_CHAR('b_text_a'), 0, NULL);
JUT_ASSERT(0, mpBTextA != NULL);
mpBTextB = new CPaneMgr(mpScreen, 'b_text_b', 0, NULL);
mpBTextB = new CPaneMgr(mpScreen, MULTI_CHAR('b_text_b'), 0, NULL);
JUT_ASSERT(0, mpBTextB != NULL);
mpBTextXY[0] = new CPaneMgr(mpScreen, 'b_text_x', 0, NULL);
mpBTextXY[0] = new CPaneMgr(mpScreen, MULTI_CHAR('b_text_x'), 0, NULL);
JUT_ASSERT(0, mpBTextXY[0] != NULL);
mpBTextXY[1] = new CPaneMgr(mpScreen, 'b_text_y', 0, NULL);
mpBTextXY[1] = new CPaneMgr(mpScreen, MULTI_CHAR('b_text_y'), 0, NULL);
JUT_ASSERT(0, mpBTextXY[1] != NULL);
mpBTextXY[2] = NULL;
mpTextA = new CPaneMgr(mpScreen, 'a_text_n', 0, NULL);
mpTextA = new CPaneMgr(mpScreen, MULTI_CHAR('a_text_n'), 0, NULL);
JUT_ASSERT(0, mpTextA != NULL);
mpTextB = new CPaneMgr(mpScreen, 'b_text_n', 0, NULL);
mpTextB = new CPaneMgr(mpScreen, MULTI_CHAR('b_text_n'), 0, NULL);
JUT_ASSERT(0, mpTextB != NULL);
mpTextXY[2] = new CPaneMgr(mpScreen, 'z_text_n', 0, NULL);
mpTextXY[2] = new CPaneMgr(mpScreen, MULTI_CHAR('z_text_n'), 0, NULL);
JUT_ASSERT(0, mpTextXY[2] != NULL);
mpTextXY[0] = new CPaneMgr(mpScreen, 'x_text_n', 0, NULL);
mpTextXY[0] = new CPaneMgr(mpScreen, MULTI_CHAR('x_text_n'), 0, NULL);
JUT_ASSERT(0, mpTextXY[0] != NULL);
mpTextXY[1] = new CPaneMgr(mpScreen, 'y_text_n', 0, NULL);
mpTextXY[1] = new CPaneMgr(mpScreen, MULTI_CHAR('y_text_n'), 0, NULL);
JUT_ASSERT(0, mpTextXY[1] != NULL);
mpTextI = new CPaneMgr(mpScreen, 'i_text_n', 2, NULL);
mpTextI = new CPaneMgr(mpScreen, MULTI_CHAR('i_text_n'), 2, NULL);
JUT_ASSERT(0, mpTextI != NULL);
mpTextM = new CPaneMgr(mpScreen, 'm_text_n', 2, NULL);
mpTextM = new CPaneMgr(mpScreen, MULTI_CHAR('m_text_n'), 2, NULL);
JUT_ASSERT(0, mpTextM != NULL);
static u64 const juji_i_tag[] = {'ju_ring4', 'yaji_00', 'yaji_01', 'ju_ring2', 'ju_ring4'};
static u64 const juji_m_tag[] = {'ju_ring3', 'yaji_02', 'yaji_03', 'ju_ring3', 0};
static u64 const juji_i_tag[] = {MULTI_CHAR('ju_ring4'), MULTI_CHAR('yaji_00'), MULTI_CHAR('yaji_01'), MULTI_CHAR('ju_ring2'), MULTI_CHAR('ju_ring4')};
static u64 const juji_m_tag[] = {MULTI_CHAR('ju_ring3'), MULTI_CHAR('yaji_02'), MULTI_CHAR('yaji_03'), MULTI_CHAR('ju_ring3'), 0};
for (int i = 0; i < 5; i++) {
if (juji_i_tag[i] != 0) {
@@ -1130,33 +1130,33 @@ void dMeter2Draw_c::initButton() {
mpTextXY[0]->hide();
mpTextXY[1]->hide();
mpButtonParent = new CPaneMgr(mpScreen, 'cont_n', 2, NULL);
mpButtonParent = new CPaneMgr(mpScreen, MULTI_CHAR('cont_n'), 2, NULL);
JUT_ASSERT(0, mpButtonParent != NULL);
mpButtonA = new CPaneMgr(mpScreen, 'abtn_n', 2, NULL);
mpButtonA = new CPaneMgr(mpScreen, MULTI_CHAR('abtn_n'), 2, NULL);
JUT_ASSERT(0, mpButtonA != NULL);
mpButtonB = new CPaneMgr(mpScreen, 'bbtn_n', 2, NULL);
mpButtonB = new CPaneMgr(mpScreen, MULTI_CHAR('bbtn_n'), 2, NULL);
JUT_ASSERT(0, mpButtonB != NULL);
field_0x730 = 1.0f;
mpButtonMidona = new CPaneMgr(mpScreen, 'midona_n', 2, NULL);
mpButtonMidona = new CPaneMgr(mpScreen, MULTI_CHAR('midona_n'), 2, NULL);
JUT_ASSERT(0, mpButtonMidona != NULL);
mButtonZAlpha = 0.0f;
field_0x724 = 0.0f;
field_0x738 = 0.0f;
field_0x740 = 0;
mpButtonXY[0] = new CPaneMgr(mpScreen, 'xbtn_n', 2, NULL);
mpButtonXY[0] = new CPaneMgr(mpScreen, MULTI_CHAR('xbtn_n'), 2, NULL);
JUT_ASSERT(0, mpButtonXY[0] != NULL);
mpButtonXY[1] = new CPaneMgr(mpScreen, 'ybtn_n', 2, NULL);
mpButtonXY[1] = new CPaneMgr(mpScreen, MULTI_CHAR('ybtn_n'), 2, NULL);
JUT_ASSERT(0, mpButtonXY[1] != NULL);
mpButtonXY[2] = new CPaneMgr(mpScreen, 'zbtn_n', 2, NULL);
mpButtonXY[2] = new CPaneMgr(mpScreen, MULTI_CHAR('zbtn_n'), 2, NULL);
JUT_ASSERT(0, mpButtonXY[2] != NULL);
mpUzu = new CPaneMgrAlpha(mpScreen, 'uzu_n', 2, NULL);
mpUzu = new CPaneMgrAlpha(mpScreen, MULTI_CHAR('uzu_n'), 2, NULL);
JUT_ASSERT(0, mpUzu != NULL);
ResTIMG* timg = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource(
@@ -1173,7 +1173,7 @@ void dMeter2Draw_c::initButton() {
for (int i = 0; i < 2; i++) {
for (int j = 0; j < 2; j++) {
field_0x524[i][j] = NULL;
field_0x524[i][j] = 0;
}
}
@@ -1208,54 +1208,54 @@ void dMeter2Draw_c::initButton() {
}
void dMeter2Draw_c::initButtonCross() {
mpButtonCrossParent = new CPaneMgr(mpScreen, 'juji_n', 2, NULL);
mpButtonCrossParent = new CPaneMgr(mpScreen, MULTI_CHAR('juji_n'), 2, NULL);
JUT_ASSERT(0, mpButtonCrossParent != NULL);
static_cast<J2DTextBox*>(mpScreen->search('cont_ju0'))->setFont(mDoExt_getMesgFont());
static_cast<J2DTextBox*>(mpScreen->search('cont_ju1'))->setFont(mDoExt_getMesgFont());
static_cast<J2DTextBox*>(mpScreen->search('cont_ju2'))->setFont(mDoExt_getMesgFont());
static_cast<J2DTextBox*>(mpScreen->search('cont_ju3'))->setFont(mDoExt_getMesgFont());
static_cast<J2DTextBox*>(mpScreen->search('cont_ju4'))->setFont(mDoExt_getMesgFont());
static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('cont_ju0')))->setFont(mDoExt_getMesgFont());
static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('cont_ju1')))->setFont(mDoExt_getMesgFont());
static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('cont_ju2')))->setFont(mDoExt_getMesgFont());
static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('cont_ju3')))->setFont(mDoExt_getMesgFont());
static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('cont_ju4')))->setFont(mDoExt_getMesgFont());
static_cast<J2DTextBox*>(mpScreen->search('cont_ju0'))->setString(0x40, "");
static_cast<J2DTextBox*>(mpScreen->search('cont_ju1'))->setString(0x40, "");
static_cast<J2DTextBox*>(mpScreen->search('cont_ju2'))->setString(0x40, "");
static_cast<J2DTextBox*>(mpScreen->search('cont_ju3'))->setString(0x40, "");
static_cast<J2DTextBox*>(mpScreen->search('cont_ju4'))->setString(0x40, "");
static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('cont_ju0')))->setString(0x40, "");
static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('cont_ju1')))->setString(0x40, "");
static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('cont_ju2')))->setString(0x40, "");
static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('cont_ju3')))->setString(0x40, "");
static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('cont_ju4')))->setString(0x40, "");
dMeter2Info_getString(
0x61, static_cast<J2DTextBox*>(mpScreen->search('cont_ju0'))->getStringPtr(), NULL);
0x61, static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('cont_ju0')))->getStringPtr(), NULL);
dMeter2Info_getString(
0x61, static_cast<J2DTextBox*>(mpScreen->search('cont_ju1'))->getStringPtr(), NULL);
0x61, static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('cont_ju1')))->getStringPtr(), NULL);
dMeter2Info_getString(
0x61, static_cast<J2DTextBox*>(mpScreen->search('cont_ju2'))->getStringPtr(), NULL);
0x61, static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('cont_ju2')))->getStringPtr(), NULL);
dMeter2Info_getString(
0x61, static_cast<J2DTextBox*>(mpScreen->search('cont_ju3'))->getStringPtr(), NULL);
0x61, static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('cont_ju3')))->getStringPtr(), NULL);
dMeter2Info_getString(
0x61, static_cast<J2DTextBox*>(mpScreen->search('cont_ju4'))->getStringPtr(), NULL);
0x61, static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('cont_ju4')))->getStringPtr(), NULL);
static_cast<J2DTextBox*>(mpScreen->search('cont_ju5'))->setFont(mDoExt_getMesgFont());
static_cast<J2DTextBox*>(mpScreen->search('cont_ju6'))->setFont(mDoExt_getMesgFont());
static_cast<J2DTextBox*>(mpScreen->search('cont_ju7'))->setFont(mDoExt_getMesgFont());
static_cast<J2DTextBox*>(mpScreen->search('cont_ju8'))->setFont(mDoExt_getMesgFont());
static_cast<J2DTextBox*>(mpScreen->search('cont_ju9'))->setFont(mDoExt_getMesgFont());
static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('cont_ju5')))->setFont(mDoExt_getMesgFont());
static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('cont_ju6')))->setFont(mDoExt_getMesgFont());
static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('cont_ju7')))->setFont(mDoExt_getMesgFont());
static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('cont_ju8')))->setFont(mDoExt_getMesgFont());
static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('cont_ju9')))->setFont(mDoExt_getMesgFont());
static_cast<J2DTextBox*>(mpScreen->search('cont_ju5'))->setString(0x40, "");
static_cast<J2DTextBox*>(mpScreen->search('cont_ju6'))->setString(0x40, "");
static_cast<J2DTextBox*>(mpScreen->search('cont_ju7'))->setString(0x40, "");
static_cast<J2DTextBox*>(mpScreen->search('cont_ju8'))->setString(0x40, "");
static_cast<J2DTextBox*>(mpScreen->search('cont_ju9'))->setString(0x40, "");
static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('cont_ju5')))->setString(0x40, "");
static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('cont_ju6')))->setString(0x40, "");
static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('cont_ju7')))->setString(0x40, "");
static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('cont_ju8')))->setString(0x40, "");
static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('cont_ju9')))->setString(0x40, "");
dMeter2Info_getString(
0x62, static_cast<J2DTextBox*>(mpScreen->search('cont_ju5'))->getStringPtr(), NULL);
0x62, static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('cont_ju5')))->getStringPtr(), NULL);
dMeter2Info_getString(
0x62, static_cast<J2DTextBox*>(mpScreen->search('cont_ju6'))->getStringPtr(), NULL);
0x62, static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('cont_ju6')))->getStringPtr(), NULL);
dMeter2Info_getString(
0x62, static_cast<J2DTextBox*>(mpScreen->search('cont_ju7'))->getStringPtr(), NULL);
0x62, static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('cont_ju7')))->getStringPtr(), NULL);
dMeter2Info_getString(
0x62, static_cast<J2DTextBox*>(mpScreen->search('cont_ju8'))->getStringPtr(), NULL);
0x62, static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('cont_ju8')))->getStringPtr(), NULL);
dMeter2Info_getString(
0x62, static_cast<J2DTextBox*>(mpScreen->search('cont_ju9'))->getStringPtr(), NULL);
0x62, static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('cont_ju9')))->getStringPtr(), NULL);
mpButtonCrossParent->setAlphaRate(0.0f);
drawButtonCross(g_drawHIO.mButtonCrossOFFPosX, g_drawHIO.mButtonCrossOFFPosY);
@@ -1269,9 +1269,9 @@ void dMeter2Draw_c::playPikariBckAnimation(f32 i_frame) {
}
void dMeter2Draw_c::setPikariBpkAnimation(J2DAnmColor* i_bpk) {
mpPikariScreen->search('pika00')->setAnimation(i_bpk);
mpPikariScreen->search('moya00')->setAnimation(i_bpk);
mpPikariScreen->search('moyabs')->setAnimation(i_bpk);
mpPikariScreen->search(MULTI_CHAR('pika00'))->setAnimation(i_bpk);
mpPikariScreen->search(MULTI_CHAR('moya00'))->setAnimation(i_bpk);
mpPikariScreen->search(MULTI_CHAR('moyabs'))->setAnimation(i_bpk);
}
void dMeter2Draw_c::playPikariBpkAnimation(f32 i_frame) {
@@ -1283,18 +1283,18 @@ void dMeter2Draw_c::playPikariBpkAnimation(f32 i_frame) {
void dMeter2Draw_c::playOxygenBpkAnimation(J2DAnmColor* i_bpk) {
if (i_bpk == NULL || mpMagicMeter->getAlpha() == 0) {
mpKanteraScreen->search('mm_00')->setAnimation((J2DAnmColor*)NULL);
mpKanteraScreen->search(MULTI_CHAR('mm_00'))->setAnimation((J2DAnmColor*)NULL);
} else {
field_0x558++;
if (field_0x558 >= i_bpk->getFrameMax()) {
field_0x558 -= i_bpk->getFrameMax();
}
mpKanteraScreen->search('mm_00')->setAnimation(i_bpk);
mpKanteraScreen->search(MULTI_CHAR('mm_00'))->setAnimation(i_bpk);
i_bpk->setFrame(field_0x558);
mpKanteraScreen->animation();
mpKanteraScreen->search('mm_00')->setAnimation((J2DAnmColor*)NULL);
mpKanteraScreen->search(MULTI_CHAR('mm_00'))->setAnimation((J2DAnmColor*)NULL);
}
}
@@ -1315,20 +1315,20 @@ void dMeter2Draw_c::drawPikari(f32 i_posX, f32 i_posY, f32* i_framep, f32 i_scal
if (param_9 == 4) {
var_f31 = 24.0f;
if (mpPikariScreen->search('moya00')->isVisible()) {
mpPikariScreen->search('moya00')->hide();
if (mpPikariScreen->search(MULTI_CHAR('moya00'))->isVisible()) {
mpPikariScreen->search(MULTI_CHAR('moya00'))->hide();
}
if (mpPikariScreen->search('moyabs')->isVisible()) {
mpPikariScreen->search('moyabs')->hide();
if (mpPikariScreen->search(MULTI_CHAR('moyabs'))->isVisible()) {
mpPikariScreen->search(MULTI_CHAR('moyabs'))->hide();
}
} else {
if (!mpPikariScreen->search('moya00')->isVisible()) {
mpPikariScreen->search('moya00')->show();
if (!mpPikariScreen->search(MULTI_CHAR('moya00'))->isVisible()) {
mpPikariScreen->search(MULTI_CHAR('moya00'))->show();
}
if (!mpPikariScreen->search('moyabs')->isVisible()) {
mpPikariScreen->search('moyabs')->show();
if (!mpPikariScreen->search(MULTI_CHAR('moyabs'))->isVisible()) {
mpPikariScreen->search(MULTI_CHAR('moyabs'))->show();
}
}
@@ -1357,21 +1357,21 @@ void dMeter2Draw_c::drawPikari(f32 i_posX, f32 i_posY, f32* i_framep, f32 i_scal
mpPikariParent->scale(i_scale * mpPikariParent->getScaleX(),
i_scale * mpPikariParent->getScaleY());
if (mpPikariScreen->search('moya00')->isVisible()) {
static_cast<J2DPicture*>(mpPikariScreen->search('moya00'))
if (mpPikariScreen->search(MULTI_CHAR('moya00'))->isVisible()) {
static_cast<J2DPicture*>(mpPikariScreen->search(MULTI_CHAR('moya00')))
->setBlackWhite(i_moyaBlack, i_moyaWhite);
}
if (mpPikariScreen->search('moyabs')->isVisible()) {
static_cast<J2DPicture*>(mpPikariScreen->search('moyabs'))
if (mpPikariScreen->search(MULTI_CHAR('moyabs'))->isVisible()) {
static_cast<J2DPicture*>(mpPikariScreen->search(MULTI_CHAR('moyabs')))
->setBlackWhite(i_moyabsBlack, i_moyabsWhite);
}
if (param_9 != 4) {
static_cast<J2DPicture*>(mpPikariScreen->search('pika00'))
static_cast<J2DPicture*>(mpPikariScreen->search(MULTI_CHAR('pika00')))
->setBlackWhite(mPikariBlack, mPikariBlack);
} else {
static_cast<J2DPicture*>(mpPikariScreen->search('pika00'))
static_cast<J2DPicture*>(mpPikariScreen->search(MULTI_CHAR('pika00')))
->setBlackWhite(g_MsgObject_HIO_c.mPikariPikaR1, g_MsgObject_HIO_c.mPikariPikaR0);
}
@@ -1390,9 +1390,9 @@ void dMeter2Draw_c::drawPikariHakusha(f32 i_posX, f32 i_posY, f32 i_frame, f32 i
mpPikariParent->scale(i_scale * mpPikariParent->getScaleX(),
i_scale * mpPikariParent->getScaleY());
static_cast<J2DPicture*>(mpPikariScreen->search('moya00'))
static_cast<J2DPicture*>(mpPikariScreen->search(MULTI_CHAR('moya00')))
->setBlackWhite(i_moyaBlack, i_moyaWhite);
static_cast<J2DPicture*>(mpPikariScreen->search('moyabs'))
static_cast<J2DPicture*>(mpPikariScreen->search(MULTI_CHAR('moyabs')))
->setBlackWhite(i_moyabsBlack, i_moyabsWhite);
mpPikariScreen->draw(0.0f, 0.0f, dComIfGp_getCurrentGrafPort());
@@ -1407,7 +1407,7 @@ void dMeter2Draw_c::changeTextureLife(int i_no, bool param_1, u8 i_quarterNum) {
mpLifeTexture[i_no][0]->hide();
mpLifeTexture[i_no][1]->hide();
static u64 const tag_bigh[] = {'bigh_00', 'bigh_01', 'bigh_02', 'bigh_03'};
static u64 const tag_bigh[] = {MULTI_CHAR('bigh_00'), MULTI_CHAR('bigh_01'), MULTI_CHAR('bigh_02'), MULTI_CHAR('bigh_03')};
for (int i = 0; i < 4; i++) {
if (i == i_quarterNum) {
@@ -1417,7 +1417,7 @@ void dMeter2Draw_c::changeTextureLife(int i_no, bool param_1, u8 i_quarterNum) {
}
}
static u64 const tag_du[] = {'heart_ln', 'heart_un'};
static u64 const tag_du[] = {MULTI_CHAR('heart_ln'), MULTI_CHAR('heart_un')};
mpBigHeart->translate(mpLifeParts[i_no]->getTranslateX() +
(mpScreen->search(tag_du[i_no / 10])->getTranslateX() -
@@ -2295,7 +2295,7 @@ void dMeter2Draw_c::drawButtonB(u8 i_action, bool param_1, f32 i_posX, f32 i_pos
}
if (i_action == 0x26 || i_action == 0x2E) {
mpScreen->search('item_b_n')->show();
mpScreen->search(MULTI_CHAR('item_b_n'))->show();
var_r31 = 1;
if (mButtonBItem != dComIfGs_getSelectEquipSword()) {
@@ -2309,17 +2309,17 @@ void dMeter2Draw_c::drawButtonB(u8 i_action, bool param_1, f32 i_posX, f32 i_pos
changeTextureItemB(mButtonBItem);
break;
default:
mpScreen->search('item_b_n')->hide();
mpScreen->search(MULTI_CHAR('item_b_n'))->hide();
var_r31 = 0;
}
}
} else if (param_1 == true && i_action == 0x4F) {
mpScreen->search('item_b_n')->show();
mpScreen->search(MULTI_CHAR('item_b_n'))->show();
mButtonBItem = fpcNm_ITEM_LURE_ROD;
changeTextureItemB(fpcNm_ITEM_LURE_ROD);
var_r31 = 2;
} else {
mpScreen->search('item_b_n')->hide();
mpScreen->search(MULTI_CHAR('item_b_n'))->hide();
}
mpItemB->getPanePtr()->rotate(mpItemB->getSizeX() * 0.5f, mpItemB->getSizeY() * 0.5f, ROTATE_Z,
@@ -2344,7 +2344,7 @@ void dMeter2Draw_c::drawButtonB(u8 i_action, bool param_1, f32 i_posX, f32 i_pos
}
void dMeter2Draw_c::drawButtonR(u8 unused0, u8 i_action, bool unused1, bool unused2) {
mpScreen->search('item_r_n')->hide();
mpScreen->search(MULTI_CHAR('item_r_n'))->hide();
mpTextXY[2]->show();
getActionString(i_action, 1, &field_0x768[2]);
@@ -2431,7 +2431,7 @@ void dMeter2Draw_c::drawButtonBin(u8 i_action) {
void dMeter2Draw_c::drawButtonXY(int i_no, u8 i_itemNo, u8 i_action, bool param_3, bool param_4) {
JUT_ASSERT(0, i_no < SELECT_MAX_e);
static u64 const tag[] = {'item_x_n', 'item_y_n'};
static u64 const tag[] = {MULTI_CHAR('item_x_n'), MULTI_CHAR('item_y_n')};
if (!param_3) {
mpScreen->search(tag[i_no])->hide();
@@ -3926,7 +3926,7 @@ s16 dMeter2Draw_c::getButtonTimer() {
// unused
static u64 const tag_7759[] = {
'item_x_n',
'item_y_n',
'item_j_n',
MULTI_CHAR('item_x_n'),
MULTI_CHAR('item_y_n'),
MULTI_CHAR('item_j_n'),
};
src/d/d_meter_button.cpp
+102 -102
View File
@@ -142,42 +142,42 @@ int dMeterButton_c::_execute(u32 i_flags, bool i_drawA, bool i_drawB, bool i_dra
u8 dir_3D = dComIfGp_get3DDirection();
if (dir_3D & DIR_LEFT_e) {
if (!mpButtonScreen->search('yaji_l_n')->isVisible()) {
mpButtonScreen->search('yaji_l_n')->show();
if (!mpButtonScreen->search(MULTI_CHAR('yaji_l_n'))->isVisible()) {
mpButtonScreen->search(MULTI_CHAR('yaji_l_n'))->show();
}
} else {
if (mpButtonScreen->search('yaji_l_n')->isVisible() == true) {
mpButtonScreen->search('yaji_l_n')->hide();
if (mpButtonScreen->search(MULTI_CHAR('yaji_l_n'))->isVisible() == true) {
mpButtonScreen->search(MULTI_CHAR('yaji_l_n'))->hide();
}
}
if (dir_3D & DIR_UP_e) {
if (!mpButtonScreen->search('yaji_u_n')->isVisible()) {
mpButtonScreen->search('yaji_u_n')->show();
if (!mpButtonScreen->search(MULTI_CHAR('yaji_u_n'))->isVisible()) {
mpButtonScreen->search(MULTI_CHAR('yaji_u_n'))->show();
}
} else {
if (mpButtonScreen->search('yaji_u_n')->isVisible() == true) {
mpButtonScreen->search('yaji_u_n')->hide();
if (mpButtonScreen->search(MULTI_CHAR('yaji_u_n'))->isVisible() == true) {
mpButtonScreen->search(MULTI_CHAR('yaji_u_n'))->hide();
}
}
if (dir_3D & DIR_DOWN_e) {
if (!mpButtonScreen->search('yaji_d_n')->isVisible()) {
mpButtonScreen->search('yaji_d_n')->show();
if (!mpButtonScreen->search(MULTI_CHAR('yaji_d_n'))->isVisible()) {
mpButtonScreen->search(MULTI_CHAR('yaji_d_n'))->show();
}
} else {
if (mpButtonScreen->search('yaji_d_n')->isVisible() == true) {
mpButtonScreen->search('yaji_d_n')->hide();
if (mpButtonScreen->search(MULTI_CHAR('yaji_d_n'))->isVisible() == true) {
mpButtonScreen->search(MULTI_CHAR('yaji_d_n'))->hide();
}
}
if (dir_3D & DIR_RIGHT_e) {
if (!mpButtonScreen->search('yaji_r_n')->isVisible()) {
mpButtonScreen->search('yaji_r_n')->show();
if (!mpButtonScreen->search(MULTI_CHAR('yaji_r_n'))->isVisible()) {
mpButtonScreen->search(MULTI_CHAR('yaji_r_n'))->show();
}
} else {
if (mpButtonScreen->search('yaji_r_n')->isVisible() == true) {
mpButtonScreen->search('yaji_r_n')->hide();
if (mpButtonScreen->search(MULTI_CHAR('yaji_r_n'))->isVisible() == true) {
mpButtonScreen->search(MULTI_CHAR('yaji_r_n'))->hide();
}
}
}
@@ -186,39 +186,39 @@ int dMeterButton_c::_execute(u32 i_flags, bool i_drawA, bool i_drawB, bool i_dra
u8 dir_c = dComIfGp_getCStickDirection();
if (dir_c & DIR_LEFT_e) {
if (!mpButtonScreen->search('yaji_ln')->isVisible()) {
mpButtonScreen->search('yaji_ln')->show();
if (!mpButtonScreen->search(MULTI_CHAR('yaji_ln'))->isVisible()) {
mpButtonScreen->search(MULTI_CHAR('yaji_ln'))->show();
}
} else {
if (mpButtonScreen->search('yaji_ln')->isVisible() == true) {
mpButtonScreen->search('yaji_ln')->hide();
if (mpButtonScreen->search(MULTI_CHAR('yaji_ln'))->isVisible() == true) {
mpButtonScreen->search(MULTI_CHAR('yaji_ln'))->hide();
}
}
if (dir_c & DIR_UP_e) {
if (!mpButtonScreen->search('yaji_un')->isVisible()) {
mpButtonScreen->search('yaji_un')->show();
if (!mpButtonScreen->search(MULTI_CHAR('yaji_un'))->isVisible()) {
mpButtonScreen->search(MULTI_CHAR('yaji_un'))->show();
}
} else {
if (mpButtonScreen->search('yaji_un')->isVisible() == true) {
mpButtonScreen->search('yaji_un')->hide();
if (mpButtonScreen->search(MULTI_CHAR('yaji_un'))->isVisible() == true) {
mpButtonScreen->search(MULTI_CHAR('yaji_un'))->hide();
}
}
if (dir_c & DIR_DOWN_e) {
if (!mpButtonScreen->search('yaji_dn')->isVisible()) {
mpButtonScreen->search('yaji_dn')->show();
if (!mpButtonScreen->search(MULTI_CHAR('yaji_dn'))->isVisible()) {
mpButtonScreen->search(MULTI_CHAR('yaji_dn'))->show();
}
} else if (mpButtonScreen->search('yaji_dn')->isVisible() == true) {
mpButtonScreen->search('yaji_dn')->hide();
} else if (mpButtonScreen->search(MULTI_CHAR('yaji_dn'))->isVisible() == true) {
mpButtonScreen->search(MULTI_CHAR('yaji_dn'))->hide();
}
if (dir_c & DIR_RIGHT_e) {
if (!mpButtonScreen->search('yaji_rn')->isVisible()) {
mpButtonScreen->search('yaji_rn')->show();
if (!mpButtonScreen->search(MULTI_CHAR('yaji_rn'))->isVisible()) {
mpButtonScreen->search(MULTI_CHAR('yaji_rn'))->show();
}
} else if (mpButtonScreen->search('yaji_rn')->isVisible() == true) {
mpButtonScreen->search('yaji_rn')->hide();
} else if (mpButtonScreen->search(MULTI_CHAR('yaji_rn'))->isVisible() == true) {
mpButtonScreen->search(MULTI_CHAR('yaji_rn'))->hide();
}
}
@@ -987,13 +987,13 @@ bool dMeterButton_c::alphaAnimeButtonBin(u32 i_flags, bool i_drawButton) {
void dMeterButton_c::screenInitButton() {
static u64 const text_tag[] = {
'info_ar0', 'info_ar1', 'info_ar2', 'info_ar3', 'info_ar4',
'info_ar5', 'info_ar6', 'info_ar7', 'info_ar8', 'info_ar9',
MULTI_CHAR('info_ar0'), MULTI_CHAR('info_ar1'), MULTI_CHAR('info_ar2'), MULTI_CHAR('info_ar3'), MULTI_CHAR('info_ar4'),
MULTI_CHAR('info_ar5'), MULTI_CHAR('info_ar6'), MULTI_CHAR('info_ar7'), MULTI_CHAR('info_ar8'), MULTI_CHAR('info_ar9'),
};
static u64 const ftext_tag[] = {
'fnfo_ar0', 'fnfo_ar1', 'fnfo_ar2', 'fnfo_ar3', 'fnfo_ar4',
'fnfo_ar5', 'fnfo_ar6', 'fnfo_ar7', 'fnfo_ar8', 'fnfo_ar9',
MULTI_CHAR('fnfo_ar0'), MULTI_CHAR('fnfo_ar1'), MULTI_CHAR('fnfo_ar2'), MULTI_CHAR('fnfo_ar3'), MULTI_CHAR('fnfo_ar4'),
MULTI_CHAR('fnfo_ar5'), MULTI_CHAR('fnfo_ar6'), MULTI_CHAR('fnfo_ar7'), MULTI_CHAR('fnfo_ar8'), MULTI_CHAR('fnfo_ar9'),
};
OS_REPORT("enter dMeterButton_c::screenInitButton\n");
@@ -1013,7 +1013,7 @@ void dMeterButton_c::screenInitButton() {
dPaneClass_showNullPane(mpButtonScreen);
field_0x00c = NULL;
mpParent = new CPaneMgr(mpButtonScreen, 'info_n', 0, NULL);
mpParent = new CPaneMgr(mpButtonScreen, MULTI_CHAR('info_n'), 0, NULL);
if (mpParent == NULL)
OS_REPORT("[%s] %d\n", __FILE__, 1867);
JUT_ASSERT(1868, mpParent != NULL);
@@ -1038,7 +1038,7 @@ void dMeterButton_c::screenInitButton() {
mParentCenterX = (608.0f / 2) - mpParent->getInitCenterPosX();
paneTrans(mpParent, mParentCenterX, 0.0f, 0xFF);
mpButtonA = new CPaneMgr(mpButtonScreen, 'abtn_n', 2, NULL);
mpButtonA = new CPaneMgr(mpButtonScreen, MULTI_CHAR('abtn_n'), 2, NULL);
if (mpButtonA == NULL) {
OS_REPORT("[%s] %d\n", __FILE__, 1902);
}
@@ -1046,7 +1046,7 @@ void dMeterButton_c::screenInitButton() {
mpButtonA->setAlphaRate(0.0f);
mpButtonA->show();
mpButtonB = new CPaneMgr(mpButtonScreen, 'bbtn_n', 2, NULL);
mpButtonB = new CPaneMgr(mpButtonScreen, MULTI_CHAR('bbtn_n'), 2, NULL);
if (mpButtonB == NULL) {
OS_REPORT("[%s] %d\n", __FILE__, 1914);
}
@@ -1054,7 +1054,7 @@ void dMeterButton_c::screenInitButton() {
mpButtonB->setAlphaRate(0.0f);
mpButtonB->show();
mpButtonR = new CPaneMgr(mpButtonScreen, 'rbtn_n', 2, NULL);
mpButtonR = new CPaneMgr(mpButtonScreen, MULTI_CHAR('rbtn_n'), 2, NULL);
if (mpButtonR == NULL) {
OS_REPORT("[%s] %d\n", __FILE__, 1932);
}
@@ -1062,7 +1062,7 @@ void dMeterButton_c::screenInitButton() {
mpButtonR->setAlphaRate(0.0f);
mpButtonR->show();
mpMidona = new CPaneMgr(mpButtonScreen, 'midona', 0, NULL);
mpMidona = new CPaneMgr(mpButtonScreen, MULTI_CHAR('midona'), 0, NULL);
JUT_ASSERT(1939, mpMidona != NULL);
if (mpMidona == NULL) {
OS_REPORT("[%s] %d\n", __FILE__, 1941);
@@ -1074,12 +1074,12 @@ void dMeterButton_c::screenInitButton() {
#if DEBUG
if (mpButtonScreen->search('zbtn') == 0) OS_REPORT("[%s] %d\n", __FILE__, 1947);
if (mpButtonScreen->search('z_btnl') == 0) OS_REPORT("[%s] %d\n", __FILE__, 1948);
if (mpButtonScreen->search(MULTI_CHAR('z_btnl')) == 0) OS_REPORT("[%s] %d\n", __FILE__, 1948);
#endif
mpButtonScreen->search('zbtn')->show();
mpButtonScreen->search('z_btnl')->show();
mpButtonScreen->search(MULTI_CHAR('z_btnl'))->show();
mpButtonZ = new CPaneMgr(mpButtonScreen, 'zbtn_n', 2, NULL);
mpButtonZ = new CPaneMgr(mpButtonScreen, MULTI_CHAR('zbtn_n'), 2, NULL);
if (mpButtonZ == NULL) {
OS_REPORT("[%s] %d\n", __FILE__, 1954);
}
@@ -1087,35 +1087,35 @@ void dMeterButton_c::screenInitButton() {
mpButtonZ->setAlphaRate(0.0f);
mpButtonZ->show();
mpButton3D = new CPaneMgr(mpButtonScreen, 'asbtn_n', 2, NULL);
mpButton3D = new CPaneMgr(mpButtonScreen, MULTI_CHAR('asbtn_n'), 2, NULL);
JUT_ASSERT(1964, mpButton3D != NULL);
mpButton3D->setAlphaRate(0.0f);
mpButton3D->show();
mpButtonScreen->search('yaji_l_n')->hide();
mpButtonScreen->search('yaji_u_n')->hide();
mpButtonScreen->search('yaji_d_n')->hide();
mpButtonScreen->search('yaji_r_n')->hide();
mpButtonScreen->search(MULTI_CHAR('yaji_l_n'))->hide();
mpButtonScreen->search(MULTI_CHAR('yaji_u_n'))->hide();
mpButtonScreen->search(MULTI_CHAR('yaji_d_n'))->hide();
mpButtonScreen->search(MULTI_CHAR('yaji_r_n'))->hide();
mpButtonC = new CPaneMgr(mpButtonScreen, 'cbtn_n', 2, NULL);
mpButtonC = new CPaneMgr(mpButtonScreen, MULTI_CHAR('cbtn_n'), 2, NULL);
JUT_ASSERT(1992, mpButtonC != NULL);
mpButtonC->setAlphaRate(0.0f);
mpButtonC->show();
mpButtonScreen->search('yaji_ln')->hide();
mpButtonScreen->search('yaji_un')->hide();
mpButtonScreen->search('yaji_dn')->hide();
mpButtonScreen->search('yaji_rn')->hide();
mpButtonScreen->search(MULTI_CHAR('yaji_ln'))->hide();
mpButtonScreen->search(MULTI_CHAR('yaji_un'))->hide();
mpButtonScreen->search(MULTI_CHAR('yaji_dn'))->hide();
mpButtonScreen->search(MULTI_CHAR('yaji_rn'))->hide();
mpButtonS = new CPaneMgr(mpButtonScreen, 'sbtn_n', 2, NULL);
mpButtonS = new CPaneMgr(mpButtonScreen, MULTI_CHAR('sbtn_n'), 2, NULL);
JUT_ASSERT(2002, mpButtonS != NULL);
mpButtonS->setAlphaRate(0.0f);
mpButtonX = new CPaneMgr(mpButtonScreen, 'xbtn_n', 2, NULL);
mpButtonX = new CPaneMgr(mpButtonScreen, MULTI_CHAR('xbtn_n'), 2, NULL);
JUT_ASSERT(2048, mpButtonX != NULL);
mpButtonX->setAlphaRate(0.0f);
mpButtonY = new CPaneMgr(mpButtonScreen, 'ybtn_n', 2, NULL);
mpButtonY = new CPaneMgr(mpButtonScreen, MULTI_CHAR('ybtn_n'), 2, NULL);
JUT_ASSERT(2052, mpButtonY != NULL);
mpButtonY->setAlphaRate(0.0f);
@@ -1124,7 +1124,7 @@ void dMeterButton_c::screenInitButton() {
mpButtonRemo2 = NULL;
mpButtonAR = NULL;
mpButton3DB = new CPaneMgr(mpButtonScreen, 'as_b_n', 2, NULL);
mpButton3DB = new CPaneMgr(mpButtonScreen, MULTI_CHAR('as_b_n'), 2, NULL);
JUT_ASSERT(2060, mpButton3DB != NULL);
mpButton3DB->setAlphaRate(0.0f);
@@ -1136,19 +1136,19 @@ void dMeterButton_c::screenInitButton() {
mpButtonNunZ = NULL;
mpButtonNunC = NULL;
mpButtonBin = new CPaneMgr(mpButtonScreen, 'bottl_n', 2, NULL);
mpButtonBin = new CPaneMgr(mpButtonScreen, MULTI_CHAR('bottl_n'), 2, NULL);
JUT_ASSERT(2071, mpButtonBin != NULL);
mpButtonBin->setAlphaRate(0.0f);
mpText[0] = new CPaneMgr(mpButtonScreen, 'text_n', 2, NULL);
mpText[0] = new CPaneMgr(mpButtonScreen, MULTI_CHAR('text_n'), 2, NULL);
JUT_ASSERT(2075, mpText[0] != NULL);
mpText[0]->setAlphaRate(0.0f);
mpText[1] = new CPaneMgr(mpButtonScreen, 'text2_n', 2, NULL);
mpText[1] = new CPaneMgr(mpButtonScreen, MULTI_CHAR('text2_n'), 2, NULL);
JUT_ASSERT(2079, mpText[1] != NULL);
mpText[1]->setAlphaRate(0.0f);
mpItem_c = new CPaneMgr(mpButtonScreen, 'fishing', 0, NULL);
mpItem_c = new CPaneMgr(mpButtonScreen, MULTI_CHAR('fishing'), 0, NULL);
JUT_ASSERT(2083, mpItem_c != NULL);
mpItem_c->setAlphaRate(0.0f);
@@ -1215,8 +1215,8 @@ void dMeterButton_c::screenInitButton() {
Mtx m, m2;
Vec sp108 = pane.getGlobalVtx(mpButtonScreen->search('zbtn'), &m, 0, false, 0);
Vec spFC = pane.getGlobalVtx(mpButtonScreen->search('zbtn'), &m, 3, false, 0);
Vec spF0 = pane.getGlobalVtx(mpButtonScreen->search('midona'), &m2, 0, false, 0);
Vec spE4 = pane.getGlobalVtx(mpButtonScreen->search('midona'), &m2, 3, false, 0);
Vec spF0 = pane.getGlobalVtx(mpButtonScreen->search(MULTI_CHAR('midona')), &m2, 0, false, 0);
Vec spE4 = pane.getGlobalVtx(mpButtonScreen->search(MULTI_CHAR('midona')), &m2, 3, false, 0);
f32 var_f2;
if (sp108.x > spF0.x) {
@@ -1412,18 +1412,18 @@ void dMeterButton_c::screenInitText() {
JUT_ASSERT(2457, fg != false);
dPaneClass_showNullPane(mpScreen);
mpFkAll_c = new CPaneMgr(mpScreen, 'n_all', 2, NULL);
mpFkAll_c = new CPaneMgr(mpScreen, MULTI_CHAR('n_all'), 2, NULL);
OS_REPORT("[%s] %d\n", __FILE__, 2461);
JUT_ASSERT(2462, mpFkAll_c != NULL);
mpFkAll_c->setAlphaRate(0.0f);
OS_REPORT("[%s] %d\n", __FILE__, 2465);
mpScreen->search('mg_null')->move(
g_MsgObject_HIO_c.mTextPosX + mpScreen->search('mg_null')->getBounds().i.x,
g_MsgObject_HIO_c.mTextPosY + mpScreen->search('mg_null')->getBounds().i.y);
mpScreen->search(MULTI_CHAR('mg_null'))->move(
g_MsgObject_HIO_c.mTextPosX + mpScreen->search(MULTI_CHAR('mg_null'))->getBounds().i.x,
g_MsgObject_HIO_c.mTextPosY + mpScreen->search(MULTI_CHAR('mg_null'))->getBounds().i.y);
OS_REPORT("[%s] %d\n", __FILE__, 2469);
mpFkRoot_c = new CPaneMgr(mpScreen, 'mg_null', 0, NULL);
mpFkRoot_c = new CPaneMgr(mpScreen, MULTI_CHAR('mg_null'), 0, NULL);
JUT_ASSERT(2472, mpFkRoot_c != NULL);
OS_REPORT("[%s] %d\n", __FILE__, 2474);
@@ -1441,24 +1441,24 @@ void dMeterButton_c::screenInitText() {
dPaneClass_showNullPane(mpTextScreen);
OS_REPORT("[%s] %d\n", __FILE__, 2496);
mpTmRoot_c = new CPaneMgr(mpTextScreen, 'mg_null', 0, NULL);
mpTmRoot_c = new CPaneMgr(mpTextScreen, MULTI_CHAR('mg_null'), 0, NULL);
JUT_ASSERT(2499, mpTmRoot_c != NULL);
#if VERSION == VERSION_GCN_JPN
if (dComIfGs_getOptRuby() == 0) {
mpTm_c[0] = new CPaneMgr(mpTextScreen, 'mg_3flin', 0, NULL);
mpTm_c[0] = new CPaneMgr(mpTextScreen, MULTI_CHAR('mg_3flin'), 0, NULL);
mpTm_c[1] = new CPaneMgr(mpTextScreen, 't3f_s', 0, NULL);
mpTm_c[1] = new CPaneMgr(mpTextScreen, MULTI_CHAR('t3f_s'), 0, NULL);
field_0x0ec[0] = new CPaneMgr(mpTextScreen, 'mg_3f', 0, NULL);
field_0x0ec[0] = new CPaneMgr(mpTextScreen, MULTI_CHAR('mg_3f'), 0, NULL);
field_0x0ec[1] = new CPaneMgr(mpTextScreen, 'mg_3f_s', 0, NULL);
field_0x0ec[1] = new CPaneMgr(mpTextScreen, MULTI_CHAR('mg_3f_s'), 0, NULL);
mpTextScreen->search('n_3line')->hide();
mpTextScreen->search('n_3fline')->show();
mpTextScreen->search('n_e4line')->hide();
mpTextScreen->search(MULTI_CHAR('n_3line'))->hide();
mpTextScreen->search(MULTI_CHAR('n_3fline'))->show();
mpTextScreen->search(MULTI_CHAR('n_e4line'))->hide();
} else {
mpTm_c[0] = new CPaneMgr(mpTextScreen, 'mg_3line', 0, NULL);
mpTm_c[0] = new CPaneMgr(mpTextScreen, MULTI_CHAR('mg_3line'), 0, NULL);
mpTm_c[1] = new CPaneMgr(mpTextScreen, 't3_s', 0, NULL);
@@ -1466,12 +1466,12 @@ void dMeterButton_c::screenInitText() {
field_0x0ec[1] = NULL;
OS_REPORT("[%s] %d\n", __FILE__, __LINE__);
mpTextScreen->search('n_3line')->show();
mpTextScreen->search('n_3fline')->hide();
mpTextScreen->search('n_e4line')->hide();
mpTextScreen->search(MULTI_CHAR('n_3line'))->show();
mpTextScreen->search(MULTI_CHAR('n_3fline'))->hide();
mpTextScreen->search(MULTI_CHAR('n_e4line'))->hide();
}
#else
mpTm_c[0] = new CPaneMgr(mpTextScreen, 'mg_e4lin', 0, NULL);
mpTm_c[0] = new CPaneMgr(mpTextScreen, MULTI_CHAR('mg_e4lin'), 0, NULL);
JUT_ASSERT(2504, mpTm_c[0] != NULL);
mpTm_c[1] = new CPaneMgr(mpTextScreen, 't4_s', 0, NULL);
@@ -1482,9 +1482,9 @@ void dMeterButton_c::screenInitText() {
OS_REPORT("[%s] %d\n", __FILE__, 2512);
mpTextScreen->search('n_3line')->hide();
mpTextScreen->search('n_3fline')->hide();
mpTextScreen->search('n_e4line')->show();
mpTextScreen->search(MULTI_CHAR('n_3line'))->hide();
mpTextScreen->search(MULTI_CHAR('n_3fline'))->hide();
mpTextScreen->search(MULTI_CHAR('n_e4line'))->show();
#endif
OS_REPORT("[%s] %d\n", __FILE__, 2554);
@@ -3046,7 +3046,7 @@ f32 dMeterButton_c::getCenterPosCalc(u8 i_button, char* i_string, int param_2) {
(mTextScale[param_2] * dMeter2Info_getStringLength(mpTextBox[0], i_string)) * temp_f0;
if (field_0x4d9 == param_2 && field_0x4be[param_2] == 1) {
field_0x1e4[param_2] = mButtonBScale * mpButtonScreen->search('fishing')->getWidth();
field_0x1e4[param_2] = mButtonBScale * mpButtonScreen->search(MULTI_CHAR('fishing'))->getWidth();
}
field_0x29c[param_2] = field_0x1e4[param_2];
@@ -3059,15 +3059,15 @@ f32 dMeterButton_c::getCenterPosCalc(u8 i_button, char* i_string, int param_2) {
switch (i_button) {
case BUTTON_A_e:
mButtonWidth[i_button] = mButtonAScale * mpButtonScreen->search('a_btn1')->getWidth();
mButtonWidth[i_button] = mButtonAScale * mpButtonScreen->search(MULTI_CHAR('a_btn1'))->getWidth();
field_0x304[i_button] = field_0x1e4[param_2] + mButtonWidth[i_button];
break;
case BUTTON_B_e:
mButtonWidth[i_button] = mButtonBScale * mpButtonScreen->search('b_btn')->getWidth();
mButtonWidth[i_button] = mButtonBScale * mpButtonScreen->search(MULTI_CHAR('b_btn'))->getWidth();
field_0x304[i_button] = field_0x1e4[param_2] + mButtonWidth[i_button];
break;
case BUTTON_R_e:
mButtonWidth[i_button] = mButtonRScale * mpButtonScreen->search('r_btn_b')->getWidth();
mButtonWidth[i_button] = mButtonRScale * mpButtonScreen->search(MULTI_CHAR('r_btn_b'))->getWidth();
field_0x304[i_button] = field_0x1e4[param_2] + mButtonWidth[i_button];
break;
case BUTTON_Z_e:
@@ -3077,8 +3077,8 @@ f32 dMeterButton_c::getCenterPosCalc(u8 i_button, char* i_string, int param_2) {
Mtx m, m2;
Vec sp124 = pane.getGlobalVtx(mpButtonScreen->search('zbtn'), &m, 0, false, 0);
Vec sp130 = pane.getGlobalVtx(mpButtonScreen->search('zbtn'), &m, 3, false, 0);
Vec sp13C = pane.getGlobalVtx(mpButtonScreen->search('midona'), &m2, 0, false, 0);
Vec sp148 = pane.getGlobalVtx(mpButtonScreen->search('midona'), &m2, 3, false, 0);
Vec sp13C = pane.getGlobalVtx(mpButtonScreen->search(MULTI_CHAR('midona')), &m2, 0, false, 0);
Vec sp148 = pane.getGlobalVtx(mpButtonScreen->search(MULTI_CHAR('midona')), &m2, 3, false, 0);
f32 var_f2;
if (sp124.x > sp13C.x) {
@@ -3100,47 +3100,47 @@ f32 dMeterButton_c::getCenterPosCalc(u8 i_button, char* i_string, int param_2) {
field_0x304[i_button] = field_0x1e4[param_2] + mButtonWidth[i_button];
break;
case BUTTON_3D_e:
mButtonWidth[i_button] = mButton3DScale * mpButtonScreen->search('as_btn1')->getWidth();
mButtonWidth[i_button] = mButton3DScale * mpButtonScreen->search(MULTI_CHAR('as_btn1'))->getWidth();
if (dComIfGp_get3DDirection() & DIR_LEFT_e) {
mButtonWidth[i_button] += mButton3DScale * mpButtonScreen->search('yaji04')->getWidth();
mButtonWidth[i_button] += mButton3DScale * mpButtonScreen->search(MULTI_CHAR('yaji04'))->getWidth();
}
if (dComIfGp_get3DDirection() & DIR_RIGHT_e) {
mButtonWidth[i_button] += mButton3DScale * mpButtonScreen->search('yaji02')->getWidth();
mButtonWidth[i_button] += mButton3DScale * mpButtonScreen->search(MULTI_CHAR('yaji02'))->getWidth();
}
field_0x304[i_button] = 0.0f;
break;
case BUTTON_C_e:
if (dComIfGp_checkCameraAttentionStatus(0, 8)) {
mButtonWidth[i_button] = mButtonCScale * mpButtonScreen->search('c_btn')->getWidth();
mButtonWidth[i_button] = mButtonCScale * mpButtonScreen->search(MULTI_CHAR('c_btn'))->getWidth();
field_0x304[i_button] = 0.0f;
} else {
mButtonWidth[i_button] =
mButtonCScale * (mpButtonScreen->search('yaji_rn')->getWidth() +
mpButtonScreen->search('c_btn')->getWidth());
mButtonCScale * (mpButtonScreen->search(MULTI_CHAR('yaji_rn'))->getWidth() +
mpButtonScreen->search(MULTI_CHAR('c_btn'))->getWidth());
field_0x304[i_button] = field_0x1e4[param_2] + mButtonWidth[i_button];
}
break;
case BUTTON_S_e:
mButtonWidth[i_button] = mButtonSScale * mpButtonScreen->search('a_btn2')->getWidth();
mButtonWidth[i_button] = mButtonSScale * mpButtonScreen->search(MULTI_CHAR('a_btn2'))->getWidth();
field_0x304[i_button] = field_0x1e4[param_2] + mButtonWidth[i_button];
break;
case BUTTON_X_e:
mButtonWidth[i_button] = mButtonXScale * mpButtonScreen->search('x_btn')->getWidth();
mButtonWidth[i_button] = mButtonXScale * mpButtonScreen->search(MULTI_CHAR('x_btn'))->getWidth();
field_0x304[i_button] = field_0x1e4[param_2] + mButtonWidth[i_button];
break;
case BUTTON_Y_e:
mButtonWidth[i_button] = mButtonYScale * mpButtonScreen->search('y_btn')->getWidth();
mButtonWidth[i_button] = mButtonYScale * mpButtonScreen->search(MULTI_CHAR('y_btn'))->getWidth();
field_0x304[i_button] = field_0x1e4[param_2] + mButtonWidth[i_button];
break;
case BUTTON_3DB_e:
mButtonWidth[i_button] = mButton3DBScale * mpButtonScreen->search('as_b_n')->getWidth();
mButtonWidth[i_button] = mButton3DBScale * mpButtonScreen->search(MULTI_CHAR('as_b_n'))->getWidth();
field_0x304[i_button] = field_0x1e4[param_2] + mButtonWidth[i_button];
break;
case BUTTON_BIN_e:
mButtonWidth[i_button] = field_0x5f0 * mpButtonScreen->search('bottl_n')->getWidth();
mButtonWidth[i_button] = field_0x5f0 * mpButtonScreen->search(MULTI_CHAR('bottl_n'))->getWidth();
field_0x304[i_button] = 0.0f;
break;
}
src/d/d_meter_haihai.cpp
+8 -8
View File
@@ -30,7 +30,7 @@ int dMeterHaihai_c::_create() {
JUT_ASSERT(0, fg != false);
dPaneClass_showNullPane(mpHaihaiScreen);
mpParent = new CPaneMgr(mpHaihaiScreen, 'n_all', 2, NULL);
mpParent = new CPaneMgr(mpHaihaiScreen, MULTI_CHAR('n_all'), 2, NULL);
JUT_ASSERT(0, mpParent != NULL);
OSInitFastCast();
@@ -300,9 +300,9 @@ void dMeterHaihai_c::playBckAnime(J2DAnmTransformKey* i_bck) {
}
i_bck->setFrame(mBckFrame);
mpHaihaiScreen->search('n_anim')->setAnimation(i_bck);
mpHaihaiScreen->search('n_anim')->animationTransform();
mpHaihaiScreen->search('n_anim')->setAnimation((J2DAnmTransform*)NULL);
mpHaihaiScreen->search(MULTI_CHAR('n_anim'))->setAnimation(i_bck);
mpHaihaiScreen->search(MULTI_CHAR('n_anim'))->animationTransform();
mpHaihaiScreen->search(MULTI_CHAR('n_anim'))->setAnimation((J2DAnmTransform*)NULL);
}
}
@@ -323,8 +323,8 @@ void dMeterHaihai_c::playBtkAnime(J2DAnmTextureSRTKey* i_btk) {
}
i_btk->setFrame(mBtkFrame);
mpHaihaiScreen->search('yaji00')->setAnimation(i_btk);
mpHaihaiScreen->search('yaji01')->setAnimation(i_btk);
mpHaihaiScreen->search(MULTI_CHAR('yaji00'))->setAnimation(i_btk);
mpHaihaiScreen->search(MULTI_CHAR('yaji01'))->setAnimation(i_btk);
}
}
@@ -345,7 +345,7 @@ void dMeterHaihai_c::playBpkAnime(J2DAnmColor* i_bpk) {
}
i_bpk->setFrame(mBpkFrame);
mpHaihaiScreen->search('npc_l1')->setAnimation(i_bpk);
mpHaihaiScreen->search('yaji_l')->setAnimation(i_bpk);
mpHaihaiScreen->search(MULTI_CHAR('npc_l1'))->setAnimation(i_bpk);
mpHaihaiScreen->search(MULTI_CHAR('yaji_l'))->setAnimation(i_bpk);
}
}
src/d/d_meter_hakusha.cpp
+6 -6
View File
@@ -26,7 +26,7 @@ dMeterHakusha_c::~dMeterHakusha_c() {
int dMeterHakusha_c::_create() {
static u64 haku_tag[] = {
'haku_n00', 'haku_n01', 'haku_n02', 'haku_n03', 'haku_n04', 'haku_n05',
MULTI_CHAR('haku_n00'), MULTI_CHAR('haku_n01'), MULTI_CHAR('haku_n02'), MULTI_CHAR('haku_n03'), MULTI_CHAR('haku_n04'), MULTI_CHAR('haku_n05'),
};
for (int i = 0; i < 6; i++) {
@@ -34,7 +34,7 @@ int dMeterHakusha_c::_create() {
JUT_ASSERT(0, mpHakushaPos[i] != NULL);
}
mpHakushaParent = new CPaneMgr(field_0x004, 'hakunall', 0, NULL);
mpHakushaParent = new CPaneMgr(field_0x004, MULTI_CHAR('hakunall'), 0, NULL);
JUT_ASSERT(0, mpHakushaParent != NULL);
mpHakushaScreen = new J2DScreen();
@@ -45,10 +45,10 @@ int dMeterHakusha_c::_create() {
JUT_ASSERT(0, fg != false);
dPaneClass_showNullPane(mpHakushaScreen);
mpHakushaOn = new CPaneMgr(mpHakushaScreen, 'haku_n', 2, NULL);
mpHakushaOn = new CPaneMgr(mpHakushaScreen, MULTI_CHAR('haku_n'), 2, NULL);
JUT_ASSERT(0, mpHakushaOn != NULL);
mpHakushaOff = new CPaneMgr(mpHakushaScreen, 'haku_b_n', 2, NULL);
mpHakushaOff = new CPaneMgr(mpHakushaScreen, MULTI_CHAR('haku_b_n'), 2, NULL);
JUT_ASSERT(0, mpHakushaOff != NULL);
mpHakushaOn->setAlphaRate(0.0f);
@@ -74,12 +74,12 @@ int dMeterHakusha_c::_create() {
JUT_ASSERT(0, fg != false);
dPaneClass_showNullPane(mpButtonScreen);
mpButtonA = new CPaneMgr(mpButtonScreen, 'abtn_n', 2, NULL);
mpButtonA = new CPaneMgr(mpButtonScreen, MULTI_CHAR('abtn_n'), 2, NULL);
JUT_ASSERT(0, mpButtonA != NULL);
mpButtonA->show();
mpButtonA->setAlphaRate(0.0f);
mpButtonScreen->search('info_n')->translate(0.0f, 0.0f);
mpButtonScreen->search(MULTI_CHAR('info_n'))->translate(0.0f, 0.0f);
field_0x100 = g_drawHIO.mButtonAHorsePosX;
field_0x104 = g_drawHIO.mButtonAHorsePosY;
src/d/d_meter_string.cpp
+9 -9
View File
@@ -58,19 +58,19 @@ int dMeterString_c::_create() {
mpGetInBck = (J2DAnmTransformKey*)J2DAnmLoaderDataBase::load(
JKRGetNameResource("zelda_game_image_cow_get_in.bck", mpMapArchive));
mpParentPane = new CPaneMgr(mpScreen, 'get_in_n', 2, NULL);
mpParentPane = new CPaneMgr(mpScreen, MULTI_CHAR('get_in_n'), 2, NULL);
JUT_ASSERT(0, mpParentPane != NULL);
mpRootPane = new CPaneMgr(mpScreen, 'n_all', 0, NULL);
mpRootPane = new CPaneMgr(mpScreen, MULTI_CHAR('n_all'), 0, NULL);
JUT_ASSERT(0, mpRootPane != NULL);
mpTextPane = new CPaneMgr(mpScreen, 'get_in', 0, NULL);
mpTextPane = new CPaneMgr(mpScreen, MULTI_CHAR('get_in'), 0, NULL);
JUT_ASSERT(0, mpTextPane != NULL);
static_cast<J2DTextBox*>(mpScreen->search('get_in_s'))->setFont(mDoExt_getMesgFont());
static_cast<J2DTextBox*>(mpScreen->search('get_in'))->setFont(mDoExt_getMesgFont());
static_cast<J2DTextBox*>(mpScreen->search('get_in_s'))->setString(0x100, "");
static_cast<J2DTextBox*>(mpScreen->search('get_in'))->setString(0x100, "");
static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('get_in_s')))->setFont(mDoExt_getMesgFont());
static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('get_in')))->setFont(mDoExt_getMesgFont());
static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('get_in_s')))->setString(0x100, "");
static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('get_in')))->setString(0x100, "");
mAnimFrame = 0.0f;
mPikariAnimFrame = 0.0f;
@@ -166,8 +166,8 @@ int dMeterString_c::_delete() {
int dMeterString_c::createString(int i_stringID) {
char str_buf[32];
dMeter2Info_getString(i_stringID, str_buf, NULL);
strcpy(static_cast<J2DTextBox*>(mpScreen->search('get_in_s'))->getStringPtr(), str_buf);
strcpy(static_cast<J2DTextBox*>(mpScreen->search('get_in'))->getStringPtr(), str_buf);
strcpy(static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('get_in_s')))->getStringPtr(), str_buf);
strcpy(static_cast<J2DTextBox*>(mpScreen->search(MULTI_CHAR('get_in')))->getStringPtr(), str_buf);
mAnimFrame = 40.0f;
mPikariAnimFrame = -1.0f;
src/d/d_msg_scrn_3select.cpp
+31 -31
View File
@@ -25,16 +25,16 @@ processFn process[] = {
dMsgScrn3Select_c::dMsgScrn3Select_c() {
static u64 const tag_name[3][12] = {
// A
'a_n', 'a_g', 'a_gr', 'a_m', 'w_yes_00', 'w_yes_01', 'w_yes_02', 'w_yes_03', 'w_yes_04',
'sel_po00', 'a_kahen', 'a_cursor',
'a_n', 'a_g', 'a_gr', 'a_m', MULTI_CHAR('w_yes_00'), MULTI_CHAR('w_yes_01'), MULTI_CHAR('w_yes_02'), MULTI_CHAR('w_yes_03'), MULTI_CHAR('w_yes_04'),
MULTI_CHAR('sel_po00'), MULTI_CHAR('a_kahen'), MULTI_CHAR('a_cursor'),
// B
'b_n', 'b_g', 'b_gr', 'b_m', 'w_yes_07', 'w_yes_06', 'w_yes_05', 'w_yes_08', 'w_yes_09',
'sel_po01', 'b_kahen', 'b_cursor',
'b_n', 'b_g', 'b_gr', 'b_m', MULTI_CHAR('w_yes_07'), MULTI_CHAR('w_yes_06'), MULTI_CHAR('w_yes_05'), MULTI_CHAR('w_yes_08'), MULTI_CHAR('w_yes_09'),
MULTI_CHAR('sel_po01'), MULTI_CHAR('b_kahen'), MULTI_CHAR('b_cursor'),
// C
'c_n', 'c_g', 'c_gr', 'c_m', 'w_yes_12', 'w_yes_11', 'w_yes_10', 'w_yes_13', 'w_yes_14',
'sel_po02', 'c_kahen', 'c_cursor'
'c_n', 'c_g', 'c_gr', 'c_m', MULTI_CHAR('w_yes_12'), MULTI_CHAR('w_yes_11'), MULTI_CHAR('w_yes_10'), MULTI_CHAR('w_yes_13'), MULTI_CHAR('w_yes_14'),
MULTI_CHAR('sel_po02'), MULTI_CHAR('c_kahen'), MULTI_CHAR('c_cursor')
};
mpScreen = new J2DScreen();
@@ -66,7 +66,7 @@ dMsgScrn3Select_c::dMsgScrn3Select_c() {
JUT_ASSERT(0, mpSelectCursor != NULL);
mpSelectCursor->setAlphaRate(0.0f);
mpParent = new CPaneMgr(mpScreen, 'abc_n', 0, NULL);
mpParent = new CPaneMgr(mpScreen, MULTI_CHAR('abc_n'), 0, NULL);
JUT_ASSERT(0, mpParent != NULL);
for (int i = 0; i < 3; i++) {
@@ -115,11 +115,11 @@ dMsgScrn3Select_c::dMsgScrn3Select_c() {
mpTmSel_c[2] = new CPaneMgr(mpScreen, 'c_tf', 0, NULL);
mpTmrSel_c[0] = new CPaneMgr(mpScreen, 'a_tf_f', 0, NULL);
mpTmrSel_c[0] = new CPaneMgr(mpScreen, MULTI_CHAR('a_tf_f'), 0, NULL);
mpTmrSel_c[1] = new CPaneMgr(mpScreen, 'b_tf_f', 0, NULL);
mpTmrSel_c[1] = new CPaneMgr(mpScreen, MULTI_CHAR('b_tf_f'), 0, NULL);
mpTmrSel_c[2] = new CPaneMgr(mpScreen, 'c_tf_f', 0, NULL);
mpTmrSel_c[2] = new CPaneMgr(mpScreen, MULTI_CHAR('c_tf_f'), 0, NULL);
for (int i = 0; i < 3; i++) {
((J2DTextBox*)(mpTmSel_c[i]->getPanePtr()))->setString(64, "");
@@ -129,15 +129,15 @@ dMsgScrn3Select_c::dMsgScrn3Select_c() {
((J2DTextBox*)(mpTmrSel_c[i]->getPanePtr()))->setFont(mDoExt_getMesgFont());
}
mpScreen->search('a_t_e')->hide();
mpScreen->search('b_t_e')->hide();
mpScreen->search('c_t_e')->hide();
mpScreen->search(MULTI_CHAR('a_t_e'))->hide();
mpScreen->search(MULTI_CHAR('b_t_e'))->hide();
mpScreen->search(MULTI_CHAR('c_t_e'))->hide();
mpScreen->search('a_tf')->show();
mpScreen->search('b_tf')->show();
mpScreen->search('c_tf')->show();
mpScreen->search('a_tf_f')->show();
mpScreen->search('b_tf_f')->show();
mpScreen->search('c_tf_f')->show();
mpScreen->search(MULTI_CHAR('a_tf_f'))->show();
mpScreen->search(MULTI_CHAR('b_tf_f'))->show();
mpScreen->search(MULTI_CHAR('c_tf_f'))->show();
mpScreen->search('a_t')->hide();
mpScreen->search('b_t')->hide();
mpScreen->search('c_t')->hide();
@@ -154,27 +154,27 @@ dMsgScrn3Select_c::dMsgScrn3Select_c() {
mpTmrSel_c[i] = NULL;
}
mpScreen->search('a_t_e')->hide();
mpScreen->search('b_t_e')->hide();
mpScreen->search('c_t_e')->hide();
mpScreen->search(MULTI_CHAR('a_t_e'))->hide();
mpScreen->search(MULTI_CHAR('b_t_e'))->hide();
mpScreen->search(MULTI_CHAR('c_t_e'))->hide();
mpScreen->search('a_tf')->hide();
mpScreen->search('b_tf')->hide();
mpScreen->search('c_tf')->hide();
mpScreen->search('a_tf_f')->hide();
mpScreen->search('b_tf_f')->hide();
mpScreen->search('c_tf_f')->hide();
mpScreen->search(MULTI_CHAR('a_tf_f'))->hide();
mpScreen->search(MULTI_CHAR('b_tf_f'))->hide();
mpScreen->search(MULTI_CHAR('c_tf_f'))->hide();
mpScreen->search('a_t')->show();
mpScreen->search('b_t')->show();
mpScreen->search('c_t')->show();
}
#else
mpTmSel_c[0] = new CPaneMgr(mpScreen, 'a_t_e', 0, NULL);
mpTmSel_c[0] = new CPaneMgr(mpScreen, MULTI_CHAR('a_t_e'), 0, NULL);
JUT_ASSERT(0, mpTmSel_c[0] != NULL);
mpTmSel_c[1] = new CPaneMgr(mpScreen, 'b_t_e', 0, NULL);
mpTmSel_c[1] = new CPaneMgr(mpScreen, MULTI_CHAR('b_t_e'), 0, NULL);
JUT_ASSERT(0, mpTmSel_c[1] != NULL);
mpTmSel_c[2] = new CPaneMgr(mpScreen, 'c_t_e', 0, NULL);
mpTmSel_c[2] = new CPaneMgr(mpScreen, MULTI_CHAR('c_t_e'), 0, NULL);
JUT_ASSERT(0, mpTmSel_c[2] != NULL);
for (int i = 0; i < 3; i++) {
@@ -183,15 +183,15 @@ dMsgScrn3Select_c::dMsgScrn3Select_c() {
mpTmrSel_c[i] = NULL;
}
mpScreen->search('a_t_e')->show();
mpScreen->search('b_t_e')->show();
mpScreen->search('c_t_e')->show();
mpScreen->search(MULTI_CHAR('a_t_e'))->show();
mpScreen->search(MULTI_CHAR('b_t_e'))->show();
mpScreen->search(MULTI_CHAR('c_t_e'))->show();
mpScreen->search('a_tf')->hide();
mpScreen->search('b_tf')->hide();
mpScreen->search('c_tf')->hide();
mpScreen->search('a_tf_f')->hide();
mpScreen->search('b_tf_f')->hide();
mpScreen->search('c_tf_f')->hide();
mpScreen->search(MULTI_CHAR('a_tf_f'))->hide();
mpScreen->search(MULTI_CHAR('b_tf_f'))->hide();
mpScreen->search(MULTI_CHAR('c_tf_f'))->hide();
mpScreen->search('a_t')->hide();
mpScreen->search('b_t')->hide();
mpScreen->search('c_t')->hide();
src/d/d_msg_scrn_arrow.cpp
+7 -7
View File
@@ -25,23 +25,23 @@ dMsgScrnArrow_c::dMsgScrnArrow_c() {
mpBpk->searchUpdateMaterialID(mpScreen);
mBpkFrame = 0.0f;
mpParent_c = new CPaneMgr(mpScreen, 'set_ya_n', 0, NULL);
mpParent_c = new CPaneMgr(mpScreen, MULTI_CHAR('set_ya_n'), 0, NULL);
JUT_ASSERT(0, mpParent_c != NULL);
mpArw_c = new CPaneMgr(mpScreen, 'ya_next', 0, NULL);
mpArw_c = new CPaneMgr(mpScreen, MULTI_CHAR('ya_next'), 0, NULL);
JUT_ASSERT(0, mpArw_c != NULL);
mpArw_c->hide();
mpArw_c->mPane->setAnimation(mpBck);
mpScreen->search('yajnext')->setAnimation(mpBpk);
mpScreen->search('yajinexl')->setAnimation(mpBpk);
mpScreen->search(MULTI_CHAR('yajnext'))->setAnimation(mpBpk);
mpScreen->search(MULTI_CHAR('yajinexl'))->setAnimation(mpBpk);
mpDot_c = new CPaneMgr(mpScreen, 'ya_end', 0, NULL);
mpDot_c = new CPaneMgr(mpScreen, MULTI_CHAR('ya_end'), 0, NULL);
JUT_ASSERT(0, mpDot_c != NULL);
mpDot_c->hide();
mpScreen->search('yaj_end')->setAnimation(mpBpk);
mpScreen->search('yajiendl')->setAnimation(mpBpk);
mpScreen->search(MULTI_CHAR('yaj_end'))->setAnimation(mpBpk);
mpScreen->search(MULTI_CHAR('yajiendl'))->setAnimation(mpBpk);
}
dMsgScrnArrow_c::~dMsgScrnArrow_c() {
src/d/d_msg_scrn_boss.cpp
+4 -4
View File
@@ -8,7 +8,7 @@
dMsgScrnBoss_c::dMsgScrnBoss_c() {
static u64 t_tag[7] = {
'sfontb0', 'sfontb1', 'sfontb2', 'sfontl0', 'sfontl1', 'sfontl2', 'sfont00',
MULTI_CHAR('sfontb0'), MULTI_CHAR('sfontb1'), MULTI_CHAR('sfontb2'), MULTI_CHAR('sfontl0'), MULTI_CHAR('sfontl1'), MULTI_CHAR('sfontl2'), MULTI_CHAR('sfont00'),
};
init();
@@ -17,15 +17,15 @@ dMsgScrnBoss_c::dMsgScrnBoss_c() {
mpScreen->setPriority("zelda_boss_name.blo", 0x20000, dComIfGp_getMsgArchive(4));
dPaneClass_showNullPane(mpScreen);
mpPmP_c = new CPaneMgr(mpScreen, 'n_all', 2, NULL);
mpPmP_c = new CPaneMgr(mpScreen, MULTI_CHAR('n_all'), 2, NULL);
mpPmP_c->scale(g_MsgObject_HIO_c.mBossNameScaleX, g_MsgObject_HIO_c.mBossNameScaleY);
mpFontParent = new CPaneMgr(mpScreen, 's_font_n', 0, NULL);
mpFontParent = new CPaneMgr(mpScreen, MULTI_CHAR('s_font_n'), 0, NULL);
mpFontParent->scale(g_MsgObject_HIO_c.mBossNameCharSizeX, g_MsgObject_HIO_c.mBossNameCharSizeY);
mpFontParent->paneTrans(g_MsgObject_HIO_c.mBossNameCharPosX,
g_MsgObject_HIO_c.mBossNameCharPosY);
mpBaseParent = new CPaneMgr(mpScreen, 'base_n', 2, NULL);
mpBaseParent = new CPaneMgr(mpScreen, MULTI_CHAR('base_n'), 2, NULL);
mpBaseParent->scale(g_MsgObject_HIO_c.mBossNameBaseSizeX, g_MsgObject_HIO_c.mBossNameBaseSizeY);
mpBaseParent->paneTrans(g_MsgObject_HIO_c.mBossNameBasePosX,
g_MsgObject_HIO_c.mBossNameBasePosY);

Some files were not shown because too many files have changed in this diff Show More