Compare commits

..

4 Commits

Author SHA1 Message Date
Cursor Agent
83303f84a6 data(CDBFileSystemUtils): match .sdata path separator
Replace lbl_816979E8 + .sdata section pragma with a plain
char CDBFSPathSeparator = '/' so the .sdata symbol size matches
the original (1 byte). Rename the symbol in symbols.txt to match.

Co-authored-by: coah <coah80@users.noreply.github.com>
2026-10-01 22:17:18 +00:00
coah
2368a9a774 cleanup(tiHwKeyboard): name EU/non-EU country map tables (#515)
Rename Matching-only setLanguage country lookup tables and
symbols.txt entries.
2026-10-01 17:13:57 -05:00
coah
90399bb6cf cleanup(iplDate): name calendar date pane/string labels (#518)
Matching-only renames in scene/calendar/iplDate (+ symbols.txt).
2026-10-01 17:13:54 -05:00
coah
fc831357ea CDBDatabase: convert Close and FindByKey to matching C (#491)
* CDBDatabase: convert Close and FindByKey to matching C

Replace asm bodies for CDBDatabaseClose and CDBDatabaseFindByKey with
equivalent C that matches instruction-exact (ctxdiff diffs 0). Unit stays
33/33 matched with 100% code and data.

* CDBDatabase: reuse labeled error strings for Close/FindByKey

Point CDBReportError at the existing lbl_ string pool entries so the
linked DOL matches baserom SHA1 26116613f624061ba99c8d1a299aaa6efa85670d.
2026-10-01 17:13:50 -05:00
6 changed files with 162 additions and 245 deletions

View File

@@ -13986,8 +13986,8 @@ lbl_81616AE4 = .rodata:0x81616AE4; // type:object size:0x30
lbl_81616B14 = .rodata:0x81616B14; // type:object size:0x74
lbl_81616B88 = .rodata:0x81616B88; // type:object size:0x40
lbl_81616BC8 = .rodata:0x81616BC8; // type:object size:0x10 data:4byte
lbl_81616BD8 = .rodata:0x81616BD8; // type:object size:0xC
lbl_81616BE4 = .rodata:0x81616BE4; // type:object size:0xC
scCountryMap_EU = .rodata:0x81616BD8; // type:object size:0xC
scCountryMap_NonEU = .rodata:0x81616BE4; // type:object size:0xC
lbl_81616BF0 = .rodata:0x81616BF0; // type:object size:0x88
CHANSVmConstStringObjectUndefined = .rodata:0x81616C78; // type:object size:0x10
lbl_81616C88 = .rodata:0x81616C88; // type:object size:0x10
@@ -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
@@ -15796,20 +15796,20 @@ __vt__Q33ipl5scene11ChannelEdit = .data:0x8164CC1C; // type:object size:0x4C
@17390 = .data:0x8164D00C; // type:object size:0x30 scope:local
__vt__Q33ipl5scene11ChanAppBase = .data:0x8164D03C; // type:object size:0x28
__vt__Q33ipl5scene13AnmController = .data:0x8164D0F8; // type:object size:0xC scope:weak
scBrlan_SaveDataIn = .data:0x8164D108; // type:object size:0x25 data:string
scBrlan_SaveDataOut = .data:0x8164D12D; // type:object size:0x26 data:string
scBrlan_SaveDataFocusIn = .data:0x8164D153; // type:object size:0x2B data:string
scBrlan_SaveDataFocusOut = .data:0x8164D17E; // type:object size:0x2C data:string
scPaneName_N_Data16x9 = .data:0x8164D1AA; // type:object size:0xB data:string
scPaneName_N_Data4x3 = .data:0x8164D1B5; // type:object size:0xA data:string
scPaneName_B_Data_01 = .data:0x8164D1BF; // type:object size:0xA data:string
scPaneName_B_Data_00 = .data:0x8164D1C9; // type:object size:0xA data:string
scPaneName_N_Atari16x9 = .data:0x8164D1D3; // type:object size:0xC data:string
scPaneName_N_Data_01 = .data:0x8164D1DF; // type:object size:0xA data:string
scPaneName_N_Atari4x3 = .data:0x8164D1E9; // type:object size:0xB data:string
scPaneName_N_Data_00 = .data:0x8164D1F4; // type:object size:0xA data:string
scPaneName_DataBaseCover_00 = .data:0x8164D1FE; // type:object size:0x11 data:string
scPaneName_DataBaseCover_01 = .data:0x8164D20F; // type:object size:0x11 data:string
lbl_8164D108 = .data:0x8164D108; // type:object size:0x25 data:string
lbl_8164D12D = .data:0x8164D12D; // type:object size:0x26 data:string
lbl_8164D153 = .data:0x8164D153; // type:object size:0x2B data:string
lbl_8164D17E = .data:0x8164D17E; // type:object size:0x2C data:string
lbl_8164D1AA = .data:0x8164D1AA; // type:object size:0xB data:string
lbl_8164D1B5 = .data:0x8164D1B5; // type:object size:0xA data:string
lbl_8164D1BF = .data:0x8164D1BF; // type:object size:0xA data:string
lbl_8164D1C9 = .data:0x8164D1C9; // type:object size:0xA data:string
lbl_8164D1D3 = .data:0x8164D1D3; // type:object size:0xC data:string
lbl_8164D1DF = .data:0x8164D1DF; // type:object size:0xA data:string
lbl_8164D1E9 = .data:0x8164D1E9; // type:object size:0xB data:string
lbl_8164D1F4 = .data:0x8164D1F4; // type:object size:0xA data:string
lbl_8164D1FE = .data:0x8164D1FE; // type:object size:0x11 data:string
lbl_8164D20F = .data:0x8164D20F; // type:object size:0x11 data:string
__vt__Q33ipl5scene10ChanAppBox = .data:0x8164D220; // type:object size:0x28
@18429 = .data:0x8164D2E8; // type:object size:0x20 scope:local data:string
@18431 = .data:0x8164D308; // type:object size:0x21 scope:local data:string
@@ -20370,9 +20370,9 @@ lbl_816948E8 = .sdata2:0x816948E8; // type:object size:0x8 align:4 data:float
@16092 = .sdata2:0x816948F4; // type:object size:0x4 scope:local align:4 data:float
@16094 = .sdata2:0x816948F8; // type:object size:0x4 scope:local align:4 data:float
@16095 = .sdata2:0x816948FC; // type:object size:0x4 scope:local align:4 data:float
scHalfF = .sdata2:0x81694900; // type:object size:0x4 align:4 data:float
scTwoF = .sdata2:0x81694904; // type:object size:0x4 align:4 data:float
scF2IBias = .sdata2:0x81694908; // type:object size:0x8 align:8 data:double
lbl_81694900 = .sdata2:0x81694900; // type:object size:0x4 align:4 data:float
lbl_81694904 = .sdata2:0x81694904; // type:object size:0x4 align:4 data:float
lbl_81694908 = .sdata2:0x81694908; // type:object size:0x8 align:8 data:double
lbl_81694910 = .sdata2:0x81694910; // type:object size:0x4 align:4 data:float
lbl_81694914 = .sdata2:0x81694914; // type:object size:0x4 align:4 data:float
lbl_81694918 = .sdata2:0x81694918; // type:object size:0x4 align:4 data:float
@@ -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
@@ -21802,8 +21802,8 @@ lbl_8169682A = .sdata:0x8169682A; // type:object size:0x7 data:string
lbl_81696831 = .sdata:0x81696831; // type:object size:0x7 data:string
lbl_81696838 = .sdata:0x81696838; // type:object size:0x7 data:string
lbl_8169683F = .sdata:0x8169683F; // type:object size:0x7 data:string
scGroup_G_Data = .sdata:0x81696848; // type:object size:0x7 data:string
scUnknownWstr = .sdata:0x81696850; // type:object size:0x8 data:wstring
lbl_81696848 = .sdata:0x81696848; // type:object size:0x7 data:string
lbl_81696850 = .sdata:0x81696850; // type:object size:0x8 data:wstring
s_all_pane_name__Q33ipl5scene10ChanAppBox = .sdata:0x81696858; // type:object size:0x6 data:string
lbl_81696860 = .sdata:0x81696860; // type:object size:0x7 data:string
lbl_81696867 = .sdata:0x81696867; // type:object size:0x7 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
lbl_816979E8 = .sdata:0x816979E8; // type:object size:0x1 data:byte
CDBFSPathSeparator = .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

View File

@@ -8,10 +8,10 @@ extern u32 CDBGetInitialCode();
extern void CDBLock();
extern CDBErr CDBDatabaseAllocate(CDBDatabase* database, u32 flags);
extern void CDBUnlock();
extern void CDBDatabaseFree();
extern CDBErr CDBDatabaseFree(CDBDatabase* database);
extern void CDBRecordCreateAtOnce();
extern void CDBRecordInitDescriptor();
extern void CDBRecordIsExistFile();
extern void CDBRecordInitDescriptor(CDBRecord* record, CDBDatabase* database, CDBRecordKey* key);
extern BOOL CDBRecordIsExistFile(CDBRecord* record);
extern void CDBRecordOpenReadOnly();
extern void CDBRecordKeyArrayInit();
extern void CDBRecordKeyArraySetReverse();
@@ -157,59 +157,27 @@ CDBErr CDBDatabaseOpen(CDBDatabase* database) {
return result;
}
asm CDBErr CDBDatabaseClose(CDBDatabase* database) {
#ifdef __MWERKS__
nofralloc
stwu r1, -0x10(r1)
mflr r0
stw r0, 0x14(r1)
stw r31, 0xc(r1)
stw r30, 0x8(r1)
mr r30, r3
bl CDBLock
lwz r31, 0x8(r30)
cmpwi r31, 0x0
beq L_8148746C
addis r3, r31, 0x1
lwz r0, -0x3ff0(r3)
cmpwi r0, 0x0
bne L_8148749C
L_8148746C:
li r3, 0x2
bl CDBIsPrintDebugMessage
cmpwi r3, 0x0
beq L_81487494
li r3, 0x2
bl CDBReport_
lis r3, lbl_8166B528@ha
addi r3, r3, lbl_8166B528@l
crclr 4*cr1+eq
bl OSReport
L_81487494:
li r31, 0x1b
b L_814874C4
L_8148749C:
mr r3, r30
bl CDBDatabaseFree
cmpwi r3, 0x0
beq L_814874B4
mr r31, r3
b L_814874C4
L_814874B4:
addis r3, r31, 0x1
li r0, 0x0
stw r0, -0x3ff0(r3)
li r31, 0x0
L_814874C4:
bl CDBUnlock
mr r3, r31
lwz r31, 0xc(r1)
lwz r30, 0x8(r1)
lwz r0, 0x14(r1)
mtlr r0
addi r1, r1, 0x10
blr
#endif
CDBErr CDBDatabaseClose(CDBDatabase* database) {
CDBErr result;
CDBErr status;
CDBDatabaseState* instance;
CDBLock();
instance = database->instance;
if (instance == NULL || instance->flags == 0) {
CDBReportError(lbl_8166B528);
result = CDB_ERROR_27;
} else {
status = CDBDatabaseFree(database);
if (status != CDB_ERROR_OK) {
result = status;
} else {
instance->flags = 0;
result = CDB_ERROR_OK;
}
}
CDBUnlock();
return result;
}
CDBErr CDBDatabasePrivateCreateRecordAtOnce(CDBDatabase* database, CDBRecord* record, const char* typeStr, const char* fileTypeStr, u8* recordData, u32 recordDataSize, char* makerCodeStr, char* gameCodeStr) {
@@ -525,72 +493,24 @@ asm CDBErr CDBDatabaseCreateRecordImAtOnce_() {
#endif
}
asm CDBErr CDBDatabaseFindByKey() {
#ifdef __MWERKS__
nofralloc
stwu r1, -0x20(r1)
mflr r0
stw r0, 0x24(r1)
stw r31, 0x1c(r1)
mr r31, r5
stw r30, 0x18(r1)
mr r30, r4
stw r29, 0x14(r1)
mr r29, r3
bl CDBLock
mr r3, r31
bl CDBRecordKeyIsValid
cmpwi r3, 0x0
bne L_81487ABC
li r3, 0x2
bl CDBIsPrintDebugMessage
cmpwi r3, 0x0
beq L_81487AB4
li r3, 0x2
bl CDBReport_
lis r3, lbl_8166B5A8@ha
addi r3, r3, lbl_8166B5A8@l
crclr 4*cr1+eq
bl OSReport
L_81487AB4:
li r31, 0x5
b L_81487B14
L_81487ABC:
mr r3, r30
mr r4, r29
mr r5, r31
bl CDBRecordInitDescriptor
mr r3, r30
bl CDBRecordIsExistFile
cmpwi r3, 0x0
bne L_81487B10
li r3, 0x2
bl CDBIsPrintDebugMessage
cmpwi r3, 0x0
beq L_81487B08
li r3, 0x2
bl CDBReport_
lis r3, lbl_8166B5B8@ha
mr r4, r31
addi r3, r3, lbl_8166B5B8@l
crclr 4*cr1+eq
bl OSReport
L_81487B08:
li r31, 0x23
b L_81487B14
L_81487B10:
li r31, 0x0
L_81487B14:
bl CDBUnlock
mr r3, r31
lwz r31, 0x1c(r1)
lwz r30, 0x18(r1)
lwz r29, 0x14(r1)
lwz r0, 0x24(r1)
mtlr r0
addi r1, r1, 0x20
blr
#endif
CDBErr CDBDatabaseFindByKey(CDBDatabase* database, CDBRecord* record, CDBRecordKey* recordKey) {
CDBErr result;
CDBLock();
if (!CDBRecordKeyIsValid(recordKey)) {
CDBReportError(lbl_8166B5A8);
result = CDB_ERROR_5;
} else {
CDBRecordInitDescriptor(record, database, recordKey);
if (!CDBRecordIsExistFile(record)) {
CDBReportError(lbl_8166B5B8, recordKey->keyString);
result = CDB_ERROR_CANNOT_OPEN_FILE;
} else {
result = CDB_ERROR_OK;
}
}
CDBUnlock();
return result;
}
CDBErr CDBDatabaseSearchConditionsIsMatch(CDBSearchConditions* conditions, char* key) {

View File

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

View File

@@ -526,8 +526,8 @@ extern const u8 controlKeys[];
return false;
}
extern "C" const u8 lbl_81616BD8[] = {0x0f, 0x21, 0x20, 0x08, 0x09, 0x0e, 0x19, 0x00, 0x21, 0x21, 0x00, 0x00};
extern "C" const u8 lbl_81616BE4[] = {0x0f, 0x21, 0x20, 0x04, 0x09, 0x0e, 0x11, 0x00, 0x21, 0x21, 0x00, 0x00};
extern "C" const u8 scCountryMap_EU[] = {0x0f, 0x21, 0x20, 0x08, 0x09, 0x0e, 0x19, 0x00, 0x21, 0x21, 0x00, 0x00};
extern "C" const u8 scCountryMap_NonEU[] = {0x0f, 0x21, 0x20, 0x04, 0x09, 0x0e, 0x11, 0x00, 0x21, 0x21, 0x00, 0x00};
const u8 controlKeys[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x01, 0x0a, 0x03,
@@ -640,16 +640,16 @@ const u8 controlKeys[] = {
nofralloc
cmpwi r4, 2
bne setLanguage_L1
lis r4, lbl_81616BD8@ha
lis r4, scCountryMap_EU@ha
lis r3, sInstance__Q39textinput5input10HKBManager@ha
addi r4, r4, lbl_81616BD8@l
addi r4, r4, scCountryMap_EU@l
lbzx r4, r4, r5
addi r3, r3, sInstance__Q39textinput5input10HKBManager@l
b SetCountry__Q39textinput5input10HKBManagerFUc
setLanguage_L1:
lis r4, lbl_81616BE4@ha
lis r4, scCountryMap_NonEU@ha
lis r3, sInstance__Q39textinput5input10HKBManager@ha
addi r4, r4, lbl_81616BE4@l
addi r4, r4, scCountryMap_NonEU@l
lbzx r4, r4, r5
addi r3, r3, sInstance__Q39textinput5input10HKBManager@l
b SetCountry__Q39textinput5input10HKBManagerFUc

View File

@@ -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);
}

View File

@@ -4,27 +4,27 @@
#pragma push
#pragma section const_type ".data"
extern "C" const char scBrlan_SaveDataIn[] = "it_ObjChannelEdit_b_SaveDataIn.brlan";
extern "C" const char scBrlan_SaveDataOut[] = "it_ObjChannelEdit_b_SaveDataOut.brlan";
extern "C" const char scBrlan_SaveDataFocusIn[] = "it_ObjChannelEdit_b_SaveDataFoucusIn.brlan";
extern "C" const char scBrlan_SaveDataFocusOut[] = "it_ObjChannelEdit_b_SaveDataFoucusOut.brlan";
extern "C" const char scPaneName_N_Data16x9[] = "N_Data16x9";
extern "C" const char scPaneName_N_Data4x3[] = "N_Data4x3";
extern "C" const char scPaneName_B_Data_01[] = "B_Data_01";
extern "C" const char scPaneName_B_Data_00[] = "B_Data_00";
extern "C" const char scPaneName_N_Atari16x9[] = "N_Atari16x9";
extern "C" const char scPaneName_N_Data_01[] = "N_Data_01";
extern "C" const char scPaneName_N_Atari4x3[] = "N_Atari4x3";
extern "C" const char scPaneName_N_Data_00[] = "N_Data_00";
extern "C" const char scPaneName_DataBaseCover_00[] = "DataBaseCover_00";
extern "C" const char scPaneName_DataBaseCover_01[] = "DataBaseCover_01";
extern "C" const char lbl_8164D108[] = "it_ObjChannelEdit_b_SaveDataIn.brlan";
extern "C" const char lbl_8164D12D[] = "it_ObjChannelEdit_b_SaveDataOut.brlan";
extern "C" const char lbl_8164D153[] = "it_ObjChannelEdit_b_SaveDataFoucusIn.brlan";
extern "C" const char lbl_8164D17E[] = "it_ObjChannelEdit_b_SaveDataFoucusOut.brlan";
extern "C" const char lbl_8164D1AA[] = "N_Data16x9";
extern "C" const char lbl_8164D1B5[] = "N_Data4x3";
extern "C" const char lbl_8164D1BF[] = "B_Data_01";
extern "C" const char lbl_8164D1C9[] = "B_Data_00";
extern "C" const char lbl_8164D1D3[] = "N_Atari16x9";
extern "C" const char lbl_8164D1DF[] = "N_Data_01";
extern "C" const char lbl_8164D1E9[] = "N_Atari4x3";
extern "C" const char lbl_8164D1F4[] = "N_Data_00";
extern "C" const char lbl_8164D1FE[] = "DataBaseCover_00";
extern "C" const char lbl_8164D20F[] = "DataBaseCover_01";
#pragma section const_type ".sdata"
extern "C" __declspec(section ".sdata") const char scGroup_G_Data[] = "G_Data";
extern "C" __declspec(section ".sdata") const wchar_t scUnknownWstr[] = L"???";
extern "C" __declspec(section ".sdata") const char lbl_81696848[] = "G_Data";
extern "C" __declspec(section ".sdata") const wchar_t lbl_81696850[] = L"???";
#pragma section sconst_type ".sdata2"
extern "C" __declspec(section ".sdata2") const f32 scHalfF = 0.5f;
extern "C" __declspec(section ".sdata2") const f32 scTwoF = 2.0f;
extern "C" __declspec(section ".sdata2") const f64 scF2IBias = 4503599627370496.0;
extern "C" __declspec(section ".sdata2") const f32 lbl_81694900 = 0.5f;
extern "C" __declspec(section ".sdata2") const f32 lbl_81694904 = 2.0f;
extern "C" __declspec(section ".sdata2") const f64 lbl_81694908 = 4503599627370496.0;
#pragma pop
namespace ipl {
@@ -33,26 +33,26 @@ namespace ipl {
: AnmController(heap), ::gui::EventHandler(), mState(STATE_HIDDEN), mpThumbnail(NULL), mpBalloon(NULL), mbInitBalloon(false) {
mpLayout = new (heap) layout::Object(heap, layoutFile, layoutDir, layoutFileName);
add_animation(scBrlan_SaveDataIn, scGroup_G_Data);
add_animation(scBrlan_SaveDataOut, scGroup_G_Data);
add_animation(scBrlan_SaveDataFocusIn, scGroup_G_Data);
add_animation(scBrlan_SaveDataFocusOut, scGroup_G_Data);
add_animation(lbl_8164D108, lbl_81696848);
add_animation(lbl_8164D12D, lbl_81696848);
add_animation(lbl_8164D153, lbl_81696848);
add_animation(lbl_8164D17E, lbl_81696848);
mpLayout->finishBinding();
set_visible(scPaneName_N_Data16x9, false);
set_visible(scPaneName_N_Data4x3, false);
set_visible(lbl_8164D1AA, false);
set_visible(lbl_8164D1B5, false);
mpGui = new gui::PaneManager(this, mpLayout->getDrawInfo(), NULL, NULL, true);
mpGui->createLayoutScene(*mpLayout->getNW4RLyt());
mpGui->setAllComponentTriggerTarget(false);
if (SCGetAspectRatio() == SC_ASPECT_RATIO_16x9) {
mpGui->setTriggerTarget(mpLayout->FindPaneByName(scPaneName_B_Data_01), true);
add_anmpane(scPaneName_B_Data_01, get_animation(ANIM_DATA_FOCUS_IN), get_animation(ANIM_DATA_FOCUS_OUT));
mpGui->setTriggerTarget(mpLayout->FindPaneByName(lbl_8164D1BF), true);
add_anmpane(lbl_8164D1BF, get_animation(ANIM_DATA_FOCUS_IN), get_animation(ANIM_DATA_FOCUS_OUT));
} else {
mpGui->setTriggerTarget(mpLayout->FindPaneByName(scPaneName_B_Data_00), true);
add_anmpane(scPaneName_B_Data_00, get_animation(ANIM_DATA_FOCUS_IN), get_animation(ANIM_DATA_FOCUS_OUT));
mpGui->setTriggerTarget(mpLayout->FindPaneByName(lbl_8164D1C9), true);
add_anmpane(lbl_8164D1C9, get_animation(ANIM_DATA_FOCUS_IN), get_animation(ANIM_DATA_FOCUS_OUT));
}
}
@@ -92,11 +92,11 @@ namespace ipl {
nw4r::math::VEC2 scale = mpThumbnail->getLytObj()->GetRootPane()->GetScale();
if (SCGetAspectRatio() == SC_ASPECT_RATIO_16x9) {
scale *= get_scale(scPaneName_N_Atari16x9).x;
scale *= get_scale(scPaneName_N_Data_01).x;
scale *= get_scale(lbl_8164D1D3).x;
scale *= get_scale(lbl_8164D1DF).x;
} else {
scale *= get_scale(scPaneName_N_Atari4x3).x;
scale *= get_scale(scPaneName_N_Data_00).x;
scale *= get_scale(lbl_8164D1E9).x;
scale *= get_scale(lbl_8164D1F4).x;
}
mpThumbnail->getLytObj()->GetRootPane()->SetScale(scale);
}
@@ -127,8 +127,8 @@ namespace ipl {
return;
mpLayout->draw();
set_visible(scPaneName_DataBaseCover_00, false);
set_visible(scPaneName_DataBaseCover_01, false);
set_visible(lbl_8164D1FE, false);
set_visible(lbl_8164D20F, false);
ChannelEdit* sceneChannelEdit = get_channel_edit();
if (sceneChannelEdit->getState() == ChannelEdit::STATE_ON_SCROLL_R || sceneChannelEdit->getState() == ChannelEdit::STATE_ON_SCROLL_L)
@@ -138,7 +138,7 @@ namespace ipl {
if (mState == STATE_FADE_OUT)
return;
if (!get_visible(scPaneName_N_Data4x3) && !get_visible(scPaneName_N_Data16x9))
if (!get_visible(lbl_8164D1B5) && !get_visible(lbl_8164D1AA))
return;
if (mpThumbnail == NULL) {
@@ -171,11 +171,11 @@ namespace ipl {
mpThumbnail->draw();
if (SCGetAspectRatio() == SC_ASPECT_RATIO_16x9) {
set_visible(scPaneName_DataBaseCover_01, true);
mpLayout->draw(scPaneName_DataBaseCover_01);
set_visible(lbl_8164D20F, true);
mpLayout->draw(lbl_8164D20F);
} else {
set_visible(scPaneName_DataBaseCover_00, true);
mpLayout->draw(scPaneName_DataBaseCover_00);
set_visible(lbl_8164D1FE, true);
mpLayout->draw(lbl_8164D1FE);
}
GXSetScissor(0, 0, System::getRenderModeObj()->fbWidth, System::getRenderModeObj()->efbHeight);
@@ -187,11 +187,11 @@ namespace ipl {
void ChanAppBox::anmFadein() {
if (SCGetAspectRatio() == SC_ASPECT_RATIO_16x9) {
set_visible(scPaneName_N_Data16x9, true);
set_visible(scPaneName_N_Data4x3, false);
set_visible(lbl_8164D1AA, true);
set_visible(lbl_8164D1B5, false);
} else {
set_visible(scPaneName_N_Data16x9, false);
set_visible(scPaneName_N_Data4x3, true);
set_visible(lbl_8164D1AA, false);
set_visible(lbl_8164D1B5, true);
}
do_animation(ANIM_DATA_IN, ANIM_TYPE_FORWARD, true);
mState = STATE_FADE_IN;
@@ -226,7 +226,7 @@ namespace ipl {
mbInitBalloon = true;
if (mpThumbnail->getIsCorrupt()) {
mpBalloon->init(scUnknownWstr);
mpBalloon->init(lbl_81696850);
} else {
if (mpThumbnail->getMatchesTmpTitle()) {
mpBalloon->init(System::getMessage(MESG_CHAN_EDIT_SD_CARD_MENU));
@@ -251,7 +251,7 @@ namespace ipl {
mbInitBalloon = true;
if (mpThumbnail->getIsCorrupt()) {
mpBalloon->init(scUnknownWstr);
mpBalloon->init(lbl_81696850);
} else {
if (mpThumbnail->getMatchesTmpTitle()) {
mpBalloon->init(System::getMessage(MESG_CHAN_EDIT_SD_CARD_MENU));
@@ -297,9 +297,9 @@ namespace ipl {
void ChanAppBox::clearEvent() {
if (SCGetAspectRatio() == SC_ASPECT_RATIO_16x9) {
clear_anmpane(scPaneName_B_Data_01);
clear_anmpane(lbl_8164D1BF);
} else {
clear_anmpane(scPaneName_B_Data_00);
clear_anmpane(lbl_8164D1C9);
}
if (mpBalloon != NULL) {
@@ -314,8 +314,8 @@ namespace ipl {
WAIT_FOR_ANIM_STATE(ChanAppBox::on_fadein, ANIM_DATA_IN, mState = STATE_IDLE);
WAIT_FOR_ANIM_STATE(ChanAppBox::on_fadeout, ANIM_DATA_OUT, {
set_visible(scPaneName_N_Data16x9, false);
set_visible(scPaneName_N_Data4x3, false);
set_visible(lbl_8164D1AA, false);
set_visible(lbl_8164D1B5, false);
mState = STATE_IDLE;
});