Compare commits
1 Commits
cleanup/ca
...
cleanup/ip
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bb1587520b |
@@ -15655,15 +15655,15 @@ lbl_8164C424 = .data:0x8164C424; // type:object size:0xB data:string
|
||||
lbl_8164C42F = .data:0x8164C42F; // type:object size:0xD data:string
|
||||
lbl_8164C43C = .data:0x8164C43C; // type:object size:0xD data:string
|
||||
lbl_8164C449 = .data:0x8164C449; // type:object size:0xD data:string
|
||||
scPaneName_T_CalMonth = .data:0x8164C458; // type:object size:0xC data:4byte
|
||||
lbl_8164C458 = .data:0x8164C458; // type:object size:0xC data:4byte
|
||||
lbl_8164C464 = .data:0x8164C464; // type:object size:0x9 data:string
|
||||
lbl_8164C46D = .data:0x8164C46D; // type:object size:0x9 data:string
|
||||
lbl_8164C476 = .data:0x8164C476; // type:object size:0x9 data:string
|
||||
scPaneName_N_Cal = .data:0x8164C480; // type:object size:0xC
|
||||
lbl_8164C480 = .data:0x8164C480; // type:object size:0xC
|
||||
lbl_8164C48C = .data:0x8164C48C; // type:object size:0xB data:string
|
||||
lbl_8164C497 = .data:0x8164C497; // type:object size:0xB data:string
|
||||
lbl_8164C4A2 = .data:0x8164C4A2; // type:object size:0xB data:string
|
||||
scPaneName_N_CalPos = .data:0x8164C4B0; // type:object size:0xC
|
||||
lbl_8164C4B0 = .data:0x8164C4B0; // type:object size:0xC
|
||||
lbl_8164C4BC = .data:0x8164C4BC; // type:object size:0x43
|
||||
lbl_8164C4FF = .data:0x8164C4FF; // type:object size:0xF data:string
|
||||
lbl_8164C50E = .data:0x8164C50E; // type:object size:0x14 data:string
|
||||
@@ -15673,11 +15673,11 @@ lbl_8164C54E = .data:0x8164C54E; // type:object size:0x18
|
||||
lbl_8164C566 = .data:0x8164C566; // type:object size:0xC
|
||||
lbl_8164C572 = .data:0x8164C572; // type:object size:0xA
|
||||
__vt__Q33ipl5scene8Calendar = .data:0x8164C57C; // type:object size:0xA4
|
||||
lbl_8164C620 = .data:0x8164C620; // type:object size:0xB data:string
|
||||
lbl_8164C62C = .data:0x8164C62C; // type:object size:0x14 data:4byte
|
||||
lbl_8164C640 = .data:0x8164C640; // type:object size:0x12 data:string
|
||||
lbl_8164C652 = .data:0x8164C652; // type:object size:0xB data:string
|
||||
lbl_8164C65D = .data:0x8164C65D; // type:object size:0x13 data:string
|
||||
scN_CalDay_r = .data:0x8164C620; // type:object size:0xB data:string
|
||||
scDateAnimPaneNames = .data:0x8164C62C; // type:object size:0x14 data:4byte
|
||||
scMyIplTopFBrlan = .data:0x8164C640; // type:object size:0x12 data:string
|
||||
scN_CalDay_t = .data:0x8164C652; // type:object size:0xB data:string
|
||||
scSEDateFocus = .data:0x8164C65D; // type:object size:0x13 data:string
|
||||
__vt__Q33ipl5scene4Date = .data:0x8164C670; // type:object size:0x18
|
||||
@12712 = .data:0x8164C688; // type:object size:0xC scope:local data:string
|
||||
...data.0 = .data:0x8164C688; // type:label scope:local
|
||||
@@ -21785,11 +21785,11 @@ scPaneName_T_Stop = .sdata:0x816967B5; // type:object size:0x7 data:string
|
||||
lbl_816967C0 = .sdata:0x816967C0; // type:object size:0x4 data:string
|
||||
lbl_816967C4 = .sdata:0x816967C4; // type:object size:0x6 data:string
|
||||
lbl_816967CA = .sdata:0x816967CA; // type:object size:0x7 data:string
|
||||
lbl_816967D8 = .sdata:0x816967D8; // type:object size:0x6 data:string
|
||||
lbl_816967DE = .sdata:0x816967DE; // type:object size:0x6 data:string
|
||||
lbl_816967E4 = .sdata:0x816967E4; // type:object size:0x7 data:string
|
||||
lbl_816967EB = .sdata:0x816967EB; // type:object size:0x7 data:string
|
||||
lbl_816967F2 = .sdata:0x816967F2; // type:object size:0x6 data:string
|
||||
scW_Cal = .sdata:0x816967D8; // type:object size:0x6 data:string
|
||||
scT_Cal = .sdata:0x816967DE; // type:object size:0x6 data:string
|
||||
scCal_Ac = .sdata:0x816967E4; // type:object size:0x7 data:string
|
||||
scInfo_a = .sdata:0x816967EB; // type:object size:0x7 data:string
|
||||
scB_Cal = .sdata:0x816967F2; // type:object size:0x6 data:string
|
||||
@16087 = .sdata:0x816967F8; // type:object size:0x4 scope:local data:string
|
||||
@16350 = .sdata:0x816967FC; // type:object size:0x7 scope:local data:string
|
||||
@16351 = .sdata:0x81696803; // type:object size:0x7 scope:local data:string
|
||||
|
||||
@@ -215,19 +215,19 @@ namespace ipl {
|
||||
MESG_CALENDAR_DEC,
|
||||
};
|
||||
|
||||
static const char* scPaneName_T_CalMonth[] = {
|
||||
static const char* lbl_8164C458[] = {
|
||||
"T_CalMonth_a",
|
||||
"T_CalMonth_b",
|
||||
"T_CalMonth_c",
|
||||
};
|
||||
|
||||
static const char* scPaneName_N_Cal[] = {
|
||||
static const char* lbl_8164C480[] = {
|
||||
"N_Cal_a1",
|
||||
"N_Cal_b1",
|
||||
"N_Cal_c1",
|
||||
};
|
||||
|
||||
static const char* scPaneName_N_CalPos[] = {
|
||||
static const char* lbl_8164C4B0[] = {
|
||||
"N_CalPos_a",
|
||||
"N_CalPos_b",
|
||||
"N_CalPos_c",
|
||||
@@ -661,9 +661,9 @@ namespace ipl {
|
||||
utility::Calendar::getLastMonth(*mpBoardDate, &last);
|
||||
utility::Calendar::getNextMonth(*mpBoardDate, &next);
|
||||
|
||||
set_textbox_month(scPaneName_T_CalMonth[0], last);
|
||||
set_textbox_month(scPaneName_T_CalMonth[1], *mpBoardDate);
|
||||
set_textbox_month(scPaneName_T_CalMonth[2], next);
|
||||
set_textbox_month(lbl_8164C458[0], last);
|
||||
set_textbox_month(lbl_8164C458[1], *mpBoardDate);
|
||||
set_textbox_month(lbl_8164C458[2], next);
|
||||
}
|
||||
|
||||
void Calendar::set_textbox_month(const char* paneName, const utility::Date& date) {
|
||||
@@ -714,31 +714,31 @@ namespace ipl {
|
||||
|
||||
OSCalendarTime curTime = System::getCurrentTime();
|
||||
|
||||
utility::Date todayDate(curTime.year, curTime.mon + 1, curTime.mday);
|
||||
utility::Date lastMonth;
|
||||
utility::Date nextMonth;
|
||||
utility::Date local_64(curTime.year, curTime.mon + 1, curTime.mday);
|
||||
utility::Date local_70;
|
||||
utility::Date local_7c;
|
||||
|
||||
utility::Calendar::getLastMonth(date, &lastMonth);
|
||||
utility::Calendar::getNextMonth(date, &nextMonth);
|
||||
utility::Calendar::getLastMonth(date, &local_70);
|
||||
utility::Calendar::getNextMonth(date, &local_7c);
|
||||
|
||||
int dateIndex;
|
||||
int weekOffset;
|
||||
int iVar10;
|
||||
if (mbAsian || mbUSA) {
|
||||
weekOffset = 6 - utility::Calendar::getWeek(date.year, date.month, maxDays);
|
||||
iVar10 = 6 - utility::Calendar::getWeek(date.year, date.month, maxDays);
|
||||
} else {
|
||||
week--;
|
||||
if (week < 0) {
|
||||
week = 6;
|
||||
}
|
||||
weekOffset = 6 - (utility::Calendar::getWeek(date.year, date.month, maxDays) - 1);
|
||||
if (weekOffset >= 7) {
|
||||
weekOffset = 0;
|
||||
iVar10 = 6 - (utility::Calendar::getWeek(date.year, date.month, maxDays) - 1);
|
||||
if (iVar10 >= 7) {
|
||||
iVar10 = 0;
|
||||
}
|
||||
}
|
||||
|
||||
dateIndex = unk == 1 ? 0 : DATE_COUNT;
|
||||
|
||||
utility::Date cellDate;
|
||||
utility::Date local_88;
|
||||
|
||||
u32 attr;
|
||||
int val2;
|
||||
@@ -750,25 +750,25 @@ namespace ipl {
|
||||
|
||||
val = (maxDays + week);
|
||||
attr = 0;
|
||||
val2 = (weekOffset + val);
|
||||
val2 = (iVar10 + val);
|
||||
if ((week - i) > 0) {
|
||||
cellDate.year = lastMonth.year;
|
||||
cellDate.month = lastMonth.month;
|
||||
cellDate.day = i + (lastMonth.day - week) + 1;
|
||||
local_88.year = local_70.year;
|
||||
local_88.month = local_70.month;
|
||||
local_88.day = i + (local_70.day - week) + 1;
|
||||
goto out;
|
||||
}
|
||||
|
||||
if ((val - i) > 0) {
|
||||
cellDate.year = date.year;
|
||||
cellDate.month = date.month;
|
||||
cellDate.day = (i - week) + 1;
|
||||
local_88.year = date.year;
|
||||
local_88.month = date.month;
|
||||
local_88.day = (i - week) + 1;
|
||||
attr |= 2;
|
||||
|
||||
if (cellDate == todayDate) {
|
||||
if (local_88 == local_64) {
|
||||
attr |= 1;
|
||||
}
|
||||
|
||||
switch (utility::Calendar::getWeek(cellDate.year, cellDate.month, cellDate.day)) {
|
||||
switch (utility::Calendar::getWeek(local_88.year, local_88.month, local_88.day)) {
|
||||
case 6: {
|
||||
attr |= 8;
|
||||
break;
|
||||
@@ -782,9 +782,9 @@ namespace ipl {
|
||||
}
|
||||
|
||||
if ((val2 - i) > 0) {
|
||||
cellDate.year = nextMonth.year;
|
||||
cellDate.month = nextMonth.month;
|
||||
cellDate.day = ((i - maxDays) - week) + 1;
|
||||
local_88.year = local_7c.year;
|
||||
local_88.month = local_7c.month;
|
||||
local_88.day = ((i - maxDays) - week) + 1;
|
||||
goto out;
|
||||
} else {
|
||||
dateScn->setVisible(false);
|
||||
@@ -792,14 +792,14 @@ namespace ipl {
|
||||
}
|
||||
|
||||
out:
|
||||
dateScn->setDate(cellDate);
|
||||
dateScn->setDate(local_88);
|
||||
dateScn->setAttribute(attr);
|
||||
}
|
||||
}
|
||||
|
||||
void Calendar::set_date_pos(int unk) {
|
||||
nw4r::lyt::Pane* pane1 = mpLayout->FindPaneByName(scPaneName_N_Cal[unk]);
|
||||
nw4r::lyt::Pane* pane2 = mpLayout->FindPaneByName(scPaneName_N_CalPos[unk]);
|
||||
nw4r::lyt::Pane* pane1 = mpLayout->FindPaneByName(lbl_8164C480[unk]);
|
||||
nw4r::lyt::Pane* pane2 = mpLayout->FindPaneByName(lbl_8164C4B0[unk]);
|
||||
|
||||
int dateIndex = unk == 1 ? 0 : DATE_COUNT;
|
||||
|
||||
@@ -807,14 +807,14 @@ namespace ipl {
|
||||
Date* dateScn = ((Date*)nw4r::ut::List_GetNth(&mDateList, dateIndex));
|
||||
dateIndex++;
|
||||
|
||||
nw4r::math::VEC3 cellPos;
|
||||
cellPos.x = ((u16)i % 7) * 0x46;
|
||||
cellPos.y = ((u16)i / 7) * -0x30;
|
||||
cellPos.z = 0.0f;
|
||||
nw4r::math::VEC3 local_68;
|
||||
local_68.x = ((u16)i % 7) * 0x46;
|
||||
local_68.y = ((u16)i / 7) * -0x30;
|
||||
local_68.z = 0.0f;
|
||||
|
||||
MTXMultVec(pane2->GetGlobalMtx(), cellPos, cellPos);
|
||||
MTXMultVec(pane2->GetGlobalMtx(), local_68, local_68);
|
||||
|
||||
dateScn->setTranslate(cellPos);
|
||||
dateScn->setTranslate(local_68);
|
||||
dateScn->setRotate(pane1->GetRotate());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,40 +7,40 @@
|
||||
|
||||
namespace ipl {
|
||||
namespace scene {
|
||||
extern "C" char lbl_816967D8[];
|
||||
extern "C" char lbl_816967DE[];
|
||||
extern "C" char lbl_816967E4[];
|
||||
extern "C" char lbl_816967EB[];
|
||||
extern "C" char lbl_816967F2[];
|
||||
extern "C" char scW_Cal[];
|
||||
extern "C" char scT_Cal[];
|
||||
extern "C" char scCal_Ac[];
|
||||
extern "C" char scInfo_a[];
|
||||
extern "C" char scB_Cal[];
|
||||
|
||||
#pragma push
|
||||
#pragma section const_type ".data"
|
||||
extern "C" const char lbl_8164C620[] = "N_CalDay_r";
|
||||
extern "C" const char scN_CalDay_r[] = "N_CalDay_r";
|
||||
#pragma pop
|
||||
|
||||
// clang-format off
|
||||
extern "C" const char* lbl_8164C62C[Date::ANIM_PANE_MAX] = {
|
||||
lbl_8164C620,
|
||||
lbl_816967D8,
|
||||
lbl_816967DE,
|
||||
lbl_816967E4,
|
||||
lbl_816967EB,
|
||||
extern "C" const char* scDateAnimPaneNames[Date::ANIM_PANE_MAX] = {
|
||||
scN_CalDay_r,
|
||||
scW_Cal,
|
||||
scT_Cal,
|
||||
scCal_Ac,
|
||||
scInfo_a,
|
||||
};
|
||||
|
||||
#pragma push
|
||||
#pragma section const_type ".data"
|
||||
extern "C" const char lbl_8164C640[] = "my_IplTop_f.brlan";
|
||||
extern "C" const char lbl_8164C652[] = "N_CalDay_t";
|
||||
extern "C" const char lbl_8164C65D[] = "WIPL_SE_DATE_FOCUS";
|
||||
extern "C" const char scMyIplTopFBrlan[] = "my_IplTop_f.brlan";
|
||||
extern "C" const char scN_CalDay_t[] = "N_CalDay_t";
|
||||
extern "C" const char scSEDateFocus[] = "WIPL_SE_DATE_FOCUS";
|
||||
#pragma pop
|
||||
|
||||
#pragma push
|
||||
#pragma section const_type ".sdata"
|
||||
extern "C" char lbl_816967D8[] = "W_Cal";
|
||||
extern "C" char lbl_816967DE[] = "T_Cal";
|
||||
extern "C" char lbl_816967E4[] = "Cal_Ac";
|
||||
extern "C" char lbl_816967EB[] = "Info_a";
|
||||
extern "C" char lbl_816967F2[] = "B_Cal";
|
||||
extern "C" char scW_Cal[] = "W_Cal";
|
||||
extern "C" char scT_Cal[] = "T_Cal";
|
||||
extern "C" char scCal_Ac[] = "Cal_Ac";
|
||||
extern "C" char scInfo_a[] = "Info_a";
|
||||
extern "C" char scB_Cal[] = "B_Cal";
|
||||
#pragma pop
|
||||
|
||||
static const Date::AnmFrame scAnmFrame[] = {
|
||||
@@ -73,7 +73,7 @@ namespace ipl {
|
||||
|
||||
// Bind animations
|
||||
for (int i = 0; i < ANIM_PANE_MAX; i++) {
|
||||
mpPaneAnims[i] = mpLayout->bind(lbl_8164C640, lbl_8164C62C[i], false);
|
||||
mpPaneAnims[i] = mpLayout->bind(scMyIplTopFBrlan, scDateAnimPaneNames[i], false);
|
||||
}
|
||||
mpLayout->finishBinding();
|
||||
|
||||
@@ -81,7 +81,7 @@ namespace ipl {
|
||||
mpGui = new gui::PaneManager(this, mpLayout->getDrawInfo(), NULL, NULL);
|
||||
mpGui->setupScene(mpLayout);
|
||||
mpGui->setAllComponentTriggerTarget(false);
|
||||
mpGui->setTriggerTarget(mpLayout->FindPaneByName(lbl_816967F2), true);
|
||||
mpGui->setTriggerTarget(mpLayout->FindPaneByName(scB_Cal), true);
|
||||
|
||||
// Init date
|
||||
mpDate = new utility::Date();
|
||||
@@ -128,19 +128,19 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void Date::setRotate(const nw4r::math::VEC3& vec) {
|
||||
mpLayout->FindPaneByName(lbl_8164C652)->SetRotate(vec);
|
||||
mpLayout->FindPaneByName(scN_CalDay_t)->SetRotate(vec);
|
||||
}
|
||||
|
||||
void Date::setTranslate(const nw4r::math::VEC3& vec) {
|
||||
mpLayout->FindPaneByName(lbl_8164C652)->SetTranslate(vec);
|
||||
mpLayout->FindPaneByName(scN_CalDay_t)->SetTranslate(vec);
|
||||
}
|
||||
|
||||
void Date::setVisible(bool visible) {
|
||||
mpLayout->FindPaneByName(lbl_8164C62C[0])->SetVisible(visible);
|
||||
mpLayout->FindPaneByName(scDateAnimPaneNames[0])->SetVisible(visible);
|
||||
}
|
||||
|
||||
bool Date::getVisible() {
|
||||
return mpLayout->FindPaneByName(lbl_8164C62C[0])->IsVisible();
|
||||
return mpLayout->FindPaneByName(scDateAnimPaneNames[0])->IsVisible();
|
||||
}
|
||||
|
||||
void Date::setAttribute(int attr) {
|
||||
@@ -209,13 +209,13 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void Date::start_point_event(const char* paneName, controller::Interface* con) {
|
||||
if (strcmp(paneName, lbl_816967F2) == 0) {
|
||||
if (strcmp(paneName, scB_Cal) == 0) {
|
||||
if (unk_0x3C == 0) {
|
||||
static_cast<Calendar*>(System::getScene(SCENE_CALENDAR))->onPointDate(this);
|
||||
onCmdRecv(1);
|
||||
|
||||
if (getVisible()) {
|
||||
snd::getSystem()->startSE(lbl_8164C65D);
|
||||
snd::getSystem()->startSE(scSEDateFocus);
|
||||
if (con != NULL) {
|
||||
con->rumble(1);
|
||||
}
|
||||
@@ -226,7 +226,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void Date::start_left_event(const char* paneName) {
|
||||
if (strcmp(paneName, lbl_816967F2) == 0) {
|
||||
if (strcmp(paneName, scB_Cal) == 0) {
|
||||
if (unk_0x3C == 1) {
|
||||
onCmdRecv(2);
|
||||
}
|
||||
@@ -262,7 +262,7 @@ namespace ipl {
|
||||
|
||||
numStr[index++] = 0;
|
||||
|
||||
nw4r::lyt::TextBox* pane = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(mpLayout->FindPaneByName(lbl_8164C62C[2]));
|
||||
nw4r::lyt::TextBox* pane = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(mpLayout->FindPaneByName(scDateAnimPaneNames[2]));
|
||||
pane->SetString(numStr);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user