Compare commits

..

6 Commits

Author SHA1 Message Date
coah
8801f29333 cleanup(WDScan): name RSN/WPA OUI byte constants
Rename privacy-mode OUI sdata/sdata2 bytes used by WDGetPrivacyMode.
Leave unused pad bytes as address labels so section layout stays fixed.
2026-10-01 17:17:49 -05:00
coah
73de5786da cleanup(www_surface): rename CreateManager params to match cpp (#512)
param_10 → arcPath; rectW0/H0/W1/H1 → surfaceW/H, browserW/H.
Header-only rename aligned with www_surface.cpp.
2026-10-01 17:16:25 -05:00
coah
3abcd34252 cleanup(iplCalendar): name month/pos pane arrays and day-grid locals (#517)
Replace Matching-only lbl_* pane name tables and Ghidra locals in
the day layout path; update symbols.txt for the arrays.
2026-10-01 17:16:04 -05:00
coah
5c20a11fa8 Restore truncated PC-keyboard event thunk name (#519) 2026-10-01 17:15:31 -05:00
coah
f85a98a6e3 cleanup(iplSettingSelect): name exit-sequence helpers (#516)
Rename Matching-only fn_* exit/reboot helpers to descriptive
snake_case names; update mangled symbols.txt entries.
2026-10-01 17:15:19 -05:00
coah
137ee3242a cleanup(iplCSPane): name fatal OSFatal color/msg and zero float (#511)
lbl_81697844..47 → scCsFatalColorR/G/B/A, lbl_8166A6E3 → scCsFatalMsg,
lbl_81694FC0 → scCsZeroF.
2026-10-01 17:15:08 -05:00
8 changed files with 127 additions and 124 deletions

View File

@@ -5267,10 +5267,10 @@ start_focusout_anm__Q33ipl5scene13SettingSelectFi = .text:0x814093D0; // type:fu
start_selected_anm__Q33ipl5scene13SettingSelectFi = .text:0x81409480; // type:function size:0x274
is_stopped_all_anm__Q33ipl5scene13SettingSelectCFv = .text:0x814096F4; // type:function size:0x74
onEvent__Q33ipl5scene13SettingSelectFUlUlPv = .text:0x81409768; // type:function size:0xFC
fn_81409864__Q33ipl5scene13SettingSelectFv = .text:0x81409864; // type:function size:0x90
fn_814098F4__Q33ipl5scene13SettingSelectFv = .text:0x814098F4; // type:function size:0x94
fn_81409988__Q33ipl5scene13SettingSelectFv = .text:0x81409988; // type:function size:0x64
fn_814099EC__Q33ipl5scene13SettingSelectFv = .text:0x814099EC; // type:function size:0x198
calc_exit_sequence__Q33ipl5scene13SettingSelectFv = .text:0x81409864; // type:function size:0x90
prepare_exit_abort__Q33ipl5scene13SettingSelectFv = .text:0x814098F4; // type:function size:0x94
start_exit_fade__Q33ipl5scene13SettingSelectFv = .text:0x81409988; // type:function size:0x64
finish_exit_reboot__Q33ipl5scene13SettingSelectFv = .text:0x814099EC; // type:function size:0x198
__dt__Q33ipl5scene13SettingSelectFv = .text:0x81409B84; // type:function size:0x58 scope:weak
@20@__dt__Q33ipl5scene13SettingSelectFv = .text:0x81409BDC; // type:function size:0x8 scope:weak
@84@onEvent__Q33ipl5scene13SettingSelectFUlUlPv = .text:0x81409BE4; // type:function size:0x8 scope:weak
@@ -5576,7 +5576,7 @@ __sinit_\tiPcKeyboard_cpp = .text:0x81416F34; // type:function size:0x1B0
@68@calc__Q49textinput8keyboard6pctype12LayoutByNW4RFv = .text:0x814170FC; // type:function size:0x8
@68@draw__Q49textinput8keyboard6pctype12LayoutByNW4RFv = .text:0x81417104; // type:function size:0x8
@68@init__Q49textinput8keyboard6pctype12LayoutByNW4RFv = .text:0x8141710C; // type:function size:0x8
@236@onEvent__Q49textinput8keyboard6pctype12LayoutByNW4RFPQ49textinput8keyboard6pctype5 = .text:0x81417114; // type:function size:0x8
@236@onEvent__Q49textinput8keyboard6pctype12LayoutByNW4RFPQ49textinput8keyboard6pctype5UIObjUlPv = .text:0x81417114; // type:function size:0x8
create__Q49textinput8keyboard13cellphonetype4BaseFP12MEMAllocator = .text:0x8141711C; // type:function size:0xAC
init__Q49textinput8keyboard13cellphonetype4BaseFv = .text:0x814171C8; // type:function size:0xA8
calc__Q49textinput8keyboard13cellphonetype4BaseFv = .text:0x81417270; // type:function size:0x4
@@ -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
lbl_8164C458 = .data:0x8164C458; // type:object size:0xC data:4byte
scPaneName_T_CalMonth = .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
lbl_8164C480 = .data:0x8164C480; // type:object size:0xC
scPaneName_N_Cal = .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
lbl_8164C4B0 = .data:0x8164C4B0; // type:object size:0xC
scPaneName_N_CalPos = .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
@@ -18149,7 +18149,7 @@ lbl_8166A6B1 = .data:0x8166A6B1; // type:object size:0xD data:string
lbl_8166A6BE = .data:0x8166A6BE; // type:object size:0xD data:string
lbl_8166A6CB = .data:0x8166A6CB; // type:object size:0xC data:string
lbl_8166A6D7 = .data:0x8166A6D7; // type:object size:0xC data:string
lbl_8166A6E3 = .data:0x8166A6E3; // type:object size:0x41 data:string
scCsFatalMsg = .data:0x8166A6E3; // type:object size:0x41 data:string
lbl_8166A728 = .data:0x8166A728; // type:object size:0xB data:string
lbl_8166A733 = .data:0x8166A733; // type:object size:0x9 data:string
lbl_8166A73C = .data:0x8166A73C; // type:object size:0xB data:string
@@ -20741,7 +20741,7 @@ lbl_81694FA0 = .sdata2:0x81694FA0; // type:object size:0x7 data:string
lbl_81694FA7 = .sdata2:0x81694FA7; // type:object size:0x5 data:string
lbl_81694FAC = .sdata2:0x81694FAC; // type:object size:0xC align:4
lbl_81694FB8 = .sdata2:0x81694FB8; // type:object size:0x8 align:8 data:double
lbl_81694FC0 = .sdata2:0x81694FC0; // type:object size:0x4 align:4 data:float
scCsZeroF = .sdata2:0x81694FC0; // type:object size:0x4 align:4 data:float
@10105 = .sdata2:0x81694FC8; // type:object size:0x4 scope:local align:4 data:float
@9941 = .sdata2:0x81694FD0; // type:object size:0x8 scope:local data:4byte
@10304 = .sdata2:0x81694FD8; // type:object size:0x8 scope:local align:8 data:double
@@ -20769,12 +20769,12 @@ NET_AES_BLOCK_MODE_CBC = .sdata2:0x81695040; // type:object size:0x8
@524 = .sdata2:0x81695050; // type:object size:0x2 scope:local data:byte
@1077 = .sdata2:0x81695054; // type:object size:0x2 scope:local data:byte
@1128 = .sdata2:0x81695058; // type:object size:0x2 scope:local data:byte
lbl_81695060 = .sdata2:0x81695060; // type:object size:0x1 data:byte
lbl_81695061 = .sdata2:0x81695061; // type:object size:0x1 data:byte
lbl_81695062 = .sdata2:0x81695062; // type:object size:0x1 data:byte
lbl_81695064 = .sdata2:0x81695064; // type:object size:0x1 data:byte
lbl_81695065 = .sdata2:0x81695065; // type:object size:0x1 data:byte
lbl_81695066 = .sdata2:0x81695066; // type:object size:0x1 data:byte
scRsnOui0 = .sdata2:0x81695060; // type:object size:0x1 data:byte
scRsnOui1 = .sdata2:0x81695061; // type:object size:0x1 data:byte
scRsnOui2 = .sdata2:0x81695062; // type:object size:0x1 data:byte
scWpaOui0 = .sdata2:0x81695064; // type:object size:0x1 data:byte
scWpaOui1 = .sdata2:0x81695065; // type:object size:0x1 data:byte
scWpaOui2 = .sdata2:0x81695066; // type:object size:0x1 data:byte
scFilePermissions = .sdata2:0x81695068; // type:object size:0x2 scope:local
cWhite = .sdata2:0x81695070; // type:object size:0x4 scope:local data:byte
@2829 = .sdata2:0x81695074; // type:object size:0x4 scope:local align:4 data:float
@@ -22466,10 +22466,10 @@ lbl_81697824 = .sdata:0x81697824; // type:object size:0x8 data:string
lbl_8169782C = .sdata:0x8169782C; // type:object size:0x8 data:string
lbl_81697834 = .sdata:0x81697834; // type:object size:0x8 data:string
lbl_8169783C = .sdata:0x8169783C; // type:object size:0x8 data:string
lbl_81697844 = .sdata:0x81697844; // type:object size:0x1 data:byte
lbl_81697845 = .sdata:0x81697845; // type:object size:0x1 data:byte
lbl_81697846 = .sdata:0x81697846; // type:object size:0x1 data:byte
lbl_81697847 = .sdata:0x81697847; // type:object size:0x1 data:byte
scCsFatalColorR = .sdata:0x81697844; // type:object size:0x1 data:byte
scCsFatalColorG = .sdata:0x81697845; // type:object size:0x1 data:byte
scCsFatalColorB = .sdata:0x81697846; // type:object size:0x1 data:byte
scCsFatalColorA = .sdata:0x81697847; // type:object size:0x1 data:byte
lbl_81697848 = .sdata:0x81697848; // type:object size:0x8 data:string
lbl_81697850 = .sdata:0x81697850; // type:object size:0x6 data:string
lbl_81697858 = .sdata:0x81697858; // type:object size:0x6 data:string
@@ -22538,7 +22538,7 @@ lbl_816979C8 = .sdata:0x816979C8; // type:object size:0x5 data:string
lbl_816979D0 = .sdata:0x816979D0; // type:object size:0x5 data:string
lbl_816979D8 = .sdata:0x816979D8; // type:object size:0x4 data:string
lbl_816979E0 = .sdata:0x816979E0; // type:object size:0x8 data:string
CDBFSPathSeparator = .sdata:0x816979E8; // type:object size:0x1 data:byte
lbl_816979E8 = .sdata:0x816979E8; // type:object size:0x1 data:byte
@1433 = .sdata:0x816979F0; // type:object size:0x4 scope:local data:string
@1435 = .sdata:0x816979F4; // type:object size:0x1 scope:local
@1440 = .sdata:0x816979F8; // type:object size:0x6 scope:local data:string
@@ -22700,9 +22700,9 @@ __SSLVersion = .sdata:0x81697CE0; // type:object size:0x4 data:4byte
qErr$1631 = .sdata:0x81697D58; // type:object size:0x4 scope:local data:4byte
l_dev_nandflash_init_info = .sdata:0x81697D60; // type:object size:0x8 scope:local
l_dev_sd_direct_init_info = .sdata:0x81697D68; // type:object size:0x8 scope:local
lbl_81697D70 = .sdata:0x81697D70; // type:object size:0x1 data:byte
lbl_81697D71 = .sdata:0x81697D71; // type:object size:0x1 data:byte
lbl_81697D72 = .sdata:0x81697D72; // type:object size:0x1 data:byte
scWpaFindOui0 = .sdata:0x81697D70; // type:object size:0x1 data:byte
scWpaFindOui1 = .sdata:0x81697D71; // type:object size:0x1 data:byte
scWpaFindOui2 = .sdata:0x81697D72; // type:object size:0x1 data:byte
__RFLVersion = .sdata:0x81697D78; // type:object size:0x4 data:4byte
sRFLLastErrCode = .sdata:0x81697D7C; // type:object size:0x4 scope:local data:4byte
scResFileFullPathName = .sdata:0x81697D80; // type:object size:0x4 scope:local data:4byte

View File

@@ -35,8 +35,8 @@ namespace ext_ead {
class SurfaceManager {
public:
static void CreateManager(int rectW0, int rectH0, int rectW1, int rectH1, void* mem1Buf, u32 mem1BufSize, void* mem2Buf, u32 mem2BufSize,
void* libBuf, const char* param_10);
static void CreateManager(int surfaceW, int surfaceH, int browserW, int browserH, void* mem1Buf, u32 mem1BufSize, void* mem2Buf, u32 mem2BufSize,
void* libBuf, const char* arcPath);
static void DisposeManager();
static void RegisterArcFile(void* fileBuf);

View File

@@ -167,12 +167,12 @@ namespace ipl {
bool is_stopped_all_anm() const;
void fn_81409864();
void calc_exit_sequence();
void fn_814098F4();
void fn_unk_inline();
void fn_81409988();
void fn_814099EC();
void prepare_exit_abort();
void wait_decide_se();
void start_exit_fade();
void finish_exit_reboot();
int mState; // 0x60
int mPrevState; // 0x64

View File

@@ -6,10 +6,13 @@
#include <stdlib.h>
#include <string.h>
char CDBFSPathSeparator = '/';
#pragma push
#pragma section sconst_type ".sdata"
extern const char lbl_816979E8[8] = "/\0\0\0\0\0\0\0";
#pragma pop
void CDBFSConcatenatePath(char* path, const char* concatPath) {
strcat(path, &CDBFSPathSeparator);
strcat(path, lbl_816979E8);
strcat(path, concatPath);
}

View File

@@ -10,20 +10,20 @@
#pragma push
#pragma section sconst_type ".sdata2"
const u8 lbl_81695060 = 0;
const u8 lbl_81695061 = 0x0F;
const u8 lbl_81695062 = 0xAC;
const u8 scRsnOui0 = 0;
const u8 scRsnOui1 = 0x0F;
const u8 scRsnOui2 = 0xAC;
const u8 lbl_81695063 = 0;
const u8 lbl_81695064 = 0;
const u8 lbl_81695065 = 0x50;
const u8 lbl_81695066 = 0xF2;
const u8 scWpaOui0 = 0;
const u8 scWpaOui1 = 0x50;
const u8 scWpaOui2 = 0xF2;
const u8 lbl_81695067 = 0;
#pragma pop
#pragma push
#pragma section sconst_type ".sdata"
const u8 lbl_81697D70 = 0;
const u8 lbl_81697D71 = 0x50;
const u8 lbl_81697D72 = 0xF2;
const u8 scWpaFindOui0 = 0;
const u8 scWpaFindOui1 = 0x50;
const u8 scWpaFindOui2 = 0xF2;
const u8 lbl_81697D73 = 0;
const u8 lbl_81697D74 = 0;
const u8 lbl_81697D75 = 0;
@@ -31,15 +31,15 @@ const u8 lbl_81697D76 = 0;
const u8 lbl_81697D77 = 0;
#pragma pop
#define lbl_81695060 (*((volatile const u8*)&lbl_81695060))
#define lbl_81695061 (*((volatile const u8*)&lbl_81695061))
#define lbl_81695062 (*((volatile const u8*)&lbl_81695062))
#define lbl_81695064 (*((volatile const u8*)&lbl_81695064))
#define lbl_81695065 (*((volatile const u8*)&lbl_81695065))
#define lbl_81695066 (*((volatile const u8*)&lbl_81695066))
#define lbl_81697D70 (*((volatile const u8*)&lbl_81697D70))
#define lbl_81697D71 (*((volatile const u8*)&lbl_81697D71))
#define lbl_81697D72 (*((volatile const u8*)&lbl_81697D72))
#define scRsnOui0 (*((volatile const u8*)&scRsnOui0))
#define scRsnOui1 (*((volatile const u8*)&scRsnOui1))
#define scRsnOui2 (*((volatile const u8*)&scRsnOui2))
#define scWpaOui0 (*((volatile const u8*)&scWpaOui0))
#define scWpaOui1 (*((volatile const u8*)&scWpaOui1))
#define scWpaOui2 (*((volatile const u8*)&scWpaOui2))
#define scWpaFindOui0 (*((volatile const u8*)&scWpaFindOui0))
#define scWpaFindOui1 (*((volatile const u8*)&scWpaFindOui1))
#define scWpaFindOui2 (*((volatile const u8*)&scWpaFindOui2))
extern void _savegpr_21();
extern void _restgpr_21();
@@ -175,9 +175,9 @@ s32 WDGetPrivacyMode(WDBssDesc* bssDesc) {
if (WDFindInformationElement((WDInfoElement**)&ieData, &ieLength, bssDesc, 0x30)) {
u8 data[WD_VENDOR_LENGTH];
data[0] = lbl_81695060;
data[1] = lbl_81695061;
data[2] = lbl_81695062;
data[0] = scRsnOui0;
data[1] = scRsnOui1;
data[2] = scRsnOui2;
memcpy(readIE, ieData, sizeof(WDVendorInfoElement) + 2);
if (memcmp(&readIE[2], data, WD_VENDOR_LENGTH) == 0) {
if ((s32)readIE[5] == 3) {
@@ -218,15 +218,15 @@ privacy_second: {
u8 data[WD_VENDOR_LENGTH];
u8 findData[WD_VENDOR_LENGTH];
findData[0] = lbl_81697D70;
findData[1] = lbl_81697D71;
findData[2] = lbl_81697D72;
findData[0] = scWpaFindOui0;
findData[1] = scWpaFindOui1;
findData[2] = scWpaFindOui2;
if (!WDiFindVendorSpecificIE(&ieData, &ieLength, bssDesc, 0xDD, findData, 1)) {
goto privacy_fallback;
}
data[0] = lbl_81695064;
data[1] = lbl_81695065;
data[2] = lbl_81695066;
data[0] = scWpaOui0;
data[1] = scWpaOui1;
data[2] = scWpaOui2;
{
memcpy(readIE, ieData, sizeof(WDVendorInfoElement));

View File

@@ -1,19 +1,19 @@
#include <revolution/gx/GXStruct.h>
#include <revolution/os/OSError.h>
extern "C" const char lbl_8166A6E3[];
extern "C" const u8 lbl_81697844;
extern "C" const u8 lbl_81697845;
extern "C" const u8 lbl_81697846;
extern "C" const u8 lbl_81697847;
extern "C" const char scCsFatalMsg[];
extern "C" const u8 scCsFatalColorR;
extern "C" const u8 scCsFatalColorG;
extern "C" const u8 scCsFatalColorB;
extern "C" const u8 scCsFatalColorA;
#define NW4R_DB_ASSERT_H
#define NW4R_ASSERT(x) \
{ \
if (!(x)) { \
GXColor front = {lbl_81697844, lbl_81697845, lbl_81697846, lbl_81697847}; \
GXColor front = {scCsFatalColorR, scCsFatalColorG, scCsFatalColorB, scCsFatalColorA}; \
GXColor back = {0, 0, 0, 0}; \
OSFatal((GXColor)front, (GXColor)back, lbl_8166A6E3); \
OSFatal((GXColor)front, (GXColor)back, scCsFatalMsg); \
} \
}
@@ -29,7 +29,7 @@ extern "C" const u8 lbl_81697847;
#include "math/iplMathTypes.h"
extern "C" const f32 lbl_81694FC0 = 0.0f;
extern "C" const f32 scCsZeroF = 0.0f;
extern "C" nw4r::ut::Color GetTextColor__Q34nw4r3lyt7TextBoxCFUl(const nw4r::lyt::TextBox*, u32);
@@ -130,7 +130,7 @@ namespace ipl {
nw4r::math::VEC2 scale;
scale.x = pane->GetScale().x;
scale.y = pane->GetScale().y;
result = vec3::_ctor(VmInst, VmReturnObj, scale.x, scale.y, lbl_81694FC0) == TRUE;
result = vec3::_ctor(VmInst, VmReturnObj, scale.x, scale.y, scCsZeroF) == TRUE;
}
}
return result;
@@ -514,7 +514,7 @@ namespace ipl {
nw4r::math::VEC3 get_vec_(CHANSVm* vm) {
u32 argc = CHANSVmGetArgc(vm);
CHANSVmObjHdr* arg = CHANSVmGetArg(vm, 0);
nw4r::math::VEC3 out(lbl_81694FC0, lbl_81694FC0, lbl_81694FC0);
nw4r::math::VEC3 out(scCsZeroF, scCsZeroF, scCsZeroF);
if (argc == 1 && util::is_valid_class(arg, "VEC3")) {
f32* src = static_cast<f32*>(*arg->value.ptr_v);
out.x = src[0];
@@ -540,7 +540,7 @@ namespace ipl {
nw4r::lyt::Size get_size_(CHANSVm* vm) {
u32 argc = CHANSVmGetArgc(vm);
CHANSVmObjHdr* arg = CHANSVmGetArg(vm, 0);
nw4r::lyt::Size out(lbl_81694FC0, lbl_81694FC0);
nw4r::lyt::Size out(scCsZeroF, scCsZeroF);
if (argc == 1 && util::is_valid_class(arg, "Size")) {
f32* src = static_cast<f32*>(*arg->value.ptr_v);
out.width = src[0];
@@ -622,15 +622,15 @@ namespace ipl {
namespace pane {
#pragma push
#pragma section const_type ".data"
extern "C" const char lbl_8166A6E3[] = "Error#004\nAn error has occurred.\nThe system files are corrupted.";
extern "C" const char scCsFatalMsg[] = "Error#004\nAn error has occurred.\nThe system files are corrupted.";
#pragma pop
#pragma push
#pragma section data_type ".sdata"
extern "C" __declspec(section ".sdata") const u8 lbl_81697844 = 0xff;
extern "C" __declspec(section ".sdata") const u8 lbl_81697845 = 0xff;
extern "C" __declspec(section ".sdata") const u8 lbl_81697846 = 0xff;
extern "C" __declspec(section ".sdata") const u8 lbl_81697847 = 0;
extern "C" __declspec(section ".sdata") const u8 scCsFatalColorR = 0xff;
extern "C" __declspec(section ".sdata") const u8 scCsFatalColorG = 0xff;
extern "C" __declspec(section ".sdata") const u8 scCsFatalColorB = 0xff;
extern "C" __declspec(section ".sdata") const u8 scCsFatalColorA = 0;
#pragma pop
}
}

View File

@@ -215,19 +215,19 @@ namespace ipl {
MESG_CALENDAR_DEC,
};
static const char* lbl_8164C458[] = {
static const char* scPaneName_T_CalMonth[] = {
"T_CalMonth_a",
"T_CalMonth_b",
"T_CalMonth_c",
};
static const char* lbl_8164C480[] = {
static const char* scPaneName_N_Cal[] = {
"N_Cal_a1",
"N_Cal_b1",
"N_Cal_c1",
};
static const char* lbl_8164C4B0[] = {
static const char* scPaneName_N_CalPos[] = {
"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(lbl_8164C458[0], last);
set_textbox_month(lbl_8164C458[1], *mpBoardDate);
set_textbox_month(lbl_8164C458[2], 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);
}
void Calendar::set_textbox_month(const char* paneName, const utility::Date& date) {
@@ -714,31 +714,31 @@ namespace ipl {
OSCalendarTime curTime = System::getCurrentTime();
utility::Date local_64(curTime.year, curTime.mon + 1, curTime.mday);
utility::Date local_70;
utility::Date local_7c;
utility::Date todayDate(curTime.year, curTime.mon + 1, curTime.mday);
utility::Date lastMonth;
utility::Date nextMonth;
utility::Calendar::getLastMonth(date, &local_70);
utility::Calendar::getNextMonth(date, &local_7c);
utility::Calendar::getLastMonth(date, &lastMonth);
utility::Calendar::getNextMonth(date, &nextMonth);
int dateIndex;
int iVar10;
int weekOffset;
if (mbAsian || mbUSA) {
iVar10 = 6 - utility::Calendar::getWeek(date.year, date.month, maxDays);
weekOffset = 6 - utility::Calendar::getWeek(date.year, date.month, maxDays);
} else {
week--;
if (week < 0) {
week = 6;
}
iVar10 = 6 - (utility::Calendar::getWeek(date.year, date.month, maxDays) - 1);
if (iVar10 >= 7) {
iVar10 = 0;
weekOffset = 6 - (utility::Calendar::getWeek(date.year, date.month, maxDays) - 1);
if (weekOffset >= 7) {
weekOffset = 0;
}
}
dateIndex = unk == 1 ? 0 : DATE_COUNT;
utility::Date local_88;
utility::Date cellDate;
u32 attr;
int val2;
@@ -750,25 +750,25 @@ namespace ipl {
val = (maxDays + week);
attr = 0;
val2 = (iVar10 + val);
val2 = (weekOffset + val);
if ((week - i) > 0) {
local_88.year = local_70.year;
local_88.month = local_70.month;
local_88.day = i + (local_70.day - week) + 1;
cellDate.year = lastMonth.year;
cellDate.month = lastMonth.month;
cellDate.day = i + (lastMonth.day - week) + 1;
goto out;
}
if ((val - i) > 0) {
local_88.year = date.year;
local_88.month = date.month;
local_88.day = (i - week) + 1;
cellDate.year = date.year;
cellDate.month = date.month;
cellDate.day = (i - week) + 1;
attr |= 2;
if (local_88 == local_64) {
if (cellDate == todayDate) {
attr |= 1;
}
switch (utility::Calendar::getWeek(local_88.year, local_88.month, local_88.day)) {
switch (utility::Calendar::getWeek(cellDate.year, cellDate.month, cellDate.day)) {
case 6: {
attr |= 8;
break;
@@ -782,9 +782,9 @@ namespace ipl {
}
if ((val2 - i) > 0) {
local_88.year = local_7c.year;
local_88.month = local_7c.month;
local_88.day = ((i - maxDays) - week) + 1;
cellDate.year = nextMonth.year;
cellDate.month = nextMonth.month;
cellDate.day = ((i - maxDays) - week) + 1;
goto out;
} else {
dateScn->setVisible(false);
@@ -792,14 +792,14 @@ namespace ipl {
}
out:
dateScn->setDate(local_88);
dateScn->setDate(cellDate);
dateScn->setAttribute(attr);
}
}
void Calendar::set_date_pos(int unk) {
nw4r::lyt::Pane* pane1 = mpLayout->FindPaneByName(lbl_8164C480[unk]);
nw4r::lyt::Pane* pane2 = mpLayout->FindPaneByName(lbl_8164C4B0[unk]);
nw4r::lyt::Pane* pane1 = mpLayout->FindPaneByName(scPaneName_N_Cal[unk]);
nw4r::lyt::Pane* pane2 = mpLayout->FindPaneByName(scPaneName_N_CalPos[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 local_68;
local_68.x = ((u16)i % 7) * 0x46;
local_68.y = ((u16)i / 7) * -0x30;
local_68.z = 0.0f;
nw4r::math::VEC3 cellPos;
cellPos.x = ((u16)i % 7) * 0x46;
cellPos.y = ((u16)i / 7) * -0x30;
cellPos.z = 0.0f;
MTXMultVec(pane2->GetGlobalMtx(), local_68, local_68);
MTXMultVec(pane2->GetGlobalMtx(), cellPos, cellPos);
dateScn->setTranslate(local_68);
dateScn->setTranslate(cellPos);
dateScn->setRotate(pane1->GetRotate());
}
}

View File

@@ -185,7 +185,7 @@ namespace ipl {
break;
}
case STATE_16: {
fn_81409864();
calc_exit_sequence();
break;
}
}
@@ -688,28 +688,28 @@ namespace ipl {
}
}
void SettingSelect::fn_81409864() {
void SettingSelect::calc_exit_sequence() {
switch (unk_0x94) {
case 0: {
fn_814098F4();
prepare_exit_abort();
break;
}
case 1: {
fn_unk_inline();
wait_decide_se();
break;
}
case 2: {
fn_81409988();
start_exit_fade();
break;
}
case 3: {
fn_814099EC();
finish_exit_reboot();
break;
}
}
}
void SettingSelect::fn_814098F4() {
void SettingSelect::prepare_exit_abort() {
if (System::getChannelManager()->isReady()) {
for (int i = 0; i < WPAD_MAX_CONTROLLERS; i++) {
controller::Interface* con = System::getController(i);
@@ -724,20 +724,20 @@ namespace ipl {
}
}
void SettingSelect::fn_unk_inline() {
void SettingSelect::wait_decide_se() {
if (!snd::getSystem()->isSEActive("WIPL_SE_DECIDE")) {
unk_0x94 = 2;
}
}
void SettingSelect::fn_81409988() {
void SettingSelect::start_exit_fade() {
__WPADReconnect(TRUE);
snd::getSystem()->stopAllSound(20);
System::getFader()->fadeOut();
unk_0x94 = 3;
}
void SettingSelect::fn_814099EC() {
void SettingSelect::finish_exit_reboot() {
if (System::getFader()->getStatus() == EGG::Fader::PREPARE_IN) {
while (WPADGetStatus() != 0 || System::getBS2Manager()->getIPLState() != bs2::IPL_STATE_8) {
snd::getSystem()->calc();